diff --git a/conf/distro/hipos.conf b/conf/distro/hipos.conf
index 8db07426..e03223f8 100644
--- a/conf/distro/hipos.conf
+++ b/conf/distro/hipos.conf
@@ -15,30 +15,30 @@ SDKPATHINSTALL = "/usr/local/${SDK_NAME_PREFIX}-${SDK_ARCH}/${TUNE_PKGARCH}"
 MAINTAINER = "DFE"
 
 REMOVE_VULKAN_FEATURE = "vulkan"
-REMOVE_VULKAN_FEATURE:mx8 = ""
+REMOVE_VULKAN_FEATURE:mx8-nxp-bsp = ""
 POKY_DEFAULT_DISTRO_FEATURES:remove      = "wayland ${REMOVE_VULKAN_FEATURE}"
-POKY_DEFAULT_DISTRO_FEATURES:append:mx8  = " jailhouse"
+POKY_DEFAULT_DISTRO_FEATURES:append:mx8-nxp-bsp  = " jailhouse"
 
 INHERIT:remove = "uninative"
 
-PREFERRED_PROVIDER_virtual/bootloader:mx8 = "u-boot-imx"
-PREFERRED_PROVIDER_virtual/kernel:mx8 = "linux-imx"
+PREFERRED_PROVIDER_virtual/bootloader:mx8-nxp-bsp = "u-boot-imx"
+PREFERRED_PROVIDER_virtual/kernel:mx8-nxp-bsp = "linux-imx"
 
-PREFERRED_VERSION_linux-libc-headers:imx ?= "5.10"
+PREFERRED_VERSION_linux-libc-headers:imx-nxp-bsp ?= "5.10"
 
 PREFERRED_PROVIDER_opencl-headers:imxgpu = "imx-gpu-viv"
 PREFERRED_PROVIDER_opencl-icd-loader:imxgpu = "imx-gpu-viv"
 
-PREFERRED_VERSION_gstreamer1.0-plugins-base:mx8 = "1.18.0.imx"
-PREFERRED_VERSION_gstreamer1.0-plugins-bad:mx8  = "1.18.0.imx"
-PREFERRED_VERSION_gstreamer1.0-plugins-good:mx8 = "1.18.0.imx"
-PREFERRED_VERSION_gstreamer1.0-plugins-good-qt:mx8 = "1.18.0.imx"
-PREFERRED_VERSION_gstreamer1.0:mx8              = "1.18.0.imx"
-PREFERRED_VERSION_gstreamer1.0-libav:mx8        = "1.18.0"
+PREFERRED_VERSION_gstreamer1.0-plugins-base:mx8-nxp-bsp = "1.18.0.imx"
+PREFERRED_VERSION_gstreamer1.0-plugins-bad:mx8-nxp-bsp  = "1.18.0.imx"
+PREFERRED_VERSION_gstreamer1.0-plugins-good:mx8-nxp-bsp = "1.18.0.imx"
+PREFERRED_VERSION_gstreamer1.0-plugins-good-qt:mx8-nxp-bsp = "1.18.0.imx"
+PREFERRED_VERSION_gstreamer1.0:mx8-nxp-bsp              = "1.18.0.imx"
+PREFERRED_VERSION_gstreamer1.0-libav:mx8-nxp-bsp        = "1.18.0"
 
 PREFERRED_VERSION_opengl-es-cts     = "3.2.6.1"
-PREFERRED_VERSION_opengl-es-cts:mx6 = "3.2.4.0"
-PREFERRED_VERSION_opengl-es-cts:mx7 = "3.2.4.0"
+PREFERRED_VERSION_opengl-es-cts:mx6-nxp-bsp = "3.2.4.0"
+PREFERRED_VERSION_opengl-es-cts:mx7-nxp-bsp = "3.2.4.0"
 
 # Use systemd as default init manager
 VIRTUAL-RUNTIME_init_manager = "systemd"
@@ -50,7 +50,7 @@ POKY_DEFAULT_DISTRO_FEATURES += " systemd"
 # Remove conflicting backends
 DISTRO_FEATURES:remove = "directfb x11 "
 DISTRO_FEATURES:append = " pam systemd"
-DISTRO_FEATURES:append:mx8 = " wayland"
+DISTRO_FEATURES:append:mx8-nxp-bsp = " wayland"
 
 LICENSE_FLAGS_ACCEPTED += "commercial"
 
diff --git a/conf/machine/himx0294.conf b/conf/machine/himx0294.conf
index 0d42f41b..6399418f 100644
--- a/conf/machine/himx0294.conf
+++ b/conf/machine/himx0294.conf
@@ -3,7 +3,7 @@
 #@SOC: i.MX6Q
 #@DESCRIPTION: Machine configuration for DResearch HydraIP device based on Freescale i.MX6 (Smart Terminal)
 
-MACHINEOVERRIDES =. "mx6:mx6q:mx6dl:"
+MACHINEOVERRIDES =. "mx6q:mx6dl:"
 
 include conf/machine/include/imx-base.inc
 include conf/machine/include/tune-cortexa9.inc
@@ -14,7 +14,7 @@ IMX_DEFAULT_BSP = "nxp"
 
 SERIAL_CONSOLES = "115200;ttymxc1"
 
-SOC_FAMILY = "mx6:mx6dl:mx6q"
+SOC_FAMILY = "mx6dl:mx6q"
 
 KERNEL_DEVICETREE = " \
 	imx6q-himx0294-imoc.dtb     \
diff --git a/conf/machine/imx6dqscm-1gb-evb.conf b/conf/machine/imx6dqscm-1gb-evb.conf
index e4921953..e1bdf435 100644
--- a/conf/machine/imx6dqscm-1gb-evb.conf
+++ b/conf/machine/imx6dqscm-1gb-evb.conf
@@ -6,7 +6,7 @@
 
 require conf/machine/include/imx6sabresd-common.inc
 
-SOC_FAMILY = "mx6:mx6q"
+SOC_FAMILY = "mx6q"
 
 KERNEL_DEVICETREE = "imx6dqscm-1gb-evb-fix-ldo.dtb imx6dqscm-1gb-evb-hdcp-fix-ldo.dtb  \
                      imx6dqscm-1gb-evb-enetirq-fix-ldo.dtb imx6dqscm-1gb-evb-btwifi-fix-ldo.dtb"
diff --git a/conf/machine/imx6dqscm-1gb-qwks.conf b/conf/machine/imx6dqscm-1gb-qwks.conf
index c28cff60..d79a73be 100644
--- a/conf/machine/imx6dqscm-1gb-qwks.conf
+++ b/conf/machine/imx6dqscm-1gb-qwks.conf
@@ -7,7 +7,7 @@
 require conf/machine/include/imx6sabresd-common.inc
 include conf/machine/include/soc-family.inc
 
-SOC_FAMILY = "mx6:mx6q"
+SOC_FAMILY = "mx6q"
 
 KERNEL_DEVICETREE = "imx6dqscm-1gb-qwks-rev2-interleave-ldo.dtb imx6dqscm-1gb-qwks-rev2-hdcp-interleave-ldo.dtb imx6dqscm-1gb-qwks-rev2-wifi-interleave-ldo.dtb imx6dqscm-1gb-qwks-rmii-50mhz.dtb"
 
diff --git a/conf/machine/imx6dqscm-2gb-evb.conf b/conf/machine/imx6dqscm-2gb-evb.conf
index db81e799..617e172c 100644
--- a/conf/machine/imx6dqscm-2gb-evb.conf
+++ b/conf/machine/imx6dqscm-2gb-evb.conf
@@ -6,7 +6,7 @@
 
 require conf/machine/include/imx6sabresd-common.inc
 
-SOC_FAMILY = "mx6:mx6q"
+SOC_FAMILY = "mx6q"
 
 KERNEL_DEVICETREE = "imx6dqscm-2gb-evb-fix-ldo.dtb imx6dqscm-2gb-evb-hdcp-fix-ldo.dtb  \
                      imx6dqscm-2gb-evb-enetirq-fix-ldo.dtb imx6dqscm-2gb-evb-btwifi-fix-ldo.dtb"
diff --git a/conf/machine/imx6dqscm-epop-qwks.conf b/conf/machine/imx6dqscm-epop-qwks.conf
index c352041f..ec605f00 100644
--- a/conf/machine/imx6dqscm-epop-qwks.conf
+++ b/conf/machine/imx6dqscm-epop-qwks.conf
@@ -6,7 +6,7 @@
 
 require conf/machine/include/imx6sabresd-common.inc
 
-SOC_FAMILY = "mx6:mx6q"
+SOC_FAMILY = "mx6q"
 
 KERNEL_DEVICETREE = "imx6dqscm-512mb-qwks-rev2-fix-ldo.dtb imx6dqscm-512mb-qwks-rev2-hdcp-fix-ldo.dtb imx6dqscm-512mb-qwks-rev2-wifi-fix-ldo.dtb"
 
diff --git a/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.3.p2.0-aarch64.bbap b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.3.p2.0-aarch64.bbap
index a6435177..6098e713 100644
--- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.3.p2.0-aarch64.bbap
+++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.3.p2.0-aarch64.bbap
@@ -1,2 +1,2 @@
 
-REQUIRED_DISTRO_FEATURES:remove:mx8 = "wayland"
+REQUIRED_DISTRO_FEATURES:remove:mx8-nxp-bsp = "wayland"
diff --git a/recipes-kernel/linux/linux-boundary_5.15.bbappend b/recipes-kernel/linux/linux-boundary_5.15.bbappend
index 41efb07d..44630357 100755
--- a/recipes-kernel/linux/linux-boundary_5.15.bbappend
+++ b/recipes-kernel/linux/linux-boundary_5.15.bbappend
@@ -1,6 +1,6 @@
 inherit kernel_wireless_regdb
 
-COMPATIBLE_MACHINE = "(himx0294|himx|nitrogen6x|nitrogen6x-lite|mx6)"
+COMPATIBLE_MACHINE = "(himx0294|himx-nxp-bsp|nitrogen6x|nitrogen6x-lite|mx6-nxp-bsp)"
 
 FILESEXTRAPATHS:prepend := "${THISDIR}/linux-boundary-5.15:"
 
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-imx_0.13.1.bb b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-imx_0.13.1.bb
index 8a1554e0..8c213f09 100644
--- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-imx_0.13.1.bb
+++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-imx_0.13.1.bb
@@ -68,4 +68,4 @@ require recipes-multimedia/gstreamer/gstreamer1.0-plugins-packaging.inc
 # the following line is required to produce one package for each plugin
 PACKAGES_DYNAMIC = "^${PN}-.*"
 
-COMPATIBLE_MACHINE = "(mx6dl|mx6q|mx6sl|mx6sx|mx6ul|mx6ull|mx7d)"
+COMPATIBLE_MACHINE = "(mx6dl-nxp-bsp|mx6q-nxp-bsp|mx6sl-nxp-bsp|mx6sx-nxp-bsp|mx6ul-nxp-bsp|mx6ull-nxp-bsp|mx7d-nxp-bsp)"
diff --git a/recipes-qt/qt5/qtbase_%.bbappend b/recipes-qt/qt5/qtbase_%.bbappend
index f7a80f74..721ac0a6 100644
--- a/recipes-qt/qt5/qtbase_%.bbappend
+++ b/recipes-qt/qt5/qtbase_%.bbappend
@@ -2,7 +2,7 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/qtbase:"
 
 # Append qtbase configuration
 
-PACKAGECONFIG:append:mx6 = " tslib icu examples sql-sqlite "
+PACKAGECONFIG:append:mx6-nxp-bsp = " tslib icu examples sql-sqlite "
 
 SRC_URI:append:imxgpu3d = " \
 	file://0015-Add-eglfs-to-IMX-GPU.patch \
diff --git a/recipes-support/rng-tools/rng-tools_%.bbappend b/recipes-support/rng-tools/rng-tools_%.bbappend
index a07d0c99..9f3ad44d 100644
--- a/recipes-support/rng-tools/rng-tools_%.bbappend
+++ b/recipes-support/rng-tools/rng-tools_%.bbappend
@@ -2,4 +2,4 @@
 # Up to Yocto honister this dependency did not exist. For i.mx6
 # machines, the dependency is removed again to speed up the boot
 # process.
-FILESEXTRAPATHS:prepend:mx6 := "${THISDIR}/imx6:"
+FILESEXTRAPATHS:prepend:mx6-nxp-bsp := "${THISDIR}/imx6:"