diff --git a/heat/engine/clients/os/cinder.py b/heat/engine/clients/os/cinder.py
index 961ae5e8d..1ba7d6dc9 100644
--- a/heat/engine/clients/os/cinder.py
+++ b/heat/engine/clients/os/cinder.py
@@ -70,7 +70,7 @@ class CinderClientPlugin(client_plugin.ClientPlugin):
         args = {
             'service_type': service_type,
             'auth_url': con.auth_url or '',
-            'project_id': con.tenant,
+            'project_id': con.tenant_id,
             'username': None,
             'api_key': None,
             'endpoint_type': endpoint_type,
diff --git a/heat/engine/clients/os/glance.py b/heat/engine/clients/os/glance.py
index 8c69bed80..af9120b13 100644
--- a/heat/engine/clients/os/glance.py
+++ b/heat/engine/clients/os/glance.py
@@ -40,7 +40,7 @@ class GlanceClientPlugin(client_plugin.ClientPlugin):
         args = {
             'auth_url': con.auth_url,
             'service_type': self.IMAGE,
-            'project_id': con.tenant,
+            'project_id': con.tenant_id,
             'token': self.auth_token,
             'endpoint_type': endpoint_type,
             'cacert': self._get_client_option('glance', 'ca_file'),
diff --git a/heat/engine/clients/os/nova.py b/heat/engine/clients/os/nova.py
index b745406c8..22a923b78 100644
--- a/heat/engine/clients/os/nova.py
+++ b/heat/engine/clients/os/nova.py
@@ -66,7 +66,7 @@ class NovaClientPlugin(client_plugin.ClientPlugin):
         extensions = nc.discover_extensions(NOVACLIENT_VERSION)
 
         args = {
-            'project_id': self.context.tenant,
+            'project_id': self.context.tenant_id,
             'auth_url': self.context.auth_url,
             'auth_token': self.auth_token,
             'service_type': self.COMPUTE,