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 3add7fe996b364f2c92e480f56676ce04db6cc68..cf2b3a2d85e76930d1a9247a8b85be73b75a79e5 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,7 @@ public interface FSAntragstellerMapper {
 	String NAT_PLZ_KEY = "AS_PLZ";
 	String NAT_ORT_KEY = "AS_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)
@@ -102,15 +93,7 @@ public interface FSAntragstellerMapper {
 	@Named("normalizeStringValueKey")
 	default String normalizeStringValueKey(String stringValueKey) {
 		return switch (stringValueKey) {
-			case NAT_TELEFON1_KEY, NAT_TELEFON2_KEY, JUR_KONTAKT_TELEFON_KEY -> NAT_TELEFON_KEY;
-			case JUR_KONTAKT_ANREDE_KEY -> NAT_ANREDE_KEY;
-			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;
+			case NAT_TELEFON1_KEY, NAT_TELEFON2_KEY -> NAT_TELEFON_KEY;
 			default -> stringValueKey;
 		};
 	}
diff --git a/src/test/java/de/ozgcloud/eingang/semantik/enginebased/formsolutions/AntragstellerStringValuesTestFactory.java b/src/test/java/de/ozgcloud/eingang/semantik/enginebased/formsolutions/AntragstellerStringValuesTestFactory.java
index 37f70231af162175c2e5a1ff4d8eed81ed5e83df..0a2e014d623861fc3b6209a894338b92296ab1e6 100644
--- a/src/test/java/de/ozgcloud/eingang/semantik/enginebased/formsolutions/AntragstellerStringValuesTestFactory.java
+++ b/src/test/java/de/ozgcloud/eingang/semantik/enginebased/formsolutions/AntragstellerStringValuesTestFactory.java
@@ -34,20 +34,19 @@ public class AntragstellerStringValuesTestFactory {
 
 	public static Map<String, String> createJuristicPerson() {
 		return createMap(
-				JUR_KONTAKT_ANREDE_KEY, ANREDE,
+				NAT_ANREDE_KEY, ANREDE,
 				JUR_NAME_KEY, FIRMA_NAME,
-				JUR_KONTAKT_VORNAME_KEY, VORNAME,
 				NAT_VORNAME_KEY, VORNAME,
-				JUR_KONTAKT_NACHNAME_KEY, NACHNAME,
+				NAT_NACHNAME_KEY, NACHNAME,
 				NAT_GEBURTSNAME_KEY, GEBURTSNAME,
 				NAT_GEBURTSDATUM_KEY, GEBURTSDATUM,
 				NAT_GEBURTSORT_KEY, GEBURTSORT,
-				JUR_KONTAKT_EMAIL_KEY, EMAIL,
-				JUR_KONTAKT_TELEFON_KEY, TELEFON,
-				JUR_STRASSE_KEY, STRASSE,
-				JUR_HAUSNUMMER_KEY, HAUSNUMMER,
-				JUR_PLZ_KEY, PLZ,
-				JUR_ORT_KEY, ORT,
+				NAT_EMAIL_KEY, EMAIL,
+				NAT_TELEFON_KEY, TELEFON,
+				NAT_STRASSE_KEY, STRASSE,
+				NAT_HAUSNUMMER_KEY, HAUSNUMMER,
+				NAT_PLZ_KEY, PLZ,
+				NAT_ORT_KEY, ORT,
 				"otherKey", "otherValue"
 		);
 	}