diff --git a/novaclient/client.py b/novaclient/client.py
index 39dce56d5..c136722ec 100644
--- a/novaclient/client.py
+++ b/novaclient/client.py
@@ -256,7 +256,7 @@ class HTTPClient(httplib2.Http):
                                            "password": self.apikey}}}
 
         if self.projectid:
-            body['auth']['tenantId'] = self.projectid
+            body['auth']['tenantName'] = self.projectid
 
         token_url = urlparse.urljoin(url, "tokens")
         resp, body = self.request(token_url, "POST", body=body)
diff --git a/tests/v1_1/test_auth.py b/tests/v1_1/test_auth.py
index daae47278..9be2ce365 100644
--- a/tests/v1_1/test_auth.py
+++ b/tests/v1_1/test_auth.py
@@ -45,7 +45,7 @@ class AuthenticateAgainstKeystoneTests(utils.TestCase):
             body = {'auth': {
                         'passwordCredentials': {'username': cs.client.user,
                                                 'password': cs.client.apikey},
-                        'tenantId': cs.client.projectid, }}
+                        'tenantName': cs.client.projectid, }}
 
             token_url = urlparse.urljoin(cs.client.auth_url, "tokens")
             mock_request.assert_called_with(token_url, "POST",
@@ -117,7 +117,7 @@ class AuthenticateAgainstKeystoneTests(utils.TestCase):
             body = {'auth': {
                             'passwordCredentials': {'username': cs.client.user,
                                                     'password': cs.client.apikey},
-                            'tenantId': cs.client.projectid,}}
+                            'tenantName': cs.client.projectid,}}
 
             token_url = urlparse.urljoin(cs.client.auth_url, "tokens")
             mock_request.assert_called_with(token_url, "POST",