Rm comp doc not needed

input/fsh/instances/CoverageFranzMuster.fsh

@@ -1,6 +1,6 @@
 Instance: CoverageFranzMuster
 InstanceOf: CHCoreCoverage
-Title: "CoverageFranzMuster"
+Title: "Coverage: FranzMuster"
 Description: "Example for Insurance Coverage"
 Usage: #example
 * meta.source = "https://www.ti.bfh.ch/de/bachelor/medizininformatik.html"

input/fsh/instances/DocumentReference.fsh

@@ -1,5 +1,6 @@
 Instance: example
 InstanceOf: ChLabDocumentReference
+Title: "DocumentReference: Physical"
 Usage: #example
 // * contained = a2
 * masterIdentifier.system = "urn:ietf:rfc:3986"

input/fsh/instances/HealthInsuranceCard.fsh

@@ -1,6 +1,6 @@
 Instance: HealthInsuranceCard
 InstanceOf: Coverage
-Title: "HealthInsuranceCard"
+Title: "Coverage: HealthInsuranceCard Franz Muster"
 Description: "Example for Insurance"
 Usage: #example
 * identifier.system = "http://ehic.com/insurer/123456789/member"

input/fsh/instances/LabOrder-Composition.fsh → input/fsh/instances/LabOrder-CompositionWithSR.fsh

@@ -1,9 +1,9 @@
-Instance: LabOrder-Composition
-InstanceOf: ChLabOrderComposition
-Title: "CH LAB-Order Composition by Service Request"
-Description: "Composition multiple SR whithout Questionnaire/Quse"
+Instance: LabOrder-CompositionWithSR
+InstanceOf: ChLabOrderCompositionWithSR
+Title: "CH LAB-Order Composition with Service Request"
+Description: "Composition multiple SR whithout Questionnaire/QuestionnaireResponse"
 Usage: #example
-* id = "ch-lab-order-composition"
+* id = "ch-lab-order-composition-with-sr"
 * meta.versionId = "1"
 * meta.lastUpdated = "2021-02-18T17:04:38.520+00:00"
 * text.status = #additional
@@ -36,4 +36,4 @@ Usage: #example
 * section[orderReferral].text.status = #generated
 * section[orderReferral].text.div = "<div xmlns=\"http://www.w3.org/1999/xhtml\">\n                Order-Referral-Form\n            </div>"
 
-* section[orderReferral].entry[ServiceRequest] = Reference(LabOrder-ServiceRequest-potassium)
+* section[orderReferral].entry[ServiceRequest] = Reference(LabOrder-ServiceRequest-potassium)

input/fsh/instances/LabOrder-Composition-by-Form.fsh → input/fsh/instances/LabOrder-CompositionWithSR_AndForm.fsh

@@ -1,9 +1,9 @@
-Instance: LabOrder-Composition-by-Form
-InstanceOf: ChLabOrderCompositionByForm
-Title: "CH LAB-Order Composition by Form"
+Instance: LabOrder-CompositionWithSR_AndForm
+InstanceOf: ChLabOrderCompositionWithSR_AndForm
+Title: "CH LAB-Order Composition with ServiceRequest and Form"
 Description: "Composition Questionnaire/QuestionnaireResponse and multiple SR"
 Usage: #example
-* id = "ch-lab-order-composition-by-form"
+* id = "ch-lab-order-composition-with-sr-and-form"
 * meta.versionId = "1"
 * meta.lastUpdated = "2021-02-18T17:04:38.520+00:00"
 * text.status = #additional
@@ -37,4 +37,4 @@ Usage: #example
 * section[orderReferral].text.div = "<div xmlns=\"http://www.w3.org/1999/xhtml\">\n                Order-Referral-Form\n            </div>"
 * section[orderReferral].entry[Questionnaire] = Reference(LabOrder-form)
 * section[orderReferral].entry[QuestionnaireResponse] = Reference(LabOrder-QuestionnaireResponse)
-* section[orderReferral].entry[ServiceRequest] = Reference(LabOrder-ServiceRequest-potassium)
+* section[orderReferral].entry[ServiceRequest] = Reference(LabOrder-ServiceRequest-potassium)

input/fsh/instances/LabOrder-Document-by-Form.fsh → input/fsh/instances/LabOrder-Document-with-SR-and-Form.fsh

@@ -1,9 +1,9 @@
-Instance: LabOrder-Document-by-Form
-InstanceOf: ChLabOrderDocumentByForm
-Title: "CH LAB-Order Document by Form"
-Description: "Example Bundle for referral/order due to suspected deep vein thrombosis"
+Instance: LabOrder-Document-with-SR-and-Form
+InstanceOf: ChLabOrderDocumentWithSR_AndForm
+Title: "CH LAB-Order Document with ServiceRequest and Form"
+Description: "Document for referral/order due to suspected deep vein thrombosis"
 Usage: #example
-* id = "ch-lab-order-by-form"
+* id = "ch-lab-order-with-sr-and-form"
 * meta.versionId = "1"
 * meta.lastUpdated = "2019-04-01T20:18:41.341+00:00"
 * language = #en
@@ -12,8 +12,8 @@ Usage: #example
 * type = #document
 * timestamp = "2019-04-01T20:18:41.341+00:00"
 
-* entry[0].fullUrl = "http://example.com/fhir/Composition/ch-lab-order-composition-by-form"
-* entry[=].resource = LabOrder-Composition-by-Form
+* entry[0].fullUrl = "http://example.com/fhir/Composition/ch-lab-order-composition-with-sr-and-form"
+* entry[=].resource = LabOrder-CompositionWithSR_AndForm
 
 * entry[+].fullUrl = "http://example.com/fhir/Patient/HansGuggindieluft"
 * entry[=].resource = HansGuggindieluft
@@ -64,4 +64,3 @@ Usage: #example
 // // ---- SR for Coagulation Tests ----
 // * entry[+].fullUrl = "http://example.com/fhir/ServiceRequest/LabOrder-cc"
 // * entry[=].resource = LabOrder-ServiceRequest-cc
-

input/fsh/instances/LabOrder-Document.fsh → input/fsh/instances/LabOrder-Document-with-SR.fsh

@@ -1,9 +1,9 @@
-Instance: LabOrder-Document
-InstanceOf: ChLabOrderDocument
-Title: "CH LAB-Order Document by Service Request"
-Description: "Example Bundle for referral/order due to suspected deep vein thrombosis"
+Instance: LabOrder-DocumentWithSR
+InstanceOf: ChLabOrderDocumentWithSR
+Title: "CH LAB-Order Document with Service Request"
+Description: "Document for referral/order due to suspected deep vein thrombosis"
 Usage: #example
-* id = "ch-lab-order-document"
+* id = "ch-lab-order-document-with-sr"
 * meta.versionId = "1"
 * meta.lastUpdated = "2019-04-01T20:18:41.341+00:00"
 * language = #en
@@ -12,8 +12,8 @@ Usage: #example
 * type = #document
 * timestamp = "2019-04-01T20:18:41.341+00:00"
 
-* entry[0].fullUrl = "http://example.com/fhir/Composition/ch-lab-order-composition"
-* entry[=].resource = LabOrder-Composition
+* entry[0].fullUrl = "http://example.com/fhir/Composition/ch-lab-order-composition-with-sr"
+* entry[=].resource = LabOrder-CompositionWithSR
 
 * entry[+].fullUrl = "http://example.com/fhir/Patient/HansGuggindieluft"
 * entry[=].resource = HansGuggindieluft

input/fsh/instances/LabOrder-ServiceRequest-chloride.fsh

@@ -1,7 +1,7 @@
 Instance: LabOrder-ServiceRequest-chloride
 InstanceOf: ChLabOrderSRSingletest
-Title: "CH LAB-Order example Service Request for Clinical Chemistry Tests"
-Description: "Example for Service Request of Chloride [Moles/volume] in Serum or Plasma"
+Title: "CH LAB Service Request for Chloride"
+Description: "Service Request for Chloride [Moles/volume] in Serum or Plasma"
 Usage: #example
 * id = "LabOrder-chloride"
 * identifier[placerOrderIdentifier].type = $v2-0203#PLAC "Placer Identifier"

input/fsh/instances/LabOrder-ServiceRequest-container-example.fsh

@@ -1,7 +1,7 @@
 Instance: LabOrder-ServiceRequest-container-example
 InstanceOf: ChLabOrderSRContainer
-Title: "CH LAB-Order example Service Request for Creatinine Clearance and Electrolytes in Serum"
-Description: "Example for Service Request as container for multiple Service Requests"
+Title: "CH LAB Service Request for Creatinine Clearance and Electrolytes in Serum"
+Description: "Service Request as container for multiple Service Requests"
 Usage: #example
 * id = "LabOrder-container-example"
 * identifier[placerOrderIdentifier].type = $v2-0203#PLAC "Placer Identifier"