diff --git a/common/src/main/java/de/ozgcloud/eingang/common/formdata/Antragsteller.java b/common/src/main/java/de/ozgcloud/eingang/common/formdata/Antragsteller.java
index 40bee43c61eaa12f49341314d7ae4a03fbbd89ba..81826cff9dccf04d8b16040f00f1d8c4f967e8a0 100644
--- a/common/src/main/java/de/ozgcloud/eingang/common/formdata/Antragsteller.java
+++ b/common/src/main/java/de/ozgcloud/eingang/common/formdata/Antragsteller.java
@@ -33,7 +33,7 @@ import lombok.Getter;
 public class Antragsteller {
 
 	private String anrede;
-	private String firmName;
+	private String firmaName;
 	private String vorname;
 	private String nachname;
 	private String geburtsname;
diff --git a/common/src/test/java/de/ozgcloud/eingang/common/formdata/AntragstellerTestFactory.java b/common/src/test/java/de/ozgcloud/eingang/common/formdata/AntragstellerTestFactory.java
index 1f3bafc0e2c86b61357bf488d0a4304bca032b70..6a506945dc9822cafcc2f1dc37d7ecedb6405b6c 100644
--- a/common/src/test/java/de/ozgcloud/eingang/common/formdata/AntragstellerTestFactory.java
+++ b/common/src/test/java/de/ozgcloud/eingang/common/formdata/AntragstellerTestFactory.java
@@ -56,16 +56,15 @@ public class AntragstellerTestFactory {
 	}
 
 	public static Antragsteller createFirm() {
+		return createFirmBuilder().build();
+	}
+
+	public static Antragsteller.AntragstellerBuilder createFirmBuilder() {
 		return createBuilder()
-				.firmName(FIRMA_NAME)
+				.firmaName(FIRMA_NAME)
 				.geburtsname(null)
 				.geburtsdatum(null)
-				.geburtsort(null)
-				.hausnummer(null)
-				.postfachId(null)
-				.strasse("%s %s".formatted(STRASSE, HAUSNUMMER))
-				.data(null)
-				.build();
+				.geburtsort(null);
 	}
 
 	public static Antragsteller.AntragstellerBuilder createBuilder() {
diff --git a/router/src/test/java/de/ozgcloud/eingang/router/GrpcEingangMapperTest.java b/router/src/test/java/de/ozgcloud/eingang/router/GrpcEingangMapperTest.java
index b0348cc39fa405d1b7ea467d6d99e2a5ee5db4f0..3909125566b6f297d16633590aa4dcc05644611b 100644
--- a/router/src/test/java/de/ozgcloud/eingang/router/GrpcEingangMapperTest.java
+++ b/router/src/test/java/de/ozgcloud/eingang/router/GrpcEingangMapperTest.java
@@ -69,6 +69,13 @@ class GrpcEingangMapperTest {
 
 		}
 
+		@Test
+		void shouldMapFirmaName() {
+			var mapped = mapper.toAntragsteller(AntragstellerTestFactory.createFirm());
+
+			assertThat(mapped.getFirmaName()).isEqualTo(AntragstellerTestFactory.FIRMA_NAME);
+		}
+
 		private GrpcAntragsteller toAntragsteller() {
 			return mapper.toAntragsteller(AntragstellerTestFactory.create());
 		}
diff --git a/semantik-adapter/src/main/java/de/ozgcloud/eingang/semantik/enginebased/afm/AfmAntragstellerMapper.java b/semantik-adapter/src/main/java/de/ozgcloud/eingang/semantik/enginebased/afm/AfmAntragstellerMapper.java
index 7a4ffd5005be1439e1db60aba09cde5a8de7d473..be2eb0cde5339c900477a2e6554b0612b62afce9 100644
--- a/semantik-adapter/src/main/java/de/ozgcloud/eingang/semantik/enginebased/afm/AfmAntragstellerMapper.java
+++ b/semantik-adapter/src/main/java/de/ozgcloud/eingang/semantik/enginebased/afm/AfmAntragstellerMapper.java
@@ -126,7 +126,7 @@ class AfmAntragstellerMapper implements AfmEngineBasedMapper {
 	Antragsteller.AntragstellerBuilder addFirmAntragstellerData(Antragsteller.AntragstellerBuilder builder,
 			Map<String, Object> antragstellerMap) {
 		return builder
-				.firmName(MapUtils.getString(antragstellerMap, FIELD_FIRMA_NAME))
+				.firmaName(MapUtils.getString(antragstellerMap, FIELD_FIRMA_NAME))
 				.strasse(MapUtils.getString(antragstellerMap, FIELD_FIRMA_STRASSE))
 				.hausnummer(MapUtils.getString(antragstellerMap, FIELD_FIRMA_HAUSNUMMER))
 				.plz(MapUtils.getString(antragstellerMap, FIELD_FIRMA_PLZ))
diff --git a/semantik-adapter/src/main/java/de/ozgcloud/eingang/semantik/enginebased/formcycle/FormcycleAntragstellerMapper.java b/semantik-adapter/src/main/java/de/ozgcloud/eingang/semantik/enginebased/formcycle/FormcycleAntragstellerMapper.java
index 7e9abf89ddcfd882477dc7007848f937db800e5c..ab351eb8f849b811373de9c7e4f2b95e0d080086 100644
--- a/semantik-adapter/src/main/java/de/ozgcloud/eingang/semantik/enginebased/formcycle/FormcycleAntragstellerMapper.java
+++ b/semantik-adapter/src/main/java/de/ozgcloud/eingang/semantik/enginebased/formcycle/FormcycleAntragstellerMapper.java
@@ -46,7 +46,7 @@ public class FormcycleAntragstellerMapper implements FormcycleEngineBasedMapper
 	Antragsteller buildAntragsteller(Map<String, Object> antragstellerData) {
 		var firmaName = getValue(antragstellerData, KEY_FIRMA_NAME);
 		var antragstellerBuilder = Antragsteller.builder()
-				.firmName(firmaName)
+				.firmaName(firmaName)
 				.anrede(getValue(antragstellerData, KEY_ANREDE))
 				.vorname(getValue(antragstellerData, KEY_VORNAME))
 				.nachname(getValue(antragstellerData, KEY_NACHNAME))
@@ -61,7 +61,7 @@ public class FormcycleAntragstellerMapper implements FormcycleEngineBasedMapper
 					.geburtsdatum(getValue(antragstellerData, KEY_GEBURTSDATUM))
 					.geburtsort(getValue(antragstellerData, KEY_GEBURTSORT));
 		}else {
-			antragstellerBuilder.firmName(firmaName);
+			antragstellerBuilder.firmaName(firmaName);
 		}
 		return antragstellerBuilder.build();
 	}
diff --git a/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/enginebased/afm/AfmAntragstellerTestFactory.java b/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/enginebased/afm/AfmAntragstellerTestFactory.java
index 6fc16c9b5185091deed63ad81df92273c5e07364..bcdf3985f30f88c7fe5d1a0d47f669aca86942b6 100644
--- a/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/enginebased/afm/AfmAntragstellerTestFactory.java
+++ b/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/enginebased/afm/AfmAntragstellerTestFactory.java
@@ -57,7 +57,7 @@ public class AfmAntragstellerTestFactory {
 
 	public static Antragsteller createFirm() {
 		return createBuilder()
-				.firmName(FIRMA_NAME)
+				.firmaName(FIRMA_NAME)
 				.geburtsname(null)
 				.geburtsdatum(null)
 				.geburtsort(null)
diff --git a/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/enginebased/formcycle/FormcycleAntragstellerMapperTest.java b/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/enginebased/formcycle/FormcycleAntragstellerMapperTest.java
index 96ba09f229caed28bbaa88174714a57f1a54755f..4bcbc1cba5239aeffb34b319eb5d0d81b54bc5a7 100644
--- a/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/enginebased/formcycle/FormcycleAntragstellerMapperTest.java
+++ b/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/enginebased/formcycle/FormcycleAntragstellerMapperTest.java
@@ -226,9 +226,13 @@ class FormcycleAntragstellerMapperTest {
 
 		@Test
 		void shouldMapFirmaData() {
+			var expectedAntragsteller = AntragstellerTestFactory.createFirmBuilder()
+					.strasse("%s %s".formatted(AntragstellerTestFactory.STRASSE, AntragstellerTestFactory.HAUSNUMMER))
+					.hausnummer(null).postfachId(null).data(null).build();
+
 			var result = mapper.buildAntragsteller(antragstellerData);
 
-			assertThat(result).usingRecursiveComparison().isEqualTo(AntragstellerTestFactory.createFirm());
+			assertThat(result).usingRecursiveComparison().isEqualTo(expectedAntragsteller);
 		}
 
 	}