diff --git a/meta-ibm/conf/machine/mihawk.conf b/meta-ibm/conf/machine/mihawk.conf
index 2bb67ed..932ed5e 100644
--- a/meta-ibm/conf/machine/mihawk.conf
+++ b/meta-ibm/conf/machine/mihawk.conf
@@ -25,20 +25,20 @@
 
 
 # Inhibit phosphor-hwmon-config-mrw
-VIRTUAL-RUNTIME_phosphor-hwmon-config_df-mrw = ""
+VIRTUAL-RUNTIME_phosphor-hwmon-config:df-mrw = ""
 
 # Inhibit phosphor-fan-presence-mrw-native
-PREFERRED_PROVIDER_virtual/phosphor-fan-presence-config_df-mrw = \
+PREFERRED_PROVIDER_virtual/phosphor-fan-presence-config:df-mrw = \
     "phosphor-fan-presence-config"
 
 # Inhibit phosphor-fan-control-fan-config-mrw-native
-PREFERRED_PROVIDER_virtual/phosphor-fan-control-fan-config_df-mrw = \
+PREFERRED_PROVIDER_virtual/phosphor-fan-control-fan-config:df-mrw = \
     "phosphor-fan-control-fan-config"
 
 # Inhibit mihawk-led-manager-config-native
-PREFERRED_PROVIDER_virtual/phosphor-led-manager-config-native_df-mrw = \
+PREFERRED_PROVIDER_virtual/phosphor-led-manager-config-native:df-mrw = \
     "mihawk-led-manager-config-native"
 
-PREFERRED_PROVIDER_virtual/phosphor-logging-callouts_df-mrw = "mihawk-phosphor-logging-callouts-native"
+PREFERRED_PROVIDER_virtual/phosphor-logging-callouts:df-mrw = "mihawk-phosphor-logging-callouts-native"
 
-PREFERRED_PROVIDER_virtual/openpower-fru-inventory_df-mrw = "mihawk-openpower-fru-inventory-native"
+PREFERRED_PROVIDER_virtual/openpower-fru-inventory:df-mrw = "mihawk-openpower-fru-inventory-native"
diff --git a/meta-ibm/conf/machine/p10bmc.conf b/meta-ibm/conf/machine/p10bmc.conf
index 49a0bdb..2b7463e 100644
--- a/meta-ibm/conf/machine/p10bmc.conf
+++ b/meta-ibm/conf/machine/p10bmc.conf
@@ -24,16 +24,16 @@
 PHOSPHOR_MRW_URI = "git://github.com/open-power/witherspoon-xml"
 PHOSPHOR_MRW_REV = "c622cb5a5dd3ebc2a4eef558d1b70740f914e6f7"
 
-VIRTUAL-RUNTIME_phosphor-hwmon-config_df-mrw = ""
+VIRTUAL-RUNTIME_phosphor-hwmon-config:df-mrw = ""
 
-PREFERRED_PROVIDER_virtual/phosphor-fan-control-fan-config_df-mrw = \
+PREFERRED_PROVIDER_virtual/phosphor-fan-control-fan-config:df-mrw = \
     "phosphor-fan-control-fan-config"
-PREFERRED_PROVIDER_virtual/phosphor-fan-presence-config_df-mrw = \
+PREFERRED_PROVIDER_virtual/phosphor-fan-presence-config:df-mrw = \
     "phosphor-fan-presence-config"
 
 SKIP_BROKEN_MRW = "1"
 
-IMAGE_FEATURES_remove = "obmc-ikvm"
+IMAGE_FEATURES:remove = "obmc-ikvm"
 
 UBOOT_SIGN_ENABLE = "1"
 SPL_SIGN_ENABLE = "1"
@@ -56,4 +56,4 @@
 SPL_SIGN_KEYDIR = "${WORKDIR}"
 
 DEBUG_TRIGGERS = "kcs2"
-PACKAGECONFIG_append_pn-debug-trigger = " triggers"
+PACKAGECONFIG:append:pn-debug-trigger = " triggers"
diff --git a/meta-ibm/conf/machine/swift.conf b/meta-ibm/conf/machine/swift.conf
index e8d6dcc..f4f2413 100644
--- a/meta-ibm/conf/machine/swift.conf
+++ b/meta-ibm/conf/machine/swift.conf
@@ -18,5 +18,5 @@
 BMC_RW_SIZE = "0x2000000"
 
 # Inhibit swift-led-manager-config-native
-PREFERRED_PROVIDER_virtual/phosphor-led-manager-config-native_df-mrw = \
+PREFERRED_PROVIDER_virtual/phosphor-led-manager-config-native:df-mrw = \
     "swift-led-manager-config-native"
diff --git a/meta-ibm/conf/machine/witherspoon-tacoma.conf b/meta-ibm/conf/machine/witherspoon-tacoma.conf
index 7860e3e..bf10d16 100644
--- a/meta-ibm/conf/machine/witherspoon-tacoma.conf
+++ b/meta-ibm/conf/machine/witherspoon-tacoma.conf
@@ -24,11 +24,11 @@
 PHOSPHOR_MRW_URI = "git://github.com/open-power/witherspoon-xml"
 PHOSPHOR_MRW_REV = "c622cb5a5dd3ebc2a4eef558d1b70740f914e6f7"
 
-VIRTUAL-RUNTIME_phosphor-hwmon-config_df-mrw = ""
+VIRTUAL-RUNTIME_phosphor-hwmon-config:df-mrw = ""
 
-PREFERRED_PROVIDER_virtual/phosphor-fan-control-fan-config_df-mrw = \
+PREFERRED_PROVIDER_virtual/phosphor-fan-control-fan-config:df-mrw = \
     "phosphor-fan-control-fan-config"
-PREFERRED_PROVIDER_virtual/phosphor-fan-presence-config_df-mrw = \
+PREFERRED_PROVIDER_virtual/phosphor-fan-presence-config:df-mrw = \
     "phosphor-fan-presence-config"
 
 # The eMMC on Tacoma is just 1GB smaller than Rainier. The template file
@@ -38,7 +38,7 @@
 # partition is 5GB, therefore setting it to 4GB for Tacoma.
 WKS_HOSTFW_SIZE = "4G"
 
-IMAGE_FEATURES_remove = "obmc-ikvm"
+IMAGE_FEATURES:remove = "obmc-ikvm"
 
 DEBUG_TRIGGERS = "kcs2"
-PACKAGECONFIG_append_pn-debug-trigger = " triggers"
+PACKAGECONFIG:append:pn-debug-trigger = " triggers"
diff --git a/meta-ibm/conf/machine/witherspoon.conf b/meta-ibm/conf/machine/witherspoon.conf
index 08f2935..42844c1 100644
--- a/meta-ibm/conf/machine/witherspoon.conf
+++ b/meta-ibm/conf/machine/witherspoon.conf
@@ -23,12 +23,12 @@
 PHOSPHOR_MRW_REV = "c622cb5a5dd3ebc2a4eef558d1b70740f914e6f7"
 
 # Inhibit phosphor-hwmon-config-mrw
-VIRTUAL-RUNTIME_phosphor-hwmon-config_df-mrw = ""
+VIRTUAL-RUNTIME_phosphor-hwmon-config:df-mrw = ""
 
 # Inhibit phosphor-fan-presence-mrw-native
-PREFERRED_PROVIDER_virtual/phosphor-fan-presence-config_df-mrw = \
+PREFERRED_PROVIDER_virtual/phosphor-fan-presence-config:df-mrw = \
     "phosphor-fan-presence-config"
 
 # Inhibit phosphor-fan-control-fan-config-mrw-native
-PREFERRED_PROVIDER_virtual/phosphor-fan-control-fan-config_df-mrw = \
+PREFERRED_PROVIDER_virtual/phosphor-fan-control-fan-config:df-mrw = \
     "phosphor-fan-control-fan-config"