diff --git a/input/fsh/extensions/language.fsh b/input/fsh/extensions/language.fsh
index 57b313e..b98b53c 100644
--- a/input/fsh/extensions/language.fsh
+++ b/input/fsh/extensions/language.fsh
@@ -1,10 +1,10 @@
 Extension: Language
 Description: "Language"
-Id: language 
+Id: language
 Title: "Language Extension"
 Context: Patient
 
 
 // Religion using standard HL7 extension
 * extension contains http://hl7.org/fhir/StructureDefinition/language named language 1..1
-* extension[language].valueCode from LanguageValueSet
\ No newline at end of file
+* extension[language].valueCode from BDLanguageVS
\ No newline at end of file
diff --git a/input/fsh/profile/BDMedicationRequest.fsh b/input/fsh/profile/BDMedicationRequest.fsh
index 0632d58..0f97eb9 100644
--- a/input/fsh/profile/BDMedicationRequest.fsh
+++ b/input/fsh/profile/BDMedicationRequest.fsh
@@ -12,7 +12,9 @@ Description: "Profile of MedicationRequest Bangladesh Standard V2"
 * medication[x] only Reference(BDMedication) or CodeableConcept
 * subject only Reference(BDPatientProfile)
 
-// TODO: BDEncounter referencing
+* encounter 0..1 MS
+* encounter only Reference(BDEncounterProfile)
+* encounter ^definition = "The encounter during which this prescription was created."
 * authoredOn 1..1
 * requester 1..1
 
diff --git a/input/fsh/profile/immunization-profile.fsh b/input/fsh/profile/immunization-profile.fsh
index a57e9a3..b1cbfec 100644
--- a/input/fsh/profile/immunization-profile.fsh
+++ b/input/fsh/profile/immunization-profile.fsh
@@ -19,7 +19,7 @@ Description: "Bangladesh Immunization Profile"
 * reasonReference only Reference(Condition or Observation or DiagnosticReport)
 
 * vaccineCode 1..1
-* vaccineCode from BDVaccineValueSet (required)
+* vaccineCode from BDVaccineVS (required)
 
 //* ^url = "https://fhir.dghs.gov.bd/core/StructureDefinition/bd-medication"
 
@@ -52,11 +52,11 @@ Description: "Bangladesh Immunization Profile"
 
 * site 0..1
 * site ^definition = "Body site of administration"
-* site from BDImmunizationSiteValueSet
+* site from BDImmunizationSiteVS
 
 * route 0..1
 * route ^definition = "Route of administration"
-* route from BDImmunizationRouteValueSet
+* route from BDImmunizationRouteVS
 
 * doseQuantity 0..1
 * doseQuantity ^definition = "Amount of vaccine administered"
diff --git a/input/fsh/valueSets/bd-immunization-reaction-valueset.fsh b/input/fsh/valueSets/BDImmunizationReactionVS.fsh
similarity index 89%
rename from input/fsh/valueSets/bd-immunization-reaction-valueset.fsh
rename to input/fsh/valueSets/BDImmunizationReactionVS.fsh
index 8c1ce54..9cc5312 100644
--- a/input/fsh/valueSets/bd-immunization-reaction-valueset.fsh
+++ b/input/fsh/valueSets/BDImmunizationReactionVS.fsh
@@ -1,5 +1,5 @@
 ValueSet: BDImmunizationReactionValueSet
-Id: bd-immunization-reaction-valueset
+Id: bd-immunization-reaction-vs
 Title: "Bangladesh Immunization Reaction Value Set"
 Description: "Allowed vaccine reactions for immunization in Bangladesh."
 * ^url = "https://fhir.dghs.gov.bd/core/ValueSet/bd-immunization-reaction-valueset"
diff --git a/input/fsh/valueSets/bd-immunization-route-valueset.fsh b/input/fsh/valueSets/BDImmunizationRouteVS.fsh
similarity index 78%
rename from input/fsh/valueSets/bd-immunization-route-valueset.fsh
rename to input/fsh/valueSets/BDImmunizationRouteVS.fsh
index 08e0e3b..7d58f9c 100644
--- a/input/fsh/valueSets/bd-immunization-route-valueset.fsh
+++ b/input/fsh/valueSets/BDImmunizationRouteVS.fsh
@@ -1,5 +1,5 @@
-ValueSet: BDImmunizationRouteValueSet
-Id: bd-immunization-route-valueset
+ValueSet: BDImmunizationRouteVS
+Id: bd-immunization-route-vs
 Title: "Bangladesh Immunization Route Value Set"
 Description: "Allowed administration routes for vaccines in Bangladesh."
 * ^url = "https://fhir.dghs.gov.bd/core/ValueSet/bd-immunization-route-valueset"
diff --git a/input/fsh/valueSets/bd-immunization-site-valueset.fsh b/input/fsh/valueSets/BDImmunizationSiteVs.fsh
similarity index 79%
rename from input/fsh/valueSets/bd-immunization-site-valueset.fsh
rename to input/fsh/valueSets/BDImmunizationSiteVs.fsh
index ac98f10..9fb3ffe 100644
--- a/input/fsh/valueSets/bd-immunization-site-valueset.fsh
+++ b/input/fsh/valueSets/BDImmunizationSiteVs.fsh
@@ -1,5 +1,5 @@
-ValueSet: BDImmunizationSiteValueSet
-Id: bd-immunization-site-valueset
+ValueSet: BDImmunizationSiteVS
+Id: bd-immunization-site-vs
 Title: "Bangladesh Immunization Site Value Set"
 Description: "Allowed administration sites for vaccines in Bangladesh."
 * ^url = "https://fhir.dghs.gov.bd/core/ValueSet/bd-immunization-site-valueset"
diff --git a/input/fsh/valueSets/languageVS.fsh b/input/fsh/valueSets/BDLanguage.fsh
similarity index 56%
rename from input/fsh/valueSets/languageVS.fsh
rename to input/fsh/valueSets/BDLanguage.fsh
index 0a5b001..0eb7173 100644
--- a/input/fsh/valueSets/languageVS.fsh
+++ b/input/fsh/valueSets/BDLanguage.fsh
@@ -1,5 +1,5 @@
-ValueSet: LanguageValueSet
-Id: language-valueset
+ValueSet: BDLanguageVS
+Id: bd-language-vs
 Title: "Allowed Languages"
 Description: "Only English and Bengali are allowed"
 * http://hl7.org/fhir/ValueSet/languages#en "English"
diff --git a/input/fsh/valueSets/bd-vaccine-valueset.fsh b/input/fsh/valueSets/BDVaccineVS.fsh
similarity index 81%
rename from input/fsh/valueSets/bd-vaccine-valueset.fsh
rename to input/fsh/valueSets/BDVaccineVS.fsh
index 883685d..1ebb60d 100644
--- a/input/fsh/valueSets/bd-vaccine-valueset.fsh
+++ b/input/fsh/valueSets/BDVaccineVS.fsh
@@ -1,5 +1,5 @@
-ValueSet: BDVaccineValueSet
-Id: bd-vaccine-valueset
+ValueSet: BDVaccineVS
+Id: bd-vaccine-vs
 Title: "Bangladesh Vaccine Value Set"
 Description: "Allowed vaccines for immunization in Bangladesh."
 * ^url = "https://fhir.dghs.gov.bd/core/ValueSet/bd-vaccine-valueset"