diff --git a/meta-digi-arm/conf/machine/ccimx8mn-dvk.conf b/meta-digi-arm/conf/machine/ccimx8mn-dvk.conf
index 5b45b1424..025e7e817 100644
--- a/meta-digi-arm/conf/machine/ccimx8mn-dvk.conf
+++ b/meta-digi-arm/conf/machine/ccimx8mn-dvk.conf
@@ -15,12 +15,12 @@ SPL_BINARY = "spl/u-boot-spl.bin"
 UBOOT_DTB_NAME = "ccimx8mn-dvk.dtb"
 
 KERNEL_DEVICETREE ?= " \
-    digi/ccimx8mn_ov_bt.dtbo \
-    digi/ccimx8mn_ov_quad.dtbo \
-    digi/ccimx8mn_ov_v1.dtbo \
-    digi/ccimx8mn_ov_wifi.dtbo \
     digi/ccimx8mn-dvk.dtb \
-    digi/ccimx8mn-dvk_ov_lvds.dtbo \
+    digi/_ov_board_lvds_ccimx8mn-dvk.dtbo \
+    digi/_ov_som_bt_ccimx8mn.dtbo \
+    digi/_ov_som_quad_ccimx8mn.dtbo \
+    digi/_ov_som_v1_ccimx8mn.dtbo \
+    digi/_ov_som_wifi_ccimx8mn.dtbo \
 "
 
 SERIAL_CONSOLES ?= "115200;ttymxc0"
diff --git a/meta-digi-arm/conf/machine/ccimx8x-sbc-express.conf b/meta-digi-arm/conf/machine/ccimx8x-sbc-express.conf
index e4aa15a34..c2599b41d 100644
--- a/meta-digi-arm/conf/machine/ccimx8x-sbc-express.conf
+++ b/meta-digi-arm/conf/machine/ccimx8x-sbc-express.conf
@@ -13,9 +13,9 @@ UBOOT_CONFIG[ccimx8x_sbc_express1GB] = "ccimx8x_sbc_express1GB_defconfig,,u-boot
 
 KERNEL_DEVICETREE ?= " \
     digi/ccimx8x-sbc-express.dtb \
-    digi/ccimx8x_ov_bt.dtbo \
-    digi/ccimx8x_ov_qxp.dtbo \
-    digi/ccimx8x_ov_wifi.dtbo \
+    digi/_ov_som_bt_ccimx8x.dtbo \
+    digi/_ov_som_quad_ccimx8x.dtbo \
+    digi/_ov_som_wifi_ccimx8x.dtbo \
 "
 
 SERIAL_CONSOLES ?= "115200;ttyLP2"
diff --git a/meta-digi-arm/conf/machine/ccimx8x-sbc-pro.conf b/meta-digi-arm/conf/machine/ccimx8x-sbc-pro.conf
index 9563dcfcd..d69665211 100644
--- a/meta-digi-arm/conf/machine/ccimx8x-sbc-pro.conf
+++ b/meta-digi-arm/conf/machine/ccimx8x-sbc-pro.conf
@@ -14,16 +14,16 @@ UBOOT_CONFIG[ccimx8x_sbc_pro512MB] = "ccimx8x_sbc_pro512MB_defconfig,,u-boot-dtb
 
 KERNEL_DEVICETREE ?= " \
     digi/ccimx8x-sbc-pro.dtb \
-    digi/ccimx8x_ov_bt.dtbo \
-    digi/ccimx8x_ov_qxp.dtbo \
-    digi/ccimx8x_ov_wifi.dtbo \
-    digi/ccimx8x-sbc-pro_ov_flexcan1.dtbo \
-    digi/ccimx8x-sbc-pro_ov_lpuart3.dtbo \
-    digi/ccimx8x-sbc-pro_ov_lt9812-hdmi-dsi0.dtbo \
-    digi/ccimx8x-sbc-pro_ov_lvds1.dtbo \
-    digi/ccimx8x-sbc-pro_ov_parallel-camera.dtbo \
-    digi/ccimx8x-sbc-pro_ov_pcie-card.dtbo \
-    digi/ccimx8x-sbc-pro_ov_hsd101pfw2_lvds.dtbo \
+    digi/_ov_board_flexcan1_ccimx8x-sbc-pro.dtbo \
+    digi/_ov_board_hsd101pfw2-lvds_ccimx8x-sbc-pro.dtbo \
+    digi/_ov_board_lpuart3_ccimx8x-sbc-pro.dtbo \
+    digi/_ov_board_lt9812-hdmi-dsi0_ccimx8x-sbc-pro.dtbo \
+    digi/_ov_board_lvds1_ccimx8x-sbc-pro.dtbo \
+    digi/_ov_board_parallel-camera_ccimx8x-sbc-pro.dtbo \
+    digi/_ov_board_pcie-card_ccimx8x-sbc-pro.dtbo \
+    digi/_ov_som_bt_ccimx8x.dtbo \
+    digi/_ov_som_quad_ccimx8x.dtbo \
+    digi/_ov_som_wifi_ccimx8x.dtbo \
 "
 
 SERIAL_CONSOLES ?= "115200;ttyLP2"
diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8mn-dvk/boot.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8mn-dvk/boot.txt
index 0b72f146f..c85d093c1 100644
--- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8mn-dvk/boot.txt
+++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8mn-dvk/boot.txt
@@ -21,21 +21,21 @@ if test -n "${module_ram}"; then
 	setexpr module_has_bt ${module_has_bt} / 20000
 
 	if test "${module_has_bt}" = "1"; then
-		setenv overlays ccimx8mn_ov_bt.dtbo,${overlays}
+		setenv overlays _ov_som_bt_ccimx8mn.dtbo,${overlays}
 	fi
 
 	if test "${module_has_wifi}" = "1"; then
-		setenv overlays ccimx8mn_ov_wifi.dtbo,${overlays}
+		setenv overlays _ov_som_wifi_ccimx8mn.dtbo,${overlays}
 	fi
 
 	if test "${som_hv}" = "1"; then
-		setenv overlays ccimx8mn_ov_v1.dtbo,${overlays}
+		setenv overlays _ov_som_v1_ccimx8mn.dtbo,${overlays}
 	fi
 fi
 
 # Apply quad overlay if the SOC type is "imx8mn"
 if test "${soc_type}" = "imx8mn"; then
-	setenv overlays ccimx8mn_ov_quad.dtbo,${overlays}
+	setenv overlays _ov_som_quad_ccimx8mn.dtbo,${overlays}
 fi
 
 # Get the UUID of the configured boot partition.
diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x/boot.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x/boot.txt
index dd3edbecb..f0fbb1a0e 100644
--- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x/boot.txt
+++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x/boot.txt
@@ -17,28 +17,28 @@ if test -n "${module_ram}"; then
 	setexpr module_has_bt ${module_has_bt} / 2
 
 	if test "${module_has_bt}" = "1"; then
-		setenv overlays ccimx8x_ov_bt.dtbo,${overlays}
+		setenv overlays _ov_som_bt_ccimx8x.dtbo,${overlays}
 	fi
 
 	if test "${module_has_wifi}" = "1"; then
-		setenv overlays ccimx8x_ov_wifi.dtbo,${overlays}
+		setenv overlays _ov_som_wifi_ccimx8x.dtbo,${overlays}
 	fi
 else
 	#
 	# Set overlays depending on the hardware variant
 	#
 	if test "${module_variant}" = "0x01"; then
-		setenv overlays ccimx8x_ov_bt.dtbo,ccimx8x_ov_wifi.dtbo,${overlays}
+		setenv overlays _ov_som_bt_ccimx8x.dtbo,_ov_som_wifi_ccimx8x.dtbo,${overlays}
 	elif test "${module_variant}" = "0x02"; then
-		setenv overlays ccimx8x_ov_bt.dtbo,ccimx8x_ov_wifi.dtbo,${overlays}
+		setenv overlays _ov_som_bt_ccimx8x.dtbo,_ov_som_wifi_ccimx8x.dtbo,${overlays}
 	elif test "${module_variant}" = "0x04"; then
-		setenv overlays ccimx8x_ov_bt.dtbo,ccimx8x_ov_wifi.dtbo,${overlays}
+		setenv overlays _ov_som_bt_ccimx8x.dtbo,_ov_som_wifi_ccimx8x.dtbo,${overlays}
 	fi
 fi
 
 # Apply QXP overlay if the SOC type is "imx8qxp"
 if test "${soc_type}" = "imx8qxp"; then
-	setenv overlays ccimx8x_ov_qxp.dtbo,${overlays}
+	setenv overlays _ov_som_quad_ccimx8x.dtbo,${overlays}
 fi
 
 # Get the UUID of the configured boot partition.