diff --git a/meta-phosphor/aspeed-layer/recipes-bsp/u-boot/u-boot-aspeed.inc b/meta-phosphor/aspeed-layer/recipes-bsp/u-boot/u-boot-aspeed.inc
index 5329b2c..69b50d6 100644
--- a/meta-phosphor/aspeed-layer/recipes-bsp/u-boot/u-boot-aspeed.inc
+++ b/meta-phosphor/aspeed-layer/recipes-bsp/u-boot/u-boot-aspeed.inc
@@ -1,24 +1,24 @@
 inherit image_version
 
-SRC_URI_append_aspeed = " file://0001-configs-ast-Add-redundnant-env.patch"
+SRC_URI:append:aspeed = " file://0001-configs-ast-Add-redundnant-env.patch"
 
-SRC_URI_append_aspeed_df-obmc-ubi-fs = " \
+SRC_URI:append:aspeed:df-obmc-ubi-fs = " \
     file://0002-config-ast-common-hack-bootopts.patch \
     file://0003-config-ast-common-Add-bootopts-to-support-ubi-and-mt.patch \
     file://0004-config-ast-common-Add-conditional-factory-reset-comm.patch \
     file://0005-config-ast-common-Fall-back-to-secondary-flash-on-fa.patch \
     "
 
-SRC_URI_append_aspeed_df-isolate-bmc = " \
+SRC_URI:append:aspeed:df-isolate-bmc = " \
     file://0001-aspeed-Disable-unnecessary-features.patch \
     "
-SRC_URI_append_aspeed_df-aspeednic-use-mac2 = " \
+SRC_URI:append:aspeed:df-aspeednic-use-mac2 = " \
     file://0002-board-aspeed-aspeednic-Use-MAC2-for-networking.patch \
     "
 
 do_patch[depends] += "os-release:do_populate_sysroot"
 
-python do_patch_append_aspeed_df-obmc-ubi-fs () {
+python do_patch:append:aspeed:df-obmc-ubi-fs () {
     version_id=do_get_versionID(d)
     d.setVar('VERSION_ID', version_id)
     bb.build.exec_func("patch_kernelname", d)
diff --git a/meta-phosphor/aspeed-layer/recipes-bsp/u-boot/u-boot-aspeed_%.bbappend b/meta-phosphor/aspeed-layer/recipes-bsp/u-boot/u-boot-aspeed_%.bbappend
index 6c68494..452ef7e 100644
--- a/meta-phosphor/aspeed-layer/recipes-bsp/u-boot/u-boot-aspeed_%.bbappend
+++ b/meta-phosphor/aspeed-layer/recipes-bsp/u-boot/u-boot-aspeed_%.bbappend
@@ -1,3 +1,3 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
 
 require u-boot-aspeed.inc
diff --git a/meta-phosphor/aspeed-layer/recipes-bsp/u-boot/u-boot-fw-utils-aspeed_%.bbappend b/meta-phosphor/aspeed-layer/recipes-bsp/u-boot/u-boot-fw-utils-aspeed_%.bbappend
index 6c68494..452ef7e 100644
--- a/meta-phosphor/aspeed-layer/recipes-bsp/u-boot/u-boot-fw-utils-aspeed_%.bbappend
+++ b/meta-phosphor/aspeed-layer/recipes-bsp/u-boot/u-boot-fw-utils-aspeed_%.bbappend
@@ -1,3 +1,3 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
 
 require u-boot-aspeed.inc
diff --git a/meta-phosphor/aspeed-layer/recipes-connectivity/jsnbd/jsnbd_git.bbappend b/meta-phosphor/aspeed-layer/recipes-connectivity/jsnbd/jsnbd_git.bbappend
index 3ccc087..1061a92 100644
--- a/meta-phosphor/aspeed-layer/recipes-connectivity/jsnbd/jsnbd_git.bbappend
+++ b/meta-phosphor/aspeed-layer/recipes-connectivity/jsnbd/jsnbd_git.bbappend
@@ -1,9 +1,9 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
-FILES_${PN} += "${sysconfdir}/nbd-proxy/state"
+FILES:${PN} += "${sysconfdir}/nbd-proxy/state"
 SRC_URI += "file://state_hook"
 
-do_install_append() {
+do_install:append() {
     install -d ${D}${sysconfdir}/nbd-proxy/
     install -m 0755 ${WORKDIR}/state_hook ${D}${sysconfdir}/nbd-proxy/state
 }
diff --git a/meta-phosphor/aspeed-layer/recipes-kernel/cf-fsi-firmware/cf-fsi-firmware_git.bb b/meta-phosphor/aspeed-layer/recipes-kernel/cf-fsi-firmware/cf-fsi-firmware_git.bb
index d96a2ef..62819f2 100644
--- a/meta-phosphor/aspeed-layer/recipes-kernel/cf-fsi-firmware/cf-fsi-firmware_git.bb
+++ b/meta-phosphor/aspeed-layer/recipes-kernel/cf-fsi-firmware/cf-fsi-firmware_git.bb
@@ -25,4 +25,4 @@
 	install -m 0644 ${S}/dist-bin/cf-fsi-fw.bin ${D}${firmware_dir}
 }
 
-FILES_${PN} = "${firmware_dir}"
+FILES:${PN} = "${firmware_dir}"