diff --git a/manila_tempest_tests/tests/api/base.py b/manila_tempest_tests/tests/api/base.py
index eab6b38..387b5d5 100644
--- a/manila_tempest_tests/tests/api/base.py
+++ b/manila_tempest_tests/tests/api/base.py
@@ -201,8 +201,8 @@
         if not hasattr(cls, "os"):
             cls.username = CONF.identity.username
             cls.password = CONF.identity.password
-            cls.tenant_name = CONF.identity.tenant_name
-            cls.verify_nonempty(cls.username, cls.password, cls.tenant_name)
+            cls.project_name = CONF.identity.project_name
+            cls.verify_nonempty(cls.username, cls.password, cls.project_name)
             cls.os = clients.Manager()
         if CONF.share.multitenancy_enabled:
             if not CONF.service_available.neutron:
@@ -807,8 +807,8 @@
     def resource_setup(cls):
         cls.username = CONF.identity.alt_username
         cls.password = CONF.identity.alt_password
-        cls.tenant_name = CONF.identity.alt_tenant_name
-        cls.verify_nonempty(cls.username, cls.password, cls.tenant_name)
+        cls.project_name = CONF.identity.alt_project_name
+        cls.verify_nonempty(cls.username, cls.password, cls.project_name)
         cls.os = clients.AltManager()
         alt_share_network_id = CONF.share.alt_share_network_id
         cls.os.shares_client.share_network_id = alt_share_network_id
@@ -824,12 +824,12 @@
         if hasattr(CONF.identity, 'admin_username'):
             cls.username = CONF.identity.admin_username
             cls.password = CONF.identity.admin_password
-            cls.tenant_name = CONF.identity.admin_tenant_name
+            cls.project_name = CONF.identity.admin_project_name
         else:
             cls.username = CONF.auth.admin_username
             cls.password = CONF.auth.admin_password
-            cls.tenant_name = CONF.auth.admin_tenant_name
-        cls.verify_nonempty(cls.username, cls.password, cls.tenant_name)
+            cls.project_name = CONF.auth.admin_project_name
+        cls.verify_nonempty(cls.username, cls.password, cls.project_name)
         cls.os = clients.AdminManager()
         admin_share_network_id = CONF.share.admin_share_network_id
         cls.os.shares_client.share_network_id = admin_share_network_id
diff --git a/manila_tempest_tests/tests/scenario/manager_share.py b/manila_tempest_tests/tests/scenario/manager_share.py
index 37b346e..8e5c132 100644
--- a/manila_tempest_tests/tests/scenario/manager_share.py
+++ b/manila_tempest_tests/tests/scenario/manager_share.py
@@ -152,7 +152,7 @@
         :param tenant_id
         """
         if not client:
-            client = self.network_client
+            client = self.routers_client
         if not tenant_id:
             tenant_id = client.tenant_id
         if not router_id: