diff --git a/contrib/heat_keystoneclient_v2/heat_keystoneclient_v2/client.py b/contrib/heat_keystoneclient_v2/heat_keystoneclient_v2/client.py
index e51c96d17a..47887d7f60 100644
--- a/contrib/heat_keystoneclient_v2/heat_keystoneclient_v2/client.py
+++ b/contrib/heat_keystoneclient_v2/heat_keystoneclient_v2/client.py
@@ -65,7 +65,7 @@ class KeystoneClientV2(object):
     def _v2_client_init(self):
         kwargs = {
             'auth_url': self.context.auth_url,
-            'region': cfg.CONF.region_name_for_services
+            'region_name': cfg.CONF.region_name_for_services
         }
         auth_kwargs = {}
         # Note try trust_id first, as we can't reuse auth_token in that case
diff --git a/contrib/heat_keystoneclient_v2/heat_keystoneclient_v2/tests/test_client.py b/contrib/heat_keystoneclient_v2/heat_keystoneclient_v2/tests/test_client.py
index 3b0baf90ab..e52ab7ff98 100644
--- a/contrib/heat_keystoneclient_v2/heat_keystoneclient_v2/tests/test_client.py
+++ b/contrib/heat_keystoneclient_v2/heat_keystoneclient_v2/tests/test_client.py
@@ -58,7 +58,7 @@ class KeystoneClientTest(HeatTestCase):
                 cacert=None,
                 cert=None,
                 insecure=False,
-                region=None,
+                region_name=None,
                 key=None).AndReturn(self.mock_ks_client)
             self.mock_ks_client.authenticate().AndReturn(auth_ok)
         elif method == 'password':
@@ -71,7 +71,7 @@ class KeystoneClientTest(HeatTestCase):
                 cacert=None,
                 cert=None,
                 insecure=False,
-                region=None,
+                region_name=None,
                 key=None).AndReturn(self.mock_ks_client)
             self.mock_ks_client.authenticate().AndReturn(auth_ok)
         if method == 'trust':
@@ -83,7 +83,7 @@ class KeystoneClientTest(HeatTestCase):
                 cacert=None,
                 cert=None,
                 insecure=False,
-                region=None,
+                region_name=None,
                 key=None).AndReturn(self.mock_ks_client)
             self.mock_ks_client.authenticate(trust_id='atrust123',
                                              tenant_id='test_tenant_id'