diff --git a/meta-openpower/classes/openpower-software-manager-mmc.bbclass b/meta-openpower/classes/openpower-software-manager-mmc.bbclass
index 38ae631..afbee1a 100644
--- a/meta-openpower/classes/openpower-software-manager-mmc.bbclass
+++ b/meta-openpower/classes/openpower-software-manager-mmc.bbclass
@@ -1,6 +1,6 @@
-PACKAGECONFIG_append = " mmc_layout"
+PACKAGECONFIG:append = " mmc_layout"
 
-SYSTEMD_SERVICE_${PN} += " \
+SYSTEMD_SERVICE:${PN} += " \
     obmc-flash-bios-init.service \
     obmc-flash-bios-patch.service \
     openpower-process-host-firmware.service \
diff --git a/meta-openpower/classes/openpower-software-manager-static.bbclass b/meta-openpower/classes/openpower-software-manager-static.bbclass
index 4afb274..623b051 100644
--- a/meta-openpower/classes/openpower-software-manager-static.bbclass
+++ b/meta-openpower/classes/openpower-software-manager-static.bbclass
@@ -1,4 +1,4 @@
-RDEPENDS_${PN} += "pflash"
+RDEPENDS:${PN} += "pflash"
 
-SYSTEMD_SERVICE_${PN} += "openpower-pnor-update@.service"
+SYSTEMD_SERVICE:${PN} += "openpower-pnor-update@.service"
 
diff --git a/meta-openpower/classes/openpower-software-manager-ubi.bbclass b/meta-openpower/classes/openpower-software-manager-ubi.bbclass
index 6fd6b68..e7ab008 100644
--- a/meta-openpower/classes/openpower-software-manager-ubi.bbclass
+++ b/meta-openpower/classes/openpower-software-manager-ubi.bbclass
@@ -1,6 +1,6 @@
-PACKAGECONFIG_append = " ubifs_layout"
+PACKAGECONFIG:append = " ubifs_layout"
 
-SYSTEMD_SERVICE_${PN} += " \
+SYSTEMD_SERVICE:${PN} += " \
         obmc-flash-bios-ubiattach.service \
         obmc-flash-bios-ubimount@.service \
         obmc-flash-bios-ubiumount-ro@.service \
diff --git a/meta-openpower/classes/openpower-software-manager-virtual-pnor.bbclass b/meta-openpower/classes/openpower-software-manager-virtual-pnor.bbclass
index 375ef68..61822f1 100644
--- a/meta-openpower/classes/openpower-software-manager-virtual-pnor.bbclass
+++ b/meta-openpower/classes/openpower-software-manager-virtual-pnor.bbclass
@@ -1,10 +1,10 @@
-PACKAGECONFIG_append = " virtual_pnor"
+PACKAGECONFIG:append = " virtual_pnor"
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
         bash \
 "
 
-SYSTEMD_SERVICE_${PN} += " \
+SYSTEMD_SERVICE:${PN} += " \
         obmc-vpnor-updatesymlinks.service \
         obmc-vpnor-check-clearvolatile@.service \
         obmc-vpnor-enable-clearvolatile@.service \