diff --git a/src/main/java/de/ozgcloud/eingang/semantik/enginebased/formsolutions/mapper/FSAntragstellerMapper.java b/src/main/java/de/ozgcloud/eingang/semantik/enginebased/formsolutions/mapper/FSAntragstellerMapper.java
index 51c31ca779c7da40fd4bf52f2a70b0b80d11427f..3add7fe996b364f2c92e480f56676ce04db6cc68 100644
--- a/src/main/java/de/ozgcloud/eingang/semantik/enginebased/formsolutions/mapper/FSAntragstellerMapper.java
+++ b/src/main/java/de/ozgcloud/eingang/semantik/enginebased/formsolutions/mapper/FSAntragstellerMapper.java
@@ -28,16 +28,16 @@ public interface FSAntragstellerMapper {
 	String NAT_PLZ_KEY = "AS_PLZ";
 	String NAT_ORT_KEY = "AS_Ort";
 
-	String JUR_KONTAKT_ANREDE_KEY = "AS_Firma_Kontakt_Anrede";
-	String JUR_NAME_KEY = "AS_Firma_Name";
-	String JUR_KONTAKT_VORNAME_KEY = "AS_Firma_Kontakt_Vorname";
-	String JUR_KONTAKT_NACHNAME_KEY = "AS_Firma_Kontakt_Name";
-	String JUR_KONTAKT_EMAIL_KEY = "AS_Firma_Kontakt_E-Mail";
-	String JUR_KONTAKT_TELEFON_KEY = "AS_Firma_Kontakt_Telefon";
-	String JUR_STRASSE_KEY = "AS_Firma_Strasse";
-	String JUR_HAUSNUMMER_KEY = "AS_Firma_Hausnummer";
-	String JUR_PLZ_KEY = "AS_Firma_PLZ";
-	String JUR_ORT_KEY = "AS_Firma_Ort";
+	String JUR_KONTAKT_ANREDE_KEY = "AS_jur_Kontakt_Anrede";
+	String JUR_NAME_KEY = "AS_Name_jur_Person";
+	String JUR_KONTAKT_VORNAME_KEY = "AS_jur_Kontakt_Vorname";
+	String JUR_KONTAKT_NACHNAME_KEY = "AS_jur_Kontakt_Name";
+	String JUR_KONTAKT_EMAIL_KEY = "AS_jur_Kontakt_E-Mail";
+	String JUR_KONTAKT_TELEFON_KEY = "AS_jur_Kontakt_Telefon";
+	String JUR_STRASSE_KEY = "AS_jur_Strasse";
+	String JUR_HAUSNUMMER_KEY = "AS_jur_Hausnummer";
+	String JUR_PLZ_KEY = "AS_jur_PLZ";
+	String JUR_ORT_KEY = "AS_jur_Ort";
 
 
 	@Mapping(target = "anrede", source = NAT_ANREDE_KEY)
@@ -67,10 +67,10 @@ public interface FSAntragstellerMapper {
 	@Mapping(target = "geburtsort", ignore = true)
 	@Mapping(target = "email", source = NAT_EMAIL_KEY)
 	@Mapping(target = "telefon", source = NAT_TELEFON_KEY)
-	@Mapping(target = "strasse", source = JUR_STRASSE_KEY)
-	@Mapping(target = "hausnummer", source = JUR_HAUSNUMMER_KEY)
-	@Mapping(target = "plz", source = JUR_PLZ_KEY)
-	@Mapping(target = "ort", source = JUR_ORT_KEY)
+	@Mapping(target = "strasse", source = NAT_STRASSE_KEY)
+	@Mapping(target = "hausnummer", source = NAT_HAUSNUMMER_KEY)
+	@Mapping(target = "plz", source = NAT_PLZ_KEY)
+	@Mapping(target = "ort", source = NAT_ORT_KEY)
 	@Mapping(target = "postfachId", ignore = true)
 	@Mapping(target = "data", expression = "java( Map.of() )")
 	Antragsteller mapJuristicPerson(Map<String, String> stringValues);
@@ -107,6 +107,10 @@ public interface FSAntragstellerMapper {
 			case JUR_KONTAKT_VORNAME_KEY -> NAT_VORNAME_KEY;
 			case JUR_KONTAKT_NACHNAME_KEY -> NAT_NACHNAME_KEY;
 			case JUR_KONTAKT_EMAIL_KEY -> NAT_EMAIL_KEY;
+			case JUR_STRASSE_KEY -> NAT_STRASSE_KEY;
+			case JUR_HAUSNUMMER_KEY -> NAT_HAUSNUMMER_KEY;
+			case JUR_PLZ_KEY -> NAT_PLZ_KEY;
+			case JUR_ORT_KEY -> NAT_ORT_KEY;
 			default -> stringValueKey;
 		};
 	}