IKNL · HarmkeKoning · Aug 18, 2026 · Jun 3, 2026 · Jul 14, 2026 · Jul 17, 2026
diff --git a/.github/workflows/r4_firely_terminal.yaml b/.github/workflows/r4_firely_terminal.yaml
@@ -30,7 +30,7 @@ jobs:
           java-version: '21'
 
       - name: Firely.Terminal (GitHub Actions)
-        uses: FirelyTeam/firely-terminal-pipeline@v0.8.1
+        uses: FirelyTeam/firely-terminal-pipeline@v0.8.16
         with:
           PATH_TO_CONFORMANCE_RESOURCES: fsh-generated/resources
           PATH_TO_EXAMPLES: fsh-generated/resources

diff --git a/.github/workflows/r4_firely_terminal_nts.yaml b/.github/workflows/r4_firely_terminal_nts.yaml
@@ -65,7 +65,7 @@ jobs:
           echo "JAVA_TOOL_OPTIONS=-Dhttp.proxyHost=localhost -Dhttp.proxyPort=8080 -Dhttps.proxyHost=localhost -Dhttps.proxyPort=8080 -Dhttp.nonProxyHosts=" >> $GITHUB_ENV
 
       - name: Firely.Terminal (GitHub Actions)
-        uses: FirelyTeam/firely-terminal-pipeline@v0.8.1
+        uses: FirelyTeam/firely-terminal-pipeline@v0.8.16
         with:
           PATH_TO_CONFORMANCE_RESOURCES: fsh-generated/resources
           PATH_TO_EXAMPLES: fsh-generated/resources

diff --git a/input/fsh/CapabilityStatement.fsh b/input/fsh/CapabilityStatement.fsh
@@ -139,7 +139,7 @@ Usage: #definition
       * valueCode = #SHOULD
     * type = #Observation
     // Supported profiles for Observation resource are set to SHOULD because not all Observation have to be implemented.
-    * supportedProfile[0] = "https://api.iknl.nl/docs/pzp/r4/StructureDefinition/ACP-LegallyCapable"
+    * supportedProfile[0] = "https://api.iknl.nl/docs/pzp/r4/StructureDefinition/ACP-LegallyCapableTreatmentDecisions"
       * extension
         * url = $CapExpectation
         * valueCode = #SHOULD
@@ -487,7 +487,7 @@ Usage: #definition
       * valueCode = #SHALL
     * type = #Observation
     // Supported profiles for Observation resource are set to SHOULD because not all Observation have to be implemented.
-    * supportedProfile[0] = "https://api.iknl.nl/docs/pzp/r4/StructureDefinition/ACP-LegallyCapable"
+    * supportedProfile[0] = "https://api.iknl.nl/docs/pzp/r4/StructureDefinition/ACP-LegallyCapableTreatmentDecisions"
       * extension
         * url = $CapExpectation
         * valueCode = #SHOULD 

diff --git a/input/fsh/CommunicationRequest.fsh b/input/fsh/CommunicationRequest.fsh
@@ -2,7 +2,7 @@ Profile: ACPInformRelativesRequest
 Parent: CommunicationRequest
 Id: ACP-InformRelativesRequest
 Title: "ACP Request to Inform Relatives"
-Description: "A CommunicationRequest representing the advice or instruction given to the patient to discuss their advance care planning (ACP) and treatment agreements with their relatives or proxies."
+Description: "A CommunicationRequest representing the advice or instruction given to the patient to discuss their advance care planning (ACP) and treatment agreements with their relatives or proxies. Based on CommunicationRequest resource."
 * insert MetaRules
 * category 1..*
 * category = $snomed#223449006
@@ -14,7 +14,6 @@ Description: "A CommunicationRequest representing the advice or instruction give
 * requester only Reference(ACPHealthProfessionalPractitionerRole or ACPHealthProfessionalPractitioner) 
 * sender 1..1
 * sender only Reference(ACPPatient)
-* recipient only Reference(ACPContactPerson)
 * reasonCode 1..*
 * reasonCode = $snomed#713603004 // "advance care planning"
 * obeys cr-date-required
@@ -25,7 +24,6 @@ Description: "A CommunicationRequest representing the advice or instruction give
 * insert ObligationRules(authoredOn) // not explicitly required/defined in dataset but important for context
 * insert ObligationRules(requester)
 * insert ObligationRules(sender)
-* insert ObligationRules(recipient)
 * insert ObligationRules(reasonCode) // already 1..1 so may not be needed place under obligation but added for consistency
 
 
@@ -39,7 +37,7 @@ Mapping: MapACPInformRelativesRequest
 Id: pall-izppz-zib2020
 Title: "ACP dataset"
 Source: ACPInformRelativesRequest
-Target: "https://decor.nictiz.nl/exist/apps/api/dataset/2.16.840.1.113883.2.4.3.11.60.117.1.1/2020-07-29T10%3A37%3A48/$view?language=nl-NL&ui=nl-NL&format=html&hidecolumns=3456gh&release=2026-05-12T07%3A58%3A08"
+Target: "https://decor.nictiz.nl/exist/apps/api/dataset/2.16.840.1.113883.2.4.3.11.60.117.1.1/2020-07-29T10%3A37%3A48/$view?language=nl-NL&ui=nl-NL&format=html&hidecolumns=3456gh&release=2026-08-10T10%3A11%3A40"
 * -> "734" "Heeft u patient geïnformeerd over eigen verantwoordelijkheid om deze behandelafspraken met naasten te bespreken?"
 
 

diff --git a/input/fsh/Consent.fsh b/input/fsh/Consent.fsh
@@ -23,7 +23,7 @@ Mapping: MapACPAdvanceDirective
 Id: pall-izppz-zib2020
 Title: "ACP dataset"
 Source: ACPAdvanceDirective
-Target: "https://decor.nictiz.nl/exist/apps/api/dataset/2.16.840.1.113883.2.4.3.11.60.117.1.1/2020-07-29T10%3A37%3A48/$view?language=nl-NL&ui=nl-NL&format=html&hidecolumns=3456gh&release=2026-05-12T07%3A58%3A08"
+Target: "https://decor.nictiz.nl/exist/apps/api/dataset/2.16.840.1.113883.2.4.3.11.60.117.1.1/2020-07-29T10%3A37%3A48/$view?language=nl-NL&ui=nl-NL&format=html&hidecolumns=3456gh&release=2026-08-10T10%3A11%3A40"
 * -> "690" "Euthanasieverklaring (Wilsverklaring)"
 * -> "700" "Keuze orgaandonatie vastgelegd (Wilsverklaring)"
 * -> "721" "Eerder vastgelegde behandelafspraken (Wilsverklaring)"
@@ -126,7 +126,7 @@ Mapping: MapACPTreatmentDirective
 Id: pall-izppz-zib2020
 Title: "ACP dataset"
 Source: ACPTreatmentDirective
-Target: "https://decor.nictiz.nl/exist/apps/api/dataset/2.16.840.1.113883.2.4.3.11.60.117.1.1/2020-07-29T10%3A37%3A48/$view?language=nl-NL&ui=nl-NL&format=html&hidecolumns=3456gh&release=2026-05-12T07%3A58%3A08"
+Target: "https://decor.nictiz.nl/exist/apps/api/dataset/2.16.840.1.113883.2.4.3.11.60.117.1.1/2020-07-29T10%3A37%3A48/$view?language=nl-NL&ui=nl-NL&format=html&hidecolumns=3456gh&release=2026-08-10T10%3A11%3A40"
 * -> "602" "Behandelgrens (BehandelAanwijzing)"
 * -> "637" "Afspraak uitzetten ICD (BehandelAanwijzing)"
 * modifierExtension[specificationOther] -> "605" "SpecificatieAnders"

diff --git a/input/fsh/Device.fsh b/input/fsh/Device.fsh
@@ -18,7 +18,7 @@ Mapping: MapACPMedicalDeviceProductICD
 Id: pall-izppz-zib2020
 Title: "ACP dataset"
 Source: ACPMedicalDeviceProductICD
-Target: "https://decor.nictiz.nl/exist/apps/api/dataset/2.16.840.1.113883.2.4.3.11.60.117.1.1/2020-07-29T10%3A37%3A48/$view?language=nl-NL&ui=nl-NL&format=html&hidecolumns=3456gh&release=2026-05-12T07%3A58%3A08"
+Target: "https://decor.nictiz.nl/exist/apps/api/dataset/2.16.840.1.113883.2.4.3.11.60.117.1.1/2020-07-29T10%3A37%3A48/$view?language=nl-NL&ui=nl-NL&format=html&hidecolumns=3456gh&release=2026-08-10T10%3A11%3A40"
 * -> "621" "Product"
 * identifier[gs1ProductID] -> "622" "ProductID"
 * identifier[hibcProductID] -> "622" "ProductID"

diff --git a/input/fsh/DeviceUseStatement.fsh b/input/fsh/DeviceUseStatement.fsh
@@ -22,7 +22,7 @@ Mapping: MapACPMedicalDevice
 Id: pall-izppz-zib2020
 Title: "ACP dataset"
 Source: ACPMedicalDevice
-Target: "https://decor.nictiz.nl/exist/apps/api/dataset/2.16.840.1.113883.2.4.3.11.60.117.1.1/2020-07-29T10%3A37%3A48/$view?language=nl-NL&ui=nl-NL&format=html&hidecolumns=3456gh&release=2026-05-12T07%3A58%3A08"
+Target: "https://decor.nictiz.nl/exist/apps/api/dataset/2.16.840.1.113883.2.4.3.11.60.117.1.1/2020-07-29T10%3A37%3A48/$view?language=nl-NL&ui=nl-NL&format=html&hidecolumns=3456gh&release=2026-08-10T10%3A11%3A40"
 * -> "619" "Heeft de patient een ICD?"
 * -> "620" "ICD (MedischHulpmiddel)"
 * extension[healthProfessional]  -> "635" "Zorgverlener"

diff --git a/input/fsh/Encounter.fsh b/input/fsh/Encounter.fsh
@@ -28,7 +28,7 @@ Mapping: MapACPEncounter
 Id: pall-izppz-zib2020
 Title: "ACP dataset"
 Source: ACPEncounter
-Target: "https://decor.nictiz.nl/exist/apps/api/dataset/2.16.840.1.113883.2.4.3.11.60.117.1.1/2020-07-29T10%3A37%3A48/$view?language=nl-NL&ui=nl-NL&format=html&hidecolumns=3456gh&release=2026-05-12T07%3A58%3A08"
+Target: "https://decor.nictiz.nl/exist/apps/api/dataset/2.16.840.1.113883.2.4.3.11.60.117.1.1/2020-07-29T10%3A37%3A48/$view?language=nl-NL&ui=nl-NL&format=html&hidecolumns=3456gh&release=2026-08-10T10%3A11%3A40"
 * -> "808" "Contact"
 * class -> "809" "ContactType"
 * subject -> "514" "Gesprek gevoerd in bijzijn van (Patient)" // In R5 patient is added to .participant.individual. For now, if present at .subject, we assume the patient was present. Also clear from the definition of the subject element: "The patient or group present at the encounter" 

diff --git a/input/fsh/Goal.fsh b/input/fsh/Goal.fsh
@@ -19,7 +19,7 @@ Mapping: MapACPMedicalPolicyGoal
 Id: pall-izppz-zib2020
 Title: "ACP dataset"
 Source: ACPMedicalPolicyGoal
-Target: "https://decor.nictiz.nl/exist/apps/api/dataset/2.16.840.1.113883.2.4.3.11.60.117.1.1/2020-07-29T10%3A37%3A48/$view?language=nl-NL&ui=nl-NL&format=html&hidecolumns=3456gh&release=2026-05-12T07%3A58%3A08"
+Target: "https://decor.nictiz.nl/exist/apps/api/dataset/2.16.840.1.113883.2.4.3.11.60.117.1.1/2020-07-29T10%3A37%3A48/$view?language=nl-NL&ui=nl-NL&format=html&hidecolumns=3456gh&release=2026-08-10T10%3A11%3A40"
 * -> "590" "Belangrijkste doel van behandeling ([Meting])"
 * -> "591" "Belangrijkste doel van behandeling ([MetingNaam])"
 * description -> "592" "Doel ([MetingWaarde])"

diff --git a/input/fsh/Observation.fsh b/input/fsh/Observation.fsh
@@ -28,7 +28,7 @@ Mapping: MapACPSpecificCareWishes
 Id: pall-izppz-zib2020
 Title: "ACP dataset"
 Source: ACPSpecificCareWishes
-Target: "https://decor.nictiz.nl/exist/apps/api/dataset/2.16.840.1.113883.2.4.3.11.60.117.1.1/2020-07-29T10%3A37%3A48/$view?language=nl-NL&ui=nl-NL&format=html&hidecolumns=3456gh&release=2026-05-12T07%3A58%3A08"
+Target: "https://decor.nictiz.nl/exist/apps/api/dataset/2.16.840.1.113883.2.4.3.11.60.117.1.1/2020-07-29T10%3A37%3A48/$view?language=nl-NL&ui=nl-NL&format=html&hidecolumns=3456gh&release=2026-08-10T10%3A11%3A40"
 * -> "654" "Specifieke wensen ([Meting])"
 * code -> "655" "Wens en verwachting patient ([MetingNaam])"
 * valueString -> "656" "Wens en verwachting patient ([MetingWaarde])"
@@ -101,7 +101,7 @@ Mapping: MapACPSPreferredPlaceOfDeath
 Id: pall-izppz-zib2020
 Title: "ACP dataset"
 Source: ACPPreferredPlaceOfDeath
-Target: "https://decor.nictiz.nl/exist/apps/api/dataset/2.16.840.1.113883.2.4.3.11.60.117.1.1/2020-07-29T10%3A37%3A48/$view?language=nl-NL&ui=nl-NL&format=html&hidecolumns=3456gh&release=2026-05-12T07%3A58%3A08"
+Target: "https://decor.nictiz.nl/exist/apps/api/dataset/2.16.840.1.113883.2.4.3.11.60.117.1.1/2020-07-29T10%3A37%3A48/$view?language=nl-NL&ui=nl-NL&format=html&hidecolumns=3456gh&release=2026-08-10T10%3A11%3A40"
 * -> "666" "Gewenste plek van overlijden ([Meting]))"
 * code -> "667" "Gewenste plek van overlijden ([Meting])"
 * valueCodeableConcept -> "668" "Voorkeursplek ([MetingWaarde])"
@@ -130,7 +130,7 @@ Usage: #example
 
 Instance: ACP-PreferredPlaceOfDeath-Pat2
 InstanceOf: ACPPreferredPlaceOfDeath
-Title: "ACP Preferred Place Of Death - Pat 2"
+Title: "ACP Preferred Place of Death - Pat 2"
 Usage: #example
 * identifier.type = $v2-0203#RI "Resource identifier"
 * identifier.system = "https://acme.com/fhir/NamingSystem/resource-business-identifier"
@@ -173,7 +173,7 @@ Mapping: MapACPPositionRegardingEuthanasia
 Id: pall-izppz-zib2020
 Title: "ACP dataset"
 Source: ACPPositionRegardingEuthanasia
-Target: "https://decor.nictiz.nl/exist/apps/api/dataset/2.16.840.1.113883.2.4.3.11.60.117.1.1/2020-07-29T10%3A37%3A48/$view?language=nl-NL&ui=nl-NL&format=html&hidecolumns=3456gh&release=2026-05-12T07%3A58%3A08"
+Target: "https://decor.nictiz.nl/exist/apps/api/dataset/2.16.840.1.113883.2.4.3.11.60.117.1.1/2020-07-29T10%3A37%3A48/$view?language=nl-NL&ui=nl-NL&format=html&hidecolumns=3456gh&release=2026-08-10T10%3A11%3A40"
 * -> "678" "Euthanasie standpunt ([Meting])"
 * code -> "679" "Euthanasie standpunt ([MetingNaam])"
 * valueCodeableConcept -> "680" "Euthanasie standpunt ([MetingWaarde])"
@@ -243,7 +243,7 @@ Mapping: MapACPOrganDonationChoiceRegistration
 Id: pall-izppz-zib2020
 Title: "ACP dataset"
 Source: ACPOrganDonationChoiceRegistration
-Target: "https://decor.nictiz.nl/exist/apps/api/dataset/2.16.840.1.113883.2.4.3.11.60.117.1.1/2020-07-29T10%3A37%3A48/$view?language=nl-NL&ui=nl-NL&format=html&hidecolumns=3456gh&release=2026-05-12T07%3A58%3A08"
+Target: "https://decor.nictiz.nl/exist/apps/api/dataset/2.16.840.1.113883.2.4.3.11.60.117.1.1/2020-07-29T10%3A37%3A48/$view?language=nl-NL&ui=nl-NL&format=html&hidecolumns=3456gh&release=2026-08-10T10%3A11%3A40"
 * -> "746" "Keuze orgaandonatie vastgelegd in donorregister? ([Meting])"
 * code -> "747" "Keuze orgaandonatie vastgelegd in donorregister? ([MetingNaam])"
 * valueCodeableConcept -> "748" "Keuze orgaandonatie in donorregister ([MetingWaarde])"
@@ -270,7 +270,7 @@ Usage: #example
 
 Instance: ACP-OrganDonationChoiceRegistrationInDonorRegister-Pat2
 InstanceOf: ACPOrganDonationChoiceRegistration
-Title: "ACP Organ Donation Choice Registration In Donor Register - Pat 2"
+Title: "ACP Organ Donation Choice Registration in Donor Register - Pat 2"
 Usage: #example
 * identifier.type = $v2-0203#RI "Resource identifier"
 * identifier.system = "https://acme.com/fhir/NamingSystem/resource-business-identifier"
@@ -310,7 +310,7 @@ Mapping: MapACPSenseOfPurpose
 Id: pall-izppz-zib2020
 Title: "ACP dataset"
 Source: ACPSenseOfPurpose
-Target: "https://decor.nictiz.nl/exist/apps/api/dataset/2.16.840.1.113883.2.4.3.11.60.117.1.1/2020-07-29T10%3A37%3A48/$view?language=nl-NL&ui=nl-NL&format=html&hidecolumns=3456gh&release=2026-05-12T07%3A58%3A08"
+Target: "https://decor.nictiz.nl/exist/apps/api/dataset/2.16.840.1.113883.2.4.3.11.60.117.1.1/2020-07-29T10%3A37%3A48/$view?language=nl-NL&ui=nl-NL&format=html&hidecolumns=3456gh&release=2026-08-10T10%3A11%3A40"
 * -> "709" "Wat verder nog belangrijk is ([Meting])"
 * code -> "710" "Wat verder nog belangrijk is ([MetingNaam])"
 * valueString -> "711" "Wat verder nog belangrijk is ([MetingWaarde])"
@@ -350,10 +350,10 @@ Usage: #example
 * effectiveDateTime = "2025-08-07"
 
 
-Profile: ACPLegallyCapable
+Profile: ACPLegallyCapableTreatmentDecisions
 Parent: Observation
-Id: ACP-LegallyCapable
-Title: "ACP Legally Capable"
+Id: ACP-LegallyCapableTreatmentDecisions
+Title: "ACP Legally Capable Regarding Medical Treatment Decisions"
 Description: "Indicates whether the patient is currently assessed as having the capacity to understand and oversee the consequences of medical treatment decisions. If the patient is not legally capable, there should be a legal representative captured in a RelatedPerson resource. Based on Observation resource."
 * insert MetaRules
 * encounter only Reference(ACPEncounter)
@@ -370,20 +370,20 @@ Description: "Indicates whether the patient is currently assessed as having the
 * insert ObligationRules(note.text)
 * insert ObligationRules(performer)
 
-Mapping: MapACPLegallyCapable
+Mapping: MapACPLegallyCapableTreatmentDecisions
 Id: pall-izppz-zib2020
 Title: "ACP dataset"
-Source: ACPLegallyCapable
+Source: ACPLegallyCapableTreatmentDecisions
 Target: "https://decor.nictiz.nl/exist/apps/api/dataset/2.16.840.1.113883.2.4.3.11.60.117.1.1/2020-07-29T10%3A37%3A48/$view?language=nl-NL&ui=nl-NL&format=html&hidecolumns=3456gh&release=2026-02-24T09:29:59"
 * -> "761" "Wilsbekwaamheid m.b.t. medische behandelbeslissingen"
 * valueBoolean -> "762" "Wilsbekwaamheid m.b.t. medische behandelbeslissingen"
 * dataAbsentReason -> "762" "Wilsbekwaamheid m.b.t. medische behandelbeslissingen"
 * note.text -> "763" "[Toelichting]"
 
 
-Instance: ACP-LegallyCapable-Pat1
-InstanceOf: ACPLegallyCapable
-Title: "ACP Legally Capable - Pat 1"
+Instance: ACP-LegallyCapableTreatmentDecisions-Pat1
+InstanceOf: ACPLegallyCapableTreatmentDecisions
+Title: "ACP Legally Capable Regarding Medical Treatment Decisions - Pat 1"
 Usage: #example
 * identifier.type = $v2-0203#RI "Resource identifier"
 * identifier.system = "https://acme.com/fhir/NamingSystem/resource-business-identifier"
@@ -397,9 +397,9 @@ Usage: #example
 * effectiveDateTime = "2020-10-01"
 
 
-Instance: ACP-LegallyCapable-Pat2
-InstanceOf: ACPLegallyCapable
-Title: "ACP Legally Capable - Pat 2"
+Instance: ACP-LegallyCapableTreatmentDecisions-Pat2
+InstanceOf: ACPLegallyCapableTreatmentDecisions
+Title: "ACP Legally Capable Regarding Medical Treatment Decisions - Pat 2"
 Usage: #example
 * identifier.type = $v2-0203#RI "Resource identifier"
 * identifier.system = "https://acme.com/fhir/NamingSystem/resource-business-identifier"

diff --git a/input/fsh/Patient.fsh b/input/fsh/Patient.fsh
@@ -45,7 +45,7 @@ Mapping: MapACPPatient
 Id: pall-izppz-zib2020
 Title: "ACP dataset"
 Source: ACPPatient
-Target: "https://decor.nictiz.nl/exist/apps/api/dataset/2.16.840.1.113883.2.4.3.11.60.117.1.1/2020-07-29T10%3A37%3A48/$view?language=nl-NL&ui=nl-NL&format=html&hidecolumns=3456gh&release=2026-05-12T07%3A58%3A08"
+Target: "https://decor.nictiz.nl/exist/apps/api/dataset/2.16.840.1.113883.2.4.3.11.60.117.1.1/2020-07-29T10%3A37%3A48/$view?language=nl-NL&ui=nl-NL&format=html&hidecolumns=3456gh&release=2026-08-10T10%3A11%3A40"
 * -> "351" "Patient"
 * -> "613" "Patient"
 * -> "648" "Patient"
@@ -187,4 +187,10 @@ Usage: #example
 * address.postalCode = "3011BN"
 * address.country = "Nederland"
 * address.country.extension.url = "http://nictiz.nl/fhir/StructureDefinition/ext-CodeSpecification"
-* address.country.extension.valueCodeableConcept.coding = urn:iso:std:iso:3166#NL "Netherlands"
+* address.country.extension.valueCodeableConcept.coding = urn:iso:std:iso:3166#NL "Netherlands"
+* contact[0].name.text = "Gert-Jan de Jong"
+* contact[=].name.use = #official
+* contact[=].extension[relatedPerson].valueReference = Reference(ACP-ContactPerson-GertJanDeJong-Pat2)
+* contact[+].name.text = "Maya van der Sluijs-Mulder"
+* contact[=].name.use = #official
+* contact[=].extension[relatedPerson].valueReference = Reference(ACP-ContactPerson-MayaVanDerSluijsMulder-Pat2)
diff --git a/input/fsh/Practitioner.fsh b/input/fsh/Practitioner.fsh
@@ -15,7 +15,7 @@ Mapping: MapACPHealthProfessionalPractitioner
 Id: pall-izppz-zib2020
 Title: "ACP dataset"
 Source: ACPHealthProfessionalPractitioner
-Target: "https://decor.nictiz.nl/exist/apps/api/dataset/2.16.840.1.113883.2.4.3.11.60.117.1.1/2020-07-29T10%3A37%3A48/$view?language=nl-NL&ui=nl-NL&format=html&hidecolumns=3456gh&release=2026-05-12T07%3A58%3A08"
+Target: "https://decor.nictiz.nl/exist/apps/api/dataset/2.16.840.1.113883.2.4.3.11.60.117.1.1/2020-07-29T10%3A37%3A48/$view?language=nl-NL&ui=nl-NL&format=html&hidecolumns=3456gh&release=2026-08-10T10%3A11%3A40"
 * -> "391" "Gesprek gevoerd door (Zorgverlener)"
 * identifier -> "392" "ZorgverlenerIdentificatienummer"
 * name -> "393" "Naamgegevens"

diff --git a/input/fsh/PractitionerRole.fsh b/input/fsh/PractitionerRole.fsh
@@ -13,7 +13,7 @@ Mapping: MapACPHealthProfessionalPractitionerRole
 Id: pall-izppz-zib2020
 Title: "ACP dataset"
 Source: ACPHealthProfessionalPractitionerRole
-Target: "https://decor.nictiz.nl/exist/apps/api/dataset/2.16.840.1.113883.2.4.3.11.60.117.1.1/2020-07-29T10%3A37%3A48/$view?language=nl-NL&ui=nl-NL&format=html&hidecolumns=3456gh&release=2026-05-12T07%3A58%3A08"
+Target: "https://decor.nictiz.nl/exist/apps/api/dataset/2.16.840.1.113883.2.4.3.11.60.117.1.1/2020-07-29T10%3A37%3A48/$view?language=nl-NL&ui=nl-NL&format=html&hidecolumns=3456gh&release=2026-08-10T10%3A11%3A40"
 * -> "391" "Gesprek gevoerd door (Zorgverlener)"
 * -> "617" "Zorgverlener"
 * -> "636" "Zorgverlener"

diff --git a/input/fsh/Procedure.fsh b/input/fsh/Procedure.fsh
@@ -17,7 +17,7 @@ Mapping: MapACPProcedure
 Id: pall-izppz-zib2020
 Title: "ACP dataset"
 Source: ACPProcedure
-Target: "https://decor.nictiz.nl/exist/apps/api/dataset/2.16.840.1.113883.2.4.3.11.60.117.1.1/2020-07-29T10%3A37%3A48/$view?language=nl-NL&ui=nl-NL&format=html&hidecolumns=3456gh&release=2026-05-12T07%3A58%3A08"
+Target: "https://decor.nictiz.nl/exist/apps/api/dataset/2.16.840.1.113883.2.4.3.11.60.117.1.1/2020-07-29T10%3A37%3A48/$view?language=nl-NL&ui=nl-NL&format=html&hidecolumns=3456gh&release=2026-08-10T10%3A11%3A40"
 * -> "820" "Verrichting"
 * code -> "827" "PZP gesprek (VerrichtingType)"
 

diff --git a/input/fsh/RelatedPerson.fsh b/input/fsh/RelatedPerson.fsh
@@ -52,7 +52,7 @@ Mapping: MapACPContactPerson
 Id: pall-izppz-zib2020
 Title: "ACP dataset"
 Source: ACPContactPerson
-Target: "https://decor.nictiz.nl/exist/apps/api/dataset/2.16.840.1.113883.2.4.3.11.60.117.1.1/2020-07-29T10%3A37%3A48/$view?language=nl-NL&ui=nl-NL&format=html&hidecolumns=3456gh&release=2026-05-12T07%3A58%3A08"
+Target: "https://decor.nictiz.nl/exist/apps/api/dataset/2.16.840.1.113883.2.4.3.11.60.117.1.1/2020-07-29T10%3A37%3A48/$view?language=nl-NL&ui=nl-NL&format=html&hidecolumns=3456gh&release=2026-08-10T10%3A11%3A40"
 * -> "441" "Wettelijk vertegenwoordiger (Contactpersoon)"
 * -> "478" "Eerste contactpersoon (Contactpersoon)" 
 * -> "615" "Contactpersoon"