diff --git a/image_prediction/estimator/preprocessor/preprocessor.py b/image_prediction/estimator/preprocessor/preprocessor.py
index 9cd13a4..c7c4ce9 100644
--- a/image_prediction/estimator/preprocessor/preprocessor.py
+++ b/image_prediction/estimator/preprocessor/preprocessor.py
@@ -1,4 +1,4 @@
-from image_prediction.estimator.adapter import EstimatorAdapter
+from image_prediction.estimator.adapter.adapter import EstimatorAdapter
 
 
 class EstimatorPreprocessor:
diff --git a/image_prediction/estimator/service_estimator.py b/image_prediction/estimator/service_estimator.py
index 1704fb1..66e6ed1 100644
--- a/image_prediction/estimator/service_estimator.py
+++ b/image_prediction/estimator/service_estimator.py
@@ -8,7 +8,7 @@ from image_prediction.utils import get_logger
 logger = get_logger()
 
 
-class ServiceEstimator:
+class Estimator:
     def __init__(self, estimator_adapter: EstimatorAdapter, classes: Mapping[int, str]):
         self.__estimator_adapter = estimator_adapter
         self.__classes = classes
@@ -16,7 +16,7 @@ class ServiceEstimator:
     def predict(self, batch: np.array) -> List[str]:
 
         if batch.shape[0] == 0:
-            logger.warning("ServiceEstimator received empty batch.")
+            logger.warning("Estimator received empty batch.")
             return []
 
         return [self.__classes[numeric_label] for numeric_label in self.__estimator_adapter.predict(batch)]
diff --git a/test/unit_tests/conftest.py b/test/unit_tests/conftest.py
index 618d6e0..51df4b7 100644
--- a/test/unit_tests/conftest.py
+++ b/test/unit_tests/conftest.py
@@ -6,7 +6,7 @@ from image_prediction.estimator.adapter.adapters.keras import KerasEstimatorAdap
 from image_prediction.estimator.adapter.adapters.mock import DummyEstimator, EstimatorAdapterMock
 from image_prediction.exceptions import UnknownEstimatorAdapter
 from image_prediction.predictor.predictor import Predictor
-from image_prediction.estimator.service_estimator import ServiceEstimator
+from image_prediction.estimator.service_estimator import Estimator
 
 
 @pytest.fixture
@@ -16,7 +16,7 @@ def predictor(service_estimator):
 
 @pytest.fixture
 def service_estimator(estimator, classes):
-    service_estimator = ServiceEstimator(estimator, classes)
+    service_estimator = Estimator(estimator, classes)
     return service_estimator