diff --git a/meta-ibm/recipes-phosphor/certificate/phosphor-certificate-manager_%.bbappend b/meta-ibm/recipes-phosphor/certificate/phosphor-certificate-manager_%.bbappend
index ee6b189..ab4f048 100644
--- a/meta-ibm/recipes-phosphor/certificate/phosphor-certificate-manager_%.bbappend
+++ b/meta-ibm/recipes-phosphor/certificate/phosphor-certificate-manager_%.bbappend
@@ -1,2 +1,2 @@
-PACKAGECONFIG_append_p10bmc = " ibm-hypervisor-cert"
-PACKAGECONFIG_append_witherspoon-tacoma = " ibm-hypervisor-cert"
+PACKAGECONFIG:append:p10bmc = " ibm-hypervisor-cert"
+PACKAGECONFIG:append:witherspoon-tacoma = " ibm-hypervisor-cert"
diff --git a/meta-ibm/recipes-phosphor/chassis/avsbus-control.bb b/meta-ibm/recipes-phosphor/chassis/avsbus-control.bb
index 2e98aaf..c46926f 100644
--- a/meta-ibm/recipes-phosphor/chassis/avsbus-control.bb
+++ b/meta-ibm/recipes-phosphor/chassis/avsbus-control.bb
@@ -6,19 +6,19 @@
 inherit allarch
 inherit obmc-phosphor-systemd
 
-RDEPENDS_${PN} += "i2c-tools"
+RDEPENDS:${PN} += "i2c-tools"
 
 S = "${WORKDIR}"
 
 SRC_URI += "file://avsbus-enable.sh"
-SRC_URI_append_witherspoon = " file://avsbus-disable.sh"
+SRC_URI:append:witherspoon = " file://avsbus-disable.sh"
 
 do_install() {
         install -d ${D}${bindir}
         install -m 0755 ${S}/avsbus-enable.sh ${D}${bindir}/avsbus-enable.sh
 }
 
-do_install_append_witherspoon() {
+do_install:append:witherspoon() {
         install -m 0755 ${S}/avsbus-disable.sh ${D}${bindir}/avsbus-disable.sh
 }
 
@@ -30,7 +30,7 @@
 FMT_EN = "../${TMPL_EN}:${TGTFMT}.requires/${INSTFMT_EN}"
 FMT_DIS = "../${TMPL_DIS}:${TGTFMT}.requires/${INSTFMT_DIS}"
 
-SYSTEMD_SERVICE_${PN} += "${TMPL_EN}"
+SYSTEMD_SERVICE:${PN} += "${TMPL_EN}"
 SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT_EN', 'OBMC_CHASSIS_INSTANCES')}"
-SYSTEMD_SERVICE_${PN}_append_witherspoon = " ${TMPL_DIS}"
-SYSTEMD_LINK_${PN}_append_witherspoon = " ${@compose_list(d, 'FMT_DIS', 'OBMC_CHASSIS_INSTANCES')}"
+SYSTEMD_SERVICE:${PN}:append:witherspoon = " ${TMPL_DIS}"
+SYSTEMD_LINK_${PN}:append:witherspoon = " ${@compose_list(d, 'FMT_DIS', 'OBMC_CHASSIS_INSTANCES')}"
diff --git a/meta-ibm/recipes-phosphor/chassis/obmc-op-control-power_%.bbappend b/meta-ibm/recipes-phosphor/chassis/obmc-op-control-power_%.bbappend
index 72d991c..4fc41d0 100644
--- a/meta-ibm/recipes-phosphor/chassis/obmc-op-control-power_%.bbappend
+++ b/meta-ibm/recipes-phosphor/chassis/obmc-op-control-power_%.bbappend
@@ -1 +1 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
diff --git a/meta-ibm/recipes-phosphor/chassis/power-workarounds.bb b/meta-ibm/recipes-phosphor/chassis/power-workarounds.bb
index af8babb..2d00264 100644
--- a/meta-ibm/recipes-phosphor/chassis/power-workarounds.bb
+++ b/meta-ibm/recipes-phosphor/chassis/power-workarounds.bb
@@ -6,7 +6,7 @@
 inherit allarch
 inherit obmc-phosphor-systemd
 
-RDEPENDS_${PN} += "i2c-tools"
+RDEPENDS:${PN} += "i2c-tools"
 
 S = "${WORKDIR}"
 
@@ -22,5 +22,5 @@
 TGTFMT = "obmc-chassis-poweron@{0}.target"
 FMT_WA = "../${TMPL_WA}:${TGTFMT}.requires/${INSTFMT_WA}"
 
-SYSTEMD_SERVICE_${PN} += "${TMPL_WA}"
+SYSTEMD_SERVICE:${PN} += "${TMPL_WA}"
 SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT_WA', 'OBMC_CHASSIS_INSTANCES')}"
diff --git a/meta-ibm/recipes-phosphor/chassis/vrm-control.bb b/meta-ibm/recipes-phosphor/chassis/vrm-control.bb
index 8a0d7a6..8a9ef7f 100644
--- a/meta-ibm/recipes-phosphor/chassis/vrm-control.bb
+++ b/meta-ibm/recipes-phosphor/chassis/vrm-control.bb
@@ -7,18 +7,18 @@
 inherit allarch
 inherit obmc-phosphor-systemd
 
-RDEPENDS_${PN} += "i2c-tools bash"
+RDEPENDS:${PN} += "i2c-tools bash"
 
 S = "${WORKDIR}"
 SRC_URI = "file://ir35221-unbind-bind.sh"
-SRC_URI_append_ibm-ac-server = " file://vrm-control.sh"
+SRC_URI:append:ibm-ac-server = " file://vrm-control.sh"
 
 do_install() {
         install -d ${D}${bindir}
         install -m 0755 ${WORKDIR}/ir35221-unbind-bind.sh ${D}${bindir}/ir35221-unbind-bind.sh
 }
 
-do_install_append_ibm-ac-server() {
+do_install:append:ibm-ac-server() {
         install -m 0755 ${WORKDIR}/vrm-control.sh ${D}${bindir}/vrm-control.sh
 }
 
@@ -35,8 +35,8 @@
 INSTFMT_ON_IRUNBIND = "ir35221-on-unbind@{0}.service"
 FMT_ON_IRUNBIND = "../${TMPL_ON_IRUNBIND}:${TGTFMT_ON}.requires/${INSTFMT_ON_IRUNBIND}"
 
-SYSTEMD_SERVICE_${PN} += "${TMPL_ON_IRUNBIND} ${TMPL_ON_IRBIND}"
-SYSTEMD_SERVICE_${PN}_append_ibm-ac-server = " ${TMPL}"
-SYSTEMD_LINK_${PN}_append_ibm-ac-server = " ${@compose_list(d, 'FMT_ON', 'OBMC_CHASSIS_INSTANCES')}"
+SYSTEMD_SERVICE:${PN} += "${TMPL_ON_IRUNBIND} ${TMPL_ON_IRBIND}"
+SYSTEMD_SERVICE:${PN}:append:ibm-ac-server = " ${TMPL}"
+SYSTEMD_LINK_${PN}:append:ibm-ac-server = " ${@compose_list(d, 'FMT_ON', 'OBMC_CHASSIS_INSTANCES')}"
 SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT_ON_IRBIND', 'OBMC_CHASSIS_INSTANCES')}"
 SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT_ON_IRUNBIND', 'OBMC_CHASSIS_INSTANCES')}"
diff --git a/meta-ibm/recipes-phosphor/configuration/acx22-yaml-config.bb b/meta-ibm/recipes-phosphor/configuration/acx22-yaml-config.bb
index 5ec7d45..3a01fe1 100644
--- a/meta-ibm/recipes-phosphor/configuration/acx22-yaml-config.bb
+++ b/meta-ibm/recipes-phosphor/configuration/acx22-yaml-config.bb
@@ -6,7 +6,7 @@
 inherit allarch
 inherit mrw-xml
 
-SRC_URI_ibm-ac-server = " \
+SRC_URI:ibm-ac-server = " \
     file://acx22-ipmi-fru-bmc.yaml \
     file://acx22-ipmi-fru-not-sent-by-host.yaml \
     file://acx22-ipmi-hwmon-sensors.yaml \
@@ -14,7 +14,7 @@
     file://acx22-ipmi-occ-sensors.yaml \
     file://acx22-ipmi-sensors-mrw.yaml \
     "
-SRC_URI_mihawk = " \
+SRC_URI:mihawk = " \
     file://acx22-ipmi-fru-bmc.yaml \
     file://acx22-ipmi-hwmon-sensors.yaml \
     file://acx22-ipmi-inventory-sensors.yaml \
@@ -29,11 +29,11 @@
 
 S = "${WORKDIR}"
 
-ACx22_IPMI_EXTRA_FRU_READ_YAMLS_ibm-ac-server = " \
+ACx22_IPMI_EXTRA_FRU_READ_YAMLS:ibm-ac-server = " \
     acx22-ipmi-fru-bmc.yaml \
     acx22-ipmi-fru-not-sent-by-host.yaml \
     "
-ACx22_IPMI_EXTRA_FRU_READ_YAMLS_mihawk = " \
+ACx22_IPMI_EXTRA_FRU_READ_YAMLS:mihawk = " \
     acx22-ipmi-fru-bmc.yaml \
     "
 ACx22_IPMI_EXTRA_SENSOR_YAMLS = " \
@@ -82,11 +82,11 @@
     install -m 0644 -D sensors.yaml ${D}${datadir}/${BPN}/ipmi-sensors.yaml
 }
 
-FILES_${PN}-dev = " \
+FILES:${PN}-dev = " \
     ${datadir}/${BPN}/ipmi-extra-properties.yaml \
     ${datadir}/${BPN}/ipmi-fru-read.yaml \
     ${datadir}/${BPN}/ipmi-inventory-sensors.yaml \
     ${datadir}/${BPN}/ipmi-sensors.yaml \
     "
 
-ALLOW_EMPTY_${PN} = "1"
+ALLOW_EMPTY:${PN} = "1"
diff --git a/meta-ibm/recipes-phosphor/console/obmc-console_%.bbappend b/meta-ibm/recipes-phosphor/console/obmc-console_%.bbappend
index f493ef5..9360e21 100644
--- a/meta-ibm/recipes-phosphor/console/obmc-console_%.bbappend
+++ b/meta-ibm/recipes-phosphor/console/obmc-console_%.bbappend
@@ -1,6 +1,6 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
-SRC_URI_remove = "file://${BPN}.conf"
+SRC_URI:remove = "file://${BPN}.conf"
 SRC_URI += "file://server.ttyVUART0.conf"
 
 install_concurrent_console_config() {
@@ -27,38 +27,38 @@
         install -m 0644 ${WORKDIR}/server.ttyVUART1.conf ${D}${sysconfdir}/${BPN}/
 }
 
-SRC_URI_append_p10bmc = " file://client.2201.conf"
-SRC_URI_append_p10bmc = " file://server.ttyVUART1.conf"
+SRC_URI:append:p10bmc = " file://client.2201.conf"
+SRC_URI:append:p10bmc = " file://server.ttyVUART1.conf"
 
-REGISTERED_SERVICES_${PN}_append_p10bmc = " obmc_console_guests:tcp:2201:"
+REGISTERED_SERVICES_${PN}:append:p10bmc = " obmc_console_guests:tcp:2201:"
 
-SYSTEMD_SERVICE_${PN}_append_p10bmc = " obmc-console-ssh@2200.service \
+SYSTEMD_SERVICE:${PN}:append:p10bmc = " obmc-console-ssh@2200.service \
 		obmc-console-ssh@2201.service \
                 "
-SYSTEMD_SERVICE_${PN}_remove_p10bmc = "obmc-console-ssh.socket"
+SYSTEMD_SERVICE:${PN}:remove:p10bmc = "obmc-console-ssh.socket"
 
-FILES_${PN}_remove_p10bmc = "${systemd_system_unitdir}/obmc-console-ssh@.service.d/use-socket.conf"
+FILES:${PN}:remove:p10bmc = "${systemd_system_unitdir}/obmc-console-ssh@.service.d/use-socket.conf"
 
-EXTRA_OECONF_append_p10bmc = " --enable-concurrent-servers"
+EXTRA_OECONF:append:p10bmc = " --enable-concurrent-servers"
 
-do_install_append_p10bmc() {
+do_install:append:p10bmc() {
         install_concurrent_console_config
 }
 
-SRC_URI_append_witherspoon-tacoma = " file://client.2201.conf"
-SRC_URI_append_witherspoon-tacoma = " file://server.ttyVUART1.conf"
+SRC_URI:append:witherspoon-tacoma = " file://client.2201.conf"
+SRC_URI:append:witherspoon-tacoma = " file://server.ttyVUART1.conf"
 
-REGISTERED_SERVICES_${PN}_append_witherspoon-tacoma = " obmc_console_guests:tcp:2201:"
+REGISTERED_SERVICES_${PN}:append:witherspoon-tacoma = " obmc_console_guests:tcp:2201:"
 
-SYSTEMD_SERVICE_${PN}_append_witherspoon-tacoma = " obmc-console-ssh@2200.service \
+SYSTEMD_SERVICE:${PN}:append:witherspoon-tacoma = " obmc-console-ssh@2200.service \
 		obmc-console-ssh@2201.service \
                 "
-SYSTEMD_SERVICE_${PN}_remove_witherspoon-tacoma = "obmc-console-ssh.socket"
+SYSTEMD_SERVICE:${PN}:remove:witherspoon-tacoma = "obmc-console-ssh.socket"
 
-FILES_${PN}_remove_witherspoon-tacoma = "${systemd_system_unitdir}/obmc-console-ssh@.service.d/use-socket.conf"
+FILES:${PN}:remove:witherspoon-tacoma = "${systemd_system_unitdir}/obmc-console-ssh@.service.d/use-socket.conf"
 
-EXTRA_OECONF_append_witherspoon-tacoma = " --enable-concurrent-servers"
+EXTRA_OECONF:append:witherspoon-tacoma = " --enable-concurrent-servers"
 
-do_install_append_witherspoon-tacoma() {
+do_install:append:witherspoon-tacoma() {
         install_concurrent_console_config
 }
diff --git a/meta-ibm/recipes-phosphor/dbus/events-policy.bb b/meta-ibm/recipes-phosphor/dbus/events-policy.bb
index 52cb313..676466b 100644
--- a/meta-ibm/recipes-phosphor/dbus/events-policy.bb
+++ b/meta-ibm/recipes-phosphor/dbus/events-policy.bb
@@ -6,7 +6,7 @@
 inherit allarch
 inherit phosphor-dbus-monitor
 
-FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:"
 
 SRC_URI += "file://config.yaml"
 
@@ -14,4 +14,4 @@
         install -D ${WORKDIR}/config.yaml ${D}${config_dir}/config.yaml
 }
 
-FILES_${PN} += "${config_dir}/config.yaml"
+FILES:${PN} += "${config_dir}/config.yaml"
diff --git a/meta-ibm/recipes-phosphor/dbus/fan-policy.bb b/meta-ibm/recipes-phosphor/dbus/fan-policy.bb
index 8bfecd3..f542725 100644
--- a/meta-ibm/recipes-phosphor/dbus/fan-policy.bb
+++ b/meta-ibm/recipes-phosphor/dbus/fan-policy.bb
@@ -6,29 +6,29 @@
 inherit allarch
 inherit phosphor-dbus-monitor
 
-FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:"
 
 SRC_URI += "file://air-cooled.yaml"
-SRC_URI_append_ibm-ac-server = " file://water-cooled.yaml"
+SRC_URI:append:ibm-ac-server = " file://water-cooled.yaml"
 SRC_URI += "file://fan-errors.yaml"
 
-SRC_URI_remove_p10bmc = "file://air-cooled.yaml"
-SRC_URI_remove_p10bmc = "file://fan-errors.yaml"
+SRC_URI:remove:p10bmc = "file://air-cooled.yaml"
+SRC_URI:remove:p10bmc = "file://fan-errors.yaml"
 
-do_install_append_ibm-ac-server() {
+do_install:append:ibm-ac-server() {
         install -D ${WORKDIR}/air-cooled.yaml ${D}${config_dir}/air-cooled.yaml
         install -D ${WORKDIR}/water-cooled.yaml ${D}${config_dir}/water-cooled.yaml
         install -D ${WORKDIR}/fan-errors.yaml ${D}${config_dir}/fan-errors.yaml
 }
 
-do_install_append_mihawk() {
+do_install:append:mihawk() {
         install -D ${WORKDIR}/air-cooled.yaml ${D}${config_dir}/air-cooled.yaml
         install -D ${WORKDIR}/fan-errors.yaml ${D}${config_dir}/fan-errors.yaml
 }
 
-FILES_${PN} += "${config_dir}/air-cooled.yaml"
-FILES_${PN}_append_ibm-ac-server = " ${config_dir}/water-cooled.yaml"
-FILES_${PN} += "${config_dir}/fan-errors.yaml"
+FILES:${PN} += "${config_dir}/air-cooled.yaml"
+FILES:${PN}:append:ibm-ac-server = " ${config_dir}/water-cooled.yaml"
+FILES:${PN} += "${config_dir}/fan-errors.yaml"
 
-FILES_${PN}_remove_p10bmc = "${config_dir}/air-cooled.yaml"
-FILES_${PN}_remove_p10bmc = "${config_dir}/fan-errors.yaml"
+FILES:${PN}:remove:p10bmc = "${config_dir}/air-cooled.yaml"
+FILES:${PN}:remove:p10bmc = "${config_dir}/fan-errors.yaml"
diff --git a/meta-ibm/recipes-phosphor/dbus/ibm-dbus-interfaces-mapper-config-native.bb b/meta-ibm/recipes-phosphor/dbus/ibm-dbus-interfaces-mapper-config-native.bb
index b8489d6..14c1255 100644
--- a/meta-ibm/recipes-phosphor/dbus/ibm-dbus-interfaces-mapper-config-native.bb
+++ b/meta-ibm/recipes-phosphor/dbus/ibm-dbus-interfaces-mapper-config-native.bb
@@ -7,5 +7,5 @@
 inherit phosphor-mapper
 inherit native
 
-PHOSPHOR_MAPPER_SERVICE_append = " com.ibm"
-PHOSPHOR_MAPPER_INTERFACE_append = " com.ibm"
+PHOSPHOR_MAPPER_SERVICE:append = " com.ibm"
+PHOSPHOR_MAPPER_INTERFACE:append = " com.ibm"
diff --git a/meta-ibm/recipes-phosphor/dbus/ibm-dbus-interfaces_git.bb b/meta-ibm/recipes-phosphor/dbus/ibm-dbus-interfaces_git.bb
index 99b933a..f8b3da2 100644
--- a/meta-ibm/recipes-phosphor/dbus/ibm-dbus-interfaces_git.bb
+++ b/meta-ibm/recipes-phosphor/dbus/ibm-dbus-interfaces_git.bb
@@ -25,7 +25,7 @@
         libsystemd \
         "
 
-PACKAGECONFIG_remove_class-native = "libibm_dbus"
-PACKAGECONFIG_remove_class-nativesdk = "libibm_dbus"
+PACKAGECONFIG:remove:class-native = "libibm_dbus"
+PACKAGECONFIG:remove:class-nativesdk = "libibm_dbus"
 
 BBCLASSEXTEND += "native nativesdk"
diff --git a/meta-ibm/recipes-phosphor/dbus/phosphor-dbus-monitor-config.bbappend b/meta-ibm/recipes-phosphor/dbus/phosphor-dbus-monitor-config.bbappend
index 8437cba..7ed24ff 100644
--- a/meta-ibm/recipes-phosphor/dbus/phosphor-dbus-monitor-config.bbappend
+++ b/meta-ibm/recipes-phosphor/dbus/phosphor-dbus-monitor-config.bbappend
@@ -1,11 +1,11 @@
-PHOSPHOR_DBUS_MONITOR_CONFIGS_append_ibm-ac-server = " fan-policy"
-PHOSPHOR_DBUS_MONITOR_CONFIGS_append_ibm-ac-server = " thermal-policy"
-PHOSPHOR_DBUS_MONITOR_CONFIGS_append_ibm-ac-server = " power-supply-policy"
-PHOSPHOR_DBUS_MONITOR_CONFIGS_append_ibm-ac-server = " events-policy"
-PHOSPHOR_DBUS_MONITOR_CONFIGS_append_ibm-ac-server = " snmp-policy"
-PHOSPHOR_DBUS_MONITOR_CONFIGS_append_mihawk = " fan-policy"
-PHOSPHOR_DBUS_MONITOR_CONFIGS_append_mihawk = " thermal-policy"
-PHOSPHOR_DBUS_MONITOR_CONFIGS_append_mihawk = " power-supply-policy"
-PHOSPHOR_DBUS_MONITOR_CONFIGS_append_mihawk = " events-policy"
-PHOSPHOR_DBUS_MONITOR_CONFIGS_append_mihawk = " snmp-policy"
-PHOSPHOR_DBUS_MONITOR_CONFIGS_append_p10bmc = " snmp-policy"
+PHOSPHOR_DBUS_MONITOR_CONFIGS:append:ibm-ac-server = " fan-policy"
+PHOSPHOR_DBUS_MONITOR_CONFIGS:append:ibm-ac-server = " thermal-policy"
+PHOSPHOR_DBUS_MONITOR_CONFIGS:append:ibm-ac-server = " power-supply-policy"
+PHOSPHOR_DBUS_MONITOR_CONFIGS:append:ibm-ac-server = " events-policy"
+PHOSPHOR_DBUS_MONITOR_CONFIGS:append:ibm-ac-server = " snmp-policy"
+PHOSPHOR_DBUS_MONITOR_CONFIGS:append:mihawk = " fan-policy"
+PHOSPHOR_DBUS_MONITOR_CONFIGS:append:mihawk = " thermal-policy"
+PHOSPHOR_DBUS_MONITOR_CONFIGS:append:mihawk = " power-supply-policy"
+PHOSPHOR_DBUS_MONITOR_CONFIGS:append:mihawk = " events-policy"
+PHOSPHOR_DBUS_MONITOR_CONFIGS:append:mihawk = " snmp-policy"
+PHOSPHOR_DBUS_MONITOR_CONFIGS:append:p10bmc = " snmp-policy"
diff --git a/meta-ibm/recipes-phosphor/dbus/phosphor-dbus-monitor_%.bbappend b/meta-ibm/recipes-phosphor/dbus/phosphor-dbus-monitor_%.bbappend
index 5c9d0b1..3071cb4 100644
--- a/meta-ibm/recipes-phosphor/dbus/phosphor-dbus-monitor_%.bbappend
+++ b/meta-ibm/recipes-phosphor/dbus/phosphor-dbus-monitor_%.bbappend
@@ -1,2 +1,2 @@
-SYSTEMD_LINK_phosphor-msl-verify_append_ibm-ac-server = " ../phosphor-msl-verify.service:obmc-chassis-poweron@0.target.requires/phosphor-msl-verify.service"
-SYSTEMD_LINK_phosphor-msl-verify_append_mihawk = " ../phosphor-msl-verify.service:obmc-chassis-poweron@0.target.requires/phosphor-msl-verify.service"
+SYSTEMD_LINK_phosphor-msl-verify:append:ibm-ac-server = " ../phosphor-msl-verify.service:obmc-chassis-poweron@0.target.requires/phosphor-msl-verify.service"
+SYSTEMD_LINK_phosphor-msl-verify:append:mihawk = " ../phosphor-msl-verify.service:obmc-chassis-poweron@0.target.requires/phosphor-msl-verify.service"
diff --git a/meta-ibm/recipes-phosphor/dbus/phosphor-mapper-config-native.bbappend b/meta-ibm/recipes-phosphor/dbus/phosphor-mapper-config-native.bbappend
index d94a554..25ab376 100644
--- a/meta-ibm/recipes-phosphor/dbus/phosphor-mapper-config-native.bbappend
+++ b/meta-ibm/recipes-phosphor/dbus/phosphor-mapper-config-native.bbappend
@@ -1 +1 @@
-PHOSPHOR_MAPPER_CONFIGS_append = " ibm-dbus-interfaces-mapper-config-native"
+PHOSPHOR_MAPPER_CONFIGS:append = " ibm-dbus-interfaces-mapper-config-native"
diff --git a/meta-ibm/recipes-phosphor/dbus/power-supply-policy.bb b/meta-ibm/recipes-phosphor/dbus/power-supply-policy.bb
index 8d3df46..b55efb3 100644
--- a/meta-ibm/recipes-phosphor/dbus/power-supply-policy.bb
+++ b/meta-ibm/recipes-phosphor/dbus/power-supply-policy.bb
@@ -6,7 +6,7 @@
 inherit allarch
 inherit phosphor-dbus-monitor
 
-FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:"
 
 SRC_URI += "file://power-supply-policy.yaml"
 
@@ -14,4 +14,4 @@
         install -D ${WORKDIR}/power-supply-policy.yaml ${D}${config_dir}/power-supply-policy.yaml
 }
 
-FILES_${PN} += "${config_dir}/power-supply-policy.yaml"
+FILES:${PN} += "${config_dir}/power-supply-policy.yaml"
diff --git a/meta-ibm/recipes-phosphor/dbus/snmp-policy.bb b/meta-ibm/recipes-phosphor/dbus/snmp-policy.bb
index 500c674..94fce40 100644
--- a/meta-ibm/recipes-phosphor/dbus/snmp-policy.bb
+++ b/meta-ibm/recipes-phosphor/dbus/snmp-policy.bb
@@ -6,7 +6,7 @@
 inherit allarch
 inherit phosphor-dbus-monitor
 
-FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:"
 
 SRC_URI += "file://snmp-config.yaml"
 
diff --git a/meta-ibm/recipes-phosphor/dbus/thermal-policy.bb b/meta-ibm/recipes-phosphor/dbus/thermal-policy.bb
index b5b38ba..5c381b4 100644
--- a/meta-ibm/recipes-phosphor/dbus/thermal-policy.bb
+++ b/meta-ibm/recipes-phosphor/dbus/thermal-policy.bb
@@ -6,7 +6,7 @@
 inherit allarch
 inherit phosphor-dbus-monitor
 
-FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:"
 
 SRC_URI = "file://thermal-policy.yaml"
 
@@ -14,4 +14,4 @@
         install -D ${WORKDIR}/thermal-policy.yaml ${D}${config_dir}/thermal-policy.yaml
 }
 
-FILES_${PN} += "${config_dir}/thermal-policy.yaml"
+FILES:${PN} += "${config_dir}/thermal-policy.yaml"
diff --git a/meta-ibm/recipes-phosphor/dump/phosphor-debug-collector_%.bbappend b/meta-ibm/recipes-phosphor/dump/phosphor-debug-collector_%.bbappend
index 0cbca65..ec831eb 100644
--- a/meta-ibm/recipes-phosphor/dump/phosphor-debug-collector_%.bbappend
+++ b/meta-ibm/recipes-phosphor/dump/phosphor-debug-collector_%.bbappend
@@ -1,10 +1,10 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:"
 
-PACKAGECONFIG_append_p10bmc = " host-dump-transport-pldm"
-PACKAGECONFIG_append_witherspoon-tacoma = " host-dump-transport-pldm"
+PACKAGECONFIG:append:p10bmc = " host-dump-transport-pldm"
+PACKAGECONFIG:append:witherspoon-tacoma = " host-dump-transport-pldm"
 
-PACKAGECONFIG_append_p10bmc = " openpower-dumps-extension"
-PACKAGECONFIG_append_witherspoon-tacoma = " openpower-dumps-extension"
+PACKAGECONFIG:append:p10bmc = " openpower-dumps-extension"
+PACKAGECONFIG:append:witherspoon-tacoma = " openpower-dumps-extension"
 
 SRC_URI += "file://plugins.d/ibm_elogall"
 SRC_URI += "file://plugins.d/pels"
@@ -47,6 +47,6 @@
 }
 
 IBM_INSTALL_POSTFUNCS = "install_ibm_plugins link_ibm_plugins"
-IBM_INSTALL_POSTFUNCS_p10bmc += "install_dreport_header install_ibm_bad_vpd link_ibm_bad_vpd"
+IBM_INSTALL_POSTFUNCS:p10bmc += "install_dreport_header install_ibm_bad_vpd link_ibm_bad_vpd"
 
 do_install[postfuncs] += "${IBM_INSTALL_POSTFUNCS}"
diff --git a/meta-ibm/recipes-phosphor/fans/fan-watchdog.bb b/meta-ibm/recipes-phosphor/fans/fan-watchdog.bb
index d71b378..ad44ba3 100644
--- a/meta-ibm/recipes-phosphor/fans/fan-watchdog.bb
+++ b/meta-ibm/recipes-phosphor/fans/fan-watchdog.bb
@@ -5,8 +5,8 @@
 
 inherit obmc-phosphor-systemd
 
-RDEPENDS_${PN} += "virtual/obmc-gpio-monitor"
-RDEPENDS_${PN} += "busybox"
+RDEPENDS:${PN} += "virtual/obmc-gpio-monitor"
+RDEPENDS:${PN} += "busybox"
 
 RESET_SERVICE = "reset-fan-watchdog.service"
 TGTFMT = "obmc-chassis-poweron@0.target"
@@ -17,7 +17,7 @@
 WATCHDOG_SERVICE = "fan-watchdog.service"
 WATCHDOG_FMT = "../${WATCHDOG_SERVICE}:${TGTFMT}.requires/${WATCHDOG_SERVICE}"
 
-SYSTEMD_SERVICE_${PN} += "${RESET_SERVICE} ${MONITOR_SERVICE} ${WATCHDOG_SERVICE}"
+SYSTEMD_SERVICE:${PN} += "${RESET_SERVICE} ${MONITOR_SERVICE} ${WATCHDOG_SERVICE}"
 SYSTEMD_LINK_${PN} += "${RESET_FMT} ${WATCHDOG_FMT}"
 SYSTEMD_ENVIRONMENT_FILE_${PN} += "obmc/fan-watchdog/reset-fan-watchdog.conf"
 SYSTEMD_ENVIRONMENT_FILE_${PN} += "obmc/fan-watchdog/fan-watchdog.conf"
diff --git a/meta-ibm/recipes-phosphor/fans/phosphor-fan-control-events-config.bbappend b/meta-ibm/recipes-phosphor/fans/phosphor-fan-control-events-config.bbappend
index 8f2097c..9accc57 100644
--- a/meta-ibm/recipes-phosphor/fans/phosphor-fan-control-events-config.bbappend
+++ b/meta-ibm/recipes-phosphor/fans/phosphor-fan-control-events-config.bbappend
@@ -1 +1 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:"
diff --git a/meta-ibm/recipes-phosphor/fans/phosphor-fan-control-fan-config.bbappend b/meta-ibm/recipes-phosphor/fans/phosphor-fan-control-fan-config.bbappend
index 8f2097c..9accc57 100644
--- a/meta-ibm/recipes-phosphor/fans/phosphor-fan-control-fan-config.bbappend
+++ b/meta-ibm/recipes-phosphor/fans/phosphor-fan-control-fan-config.bbappend
@@ -1 +1 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:"
diff --git a/meta-ibm/recipes-phosphor/fans/phosphor-fan-control-zone-conditions-config.bbappend b/meta-ibm/recipes-phosphor/fans/phosphor-fan-control-zone-conditions-config.bbappend
index 8f2097c..9accc57 100644
--- a/meta-ibm/recipes-phosphor/fans/phosphor-fan-control-zone-conditions-config.bbappend
+++ b/meta-ibm/recipes-phosphor/fans/phosphor-fan-control-zone-conditions-config.bbappend
@@ -1 +1 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:"
diff --git a/meta-ibm/recipes-phosphor/fans/phosphor-fan-control-zone-config.bbappend b/meta-ibm/recipes-phosphor/fans/phosphor-fan-control-zone-config.bbappend
index 8f2097c..9accc57 100644
--- a/meta-ibm/recipes-phosphor/fans/phosphor-fan-control-zone-config.bbappend
+++ b/meta-ibm/recipes-phosphor/fans/phosphor-fan-control-zone-config.bbappend
@@ -1 +1 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:"
diff --git a/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config.bbappend b/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config.bbappend
index 2c15e03..85cc4d8 100644
--- a/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config.bbappend
+++ b/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config.bbappend
@@ -1,18 +1,18 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:"
 
-SRC_URI_witherspoon = "file://config.json"
-SRC_URI_p10bmc = "file://rainier-2u/config.json \
+SRC_URI:witherspoon = "file://config.json"
+SRC_URI:p10bmc = "file://rainier-2u/config.json \
                    file://rainier-4u/config.json \
                    file://rainier-1s4u/config.json \
                    file://everest/config.json \
                    "
 
-do_install_witherspoon() {
+do_install:witherspoon() {
         install -d ${D}/${datadir}/phosphor-fan-presence/monitor/
         install -m 0644 ${WORKDIR}/config.json ${D}/${datadir}/phosphor-fan-presence/monitor/
 }
 
-do_install_p10bmc() {
+do_install:p10bmc() {
         # Install Rainier-2U/4U fan monitor config files
         install -d ${D}/${datadir}/phosphor-fan-presence/monitor/ibm,rainier-2u/
         install -d ${D}/${datadir}/phosphor-fan-presence/monitor/ibm,rainier-4u/
@@ -26,11 +26,11 @@
         install -m 0644 ${WORKDIR}/everest/config.json ${D}/${datadir}/phosphor-fan-presence/monitor/ibm,everest/
 }
 
-FILES_${PN}_append_witherspoon = " ${datadir}/phosphor-fan-presence/monitor/config.json"
-FILES_${PN}_remove_witherspoon = "${monitor_datadir}/monitor.yaml"
+FILES:${PN}:append:witherspoon = " ${datadir}/phosphor-fan-presence/monitor/config.json"
+FILES:${PN}:remove:witherspoon = "${monitor_datadir}/monitor.yaml"
 
-FILES_${PN}_remove_p10bmc = "${monitor_datadir}/monitor.yaml"
-FILES_${PN}_append_p10bmc = " ${datadir}/phosphor-fan-presence/monitor/ibm,rainier-2u/config.json"
-FILES_${PN}_append_p10bmc = " ${datadir}/phosphor-fan-presence/monitor/ibm,rainier-4u/config.json"
-FILES_${PN}_append_p10bmc = " ${datadir}/phosphor-fan-presence/monitor/ibm,rainier-1s4u/config.json"
-FILES_${PN}_append_p10bmc = " ${datadir}/phosphor-fan-presence/monitor/ibm,everest/config.json"
+FILES:${PN}:remove:p10bmc = "${monitor_datadir}/monitor.yaml"
+FILES:${PN}:append:p10bmc = " ${datadir}/phosphor-fan-presence/monitor/ibm,rainier-2u/config.json"
+FILES:${PN}:append:p10bmc = " ${datadir}/phosphor-fan-presence/monitor/ibm,rainier-4u/config.json"
+FILES:${PN}:append:p10bmc = " ${datadir}/phosphor-fan-presence/monitor/ibm,rainier-1s4u/config.json"
+FILES:${PN}:append:p10bmc = " ${datadir}/phosphor-fan-presence/monitor/ibm,everest/config.json"
diff --git a/meta-ibm/recipes-phosphor/fans/phosphor-fan-presence-config.bbappend b/meta-ibm/recipes-phosphor/fans/phosphor-fan-presence-config.bbappend
index 2306ee5..64dbc75 100644
--- a/meta-ibm/recipes-phosphor/fans/phosphor-fan-presence-config.bbappend
+++ b/meta-ibm/recipes-phosphor/fans/phosphor-fan-presence-config.bbappend
@@ -1,17 +1,17 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:"
 
-SRC_URI_witherspoon = "file://config.json"
-SRC_URI_p10bmc = "file://rainier-2u/config.json \
+SRC_URI:witherspoon = "file://config.json"
+SRC_URI:p10bmc = "file://rainier-2u/config.json \
                    file://rainier-4u/config.json \
                    file://rainier-1s4u/config.json \
                    file://everest/config.json \
                    "
 
-do_install_witherspoon() {
+do_install:witherspoon() {
         install -d ${D}/${datadir}/phosphor-fan-presence/presence/
         install -m 0644 ${WORKDIR}/config.json ${D}/${datadir}/phosphor-fan-presence/presence/
 }
-do_install_p10bmc() {
+do_install:p10bmc() {
         # Install Rainier-2U/4U fan presence config files
         install -d ${D}/${datadir}/phosphor-fan-presence/presence/ibm,rainier-2u/
         install -d ${D}/${datadir}/phosphor-fan-presence/presence/ibm,rainier-4u/
@@ -25,11 +25,11 @@
         install -m 0644 ${WORKDIR}/everest/config.json ${D}/${datadir}/phosphor-fan-presence/presence/ibm,everest/
 }
 
-FILES_${PN}_append_witherspoon = " ${datadir}/phosphor-fan-presence/presence/config.json"
-FILES_${PN}_remove_witherspoon = "${presence_datadir}/config.yaml"
+FILES:${PN}:append:witherspoon = " ${datadir}/phosphor-fan-presence/presence/config.json"
+FILES:${PN}:remove:witherspoon = "${presence_datadir}/config.yaml"
 
-FILES_${PN}_remove_p10bmc = "${presence_datadir}/config.yaml"
-FILES_${PN}_append_p10bmc = " ${datadir}/phosphor-fan-presence/presence/ibm,rainier-2u/config.json"
-FILES_${PN}_append_p10bmc = " ${datadir}/phosphor-fan-presence/presence/ibm,rainier-4u/config.json"
-FILES_${PN}_append_p10bmc = " ${datadir}/phosphor-fan-presence/presence/ibm,rainier-1s4u/config.json"
-FILES_${PN}_append_p10bmc = " ${datadir}/phosphor-fan-presence/presence/ibm,everest/config.json"
+FILES:${PN}:remove:p10bmc = "${presence_datadir}/config.yaml"
+FILES:${PN}:append:p10bmc = " ${datadir}/phosphor-fan-presence/presence/ibm,rainier-2u/config.json"
+FILES:${PN}:append:p10bmc = " ${datadir}/phosphor-fan-presence/presence/ibm,rainier-4u/config.json"
+FILES:${PN}:append:p10bmc = " ${datadir}/phosphor-fan-presence/presence/ibm,rainier-1s4u/config.json"
+FILES:${PN}:append:p10bmc = " ${datadir}/phosphor-fan-presence/presence/ibm,everest/config.json"
diff --git a/meta-ibm/recipes-phosphor/fans/phosphor-fan_%.bbappend b/meta-ibm/recipes-phosphor/fans/phosphor-fan_%.bbappend
index 0d8b3b8..8b4e91e 100644
--- a/meta-ibm/recipes-phosphor/fans/phosphor-fan_%.bbappend
+++ b/meta-ibm/recipes-phosphor/fans/phosphor-fan_%.bbappend
@@ -1,74 +1,74 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:"
 
 # Package configuration
-FAN_PACKAGES_append_ibm-ac-server = " \
+FAN_PACKAGES:append:ibm-ac-server = " \
         phosphor-cooling-type \
         "
 
-FAN_PACKAGES_append_mihawk = " \
+FAN_PACKAGES:append:mihawk = " \
         phosphor-cooling-type \
         "
 
-PACKAGECONFIG_append_ibm-ac-server = " cooling-type"
-PACKAGECONFIG_append_mihawk = " cooling-type"
+PACKAGECONFIG:append:ibm-ac-server = " cooling-type"
+PACKAGECONFIG:append:mihawk = " cooling-type"
 
 TMPL_COOLING = "phosphor-cooling-type@.service"
 INSTFMT_COOLING = "phosphor-cooling-type@{0}.service"
 MULTI_USR_TGT = "multi-user.target"
 FMT_COOLING = "../${TMPL_COOLING}:${MULTI_USR_TGT}.requires/${INSTFMT_COOLING}"
 
-FILES_phosphor-cooling-type_append_ibm-ac-server = " ${bindir}/phosphor-cooling-type"
-SYSTEMD_SERVICE_phosphor-cooling-type_append_ibm-ac-server = " ${TMPL_COOLING}"
-SYSTEMD_LINK_phosphor-cooling-type_append_ibm-ac-server = " ${@compose_list(d, 'FMT_COOLING', 'OBMC_CHASSIS_INSTANCES')}"
-FILES_phosphor-cooling-type_append_mihawk = " ${bindir}/phosphor-cooling-type"
-SYSTEMD_SERVICE_phosphor-cooling-type_append_mihawk = " ${TMPL_COOLING}"
-SYSTEMD_LINK_phosphor-cooling-type_append_mihawk = " ${@compose_list(d, 'FMT_COOLING', 'OBMC_CHASSIS_INSTANCES')}"
+FILES:phosphor-cooling-type:append:ibm-ac-server = " ${bindir}/phosphor-cooling-type"
+SYSTEMD_SERVICE:phosphor-cooling-type:append:ibm-ac-server = " ${TMPL_COOLING}"
+SYSTEMD_LINK_phosphor-cooling-type:append:ibm-ac-server = " ${@compose_list(d, 'FMT_COOLING', 'OBMC_CHASSIS_INSTANCES')}"
+FILES:phosphor-cooling-type:append:mihawk = " ${bindir}/phosphor-cooling-type"
+SYSTEMD_SERVICE:phosphor-cooling-type:append:mihawk = " ${TMPL_COOLING}"
+SYSTEMD_LINK_phosphor-cooling-type:append:mihawk = " ${@compose_list(d, 'FMT_COOLING', 'OBMC_CHASSIS_INSTANCES')}"
 
 COOLING_ENV_FMT = "obmc/phosphor-fan/phosphor-cooling-type-{0}.conf"
 
-SYSTEMD_ENVIRONMENT_FILE_phosphor-cooling-type_append_ibm-ac-server = " ${@compose_list(d, 'COOLING_ENV_FMT', 'OBMC_CHASSIS_INSTANCES')}"
-SYSTEMD_ENVIRONMENT_FILE_phosphor-cooling-type_append_mihawk = " ${@compose_list(d, 'COOLING_ENV_FMT', 'OBMC_CHASSIS_INSTANCES')}"
+SYSTEMD_ENVIRONMENT_FILE_phosphor-cooling-type:append:ibm-ac-server = " ${@compose_list(d, 'COOLING_ENV_FMT', 'OBMC_CHASSIS_INSTANCES')}"
+SYSTEMD_ENVIRONMENT_FILE_phosphor-cooling-type:append:mihawk = " ${@compose_list(d, 'COOLING_ENV_FMT', 'OBMC_CHASSIS_INSTANCES')}"
 
 #These services are protected by the watchdog
-SYSTEMD_OVERRIDE_phosphor-fan-control_witherspoon += "fan-watchdog-monitor.conf:phosphor-fan-control-init@0.service.d/fan-watchdog-monitor.conf"
-SYSTEMD_OVERRIDE_phosphor-fan-control_witherspoon += "fan-watchdog-monitor.conf:phosphor-fan-control@0.service.d/fan-watchdog-monitor.conf"
-SYSTEMD_OVERRIDE_phosphor-fan-monitor_witherspoon += "fan-watchdog-monitor.conf:phosphor-fan-monitor-init@0.service.d/fan-watchdog-monitor.conf"
-SYSTEMD_OVERRIDE_phosphor-fan-monitor_witherspoon += "fan-watchdog-monitor.conf:phosphor-fan-monitor@0.service.d/fan-watchdog-monitor.conf"
-SYSTEMD_OVERRIDE_phosphor-fan-control_p10bmc += "fan-watchdog-monitor.conf:phosphor-fan-control-init@0.service.d/fan-watchdog-monitor.conf"
-SYSTEMD_OVERRIDE_phosphor-fan-control_p10bmc += "fan-watchdog-monitor.conf:phosphor-fan-control@0.service.d/fan-watchdog-monitor.conf"
-SYSTEMD_OVERRIDE_phosphor-fan-monitor_p10bmc += "fan-watchdog-monitor.conf:phosphor-fan-monitor-init@0.service.d/fan-watchdog-monitor.conf"
-SYSTEMD_OVERRIDE_phosphor-fan-monitor_p10bmc += "fan-watchdog-monitor.conf:phosphor-fan-monitor@0.service.d/fan-watchdog-monitor.conf"
+SYSTEMD_OVERRIDE_phosphor-fan-control:witherspoon += "fan-watchdog-monitor.conf:phosphor-fan-control-init@0.service.d/fan-watchdog-monitor.conf"
+SYSTEMD_OVERRIDE_phosphor-fan-control:witherspoon += "fan-watchdog-monitor.conf:phosphor-fan-control@0.service.d/fan-watchdog-monitor.conf"
+SYSTEMD_OVERRIDE_phosphor-fan-monitor:witherspoon += "fan-watchdog-monitor.conf:phosphor-fan-monitor-init@0.service.d/fan-watchdog-monitor.conf"
+SYSTEMD_OVERRIDE_phosphor-fan-monitor:witherspoon += "fan-watchdog-monitor.conf:phosphor-fan-monitor@0.service.d/fan-watchdog-monitor.conf"
+SYSTEMD_OVERRIDE_phosphor-fan-control:p10bmc += "fan-watchdog-monitor.conf:phosphor-fan-control-init@0.service.d/fan-watchdog-monitor.conf"
+SYSTEMD_OVERRIDE_phosphor-fan-control:p10bmc += "fan-watchdog-monitor.conf:phosphor-fan-control@0.service.d/fan-watchdog-monitor.conf"
+SYSTEMD_OVERRIDE_phosphor-fan-monitor:p10bmc += "fan-watchdog-monitor.conf:phosphor-fan-monitor-init@0.service.d/fan-watchdog-monitor.conf"
+SYSTEMD_OVERRIDE_phosphor-fan-monitor:p10bmc += "fan-watchdog-monitor.conf:phosphor-fan-monitor@0.service.d/fan-watchdog-monitor.conf"
 
 #These services need to be stopped when watchdog expires
-SYSTEMD_OVERRIDE_phosphor-fan-control_witherspoon += "fan-watchdog-conflicts.conf:phosphor-fan-control@0.service.d/fan-watchdog-conflicts.conf"
-SYSTEMD_OVERRIDE_phosphor-fan-monitor_witherspoon += "fan-watchdog-conflicts.conf:phosphor-fan-monitor@0.service.d/fan-watchdog-conflicts.conf"
-SYSTEMD_OVERRIDE_phosphor-fan-control_p10bmc += "fan-watchdog-conflicts.conf:phosphor-fan-control@0.service.d/fan-watchdog-conflicts.conf"
-SYSTEMD_OVERRIDE_phosphor-fan-monitor_p10bmc += "fan-watchdog-conflicts.conf:phosphor-fan-monitor@0.service.d/fan-watchdog-conflicts.conf"
+SYSTEMD_OVERRIDE_phosphor-fan-control:witherspoon += "fan-watchdog-conflicts.conf:phosphor-fan-control@0.service.d/fan-watchdog-conflicts.conf"
+SYSTEMD_OVERRIDE_phosphor-fan-monitor:witherspoon += "fan-watchdog-conflicts.conf:phosphor-fan-monitor@0.service.d/fan-watchdog-conflicts.conf"
+SYSTEMD_OVERRIDE_phosphor-fan-control:p10bmc += "fan-watchdog-conflicts.conf:phosphor-fan-control@0.service.d/fan-watchdog-conflicts.conf"
+SYSTEMD_OVERRIDE_phosphor-fan-monitor:p10bmc += "fan-watchdog-conflicts.conf:phosphor-fan-monitor@0.service.d/fan-watchdog-conflicts.conf"
 
 # Witherspoon fan control service linking
 # Link fan control init service
-SYSTEMD_SERVICE_${PN}-control_witherspoon += "${TMPL_CONTROL} ${TMPL_CONTROL_INIT}"
-SYSTEMD_LINK_${PN}-control_witherspoon += "${@compose_list(d, 'FMT_CONTROL_INIT', 'OBMC_CHASSIS_INSTANCES')}"
+SYSTEMD_SERVICE:${PN}-control:witherspoon += "${TMPL_CONTROL} ${TMPL_CONTROL_INIT}"
+SYSTEMD_LINK_${PN}-control:witherspoon += "${@compose_list(d, 'FMT_CONTROL_INIT', 'OBMC_CHASSIS_INSTANCES')}"
 # Link fan control service to be started at standby
-FMT_CONTROL_STDBY_witherspoon = "../${TMPL_CONTROL}:${MULTI_USR_TGT}.wants/${INSTFMT_CONTROL}"
-SYSTEMD_LINK_${PN}-control_witherspoon += "${@compose_list(d, 'FMT_CONTROL_STDBY', 'OBMC_CHASSIS_INSTANCES')}"
+FMT_CONTROL_STDBY:witherspoon = "../${TMPL_CONTROL}:${MULTI_USR_TGT}.wants/${INSTFMT_CONTROL}"
+SYSTEMD_LINK_${PN}-control:witherspoon += "${@compose_list(d, 'FMT_CONTROL_STDBY', 'OBMC_CHASSIS_INSTANCES')}"
 # Link fan control service to also start at poweron
-FMT_CONTROL_PWRON_witherspoon = "../${TMPL_CONTROL}:${POWERON_TGT}.requires/${INSTFMT_CONTROL}"
-SYSTEMD_LINK_${PN}-control_witherspoon += "${@compose_list(d, 'FMT_CONTROL_PWRON', 'OBMC_CHASSIS_INSTANCES')}"
+FMT_CONTROL_PWRON:witherspoon = "../${TMPL_CONTROL}:${POWERON_TGT}.requires/${INSTFMT_CONTROL}"
+SYSTEMD_LINK_${PN}-control:witherspoon += "${@compose_list(d, 'FMT_CONTROL_PWRON', 'OBMC_CHASSIS_INSTANCES')}"
 
 # Enable the use of JSON on the fan applications that support it
-PACKAGECONFIG_append_witherspoon = " json"
-EXTRA_OECONF_append_witherspoon = " --disable-json-control"
-RDEPENDS_${PN}-presence-tach_append_witherspoon = " phosphor-fan-presence-config"
-RDEPENDS_${PN}-monitor_append_witherspoon = " phosphor-fan-monitor-config"
+PACKAGECONFIG:append:witherspoon = " json"
+EXTRA_OECONF:append:witherspoon = " --disable-json-control"
+RDEPENDS:${PN}-presence-tach:append:witherspoon = " phosphor-fan-presence-config"
+RDEPENDS:${PN}-monitor:append:witherspoon = " phosphor-fan-monitor-config"
 
-PACKAGECONFIG_append_p10bmc = " json sensor-monitor"
-FAN_PACKAGES_append_p10bmc = " sensor-monitor"
-RDEPENDS_${PN}-presence-tach_append_p10bmc = " phosphor-fan-presence-config"
-RDEPENDS_${PN}-monitor_append_p10bmc = " phosphor-fan-monitor-config"
+PACKAGECONFIG:append:p10bmc = " json sensor-monitor"
+FAN_PACKAGES:append:p10bmc = " sensor-monitor"
+RDEPENDS:${PN}-presence-tach:append:p10bmc = " phosphor-fan-presence-config"
+RDEPENDS:${PN}-monitor:append:p10bmc = " phosphor-fan-monitor-config"
 
 # Install fan control JSON config files
-SRC_URI_append_p10bmc = " \
+SRC_URI:append:p10bmc = " \
     file://manager.json \
     file://rainier/fans.json \
     file://rainier-1s4u/fans.json \
@@ -77,7 +77,7 @@
     file://rainier-1s4u/zones.json \
     file://everest/fans.json \
     file://everest/zones.json"
-do_install_append_p10bmc() {
+do_install:append:p10bmc() {
     # Install fan control manager config file
     install -d ${D}/${datadir}/phosphor-fan-presence/control/
     install -m 0644 ${WORKDIR}/manager.json ${D}/${datadir}/phosphor-fan-presence/control/
@@ -100,7 +100,7 @@
     install -m 0644 ${WORKDIR}/everest/fans.json ${D}/${datadir}/phosphor-fan-presence/control/ibm,everest/
     install -m 0644 ${WORKDIR}/everest/zones.json ${D}/${datadir}/phosphor-fan-presence/control/ibm,everest/
 }
-FILES_${PN}-control_append_p10bmc = " \
+FILES:${PN}-control:append:p10bmc = " \
     ${datadir}/phosphor-fan-presence/control/manager.json \
     ${datadir}/phosphor-fan-presence/control/ibm,rainier/fans.json \
     ${datadir}/phosphor-fan-presence/control/ibm,rainier-1s4u/fans.json \
@@ -112,5 +112,5 @@
 
 # Set the appropriate i2c address used within the overridden phosphor-fan-control@.service
 # file that's used for witherspoon type(including witherspoon-tacoma) machines
-SYSTEMD_SUBSTITUTIONS_witherspoon = "ADDR:100:phosphor-fan-control@.service"
-SYSTEMD_SUBSTITUTIONS_witherspoon-tacoma = "ADDR:200:phosphor-fan-control@.service"
+SYSTEMD_SUBSTITUTIONS:witherspoon = "ADDR:100:phosphor-fan-control@.service"
+SYSTEMD_SUBSTITUTIONS:witherspoon-tacoma = "ADDR:200:phosphor-fan-control@.service"
diff --git a/meta-ibm/recipes-phosphor/flash/openpower-software-manager_%.bbappend b/meta-ibm/recipes-phosphor/flash/openpower-software-manager_%.bbappend
index 6c1f275..2d9c096 100644
--- a/meta-ibm/recipes-phosphor/flash/openpower-software-manager_%.bbappend
+++ b/meta-ibm/recipes-phosphor/flash/openpower-software-manager_%.bbappend
@@ -1,2 +1,2 @@
-PACKAGECONFIG_append_ibm-ac-server = " verify_pnor_signature"
-PACKAGECONFIG_append_mihawk = " verify_pnor_signature"
+PACKAGECONFIG:append:ibm-ac-server = " verify_pnor_signature"
+PACKAGECONFIG:append:mihawk = " verify_pnor_signature"
diff --git a/meta-ibm/recipes-phosphor/flash/phosphor-software-manager_%.bbappend b/meta-ibm/recipes-phosphor/flash/phosphor-software-manager_%.bbappend
index a440b11..154b5c5 100644
--- a/meta-ibm/recipes-phosphor/flash/phosphor-software-manager_%.bbappend
+++ b/meta-ibm/recipes-phosphor/flash/phosphor-software-manager_%.bbappend
@@ -1,18 +1,18 @@
-BMC_RW_MTD_ibm-ac-server = "bmc"
-BMC_RW_MTD_p10bmc = "bmc"
-BMC_RW_MTD_mihawk = "bmc"
-BMC_RO_MTD_ibm-ac-server = "alt-bmc+bmc"
-BMC_RO_MTD_p10bmc = "bmc"
-BMC_RO_MTD_mihawk = "alt-bmc+bmc"
-BMC_KERNEL_MTD_ibm-ac-server = "bmc"
-BMC_KERNEL_MTD_p10bmc = "bmc"
-BMC_KERNEL_MTD_mihawk = "bmc"
+BMC_RW_MTD:ibm-ac-server = "bmc"
+BMC_RW_MTD:p10bmc = "bmc"
+BMC_RW_MTD:mihawk = "bmc"
+BMC_RO_MTD:ibm-ac-server = "alt-bmc+bmc"
+BMC_RO_MTD:p10bmc = "bmc"
+BMC_RO_MTD:mihawk = "alt-bmc+bmc"
+BMC_KERNEL_MTD:ibm-ac-server = "bmc"
+BMC_KERNEL_MTD:p10bmc = "bmc"
+BMC_KERNEL_MTD:mihawk = "bmc"
 
 # Enable signature verification
-PACKAGECONFIG_append_ibm-ac-server = " verify_signature"
-PACKAGECONFIG_append_p10bmc = " verify_signature"
-PACKAGECONFIG_append_mihawk = " verify_signature"
+PACKAGECONFIG:append:ibm-ac-server = " verify_signature"
+PACKAGECONFIG:append:p10bmc = " verify_signature"
+PACKAGECONFIG:append:mihawk = " verify_signature"
 
 # Enable sync of persistent files to the alternate BMC chip
-PACKAGECONFIG_append_ibm-ac-server = " sync_bmc_files"
-PACKAGECONFIG_append_mihawk = " sync_bmc_files"
+PACKAGECONFIG:append:ibm-ac-server = " sync_bmc_files"
+PACKAGECONFIG:append:mihawk = " sync_bmc_files"
diff --git a/meta-ibm/recipes-phosphor/gpio/id-button.bb b/meta-ibm/recipes-phosphor/gpio/id-button.bb
index 386a2b9..01df2ea 100644
--- a/meta-ibm/recipes-phosphor/gpio/id-button.bb
+++ b/meta-ibm/recipes-phosphor/gpio/id-button.bb
@@ -6,7 +6,7 @@
 inherit obmc-phosphor-systemd
 
 DEPENDS += "virtual/obmc-gpio-monitor"
-RDEPENDS_${PN} += "virtual/obmc-gpio-monitor"
+RDEPENDS:${PN} += "virtual/obmc-gpio-monitor"
 
 S = "${WORKDIR}"
 SRC_URI += "file://toggle_identify_led.sh"
@@ -26,5 +26,5 @@
 TGT = "multi-user.target"
 FMT = "../${TMPL}:${TGT}.requires/${INSTFMT}"
 
-SYSTEMD_SERVICE_${PN} += "id-button-pressed.service"
+SYSTEMD_SERVICE:${PN} += "id-button-pressed.service"
 SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT', 'ID_BUTTON_SERVICE')}"
diff --git a/meta-ibm/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend b/meta-ibm/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend
index 995dca3..272a8a1 100644
--- a/meta-ibm/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend
+++ b/meta-ibm/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend
@@ -1,14 +1,14 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
 TMPL_POWERSUPPLY = "phosphor-gpio-presence@.service"
 INSTFMT_POWERSUPPLY = "phosphor-gpio-presence@{0}.service"
 POWERSUPPLY_TGT = "multi-user.target"
 FMT_POWERSUPPLY = "../${TMPL_POWERSUPPLY}:${POWERSUPPLY_TGT}.wants/${INSTFMT_POWERSUPPLY}"
 
-SYSTEMD_LINK_${PN}-presence_append_ibm-ac-server = " ${@compose_list(d, 'FMT_POWERSUPPLY', 'OBMC_POWER_SUPPLY_INSTANCES')}"
-SYSTEMD_LINK_${PN}-presence_append_mihawk = " ${@compose_list(d, 'FMT_POWERSUPPLY', 'OBMC_POWER_SUPPLY_INSTANCES')}"
+SYSTEMD_LINK_${PN}-presence:append:ibm-ac-server = " ${@compose_list(d, 'FMT_POWERSUPPLY', 'OBMC_POWER_SUPPLY_INSTANCES')}"
+SYSTEMD_LINK_${PN}-presence:append:mihawk = " ${@compose_list(d, 'FMT_POWERSUPPLY', 'OBMC_POWER_SUPPLY_INSTANCES')}"
 
 POWERSUPPLY_ENV_FMT  = "obmc/gpio/phosphor-power-supply-{0}.conf"
 
-SYSTEMD_ENVIRONMENT_FILE_${PN}-presence_append_ibm-ac-server = " ${@compose_list(d, 'POWERSUPPLY_ENV_FMT', 'OBMC_POWER_SUPPLY_INSTANCES')}"
-SYSTEMD_ENVIRONMENT_FILE_${PN}-presence_append_mihawk = " ${@compose_list(d, 'POWERSUPPLY_ENV_FMT', 'OBMC_POWER_SUPPLY_INSTANCES')}"
+SYSTEMD_ENVIRONMENT_FILE_${PN}-presence:append:ibm-ac-server = " ${@compose_list(d, 'POWERSUPPLY_ENV_FMT', 'OBMC_POWER_SUPPLY_INSTANCES')}"
+SYSTEMD_ENVIRONMENT_FILE_${PN}-presence:append:mihawk = " ${@compose_list(d, 'POWERSUPPLY_ENV_FMT', 'OBMC_POWER_SUPPLY_INSTANCES')}"
diff --git a/meta-ibm/recipes-phosphor/host/p9-host-start.bbappend b/meta-ibm/recipes-phosphor/host/p9-host-start.bbappend
index 9ceffea..ac33cc6 100644
--- a/meta-ibm/recipes-phosphor/host/p9-host-start.bbappend
+++ b/meta-ibm/recipes-phosphor/host/p9-host-start.bbappend
@@ -1,5 +1,5 @@
-RDEPENDS_${PN}_append_ibm-ac-server = " avsbus-control"
-RDEPENDS_${PN}_append_witherspoon = " vrm-control"
-RDEPENDS_${PN}_append_ibm-ac-server = " power-workarounds"
-RDEPENDS_${PN}_append_mihawk = " avsbus-control"
-RDEPENDS_${PN}_append_mihawk = " vrm-control"
+RDEPENDS:${PN}:append:ibm-ac-server = " avsbus-control"
+RDEPENDS:${PN}:append:witherspoon = " vrm-control"
+RDEPENDS:${PN}:append:ibm-ac-server = " power-workarounds"
+RDEPENDS:${PN}:append:mihawk = " avsbus-control"
+RDEPENDS:${PN}:append:mihawk = " vrm-control"
diff --git a/meta-ibm/recipes-phosphor/host/phosphor-host-postd_%.bbappend b/meta-ibm/recipes-phosphor/host/phosphor-host-postd_%.bbappend
index 5ac5e59..ac06427 100644
--- a/meta-ibm/recipes-phosphor/host/phosphor-host-postd_%.bbappend
+++ b/meta-ibm/recipes-phosphor/host/phosphor-host-postd_%.bbappend
@@ -1,2 +1,2 @@
-SNOOP_DEVICE_witherspoon-tacoma = ""
-SNOOP_DEVICE_p10bmc = ""
+SNOOP_DEVICE:witherspoon-tacoma = ""
+SNOOP_DEVICE:p10bmc = ""
diff --git a/meta-ibm/recipes-phosphor/images/obmc-phosphor-image.bbappend b/meta-ibm/recipes-phosphor/images/obmc-phosphor-image.bbappend
index 05fc303..36c6312 100644
--- a/meta-ibm/recipes-phosphor/images/obmc-phosphor-image.bbappend
+++ b/meta-ibm/recipes-phosphor/images/obmc-phosphor-image.bbappend
@@ -1,10 +1,10 @@
-OBMC_IMAGE_EXTRA_INSTALL_append_ibm-ac-server = " mboxd max31785-msl phosphor-msl-verify liberation-fonts uart-render-controller first-boot-set-hostname"
-OBMC_IMAGE_EXTRA_INSTALL_append_p10bmc = " mboxd ibmtpm2tss"
-OBMC_IMAGE_EXTRA_INSTALL_append_witherspoon-tacoma = " ibmtpm2tss"
-OBMC_IMAGE_EXTRA_INSTALL_append_mihawk = " mboxd liberation-fonts uart-render-controller "
+OBMC_IMAGE_EXTRA_INSTALL:append:ibm-ac-server = " mboxd max31785-msl phosphor-msl-verify liberation-fonts uart-render-controller first-boot-set-hostname"
+OBMC_IMAGE_EXTRA_INSTALL:append:p10bmc = " mboxd ibmtpm2tss"
+OBMC_IMAGE_EXTRA_INSTALL:append:witherspoon-tacoma = " ibmtpm2tss"
+OBMC_IMAGE_EXTRA_INSTALL:append:mihawk = " mboxd liberation-fonts uart-render-controller "
 
 # remove so things fit in available flash space
-IMAGE_FEATURES_remove_witherspoon = "obmc-user-mgmt-ldap"
+IMAGE_FEATURES:remove:witherspoon = "obmc-user-mgmt-ldap"
 
 # Optionally configure IBM service accounts
 #
@@ -58,7 +58,7 @@
   "
 
 # This is recipe specific to ensure it takes effect.
-EXTRA_USERS_PARAMS_pn-obmc-phosphor-image += "${@bb.utils.contains('DISTRO_FEATURES', 'ibm-service-account-policy', "${IBM_EXTRA_USERS_PARAMS}", '', d)}"
+EXTRA_USERS_PARAMS:pn-obmc-phosphor-image += "${@bb.utils.contains('DISTRO_FEATURES', 'ibm-service-account-policy', "${IBM_EXTRA_USERS_PARAMS}", '', d)}"
 
 # The service account needs sudo.
-IMAGE_INSTALL_append = " ${@bb.utils.contains('DISTRO_FEATURES', 'ibm-service-account-policy', 'sudo', '', d)}"
+IMAGE_INSTALL:append = " ${@bb.utils.contains('DISTRO_FEATURES', 'ibm-service-account-policy', 'sudo', '', d)}"
diff --git a/meta-ibm/recipes-phosphor/interfaces/bmcweb_%.bbappend b/meta-ibm/recipes-phosphor/interfaces/bmcweb_%.bbappend
index a45f048..659eafd 100644
--- a/meta-ibm/recipes-phosphor/interfaces/bmcweb_%.bbappend
+++ b/meta-ibm/recipes-phosphor/interfaces/bmcweb_%.bbappend
@@ -1,4 +1,4 @@
-EXTRA_OEMESON_append = " \
+EXTRA_OEMESON:append = " \
     -Dinsecure-tftp-update=enabled \
     -Dibm-management-console=enabled \
 "
diff --git a/meta-ibm/recipes-phosphor/inventory/inventory-cleanup.bb b/meta-ibm/recipes-phosphor/inventory/inventory-cleanup.bb
index 0c4b56f..1b5a119 100644
--- a/meta-ibm/recipes-phosphor/inventory/inventory-cleanup.bb
+++ b/meta-ibm/recipes-phosphor/inventory/inventory-cleanup.bb
@@ -14,4 +14,4 @@
         install -D inventory-cleanup.yaml ${D}${base_datadir}/events.d/inventory-cleanup.yaml
 }
 
-FILES_${PN} += "${base_datadir}/events.d/inventory-cleanup.yaml"
+FILES:${PN} += "${base_datadir}/events.d/inventory-cleanup.yaml"
diff --git a/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager_%.bbappend b/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager_%.bbappend
index 607546b..16cb426 100644
--- a/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager_%.bbappend
+++ b/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager_%.bbappend
@@ -1,21 +1,21 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-PACKAGECONFIG_append_ibm-ac-server = " associations"
-SRC_URI_append_ibm-ac-server = " file://associations.json"
-DEPENDS_append_ibm-ac-server = " inventory-cleanup"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
+PACKAGECONFIG:append:ibm-ac-server = " associations"
+SRC_URI:append:ibm-ac-server = " file://associations.json"
+DEPENDS:append:ibm-ac-server = " inventory-cleanup"
 
-PACKAGECONFIG_append_p10bmc = " associations"
-SRC_URI_append_p10bmc = " \
+PACKAGECONFIG:append:p10bmc = " associations"
+SRC_URI:append:p10bmc = " \
     file://ibm,rainier-2u_associations.json \
     file://ibm,rainier-4u_associations.json \
     file://ibm,everest_associations.json \
     "
 
-do_install_append_ibm-ac-server() {
+do_install:append:ibm-ac-server() {
     install -d ${D}${base_datadir}
     install -m 0755 ${WORKDIR}/associations.json ${D}${base_datadir}/associations.json
 }
 
-do_install_append_p10bmc() {
+do_install:append:p10bmc() {
     install -d ${D}${base_datadir}
     install -m 0755 ${WORKDIR}/ibm,rainier-2u_associations.json ${D}${base_datadir}/ibm,rainier-2u_associations.json
     install -m 0755 ${WORKDIR}/ibm,rainier-4u_associations.json ${D}${base_datadir}/ibm,rainier-4u_associations.json
diff --git a/meta-ibm/recipes-phosphor/ipmi/openpower-ipmi-oem_%.bbappend b/meta-ibm/recipes-phosphor/ipmi/openpower-ipmi-oem_%.bbappend
index fd27f7d..986c2ca 100644
--- a/meta-ibm/recipes-phosphor/ipmi/openpower-ipmi-oem_%.bbappend
+++ b/meta-ibm/recipes-phosphor/ipmi/openpower-ipmi-oem_%.bbappend
@@ -1,9 +1,9 @@
-DEPENDS_append_ibm-ac-server = " acx22-yaml-config"
-DEPENDS_append_mihawk = " acx22-yaml-config"
+DEPENDS:append:ibm-ac-server = " acx22-yaml-config"
+DEPENDS:append:mihawk = " acx22-yaml-config"
 
-EXTRA_OECONF_ibm-ac-server = " \
+EXTRA_OECONF:ibm-ac-server = " \
     INVSENSOR_YAML_GEN=${STAGING_DIR_HOST}${datadir}/acx22-yaml-config/ipmi-inventory-sensors.yaml \
     "
-EXTRA_OECONF_mihawk = " \
+EXTRA_OECONF:mihawk = " \
     INVSENSOR_YAML_GEN=${STAGING_DIR_HOST}${datadir}/acx22-yaml-config/ipmi-inventory-sensors.yaml \
     "
\ No newline at end of file
diff --git a/meta-ibm/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend b/meta-ibm/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend
index 7898a10..d490c08 100644
--- a/meta-ibm/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend
+++ b/meta-ibm/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend
@@ -1,4 +1,4 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
 # Calculate the auxiliary firmware revision to be updated in the dev_id.json
 # file. It is calculated from the VERSION_ID field which currently has two
@@ -16,7 +16,7 @@
 unset do_patch[noexec]
 do_patch[depends] = "os-release:do_populate_sysroot"
 
-python do_patch_ibm-ac-server() {
+python do_patch:ibm-ac-server() {
     import json
     import re
     from shutil import copyfile
diff --git a/meta-ibm/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend b/meta-ibm/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend
index 6efe241..30245d3 100644
--- a/meta-ibm/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend
+++ b/meta-ibm/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend
@@ -1,11 +1,11 @@
-DEPENDS_append_ibm-ac-server = " acx22-yaml-config"
-DEPENDS_append_mihawk = " acx22-yaml-config"
+DEPENDS:append:ibm-ac-server = " acx22-yaml-config"
+DEPENDS:append:mihawk = " acx22-yaml-config"
 
-EXTRA_OECONF_ibm-ac-server = " \
+EXTRA_OECONF:ibm-ac-server = " \
     YAML_GEN=${STAGING_DIR_HOST}${datadir}/acx22-yaml-config/ipmi-fru-read.yaml \
     PROP_YAML=${STAGING_DIR_HOST}${datadir}/acx22-yaml-config/ipmi-extra-properties.yaml \
     "
-EXTRA_OECONF_mihawk = " \
+EXTRA_OECONF:mihawk = " \
     YAML_GEN=${STAGING_DIR_HOST}${datadir}/acx22-yaml-config/ipmi-fru-read.yaml \
     PROP_YAML=${STAGING_DIR_HOST}${datadir}/acx22-yaml-config/ipmi-extra-properties.yaml \
     "
diff --git a/meta-ibm/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend b/meta-ibm/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend
index 8d51478..38fbd71 100644
--- a/meta-ibm/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend
+++ b/meta-ibm/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend
@@ -1,12 +1,12 @@
-DEPENDS_append_ibm-ac-server = " acx22-yaml-config"
-DEPENDS_append_mihawk = " acx22-yaml-config"
+DEPENDS:append:ibm-ac-server = " acx22-yaml-config"
+DEPENDS:append:mihawk = " acx22-yaml-config"
 
-EXTRA_OECONF_ibm-ac-server = " \
+EXTRA_OECONF:ibm-ac-server = " \
     SENSOR_YAML_GEN=${STAGING_DIR_HOST}${datadir}/acx22-yaml-config/ipmi-sensors.yaml \
     INVSENSOR_YAML_GEN=${STAGING_DIR_HOST}${datadir}/acx22-yaml-config/ipmi-inventory-sensors.yaml \
     FRU_YAML_GEN=${STAGING_DIR_HOST}${datadir}/acx22-yaml-config/ipmi-fru-read.yaml \
     "
-EXTRA_OECONF_mihawk = " \
+EXTRA_OECONF:mihawk = " \
     SENSOR_YAML_GEN=${STAGING_DIR_HOST}${datadir}/acx22-yaml-config/ipmi-sensors.yaml \
     INVSENSOR_YAML_GEN=${STAGING_DIR_HOST}${datadir}/acx22-yaml-config/ipmi-inventory-sensors.yaml \
     FRU_YAML_GEN=${STAGING_DIR_HOST}${datadir}/acx22-yaml-config/ipmi-fru-read.yaml \
diff --git a/meta-ibm/recipes-phosphor/ipmi/phosphor-ipmi-net_%.bbappend b/meta-ibm/recipes-phosphor/ipmi/phosphor-ipmi-net_%.bbappend
index c847c05..a157e0d 100644
--- a/meta-ibm/recipes-phosphor/ipmi/phosphor-ipmi-net_%.bbappend
+++ b/meta-ibm/recipes-phosphor/ipmi/phosphor-ipmi-net_%.bbappend
@@ -1,5 +1,5 @@
-ALT_RMCPP_IFACE_mihawk  = "eth1"
-SYSTEMD_SERVICE_${PN}_append_mihawk += " \
+ALT_RMCPP_IFACE:mihawk  = "eth1"
+SYSTEMD_SERVICE:${PN}:append:mihawk += " \
     ${PN}@${ALT_RMCPP_IFACE}.service \
     ${PN}@${ALT_RMCPP_IFACE}.socket \
     "
diff --git a/meta-ibm/recipes-phosphor/ipmi/wistron-ipmi-oem_git.bb b/meta-ibm/recipes-phosphor/ipmi/wistron-ipmi-oem_git.bb
index 8ee9e33..e72755d 100644
--- a/meta-ibm/recipes-phosphor/ipmi/wistron-ipmi-oem_git.bb
+++ b/meta-ibm/recipes-phosphor/ipmi/wistron-ipmi-oem_git.bb
@@ -16,8 +16,8 @@
 SRC_URI = "git://github.com/openbmc/wistron-ipmi-oem"
 SRCREV = "ba89a1ea570cb010c2e929ac11ada3714878ca7d"
 
-FILES_${PN}_append = " ${libdir}/ipmid-providers/lib*${SOLIBS}"
-FILES_${PN}_append = " ${libdir}/host-ipmid/lib*${SOLIBS}"
-FILES_${PN}-dev_append = " ${libdir}/ipmid-providers/lib*${SOLIBSDEV} ${libdir}/ipmid-providers/*.la"
+FILES:${PN}:append = " ${libdir}/ipmid-providers/lib*${SOLIBS}"
+FILES:${PN}:append = " ${libdir}/host-ipmid/lib*${SOLIBS}"
+FILES:${PN}-dev:append = " ${libdir}/ipmid-providers/lib*${SOLIBSDEV} ${libdir}/ipmid-providers/*.la"
 
 HOSTIPMI_PROVIDER_LIBRARY += "libwistronoem.so"
diff --git a/meta-ibm/recipes-phosphor/leds/phosphor-led-manager_%.bbappend b/meta-ibm/recipes-phosphor/leds/phosphor-led-manager_%.bbappend
index 96a97b0..57fb62b 100644
--- a/meta-ibm/recipes-phosphor/leds/phosphor-led-manager_%.bbappend
+++ b/meta-ibm/recipes-phosphor/leds/phosphor-led-manager_%.bbappend
@@ -1,19 +1,19 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
-SYSTEMD_SERVICE_${PN}_append_p10bmc += "obmc-led-set-all-groups-asserted@.service obmc-led-create-virtual-leds@.service"
+SYSTEMD_SERVICE:${PN}:append:p10bmc += "obmc-led-set-all-groups-asserted@.service obmc-led-create-virtual-leds@.service"
 
 # Copies config file having arguments for led-set-all-groups-asserted.sh
-SYSTEMD_ENVIRONMENT_FILE_${PN}_append_p10bmc +="obmc/led/set-all/groups/config"
+SYSTEMD_ENVIRONMENT_FILE_${PN}:append:p10bmc +="obmc/led/set-all/groups/config"
 
 # Use the JSON configuration file at runtime than the static led.yaml
 # Also, enable Lamp Test and OperationalStatus monitor feature for
 # p10bmc systems
-PACKAGECONFIG_append_p10bmc = " use-json use-lamp-test monitor-operational-status"
+PACKAGECONFIG:append:p10bmc = " use-json use-lamp-test monitor-operational-status"
 
 # Install the lamp test override file for p10bmc
-SRC_URI_append_p10bmc = " file://lamp-test-led-overrides.json"
+SRC_URI:append:p10bmc = " file://lamp-test-led-overrides.json"
 
-pkg_postinst_${PN}_p10bmc () {
+pkg_postinst:${PN}:p10bmc () {
 
     # Needed this to run as part of BMC boot
     mkdir -p $D$systemd_system_unitdir/multi-user.target.wants
@@ -40,7 +40,7 @@
     ln -s $TARGET_ID $LINK_ID
 }
 
-pkg_prerm_${PN}_p10bmc () {
+pkg_prerm:${PN}:p10bmc () {
 
     LINK="$D$systemd_system_unitdir/multi-user.target.wants/obmc-led-set-all-groups-asserted@false.service"
     rm $LINK
@@ -56,7 +56,7 @@
 }
 
 # Install lamp test override json
-do_install_append_p10bmc() {
+do_install:append:p10bmc() {
     install -d ${D}${datadir}/${BPN}/
     install -m 0644 ${WORKDIR}/lamp-test-led-overrides.json ${D}${datadir}/${BPN}/
 }
diff --git a/meta-ibm/recipes-phosphor/logging/ibm-logging_git.bb b/meta-ibm/recipes-phosphor/logging/ibm-logging_git.bb
index 3163c07..d2efcda 100644
--- a/meta-ibm/recipes-phosphor/logging/ibm-logging_git.bb
+++ b/meta-ibm/recipes-phosphor/logging/ibm-logging_git.bb
@@ -31,8 +31,8 @@
 PACKAGECONFIG ??= ""
 PACKAGECONFIG[policy-interface] = "--enable-policy-interface, --disable-policy-interface,,"
 
-PACKAGECONFIG_ibm-ac-server = "policy-interface"
-PACKAGECONFIG_mihawk = "policy-interface"
+PACKAGECONFIG:ibm-ac-server = "policy-interface"
+PACKAGECONFIG:mihawk = "policy-interface"
 
 SERVICE = "com.ibm.Logging.service"
 DBUS_SERVICE_${PN} += "${SERVICE}"
@@ -43,7 +43,7 @@
 LOG_FMT = "../${SERVICE}:xyz.openbmc_project.Logging.service.wants/${SERVICE}"
 SYSTEMD_LINK_${PN} += "${LOG_FMT}"
 
-do_install_append(){
+do_install:append(){
 
     install -d ${D}${datadir}/ibm-logging
 
diff --git a/meta-ibm/recipes-phosphor/logging/phosphor-logging_%.bbappend b/meta-ibm/recipes-phosphor/logging/phosphor-logging_%.bbappend
index 0171482..3614174 100644
--- a/meta-ibm/recipes-phosphor/logging/phosphor-logging_%.bbappend
+++ b/meta-ibm/recipes-phosphor/logging/phosphor-logging_%.bbappend
@@ -1,20 +1,20 @@
-PACKAGECONFIG_append_witherspoon-tacoma = " openpower-pels"
-PACKAGECONFIG_append_p10bmc = " openpower-pels"
+PACKAGECONFIG:append:witherspoon-tacoma = " openpower-pels"
+PACKAGECONFIG:append:p10bmc = " openpower-pels"
 
-FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:"
 
-SRC_URI_append_p10bmc = " file://ibm,rainier-2u_dev_callouts.json"
-SRC_URI_append_p10bmc = " file://ibm,rainier-4u_dev_callouts.json"
-SRC_URI_append_p10bmc = " file://ibm,everest_dev_callouts.json"
-FILES_${PN}_append_p10bmc = " ${datadir}/phosphor-logging/pels/ibm,rainier-2u_dev_callouts.json"
-FILES_${PN}_append_p10bmc = " ${datadir}/phosphor-logging/pels/ibm,rainier-4u_dev_callouts.json"
-FILES_${PN}_append_p10bmc = " ${datadir}/phosphor-logging/pels/ibm,everest_dev_callouts.json"
+SRC_URI:append:p10bmc = " file://ibm,rainier-2u_dev_callouts.json"
+SRC_URI:append:p10bmc = " file://ibm,rainier-4u_dev_callouts.json"
+SRC_URI:append:p10bmc = " file://ibm,everest_dev_callouts.json"
+FILES:${PN}:append:p10bmc = " ${datadir}/phosphor-logging/pels/ibm,rainier-2u_dev_callouts.json"
+FILES:${PN}:append:p10bmc = " ${datadir}/phosphor-logging/pels/ibm,rainier-4u_dev_callouts.json"
+FILES:${PN}:append:p10bmc = " ${datadir}/phosphor-logging/pels/ibm,everest_dev_callouts.json"
 
 #Enable phal feature, if available.
-PACKAGECONFIG_append = " ${@bb.utils.filter('OBMC_MACHINE_FEATURES', 'phal', d)}"
+PACKAGECONFIG:append = " ${@bb.utils.filter('OBMC_MACHINE_FEATURES', 'phal', d)}"
 PACKAGECONFIG[phal] = "-Dphal=enabled, -Dphal=disabled, pdata libekb pdbg"
 
-do_install_append_p10bmc() {
+do_install:append:p10bmc() {
     install -d ${D}/${datadir}/phosphor-logging/pels
     install -m 0644 ${WORKDIR}/ibm,rainier-2u_dev_callouts.json ${D}/${datadir}/phosphor-logging/pels/ibm,rainier-2u_dev_callouts.json
     install -m 0644 ${WORKDIR}/ibm,rainier-4u_dev_callouts.json ${D}/${datadir}/phosphor-logging/pels/ibm,rainier-4u_dev_callouts.json
diff --git a/meta-ibm/recipes-phosphor/mboxd/mboxd_%.bbappend b/meta-ibm/recipes-phosphor/mboxd/mboxd_%.bbappend
index 23d1718..c3917e8 100644
--- a/meta-ibm/recipes-phosphor/mboxd/mboxd_%.bbappend
+++ b/meta-ibm/recipes-phosphor/mboxd/mboxd_%.bbappend
@@ -1,14 +1,14 @@
-MBOXD_FLASH_SIZE_ibm-ac-server = "64M"
-MBOXD_FLASH_SIZE_mihawk = "64M"
-MBOXD_FLASH_SIZE_p10bmc = "64M"
+MBOXD_FLASH_SIZE:ibm-ac-server = "64M"
+MBOXD_FLASH_SIZE:mihawk = "64M"
+MBOXD_FLASH_SIZE:p10bmc = "64M"
 
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
-SYSTEMD_SERVICE_${PN}_append_df-openpower-ubi-fs = " check-pnor-format.service"
+SYSTEMD_SERVICE:${PN}:append:df-openpower-ubi-fs = " check-pnor-format.service"
 
-SRC_URI_append_df-openpower-ubi-fs = " file://check_pnor_format.sh"
+SRC_URI:append:df-openpower-ubi-fs = " file://check_pnor_format.sh"
 
-do_install_append_df-openpower-ubi-fs() {
+do_install:append:df-openpower-ubi-fs() {
 	install -d ${D}${bindir}
 	install -m 0755 ${WORKDIR}/check_pnor_format.sh ${D}${bindir}/check_pnor_format.sh
 }
diff --git a/meta-ibm/recipes-phosphor/mctp/mctp_%.bbappend b/meta-ibm/recipes-phosphor/mctp/mctp_%.bbappend
index 46020aa..e69ed5c 100644
--- a/meta-ibm/recipes-phosphor/mctp/mctp_%.bbappend
+++ b/meta-ibm/recipes-phosphor/mctp/mctp_%.bbappend
@@ -1,7 +1,7 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
 
-SRC_URI_append_p10bmc = " file://mctp"
-SRC_URI_append_witherspoon-tacoma = " file://mctp"
+SRC_URI:append:p10bmc = " file://mctp"
+SRC_URI:append:witherspoon-tacoma = " file://mctp"
 
-PACKAGECONFIG_append_p10bmc = " astlpc-raw-kcs"
-PACKAGECONFIG_append_witherspoon-tacoma = " astlpc-raw-kcs"
+PACKAGECONFIG:append:p10bmc = " astlpc-raw-kcs"
+PACKAGECONFIG:append:witherspoon-tacoma = " astlpc-raw-kcs"
diff --git a/meta-ibm/recipes-phosphor/network/phosphor-network_%.bbappend b/meta-ibm/recipes-phosphor/network/phosphor-network_%.bbappend
index a79dae6..0aee776 100644
--- a/meta-ibm/recipes-phosphor/network/phosphor-network_%.bbappend
+++ b/meta-ibm/recipes-phosphor/network/phosphor-network_%.bbappend
@@ -1,10 +1,10 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/network:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/network:"
 
 SRC_URI += " file://ncsi-netlink.service"
-SYSTEMD_SERVICE_${PN} += " ncsi-netlink.service"
-FILES_${PN} += "${datadir}/network/*.json"
+SYSTEMD_SERVICE:${PN} += " ncsi-netlink.service"
+FILES:${PN} += "${datadir}/network/*.json"
 
-PACKAGECONFIG_append = " sync-mac"
+PACKAGECONFIG:append = " sync-mac"
 
 install_network_configuration(){
     install -d ${D}${systemd_system_unitdir}
@@ -13,22 +13,22 @@
     install -m 0644 ${WORKDIR}/inventory-object-map.json ${D}${datadir}/network/config.json
 }
 
-SRC_URI_append_p10bmc = " file://inventory-object-map.json"
-do_install_append_p10bmc(){
+SRC_URI:append:p10bmc = " file://inventory-object-map.json"
+do_install:append:p10bmc(){
     install_network_configuration
 }
 
-SRC_URI_append_ibm-ac-server = " file://inventory-object-map.json"
-do_install_append_ibm-ac-server() {
+SRC_URI:append:ibm-ac-server = " file://inventory-object-map.json"
+do_install:append:ibm-ac-server() {
     install_network_configuration
 }
 
-SRC_URI_append_mihawk = " file://inventory-object-map.json"
-do_install_append_mihawk() {
+SRC_URI:append:mihawk = " file://inventory-object-map.json"
+do_install:append:mihawk() {
     install_network_configuration
 }
 
-SRC_URI_append_witherspoon-tacoma = " file://inventory-object-map.json"
-do_install_append_witherspoon-tacoma(){
+SRC_URI:append:witherspoon-tacoma = " file://inventory-object-map.json"
+do_install:append:witherspoon-tacoma(){
     install_network_configuration
 }
diff --git a/meta-ibm/recipes-phosphor/openssl/openssl_%.bbappend b/meta-ibm/recipes-phosphor/openssl/openssl_%.bbappend
index c0bf602..8335f86 100644
--- a/meta-ibm/recipes-phosphor/openssl/openssl_%.bbappend
+++ b/meta-ibm/recipes-phosphor/openssl/openssl_%.bbappend
@@ -1,4 +1,4 @@
 # P10 needs ibmtpm2tss which needs ibmswtpm2 which needs openssl
 # camellia support
-DEPRECATED_CRYPTO_FLAGS_remove_witherspoon-tacoma = " no-camellia"
-DEPRECATED_CRYPTO_FLAGS_remove_p10bmc = " no-camellia"
+DEPRECATED_CRYPTO_FLAGS:remove:witherspoon-tacoma = " no-camellia"
+DEPRECATED_CRYPTO_FLAGS:remove:p10bmc = " no-camellia"
diff --git a/meta-ibm/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend b/meta-ibm/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend
index 63c8b03..c74ca98 100644
--- a/meta-ibm/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend
+++ b/meta-ibm/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend
@@ -18,26 +18,26 @@
 "
 
 EXTRA_IBM_LOGGING_PKGS = ""
-EXTRA_IBM_LOGGING_PKGS_witherspoon = "ibm-logging"
-EXTRA_IBM_LOGGING_PKGS_witherspoon-tacoma = ""
-EXTRA_IBM_LOGGING_PKGS_mihawk = "ibm-logging"
+EXTRA_IBM_LOGGING_PKGS:witherspoon = "ibm-logging"
+EXTRA_IBM_LOGGING_PKGS:witherspoon-tacoma = ""
+EXTRA_IBM_LOGGING_PKGS:mihawk = "ibm-logging"
 
-RDEPENDS_${PN}-inventory_append_ibm-ac-server = " openpower-fru-vpd openpower-occ-control phosphor-cooling-type virtual/obmc-gpio-presence"
-RDEPENDS_${PN}-inventory_append_p10bmc = " openpower-fru-vpd openpower-occ-control virtual/obmc-gpio-presence"
-RDEPENDS_${PN}-inventory_append_mihawk = " openpower-fru-vpd openpower-occ-control virtual/obmc-gpio-presence id-button phosphor-cooling-type"
-RDEPENDS_${PN}-fan-control_append_ibm-ac-server = " fan-watchdog"
-RDEPENDS_${PN}-fan-control_append_p10bmc = " fan-watchdog sensor-monitor"
-RDEPENDS_${PN}-extras_append_ibm-ac-server = " ${POWER_SERVICE_PACKAGES_AC_SERVER} witherspoon-power-supply-sync phosphor-webui"
-RDEPENDS_${PN}-extras_append_p10bmc = " ${POWER_SERVICE_PACKAGES_P10} webui-vue dbus-sensors phosphor-virtual-sensor kexec-tools makedumpfile kdump vmcore-dmesg"
-RDEPENDS_${PN}-extras_append_p10bmc = " pldm openpower-hw-diags srvcfg-manager biosconfig-manager phosphor-post-code-manager phosphor-host-postd debug-trigger mctp"
-RDEPENDS_${PN}-extras_append_mihawk = " phosphor-webui phosphor-image-signing wistron-ipmi-oem ${POWER_SERVICE_PACKAGES_AC_SERVER}"
-RDEPENDS_${PN}-extras_append_witherspoon-tacoma = " pldm srvcfg-manager webui-vue biosconfig-manager phosphor-post-code-manager phosphor-host-postd kexec-tools makedumpfile kdump vmcore-dmesg debug-trigger"
+RDEPENDS:${PN}-inventory:append:ibm-ac-server = " openpower-fru-vpd openpower-occ-control phosphor-cooling-type virtual/obmc-gpio-presence"
+RDEPENDS:${PN}-inventory:append:p10bmc = " openpower-fru-vpd openpower-occ-control virtual/obmc-gpio-presence"
+RDEPENDS:${PN}-inventory:append:mihawk = " openpower-fru-vpd openpower-occ-control virtual/obmc-gpio-presence id-button phosphor-cooling-type"
+RDEPENDS:${PN}-fan-control:append:ibm-ac-server = " fan-watchdog"
+RDEPENDS:${PN}-fan-control:append:p10bmc = " fan-watchdog sensor-monitor"
+RDEPENDS:${PN}-extras:append:ibm-ac-server = " ${POWER_SERVICE_PACKAGES_AC_SERVER} witherspoon-power-supply-sync phosphor-webui"
+RDEPENDS:${PN}-extras:append:p10bmc = " ${POWER_SERVICE_PACKAGES_P10} webui-vue dbus-sensors phosphor-virtual-sensor kexec-tools makedumpfile kdump vmcore-dmesg"
+RDEPENDS:${PN}-extras:append:p10bmc = " pldm openpower-hw-diags srvcfg-manager biosconfig-manager phosphor-post-code-manager phosphor-host-postd debug-trigger mctp"
+RDEPENDS:${PN}-extras:append:mihawk = " phosphor-webui phosphor-image-signing wistron-ipmi-oem ${POWER_SERVICE_PACKAGES_AC_SERVER}"
+RDEPENDS:${PN}-extras:append:witherspoon-tacoma = " pldm srvcfg-manager webui-vue biosconfig-manager phosphor-post-code-manager phosphor-host-postd kexec-tools makedumpfile kdump vmcore-dmesg debug-trigger"
 
-RDEPENDS_${PN}-extras_remove_p10bmc = "obmc-ikvm liberation-fonts uart-render-controller"
-RDEPENDS_${PN}-host-state-mgmt_remove_p10bmc = "checkstop-monitor"
-RDEPENDS_${PN}-extras_remove_swift = "obmc-ikvm"
-RDEPENDS_${PN}-extras_remove_witherspoon-tacoma = "obmc-ikvm liberation-fonts uart-render-controller phosphor-webui"
-RDEPENDS_${PN}-logging_append = " ${EXTRA_IBM_LOGGING_PKGS}"
-RDEPENDS_${PN}-leds_remove_witherspoon-tacoma = "phosphor-led-manager-faultmonitor"
+RDEPENDS:${PN}-extras:remove:p10bmc = "obmc-ikvm liberation-fonts uart-render-controller"
+RDEPENDS:${PN}-host-state-mgmt:remove:p10bmc = "checkstop-monitor"
+RDEPENDS:${PN}-extras:remove:swift = "obmc-ikvm"
+RDEPENDS:${PN}-extras:remove:witherspoon-tacoma = "obmc-ikvm liberation-fonts uart-render-controller phosphor-webui"
+RDEPENDS:${PN}-logging:append = " ${EXTRA_IBM_LOGGING_PKGS}"
+RDEPENDS:${PN}-leds:remove:witherspoon-tacoma = "phosphor-led-manager-faultmonitor"
 
-${PN}-software-extras_append_ibm-ac-server = " phosphor-software-manager-sync"
+${PN}-software-extras:append:ibm-ac-server = " phosphor-software-manager-sync"
diff --git a/meta-ibm/recipes-phosphor/pldm/pldm_%.bbappend b/meta-ibm/recipes-phosphor/pldm/pldm_%.bbappend
index b57abd8..e2e7c23 100644
--- a/meta-ibm/recipes-phosphor/pldm/pldm_%.bbappend
+++ b/meta-ibm/recipes-phosphor/pldm/pldm_%.bbappend
@@ -1,8 +1,8 @@
 PACKAGECONFIG += "oem-ibm"
 PACKAGECONFIG[oem-ibm] = "-Doem-ibm=enabled, -Doem-ibm=disabled, , squashfs-tools"
 
-EXTRA_OEMESON_append = " \
+EXTRA_OEMESON:append = " \
     -Dresponse-time-out=4800 \
 "
 
-SYSTEMD_SERVICE_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'oem-ibm', 'pldm-create-phyp-nvram.service pldm-create-phyp-nvram-cksum.service', '', d)}"
+SYSTEMD_SERVICE:${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'oem-ibm', 'pldm-create-phyp-nvram.service pldm-create-phyp-nvram-cksum.service', '', d)}"
diff --git a/meta-ibm/recipes-phosphor/power/phosphor-power_%.bbappend b/meta-ibm/recipes-phosphor/power/phosphor-power_%.bbappend
index c2f5b2c..9acaad7 100644
--- a/meta-ibm/recipes-phosphor/power/phosphor-power_%.bbappend
+++ b/meta-ibm/recipes-phosphor/power/phosphor-power_%.bbappend
@@ -1,24 +1,24 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
 inherit obmc-phosphor-systemd
 
 SRC_URI += "file://psu.json"
 
-EXTRA_OEMESON_append_ibm-ac-server = " -Ducd90160-yaml=${STAGING_DIR_HOST}${datadir}/power-sequencer/ucd90160.yaml"
-EXTRA_OEMESON_append_p10bmc = " -Ducd90160-yaml=${STAGING_DIR_HOST}${datadir}/power-sequencer/ucd90160.yaml -Dibm-vpd=true"
-EXTRA_OEMESON_append_mihawk = " -Dpower_sequencer=mihawk-cpld"
+EXTRA_OEMESON:append:ibm-ac-server = " -Ducd90160-yaml=${STAGING_DIR_HOST}${datadir}/power-sequencer/ucd90160.yaml"
+EXTRA_OEMESON:append:p10bmc = " -Ducd90160-yaml=${STAGING_DIR_HOST}${datadir}/power-sequencer/ucd90160.yaml -Dibm-vpd=true"
+EXTRA_OEMESON:append:mihawk = " -Dpower_sequencer=mihawk-cpld"
 
-DEPENDS_append_ibm-ac-server = " power-sequencer"
-DEPENDS_append_p10bmc = " power-sequencer"
+DEPENDS:append:ibm-ac-server = " power-sequencer"
+DEPENDS:append:p10bmc = " power-sequencer"
 
-PACKAGECONFIG_append_ibm-ac-server = " monitor"
-PACKAGECONFIG_append_swift = " monitor"
-PACKAGECONFIG_append_mihawk = " monitor"
+PACKAGECONFIG:append:ibm-ac-server = " monitor"
+PACKAGECONFIG:append:swift = " monitor"
+PACKAGECONFIG:append:mihawk = " monitor"
 
-do_install_append(){
+do_install:append(){
     install -D ${WORKDIR}/psu.json ${D}${datadir}/phosphor-power/psu.json
 }
-FILES_${PN} += "${datadir}/phosphor-power/psu.json"
+FILES:${PN} += "${datadir}/phosphor-power/psu.json"
 
 PSU_MONITOR_ENV_FMT = "obmc/power-supply-monitor/power-supply-monitor-{0}.conf"
-SYSTEMD_ENVIRONMENT_FILE_${PN}-monitor_append_ibm-ac-server += "${@compose_list(d, 'PSU_MONITOR_ENV_FMT', 'OBMC_POWER_SUPPLY_INSTANCES')}"
+SYSTEMD_ENVIRONMENT_FILE_${PN}-monitor:append:ibm-ac-server += "${@compose_list(d, 'PSU_MONITOR_ENV_FMT', 'OBMC_POWER_SUPPLY_INSTANCES')}"
diff --git a/meta-ibm/recipes-phosphor/power/power-sequencer.bb b/meta-ibm/recipes-phosphor/power/power-sequencer.bb
index 6fc1133..17ff4c2 100644
--- a/meta-ibm/recipes-phosphor/power/power-sequencer.bb
+++ b/meta-ibm/recipes-phosphor/power/power-sequencer.bb
@@ -5,21 +5,21 @@
 
 inherit allarch
 
-SRC_URI_append_ibm-ac-server = " file://ucd90160.yaml"
-SRC_URI_append_p10bmc = " file://ucd90160.yaml"
+SRC_URI:append:ibm-ac-server = " file://ucd90160.yaml"
+SRC_URI:append:p10bmc = " file://ucd90160.yaml"
 
-FILES_${PN}_append_ibm-ac-server = " ${datadir}/power-sequencer/ucd90160.yaml"
-FILES_${PN}_append_p10bmc = " ${datadir}/power-sequencer/ucd90160.yaml"
+FILES:${PN}:append:ibm-ac-server = " ${datadir}/power-sequencer/ucd90160.yaml"
+FILES:${PN}:append:p10bmc = " ${datadir}/power-sequencer/ucd90160.yaml"
 
 S = "${WORKDIR}"
 
-do_install_append_ibm-ac-server() {
+do_install:append:ibm-ac-server() {
     DEST=${D}${datadir}/power-sequencer
 
     install -D ucd90160.yaml ${DEST}/ucd90160.yaml
 }
 
-do_install_append_p10bmc() {
+do_install:append:p10bmc() {
     DEST=${D}${datadir}/power-sequencer
 
     install -D ucd90160.yaml ${DEST}/ucd90160.yaml
diff --git a/meta-ibm/recipes-phosphor/power/witherspoon-pfault-analysis-error-native_git.bb b/meta-ibm/recipes-phosphor/power/witherspoon-pfault-analysis-error-native_git.bb
index 5ea6cb5..fb02ace 100644
--- a/meta-ibm/recipes-phosphor/power/witherspoon-pfault-analysis-error-native_git.bb
+++ b/meta-ibm/recipes-phosphor/power/witherspoon-pfault-analysis-error-native_git.bb
@@ -9,7 +9,7 @@
 
 S = "${WORKDIR}/git"
 
-do_install_append() {
+do_install:append() {
     SRC=${S}/org/open_power/Witherspoon
     DEST=${D}${yaml_dir}/org/open_power/Witherspoon
     install -d ${DEST}
diff --git a/meta-ibm/recipes-phosphor/power/witherspoon-power-supply-sync.bb b/meta-ibm/recipes-phosphor/power/witherspoon-power-supply-sync.bb
index 4f599a7..4c4c884 100644
--- a/meta-ibm/recipes-phosphor/power/witherspoon-power-supply-sync.bb
+++ b/meta-ibm/recipes-phosphor/power/witherspoon-power-supply-sync.bb
@@ -6,11 +6,11 @@
 
 inherit obmc-phosphor-systemd
 
-RDEPENDS_${PN} += "virtual/obmc-gpio-monitor"
+RDEPENDS:${PN} += "virtual/obmc-gpio-monitor"
 
 SYNC_SERVICE = "power-supply-sync.service"
 TGTFMT = "obmc-chassis-poweron@0.target"
 SYNC_FMT = "../${SYNC_SERVICE}:${TGTFMT}.wants/${SYNC_SERVICE}"
 
-SYSTEMD_SERVICE_${PN} += "${SYNC_SERVICE}"
+SYSTEMD_SERVICE:${PN} += "${SYNC_SERVICE}"
 SYSTEMD_LINK_${PN} += "${SYNC_FMT}"
diff --git a/meta-ibm/recipes-phosphor/sensors/dbus-sensors_%.bbappend b/meta-ibm/recipes-phosphor/sensors/dbus-sensors_%.bbappend
index 6c283f4..b5abeec 100644
--- a/meta-ibm/recipes-phosphor/sensors/dbus-sensors_%.bbappend
+++ b/meta-ibm/recipes-phosphor/sensors/dbus-sensors_%.bbappend
@@ -1 +1 @@
-PACKAGECONFIG_p10bmc = "hwmontempsensor"
+PACKAGECONFIG:p10bmc = "hwmontempsensor"
diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend
index c9e7927..cde45e7 100644
--- a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend
+++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend
@@ -1,14 +1,14 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
-EXTRA_OEMESON_append_mihawk = "-Dnegative-errno-on-fail=true"
+EXTRA_OEMESON:append:mihawk = "-Dnegative-errno-on-fail=true"
 
-SRC_URI_append_ibm-ac-server = " \
+SRC_URI:append:ibm-ac-server = " \
            file://70-hwmon.rules \
            file://70-max31785-hwmon.rules \
            file://start_max31785_hwmon.sh \
            "
 
-CHIPS_witherspoon = " \
+CHIPS:witherspoon = " \
                bus@1e78a000/i2c-bus@100/max31785@52_air \
                bus@1e78a000/i2c-bus@100/max31785@52_water \
                bus@1e78a000/i2c-bus@100/power-supply@68 \
@@ -21,7 +21,7 @@
                bus@1e78a000/i2c-bus@180/ir35221@71 \
                bus@1e78a000/i2c-bus@380/tmp275@4a \
                "
-CHIPS_swift = " \
+CHIPS:swift = " \
                bus@1e78a000/i2c-bus@100/max31785@52_air \
                bus@1e78a000/i2c-bus@100/max31785@52_water \
                bus@1e78a000/i2c-bus@100/power-supply@68 \
@@ -38,7 +38,7 @@
                bus@1e78a000/i2c-bus@3c0/ir35221@71 \
                bus@1e78a000/i2c-bus@3c0/ir35221@72 \
                "
-CHIPS_mihawk = " \
+CHIPS:mihawk = " \
                bus@1e78a000/i2c-bus@100/power-supply@58 \
                bus@1e78a000/i2c-bus@100/power-supply@5b \
                bus@1e78a000/i2c-bus@140/ir35221@70 \
@@ -60,7 +60,7 @@
                bus@1e78a000/i2c-bus@440/pca9545@70/i2c@3/tmp275@48 \
                "
 
-CHIPS_witherspoon-tacoma = " \
+CHIPS:witherspoon-tacoma = " \
                bus@1e78a000/i2c-bus@200/max31785@52_air \
                bus@1e78a000/i2c-bus@200/max31785@52_water \
                bus@1e78a000/i2c-bus@200/power-supply@68 \
@@ -74,29 +74,29 @@
                bus@1e78a000/i2c-bus@500/tmp275@4a \
                "
 
-CHIPS_p10bmc = " \
+CHIPS:p10bmc = " \
                bus@1e78a000/i2c-bus@400/max31785@52 \
                bus@1e78a000/i2c-bus@780/i2c-switch@70/i2c@3/max31785@52 \
                "
 
 ITEMSFMT = "ahb/apb/{0}.conf"
 ITEMS = "${@compose_list(d, 'ITEMSFMT', 'CHIPS')}"
-ITEMS_append_mihawk += " iio-hwmon-vdd0.conf"
-ITEMS_append_mihawk += " iio-hwmon-vdd1.conf"
-ITEMS_append_mihawk += " iio-hwmon-vcs0.conf"
-ITEMS_append_mihawk += " iio-hwmon-vcs1.conf"
-ITEMS_append_mihawk += " iio-hwmon-vdn0.conf"
-ITEMS_append_mihawk += " iio-hwmon-vdn1.conf"
-ITEMS_append_mihawk += " iio-hwmon-vio0.conf"
-ITEMS_append_mihawk += " iio-hwmon-vio1.conf"
-ITEMS_append_mihawk += " iio-hwmon-vddra.conf"
-ITEMS_append_mihawk += " iio-hwmon-vddrb.conf"
-ITEMS_append_mihawk += " iio-hwmon-vddrc.conf"
-ITEMS_append_mihawk += " iio-hwmon-vddrd.conf"
-ITEMS_append_mihawk += " iio-hwmon-12v.conf"
-ITEMS_append_mihawk += " iio-hwmon-5v.conf"
-ITEMS_append_mihawk += " iio-hwmon-3v.conf"
-ITEMS_append_mihawk += " iio-hwmon-battery.conf"
+ITEMS:append:mihawk += " iio-hwmon-vdd0.conf"
+ITEMS:append:mihawk += " iio-hwmon-vdd1.conf"
+ITEMS:append:mihawk += " iio-hwmon-vcs0.conf"
+ITEMS:append:mihawk += " iio-hwmon-vcs1.conf"
+ITEMS:append:mihawk += " iio-hwmon-vdn0.conf"
+ITEMS:append:mihawk += " iio-hwmon-vdn1.conf"
+ITEMS:append:mihawk += " iio-hwmon-vio0.conf"
+ITEMS:append:mihawk += " iio-hwmon-vio1.conf"
+ITEMS:append:mihawk += " iio-hwmon-vddra.conf"
+ITEMS:append:mihawk += " iio-hwmon-vddrb.conf"
+ITEMS:append:mihawk += " iio-hwmon-vddrc.conf"
+ITEMS:append:mihawk += " iio-hwmon-vddrd.conf"
+ITEMS:append:mihawk += " iio-hwmon-12v.conf"
+ITEMS:append:mihawk += " iio-hwmon-5v.conf"
+ITEMS:append:mihawk += " iio-hwmon-3v.conf"
+ITEMS:append:mihawk += " iio-hwmon-battery.conf"
 
 OCCS = " \
         00--00--00--06/sbefifo1-dev0/occ-hwmon.1 \
@@ -106,20 +106,20 @@
 OCCITEMS = "${@compose_list(d, 'OCCSFMT', 'OCCS')}"
 
 ENVS = "obmc/hwmon/{0}"
-SYSTEMD_ENVIRONMENT_FILE_${PN}_append_ibm-ac-server = " ${@compose_list(d, 'ENVS', 'ITEMS')}"
-SYSTEMD_ENVIRONMENT_FILE_${PN}_append_ibm-ac-server = " ${@compose_list(d, 'ENVS', 'OCCITEMS')}"
-SYSTEMD_ENVIRONMENT_FILE_${PN}_append_mihawk = " ${@compose_list(d, 'ENVS', 'ITEMS')}"
-SYSTEMD_ENVIRONMENT_FILE_${PN}_append_mihawk = " ${@compose_list(d, 'ENVS', 'OCCITEMS')}"
-SYSTEMD_ENVIRONMENT_FILE_${PN}_append_p10bmc = " ${@compose_list(d, 'ENVS', 'ITEMS')}"
+SYSTEMD_ENVIRONMENT_FILE_${PN}:append:ibm-ac-server = " ${@compose_list(d, 'ENVS', 'ITEMS')}"
+SYSTEMD_ENVIRONMENT_FILE_${PN}:append:ibm-ac-server = " ${@compose_list(d, 'ENVS', 'OCCITEMS')}"
+SYSTEMD_ENVIRONMENT_FILE_${PN}:append:mihawk = " ${@compose_list(d, 'ENVS', 'ITEMS')}"
+SYSTEMD_ENVIRONMENT_FILE_${PN}:append:mihawk = " ${@compose_list(d, 'ENVS', 'OCCITEMS')}"
+SYSTEMD_ENVIRONMENT_FILE_${PN}:append:p10bmc = " ${@compose_list(d, 'ENVS', 'ITEMS')}"
 
 # Enable and install the max31785-msl package
-PACKAGECONFIG_append_ibm-ac-server = " max31785-msl"
-SYSTEMD_ENVIRONMENT_FILE_max31785-msl_append_ibm-ac-server = " obmc/hwmon-max31785/max31785.conf"
-SYSTEMD_LINK_max31785-msl_append_ibm-ac-server = " ../phosphor-max31785-msl@.service:multi-user.target.wants/phosphor-max31785-msl@${MACHINE}.service"
+PACKAGECONFIG:append:ibm-ac-server = " max31785-msl"
+SYSTEMD_ENVIRONMENT_FILE_max31785-msl:append:ibm-ac-server = " obmc/hwmon-max31785/max31785.conf"
+SYSTEMD_LINK_max31785-msl:append:ibm-ac-server = " ../phosphor-max31785-msl@.service:multi-user.target.wants/phosphor-max31785-msl@${MACHINE}.service"
 
-SYSTEMD_SERVICE_${PN}_append_ibm-ac-server = " max31785-hwmon-helper@.service"
+SYSTEMD_SERVICE:${PN}:append:ibm-ac-server = " max31785-hwmon-helper@.service"
 
-do_install_append_ibm-ac-server() {
+do_install:append:ibm-ac-server() {
     install -d ${D}/${base_libdir}/udev/rules.d/
     install -m 0644 ${WORKDIR}/70-max31785-hwmon.rules ${D}/${base_libdir}/udev/rules.d/
 
diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend b/meta-ibm/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend
index 878a58a..020a27a 100644
--- a/meta-ibm/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend
+++ b/meta-ibm/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend
@@ -1,6 +1,6 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 SRC_URI += "file://virtual_sensor_config.json"
 
-do_install_append_p10bmc() {
+do_install:append:p10bmc() {
     install -m 0644 ${WORKDIR}/virtual_sensor_config.json ${D}${datadir}/phosphor-virtual-sensor/
 }
diff --git a/meta-ibm/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend b/meta-ibm/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend
index 92c1bcc..ba950b3 100644
--- a/meta-ibm/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend
+++ b/meta-ibm/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend
@@ -1,7 +1,7 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-SRC_URI_append_ibm-ac-server = " file://TPMEnable-default-true.override.yml"
-SRC_URI_append_ibm-ac-server = " file://ClearHostSecurityKeys-default-zero.override.yml"
-SRC_URI_append_mihawk = " file://TPMEnable-default-true.override.yml"
-SRC_URI_append = " file://ibm_settings.override.yml"
-SRC_URI_append_p10bmc = " file://HypervisorInterface-default-p10bmc.override.yml"
-SRC_URI_append_witherspoon-tacoma = " file://HypervisorInterface-default-tacoma.override.yml"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
+SRC_URI:append:ibm-ac-server = " file://TPMEnable-default-true.override.yml"
+SRC_URI:append:ibm-ac-server = " file://ClearHostSecurityKeys-default-zero.override.yml"
+SRC_URI:append:mihawk = " file://TPMEnable-default-true.override.yml"
+SRC_URI:append = " file://ibm_settings.override.yml"
+SRC_URI:append:p10bmc = " file://HypervisorInterface-default-p10bmc.override.yml"
+SRC_URI:append:witherspoon-tacoma = " file://HypervisorInterface-default-tacoma.override.yml"
diff --git a/meta-ibm/recipes-phosphor/settings/phosphor-settings-read-settings-mrw-native.bbappend b/meta-ibm/recipes-phosphor/settings/phosphor-settings-read-settings-mrw-native.bbappend
index aa8149c..debc568 100644
--- a/meta-ibm/recipes-phosphor/settings/phosphor-settings-read-settings-mrw-native.bbappend
+++ b/meta-ibm/recipes-phosphor/settings/phosphor-settings-read-settings-mrw-native.bbappend
@@ -1,2 +1,2 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 MRW_EXPRESSION_VARS = "-v PS_DERATING=${POWER_SUPPLY_DERATING_FACTOR}"
diff --git a/meta-ibm/recipes-phosphor/skeleton/obmc-libobmc-intf_%.bbappend b/meta-ibm/recipes-phosphor/skeleton/obmc-libobmc-intf_%.bbappend
index 72d991c..4fc41d0 100644
--- a/meta-ibm/recipes-phosphor/skeleton/obmc-libobmc-intf_%.bbappend
+++ b/meta-ibm/recipes-phosphor/skeleton/obmc-libobmc-intf_%.bbappend
@@ -1 +1 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
diff --git a/meta-ibm/recipes-phosphor/state/phosphor-post-code-manager_%.bbappend b/meta-ibm/recipes-phosphor/state/phosphor-post-code-manager_%.bbappend
index f8ff901..bee5a5f 100644
--- a/meta-ibm/recipes-phosphor/state/phosphor-post-code-manager_%.bbappend
+++ b/meta-ibm/recipes-phosphor/state/phosphor-post-code-manager_%.bbappend
@@ -1,4 +1,4 @@
 # Set MaxBootCycleCount to 5 on IBM systems
-EXTRA_OECMAKE_append_p10bmc = "-DMAX_BOOT_CYCLE_COUNT=5"
-EXTRA_OECMAKE_append_witherspoon-tacoma = "-DMAX_BOOT_CYCLE_COUNT=5"
+EXTRA_OECMAKE:append:p10bmc = "-DMAX_BOOT_CYCLE_COUNT=5"
+EXTRA_OECMAKE:append:witherspoon-tacoma = "-DMAX_BOOT_CYCLE_COUNT=5"
 
diff --git a/meta-ibm/recipes-phosphor/state/phosphor-state-manager_%.bbappend b/meta-ibm/recipes-phosphor/state/phosphor-state-manager_%.bbappend
index 5b35a0a..68a4ccc 100644
--- a/meta-ibm/recipes-phosphor/state/phosphor-state-manager_%.bbappend
+++ b/meta-ibm/recipes-phosphor/state/phosphor-state-manager_%.bbappend
@@ -1,11 +1,11 @@
-EXTRA_OEMESON_append_witherspoon = " -Dwarm-reboot=disabled"
+EXTRA_OEMESON:append:witherspoon = " -Dwarm-reboot=disabled"
 
 # The scheduled-host-transition package provides support to
 # schedule power on and off operations for the host at some
 # time in the future. IBM systems will utilize this feature
-RRECOMMENDS_${PN}-host += "${PN}-scheduled-host-transition"
+RRECOMMENDS:${PN}-host += "${PN}-scheduled-host-transition"
 
 # IBM systems track the state of the hypervisor so bring
 # in the needed package when the host state package is
 # included
-RRECOMMENDS_${PN}-host += "${PN}-hypervisor"
+RRECOMMENDS:${PN}-host += "${PN}-hypervisor"
diff --git a/meta-ibm/recipes-phosphor/vpd/openpower-fru-vpd_%.bbappend b/meta-ibm/recipes-phosphor/vpd/openpower-fru-vpd_%.bbappend
index 6c0cbeb..d2b8407 100644
--- a/meta-ibm/recipes-phosphor/vpd/openpower-fru-vpd_%.bbappend
+++ b/meta-ibm/recipes-phosphor/vpd/openpower-fru-vpd_%.bbappend
@@ -1,14 +1,14 @@
-do_install_append_witherspoon() {
+do_install:append:witherspoon() {
         DEST=${D}${inventory_envdir}
         printf "\nEEPROM=/sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a400.i2c-bus/i2c-11/11-0051/eeprom" >> ${DEST}/inventory
 }
 
-do_install_append_swift() {
+do_install:append:swift() {
         DEST=${D}${inventory_envdir}
         printf "\nEEPROM=/sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a340.i2c-bus/i2c-8/8-0051/eeprom" >> ${DEST}/inventory
 }
 
-do_install_append_witherspoon-tacoma() {
+do_install:append:witherspoon-tacoma() {
         DEST=${D}${inventory_envdir}
         printf "FRUS=BMC,ETHERNET" > ${DEST}/inventory
         printf "\nPATHS=/system/chassis/motherboard/bmc,/system/chassis/motherboard/bmc/eth0" >> ${DEST}/inventory
diff --git a/meta-ibm/recipes-phosphor/watchdog/phosphor-watchdog_%.bbappend b/meta-ibm/recipes-phosphor/watchdog/phosphor-watchdog_%.bbappend
index 0d9704f..7d90446 100644
--- a/meta-ibm/recipes-phosphor/watchdog/phosphor-watchdog_%.bbappend
+++ b/meta-ibm/recipes-phosphor/watchdog/phosphor-watchdog_%.bbappend
@@ -1,4 +1,4 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
 # utilize a 600s default timer config for p10bmc
-SYSTEMD_ENVIRONMENT_FILE_${PN}_append_p10bmc = " obmc/watchdog/poweron"
+SYSTEMD_ENVIRONMENT_FILE_${PN}:append:p10bmc = " obmc/watchdog/poweron"