diff --git a/common/recipes-phosphor/leds/phosphor-led-manager-config-mrw-native.bb b/common/recipes-phosphor/leds/phosphor-led-manager-config-mrw-native.bb
index ef14030..920f637 100644
--- a/common/recipes-phosphor/leds/phosphor-led-manager-config-mrw-native.bb
+++ b/common/recipes-phosphor/leds/phosphor-led-manager-config-mrw-native.bb
@@ -11,7 +11,7 @@
 
 # Generate a YAML files based on MRW input
 do_install_append() {
-    USE_MRW="${@cf_enabled(d, 'obmc-mrw', 'yes')}"
+    USE_MRW="${@df_enabled(d, 'obmc-mrw', 'yes')}"
     DEST=${D}${datadir}/phosphor-led-manager
 
     if [ "${USE_MRW}" = "yes" ]; then
diff --git a/common/recipes-phosphor/settings/phosphor-settings-manager.bb b/common/recipes-phosphor/settings/phosphor-settings-manager.bb
index 17f727a..a63a1f2 100644
--- a/common/recipes-phosphor/settings/phosphor-settings-manager.bb
+++ b/common/recipes-phosphor/settings/phosphor-settings-manager.bb
@@ -16,7 +16,7 @@
 DEPENDS += "python-mako-native"
 DEPENDS += "autoconf-archive-native"
 DEPENDS += "virtual/phosphor-settings-defaults"
-DEPENDS += "${@cf_enabled(d, 'obmc-mrw', 'phosphor-settings-read-settings-mrw-native')}"
+DEPENDS += "${@df_enabled(d, 'obmc-mrw', 'phosphor-settings-read-settings-mrw-native')}"
 DEPENDS += "sdbusplus sdbusplus-native"
 DEPENDS += "phosphor-dbus-interfaces phosphor-dbus-interfaces-native"
 DEPENDS += "phosphor-logging"
@@ -48,7 +48,7 @@
     cmd.append(os.path.join(workdir, 'merge_settings.py'))
     cmd.append(os.path.join(settingsdir, 'defaults.yaml'))
     # Used for any settings from the MRW
-    use_mrw = cf_enabled(d, 'obmc-mrw', 'true')
+    use_mrw = df_enabled(d, 'obmc-mrw', 'true')
     if (use_mrw == 'true'):
         cmd.append(os.path.join(settingsdir, 'mrw-settings.override.yaml'))