diff --git a/image_prediction/estimator/service_estimator.py b/image_prediction/estimator/estimator.py
similarity index 100%
rename from image_prediction/estimator/service_estimator.py
rename to image_prediction/estimator/estimator.py
diff --git a/test/unit_tests/conftest.py b/test/unit_tests/conftest.py
index 51df4b7..d3d247a 100644
--- a/test/unit_tests/conftest.py
+++ b/test/unit_tests/conftest.py
@@ -4,9 +4,9 @@ from PIL import Image
 
 from image_prediction.estimator.adapter.adapters.keras import KerasEstimatorAdapter
 from image_prediction.estimator.adapter.adapters.mock import DummyEstimator, EstimatorAdapterMock
+from image_prediction.estimator.estimator import Estimator
 from image_prediction.exceptions import UnknownEstimatorAdapter
 from image_prediction.predictor.predictor import Predictor
-from image_prediction.estimator.service_estimator import Estimator
 
 
 @pytest.fixture