diff --git a/watcher_tempest_plugin/services/infra_optim/base.py b/watcher_tempest_plugin/services/base.py
similarity index 96%
rename from watcher_tempest_plugin/services/infra_optim/base.py
rename to watcher_tempest_plugin/services/base.py
index d702c69..188e4cb 100644
--- a/watcher_tempest_plugin/services/infra_optim/base.py
+++ b/watcher_tempest_plugin/services/base.py
@@ -44,19 +44,19 @@ def handle_errors(f):
 
 
 @six.add_metaclass(abc.ABCMeta)
-class BaseInfraOptimClient(rest_client.RestClient):
-    """Base Tempest REST client for Watcher API."""
+class BaseClient(rest_client.RestClient):
+    """Base Tempest REST client for API."""
 
     URI_PREFIX = ''
 
     @abc.abstractmethod
     def serialize(self, object_dict):
-        """Serialize an Watcher object."""
+        """Serialize an object."""
         raise NotImplementedError()
 
     @abc.abstractmethod
     def deserialize(self, object_str):
-        """Deserialize an Watcher object."""
+        """Deserialize an object."""
         raise NotImplementedError()
 
     def _get_uri(self, resource_name, uuid=None, permanent=False):
@@ -186,7 +186,7 @@ class BaseInfraOptimClient(rest_client.RestClient):
 
     @handle_errors
     def get_api_description(self):
-        """Retrieves all versions of the Watcher API."""
+        """Retrieves all versions of the API."""
 
         return self._list_request('', permanent=True)
 
diff --git a/watcher_tempest_plugin/services/infra_optim/v1/json/client.py b/watcher_tempest_plugin/services/infra_optim/v1/json/client.py
index 77d1526..1f26651 100644
--- a/watcher_tempest_plugin/services/infra_optim/v1/json/client.py
+++ b/watcher_tempest_plugin/services/infra_optim/v1/json/client.py
@@ -16,10 +16,10 @@
 
 from oslo_serialization import jsonutils
 from oslo_utils import uuidutils
-from watcher_tempest_plugin.services.infra_optim import base
+from watcher_tempest_plugin.services import base
 
 
-class InfraOptimClientJSON(base.BaseInfraOptimClient):
+class InfraOptimClientJSON(base.BaseClient):
     """Base Tempest REST client for Watcher API v1."""
 
     URI_PREFIX = 'v1'
diff --git a/watcher_tempest_plugin/services/metric/v1/json/client.py b/watcher_tempest_plugin/services/metric/v1/json/client.py
index be08421..638ce6d 100644
--- a/watcher_tempest_plugin/services/metric/v1/json/client.py
+++ b/watcher_tempest_plugin/services/metric/v1/json/client.py
@@ -16,10 +16,10 @@
 
 
 from oslo_serialization import jsonutils
-from watcher_tempest_plugin.services.infra_optim import base
+from watcher_tempest_plugin.services import base
 
 
-class GnocchiClientJSON(base.BaseInfraOptimClient):
+class GnocchiClientJSON(base.BaseClient):
     """Base Tempest REST client for Gnocchi API v1."""
 
     URI_PREFIX = 'v1'