diff --git a/analysis/measures_definition_pf_codes_conditions.py b/analysis/measures_definition_pf_codes_conditions.py
index e9d5e8f..2ecdcbf 100644
--- a/analysis/measures_definition_pf_codes_conditions.py
+++ b/analysis/measures_definition_pf_codes_conditions.py
@@ -11,7 +11,7 @@
     ethnicity_codelist,
 )
 
-from pf_dataset import pharmacy_first_event_codes, pharmacy_first_codes
+from pf_dataset import pharmacy_first_event_codes
 
 measures = create_measures()
 measures.configure_dummy_data(population_size=1000)
@@ -94,7 +94,7 @@
 )
 
 pharmacy_first_ids = clinical_events.where(
-    clinical_events.snomedct_code.is_in(pharmacy_first_codes)
+    clinical_events.snomedct_code.is_in(pharmacy_first_event_codes["combined_pf_service"])
 ).consultation_id
 
 # Select clinical events in interval date range
diff --git a/analysis/pf_dataset.py b/analysis/pf_dataset.py
index 7e8216b..1c9d0ba 100644
--- a/analysis/pf_dataset.py
+++ b/analysis/pf_dataset.py
@@ -10,16 +10,9 @@
     "consultation_service": ["1577041000000109"],
     # Pharmacy First service (qualifier value)
     "pharmacy_first_service": ["983341000000102"],
-    "combined_service": ["1577041000000109", "983341000000102"],
+    "combined_pf_service": ["1577041000000109", "983341000000102"],
 }
 
-# Pharmacy first clinical codes
-pharmacy_first_codes = [
-    "1659111000000107",
-    "1659121000000101",
-    "1577041000000109",
-    "983341000000102",
-]
 
 # Create denominator variables for each clinical condition
 # These are based on NHS England rules using sex, age, pregnancy status and repeated diagnoses
diff --git a/reports/pharmacy_first_report.Rmd b/reports/pharmacy_first_report.Rmd
index cf33ab8..6238925 100644
--- a/reports/pharmacy_first_report.Rmd
+++ b/reports/pharmacy_first_report.Rmd
@@ -45,7 +45,7 @@ pf_measures_name_mapping <- list(
   # contraception_service = "clinical_service",
   consultation_service = "clinical_service",
   pharmacy_first_service = "clinical_service",
-  combined_service = "pharmacy_first_services",
+  combined_pf_service = "pharmacy_first_services",
   acute_otitis_media = "clinical_condition",
   herpes_zoster = "clinical_condition",
   acute_sinusitis = "clinical_condition",