diff --git a/api-project-v1/src/main/java/org/opendevstack/apiservice/projectv1/facade/impl/ProjectsFacadeImpl.java b/api-project-v1/src/main/java/org/opendevstack/apiservice/projectv1/facade/impl/ProjectsFacadeImpl.java
index c0be36f..3b941ea 100644
--- a/api-project-v1/src/main/java/org/opendevstack/apiservice/projectv1/facade/impl/ProjectsFacadeImpl.java
+++ b/api-project-v1/src/main/java/org/opendevstack/apiservice/projectv1/facade/impl/ProjectsFacadeImpl.java
@@ -8,7 +8,7 @@
 import org.opendevstack.apiservice.projectv1.exception.PageNotFoundException;
 import org.opendevstack.apiservice.projectv1.facade.ProjectsFacade;
 import org.opendevstack.apiservice.projectv1.client.model.GetProjectsResponse;
-import org.opendevstack.apiservice.projectv1.mapper.ProjectMapper;
+import org.opendevstack.apiservice.projectv1.mapper.ProjectMapperV1;
 import org.opendevstack.apiservice.serviceproject.model.ProjectSummary;
 import org.opendevstack.apiservice.serviceproject.service.ProjectService;
 import org.springframework.data.domain.Page;
@@ -26,7 +26,7 @@ public class ProjectsFacadeImpl implements ProjectsFacade {
 
     private final ProjectService projectService;
 
-    private final ProjectMapper projectMapper;
+    private final ProjectMapperV1 projectMapper;
 
     @Override
     public GetProjectsResponse getProjects(Integer page, Integer size) {
diff --git a/api-project-v1/src/main/java/org/opendevstack/apiservice/projectv1/mapper/ProjectMapper.java b/api-project-v1/src/main/java/org/opendevstack/apiservice/projectv1/mapper/ProjectMapperV1.java
similarity index 92%
rename from api-project-v1/src/main/java/org/opendevstack/apiservice/projectv1/mapper/ProjectMapper.java
rename to api-project-v1/src/main/java/org/opendevstack/apiservice/projectv1/mapper/ProjectMapperV1.java
index c868e1c..903d543 100644
--- a/api-project-v1/src/main/java/org/opendevstack/apiservice/projectv1/mapper/ProjectMapper.java
+++ b/api-project-v1/src/main/java/org/opendevstack/apiservice/projectv1/mapper/ProjectMapperV1.java
@@ -6,15 +6,13 @@
 import org.opendevstack.apiservice.projectv1.client.model.ProjectsResponse;
 import org.opendevstack.apiservice.serviceproject.model.ProjectSummary;
 import org.opendevstack.apiservice.serviceproject.model.Status;
-import org.springframework.stereotype.Component;
 
 import java.time.OffsetDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.List;
 
 @Mapper(componentModel = "spring")
-@Component("projectMapperV1")
-public interface ProjectMapper {
+public interface ProjectMapperV1 {
 
     DateTimeFormatter FORMATTER = DateTimeFormatter.ISO_OFFSET_DATE_TIME;
 
diff --git a/api-project-v1/src/test/java/org/opendevstack/apiservice/projectv1/facade/impl/ProjectsFacadeImplTest.java b/api-project-v1/src/test/java/org/opendevstack/apiservice/projectv1/facade/impl/ProjectsFacadeImplTest.java
index 561d19e..bcc6b01 100644
--- a/api-project-v1/src/test/java/org/opendevstack/apiservice/projectv1/facade/impl/ProjectsFacadeImplTest.java
+++ b/api-project-v1/src/test/java/org/opendevstack/apiservice/projectv1/facade/impl/ProjectsFacadeImplTest.java
@@ -7,7 +7,7 @@
 import org.opendevstack.apiservice.projectv1.client.model.GetProjectsResponse;
 import org.opendevstack.apiservice.projectv1.client.model.ProjectsResponse;
 import org.opendevstack.apiservice.projectv1.exception.PageNotFoundException;
-import org.opendevstack.apiservice.projectv1.mapper.ProjectMapper;
+import org.opendevstack.apiservice.projectv1.mapper.ProjectMapperV1;
 import org.opendevstack.apiservice.serviceproject.model.ProjectSummary;
 import org.opendevstack.apiservice.serviceproject.model.Status;
 import org.opendevstack.apiservice.serviceproject.service.ProjectService;
@@ -29,7 +29,7 @@ class ProjectsFacadeImplTest {
     private ProjectService projectService;
 
     @Mock
-    private ProjectMapper projectMapper;
+    private ProjectMapperV1 projectMapper;
 
     private ProjectsFacadeImpl sut;
 
diff --git a/api-project-v1/src/test/java/org/opendevstack/apiservice/projectv1/mapper/ProjectMapperTest.java b/api-project-v1/src/test/java/org/opendevstack/apiservice/projectv1/mapper/ProjectMapperV1Test.java
similarity index 96%
rename from api-project-v1/src/test/java/org/opendevstack/apiservice/projectv1/mapper/ProjectMapperTest.java
rename to api-project-v1/src/test/java/org/opendevstack/apiservice/projectv1/mapper/ProjectMapperV1Test.java
index 00d23aa..30868dd 100644
--- a/api-project-v1/src/test/java/org/opendevstack/apiservice/projectv1/mapper/ProjectMapperTest.java
+++ b/api-project-v1/src/test/java/org/opendevstack/apiservice/projectv1/mapper/ProjectMapperV1Test.java
@@ -13,13 +13,13 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-class ProjectMapperTest {
+class ProjectMapperV1Test {
 
-    private ProjectMapper projectMapper;
+    private ProjectMapperV1 projectMapper;
 
     @BeforeEach
     void setUp() {
-        projectMapper = Mappers.getMapper(ProjectMapper.class);
+        projectMapper = Mappers.getMapper(ProjectMapperV1.class);
     }
 
     @Test