diff --git a/meta-phosphor/recipes-phosphor/power/phosphor-power-systemd-links-monitor.bb b/meta-phosphor/recipes-phosphor/power/phosphor-power-systemd-links-monitor.bb
index 77df3ac..01ddecb 100644
--- a/meta-phosphor/recipes-phosphor/power/phosphor-power-systemd-links-monitor.bb
+++ b/meta-phosphor/recipes-phosphor/power/phosphor-power-systemd-links-monitor.bb
@@ -6,12 +6,12 @@
 
 inherit allarch
 
-RDEPENDS_${PN}-monitor += "phosphor-power-monitor"
+RDEPENDS:${PN}-monitor += "phosphor-power-monitor"
 
-ALLOW_EMPTY_${PN} = "1"
+ALLOW_EMPTY:${PN} = "1"
 
 
-pkg_postinst_${PN}() {
+pkg_postinst:${PN}() {
 	mkdir -p $D$systemd_system_unitdir/multi-user.target.requires
 
 	[ -z "${OBMC_POWER_SUPPLY_INSTANCES}" ] && echo "No power supply instance defined" && exit 1
@@ -23,7 +23,7 @@
 	done
 }
 
-pkg_prerm_${PN}() {
+pkg_prerm:${PN}() {
 	[ -z "${OBMC_POWER_SUPPLY_INSTANCES}" ] && echo "No power supply instance defined" && exit 1
 
 	for inst in ${OBMC_POWER_SUPPLY_INSTANCES}; do
diff --git a/meta-phosphor/recipes-phosphor/power/phosphor-power-systemd-links-sequencer.bb b/meta-phosphor/recipes-phosphor/power/phosphor-power-systemd-links-sequencer.bb
index ac91c35..84ca499 100644
--- a/meta-phosphor/recipes-phosphor/power/phosphor-power-systemd-links-sequencer.bb
+++ b/meta-phosphor/recipes-phosphor/power/phosphor-power-systemd-links-sequencer.bb
@@ -6,11 +6,11 @@
 
 inherit allarch
 
-RDEPENDS_${PN} += "phosphor-power-sequencer"
+RDEPENDS:${PN} += "phosphor-power-sequencer"
 
-ALLOW_EMPTY_${PN} = "1"
+ALLOW_EMPTY:${PN} = "1"
 
-pkg_postinst_${PN}() {
+pkg_postinst:${PN}() {
 	mkdir -p $D$systemd_system_unitdir/obmc-chassis-poweron@0.target.wants
 	mkdir -p $D$systemd_system_unitdir/multi-user.target.requires
 
@@ -23,7 +23,7 @@
 	ln -s $TARGET $LINK
 }
 
-pkg_prerm_${PN}() {
+pkg_prerm:${PN}() {
 	LINK="$D$systemd_system_unitdir/obmc-chassis-poweron@0.target.wants/pseq-monitor.service"
 	rm $LINK
 	LINK="$D$systemd_system_unitdir/obmc-chassis-poweron@0.target.wants/pseq-monitor-pgood.service"
diff --git a/meta-phosphor/recipes-phosphor/power/phosphor-power-systemd-links.bb b/meta-phosphor/recipes-phosphor/power/phosphor-power-systemd-links.bb
index f84ad28..4a5cdad 100644
--- a/meta-phosphor/recipes-phosphor/power/phosphor-power-systemd-links.bb
+++ b/meta-phosphor/recipes-phosphor/power/phosphor-power-systemd-links.bb
@@ -10,6 +10,6 @@
 
 inherit allarch
 
-RDEPENDS_${PN} += "phosphor-power"
+RDEPENDS:${PN} += "phosphor-power"
 
-ALLOW_EMPTY_${PN} = "1"
+ALLOW_EMPTY:${PN} = "1"
diff --git a/meta-phosphor/recipes-phosphor/power/phosphor-power_git.bb b/meta-phosphor/recipes-phosphor/power/phosphor-power_git.bb
index e9e5f3e..3db26f9 100644
--- a/meta-phosphor/recipes-phosphor/power/phosphor-power_git.bb
+++ b/meta-phosphor/recipes-phosphor/power/phosphor-power_git.bb
@@ -23,7 +23,7 @@
 POWER_UTIL_PACKAGES = "${PN}-utils"
 
 PACKAGE_BEFORE_PN = "${POWER_SERVICE_PACKAGES} ${POWER_UTIL_PACKAGES}"
-ALLOW_EMPTY_${PN} = "1"
+ALLOW_EMPTY:${PN} = "1"
 
 SYSTEMD_PACKAGES = "${POWER_SERVICE_PACKAGES}"
 
@@ -55,18 +55,18 @@
 REGS_MON_ENA_SVC = "phosphor-regulators-monitor-enable.service"
 REGS_MON_DIS_SVC = "phosphor-regulators-monitor-disable.service"
 
-SYSTEMD_SERVICE_${PN}-sequencer = "${SEQ_MONITOR_SVC} ${SEQ_PGOOD_SVC}"
-SYSTEMD_SERVICE_${PN}-monitor = "${@bb.utils.contains('PACKAGECONFIG', 'monitor', '${PSU_MONITOR_TMPL}', '', d)}"
-SYSTEMD_SERVICE_${PN}-psu-monitor = "${PSU_MONITOR_SVC}"
-SYSTEMD_SERVICE_${PN}-regulators = "${REGS_SVC} ${REGS_CONF_SVC} ${REGS_MON_ENA_SVC} ${REGS_MON_DIS_SVC}"
+SYSTEMD_SERVICE:${PN}-sequencer = "${SEQ_MONITOR_SVC} ${SEQ_PGOOD_SVC}"
+SYSTEMD_SERVICE:${PN}-monitor = "${@bb.utils.contains('PACKAGECONFIG', 'monitor', '${PSU_MONITOR_TMPL}', '', d)}"
+SYSTEMD_SERVICE:${PN}-psu-monitor = "${PSU_MONITOR_SVC}"
+SYSTEMD_SERVICE:${PN}-regulators = "${REGS_SVC} ${REGS_CONF_SVC} ${REGS_MON_ENA_SVC} ${REGS_MON_DIS_SVC}"
 
 
 # TODO: cold-redundancy is not installed in the repo yet
-# FILES_${PN}-cold-redundancy = "${bindir}/cold-redundancy"
+# FILES:${PN}-cold-redundancy = "${bindir}/cold-redundancy"
 
-FILES_${PN}-monitor = "${bindir}/psu-monitor"
-FILES_${PN}-psu-monitor = "${bindir}/phosphor-psu-monitor ${datadir}/phosphor-psu-monitor"
-FILES_${PN}-regulators = "${bindir}/phosphor-regulators ${datadir}/phosphor-regulators"
-FILES_${PN}-regulators += "${bindir}/regsctl"
-FILES_${PN}-sequencer = "${bindir}/pseq-monitor"
-FILES_${PN}-utils = "${bindir}/psutils"
+FILES:${PN}-monitor = "${bindir}/psu-monitor"
+FILES:${PN}-psu-monitor = "${bindir}/phosphor-psu-monitor ${datadir}/phosphor-psu-monitor"
+FILES:${PN}-regulators = "${bindir}/phosphor-regulators ${datadir}/phosphor-regulators"
+FILES:${PN}-regulators += "${bindir}/regsctl"
+FILES:${PN}-sequencer = "${bindir}/pseq-monitor"
+FILES:${PN}-utils = "${bindir}/psutils"
diff --git a/meta-phosphor/recipes-phosphor/power/phosphor-psu-software-manager_git.bb b/meta-phosphor/recipes-phosphor/power/phosphor-psu-software-manager_git.bb
index 1ea2c9e..cca4f95 100644
--- a/meta-phosphor/recipes-phosphor/power/phosphor-psu-software-manager_git.bb
+++ b/meta-phosphor/recipes-phosphor/power/phosphor-psu-software-manager_git.bb
@@ -24,8 +24,8 @@
 
 # The default config of this repo depends on utils from phosphor-power.
 # If your system does not depend on phosphor-power, please use
-# RDEPENDS_${PN}_remove to remove the dependency.
-RDEPENDS_${PN} += "phosphor-power"
+# RDEPENDS:${PN}:remove to remove the dependency.
+RDEPENDS:${PN} += "phosphor-power"
 
 # The below configs are expected to be overriden by machine layer
 
@@ -48,5 +48,5 @@
         ${PSU_UPDATE_SERVICE} \
         "
 
-SYSTEMD_SERVICE_${PN} = "xyz.openbmc_project.Software.Psu.Updater.service"
-SYSTEMD_SERVICE_${PN} += "psu-update@.service"
+SYSTEMD_SERVICE:${PN} = "xyz.openbmc_project.Software.Psu.Updater.service"
+SYSTEMD_SERVICE:${PN} += "psu-update@.service"