diff --git a/classes/image_types_digi.bbclass b/classes/image_types_digi.bbclass
index ab24422..45a4f51 100644
--- a/classes/image_types_digi.bbclass
+++ b/classes/image_types_digi.bbclass
@@ -6,7 +6,7 @@ do_image_boot_ubifs[depends] += " \
     virtual/kernel:do_deploy \
 "
 
-IMAGE_CMD_boot.ubifs() {
+IMAGE_CMD:boot.ubifs() {
 	BOOTIMG_FILES_SYMLINK="${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${MACHINE}.bin"
 	if [ -n "${KERNEL_DEVICETREE}" ]; then
 		for DTB in ${KERNEL_DEVICETREE}; do
diff --git a/conf/machine/apalis-imx6.conf b/conf/machine/apalis-imx6.conf
index 086b591..e60ec40 100644
--- a/conf/machine/apalis-imx6.conf
+++ b/conf/machine/apalis-imx6.conf
@@ -14,7 +14,7 @@ KERNEL_DEVICETREE += "imx6q-apalis-eval.dtb imx6q-apalis-ixora.dtb \
                       imx6q-apalis-ixora-v1.1.dtb"
 KERNEL_IMAGETYPE = "zImage"
 # The kernel lives in a seperate FAT partition, don't deploy it in /boot/
-RDEPENDS_${KERNEL_PACKAGE_NAME}-base = ""
+RDEPENDS:${KERNEL_PACKAGE_NAME}-base = ""
 
 IMX_DEFAULT_BOOTLOADER = "u-boot-toradex"
 PREFERRED_RPROVIDER_u-boot-default-script = "u-boot-script-toradex"
@@ -25,12 +25,12 @@ SPL_BINARY = "SPL"
 UBOOT_CONFIG ??= "spl"
 UBOOT_CONFIG[spl] = "apalis_imx6_defconfig,,u-boot.img"
 UBOOT_MAKE_TARGET = ""
-UBOOT_ENTRYPOINT_use-mainline-bsp = "0x10008000"
+UBOOT_ENTRYPOINT:use-mainline-bsp = "0x10008000"
 
 IMAGE_FSTYPES += "tar.xz"
 # wic support
-IMAGE_BOOT_FILES_append = " boot.scr-${MACHINE};boot.scr"
-WKS_FILE_DEPENDS_append = " u-boot-default-script"
+IMAGE_BOOT_FILES:append = " boot.scr-${MACHINE};boot.scr"
+WKS_FILE_DEPENDS:append = " u-boot-default-script"
 WKS_FILE = "sdimage-bootpart.wks"
 
 MACHINE_FEATURES += "screen usbgadget usbhost vfat ext2 alsa touchscreen wifi bluetooth 3g pci"
diff --git a/conf/machine/colibri-imx6.conf b/conf/machine/colibri-imx6.conf
index 425c915..3f77c8d 100644
--- a/conf/machine/colibri-imx6.conf
+++ b/conf/machine/colibri-imx6.conf
@@ -12,10 +12,10 @@ include conf/machine/include/tune-cortexa9.inc
 PREFERRED_PROVIDER_virtual/kernel_use-nxp-bsp ??= "linux-toradex"
 KERNEL_DEVICETREE += "imx6dl-colibri-eval-v3.dtb imx6dl-colibri-cam-eval-v3.dtb \
                       imx6dl-colibri-aster.dtb"
-KERNEL_DEVICETREE_use-mainline-bsp = "imx6dl-colibri-eval-v3.dtb"
+KERNEL_DEVICETREE:use-mainline-bsp = "imx6dl-colibri-eval-v3.dtb"
 KERNEL_IMAGETYPE = "zImage"
 # The kernel lives in a seperate FAT partition, don't deploy it in /boot/
-RDEPENDS_${KERNEL_PACKAGE_NAME}-base = ""
+RDEPENDS:${KERNEL_PACKAGE_NAME}-base = ""
 
 IMX_DEFAULT_BOOTLOADER = "u-boot-toradex"
 PREFERRED_PROVIDER_u-boot-default-script = "u-boot-script-toradex"
@@ -25,12 +25,12 @@ SPL_BINARY = "SPL"
 UBOOT_CONFIG ??= "spl"
 UBOOT_CONFIG[spl] = "colibri_imx6_defconfig,,u-boot.img"
 UBOOT_MAKE_TARGET = ""
-UBOOT_ENTRYPOINT_use-mainline-bsp = "0x10008000"
+UBOOT_ENTRYPOINT:use-mainline-bsp = "0x10008000"
 
 IMAGE_FSTYPES += "tar.xz"
 # wic support
-IMAGE_BOOT_FILES_append = " boot.scr-${MACHINE};boot.scr"
-WKS_FILE_DEPENDS_append = " u-boot-default-script"
+IMAGE_BOOT_FILES:append = " boot.scr-${MACHINE};boot.scr"
+WKS_FILE_DEPENDS:append = " u-boot-default-script"
 WKS_FILE = "sdimage-bootpart.wks"
 
 MACHINE_FEATURES += "screen usbgadget usbhost vfat ext2 alsa touchscreen wifi bluetooth 3g"
diff --git a/conf/machine/colibri-imx6ull.conf b/conf/machine/colibri-imx6ull.conf
index 1e1fd93..3b24edc 100644
--- a/conf/machine/colibri-imx6ull.conf
+++ b/conf/machine/colibri-imx6ull.conf
@@ -13,7 +13,7 @@ PREFERRED_PROVIDER_virtual/kernel_use-nxp-bsp ?= "linux-toradex"
 KERNEL_DEVICETREE += "imx6ull-colibri-eval-v3.dtb imx6ull-colibri-wifi-eval-v3.dtb"
 KERNEL_IMAGETYPE = "zImage"
 # The kernel lives in its own ubi volume.
-RDEPENDS_${KERNEL_PACKAGE_NAME}-base = ""
+RDEPENDS:${KERNEL_PACKAGE_NAME}-base = ""
 
 PREFERRED_PROVIDER_u-boot ?= "u-boot-toradex"
 PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-toradex"
@@ -27,9 +27,9 @@ UBOOT_MACHINE ?= "colibri-imx6ull_defconfig"
 
 IMAGE_FSTYPES += "tar.xz"
 # wic support
-IMAGE_BOOT_FILES_append = " boot.scr-${MACHINE};boot.scr"
-WKS_FILE_DEPENDS_append = " u-boot-default-script"
+IMAGE_BOOT_FILES:append = " boot.scr-${MACHINE};boot.scr"
+WKS_FILE_DEPENDS:append = " u-boot-default-script"
 WKS_FILE = "sdimage-bootpart.wks"
 
 MACHINE_FEATURES += "screen usbgadget usbhost vfat ext2 alsa touchscreen wifi bluetooth 3g"
-MACHINE_FIRMWARE_remove = "firmware-imx-epdc"
+MACHINE_FIRMWARE:remove = "firmware-imx-epdc"
diff --git a/conf/machine/colibri-imx7-emmc.conf b/conf/machine/colibri-imx7-emmc.conf
index 052dc6c..4a9f0cd 100644
--- a/conf/machine/colibri-imx7-emmc.conf
+++ b/conf/machine/colibri-imx7-emmc.conf
@@ -12,10 +12,10 @@ include conf/machine/include/tune-cortexa7.inc
 PREFERRED_PROVIDER_virtual/kernel_use-nxp-bsp ??= "linux-toradex"
 
 KERNEL_DEVICETREE = "imx7d-colibri-emmc-eval-v3.dtb"
-KERNEL_DEVICETREE_append_use-nxp-bsp = " imx7d-colibri-emmc-aster.dtb"
+KERNEL_DEVICETREE:append:use-nxp-bsp = " imx7d-colibri-emmc-aster.dtb"
 
 # The kernel lives in a seperate FAT partition, don't deploy it in /boot/
-RDEPENDS_${KERNEL_PACKAGE_NAME}-base = ""
+RDEPENDS:${KERNEL_PACKAGE_NAME}-base = ""
 
 IMX_DEFAULT_BOOTLOADER = "u-boot-toradex"
 PREFERRED_RPROVIDER_u-boot-default-script = "u-boot-script-toradex"
@@ -25,7 +25,7 @@ UBOOT_BINARY = "u-boot-dtb.${UBOOT_SUFFIX}"
 UBOOT_MACHINE ?= "colibri_imx7_emmc_defconfig"
 
 IMAGE_FSTYPES += "tar.xz"
-IMAGE_BOOT_FILES_append = " boot.scr-${MACHINE};boot.scr"
-WKS_FILE_DEPENDS_append = " u-boot-default-script"
+IMAGE_BOOT_FILES:append = " boot.scr-${MACHINE};boot.scr"
+WKS_FILE_DEPENDS:append = " u-boot-default-script"
 
 MACHINE_FEATURES += "screen usbgadget usbhost vfat ext2 alsa touchscreen wifi bluetooth 3g"
diff --git a/conf/machine/colibri-imx7-nand.conf b/conf/machine/colibri-imx7-nand.conf
index 4ab7a95..c257b66 100644
--- a/conf/machine/colibri-imx7-nand.conf
+++ b/conf/machine/colibri-imx7-nand.conf
@@ -18,14 +18,14 @@ KERNEL_DEVICETREE = " \
     imx7s-colibri-eval-v3.dtb \
 "
 
-KERNEL_DEVICETREE_append_use-nxp-bsp = " \
+KERNEL_DEVICETREE:append:use-nxp-bsp = " \
     imx7d-colibri-aster.dtb \
     imx7s-colibri-aster.dtb \
 "
 
 # U-Boot of our newer release read the Kernel and device tree from static UBI
 # volumes, hence no need to deploy the kernel binary in the image itself
-RDEPENDS_${KERNEL_PACKAGE_NAME}-base = ""
+RDEPENDS:${KERNEL_PACKAGE_NAME}-base = ""
 
 PREFERRED_PROVIDER_u-boot ?= "u-boot-toradex"
 PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-toradex"
@@ -40,8 +40,8 @@ UBOOT_MACHINE ?= "colibri_imx7_defconfig"
 
 IMAGE_FSTYPES += "tar.xz"
 # wic support
-IMAGE_BOOT_FILES_append = " boot.scr-${MACHINE};boot.scr"
-WKS_FILE_DEPENDS_append = " u-boot-default-script"
+IMAGE_BOOT_FILES:append = " boot.scr-${MACHINE};boot.scr"
+WKS_FILE_DEPENDS:append = " u-boot-default-script"
 WKS_FILE = "sdimage-bootpart.wks"
 
 # Enable free --space-fixup (-F) by default, this allows DFU updates
diff --git a/conf/machine/colibri-vf.conf b/conf/machine/colibri-vf.conf
index 8c66ced..50a5f43 100644
--- a/conf/machine/colibri-vf.conf
+++ b/conf/machine/colibri-vf.conf
@@ -18,14 +18,14 @@ KERNEL_DEVICETREE = " \
     vf610-colibri-eval-v3.dtb \
 "
 
-KERNEL_DEVICETREE_append_use-nxp-bsp = " \
+KERNEL_DEVICETREE:append:use-nxp-bsp = " \
     vf500-colibri-aster.dtb \
     vf610-colibri-aster.dtb \
 "
 
 # U-Boot of our newer release read the Kernel and device tree from static UBI volumes,
 # hence no need to deploy the kernel binary in the image itself
-RDEPENDS_${KERNEL_PACKAGE_NAME}-base = ""
+RDEPENDS:${KERNEL_PACKAGE_NAME}-base = ""
 
 PREFERRED_PROVIDER_u-boot ?= "u-boot-toradex"
 PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-toradex"
@@ -35,7 +35,7 @@ PREFERRED_PROVIDER_u-boot-default-script ?= "u-boot-script-toradex"
 PREFERRED_PROVIDER_virtual/kernel-module-mcc ?= "kernel-module-mcc-toradex"
 PREFERRED_PROVIDER_virtual/kernel-module-mcc-dev ?= "kernel-module-mcc-toradex"
 PREFERRED_VERSION_mqxboot ?= "1.%"
-PREFERRED_VERSION_weston_use-nxp-bsp = ""
+PREFERRED_VERSION_weston:use-nxp-bsp = ""
 
 # U-Boot NAND binary includes 0x400 padding required for NAND boot
 UBOOT_BINARY = "u-boot-nand.imx"
@@ -44,8 +44,8 @@ UBOOT_MACHINE ?= "colibri_vf_defconfig"
 
 IMAGE_FSTYPES += "tar.xz ubifs"
 # wic support
-IMAGE_BOOT_FILES_append = " boot.scr-${MACHINE};boot.scr"
-WKS_FILE_DEPENDS_append = " u-boot-default-script"
+IMAGE_BOOT_FILES:append = " boot.scr-${MACHINE};boot.scr"
+WKS_FILE_DEPENDS:append = " u-boot-default-script"
 WKS_FILE = "sdimage-bootpart.wks"
 
 # Enable free --space-fixup (-F) by default, this allows DFU updates
diff --git a/conf/machine/imx6qdl-pico.conf b/conf/machine/imx6qdl-pico.conf
index 61f59bb..e397f4b 100644
--- a/conf/machine/imx6qdl-pico.conf
+++ b/conf/machine/imx6qdl-pico.conf
@@ -49,6 +49,6 @@ WKS_FILES ?= "imx-uboot-spl.wks.in"
 WKS_FILE_DEPENDS ?= ""
 IMAGE_FSTYPES = "wic.bmap wic.xz ext4.gz"
 
-MACHINE_FIRMWARE_append = " linux-firmware-ath10k"
+MACHINE_FIRMWARE:append = " linux-firmware-ath10k"
 
 MACHINE_FEATURES += " pci bluetooth touchscreen wifi"
diff --git a/conf/machine/imx6qdl-variscite-som.conf b/conf/machine/imx6qdl-variscite-som.conf
index f8f2e56..e39b930 100644
--- a/conf/machine/imx6qdl-variscite-som.conf
+++ b/conf/machine/imx6qdl-variscite-som.conf
@@ -25,7 +25,7 @@ KERNEL_DEVICETREE = " \
     imx6q-var-som-vsc.dtb \
 "
 
-KERNEL_DEVICETREE_use-mainline-bsp = " \
+KERNEL_DEVICETREE:use-mainline-bsp = " \
     imx6q-var-som-vsc.dtb \
 "
 
@@ -38,7 +38,7 @@ WKS_FILE = "imx-uboot-spl-bootpart.wks.in"
 
 PREFERRED_PROVIDER_virtual/bootloader = "u-boot-variscite"
 PREFERRED_PROVIDER_u-boot = "u-boot-variscite"
-UBOOT_ENTRYPOINT_use-mainline-bsp = "0x10008000"
+UBOOT_ENTRYPOINT:use-mainline-bsp = "0x10008000"
 
 UBOOT_CONFIG ??= "nand sd"
 UBOOT_CONFIG[sd] = "mx6var_som_sd_config,sdcard"
@@ -56,6 +56,6 @@ SERIAL_CONSOLES = "115200;ttymxc0"
 
 USE_VT = "0"
 
-MACHINE_FIRMWARE_append = " linux-firmware-wl12xx linux-firmware-wl18xx ti-18xx-wlconf"
+MACHINE_FIRMWARE:append = " linux-firmware-wl12xx linux-firmware-wl18xx ti-18xx-wlconf"
 
 MACHINE_FEATURES += " pci bluetooth touchscreen wifi"
diff --git a/conf/machine/lx2160acex7.conf b/conf/machine/lx2160acex7.conf
index f8a0193..3bd43d0 100644
--- a/conf/machine/lx2160acex7.conf
+++ b/conf/machine/lx2160acex7.conf
@@ -45,7 +45,7 @@ PREFERRED_VERSION_qoriq-atf = "1.5%"
 
 IMAGE_FSTYPES += "wic"
 WKS_FILE = "lx2160acex7.wks.in"
-WKS_FILE_DEPENDS_append = "\
+WKS_FILE_DEPENDS:append = "\
     ${PREFERRED_PROVIDER_u-boot-default-script} \
 "
 IMAGE_BOOT_FILES ?= "${KERNEL_IMAGETYPE} ${KERNEL_DEVICETREE_BASENAME} boot.scr-${MACHINE};boot.scr"
diff --git a/conf/machine/nitrogen6sx.conf b/conf/machine/nitrogen6sx.conf
index 1270248..be3bb4a 100644
--- a/conf/machine/nitrogen6sx.conf
+++ b/conf/machine/nitrogen6sx.conf
@@ -21,7 +21,7 @@ PREFERRED_PROVIDER_virtual/kernel_use-mainline-bsp ??= "linux-fslc"
 
 # wic support
 WKS_FILE = "sdimage-bootpart.wks"
-IMAGE_BOOT_FILES_append = " \
+IMAGE_BOOT_FILES:append = " \
     boot.scr-${MACHINE};boot.scr \
 "
 WKS_FILE_DEPENDS = " \
diff --git a/conf/machine/nitrogen6x-lite.conf b/conf/machine/nitrogen6x-lite.conf
index b0d4536..e5c8674 100644
--- a/conf/machine/nitrogen6x-lite.conf
+++ b/conf/machine/nitrogen6x-lite.conf
@@ -21,7 +21,7 @@ PREFERRED_PROVIDER_virtual/kernel_use-mainline-bsp ??= "linux-fslc"
 
 # wic support
 WKS_FILE = "sdimage-bootpart.wks"
-IMAGE_BOOT_FILES_append = " \
+IMAGE_BOOT_FILES:append = " \
     boot.scr-${MACHINE};boot.scr \
 "
 WKS_FILE_DEPENDS = " \
diff --git a/conf/machine/nitrogen6x.conf b/conf/machine/nitrogen6x.conf
index 34c1295..078a14c 100644
--- a/conf/machine/nitrogen6x.conf
+++ b/conf/machine/nitrogen6x.conf
@@ -44,7 +44,7 @@ KERNEL_DEVICETREE = "imx6q-sabrelite.dtb \
 "
 
 # Not yet supported by Linux mainline
-KERNEL_DEVICETREE_remove_use-mainline-bsp = "imx6dl-nitrogen6_vm.dtb imx6dl-nitrogen6_vm-magstripe.dtb"
+KERNEL_DEVICETREE:remove:use-mainline-bsp = "imx6dl-nitrogen6_vm.dtb imx6dl-nitrogen6_vm-magstripe.dtb"
 
 KERNEL_IMAGETYPE = "zImage"
 
@@ -56,7 +56,7 @@ PREFERRED_PROVIDER_virtual/kernel_use-mainline-bsp ??= "linux-fslc"
 
 # wic support
 WKS_FILE = "sdimage-bootpart.wks"
-IMAGE_BOOT_FILES_append = " \
+IMAGE_BOOT_FILES:append = " \
     boot.scr-${MACHINE};boot.scr \
 "
 WKS_FILE_DEPENDS = " \
diff --git a/conf/machine/nitrogen7.conf b/conf/machine/nitrogen7.conf
index 12a1a54..8e900ce 100644
--- a/conf/machine/nitrogen7.conf
+++ b/conf/machine/nitrogen7.conf
@@ -21,7 +21,7 @@ PREFERRED_PROVIDER_virtual/kernel_use-mainline-bsp ??= "linux-fslc"
 
 # wic support
 WKS_FILE = "sdimage-bootpart.wks"
-IMAGE_BOOT_FILES_append = " \
+IMAGE_BOOT_FILES:append = " \
     boot.scr-${MACHINE};boot.scr \
 "
 WKS_FILE_DEPENDS = " \
diff --git a/conf/machine/nitrogen8m.conf b/conf/machine/nitrogen8m.conf
index 5381767..0187b33 100644
--- a/conf/machine/nitrogen8m.conf
+++ b/conf/machine/nitrogen8m.conf
@@ -21,7 +21,7 @@ KERNEL_DEVICETREE = "freescale/imx8mq-nitrogen8m.dtb \
 	freescale/imx8mq-nitrogen8m-edp.dtb \
 "
 KERNEL_IMAGETYPE = "Image"
-RDEPENDS_${KERNEL_PACKAGE_NAME}-base = ""
+RDEPENDS:${KERNEL_PACKAGE_NAME}-base = ""
 
 # U-Boot configuration
 PREFERRED_PROVIDER_u-boot ??= "u-boot-boundary"
@@ -56,7 +56,7 @@ DDR_FIRMWARE_NAME = "\
     lpddr4_pmu_train_2d_dmem.bin \
 "
 
-IMAGE_BOOT_FILES_append = " \
+IMAGE_BOOT_FILES:append = " \
 	boot.scr-${MACHINE};boot.scr \
 	upgrade.scr-${MACHINE};upgrade.scr \
 	imx-boot;u-boot.${BOUNDARY_DEVICES_UBOOT_DEFCONFIG} \
@@ -64,7 +64,7 @@ IMAGE_BOOT_FILES_append = " \
 
 # wic support
 WKS_FILE = "sdimage-bootpart.wks"
-WKS_FILE_DEPENDS_mx8 += " \
+WKS_FILE_DEPENDS:mx8 += " \
 	u-boot-script-boundary \
 	e2fsprogs-native \
 	bmap-tools-native \
diff --git a/conf/machine/nitrogen8mm.conf b/conf/machine/nitrogen8mm.conf
index 2b050e0..1245f4b 100644
--- a/conf/machine/nitrogen8mm.conf
+++ b/conf/machine/nitrogen8mm.conf
@@ -25,7 +25,7 @@ KERNEL_DEVICETREE = "freescale/imx8mq-nitrogen8m.dtb \
 	freescale/imx8mm-nitrogen8mm_som-tc358743.dtb \
 "
 KERNEL_IMAGETYPE = "Image"
-RDEPENDS_${KERNEL_PACKAGE_NAME}-base = ""
+RDEPENDS:${KERNEL_PACKAGE_NAME}-base = ""
 
 # U-Boot configuration
 PREFERRED_PROVIDER_u-boot ??= "u-boot-boundary"
@@ -61,7 +61,7 @@ DDR_FIRMWARE_NAME = "\
     lpddr4_pmu_train_2d_dmem.bin \
 "
 
-IMAGE_BOOT_FILES_append = " \
+IMAGE_BOOT_FILES:append = " \
 	boot.scr-${MACHINE};boot.scr \
 	upgrade.scr-${MACHINE};upgrade.scr \
 	imx-boot;u-boot.${BOUNDARY_DEVICES_UBOOT_DEFCONFIG} \
@@ -69,7 +69,7 @@ IMAGE_BOOT_FILES_append = " \
 
 # wic support
 WKS_FILE = "sdimage-bootpart.wks"
-WKS_FILE_DEPENDS_mx8 += " \
+WKS_FILE_DEPENDS:mx8 += " \
 	u-boot-script-boundary \
 	e2fsprogs-native \
 	bmap-tools-native \
diff --git a/conf/machine/nitrogen8mn.conf b/conf/machine/nitrogen8mn.conf
index 7ef4de3..e0c48d0 100644
--- a/conf/machine/nitrogen8mn.conf
+++ b/conf/machine/nitrogen8mn.conf
@@ -20,7 +20,7 @@ KERNEL_DEVICETREE = "freescale/imx8mn-nitrogen8mn.dtb \
 
 KERNEL_IMAGETYPE = "Image"
 KERNEL_DEFCONFIG = "boundary_defconfig"
-RDEPENDS_${KERNEL_PACKAGE_NAME}-base = ""
+RDEPENDS:${KERNEL_PACKAGE_NAME}-base = ""
 
 # U-Boot configuration
 PREFERRED_PROVIDER_u-boot ??= "u-boot-boundary"
@@ -55,7 +55,7 @@ DDR_FIRMWARE_NAME = "\
     lpddr4_pmu_train_2d_dmem.bin \
 "
 
-IMAGE_BOOT_FILES_append = " \
+IMAGE_BOOT_FILES:append = " \
 	boot.scr-${MACHINE};boot.scr \
 	upgrade.scr-${MACHINE};upgrade.scr \
 	imx-boot;u-boot.${BOUNDARY_DEVICES_UBOOT_DEFCONFIG} \
@@ -63,7 +63,7 @@ IMAGE_BOOT_FILES_append = " \
 
 # wic support
 WKS_FILE = "sdimage-bootpart.wks"
-WKS_FILE_DEPENDS_mx8 += " \
+WKS_FILE_DEPENDS:mx8 += " \
 	u-boot-script-boundary \
 	e2fsprogs-native \
 	bmap-tools-native \
diff --git a/conf/machine/nitrogen8mp.conf b/conf/machine/nitrogen8mp.conf
index 779b781..4e98e50 100644
--- a/conf/machine/nitrogen8mp.conf
+++ b/conf/machine/nitrogen8mp.conf
@@ -15,7 +15,7 @@ KERNEL_DEVICETREE = "freescale/imx8mp-nitrogen8mp.dtb \
 		     freescale/imx8mp-a0-nitrogen8mp.dtb \
 "
 KERNEL_IMAGETYPE = "Image"
-RDEPENDS_${KERNEL_PACKAGE_NAME}-base = ""
+RDEPENDS:${KERNEL_PACKAGE_NAME}-base = ""
 
 # U-Boot configuration
 PREFERRED_PROVIDER_u-boot ??= "u-boot-boundary"
@@ -50,12 +50,12 @@ DDR_FIRMWARE_NAME = "\
 
 # wic support
 WKS_FILE = "sdimage-bootpart.wks"
-IMAGE_BOOT_FILES_append = " \
+IMAGE_BOOT_FILES:append = " \
 	boot.scr-${MACHINE};boot.scr \
 	upgrade.scr-${MACHINE};upgrade.scr \
 	imx-boot;u-boot.${BOUNDARY_DEVICES_UBOOT_DEFCONFIG} \
 "
-WKS_FILE_DEPENDS_mx8 += " \
+WKS_FILE_DEPENDS:mx8 += " \
 	u-boot-script-boundary \
 	e2fsprogs-native \
 	bmap-tools-native \
diff --git a/conf/machine/ventana.conf b/conf/machine/ventana.conf
index 7794c77..31b7d0f 100644
--- a/conf/machine/ventana.conf
+++ b/conf/machine/ventana.conf
@@ -38,7 +38,7 @@ KERNEL_DEVICETREE  = " \
 KERNEL_IMAGETYPE = "uImage"
 
 # Not yet supported by Linux mainline
-KERNEL_DEVICETREE_remove_use-mainline-bsp = "imx6q-gw560x.dtb imx6dl-gw560x.dtb"
+KERNEL_DEVICETREE:remove:use-mainline-bsp = "imx6q-gw560x.dtb imx6dl-gw560x.dtb"
 
 MACHINE_FEATURES += "pci wifi bluetooth"
 
@@ -59,7 +59,7 @@ MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "\
 # Bootloader configs:
 UBOOT_CONFIG ??= "std"
 UBOOT_CONFIG[std] = "gwventana_config"
-UBOOT_ENTRYPOINT_use-mainline-bsp = "0x10008000"
+UBOOT_ENTRYPOINT:use-mainline-bsp = "0x10008000"
 
 SERIAL_CONSOLES = "115200;ttymxc1"
 
diff --git a/conf/machine/wandboard.conf b/conf/machine/wandboard.conf
index a32cb0b..13fcada 100644
--- a/conf/machine/wandboard.conf
+++ b/conf/machine/wandboard.conf
@@ -21,7 +21,7 @@ UBOOT_EXTLINUX_ROOT = "root=PARTUUID=${uuid}"
 UBOOT_EXTLINUX_CONSOLE = "console=${console},${baudrate}"
 
 WANDBOARD_DEFAULT_KERNEL = "linux-wandboard"
-WANDBOARD_DEFAULT_KERNEL_use-mainline-bsp = "linux-fslc"
+WANDBOARD_DEFAULT_KERNEL:use-mainline-bsp = "linux-fslc"
 PREFERRED_PROVIDER_virtual/kernel ?= "${WANDBOARD_DEFAULT_KERNEL}"
 KERNEL_DEVICETREE = " \
     imx6dl-wandboard.dtb \
diff --git a/recipes-bsp/alsa-state/alsa-state.bbappend b/recipes-bsp/alsa-state/alsa-state.bbappend
index afdd912..b9f8bf2 100644
--- a/recipes-bsp/alsa-state/alsa-state.bbappend
+++ b/recipes-bsp/alsa-state/alsa-state.bbappend
@@ -1 +1 @@
-FILESEXTRAPATHS_prepend_cubox-i := "${THISDIR}/files:"
+FILESEXTRAPATHS:prepend:cubox-i := "${THISDIR}/files:"
diff --git a/recipes-bsp/atf/qoriq-atf_1.5.bbappend b/recipes-bsp/atf/qoriq-atf_1.5.bbappend
index 9f3171d..aab5dd4 100644
--- a/recipes-bsp/atf/qoriq-atf_1.5.bbappend
+++ b/recipes-bsp/atf/qoriq-atf_1.5.bbappend
@@ -1,6 +1,6 @@
-FILESEXTRAPATHS_append_lx2160acex7 := "${THISDIR}/${PN}-lx2160acex7:"
+FILESEXTRAPATHS:append:lx2160acex7 := "${THISDIR}/${PN}-lx2160acex7:"
 
-SRC_URI_append_lx2160acex7 = "\
+SRC_URI:append:lx2160acex7 = "\
 	file://0001-plat-nxp-Add-lx2160acex7-module-support.patch \
 	file://0002-plat-nxp-lx2160a-auto-boot.patch \
 "
diff --git a/recipes-bsp/broadcom-nvram-config/broadcom-nvram-config.inc b/recipes-bsp/broadcom-nvram-config/broadcom-nvram-config.inc
index afc96b5..5102bee 100644
--- a/recipes-bsp/broadcom-nvram-config/broadcom-nvram-config.inc
+++ b/recipes-bsp/broadcom-nvram-config/broadcom-nvram-config.inc
@@ -20,11 +20,11 @@ SRC_URI += " \
    file://brcmfmac${CHIP_MODEL}-sdio.txt \
 "
 
-FILES_${PN} = " \
+FILES:${PN} = " \
   ${BRCM_FWDIR}/brcmfmac${CHIP_MODEL}-sdio.txt \
 "
 
-RDEPENDS_${PN} = " \ 
+RDEPENDS:${PN} = " \ 
   linux-firmware-bcm${CHIP_MODEL} \
 "
 
diff --git a/recipes-bsp/formfactor/formfactor_0.0.bbappend b/recipes-bsp/formfactor/formfactor_0.0.bbappend
index 72d991c..4fc41d0 100644
--- a/recipes-bsp/formfactor/formfactor_0.0.bbappend
+++ b/recipes-bsp/formfactor/formfactor_0.0.bbappend
@@ -1 +1 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
diff --git a/recipes-bsp/imx-atf/imx-atf-boundary_2.2.bb b/recipes-bsp/imx-atf/imx-atf-boundary_2.2.bb
index c1de76c..ad33f4d 100644
--- a/recipes-bsp/imx-atf/imx-atf-boundary_2.2.bb
+++ b/recipes-bsp/imx-atf/imx-atf-boundary_2.2.bb
@@ -21,10 +21,10 @@ inherit deploy
 BOOT_TOOLS = "imx-boot-tools"
 
 ATF_PLATFORM        ?= "INVALID"
-ATF_PLATFORM_mx8mq   = "imx8mq"
-ATF_PLATFORM_mx8mm   = "imx8mm"
-ATF_PLATFORM_mx8mn   = "imx8mn"
-ATF_PLATFORM_mx8mp   = "imx8mp"
+ATF_PLATFORM:mx8mq   = "imx8mq"
+ATF_PLATFORM:mx8mm   = "imx8mm"
+ATF_PLATFORM:mx8mn   = "imx8mn"
+ATF_PLATFORM:mx8mp   = "imx8mp"
 
 EXTRA_OEMAKE += " \
     CROSS_COMPILE="${TARGET_PREFIX}" \
diff --git a/recipes-bsp/libmcc/libmcc_1.05.1.bb b/recipes-bsp/libmcc/libmcc_1.05.1.bb
index 5837dae..2b8b61c 100644
--- a/recipes-bsp/libmcc/libmcc_1.05.1.bb
+++ b/recipes-bsp/libmcc/libmcc_1.05.1.bb
@@ -17,7 +17,7 @@ S = "${WORKDIR}/libmcc-${PV}"
 
 CFLAGS += "-I${STAGING_KERNEL_DIR}/include"
 
-RDEPENDS_${PN} = "virtual/kernel-module-mcc"
+RDEPENDS:${PN} = "virtual/kernel-module-mcc"
 
 COMPATIBLE_MACHINE = "(vf60)"
 
@@ -25,5 +25,5 @@ do_install() {
     oe_runmake 'DESTDIR=${D}' install
 }
 
-RDEPENDS_${PN}-dev += "virtual/kernel-module-mcc-dev"
+RDEPENDS:${PN}-dev += "virtual/kernel-module-mcc-dev"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
diff --git a/recipes-bsp/mc-utils/mc-utils_git.bbappend b/recipes-bsp/mc-utils/mc-utils_git.bbappend
index 09c0415..0c0e81c 100644
--- a/recipes-bsp/mc-utils/mc-utils_git.bbappend
+++ b/recipes-bsp/mc-utils/mc-utils_git.bbappend
@@ -1,7 +1,7 @@
-FILESEXTRAPATHS_append_lx2160acex7 := "${THISDIR}/${PN}-lx2160acex7:"
+FILESEXTRAPATHS:append:lx2160acex7 := "${THISDIR}/${PN}-lx2160acex7:"
 
-SRC_URI_append_lx2160acex7 = "\
+SRC_URI:append:lx2160acex7 = "\
 	file://0001-lx2160acex7-add-8x10G-dual-40G-and-dual-100G-DPL-DPC.patch \
 "
 
-MC_FLAVOUR_lx2160acex7 = "CEX7"
+MC_FLAVOUR:lx2160acex7 = "CEX7"
diff --git a/recipes-bsp/mqxboot/mqxboot_1.0.1.bb b/recipes-bsp/mqxboot/mqxboot_1.0.1.bb
index 7465fa8..00f8d61 100644
--- a/recipes-bsp/mqxboot/mqxboot_1.0.1.bb
+++ b/recipes-bsp/mqxboot/mqxboot_1.0.1.bb
@@ -15,7 +15,7 @@ S = "${WORKDIR}/mqxboot-${PV}"
 
 CFLAGS += "-I${STAGING_KERNEL_DIR}/include"
 
-RDEPENDS_${PN} = "virtual/kernel-module-mcc"
+RDEPENDS:${PN} = "virtual/kernel-module-mcc"
 
 COMPATIBLE_MACHINE = "(vf60)"
 
diff --git a/recipes-bsp/rcw/rcw_git.bbappend b/recipes-bsp/rcw/rcw_git.bbappend
index 4384c04..35b893f 100644
--- a/recipes-bsp/rcw/rcw_git.bbappend
+++ b/recipes-bsp/rcw/rcw_git.bbappend
@@ -1,6 +1,6 @@
-FILESEXTRAPATHS_append_lx2160acex7 := "${THISDIR}/${PN}-lx2160acex7:"
+FILESEXTRAPATHS:append:lx2160acex7 := "${THISDIR}/${PN}-lx2160acex7:"
 
-SRC_URI_append_lx2160acex7 = "\
+SRC_URI:append:lx2160acex7 = "\
 	file://0001-lx2160acex7-misc-RCW-files.patch \
 	file://0002-Set-io-pads-as-GPIO.patch \
 	file://0003-S2-enable-gen3-xspi-increase-divisor-to-28.patch \
@@ -11,7 +11,7 @@ SRC_URI_append_lx2160acex7 = "\
 	file://0009-lx2160acex7-remove-all-predefined-RCW-files.patch \
 "
 
-do_configure_prepend_lx2160acex7 () {
+do_configure:prepend:lx2160acex7 () {
     for BT in ${BOARD_TARGETS}
     do
 	mkdir -p ${S}/${BOARD_TARGETS}/${SERDES}
diff --git a/recipes-bsp/u-boot/u-boot-boundary_2020.10.bb b/recipes-bsp/u-boot/u-boot-boundary_2020.10.bb
index c26e483..3cb688a 100644
--- a/recipes-bsp/u-boot/u-boot-boundary_2020.10.bb
+++ b/recipes-bsp/u-boot/u-boot-boundary_2020.10.bb
@@ -1,9 +1,9 @@
 require recipes-bsp/u-boot/u-boot.inc
 require recipes-bsp/u-boot/u-boot-boundary-common_${PV}.inc
 
-FILESEXTRAPATHS_prepend_mx6 := "${THISDIR}/${PN}/arm:"
-FILESEXTRAPATHS_prepend_mx7 := "${THISDIR}/${PN}/arm:"
-FILESEXTRAPATHS_prepend_mx8 := "${THISDIR}/${PN}/aarch64:"
+FILESEXTRAPATHS:prepend:mx6 := "${THISDIR}/${PN}/arm:"
+FILESEXTRAPATHS:prepend:mx7 := "${THISDIR}/${PN}/arm:"
+FILESEXTRAPATHS:prepend:mx8 := "${THISDIR}/${PN}/aarch64:"
 
 DEPENDS += "bison-native"
 
@@ -13,7 +13,7 @@ PROVIDES += "u-boot"
 
 BOOT_TOOLS = "imx-boot-tools"
 
-do_deploy_append_mx8 () {
+do_deploy:append:mx8 () {
 	install -d ${DEPLOYDIR}/${BOOT_TOOLS}
 	install -m 0777 ${B}/${config}/arch/arm/dts/${UBOOT_DTB_NAME}  ${DEPLOYDIR}/${BOOT_TOOLS}
 	install -m 0777 ${B}/${config}/u-boot-nodtb.bin  ${DEPLOYDIR}/${BOOT_TOOLS}/u-boot-nodtb.bin-${MACHINE}-${UBOOT_CONFIG}
diff --git a/recipes-bsp/u-boot/u-boot-fslc_%.bbappend b/recipes-bsp/u-boot/u-boot-fslc_%.bbappend
index a1f0e56..3461d92 100644
--- a/recipes-bsp/u-boot/u-boot-fslc_%.bbappend
+++ b/recipes-bsp/u-boot/u-boot-fslc_%.bbappend
@@ -1,2 +1,2 @@
-COMPATIBLE_MACHINE_imx6sl-warp = "(.)"
-COMPATIBLE_MACHINE_imx6dl-riotboard = "(.)"
+COMPATIBLE_MACHINE:imx6sl-warp = "(.)"
+COMPATIBLE_MACHINE:imx6dl-riotboard = "(.)"
diff --git a/recipes-bsp/u-boot/u-boot-qoriq_2019.10.bb b/recipes-bsp/u-boot/u-boot-qoriq_2019.10.bb
index 571fadb..b8276e6 100644
--- a/recipes-bsp/u-boot/u-boot-qoriq_2019.10.bb
+++ b/recipes-bsp/u-boot/u-boot-qoriq_2019.10.bb
@@ -28,14 +28,14 @@ SRCREV= "1e55b2f9e7f56b76569089b9e950f49c1579580e"
 
 S = "${WORKDIR}/git"
 B = "${WORKDIR}/build"
-PV_append = "+fslgit"
+PV:append = "+fslgit"
 LOCALVERSION = "+fsl"
 
 INHIBIT_DEFAULT_DEPS = "1"
 DEPENDS = "libgcc virtual/${TARGET_PREFIX}gcc bison-native bc-native swig-native python3-native"
-DEPENDS_append_qoriq-arm64 = " dtc-native"
-DEPENDS_append_qoriq-arm = " dtc-native"
-DEPENDS_append_qoriq-ppc = " boot-format-native"
+DEPENDS:append:qoriq-arm64 = " dtc-native"
+DEPENDS:append:qoriq-arm = " dtc-native"
+DEPENDS:append:qoriq-ppc = " boot-format-native"
 
 python () {
     if d.getVar("TCMODE") == "external-fsl":
@@ -50,8 +50,8 @@ python () {
         sys_multilib = d.getVar('TARGET_VENDOR') + 'mllib32-linux'
         sys_original = d.getVar('TARGET_VENDOR') + '-' + d.getVar('TARGET_OS')
         workdir = d.getVar('WORKDIR')
-        d.setVar('DEPENDS_append', ' lib32-gcc-cross-powerpc lib32-libgcc')
-        d.setVar('PATH_append', ':' + d.getVar('STAGING_BINDIR_NATIVE') + '/powerpc' + sys_multilib)
+        d.setVar('DEPENDS:append', ' lib32-gcc-cross-powerpc lib32-libgcc')
+        d.setVar('PATH:append', ':' + d.getVar('STAGING_BINDIR_NATIVE') + '/powerpc' + sys_multilib)
         d.setVar('TOOLCHAIN_OPTIONS', '--sysroot=' + workdir + '/lib32-recipe-sysroot')
         d.setVar("WRAP_TARGET_PREFIX", 'powerpc' + sys_multilib + '-')
     elif "fsl-lsch2-32b:" in arch:
@@ -60,8 +60,8 @@ python () {
         sys_multilib = d.getVar('TARGET_VENDOR') + 'mllib64-linux'
         sys_original = d.getVar('TARGET_VENDOR') + '-' + d.getVar('TARGET_OS')
         workdir = d.getVar('WORKDIR')
-        d.setVar('DEPENDS_append', ' lib64-gcc-cross-aarch64 lib64-libgcc')
-        d.setVar('PATH_append', ':' + d.getVar('STAGING_BINDIR_NATIVE') + '/aarch64' + sys_multilib)
+        d.setVar('DEPENDS:append', ' lib64-gcc-cross-aarch64 lib64-libgcc')
+        d.setVar('PATH:append', ':' + d.getVar('STAGING_BINDIR_NATIVE') + '/aarch64' + sys_multilib)
         d.setVar('TOOLCHAIN_OPTIONS', '--sysroot=' + workdir + '/lib64-recipe-sysroot')
         d.setVar("WRAP_TARGET_PREFIX", 'aarch64' + sys_multilib + '-')
 }
@@ -75,7 +75,7 @@ EXTRA_OEMAKE = 'CROSS_COMPILE=${WRAP_TARGET_PREFIX} CC="${WRAP_TARGET_PREFIX}gcc
 EXTRA_OEMAKE += 'HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}"'
 EXTRA_OEMAKE += 'STAGING_INCDIR=${STAGING_INCDIR_NATIVE} STAGING_LIBDIR=${STAGING_LIBDIR_NATIVE}'
 
-do_compile_append_qoriq() {
+do_compile:append:qoriq() {
     unset i j k
     for config in ${UBOOT_MACHINE}; do
         i=`expr $i + 1`;
@@ -103,5 +103,5 @@ do_compile_append_qoriq() {
 
 
 PACKAGES += "${PN}-images"
-FILES_${PN}-images += "/boot"
+FILES:${PN}-images += "/boot"
 COMPATIBLE_MACHINE = "(qoriq)"
diff --git a/recipes-bsp/u-boot/u-boot-qoriq_2019.10.bbappend b/recipes-bsp/u-boot/u-boot-qoriq_2019.10.bbappend
index 40e6c38..6538fd1 100644
--- a/recipes-bsp/u-boot/u-boot-qoriq_2019.10.bbappend
+++ b/recipes-bsp/u-boot/u-boot-qoriq_2019.10.bbappend
@@ -1,6 +1,6 @@
-FILESEXTRAPATHS_append_lx2160acex7 := "${THISDIR}/${PN}-lx2160acex7:"
+FILESEXTRAPATHS:append:lx2160acex7 := "${THISDIR}/${PN}-lx2160acex7:"
 
-SRC_URI_append_lx2160acex7 = "\
+SRC_URI:append:lx2160acex7 = "\
     file://0001-armv8-add-lx2160acex7-build-inclusion.patch \
     file://0002-armv8-lx2160acex-misc-hacks-to-get-the-sources-built.patch \
     file://0003-armv8-lx2160acex7-defconfig-and-main-platform-includ.patch \
diff --git a/recipes-bsp/u-boot/u-boot-script-boundary_2020.10.bb b/recipes-bsp/u-boot/u-boot-script-boundary_2020.10.bb
index 80e8723..1952930 100644
--- a/recipes-bsp/u-boot/u-boot-script-boundary_2020.10.bb
+++ b/recipes-bsp/u-boot/u-boot-script-boundary_2020.10.bb
@@ -5,7 +5,7 @@ DEPENDS = "u-boot-mkimage-native"
 inherit deploy
 
 BOOTSCRIPT ??= "${S}/board/boundary/bootscripts/bootscript-yocto.txt"
-BOOTSCRIPT_use-mainline-bsp ??= "${S}/board/boundary/bootscripts/bootscript-mainline.txt"
+BOOTSCRIPT:use-mainline-bsp ??= "${S}/board/boundary/bootscripts/bootscript-mainline.txt"
 
 UPGRADESCRIPT = "${S}/board/boundary/bootscripts/upgrade.txt"
 
@@ -40,6 +40,6 @@ do_deploy () {
 
 addtask deploy after do_install before do_build
 
-FILES_${PN} += "/"
+FILES:${PN} += "/"
 
 COMPATIBLE_MACHINE = "(nitrogen6x-lite|nitrogen6x|nitrogen6sx|nitrogen7|nitrogen8m|nitrogen8mm|nitrogen8mn|nitrogen8mp)"
diff --git a/recipes-bsp/u-boot/u-boot-script-gateworks-imx.bb b/recipes-bsp/u-boot/u-boot-script-gateworks-imx.bb
index 5023f37..f1b17d8 100644
--- a/recipes-bsp/u-boot/u-boot-script-gateworks-imx.bb
+++ b/recipes-bsp/u-boot/u-boot-script-gateworks-imx.bb
@@ -24,7 +24,7 @@ do_install() {
     ln -sf 6x_bootscript-${MACHINE}-${PV}-${PR} 6x_bootscript-${MACHINE}
 }
 
-FILES_${PN} = "${DESTDIR}/*"
+FILES:${PN} = "${DESTDIR}/*"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 COMPATIBLE_MACHINE = "(ventana)"
diff --git a/recipes-bsp/u-boot/u-boot-script-qoriq_2019.10.bb b/recipes-bsp/u-boot/u-boot-script-qoriq_2019.10.bb
index eadd683..ebdecf8 100644
--- a/recipes-bsp/u-boot/u-boot-script-qoriq_2019.10.bb
+++ b/recipes-bsp/u-boot/u-boot-script-qoriq_2019.10.bb
@@ -51,4 +51,4 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 COMPATIBLE_MACHINE = "(qoriq)"
 
-FILES_${PN} = "/boot"
+FILES:${PN} = "/boot"
diff --git a/recipes-bsp/u-boot/u-boot-script-toradex_2020.07.bb b/recipes-bsp/u-boot/u-boot-script-toradex_2020.07.bb
index a2aacdb..6e93d34 100644
--- a/recipes-bsp/u-boot/u-boot-script-toradex_2020.07.bb
+++ b/recipes-bsp/u-boot/u-boot-script-toradex_2020.07.bb
@@ -10,7 +10,7 @@ SRC_URI = "\
 "
 
 KERNEL_BOOTCMD ??= "bootz"
-KERNEL_BOOTCMD_aarch64 ?= "booti"
+KERNEL_BOOTCMD:aarch64 ?= "booti"
 
 inherit deploy nopackages
 
diff --git a/recipes-bsp/u-boot/u-boot-toradex_2020.07.bb b/recipes-bsp/u-boot/u-boot-toradex_2020.07.bb
index 6a1c71e..af11c3e 100644
--- a/recipes-bsp/u-boot/u-boot-toradex_2020.07.bb
+++ b/recipes-bsp/u-boot/u-boot-toradex_2020.07.bb
@@ -18,14 +18,14 @@ nand_padding () {
     dd bs=1024 count=1 if=/dev/zero | cat - u-boot.imx > u-boot-nand.imx
 }
 
-do_compile_append_colibri-imx6ull () {
+do_compile:append:colibri-imx6ull () {
     nand_padding
 }
 
-do_compile_append_colibri-imx7 () {
+do_compile:append:colibri-imx7 () {
     nand_padding
 }
 
-do_compile_append_colibri-vf () {
+do_compile:append:colibri-vf () {
     nand_padding
 }
diff --git a/recipes-connectivity/ti-18xx-wlconf/ti-18xx-wlconf_8.7.3..bb b/recipes-connectivity/ti-18xx-wlconf/ti-18xx-wlconf_8.7.3..bb
index 138166e..24ec757 100644
--- a/recipes-connectivity/ti-18xx-wlconf/ti-18xx-wlconf_8.7.3..bb
+++ b/recipes-connectivity/ti-18xx-wlconf/ti-18xx-wlconf_8.7.3..bb
@@ -30,11 +30,11 @@ do_install() {
 			${D}${sbindir}/wlconf/official_inis/
 }
 
-FILES_${PN} += " \
+FILES:${PN} += " \
 	${sbindir}/wlconf \
 	${sbindir}/wlconf/official_inis \
 	/lib/firmware/ti-connectivity/wl18xx-conf.bin \
 "
 
-FILES_${PN}-dbg += "${sbindir}/wlconf/.debug"
+FILES:${PN}-dbg += "${sbindir}/wlconf/.debug"
 
diff --git a/recipes-core/init-ifupdown/init-ifupdown_1.0.bbappend b/recipes-core/init-ifupdown/init-ifupdown_1.0.bbappend
index a276059..1f56acd 100644
--- a/recipes-core/init-ifupdown/init-ifupdown_1.0.bbappend
+++ b/recipes-core/init-ifupdown/init-ifupdown_1.0.bbappend
@@ -1 +1 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/init-ifupdown:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/init-ifupdown:"
diff --git a/recipes-kernel/kernel-module-mcc-toradex/kernel-module-mcc-toradex_1.06+toradex2.bb b/recipes-kernel/kernel-module-mcc-toradex/kernel-module-mcc-toradex_1.06+toradex2.bb
index 6022168..ca1dad1 100644
--- a/recipes-kernel/kernel-module-mcc-toradex/kernel-module-mcc-toradex_1.06+toradex2.bb
+++ b/recipes-kernel/kernel-module-mcc-toradex/kernel-module-mcc-toradex_1.06+toradex2.bb
@@ -5,8 +5,8 @@ LICENSE = "GPL-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=c8959abcbbe4d6676c58eab9354019e6"
 
 PROVIDES = "virtual/kernel-module-mcc"
-RPROVIDES_${PN} = "virtual/kernel-module-mcc"
-RPROVIDES_${PN}-dev = "virtual/kernel-module-mcc-dev"
+RPROVIDES:${PN} = "virtual/kernel-module-mcc"
+RPROVIDES:${PN}-dev = "virtual/kernel-module-mcc-dev"
 
 inherit module
 
diff --git a/recipes-kernel/linux-firmware/linux-firmware_%.bbappend b/recipes-kernel/linux-firmware/linux-firmware_%.bbappend
index 50deb2e..83ff9ad 100644
--- a/recipes-kernel/linux-firmware/linux-firmware_%.bbappend
+++ b/recipes-kernel/linux-firmware/linux-firmware_%.bbappend
@@ -2,14 +2,14 @@
 # TIInit_11.8.32.bts is required for bluetooth support but this particular
 # version is not available in the linux-firmware repository.
 #
-SRC_URI_append_imx6qdl-variscite-som = "\
+SRC_URI:append:imx6qdl-variscite-som = "\
     https://git.ti.com/ti-bt/service-packs/blobs/raw/5f73abe7c03631bb2596af27e41a94abcc70b009/initscripts/TIInit_11.8.32.bts;name=TIInit_11.8.32 \
 "
 SRC_URI[TIInit_11.8.32.md5sum] = "a76788680905c30979038f9e6aa407f3"
 SRC_URI[TIInit_11.8.32.sha256sum] = "26ab0608e39fab95a6a55070c2f8364c92aad34442e8349abda71cee4da3277a"
 
-do_install_append_imx6qdl-variscite-som() {
+do_install:append:imx6qdl-variscite-som() {
     cp ${WORKDIR}/TIInit_11.8.32.bts ${D}/lib/firmware/ti-connectivity/
 }
 
-PACKAGE_ARCH_imx6qdl-variscite-som = "${MACHINE_ARCH}"
+PACKAGE_ARCH:imx6qdl-variscite-som = "${MACHINE_ARCH}"
diff --git a/recipes-kernel/linux/linux-fslc_%.bbappend b/recipes-kernel/linux/linux-fslc_%.bbappend
index 5b675d6..aadb0ac 100644
--- a/recipes-kernel/linux/linux-fslc_%.bbappend
+++ b/recipes-kernel/linux/linux-fslc_%.bbappend
@@ -1,13 +1,13 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
-COMPATIBLE_MACHINE_imx6sl-warp = "(.)"
-COMPATIBLE_MACHINE_imx6dl-riotboard = "(.)"
+COMPATIBLE_MACHINE:imx6sl-warp = "(.)"
+COMPATIBLE_MACHINE:imx6dl-riotboard = "(.)"
 
-SRC_URI_append_imx6qdl-variscite-som_use-mainline-bsp = " \
+SRC_URI:append:imx6qdl-variscite-som:use-mainline-bsp = " \
     file://imx6qdl-var-som.dtsi \
     file://imx6q-var-som-vsc.dts \
 "
 
-do_configure_prepend_imx6qdl-variscite-som() {
+do_configure:prepend:imx6qdl-variscite-som() {
     cp ${WORKDIR}/imx6*-var*.dts* ${S}/arch/arm/boot/dts
 }
diff --git a/recipes-kernel/linux/linux-lx2160acex7.inc b/recipes-kernel/linux/linux-lx2160acex7.inc
index 8bc63af..e88a895 100644
--- a/recipes-kernel/linux/linux-lx2160acex7.inc
+++ b/recipes-kernel/linux/linux-lx2160acex7.inc
@@ -1,6 +1,6 @@
-FILESEXTRAPATHS_append_lx2160acex7 := "${THISDIR}/linux-fslc-qoriq-lx2160acex7:"
+FILESEXTRAPATHS:append:lx2160acex7 := "${THISDIR}/linux-fslc-qoriq-lx2160acex7:"
 
-SRC_URI_append_lx2160acex7 = "\
+SRC_URI:append:lx2160acex7 = "\
     file://0001-arm64-dts-lx2160a-add-lx2160acex7-device-tree-build.patch \
     file://0002-arm64-dts-lx2160a-add-lx2160acex7-device-tree.patch \
     file://0005-arm64-dts-lx2160a-cex7-add-ltc3882-support.patch \
diff --git a/recipes-kernel/linux/linux-toradex_4.14-2.0.x.bb b/recipes-kernel/linux/linux-toradex_4.14-2.0.x.bb
index 0ef1075..a13c659 100644
--- a/recipes-kernel/linux/linux-toradex_4.14-2.0.x.bb
+++ b/recipes-kernel/linux/linux-toradex_4.14-2.0.x.bb
@@ -1,4 +1,4 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-${PV}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-${PV}:"
 
 require recipes-kernel/linux/linux-imx.inc
 
@@ -12,7 +12,7 @@ SRC_URI = "git://git.toradex.com/linux-toradex.git;protocol=git;branch=${SRCBRAN
 # Load USB functions configurable through configfs (CONFIG_USB_CONFIGFS)
 KERNEL_MODULE_AUTOLOAD += "${@bb.utils.contains('COMBINED_FEATURES', 'usbgadget', ' libcomposite', '',d)}"
 
-PV_append = "+git${SRCPV}"
+PV:append = "+git${SRCPV}"
 
 LINUX_VERSION = "4.14.159"
 
diff --git a/recipes-kernel/linux/linux-toradex_4.4.bb b/recipes-kernel/linux/linux-toradex_4.4.bb
index f26a99f..9a07e94 100644
--- a/recipes-kernel/linux/linux-toradex_4.4.bb
+++ b/recipes-kernel/linux/linux-toradex_4.4.bb
@@ -1,4 +1,4 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-${PV}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-${PV}:"
 require recipes-kernel/linux/linux-imx.inc
 
 SUMMARY = "Linux kernel for Toradex Colibri VFxx Computer on Modules"
@@ -9,7 +9,7 @@ SRC_URI = "git://git.toradex.com/linux-toradex.git;protocol=git;branch=${SRCBRAN
 KERNEL_MODULE_AUTOLOAD += "${@bb.utils.contains('COMBINED_FEATURES', 'usbgadget', ' libcomposite', '',d)}"
 
 LOCALVERSION = "-0.0.0"
-PV_append = "+git${SRCPV}"
+PV:append = "+git${SRCPV}"
 
 LINUX_VERSION = "4.4.274"