Updated canonicals; added extension context

WorldHealthOrganization · Apr 13, 2020 · 9a00e5d · 9a00e5d
1 parent e112cfa
commit 9a00e5d
Show file tree

Hide file tree

Showing 46 changed files with 70 additions and 64 deletions.
diff --git a/input/extensions/structuredefinition-deliverymethod.json b/input/extensions/structuredefinition-deliverymethod.json
@@ -1,7 +1,7 @@
 {
   "resourceType": "StructureDefinition",
   "id": "deliverymethod",
-  "url": "http://hl7.org/fhir/dbcg/fp-cds/ImplementationGuide/fp-cds/StructureDefinition/deliverymethod",
+  "url": "http://fhir.org/guides/who/fp-cds/StructureDefinition/deliverymethod",
   "name": "deliveryMethod",
   "title": "How contraceptive method is being provided",
   "status": "draft",
@@ -10,6 +10,12 @@
   "fhirVersion": "4.0.1",
   "kind": "complex-type",
   "abstract": false,
+  "context": [
+    {
+      "type": "element",
+      "expression": "CarePlan"
+    }
+  ],
   "type": "Extension",
   "baseDefinition": "http://hl7.org/fhir/StructureDefinition/Extension",
   "derivation": "constraint",
@@ -33,7 +39,7 @@
       {
         "id": "Extension.url",
         "path": "Extension.url",
-        "fixedUri": "http://hl7.org/fhir/dbcg/fp-cds/ImplementationGuide/fp-cds/StructureDefinition/deliverymethod"
+        "fixedUri": "http://fhir.org/guides/who/fp-cds/StructureDefinition/deliverymethod"
       },
       {
         "id": "Extension.value[x]",
@@ -48,7 +54,7 @@
         ],
         "binding": {
           "strength": "required",
-          "valueSet": "http://hl7.org/fhir/dbcg/fp-cds/ImplementationGuide/fp-cds/ValueSet/contraceptivedeliverymethod-values"
+          "valueSet": "http://fhir.org/guides/who/fp-cds/ValueSet/contraceptivedeliverymethod-values"
         }
       }
     ]

diff --git a/input/fp-cds.xml b/input/fp-cds.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ImplementationGuide xmlns="http://hl7.org/fhir" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hl7.org/fhir ../input-cache/schemas-r5/fhir-single.xsd">
   <id value="fhir.who.fp-cds"/>
-  <url value="http://fhir.org/guides/who/core/ImplementationGuide/fhir.who.fp-cds"/>
+  <url value="http://fhir.org/guides/who/fp-cds/ImplementationGuide/fhir.who.fp-cds"/>
   <version value="0.1.0" />
-  <name value="DBCGIGStart"/>
+  <name value="FPCDS"/>
   <title value="WHO Family Planning Implementation Guide"/>
   <status value="draft"/>
   <experimental value="false"/>

diff --git a/input/profiles/structuredefinition-who-fp-careplan-backup-contraceptive-method.json b/input/profiles/structuredefinition-who-fp-careplan-backup-contraceptive-method.json
@@ -1,7 +1,7 @@
 {
   "resourceType": "StructureDefinition",
   "id": "who-fp-careplan-backup-contraceptive-method",
-  "url": "http://hl7.org/fhir/dbcg/fp-cds/ImplementationGuide/fp-cds/StructureDefinition/who-fp-careplan-backup-contraceptive-method",
+  "url": "http://fhir.org/guides/who/fp-cds/StructureDefinition/who-fp-careplan-backup-contraceptive-method",
   "name": "WHO-FP CarePlan (Backup Contraceptive Method)",
   "title": "WHO-FP CarePlan (Backup Contraceptive Method)",
   "status": "draft",
@@ -29,7 +29,7 @@
         "mustSupport": true,
         "binding": {
           "strength": "required",
-          "valueSet": "http://hl7.org/fhir/dbcg/fp-cds/ImplementationGuide/fp-cds/ValueSet/backupcontraceptivemethod-values"
+          "valueSet": "http://fhir.org/guides/who/fp-cds/ValueSet/backupcontraceptivemethod-values"
         }
       }
     ]

diff --git a/input/profiles/structuredefinition-who-fp-careplan-exit-contraceptive-method.json b/input/profiles/structuredefinition-who-fp-careplan-exit-contraceptive-method.json
@@ -1,7 +1,7 @@
 {
   "resourceType": "StructureDefinition",
   "id": "who-fp-careplan-exit-contraceptive-method",
-  "url": "http://hl7.org/fhir/dbcg/fp-cds/ImplementationGuide/fp-cds/StructureDefinition/who-fp-careplan-exit-contraceptive-method",
+  "url": "http://fhir.org/guides/who/fp-cds/StructureDefinition/who-fp-careplan-exit-contraceptive-method",
   "name": "WHO-FP CarePlan (Exit Contraceptive Method)",
   "title": "WHO-FP CarePlan (Exit Contraceptive Method)",
   "status": "draft",
@@ -43,7 +43,7 @@
           {
             "code": "Extension",
             "profile": [
-              "http://hl7.org/fhir/dbcg/fp-cds/ImplementationGuide/fp-cds/StructureDefinition/deliverymethod"
+              "http://fhir.org/guides/who/fp-cds/StructureDefinition/deliverymethod"
             ]
           }
         ]

diff --git a/input/profiles/structuredefinition-who-fp-careplan-recommendation.json b/input/profiles/structuredefinition-who-fp-careplan-recommendation.json
@@ -1,7 +1,7 @@
 {
   "resourceType": "StructureDefinition",
   "id": "who-fp-careplan-recommendation",
-  "url": "http://hl7.org/fhir/dbcg/fp-cds/ImplementationGuide/fp-cds/StructureDefinition/who-fp-careplan-recommendation",
+  "url": "http://fhir.org/guides/who/fp-cds/StructureDefinition/who-fp-careplan-recommendation",
   "name": "WHO-FP CarePlan (Recommendation)",
   "title": "WHO-FP CarePlan (Recommendation)",
   "status": "draft",
@@ -27,7 +27,7 @@
         "mustSupport": true,
         "binding": {
           "strength": "required",
-          "valueSet": "http://hl7.org/fhir/dbcg/fp-cds/ImplementationGuide/fp-cds/ValueSet/fp-recommended-care-values"
+          "valueSet": "http://fhir.org/guides/who/fp-cds/ValueSet/fp-recommended-care-values"
         }
       }
     ]

diff --git a/input/profiles/structuredefinition-who-fp-careplan-requested-contraceptive-method.json b/input/profiles/structuredefinition-who-fp-careplan-requested-contraceptive-method.json
@@ -1,7 +1,7 @@
 {
   "resourceType": "StructureDefinition",
   "id": "who-fp-careplan-requested-contraceptive-method",
-  "url": "http://hl7.org/fhir/dbcg/fp-cds/ImplementationGuide/fp-cds/StructureDefinition/who-fp-careplan-requested-contraceptive-method",
+  "url": "http://fhir.org/guides/who/fp-cds/StructureDefinition/who-fp-careplan-requested-contraceptive-method",
   "name": "WHO-FP CarePlan (Requested Contraceptive Method)",
   "title": "WHO-FP CarePlan (Requested Contraceptive Method)",
   "status": "draft",

diff --git a/input/profiles/structuredefinition-who-fp-condition-medical-eligibility.json b/input/profiles/structuredefinition-who-fp-condition-medical-eligibility.json
@@ -1,7 +1,7 @@
 {
   "resourceType": "StructureDefinition",
   "id": "who-fp-condition-medical-eligibility",
-  "url": "http://hl7.org/fhir/dbcg/fp-cds/ImplementationGuide/fp-cds/StructureDefinition/who-fp-condition-medical-eligibility",
+  "url": "http://fhir.org/guides/who/fp-cds/StructureDefinition/who-fp-condition-medical-eligibility",
   "name": "WHO-FP Condition (Medical Eligibility)",
   "title": "WHO-FP Condition (Medical Eligibility)",
   "status": "draft",
@@ -27,7 +27,7 @@
         "mustSupport": true,
         "binding": {
           "strength": "required",
-          "valueSet": "http://hl7.org/fhir/dbcg/fp-cds/ImplementationGuide/fp-cds/ValueSet/medicaleligibilityconditions-values"
+          "valueSet": "http://fhir.org/guides/who/fp-cds/ValueSet/medicaleligibilityconditions-values"
         }
       }
     ]

diff --git a/input/profiles/structuredefinition-who-fp-consent.json b/input/profiles/structuredefinition-who-fp-consent.json
@@ -1,7 +1,7 @@
 {
   "resourceType": "StructureDefinition",
   "id": "who-fp-consent",
-  "url": "http://hl7.org/fhir/dbcg/fp-cds/ImplementationGuide/fp-cds/StructureDefinition/who-fp-consent",
+  "url": "http://fhir.org/guides/who/fp-cds/StructureDefinition/who-fp-consent",
   "name": "WHO-FP Consent",
   "title": "WHO-FP Consent",
   "status": "draft",

diff --git a/input/profiles/structuredefinition-who-fp-deviceusestatement-exit-contraceptive-method.json b/input/profiles/structuredefinition-who-fp-deviceusestatement-exit-contraceptive-method.json
@@ -1,7 +1,7 @@
 {
   "resourceType": "StructureDefinition",
   "id": "who-fp-deviceusestatement-exit-contraceptive-method",
-  "url": "http://hl7.org/fhir/dbcg/fp-cds/ImplementationGuide/fp-cds/StructureDefinition/who-fp-deviceusestatement-exit-contraceptive-method",
+  "url": "http://fhir.org/guides/who/fp-cds/StructureDefinition/who-fp-deviceusestatement-exit-contraceptive-method",
   "name": "WHO-FP DeviceUseStatement (Exit Contraceptive Method)",
   "title": "WHO-FP DeviceUseStatement (Exit Contraceptive Method)",
   "status": "draft",

diff --git a/...rofiles/structuredefinition-who-fp-deviceusestatement-requested-contraceptive-method.json b/...rofiles/structuredefinition-who-fp-deviceusestatement-requested-contraceptive-method.json
@@ -1,7 +1,7 @@
 {
   "resourceType": "StructureDefinition",
   "id": "who-fp-deviceusestatement-requested-contraceptive-method",
-  "url": "http://hl7.org/fhir/dbcg/fp-cds/ImplementationGuide/fp-cds/StructureDefinition/who-fp-deviceusestatement-requested-contraceptive-method",
+  "url": "http://fhir.org/guides/who/fp-cds/StructureDefinition/who-fp-deviceusestatement-requested-contraceptive-method",
   "name": "WHO-FP DeviceUseStatement (Requested Contraceptive Method)",
   "title": "WHO-FP DeviceUseStatement (Requested Contraceptive Method)",
   "status": "draft",

diff --git a/input/profiles/structuredefinition-who-fp-encounter-contraception-issues-and-concerns.json b/input/profiles/structuredefinition-who-fp-encounter-contraception-issues-and-concerns.json
@@ -1,7 +1,7 @@
 {
   "resourceType": "StructureDefinition",
   "id": "who-fp-encounter-contraception-issues-and-concerns",
-  "url": "http://hl7.org/fhir/dbcg/fp-cds/ImplementationGuide/fp-cds/StructureDefinition/who-fp-encounter-contraception-issues-and-concerns",
+  "url": "http://fhir.org/guides/who/fp-cds/StructureDefinition/who-fp-encounter-contraception-issues-and-concerns",
   "name": "WHO-FP Encounter (Contraception Issues and Concerns) ",
   "title": "WHO-FP Encounter (Contraception Issues and Concerns) ",
   "status": "draft",
@@ -29,7 +29,7 @@
         "mustSupport": true,
         "binding": {
           "strength": "extensible",
-          "valueSet": "http://hl7.org/fhir/dbcg/fp-cds/ImplementationGuide/fp-cds/ValueSet/contraception-issues-and-concerns-values"
+          "valueSet": "http://fhir.org/guides/who/fp-cds/ValueSet/contraception-issues-and-concerns-values"
         }
       }
     ]

diff --git a/input/profiles/structuredefinition-who-fp-encounter.json b/input/profiles/structuredefinition-who-fp-encounter.json
@@ -1,7 +1,7 @@
 {
   "resourceType": "StructureDefinition",
   "id": "who-fp-encounter",
-  "url": "http://hl7.org/fhir/dbcg/fp-cds/ImplementationGuide/fp-cds/StructureDefinition/who-fp-encounter",
+  "url": "http://fhir.org/guides/who/fp-cds/StructureDefinition/who-fp-encounter",
   "name": "WHO-FP Encounter",
   "title": "WHO-FP Encounter",
   "status": "draft",
@@ -29,7 +29,7 @@
         "mustSupport": true,
         "binding": {
           "strength": "required",
-          "valueSet": "http://hl7.org/fhir/dbcg/fp-cds/ImplementationGuide/fp-cds/ValueSet/reason-for-family-planning-visit-values"
+          "valueSet": "http://fhir.org/guides/who/fp-cds/ValueSet/reason-for-family-planning-visit-values"
         }
       },
       {

diff --git a/input/profiles/structuredefinition-who-fp-healthcareservice.json b/input/profiles/structuredefinition-who-fp-healthcareservice.json
@@ -1,7 +1,7 @@
 {
   "resourceType": "StructureDefinition",
   "id": "who-fp-healthcareservice",
-  "url": "http://hl7.org/fhir/dbcg/fp-cds/ImplementationGuide/fp-cds/StructureDefinition/who-fp-healthcareservice",
+  "url": "http://fhir.org/guides/who/fp-cds/StructureDefinition/who-fp-healthcareservice",
   "name": "WHO-FP HealthcareService",
   "title": "WHO-FP HealthcareService",
   "status": "draft",

diff --git a/input/profiles/structuredefinition-who-fp-medicationstatement-current-medication.json b/input/profiles/structuredefinition-who-fp-medicationstatement-current-medication.json
@@ -1,7 +1,7 @@
 {
   "resourceType": "StructureDefinition",
   "id": "who-fp-medicationstatement-current-medication",
-  "url": "http://hl7.org/fhir/dbcg/fp-cds/ImplementationGuide/fp-cds/StructureDefinition/who-fp-medicationstatement-current-medication",
+  "url": "http://fhir.org/guides/who/fp-cds/StructureDefinition/who-fp-medicationstatement-current-medication",
   "name": "WHO-FP MedicationStatement (Current Medication)",
   "title": "WHO-FP MedicationStatement (Current Medication)",
   "status": "draft",
@@ -34,7 +34,7 @@
         "mustSupport": true,
         "binding": {
           "strength": "required",
-          "valueSet": "http://hl7.org/fhir/dbcg/fp-cds/ImplementationGuide/fp-cds/ValueSet/current-medications-values"
+          "valueSet": "http://fhir.org/guides/who/fp-cds/ValueSet/current-medications-values"
         }
       }
     ]

diff --git a/input/profiles/structuredefinition-who-fp-medicationstatement-exit-contraceptive-method.json b/input/profiles/structuredefinition-who-fp-medicationstatement-exit-contraceptive-method.json
@@ -1,7 +1,7 @@
 {
   "resourceType": "StructureDefinition",
   "id": "who-fp-medicationstatement-exit-contraceptive-method",
-  "url": "http://hl7.org/fhir/dbcg/fp-cds/ImplementationGuide/fp-cds/StructureDefinition/who-fp-medicationstatement-exit-contraceptive-method",
+  "url": "http://fhir.org/guides/who/fp-cds/StructureDefinition/who-fp-medicationstatement-exit-contraceptive-method",
   "name": "WHO-FP MedicationStatement (Exit Contraceptive Method)",
   "title": "WHO-FP MedicationStatement (Exit Contraceptive Method)",
   "status": "draft",

diff --git a/...ofiles/structuredefinition-who-fp-medicationstatement-requested-contraceptive-method.json b/...ofiles/structuredefinition-who-fp-medicationstatement-requested-contraceptive-method.json
@@ -1,7 +1,7 @@
 {
   "resourceType": "StructureDefinition",
   "id": "who-fp-medicationstatement-requested-contraceptive-method",
-  "url": "http://hl7.org/fhir/dbcg/fp-cds/ImplementationGuide/fp-cds/StructureDefinition/who-fp-medicationstatement-requested-contraceptive-method",
+  "url": "http://fhir.org/guides/who/fp-cds/StructureDefinition/who-fp-medicationstatement-requested-contraceptive-method",
   "name": "WHO-FP MedicationStatement (Requested Contraceptive Method)",
   "title": "WHO-FP MedicationStatement (Requested Contraceptive Method)",
   "status": "draft",

diff --git a/input/profiles/structuredefinition-who-fp-observation-breastfeeding-status.json b/input/profiles/structuredefinition-who-fp-observation-breastfeeding-status.json
@@ -1,7 +1,7 @@
 {
   "resourceType": "StructureDefinition",
   "id": "who-fp-observation-breastfeeding-status",
-  "url": "http://hl7.org/fhir/dbcg/fp-cds/ImplementationGuide/fp-cds/StructureDefinition/who-fp-observation-breastfeeding-status",
+  "url": "http://fhir.org/guides/who/fp-cds/StructureDefinition/who-fp-observation-breastfeeding-status",
   "name": "WHO-FP Observation (Breastfeeding Status)",
   "title": "WHO-FP Observation (Breastfeeding Status)",
   "status": "draft",
@@ -49,7 +49,7 @@
         "mustSupport": true,
         "binding": {
           "strength": "required",
-          "valueSet": "http://hl7.org/fhir/dbcg/fp-cds/ImplementationGuide/fp-cds/ValueSet/breastfeeding-status-values"
+          "valueSet": "http://fhir.org/guides/who/fp-cds/ValueSet/breastfeeding-status-values"
         }
       }
     ]

diff --git a/input/profiles/structuredefinition-who-fp-observation-days-since-last-normal-menses.json b/input/profiles/structuredefinition-who-fp-observation-days-since-last-normal-menses.json
@@ -1,7 +1,7 @@
 {
   "resourceType": "StructureDefinition",
   "id": "who-fp-observation-days-since-last-normal-menses",
-  "url": "http://hl7.org/fhir/dbcg/fp-cds/ImplementationGuide/fp-cds/StructureDefinition/who-fp-observation-days-since-last-normal-menses",
+  "url": "http://fhir.org/guides/who/fp-cds/StructureDefinition/who-fp-observation-days-since-last-normal-menses",
   "name": "WHO-FP Observation (Days since Last Normal Menses)",
   "title": "WHO-FP Observation (Days since Last Normal Menses)",
   "status": "draft",

diff --git a/...profiles/structuredefinition-who-fp-observation-intercourse-since-last-normal-menses.json b/...profiles/structuredefinition-who-fp-observation-intercourse-since-last-normal-menses.json
@@ -1,7 +1,7 @@
 {
   "resourceType": "StructureDefinition",
   "id": "who-fp-observation-intercourse-since-last-normal-menses",
-  "url": "http://hl7.org/fhir/dbcg/fp-cds/ImplementationGuide/fp-cds/StructureDefinition/who-fp-observation-intercourse-since-last-normal-menses",
+  "url": "http://fhir.org/guides/who/fp-cds/StructureDefinition/who-fp-observation-intercourse-since-last-normal-menses",
   "name": "WHO-FP Observation (Intercourse since Last Normal Menses)",
   "title": "WHO-FP Observation (Intercourse since Last Normal Menses)",
   "status": "draft",

diff --git a/input/profiles/structuredefinition-who-fp-observation-medical-eligibility-number.json b/input/profiles/structuredefinition-who-fp-observation-medical-eligibility-number.json
@@ -1,7 +1,7 @@
 {
   "resourceType": "StructureDefinition",
   "id": "who-fp-observation-medical-eligibility-number",
-  "url": "http://hl7.org/fhir/dbcg/fp-cds/ImplementationGuide/fp-cds/StructureDefinition/who-fp-observation-medical-eligibility-number",
+  "url": "http://fhir.org/guides/who/fp-cds/StructureDefinition/who-fp-observation-medical-eligibility-number",
   "name": "WHO-FP Observation (Medical eligibility number)",
   "title": "WHO-FP Observation (Medical eligibility number)",
   "status": "draft",
@@ -35,7 +35,7 @@
         "mustSupport": true,
         "binding": {
           "strength": "required",
-          "valueSet": "http://hl7.org/fhir/dbcg/fp-cds/ImplementationGuide/fp-cds/ValueSet/medicaleligibilitynumber-values"
+          "valueSet": "http://fhir.org/guides/who/fp-cds/ValueSet/medicaleligibilitynumber-values"
         }
       }
     ]

diff --git a/input/profiles/structuredefinition-who-fp-observation-medical-eligibility-text.json b/input/profiles/structuredefinition-who-fp-observation-medical-eligibility-text.json
@@ -1,7 +1,7 @@
 {
   "resourceType": "StructureDefinition",
   "id": "who-fp-observation-medical-eligibility-text",
-  "url": "http://hl7.org/fhir/dbcg/fp-cds/ImplementationGuide/fp-cds/StructureDefinition/who-fp-observation-medical-eligibility-text",
+  "url": "http://fhir.org/guides/who/fp-cds/StructureDefinition/who-fp-observation-medical-eligibility-text",
   "name": "WHO-FP Observation (Medical eligibility text)",
   "title": "WHO-FP Observation (Medical eligibility text)",
   "status": "draft",
@@ -34,7 +34,7 @@
         "mustSupport": true,
         "binding": {
           "strength": "required",
-          "valueSet": "http://hl7.org/fhir/dbcg/fp-cds/ImplementationGuide/fp-cds/ValueSet/medical-eligibility-text-classification-values"
+          "valueSet": "http://fhir.org/guides/who/fp-cds/ValueSet/medical-eligibility-text-classification-values"
         }
       }
     ]

diff --git a/input/profiles/structuredefinition-who-fp-observation-medical-eligibility.json b/input/profiles/structuredefinition-who-fp-observation-medical-eligibility.json
@@ -1,7 +1,7 @@
 {
   "resourceType": "StructureDefinition",
   "id": "who-fp-observation-medical-eligibility",
-  "url": "http://hl7.org/fhir/dbcg/fp-cds/ImplementationGuide/fp-cds/StructureDefinition/who-fp-observation-medical-eligibility",
+  "url": "http://fhir.org/guides/who/fp-cds/StructureDefinition/who-fp-observation-medical-eligibility",
   "name": "WHO-FP Observation (Medical Eligibility)",
   "title": "WHO-FP Observation (Medical Eligibility)",
   "status": "draft",
@@ -27,7 +27,7 @@
         "mustSupport": true,
         "binding": {
           "strength": "required",
-          "valueSet": "http://hl7.org/fhir/dbcg/fp-cds/ImplementationGuide/fp-cds/ValueSet/medicaleligibilityobservations-values"
+          "valueSet": "http://fhir.org/guides/who/fp-cds/ValueSet/medicaleligibilityobservations-values"
         }
       }
     ]

diff --git a/input/profiles/structuredefinition-who-fp-observation-missed-or-late-menses.json b/input/profiles/structuredefinition-who-fp-observation-missed-or-late-menses.json
@@ -1,7 +1,7 @@
 {
   "resourceType": "StructureDefinition",
   "id": "who-fp-observation-missed-or-late-menses",
-  "url": "http://hl7.org/fhir/dbcg/fp-cds/ImplementationGuide/fp-cds/StructureDefinition/who-fp-observation-missed-or-late-menses",
+  "url": "http://fhir.org/guides/who/fp-cds/StructureDefinition/who-fp-observation-missed-or-late-menses",
   "name": "WHO-FP Observation (Missed or Late Menses)",
   "title": "WHO-FP Observation (Missed or Late Menses)",
   "status": "draft",

diff --git a/input/profiles/structuredefinition-who-fp-observation-pregnancy-intention.json b/input/profiles/structuredefinition-who-fp-observation-pregnancy-intention.json
@@ -1,7 +1,7 @@
 {
   "resourceType": "StructureDefinition",
   "id": "who-fp-observation-pregnancy-intention",
-  "url": "http://hl7.org/fhir/dbcg/fp-cds/ImplementationGuide/fp-cds/StructureDefinition/who-fp-observation-pregnancy-intention",
+  "url": "http://fhir.org/guides/who/fp-cds/StructureDefinition/who-fp-observation-pregnancy-intention",
   "name": "WHO-FP Observation (Pregnancy Intention)",
   "title": "WHO-FP Observation (Pregnancy Intention)",
   "status": "draft",
@@ -51,7 +51,7 @@
         "mustSupport": true,
         "binding": {
           "strength": "required",
-          "valueSet": "http://hl7.org/fhir/dbcg/fp-cds/ImplementationGuide/fp-cds/ValueSet/pregnancy-intention-values"
+          "valueSet": "http://fhir.org/guides/who/fp-cds/ValueSet/pregnancy-intention-values"
         }
       }
     ]

diff --git a/...es/structuredefinition-who-fp-observation-reason-for-no-contraceptive-method-at-exit.json b/...es/structuredefinition-who-fp-observation-reason-for-no-contraceptive-method-at-exit.json
@@ -1,7 +1,7 @@
 {
   "resourceType": "StructureDefinition",
   "id": "who-fp-observation-reason-for-no-contraceptive-method-at-exit",
-  "url": "http://hl7.org/fhir/dbcg/fp-cds/ImplementationGuide/fp-cds/StructureDefinition/who-fp-observation-reason-for-no-contraceptive-method-at-exit",
+  "url": "http://fhir.org/guides/who/fp-cds/StructureDefinition/who-fp-observation-reason-for-no-contraceptive-method-at-exit",
   "name": "WHO-FP Observation (Reason for no contraceptive method at exit)",
   "title": "WHO-FP Observation (Reason for no contraceptive method at exit)",
   "status": "draft",
@@ -50,7 +50,7 @@
         "mustSupport": true,
         "binding": {
           "strength": "required",
-          "valueSet": "http://hl7.org/fhir/dbcg/fp-cds/ImplementationGuide/fp-cds/ValueSet/reason-for-no-method-at-exit-values"
+          "valueSet": "http://fhir.org/guides/who/fp-cds/ValueSet/reason-for-no-method-at-exit-values"
         }
       }
     ]

diff --git a/input/profiles/structuredefinition-who-fp-observation-reason-for-stopping-contraception.json b/input/profiles/structuredefinition-who-fp-observation-reason-for-stopping-contraception.json
@@ -1,7 +1,7 @@
 {
   "resourceType": "StructureDefinition",
   "id": "who-fp-observation-reason-for-stopping-contraception",
-  "url": "http://hl7.org/fhir/dbcg/fp-cds/ImplementationGuide/fp-cds/StructureDefinition/who-fp-observation-reason-for-stopping-contraception",
+  "url": "http://fhir.org/guides/who/fp-cds/StructureDefinition/who-fp-observation-reason-for-stopping-contraception",
   "name": "WHO-FP Observation (Reason for Stopping Contraception)",
   "title": "WHO-FP Observation (Reason for Stopping Contraception)",
   "status": "draft",