diff --git a/src/main/java/org/miracum/streams/ume/obdstofhir/mapper/ObdsConditionMapper.java b/src/main/java/org/miracum/streams/ume/obdstofhir/mapper/ObdsConditionMapper.java
index 33af35d4..ce0b4c92 100644
--- a/src/main/java/org/miracum/streams/ume/obdstofhir/mapper/ObdsConditionMapper.java
+++ b/src/main/java/org/miracum/streams/ume/obdstofhir/mapper/ObdsConditionMapper.java
@@ -82,7 +82,7 @@ public Bundle mapOnkoResourcesToCondition(
       }
     }
 
-    var patId = getPatIdFromAdt(meldungExport);
+    var patId = getPatIdFromMeldung(meldungExport);
     var pid = patId;
     if (checkDigitConversion) {
       pid = convertId(patId);
diff --git a/src/main/java/org/miracum/streams/ume/obdstofhir/mapper/ObdsMedicationStatementMapper.java b/src/main/java/org/miracum/streams/ume/obdstofhir/mapper/ObdsMedicationStatementMapper.java
index d5c9057e..1ef03d93 100644
--- a/src/main/java/org/miracum/streams/ume/obdstofhir/mapper/ObdsMedicationStatementMapper.java
+++ b/src/main/java/org/miracum/streams/ume/obdstofhir/mapper/ObdsMedicationStatementMapper.java
@@ -63,7 +63,7 @@ public Bundle mapOnkoResourcesToMedicationStatement(List<MeldungExport> meldungE
     var senderId = meldungExport.getXml_daten().getAbsender().getAbsender_ID();
     var softwareId = meldungExport.getXml_daten().getAbsender().getSoftware_ID();
 
-    var patId = getPatIdFromAdt(meldungExport);
+    var patId = getPatIdFromMeldung(meldungExport);
     var pid = patId;
     if (checkDigitConversion) {
       pid = convertId(patId);
diff --git a/src/main/java/org/miracum/streams/ume/obdstofhir/mapper/ObdsObservationMapper.java b/src/main/java/org/miracum/streams/ume/obdstofhir/mapper/ObdsObservationMapper.java
index 378a4ed0..c9441cb9 100644
--- a/src/main/java/org/miracum/streams/ume/obdstofhir/mapper/ObdsObservationMapper.java
+++ b/src/main/java/org/miracum/streams/ume/obdstofhir/mapper/ObdsObservationMapper.java
@@ -115,7 +115,7 @@ public Bundle mapOnkoResourcesToObservation(List<MeldungExport> meldungExportLis
       // reporting reason
       var meldeanlass = meldung.getMeldeanlass();
 
-      patId = getPatIdFromAdt(meldungExport);
+      patId = getPatIdFromMeldung(meldungExport);
       if (checkDigitConversion) {
         patId = convertId(patId);
       }
diff --git a/src/main/java/org/miracum/streams/ume/obdstofhir/mapper/ObdsPatientMapper.java b/src/main/java/org/miracum/streams/ume/obdstofhir/mapper/ObdsPatientMapper.java
index de4b1375..d89ccb26 100644
--- a/src/main/java/org/miracum/streams/ume/obdstofhir/mapper/ObdsPatientMapper.java
+++ b/src/main/java/org/miracum/streams/ume/obdstofhir/mapper/ObdsPatientMapper.java
@@ -44,7 +44,7 @@ public Bundle mapOnkoResourcesToPatient(List<MeldungExport> meldungExportList) {
     var patient = new Patient();
 
     // id
-    var patId = getPatIdFromAdt(meldungExport);
+    var patId = getPatIdFromMeldung(meldungExport);
     var pid = patId;
     if (checkDigitConversion) {
       pid = convertId(patId);
diff --git a/src/main/java/org/miracum/streams/ume/obdstofhir/mapper/ObdsProcedureMapper.java b/src/main/java/org/miracum/streams/ume/obdstofhir/mapper/ObdsProcedureMapper.java
index ac442a14..3afc7400 100644
--- a/src/main/java/org/miracum/streams/ume/obdstofhir/mapper/ObdsProcedureMapper.java
+++ b/src/main/java/org/miracum/streams/ume/obdstofhir/mapper/ObdsProcedureMapper.java
@@ -71,7 +71,7 @@ public Bundle mapOnkoResourcesToProcedure(List<MeldungExport> meldungExportList)
     var senderId = meldungExport.getXml_daten().getAbsender().getAbsender_ID();
     var softwareId = meldungExport.getXml_daten().getAbsender().getSoftware_ID();
 
-    var patId = getPatIdFromAdt(meldungExport);
+    var patId = getPatIdFromMeldung(meldungExport);
     var pid = patId;
     if (checkDigitConversion) {
       pid = convertId(patId);