diff --git a/input/fsh/models/logical-IMMZ.C.fsh b/input/fsh/models/logical-IMMZ.C.fsh
index 6afe16e47e..e95f09dde2 100644
--- a/input/fsh/models/logical-IMMZ.C.fsh
+++ b/input/fsh/models/logical-IMMZ.C.fsh
@@ -15,54 +15,55 @@ Description:  "Data elements for the IMMZ.C Register Client Data Dictionary."
 
 * ^name = "IMMZ_C_Register_Client"
 * obeys IMMZ-C-DE10-1
-* uniqueId 1..1 SU string "Unique identifier for the client, according to the policies applicable to each country. There can be more than one unique identifier used to link records (e.g. national ID, health ID, immunization information system ID, medical record ID)."
+* uniqueId 1..1 SU string "Unique identifier" "Unique identifier for the client, according to the policies applicable to each country. There can be more than one unique identifier used to link records (e.g. national ID, health ID, immunization information system ID, medical record ID)."
   * ^code[+] = IMMZ.C#DE1
-* name 1..1 string "The full name of the client"
+  * ^code[WHOCommon] = IMMZ.C#DE1
+* name 1..1 string "Name" "The full name of the client"
   * obeys IMMZ-C-name-1
   * ^code[+] = IMMZ.C#DE2
   * ^code[+] = $LNC#54125-0 "Patient name"
   * ^code[+] = $SCT#371484003 "Patient name (observable entity)"
-* firstName 0..1 string "Client's first name or given name"
+* firstName 0..1 string "First name" "Client's first name or given name"
   * obeys IMMZ-C-name-1
   * ^code[+] = IMMZ.C#DE3
   * ^code[+] = $LNC#45392-8 "First name"
   * ^code[+] = $SCT#184095009 "Patient forename (observable entity)"
-* familyName 0..1 string "Client's family name or last name"
+* familyName 0..1 string "Last name" "Client's family name or last name"
   * obeys IMMZ-C-name-1
   * ^code[+] = IMMZ.C#DE4
   * ^code[+] = $LNC#45394-4 "Last name"
   * ^code[+] = $SCT#184096005 "Patient surname (observable entity)"
-* sex 1..1 code "Documentation of a specific instance of sex information for the client"
+* sex 1..1 code "Sex" "Documentation of a specific instance of sex information for the client"
   * ^code[+] = IMMZ.C#DE5
   * ^code[+] = $LNC#46098-0	"Sex"
   * ^code[+] = $SCT#184100006 "Patient sex (observable entity)"
 * sex from IMMZ.C.DE5 (required)
-* birthDate 0..1 date "Client's date of birth (DOB) if known; if unknown, use assigned DOB for administrative purposes"
+* birthDate 0..1 date "Date of birth" "Client's date of birth (DOB) if known; if unknown, use assigned DOB for administrative purposes"
   * ^code[+] = IMMZ.C#DE10
   * ^code[+] = $LNC#21112-8	"Birth date"
   * ^code[+] = $SCT#184099003 "Date of birth (observable entity)"
-* caregiver 0..* BackboneElement "The client's caregiver (person) which could be next of kin (e.g. partner, husband, mother, sibling, etc.)"
+* 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
   * ^code[+] = $SCT#184140000 "Caregiver details (observable entity)"
-  * name 1..1 string "The full name of the client's caregiver"
+  * 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
     * ^code[+] = $SCT#184140000 "Caregiver details (observable entity)"
-  * firstName 0..1 string "First or given name of the client's caregiver"
+  * firstName 0..1 string "Caregiver'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 "Family name or last name of the client's caregiver"
+  * familyName 0..1 string "Caregiver's family name" "Family name or last name of the client's caregiver"
     * obeys IMMZ-C-name-1
     * ^code[+] = IMMZ.C#DE17
-* phone 1..1 string "Client's phone number"
+* phone 1..1 string "Contact phone number" "Client's phone number"
   * ^code[+] = IMMZ.C#DE18
   * ^code[+] = $LNC#42077-8 "Patient Phone number"
   * ^code[+] = $SCT#184103008 "Patient telephone number (observable entity)"
-* administrativeArea 0..1 CodeableConcept "The name of the city/municipality/town/village of where the client lives"
+* administrativeArea 0..1 CodeableConcept "Administrative area" "The name of the city/municipality/town/village of where the client lives"
   * ^code[+] = IMMZ.C#DE19
   * ^code[+] = $LNC#56799-0 "Address"
   * ^code[+] = $SCT#184097001 "Patient address (observable entity)"
-* healthWorker 1..1 boolean "Is the client an active and participating health worker. This data element is used mainly for reporting and indicators purposes."
+* 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
   
 Mapping:      IMMZ-C-to-Patient