diff --git a/tempest/clients.py b/tempest/clients.py
index d36546b..f97992d 100644
--- a/tempest/clients.py
+++ b/tempest/clients.py
@@ -135,12 +135,13 @@
 from tempest.services.identity.v3.json.trusts_client import TrustsClient
 from tempest.services.identity.v3.json.users_clients import \
     UsersClient as UsersV3Client
+from tempest.services.image.v1.json.image_members_client import \
+    ImageMembersClient
 from tempest.services.image.v1.json.images_client import ImagesClient
-from tempest.services.image.v1.json.members_client import MembersClient
+from tempest.services.image.v2.json.image_members_client import \
+    ImageMembersClient as ImageMembersClientV2
 from tempest.services.image.v2.json.images_client import \
     ImagesClient as ImagesV2Client
-from tempest.services.image.v2.json.members_client import MembersClient \
-    as MembersClientV2
 from tempest.services.object_storage.account_client import AccountClient
 from tempest.services.object_storage.container_client import ContainerClient
 from tempest.services.object_storage.object_client import ObjectClient
@@ -339,7 +340,7 @@
                 build_interval=CONF.image.build_interval,
                 build_timeout=CONF.image.build_timeout,
                 **self.default_params)
-            self.image_member_client = MembersClient(
+            self.image_member_client = ImageMembersClient(
                 self.auth_provider,
                 CONF.image.catalog_type,
                 CONF.image.region or CONF.identity.region,
@@ -355,7 +356,7 @@
                 build_interval=CONF.image.build_interval,
                 build_timeout=CONF.image.build_timeout,
                 **self.default_params)
-            self.image_member_client_v2 = MembersClientV2(
+            self.image_member_client_v2 = ImageMembersClientV2(
                 self.auth_provider,
                 CONF.image.catalog_type,
                 CONF.image.region or CONF.identity.region,
diff --git a/tempest/services/image/v1/json/members_client.py b/tempest/services/image/v1/json/image_members_client.py
similarity index 97%
rename from tempest/services/image/v1/json/members_client.py
rename to tempest/services/image/v1/json/image_members_client.py
index 95cee1c..df16d2fd 100644
--- a/tempest/services/image/v1/json/members_client.py
+++ b/tempest/services/image/v1/json/image_members_client.py
@@ -15,7 +15,7 @@
 from tempest.lib.common import rest_client
 
 
-class MembersClient(rest_client.RestClient):
+class ImageMembersClient(rest_client.RestClient):
     api_version = "v1"
 
     def list_image_members(self, image_id):
diff --git a/tempest/services/image/v2/json/members_client.py b/tempest/services/image/v2/json/image_members_client.py
similarity index 97%
rename from tempest/services/image/v2/json/members_client.py
rename to tempest/services/image/v2/json/image_members_client.py
index 233a6ec..2ae7516 100644
--- a/tempest/services/image/v2/json/members_client.py
+++ b/tempest/services/image/v2/json/image_members_client.py
@@ -15,7 +15,7 @@
 from tempest.lib.common import rest_client
 
 
-class MembersClient(rest_client.RestClient):
+class ImageMembersClient(rest_client.RestClient):
     api_version = "v2"
 
     def list_image_members(self, image_id):