diff --git a/xml/FHIR-phr.xml b/xml/FHIR-phr.xml
index c994a695..059d9098 100644
--- a/xml/FHIR-phr.xml
+++ b/xml/FHIR-phr.xml
@@ -23,16 +23,16 @@
     <artifact id="SearchParameter/patient-identifier" key="SearchParameter-patient-identifier" name="PatientIdentifierSearchParameter"/>
     <artifact id="SearchParameter/search-from-date" key="SearchParameter-search-from-date" name="SearchFromDateSearchParameter"/>
 
-    <artifact id="StructureDefinition/apple-health-kit-category-sample" key="StructureDefinition-AppleHealthKitCategorySample" name="Apple HealthKit Category Sample Logical Model"/>
-    <artifact id="StructureDefinition/apple-health-kit-correlation-sample" key="StructureDefinition-AppleHealthKitCorrelationSample" name="Apple HealthKit Correlation Sample Logical Model"/>
-    <artifact id="StructureDefinition/apple-health-kit-healthstore-characteristic" key="StructureDefinition-AppleHealthKitHealthStoreCharacteristic" name="Apple HealthKit HealthStore Characteristic Logical Model"/>
-    <artifact id="StructureDefinition/apple-health-kit-object" key="StructureDefinition-AppleHealthKitObject" name="Apple HealthKit Object Logical Model"/>
-    <artifact id="StructureDefinition/apple-health-kit-quantity-sample" key="StructureDefinition-AppleHealthKitQuantitySample" name="Apple HealthKit Quantity Sample Logical Model"/>
-    <artifact id="StructureDefinition/apple-health-kit-sample" key="StructureDefinition-AppleHealthKitSample" name="Apple HealthKit Sample Logical Model"/>
-    <artifact id="StructureDefinition/apple-health-kit-workout-activity" key="StructureDefinition-AppleHealthKitWorkoutActivity" name="Apple HealthKit Workout Activity Logical Model"/>
-    <artifact id="StructureDefinition/apple-health-kit-workout-event" key="StructureDefinition-AppleHealthKitWorkoutEvent" name="Apple HealthKit Workout Event Logical Model"/>
-    <artifact id="StructureDefinition/apple-health-kit-workout-sample" key="StructureDefinition-AppleHealthKitWorkoutSample" name="Apple HealthKit Workout Sample Logical Model"/>
-    <artifact id="StructureDefinition/pcd-sleep-observation" key="StructureDefinition-PCDSleepObservation" name="Patient contributed data: sleep observation"/>
+    <artifact id="StructureDefinition/AppleHealthKitCategorySample" key="StructureDefinition-AppleHealthKitCategorySample" name="Apple HealthKit Category Sample Logical Model"/>
+    <artifact id="StructureDefinition/AppleHealthKitCorrelationSample" key="StructureDefinition-AppleHealthKitCorrelationSample" name="Apple HealthKit Correlation Sample Logical Model"/>
+    <artifact id="StructureDefinition/AppleHealthKitHealthStoreCharacteristic" key="StructureDefinition-AppleHealthKitHealthStoreCharacteristic" name="Apple HealthKit HealthStore Characteristic Logical Model"/>
+    <artifact id="StructureDefinition/AppleHealthKitObject" key="StructureDefinition-AppleHealthKitObject" name="Apple HealthKit Object Logical Model"/>
+    <artifact id="StructureDefinition/AppleHealthKitQuantitySample" key="StructureDefinition-AppleHealthKitQuantitySample" name="Apple HealthKit Quantity Sample Logical Model"/>
+    <artifact id="StructureDefinition/AppleHealthKitSample" key="StructureDefinition-AppleHealthKitSample" name="Apple HealthKit Sample Logical Model"/>
+    <artifact id="StructureDefinition/AppleHealthKitWorkoutActivity" key="StructureDefinition-AppleHealthKitWorkoutActivity" name="Apple HealthKit Workout Activity Logical Model"/>
+    <artifact id="StructureDefinition/AppleHealthKitWorkoutEvent" key="StructureDefinition-AppleHealthKitWorkoutEvent" name="Apple HealthKit Workout Event Logical Model"/>
+    <artifact id="StructureDefinition/AppleHealthKitWorkoutSample" key="StructureDefinition-AppleHealthKitWorkoutSample" name="Apple HealthKit Workout Sample Logical Model"/>
+    <artifact id="StructureDefinition/PCDSleepObservation" key="StructureDefinition-PCDSleepObservation" name="Patient contributed data: sleep observation"/>
     <artifact id="StructureDefinition/Environmental" key="StructureDefinition-Environmental" name="Environmental"/>
     <artifact id="StructureDefinition/NutrientOuttake" key="StructureDefinition-NutrientOuttake" name="NutrientOuttake"/>
     <artifact id="StructureDefinition/PhrBundle" key="StructureDefinition-PhrBundle" name="PhrBundle"/>
@@ -43,16 +43,16 @@
     <artifact id="StructureDefinition/PhrProvenance" key="StructureDefinition-PhrProvenance" name="PhrProvenance"/>
     <artifact id="StructureDefinition/SocialMedia" key="StructureDefinition-SocialMedia" name="SocialMedia"/>
 
-    <artifact id="ValueSet/apple-health-kit-biological-sex-value-set" key="ValueSet-AppleHealthKitBiologicalSexValueSet" name="Apple HealthKit Biological Sex Value Set"/>
-    <artifact id="ValueSet/apple-health-kit-category-type-value-set" key="ValueSet-AppleHealthKitCategoryTypeValueSet" name="Apple HealthKit Category Type Value Set"/>
-    <artifact id="ValueSet/apple-health-kit-characteristic-type-value-set" key="ValueSet-AppleHealthKitCharacteristicTypeValueSet" name="Apple HealthKit Charactersitic Type Value Set"/>
-    <artifact id="ValueSet/apple-health-kit-correlation-type-value-set" key="ValueSet-AppleHealthKitCorrelationTypeValueSet" name="Apple HealthKit Correlation Type Value Set"/>
-    <artifact id="ValueSet/apple-health-kit-quantity-type-value-set" key="ValueSet-AppleHealthKitQuantityTypeValueSet" name="Apple HealthKit Quantity Type Value Set"/>
-    <artifact id="ValueSet/apple-health-kit-sample-type-value-set" key="ValueSet-AppleHealthKitSampleTypeValueSet" name="Apple HealthKit Sample Type Value Set"/>
-    <artifact id="ValueSet/apple-health-kit-workout-activity-type-value-set" key="ValueSet-AppleHealthKitWorkoutActivityTypeValueSet" name="Apple HealthKit Workout Activity Type Value Set"/>
-    <artifact id="ValueSet/apple-health-kit-workout-event-type-value-set" key="ValueSet-AppleHealthKitWorkoutEventTypeValueSet" name="Apple HealthKit Workout Event Type Value Set"/>
-    <artifact id="ValueSet/pcd-sleep-observation-code" key="ValueSet-PCDSleepObservationCode" name="Patient contributed data: sleep observation code"/>
-    <artifact id="ValueSet/pcd-sleep-observation-value" key="ValueSet-PCDSleepStageValueCode" name="Patient contributed data: sleep stage value"/>
+    <artifact id="ValueSet/AppleHealthKitBiologicalSexValueSet" key="ValueSet-AppleHealthKitBiologicalSexValueSet" name="Apple HealthKit Biological Sex Value Set"/>
+    <artifact id="ValueSet/AppleHealthKitCategoryTypeValueSet" key="ValueSet-AppleHealthKitCategoryTypeValueSet" name="Apple HealthKit Category Type Value Set"/>
+    <artifact id="ValueSet/AppleHealthKitCharacteristicTypeValueSet" key="ValueSet-AppleHealthKitCharacteristicTypeValueSet" name="Apple HealthKit Charactersitic Type Value Set"/>
+    <artifact id="ValueSet/AppleHealthKitCorrelationTypeValueSet" key="ValueSet-AppleHealthKitCorrelationTypeValueSet" name="Apple HealthKit Correlation Type Value Set"/>
+    <artifact id="ValueSet/AppleHealthKitQuantityTypeValueSet" key="ValueSet-AppleHealthKitQuantityTypeValueSet" name="Apple HealthKit Quantity Type Value Set"/>
+    <artifact id="ValueSet/AppleHealthKitSampleTypeValueSet" key="ValueSet-AppleHealthKitSampleTypeValueSet" name="Apple HealthKit Sample Type Value Set"/>
+    <artifact id="ValueSet/AppleHealthKitWorkoutActivityTypeValueSet" key="ValueSet-AppleHealthKitWorkoutActivityTypeValueSet" name="Apple HealthKit Workout Activity Type Value Set"/>
+    <artifact id="ValueSet/AppleHealthKitWorkoutEventTypeValueSet" key="ValueSet-AppleHealthKitWorkoutEventTypeValueSet" name="Apple HealthKit Workout Event Type Value Set"/>
+    <artifact id="ValueSet/PCDSleepObservationCode" key="ValueSet-PCDSleepObservationCode" name="Patient contributed data: sleep observation code"/>
+    <artifact id="ValueSet/PCDSleepStageValueCode" key="ValueSet-PCDSleepStageValueCode" name="Patient contributed data: sleep stage value"/>
 
     <page key="NA" name="(NA)"/>
     <page key="many" name="(many)"/>