diff --git a/boards/ti/am243x_evm/am243x_evm_am2434_m4.dts b/boards/ti/am243x_evm/am243x_evm_am2434_m4.dts
index 16a8045e024..4d135718374 100644
--- a/boards/ti/am243x_evm/am243x_evm_am2434_m4.dts
+++ b/boards/ti/am243x_evm/am243x_evm_am2434_m4.dts
@@ -55,7 +55,7 @@
 
 	ipc0: ipc {
 		compatible = "zephyr,mbox-ipm";
-		mboxes = <&mbox6 0>, <&mbox6 1>;
+		mboxes = <&main_mbox6 0>, <&main_mbox6 1>;
 		mbox-names = "tx", "rx";
 	};
 };
@@ -73,7 +73,7 @@
 	status = "okay";
 };
 
-&mbox6 {
+&main_mbox6 {
 	usr-id = <3>;
 	status = "okay";
 };
diff --git a/boards/ti/am243x_evm/am243x_evm_am2434_r5f0_0-pinctrl.dtsi b/boards/ti/am243x_evm/am243x_evm_am2434_r5f0_0-pinctrl.dtsi
index 25465279e35..ebb531a8629 100644
--- a/boards/ti/am243x_evm/am243x_evm_am2434_r5f0_0-pinctrl.dtsi
+++ b/boards/ti/am243x_evm/am243x_evm_am2434_r5f0_0-pinctrl.dtsi
@@ -6,22 +6,22 @@
 
 #include <zephyr/dt-bindings/pinctrl/ti-k3-pinctrl.h>
 
-&pinctrl {
+&main_pinctrl {
 	status = "okay";
 
-	uart0_rx: uart0_rx_default {
+	main_uart0_rx: uart0_rx_default {
 		pinmux = <K3_PINMUX(0x230, PIN_INPUT, MUX_MODE_0)>;
 	};
 
-	uart0_tx: uart0_tx_default {
+	main_uart0_tx: uart0_tx_default {
 		pinmux = <K3_PINMUX(0x234, PIN_OUTPUT, MUX_MODE_0)>;
 	};
 
-	i2c0_scl: i2c0_scl_default {
+	main_i2c0_scl: i2c0_scl_default {
 		pinmux = <K3_PINMUX(0x260, PIN_INPUT_PULLUP, MUX_MODE_0)>;
 	};
 
-	i2c0_sda: i2c0_sda_default {
+	main_i2c0_sda: i2c0_sda_default {
 		pinmux = <K3_PINMUX(0x264, PIN_INPUT_PULLUP, MUX_MODE_0)>;
 	};
 
diff --git a/boards/ti/am243x_evm/am243x_evm_am2434_r5f0_0.dts b/boards/ti/am243x_evm/am243x_evm_am2434_r5f0_0.dts
index 862c7ff18e7..c376cde6d99 100644
--- a/boards/ti/am243x_evm/am243x_evm_am2434_r5f0_0.dts
+++ b/boards/ti/am243x_evm/am243x_evm_am2434_r5f0_0.dts
@@ -16,15 +16,15 @@
 	chosen {
 		zephyr,sram = &sram;
 		zephyr,sram1 = &atcm;
-		zephyr,console = &uart0;
-		zephyr,shell-uart = &uart0;
+		zephyr,console = &main_uart0;
+		zephyr,shell-uart = &main_uart0;
 		zephyr,ipc = &ipc0;
 		zephyr,ipc-shm = &ipc_shm0;
 	};
 
 	aliases {
 		led0 = &ld26;
-		adc0 = &adc0;
+		adc0 = &main_adc0;
 	};
 
 	leds: leds {
@@ -51,7 +51,7 @@
 
 	ipc0: ipc {
 		compatible = "zephyr,mbox-ipm";
-		mboxes = <&mbox6 0>, <&mbox6 1>;
+		mboxes = <&main_mbox6 0>, <&main_mbox6 1>;
 		mbox-names = "rx", "tx";
 	};
 };
@@ -65,13 +65,13 @@
 };
 
 /* system timer */
-&timer8 {
+&main_timer8 {
 	status = "okay";
 };
 
-&uart0 {
+&main_uart0 {
 	status = "okay";
-	pinctrl-0 = <&uart0_tx &uart0_rx>;
+	pinctrl-0 = <&main_uart0_tx &main_uart0_rx>;
 	pinctrl-names = "default";
 	current-speed = <115200>;
 };
@@ -82,20 +82,21 @@
 	status = "okay";
 };
 
-&i2c0 {
-	pinctrl-0 = <&i2c0_scl &i2c0_sda>;
+&main_i2c0 {
+	pinctrl-0 = <&main_i2c0_scl &main_i2c0_sda>;
 	pinctrl-names = "default";
 	status = "okay";
 	power-domains = <&i2c0_pd>;
 };
 
-&mcspi0 {
+&main_mcspi0 {
 	pinctrl-0 = <&spi0_clk &spi0_cs0 &spi0_d0 &spi0_d1>;
 	pinctrl-names = "default";
 	status = "okay";
+	power-domains = <&mcspi0_pd>;
 };
 
-&adc0 {
+&main_adc0 {
 	ti,vrefp = <1800>;
 	ti,fifo = <0>;
 	status = "okay";
@@ -182,7 +183,7 @@
 	};
 };
 
-&mbox6 {
+&main_mbox6 {
 	usr-id = <0>;
 	status = "okay";
 };
diff --git a/boards/ti/sk_am64/sk_am64_am6442_m4.dts b/boards/ti/sk_am64/sk_am64_am6442_m4.dts
index 2039c6e442d..0eb59478035 100644
--- a/boards/ti/sk_am64/sk_am64_am6442_m4.dts
+++ b/boards/ti/sk_am64/sk_am64_am6442_m4.dts
@@ -62,7 +62,7 @@
 
 	ipc0: ipc {
 		compatible = "zephyr,mbox-ipm";
-		mboxes = <&mbox6 0>, <&mbox6 1>;
+		mboxes = <&main_mbox6 0>, <&main_mbox6 1>;
 		mbox-names = "tx", "rx";
 	};
 };
@@ -80,7 +80,7 @@
 	status = "okay";
 };
 
-&mbox6 {
+&main_mbox6 {
 	usr-id = <3>;
 	status = "okay";
 };
diff --git a/boards/ti/sk_am64/sk_am64_am6442_r5f0_0.dts b/boards/ti/sk_am64/sk_am64_am6442_r5f0_0.dts
index af968fccbe7..4d68057b1f1 100644
--- a/boards/ti/sk_am64/sk_am64_am6442_r5f0_0.dts
+++ b/boards/ti/sk_am64/sk_am64_am6442_r5f0_0.dts
@@ -44,11 +44,11 @@
 
 	ipc0: ipc {
 		compatible = "zephyr,mbox-ipm";
-		mboxes = <&mbox2 0>, <&mbox2 1>;
+		mboxes = <&main_mbox2 0>, <&main_mbox2 1>;
 		mbox-names = "tx", "rx";
 	};
 };
 
-&timer8 {
+&main_timer8 {
 	status = "okay";
 };
diff --git a/boards/ti/sk_am64/sk_am64_am6442_r5f0_1.dts b/boards/ti/sk_am64/sk_am64_am6442_r5f0_1.dts
index 2d71c0cc551..f4dd890afbf 100644
--- a/boards/ti/sk_am64/sk_am64_am6442_r5f0_1.dts
+++ b/boards/ti/sk_am64/sk_am64_am6442_r5f0_1.dts
@@ -44,11 +44,11 @@
 
 	ipc0: ipc {
 		compatible = "zephyr,mbox-ipm";
-		mboxes = <&mbox2 2>, <&mbox2 3>;
+		mboxes = <&main_mbox2 2>, <&main_mbox2 3>;
 		mbox-names = "tx", "rx";
 	};
 };
 
-&timer9 {
+&main_timer9 {
 	status = "okay";
 };
diff --git a/boards/ti/sk_am64/sk_am64_am6442_r5f1_0.dts b/boards/ti/sk_am64/sk_am64_am6442_r5f1_0.dts
index de381fc5f53..3293342623b 100644
--- a/boards/ti/sk_am64/sk_am64_am6442_r5f1_0.dts
+++ b/boards/ti/sk_am64/sk_am64_am6442_r5f1_0.dts
@@ -44,11 +44,11 @@
 
 	ipc0: ipc {
 		compatible = "zephyr,mbox-ipm";
-		mboxes = <&mbox4 0>, <&mbox4 1>;
+		mboxes = <&main_mbox4 0>, <&main_mbox4 1>;
 		mbox-names = "tx", "rx";
 	};
 };
 
-&timer10 {
+&main_timer10 {
 	status = "okay";
 };
diff --git a/boards/ti/sk_am64/sk_am64_am6442_r5f1_1.dts b/boards/ti/sk_am64/sk_am64_am6442_r5f1_1.dts
index c7943c4e0ce..e7ce436d6a6 100644
--- a/boards/ti/sk_am64/sk_am64_am6442_r5f1_1.dts
+++ b/boards/ti/sk_am64/sk_am64_am6442_r5f1_1.dts
@@ -44,11 +44,11 @@
 
 	ipc0: ipc {
 		compatible = "zephyr,mbox-ipm";
-		mboxes = <&mbox4 2>, <&mbox4 3>;
+		mboxes = <&main_mbox4 2>, <&main_mbox4 3>;
 		mbox-names = "tx", "rx";
 	};
 };
 
-&timer11 {
+&main_timer11 {
 	status = "okay";
 };
diff --git a/tests/drivers/spi/spi_loopback/boards/am243x_evm_am2434_r5f0_0.overlay b/tests/drivers/spi/spi_loopback/boards/am243x_evm_am2434_r5f0_0.overlay
index 96dbdca4c9f..be2e6e7d4e0 100644
--- a/tests/drivers/spi/spi_loopback/boards/am243x_evm_am2434_r5f0_0.overlay
+++ b/tests/drivers/spi/spi_loopback/boards/am243x_evm_am2434_r5f0_0.overlay
@@ -6,7 +6,7 @@
 
 #include <freq.h>
 
-&mcspi0 {
+&main_mcspi0 {
 	slow@0 {
 		compatible = "test-spi-loopback-slow";
 		reg = <0>;