diff --git a/ig.ini b/ig.ini
index bd7866ff4f..13b16450c7 100644
--- a/ig.ini
+++ b/ig.ini
@@ -1,5 +1,5 @@
 [IG]
-ig = fsh-generated/resources/ImplementationGuide-who.fhir.smart-immunizations-measles.json
+ig = fsh-generated/resources/ImplementationGuide-kenya.fhir.smart-immunizations-measles.json
 
 template = #local-template
 #template = who.fhir.template#current
diff --git a/input/cql/IMMZD2DTMeasles.cql b/input/cql/IMMZD2DTMeasles.cql
index d0ae4fa435..511be4a2c4 100644
--- a/input/cql/IMMZD2DTMeasles.cql
+++ b/input/cql/IMMZD2DTMeasles.cql
@@ -46,11 +46,11 @@ define "Expected Due Date for MCV dose":
 	//when "Needs Zero MCV Dose"
 	//	then Patient.birthDate + 6 months
 	when "No MCV Doses Administered to Patient"
-		then if "High Transmission Setting" then Patient.birthDate + 9 months else Patient.birthDate + 12 months
+		then if "High Transmission Setting" then Patient.birthDate + 6 months else Patient.birthDate + 9 months
 	//when "Second MCV Dose Administered to Patient" is not null and "Needs Supplementary MCV Dose"
 	//	then "Date Second MCV Dose Administered to Patient" + 4 weeks
 	when "First MCV Dose Administered to Patient" is not null
-		then Patient.birthDate + 15 months
+		then Patient.birthDate + 18 months
 	else null
 	end
 
@@ -82,7 +82,7 @@ define "Expiration Date for MCV dose":
 	//end
 	null
 
-define "Overdue Date for MCV dose":
+define "Overdue Date for MCV dose"
 	null
 
 define "Date Last Valid MCV Dose":
diff --git a/input/fsh/models/IMMZCRegisterClient.fsh b/input/fsh/models/IMMZCRegisterClient.fsh
index 8f46b4711b..491770a760 100644
--- a/input/fsh/models/IMMZCRegisterClient.fsh
+++ b/input/fsh/models/IMMZCRegisterClient.fsh
@@ -30,21 +30,37 @@ Description:  "Data elements for the IMMZ.C Register Client Data Dictionary."
   * ^code[+] = IMMZ.C#DE10
 * caregiver 0..* BackboneElement "Caregiver" "The client's caregiver (person) which could be next of kin (e.g. partner, husband, mother, sibling, etc.)"
   * ^code[+] = IMMZ.C#DE14
-  * name 1..1 string "Caregiver's full name" "The full name of the client's caregiver"
-    * obeys IMMZ-C-name-1
-    * ^code[+] = IMMZ.C#DE15
-  * firstName 0..1 string "Caregiver's first name" "First or given name of the client's caregiver"
+  * firstName 0..1 string "Mother's/Guardian's first name" "First or given name of the client's caregiver"
     * obeys IMMZ-C-name-1
     * ^code[+] = IMMZ.C#DE16
-  * familyName 0..1 string "Caregiver's family name" "Family name or last name of the client's caregiver"
+  * firstName 0..1 string "Mother's/Guardian's middle name" "First or given name of the client's caregiver"
+    * obeys IMMZ-C-name-1
+    * ^code[+] = IMMZ.C#DE16.1
+  * familyName 0..1 string "Mother's last name" "Family name or last name of the client's caregiver"
     * obeys IMMZ-C-name-1
     * ^code[+] = IMMZ.C#DE17
 * phone 1..1 string "Contact phone number" "Client's phone number"
   * ^code[+] = IMMZ.C#DE18
-* administrativeArea 0..1 CodeableConcept "Administrative area" "The name of the city/municipality/town/village of where the client lives"
+  * firstName 0..1 string "Father's/Guardian's first name" "First or given name of the client's caregiver"
+    * obeys IMMZ-C-name-1
+    * ^code[+] = IMMZ.C#DE16
+  * firstName 0..1 string "Father's/Guardian's middle name" "First or given name of the client's caregiver"
+    * obeys IMMZ-C-name-1
+    * ^code[+] = IMMZ.C#DE16.1
+  * familyName 0..1 string "Father's last name" "Family name or last name of the client's caregiver"
+    * obeys IMMZ-C-name-1
+    * ^code[+] = IMMZ.C#DE17
+* administrativeArea 0..1 CodeableConcept "Administrative area" "The name of the county/sub county/ward/CHU of where the client lives"
   * ^code[+] = IMMZ.C#DE19
-* healthWorker 1..1 boolean "Active health worker" "Is the client an active and participating health worker. This data element is used mainly for reporting and indicators purposes."
-  * ^code[+] = IMMZ.C#DE20
+* administrativeArea 0..1 CodeableConcept "County" "The name of the county/sub county/ward/CHU of where the client lives"
+  * ^code[+] = IMMZ.C#DE19.1
+* administrativeArea 0..1 CodeableConcept "Sub county" "The name of the county/sub county/ward/CHU of where the client lives"
+  * ^code[+] = IMMZ.C#DE19.2
+* administrativeArea 0..1 CodeableConcept "Ward" "The name of the county/sub county/ward/CHU of where the client lives"
+  * ^code[+] = IMMZ.C#DE19.3
+* administrativeArea 0..1 CodeableConcept "CHU" "The name of the county/sub county/ward/CHU of where the client lives"
+  * ^code[+] = IMMZ.C#DE19.4
+
   
 
 // Mapping:      IMMZ-C-to-Patient
@@ -62,4 +78,4 @@ Description:  "Data elements for the IMMZ.C Register Client Data Dictionary."
 // * caregiver.firstName -> "Patient.contact.name.given"
 // * caregiver.familyName -> "Patient.contact.name.family"
 // * phone -> "Patient.telecom.value"
-// * administrativeArea -> "Patient.address.text"
\ No newline at end of file
+// * administrativeArea -> "Patient.address.text"
diff --git a/input/fsh/questionnaires/QIMMZCRegisterClient.fsh b/input/fsh/questionnaires/QIMMZCRegisterClient.fsh
index 0bd8fce33c..cce5486aa6 100644
--- a/input/fsh/questionnaires/QIMMZCRegisterClient.fsh
+++ b/input/fsh/questionnaires/QIMMZCRegisterClient.fsh
@@ -21,28 +21,18 @@ Usage: #definition
 * item[=]
   * code[+] = IMMZ.C#DE1
 
-* insert Question(name, Client name,group,true,false)
-* item[=]
-  * code[+] = IMMZ.C#DE2
-  * code[+] = $LNC#54125-0 "Patient name"
-  * code[+] = $SCT#371484003 "Patient name (observable entity)"
-  * insert Question(fullName, Full name of the client,string,true,false)
-  * item[=]
-    * code[+] = IMMZ.C#DE2
-    * code[+] = $LNC#54125-0 "Patient name"
-    * code[+] = $SCT#371484003 "Patient name (observable entity)"
 
   * insert Question(firstName, First or given name,string,false,false)
   * item[=]
     * code[+] = IMMZ.C#DE3
-    * code[+] = $LNC#45392-8 "First name"
-    * code[+] = $SCT#184095009 "Patient forename (observable entity)"
+
+  * insert Question(middleName, middle name,string,false,false)
+  * item[=]
+    * code[+] = IMMZ.C#DE3.1
 
   * insert Question(familyName, Family name,string,false,false)
   * item[=]
     * code[+] = IMMZ.C#DE4
-    * code[+] = $LNC#45394-4 "Last name"
-    * code[+] = $SCT#184096005 "Patient surname (observable entity)"
 
 
 * insert Question(sex, Sex,choice,true,false)
@@ -58,19 +48,35 @@ Usage: #definition
   * code[+] = $LNC#21112-8	"Birth date"
   * code[+] = $SCT#184099003 "Date of birth (observable entity)"
 
-* insert Question(caregiver, Care giver name,group,true,false)
+* insert Question(Mother, Mother name,group,true,false)
 * item[=]
   * code[+] = IMMZ.C#DE14
-  * code[+] = $SCT#184140000 "Caregiver details (observable entity)"
+  * code[+] = $SCT#184140000 "Mother details (observable entity)"
+
+  * insert Question(firstName, First or given name,string,false,false)
+  * item[=]
+    * code[+] = IMMZ.C#DE16.1
+
+ * insert Question(middleName, Middle name,string,false,false)
+  * item[=]
+    * code[+] = IMMZ.C#DE16.2
 
-  * insert Question(fullName, Full name of the care giver,string,true,false)
+  * insert Question(familyName, Family name,string,false,false)
   * item[=]
-    * code[+] = IMMZ.C#DE15
-    * code[+] = $SCT#184140000 "Caregiver details (observable entity)"
+    * code[+] = IMMZ.C#DE17
+
+* insert Question(Father, Father name,group,true,false)
+* item[=]
+  * code[+] = IMMZ.C#DE14.1
+  * code[+] = $SCT#184140000 "Father details (observable entity)"
 
   * insert Question(firstName, First or given name,string,false,false)
   * item[=]
-    * code[+] = IMMZ.C#DE16
+    * code[+] = IMMZ.C#DE16.1
+
+ * insert Question(middleName, Middle name,string,false,false)
+  * item[=]
+    * code[+] = IMMZ.C#DE16.2
 
   * insert Question(familyName, Family name,string,false,false)
   * item[=]
@@ -82,15 +88,22 @@ Usage: #definition
   * code[+] = $LNC#42077-8 "Patient Phone number"
   * code[+] = $SCT#184103008 "Patient telephone number (observable entity)"
 
-* insert Question(administrativeArea, Administrative area,choice,false,false)
+* insert Question(County, County,choice,false,false)
+* item[=]
+  * code[+] = IMMZ.C#DE19.1
+//  * code[+] = $LNC#56799-0 "Address"
+ // * code[+] = $SCT#184097001 "Patient address (observable entity)"
+
+* insert Question(Sub County, Sub County,choice,false,false)
 * item[=]
-  * code[+] = IMMZ.C#DE19
-  * code[+] = $LNC#56799-0 "Address"
-  * code[+] = $SCT#184097001 "Patient address (observable entity)"
+  * code[+] = IMMZ.C#DE19.2
 
+* insert Question(Ward, Ward,choice,false,false)
+* item[=]
+  * code[+] = IMMZ.C#DE19.2
 
-* insert Question(healthWorker, Health Worker,boolean,true,false)
+* insert Question(CHU, CHU,choice,false,false)
 * item[=]
-  * code[+] = IMMZ.C#DE20
+  * code[+] = IMMZ.C#DE19.3
 
 
diff --git a/input/fsh/valuesets/IMMZ.C.DE5.fsh b/input/fsh/valuesets/IMMZ.C.DE5.fsh
index 553934150f..e4c6393ea4 100644
--- a/input/fsh/valuesets/IMMZ.C.DE5.fsh
+++ b/input/fsh/valuesets/IMMZ.C.DE5.fsh
@@ -7,5 +7,4 @@ Description:  "ValueSet for Sex for IMMZ.C.DE5."
 * ^name = "IMMZ_C_DE5"
 * IMMZ.C#DE6 "Male"
 * IMMZ.C#DE7 "Female"
-* IMMZ.C#DE8 "Biological sex not specified"
-* IMMZ.C#DE9 "Intersex"
+
diff --git a/input/pagecontent/index.md b/input/pagecontent/index.md
index f837e7d5c1..0bbb82e62a 100644
--- a/input/pagecontent/index.md
+++ b/input/pagecontent/index.md
@@ -1,4 +1,4 @@
-This WHO Immunization Implementation Guide details how to use Health Level 7 (HL7) Fast Healthcare Interoperability Resources (FHIR) for consistent digital representation of immunization services.
+This is Ministry's of Health Kenya's Immunization Implementation Guide details how to use Health Level 7 (HL7) Fast Healthcare Interoperability Resources (FHIR) for consistent digital representation of immunization services.
 
 <div>
 <p> This implementation guide and set of artifacts are still undergoing development. </p>
@@ -7,9 +7,9 @@ This WHO Immunization Implementation Guide details how to use Health Level 7 (HL
 
 
 ### Summary 
-This implementation guide includes a machine-readable representation of WHO guidelines for immunization, as documented in the WHO Digital Adaptation Kit: SMART Guidelines for Immunizations (link forthcoming) and explicitly encodes computer-interoperable logic, including data models, terminologies, and logic expressions, in a computable language to support implementation of immunization use cases by WHO Member States.
+This implementation guide includes a machine-readable representation of WHO and Kenya's guidelines for immunization, as documented in the locally adopted WHO Digital Adaptation Kit: SMART Guidelines for Immunizations (link forthcoming) and explicitly encodes computer-interoperable logic, including data models, terminologies, and logic expressions, in a computable language to support implementation of immunization use cases by WHO Member States.
 
-The guide is part of the [WHO SMART Guidelines approach](https://www.who.int/teams/digital-health-and-innovation/smart-guidelines) to support countries to integrate WHO global health and data recommendations into digital systems accurately and consistently. It defines a series of FHIR Resources, Profiles, Extensions, and Terminology based on the WHO Immunization Digital Adaptation Kit (link forthcoming). 
+The guide is customized from the [WHO SMART Guidelines approach](https://www.who.int/teams/digital-health-and-innovation/smart-guidelines) to support Kenya to integrate WHO global health and data recommendations into digital systems accurately and consistently. It defines a series of FHIR Resources, Profiles, Extensions, and Terminology based on the WHO Immunization Digital Adaptation Kit (link forthcoming). 
 
 Resources and guidance in this guide are provided to support application of the WHO recommendations on routine vaccinations:
 [WHO Recommendations on Immunization](https://www.who.int/teams/immunization-vaccines-and-biologicals). The decision support artifacts specifically represent the content defined as part of routine immunizations: [WHO recommendations for routine immunization - summary tables](https://www.who.int/teams/immunization-vaccines-and-biologicals/policies/who-recommendations-for-routine-immunization---summary-tables).
diff --git a/sushi-config.yaml b/sushi-config.yaml
index 91a3f12c12..06d2be73b8 100644
--- a/sushi-config.yaml
+++ b/sushi-config.yaml
@@ -3,8 +3,8 @@
 # │  used properties are included. For a list of all supported properties and their functions,     │
 # │  see: https://fshschool.org/docs/sushi/configuration/.                                         │
 # ╰────────────────────────────────────────────────────────────────────────────────────────────────╯
-id: who.fhir.smart-immunizations-measles
-canonical: http://smart.who.int/ig/smart-immunizations-measles
+id: kenya.fhir.smart-immunizations-measles
+canonical: http://moh.kenya.int/ig/smart-immunizations-measles
 name: SMART
 # title: Example Title
 # description: Example Implementation Guide for getting started with SUSHI
@@ -16,8 +16,8 @@ releaseLabel: ci-build # ci-build | draft | qa-preview | ballot | trial-use | re
 license: CC-BY-SA-3.0 # https://www.hl7.org/fhir/valueset-spdx-license.html
 # jurisdiction: urn:iso:std:iso:3166#US "United States of America" # https://www.hl7.org/fhir/valueset-jurisdiction.html
 publisher:
-  name: WHO
-  url: http://who.int
+  name: MOH Kenya
+  url: http://moh.kenya
   # email: test@example.org
 
 # The dependencies property corresponds to IG.dependsOn. The key is the