diff --git a/input/fsh/codeSystems/bd-country-list.fsh b/input/fsh/codeSystems/bd-country-list.fsh
index d915da9..fef1aea 100644
--- a/input/fsh/codeSystems/bd-country-list.fsh
+++ b/input/fsh/codeSystems/bd-country-list.fsh
@@ -1,4 +1,4 @@
-CodeSystem: bd-country-list
+CodeSystem: BDCountryListCS 
 Id: bd-country-list-cs
 Title: "Nationality List"
 * ^url =  "https://fhir.dghs.gov.bd/core/CodeSystem/bd-country-list"
@@ -193,7 +193,7 @@ Title: "Nationality List"
 * #716 "Zimbabwean"
 
 
-ValueSet: bd-country-list
+ValueSet: BDCountryListVS 
 Id: bd-country-list-vs
 Title: "Nationality ValueSet"
 Description: "Nationality value set"
diff --git a/input/fsh/codeSystems/bd-occupations.fsh b/input/fsh/codeSystems/bd-occupations.fsh
index ce07f94..bd903d0 100644
--- a/input/fsh/codeSystems/bd-occupations.fsh
+++ b/input/fsh/codeSystems/bd-occupations.fsh
@@ -1,4 +1,4 @@
-CodeSystem: bd-occupations
+CodeSystem: BDOccupationsCS
 Id: bangladesh-occupations-cs
 Title: "Bangladesh Occupations"
 * ^url =  "https://fhir.dghs.gov.bd/core/CodeSystem/bd-occupations"
@@ -75,7 +75,7 @@ Title: "Bangladesh Occupations"
 * #91 "Paper and Paperboard Products Workers" "কাগজ ও কাগজের বোর্ড প্রস্তুতকারী "
 * #92 "Printers and Related Workers" "মুদ্রণকাজ"
 
-ValueSet: bd-occupations
+ValueSet: BDOccupationsVS 
 Id: bd-occupations-vs
 Title: "Bangladesh Occupations ValueSet"
 Description: "Occupations value set according to CCDS guideline"
diff --git a/input/fsh/codeSystems/bd-religions.fsh b/input/fsh/codeSystems/bd-religions.fsh
index 11bed3d..6b33caa 100644
--- a/input/fsh/codeSystems/bd-religions.fsh
+++ b/input/fsh/codeSystems/bd-religions.fsh
@@ -1,5 +1,5 @@
 //codeSystems/bd-regions.fsh
-CodeSystem: bd-religions
+CodeSystem: BDReligionsCS
 Id: bangladesh-religions-cs
 Title: "Bangladesh Religions"
 * ^url =  "https://fhir.dghs.gov.bd/core/CodeSystem/bd-religions"
@@ -12,7 +12,7 @@ Title: "Bangladesh Religions"
 * #9 "Not a believer" "Identifies as not having a religion"
 * #0 "Other (specify)" "Other religion (to be specified in free text)"
 
-ValueSet: bd-religions
+ValueSet: BDReligionsVS 
 Id: bd-religions-vs
 Title: "Bangladesh Religions ValueSet"
 Description: "Religions value set according to CCDS guideline"
diff --git a/input/fsh/extensions/bloodgroup.fsh b/input/fsh/extensions/bloodgroup.fsh
index 5887ece..5de4b11 100644
--- a/input/fsh/extensions/bloodgroup.fsh
+++ b/input/fsh/extensions/bloodgroup.fsh
@@ -1,9 +1,9 @@
 // ---------------------------
 // Extension Definition
 // ---------------------------
-Extension: bdbloodgroup
+Extension: BDBloodGroup 
 Id: bd-blood-group
 Title: "Patient Blood Group"
 Description: "Blood group of the patient according to CCDS guideline"
 * valueCodeableConcept 1..1
-* valueCodeableConcept from BDBloodGroupVS (required)
\ No newline at end of file
+* valueCodeableConcept from BDBloodGroupVS (required)
diff --git a/input/fsh/extensions/nationality.fsh b/input/fsh/extensions/nationality.fsh
index fc274dd..0b78228 100644
--- a/input/fsh/extensions/nationality.fsh
+++ b/input/fsh/extensions/nationality.fsh
@@ -1,4 +1,4 @@
-Extension: nationality
+Extension: Nationality 
 Id: nationality
 Title: "patient Nationality"
 Description: "Nationality"
diff --git a/input/fsh/extensions/occupation.fsh b/input/fsh/extensions/occupation.fsh
index 2151138..779c7f2 100644
--- a/input/fsh/extensions/occupation.fsh
+++ b/input/fsh/extensions/occupation.fsh
@@ -1,4 +1,4 @@
-Extension: occupation
+Extension: Occupation 
 Description: "Occupation"
 Id: occupation-bd 
 Title: "Bangladesh Occupations"
diff --git a/input/fsh/patient-profile.fsh b/input/fsh/patient-profile.fsh
index a42c50c..09f56e7 100644
--- a/input/fsh/patient-profile.fsh
+++ b/input/fsh/patient-profile.fsh
@@ -105,6 +105,6 @@ Description: "Profile of Patient Bangladesh Standard"
 * address 1..* MS
 * address only BDAddress 
 
-* extension contains occupation named occupation 0..1
+* extension contains Occupation named occupation 0..1
 
 * extension contains nationality named nationality 1..1