diff --git a/meta-digi-arm/recipes-bsp/imx-mkimage/imx-boot_1.0.bbappend b/meta-digi-arm/recipes-bsp/imx-mkimage/imx-boot_1.0.bbappend
index 575485ec2..9bdb730c3 100644
--- a/meta-digi-arm/recipes-bsp/imx-mkimage/imx-boot_1.0.bbappend
+++ b/meta-digi-arm/recipes-bsp/imx-mkimage/imx-boot_1.0.bbappend
@@ -32,7 +32,7 @@ do_populate_lic[depends] += " \
 IMXBOOT_TARGETS_ccimx8x = "${@bb.utils.contains('UBOOT_CONFIG', 'fspi', 'flash_flexspi', \
                                                 'flash flash_regression_linux_m4', d)}"
 
-IMXBOOT_TARGETS_ccimx8mn = "${@bb.utils.contains('UBOOT_CONFIG', 'fspi', 'flash_evk_flexspi', 'flash_spl_uboot', d)}"
+IMXBOOT_TARGETS_ccimx8m = "${@bb.utils.contains('UBOOT_CONFIG', 'fspi', 'flash_evk_flexspi', 'flash_spl_uboot', d)}"
 
 compile_mx8x() {
 	bbnote 8QX boot binary build
@@ -133,8 +133,8 @@ do_compile () {
 	fi
 }
 
-# ConnectCore 8M Nano does not have different binaries
-UBOOT_RAM_COMBINATIONS_ccimx8mn = ""
+# ConnectCore 8M Nano and 8M Mini do not have different binaries
+UBOOT_RAM_COMBINATIONS_ccimx8m = ""
 
 do_install () {
 	install -d ${D}/boot
@@ -250,4 +250,4 @@ do_deploy_append () {
 	fi
 }
 
-COMPATIBLE_MACHINE = "(ccimx8x|ccimx8mn)"
+COMPATIBLE_MACHINE = "(ccimx8x|ccimx8m)"
diff --git a/meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.inc b/meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.inc
index 5f459663d..0a880edb3 100644
--- a/meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.inc
+++ b/meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.inc
@@ -192,8 +192,8 @@ do_deploy_append_ccimx8x() {
 	mv ${DEPLOYDIR}/${UBOOT_SYMLINK}-* ${DEPLOYDIR}/${BOOT_TOOLS}/
 }
 
-do_deploy_append_ccimx8mn() {
-	# Deploy u-boot-nodtb.bin and ccimx8mn-dvk.dtb, to be packaged in boot binary by imx-boot
+do_deploy_append_ccimx8m() {
+	# Deploy u-boot-nodtb.bin and ccimx8m[m|n]-dvk.dtb, to be packaged in boot binary by imx-boot
 	if [ -n "${UBOOT_CONFIG}" ]
 	then
 		for config in ${UBOOT_MACHINE}; do