us_quality_core_test_kit 0.1.2 → 0.2.0

data/lib/us_quality_core_test_kit/generated/v0.5.0/metadata.yml

@@ -7,11 +7,11 @@
   :reformatted_version: v050
   :resource: AdverseEvent
   :profile_url: http://fhir.org/guides/onc/us-quality-core/StructureDefinition/us-quality-core-adverseevent
-  :profile_name: US Quality Core AdverseEvent
+  :profile_name: US Quality Core AdverseEvent Profile
   :profile_version: 0.5.0
   :title: AdverseEvent
   :short_description: Verify support for the capabilities required by the US Quality
-    Core AdverseEvent.
+    Core AdverseEvent Profile.
   :is_delayed: false
   :interactions:
   - :code: read
@@ -88,19 +88,19 @@
     :slices: []
     :elements:
     - :path: category
-      :us_quality_coreuscdi_plus_quality: true
+      :uscdi_plus_quality: true
     - :path: event
-      :us_quality_coreuscdi_plus_quality: true
+      :uscdi_plus_quality: true
     - :path: date
-      :us_quality_coreuscdi_plus_quality: true
+      :uscdi_plus_quality: true
     - :path: detected
-      :us_quality_coreuscdi_plus_quality: true
+      :uscdi_plus_quality: true
     - :path: recordedDate
-      :us_quality_coreuscdi_plus_quality: true
+      :uscdi_plus_quality: true
     - :path: suspectEntity.instance
       :types:
       - Reference
-      :us_quality_coreuscdi_plus_quality: true
+      :uscdi_plus_quality: true
   :mandatory_elements:
   - AdverseEvent.actuality
   - AdverseEvent.event
@@ -221,11 +221,11 @@
   :reformatted_version: v050
   :resource: AllergyIntolerance
   :profile_url: http://fhir.org/guides/onc/us-quality-core/StructureDefinition/us-quality-core-allergyintolerance
-  :profile_name: US Quality Core AllergyIntolerance
+  :profile_name: US Quality Core AllergyIntolerance Profile
   :profile_version: 0.5.0
   :title: AllergyIntolerance
   :short_description: Verify support for the capabilities required by the US Quality
-    Core AllergyIntolerance.
+    Core AllergyIntolerance Profile.
   :is_delayed: false
   :interactions:
   - :code: read
@@ -269,11 +269,11 @@
       :target_profiles:
       - http://fhir.org/guides/onc/us-quality-core/StructureDefinition/us-quality-core-patient
     - :path: onset[x]
-      :us_quality_coreuscdi_plus_quality: true
+      :uscdi_plus_quality: true
     - :path: recordedDate
-      :us_quality_coreuscdi_plus_quality: true
+      :uscdi_plus_quality: true
     - :path: lastOccurrence
-      :us_quality_coreuscdi_plus_quality: true
+      :uscdi_plus_quality: true
     - :path: reaction
     - :path: reaction.manifestation
   :mandatory_elements:
@@ -347,11 +347,11 @@
   :reformatted_version: v050
   :resource: CarePlan
   :profile_url: http://fhir.org/guides/onc/us-quality-core/StructureDefinition/us-quality-core-careplan
-  :profile_name: US Quality Core CarePlan
+  :profile_name: US Quality Core CarePlan Profile
   :profile_version: 0.5.0
   :title: CarePlan
   :short_description: Verify support for the capabilities required by the US Quality
-    Core CarePlan.
+    Core CarePlan Profile.
   :is_delayed: false
   :interactions:
   - :code: read
@@ -549,11 +549,11 @@
   :reformatted_version: v050
   :resource: CareTeam
   :profile_url: http://fhir.org/guides/onc/us-quality-core/StructureDefinition/us-quality-core-careteam
-  :profile_name: US Quality Core CareTeam
+  :profile_name: US Quality Core CareTeam Profile
   :profile_version: 0.5.0
   :title: CareTeam
   :short_description: Verify support for the capabilities required by the US Quality
-    Core CareTeam.
+    Core CareTeam Profile.
   :is_delayed: false
   :interactions:
   - :code: read
@@ -673,11 +673,11 @@
   :reformatted_version: v050
   :resource: Condition
   :profile_url: http://fhir.org/guides/onc/us-quality-core/StructureDefinition/us-quality-core-condition-encounter-diagnosis
-  :profile_name: US Quality Core Condition Encounter Diagnosis
+  :profile_name: US Quality Core Condition Encounter Diagnosis Profile
   :profile_version: 0.5.0
   :title: Condition Encounter Diagnosis
   :short_description: Verify support for the capabilities required by the US Quality
-    Core Condition Encounter Diagnosis.
+    Core Condition Encounter Diagnosis Profile.
   :is_delayed: false
   :interactions:
   - :code: read
@@ -846,11 +846,11 @@
   :reformatted_version: v050
   :resource: Condition
   :profile_url: http://fhir.org/guides/onc/us-quality-core/StructureDefinition/us-quality-core-condition-problems-health-concerns
-  :profile_name: US Quality Core Condition Problems Health Concerns
+  :profile_name: US Quality Core Condition Problems Health Concerns Profile
   :profile_version: 0.5.0
   :title: Condition Problems Health Concerns
   :short_description: Verify support for the capabilities required by the US Quality
-    Core Condition Problems Health Concerns.
+    Core Condition Problems Health Concerns Profile.
   :is_delayed: false
   :interactions:
   - :code: read
@@ -953,7 +953,7 @@
     - :path: verificationStatus
     - :path: category
     - :path: severity
-      :us_quality_coreuscdi_plus_quality: true
+      :uscdi_plus_quality: true
     - :path: code
     - :path: subject
       :types:
@@ -1037,11 +1037,11 @@
   :reformatted_version: v050
   :resource: Coverage
   :profile_url: http://fhir.org/guides/onc/us-quality-core/StructureDefinition/us-quality-core-coverage
-  :profile_name: US Quality Core Coverage
+  :profile_name: US Quality Core Coverage Profile
   :profile_version: 0.5.0
   :title: Coverage
   :short_description: Verify support for the capabilities required by the US Quality
-    Core Coverage.
+    Core Coverage Profile.
   :is_delayed: false
   :interactions:
   - :code: read
@@ -1190,11 +1190,11 @@
   :reformatted_version: v050
   :resource: DeviceRequest
   :profile_url: http://fhir.org/guides/onc/us-quality-core/StructureDefinition/us-quality-core-devicerequest
-  :profile_name: US Quality Core DeviceRequest
+  :profile_name: US Quality Core DeviceRequest Profile
   :profile_version: 0.5.0
   :title: DeviceRequest
   :short_description: Verify support for the capabilities required by the US Quality
-    Core DeviceRequest.
+    Core DeviceRequest Profile.
   :is_delayed: false
   :interactions:
   - :code: read
@@ -1207,9 +1207,8 @@
     :names:
     - patient
     - do-not-perform
-    :names_not_must_support_or_mandatory:
-    - do-not-perform
-    :must_support_or_mandatory: false
+    :names_not_must_support_or_mandatory: []
+    :must_support_or_mandatory: true
   - :names:
     - patient
     :expectation: SHALL
@@ -1264,7 +1263,7 @@
     - :path: code[x]
       :types:
       - Reference
-      :us_quality_coreuscdi_plus_quality: true
+      :uscdi_plus_quality: true
   :mandatory_elements:
   - DeviceRequest.modifierExtension.url
   - DeviceRequest.modifierExtension.value[x]
@@ -1359,11 +1358,11 @@
   :reformatted_version: v050
   :resource: DeviceRequest
   :profile_url: http://fhir.org/guides/onc/us-quality-core/StructureDefinition/us-quality-core-devicenotrequested
-  :profile_name: US Quality Core Device Not Requested
+  :profile_name: US Quality Core Device Not Requested Profile
   :profile_version: 0.5.0
   :title: DeviceRequest Device Not Requested
   :short_description: Verify support for the capabilities required by the US Quality
-    Core Device Not Requested.
+    Core Device Not Requested Profile.
   :is_delayed: false
   :interactions:
   - :code: read
@@ -1376,9 +1375,8 @@
     :names:
     - patient
     - do-not-perform
-    :names_not_must_support_or_mandatory:
-    - do-not-perform
-    :must_support_or_mandatory: false
+    :names_not_must_support_or_mandatory: []
+    :must_support_or_mandatory: true
   - :names:
     - patient
     :expectation: SHALL
@@ -1430,7 +1428,7 @@
     :slices: []
     :elements:
     - :path: code[x]
-      :us_quality_coreuscdi_plus_quality: true
+      :uscdi_plus_quality: true
   :mandatory_elements:
   - DeviceRequest.extension
   - DeviceRequest.modifierExtension
@@ -1530,10 +1528,11 @@
   :resource: DiagnosticReport
   :profile_url: http://fhir.org/guides/onc/us-quality-core/StructureDefinition/us-quality-core-diagnosticreport-note
   :profile_name: US Quality Core DiagnosticReport Profile for Report and Note Exchange
+    Profile
   :profile_version: 0.5.0
   :title: DiagnosticReport for Report and Note Exchange
   :short_description: Verify support for the capabilities required by the US Quality
-    Core DiagnosticReport Profile for Report and Note Exchange.
+    Core DiagnosticReport Profile for Report and Note Exchange Profile.
   :is_delayed: false
   :interactions:
   - :code: read
@@ -1753,10 +1752,11 @@
   :resource: DiagnosticReport
   :profile_url: http://fhir.org/guides/onc/us-quality-core/StructureDefinition/us-quality-core-diagnosticreport-lab
   :profile_name: US Quality Core DiagnosticReport Profile for Laboratory Results Reporting
+    Profile
   :profile_version: 0.5.0
   :title: DiagnosticReport for Laboratory Results Reporting
   :short_description: Verify support for the capabilities required by the US Quality
-    Core DiagnosticReport Profile for Laboratory Results Reporting.
+    Core DiagnosticReport Profile for Laboratory Results Reporting Profile.
   :is_delayed: false
   :interactions:
   - :code: read
@@ -1958,7 +1958,7 @@
   :profile_url: http://hl7.org/fhir/us/core/StructureDefinition/us-core-documentreference
   :profile_name: US Core DocumentReference Profile
   :profile_version: 6.1.0
-  :title: US Core DocumentReference
+  :title: DocumentReference US Core
   :short_description: Verify support for the capabilities required by the US Core
     DocumentReference Profile.
   :is_delayed: false
@@ -1969,6 +1969,12 @@
     :expectation: SHALL
   :operations: []
   :searches:
+  - :expectation: SHALL
+    :names:
+    - patient
+    - category
+    :names_not_must_support_or_mandatory: []
+    :must_support_or_mandatory: true
   - :names:
     - patient
     :expectation: SHALL
@@ -1985,12 +1991,6 @@
     - type
     :names_not_must_support_or_mandatory: []
     :must_support_or_mandatory: true
-  - :expectation: SHALL
-    :names:
-    - patient
-    - category
-    :names_not_must_support_or_mandatory: []
-    :must_support_or_mandatory: true
   - :expectation: SHALL
     :names:
     - patient
@@ -2112,6 +2112,10 @@
       :target_profiles:
       - http://hl7.org/fhir/us/core/StructureDefinition/us-core-encounter
     - :path: context.period
+    :choices:
+    - :paths:
+      - content.attachment.data
+      - content.attachment.url
   :mandatory_elements:
   - DocumentReference.status
   - DocumentReference.type
@@ -2175,28 +2179,30 @@
     :profiles:
     - http://hl7.org/fhir/StructureDefinition/Resource
   :tests:
-  - :id: us_quality_core_v050_document_reference_patient_search_test
-    :file_name: document_reference_patient_search_test.rb
-  - :id: us_quality_core_v050_document_reference__id_search_test
-    :file_name: document_reference_id_search_test.rb
-  - :id: us_quality_core_v050_document_reference_patient_type_search_test
-    :file_name: document_reference_patient_type_search_test.rb
-  - :id: us_quality_core_v050_document_reference_patient_category_search_test
-    :file_name: document_reference_patient_category_search_test.rb
-  - :id: us_quality_core_v050_document_reference_patient_category_date_search_test
-    :file_name: document_reference_patient_category_date_search_test.rb
-  - :id: us_quality_core_v050_document_reference_read_test
-    :file_name: document_reference_read_test.rb
-  - :id: us_quality_core_v050_document_reference_provenance_revinclude_search_test
-    :file_name: document_reference_provenance_revinclude_search_test.rb
-  - :id: us_quality_core_v050_document_reference_validation_test
-    :file_name: document_reference_validation_test.rb
-  - :id: us_quality_core_v050_document_reference_must_support_test
-    :file_name: document_reference_must_support_test.rb
-  - :id: us_quality_core_v050_document_reference_reference_resolution_test
-    :file_name: document_reference_reference_resolution_test.rb
-  :id: us_quality_core_v050_document_reference
-  :file_name: document_reference_group.rb
+  - :id: us_quality_core_v050_us_core_documentreference_patient_category_search_test
+    :file_name: us_core_documentreference_patient_category_search_test.rb
+  - :id: us_quality_core_v050_us_core_documentreference_patient_search_test
+    :file_name: us_core_documentreference_patient_search_test.rb
+  - :id: us_quality_core_v050_us_core_documentreference__id_search_test
+    :file_name: us_core_documentreference_id_search_test.rb
+  - :id: us_quality_core_v050_us_core_documentreference_patient_type_search_test
+    :file_name: us_core_documentreference_patient_type_search_test.rb
+  - :id: us_quality_core_v050_us_core_documentreference_patient_category_date_search_test
+    :file_name: us_core_documentreference_patient_category_date_search_test.rb
+  - :id: us_quality_core_v050_us_core_documentreference_read_test
+    :file_name: us_core_documentreference_read_test.rb
+  - :id: us_quality_core_v050_us_core_documentreference_provenance_revinclude_search_test
+    :file_name: us_core_documentreference_provenance_revinclude_search_test.rb
+  - :id: us_quality_core_v050_us_core_documentreference_validation_test
+    :file_name: us_core_documentreference_validation_test.rb
+  - :id: us_quality_core_v050_us_core_documentreference_must_support_test
+    :file_name: us_core_documentreference_must_support_test.rb
+  - :id: us_quality_core_v050_us_core_documentreference_reference_resolution_test
+    :file_name: us_core_documentreference_reference_resolution_test.rb
+  - :id: us_quality_core_v050_us_core_documentreference_custodian_test
+    :file_name: us_core_documentreference_document_reference_custodian_test.rb
+  :id: us_quality_core_v050_us_core_documentreference
+  :file_name: us_core_documentreference_group.rb
   :delayed_references: []
   :resource_conformance_expectation: SHALL
 - :name: us_quality_core_encounter
@@ -2205,11 +2211,11 @@
   :reformatted_version: v050
   :resource: Encounter
   :profile_url: http://fhir.org/guides/onc/us-quality-core/StructureDefinition/us-quality-core-encounter
-  :profile_name: US Quality Core Encounter
+  :profile_name: US Quality Core Encounter Profile
   :profile_version: 0.5.0
   :title: Encounter
   :short_description: Verify support for the capabilities required by the US Quality
-    Core Encounter.
+    Core Encounter Profile.
   :is_delayed: true
   :interactions:
   - :code: read
@@ -2308,7 +2314,7 @@
     - :path: class
     - :path: type
     - :path: priority
-      :us_quality_coreuscdi_plus_quality: true
+      :uscdi_plus_quality: true
     - :path: subject
       :types:
       - Reference
@@ -2326,7 +2332,7 @@
       :types:
       - Reference
     - :path: diagnosis
-      :us_quality_coreuscdi_plus_quality: true
+      :uscdi_plus_quality: true
     - :path: hospitalization
     - :path: hospitalization.dischargeDisposition
     - :path: location
@@ -2340,6 +2346,13 @@
       - Reference
       :target_profiles:
       - http://fhir.org/guides/onc/us-quality-core/StructureDefinition/us-quality-core-organization
+    :choices:
+    - :paths:
+      - reasonCode
+      - reasonReference
+    - :paths:
+      - location.location
+      - serviceProvider
   :mandatory_elements:
   - Encounter.identifier.system
   - Encounter.identifier.value
@@ -2445,6 +2458,8 @@
     :file_name: encounter_must_support_test.rb
   - :id: us_quality_core_v050_encounter_reference_resolution_test
     :file_name: encounter_reference_resolution_test.rb
+  - :id: us_quality_core_v050_interpreter_required_extension_test
+    :file_name: interpreter_required_extension_test.rb
   :id: us_quality_core_v050_encounter
   :file_name: encounter_group.rb
   :delayed_references:
@@ -2474,11 +2489,11 @@
   :reformatted_version: v050
   :resource: FamilyMemberHistory
   :profile_url: http://fhir.org/guides/onc/us-quality-core/StructureDefinition/us-quality-core-familymemberhistory
-  :profile_name: US Quality Core FamilyMemberHistory
+  :profile_name: US Quality Core FamilyMemberHistory Profile
   :profile_version: 0.5.0
   :title: FamilyMemberHistory
   :short_description: Verify support for the capabilities required by the US Quality
-    Core FamilyMemberHistory.
+    Core FamilyMemberHistory Profile.
   :is_delayed: false
   :interactions:
   - :code: read
@@ -2512,7 +2527,7 @@
     :slices: []
     :elements:
     - :path: condition.code
-      :us_quality_coreuscdi_plus_quality: true
+      :uscdi_plus_quality: true
   :mandatory_elements:
   - FamilyMemberHistory.status
   - FamilyMemberHistory.patient
@@ -2556,11 +2571,11 @@
   :reformatted_version: v050
   :resource: Goal
   :profile_url: http://fhir.org/guides/onc/us-quality-core/StructureDefinition/us-quality-core-goal
-  :profile_name: US Quality Core Goal
+  :profile_name: US Quality Core Goal Profile
   :profile_version: 0.5.0
   :title: Goal
   :short_description: Verify support for the capabilities required by the US Quality
-    Core Goal.
+    Core Goal Profile.
   :is_delayed: false
   :interactions:
   - :code: read
@@ -2605,6 +2620,10 @@
     - :path: target
     - :path: target.dueDate
       :original_path: target.due[x]
+    :choices:
+    - :paths:
+      - startDate
+      - target.dueDate
   :mandatory_elements:
   - Goal.lifecycleStatus
   - Goal.description
@@ -2658,11 +2677,11 @@
   :reformatted_version: v050
   :resource: Immunization
   :profile_url: http://fhir.org/guides/onc/us-quality-core/StructureDefinition/us-quality-core-immunization
-  :profile_name: US Quality Core Immunization
+  :profile_name: US Quality Core Immunization Profile
   :profile_version: 0.5.0
   :title: Immunization
   :short_description: Verify support for the capabilities required by the US Quality
-    Core Immunization.
+    Core Immunization Profile.
   :is_delayed: false
   :interactions:
   - :code: read
@@ -2790,11 +2809,11 @@
   :reformatted_version: v050
   :resource: Immunization
   :profile_url: http://fhir.org/guides/onc/us-quality-core/StructureDefinition/us-quality-core-immunizationnotdone
-  :profile_name: US Quality Core Immunization Not Done
+  :profile_name: US Quality Core Immunization Not Done Profile
   :profile_version: 0.5.0
   :title: Immunization Not Done
   :short_description: Verify support for the capabilities required by the US Quality
-    Core Immunization Not Done.
+    Core Immunization Not Done Profile.
   :is_delayed: false
   :interactions:
   - :code: read
@@ -2919,11 +2938,11 @@
   :reformatted_version: v050
   :resource: Location
   :profile_url: http://fhir.org/guides/onc/us-quality-core/StructureDefinition/us-quality-core-location
-  :profile_name: US Quality Core Location
+  :profile_name: US Quality Core Location Profile
   :profile_version: 0.5.0
   :title: Location
   :short_description: Verify support for the capabilities required by the US Quality
-    Core Location.
+    Core Location Profile.
   :is_delayed: true
   :interactions:
   - :code: read
@@ -2941,7 +2960,7 @@
     - :path: status
     - :path: name
     - :path: type
-      :us_quality_coreuscdi_plus_quality: true
+      :uscdi_plus_quality: true
     - :path: telecom
     - :path: address
     - :path: address.line
@@ -3013,11 +3032,11 @@
   :reformatted_version: v050
   :resource: Medication
   :profile_url: http://fhir.org/guides/onc/us-quality-core/StructureDefinition/us-quality-core-medication
-  :profile_name: US Quality Core Medication
+  :profile_name: US Quality Core Medication Profile
   :profile_version: 0.5.0
   :title: Medication
   :short_description: Verify support for the capabilities required by the US Quality
-    Core Medication.
+    Core Medication Profile.
   :is_delayed: true
   :interactions:
   - :code: read
@@ -3073,11 +3092,11 @@
   :reformatted_version: v050
   :resource: MedicationAdministration
   :profile_url: http://fhir.org/guides/onc/us-quality-core/StructureDefinition/us-quality-core-medicationadministration
-  :profile_name: US Quality Core MedicationAdministration
+  :profile_name: US Quality Core MedicationAdministration Profile
   :profile_version: 0.5.0
   :title: MedicationAdministration
   :short_description: Verify support for the capabilities required by the US Quality
-    Core MedicationAdministration.
+    Core MedicationAdministration Profile.
   :is_delayed: false
   :interactions:
   - :code: read
@@ -3174,19 +3193,19 @@
     :slices: []
     :elements:
     - :path: status
-      :us_quality_coreuscdi_plus_quality: true
+      :uscdi_plus_quality: true
     - :path: medication[x]
       :types:
       - Reference
-      :us_quality_coreuscdi_plus_quality: true
+      :uscdi_plus_quality: true
     - :path: effective[x]
-      :us_quality_coreuscdi_plus_quality: true
+      :uscdi_plus_quality: true
     - :path: dosage
-      :us_quality_coreuscdi_plus_quality: true
+      :uscdi_plus_quality: true
     - :path: dosage.route
-      :us_quality_coreuscdi_plus_quality: true
+      :uscdi_plus_quality: true
     - :path: dosage.dose
-      :us_quality_coreuscdi_plus_quality: true
+      :uscdi_plus_quality: true
   :mandatory_elements:
   - MedicationAdministration.status
   - MedicationAdministration.medication[x]
@@ -3266,11 +3285,11 @@
   :reformatted_version: v050
   :resource: MedicationAdministration
   :profile_url: http://fhir.org/guides/onc/us-quality-core/StructureDefinition/us-quality-core-medicationadministrationnotdone
-  :profile_name: US Quality Core MedicationAdministration Not Done
+  :profile_name: US Quality Core MedicationAdministration Not Done Profile
   :profile_version: 0.5.0
   :title: MedicationAdministration Not Done
   :short_description: Verify support for the capabilities required by the US Quality
-    Core MedicationAdministration Not Done.
+    Core MedicationAdministration Not Done Profile.
   :is_delayed: false
   :interactions:
   - :code: read
@@ -3294,16 +3313,14 @@
     :names:
     - patient
     - code
-    :names_not_must_support_or_mandatory:
-    - code
-    :must_support_or_mandatory: false
+    :names_not_must_support_or_mandatory: []
+    :must_support_or_mandatory: true
   - :expectation: SHALL
     :names:
     - patient
     - effective-time
-    :names_not_must_support_or_mandatory:
-    - effective-time
-    :must_support_or_mandatory: false
+    :names_not_must_support_or_mandatory: []
+    :must_support_or_mandatory: true
   :search_definitions:
     :patient:
       :paths:
@@ -3364,9 +3381,9 @@
     :elements:
     - :path: status
       :fixed_value: not-done
-      :us_quality_coreuscdi_plus_quality: true
+      :uscdi_plus_quality: true
     - :path: statusReason
-      :us_quality_coreuscdi_plus_quality: true
+      :uscdi_plus_quality: true
   :mandatory_elements:
   - MedicationAdministration.extension
   - MedicationAdministration.status
@@ -3442,11 +3459,11 @@
   :reformatted_version: v050
   :resource: MedicationDispense
   :profile_url: http://fhir.org/guides/onc/us-quality-core/StructureDefinition/us-quality-core-medicationdispense
-  :profile_name: US Quality Core MedicationDispense
+  :profile_name: US Quality Core MedicationDispense Profile
   :profile_version: 0.5.0
   :title: MedicationDispense
   :short_description: Verify support for the capabilities required by the US Quality
-    Core MedicationDispense.
+    Core MedicationDispense Profile.
   :is_delayed: false
   :interactions:
   - :code: read
@@ -3527,13 +3544,13 @@
     - :path: type
     - :path: quantity
     - :path: daysSupply
-      :us_quality_coreuscdi_plus_quality: true
+      :uscdi_plus_quality: true
     - :path: whenHandedOver
     - :path: dosageInstruction
     - :path: dosageInstruction.text
     - :path: dosageInstruction.timing
     - :path: dosageInstruction.route
-      :us_quality_coreuscdi_plus_quality: true
+      :uscdi_plus_quality: true
     - :path: dosageInstruction.doseAndRate
     - :path: dosageInstruction.doseAndRate.doseQuantity
       :original_path: dosageInstruction.doseAndRate.dose[x]
@@ -3618,11 +3635,11 @@
   :reformatted_version: v050
   :resource: MedicationDispense
   :profile_url: http://fhir.org/guides/onc/us-quality-core/StructureDefinition/us-quality-core-medicationdispensedeclined
-  :profile_name: US Quality Core MedicationDispense Declined
+  :profile_name: US Quality Core MedicationDispense Declined Profile
   :profile_version: 0.5.0
   :title: MedicationDispense Declined
   :short_description: Verify support for the capabilities required by the US Quality
-    Core MedicationDispense Declined.
+    Core MedicationDispense Declined Profile.
   :is_delayed: false
   :interactions:
   - :code: read
@@ -3674,7 +3691,7 @@
     - :path: status
       :fixed_value: declined
     - :path: statusReason[x]
-      :us_quality_coreuscdi_plus_quality: true
+      :uscdi_plus_quality: true
     - :path: medication[x]
       :types:
       - Reference
@@ -3784,11 +3801,11 @@
   :reformatted_version: v050
   :resource: MedicationRequest
   :profile_url: http://fhir.org/guides/onc/us-quality-core/StructureDefinition/us-quality-core-medicationrequest
-  :profile_name: US Quality Core MedicationRequest
+  :profile_name: US Quality Core MedicationRequest Profile
   :profile_version: 0.5.0
   :title: MedicationRequest
   :short_description: Verify support for the capabilities required by the US Quality
-    Core MedicationRequest.
+    Core MedicationRequest Profile.
   :is_delayed: false
   :interactions:
   - :code: read
@@ -3900,44 +3917,50 @@
       :types:
       - Reference
     - :path: reasonCode
-      :uscdi_only: true
-      :us_quality_coreuscdi_plus_quality: true
+      :uscdi_plus_quality: true
     - :path: reasonReference
-      :uscdi_only: true
       :types:
       - Reference
-      :us_quality_coreuscdi_plus_quality: true
+      :uscdi_plus_quality: true
     - :path: dosageInstruction
     - :path: dosageInstruction.text
     - :path: dosageInstruction.timing
     - :path: dosageInstruction.timing.repeat
-      :us_quality_coreuscdi_plus_quality: true
+      :uscdi_plus_quality: true
     - :path: dosageInstruction.timing.repeat.bounds[x]
-      :us_quality_coreuscdi_plus_quality: true
+      :uscdi_plus_quality: true
     - :path: dosageInstruction.timing.repeat.frequency
-      :us_quality_coreuscdi_plus_quality: true
+      :uscdi_plus_quality: true
     - :path: dosageInstruction.timing.repeat.frequencyMax
-      :us_quality_coreuscdi_plus_quality: true
+      :uscdi_plus_quality: true
     - :path: dosageInstruction.timing.repeat.period
-      :us_quality_coreuscdi_plus_quality: true
+      :uscdi_plus_quality: true
     - :path: dosageInstruction.timing.repeat.periodMax
-      :us_quality_coreuscdi_plus_quality: true
+      :uscdi_plus_quality: true
     - :path: dosageInstruction.timing.repeat.periodUnit
-      :us_quality_coreuscdi_plus_quality: true
+      :uscdi_plus_quality: true
     - :path: dosageInstruction.asNeeded[x]
-      :us_quality_coreuscdi_plus_quality: true
+      :uscdi_plus_quality: true
     - :path: dosageInstruction.route
-      :us_quality_coreuscdi_plus_quality: true
+      :uscdi_plus_quality: true
     - :path: dosageInstruction.doseAndRate
     - :path: dosageInstruction.doseAndRate.doseQuantity
       :original_path: dosageInstruction.doseAndRate.dose[x]
     - :path: dispenseRequest
     - :path: dispenseRequest.validityPeriod
-      :us_quality_coreuscdi_plus_quality: true
+      :uscdi_plus_quality: true
     - :path: dispenseRequest.numberOfRepeatsAllowed
     - :path: dispenseRequest.quantity
     - :path: dispenseRequest.expectedSupplyDuration
-      :us_quality_coreuscdi_plus_quality: true
+      :uscdi_plus_quality: true
+    :choices:
+    - :paths:
+      - reportedBoolean
+      - reportedReference
+    - :paths:
+      - reasonCode
+      - reasonReference
+      :uscdi_plus_quality: true
   :mandatory_elements:
   - MedicationRequest.status
   - MedicationRequest.intent
@@ -4070,11 +4093,11 @@
   :reformatted_version: v050
   :resource: MedicationRequest
   :profile_url: http://fhir.org/guides/onc/us-quality-core/StructureDefinition/us-quality-core-medicationnotrequested
-  :profile_name: US Quality Core Medication Not Requested
+  :profile_name: US Quality Core Medication Not Requested Profile
   :profile_version: 0.5.0
   :title: MedicationRequest Medication Not Requested
   :short_description: Verify support for the capabilities required by the US Quality
-    Core Medication Not Requested.
+    Core Medication Not Requested Profile.
   :is_delayed: false
   :interactions:
   - :code: read
@@ -4163,7 +4186,7 @@
     - :path: intent
     - :path: category
     - :path: doNotPerform
-      :us_quality_coreuscdi_plus_quality: true
+      :uscdi_plus_quality: true
     - :path: reportedReference
       :original_path: reported[x]
       :types:
@@ -4184,12 +4207,11 @@
       :types:
       - Reference
     - :path: reasonCode
-      :uscdi_only: true
-      :us_quality_coreuscdi_plus_quality: true
+      :uscdi_plus_quality: true
     - :path: reasonReference
-      :uscdi_only: true
       :types:
       - Reference
+      :uscdi_only: true
     - :path: dosageInstruction
     - :path: dosageInstruction.text
     - :path: dosageInstruction.timing
@@ -4199,6 +4221,14 @@
     - :path: dispenseRequest
     - :path: dispenseRequest.numberOfRepeatsAllowed
     - :path: dispenseRequest.quantity
+    :choices:
+    - :paths:
+      - reportedBoolean
+      - reportedReference
+    - :paths:
+      - reasonCode
+      - reasonReference
+      :uscdi_plus_quality: true
   :mandatory_elements:
   - MedicationRequest.status
   - MedicationRequest.intent
@@ -4318,11 +4348,11 @@
   :reformatted_version: v050
   :resource: Observation
   :profile_url: http://fhir.org/guides/onc/us-quality-core/StructureDefinition/us-quality-core-observation-clinical-result
-  :profile_name: US Quality Core Observation Clinical Result
+  :profile_name: US Quality Core Observation Clinical Result Profile
   :profile_version: 0.5.0
   :title: Observation Clinical Result
   :short_description: Verify support for the capabilities required by the US Quality
-    Core Observation Clinical Result.
+    Core Observation Clinical Result Profile.
   :is_delayed: false
   :interactions:
   - :code: read
@@ -4375,7 +4405,13 @@
       - Observation.category
       :comparators: {}
       :values:
+      - laboratory
       - exam
+      - therapy
+      - imaging
+      - procedure
+      - vital-signs
+      - activity
       :type: CodeableConcept
       :contains_multiple: true
       :multiple_or: MAY
@@ -4564,11 +4600,11 @@
   :reformatted_version: v050
   :resource: Observation
   :profile_url: http://fhir.org/guides/onc/us-quality-core/StructureDefinition/us-quality-core-simple-observation
-  :profile_name: US Quality Core Simple Observation
+  :profile_name: US Quality Core Simple Observation Profile
   :profile_version: 0.5.0
   :title: Observation Simple
   :short_description: Verify support for the capabilities required by the US Quality
-    Core Simple Observation.
+    Core Simple Observation Profile.
   :is_delayed: false
   :interactions:
   - :code: read
@@ -4621,7 +4657,10 @@
       - Observation.category
       :comparators: {}
       :values:
-      - activity
+      - sdoh
+      - functional-status
+      - disability-status
+      - cognitive-status
       :type: CodeableConcept
       :contains_multiple: true
       :multiple_or: MAY
@@ -4721,9 +4760,9 @@
     - :path: valueBoolean
       :original_path: value[x]
     - :path: derivedFrom
-      :uscdi_only: true
       :types:
       - Reference
+      :uscdi_only: true
   :mandatory_elements:
   - Observation.status
   - Observation.category
@@ -4823,11 +4862,11 @@
   :reformatted_version: v050
   :resource: Observation
   :profile_url: http://fhir.org/guides/onc/us-quality-core/StructureDefinition/us-quality-core-observation-screening-assessment
-  :profile_name: US Quality Core Observation Screening Assessment
+  :profile_name: US Quality Core Observation Screening Assessment Profile
   :profile_version: 0.5.0
   :title: Observation Screening Assessment
   :short_description: Verify support for the capabilities required by the US Quality
-    Core Observation Screening Assessment.
+    Core Observation Screening Assessment Profile.
   :is_delayed: false
   :interactions:
   - :code: read
@@ -5088,11 +5127,11 @@
   :reformatted_version: v050
   :resource: Observation
   :profile_url: http://fhir.org/guides/onc/us-quality-core/StructureDefinition/us-quality-core-observationcancelled
-  :profile_name: US Quality Core Observation Cancelled
+  :profile_name: US Quality Core Observation Cancelled Profile
   :profile_version: 0.5.0
   :title: Observation Cancelled
   :short_description: Verify support for the capabilities required by the US Quality
-    Core Observation Cancelled.
+    Core Observation Cancelled Profile.
   :is_delayed: false
   :interactions:
   - :code: read
@@ -5145,6 +5184,14 @@
       - Observation.category
       :comparators: {}
       :values:
+      - social-history
+      - vital-signs
+      - imaging
+      - laboratory
+      - procedure
+      - survey
+      - exam
+      - therapy
       - activity
       :type: CodeableConcept
       :contains_multiple: true
@@ -5197,20 +5244,20 @@
     - :id: Observation.extension:notDoneReason
       :path: extension
       :url: http://fhir.org/guides/onc/us-quality-core/StructureDefinition/us-quality-core-notDoneReason
-      :us_quality_coreuscdi_plus_quality: true
+      :uscdi_plus_quality: true
     :slices: []
     :elements:
     - :path: status
       :fixed_value: cancelled
-      :us_quality_coreuscdi_plus_quality: true
+      :uscdi_plus_quality: true
     - :path: category
-      :us_quality_coreuscdi_plus_quality: true
+      :uscdi_plus_quality: true
     - :path: code
-      :us_quality_coreuscdi_plus_quality: true
+      :uscdi_plus_quality: true
     - :path: effective[x]
-      :us_quality_coreuscdi_plus_quality: true
+      :uscdi_plus_quality: true
     - :path: value[x]
-      :us_quality_coreuscdi_plus_quality: true
+      :uscdi_plus_quality: true
   :mandatory_elements:
   - Observation.extension
   - Observation.status
@@ -6019,11 +6066,11 @@
   :reformatted_version: v050
   :resource: Observation
   :profile_url: http://fhir.org/guides/onc/us-quality-core/StructureDefinition/us-quality-core-observation-lab
-  :profile_name: US Quality Core Laboratory Result Observation
+  :profile_name: US Quality Core Laboratory Result Observation Profile
   :profile_version: 0.5.0
   :title: Observation Laboratory Result
   :short_description: Verify support for the capabilities required by the US Quality
-    Core Laboratory Result Observation.
+    Core Laboratory Result Observation Profile.
   :is_delayed: false
   :interactions:
   - :code: read
@@ -6152,7 +6199,7 @@
     - :path: effectiveDateTime
       :original_path: effective[x]
     - :path: issued
-      :us_quality_coreuscdi_plus_quality: true
+      :uscdi_plus_quality: true
     - :path: valueQuantity
       :original_path: value[x]
     - :path: valueCodeableConcept
@@ -6160,7 +6207,7 @@
     - :path: valueString
       :original_path: value[x]
     - :path: interpretation
-      :us_quality_coreuscdi_plus_quality: true
+      :uscdi_plus_quality: true
     - :path: specimen
       :types:
       - Reference
@@ -9567,11 +9614,11 @@
   :reformatted_version: v050
   :resource: Organization
   :profile_url: http://fhir.org/guides/onc/us-quality-core/StructureDefinition/us-quality-core-organization
-  :profile_name: US Quality Core Organization
+  :profile_name: US Quality Core Organization Profile
   :profile_version: 0.5.0
   :title: Organization
   :short_description: Verify support for the capabilities required by the US Quality
-    Core Organization.
+    Core Organization Profile.
   :is_delayed: true
   :interactions:
   - :code: read
@@ -9684,11 +9731,11 @@
   :reformatted_version: v050
   :resource: Patient
   :profile_url: http://fhir.org/guides/onc/us-quality-core/StructureDefinition/us-quality-core-patient
-  :profile_name: US Quality Core Patient
+  :profile_name: US Quality Core Patient Profile
   :profile_version: 0.5.0
   :title: Patient
   :short_description: Verify support for the capabilities required by the US Quality
-    Core Patient.
+    Core Patient Profile.
   :is_delayed: false
   :interactions:
   - :code: read
@@ -9722,18 +9769,15 @@
     - :id: Patient.extension:race
       :path: extension
       :url: http://hl7.org/fhir/us/core/StructureDefinition/us-core-race|6.1.0
-      :uscdi_only: true
-      :us_quality_coreuscdi_plus_quality: true
+      :uscdi_plus_quality: true
     - :id: Patient.extension:ethnicity
       :path: extension
       :url: http://hl7.org/fhir/us/core/StructureDefinition/us-core-ethnicity|6.1.0
-      :uscdi_only: true
-      :us_quality_coreuscdi_plus_quality: true
+      :uscdi_plus_quality: true
     - :id: Patient.extension:tribalAffiliation
       :path: extension
       :url: http://hl7.org/fhir/us/core/StructureDefinition/us-core-tribal-affiliation|6.1.0
-      :uscdi_only: true
-      :us_quality_coreuscdi_plus_quality: true
+      :uscdi_plus_quality: true
     - :id: Patient.extension:sex
       :path: extension
       :url: http://hl7.org/fhir/us/core/StructureDefinition/us-core-sex
@@ -9745,42 +9789,49 @@
     - :path: identifier.value
     - :path: name
     - :path: name.use
-      :uscdi_only: true
-      :us_quality_coreuscdi_plus_quality: true
+      :uscdi_plus_quality: true
+      :fixed_value: old
     - :path: name.family
     - :path: name.given
     - :path: name.suffix
-      :uscdi_only: true
-      :us_quality_coreuscdi_plus_quality: true
-    - :path: name.period
-      :uscdi_only: true
-      :us_quality_coreuscdi_plus_quality: true
+      :uscdi_plus_quality: true
+    - :path: name.period.end
+      :uscdi_plus_quality: true
     - :path: telecom
-      :uscdi_only: true
-      :us_quality_coreuscdi_plus_quality: true
+      :uscdi_plus_quality: true
     - :path: telecom.system
+      :uscdi_plus_quality: true
     - :path: telecom.value
+      :uscdi_plus_quality: true
     - :path: telecom.use
+      :uscdi_plus_quality: true
     - :path: gender
     - :path: birthDate
     - :path: deceased[x]
-      :uscdi_only: true
-      :us_quality_coreuscdi_plus_quality: true
+      :uscdi_plus_quality: true
     - :path: address
     - :path: address.use
-      :uscdi_only: true
-      :us_quality_coreuscdi_plus_quality: true
+      :uscdi_plus_quality: true
+      :fixed_value: old
     - :path: address.line
     - :path: address.city
     - :path: address.state
     - :path: address.postalCode
-    - :path: address.period
-      :uscdi_only: true
-      :us_quality_coreuscdi_plus_quality: true
+    - :path: address.period.end
+      :uscdi_plus_quality: true
     - :path: communication
-      :uscdi_only: true
-      :us_quality_coreuscdi_plus_quality: true
+      :uscdi_plus_quality: true
     - :path: communication.language
+      :uscdi_plus_quality: true
+    :choices:
+    - :paths:
+      - address.period.end
+      - address.use
+      :uscdi_plus_quality: true
+    - :paths:
+      - name.period.end
+      - name.use
+      :uscdi_plus_quality: true
   :mandatory_elements:
   - Patient.identifier
   - Patient.identifier.system
@@ -9921,11 +9972,11 @@
   :reformatted_version: v050
   :resource: Practitioner
   :profile_url: http://fhir.org/guides/onc/us-quality-core/StructureDefinition/us-quality-core-practitioner
-  :profile_name: US Quality Core Practitioner
+  :profile_name: US Quality Core Practitioner Profile
   :profile_version: 0.5.0
   :title: Practitioner
   :short_description: Verify support for the capabilities required by the US Quality
-    Core Practitioner.
+    Core Practitioner Profile.
   :is_delayed: true
   :interactions:
   - :code: read
@@ -9958,24 +10009,18 @@
     - :path: identifier.system
     - :path: identifier.value
     - :path: identifier:NPI.system
-      :us_quality_coreuscdi_plus_quality: true
+      :uscdi_plus_quality: true
     - :path: identifier:NPI.value
-      :us_quality_coreuscdi_plus_quality: true
+      :uscdi_plus_quality: true
     - :path: identifier:ein.system
-      :us_quality_coreuscdi_plus_quality: true
+      :uscdi_plus_quality: true
     - :path: identifier:ein.value
-      :us_quality_coreuscdi_plus_quality: true
+      :uscdi_plus_quality: true
     - :path: name
     - :path: name.family
     - :path: telecom
     - :path: telecom.system
     - :path: telecom.value
-    - :path: address
-    - :path: address.line
-    - :path: address.city
-    - :path: address.state
-    - :path: address.postalCode
-    - :path: address.country
   :mandatory_elements:
   - Practitioner.identifier
   - Practitioner.identifier.system
@@ -10041,6 +10086,8 @@
     :file_name: practitioner_validation_test.rb
   - :id: us_quality_core_v050_practitioner_must_support_test
     :file_name: practitioner_must_support_test.rb
+  - :id: us_quality_core_v050_practitioner_address_test
+    :file_name: practitioner_address_test.rb
   :id: us_quality_core_v050_practitioner
   :file_name: practitioner_group.rb
   :delayed_references: []
@@ -10051,11 +10098,11 @@
   :reformatted_version: v050
   :resource: PractitionerRole
   :profile_url: http://fhir.org/guides/onc/us-quality-core/StructureDefinition/us-quality-core-practitionerrole
-  :profile_name: US Quality Core PractitionerRole
+  :profile_name: US Quality Core PractitionerRole Profile
   :profile_version: 0.5.0
   :title: PractitionerRole
   :short_description: Verify support for the capabilities required by the US Quality
-    Core PractitionerRole.
+    Core PractitionerRole Profile.
   :is_delayed: true
   :interactions:
   - :code: read
@@ -10071,11 +10118,11 @@
     :slices: []
     :elements:
     - :path: identifier
-      :us_quality_coreuscdi_plus_quality: true
+      :uscdi_plus_quality: true
     - :path: identifier.system
-      :us_quality_coreuscdi_plus_quality: true
+      :uscdi_plus_quality: true
     - :path: identifier.value
-      :us_quality_coreuscdi_plus_quality: true
+      :uscdi_plus_quality: true
     - :path: practitioner
       :types:
       - Reference
@@ -10173,11 +10220,11 @@
   :reformatted_version: v050
   :resource: Procedure
   :profile_url: http://fhir.org/guides/onc/us-quality-core/StructureDefinition/us-quality-core-procedure
-  :profile_name: US Quality Core Procedure
+  :profile_name: US Quality Core Procedure Profile
   :profile_version: 0.5.0
   :title: Procedure
   :short_description: Verify support for the capabilities required by the US Quality
-    Core Procedure.
+    Core Procedure Profile.
   :is_delayed: false
   :interactions:
   - :code: read
@@ -10259,20 +10306,20 @@
     - :id: Procedure.extension:recorded
       :path: extension
       :url: http://fhir.org/guides/onc/us-quality-core/StructureDefinition/us-quality-core-recorded
-      :us_quality_coreuscdi_plus_quality: true
+      :uscdi_plus_quality: true
     :slices: []
     :elements:
     - :path: basedOn
-      :uscdi_only: true
       :types:
       - Reference
+      :uscdi_only: true
     - :path: partOf
       :types:
       - Reference
-      :us_quality_coreuscdi_plus_quality: true
+      :uscdi_plus_quality: true
     - :path: status
     - :path: statusReason
-      :us_quality_coreuscdi_plus_quality: true
+      :uscdi_plus_quality: true
     - :path: code
     - :path: subject
       :types:
@@ -10282,11 +10329,16 @@
     - :path: performedDateTime
       :original_path: performed[x]
     - :path: reasonCode
-      :us_quality_coreuscdi_plus_quality: true
+      :uscdi_plus_quality: true
     - :path: reasonReference
       :types:
       - Reference
-      :us_quality_coreuscdi_plus_quality: true
+      :uscdi_plus_quality: true
+    :choices:
+    - :paths:
+      - reasonCode
+      - reasonReference
+      :uscdi_plus_quality: true
   :mandatory_elements:
   - Procedure.status
   - Procedure.code
@@ -10391,11 +10443,11 @@
   :reformatted_version: v050
   :resource: Procedure
   :profile_url: http://fhir.org/guides/onc/us-quality-core/StructureDefinition/us-quality-core-procedurenotdone
-  :profile_name: US Quality Core Procedure Not Done
+  :profile_name: US Quality Core Procedure Not Done Profile
   :profile_version: 0.5.0
   :title: Procedure Not Done
   :short_description: Verify support for the capabilities required by the US Quality
-    Core Procedure Not Done.
+    Core Procedure Not Done Profile.
   :is_delayed: false
   :interactions:
   - :code: read
@@ -10470,21 +10522,21 @@
     - :id: Procedure.extension:recorded
       :path: extension
       :url: http://fhir.org/guides/onc/us-quality-core/StructureDefinition/us-quality-core-recorded
-      :us_quality_coreuscdi_plus_quality: true
+      :uscdi_plus_quality: true
     :slices: []
     :elements:
     - :path: basedOn
-      :uscdi_only: true
       :types:
       - Reference
+      :uscdi_only: true
     - :path: partOf
       :types:
       - Reference
-      :us_quality_coreuscdi_plus_quality: true
+      :uscdi_plus_quality: true
     - :path: status
       :fixed_value: not-done
     - :path: statusReason
-      :us_quality_coreuscdi_plus_quality: true
+      :uscdi_plus_quality: true
     - :path: code
     - :path: subject
       :types:
@@ -10494,11 +10546,16 @@
     - :path: performedDateTime
       :original_path: performed[x]
     - :path: reasonCode
-      :us_quality_coreuscdi_plus_quality: true
+      :uscdi_plus_quality: true
     - :path: reasonReference
       :types:
       - Reference
-      :us_quality_coreuscdi_plus_quality: true
+      :uscdi_plus_quality: true
+    :choices:
+    - :paths:
+      - reasonCode
+      - reasonReference
+      :uscdi_plus_quality: true
   :mandatory_elements:
   - Procedure.extension
   - Procedure.status
@@ -10741,11 +10798,11 @@
   :reformatted_version: v050
   :resource: RelatedPerson
   :profile_url: http://fhir.org/guides/onc/us-quality-core/StructureDefinition/us-quality-core-relatedperson
-  :profile_name: US Quality Core RelatedPerson
+  :profile_name: US Quality Core RelatedPerson Profile
   :profile_version: 0.5.0
   :title: RelatedPerson
   :short_description: Verify support for the capabilities required by the US Quality
-    Core RelatedPerson.
+    Core RelatedPerson Profile.
   :is_delayed: false
   :interactions:
   - :code: read
@@ -10841,11 +10898,11 @@
   :reformatted_version: v050
   :resource: ServiceRequest
   :profile_url: http://fhir.org/guides/onc/us-quality-core/StructureDefinition/us-quality-core-servicerequest
-  :profile_name: US Quality Core ServiceRequest
+  :profile_name: US Quality Core ServiceRequest Profile
   :profile_version: 0.5.0
   :title: ServiceRequest
   :short_description: Verify support for the capabilities required by the US Quality
-    Core ServiceRequest.
+    Core ServiceRequest Profile.
   :is_delayed: false
   :interactions:
   - :code: read
@@ -10858,9 +10915,8 @@
     :names:
     - patient
     - do-not-perform
-    :names_not_must_support_or_mandatory:
-    - do-not-perform
-    :must_support_or_mandatory: false
+    :names_not_must_support_or_mandatory: []
+    :must_support_or_mandatory: true
   - :names:
     - _id
     :expectation: SHALL
@@ -11011,13 +11067,16 @@
       :types:
       - Reference
     - :path: reasonCode
-      :uscdi_only: true
-      :us_quality_coreuscdi_plus_quality: true
+      :uscdi_plus_quality: true
     - :path: reasonReference
-      :uscdi_only: true
       :types:
       - Reference
-      :us_quality_coreuscdi_plus_quality: true
+      :uscdi_plus_quality: true
+    :choices:
+    - :paths:
+      - reasonCode
+      - reasonReference
+      :uscdi_plus_quality: true
   :mandatory_elements:
   - ServiceRequest.status
   - ServiceRequest.intent
@@ -11128,11 +11187,11 @@
   :reformatted_version: v050
   :resource: ServiceRequest
   :profile_url: http://fhir.org/guides/onc/us-quality-core/StructureDefinition/us-quality-core-servicenotrequested
-  :profile_name: US Quality Core Service Not Requested
+  :profile_name: US Quality Core Service Not Requested Profile
   :profile_version: 0.5.0
   :title: ServiceRequest Service Not Requested
   :short_description: Verify support for the capabilities required by the US Quality
-    Core Service Not Requested.
+    Core Service Not Requested Profile.
   :is_delayed: false
   :interactions:
   - :code: read
@@ -11296,13 +11355,16 @@
       :types:
       - Reference
     - :path: reasonCode
-      :uscdi_only: true
-      :us_quality_coreuscdi_plus_quality: true
+      :uscdi_plus_quality: true
     - :path: reasonReference
-      :uscdi_only: true
       :types:
       - Reference
-      :us_quality_coreuscdi_plus_quality: true
+      :uscdi_plus_quality: true
+    :choices:
+    - :paths:
+      - reasonCode
+      - reasonReference
+      :uscdi_plus_quality: true
   :mandatory_elements:
   - ServiceRequest.extension
   - ServiceRequest.status
@@ -11464,6 +11526,10 @@
       - Reference
       :target_profiles:
       - http://hl7.org/fhir/us/core/StructureDefinition/us-core-patient
+    :choices:
+    - :paths:
+      - accessionIdentifier
+      - identifier
   :mandatory_elements:
   - Specimen.type
   :bindings:
@@ -11509,11 +11575,11 @@
   :reformatted_version: v050
   :resource: Task
   :profile_url: http://fhir.org/guides/onc/us-quality-core/StructureDefinition/us-quality-core-task
-  :profile_name: US Quality Core Task
+  :profile_name: US Quality Core Task Profile
   :profile_version: 0.5.0
   :title: Task
   :short_description: Verify support for the capabilities required by the US Quality
-    Core Task.
+    Core Task Profile.
   :is_delayed: false
   :interactions:
   - :code: read
@@ -11595,21 +11661,21 @@
     - :path: basedOn
       :types:
       - Reference
-      :us_quality_coreuscdi_plus_quality: true
+      :uscdi_plus_quality: true
     - :path: status
-      :us_quality_coreuscdi_plus_quality: true
+      :uscdi_plus_quality: true
     - :path: statusReason
-      :us_quality_coreuscdi_plus_quality: true
+      :uscdi_plus_quality: true
     - :path: code
-      :us_quality_coreuscdi_plus_quality: true
+      :uscdi_plus_quality: true
     - :path: focus
       :types:
       - Reference
-      :us_quality_coreuscdi_plus_quality: true
+      :uscdi_plus_quality: true
     - :path: executionPeriod
-      :us_quality_coreuscdi_plus_quality: true
+      :uscdi_plus_quality: true
     - :path: reasonCode
-      :us_quality_coreuscdi_plus_quality: true
+      :uscdi_plus_quality: true
   :mandatory_elements:
   - Task.identifier
   - Task.status
@@ -11716,11 +11782,11 @@
   :reformatted_version: v050
   :resource: Task
   :profile_url: http://fhir.org/guides/onc/us-quality-core/StructureDefinition/us-quality-core-taskrejected
-  :profile_name: US Quality Core Task Rejected
+  :profile_name: US Quality Core Task Rejected Profile
   :profile_version: 0.5.0
   :title: Task Rejected
   :short_description: Verify support for the capabilities required by the US Quality
-    Core Task Rejected.
+    Core Task Rejected Profile.
   :is_delayed: false
   :interactions:
   - :code: read
@@ -11791,22 +11857,22 @@
     - :path: basedOn
       :types:
       - Reference
-      :us_quality_coreuscdi_plus_quality: true
+      :uscdi_plus_quality: true
     - :path: status
       :fixed_value: rejected
-      :us_quality_coreuscdi_plus_quality: true
+      :uscdi_plus_quality: true
     - :path: statusReason
-      :us_quality_coreuscdi_plus_quality: true
+      :uscdi_plus_quality: true
     - :path: code
-      :us_quality_coreuscdi_plus_quality: true
+      :uscdi_plus_quality: true
     - :path: focus
       :types:
       - Reference
-      :us_quality_coreuscdi_plus_quality: true
+      :uscdi_plus_quality: true
     - :path: executionPeriod
-      :us_quality_coreuscdi_plus_quality: true
+      :uscdi_plus_quality: true
     - :path: reasonCode
-      :us_quality_coreuscdi_plus_quality: true
+      :uscdi_plus_quality: true
   :mandatory_elements:
   - Task.status
   - Task.statusReason