diff --git a/magnum/common/context.py b/magnum/common/context.py
index dae1afd784..44b2bce0e8 100644
--- a/magnum/common/context.py
+++ b/magnum/common/context.py
@@ -41,7 +41,7 @@ class RequestContext(context.RequestContext):
 
         """
         super(RequestContext, self).__init__(auth_token=auth_token,
-                                             user=user_name,
+                                             user_id=user_name,
                                              tenant=project_name,
                                              is_admin=is_admin,
                                              read_only=read_only,
diff --git a/magnum/drivers/mesos_ubuntu_v1/template_def.py b/magnum/drivers/mesos_ubuntu_v1/template_def.py
index 5c29231157..2a7d931112 100644
--- a/magnum/drivers/mesos_ubuntu_v1/template_def.py
+++ b/magnum/drivers/mesos_ubuntu_v1/template_def.py
@@ -58,7 +58,7 @@ class UbuntuMesosTemplateDefinition(template_def.BaseTemplateDefinition):
         osc = self.get_osc(context)
         extra_params['auth_url'] = context.auth_url
         extra_params['username'] = context.user_name
-        extra_params['tenant_name'] = context.tenant
+        extra_params['tenant_name'] = context.project_id
         extra_params['domain_name'] = context.domain_name
         extra_params['region_name'] = osc.cinder_region_name()
 
diff --git a/magnum/tests/unit/common/test_context.py b/magnum/tests/unit/common/test_context.py
index 1e207dae0d..c72c2c763d 100644
--- a/magnum/tests/unit/common/test_context.py
+++ b/magnum/tests/unit/common/test_context.py
@@ -84,7 +84,7 @@ class ContextTestCase(base.TestCase):
         self.assertEqual(ctx.domain_name, ctx2.domain_name)
         self.assertEqual(ctx.user_name, ctx2.user_name)
         self.assertEqual(ctx.user_id, ctx2.user_id)
-        self.assertEqual(ctx.tenant, ctx2.tenant)
+        self.assertEqual(ctx.project_id, ctx2.project_id)
         self.assertEqual(ctx.project_name, ctx2.project_name)
         self.assertEqual(ctx.project_id, ctx2.project_id)
         self.assertEqual(ctx.is_admin, ctx2.is_admin)
diff --git a/magnum/tests/unit/conductor/handlers/test_k8s_cluster_conductor.py b/magnum/tests/unit/conductor/handlers/test_k8s_cluster_conductor.py
index 7b8195520c..7c13152270 100644
--- a/magnum/tests/unit/conductor/handlers/test_k8s_cluster_conductor.py
+++ b/magnum/tests/unit/conductor/handlers/test_k8s_cluster_conductor.py
@@ -100,7 +100,7 @@ class TestClusterConductorWithK8s(base.TestCase):
             'flavor_id': 'flavor_id',
         }
         self.context.user_name = 'fake_user'
-        self.context.tenant = 'fake_tenant'
+        self.context.project_id = 'fake_tenant'
         osc_patcher = mock.patch('magnum.common.clients.OpenStackClients')
         self.mock_osc_class = osc_patcher.start()
         self.addCleanup(osc_patcher.stop)
diff --git a/magnum/tests/unit/conductor/handlers/test_mesos_cluster_conductor.py b/magnum/tests/unit/conductor/handlers/test_mesos_cluster_conductor.py
index dcd68ef7cc..3389fe1189 100644
--- a/magnum/tests/unit/conductor/handlers/test_mesos_cluster_conductor.py
+++ b/magnum/tests/unit/conductor/handlers/test_mesos_cluster_conductor.py
@@ -77,7 +77,7 @@ class TestClusterConductorWithMesos(base.TestCase):
                        },
         }
         self.context.user_name = 'mesos_user'
-        self.context.tenant = 'admin'
+        self.context.project_id = 'admin'
         self.context.domain_name = 'domainname'
         osc_patcher = mock.patch('magnum.common.clients.OpenStackClients')
         self.mock_osc_class = osc_patcher.start()
diff --git a/magnum/tests/unit/drivers/test_template_definition.py b/magnum/tests/unit/drivers/test_template_definition.py
index d4cf4f5d10..13f55d42de 100644
--- a/magnum/tests/unit/drivers/test_template_definition.py
+++ b/magnum/tests/unit/drivers/test_template_definition.py
@@ -928,7 +928,7 @@ class UbuntuMesosTemplateDefinitionTestCase(base.TestCase):
         mock_context = mock.MagicMock()
         mock_context.auth_url = 'http://192.168.10.10:5000/v3'
         mock_context.user_name = 'mesos_user'
-        mock_context.tenant = 'admin'
+        mock_context.project_id = 'admin'
         mock_context.domain_name = 'domainname'
         mock_cluster_template = mock.MagicMock()
         mock_cluster_template.tls_disabled = False