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..1ec87a0e456865b00b7edbddf0834dad0f8e9948 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
@@ -18,18 +18,19 @@ import de.ozgcloud.eingang.common.formdata.ServiceKonto.PostfachAddress;
 public class ServiceKontoBuildHelper {
 
 	public static final int POSTFACH_ADDRESS_DEFAULT = 1;
-	public static final String POSTFACH_TYPE = "OSI";
+	public static final String POSTFACH_TYPE_OSI = "OSI";
+	public static final String POSTFACH_TYPE_BAYERN_ID = "BayernID";
 	public static final String POSTFACH_VERSION = "1.0";
 
 	public static final String REST_RESPONSE_NAME = "rest_response_name";
 	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))
@@ -37,7 +38,7 @@ public class ServiceKontoBuildHelper {
 	}
 
 	ServiceKonto buildDefault(String postfachId) {
-		return ServiceKonto.builder().type(POSTFACH_TYPE).postfachAddress(buildPostfachAddress(postfachId)).build();
+		return ServiceKonto.builder().type(POSTFACH_TYPE_OSI).postfachAddress(buildPostfachAddress(postfachId)).build();
 	}
 
 	@SuppressWarnings("unchecked")
@@ -50,31 +51,27 @@ public class ServiceKontoBuildHelper {
 
 	ServiceKonto buildWithRestResponseNames(String postfachId, List<Map<String, Object>> restResponseNames) {
 		return ServiceKonto.builder()
-				.type(POSTFACH_TYPE)
+				.type(POSTFACH_TYPE_OSI)
 				.postfachAddresses(buildPostfachAddresses(buildIdentifier(postfachId), restResponseNames))
 				.build();
 	}
 
-	private PostfachAddressIdentifier buildIdentifier(String postfachId) {
-		return StringBasedIdentifier.builder().postfachId(postfachId).build();
-	}
-
 	List<PostfachAddress> buildPostfachAddresses(PostfachAddressIdentifier identifier, List<Map<String, Object>> restResponseNames) {
 		return restResponseNames.stream().map(entry -> buildOsiPostfachV1Address(identifier, entry)).toList();
 	}
 
-	private PostfachAddress buildPostfachAddress(String postkorbHandle) {
+	PostfachAddress buildOsiPostfachV1Address(PostfachAddressIdentifier identifier, Map<String, Object> restResponseName) {
+		return buildOsiPostfachV1Address(identifier, getPostfachAddressType(restResponseName));
+	}
+
+	PostfachAddress buildOsiPostfachV1Address(PostfachAddressIdentifier identifier, int postfachAddressType) {
 		return PostfachAddress.builder()
-				.type(POSTFACH_ADDRESS_DEFAULT)
+				.type(postfachAddressType)
 				.version(POSTFACH_VERSION)
-				.identifier(buildIdentifier(postkorbHandle))
+				.identifier(identifier)
 				.build();
 	}
 
-	PostfachAddress buildOsiPostfachV1Address(PostfachAddressIdentifier identifier, Map<String, Object> restResponseName) {
-		return buildOsiPostfachV1Address(identifier, getPostfachAddressType(restResponseName));
-	}
-
 	int getPostfachAddressType(Map<String, Object> restResponseName) {
 		return getMailboxType(restResponseName);
 	}
@@ -88,11 +85,20 @@ public class ServiceKontoBuildHelper {
 		return ((List<Map<String, Object>>) restResponseName.get(REST_RESPONSE_NAME_MEMBER_SCOPE)).get(0);
 	}
 
-	PostfachAddress buildOsiPostfachV1Address(PostfachAddressIdentifier identifier, int postfachAddressType) {
+	public ServiceKonto buildBayernIdServiceKonto(String postfachId) {
+		return ServiceKonto.builder().type(POSTFACH_TYPE_BAYERN_ID).postfachAddress(buildPostfachAddress(postfachId)).build();
+	}
+
+	PostfachAddress buildPostfachAddress(String postkorbHandle) {
 		return PostfachAddress.builder()
-				.type(postfachAddressType)
+				.type(POSTFACH_ADDRESS_DEFAULT)
 				.version(POSTFACH_VERSION)
-				.identifier(identifier)
+				.identifier(buildIdentifier(postkorbHandle))
 				.build();
 	}
+
+	private PostfachAddressIdentifier buildIdentifier(String postfachId) {
+		return StringBasedIdentifier.builder().postfachId(postfachId).build();
+	}
+
 }
\ No newline at end of file
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..65e83929afd92af06611f0e987c3e8805de9805b 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
@@ -34,6 +34,7 @@ import org.springframework.stereotype.Component;
 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.common.formdata.ServiceKonto;
 import de.ozgcloud.eingang.semantik.enginebased.ServiceKontoBuildHelper;
 
 @Component
@@ -73,24 +74,36 @@ class AfmHeaderMapper implements AfmEngineBasedMapper {
 				.formEngineName(AFM_FORMENGINE_NAME)
 				.build();
 
-		Optional.ofNullable(getNameId(formData))
-				.map(nameId -> serviceKontoBuildHelper.buildServiceKonto(nameId, formData))
-				.ifPresent(formHeaderBuilder::setServiceKonto);
+		createBayernIdServiceKonto(formData).or(() -> createOsiServiceKonto(formData)).ifPresent(formHeaderBuilder::setServiceKonto);
 
 		return formHeaderBuilder;
 	}
 
+	private ZonedDateTime getCreatedAt(Map<String, Object> headerDataMap) {
+		return ZonedDateTime.parse((String) headerDataMap.get(TIMESTAMP), DateTimeFormatter.ISO_OFFSET_DATE_TIME);
+	}
+
+	Optional<ServiceKonto> createBayernIdServiceKonto(FormData formData) {
+		var postfachId1 = getPostfachId(formData);
+		return postfachId1.map(postfachId -> serviceKontoBuildHelper.buildBayernIdServiceKonto(postfachId));
+	}
+
+	Optional<String> getPostfachId(FormData formData) {
+		return Optional.ofNullable(getHeaderMap(formData)).map(headers -> headers.get(AfmAntragstellerHeaderMapper.KEY_POSTFACH_ID))
+				.map(String.class::cast);
+	}
+
 	@SuppressWarnings("unchecked")
-	private Map<String, Object> getHeaderMap(FormData formData) {
+	Map<String, Object> getHeaderMap(FormData formData) {
 		return (Map<String, Object>) formData.getFormData().get(HEADER_FIELD);
 	}
 
-	private ZonedDateTime getCreatedAt(Map<String, Object> headerDataMap) {
-		return ZonedDateTime.parse((String) headerDataMap.get(TIMESTAMP), DateTimeFormatter.ISO_OFFSET_DATE_TIME);
+	Optional<ServiceKonto> createOsiServiceKonto(FormData formData) {
+		return getNameId(formData).map(nameId -> serviceKontoBuildHelper.buildOsiServiceKonto(nameId, formData));
 	}
 
-	private String getNameId(FormData formData) {
-		return (String) formData.getFormData().get(POSTFACH_NAME_ID);
+	private Optional<String> getNameId(FormData formData) {
+		return Optional.of(formData.getFormData()).map(formDataMap -> formDataMap.get(POSTFACH_NAME_ID)).map(String.class::cast);
 	}
 
 	private FormData removeMappedData(FormData formData) {
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..8d49520d80e2d2ef27042b0dc2399202e44466c9 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
@@ -10,6 +10,7 @@ import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
+import org.mockito.InjectMocks;
 import org.mockito.Spy;
 
 import de.ozgcloud.eingang.common.formdata.FormData;
@@ -18,17 +19,17 @@ 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 {
 
 	@Spy
-	private ServiceKontoBuildHelper helper = new ServiceKontoBuildHelper();
+	@InjectMocks
+	private ServiceKontoBuildHelper helper;
 
-	@DisplayName("service konto")
+	@DisplayName("OSI service konto")
 	@Nested
-	class TestServiceKonto {
+	class TestOsiServiceKonto {
 
 		private static final FormData FORM_DATA = FormData.builder().formData(AfmHeaderTestFactory.createFormDataMap()).build();
 
@@ -47,7 +48,7 @@ class ServiceKontoBuildHelperTest {
 			void shouldContainsType() {
 				var serviceKonto = getServiceKonto(FORM_DATA);
 
-				assertThat(serviceKonto.getType()).isEqualTo(ServiceKontoBuildHelper.POSTFACH_TYPE);
+				assertThat(serviceKonto.getType()).isEqualTo(ServiceKontoBuildHelper.POSTFACH_TYPE_OSI);
 			}
 
 			@Test
@@ -67,7 +68,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,8 +137,35 @@ class ServiceKontoBuildHelperTest {
 			}
 
 			private ServiceKonto buildServiceKonto(FormData formData) {
-				return helper.buildServiceKonto(AfmHeaderTestFactory.POSTFACH_NAME_ID, formData);
+				return helper.buildOsiServiceKonto(AfmHeaderTestFactory.POSTFACH_NAME_ID, formData);
 			}
 		}
 	}
+
+	@Nested
+	class TestBayernIdServiceKonto {
+
+		private static final String POSTFACH_ID = "postfach-id";
+		private static final PostfachAddress POSTFACH_ADDRESS = PostfachAddressTestFactory.create();
+
+		@Test
+		void shouldSetType() {
+			var serviceKonto = buildBayernIdServiceKonto();
+
+			assertThat(serviceKonto.getType()).isEqualTo(ServiceKontoBuildHelper.POSTFACH_TYPE_BAYERN_ID);
+		}
+
+		@Test
+		void shouldSetPostfachAddress() {
+			doReturn(POSTFACH_ADDRESS).when(helper).buildPostfachAddress(any());
+
+			var serviceKonto = buildBayernIdServiceKonto();
+
+			assertThat(serviceKonto.getPostfachAddresses()).containsOnly(POSTFACH_ADDRESS);
+		}
+
+		ServiceKonto buildBayernIdServiceKonto() {
+			return helper.buildBayernIdServiceKonto(POSTFACH_ID);
+		}
+	}
 }
\ No newline at end of file
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..fd483d22da19b2da3f52bfec46715afdcde8a652 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
@@ -27,6 +27,9 @@ import static org.assertj.core.api.Assertions.*;
 import static org.mockito.ArgumentMatchers.*;
 import static org.mockito.Mockito.*;
 
+import java.util.Map;
+import java.util.Optional;
+
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
@@ -36,14 +39,14 @@ import org.mockito.Spy;
 
 import de.ozgcloud.eingang.common.formdata.FormData;
 import de.ozgcloud.eingang.common.formdata.FormDataUtils;
+import de.ozgcloud.eingang.common.formdata.ServiceKonto;
 import de.ozgcloud.eingang.semantik.enginebased.ServiceKontoBuildHelper;
-import de.ozgcloud.eingang.semantik.enginebased.afm.AfmHeaderMapper;
 
 class AfmHeaderMapperTest {
 
 	@Spy
 	@InjectMocks
-	private final AfmHeaderMapper mapper = new AfmHeaderMapper();
+	private AfmHeaderMapper mapper;
 	@Mock
 	private ServiceKontoBuildHelper serviceKontoBuildHelper;
 
@@ -107,18 +110,60 @@ class AfmHeaderMapperTest {
 				@Nested
 				class TestServiceKonto {
 
-					@Test
-					void shouldCallBuildServiceKontoIfPresent() {
-						parseFormData();
+					@DisplayName("OSI")
+					@Nested
+					class TestOsiServiceKonto {
+						@Test
+						void shouldCallBuildServiceKontoIfPresent() {
+							parseFormData();
+
+							verify(serviceKontoBuildHelper).buildOsiServiceKonto(any(), eq(FORM_DATA));
+						}
+
+						@Test
+						void shouldNotCallBuildServiceKontoIfNotExists() {
+							mapper.parseFormData(FormDataUtils.from(FORM_DATA).remove(AfmHeaderMapper.POSTFACH_NAME_ID).build());
 
-						verify(serviceKontoBuildHelper).buildServiceKonto(any(), eq(FORM_DATA));
+							verify(serviceKontoBuildHelper, never()).buildOsiServiceKonto(any(), any());
+						}
 					}
 
-					@Test
-					void shouldNotCallBuildServiceKontoIfNotExists() {
-						mapper.parseFormData(FormDataUtils.from(FORM_DATA).remove(AfmHeaderMapper.POSTFACH_NAME_ID).build());
+					@DisplayName("BayernID")
+					@Nested
+					class TestBayernId {
+
+						@Mock
+						private FormData formData;
+						@Mock
+						private ServiceKonto serviceKonto;
+
+						@Test
+						void shouldCallCreateBayernIdServiceKonto() {
+							var formData = FormData.builder().formData(AfmHeaderTestFactory.createFormDataMapWithExtendedHeaders()).build();
+
+							mapper.parseFormData(formData);
+
+							verify(mapper).createBayernIdServiceKonto(formData);
+						}
+
+						@Test
+						void shouldReturnServiceKonto() {
+							doReturn(Optional.of("id")).when(mapper).getPostfachId(any());
+							when(serviceKontoBuildHelper.buildBayernIdServiceKonto(any())).thenReturn(serviceKonto);
+
+							var parsedFormData = mapper.createBayernIdServiceKonto(formData);
+
+							assertThat(parsedFormData).isPresent().get().isEqualTo(serviceKonto);
+						}
+
+						@Test
+						void shouldNotCallServiceKontoBuildHelper() {
+							doReturn(Optional.empty()).when(mapper).getPostfachId(any());
+
+							mapper.createBayernIdServiceKonto(formData);
 
-						verify(serviceKontoBuildHelper, never()).buildServiceKonto(any(), any());
+							verify(serviceKontoBuildHelper, never()).buildBayernIdServiceKonto(any());
+						}
 					}
 				}
 
@@ -153,4 +198,29 @@ class AfmHeaderMapperTest {
 			}
 		}
 	}
+
+	@Nested
+	class TestGetPostfachId {
+
+		@Mock
+		private FormData formData;
+
+		@Test
+		void shouldReturnPostfachId() {
+			doReturn(Map.of(AfmAntragstellerHeaderMapper.KEY_POSTFACH_ID, AfmAntragstellerTestFactory.POSTFACH_ID)).when(mapper).getHeaderMap(any());
+
+			var postfachId = mapper.getPostfachId(formData);
+
+			assertThat(postfachId).isPresent().get().isEqualTo(AfmAntragstellerTestFactory.POSTFACH_ID);
+		}
+
+		@Test
+		void shouldReturnEmpty() {
+			doReturn(null).when(mapper).getHeaderMap(any());
+
+			var postfachId = mapper.getPostfachId(formData);
+
+			assertThat(postfachId).isEmpty();
+		}
+	}
 }
\ No newline at end of file
diff --git a/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/enginebased/afm/AfmHeaderTestFactory.java b/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/enginebased/afm/AfmHeaderTestFactory.java
index 28e807688770910087b28d5ec2a228c4f90789dd..4cdd6b5f7ed887dbd9841e0d844b5389b25bb366 100644
--- a/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/enginebased/afm/AfmHeaderTestFactory.java
+++ b/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/enginebased/afm/AfmHeaderTestFactory.java
@@ -62,6 +62,13 @@ public class AfmHeaderTestFactory {
 		return map;
 	}
 
+	@SuppressWarnings("unchecked")
+	public static Map<String, Object> createFormDataMapWithExtendedHeaders() {
+		var map = new HashMap<>(createFormDataMap());
+		((Map<String, Object>) map.get(AfmHeaderMapper.HEADER_FIELD)).putAll(createCustomHeaderMap());
+		return map;
+	}
+
 	public static Map<String, Object> createHeaderMap() {
 		var map = new HashMap<String, Object>();
 		map.put(AfmHeaderMapper.ID, ID);
@@ -69,7 +76,6 @@ public class AfmHeaderTestFactory {
 		map.put(AfmHeaderMapper.FORM_ID, FORM_ID);
 		map.put(AfmHeaderMapper.FORM, FORM);
 		map.put(AfmHeaderMapper.SENDER, SENDER);
-		map.putAll(createCustomHeaderMap());
 		return map;
 	}
 
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);
 		}
 	}