diff --git a/core/api_server.py b/core/api_server.py
index 78b42ff..3cbc783 100644
--- a/core/api_server.py
+++ b/core/api_server.py
@@ -4,7 +4,7 @@ import uvicorn
 from fastapi import FastAPI, Query, HTTPException, Request
 from fastapi.responses import PlainTextResponse
 
-from core.certificate_manager import CertificateManager
+from core.certificate_manager_interface import ICertificateManager
 from core.trace_id_handler import TraceIdHandler
 from shared.api_models import (
     CertificateDTO,
@@ -32,7 +32,7 @@ _default_response = {
 class APIServer:
     def __init__(
         self,
-        cert_manager: CertificateManager,
+        cert_manager: ICertificateManager,
         logger: Logger,
         version: str,
         port: int,
diff --git a/core/test_certificate_manager.py b/core/certificate_manager_mock.py
similarity index 98%
rename from core/test_certificate_manager.py
rename to core/certificate_manager_mock.py
index c9139f6..f9104d7 100644
--- a/core/test_certificate_manager.py
+++ b/core/certificate_manager_mock.py
@@ -11,7 +11,7 @@ from core.certificate_manager_interface import (
 from shared.models import KeyType
 
 
-class TestCertificateManager(ICertificateManager):
+class CertificateManagerMock(ICertificateManager):
     SEED = 42  # Constant seed for random generation
 
     def __init__(self):
diff --git a/core/main.py b/core/main.py
index 8b93831..11f8a07 100644
--- a/core/main.py
+++ b/core/main.py
@@ -1,5 +1,5 @@
 from core.api_server import APIServer
-from core.certificate_manager import CertificateManager
+from core.certificate_manager_mock import CertificateManagerMock
 from core.trace_id_handler import TraceIdHandler
 from shared.db_logger import DBLogger
 from shared.logger import Logger, TraceIdProvider
@@ -7,7 +7,7 @@ from shared.logger import Logger, TraceIdProvider
 logger = Logger(
     TraceIdProvider(lambda: TraceIdHandler.get_current_trace_id()), DBLogger
 )
-certificate_manager = CertificateManager(logger)
+certificate_manager = CertificateManagerMock()
 api_server = APIServer(certificate_manager, logger, "0.0.1", 5000)
 app = api_server.App