diff --git a/meta-digi-arm/conf/machine/ccimx8mm-dvk.conf b/meta-digi-arm/conf/machine/ccimx8mm-dvk.conf
index c47412636..db3ba71a3 100644
--- a/meta-digi-arm/conf/machine/ccimx8mm-dvk.conf
+++ b/meta-digi-arm/conf/machine/ccimx8mm-dvk.conf
@@ -27,15 +27,15 @@ IMX_BOOT_SOC_TARGET = "iMX8MM"
 
 KERNEL_DEVICETREE ?= " \
     digi/ccimx8mm-dvk.dtb \
-    digi/_ov_board_flexspi_ccimx8m-dvk.dtbo \
-    digi/_ov_board_gpio-watchdog_ccimx8m-dvk.dtbo \
-    digi/_ov_board_hsd101pfw2-lvds_ccimx8m-dvk.dtbo \
-    digi/_ov_board_lvds_ccimx8m-dvk.dtbo \
-    digi/_ov_board_user-leds_ccimx8m-dvk.dtbo \
-    digi/_ov_som_bt_ccimx8m.dtbo \
-    digi/_ov_som_cm4_ccimx8mm.dtbo \
-    digi/_ov_som_mca-keypad_ccimx8m.dtbo \
-    digi/_ov_som_wifi_ccimx8m.dtbo \
+    digi/ccimx8m-dvk_flexspi.dtbo \
+    digi/ccimx8m-dvk_gpio-watchdog.dtbo \
+    digi/ccimx8m-dvk_hsd101pfw2-lvds.dtbo \
+    digi/ccimx8m-dvk_lvds.dtbo \
+    digi/ccimx8m-dvk_user-leds.dtbo \
+    digi/ccimx8m_bt.dtbo \
+    digi/ccimx8mm_cm4.dtbo \
+    digi/ccimx8m_mca-keypad.dtbo \
+    digi/ccimx8m_wifi.dtbo \
 "
 
 SERIAL_CONSOLES ?= "115200;ttymxc0"
diff --git a/meta-digi-arm/conf/machine/ccimx8mn-dvk.conf b/meta-digi-arm/conf/machine/ccimx8mn-dvk.conf
index f2f6b6ae5..ea8813aae 100644
--- a/meta-digi-arm/conf/machine/ccimx8mn-dvk.conf
+++ b/meta-digi-arm/conf/machine/ccimx8mn-dvk.conf
@@ -26,17 +26,17 @@ IMX_BOOT_SOC_TARGET = "iMX8MN"
 
 KERNEL_DEVICETREE ?= " \
     digi/ccimx8mn-dvk.dtb \
-    digi/_ov_board_flexspi_ccimx8m-dvk.dtbo \
-    digi/_ov_board_gpio-watchdog_ccimx8m-dvk.dtbo \
-    digi/_ov_board_hsd101pfw2-lvds_ccimx8m-dvk.dtbo \
-    digi/_ov_board_lvds_ccimx8m-dvk.dtbo \
-    digi/_ov_board_user-leds_ccimx8m-dvk.dtbo \
-    digi/_ov_board_v1-v2_ccimx8mn-dvk.dtbo \
-    digi/_ov_som_bt_ccimx8m.dtbo \
-    digi/_ov_som_cm7_ccimx8mn.dtbo \
-    digi/_ov_som_mca-keypad_ccimx8m.dtbo \
-    digi/_ov_som_v1_ccimx8mn.dtbo \
-    digi/_ov_som_wifi_ccimx8m.dtbo \
+    digi/ccimx8m-dvk_flexspi.dtbo \
+    digi/ccimx8m-dvk_gpio-watchdog.dtbo \
+    digi/ccimx8m-dvk_hsd101pfw2-lvds.dtbo \
+    digi/ccimx8m-dvk_lvds.dtbo \
+    digi/ccimx8m-dvk_user-leds.dtbo \
+    digi/ccimx8mn-dvk_v1-v2.dtbo \
+    digi/ccimx8m_bt.dtbo \
+    digi/ccimx8mn_cm7.dtbo \
+    digi/ccimx8m_mca-keypad.dtbo \
+    digi/ccimx8mn_v1.dtbo \
+    digi/ccimx8m_wifi.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 593ff1168..f4616a3a5 100644
--- a/meta-digi-arm/conf/machine/ccimx8x-sbc-express.conf
+++ b/meta-digi-arm/conf/machine/ccimx8x-sbc-express.conf
@@ -12,9 +12,9 @@ SPL_BINARY = "spl/u-boot-spl.bin"
 
 KERNEL_DEVICETREE ?= " \
     digi/ccimx8x-sbc-express.dtb \
-    digi/_ov_som_bt_ccimx8x.dtbo \
-    digi/_ov_som_quad_ccimx8x.dtbo \
-    digi/_ov_som_wifi_ccimx8x.dtbo \
+    digi/ccimx8x_bt.dtbo \
+    digi/ccimx8x_quad.dtbo \
+    digi/ccimx8x_wifi.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 43d6bae25..d2121db08 100644
--- a/meta-digi-arm/conf/machine/ccimx8x-sbc-pro.conf
+++ b/meta-digi-arm/conf/machine/ccimx8x-sbc-pro.conf
@@ -13,23 +13,23 @@ SPL_BINARY = "spl/u-boot-spl.bin"
 
 KERNEL_DEVICETREE ?= " \
     digi/ccimx8x-sbc-pro.dtb \
-    digi/_ov_board_flexcan1_ccimx8x-sbc-pro.dtbo \
-    digi/_ov_board_flexspi_ccimx8x-sbc-pro.dtbo \
-    digi/_ov_board_gpio-watchdog_ccimx8x-sbc-pro.dtbo \
-    digi/_ov_board_hsd101pfw2-lvds_ccimx8x-sbc-pro.dtbo \
-    digi/_ov_board_lpuart3_ccimx8x-sbc-pro.dtbo \
-    digi/_ov_board_lt8912-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_board_pcie-modem_ccimx8x-sbc-pro.dtbo \
-    digi/_ov_board_user-leds_ccimx8x-sbc-pro.dtbo \
-    digi/_ov_board_v1-v3_ccimx8x-sbc-pro.dtbo \
-    digi/_ov_som_bt_ccimx8x.dtbo \
-    digi/_ov_som_cm4_ccimx8x.dtbo \
-    digi/_ov_som_mca-keypad_ccimx8x.dtbo \
-    digi/_ov_som_quad_ccimx8x.dtbo \
-    digi/_ov_som_wifi_ccimx8x.dtbo \
+    digi/ccimx8x-sbc-pro_flexcan1.dtbo \
+    digi/ccimx8x-sbc-pro_flexspi.dtbo \
+    digi/ccimx8x-sbc-pro_gpio-watchdog.dtbo \
+    digi/ccimx8x-sbc-pro_hsd101pfw2-lvds.dtbo \
+    digi/ccimx8x-sbc-pro_lpuart3.dtbo \
+    digi/ccimx8x-sbc-pro_lt8912-hdmi-dsi0.dtbo \
+    digi/ccimx8x-sbc-pro_lvds1.dtbo \
+    digi/ccimx8x-sbc-pro_parallel-camera.dtbo \
+    digi/ccimx8x-sbc-pro_pcie-card.dtbo \
+    digi/ccimx8x-sbc-pro_pcie-modem.dtbo \
+    digi/ccimx8x-sbc-pro_user-leds.dtbo \
+    digi/ccimx8x-sbc-pro_v1-v3.dtbo \
+    digi/ccimx8x_bt.dtbo \
+    digi/ccimx8x_cm4.dtbo \
+    digi/ccimx8x_mca-keypad.dtbo \
+    digi/ccimx8x_quad.dtbo \
+    digi/ccimx8x_wifi.dtbo \
 "
 
 SERIAL_CONSOLES ?= "115200;ttyLP2"
diff --git a/meta-digi-arm/conf/machine/ccimx91-dvk.conf b/meta-digi-arm/conf/machine/ccimx91-dvk.conf
index 4ae3f37f9..aa78f0b22 100644
--- a/meta-digi-arm/conf/machine/ccimx91-dvk.conf
+++ b/meta-digi-arm/conf/machine/ccimx91-dvk.conf
@@ -24,13 +24,13 @@ BOOTLOADER_SEEK_USERDATA = "32"
 
 KERNEL_DEVICETREE ?= " \
     digi/ccimx91-dvk.dtb \
-    digi/_ov_board_enet2_ccimx9-dvk.dtbo \
-    digi/_ov_board_mikroe-accel2-click_ccimx9-dvk.dtbo \
-    digi/_ov_board_mikroe-gyro-click_ccimx9-dvk.dtbo \
-    digi/_ov_som_bt_ccimx9.dtbo \
-    digi/_ov_som_bt-dtm_ccimx9.dtbo \
-    digi/_ov_som_wifi_ccimx9.dtbo \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'tsn', 'digi/_ov_board_eqos-tsn_ccimx9-dvk.dtbo', '', d)} \
+    digi/ccimx9-dvk_enet2.dtbo \
+    digi/ccimx9-dvk_mikroe-accel2-click.dtbo \
+    digi/ccimx9-dvk_mikroe-gyro-click.dtbo \
+    digi/ccimx9_bt.dtbo \
+    digi/ccimx9_bt-dtm.dtbo \
+    digi/ccimx9_wifi.dtbo \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'tsn', 'digi/ccimx9-dvk_eqos-tsn.dtbo', '', d)} \
 "
 
 # Default image for install scripts
diff --git a/meta-digi-arm/conf/machine/ccimx93-dvk.conf b/meta-digi-arm/conf/machine/ccimx93-dvk.conf
index 7f2036031..165532879 100644
--- a/meta-digi-arm/conf/machine/ccimx93-dvk.conf
+++ b/meta-digi-arm/conf/machine/ccimx93-dvk.conf
@@ -22,18 +22,18 @@ SECO_FIRMWARE_NAME:ccimx93 = "mx93??-ahab-container.img"
 
 KERNEL_DEVICETREE ?= " \
     digi/ccimx93-dvk.dtb \
-    digi/_ov_board_dlc0200ccp04df-mipi-dsi_ccimx93-dvk.dtbo \
-    digi/_ov_board_lvds_ccimx93-dvk.dtbo \
-    digi/_ov_board_enet2_ccimx9-dvk.dtbo \
-    digi/_ov_board_mikroe-accel2-click_ccimx9-dvk.dtbo \
-    digi/_ov_board_mikroe-gyro-click_ccimx9-dvk.dtbo \
-    digi/_ov_som_bt_ccimx9.dtbo \
-    digi/_ov_som_bt-dtm_ccimx9.dtbo \
-    digi/_ov_som_emulate-ccimx91_ccimx93.dtbo \
-    digi/_ov_som_npu_ccimx93.dtbo \
-    digi/_ov_som_single-core-512M_ccimx93.dtbo \
-    digi/_ov_som_wifi_ccimx9.dtbo \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'tsn', 'digi/_ov_board_eqos-tsn_ccimx9-dvk.dtbo', '', d)} \
+    digi/ccimx93-dvk_dlc0200ccp04df-mipi-dsi.dtbo \
+    digi/ccimx93-dvk_lvds.dtbo \
+    digi/ccimx9-dvk_enet2.dtbo \
+    digi/ccimx9-dvk_mikroe-accel2-click.dtbo \
+    digi/ccimx9-dvk_mikroe-gyro-click.dtbo \
+    digi/ccimx9_bt.dtbo \
+    digi/ccimx9_bt-dtm.dtbo \
+    digi/ccimx93_emulate-ccimx91.dtbo \
+    digi/ccimx93_npu.dtbo \
+    digi/ccimx93_single-core-512M.dtbo \
+    digi/ccimx9_wifi.dtbo \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'tsn', 'digi/ccimx9-dvk_eqos-tsn.dtbo', '', d)} \
 "
 
 # Add additional firmware
diff --git a/meta-digi-arm/conf/machine/ccmp13-dvk.conf b/meta-digi-arm/conf/machine/ccmp13-dvk.conf
index 062789124..e23a27cce 100644
--- a/meta-digi-arm/conf/machine/ccmp13-dvk.conf
+++ b/meta-digi-arm/conf/machine/ccmp13-dvk.conf
@@ -36,14 +36,14 @@ STM32MP_DEVICETREE ??= "ccmp13-dvk-256MB"
 # Extra DTB for board - need to specify it with .dtb ...
 STM32MP_KERNEL_DEVICETREE:ccmp13-dvk += " \
     ccmp133-dvk.dtb \
-    _ov_board_mikroe-accel2-click_ccmp13-dvk.dtbo \
-    _ov_board_mikroe-gyro-click_ccmp13-dvk.dtbo \
-    _ov_board_mikroe-i2c-to-spi-click_ccmp13-dvk.dtbo \
-    _ov_board_pwm8_ccmp13-dvk.dtbo \
-    _ov_board_v2_ccmp13-dvk.dtbo \
-    _ov_som_bt_ccmp13.dtbo \
-    _ov_som_bt_test_ccmp13.dtbo \
-    _ov_som_wifi_ccmp13.dtbo \
+    ccmp13-dvk_mikroe-accel2-click.dtbo \
+    ccmp13-dvk_mikroe-gyro-click.dtbo \
+    ccmp13-dvk_mikroe-i2c-to-spi-click.dtbo \
+    ccmp13-dvk_pwm8.dtbo \
+    ccmp13-dvk_v2.dtbo \
+    ccmp13_bt.dtbo \
+    ccmp13_bt_test.dtbo \
+    ccmp13_wifi.dtbo \
 "
 # Set DTB load address to U-Boot fdt_addr_r
 UBOOT_DTB_LOADADDRESS = "0xc4000000"
diff --git a/meta-digi-arm/conf/machine/ccmp15-dvk.conf b/meta-digi-arm/conf/machine/ccmp15-dvk.conf
index d38181d6c..abe62b0c2 100644
--- a/meta-digi-arm/conf/machine/ccmp15-dvk.conf
+++ b/meta-digi-arm/conf/machine/ccmp15-dvk.conf
@@ -36,24 +36,24 @@ STM32MP_DEVICETREE ??= "ccmp15-dvk-512MB ccmp15-dvk-1GB"
 # Extra DTB for board - need to specify it with .dtb ...
 STM32MP_KERNEL_DEVICETREE:ccmp15-dvk += " \
     ccmp157-dvk.dtb \
-    _ov_board_can1_ccmp15-dvk.dtbo \
-    _ov_board_can2_ccmp15-dvk.dtbo \
-    _ov_board_dlc0200ccp04df-mipi-dsi_ccmp15-dvk.dtbo \
-    _ov_board_eth0-10-100_ccmp15-dvk.dtbo \
-    _ov_board_fusion10-lvds_ccmp15-dvk.dtbo \
-    _ov_board_fusion7-parallel_ccmp15-dvk.dtbo \
-    _ov_board_g101evn010-lvds_ccmp15-dvk.dtbo \
-    _ov_board_mikroe-accel2-click_ccmp15-dvk.dtbo \
-    _ov_board_mikroe-gyro-click_ccmp15-dvk.dtbo \
-    _ov_board_mikroe-i2c-to-spi-click_ccmp15-dvk.dtbo \
-    _ov_board_nhd-3-5-640480ef-msxp-mipi-dsi_ccmp15-dvk.dtbo \
-    _ov_board_sv4e-mipi-analyzer_ccmp15-dvk.dtbo \
-    _ov_board_v1_ccmp15-dvk.dtbo \
-    _ov_board_v2_ccmp15-dvk.dtbo \
-    _ov_som_bt_ccmp15.dtbo \
-    _ov_som_bt_test_ccmp15.dtbo \
-    _ov_som_v1_ccmp15.dtbo \
-    _ov_som_wifi_ccmp15.dtbo \
+    ccmp15-dvk_can1.dtbo \
+    ccmp15-dvk_can2.dtbo \
+    ccmp15-dvk_dlc0200ccp04df-mipi-dsi.dtbo \
+    ccmp15-dvk_eth0-10-100.dtbo \
+    ccmp15-dvk_fusion10-lvds.dtbo \
+    ccmp15-dvk_fusion7-parallel.dtbo \
+    ccmp15-dvk_g101evn010-lvds.dtbo \
+    ccmp15-dvk_mikroe-accel2-click.dtbo \
+    ccmp15-dvk_mikroe-gyro-click.dtbo \
+    ccmp15-dvk_mikroe-i2c-to-spi-click.dtbo \
+    ccmp15-dvk_nhd-3-5-640480ef-msxp-mipi-dsi.dtbo \
+    ccmp15-dvk_sv4e-mipi-analyzer.dtbo \
+    ccmp15-dvk_v1.dtbo \
+    ccmp15-dvk_v2.dtbo \
+    ccmp15_bt.dtbo \
+    ccmp15_bt_test.dtbo \
+    ccmp15_v1.dtbo \
+    ccmp15_wifi.dtbo \
 "
 # Set DTB load address to U-Boot fdt_addr_r
 UBOOT_DTB_LOADADDRESS = "0xc4000000"
diff --git a/meta-digi-arm/conf/machine/ccmp25-dvk.conf b/meta-digi-arm/conf/machine/ccmp25-dvk.conf
index 3bb7d76b7..cb4ce27e8 100644
--- a/meta-digi-arm/conf/machine/ccmp25-dvk.conf
+++ b/meta-digi-arm/conf/machine/ccmp25-dvk.conf
@@ -43,18 +43,18 @@ STM32MP_DT_FILES_EMMC = "ccmp25-dvk"
 # Extra DTB for board - need to specify it with .dtb ...
 STM32MP_KERNEL_DEVICETREE:ccmp25-dvk += " \
     ccmp25-dvk.dtb \
-    _ov_board_e55rb-i-mw346-c-mipi-dsi_ccmp25-dvk.dtbo \
-    _ov_board_g101evn010-lvds_ccmp25-dvk.dtbo \
-    _ov_board_imx335-mipi-csi_ccmp25-dvk.dtbo \
-    _ov_board_mikroe-accel2-click_ccmp25-dvk.dtbo \
-    _ov_board_mikroe-gyro-click_ccmp25-dvk.dtbo \
-    _ov_board_mikroe-i2c-to-spi-click_ccmp25-dvk.dtbo \
-    _ov_board_mikroe-mcp2518fd-click_ccmp25-dvk.dtbo \
-    _ov_board_n25q256a-spi-nor-flash_ccmp25-dvk.dtbo \
-    _ov_board_nhd-3-5-640480ef-msxp-mipi-dsi_ccmp25-dvk.dtbo \
-    _ov_board_usb-3-0-typec_ccmp25-dvk.dtbo \
-    _ov_som_bt_ccmp25.dtbo \
-    _ov_som_wifi_ccmp25.dtbo \
+    ccmp25-dvk_e55rb-i-mw346-c-mipi-dsi.dtbo \
+    ccmp25-dvk_g101evn010-lvds.dtbo \
+    ccmp25-dvk_imx335-mipi-csi.dtbo \
+    ccmp25-dvk_mikroe-accel2-click.dtbo \
+    ccmp25-dvk_mikroe-gyro-click.dtbo \
+    ccmp25-dvk_mikroe-i2c-to-spi-click.dtbo \
+    ccmp25-dvk_mikroe-mcp2518fd-click.dtbo \
+    ccmp25-dvk_n25q256a-spi-nor-flash.dtbo \
+    ccmp25-dvk_nhd-3-5-640480ef-msxp-mipi-dsi.dtbo \
+    ccmp25-dvk_usb-3-0-typec.dtbo \
+    ccmp25_bt.dtbo \
+    ccmp25_wifi.dtbo \
 "
 
 # =========================================================================
diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8mm-dvk/boot.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8mm-dvk/boot.txt
index da6947ac1..06bcbf94e 100644
--- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8mm-dvk/boot.txt
+++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8mm-dvk/boot.txt
@@ -77,11 +77,11 @@ if test -n "${module_ram}"; then
 	setexpr module_has_bt ${module_has_bt} / 20000
 
 	if test "${module_has_bt}" = "1" && test -z "${disable_bt}"; then
-		setenv overlays _ov_som_bt_ccimx8m.dtbo,${overlays}
+		setenv overlays ccimx8m_bt.dtbo,${overlays}
 	fi
 
 	if test "${module_has_wifi}" = "1" && test -z "${disable_wifi}"; then
-		setenv overlays _ov_som_wifi_ccimx8m.dtbo,${overlays}
+		setenv overlays ccimx8m_wifi.dtbo,${overlays}
 	fi
 fi
 
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 6d155ca7f..a4ec3f14f 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
@@ -77,21 +77,21 @@ if test -n "${module_ram}"; then
 	setexpr module_has_bt ${module_has_bt} / 20000
 
 	if test "${module_has_bt}" = "1" && test -z "${disable_bt}"; then
-		setenv overlays _ov_som_bt_ccimx8m.dtbo,${overlays}
+		setenv overlays ccimx8m_bt.dtbo,${overlays}
 	fi
 
 	if test "${module_has_wifi}" = "1" && test -z "${disable_wifi}"; then
-		setenv overlays _ov_som_wifi_ccimx8m.dtbo,${overlays}
+		setenv overlays ccimx8m_wifi.dtbo,${overlays}
 	fi
 
 	if test "${som_hv}" = "1"; then
-		setenv overlays _ov_som_v1_ccimx8mn.dtbo,${overlays}
+		setenv overlays ccimx8mn_v1.dtbo,${overlays}
 	fi
 fi
 
 # Apply DVK v1-v2 overlay if the board version is < 3
 if test "${board_version}" -lt "3"; then
-	setenv overlays _ov_board_v1-v2_ccimx8mn-dvk.dtbo,${overlays}
+	setenv overlays ccimx8mn-dvk_v1-v2.dtbo,${overlays}
 fi
 
 setenv extra_bootargs fbcon=logo-pos:center fbcon=logo-count:1 ${extra_bootargs}
diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-express/boot.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-express/boot.txt
index f2fa935f9..6ee083228 100644
--- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-express/boot.txt
+++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-express/boot.txt
@@ -73,28 +73,28 @@ if test -n "${module_ram}"; then
 	setexpr module_has_bt ${module_has_bt} / 2
 
 	if test "${module_has_bt}" = "1" && test -z "${disable_bt}"; then
-		setenv overlays _ov_som_bt_ccimx8x.dtbo,${overlays}
+		setenv overlays ccimx8x_bt.dtbo,${overlays}
 	fi
 
 	if test "${module_has_wifi}" = "1" && test -z "${disable_wifi}"; then
-		setenv overlays _ov_som_wifi_ccimx8x.dtbo,${overlays}
+		setenv overlays ccimx8x_wifi.dtbo,${overlays}
 	fi
 else
 	#
 	# Set overlays depending on the hardware variant
 	#
 	if test "${module_variant}" = "0x01"; then
-		setenv overlays _ov_som_bt_ccimx8x.dtbo,_ov_som_wifi_ccimx8x.dtbo,${overlays}
+		setenv overlays ccimx8x_bt.dtbo,ccimx8x_wifi.dtbo,${overlays}
 	elif test "${module_variant}" = "0x02"; then
-		setenv overlays _ov_som_bt_ccimx8x.dtbo,_ov_som_wifi_ccimx8x.dtbo,${overlays}
+		setenv overlays ccimx8x_bt.dtbo,ccimx8x_wifi.dtbo,${overlays}
 	elif test "${module_variant}" = "0x04"; then
-		setenv overlays _ov_som_bt_ccimx8x.dtbo,_ov_som_wifi_ccimx8x.dtbo,${overlays}
+		setenv overlays ccimx8x_bt.dtbo,ccimx8x_wifi.dtbo,${overlays}
 	fi
 fi
 
 # Apply QXP overlay if the SOC type is "imx8qxp"
 if test "${soc_type}" = "imx8qxp"; then
-	setenv overlays _ov_som_quad_ccimx8x.dtbo,${overlays}
+	setenv overlays ccimx8x_quad.dtbo,${overlays}
 fi
 
 setenv extra_bootargs fbcon=logo-pos:center fbcon=logo-count:1 ${extra_bootargs}
diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-pro/boot.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-pro/boot.txt
index c39102e2b..fcfd3c7eb 100644
--- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-pro/boot.txt
+++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-pro/boot.txt
@@ -73,33 +73,33 @@ if test -n "${module_ram}"; then
 	setexpr module_has_bt ${module_has_bt} / 2
 
 	if test "${module_has_bt}" = "1" && test -z "${disable_bt}"; then
-		setenv overlays _ov_som_bt_ccimx8x.dtbo,${overlays}
+		setenv overlays ccimx8x_bt.dtbo,${overlays}
 	fi
 
 	if test "${module_has_wifi}" = "1" && test -z "${disable_wifi}"; then
-		setenv overlays _ov_som_wifi_ccimx8x.dtbo,${overlays}
+		setenv overlays ccimx8x_wifi.dtbo,${overlays}
 	fi
 else
 	#
 	# Set overlays depending on the hardware variant
 	#
 	if test "${module_variant}" = "0x01"; then
-		setenv overlays _ov_som_bt_ccimx8x.dtbo,_ov_som_wifi_ccimx8x.dtbo,${overlays}
+		setenv overlays ccimx8x_bt.dtbo,ccimx8x_wifi.dtbo,${overlays}
 	elif test "${module_variant}" = "0x02"; then
-		setenv overlays _ov_som_bt_ccimx8x.dtbo,_ov_som_wifi_ccimx8x.dtbo,${overlays}
+		setenv overlays ccimx8x_bt.dtbo,ccimx8x_wifi.dtbo,${overlays}
 	elif test "${module_variant}" = "0x04"; then
-		setenv overlays _ov_som_bt_ccimx8x.dtbo,_ov_som_wifi_ccimx8x.dtbo,${overlays}
+		setenv overlays ccimx8x_bt.dtbo,ccimx8x_wifi.dtbo,${overlays}
 	fi
 fi
 
 # Apply QXP overlay if the SOC type is "imx8qxp"
 if test "${soc_type}" = "imx8qxp"; then
-	setenv overlays _ov_som_quad_ccimx8x.dtbo,${overlays}
+	setenv overlays ccimx8x_quad.dtbo,${overlays}
 fi
 
 # Apply SBCv3 overlay if the board_version is 3 or lesser
 if test "${board_version}" -le "3"; then
-	setenv overlays _ov_board_v1-v3_ccimx8x-sbc-pro.dtbo,${overlays}
+	setenv overlays ccimx8x-sbc-pro_v1-v3.dtbo,${overlays}
 fi
 
 setenv extra_bootargs fbcon=logo-pos:center fbcon=logo-count:1 ${extra_bootargs}
diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx9/boot.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx9/boot.txt
index 6f75c7d45..8040238d9 100644
--- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx9/boot.txt
+++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx9/boot.txt
@@ -66,11 +66,11 @@ setexpr module_has_bt ${hwid_2} \& 40000
 setexpr module_has_bt ${module_has_bt} / 40000
 
 if test "${module_has_bt}" = "1" && test -z "${disable_bt}"; then
-	setenv overlays _ov_som_bt_ccimx9.dtbo,${overlays}
+	setenv overlays ccimx9_bt.dtbo,${overlays}
 fi
 
 if test "${module_has_wifi}" = "1" && test -z "${disable_wifi}"; then
-	setenv overlays _ov_som_wifi_ccimx9.dtbo,${overlays}
+	setenv overlays ccimx9_wifi.dtbo,${overlays}
 fi
 
 if test "${soc_type}" = "imx93"; then
@@ -84,14 +84,14 @@ if test "${soc_type}" = "imx93"; then
 		echo "Emulating a ConnectCore 91 (emulate-cc91=yes)"
 		module_has_npu="0"
 		setenv extra_bootargs ${extra_bootargs} mem=512M
-		setenv overlays _ov_som_emulate-ccimx91_ccimx93.dtbo,${overlays}
+		setenv overlays ccimx93_emulate-ccimx91.dtbo,${overlays}
 	elif test "${module_variant}" = "0x03" || test "${module_variant}" = "0x04"; then
-		setenv overlays _ov_som_single-core-512M_ccimx93.dtbo,${overlays}
+		setenv overlays ccimx93_single-core-512M.dtbo,${overlays}
 	fi
 fi
 
 if test "${module_has_npu}" = "1" && test -z "${disable_npu}"; then
-	setenv overlays _ov_som_npu_ccimx93.dtbo,${overlays}
+	setenv overlays ccimx93_npu.dtbo,${overlays}
 fi
 
 if test "${dboot_kernel_var}" = "fitimage" && test -z "${temp-fitimg-loaded}"; then
diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccmp13-dvk/boot.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccmp13-dvk/boot.txt
index 34d09e9cd..d0e7e60df 100644
--- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccmp13-dvk/boot.txt
+++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccmp13-dvk/boot.txt
@@ -59,16 +59,16 @@ setexpr module_has_bt ${hwid_2} \& 40000
 setexpr module_has_bt ${module_has_bt} / 40000
 
 if test "${module_has_bt}" = "1" && test -z "${disable_bt}"; then
-	setenv overlays _ov_som_bt_ccmp13.dtbo,${overlays}
+	setenv overlays ccmp13_bt.dtbo,${overlays}
 fi
 
 if test "${module_has_wifi}" = "1" && test -z "${disable_wifi}"; then
-	setenv overlays _ov_som_wifi_ccmp13.dtbo,${overlays}
+	setenv overlays ccmp13_wifi.dtbo,${overlays}
 fi
 
 # Apply DVKv2 overlay if the board_version is 2
 if test "${board_version}" -eq "2"; then
-	setenv overlays _ov_board_v2_ccmp13-dvk.dtbo,${overlays}
+	setenv overlays ccmp13-dvk_v2.dtbo,${overlays}
 fi
 
 if test "${boot_device}" = "mmc"; then
diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccmp15-dvk/boot.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccmp15-dvk/boot.txt
index cbf3976b3..9f96fe530 100644
--- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccmp15-dvk/boot.txt
+++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccmp15-dvk/boot.txt
@@ -62,25 +62,25 @@ setexpr som_hv ${som_hv} / 8
 
 # Apply SOMv1 overlay if the HWID field 'hv' is 1
 if test "${som_hv}" -eq "1"; then
-	setenv overlays _ov_som_v1_ccmp15.dtbo,${overlays}
+	setenv overlays ccmp15_v1.dtbo,${overlays}
 fi
 
 if test "${module_has_bt}" = "1" && test -z "${disable_bt}"; then
-	setenv overlays _ov_som_bt_ccmp15.dtbo,${overlays}
+	setenv overlays ccmp15_bt.dtbo,${overlays}
 fi
 
 if test "${module_has_wifi}" = "1" && test -z "${disable_wifi}"; then
-	setenv overlays _ov_som_wifi_ccmp15.dtbo,${overlays}
+	setenv overlays ccmp15_wifi.dtbo,${overlays}
 fi
 
 # Apply DVKv1 overlay if the board_version is 1
 if test -z "${board_version}" || test "${board_version}" -eq "1"; then
-	setenv overlays _ov_board_v1_ccmp15-dvk.dtbo,${overlays}
+	setenv overlays ccmp15-dvk_v1.dtbo,${overlays}
 fi
 
 # Apply DVKv2 overlay if the board_version is 2
 if test "${board_version}" -eq "2"; then
-	setenv overlays _ov_board_v2_ccmp15-dvk.dtbo,${overlays}
+	setenv overlays ccmp15-dvk_v2.dtbo,${overlays}
 fi
 
 if test "${boot_device}" = "mmc"; then
diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccmp25-dvk/boot.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccmp25-dvk/boot.txt
index d19cd4301..8414d9627 100644
--- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccmp25-dvk/boot.txt
+++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccmp25-dvk/boot.txt
@@ -66,11 +66,11 @@ setexpr module_has_bt ${hwid_2} \& 20000
 setexpr module_has_bt ${module_has_bt} / 20000
 
 if test "${module_has_bt}" = "1" && test -z "${disable_bt}"; then
-	setenv overlays _ov_som_bt_ccmp25.dtbo,${overlays}
+	setenv overlays ccmp25_bt.dtbo,${overlays}
 fi
 
 if test "${module_has_wifi}" = "1" && test -z "${disable_wifi}"; then
-	setenv overlays _ov_som_wifi_ccmp25.dtbo,${overlays}
+	setenv overlays ccmp25_wifi.dtbo,${overlays}
 fi
 
 dboot linux mmc ${mmcbootdev}:${mmcpart}
diff --git a/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix-git/ccmp13-dvk/libdigiapix.conf b/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix-git/ccmp13-dvk/libdigiapix.conf
index 95df95fc4..cffbeba2c 100644
--- a/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix-git/ccmp13-dvk/libdigiapix.conf
+++ b/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix-git/ccmp13-dvk/libdigiapix.conf
@@ -21,7 +21,7 @@ DEFAULT_SPI = 0,0
 
 [PWM]
 
-# PWM2 on MikroBus connector J31 (pin 1). Set overlay _ov_board_pwm8_ccmp13-dvk.dtbo
+# PWM2 on MikroBus connector J31 (pin 1). Set overlay ccmp13-dvk_pwm8.dtbo
 DEFAULT_PWM = 0,0
 
 [ADC]