diff --git a/input/fsh/questionnaires/DVCModel.fsh b/input/fsh/questionnaires/DVCModel.fsh
index d1091750c..67a59ce39 100644
--- a/input/fsh/questionnaires/DVCModel.fsh
+++ b/input/fsh/questionnaires/DVCModel.fsh
@@ -17,7 +17,7 @@ Usage: #definition
 * insert Question(sex, Sex, choice, false, false)
 * item[=].answerValueSet = "http://terminology.hl7.org/ValueSet/v2-0001"
 * insert Question(nationality, Nationality, choice, false, false)
-* item[=].answerValueSet = "http://hl7.org/fhir/ValueSet/country" 
+* item[=].answerValueSet = "http://terminology.hl7.org/ValueSet/v3-Country" 
 * insert Question(nid, National Identification Document, string, false, false)
 * insert Question(guardian, Parent or Guardian Details, group, false, false)
 * item[=]
diff --git a/input/fsh/questionnaires/ICVPModel.fsh b/input/fsh/questionnaires/ICVPModel.fsh
index 73ed757a7..abd9690d1 100644
--- a/input/fsh/questionnaires/ICVPModel.fsh
+++ b/input/fsh/questionnaires/ICVPModel.fsh
@@ -15,9 +15,9 @@ Usage: #definition
 * insert Question(name, Full Name of the client, string, false, true)
 * insert Question(dob, Date of Birth, date, false, true)
 * insert Question(sex, Sex, choice, false, false)
-* item[=].answerValueSet = "http://terminology.hl7.org/ValueSet/v2-0001"
+* item[=].answerValueSet = Canonical("http://terminology.hl7.org/ValueSet/v2-0001")
 * insert Question(nationality, Nationality, choice, false, false)
-* item[=].answerValueSet = "http://hl7.org/fhir/ValueSet/country" 
+* item[=].answerValueSet = "http://terminology.hl7.org/ValueSet/v3-Country" 
 * insert Question(nid, National Identification Document, string, false, false)
 * insert Question(guardian, Parent or Guardian Details, group, false, false)
 * item[=]
diff --git a/sushi-config.yaml b/sushi-config.yaml
index 4d1280bd0..0cff67e5d 100644
--- a/sushi-config.yaml
+++ b/sushi-config.yaml
@@ -257,7 +257,7 @@ menu:
 #
 #   setId: always # always | standalone-only
 dependencies:
-  who.base: current
+  smart.who.int.base: current
   hl7.fhir.uv.ips: current
   hl7.fhir.uv.sdc: 3.0.0
   ihe.iti.mcsd: