diff --git a/Resources/fsh-generated/fsh-index.json b/Resources/fsh-generated/fsh-index.json
index f1470cb3..e150c94f 100644
--- a/Resources/fsh-generated/fsh-index.json
+++ b/Resources/fsh-generated/fsh-index.json
@@ -1,15 +1,15 @@
 [
   {
-    "outputFile": "CapabilityStatement-ISiK-capabilityStatement-vitalparameter-server-hospital.json",
-    "fshName": "ISiK-capabilityStatement-vitalparameter-server-hospital",
+    "outputFile": "CapabilityStatement-ISiKCapabilityStatementVitalparameterServerHospital.json",
+    "fshName": "ISiKCapabilityStatementVitalparameterServerHospital",
     "fshType": "Instance",
     "fshFile": "ISiK-CapabilityStatement-Hospital.fsh",
     "startLine": 1,
     "endLine": 134
   },
   {
-    "outputFile": "CapabilityStatement-ISiK-capabilityStatement-vitalparameter-server-pdms.json",
-    "fshName": "ISiK-capabilityStatement-vitalparameter-server-pdms",
+    "outputFile": "CapabilityStatement-ISiKCapabilityStatementVitalparameterServerPDMS.json",
+    "fshName": "ISiKCapabilityStatementVitalparameterServerPDMS",
     "fshType": "Instance",
     "fshFile": "ISiK-CapabilityStatement-PDMS.fsh",
     "startLine": 1,
diff --git a/Resources/fsh-generated/fsh-index.txt b/Resources/fsh-generated/fsh-index.txt
index 2975ab3f..d7e1c5d3 100644
--- a/Resources/fsh-generated/fsh-index.txt
+++ b/Resources/fsh-generated/fsh-index.txt
@@ -1,6 +1,6 @@
 Output File                                                                               Name                                                                          Type      FSH File                                                                                       Lines
-CapabilityStatement-ISiK-capabilityStatement-vitalparameter-server-hospital.json          ISiK-capabilityStatement-vitalparameter-server-hospital                       Instance  ISiK-CapabilityStatement-Hospital.fsh                                                          1 - 134
-CapabilityStatement-ISiK-capabilityStatement-vitalparameter-server-pdms.json              ISiK-capabilityStatement-vitalparameter-server-pdms                           Instance  ISiK-CapabilityStatement-PDMS.fsh                                                              1 - 164
+CapabilityStatement-ISiKCapabilityStatementVitalparameterServerHospital.json              ISiKCapabilityStatementVitalparameterServerHospital                           Instance  ISiK-CapabilityStatement-Hospital.fsh                                                          1 - 134
+CapabilityStatement-ISiKCapabilityStatementVitalparameterServerPDMS.json                  ISiKCapabilityStatementVitalparameterServerPDMS                               Instance  ISiK-CapabilityStatement-PDMS.fsh                                                              1 - 164
 Device-ExampleDevice.json                                                                 ExampleDevice                                                                 Instance  instances.fsh                                                                                  14 - 17
 Observation-Herzzeitvolumen.json                                                          Herzzeitvolumen                                                               Instance  mii-backport/SD_MII_ICU_Herzzeitvolumen.fsh                                                    13 - 25
 Observation-ISiKAtemfrequenzExample.json                                                  ISiKAtemfrequenzExample                                                       Instance  ISiK-Atemfrequenz.fsh                                                                          29 - 41
diff --git a/Resources/fsh-generated/resources/CapabilityStatement-ISiK-capabilityStatement-vitalparameter-server-hospital.json b/Resources/fsh-generated/resources/CapabilityStatement-ISiKCapabilityStatementVitalparameterServerHospital.json
similarity index 97%
rename from Resources/fsh-generated/resources/CapabilityStatement-ISiK-capabilityStatement-vitalparameter-server-hospital.json
rename to Resources/fsh-generated/resources/CapabilityStatement-ISiKCapabilityStatementVitalparameterServerHospital.json
index 5fba1665..9f7ed380 100644
--- a/Resources/fsh-generated/resources/CapabilityStatement-ISiK-capabilityStatement-vitalparameter-server-hospital.json
+++ b/Resources/fsh-generated/resources/CapabilityStatement-ISiKCapabilityStatementVitalparameterServerHospital.json
@@ -1,7 +1,7 @@
 {
   "resourceType": "CapabilityStatement",
-  "id": "ISiK-capabilityStatement-vitalparameter-server-hospital",
-  "url": "https://gematik.de/fhir/isik/CapabilityStatement/ISiK-capabilityStatement-vitalparameter-server-hospital",
+  "id": "ISiKCapabilityStatementVitalparameterServerHospital",
+  "url": "https://gematik.de/fhir/isik/CapabilityStatement/ISiKCapabilityStatementVitalparameterServerHospital",
   "status": "draft",
   "experimental": false,
   "version": "4.0.0-rc",
@@ -10,8 +10,8 @@
   "implementationGuide": [
     "https://gematik.de/fhir/isik/v4/Vitalparameter/ImplementationGuide/ISiK-vitalparameter|4.0.0-rc"
   ],
-  "name": "ISiKCapabilityStatementVitalparameterServer",
-  "title": "ISiK CapabilityStatement Vitalparameter Server",
+  "name": "ISiKCapabilityStatementVitalparameterServerHospital",
+  "title": "ISiK CapabilityStatement Vitalparameter Server Hospital",
   "contact": [
     {
       "telecom": [
@@ -41,7 +41,7 @@
     "application/fhir+json"
   ],
   "instantiates": [
-    "https://gematik.de/fhir/isik/CapabilityStatement/ISiK-capabilityStatement-vitalparameter-server-hospital"
+    "https://gematik.de/fhir/isik/CapabilityStatement/ISiKCapabilityStatementVitalparameterServerHospital"
   ],
   "rest": [
     {
diff --git a/Resources/fsh-generated/resources/CapabilityStatement-ISiK-capabilityStatement-vitalparameter-server-pdms.json b/Resources/fsh-generated/resources/CapabilityStatement-ISiKCapabilityStatementVitalparameterServerPDMS.json
similarity index 98%
rename from Resources/fsh-generated/resources/CapabilityStatement-ISiK-capabilityStatement-vitalparameter-server-pdms.json
rename to Resources/fsh-generated/resources/CapabilityStatement-ISiKCapabilityStatementVitalparameterServerPDMS.json
index 86c98967..8012a3cd 100644
--- a/Resources/fsh-generated/resources/CapabilityStatement-ISiK-capabilityStatement-vitalparameter-server-pdms.json
+++ b/Resources/fsh-generated/resources/CapabilityStatement-ISiKCapabilityStatementVitalparameterServerPDMS.json
@@ -1,7 +1,7 @@
 {
   "resourceType": "CapabilityStatement",
-  "id": "ISiK-capabilityStatement-vitalparameter-server-pdms",
-  "url": "https://gematik.de/fhir/isik/CapabilityStatement/ISiK-capabilityStatement-vitalparameter-server-pdms",
+  "id": "ISiKCapabilityStatementVitalparameterServerPDMS",
+  "url": "https://gematik.de/fhir/isik/CapabilityStatement/ISiKCapabilityStatementVitalparameterServerPDMS",
   "status": "draft",
   "experimental": false,
   "version": "4.0.0-rc",
@@ -10,8 +10,8 @@
   "implementationGuide": [
     "https://gematik.de/fhir/isik/v4/Vitalparameter/ImplementationGuide/ISiK-vitalparameter|4.0.0-rc"
   ],
-  "name": "ISiKCapabilityStatementVitalparameterServer",
-  "title": "ISiK CapabilityStatement Vitalparameter Server",
+  "name": "ISiKCapabilityStatementVitalparameterServerPDMS",
+  "title": "ISiK CapabilityStatement Vitalparameter Server PDMS",
   "contact": [
     {
       "telecom": [
@@ -22,7 +22,7 @@
       ]
     }
   ],
-  "description": "Das vorliegende CapabilityStatement beschreibt alle verpflichtenden Interaktionen die ein ISiK-konformes System unterstützen muss um das Bestätigungsverfahren für das Modul Vitalparameter zu bestehen.",
+  "description": "Das vorliegende CapabilityStatement beschreibt alle verpflichtenden Interaktionen die ein ISiK-konformes PDMS-System unterstützen muss um das Bestätigungsverfahren für das Modul Vitalparameter zu bestehen.",
   "jurisdiction": [
     {
       "coding": [
@@ -41,7 +41,7 @@
     "application/fhir+json"
   ],
   "instantiates": [
-    "https://gematik.de/fhir/isik/CapabilityStatement/ISiK-capabilityStatement-vitalparameter-server-pdms"
+    "https://gematik.de/fhir/isik/CapabilityStatement/ISiKCapabilityStatementVitalparameterServerPDMS"
   ],
   "rest": [
     {
diff --git a/Resources/input/fsh/ISiK-CapabilityStatement-Hospital.fsh b/Resources/input/fsh/ISiK-CapabilityStatement-Hospital.fsh
index 0466d37b..48b492c0 100644
--- a/Resources/input/fsh/ISiK-CapabilityStatement-Hospital.fsh
+++ b/Resources/input/fsh/ISiK-CapabilityStatement-Hospital.fsh
@@ -1,9 +1,9 @@
-Instance: ISiK-capabilityStatement-vitalparameter-server-hospital
+Instance: ISiKCapabilityStatementVitalparameterServerHospital
 InstanceOf: CapabilityStatement
 Usage: #definition
 * insert Meta-CapabilityStatement
-* name = "ISiKCapabilityStatementVitalparameterServer"
-* title = "ISiK CapabilityStatement Vitalparameter Server"
+* name = "ISiKCapabilityStatementVitalparameterServerHospital"
+* title = "ISiK CapabilityStatement Vitalparameter Server Hospital"
 * contact.telecom.system = #url
 * contact.telecom.value = "https://www.gematik.de"
 * description = "Das vorliegende CapabilityStatement beschreibt alle verpflichtenden Interaktionen die ein ISiK-konformes System unterstützen muss um das Bestätigungsverfahren für das Modul Vitalparameter zu bestehen."
@@ -12,7 +12,7 @@ Usage: #definition
 * fhirVersion = #4.0.1
 * format[0] = #application/fhir+xml
 * format[+] = #application/fhir+json
-* instantiates = Canonical(ISiK-capabilityStatement-vitalparameter-server-hospital)
+* instantiates = Canonical(ISiKCapabilityStatementVitalparameterServerHospital)
 * rest.mode = #server
 * rest.resource[+]
 * rest.resource[=].extension.url = $capabilitystatement-expectation
diff --git a/Resources/input/fsh/ISiK-CapabilityStatement-PDMS.fsh b/Resources/input/fsh/ISiK-CapabilityStatement-PDMS.fsh
index c9d5ec31..6502485e 100644
--- a/Resources/input/fsh/ISiK-CapabilityStatement-PDMS.fsh
+++ b/Resources/input/fsh/ISiK-CapabilityStatement-PDMS.fsh
@@ -1,18 +1,18 @@
-Instance: ISiK-capabilityStatement-vitalparameter-server-pdms
+Instance: ISiKCapabilityStatementVitalparameterServerPDMS
 InstanceOf: CapabilityStatement
 Usage: #definition
 * insert Meta-CapabilityStatement
-* name = "ISiKCapabilityStatementVitalparameterServer"
-* title = "ISiK CapabilityStatement Vitalparameter Server"
+* name = "ISiKCapabilityStatementVitalparameterServerPDMS"
+* title = "ISiK CapabilityStatement Vitalparameter Server PDMS"
 * contact.telecom.system = #url
 * contact.telecom.value = "https://www.gematik.de"
-* description = "Das vorliegende CapabilityStatement beschreibt alle verpflichtenden Interaktionen die ein ISiK-konformes System unterstützen muss um das Bestätigungsverfahren für das Modul Vitalparameter zu bestehen."
+* description = "Das vorliegende CapabilityStatement beschreibt alle verpflichtenden Interaktionen die ein ISiK-konformes PDMS-System unterstützen muss um das Bestätigungsverfahren für das Modul Vitalparameter zu bestehen."
 * jurisdiction = urn:iso:std:iso:3166#DE "Germany"
 * kind = #requirements
 * fhirVersion = #4.0.1
 * format[0] = #application/fhir+xml
 * format[+] = #application/fhir+json
-* instantiates = Canonical(ISiK-capabilityStatement-vitalparameter-server-pdms)
+* instantiates = Canonical(ISiKCapabilityStatementVitalparameterServerPDMS)
 * rest.mode = #server
 * rest.resource[+]
 * rest.resource[=].extension.url = $capabilitystatement-expectation