diff --git a/heat/common/auth.py b/heat/common/auth.py
index c97c284d6c..571fbdafaf 100644
--- a/heat/common/auth.py
+++ b/heat/common/auth.py
@@ -200,7 +200,7 @@ class KeystoneStrategy(BaseStrategy):
                     logger.warn(msg)
                     continue
 
-                if service_type == 'heat':
+                if service_type == 'orchestration':
                     for ep in service['endpoints']:
                         if region is None or region == ep['region']:
                             if endpoint is not None:
diff --git a/heat/engine/auth.py b/heat/engine/auth.py
index a4be7ef0a4..3712d11cbd 100644
--- a/heat/engine/auth.py
+++ b/heat/engine/auth.py
@@ -61,7 +61,7 @@ def decrypt(auth_info):
     return res
 
 
-def authenticate(con, service_type='heat', service_name='heat'):
+def authenticate(con, service_type='orchestration', service_name='heat'):
     """ Authenticate a user context.  This authenticates either an
         EC2 style key context or a keystone user/pass context.
 
diff --git a/tools/heat-keystone-service b/tools/heat-keystone-service
index 53319a0ed2..842b9b1097 100755
--- a/tools/heat-keystone-service
+++ b/tools/heat-keystone-service
@@ -39,7 +39,7 @@ echo SERVICE_TOKEN $SERVICE_TOKEN
 # Services
 HEAT_SERVICE=$(get_id \
 keystone service-create --name=heat \
-                        --type=heat \
+                        --type=orchestration \
                         --description="Heat Service")
 HEAT_USER=$(get_id keystone user-create --name=heat \
                                         --pass="$SERVICE_PASSWORD" \
diff --git a/tools/heat-keystone-service-devstack b/tools/heat-keystone-service-devstack
index 504b776f45..65dd7f52f9 100755
--- a/tools/heat-keystone-service-devstack
+++ b/tools/heat-keystone-service-devstack
@@ -39,7 +39,7 @@ echo SERVICE_TOKEN $SERVICE_TOKEN
 # Services
 HEAT_SERVICE=$(get_id \
 keystone service-create --name=heat \
-                        --type=heat \
+                        --type=orchestration \
                         --description="Heat Service")
 HEAT_USER=$(get_id keystone user-create --name=heat \
                                         --pass="$SERVICE_PASSWORD" \