diff --git a/input/cql/IMMZConcepts.cql b/input/cql/IMMZConcepts.cql
index ba13c8305c..77b2167e5e 100644
--- a/input/cql/IMMZConcepts.cql
+++ b/input/cql/IMMZConcepts.cql
@@ -12,36 +12,36 @@ codesystem "ICHI": 'https://mitel.dimi.uniud.it/ichi/#http://id.who.int/ichi'
 codesystem "ICF": 'http://hl7.org/fhir/sid/icf-nl'
 codesystem "Extended Codes CodeSystem codes": 'http://fhir.org/guides/who/anc-cds/CodeSystem/anc-custom-codes'
 
-codesystem "IMMZ.C": 'http://smart.who.int/immunizations-measles/CodeSystem/IMMZ.C'
-codesystem "IMMZ.D1": 'http://smart.who.int/immunizations-measles/CodeSystem/IMMZ.D1'
-codesystem "IMMZ.D4": 'http://smart.who.int/immunizations-measles/CodeSystem/IMMZ.D4'
+codesystem "IMMZ.C": 'http://smart.who.int/smart-immunizations-measles/CodeSystem/IMMZ.C'
+codesystem "IMMZ.D1": 'http://smart.who.int/smart-immunizations-measles/CodeSystem/IMMZ.D1'
+codesystem "IMMZ.D4": 'http://smart.who.int/smart-immunizations-measles/CodeSystem/IMMZ.D4'
 
 //WHO ATC IPS Valueset
 valueset "WHO ATC": 'http://hl7.org/fhir/uv/ips/ValueSet/whoatc-uv-ips'
 
 // General use ValueSets 
-valueset "Negative Result": 'http://smart.who.int/immunizations-measles/ValueSet/Negativetestresult-values'
-valueset "Positive Result": 'http://smart.who.int/immunizations-measles/ValueSet/PositiveTestResult-values'
-valueset "Immunocompromised": 'http://smart.who.int/immunizations-measles/ValueSet/Immunocompromised-values'
-valueset "Patient birth weight observation value": 'http://smart.who.int/immunizations-measles/ValueSet/Birthweight-values'
-valueset "PretermBirth": 'http://smart.who.int/immunizations-measles/ValueSet/Preterm-values'
-valueset "Live Attenuated": 'http://smart.who.int/immunizations-measles/ValueSet/LiveAttenduatedVaccines'
+valueset "Negative Result": 'http://smart.who.int/smart-immunizations-measles/ValueSet/Negativetestresult-values'
+valueset "Positive Result": 'http://smart.who.int/smart-immunizations-measles/ValueSet/PositiveTestResult-values'
+valueset "Immunocompromised": 'http://smart.who.int/smart-immunizations-measles/ValueSet/Immunocompromised-values'
+valueset "Patient birth weight observation value": 'http://smart.who.int/smart-immunizations-measles/ValueSet/Birthweight-values'
+valueset "PretermBirth": 'http://smart.who.int/smart-immunizations-measles/ValueSet/Preterm-values'
+valueset "Live Attenuated": 'http://smart.who.int/smart-immunizations-measles/ValueSet/LiveAttenduatedVaccines'
 
 //valueset "Target Disease": 'http://hl7.org/fhir/ValueSet/immunization-target-disease'
 
-valueset "HIV status": 'http://smart.who.int/immunizations-measles/ValueSet/HIVstatus-values'
+valueset "HIV status": 'http://smart.who.int/smart-immunizations-measles/ValueSet/HIVstatus-values'
 valueset "HIV status - HIV positive Choices": 'http://fhir.org/guides/who/anc-cds/ValueSet/anc-b9-de46'
 valueset "HIV status - HIV negative Choices": 'http://fhir.org/guides/who/anc-cds/ValueSet/anc-b9-de47'
 
-valueset "ARV Drugs": 'http://smart.who.int/immunizations-measles/ValueSet/ARVDrugs-values'
+valueset "ARV Drugs": 'http://smart.who.int/smart-immunizations-measles/ValueSet/ARVDrugs-values'
 
 // Vaccine Value Sets
 
-valueset "MCV Vaccine": 'http://smart.who.int/immunizations-measles/ValueSet/IMMZ.A1.DE9'
+valueset "MCV Vaccine": 'http://smart.who.int/smart-immunizations-measles/ValueSet/IMMZ.Z.DE9'
 
 // Plugin is complaining about not finding these so that should be resolved, but here until it can be fixed
-valueset "BCG Vaccine": 'http://smart.who.int/immunizations-measles/ValueSet/IMMZ.A1.DE1'
-valueset "Cholera Vaccine": 'http://smart.who.int/immunizations-measles/ValueSet/IMMZ.A1.DE2'
+valueset "BCG Vaccine": 'http://smart.who.int/smart-immunizations-measles/ValueSet/IMMZ.Z.DE1'
+valueset "Cholera Vaccine": 'http://smart.who.int/smart-immunizations-measles/ValueSet/IMMZ.Z.DE2'