diff --git a/Resources/fsh-generated/resources/Bundle-ExampleISiKMedikationTransaction.json b/Resources/fsh-generated/resources/Bundle-ExampleISiKMedikationTransaction.json
index b80a173..7490708 100644
--- a/Resources/fsh-generated/resources/Bundle-ExampleISiKMedikationTransaction.json
+++ b/Resources/fsh-generated/resources/Bundle-ExampleISiKMedikationTransaction.json
@@ -49,7 +49,7 @@
           "reference": "Patient/PatientinMusterfrau"
         },
         "context": {
-          "reference": "Encounter/Versorgungsstellenkontakt"
+          "reference": "Encounter/Absteilungskontakt"
         },
         "effectivePeriod": {
           "start": "2021-07-01"
diff --git a/Resources/fsh-generated/resources/Bundle-ExampleISiKMedikationTransactionResponse.json b/Resources/fsh-generated/resources/Bundle-ExampleISiKMedikationTransactionResponse.json
index cb1e801..7d72b01 100644
--- a/Resources/fsh-generated/resources/Bundle-ExampleISiKMedikationTransactionResponse.json
+++ b/Resources/fsh-generated/resources/Bundle-ExampleISiKMedikationTransactionResponse.json
@@ -49,7 +49,7 @@
           "reference": "Patient/PatientinMusterfrau"
         },
         "context": {
-          "reference": "Encounter/Versorgungsstellenkontakt"
+          "reference": "Encounter/Absteilungskontakt"
         },
         "effectivePeriod": {
           "start": "2021-07-01"
diff --git a/Resources/fsh-generated/resources/MedicationAdministration-ExampleISiKMedikationsVerabreichung.json b/Resources/fsh-generated/resources/MedicationAdministration-ExampleISiKMedikationsVerabreichung.json
index 464dc4e..f83e2c5 100644
--- a/Resources/fsh-generated/resources/MedicationAdministration-ExampleISiKMedikationsVerabreichung.json
+++ b/Resources/fsh-generated/resources/MedicationAdministration-ExampleISiKMedikationsVerabreichung.json
@@ -22,7 +22,7 @@
     "reference": "Patient/PatientinMusterfrau"
   },
   "context": {
-    "reference": "Encounter/Versorgungsstellenkontakt"
+    "reference": "Encounter/Absteilungskontakt"
   },
   "effectiveDateTime": "2021-07-01"
 }
diff --git a/Resources/fsh-generated/resources/MedicationAdministration-ExampleISiKMedikationsVerabreichung2.json b/Resources/fsh-generated/resources/MedicationAdministration-ExampleISiKMedikationsVerabreichung2.json
index df7def0..057c6b1 100644
--- a/Resources/fsh-generated/resources/MedicationAdministration-ExampleISiKMedikationsVerabreichung2.json
+++ b/Resources/fsh-generated/resources/MedicationAdministration-ExampleISiKMedikationsVerabreichung2.json
@@ -22,7 +22,7 @@
     "reference": "Patient/PatientinMusterfrau"
   },
   "context": {
-    "reference": "Encounter/Versorgungsstellenkontakt"
+    "reference": "Encounter/Absteilungskontakt"
   },
   "effectiveDateTime": "2024-01-22"
 }
diff --git a/Resources/fsh-generated/resources/MedicationRequest-ExampleISiKMedikationsVerordnung.json b/Resources/fsh-generated/resources/MedicationRequest-ExampleISiKMedikationsVerordnung.json
index 1a2aad1..b24fc2a 100644
--- a/Resources/fsh-generated/resources/MedicationRequest-ExampleISiKMedikationsVerordnung.json
+++ b/Resources/fsh-generated/resources/MedicationRequest-ExampleISiKMedikationsVerordnung.json
@@ -38,7 +38,7 @@
     "reference": "Patient/PatientinMusterfrau"
   },
   "encounter": {
-    "reference": "Encounter/Versorgungsstellenkontakt"
+    "reference": "Encounter/Absteilungskontakt"
   },
   "authoredOn": "2021-07-01",
   "requester": {
diff --git a/Resources/fsh-generated/resources/MedicationRequest-ExampleISiKMedikationsVerordnung2.json b/Resources/fsh-generated/resources/MedicationRequest-ExampleISiKMedikationsVerordnung2.json
index 67846c5..a0a2947 100644
--- a/Resources/fsh-generated/resources/MedicationRequest-ExampleISiKMedikationsVerordnung2.json
+++ b/Resources/fsh-generated/resources/MedicationRequest-ExampleISiKMedikationsVerordnung2.json
@@ -39,7 +39,7 @@
     "reference": "Patient/PatientinMusterfrau"
   },
   "encounter": {
-    "reference": "Encounter/Versorgungsstellenkontakt"
+    "reference": "Encounter/Absteilungskontakt"
   },
   "authoredOn": "2024-01-17",
   "requester": {
diff --git a/Resources/fsh-generated/resources/MedicationStatement-ExampleISiKMedikationsInformation1.json b/Resources/fsh-generated/resources/MedicationStatement-ExampleISiKMedikationsInformation1.json
index c1d9d29..3f0a0ec 100644
--- a/Resources/fsh-generated/resources/MedicationStatement-ExampleISiKMedikationsInformation1.json
+++ b/Resources/fsh-generated/resources/MedicationStatement-ExampleISiKMedikationsInformation1.json
@@ -37,7 +37,7 @@
     "reference": "Patient/PatientinMusterfrau"
   },
   "context": {
-    "reference": "Encounter/Versorgungsstellenkontakt"
+    "reference": "Encounter/Absteilungskontakt"
   },
   "effectivePeriod": {
     "start": "2021-07-01"
diff --git a/Resources/fsh-generated/resources/MedicationStatement-ExampleISiKMedikationsInformation2.json b/Resources/fsh-generated/resources/MedicationStatement-ExampleISiKMedikationsInformation2.json
index 0921141..e0a31ed 100644
--- a/Resources/fsh-generated/resources/MedicationStatement-ExampleISiKMedikationsInformation2.json
+++ b/Resources/fsh-generated/resources/MedicationStatement-ExampleISiKMedikationsInformation2.json
@@ -36,7 +36,7 @@
     "reference": "Patient/PatientinMusterfrau"
   },
   "context": {
-    "reference": "Encounter/Versorgungsstellenkontakt"
+    "reference": "Encounter/Absteilungskontakt"
   },
   "effectivePeriod": {
     "start": "2021-07-04"
diff --git a/Resources/fsh-generated/resources/MedicationStatement-ExampleISiKMedikationsInformation3.json b/Resources/fsh-generated/resources/MedicationStatement-ExampleISiKMedikationsInformation3.json
index bc2c898..d603996 100644
--- a/Resources/fsh-generated/resources/MedicationStatement-ExampleISiKMedikationsInformation3.json
+++ b/Resources/fsh-generated/resources/MedicationStatement-ExampleISiKMedikationsInformation3.json
@@ -38,7 +38,7 @@
     "reference": "Patient/PatientinMusterfrau"
   },
   "context": {
-    "reference": "Encounter/Versorgungsstellenkontakt"
+    "reference": "Encounter/Absteilungskontakt"
   },
   "effectivePeriod": {
     "start": "2024-01-22",
diff --git a/Resources/input/fsh/ISiKMedikationsInformation.fsh b/Resources/input/fsh/ISiKMedikationsInformation.fsh
index 940d56a..96cee60 100644
--- a/Resources/input/fsh/ISiKMedikationsInformation.fsh
+++ b/Resources/input/fsh/ISiKMedikationsInformation.fsh
@@ -258,7 +258,7 @@ Usage: #example
 * status = #active
 * medicationReference.reference = "Medication/ExampleISiKMedikament1"
 * subject.reference = "Patient/PatientinMusterfrau"
-* context.reference = "Encounter/Versorgungsstellenkontakt"
+* context.reference = "Encounter/Absteilungskontakt"
 * effectivePeriod.start = 2021-07-01
 * dateAsserted = 2021-07-01
 * reasonReference.reference = "Condition/BehandlungsDiagnoseFreitext"
@@ -279,7 +279,7 @@ Usage: #example
 * status = #active
 * medicationReference.reference = "Medication/ExampleISiKMedikament2"
 * subject.reference = "Patient/PatientinMusterfrau"
-* context.reference = "Encounter/Versorgungsstellenkontakt"
+* context.reference = "Encounter/Absteilungskontakt"
 * effectivePeriod.start = 2021-07-04
 * dateAsserted = 2021-07-03
 * dosage
@@ -300,7 +300,7 @@ Usage: #example
 * status = #active
 * medicationReference = Reference(ExampleISiKMedikament8)
 * subject.reference = "Patient/PatientinMusterfrau"
-* context.reference = "Encounter/Versorgungsstellenkontakt"
+* context.reference = "Encounter/Absteilungskontakt"
 * effectivePeriod
   * start = 2024-01-22
   * end = 2024-02-26
diff --git a/Resources/input/fsh/ISiKMedikationsVerabreichung.fsh b/Resources/input/fsh/ISiKMedikationsVerabreichung.fsh
index 22241fb..45e658b 100644
--- a/Resources/input/fsh/ISiKMedikationsVerabreichung.fsh
+++ b/Resources/input/fsh/ISiKMedikationsVerabreichung.fsh
@@ -134,7 +134,7 @@ Usage: #example
 * status = #completed
 * medicationReference.reference = "Medication/ExampleISiKMedikament1"
 * subject.reference = "Patient/PatientinMusterfrau"
-* context.reference = "Encounter/Versorgungsstellenkontakt"
+* context.reference = "Encounter/Absteilungskontakt"
 * effectiveDateTime = 2021-07-01
 * dosage
   * dose
@@ -149,7 +149,7 @@ Usage: #example
 * status = #completed
 * medicationReference = Reference(ExampleISiKMedikament9)
 * subject.reference = "Patient/PatientinMusterfrau"
-* context.reference = "Encounter/Versorgungsstellenkontakt"
+* context.reference = "Encounter/Absteilungskontakt"
 * effectiveDateTime = 2024-01-22
 * dosage
   * dose
diff --git a/Resources/input/fsh/ISiKMedikationsVerordnung.fsh b/Resources/input/fsh/ISiKMedikationsVerordnung.fsh
index 809c641..2647ee2 100644
--- a/Resources/input/fsh/ISiKMedikationsVerordnung.fsh
+++ b/Resources/input/fsh/ISiKMedikationsVerordnung.fsh
@@ -256,7 +256,7 @@ Usage: #example
 * intent = #order
 * medicationReference.reference = "Medication/ExampleISiKMedikament1"
 * subject.reference = "Patient/PatientinMusterfrau"
-* encounter.reference = "Encounter/Versorgungsstellenkontakt"
+* encounter.reference = "Encounter/Absteilungskontakt"
 * authoredOn = 2021-07-01
 * requester.reference = "Practitioner/PractitionerWalterArzt"
 * reasonReference.reference = "Condition/BehandlungsDiagnoseFreitext"
@@ -278,7 +278,7 @@ Usage: #example
 * intent = #order
 * medicationReference = Reference(ExampleISiKMedikament8)
 * subject.reference = "Patient/PatientinMusterfrau"
-* encounter.reference = "Encounter/Versorgungsstellenkontakt"
+* encounter.reference = "Encounter/Absteilungskontakt"
 * authoredOn = 2024-01-17
 * requester.reference = "Practitioner/PractitionerWalterArzt"
 * dosageInstruction