diff --git a/input/fsh/codeSystems/BDMedicationCS.fsh b/input/fsh/codeSystems/BDMedicationCS.fsh
index ba6a1e8..8625a03 100644
--- a/input/fsh/codeSystems/BDMedicationCS.fsh
+++ b/input/fsh/codeSystems/BDMedicationCS.fsh
@@ -21,4 +21,4 @@ ValueSet: BDMedicationVS
 Id: bd-medication-valueset
 Title: "Bangladesh Medication ValueSet"
 Description: "Bangladesh Medication ValueSet"
-* include codes from system BDMedicationCodeSystem
+* include codes from system BDMedicationCS
diff --git a/input/fsh/profile/BDLabResultObservation.fsh b/input/fsh/profile/BDLabResultObservation.fsh
index 0557c4e..f9ffb4b 100644
--- a/input/fsh/profile/BDLabResultObservation.fsh
+++ b/input/fsh/profile/BDLabResultObservation.fsh
@@ -54,6 +54,7 @@ Coded results (Ord/Nom scale):
 // ── Value[x] ──────────────────────────────────────────────────────────────
 // Required — every leaf result must carry a value.
 * value[x] 1..1 MS
+* value[x] only Quantity or CodeableConcept
 * value[x] ^definition = "The actual result value for this laboratory test"
 
 // Numeric results (Qn scale) — UCUM units required
diff --git a/input/fsh/profile/BDMedicationRequest.fsh b/input/fsh/profile/BDMedicationRequest.fsh
index 60256a1..48e1e6f 100644
--- a/input/fsh/profile/BDMedicationRequest.fsh
+++ b/input/fsh/profile/BDMedicationRequest.fsh
@@ -34,11 +34,11 @@ Inline CodeableConcept is not permitted in this profile.
 """
 
 * subject 1..1 MS
-* subject only Reference(BDPatientProfile)
+* subject only Reference(BDPatient)
 * subject ^short = "Patient for whom the medication is prescribed"
 
 * encounter 0..1 MS
-* encounter only Reference(BDEncounterProfile)
+* encounter only Reference(BDEncounter)
 * encounter ^short = "Encounter during which this prescription was created"
 * encounter ^definition = """
 The encounter during which this prescription was created. Should be populated
@@ -52,7 +52,7 @@ for inpatient and outpatient prescriptions where an encounter record exists.
 * requester only Reference(BDPractitioner or BDOrganization)
 * requester ^short = "Practitioner or organisation that authored the prescription"
 
-* reportedReference only Reference(BDPractitioner or BDOrganization or BDPatientProfile)
+* reportedReference only Reference(BDPractitioner or BDOrganization or BDPatient)
 
 * priorPrescription only Reference(BDMedicationRequest)
 * priorPrescription ^short = "Reference to a prior prescription this replaces"