diff --git a/conf/machine/colibri-imx6.conf b/conf/machine/colibri-imx6.conf
index 8ed676d..7224a38 100644
--- a/conf/machine/colibri-imx6.conf
+++ b/conf/machine/colibri-imx6.conf
@@ -9,7 +9,7 @@ MACHINEOVERRIDES =. "mx6:mx6dl:"
 include conf/machine/include/imx-base.inc
 include conf/machine/include/arm/armv7a/tune-cortexa9.inc
 
-PREFERRED_PROVIDER_virtual/kernel_use-nxp-bsp ??= "linux-toradex"
+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"
diff --git a/conf/machine/colibri-imx7-emmc.conf b/conf/machine/colibri-imx7-emmc.conf
index 3e304f5..563a3b2 100644
--- a/conf/machine/colibri-imx7-emmc.conf
+++ b/conf/machine/colibri-imx7-emmc.conf
@@ -9,7 +9,7 @@ MACHINEOVERRIDES =. "mx7:mx7d:"
 include conf/machine/include/imx-base.inc
 include conf/machine/include/arm/armv7a/tune-cortexa7.inc
 
-PREFERRED_PROVIDER_virtual/kernel_use-nxp-bsp ??= "linux-toradex"
+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"
diff --git a/conf/machine/colibri-imx7-nand.conf b/conf/machine/colibri-imx7-nand.conf
index e562c9c..36391d5 100644
--- a/conf/machine/colibri-imx7-nand.conf
+++ b/conf/machine/colibri-imx7-nand.conf
@@ -9,7 +9,7 @@ MACHINEOVERRIDES =. "mx7:mx7d:colibri-imx7:"
 include conf/machine/include/imx-base.inc
 include conf/machine/include/arm/armv7a/tune-cortexa7.inc
 
-PREFERRED_PROVIDER_virtual/kernel_use-nxp-bsp ??= "linux-toradex"
+PREFERRED_PROVIDER_virtual/kernel:use-nxp-bsp ??= "linux-toradex"
 
 KERNEL_IMAGETYPE = "zImage"
 
diff --git a/conf/machine/colibri-vf.conf b/conf/machine/colibri-vf.conf
index e0173f7..9c9be6d 100644
--- a/conf/machine/colibri-vf.conf
+++ b/conf/machine/colibri-vf.conf
@@ -9,7 +9,7 @@ MACHINEOVERRIDES =. "vf:vf50:vf60:"
 include conf/machine/include/imx-base.inc
 include conf/machine/include/arm/armv7a/tune-cortexa5.inc
 
-PREFERRED_PROVIDER_virtual/kernel_use-nxp-bsp ??= "linux-toradex"
+PREFERRED_PROVIDER_virtual/kernel:use-nxp-bsp ??= "linux-toradex"
 
 KERNEL_IMAGETYPE = "zImage"
 
diff --git a/conf/machine/imx6q-dms-ba16.conf b/conf/machine/imx6q-dms-ba16.conf
index 4577665..babc8ba 100644
--- a/conf/machine/imx6q-dms-ba16.conf
+++ b/conf/machine/imx6q-dms-ba16.conf
@@ -11,7 +11,7 @@ include conf/machine/include/arm/armv7a/tune-cortexa9.inc
 
 UBOOT_MACHINE = "dms-ba16_defconfig"
 
-PREFERRED_PROVIDER_virtual/kernel_use-nxp-bsp = "linux-advantech"
+PREFERRED_PROVIDER_virtual/kernel:use-nxp-bsp = "linux-advantech"
 PREFERRED_PROVIDER_kernel = "linux-advantech"
 KERNEL_DEVICETREE = "imx6q-dms-ba16.dtb"
 KERNEL_IMAGETYPE = "uImage"
diff --git a/conf/machine/imx6qdl-variscite-som.conf b/conf/machine/imx6qdl-variscite-som.conf
index 56cb719..74c993a 100644
--- a/conf/machine/imx6qdl-variscite-som.conf
+++ b/conf/machine/imx6qdl-variscite-som.conf
@@ -11,7 +11,7 @@ require conf/machine/include/imx-base.inc
 require conf/machine/include/arm/armv7a/tune-cortexa9.inc
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-variscite"
-PREFERRED_PROVIDER_virtual/kernel_use-mainline-bsp ??= "linux-fslc"
+PREFERRED_PROVIDER_virtual/kernel:use-mainline-bsp ??= "linux-fslc"
 
 KERNEL_DEVICETREE = " \
     imx6dl-var-som-cap.dtb \
diff --git a/conf/machine/nitrogen6sx.conf b/conf/machine/nitrogen6sx.conf
index 96bd946..46a1507 100644
--- a/conf/machine/nitrogen6sx.conf
+++ b/conf/machine/nitrogen6sx.conf
@@ -17,7 +17,7 @@ KERNEL_IMAGETYPE = "zImage"
 PREFERRED_PROVIDER_u-boot ??= "u-boot-boundary"
 PREFERRED_PROVIDER_virtual/bootloader ??= "u-boot-boundary"
 PREFERRED_PROVIDER_virtual/kernel ??= "linux-boundary"
-PREFERRED_PROVIDER_virtual/kernel_use-mainline-bsp ??= "linux-fslc"
+PREFERRED_PROVIDER_virtual/kernel:use-mainline-bsp ??= "linux-fslc"
 
 # wic support
 WKS_FILE = "sdimage-bootpart.wks"
diff --git a/conf/machine/nitrogen6x-lite.conf b/conf/machine/nitrogen6x-lite.conf
index 921c4c2..d298355 100644
--- a/conf/machine/nitrogen6x-lite.conf
+++ b/conf/machine/nitrogen6x-lite.conf
@@ -17,7 +17,7 @@ KERNEL_IMAGETYPE = "zImage"
 PREFERRED_PROVIDER_u-boot ??= "u-boot-boundary"
 PREFERRED_PROVIDER_virtual/bootloader ??= "u-boot-boundary"
 PREFERRED_PROVIDER_virtual/kernel ??= "linux-boundary"
-PREFERRED_PROVIDER_virtual/kernel_use-mainline-bsp ??= "linux-fslc"
+PREFERRED_PROVIDER_virtual/kernel:use-mainline-bsp ??= "linux-fslc"
 
 # wic support
 WKS_FILE = "sdimage-bootpart.wks"
diff --git a/conf/machine/nitrogen6x.conf b/conf/machine/nitrogen6x.conf
index 2357bfc..b2f9d3d 100644
--- a/conf/machine/nitrogen6x.conf
+++ b/conf/machine/nitrogen6x.conf
@@ -52,7 +52,7 @@ IMX_DEFAULT_BOOTLOADER = "u-boot-boundary"
 UBOOT_SUFFIX = "imx"
 UBOOT_BINARY = "u-boot-dtb.${UBOOT_SUFFIX}"
 PREFERRED_PROVIDER_virtual/kernel ??= "linux-boundary"
-PREFERRED_PROVIDER_virtual/kernel_use-mainline-bsp ??= "linux-fslc"
+PREFERRED_PROVIDER_virtual/kernel:use-mainline-bsp ??= "linux-fslc"
 
 # wic support
 WKS_FILE = "sdimage-bootpart.wks"
diff --git a/conf/machine/nitrogen7.conf b/conf/machine/nitrogen7.conf
index d75fcd1..3597178 100644
--- a/conf/machine/nitrogen7.conf
+++ b/conf/machine/nitrogen7.conf
@@ -17,7 +17,7 @@ KERNEL_IMAGETYPE = "zImage"
 PREFERRED_PROVIDER_u-boot ??= "u-boot-boundary"
 PREFERRED_PROVIDER_virtual/bootloader ??= "u-boot-boundary"
 PREFERRED_PROVIDER_virtual/kernel ??= "linux-boundary"
-PREFERRED_PROVIDER_virtual/kernel_use-mainline-bsp ??= "linux-fslc"
+PREFERRED_PROVIDER_virtual/kernel:use-mainline-bsp ??= "linux-fslc"
 
 # wic support
 WKS_FILE = "sdimage-bootpart.wks"
diff --git a/conf/machine/ventana.conf b/conf/machine/ventana.conf
index 8dbbf8a..2b0aea4 100644
--- a/conf/machine/ventana.conf
+++ b/conf/machine/ventana.conf
@@ -13,7 +13,7 @@ PREFERRED_PROVIDER_virtual/bootloader = "u-boot-gateworks-imx"
 PREFERRED_PROVIDER_u-boot = "u-boot-gateworks-imx"
 
 PREFERRED_PROVIDER_virtual/kernel ??= "linux-gateworks-imx"
-PREFERRED_PROVIDER_virtual/kernel_use-mainline-bsp ??= "linux-fslc"
+PREFERRED_PROVIDER_virtual/kernel:use-mainline-bsp ??= "linux-fslc"
 
 KERNEL_DEVICETREE  = " \
     imx6q-gw5400-a.dtb \