diff --git a/common/src/main/java/de/ozgcloud/eingang/common/formdata/FormData.java b/common/src/main/java/de/ozgcloud/eingang/common/formdata/FormData.java
index 4c643d4598f5c84123e34db1e2315bb44c0ba26b..3296ccb5e34cf25e47720371c9b32fa7881aeeab 100644
--- a/common/src/main/java/de/ozgcloud/eingang/common/formdata/FormData.java
+++ b/common/src/main/java/de/ozgcloud/eingang/common/formdata/FormData.java
@@ -48,8 +48,8 @@ public class FormData {
 	@Builder.Default
 	private FormHeader header = FormHeader.builder().build();
 
-	@Singular("zustaendigeStelle")
-	private List<ZustaendigeStelle> zustaendigeStelleList;
+	@Singular
+	private List<ZustaendigeStelle> zustaendigeStelles;
 	@ToString.Exclude
 	private Antragsteller antragsteller;
 	@ToString.Exclude
diff --git a/common/src/test/java/de/ozgcloud/eingang/common/formdata/FormDataTestFactory.java b/common/src/test/java/de/ozgcloud/eingang/common/formdata/FormDataTestFactory.java
index daf5493430b7c512498a05eb714bcaf79279bfd2..513571b9550f170ec51d69917462dd032ef53be1 100644
--- a/common/src/test/java/de/ozgcloud/eingang/common/formdata/FormDataTestFactory.java
+++ b/common/src/test/java/de/ozgcloud/eingang/common/formdata/FormDataTestFactory.java
@@ -61,7 +61,7 @@ public class FormDataTestFactory {
 		return FormData.builder()
 				.header(FormHeaderTestFactory.create())
 				.antragsteller(AntragstellerTestFactory.create())
-				.zustaendigeStelleList(List.of(
+				.zustaendigeStelles(List.of(
 						ZustaendigeStelleTestFactory.create(),
 						ZustaendigeStelleTestFactory.createBuilder()
 								.organisationseinheitenId(ORGANISATIONSEINHEIT_ID_2)
diff --git a/enterprise-adapter/src/test/java/de/ozgcloud/eingang/enterprise/entry/EnterpriseEntryITCase.java b/enterprise-adapter/src/test/java/de/ozgcloud/eingang/enterprise/entry/EnterpriseEntryITCase.java
index ce919448ce11201a42422bc048fbc706ed4abc62..7d90ccc779b105a4667b1ad1f568fa83d98d2baa 100644
--- a/enterprise-adapter/src/test/java/de/ozgcloud/eingang/enterprise/entry/EnterpriseEntryITCase.java
+++ b/enterprise-adapter/src/test/java/de/ozgcloud/eingang/enterprise/entry/EnterpriseEntryITCase.java
@@ -103,7 +103,7 @@ class EnterpriseEntryITCase {
 		void shouldHaveOrganisationseinheitId() {
 			var formData = doPostRequest();
 
-			assertThat(formData.getZustaendigeStelleList().getFirst().getOrganisationseinheitenId()).isEqualTo(
+			assertThat(formData.getZustaendigeStelles().getFirst().getOrganisationseinheitenId()).isEqualTo(
 					ControlDataTestFactory.ZUSTAENDIGE_STELLE);
 		}
 
diff --git a/formcycle-adapter/formcycle-adapter-impl/src/test/java/de/ozgcloud/eingang/formcycle/FormCycleFormDataMapperTest.java b/formcycle-adapter/formcycle-adapter-impl/src/test/java/de/ozgcloud/eingang/formcycle/FormCycleFormDataMapperTest.java
index d99cf7928acb24f024835061db36d3c207bd3ddc..cd8053fc026f9d93171e85bb047897d35a254c71 100644
--- a/formcycle-adapter/formcycle-adapter-impl/src/test/java/de/ozgcloud/eingang/formcycle/FormCycleFormDataMapperTest.java
+++ b/formcycle-adapter/formcycle-adapter-impl/src/test/java/de/ozgcloud/eingang/formcycle/FormCycleFormDataMapperTest.java
@@ -59,7 +59,7 @@ class FormCycleFormDataMapperTest {
 		void shouldMapZustaendigeStelle() {
 			var mapped = mapper.toFormData(FormCycleFormDataTestFactory.create());
 
-			assertThat(mapped.getZustaendigeStelleList().getFirst().getOrganisationseinheitenId()).isEqualTo(FormCycleFormHeaderTestFactory.ORGANISATIONSEINHEIT_ID);
+			assertThat(mapped.getZustaendigeStelles().getFirst().getOrganisationseinheitenId()).isEqualTo(FormCycleFormHeaderTestFactory.ORGANISATIONSEINHEIT_ID);
 		}
 	}
 
diff --git a/router/src/main/java/de/ozgcloud/eingang/router/GrpcEingangMapper.java b/router/src/main/java/de/ozgcloud/eingang/router/GrpcEingangMapper.java
index 75ca6f4cac18269fafcd8724af564d8dd7500b12..4442e2c046bc4e359a613c38251beeb6702facff 100644
--- a/router/src/main/java/de/ozgcloud/eingang/router/GrpcEingangMapper.java
+++ b/router/src/main/java/de/ozgcloud/eingang/router/GrpcEingangMapper.java
@@ -58,7 +58,7 @@ public interface GrpcEingangMapper {
 	GrpcEingang toEingang(FormData formData, Optional<String> organisationsEinheitenId);
 
 	default ZustaendigeStelle getZustaendigeStelle(FormData formData, Optional<String> organisationsEinheitenId) {
-		return organisationsEinheitenId.flatMap(oeId -> formData.getZustaendigeStelleList().stream()
+		return organisationsEinheitenId.flatMap(oeId -> formData.getZustaendigeStelles().stream()
 						.filter(zustaendigeStelle -> zustaendigeStelle.getOrganisationseinheitenId().equals(oeId))
 						.findFirst())
 				.orElse(ZustaendigeStelle.builder().build());
diff --git a/router/src/main/java/de/ozgcloud/eingang/router/VorgangService.java b/router/src/main/java/de/ozgcloud/eingang/router/VorgangService.java
index aa4fa022f64b696c8b85068ec5d18c84563c8b2d..dc606f2cf8b4ab2f338d16fc8d02143e6f7c34f4 100644
--- a/router/src/main/java/de/ozgcloud/eingang/router/VorgangService.java
+++ b/router/src/main/java/de/ozgcloud/eingang/router/VorgangService.java
@@ -59,7 +59,7 @@ public class VorgangService {
 	}
 
 	List<String> getOrganisationsEinheitIds(FormData formData) {
-		return formData.getZustaendigeStelleList().stream()
+		return formData.getZustaendigeStelles().stream()
 				.map(ZustaendigeStelle::getOrganisationseinheitenId)
 				.toList();
 	}
diff --git a/semantik-adapter/src/main/java/de/ozgcloud/eingang/semantik/enginebased/afm/AfmZustaendigeStelleMapper.java b/semantik-adapter/src/main/java/de/ozgcloud/eingang/semantik/enginebased/afm/AfmZustaendigeStelleMapper.java
index 554c01b5325bdfb5bc60237287a866c09b54faef..46c379d15fc6ffbe3b68841a47a8443721a6a8d1 100644
--- a/semantik-adapter/src/main/java/de/ozgcloud/eingang/semantik/enginebased/afm/AfmZustaendigeStelleMapper.java
+++ b/semantik-adapter/src/main/java/de/ozgcloud/eingang/semantik/enginebased/afm/AfmZustaendigeStelleMapper.java
@@ -74,7 +74,7 @@ class AfmZustaendigeStelleMapper implements AfmEngineBasedMapper {
 
 		return formData.toBuilder()
 				.formData(addMetaDataFlag(formData))
-				.clearZustaendigeStelleList()
+				.clearZustaendigeStelles()
 				.zustaendigeStelle(zustaendigeStelle).build();
 	}
 
diff --git a/semantik-adapter/src/main/java/de/ozgcloud/eingang/semantik/enginebased/afm/ZustaendigeStelleMetadataMapper.java b/semantik-adapter/src/main/java/de/ozgcloud/eingang/semantik/enginebased/afm/ZustaendigeStelleMetadataMapper.java
index 60475b0c19ee0b69ca93d0fa26e7ed4c7d2d070c..a140e306f7c2f10030a9ba12cb2132d86201bb87 100644
--- a/semantik-adapter/src/main/java/de/ozgcloud/eingang/semantik/enginebased/afm/ZustaendigeStelleMetadataMapper.java
+++ b/semantik-adapter/src/main/java/de/ozgcloud/eingang/semantik/enginebased/afm/ZustaendigeStelleMetadataMapper.java
@@ -46,7 +46,7 @@ public class ZustaendigeStelleMetadataMapper {
 				.map(this::readZustaendigeStelleMetadata)
 				.map(this::mapZustaendigeStelle)
 				.map(zustaendigeStelle -> formData.toBuilder()
-						.clearZustaendigeStelleList()
+						.clearZustaendigeStelles()
 						.zustaendigeStelle(zustaendigeStelle).build())
 				.orElse(formData);
 	}
diff --git a/semantik-adapter/src/main/java/de/ozgcloud/eingang/semantik/enginebased/dfoerdermittel/DFoerdermittelEngineBasedSemantikAdapter.java b/semantik-adapter/src/main/java/de/ozgcloud/eingang/semantik/enginebased/dfoerdermittel/DFoerdermittelEngineBasedSemantikAdapter.java
index e23c2c7972109d85e9d8e86db33bc32aa18c27da..8d9f07cf157a20eae9795b7a09bccb6ab5ccb868 100644
--- a/semantik-adapter/src/main/java/de/ozgcloud/eingang/semantik/enginebased/dfoerdermittel/DFoerdermittelEngineBasedSemantikAdapter.java
+++ b/semantik-adapter/src/main/java/de/ozgcloud/eingang/semantik/enginebased/dfoerdermittel/DFoerdermittelEngineBasedSemantikAdapter.java
@@ -101,9 +101,9 @@ public class DFoerdermittelEngineBasedSemantikAdapter implements EngineBasedSema
 
 	FormData addOrganisationsEinheitId(FormData formData) {
 		return Optional.ofNullable((String) getFachnachricht(formData).get(KEY_ORGANISATIONS_EINHEIT_ID))
-				.map(orgaId -> addOrganisationsEinheitId(orgaId, formData.getZustaendigeStelleList()))
+				.map(orgaId -> addOrganisationsEinheitId(orgaId, formData.getZustaendigeStelles()))
 				.map(zustStelle -> formData.toBuilder()
-						.clearZustaendigeStelleList()
+						.clearZustaendigeStelles()
 						.zustaendigeStelle(zustStelle)
 						.build())
 				.orElse(formData);
diff --git a/semantik-adapter/src/main/java/de/ozgcloud/eingang/semantik/enginebased/formsolutions/FormSolutionsZustaendigeStelleMapper.java b/semantik-adapter/src/main/java/de/ozgcloud/eingang/semantik/enginebased/formsolutions/FormSolutionsZustaendigeStelleMapper.java
index d446fd839e67852dc5e2dd45a2f60e017baeb8d7..aa1f66b8deaf00d48a63efcbe284de82a88163fe 100644
--- a/semantik-adapter/src/main/java/de/ozgcloud/eingang/semantik/enginebased/formsolutions/FormSolutionsZustaendigeStelleMapper.java
+++ b/semantik-adapter/src/main/java/de/ozgcloud/eingang/semantik/enginebased/formsolutions/FormSolutionsZustaendigeStelleMapper.java
@@ -40,7 +40,7 @@ class FormSolutionsZustaendigeStelleMapper implements FormSolutionsEngineBasedMa
 	@Override
 	public FormData parseFormData(FormData formData) {
 		return formData.toBuilder()
-				.clearZustaendigeStelleList()
+				.clearZustaendigeStelles()
 				.zustaendigeStelle(buildZustaendigeStelle(formData))
 				.formData(removeProcessedData(formData))
 				.build();
diff --git a/semantik-adapter/src/main/java/de/ozgcloud/eingang/semantik/formbased/mantelantrag/MantelantragZustaendigeStelleMapper.java b/semantik-adapter/src/main/java/de/ozgcloud/eingang/semantik/formbased/mantelantrag/MantelantragZustaendigeStelleMapper.java
index a66d38c0416374c5aca661f87876c194b0d065cd..fb071fdce3c6b202f5723bbbf6a5b5bcb29c3baa 100644
--- a/semantik-adapter/src/main/java/de/ozgcloud/eingang/semantik/formbased/mantelantrag/MantelantragZustaendigeStelleMapper.java
+++ b/semantik-adapter/src/main/java/de/ozgcloud/eingang/semantik/formbased/mantelantrag/MantelantragZustaendigeStelleMapper.java
@@ -90,7 +90,7 @@ public class MantelantragZustaendigeStelleMapper implements FormBasedMapper {
 
 	private FormData adaptFormDataWithValueGetter(FormData formData, UnaryOperator<String> getValueOrEmpty) {
 		return formData.toBuilder()
-				.clearZustaendigeStelleList()
+				.clearZustaendigeStelles()
 				.zustaendigeStelle(ZustaendigeStelle.builder()
 						.organisationseinheitenId(getOrganisationseinheitId(getValueOrEmpty))
 						.bezeichnung(getValueOrEmpty.apply(BEZEICHNUNG_FIELD))
diff --git a/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/enginebased/FilesMapperHelperTest.java b/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/enginebased/FilesMapperHelperTest.java
index 2e892cd46267b3fe4aea1f06e9f25a08dfe653d6..0375100ea49c6ac7f0c68bdff8a41d8d988bd3ad 100644
--- a/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/enginebased/FilesMapperHelperTest.java
+++ b/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/enginebased/FilesMapperHelperTest.java
@@ -171,7 +171,7 @@ class FilesMapperHelperTest {
 
 			assertThat(cleanedFormData.getId()).isEqualTo(formData.getId());
 			assertThat(cleanedFormData.getHeader()).isEqualTo(formData.getHeader());
-			assertThat(cleanedFormData.getZustaendigeStelleList()).isEqualTo(formData.getZustaendigeStelleList());
+			assertThat(cleanedFormData.getZustaendigeStelles()).isEqualTo(formData.getZustaendigeStelles());
 			assertThat(cleanedFormData.getAntragsteller()).isEqualTo(formData.getAntragsteller());
 			assertThat(cleanedFormData.getNumberOfAttachments()).isEqualTo(formData.getNumberOfAttachments());
 			assertThat(cleanedFormData.getAttachments()).isEqualTo(formData.getAttachments());
diff --git a/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/enginebased/afm/AfmZustaendigeStelleMapperTest.java b/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/enginebased/afm/AfmZustaendigeStelleMapperTest.java
index 8fdf116cc02d311c29bdfd32e17815c2780e9de3..1c580defa779a5dc55cb4b066ae1b4df4b96c7d1 100644
--- a/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/enginebased/afm/AfmZustaendigeStelleMapperTest.java
+++ b/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/enginebased/afm/AfmZustaendigeStelleMapperTest.java
@@ -78,7 +78,7 @@ class AfmZustaendigeStelleMapperTest {
 			void shouldMapOrganisationseinheitenId() {
 				var parsedFormData = parseZustaendigeStelleData(formData);
 
-				assertThat(parsedFormData.getZustaendigeStelleList().getFirst().getOrganisationseinheitenId())
+				assertThat(parsedFormData.getZustaendigeStelles().getFirst().getOrganisationseinheitenId())
 						.isEqualTo(AfmZustaendigeStelleTestFactory.ORGANISATIONSEINHEITEN_ID);
 			}
 
@@ -86,14 +86,14 @@ class AfmZustaendigeStelleMapperTest {
 			void shouldMapBezeichnung() {
 				var parsedFormData = parseZustaendigeStelleData(formData);
 
-				assertThat(parsedFormData.getZustaendigeStelleList().getFirst().getBezeichnung()).isEqualTo(BEZEICHNUNG);
+				assertThat(parsedFormData.getZustaendigeStelles().getFirst().getBezeichnung()).isEqualTo(BEZEICHNUNG);
 			}
 
 			@Test
 			void shouldMapEmail() {
 				var parsedFormData = parseZustaendigeStelleData(formData);
 
-				assertThat(parsedFormData.getZustaendigeStelleList().getFirst().getEmail()).isEqualTo(AfmZustaendigeStelleTestFactory.EMAIL);
+				assertThat(parsedFormData.getZustaendigeStelles().getFirst().getEmail()).isEqualTo(AfmZustaendigeStelleTestFactory.EMAIL);
 			}
 
 			@Test
diff --git a/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/enginebased/afm/ZustaendigeStelleMetadataMapperTest.java b/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/enginebased/afm/ZustaendigeStelleMetadataMapperTest.java
index fffcb301ec53d13d37448a87b2bb492dbe3d2b0a..e0c8c341b1f6df2d98794ece6945ec37ee453995 100644
--- a/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/enginebased/afm/ZustaendigeStelleMetadataMapperTest.java
+++ b/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/enginebased/afm/ZustaendigeStelleMetadataMapperTest.java
@@ -45,7 +45,7 @@ class ZustaendigeStelleMetadataMapperTest {
 			behoerdeMetadataFile = IncomingFileTestFactory.createBuilder().name(ZustaendigeStelleMetadataMapper.BEHOERDE_METADATA_FILE_NAME)
 					.build();
 			formData = FormDataTestFactory.createBuilder()
-					.zustaendigeStelleList(emptyList())
+					.zustaendigeStelles(emptyList())
 					.representation(behoerdeMetadataFile).build();
 		}
 
@@ -77,7 +77,7 @@ class ZustaendigeStelleMetadataMapperTest {
 
 			var result = mapper.parseZustaendigeStelleData(formData);
 
-			assertThat(result.getZustaendigeStelleList().getFirst()).isEqualTo(zustaendigeStelle);
+			assertThat(result.getZustaendigeStelles().getFirst()).isEqualTo(zustaendigeStelle);
 		}
 	}
 
diff --git a/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/enginebased/dfoerdermittel/DFoerdermittelEngineBasedSemantikAdapterTest.java b/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/enginebased/dfoerdermittel/DFoerdermittelEngineBasedSemantikAdapterTest.java
index 5fb74ec2c1c38dcffeee89bd1273c3d1342f2cf8..875c8c91fa584b34be8396795a54981e903048ba 100644
--- a/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/enginebased/dfoerdermittel/DFoerdermittelEngineBasedSemantikAdapterTest.java
+++ b/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/enginebased/dfoerdermittel/DFoerdermittelEngineBasedSemantikAdapterTest.java
@@ -220,7 +220,7 @@ class DFoerdermittelEngineBasedSemantikAdapterTest {
 		void shouldHaveOrganisationsEinheitId() {
 			var formData = adapter.addOrganisationsEinheitId(DFoerdermittelFormDataTestFactory.create());
 
-			var organisationseinheitenId = formData.getZustaendigeStelleList().getFirst().getOrganisationseinheitenId();
+			var organisationseinheitenId = formData.getZustaendigeStelles().getFirst().getOrganisationseinheitenId();
 			assertThat(organisationseinheitenId).isEqualTo(ORGANISATIONS_EINHEIT_ID);
 		}
 	}
diff --git a/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/enginebased/formsolutions/FormSolutionsEngineBasedAdapterITCase.java b/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/enginebased/formsolutions/FormSolutionsEngineBasedAdapterITCase.java
index 3a9b6a6f1f88720181d3fcc03ce326cab77524e7..793b5d3eec555f6c00476938a02f52803e559bd7 100644
--- a/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/enginebased/formsolutions/FormSolutionsEngineBasedAdapterITCase.java
+++ b/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/enginebased/formsolutions/FormSolutionsEngineBasedAdapterITCase.java
@@ -236,14 +236,14 @@ public class FormSolutionsEngineBasedAdapterITCase {
 			void shouldMap() {
 				var data = engineAdapter.parseFormData(formData);
 
-				assertThat(data.getZustaendigeStelleList()).isNotNull();
+				assertThat(data.getZustaendigeStelles()).isNotNull();
 			}
 
 			@Test
 			void shouldMapOrganistaionseinheitenId() {
 				var data = engineAdapter.parseFormData(formData);
 
-				assertThat(data.getZustaendigeStelleList().getFirst().getOrganisationseinheitenId()).isEqualTo("test");
+				assertThat(data.getZustaendigeStelles().getFirst().getOrganisationseinheitenId()).isEqualTo("test");
 			}
 		}
 	}
diff --git a/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/enginebased/formsolutions/FormSolutionsZustaendigeStelleMapperTest.java b/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/enginebased/formsolutions/FormSolutionsZustaendigeStelleMapperTest.java
index 73aa8b227b9372affd5f0a033e80577ef53b0268..6867dccf2e9a22b702e9b7024959aabd4e6d062e 100644
--- a/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/enginebased/formsolutions/FormSolutionsZustaendigeStelleMapperTest.java
+++ b/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/enginebased/formsolutions/FormSolutionsZustaendigeStelleMapperTest.java
@@ -53,7 +53,7 @@ class FormSolutionsZustaendigeStelleMapperTest {
 		@BeforeEach
 		void setup() {
 			formData = FormDataTestFactory.createBuilder()
-					.zustaendigeStelleList(Collections.emptyList())
+					.zustaendigeStelles(Collections.emptyList())
 					.formData(Map.of(
 							FormDataTestFactory.SIMPLE_VALUE_KEY, FormDataTestFactory.SIMPLE_VALUE,
 							FormSolutionsZustaendigeStelleMapper.ZUSTAENDIGE_STELLE, ORGANISATIONSEINHEIT_ID))
@@ -64,7 +64,7 @@ class FormSolutionsZustaendigeStelleMapperTest {
 		void shouldParseFormData() {
 			var resultFormData = mapper.parseFormData(formData);
 
-			assertThat(resultFormData.getZustaendigeStelleList().getFirst().getOrganisationseinheitenId()).isEqualTo(ORGANISATIONSEINHEIT_ID);
+			assertThat(resultFormData.getZustaendigeStelles().getFirst().getOrganisationseinheitenId()).isEqualTo(ORGANISATIONSEINHEIT_ID);
 			assertThat(resultFormData.getFormData()).doesNotContainKey(ZUSTAENDIGE_STELLE);
 		}
 
diff --git a/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/formbased/mantelantrag/MantelantragITCase.java b/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/formbased/mantelantrag/MantelantragITCase.java
index 26b966fa62bea03e4fdc69612a0e2ed2b0048ace..6c2281bd2b68f3051229e6c6be408b109f9b06c8 100644
--- a/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/formbased/mantelantrag/MantelantragITCase.java
+++ b/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/formbased/mantelantrag/MantelantragITCase.java
@@ -75,7 +75,7 @@ public class MantelantragITCase {
 			semantikAdapter.processFormData(formData);
 
 			verify(vorgangService).createVorgangs(formDataCaptor.capture());
-			var firstZustaendigeStelle = formDataCaptor.getValue().getZustaendigeStelleList().getFirst();
+			var firstZustaendigeStelle = formDataCaptor.getValue().getZustaendigeStelles().getFirst();
 			assertThat(firstZustaendigeStelle.getOrganisationseinheitenId()).isEqualTo("123");
 		}
 
diff --git a/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/formbased/mantelantrag/MantelantragZustaendigeStelleMapperTest.java b/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/formbased/mantelantrag/MantelantragZustaendigeStelleMapperTest.java
index 570107f367fcd3c9a04543236552c5191870b22a..57a4cc131104e30e83a7492e9c14419159fde868 100644
--- a/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/formbased/mantelantrag/MantelantragZustaendigeStelleMapperTest.java
+++ b/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/formbased/mantelantrag/MantelantragZustaendigeStelleMapperTest.java
@@ -283,7 +283,7 @@ class MantelantragZustaendigeStelleMapperTest {
 
 		private ZustaendigeStelle getAdaptedZustaendigeStelle() {
 			var formDataResult = mapper.adaptFormDataWithPossibleException(formData);
-			return formDataResult.getZustaendigeStelleList().getFirst();
+			return formDataResult.getZustaendigeStelles().getFirst();
 		}
 
 	}