diff --git a/semantik-adapter/src/main/java/de/ozgcloud/eingang/semantik/enginebased/ServiceKontoBuildHelper.java b/semantik-adapter/src/main/java/de/ozgcloud/eingang/semantik/enginebased/ServiceKontoBuildHelper.java
index ee1bdab680bbf3e85b7708af5f766bb11fbf3584..2cb43a42151681c158ec08a23e12da10f918cb29 100644
--- a/semantik-adapter/src/main/java/de/ozgcloud/eingang/semantik/enginebased/ServiceKontoBuildHelper.java
+++ b/semantik-adapter/src/main/java/de/ozgcloud/eingang/semantik/enginebased/ServiceKontoBuildHelper.java
@@ -25,11 +25,11 @@ public class ServiceKontoBuildHelper {
 	public static final String REST_RESPONSE_NAME_MEMBER_SCOPE = "memberscope";
 	public static final String REST_RESPONSE_NAME_MEMBER_SCOPE_MAILBOX_TYPE = "mailboxtype";
 
-	public ServiceKonto buildServiceKonto(String postfachId) {
+	public ServiceKonto buildOsiServiceKonto(String postfachId) {
 		return buildDefault(postfachId);
 	}
 
-	public ServiceKonto buildServiceKonto(String postfachId, FormData formData) {
+	public ServiceKonto buildOsiServiceKonto(String postfachId, FormData formData) {
 		return Optional.ofNullable(getRestResponseNames(formData))
 				.filter(names -> !names.isEmpty())
 				.map(restResponseNames -> buildWithRestResponseNames(postfachId, restResponseNames))
diff --git a/semantik-adapter/src/main/java/de/ozgcloud/eingang/semantik/enginebased/afm/AfmHeaderMapper.java b/semantik-adapter/src/main/java/de/ozgcloud/eingang/semantik/enginebased/afm/AfmHeaderMapper.java
index a0ee78f8211d9514320c81f127db0b2eb60b02a3..9653974555be411a25df47d6870f6658d3f5cfb3 100644
--- a/semantik-adapter/src/main/java/de/ozgcloud/eingang/semantik/enginebased/afm/AfmHeaderMapper.java
+++ b/semantik-adapter/src/main/java/de/ozgcloud/eingang/semantik/enginebased/afm/AfmHeaderMapper.java
@@ -74,7 +74,7 @@ class AfmHeaderMapper implements AfmEngineBasedMapper {
 				.build();
 
 		Optional.ofNullable(getNameId(formData))
-				.map(nameId -> serviceKontoBuildHelper.buildServiceKonto(nameId, formData))
+				.map(nameId -> serviceKontoBuildHelper.buildOsiServiceKonto(nameId, formData))
 				.ifPresent(formHeaderBuilder::setServiceKonto);
 
 		return formHeaderBuilder;
diff --git a/semantik-adapter/src/main/java/de/ozgcloud/eingang/semantik/enginebased/formsolutions/FormSolutionsHeaderMapper.java b/semantik-adapter/src/main/java/de/ozgcloud/eingang/semantik/enginebased/formsolutions/FormSolutionsHeaderMapper.java
index 38d6a8853605d1713cb1faf97d1a8cd01e0c87d6..0c8bc2d63bcbf51bdfba7f6963cac424c773c7e8 100644
--- a/semantik-adapter/src/main/java/de/ozgcloud/eingang/semantik/enginebased/formsolutions/FormSolutionsHeaderMapper.java
+++ b/semantik-adapter/src/main/java/de/ozgcloud/eingang/semantik/enginebased/formsolutions/FormSolutionsHeaderMapper.java
@@ -66,7 +66,7 @@ class FormSolutionsHeaderMapper implements FormSolutionsEngineBasedMapper {
 				.requestId(getRequestId(formData))
 				.formEngineName(FORM_ENGINE_NAME);
 
-		Optional.ofNullable(getPostkorbhandle(formData)).map(serviceKontoBuildHelper::buildServiceKonto).ifPresent(formHeaderBuilder::serviceKonto);
+		Optional.ofNullable(getPostkorbhandle(formData)).map(serviceKontoBuildHelper::buildOsiServiceKonto).ifPresent(formHeaderBuilder::serviceKonto);
 
 		return formHeaderBuilder.build();
 	}
diff --git a/semantik-adapter/src/main/java/de/ozgcloud/eingang/semantik/formbased/DFoerdermittelFormBasedMapper.java b/semantik-adapter/src/main/java/de/ozgcloud/eingang/semantik/formbased/DFoerdermittelFormBasedMapper.java
index 1972f9b46f1834205a01c2b0b649c7e51c2b0418..6c2292d48b4b596feef5e0abdc3d087099a94d9d 100644
--- a/semantik-adapter/src/main/java/de/ozgcloud/eingang/semantik/formbased/DFoerdermittelFormBasedMapper.java
+++ b/semantik-adapter/src/main/java/de/ozgcloud/eingang/semantik/formbased/DFoerdermittelFormBasedMapper.java
@@ -87,7 +87,7 @@ public class DFoerdermittelFormBasedMapper implements FormBasedMapper {
 	}
 
 	private ServiceKonto createServiceKonto(String postfachId) {
-		return serviceKontoHelper.buildServiceKonto(postfachId);
+		return serviceKontoHelper.buildOsiServiceKonto(postfachId);
 	}
 
 	FormData parseFachnachricht(FormData formData, IncomingFile fachnachrichtFile) {
diff --git a/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/enginebased/ServiceKontoBuildHelperTest.java b/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/enginebased/ServiceKontoBuildHelperTest.java
index e21842bd3ad9a201de98d85bf92515f4d606b2a4..3f9a6243a7856e2c4abab007c66551c766bd5b40 100644
--- a/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/enginebased/ServiceKontoBuildHelperTest.java
+++ b/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/enginebased/ServiceKontoBuildHelperTest.java
@@ -18,7 +18,6 @@ import de.ozgcloud.eingang.common.formdata.PostfachAddressTestFactory;
 import de.ozgcloud.eingang.common.formdata.ServiceKonto;
 import de.ozgcloud.eingang.common.formdata.StringBasedIdentifier;
 import de.ozgcloud.eingang.common.formdata.ServiceKonto.PostfachAddress;
-import de.ozgcloud.eingang.semantik.enginebased.ServiceKontoBuildHelper;
 import de.ozgcloud.eingang.semantik.enginebased.afm.AfmHeaderTestFactory;
 
 class ServiceKontoBuildHelperTest {
@@ -67,7 +66,7 @@ class ServiceKontoBuildHelperTest {
 		}
 
 		private ServiceKonto getServiceKonto(FormData formData) {
-			return helper.buildServiceKonto(AfmHeaderTestFactory.POSTFACH_NAME_ID, formData);
+			return helper.buildOsiServiceKonto(AfmHeaderTestFactory.POSTFACH_NAME_ID, formData);
 		}
 
 		@DisplayName("postfach addresses")
@@ -136,7 +135,7 @@ class ServiceKontoBuildHelperTest {
 			}
 
 			private ServiceKonto buildServiceKonto(FormData formData) {
-				return helper.buildServiceKonto(AfmHeaderTestFactory.POSTFACH_NAME_ID, formData);
+				return helper.buildOsiServiceKonto(AfmHeaderTestFactory.POSTFACH_NAME_ID, formData);
 			}
 		}
 	}
diff --git a/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/enginebased/afm/AfmHeaderMapperTest.java b/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/enginebased/afm/AfmHeaderMapperTest.java
index ed5eee1e2c41a092b4f5e67869fe0d208bcc7c28..9eb5bac5995dfd209f42fd4481603c3a6cbdbee4 100644
--- a/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/enginebased/afm/AfmHeaderMapperTest.java
+++ b/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/enginebased/afm/AfmHeaderMapperTest.java
@@ -37,7 +37,6 @@ import org.mockito.Spy;
 import de.ozgcloud.eingang.common.formdata.FormData;
 import de.ozgcloud.eingang.common.formdata.FormDataUtils;
 import de.ozgcloud.eingang.semantik.enginebased.ServiceKontoBuildHelper;
-import de.ozgcloud.eingang.semantik.enginebased.afm.AfmHeaderMapper;
 
 class AfmHeaderMapperTest {
 
@@ -111,14 +110,14 @@ class AfmHeaderMapperTest {
 					void shouldCallBuildServiceKontoIfPresent() {
 						parseFormData();
 
-						verify(serviceKontoBuildHelper).buildServiceKonto(any(), eq(FORM_DATA));
+						verify(serviceKontoBuildHelper).buildOsiServiceKonto(any(), eq(FORM_DATA));
 					}
 
 					@Test
 					void shouldNotCallBuildServiceKontoIfNotExists() {
 						mapper.parseFormData(FormDataUtils.from(FORM_DATA).remove(AfmHeaderMapper.POSTFACH_NAME_ID).build());
 
-						verify(serviceKontoBuildHelper, never()).buildServiceKonto(any(), any());
+						verify(serviceKontoBuildHelper, never()).buildOsiServiceKonto(any(), any());
 					}
 				}
 
diff --git a/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/enginebased/formsolutions/FormSolutionsHeaderMapperTest.java b/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/enginebased/formsolutions/FormSolutionsHeaderMapperTest.java
index ce9964d6091dbb6f5d2fe89fb481c13e6a853464..89c782671e7e568ffebc70299df1fc8431499a71 100644
--- a/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/enginebased/formsolutions/FormSolutionsHeaderMapperTest.java
+++ b/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/enginebased/formsolutions/FormSolutionsHeaderMapperTest.java
@@ -39,7 +39,6 @@ import de.ozgcloud.eingang.common.formdata.FormData;
 import de.ozgcloud.eingang.common.formdata.FormDataUtils;
 import de.ozgcloud.eingang.common.formdata.FormHeader;
 import de.ozgcloud.eingang.semantik.enginebased.ServiceKontoBuildHelper;
-import de.ozgcloud.eingang.semantik.enginebased.formsolutions.FormSolutionsHeaderMapper;
 
 class FormSolutionsHeaderMapperTest {
 
@@ -120,7 +119,7 @@ class FormSolutionsHeaderMapperTest {
 				void shouldCallServiceKontoBuildHelper() {
 					buildFormHeader();
 
-					verify(serviceKontoBuildHelper).buildServiceKonto(any());
+					verify(serviceKontoBuildHelper).buildOsiServiceKonto(any());
 				}
 
 				@Test
@@ -129,7 +128,7 @@ class FormSolutionsHeaderMapperTest {
 
 					mapper.buildFormHeader(formDataWithoutPostkorbHandle);
 
-					verify(serviceKontoBuildHelper, never()).buildServiceKonto(any());
+					verify(serviceKontoBuildHelper, never()).buildOsiServiceKonto(any());
 				}
 
 			}
diff --git a/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/formbased/DFoerdermittelFormBasedMapperTest.java b/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/formbased/DFoerdermittelFormBasedMapperTest.java
index 2b5f2ddb6438a02872383a3cefb5936165f21a08..dc9d2d172dde4c1e84debbc0bb270e3e3437e8cb 100644
--- a/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/formbased/DFoerdermittelFormBasedMapperTest.java
+++ b/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/formbased/DFoerdermittelFormBasedMapperTest.java
@@ -166,7 +166,7 @@ class DFoerdermittelFormBasedMapperTest {
 
 		@BeforeEach
 		void init() {
-			when(serviceKontoHelper.buildServiceKonto(any())).thenReturn(ServiceKontoTestFactory.create());
+			when(serviceKontoHelper.buildOsiServiceKonto(any())).thenReturn(ServiceKontoTestFactory.create());
 		}
 
 		@Test
@@ -183,7 +183,7 @@ class DFoerdermittelFormBasedMapperTest {
 		void shouldRemovePrefix() {
 			mapper.addServiceKonto(DFoerdermittelFormDataTestFactory.create(), DFoerdermittelFormDataTestFactory.createFachnachrichtMap());
 
-			verify(serviceKontoHelper).buildServiceKonto(DFoerdermittelFormDataTestFactory.POSTFACH_ID);
+			verify(serviceKontoHelper).buildOsiServiceKonto(DFoerdermittelFormDataTestFactory.POSTFACH_ID);
 		}
 	}