Merge pull request #309 from hl7ch/rename-case-studies-instances

Rename case studies instances
hl7ch · Feb 12, 2024 · da80e3d · da80e3d
2 parents cde8195 + 5d2ced6
commit da80e3d
Show file tree

Hide file tree

Showing 57 changed files with 129 additions and 139 deletions.
diff --git a/input/fsh/instances/casestudies/0-best-practice/0-best-practice-Composition.fsh b/input/fsh/instances/casestudies/0-best-practice/0-best-practice-Composition.fsh
@@ -1,6 +1,6 @@
 Instance: 0-best-practice-Composition
 InstanceOf: ChLabOrderCompositionWithSR
-Title: "Composition 0-best-practice whith Service Request"
+Title: "Composition 0-best-practice with Service Request"
 Description: "Composition: Storyboard for tibial plateau fracture"
 Usage: #example
 * id = "0-best-practice"

diff --git a/input/fsh/instances/casestudies/0-best-practice/0-best-practice-Document.fsh b/input/fsh/instances/casestudies/0-best-practice/0-best-practice-Document.fsh
@@ -1,7 +1,7 @@
 Instance: BestPracticeDocument
 InstanceOf: ChLabOrderDocumentWithSR
 Title: "CH LAB-Order document best-practice"
-Description: "Document whith Service Request in context of tibial plateau fracture"
+Description: "Document with Service Request in context of tibial plateau fracture"
 Usage: #example
 * id = "0-best-practice-document"
 * meta.versionId = "1"

diff --git a/...1-tvt-by-form/1-tvt-CompositionByForm.fsh → ...form/1-tvt-CompositionWithSR_and_Form.fsh b/...1-tvt-by-form/1-tvt-CompositionByForm.fsh → ...form/1-tvt-CompositionWithSR_and_Form.fsh
@@ -1,9 +1,9 @@
-Instance: 1-tvt-CompositionByForm
+Instance: 1-tvt-CompositionWithSR_andForm
 InstanceOf: ChOrfComposition
 Title: "Composition by Form 1-tvt"
 Description: "Composition: Storyboard for suspected deep Vein Thrombosis"
 Usage: #example
-* id = "1-tvt-composition-by-form"
+* id = "1-tvt-composition-with-sr-and-form"
 * meta.versionId = "1"
 * meta.lastUpdated = "2022-10-20T17:04:38.520+00:00"
 * text.status = #additional

diff --git a/...es/1-tvt-by-form/1-tvt-DocumentByForm.fsh → ...nd-form/1-tvt-DocumentWithSR_and_Form.fsh b/...es/1-tvt-by-form/1-tvt-DocumentByForm.fsh → ...nd-form/1-tvt-DocumentWithSR_and_Form.fsh
@@ -1,18 +1,18 @@
-Instance: 1-tvt-DocumentByForm
+Instance: 1-tvt-DocumentWithSR_andForm
 InstanceOf: ChOrfDocument
-Title: "CH LAB-Order by Form 1-tvt"
+Title: "CH LAB-Order 1-tvt with ServiceRequest and Form"
 Description: "Document for referral/order due to suspected deep vein thrombosis"
 Usage: #example
-* id = "1-tvt-document-by-form"
+* id = "1-tvt-document-with-sr-and-form"
 * meta.versionId = "1"
 * meta.lastUpdated = "2019-04-01T20:18:41.341+00:00"
 * identifier.system = "urn:ietf:rfc:3986"
 * identifier.value = "urn:uuid:26d3dff7-ab05-4737-a49c-5eccd11125f8"
 * type = #document
 * timestamp = "2019-04-01T20:18:41.341+00:00"
 
-* entry[0].fullUrl = "http://example.com/fhir/Composition/1-tvt-composition-by-form"
-* entry[=].resource = 1-tvt-CompositionByForm
+* entry[0].fullUrl = "http://example.com/fhir/Composition/1-tvt-composition-with-sr-and-form"
+* entry[=].resource = 1-tvt-CompositionWithSR_andForm
 
 * entry[+].fullUrl = "http://example.com/fhir/Patient/TobiasTimmermann"
 * entry[=].resource = TobiasTimmermann

diff --git a/...ies/1-tvt-by-form/1-tvt-Questionnaire.fsh → ...-with-sr-and-form/1-tvt-Questionnaire.fsh b/...ies/1-tvt-by-form/1-tvt-Questionnaire.fsh → ...-with-sr-and-form/1-tvt-Questionnaire.fsh
diff --git a/...t-by-form/1-tvt-QuestionnaireResponse.fsh → ...-and-form/1-tvt-QuestionnaireResponse.fsh b/...t-by-form/1-tvt-QuestionnaireResponse.fsh → ...-and-form/1-tvt-QuestionnaireResponse.fsh
diff --git a/...vt-by-form/1-tvt-ServiceRequestByForm.fsh → ...r-and-form/1-tvt-ServiceRequestByForm.fsh b/...vt-by-form/1-tvt-ServiceRequestByForm.fsh → ...r-and-form/1-tvt-ServiceRequestByForm.fsh
diff --git a/...s/casestudies/1-tvt/1-tvt-Composition.fsh → ...1-tvt-with-sr/1-tvt-CompositionWithSR.fsh b/...s/casestudies/1-tvt/1-tvt-Composition.fsh → ...1-tvt-with-sr/1-tvt-CompositionWithSR.fsh
@@ -1,6 +1,6 @@
-Instance: 1-tvt-Composition
+Instance: 1-tvt-CompositionWithSR
 InstanceOf: ChLabOrderCompositionWithSR
-Title: "Composition 1-tvt"
+Title: "Composition 1-tvt with Service Request"
 Description: "Composition: Storyboard for suspected deep Vein Thrombosis"
 Usage: #example
 * id = "1-tvt"
@@ -33,8 +33,8 @@ Usage: #example
 * author = Reference(MarcMustermannGruppenpraxis)
 * title = "Laboratory order 1-tvt"
 
-* section[orderReferral].title = "Laboratory Order by Service Request 1-tvt"
+* section[orderReferral].title = "Laboratory Order with Service Request 1-tvt"
 * section[orderReferral].text.status = #generated
-* section[orderReferral].text.div = "<div xmlns=\"http://www.w3.org/1999/xhtml\">\n Laboratory Order by Service Request 1-tvt\n </div>"
+* section[orderReferral].text.div = "<div xmlns=\"http://www.w3.org/1999/xhtml\">\n Laboratory Order with Service Request 1-tvt\n </div>"
 * section[orderReferral].entry[ServiceRequest] = Reference(1-tvt-ServiceRequest)
 
diff --git a/...nces/casestudies/1-tvt/1-tvt-Document.fsh → ...es/1-tvt-with-sr/1-tvt-DocumentWithSR.fsh b/...nces/casestudies/1-tvt/1-tvt-Document.fsh → ...es/1-tvt-with-sr/1-tvt-DocumentWithSR.fsh
@@ -1,9 +1,9 @@
-Instance: 1-tvt-Document
+Instance: 1-tvt-DocumentWithSR
 InstanceOf: ChLabOrderDocumentWithSR
-Title: "CH LAB-Order 1-tvt"
+Title: "CH LAB-Order 1-tvt with ServiceRequest"
 Description: "Document for referral/order due to suspected deep vein thrombosis"
 Usage: #example
-* id = "1-tvt-document"
+* id = "1-tvt-document-with-sr"
 * meta.versionId = "1"
 * meta.lastUpdated = "2019-04-01T20:18:41.341+00:00"
 * identifier.system = "urn:ietf:rfc:3986"
@@ -12,7 +12,7 @@ Usage: #example
 * timestamp = "2019-04-01T20:18:41.341+00:00"
 
 * entry[0].fullUrl = "http://example.com/fhir/Composition/1-tvt"
-* entry[=].resource = 1-tvt-Composition
+* entry[=].resource = 1-tvt-CompositionWithSR
 
 * entry[+].fullUrl = "http://example.com/fhir/Patient/TobiasTimmermann"
 * entry[=].resource = TobiasTimmermann

diff --git a/...asestudies/1-tvt/1-tvt-ServiceRequest.fsh → ...es/1-tvt-with-sr/1-tvt-ServiceRequest.fsh b/...asestudies/1-tvt/1-tvt-ServiceRequest.fsh → ...es/1-tvt-with-sr/1-tvt-ServiceRequest.fsh
diff --git a/...by-form/2-pertussis-CompositionByForm.fsh → ...nd-form/2-pertussis-CompositionByForm.fsh b/...by-form/2-pertussis-CompositionByForm.fsh → ...nd-form/2-pertussis-CompositionByForm.fsh
@@ -1,9 +1,9 @@
-Instance: 2-pertussis-CompositionByForm
+Instance: 2-pertussis-CompositionWith_SR_and_Form
 InstanceOf: ChOrfComposition
-Title: "Composition by Form 2-pertussis"
+Title: "Composition 2-pertussis with ServiceRequest and Form"
 Description: "Composition: Storyboard for Pertussis Investigation"
 Usage: #example
-* id = "2-pertussis-composition-by-form"
+* id = "2-pertussis-composition-with-sr-and-form"
 * meta.versionId = "1"
 * meta.lastUpdated = "2021-02-18T17:04:38.520+00:00"
 * text.status = #additional

diff --git a/...is-by-form/2-pertussis-DocumentByForm.fsh → .../2-pertussis-DocumentWith_SR_and_Form.fsh b/...is-by-form/2-pertussis-DocumentByForm.fsh → .../2-pertussis-DocumentWith_SR_and_Form.fsh
@@ -1,18 +1,18 @@
-Instance: 2-pertussis-DocumentByForm
+Instance: 2-pertussis-DocumentWith_SR_and_Form
 InstanceOf: ChOrfDocument
-Title: "CH LAB-Order by Form 2-pertussis"
+Title: "CH LAB-Order 2-pertussis with ServiceRequest and Form"
 Description: "Document for referral/order Pertussis investigation"
 Usage: #example
-* id = "2-pertussis-document-by-form"
+* id = "2-pertussis-document-with-sr-and-form"
 * meta.versionId = "1"
 * meta.lastUpdated = "2019-04-01T20:18:41.341+00:00"
 * identifier.system = "urn:ietf:rfc:3986"
 * identifier.value = "urn:uuid:26d3dff7-ab05-4737-a49c-5eccd33595f8"
 * type = #document
 * timestamp = "2019-04-01T20:18:41.341+00:00"
 
-* entry[0].fullUrl = "http://example.com/fhir/Composition/2-pertussis-composition-by-form"
-* entry[=].resource = 2-pertussis-CompositionByForm
+* entry[0].fullUrl = "http://example.com/fhir/Composition/2-pertussis-composition-with-sr-and-form"
+* entry[=].resource = 2-pertussis-CompositionWith_SR_and_Form
 
 * entry[+].fullUrl = "http://example.com/fhir/Patient/EmilKummer"
 * entry[=].resource = EmilKummer

diff --git a/...sis-by-form/2-pertussis-Questionnaire.fsh → ...sr-and-form/2-pertussis-Questionnaire.fsh b/...sis-by-form/2-pertussis-Questionnaire.fsh → ...sr-and-form/2-pertussis-Questionnaire.fsh
diff --git a/...orm/2-pertussis-QuestionnaireResponse.fsh → ...orm/2-pertussis-QuestionnaireResponse.fsh b/...orm/2-pertussis-QuestionnaireResponse.fsh → ...orm/2-pertussis-QuestionnaireResponse.fsh
diff --git a/...form/2-pertussis-ServiceRequestByForm.fsh → ...form/2-pertussis-ServiceRequestByForm.fsh b/...form/2-pertussis-ServiceRequestByForm.fsh → ...form/2-pertussis-ServiceRequestByForm.fsh
diff --git a/...s/2-pertussis/2-pertussis-Composition.fsh → ...with-sr/2-pertussis-CompositionWithSR.fsh b/...s/2-pertussis/2-pertussis-Composition.fsh → ...with-sr/2-pertussis-CompositionWithSR.fsh
@@ -1,9 +1,9 @@
-Instance: 2-pertussis-Composition
+Instance: 2-pertussis-CompositionWithSR
 InstanceOf: ChLabOrderCompositionWithSR
-Title: "Composition 2-pertussis"
+Title: "Composition 2-pertussis with Service Request"
 Description: "Composition: Storyboard for Pertussis Investigation"
 Usage: #example
-* id = "2-pertussis"
+* id = "2-pertussis-with-sr"
 * meta.versionId = "1"
 * meta.lastUpdated = "2021-02-18T17:04:38.520+00:00"
 * text.status = #additional
@@ -27,12 +27,12 @@ Usage: #example
 * subject = Reference(Patient/EmilKummer)
 * date = "2020-03-31T11:46:09+02:00"
 * author = Reference(PeterPrestoGruppenpraxis)
-* title = "Laboratory Order 2-pertussis"
+* title = "Laboratory Order 2-pertussis with Service Request"
 
-* section[orderReferral].title = "Laboratory Order by Service Request 2-pertussis"
+* section[orderReferral].title = "Laboratory Order with Service Request 2-pertussis"
 // * section[orderReferral].code = $loinc#93037-0 "Portable medical order form"
 * section[orderReferral].text.status = #generated
-* section[orderReferral].text.div = "<div xmlns=\"http://www.w3.org/1999/xhtml\">\n Laboratory Order by Service Request 2-pertussis\n </div>"
+* section[orderReferral].text.div = "<div xmlns=\"http://www.w3.org/1999/xhtml\">\n Laboratory Order with Service Request 2-pertussis\n </div>"
 // * section[orderReferral].entry[Questionnaire] = Reference(2-pertussis-Questionnaire)
 // * section[orderReferral].entry[QuestionnaireResponse] = Reference(2-pertussis-QuestionnaireResponse)
 * section[orderReferral].entry[ServiceRequest] = Reference(2-pertussis-ServiceRequest)
diff --git a/...dies/2-pertussis/2-pertussis-Document.fsh → ...is-with-sr/2-pertussis-DocumentWithSR.fsh b/...dies/2-pertussis/2-pertussis-Document.fsh → ...is-with-sr/2-pertussis-DocumentWithSR.fsh
@@ -1,25 +1,21 @@
-Instance: 2-pertussis-Document
+Instance: 2-pertussis-DocumentWithSR
 InstanceOf: ChLabOrderDocumentWithSR
-Title: "CH LAB-Order 2-pertussis"
+Title: "CH LAB-Order 2-pertussis with ServiceRequest"
 Description: "Document for referral/order for Pertussis investigation"
 Usage: #example
-* id = "2-pertussis-document"
+* id = "2-pertussis-document-with-sr"
 * meta.versionId = "1"
 * meta.lastUpdated = "2019-04-01T20:18:41.341+00:00"
 * identifier.system = "urn:ietf:rfc:3986"
 * identifier.value = "urn:uuid:26d3dff7-ab05-4737-a49c-5eccd33595f8"
 * type = #document
 * timestamp = "2019-04-01T20:18:41.341+00:00"
 
-* entry[0].fullUrl = "http://example.com/fhir/Composition/2-pertussis"
-* entry[=].resource = 2-pertussis-Composition
+* entry[0].fullUrl = "http://example.com/fhir/Composition/2-pertussis-with-sr"
+* entry[=].resource = 2-pertussis-CompositionWithSR
 
 * entry[+].fullUrl = "http://example.com/fhir/Patient/EmilKummer"
 * entry[=].resource = EmilKummer
-// * entry[+].fullUrl = "http://example.com/fhir/Patient/FranzMuster"
-// * entry[=].resource = FranzMuster
-// * entry[+].fullUrl = "http://example.com/fhir/Patient/BeatBorer"
-// * entry[=].resource = BeatBorer
 
 * entry[+].fullUrl = "http://example.com/fhir/Practitioner/PeterPresto"
 * entry[=].resource = PeterPresto

diff --git a/...s/2-pertussis-ServiceRequest-add-test.fsh → ...r/2-pertussis-ServiceRequest-add-test.fsh b/...s/2-pertussis-ServiceRequest-add-test.fsh → ...r/2-pertussis-ServiceRequest-add-test.fsh
diff --git a/...-pertussis/2-pertussis-ServiceRequest.fsh → ...is-with-sr/2-pertussis-ServiceRequest.fsh b/...-pertussis/2-pertussis-ServiceRequest.fsh → ...is-with-sr/2-pertussis-ServiceRequest.fsh
diff --git a/...3-gyn-by-form/3-gyn-CompositionByForm.fsh → ...form/3-gyn-CompositionWithSR_and_Form.fsh b/...3-gyn-by-form/3-gyn-CompositionByForm.fsh → ...form/3-gyn-CompositionWithSR_and_Form.fsh
@@ -1,9 +1,9 @@
-Instance: 3-gyn-CompositionByForm
+Instance: 3-gyn-CompositionWithSR_andForm
 InstanceOf: ChOrfComposition
-Title: "Composition 3-gyn by Form"
+Title: "Composition 3-gyn with ServiceRequest and Form"
 Description: "Composition: Storyboard for Preventive Gynecological Check-up"
 Usage: #example
-* id = "3-gyn-composition-by-form"
+* id = "with3-gyn-composition-with-sr-and-form"
 * meta.versionId = "1"
 * meta.lastUpdated = "2021-02-18T17:04:38.520+00:00"
 * text.status = #additional

diff --git a/...es/3-gyn-by-form/3-gyn-DocumentByForm.fsh → ...nd-form/3-gyn-DocumentWithSR_and_Form.fsh b/...es/3-gyn-by-form/3-gyn-DocumentByForm.fsh → ...nd-form/3-gyn-DocumentWithSR_and_Form.fsh
@@ -1,18 +1,18 @@
-Instance: 3-gyn-DocumentByForm
+Instance: 3-gyn-DocumentWithSR_andForm
 InstanceOf: ChOrfDocument
-Title: "CH LAB-Order by Form 3-gyn"
+Title: "CH LAB-Order 3-gyn with ServiceRequest and Form"
 Description: "Document for referral/order preventive gynaecological check-up"
 Usage: #example
-* id = "3-gyn-document-by-form"
+* id = "3-gyn-document-with-sr-and-form"
 * meta.versionId = "1"
 * meta.lastUpdated = "2019-04-01T20:18:41.341+00:00"
 * identifier.system = "urn:ietf:rfc:3986"
 * identifier.value = "urn:uuid:26d3dff7-ab05-4737-a49c-5eccd33595f8"
 * type = #document
 * timestamp = "2019-04-01T20:18:41.341+00:00"
 
-* entry[0].fullUrl = "http://example.com/fhir/Composition/3-gyn-composition-by-form"
-* entry[=].resource = 3-gyn-CompositionByForm
+* entry[0].fullUrl = "http://example.com/fhir/Composition/with3-gyn-composition-with-sr-and-form"
+* entry[=].resource = 3-gyn-CompositionWithSR_andForm
 
 * entry[+].fullUrl = "http://example.com/fhir/Patient/MarinaRubella"
 * entry[=].resource = MarinaRubella

diff --git a/...ies/3-gyn-by-form/3-gyn-Questionnaire.fsh → ...-with-sr-and-form/3-gyn-Questionnaire.fsh b/...ies/3-gyn-by-form/3-gyn-Questionnaire.fsh → ...-with-sr-and-form/3-gyn-Questionnaire.fsh
diff --git a/...n-by-form/3-gyn-QuestionnaireResponse.fsh → ...-and-form/3-gyn-QuestionnaireResponse.fsh b/...n-by-form/3-gyn-QuestionnaireResponse.fsh → ...-and-form/3-gyn-QuestionnaireResponse.fsh
diff --git a/...yn-by-form/3-gyn-ServiceRequestByForm.fsh → ...r-and-form/3-gyn-ServiceRequestByForm.fsh b/...yn-by-form/3-gyn-ServiceRequestByForm.fsh → ...r-and-form/3-gyn-ServiceRequestByForm.fsh
diff --git a/...s/casestudies/3-gyn/3-gyn-Composition.fsh → ...3-gyn-with-sr/3-gyn-CompositionWithSR.fsh b/...s/casestudies/3-gyn/3-gyn-Composition.fsh → ...3-gyn-with-sr/3-gyn-CompositionWithSR.fsh
@@ -1,9 +1,9 @@
-Instance: 3-gyn-Composition
+Instance: 3-gyn-CompositionWithSR
 InstanceOf: ChLabOrderCompositionWithSR
-Title: "Composition 3-gyn"
+Title: "Composition 3-gyn with Service Request"
 Description: "Composition: Storyboard for Preventive Gynaecological Check-up"
 Usage: #example
-* id = "3-gyn"
+* id = "3-gyn-with-sr"
 * meta.versionId = "1"
 * meta.lastUpdated = "2021-02-18T17:04:38.520+00:00"
 * text.status = #additional
@@ -27,11 +27,8 @@ Usage: #example
 * author = Reference(PeterPapGruppenpraxis)
 * title = "Laboratory Order 3-gyn"
 
-* section[orderReferral].title = "Laboratory Order by Service Request 3-gyn"
-// * section[orderReferral].code = $loinc#93037-0 "Portable medical order form"
+* section[orderReferral].title = "Laboratory Order with Service Request 3-gyn"
 * section[orderReferral].text.status = #generated
-* section[orderReferral].text.div = "<div xmlns=\"http://www.w3.org/1999/xhtml\">\n Laboratory Order by Service Request 3-gyn\n </div>"
-// * section[orderReferral].entry[Questionnaire] = Reference(3-gyn-Questionnaire)
-// * section[orderReferral].entry[QuestionnaireResponse] = Reference(3-gyn-QuestionnaireResponse)
+* section[orderReferral].text.div = "<div xmlns=\"http://www.w3.org/1999/xhtml\">\n Laboratory Order with Service Request 3-gyn\n </div>"
 * section[orderReferral].entry[ServiceRequest] = Reference(3-gyn-ServiceRequest)
 
diff --git a/...nces/casestudies/3-gyn/3-gyn-Document.fsh → ...es/3-gyn-with-sr/3-gyn-DocumentWithSR.fsh b/...nces/casestudies/3-gyn/3-gyn-Document.fsh → ...es/3-gyn-with-sr/3-gyn-DocumentWithSR.fsh
@@ -1,6 +1,6 @@
-Instance: 3-gyn-Document
+Instance: 3-gyn-DocumentWithSR
 InstanceOf: ChLabOrderDocumentWithSR
-Title: "CH LAB-Order 3-gyn"
+Title: "CH LAB-Order 3-gyn with ServiceRequest"
 Description: "Document for referral/order preventive gynaecological check-up"
 Usage: #example
 * id = "3-gyn-document"
@@ -11,8 +11,8 @@ Usage: #example
 * type = #document
 * timestamp = "2019-04-01T20:18:41.341+00:00"
 
-* entry[0].fullUrl = "http://example.com/fhir/Composition/3-gyn"
-* entry[=].resource = 3-gyn-Composition
+* entry[0].fullUrl = "http://example.com/fhir/Composition/3-gyn-with-sr"
+* entry[=].resource = 3-gyn-CompositionWithSR
 
 * entry[+].fullUrl = "http://example.com/fhir/Patient/MarinaRubella"
 * entry[=].resource = MarinaRubella

diff --git a/...asestudies/3-gyn/3-gyn-ServiceRequest.fsh → ...es/3-gyn-with-sr/3-gyn-ServiceRequest.fsh b/...asestudies/3-gyn/3-gyn-ServiceRequest.fsh → ...es/3-gyn-with-sr/3-gyn-ServiceRequest.fsh
diff --git a/...is-by-form/4-sepsis-CompositionByForm.fsh → ...m/4-sepsis-CompositionWithSR_and_Form.fsh b/...is-by-form/4-sepsis-CompositionByForm.fsh → ...m/4-sepsis-CompositionWithSR_and_Form.fsh
@@ -1,9 +1,9 @@
-Instance: 4-sepsis-CompositionByForm
+Instance: 4-sepsis-CompositionWithSR_andForm
 InstanceOf: ChOrfComposition
-Title: "Composition: 4-sepsis"
+Title: "Composition 4-sepsis with ServiceRequewt"
 Description: "Composition: Storyboard for Sepsis Investigation"
 Usage: #example
-* id = "4-sepsis-composition-by-form"
+* id = "4-sepsis-composition-with-sr-and-form"
 * meta.versionId = "1"
 * meta.lastUpdated = "2021-02-18T17:04:38.520+00:00"
 * text.status = #additional

diff --git a/...epsis-by-form/4-sepsis-DocumentByForm.fsh → ...form/4-sepsis-DocumentWithSR_and_Form.fsh b/...epsis-by-form/4-sepsis-DocumentByForm.fsh → ...form/4-sepsis-DocumentWithSR_and_Form.fsh
@@ -1,18 +1,18 @@
-Instance: 4-sepsis-DocumentByForm
+Instance: 4-sepsis-DocumentWithSR_andForm
 InstanceOf: ChOrfDocument
-Title: "CH LAB-Order by Form 4-sepsis"
+Title: "CH LAB-Order 4-sepsis with ServiceRequest and Form"
 Description: "Document for referral/order Sepsis Investigation"
 Usage: #example
-* id = "4-sepsis-document-by-form"
+* id = "4-sepsis-document-with-sr-and-form"
 * meta.versionId = "1"
 * meta.lastUpdated = "2019-04-01T20:18:41.341+00:00"
 * identifier.system = "urn:ietf:rfc:3986"
 * identifier.value = "urn:uuid:26d3dff7-ab05-4737-a49c-5eccd00005f8"
 * type = #document
 * timestamp = "2019-04-01T20:18:41.341+00:00"
 
-* entry[0].fullUrl = "http://example.com/fhir/Composition/4-sepsis-composition-by-form"
-* entry[=].resource = 4-sepsis-CompositionByForm
+* entry[0].fullUrl = "http://example.com/fhir/Composition/4-sepsis-composition-with-sr-and-form"
+* entry[=].resource = 4-sepsis-CompositionWithSR_andForm
 
 * entry[+].fullUrl = "http://example.com/fhir/Patient/SaraSpeckmann"
 * entry[=].resource = SaraSpeckmann

diff --git a/...sepsis-by-form/4-sepsis-Questionnaire.fsh → ...th-sr-and-form/4-sepsis-Questionnaire.fsh b/...sepsis-by-form/4-sepsis-Questionnaire.fsh → ...th-sr-and-form/4-sepsis-Questionnaire.fsh
diff --git a/...y-form/4-sepsis-QuestionnaireResponse.fsh → ...d-form/4-sepsis-QuestionnaireResponse.fsh b/...y-form/4-sepsis-QuestionnaireResponse.fsh → ...d-form/4-sepsis-QuestionnaireResponse.fsh
diff --git a/...by-form/4-sepsis-ServiceRequestByForm.fsh → ...nd-form/4-sepsis-ServiceRequestByForm.fsh b/...by-form/4-sepsis-ServiceRequestByForm.fsh → ...nd-form/4-sepsis-ServiceRequestByForm.fsh
diff --git a/...studies/4-sepsis/4-sepsis-Composition.fsh → ...is-with-sr/4-sepsis-CompositionWithSR.fsh b/...studies/4-sepsis/4-sepsis-Composition.fsh → ...is-with-sr/4-sepsis-CompositionWithSR.fsh
@@ -1,9 +1,9 @@
-Instance: 4-sepsis-Composition
+Instance: 4-sepsis-CompositionWithSR
 InstanceOf: ChLabOrderCompositionWithSR
-Title: "Composition 4-sepsis"
+Title: "Composition 4-sepsis with ServiceRequest"
 Description: "Composition: Storyboard for Sepsis Investigation"
 Usage: #example
-* id = "4-sepsis"
+* id = "4-sepsis-with-sr"
 * meta.versionId = "1"
 * meta.lastUpdated = "2021-02-18T17:04:38.520+00:00"
 
@@ -34,7 +34,7 @@ Usage: #example
 * author = Reference(HansHauserKantonsspital)
 * title = "Laboratory Order 4-sepsis"
 
-* section[orderReferral].title = "Laboratory Order by Service Request 4-sepsis"
+* section[orderReferral].title = "Laboratory Order with Service Request 4-sepsis"
 * section[orderReferral].text.status = #generated
-* section[orderReferral].text.div = "<div xmlns=\"http://www.w3.org/1999/xhtml\">\n Laboratory Order by Service Request 4-sepsis\n </div>"
+* section[orderReferral].text.div = "<div xmlns=\"http://www.w3.org/1999/xhtml\">\n Laboratory Order with Service Request 4-sepsis\n </div>"
 * section[orderReferral].entry[ServiceRequest] = Reference(4-sepsis-ServiceRequest)
diff --git a/...asestudies/4-sepsis/4-sepsis-Document.fsh → ...epsis-with-sr/4-sepsis-DocumentWithSR.fsh b/...asestudies/4-sepsis/4-sepsis-Document.fsh → ...epsis-with-sr/4-sepsis-DocumentWithSR.fsh
@@ -1,18 +1,18 @@
-Instance: 4-sepsis-Document
+Instance: 4-sepsis-DocumentWithSR
 InstanceOf: ChLabOrderDocumentWithSR
-Title: "CH LAB-Order 4-sepsis"
+Title: "CH LAB-Order 4-sepsis with ServiceRequest"
 Description: "Document for referral/order Sepsis Investigation"
 Usage: #example
-* id = "4-sepsis-document"
+* id = "4-sepsis-document-with-sr"
 * meta.versionId = "1"
 * meta.lastUpdated = "2019-04-01T20:18:41.341+00:00"
 * identifier.system = "urn:ietf:rfc:3986"
 * identifier.value = "urn:uuid:26d3dff7-ab05-4737-a49c-5eccd33595f8"
 * type = #document
 * timestamp = "2019-04-01T20:18:41.341+00:00"
 
-* entry[0].fullUrl = "http://example.com/fhir/Composition/4-sepsis"
-* entry[=].resource = 4-sepsis-Composition
+* entry[0].fullUrl = "http://example.com/fhir/Composition/4-sepsis-with-sr"
+* entry[=].resource = 4-sepsis-CompositionWithSR
 
 * entry[+].fullUrl = "http://example.com/fhir/Patient/SaraSpeckmann"
 * entry[=].resource = SaraSpeckmann

diff --git a/...dies/4-sepsis/4-sepsis-ServiceRequest.fsh → ...epsis-with-sr/4-sepsis-ServiceRequest.fsh b/...dies/4-sepsis/4-sepsis-ServiceRequest.fsh → ...epsis-with-sr/4-sepsis-ServiceRequest.fsh
diff --git a/...y-form/5-biol-monit-CompositionByForm.fsh → ...d-form/5-biol-monit-CompositionByForm.fsh b/...y-form/5-biol-monit-CompositionByForm.fsh → ...d-form/5-biol-monit-CompositionByForm.fsh
@@ -1,9 +1,9 @@
-Instance: 5-biol-monit-CompositionByForm
+Instance: 5-biol-monit-CompositionWithSR_andForm
 InstanceOf: ChOrfComposition
-Title: "Composition by Form 5-biol-monit"
+Title: "Composition 5-biol-monit with Service Request and Form"
 Description: "Composition: Storyboard for Toxicological Monitoring"
 Usage: #example
-* id = "5-biol-monit-composition-by-form"
+* id = "5-biol-monit-composition-with-sr-and-form"
 * meta.versionId = "1"
 * meta.lastUpdated = "2021-02-18T17:04:38.520+00:00"
 * text.status = #additional

diff --git a/...t-by-form/5-biol-monit-DocumentByForm.fsh → ...-and-form/5-biol-monit-DocumentByForm.fsh b/...t-by-form/5-biol-monit-DocumentByForm.fsh → ...-and-form/5-biol-monit-DocumentByForm.fsh
@@ -1,18 +1,18 @@
 Instance: 5-biol-monit-DocumentByForm
 InstanceOf: ChOrfDocument
-Title: "CH LAB-Order by Form 5-biol-monit"
+Title: "CH LAB-Order 5-biol-monit with ServiceRequest and Form"
 Description: "Document for referral/order toxicological Monitoring"
 Usage: #example
-* id = "5-biol-monit-document-by-form"
+* id = "5-biol-monit-document-with-sr-and-form"
 * meta.versionId = "1"
 * meta.lastUpdated = "2019-04-01T20:18:41.341+00:00"
 * identifier.system = "urn:ietf:rfc:3986"
 * identifier.value = "urn:uuid:26d3dff7-ab05-4737-a49c-5eccd3359505"
 * type = #document
 * timestamp = "2019-04-01T20:18:41.341+00:00"
 
-* entry[0].fullUrl = "http://example.com/fhir/Composition/5-biol-monit-composition-by-form"
-* entry[=].resource = 5-biol-monit-CompositionByForm
+* entry[0].fullUrl = "http://example.com/fhir/Composition/5-biol-monit-composition-with-sr-and-form"
+* entry[=].resource = 5-biol-monit-CompositionWithSR_andForm
 
 * entry[+].fullUrl = "http://example.com/fhir/Patient/BeatBorer"
 * entry[=].resource = BeatBorer

diff --git a/...it-by-form/5-biol-monit-Questionnaire.fsh → ...r-and-form/5-biol-monit-Questionnaire.fsh b/...it-by-form/5-biol-monit-Questionnaire.fsh → ...r-and-form/5-biol-monit-Questionnaire.fsh
diff --git a/...rm/5-biol-monit-QuestionnaireResponse.fsh → ...rm/5-biol-monit-QuestionnaireResponse.fsh b/...rm/5-biol-monit-QuestionnaireResponse.fsh → ...rm/5-biol-monit-QuestionnaireResponse.fsh
diff --git a/...orm/5-biol-monit-ServiceRequestByForm.fsh → ...orm/5-biol-monit-ServiceRequestByForm.fsh b/...orm/5-biol-monit-ServiceRequestByForm.fsh → ...orm/5-biol-monit-ServiceRequestByForm.fsh