diff --git a/input/fsh/examples/IMMZ.C.QuestionnaireResponse.1.fsh b/input/fsh/examples/IMMZ.C.QuestionnaireResponse.1.fsh
index 5f224cb097..1111f31c60 100644
--- a/input/fsh/examples/IMMZ.C.QuestionnaireResponse.1.fsh
+++ b/input/fsh/examples/IMMZ.C.QuestionnaireResponse.1.fsh
@@ -3,7 +3,7 @@ InstanceOf: QuestionnaireResponse
 Usage: #example
 * status = #completed
 * authored = "2023-08-08T19:20:20.913Z"
-* questionnaire = Canonical(Questionnaire-IMMZCRegisterClient)
+* questionnaire = Canonical(QIMMZCRegisterClient)
 * item[+]
   * linkId = "uniqueId"
   * text = "Unique identifier for the client"
diff --git a/input/fsh/examples/IMMZ.D4.QuestionnaireResponse.1.fsh b/input/fsh/examples/IMMZ.D4.QuestionnaireResponse.1.fsh
new file mode 100644
index 0000000000..a22bd618dd
--- /dev/null
+++ b/input/fsh/examples/IMMZ.D4.QuestionnaireResponse.1.fsh
@@ -0,0 +1,12 @@
+Instance: Example.IMMZ.D4.QuestionnaireResponse.1
+InstanceOf: QuestionnaireResponse
+Usage: #example
+* status = #completed
+* authored = "2023-10-11"
+* questionnaire = Canonical(QIMMZD4CheckContraindicationsMeasles)
+* subject = Reference(patient123456)
+
+* item[+]
+  * linkId = "contraindications"
+  * text = "Contraindications"
+  * answer.valueCoding = IMMZ.D4#DE162 "Currently pregnant"
\ No newline at end of file
diff --git a/input/fsh/examples/IMMZ.D4.QuestionnaireResponse.2.fsh b/input/fsh/examples/IMMZ.D4.QuestionnaireResponse.2.fsh
new file mode 100644
index 0000000000..d68ed39e59
--- /dev/null
+++ b/input/fsh/examples/IMMZ.D4.QuestionnaireResponse.2.fsh
@@ -0,0 +1,12 @@
+Instance: Example.IMMZ.D4.QuestionnaireResponse.2
+InstanceOf: QuestionnaireResponse
+Usage: #example
+* status = #completed
+* authored = "2023-10-11"
+* questionnaire = Canonical(QIMMZD4CheckContraindicationsMeasles)
+* subject = Reference(patient123456)
+
+* item[+]
+  * linkId = "contraindications"
+  * text = "Contraindications"
+  * answer.valueCoding = IMMZ.D4#DE165 "Severely immunosuppressed"
\ No newline at end of file
diff --git a/input/fsh/examples/IMMZ.D4.QuestionnaireResponse.3.fsh b/input/fsh/examples/IMMZ.D4.QuestionnaireResponse.3.fsh
new file mode 100644
index 0000000000..7b82014940
--- /dev/null
+++ b/input/fsh/examples/IMMZ.D4.QuestionnaireResponse.3.fsh
@@ -0,0 +1,13 @@
+
+Instance: Example.IMMZ.D4.QuestionnaireResponse.3
+InstanceOf: QuestionnaireResponse
+Usage: #example
+* status = #completed
+* authored = "2023-10-11"
+* questionnaire = Canonical(QIMMZD4CheckContraindicationsMeasles)
+* subject = Reference(patient123456)
+
+* item[+]
+  * linkId = "contraindications"
+  * text = "Contraindications"
+  * answer.valueCoding = IMMZ.D4#DE167 "Severe allergic reactions"
\ No newline at end of file
diff --git a/input/fsh/examples/IMMZ.D4.QuestionnaireResponse.4.fsh b/input/fsh/examples/IMMZ.D4.QuestionnaireResponse.4.fsh
new file mode 100644
index 0000000000..15de5594da
--- /dev/null
+++ b/input/fsh/examples/IMMZ.D4.QuestionnaireResponse.4.fsh
@@ -0,0 +1,24 @@
+Instance: Example.IMMZ.D4.QuestionnaireResponse.4
+InstanceOf: QuestionnaireResponse
+Usage: #example
+* status = #completed
+* authored = "2023-10-11"
+* questionnaire = Canonical(QIMMZD4CheckContraindicationsMeasles)
+* subject = Reference(patient123456)
+
+* item[+]
+  * linkId = "contraindications"
+  * text = "Contraindications"
+  * answer.valueCoding = IMMZ.D4#DE162 "Currently pregnant"
+* item[+]
+  * linkId = "contraindications"
+  * text = "Contraindications"
+  * answer.valueCoding = IMMZ.D4#DE167 "Severe allergic reactions"
+* item[+]
+  * linkId = "contraindications"
+  * text = "Contraindications"
+  * answer.valueCoding = IMMZ.D4#DE168 "Symptomatic HIV infection"
+* item[+]
+  * linkId = "contraindications"
+  * text = "Contraindications"
+  * answer.valueCoding = IMMZ.D4#DE165 "Severely immunosuppressed"
diff --git a/input/fsh/examples/IMMZ.D4.QuestionnaireResponse.fsh b/input/fsh/examples/IMMZ.D4.QuestionnaireResponse.fsh
deleted file mode 100644
index d928727fa2..0000000000
--- a/input/fsh/examples/IMMZ.D4.QuestionnaireResponse.fsh
+++ /dev/null
@@ -1,64 +0,0 @@
-Instance: Example.IMMZ.D4.QuestionnaireResponse.1
-InstanceOf: QuestionnaireResponse
-Usage: #example
-* status = #completed
-* authored = "2023-10-11"
-* questionnaire = Canonical(Questionnaire-IMMZD4CheckContraindications)
-* subject = Reference(patient123456)
-
-* item[+]
-  * linkId = "contraindications"
-  * text = "Contraindications"
-  * answer.valueCoding = IMMZ.D4#DE162 "Currently pregnant"
-
-
-Instance: Example.IMMZ.D4.QuestionnaireResponse.2
-InstanceOf: QuestionnaireResponse
-Usage: #example
-* status = #completed
-* authored = "2023-10-11"
-* questionnaire = Canonical(Questionnaire-IMMZD4CheckContraindications)
-* subject = Reference(patient123456)
-
-* item[+]
-  * linkId = "contraindications"
-  * text = "Contraindications"
-  * answer.valueCoding = IMMZ.D4#DE165 "Severely immunosuppressed"
-
-Instance: Example.IMMZ.D4.QuestionnaireResponse.3
-InstanceOf: QuestionnaireResponse
-Usage: #example
-* status = #completed
-* authored = "2023-10-11"
-* questionnaire = Canonical(Questionnaire-IMMZD4CheckContraindications)
-* subject = Reference(patient123456)
-
-* item[+]
-  * linkId = "contraindications"
-  * text = "Contraindications"
-  * answer.valueCoding = IMMZ.D4#DE167 "Severe allergic reactions"
-
-Instance: Example.IMMZ.D4.QuestionnaireResponse.4
-InstanceOf: QuestionnaireResponse
-Usage: #example
-* status = #completed
-* authored = "2023-10-11"
-* questionnaire = Canonical(Questionnaire-IMMZD4CheckContraindications)
-* subject = Reference(patient123456)
-
-* item[+]
-  * linkId = "contraindications"
-  * text = "Contraindications"
-  * answer.valueCoding = IMMZ.D4#DE162 "Currently pregnant"
-* item[+]
-  * linkId = "contraindications"
-  * text = "Contraindications"
-  * answer.valueCoding = IMMZ.D4#DE167 "Severe allergic reactions"
-* item[+]
-  * linkId = "contraindications"
-  * text = "Contraindications"
-  * answer.valueCoding = IMMZ.D4#DE168 "Symptomatic HIV infection"
-* item[+]
-  * linkId = "contraindications"
-  * text = "Contraindications"
-  * answer.valueCoding = IMMZ.D4#DE165 "Severely immunosuppressed"
diff --git a/input/fsh/questionnaires/IMMZCRegisterClient.fsh b/input/fsh/questionnaires/IMMZCRegisterClient.fsh
index 63bd41a4ea..719acc0d6f 100644
--- a/input/fsh/questionnaires/IMMZCRegisterClient.fsh
+++ b/input/fsh/questionnaires/IMMZCRegisterClient.fsh
@@ -1,8 +1,9 @@
-Instance: IMMZCRegisterClient
+Instance: QIMMZCRegisterClient
 InstanceOf: sdc-questionnaire-extr-smap
 Title: "Client Registration Questionnaire"
 Description: "Immunization - Client Registration Questionnaire"
 Usage: #definition
+* id = "IMMZCRegisterClient"
 * version = "2023"
 * status = #draft
 * subjectType = #Patient
diff --git a/input/fsh/questionnaires/IMMZD4CheckContraindicationsMeasles.fsh b/input/fsh/questionnaires/IMMZD4CheckContraindicationsMeasles.fsh
index 3639462cd1..b5a710d574 100644
--- a/input/fsh/questionnaires/IMMZD4CheckContraindicationsMeasles.fsh
+++ b/input/fsh/questionnaires/IMMZD4CheckContraindicationsMeasles.fsh
@@ -1,8 +1,9 @@
-Instance: IMMZD4CheckContraindicationsMeasles
+Instance: QIMMZD4CheckContraindicationsMeasles
 InstanceOf: sdc-questionnaire-extr-smap
 Title: "Check Contraindications Questionnaire"
 Description: "Immunization - Check Contraindications Questionnaire"
 Usage: #definition
+* id = "IMMZD4CheckContraindicationsMeasles"
 * version = "2023"
 * status = #draft
 * subjectType = #Patient