diff --git a/.metadata/.tirex/package.tirex.json b/.metadata/.tirex/package.tirex.json
index 615d5b03..70bf6eee 100644
--- a/.metadata/.tirex/package.tirex.json
+++ b/.metadata/.tirex/package.tirex.json
@@ -7,7 +7,7 @@
         "version": "01.00.00.00",
         "type": "software",
         "license": "../../LICENSE",
-        "devices": ["AM243x", "AM64x", "AM261x", "AM263px", "AM263x"],
+        "devices": ["AM243x", "AM64x", "AM261x", "AM263Px", "AM263x", "AM62x"],
         "tags": ["Baremetal", "FreeRTOS", "Linux"],
         "description": "Welcome to OpenPRU. This repository contains examples, training, and tools to develop PRU applications.",
         "dependencies": [
diff --git a/README.md b/README.md
index f6a3f3f7..66fb82e8 100644
--- a/README.md
+++ b/README.md
@@ -24,7 +24,7 @@ The OpenPRU project currently supports these processors:
 - AM243x: [AM2431](https://www.ti.com/product/AM2431), [AM2432](https://www.ti.com/product/AM2432), [AM2434](https://www.ti.com/product/AM2434)
 - AM261x: [AM2612](https://www.ti.com/product/AM2612)
 - AM263x: [AM2631](https://www.ti.com/product/AM2631), [AM2631-Q1](https://www.ti.com/product/AM2631-Q1), [AM2632](https://www.ti.com/product/AM2632), [AM2632-Q1](https://www.ti.com/product/AM2632-Q1), [AM2634](https://www.ti.com/product/AM2634), [AM2634-Q1](https://www.ti.com/product/AM2634-Q1)
-- AM263px: [AM263P2-Q1](https://www.ti.com/product/AM263P2-Q1), [AM263P2](https://www.ti.com/product/AM263P2), [AM263P4-Q1](https://www.ti.com/product/AM263P4-Q1), [AM263P4](https://www.ti.com/product/AM263P4)
+- AM263Px: [AM263P2-Q1](https://www.ti.com/product/AM263P2-Q1), [AM263P2](https://www.ti.com/product/AM263P2), [AM263P4-Q1](https://www.ti.com/product/AM263P4-Q1), [AM263P4](https://www.ti.com/product/AM263P4)
 - AM62x: [AM623](https://www.ti.com/product/AM623), [AM625](https://www.ti.com/product/AM625)
 - AM64x: [AM6411](https://www.ti.com/product/AM6411), [AM6412](https://www.ti.com/product/AM6412), [AM6421](https://www.ti.com/product/AM6421), [AM6422](https://www.ti.com/product/AM6422), [AM6441](https://www.ti.com/product/AM6441), [AM6442](https://www.ti.com/product/AM6442).
 
diff --git a/academy/crc/crc/firmware/am261x-lp/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd b/academy/crc/crc/firmware/am261x-lp/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
index 672e9b92..13fdcb5e 100644
--- a/academy/crc/crc/firmware/am261x-lp/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
+++ b/academy/crc/crc/firmware/am261x-lp/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
@@ -17,7 +17,7 @@ MEMORY
 	/* 8 KB PRU Data RAM 0 */
 	PRU0_DMEM_0	: org = 0x00000000 len = 0x00002000
 	/* 8 KB PRU Data RAM 1 */
-	PRU0_DMEM_1	: org = 0x00002000 len = 0x00002000
+	PRU1_DMEM_1	: org = 0x00002000 len = 0x00002000
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/crc/crc/firmware/am261x-lp/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd b/academy/crc/crc/firmware/am261x-lp/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
index 66f6da5e..774184dd 100644
--- a/academy/crc/crc/firmware/am261x-lp/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
+++ b/academy/crc/crc/firmware/am261x-lp/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
@@ -17,7 +17,7 @@ MEMORY
 	/* 8 KB PRU Data RAM 1 */
 	PRU1_DMEM_1	: org = 0x00000000 len = 0x00002000
 	/* 8 KB PRU Data RAM 0 */
-	PRU1_DMEM_0	: org = 0x00002000 len = 0x00002000
+	PRU0_DMEM_0	: org = 0x00002000 len = 0x00002000
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/crc/crc/firmware/am261x-som/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd b/academy/crc/crc/firmware/am261x-som/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
index 672e9b92..13fdcb5e 100644
--- a/academy/crc/crc/firmware/am261x-som/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
+++ b/academy/crc/crc/firmware/am261x-som/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
@@ -17,7 +17,7 @@ MEMORY
 	/* 8 KB PRU Data RAM 0 */
 	PRU0_DMEM_0	: org = 0x00000000 len = 0x00002000
 	/* 8 KB PRU Data RAM 1 */
-	PRU0_DMEM_1	: org = 0x00002000 len = 0x00002000
+	PRU1_DMEM_1	: org = 0x00002000 len = 0x00002000
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/crc/crc/firmware/am261x-som/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd b/academy/crc/crc/firmware/am261x-som/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
index 66f6da5e..774184dd 100644
--- a/academy/crc/crc/firmware/am261x-som/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
+++ b/academy/crc/crc/firmware/am261x-som/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
@@ -17,7 +17,7 @@ MEMORY
 	/* 8 KB PRU Data RAM 1 */
 	PRU1_DMEM_1	: org = 0x00000000 len = 0x00002000
 	/* 8 KB PRU Data RAM 0 */
-	PRU1_DMEM_0	: org = 0x00002000 len = 0x00002000
+	PRU0_DMEM_0	: org = 0x00002000 len = 0x00002000
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/crc/crc/firmware/am263px-cc/icss_m0_pru0_fw/ti-pru-cgt/example.projectspec b/academy/crc/crc/firmware/am263px-cc/icss_m0_pru0_fw/ti-pru-cgt/example.projectspec
index 4c9638a2..d20d2235 100644
--- a/academy/crc/crc/firmware/am263px-cc/icss_m0_pru0_fw/ti-pru-cgt/example.projectspec
+++ b/academy/crc/crc/firmware/am263px-cc/icss_m0_pru0_fw/ti-pru-cgt/example.projectspec
@@ -4,7 +4,7 @@
         <when>
             <context
                 deviceFamily="PRU"
-                deviceId="AM263px"
+                deviceId="AM263Px"
             />
         </when>
     </applicability>
@@ -20,7 +20,7 @@
         connection="TIXDS110_Connection.xml"
         toolChain="TI"
         cgtVersion="2.3.3"
-        device="AM263px"
+        device="AM263Px"
         deviceCore="ICSSM_PRU_0"
         ignoreDefaultDeviceSettings="true"
         ignoreDefaultCCSSettings="true"
diff --git a/academy/crc/crc/firmware/am263px-cc/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd b/academy/crc/crc/firmware/am263px-cc/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
index 9da5f8e7..5b64bc7e 100644
--- a/academy/crc/crc/firmware/am263px-cc/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
+++ b/academy/crc/crc/firmware/am263px-cc/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
@@ -1,8 +1,8 @@
 /*
- * AM263px_PRU0.cmd
+ * AM263Px_PRU0.cmd
  *
  * Example Linker command file for linking assembly programs built with the TI-PRU-CGT
- * on AM263px PRU0 cores
+ * on AM263Px PRU0 cores
  */
 
 /* Specify the System Memory Map */
@@ -17,7 +17,7 @@ MEMORY
 	/* 8 KB PRU Data RAM 0 */
 	PRU0_DMEM_0	: org = 0x00000000 len = 0x00002000
 	/* 8 KB PRU Data RAM 1 */
-	PRU0_DMEM_1	: org = 0x00002000 len = 0x00002000
+	PRU1_DMEM_1	: org = 0x00002000 len = 0x00002000
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/crc/crc/firmware/am263px-cc/icss_m0_pru1_fw/ti-pru-cgt/example.projectspec b/academy/crc/crc/firmware/am263px-cc/icss_m0_pru1_fw/ti-pru-cgt/example.projectspec
index c5343f2f..0b81a0d3 100644
--- a/academy/crc/crc/firmware/am263px-cc/icss_m0_pru1_fw/ti-pru-cgt/example.projectspec
+++ b/academy/crc/crc/firmware/am263px-cc/icss_m0_pru1_fw/ti-pru-cgt/example.projectspec
@@ -4,7 +4,7 @@
         <when>
             <context
                 deviceFamily="PRU"
-                deviceId="AM263px"
+                deviceId="AM263Px"
             />
         </when>
     </applicability>
@@ -20,7 +20,7 @@
         connection="TIXDS110_Connection.xml"
         toolChain="TI"
         cgtVersion="2.3.3"
-        device="AM263px"
+        device="AM263Px"
         deviceCore="ICSSM_PRU_1"
         ignoreDefaultDeviceSettings="true"
         ignoreDefaultCCSSettings="true"
diff --git a/academy/crc/crc/firmware/am263px-cc/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd b/academy/crc/crc/firmware/am263px-cc/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
index 23af1b71..57db723f 100644
--- a/academy/crc/crc/firmware/am263px-cc/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
+++ b/academy/crc/crc/firmware/am263px-cc/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
@@ -1,8 +1,8 @@
 /*
- * AM263px_PRU1.cmd
+ * AM263Px_PRU1.cmd
  *
  * Example Linker command file for linking assembly programs built with the TI-PRU-CGT
- * on AM263px PRU1 cores
+ * on AM263Px PRU1 cores
  */
 
 /* Specify the System Memory Map */
@@ -17,7 +17,7 @@ MEMORY
 	/* 8 KB PRU Data RAM 1 */
 	PRU1_DMEM_1	: org = 0x00000000 len = 0x00002000
 	/* 8 KB PRU Data RAM 0 */
-	PRU1_DMEM_0	: org = 0x00002000 len = 0x00002000
+	PRU0_DMEM_0	: org = 0x00002000 len = 0x00002000
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/crc/crc/firmware/am263px-lp/icss_m0_pru0_fw/ti-pru-cgt/example.projectspec b/academy/crc/crc/firmware/am263px-lp/icss_m0_pru0_fw/ti-pru-cgt/example.projectspec
index bfed48ec..2dee9ad3 100644
--- a/academy/crc/crc/firmware/am263px-lp/icss_m0_pru0_fw/ti-pru-cgt/example.projectspec
+++ b/academy/crc/crc/firmware/am263px-lp/icss_m0_pru0_fw/ti-pru-cgt/example.projectspec
@@ -4,7 +4,7 @@
         <when>
             <context
                 deviceFamily="PRU"
-                deviceId="AM263px"
+                deviceId="AM263Px"
             />
         </when>
     </applicability>
@@ -20,7 +20,7 @@
         connection="TIXDS110_Connection.xml"
         toolChain="TI"
         cgtVersion="2.3.3"
-        device="AM263px"
+        device="AM263Px"
         deviceCore="ICSSM_PRU_0"
         ignoreDefaultDeviceSettings="true"
         ignoreDefaultCCSSettings="true"
diff --git a/academy/crc/crc/firmware/am263px-lp/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd b/academy/crc/crc/firmware/am263px-lp/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
index 9da5f8e7..5b64bc7e 100644
--- a/academy/crc/crc/firmware/am263px-lp/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
+++ b/academy/crc/crc/firmware/am263px-lp/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
@@ -1,8 +1,8 @@
 /*
- * AM263px_PRU0.cmd
+ * AM263Px_PRU0.cmd
  *
  * Example Linker command file for linking assembly programs built with the TI-PRU-CGT
- * on AM263px PRU0 cores
+ * on AM263Px PRU0 cores
  */
 
 /* Specify the System Memory Map */
@@ -17,7 +17,7 @@ MEMORY
 	/* 8 KB PRU Data RAM 0 */
 	PRU0_DMEM_0	: org = 0x00000000 len = 0x00002000
 	/* 8 KB PRU Data RAM 1 */
-	PRU0_DMEM_1	: org = 0x00002000 len = 0x00002000
+	PRU1_DMEM_1	: org = 0x00002000 len = 0x00002000
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/crc/crc/firmware/am263px-lp/icss_m0_pru1_fw/ti-pru-cgt/example.projectspec b/academy/crc/crc/firmware/am263px-lp/icss_m0_pru1_fw/ti-pru-cgt/example.projectspec
index 16d97e29..3a3528ad 100644
--- a/academy/crc/crc/firmware/am263px-lp/icss_m0_pru1_fw/ti-pru-cgt/example.projectspec
+++ b/academy/crc/crc/firmware/am263px-lp/icss_m0_pru1_fw/ti-pru-cgt/example.projectspec
@@ -4,7 +4,7 @@
         <when>
             <context
                 deviceFamily="PRU"
-                deviceId="AM263px"
+                deviceId="AM263Px"
             />
         </when>
     </applicability>
@@ -20,7 +20,7 @@
         connection="TIXDS110_Connection.xml"
         toolChain="TI"
         cgtVersion="2.3.3"
-        device="AM263px"
+        device="AM263Px"
         deviceCore="ICSSM_PRU_1"
         ignoreDefaultDeviceSettings="true"
         ignoreDefaultCCSSettings="true"
diff --git a/academy/crc/crc/firmware/am263px-lp/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd b/academy/crc/crc/firmware/am263px-lp/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
index 23af1b71..57db723f 100644
--- a/academy/crc/crc/firmware/am263px-lp/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
+++ b/academy/crc/crc/firmware/am263px-lp/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
@@ -1,8 +1,8 @@
 /*
- * AM263px_PRU1.cmd
+ * AM263Px_PRU1.cmd
  *
  * Example Linker command file for linking assembly programs built with the TI-PRU-CGT
- * on AM263px PRU1 cores
+ * on AM263Px PRU1 cores
  */
 
 /* Specify the System Memory Map */
@@ -17,7 +17,7 @@ MEMORY
 	/* 8 KB PRU Data RAM 1 */
 	PRU1_DMEM_1	: org = 0x00000000 len = 0x00002000
 	/* 8 KB PRU Data RAM 0 */
-	PRU1_DMEM_0	: org = 0x00002000 len = 0x00002000
+	PRU0_DMEM_0	: org = 0x00002000 len = 0x00002000
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/crc/crc/firmware/am263x-cc/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd b/academy/crc/crc/firmware/am263x-cc/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
index 26f02bf4..11542351 100644
--- a/academy/crc/crc/firmware/am263x-cc/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
+++ b/academy/crc/crc/firmware/am263x-cc/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
@@ -17,7 +17,7 @@ MEMORY
 	/* 8 KB PRU Data RAM 0 */
 	PRU0_DMEM_0	: org = 0x00000000 len = 0x00002000
 	/* 8 KB PRU Data RAM 1 */
-	PRU0_DMEM_1	: org = 0x00002000 len = 0x00002000
+	PRU1_DMEM_1	: org = 0x00002000 len = 0x00002000
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/crc/crc/firmware/am263x-cc/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd b/academy/crc/crc/firmware/am263x-cc/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
index 70fb0765..cf0121bf 100644
--- a/academy/crc/crc/firmware/am263x-cc/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
+++ b/academy/crc/crc/firmware/am263x-cc/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
@@ -17,7 +17,7 @@ MEMORY
 	/* 8 KB PRU Data RAM 1 */
 	PRU1_DMEM_1	: org = 0x00000000 len = 0x00002000
 	/* 8 KB PRU Data RAM 0 */
-	PRU1_DMEM_0	: org = 0x00002000 len = 0x00002000
+	PRU0_DMEM_0	: org = 0x00002000 len = 0x00002000
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/crc/crc/firmware/am263x-lp/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd b/academy/crc/crc/firmware/am263x-lp/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
index 26f02bf4..11542351 100644
--- a/academy/crc/crc/firmware/am263x-lp/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
+++ b/academy/crc/crc/firmware/am263x-lp/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
@@ -17,7 +17,7 @@ MEMORY
 	/* 8 KB PRU Data RAM 0 */
 	PRU0_DMEM_0	: org = 0x00000000 len = 0x00002000
 	/* 8 KB PRU Data RAM 1 */
-	PRU0_DMEM_1	: org = 0x00002000 len = 0x00002000
+	PRU1_DMEM_1	: org = 0x00002000 len = 0x00002000
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/crc/crc/firmware/am263x-lp/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd b/academy/crc/crc/firmware/am263x-lp/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
index 70fb0765..cf0121bf 100644
--- a/academy/crc/crc/firmware/am263x-lp/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
+++ b/academy/crc/crc/firmware/am263x-lp/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
@@ -17,7 +17,7 @@ MEMORY
 	/* 8 KB PRU Data RAM 1 */
 	PRU1_DMEM_1	: org = 0x00000000 len = 0x00002000
 	/* 8 KB PRU Data RAM 0 */
-	PRU1_DMEM_0	: org = 0x00002000 len = 0x00002000
+	PRU0_DMEM_0	: org = 0x00002000 len = 0x00002000
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/getting_started_labs/assembly_code/solution/firmware/am243x-evm/icss_g0_pru0_fw/ti-pru-cgt/linker.cmd b/academy/getting_started_labs/assembly_code/solution/firmware/am243x-evm/icss_g0_pru0_fw/ti-pru-cgt/linker.cmd
index 021e887d..ff7b62c7 100644
--- a/academy/getting_started_labs/assembly_code/solution/firmware/am243x-evm/icss_g0_pru0_fw/ti-pru-cgt/linker.cmd
+++ b/academy/getting_started_labs/assembly_code/solution/firmware/am243x-evm/icss_g0_pru0_fw/ti-pru-cgt/linker.cmd
@@ -19,14 +19,14 @@ MEMORY
 	PRU0_DMEM_0	: org = 0x00000000 len = 0x00001000
 	/* 8 KB PRU Data RAM 1; reserved completely for Slice1 cores - PRU1,
 	 * RTU1 and Tx_PRU1; do not use for any Slice0 cores */
-	PRU0_DMEM_1	: org = 0x00002000 len = 0x00001000
+	PRU1_DMEM_1	: org = 0x00002000 len = 0x00001000
 	/* NOTE: Custom split of the second 4 KB of ICSS Data RAMs 0 and 1
 	 * split equally between the corresponding RTU and Tx_PRU cores in
 	 * each slice */
 	RTU0_DMEM_0	: org = 0x00001000 len = 0x00000800
 	TX_PRU0_DMEM_0	: org = 0x00001800 len = 0x00000800
-	RTU0_DMEM_1	: org = 0x00003000 len = 0x00000800
-	TX_PRU0_DMEM_1	: org = 0x00003800 len = 0x00000800
+	RTU1_DMEM_1	: org = 0x00003000 len = 0x00000800
+	TX_PRU1_DMEM_1	: org = 0x00003800 len = 0x00000800
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/getting_started_labs/assembly_code/solution/firmware/am243x-evm/icss_g0_pru1_fw/ti-pru-cgt/linker.cmd b/academy/getting_started_labs/assembly_code/solution/firmware/am243x-evm/icss_g0_pru1_fw/ti-pru-cgt/linker.cmd
index bd059cb2..7d044555 100644
--- a/academy/getting_started_labs/assembly_code/solution/firmware/am243x-evm/icss_g0_pru1_fw/ti-pru-cgt/linker.cmd
+++ b/academy/getting_started_labs/assembly_code/solution/firmware/am243x-evm/icss_g0_pru1_fw/ti-pru-cgt/linker.cmd
@@ -19,14 +19,14 @@ MEMORY
 	PRU1_DMEM_1	: org = 0x00000000 len = 0x00001000
 	/* 8 KB PRU Data RAM 0; reserved completely for Slice0 cores - PRU0,
 	 * RTU0 and Tx_PRU0; do not use for any Slice1 cores */
-	PRU1_DMEM_0	: org = 0x00002000 len = 0x00001000
+	PRU0_DMEM_0	: org = 0x00002000 len = 0x00001000
 	/* NOTE: Custom split of the second 4 KB of ICSS Data RAMs 0 and 1
 	 * split equally between the corresponding RTU and Tx_PRU cores in
 	 * each slice */
 	RTU1_DMEM_1	: org = 0x00001000 len = 0x00000800
 	TX_PRU1_DMEM_1	: org = 0x00001800 len = 0x00000800
-	RTU1_DMEM_0	: org = 0x00003000 len = 0x00000800
-	TX_PRU1_DMEM_0	: org = 0x00003800 len = 0x00000800
+	RTU0_DMEM_0	: org = 0x00003000 len = 0x00000800
+	TX_PRU0_DMEM_0	: org = 0x00003800 len = 0x00000800
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/getting_started_labs/assembly_code/solution/firmware/am243x-evm/icss_g0_rtu_pru0_fw/ti-pru-cgt/linker.cmd b/academy/getting_started_labs/assembly_code/solution/firmware/am243x-evm/icss_g0_rtu_pru0_fw/ti-pru-cgt/linker.cmd
index ad61c5df..d0a58770 100644
--- a/academy/getting_started_labs/assembly_code/solution/firmware/am243x-evm/icss_g0_rtu_pru0_fw/ti-pru-cgt/linker.cmd
+++ b/academy/getting_started_labs/assembly_code/solution/firmware/am243x-evm/icss_g0_rtu_pru0_fw/ti-pru-cgt/linker.cmd
@@ -19,14 +19,14 @@ MEMORY
 	PRU0_DMEM_0	: org = 0x00000000 len = 0x00001000
 	/* 8 KB PRU Data RAM 1; reserved completely for Slice1 cores - PRU1,
 	 * RTU1 and Tx_PRU1; do not use for any Slice0 cores */
-	PRU0_DMEM_1	: org = 0x00002000 len = 0x00001000
+	PRU1_DMEM_1	: org = 0x00002000 len = 0x00001000
 	/* NOTE: Custom split of the second 4 KB of ICSS Data RAMs 0 and 1
 	 * split equally between the corresponding RTU and Tx_PRU cores in
 	 * each slice */
 	RTU0_DMEM_0	: org = 0x00001000 len = 0x00000800
 	TX_PRU0_DMEM_0	: org = 0x00001800 len = 0x00000800
-	RTU0_DMEM_1	: org = 0x00003000 len = 0x00000800
-	TX_PRU0_DMEM_1	: org = 0x00003800 len = 0x00000800
+	RTU1_DMEM_1	: org = 0x00003000 len = 0x00000800
+	TX_PRU1_DMEM_1	: org = 0x00003800 len = 0x00000800
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/getting_started_labs/assembly_code/solution/firmware/am243x-evm/icss_g0_rtu_pru1_fw/ti-pru-cgt/linker.cmd b/academy/getting_started_labs/assembly_code/solution/firmware/am243x-evm/icss_g0_rtu_pru1_fw/ti-pru-cgt/linker.cmd
index f9573fe6..a0f7c997 100644
--- a/academy/getting_started_labs/assembly_code/solution/firmware/am243x-evm/icss_g0_rtu_pru1_fw/ti-pru-cgt/linker.cmd
+++ b/academy/getting_started_labs/assembly_code/solution/firmware/am243x-evm/icss_g0_rtu_pru1_fw/ti-pru-cgt/linker.cmd
@@ -19,14 +19,14 @@ MEMORY
 	PRU1_DMEM_1	: org = 0x00000000 len = 0x00001000
 	/* 8 KB PRU Data RAM 0; reserved completely for Slice0 cores - PRU0,
 	 * RTU0 and Tx_PRU0; do not use for any Slice1 cores */
-	PRU1_DMEM_0	: org = 0x00002000 len = 0x00001000
+	PRU0_DMEM_0	: org = 0x00002000 len = 0x00001000
 	/* NOTE: Custom split of the second 4 KB of ICSS Data RAMs 0 and 1
 	 * split equally between the corresponding RTU and Tx_PRU cores in
 	 * each slice */
 	RTU1_DMEM_1	: org = 0x00001000 len = 0x00000800
 	TX_PRU1_DMEM_1	: org = 0x00001800 len = 0x00000800
-	RTU1_DMEM_0	: org = 0x00003000 len = 0x00000800
-	TX_PRU1_DMEM_0	: org = 0x00003800 len = 0x00000800
+	RTU0_DMEM_0	: org = 0x00003000 len = 0x00000800
+	TX_PRU0_DMEM_0	: org = 0x00003800 len = 0x00000800
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/getting_started_labs/assembly_code/solution/firmware/am243x-evm/icss_g0_tx_pru0_fw/ti-pru-cgt/linker.cmd b/academy/getting_started_labs/assembly_code/solution/firmware/am243x-evm/icss_g0_tx_pru0_fw/ti-pru-cgt/linker.cmd
index 7adf8ced..4f793ea1 100644
--- a/academy/getting_started_labs/assembly_code/solution/firmware/am243x-evm/icss_g0_tx_pru0_fw/ti-pru-cgt/linker.cmd
+++ b/academy/getting_started_labs/assembly_code/solution/firmware/am243x-evm/icss_g0_tx_pru0_fw/ti-pru-cgt/linker.cmd
@@ -19,14 +19,14 @@ MEMORY
 	PRU0_DMEM_0	: org = 0x00000000 len = 0x00001000
 	/* 8 KB PRU Data RAM 1; reserved completely for Slice1 cores - PRU1,
 	 * RTU1 and Tx_PRU1; do not use for any Slice0 cores */
-	PRU0_DMEM_1	: org = 0x00002000 len = 0x00001000
+	PRU1_DMEM_1	: org = 0x00002000 len = 0x00001000
 	/* NOTE: Custom split of the second 4 KB of ICSS Data RAMs 0 and 1
 	 * split equally between the corresponding RTU and Tx_PRU cores in
 	 * each slice */
 	RTU0_DMEM_0	: org = 0x00001000 len = 0x00000800
 	TX_PRU0_DMEM_0	: org = 0x00001800 len = 0x00000800
-	RTU0_DMEM_1	: org = 0x00003000 len = 0x00000800
-	TX_PRU0_DMEM_1	: org = 0x00003800 len = 0x00000800
+	RTU1_DMEM_1	: org = 0x00003000 len = 0x00000800
+	TX_PRU1_DMEM_1	: org = 0x00003800 len = 0x00000800
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/getting_started_labs/assembly_code/solution/firmware/am243x-evm/icss_g0_tx_pru1_fw/ti-pru-cgt/linker.cmd b/academy/getting_started_labs/assembly_code/solution/firmware/am243x-evm/icss_g0_tx_pru1_fw/ti-pru-cgt/linker.cmd
index d61c0ae9..a9870ece 100644
--- a/academy/getting_started_labs/assembly_code/solution/firmware/am243x-evm/icss_g0_tx_pru1_fw/ti-pru-cgt/linker.cmd
+++ b/academy/getting_started_labs/assembly_code/solution/firmware/am243x-evm/icss_g0_tx_pru1_fw/ti-pru-cgt/linker.cmd
@@ -19,14 +19,14 @@ MEMORY
 	PRU1_DMEM_1	: org = 0x00000000 len = 0x00001000
 	/* 8 KB PRU Data RAM 0; reserved completely for Slice0 cores - PRU0,
 	 * RTU0 and Tx_PRU0; do not use for any Slice1 cores */
-	PRU1_DMEM_0	: org = 0x00002000 len = 0x00001000
+	PRU0_DMEM_0	: org = 0x00002000 len = 0x00001000
 	/* NOTE: Custom split of the second 4 KB of ICSS Data RAMs 0 and 1
 	 * split equally between the corresponding RTU and Tx_PRU cores in
 	 * each slice */
 	RTU1_DMEM_1	: org = 0x00001000 len = 0x00000800
 	TX_PRU1_DMEM_1	: org = 0x00001800 len = 0x00000800
-	RTU1_DMEM_0	: org = 0x00003000 len = 0x00000800
-	TX_PRU1_DMEM_0	: org = 0x00003800 len = 0x00000800
+	RTU0_DMEM_0	: org = 0x00003000 len = 0x00000800
+	TX_PRU0_DMEM_0	: org = 0x00003800 len = 0x00000800
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/getting_started_labs/assembly_code/solution/firmware/am243x-lp/icss_g0_pru0_fw/ti-pru-cgt/linker.cmd b/academy/getting_started_labs/assembly_code/solution/firmware/am243x-lp/icss_g0_pru0_fw/ti-pru-cgt/linker.cmd
index 021e887d..ff7b62c7 100644
--- a/academy/getting_started_labs/assembly_code/solution/firmware/am243x-lp/icss_g0_pru0_fw/ti-pru-cgt/linker.cmd
+++ b/academy/getting_started_labs/assembly_code/solution/firmware/am243x-lp/icss_g0_pru0_fw/ti-pru-cgt/linker.cmd
@@ -19,14 +19,14 @@ MEMORY
 	PRU0_DMEM_0	: org = 0x00000000 len = 0x00001000
 	/* 8 KB PRU Data RAM 1; reserved completely for Slice1 cores - PRU1,
 	 * RTU1 and Tx_PRU1; do not use for any Slice0 cores */
-	PRU0_DMEM_1	: org = 0x00002000 len = 0x00001000
+	PRU1_DMEM_1	: org = 0x00002000 len = 0x00001000
 	/* NOTE: Custom split of the second 4 KB of ICSS Data RAMs 0 and 1
 	 * split equally between the corresponding RTU and Tx_PRU cores in
 	 * each slice */
 	RTU0_DMEM_0	: org = 0x00001000 len = 0x00000800
 	TX_PRU0_DMEM_0	: org = 0x00001800 len = 0x00000800
-	RTU0_DMEM_1	: org = 0x00003000 len = 0x00000800
-	TX_PRU0_DMEM_1	: org = 0x00003800 len = 0x00000800
+	RTU1_DMEM_1	: org = 0x00003000 len = 0x00000800
+	TX_PRU1_DMEM_1	: org = 0x00003800 len = 0x00000800
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/getting_started_labs/assembly_code/solution/firmware/am243x-lp/icss_g0_pru1_fw/ti-pru-cgt/linker.cmd b/academy/getting_started_labs/assembly_code/solution/firmware/am243x-lp/icss_g0_pru1_fw/ti-pru-cgt/linker.cmd
index bd059cb2..7d044555 100644
--- a/academy/getting_started_labs/assembly_code/solution/firmware/am243x-lp/icss_g0_pru1_fw/ti-pru-cgt/linker.cmd
+++ b/academy/getting_started_labs/assembly_code/solution/firmware/am243x-lp/icss_g0_pru1_fw/ti-pru-cgt/linker.cmd
@@ -19,14 +19,14 @@ MEMORY
 	PRU1_DMEM_1	: org = 0x00000000 len = 0x00001000
 	/* 8 KB PRU Data RAM 0; reserved completely for Slice0 cores - PRU0,
 	 * RTU0 and Tx_PRU0; do not use for any Slice1 cores */
-	PRU1_DMEM_0	: org = 0x00002000 len = 0x00001000
+	PRU0_DMEM_0	: org = 0x00002000 len = 0x00001000
 	/* NOTE: Custom split of the second 4 KB of ICSS Data RAMs 0 and 1
 	 * split equally between the corresponding RTU and Tx_PRU cores in
 	 * each slice */
 	RTU1_DMEM_1	: org = 0x00001000 len = 0x00000800
 	TX_PRU1_DMEM_1	: org = 0x00001800 len = 0x00000800
-	RTU1_DMEM_0	: org = 0x00003000 len = 0x00000800
-	TX_PRU1_DMEM_0	: org = 0x00003800 len = 0x00000800
+	RTU0_DMEM_0	: org = 0x00003000 len = 0x00000800
+	TX_PRU0_DMEM_0	: org = 0x00003800 len = 0x00000800
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/getting_started_labs/assembly_code/solution/firmware/am243x-lp/icss_g0_rtu_pru0_fw/ti-pru-cgt/linker.cmd b/academy/getting_started_labs/assembly_code/solution/firmware/am243x-lp/icss_g0_rtu_pru0_fw/ti-pru-cgt/linker.cmd
index ad61c5df..d0a58770 100644
--- a/academy/getting_started_labs/assembly_code/solution/firmware/am243x-lp/icss_g0_rtu_pru0_fw/ti-pru-cgt/linker.cmd
+++ b/academy/getting_started_labs/assembly_code/solution/firmware/am243x-lp/icss_g0_rtu_pru0_fw/ti-pru-cgt/linker.cmd
@@ -19,14 +19,14 @@ MEMORY
 	PRU0_DMEM_0	: org = 0x00000000 len = 0x00001000
 	/* 8 KB PRU Data RAM 1; reserved completely for Slice1 cores - PRU1,
 	 * RTU1 and Tx_PRU1; do not use for any Slice0 cores */
-	PRU0_DMEM_1	: org = 0x00002000 len = 0x00001000
+	PRU1_DMEM_1	: org = 0x00002000 len = 0x00001000
 	/* NOTE: Custom split of the second 4 KB of ICSS Data RAMs 0 and 1
 	 * split equally between the corresponding RTU and Tx_PRU cores in
 	 * each slice */
 	RTU0_DMEM_0	: org = 0x00001000 len = 0x00000800
 	TX_PRU0_DMEM_0	: org = 0x00001800 len = 0x00000800
-	RTU0_DMEM_1	: org = 0x00003000 len = 0x00000800
-	TX_PRU0_DMEM_1	: org = 0x00003800 len = 0x00000800
+	RTU1_DMEM_1	: org = 0x00003000 len = 0x00000800
+	TX_PRU1_DMEM_1	: org = 0x00003800 len = 0x00000800
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/getting_started_labs/assembly_code/solution/firmware/am243x-lp/icss_g0_rtu_pru1_fw/ti-pru-cgt/linker.cmd b/academy/getting_started_labs/assembly_code/solution/firmware/am243x-lp/icss_g0_rtu_pru1_fw/ti-pru-cgt/linker.cmd
index f9573fe6..a0f7c997 100644
--- a/academy/getting_started_labs/assembly_code/solution/firmware/am243x-lp/icss_g0_rtu_pru1_fw/ti-pru-cgt/linker.cmd
+++ b/academy/getting_started_labs/assembly_code/solution/firmware/am243x-lp/icss_g0_rtu_pru1_fw/ti-pru-cgt/linker.cmd
@@ -19,14 +19,14 @@ MEMORY
 	PRU1_DMEM_1	: org = 0x00000000 len = 0x00001000
 	/* 8 KB PRU Data RAM 0; reserved completely for Slice0 cores - PRU0,
 	 * RTU0 and Tx_PRU0; do not use for any Slice1 cores */
-	PRU1_DMEM_0	: org = 0x00002000 len = 0x00001000
+	PRU0_DMEM_0	: org = 0x00002000 len = 0x00001000
 	/* NOTE: Custom split of the second 4 KB of ICSS Data RAMs 0 and 1
 	 * split equally between the corresponding RTU and Tx_PRU cores in
 	 * each slice */
 	RTU1_DMEM_1	: org = 0x00001000 len = 0x00000800
 	TX_PRU1_DMEM_1	: org = 0x00001800 len = 0x00000800
-	RTU1_DMEM_0	: org = 0x00003000 len = 0x00000800
-	TX_PRU1_DMEM_0	: org = 0x00003800 len = 0x00000800
+	RTU0_DMEM_0	: org = 0x00003000 len = 0x00000800
+	TX_PRU0_DMEM_0	: org = 0x00003800 len = 0x00000800
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/getting_started_labs/assembly_code/solution/firmware/am243x-lp/icss_g0_tx_pru0_fw/ti-pru-cgt/linker.cmd b/academy/getting_started_labs/assembly_code/solution/firmware/am243x-lp/icss_g0_tx_pru0_fw/ti-pru-cgt/linker.cmd
index 7adf8ced..4f793ea1 100644
--- a/academy/getting_started_labs/assembly_code/solution/firmware/am243x-lp/icss_g0_tx_pru0_fw/ti-pru-cgt/linker.cmd
+++ b/academy/getting_started_labs/assembly_code/solution/firmware/am243x-lp/icss_g0_tx_pru0_fw/ti-pru-cgt/linker.cmd
@@ -19,14 +19,14 @@ MEMORY
 	PRU0_DMEM_0	: org = 0x00000000 len = 0x00001000
 	/* 8 KB PRU Data RAM 1; reserved completely for Slice1 cores - PRU1,
 	 * RTU1 and Tx_PRU1; do not use for any Slice0 cores */
-	PRU0_DMEM_1	: org = 0x00002000 len = 0x00001000
+	PRU1_DMEM_1	: org = 0x00002000 len = 0x00001000
 	/* NOTE: Custom split of the second 4 KB of ICSS Data RAMs 0 and 1
 	 * split equally between the corresponding RTU and Tx_PRU cores in
 	 * each slice */
 	RTU0_DMEM_0	: org = 0x00001000 len = 0x00000800
 	TX_PRU0_DMEM_0	: org = 0x00001800 len = 0x00000800
-	RTU0_DMEM_1	: org = 0x00003000 len = 0x00000800
-	TX_PRU0_DMEM_1	: org = 0x00003800 len = 0x00000800
+	RTU1_DMEM_1	: org = 0x00003000 len = 0x00000800
+	TX_PRU1_DMEM_1	: org = 0x00003800 len = 0x00000800
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/getting_started_labs/assembly_code/solution/firmware/am243x-lp/icss_g0_tx_pru1_fw/ti-pru-cgt/linker.cmd b/academy/getting_started_labs/assembly_code/solution/firmware/am243x-lp/icss_g0_tx_pru1_fw/ti-pru-cgt/linker.cmd
index d61c0ae9..a9870ece 100644
--- a/academy/getting_started_labs/assembly_code/solution/firmware/am243x-lp/icss_g0_tx_pru1_fw/ti-pru-cgt/linker.cmd
+++ b/academy/getting_started_labs/assembly_code/solution/firmware/am243x-lp/icss_g0_tx_pru1_fw/ti-pru-cgt/linker.cmd
@@ -19,14 +19,14 @@ MEMORY
 	PRU1_DMEM_1	: org = 0x00000000 len = 0x00001000
 	/* 8 KB PRU Data RAM 0; reserved completely for Slice0 cores - PRU0,
 	 * RTU0 and Tx_PRU0; do not use for any Slice1 cores */
-	PRU1_DMEM_0	: org = 0x00002000 len = 0x00001000
+	PRU0_DMEM_0	: org = 0x00002000 len = 0x00001000
 	/* NOTE: Custom split of the second 4 KB of ICSS Data RAMs 0 and 1
 	 * split equally between the corresponding RTU and Tx_PRU cores in
 	 * each slice */
 	RTU1_DMEM_1	: org = 0x00001000 len = 0x00000800
 	TX_PRU1_DMEM_1	: org = 0x00001800 len = 0x00000800
-	RTU1_DMEM_0	: org = 0x00003000 len = 0x00000800
-	TX_PRU1_DMEM_0	: org = 0x00003800 len = 0x00000800
+	RTU0_DMEM_0	: org = 0x00003000 len = 0x00000800
+	TX_PRU0_DMEM_0	: org = 0x00003800 len = 0x00000800
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/getting_started_labs/assembly_code/solution/firmware/am261x-lp/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd b/academy/getting_started_labs/assembly_code/solution/firmware/am261x-lp/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
index 672e9b92..13fdcb5e 100644
--- a/academy/getting_started_labs/assembly_code/solution/firmware/am261x-lp/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
+++ b/academy/getting_started_labs/assembly_code/solution/firmware/am261x-lp/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
@@ -17,7 +17,7 @@ MEMORY
 	/* 8 KB PRU Data RAM 0 */
 	PRU0_DMEM_0	: org = 0x00000000 len = 0x00002000
 	/* 8 KB PRU Data RAM 1 */
-	PRU0_DMEM_1	: org = 0x00002000 len = 0x00002000
+	PRU1_DMEM_1	: org = 0x00002000 len = 0x00002000
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/getting_started_labs/assembly_code/solution/firmware/am261x-lp/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd b/academy/getting_started_labs/assembly_code/solution/firmware/am261x-lp/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
index 66f6da5e..774184dd 100644
--- a/academy/getting_started_labs/assembly_code/solution/firmware/am261x-lp/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
+++ b/academy/getting_started_labs/assembly_code/solution/firmware/am261x-lp/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
@@ -17,7 +17,7 @@ MEMORY
 	/* 8 KB PRU Data RAM 1 */
 	PRU1_DMEM_1	: org = 0x00000000 len = 0x00002000
 	/* 8 KB PRU Data RAM 0 */
-	PRU1_DMEM_0	: org = 0x00002000 len = 0x00002000
+	PRU0_DMEM_0	: org = 0x00002000 len = 0x00002000
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/getting_started_labs/assembly_code/solution/firmware/am261x-som/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd b/academy/getting_started_labs/assembly_code/solution/firmware/am261x-som/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
index 672e9b92..13fdcb5e 100644
--- a/academy/getting_started_labs/assembly_code/solution/firmware/am261x-som/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
+++ b/academy/getting_started_labs/assembly_code/solution/firmware/am261x-som/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
@@ -17,7 +17,7 @@ MEMORY
 	/* 8 KB PRU Data RAM 0 */
 	PRU0_DMEM_0	: org = 0x00000000 len = 0x00002000
 	/* 8 KB PRU Data RAM 1 */
-	PRU0_DMEM_1	: org = 0x00002000 len = 0x00002000
+	PRU1_DMEM_1	: org = 0x00002000 len = 0x00002000
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/getting_started_labs/assembly_code/solution/firmware/am261x-som/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd b/academy/getting_started_labs/assembly_code/solution/firmware/am261x-som/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
index 66f6da5e..774184dd 100644
--- a/academy/getting_started_labs/assembly_code/solution/firmware/am261x-som/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
+++ b/academy/getting_started_labs/assembly_code/solution/firmware/am261x-som/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
@@ -17,7 +17,7 @@ MEMORY
 	/* 8 KB PRU Data RAM 1 */
 	PRU1_DMEM_1	: org = 0x00000000 len = 0x00002000
 	/* 8 KB PRU Data RAM 0 */
-	PRU1_DMEM_0	: org = 0x00002000 len = 0x00002000
+	PRU0_DMEM_0	: org = 0x00002000 len = 0x00002000
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/getting_started_labs/assembly_code/solution/firmware/am263px-cc/icss_m0_pru0_fw/ti-pru-cgt/example.projectspec b/academy/getting_started_labs/assembly_code/solution/firmware/am263px-cc/icss_m0_pru0_fw/ti-pru-cgt/example.projectspec
index 9b71fa0b..3e202300 100644
--- a/academy/getting_started_labs/assembly_code/solution/firmware/am263px-cc/icss_m0_pru0_fw/ti-pru-cgt/example.projectspec
+++ b/academy/getting_started_labs/assembly_code/solution/firmware/am263px-cc/icss_m0_pru0_fw/ti-pru-cgt/example.projectspec
@@ -4,7 +4,7 @@
         <when>
             <context
                 deviceFamily="PRU"
-                deviceId="AM263px"
+                deviceId="AM263Px"
             />
         </when>
     </applicability>
@@ -20,7 +20,7 @@
         connection="TIXDS110_Connection.xml"
         toolChain="TI"
         cgtVersion="2.3.3"
-        device="AM263px"
+        device="AM263Px"
         deviceCore="ICSSM_PRU_0"
         ignoreDefaultDeviceSettings="true"
         ignoreDefaultCCSSettings="true"
diff --git a/academy/getting_started_labs/assembly_code/solution/firmware/am263px-cc/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd b/academy/getting_started_labs/assembly_code/solution/firmware/am263px-cc/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
index 9da5f8e7..5b64bc7e 100644
--- a/academy/getting_started_labs/assembly_code/solution/firmware/am263px-cc/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
+++ b/academy/getting_started_labs/assembly_code/solution/firmware/am263px-cc/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
@@ -1,8 +1,8 @@
 /*
- * AM263px_PRU0.cmd
+ * AM263Px_PRU0.cmd
  *
  * Example Linker command file for linking assembly programs built with the TI-PRU-CGT
- * on AM263px PRU0 cores
+ * on AM263Px PRU0 cores
  */
 
 /* Specify the System Memory Map */
@@ -17,7 +17,7 @@ MEMORY
 	/* 8 KB PRU Data RAM 0 */
 	PRU0_DMEM_0	: org = 0x00000000 len = 0x00002000
 	/* 8 KB PRU Data RAM 1 */
-	PRU0_DMEM_1	: org = 0x00002000 len = 0x00002000
+	PRU1_DMEM_1	: org = 0x00002000 len = 0x00002000
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/getting_started_labs/assembly_code/solution/firmware/am263px-cc/icss_m0_pru1_fw/ti-pru-cgt/example.projectspec b/academy/getting_started_labs/assembly_code/solution/firmware/am263px-cc/icss_m0_pru1_fw/ti-pru-cgt/example.projectspec
index ba0e54ec..1ba30f94 100644
--- a/academy/getting_started_labs/assembly_code/solution/firmware/am263px-cc/icss_m0_pru1_fw/ti-pru-cgt/example.projectspec
+++ b/academy/getting_started_labs/assembly_code/solution/firmware/am263px-cc/icss_m0_pru1_fw/ti-pru-cgt/example.projectspec
@@ -4,7 +4,7 @@
         <when>
             <context
                 deviceFamily="PRU"
-                deviceId="AM263px"
+                deviceId="AM263Px"
             />
         </when>
     </applicability>
@@ -20,7 +20,7 @@
         connection="TIXDS110_Connection.xml"
         toolChain="TI"
         cgtVersion="2.3.3"
-        device="AM263px"
+        device="AM263Px"
         deviceCore="ICSSM_PRU_1"
         ignoreDefaultDeviceSettings="true"
         ignoreDefaultCCSSettings="true"
diff --git a/academy/getting_started_labs/assembly_code/solution/firmware/am263px-cc/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd b/academy/getting_started_labs/assembly_code/solution/firmware/am263px-cc/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
index 23af1b71..57db723f 100644
--- a/academy/getting_started_labs/assembly_code/solution/firmware/am263px-cc/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
+++ b/academy/getting_started_labs/assembly_code/solution/firmware/am263px-cc/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
@@ -1,8 +1,8 @@
 /*
- * AM263px_PRU1.cmd
+ * AM263Px_PRU1.cmd
  *
  * Example Linker command file for linking assembly programs built with the TI-PRU-CGT
- * on AM263px PRU1 cores
+ * on AM263Px PRU1 cores
  */
 
 /* Specify the System Memory Map */
@@ -17,7 +17,7 @@ MEMORY
 	/* 8 KB PRU Data RAM 1 */
 	PRU1_DMEM_1	: org = 0x00000000 len = 0x00002000
 	/* 8 KB PRU Data RAM 0 */
-	PRU1_DMEM_0	: org = 0x00002000 len = 0x00002000
+	PRU0_DMEM_0	: org = 0x00002000 len = 0x00002000
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/getting_started_labs/assembly_code/solution/firmware/am263px-lp/icss_m0_pru0_fw/ti-pru-cgt/example.projectspec b/academy/getting_started_labs/assembly_code/solution/firmware/am263px-lp/icss_m0_pru0_fw/ti-pru-cgt/example.projectspec
index 2e9379ac..845fee66 100644
--- a/academy/getting_started_labs/assembly_code/solution/firmware/am263px-lp/icss_m0_pru0_fw/ti-pru-cgt/example.projectspec
+++ b/academy/getting_started_labs/assembly_code/solution/firmware/am263px-lp/icss_m0_pru0_fw/ti-pru-cgt/example.projectspec
@@ -4,7 +4,7 @@
         <when>
             <context
                 deviceFamily="PRU"
-                deviceId="AM263px"
+                deviceId="AM263Px"
             />
         </when>
     </applicability>
@@ -20,7 +20,7 @@
         connection="TIXDS110_Connection.xml"
         toolChain="TI"
         cgtVersion="2.3.3"
-        device="AM263px"
+        device="AM263Px"
         deviceCore="ICSSM_PRU_0"
         ignoreDefaultDeviceSettings="true"
         ignoreDefaultCCSSettings="true"
diff --git a/academy/getting_started_labs/assembly_code/solution/firmware/am263px-lp/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd b/academy/getting_started_labs/assembly_code/solution/firmware/am263px-lp/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
index 9da5f8e7..5b64bc7e 100644
--- a/academy/getting_started_labs/assembly_code/solution/firmware/am263px-lp/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
+++ b/academy/getting_started_labs/assembly_code/solution/firmware/am263px-lp/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
@@ -1,8 +1,8 @@
 /*
- * AM263px_PRU0.cmd
+ * AM263Px_PRU0.cmd
  *
  * Example Linker command file for linking assembly programs built with the TI-PRU-CGT
- * on AM263px PRU0 cores
+ * on AM263Px PRU0 cores
  */
 
 /* Specify the System Memory Map */
@@ -17,7 +17,7 @@ MEMORY
 	/* 8 KB PRU Data RAM 0 */
 	PRU0_DMEM_0	: org = 0x00000000 len = 0x00002000
 	/* 8 KB PRU Data RAM 1 */
-	PRU0_DMEM_1	: org = 0x00002000 len = 0x00002000
+	PRU1_DMEM_1	: org = 0x00002000 len = 0x00002000
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/getting_started_labs/assembly_code/solution/firmware/am263px-lp/icss_m0_pru1_fw/ti-pru-cgt/example.projectspec b/academy/getting_started_labs/assembly_code/solution/firmware/am263px-lp/icss_m0_pru1_fw/ti-pru-cgt/example.projectspec
index f0cf9a9e..caf6acfc 100644
--- a/academy/getting_started_labs/assembly_code/solution/firmware/am263px-lp/icss_m0_pru1_fw/ti-pru-cgt/example.projectspec
+++ b/academy/getting_started_labs/assembly_code/solution/firmware/am263px-lp/icss_m0_pru1_fw/ti-pru-cgt/example.projectspec
@@ -4,7 +4,7 @@
         <when>
             <context
                 deviceFamily="PRU"
-                deviceId="AM263px"
+                deviceId="AM263Px"
             />
         </when>
     </applicability>
@@ -20,7 +20,7 @@
         connection="TIXDS110_Connection.xml"
         toolChain="TI"
         cgtVersion="2.3.3"
-        device="AM263px"
+        device="AM263Px"
         deviceCore="ICSSM_PRU_1"
         ignoreDefaultDeviceSettings="true"
         ignoreDefaultCCSSettings="true"
diff --git a/academy/getting_started_labs/assembly_code/solution/firmware/am263px-lp/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd b/academy/getting_started_labs/assembly_code/solution/firmware/am263px-lp/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
index 23af1b71..57db723f 100644
--- a/academy/getting_started_labs/assembly_code/solution/firmware/am263px-lp/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
+++ b/academy/getting_started_labs/assembly_code/solution/firmware/am263px-lp/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
@@ -1,8 +1,8 @@
 /*
- * AM263px_PRU1.cmd
+ * AM263Px_PRU1.cmd
  *
  * Example Linker command file for linking assembly programs built with the TI-PRU-CGT
- * on AM263px PRU1 cores
+ * on AM263Px PRU1 cores
  */
 
 /* Specify the System Memory Map */
@@ -17,7 +17,7 @@ MEMORY
 	/* 8 KB PRU Data RAM 1 */
 	PRU1_DMEM_1	: org = 0x00000000 len = 0x00002000
 	/* 8 KB PRU Data RAM 0 */
-	PRU1_DMEM_0	: org = 0x00002000 len = 0x00002000
+	PRU0_DMEM_0	: org = 0x00002000 len = 0x00002000
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/getting_started_labs/assembly_code/solution/firmware/am263x-cc/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd b/academy/getting_started_labs/assembly_code/solution/firmware/am263x-cc/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
index 26f02bf4..11542351 100644
--- a/academy/getting_started_labs/assembly_code/solution/firmware/am263x-cc/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
+++ b/academy/getting_started_labs/assembly_code/solution/firmware/am263x-cc/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
@@ -17,7 +17,7 @@ MEMORY
 	/* 8 KB PRU Data RAM 0 */
 	PRU0_DMEM_0	: org = 0x00000000 len = 0x00002000
 	/* 8 KB PRU Data RAM 1 */
-	PRU0_DMEM_1	: org = 0x00002000 len = 0x00002000
+	PRU1_DMEM_1	: org = 0x00002000 len = 0x00002000
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/getting_started_labs/assembly_code/solution/firmware/am263x-cc/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd b/academy/getting_started_labs/assembly_code/solution/firmware/am263x-cc/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
index 70fb0765..cf0121bf 100644
--- a/academy/getting_started_labs/assembly_code/solution/firmware/am263x-cc/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
+++ b/academy/getting_started_labs/assembly_code/solution/firmware/am263x-cc/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
@@ -17,7 +17,7 @@ MEMORY
 	/* 8 KB PRU Data RAM 1 */
 	PRU1_DMEM_1	: org = 0x00000000 len = 0x00002000
 	/* 8 KB PRU Data RAM 0 */
-	PRU1_DMEM_0	: org = 0x00002000 len = 0x00002000
+	PRU0_DMEM_0	: org = 0x00002000 len = 0x00002000
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/getting_started_labs/assembly_code/solution/firmware/am263x-lp/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd b/academy/getting_started_labs/assembly_code/solution/firmware/am263x-lp/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
index 26f02bf4..11542351 100644
--- a/academy/getting_started_labs/assembly_code/solution/firmware/am263x-lp/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
+++ b/academy/getting_started_labs/assembly_code/solution/firmware/am263x-lp/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
@@ -17,7 +17,7 @@ MEMORY
 	/* 8 KB PRU Data RAM 0 */
 	PRU0_DMEM_0	: org = 0x00000000 len = 0x00002000
 	/* 8 KB PRU Data RAM 1 */
-	PRU0_DMEM_1	: org = 0x00002000 len = 0x00002000
+	PRU1_DMEM_1	: org = 0x00002000 len = 0x00002000
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/getting_started_labs/assembly_code/solution/firmware/am263x-lp/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd b/academy/getting_started_labs/assembly_code/solution/firmware/am263x-lp/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
index 70fb0765..cf0121bf 100644
--- a/academy/getting_started_labs/assembly_code/solution/firmware/am263x-lp/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
+++ b/academy/getting_started_labs/assembly_code/solution/firmware/am263x-lp/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
@@ -17,7 +17,7 @@ MEMORY
 	/* 8 KB PRU Data RAM 1 */
 	PRU1_DMEM_1	: org = 0x00000000 len = 0x00002000
 	/* 8 KB PRU Data RAM 0 */
-	PRU1_DMEM_0	: org = 0x00002000 len = 0x00002000
+	PRU0_DMEM_0	: org = 0x00002000 len = 0x00002000
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/getting_started_labs/assembly_code/solution/firmware/am62x-sk/pruss0_pru0_fw/ti-pru-cgt/linker.cmd b/academy/getting_started_labs/assembly_code/solution/firmware/am62x-sk/pruss0_pru0_fw/ti-pru-cgt/linker.cmd
index 85c8145a..4f8f21fe 100644
--- a/academy/getting_started_labs/assembly_code/solution/firmware/am62x-sk/pruss0_pru0_fw/ti-pru-cgt/linker.cmd
+++ b/academy/getting_started_labs/assembly_code/solution/firmware/am62x-sk/pruss0_pru0_fw/ti-pru-cgt/linker.cmd
@@ -17,7 +17,7 @@ MEMORY
 	/* 8 KB PRU Data RAM 0 */
 	PRU0_DMEM_0	: org = 0x00000000 len = 0x00002000
 	/* 8 KB PRU Data RAM 1 */
-	PRU0_DMEM_1	: org = 0x00002000 len = 0x00002000
+	PRU1_DMEM_1	: org = 0x00002000 len = 0x00002000
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/getting_started_labs/assembly_code/solution/firmware/am62x-sk/pruss0_pru1_fw/ti-pru-cgt/linker.cmd b/academy/getting_started_labs/assembly_code/solution/firmware/am62x-sk/pruss0_pru1_fw/ti-pru-cgt/linker.cmd
index e70c5725..7b3f96b4 100644
--- a/academy/getting_started_labs/assembly_code/solution/firmware/am62x-sk/pruss0_pru1_fw/ti-pru-cgt/linker.cmd
+++ b/academy/getting_started_labs/assembly_code/solution/firmware/am62x-sk/pruss0_pru1_fw/ti-pru-cgt/linker.cmd
@@ -17,7 +17,7 @@ MEMORY
 	/* 8 KB PRU Data RAM 1 */
 	PRU1_DMEM_1	: org = 0x00000000 len = 0x00002000
 	/* 8 KB PRU Data RAM 0 */
-	PRU1_DMEM_0	: org = 0x00002000 len = 0x00002000
+	PRU0_DMEM_0	: org = 0x00002000 len = 0x00002000
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/getting_started_labs/assembly_code/solution/firmware/am64x-evm/icss_g0_pru0_fw/ti-pru-cgt/linker.cmd b/academy/getting_started_labs/assembly_code/solution/firmware/am64x-evm/icss_g0_pru0_fw/ti-pru-cgt/linker.cmd
index ca7f6092..bb67e095 100644
--- a/academy/getting_started_labs/assembly_code/solution/firmware/am64x-evm/icss_g0_pru0_fw/ti-pru-cgt/linker.cmd
+++ b/academy/getting_started_labs/assembly_code/solution/firmware/am64x-evm/icss_g0_pru0_fw/ti-pru-cgt/linker.cmd
@@ -19,14 +19,14 @@ MEMORY
 	PRU0_DMEM_0	: org = 0x00000000 len = 0x00001000
 	/* 8 KB PRU Data RAM 1; reserved completely for Slice1 cores - PRU1,
 	 * RTU1 and Tx_PRU1; do not use for any Slice0 cores */
-	PRU0_DMEM_1	: org = 0x00002000 len = 0x00001000
+	PRU1_DMEM_1	: org = 0x00002000 len = 0x00001000
 	/* NOTE: Custom split of the second 4 KB of ICSS Data RAMs 0 and 1
 	 * split equally between the corresponding RTU and Tx_PRU cores in
 	 * each slice */
 	RTU0_DMEM_0	: org = 0x00001000 len = 0x00000800
 	TX_PRU0_DMEM_0	: org = 0x00001800 len = 0x00000800
-	RTU0_DMEM_1	: org = 0x00003000 len = 0x00000800
-	TX_PRU0_DMEM_1	: org = 0x00003800 len = 0x00000800
+	RTU1_DMEM_1	: org = 0x00003000 len = 0x00000800
+	TX_PRU1_DMEM_1	: org = 0x00003800 len = 0x00000800
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/getting_started_labs/assembly_code/solution/firmware/am64x-evm/icss_g0_pru1_fw/ti-pru-cgt/linker.cmd b/academy/getting_started_labs/assembly_code/solution/firmware/am64x-evm/icss_g0_pru1_fw/ti-pru-cgt/linker.cmd
index 2be2074b..4804d56c 100644
--- a/academy/getting_started_labs/assembly_code/solution/firmware/am64x-evm/icss_g0_pru1_fw/ti-pru-cgt/linker.cmd
+++ b/academy/getting_started_labs/assembly_code/solution/firmware/am64x-evm/icss_g0_pru1_fw/ti-pru-cgt/linker.cmd
@@ -19,14 +19,14 @@ MEMORY
 	PRU1_DMEM_1	: org = 0x00000000 len = 0x00001000
 	/* 8 KB PRU Data RAM 0; reserved completely for Slice0 cores - PRU0,
 	 * RTU0 and Tx_PRU0; do not use for any Slice1 cores */
-	PRU1_DMEM_0	: org = 0x00002000 len = 0x00001000
+	PRU0_DMEM_0	: org = 0x00002000 len = 0x00001000
 	/* NOTE: Custom split of the second 4 KB of ICSS Data RAMs 0 and 1
 	 * split equally between the corresponding RTU and Tx_PRU cores in
 	 * each slice */
 	RTU1_DMEM_1	: org = 0x00001000 len = 0x00000800
 	TX_PRU1_DMEM_1	: org = 0x00001800 len = 0x00000800
-	RTU1_DMEM_0	: org = 0x00003000 len = 0x00000800
-	TX_PRU1_DMEM_0	: org = 0x00003800 len = 0x00000800
+	RTU0_DMEM_0	: org = 0x00003000 len = 0x00000800
+	TX_PRU0_DMEM_0	: org = 0x00003800 len = 0x00000800
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/getting_started_labs/assembly_code/solution/firmware/am64x-evm/icss_g0_rtu_pru0_fw/ti-pru-cgt/linker.cmd b/academy/getting_started_labs/assembly_code/solution/firmware/am64x-evm/icss_g0_rtu_pru0_fw/ti-pru-cgt/linker.cmd
index 9f8bbd47..fcb1c655 100644
--- a/academy/getting_started_labs/assembly_code/solution/firmware/am64x-evm/icss_g0_rtu_pru0_fw/ti-pru-cgt/linker.cmd
+++ b/academy/getting_started_labs/assembly_code/solution/firmware/am64x-evm/icss_g0_rtu_pru0_fw/ti-pru-cgt/linker.cmd
@@ -19,14 +19,14 @@ MEMORY
 	PRU0_DMEM_0	: org = 0x00000000 len = 0x00001000
 	/* 8 KB PRU Data RAM 1; reserved completely for Slice1 cores - PRU1,
 	 * RTU1 and Tx_PRU1; do not use for any Slice0 cores */
-	PRU0_DMEM_1	: org = 0x00002000 len = 0x00001000
+	PRU1_DMEM_1	: org = 0x00002000 len = 0x00001000
 	/* NOTE: Custom split of the second 4 KB of ICSS Data RAMs 0 and 1
 	 * split equally between the corresponding RTU and Tx_PRU cores in
 	 * each slice */
 	RTU0_DMEM_0	: org = 0x00001000 len = 0x00000800
 	TX_PRU0_DMEM_0	: org = 0x00001800 len = 0x00000800
-	RTU0_DMEM_1	: org = 0x00003000 len = 0x00000800
-	TX_PRU0_DMEM_1	: org = 0x00003800 len = 0x00000800
+	RTU1_DMEM_1	: org = 0x00003000 len = 0x00000800
+	TX_PRU1_DMEM_1	: org = 0x00003800 len = 0x00000800
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/getting_started_labs/assembly_code/solution/firmware/am64x-evm/icss_g0_rtu_pru1_fw/ti-pru-cgt/linker.cmd b/academy/getting_started_labs/assembly_code/solution/firmware/am64x-evm/icss_g0_rtu_pru1_fw/ti-pru-cgt/linker.cmd
index 665376be..fec4329f 100644
--- a/academy/getting_started_labs/assembly_code/solution/firmware/am64x-evm/icss_g0_rtu_pru1_fw/ti-pru-cgt/linker.cmd
+++ b/academy/getting_started_labs/assembly_code/solution/firmware/am64x-evm/icss_g0_rtu_pru1_fw/ti-pru-cgt/linker.cmd
@@ -19,14 +19,14 @@ MEMORY
 	PRU1_DMEM_1	: org = 0x00000000 len = 0x00001000
 	/* 8 KB PRU Data RAM 0; reserved completely for Slice0 cores - PRU0,
 	 * RTU0 and Tx_PRU0; do not use for any Slice1 cores */
-	PRU1_DMEM_0	: org = 0x00002000 len = 0x00001000
+	PRU0_DMEM_0	: org = 0x00002000 len = 0x00001000
 	/* NOTE: Custom split of the second 4 KB of ICSS Data RAMs 0 and 1
 	 * split equally between the corresponding RTU and Tx_PRU cores in
 	 * each slice */
 	RTU1_DMEM_1	: org = 0x00001000 len = 0x00000800
 	TX_PRU1_DMEM_1	: org = 0x00001800 len = 0x00000800
-	RTU1_DMEM_0	: org = 0x00003000 len = 0x00000800
-	TX_PRU1_DMEM_0	: org = 0x00003800 len = 0x00000800
+	RTU0_DMEM_0	: org = 0x00003000 len = 0x00000800
+	TX_PRU0_DMEM_0	: org = 0x00003800 len = 0x00000800
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/getting_started_labs/assembly_code/solution/firmware/am64x-evm/icss_g0_tx_pru0_fw/ti-pru-cgt/linker.cmd b/academy/getting_started_labs/assembly_code/solution/firmware/am64x-evm/icss_g0_tx_pru0_fw/ti-pru-cgt/linker.cmd
index 529f7f19..9c0c42ed 100644
--- a/academy/getting_started_labs/assembly_code/solution/firmware/am64x-evm/icss_g0_tx_pru0_fw/ti-pru-cgt/linker.cmd
+++ b/academy/getting_started_labs/assembly_code/solution/firmware/am64x-evm/icss_g0_tx_pru0_fw/ti-pru-cgt/linker.cmd
@@ -19,14 +19,14 @@ MEMORY
 	PRU0_DMEM_0	: org = 0x00000000 len = 0x00001000
 	/* 8 KB PRU Data RAM 1; reserved completely for Slice1 cores - PRU1,
 	 * RTU1 and Tx_PRU1; do not use for any Slice0 cores */
-	PRU0_DMEM_1	: org = 0x00002000 len = 0x00001000
+	PRU1_DMEM_1	: org = 0x00002000 len = 0x00001000
 	/* NOTE: Custom split of the second 4 KB of ICSS Data RAMs 0 and 1
 	 * split equally between the corresponding RTU and Tx_PRU cores in
 	 * each slice */
 	RTU0_DMEM_0	: org = 0x00001000 len = 0x00000800
 	TX_PRU0_DMEM_0	: org = 0x00001800 len = 0x00000800
-	RTU0_DMEM_1	: org = 0x00003000 len = 0x00000800
-	TX_PRU0_DMEM_1	: org = 0x00003800 len = 0x00000800
+	RTU1_DMEM_1	: org = 0x00003000 len = 0x00000800
+	TX_PRU1_DMEM_1	: org = 0x00003800 len = 0x00000800
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/getting_started_labs/assembly_code/solution/firmware/am64x-evm/icss_g0_tx_pru1_fw/ti-pru-cgt/linker.cmd b/academy/getting_started_labs/assembly_code/solution/firmware/am64x-evm/icss_g0_tx_pru1_fw/ti-pru-cgt/linker.cmd
index 69fb7491..2314f4d9 100644
--- a/academy/getting_started_labs/assembly_code/solution/firmware/am64x-evm/icss_g0_tx_pru1_fw/ti-pru-cgt/linker.cmd
+++ b/academy/getting_started_labs/assembly_code/solution/firmware/am64x-evm/icss_g0_tx_pru1_fw/ti-pru-cgt/linker.cmd
@@ -19,14 +19,14 @@ MEMORY
 	PRU1_DMEM_1	: org = 0x00000000 len = 0x00001000
 	/* 8 KB PRU Data RAM 0; reserved completely for Slice0 cores - PRU0,
 	 * RTU0 and Tx_PRU0; do not use for any Slice1 cores */
-	PRU1_DMEM_0	: org = 0x00002000 len = 0x00001000
+	PRU0_DMEM_0	: org = 0x00002000 len = 0x00001000
 	/* NOTE: Custom split of the second 4 KB of ICSS Data RAMs 0 and 1
 	 * split equally between the corresponding RTU and Tx_PRU cores in
 	 * each slice */
 	RTU1_DMEM_1	: org = 0x00001000 len = 0x00000800
 	TX_PRU1_DMEM_1	: org = 0x00001800 len = 0x00000800
-	RTU1_DMEM_0	: org = 0x00003000 len = 0x00000800
-	TX_PRU1_DMEM_0	: org = 0x00003800 len = 0x00000800
+	RTU0_DMEM_0	: org = 0x00003000 len = 0x00000800
+	TX_PRU0_DMEM_0	: org = 0x00003800 len = 0x00000800
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/getting_started_labs/c_and_assembly/solution/firmware/am243x-evm/icss_g0_pru0_fw/ti-pru-cgt/linker.cmd b/academy/getting_started_labs/c_and_assembly/solution/firmware/am243x-evm/icss_g0_pru0_fw/ti-pru-cgt/linker.cmd
index a69842cd..389d0cbd 100644
--- a/academy/getting_started_labs/c_and_assembly/solution/firmware/am243x-evm/icss_g0_pru0_fw/ti-pru-cgt/linker.cmd
+++ b/academy/getting_started_labs/c_and_assembly/solution/firmware/am243x-evm/icss_g0_pru0_fw/ti-pru-cgt/linker.cmd
@@ -21,14 +21,14 @@ MEMORY
 	PRU0_DMEM_0	: org = 0x00000000 len = 0x00001000	CREGISTER=24
 	/* 8 KB PRU Data RAM 1; reserved completely for Slice1 cores - PRU1,
 	 * RTU1 and Tx_PRU1; do not use for any Slice0 cores */
-	PRU0_DMEM_1	: org = 0x00002000 len = 0x00001000	CREGISTER=25
+	PRU1_DMEM_1	: org = 0x00002000 len = 0x00001000	CREGISTER=25
 	/* NOTE: Custom split of the second 4 KB of ICSS Data RAMs 0 and 1
 	 * split equally between the corresponding RTU and Tx_PRU cores in
 	 * each slice */
 	RTU0_DMEM_0	: org = 0x00001000 len = 0x00000800
 	TX_PRU0_DMEM_0	: org = 0x00001800 len = 0x00000800
-	RTU0_DMEM_1	: org = 0x00003000 len = 0x00000800
-	TX_PRU0_DMEM_1	: org = 0x00003800 len = 0x00000800
+	RTU1_DMEM_1	: org = 0x00003000 len = 0x00000800
+	TX_PRU1_DMEM_1	: org = 0x00003800 len = 0x00000800
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/getting_started_labs/c_and_assembly/solution/firmware/am243x-evm/icss_g0_pru1_fw/ti-pru-cgt/linker.cmd b/academy/getting_started_labs/c_and_assembly/solution/firmware/am243x-evm/icss_g0_pru1_fw/ti-pru-cgt/linker.cmd
index 440057a7..85522291 100644
--- a/academy/getting_started_labs/c_and_assembly/solution/firmware/am243x-evm/icss_g0_pru1_fw/ti-pru-cgt/linker.cmd
+++ b/academy/getting_started_labs/c_and_assembly/solution/firmware/am243x-evm/icss_g0_pru1_fw/ti-pru-cgt/linker.cmd
@@ -21,14 +21,14 @@ MEMORY
 	PRU1_DMEM_1	: org = 0x00000000 len = 0x00001000	CREGISTER=24
 	/* 8 KB PRU Data RAM 0; reserved completely for Slice0 cores - PRU0,
 	 * RTU0 and Tx_PRU0; do not use for any Slice1 cores */
-	PRU1_DMEM_0	: org = 0x00002000 len = 0x00001000	CREGISTER=25
+	PRU0_DMEM_0	: org = 0x00002000 len = 0x00001000	CREGISTER=25
 	/* NOTE: Custom split of the second 4 KB of ICSS Data RAMs 0 and 1
 	 * split equally between the corresponding RTU and Tx_PRU cores in
 	 * each slice */
 	RTU1_DMEM_1	: org = 0x00001000 len = 0x00000800
 	TX_PRU1_DMEM_1	: org = 0x00001800 len = 0x00000800
-	RTU1_DMEM_0	: org = 0x00003000 len = 0x00000800
-	TX_PRU1_DMEM_0	: org = 0x00003800 len = 0x00000800
+	RTU0_DMEM_0	: org = 0x00003000 len = 0x00000800
+	TX_PRU0_DMEM_0	: org = 0x00003800 len = 0x00000800
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/getting_started_labs/c_and_assembly/solution/firmware/am243x-evm/icss_g0_rtu_pru0_fw/ti-pru-cgt/linker.cmd b/academy/getting_started_labs/c_and_assembly/solution/firmware/am243x-evm/icss_g0_rtu_pru0_fw/ti-pru-cgt/linker.cmd
index 64ab61bc..54cedd3c 100644
--- a/academy/getting_started_labs/c_and_assembly/solution/firmware/am243x-evm/icss_g0_rtu_pru0_fw/ti-pru-cgt/linker.cmd
+++ b/academy/getting_started_labs/c_and_assembly/solution/firmware/am243x-evm/icss_g0_rtu_pru0_fw/ti-pru-cgt/linker.cmd
@@ -21,14 +21,14 @@ MEMORY
 	PRU0_DMEM_0	: org = 0x00000000 len = 0x00001000	CREGISTER=24
 	/* 8 KB PRU Data RAM 1; reserved completely for Slice1 cores - PRU1,
 	 * RTU1 and Tx_PRU1; do not use for any Slice0 cores */
-	PRU0_DMEM_1	: org = 0x00002000 len = 0x00001000	CREGISTER=25
+	PRU1_DMEM_1	: org = 0x00002000 len = 0x00001000	CREGISTER=25
 	/* NOTE: Custom split of the second 4 KB of ICSS Data RAMs 0 and 1
 	 * split equally between the corresponding RTU and Tx_PRU cores in
 	 * each slice */
 	RTU0_DMEM_0	: org = 0x00001000 len = 0x00000800
 	TX_PRU0_DMEM_0	: org = 0x00001800 len = 0x00000800
-	RTU0_DMEM_1	: org = 0x00003000 len = 0x00000800
-	TX_PRU0_DMEM_1	: org = 0x00003800 len = 0x00000800
+	RTU1_DMEM_1	: org = 0x00003000 len = 0x00000800
+	TX_PRU1_DMEM_1	: org = 0x00003800 len = 0x00000800
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/getting_started_labs/c_and_assembly/solution/firmware/am243x-evm/icss_g0_rtu_pru1_fw/ti-pru-cgt/linker.cmd b/academy/getting_started_labs/c_and_assembly/solution/firmware/am243x-evm/icss_g0_rtu_pru1_fw/ti-pru-cgt/linker.cmd
index 14fd35a8..4cfd083e 100644
--- a/academy/getting_started_labs/c_and_assembly/solution/firmware/am243x-evm/icss_g0_rtu_pru1_fw/ti-pru-cgt/linker.cmd
+++ b/academy/getting_started_labs/c_and_assembly/solution/firmware/am243x-evm/icss_g0_rtu_pru1_fw/ti-pru-cgt/linker.cmd
@@ -21,14 +21,14 @@ MEMORY
 	PRU1_DMEM_1	: org = 0x00000000 len = 0x00001000	CREGISTER=24
 	/* 8 KB PRU Data RAM 0; reserved completely for Slice0 cores - PRU0,
 	 * RTU0 and Tx_PRU0; do not use for any Slice1 cores */
-	PRU1_DMEM_0	: org = 0x00002000 len = 0x00001000	CREGISTER=25
+	PRU0_DMEM_0	: org = 0x00002000 len = 0x00001000	CREGISTER=25
 	/* NOTE: Custom split of the second 4 KB of ICSS Data RAMs 0 and 1
 	 * split equally between the corresponding RTU and Tx_PRU cores in
 	 * each slice */
 	RTU1_DMEM_1	: org = 0x00001000 len = 0x00000800
 	TX_PRU1_DMEM_1	: org = 0x00001800 len = 0x00000800
-	RTU1_DMEM_0	: org = 0x00003000 len = 0x00000800
-	TX_PRU1_DMEM_0	: org = 0x00003800 len = 0x00000800
+	RTU0_DMEM_0	: org = 0x00003000 len = 0x00000800
+	TX_PRU0_DMEM_0	: org = 0x00003800 len = 0x00000800
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/getting_started_labs/c_and_assembly/solution/firmware/am243x-evm/icss_g0_tx_pru0_fw/ti-pru-cgt/linker.cmd b/academy/getting_started_labs/c_and_assembly/solution/firmware/am243x-evm/icss_g0_tx_pru0_fw/ti-pru-cgt/linker.cmd
index 16ea3376..853c81f6 100644
--- a/academy/getting_started_labs/c_and_assembly/solution/firmware/am243x-evm/icss_g0_tx_pru0_fw/ti-pru-cgt/linker.cmd
+++ b/academy/getting_started_labs/c_and_assembly/solution/firmware/am243x-evm/icss_g0_tx_pru0_fw/ti-pru-cgt/linker.cmd
@@ -21,14 +21,14 @@ MEMORY
 	PRU0_DMEM_0	: org = 0x00000000 len = 0x00001000	CREGISTER=24
 	/* 8 KB PRU Data RAM 1; reserved completely for Slice1 cores - PRU1,
 	 * RTU1 and Tx_PRU1; do not use for any Slice0 cores */
-	PRU0_DMEM_1	: org = 0x00002000 len = 0x00001000	CREGISTER=25
+	PRU1_DMEM_1	: org = 0x00002000 len = 0x00001000	CREGISTER=25
 	/* NOTE: Custom split of the second 4 KB of ICSS Data RAMs 0 and 1
 	 * split equally between the corresponding RTU and Tx_PRU cores in
 	 * each slice */
 	RTU0_DMEM_0	: org = 0x00001000 len = 0x00000800
 	TX_PRU0_DMEM_0	: org = 0x00001800 len = 0x00000800
-	RTU0_DMEM_1	: org = 0x00003000 len = 0x00000800
-	TX_PRU0_DMEM_1	: org = 0x00003800 len = 0x00000800
+	RTU1_DMEM_1	: org = 0x00003000 len = 0x00000800
+	TX_PRU1_DMEM_1	: org = 0x00003800 len = 0x00000800
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/getting_started_labs/c_and_assembly/solution/firmware/am243x-evm/icss_g0_tx_pru1_fw/ti-pru-cgt/linker.cmd b/academy/getting_started_labs/c_and_assembly/solution/firmware/am243x-evm/icss_g0_tx_pru1_fw/ti-pru-cgt/linker.cmd
index 709dde47..2547a2ba 100644
--- a/academy/getting_started_labs/c_and_assembly/solution/firmware/am243x-evm/icss_g0_tx_pru1_fw/ti-pru-cgt/linker.cmd
+++ b/academy/getting_started_labs/c_and_assembly/solution/firmware/am243x-evm/icss_g0_tx_pru1_fw/ti-pru-cgt/linker.cmd
@@ -21,14 +21,14 @@ MEMORY
 	PRU1_DMEM_1	: org = 0x00000000 len = 0x00001000	CREGISTER=24
 	/* 8 KB PRU Data RAM 0; reserved completely for Slice0 cores - PRU0,
 	 * RTU0 and Tx_PRU0; do not use for any Slice1 cores */
-	PRU1_DMEM_0	: org = 0x00002000 len = 0x00001000	CREGISTER=25
+	PRU0_DMEM_0	: org = 0x00002000 len = 0x00001000	CREGISTER=25
 	/* NOTE: Custom split of the second 4 KB of ICSS Data RAMs 0 and 1
 	 * split equally between the corresponding RTU and Tx_PRU cores in
 	 * each slice */
 	RTU1_DMEM_1	: org = 0x00001000 len = 0x00000800
 	TX_PRU1_DMEM_1	: org = 0x00001800 len = 0x00000800
-	RTU1_DMEM_0	: org = 0x00003000 len = 0x00000800
-	TX_PRU1_DMEM_0	: org = 0x00003800 len = 0x00000800
+	RTU0_DMEM_0	: org = 0x00003000 len = 0x00000800
+	TX_PRU0_DMEM_0	: org = 0x00003800 len = 0x00000800
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/getting_started_labs/c_and_assembly/solution/firmware/am243x-lp/icss_g0_pru0_fw/ti-pru-cgt/linker.cmd b/academy/getting_started_labs/c_and_assembly/solution/firmware/am243x-lp/icss_g0_pru0_fw/ti-pru-cgt/linker.cmd
index a69842cd..389d0cbd 100644
--- a/academy/getting_started_labs/c_and_assembly/solution/firmware/am243x-lp/icss_g0_pru0_fw/ti-pru-cgt/linker.cmd
+++ b/academy/getting_started_labs/c_and_assembly/solution/firmware/am243x-lp/icss_g0_pru0_fw/ti-pru-cgt/linker.cmd
@@ -21,14 +21,14 @@ MEMORY
 	PRU0_DMEM_0	: org = 0x00000000 len = 0x00001000	CREGISTER=24
 	/* 8 KB PRU Data RAM 1; reserved completely for Slice1 cores - PRU1,
 	 * RTU1 and Tx_PRU1; do not use for any Slice0 cores */
-	PRU0_DMEM_1	: org = 0x00002000 len = 0x00001000	CREGISTER=25
+	PRU1_DMEM_1	: org = 0x00002000 len = 0x00001000	CREGISTER=25
 	/* NOTE: Custom split of the second 4 KB of ICSS Data RAMs 0 and 1
 	 * split equally between the corresponding RTU and Tx_PRU cores in
 	 * each slice */
 	RTU0_DMEM_0	: org = 0x00001000 len = 0x00000800
 	TX_PRU0_DMEM_0	: org = 0x00001800 len = 0x00000800
-	RTU0_DMEM_1	: org = 0x00003000 len = 0x00000800
-	TX_PRU0_DMEM_1	: org = 0x00003800 len = 0x00000800
+	RTU1_DMEM_1	: org = 0x00003000 len = 0x00000800
+	TX_PRU1_DMEM_1	: org = 0x00003800 len = 0x00000800
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/getting_started_labs/c_and_assembly/solution/firmware/am243x-lp/icss_g0_pru1_fw/ti-pru-cgt/linker.cmd b/academy/getting_started_labs/c_and_assembly/solution/firmware/am243x-lp/icss_g0_pru1_fw/ti-pru-cgt/linker.cmd
index 440057a7..85522291 100644
--- a/academy/getting_started_labs/c_and_assembly/solution/firmware/am243x-lp/icss_g0_pru1_fw/ti-pru-cgt/linker.cmd
+++ b/academy/getting_started_labs/c_and_assembly/solution/firmware/am243x-lp/icss_g0_pru1_fw/ti-pru-cgt/linker.cmd
@@ -21,14 +21,14 @@ MEMORY
 	PRU1_DMEM_1	: org = 0x00000000 len = 0x00001000	CREGISTER=24
 	/* 8 KB PRU Data RAM 0; reserved completely for Slice0 cores - PRU0,
 	 * RTU0 and Tx_PRU0; do not use for any Slice1 cores */
-	PRU1_DMEM_0	: org = 0x00002000 len = 0x00001000	CREGISTER=25
+	PRU0_DMEM_0	: org = 0x00002000 len = 0x00001000	CREGISTER=25
 	/* NOTE: Custom split of the second 4 KB of ICSS Data RAMs 0 and 1
 	 * split equally between the corresponding RTU and Tx_PRU cores in
 	 * each slice */
 	RTU1_DMEM_1	: org = 0x00001000 len = 0x00000800
 	TX_PRU1_DMEM_1	: org = 0x00001800 len = 0x00000800
-	RTU1_DMEM_0	: org = 0x00003000 len = 0x00000800
-	TX_PRU1_DMEM_0	: org = 0x00003800 len = 0x00000800
+	RTU0_DMEM_0	: org = 0x00003000 len = 0x00000800
+	TX_PRU0_DMEM_0	: org = 0x00003800 len = 0x00000800
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/getting_started_labs/c_and_assembly/solution/firmware/am243x-lp/icss_g0_rtu_pru0_fw/ti-pru-cgt/linker.cmd b/academy/getting_started_labs/c_and_assembly/solution/firmware/am243x-lp/icss_g0_rtu_pru0_fw/ti-pru-cgt/linker.cmd
index 64ab61bc..54cedd3c 100644
--- a/academy/getting_started_labs/c_and_assembly/solution/firmware/am243x-lp/icss_g0_rtu_pru0_fw/ti-pru-cgt/linker.cmd
+++ b/academy/getting_started_labs/c_and_assembly/solution/firmware/am243x-lp/icss_g0_rtu_pru0_fw/ti-pru-cgt/linker.cmd
@@ -21,14 +21,14 @@ MEMORY
 	PRU0_DMEM_0	: org = 0x00000000 len = 0x00001000	CREGISTER=24
 	/* 8 KB PRU Data RAM 1; reserved completely for Slice1 cores - PRU1,
 	 * RTU1 and Tx_PRU1; do not use for any Slice0 cores */
-	PRU0_DMEM_1	: org = 0x00002000 len = 0x00001000	CREGISTER=25
+	PRU1_DMEM_1	: org = 0x00002000 len = 0x00001000	CREGISTER=25
 	/* NOTE: Custom split of the second 4 KB of ICSS Data RAMs 0 and 1
 	 * split equally between the corresponding RTU and Tx_PRU cores in
 	 * each slice */
 	RTU0_DMEM_0	: org = 0x00001000 len = 0x00000800
 	TX_PRU0_DMEM_0	: org = 0x00001800 len = 0x00000800
-	RTU0_DMEM_1	: org = 0x00003000 len = 0x00000800
-	TX_PRU0_DMEM_1	: org = 0x00003800 len = 0x00000800
+	RTU1_DMEM_1	: org = 0x00003000 len = 0x00000800
+	TX_PRU1_DMEM_1	: org = 0x00003800 len = 0x00000800
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/getting_started_labs/c_and_assembly/solution/firmware/am243x-lp/icss_g0_rtu_pru1_fw/ti-pru-cgt/linker.cmd b/academy/getting_started_labs/c_and_assembly/solution/firmware/am243x-lp/icss_g0_rtu_pru1_fw/ti-pru-cgt/linker.cmd
index 14fd35a8..4cfd083e 100644
--- a/academy/getting_started_labs/c_and_assembly/solution/firmware/am243x-lp/icss_g0_rtu_pru1_fw/ti-pru-cgt/linker.cmd
+++ b/academy/getting_started_labs/c_and_assembly/solution/firmware/am243x-lp/icss_g0_rtu_pru1_fw/ti-pru-cgt/linker.cmd
@@ -21,14 +21,14 @@ MEMORY
 	PRU1_DMEM_1	: org = 0x00000000 len = 0x00001000	CREGISTER=24
 	/* 8 KB PRU Data RAM 0; reserved completely for Slice0 cores - PRU0,
 	 * RTU0 and Tx_PRU0; do not use for any Slice1 cores */
-	PRU1_DMEM_0	: org = 0x00002000 len = 0x00001000	CREGISTER=25
+	PRU0_DMEM_0	: org = 0x00002000 len = 0x00001000	CREGISTER=25
 	/* NOTE: Custom split of the second 4 KB of ICSS Data RAMs 0 and 1
 	 * split equally between the corresponding RTU and Tx_PRU cores in
 	 * each slice */
 	RTU1_DMEM_1	: org = 0x00001000 len = 0x00000800
 	TX_PRU1_DMEM_1	: org = 0x00001800 len = 0x00000800
-	RTU1_DMEM_0	: org = 0x00003000 len = 0x00000800
-	TX_PRU1_DMEM_0	: org = 0x00003800 len = 0x00000800
+	RTU0_DMEM_0	: org = 0x00003000 len = 0x00000800
+	TX_PRU0_DMEM_0	: org = 0x00003800 len = 0x00000800
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/getting_started_labs/c_and_assembly/solution/firmware/am243x-lp/icss_g0_tx_pru0_fw/ti-pru-cgt/linker.cmd b/academy/getting_started_labs/c_and_assembly/solution/firmware/am243x-lp/icss_g0_tx_pru0_fw/ti-pru-cgt/linker.cmd
index 16ea3376..853c81f6 100644
--- a/academy/getting_started_labs/c_and_assembly/solution/firmware/am243x-lp/icss_g0_tx_pru0_fw/ti-pru-cgt/linker.cmd
+++ b/academy/getting_started_labs/c_and_assembly/solution/firmware/am243x-lp/icss_g0_tx_pru0_fw/ti-pru-cgt/linker.cmd
@@ -21,14 +21,14 @@ MEMORY
 	PRU0_DMEM_0	: org = 0x00000000 len = 0x00001000	CREGISTER=24
 	/* 8 KB PRU Data RAM 1; reserved completely for Slice1 cores - PRU1,
 	 * RTU1 and Tx_PRU1; do not use for any Slice0 cores */
-	PRU0_DMEM_1	: org = 0x00002000 len = 0x00001000	CREGISTER=25
+	PRU1_DMEM_1	: org = 0x00002000 len = 0x00001000	CREGISTER=25
 	/* NOTE: Custom split of the second 4 KB of ICSS Data RAMs 0 and 1
 	 * split equally between the corresponding RTU and Tx_PRU cores in
 	 * each slice */
 	RTU0_DMEM_0	: org = 0x00001000 len = 0x00000800
 	TX_PRU0_DMEM_0	: org = 0x00001800 len = 0x00000800
-	RTU0_DMEM_1	: org = 0x00003000 len = 0x00000800
-	TX_PRU0_DMEM_1	: org = 0x00003800 len = 0x00000800
+	RTU1_DMEM_1	: org = 0x00003000 len = 0x00000800
+	TX_PRU1_DMEM_1	: org = 0x00003800 len = 0x00000800
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/getting_started_labs/c_and_assembly/solution/firmware/am243x-lp/icss_g0_tx_pru1_fw/ti-pru-cgt/linker.cmd b/academy/getting_started_labs/c_and_assembly/solution/firmware/am243x-lp/icss_g0_tx_pru1_fw/ti-pru-cgt/linker.cmd
index 709dde47..2547a2ba 100644
--- a/academy/getting_started_labs/c_and_assembly/solution/firmware/am243x-lp/icss_g0_tx_pru1_fw/ti-pru-cgt/linker.cmd
+++ b/academy/getting_started_labs/c_and_assembly/solution/firmware/am243x-lp/icss_g0_tx_pru1_fw/ti-pru-cgt/linker.cmd
@@ -21,14 +21,14 @@ MEMORY
 	PRU1_DMEM_1	: org = 0x00000000 len = 0x00001000	CREGISTER=24
 	/* 8 KB PRU Data RAM 0; reserved completely for Slice0 cores - PRU0,
 	 * RTU0 and Tx_PRU0; do not use for any Slice1 cores */
-	PRU1_DMEM_0	: org = 0x00002000 len = 0x00001000	CREGISTER=25
+	PRU0_DMEM_0	: org = 0x00002000 len = 0x00001000	CREGISTER=25
 	/* NOTE: Custom split of the second 4 KB of ICSS Data RAMs 0 and 1
 	 * split equally between the corresponding RTU and Tx_PRU cores in
 	 * each slice */
 	RTU1_DMEM_1	: org = 0x00001000 len = 0x00000800
 	TX_PRU1_DMEM_1	: org = 0x00001800 len = 0x00000800
-	RTU1_DMEM_0	: org = 0x00003000 len = 0x00000800
-	TX_PRU1_DMEM_0	: org = 0x00003800 len = 0x00000800
+	RTU0_DMEM_0	: org = 0x00003000 len = 0x00000800
+	TX_PRU0_DMEM_0	: org = 0x00003800 len = 0x00000800
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/getting_started_labs/c_and_assembly/solution/firmware/am261x-lp/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd b/academy/getting_started_labs/c_and_assembly/solution/firmware/am261x-lp/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
index b40a3e09..93ae6753 100644
--- a/academy/getting_started_labs/c_and_assembly/solution/firmware/am261x-lp/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
+++ b/academy/getting_started_labs/c_and_assembly/solution/firmware/am261x-lp/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
@@ -19,7 +19,7 @@ MEMORY
 	/* 8 KB PRU Data RAM 0 */
 	PRU0_DMEM_0	: org = 0x00000000 len = 0x00002000	CREGISTER=24
 	/* 8 KB PRU Data RAM 1 */
-	PRU0_DMEM_1	: org = 0x00002000 len = 0x00002000	CREGISTER=25
+	PRU1_DMEM_1	: org = 0x00002000 len = 0x00002000	CREGISTER=25
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/getting_started_labs/c_and_assembly/solution/firmware/am261x-lp/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd b/academy/getting_started_labs/c_and_assembly/solution/firmware/am261x-lp/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
index cf883948..afb88a78 100644
--- a/academy/getting_started_labs/c_and_assembly/solution/firmware/am261x-lp/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
+++ b/academy/getting_started_labs/c_and_assembly/solution/firmware/am261x-lp/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
@@ -19,7 +19,7 @@ MEMORY
 	/* 8 KB PRU Data RAM 1 */
 	PRU1_DMEM_1	: org = 0x00000000 len = 0x00002000	CREGISTER=24
 	/* 8 KB PRU Data RAM 0 */
-	PRU1_DMEM_0	: org = 0x00002000 len = 0x00002000	CREGISTER=25
+	PRU0_DMEM_0	: org = 0x00002000 len = 0x00002000	CREGISTER=25
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/getting_started_labs/c_and_assembly/solution/firmware/am261x-som/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd b/academy/getting_started_labs/c_and_assembly/solution/firmware/am261x-som/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
index b40a3e09..93ae6753 100644
--- a/academy/getting_started_labs/c_and_assembly/solution/firmware/am261x-som/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
+++ b/academy/getting_started_labs/c_and_assembly/solution/firmware/am261x-som/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
@@ -19,7 +19,7 @@ MEMORY
 	/* 8 KB PRU Data RAM 0 */
 	PRU0_DMEM_0	: org = 0x00000000 len = 0x00002000	CREGISTER=24
 	/* 8 KB PRU Data RAM 1 */
-	PRU0_DMEM_1	: org = 0x00002000 len = 0x00002000	CREGISTER=25
+	PRU1_DMEM_1	: org = 0x00002000 len = 0x00002000	CREGISTER=25
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/getting_started_labs/c_and_assembly/solution/firmware/am261x-som/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd b/academy/getting_started_labs/c_and_assembly/solution/firmware/am261x-som/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
index cf883948..afb88a78 100644
--- a/academy/getting_started_labs/c_and_assembly/solution/firmware/am261x-som/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
+++ b/academy/getting_started_labs/c_and_assembly/solution/firmware/am261x-som/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
@@ -19,7 +19,7 @@ MEMORY
 	/* 8 KB PRU Data RAM 1 */
 	PRU1_DMEM_1	: org = 0x00000000 len = 0x00002000	CREGISTER=24
 	/* 8 KB PRU Data RAM 0 */
-	PRU1_DMEM_0	: org = 0x00002000 len = 0x00002000	CREGISTER=25
+	PRU0_DMEM_0	: org = 0x00002000 len = 0x00002000	CREGISTER=25
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/getting_started_labs/c_and_assembly/solution/firmware/am263px-cc/icss_m0_pru0_fw/ti-pru-cgt/example.projectspec b/academy/getting_started_labs/c_and_assembly/solution/firmware/am263px-cc/icss_m0_pru0_fw/ti-pru-cgt/example.projectspec
index 7d75a3f1..b79941c2 100644
--- a/academy/getting_started_labs/c_and_assembly/solution/firmware/am263px-cc/icss_m0_pru0_fw/ti-pru-cgt/example.projectspec
+++ b/academy/getting_started_labs/c_and_assembly/solution/firmware/am263px-cc/icss_m0_pru0_fw/ti-pru-cgt/example.projectspec
@@ -4,7 +4,7 @@
         <when>
             <context
                 deviceFamily="PRU"
-                deviceId="AM263px"
+                deviceId="AM263Px"
             />
         </when>
     </applicability>
@@ -20,7 +20,7 @@
         connection="TIXDS110_Connection.xml"
         toolChain="TI"
         cgtVersion="2.3.3"
-        device="AM263px"
+        device="AM263Px"
         deviceCore="ICSSM_PRU_0"
         ignoreDefaultDeviceSettings="true"
         ignoreDefaultCCSSettings="true"
diff --git a/academy/getting_started_labs/c_and_assembly/solution/firmware/am263px-cc/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd b/academy/getting_started_labs/c_and_assembly/solution/firmware/am263px-cc/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
index 095f9533..45a5a1a8 100644
--- a/academy/getting_started_labs/c_and_assembly/solution/firmware/am263px-cc/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
+++ b/academy/getting_started_labs/c_and_assembly/solution/firmware/am263px-cc/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
@@ -1,8 +1,8 @@
 /*
- * AM263px_PRU0.cmd
+ * AM263Px_PRU0.cmd
  *
  * Example Linker command file for linking programs built with the C compiler
- * on AM263px PRU0 cores
+ * on AM263Px PRU0 cores
  */
 
 -cr		/* Link using C conventions */
@@ -19,7 +19,7 @@ MEMORY
 	/* 8 KB PRU Data RAM 0 */
 	PRU0_DMEM_0	: org = 0x00000000 len = 0x00002000	CREGISTER=24
 	/* 8 KB PRU Data RAM 1 */
-	PRU0_DMEM_1	: org = 0x00002000 len = 0x00002000	CREGISTER=25
+	PRU1_DMEM_1	: org = 0x00002000 len = 0x00002000	CREGISTER=25
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/getting_started_labs/c_and_assembly/solution/firmware/am263px-cc/icss_m0_pru1_fw/ti-pru-cgt/example.projectspec b/academy/getting_started_labs/c_and_assembly/solution/firmware/am263px-cc/icss_m0_pru1_fw/ti-pru-cgt/example.projectspec
index 365a194e..a214fd6a 100644
--- a/academy/getting_started_labs/c_and_assembly/solution/firmware/am263px-cc/icss_m0_pru1_fw/ti-pru-cgt/example.projectspec
+++ b/academy/getting_started_labs/c_and_assembly/solution/firmware/am263px-cc/icss_m0_pru1_fw/ti-pru-cgt/example.projectspec
@@ -4,7 +4,7 @@
         <when>
             <context
                 deviceFamily="PRU"
-                deviceId="AM263px"
+                deviceId="AM263Px"
             />
         </when>
     </applicability>
@@ -20,7 +20,7 @@
         connection="TIXDS110_Connection.xml"
         toolChain="TI"
         cgtVersion="2.3.3"
-        device="AM263px"
+        device="AM263Px"
         deviceCore="ICSSM_PRU_1"
         ignoreDefaultDeviceSettings="true"
         ignoreDefaultCCSSettings="true"
diff --git a/academy/getting_started_labs/c_and_assembly/solution/firmware/am263px-cc/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd b/academy/getting_started_labs/c_and_assembly/solution/firmware/am263px-cc/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
index a3b557df..d54a14a7 100644
--- a/academy/getting_started_labs/c_and_assembly/solution/firmware/am263px-cc/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
+++ b/academy/getting_started_labs/c_and_assembly/solution/firmware/am263px-cc/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
@@ -1,8 +1,8 @@
 /*
- * AM263px_PRU1.cmd
+ * AM263Px_PRU1.cmd
  *
  * Example Linker command file for linking programs built with the C compiler
- * on AM263px PRU1 cores
+ * on AM263Px PRU1 cores
  */
 
 -cr		/* Link using C conventions */
@@ -19,7 +19,7 @@ MEMORY
 	/* 8 KB PRU Data RAM 1 */
 	PRU1_DMEM_1	: org = 0x00000000 len = 0x00002000	CREGISTER=24
 	/* 8 KB PRU Data RAM 0 */
-	PRU1_DMEM_0	: org = 0x00002000 len = 0x00002000	CREGISTER=25
+	PRU0_DMEM_0	: org = 0x00002000 len = 0x00002000	CREGISTER=25
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/getting_started_labs/c_and_assembly/solution/firmware/am263px-lp/icss_m0_pru0_fw/ti-pru-cgt/example.projectspec b/academy/getting_started_labs/c_and_assembly/solution/firmware/am263px-lp/icss_m0_pru0_fw/ti-pru-cgt/example.projectspec
index 526d60a7..2647c0d5 100644
--- a/academy/getting_started_labs/c_and_assembly/solution/firmware/am263px-lp/icss_m0_pru0_fw/ti-pru-cgt/example.projectspec
+++ b/academy/getting_started_labs/c_and_assembly/solution/firmware/am263px-lp/icss_m0_pru0_fw/ti-pru-cgt/example.projectspec
@@ -4,7 +4,7 @@
         <when>
             <context
                 deviceFamily="PRU"
-                deviceId="AM263px"
+                deviceId="AM263Px"
             />
         </when>
     </applicability>
@@ -20,7 +20,7 @@
         connection="TIXDS110_Connection.xml"
         toolChain="TI"
         cgtVersion="2.3.3"
-        device="AM263px"
+        device="AM263Px"
         deviceCore="ICSSM_PRU_0"
         ignoreDefaultDeviceSettings="true"
         ignoreDefaultCCSSettings="true"
diff --git a/academy/getting_started_labs/c_and_assembly/solution/firmware/am263px-lp/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd b/academy/getting_started_labs/c_and_assembly/solution/firmware/am263px-lp/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
index 095f9533..45a5a1a8 100644
--- a/academy/getting_started_labs/c_and_assembly/solution/firmware/am263px-lp/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
+++ b/academy/getting_started_labs/c_and_assembly/solution/firmware/am263px-lp/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
@@ -1,8 +1,8 @@
 /*
- * AM263px_PRU0.cmd
+ * AM263Px_PRU0.cmd
  *
  * Example Linker command file for linking programs built with the C compiler
- * on AM263px PRU0 cores
+ * on AM263Px PRU0 cores
  */
 
 -cr		/* Link using C conventions */
@@ -19,7 +19,7 @@ MEMORY
 	/* 8 KB PRU Data RAM 0 */
 	PRU0_DMEM_0	: org = 0x00000000 len = 0x00002000	CREGISTER=24
 	/* 8 KB PRU Data RAM 1 */
-	PRU0_DMEM_1	: org = 0x00002000 len = 0x00002000	CREGISTER=25
+	PRU1_DMEM_1	: org = 0x00002000 len = 0x00002000	CREGISTER=25
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/getting_started_labs/c_and_assembly/solution/firmware/am263px-lp/icss_m0_pru1_fw/ti-pru-cgt/example.projectspec b/academy/getting_started_labs/c_and_assembly/solution/firmware/am263px-lp/icss_m0_pru1_fw/ti-pru-cgt/example.projectspec
index 272dec83..b5961292 100644
--- a/academy/getting_started_labs/c_and_assembly/solution/firmware/am263px-lp/icss_m0_pru1_fw/ti-pru-cgt/example.projectspec
+++ b/academy/getting_started_labs/c_and_assembly/solution/firmware/am263px-lp/icss_m0_pru1_fw/ti-pru-cgt/example.projectspec
@@ -4,7 +4,7 @@
         <when>
             <context
                 deviceFamily="PRU"
-                deviceId="AM263px"
+                deviceId="AM263Px"
             />
         </when>
     </applicability>
@@ -20,7 +20,7 @@
         connection="TIXDS110_Connection.xml"
         toolChain="TI"
         cgtVersion="2.3.3"
-        device="AM263px"
+        device="AM263Px"
         deviceCore="ICSSM_PRU_1"
         ignoreDefaultDeviceSettings="true"
         ignoreDefaultCCSSettings="true"
diff --git a/academy/getting_started_labs/c_and_assembly/solution/firmware/am263px-lp/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd b/academy/getting_started_labs/c_and_assembly/solution/firmware/am263px-lp/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
index a3b557df..d54a14a7 100644
--- a/academy/getting_started_labs/c_and_assembly/solution/firmware/am263px-lp/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
+++ b/academy/getting_started_labs/c_and_assembly/solution/firmware/am263px-lp/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
@@ -1,8 +1,8 @@
 /*
- * AM263px_PRU1.cmd
+ * AM263Px_PRU1.cmd
  *
  * Example Linker command file for linking programs built with the C compiler
- * on AM263px PRU1 cores
+ * on AM263Px PRU1 cores
  */
 
 -cr		/* Link using C conventions */
@@ -19,7 +19,7 @@ MEMORY
 	/* 8 KB PRU Data RAM 1 */
 	PRU1_DMEM_1	: org = 0x00000000 len = 0x00002000	CREGISTER=24
 	/* 8 KB PRU Data RAM 0 */
-	PRU1_DMEM_0	: org = 0x00002000 len = 0x00002000	CREGISTER=25
+	PRU0_DMEM_0	: org = 0x00002000 len = 0x00002000	CREGISTER=25
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/getting_started_labs/c_and_assembly/solution/firmware/am263x-cc/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd b/academy/getting_started_labs/c_and_assembly/solution/firmware/am263x-cc/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
index 7123a82a..7b3ad22a 100644
--- a/academy/getting_started_labs/c_and_assembly/solution/firmware/am263x-cc/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
+++ b/academy/getting_started_labs/c_and_assembly/solution/firmware/am263x-cc/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
@@ -19,7 +19,7 @@ MEMORY
 	/* 8 KB PRU Data RAM 0 */
 	PRU0_DMEM_0	: org = 0x00000000 len = 0x00002000	CREGISTER=24
 	/* 8 KB PRU Data RAM 1 */
-	PRU0_DMEM_1	: org = 0x00002000 len = 0x00002000	CREGISTER=25
+	PRU1_DMEM_1	: org = 0x00002000 len = 0x00002000	CREGISTER=25
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/getting_started_labs/c_and_assembly/solution/firmware/am263x-cc/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd b/academy/getting_started_labs/c_and_assembly/solution/firmware/am263x-cc/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
index 6e858dc1..4cc82157 100644
--- a/academy/getting_started_labs/c_and_assembly/solution/firmware/am263x-cc/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
+++ b/academy/getting_started_labs/c_and_assembly/solution/firmware/am263x-cc/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
@@ -19,7 +19,7 @@ MEMORY
 	/* 8 KB PRU Data RAM 1 */
 	PRU1_DMEM_1	: org = 0x00000000 len = 0x00002000	CREGISTER=24
 	/* 8 KB PRU Data RAM 0 */
-	PRU1_DMEM_0	: org = 0x00002000 len = 0x00002000	CREGISTER=25
+	PRU0_DMEM_0	: org = 0x00002000 len = 0x00002000	CREGISTER=25
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/getting_started_labs/c_and_assembly/solution/firmware/am263x-lp/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd b/academy/getting_started_labs/c_and_assembly/solution/firmware/am263x-lp/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
index 7123a82a..7b3ad22a 100644
--- a/academy/getting_started_labs/c_and_assembly/solution/firmware/am263x-lp/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
+++ b/academy/getting_started_labs/c_and_assembly/solution/firmware/am263x-lp/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
@@ -19,7 +19,7 @@ MEMORY
 	/* 8 KB PRU Data RAM 0 */
 	PRU0_DMEM_0	: org = 0x00000000 len = 0x00002000	CREGISTER=24
 	/* 8 KB PRU Data RAM 1 */
-	PRU0_DMEM_1	: org = 0x00002000 len = 0x00002000	CREGISTER=25
+	PRU1_DMEM_1	: org = 0x00002000 len = 0x00002000	CREGISTER=25
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/getting_started_labs/c_and_assembly/solution/firmware/am263x-lp/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd b/academy/getting_started_labs/c_and_assembly/solution/firmware/am263x-lp/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
index 6e858dc1..4cc82157 100644
--- a/academy/getting_started_labs/c_and_assembly/solution/firmware/am263x-lp/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
+++ b/academy/getting_started_labs/c_and_assembly/solution/firmware/am263x-lp/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
@@ -19,7 +19,7 @@ MEMORY
 	/* 8 KB PRU Data RAM 1 */
 	PRU1_DMEM_1	: org = 0x00000000 len = 0x00002000	CREGISTER=24
 	/* 8 KB PRU Data RAM 0 */
-	PRU1_DMEM_0	: org = 0x00002000 len = 0x00002000	CREGISTER=25
+	PRU0_DMEM_0	: org = 0x00002000 len = 0x00002000	CREGISTER=25
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/getting_started_labs/c_and_assembly/solution/firmware/am62x-sk/pruss0_pru0_fw/ti-pru-cgt/linker.cmd b/academy/getting_started_labs/c_and_assembly/solution/firmware/am62x-sk/pruss0_pru0_fw/ti-pru-cgt/linker.cmd
index 1782108e..604fdfd9 100644
--- a/academy/getting_started_labs/c_and_assembly/solution/firmware/am62x-sk/pruss0_pru0_fw/ti-pru-cgt/linker.cmd
+++ b/academy/getting_started_labs/c_and_assembly/solution/firmware/am62x-sk/pruss0_pru0_fw/ti-pru-cgt/linker.cmd
@@ -19,7 +19,7 @@ MEMORY
 	/* 8 KB PRU Data RAM 0 */
 	PRU0_DMEM_0	: org = 0x00000000 len = 0x00002000	CREGISTER=24
 	/* 8 KB PRU Data RAM 1 */
-	PRU0_DMEM_1	: org = 0x00002000 len = 0x00002000	CREGISTER=25
+	PRU1_DMEM_1	: org = 0x00002000 len = 0x00002000	CREGISTER=25
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/getting_started_labs/c_and_assembly/solution/firmware/am62x-sk/pruss0_pru1_fw/ti-pru-cgt/linker.cmd b/academy/getting_started_labs/c_and_assembly/solution/firmware/am62x-sk/pruss0_pru1_fw/ti-pru-cgt/linker.cmd
index 9082912c..cbf74e60 100644
--- a/academy/getting_started_labs/c_and_assembly/solution/firmware/am62x-sk/pruss0_pru1_fw/ti-pru-cgt/linker.cmd
+++ b/academy/getting_started_labs/c_and_assembly/solution/firmware/am62x-sk/pruss0_pru1_fw/ti-pru-cgt/linker.cmd
@@ -19,7 +19,7 @@ MEMORY
 	/* 8 KB PRU Data RAM 1 */
 	PRU1_DMEM_1	: org = 0x00000000 len = 0x00002000	CREGISTER=24
 	/* 8 KB PRU Data RAM 0 */
-	PRU1_DMEM_0	: org = 0x00002000 len = 0x00002000	CREGISTER=25
+	PRU0_DMEM_0	: org = 0x00002000 len = 0x00002000	CREGISTER=25
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/getting_started_labs/c_and_assembly/solution/firmware/am64x-evm/icss_g0_pru0_fw/ti-pru-cgt/linker.cmd b/academy/getting_started_labs/c_and_assembly/solution/firmware/am64x-evm/icss_g0_pru0_fw/ti-pru-cgt/linker.cmd
index 7069af79..a39ea737 100644
--- a/academy/getting_started_labs/c_and_assembly/solution/firmware/am64x-evm/icss_g0_pru0_fw/ti-pru-cgt/linker.cmd
+++ b/academy/getting_started_labs/c_and_assembly/solution/firmware/am64x-evm/icss_g0_pru0_fw/ti-pru-cgt/linker.cmd
@@ -21,14 +21,14 @@ MEMORY
 	PRU0_DMEM_0	: org = 0x00000000 len = 0x00001000	CREGISTER=24
 	/* 8 KB PRU Data RAM 1; reserved completely for Slice1 cores - PRU1,
 	 * RTU1 and Tx_PRU1; do not use for any Slice0 cores */
-	PRU0_DMEM_1	: org = 0x00002000 len = 0x00001000	CREGISTER=25
+	PRU1_DMEM_1	: org = 0x00002000 len = 0x00001000	CREGISTER=25
 	/* NOTE: Custom split of the second 4 KB of ICSS Data RAMs 0 and 1
 	 * split equally between the corresponding RTU and Tx_PRU cores in
 	 * each slice */
 	RTU0_DMEM_0	: org = 0x00001000 len = 0x00000800
 	TX_PRU0_DMEM_0	: org = 0x00001800 len = 0x00000800
-	RTU0_DMEM_1	: org = 0x00003000 len = 0x00000800
-	TX_PRU0_DMEM_1	: org = 0x00003800 len = 0x00000800
+	RTU1_DMEM_1	: org = 0x00003000 len = 0x00000800
+	TX_PRU1_DMEM_1	: org = 0x00003800 len = 0x00000800
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/getting_started_labs/c_and_assembly/solution/firmware/am64x-evm/icss_g0_pru1_fw/ti-pru-cgt/linker.cmd b/academy/getting_started_labs/c_and_assembly/solution/firmware/am64x-evm/icss_g0_pru1_fw/ti-pru-cgt/linker.cmd
index 2d0fb831..d2fda1f1 100644
--- a/academy/getting_started_labs/c_and_assembly/solution/firmware/am64x-evm/icss_g0_pru1_fw/ti-pru-cgt/linker.cmd
+++ b/academy/getting_started_labs/c_and_assembly/solution/firmware/am64x-evm/icss_g0_pru1_fw/ti-pru-cgt/linker.cmd
@@ -21,14 +21,14 @@ MEMORY
 	PRU1_DMEM_1	: org = 0x00000000 len = 0x00001000	CREGISTER=24
 	/* 8 KB PRU Data RAM 0; reserved completely for Slice0 cores - PRU0,
 	 * RTU0 and Tx_PRU0; do not use for any Slice1 cores */
-	PRU1_DMEM_0	: org = 0x00002000 len = 0x00001000	CREGISTER=25
+	PRU0_DMEM_0	: org = 0x00002000 len = 0x00001000	CREGISTER=25
 	/* NOTE: Custom split of the second 4 KB of ICSS Data RAMs 0 and 1
 	 * split equally between the corresponding RTU and Tx_PRU cores in
 	 * each slice */
 	RTU1_DMEM_1	: org = 0x00001000 len = 0x00000800
 	TX_PRU1_DMEM_1	: org = 0x00001800 len = 0x00000800
-	RTU1_DMEM_0	: org = 0x00003000 len = 0x00000800
-	TX_PRU1_DMEM_0	: org = 0x00003800 len = 0x00000800
+	RTU0_DMEM_0	: org = 0x00003000 len = 0x00000800
+	TX_PRU0_DMEM_0	: org = 0x00003800 len = 0x00000800
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/getting_started_labs/c_and_assembly/solution/firmware/am64x-evm/icss_g0_rtu_pru0_fw/ti-pru-cgt/linker.cmd b/academy/getting_started_labs/c_and_assembly/solution/firmware/am64x-evm/icss_g0_rtu_pru0_fw/ti-pru-cgt/linker.cmd
index 3704b635..ea7d05f7 100644
--- a/academy/getting_started_labs/c_and_assembly/solution/firmware/am64x-evm/icss_g0_rtu_pru0_fw/ti-pru-cgt/linker.cmd
+++ b/academy/getting_started_labs/c_and_assembly/solution/firmware/am64x-evm/icss_g0_rtu_pru0_fw/ti-pru-cgt/linker.cmd
@@ -21,14 +21,14 @@ MEMORY
 	PRU0_DMEM_0	: org = 0x00000000 len = 0x00001000	CREGISTER=24
 	/* 8 KB PRU Data RAM 1; reserved completely for Slice1 cores - PRU1,
 	 * RTU1 and Tx_PRU1; do not use for any Slice0 cores */
-	PRU0_DMEM_1	: org = 0x00002000 len = 0x00001000	CREGISTER=25
+	PRU1_DMEM_1	: org = 0x00002000 len = 0x00001000	CREGISTER=25
 	/* NOTE: Custom split of the second 4 KB of ICSS Data RAMs 0 and 1
 	 * split equally between the corresponding RTU and Tx_PRU cores in
 	 * each slice */
 	RTU0_DMEM_0	: org = 0x00001000 len = 0x00000800
 	TX_PRU0_DMEM_0	: org = 0x00001800 len = 0x00000800
-	RTU0_DMEM_1	: org = 0x00003000 len = 0x00000800
-	TX_PRU0_DMEM_1	: org = 0x00003800 len = 0x00000800
+	RTU1_DMEM_1	: org = 0x00003000 len = 0x00000800
+	TX_PRU1_DMEM_1	: org = 0x00003800 len = 0x00000800
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/getting_started_labs/c_and_assembly/solution/firmware/am64x-evm/icss_g0_rtu_pru1_fw/ti-pru-cgt/linker.cmd b/academy/getting_started_labs/c_and_assembly/solution/firmware/am64x-evm/icss_g0_rtu_pru1_fw/ti-pru-cgt/linker.cmd
index e9bad7fd..3758b8a5 100644
--- a/academy/getting_started_labs/c_and_assembly/solution/firmware/am64x-evm/icss_g0_rtu_pru1_fw/ti-pru-cgt/linker.cmd
+++ b/academy/getting_started_labs/c_and_assembly/solution/firmware/am64x-evm/icss_g0_rtu_pru1_fw/ti-pru-cgt/linker.cmd
@@ -21,14 +21,14 @@ MEMORY
 	PRU1_DMEM_1	: org = 0x00000000 len = 0x00001000	CREGISTER=24
 	/* 8 KB PRU Data RAM 0; reserved completely for Slice0 cores - PRU0,
 	 * RTU0 and Tx_PRU0; do not use for any Slice1 cores */
-	PRU1_DMEM_0	: org = 0x00002000 len = 0x00001000	CREGISTER=25
+	PRU0_DMEM_0	: org = 0x00002000 len = 0x00001000	CREGISTER=25
 	/* NOTE: Custom split of the second 4 KB of ICSS Data RAMs 0 and 1
 	 * split equally between the corresponding RTU and Tx_PRU cores in
 	 * each slice */
 	RTU1_DMEM_1	: org = 0x00001000 len = 0x00000800
 	TX_PRU1_DMEM_1	: org = 0x00001800 len = 0x00000800
-	RTU1_DMEM_0	: org = 0x00003000 len = 0x00000800
-	TX_PRU1_DMEM_0	: org = 0x00003800 len = 0x00000800
+	RTU0_DMEM_0	: org = 0x00003000 len = 0x00000800
+	TX_PRU0_DMEM_0	: org = 0x00003800 len = 0x00000800
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/getting_started_labs/c_and_assembly/solution/firmware/am64x-evm/icss_g0_tx_pru0_fw/ti-pru-cgt/linker.cmd b/academy/getting_started_labs/c_and_assembly/solution/firmware/am64x-evm/icss_g0_tx_pru0_fw/ti-pru-cgt/linker.cmd
index 348a51c4..61ec26c5 100644
--- a/academy/getting_started_labs/c_and_assembly/solution/firmware/am64x-evm/icss_g0_tx_pru0_fw/ti-pru-cgt/linker.cmd
+++ b/academy/getting_started_labs/c_and_assembly/solution/firmware/am64x-evm/icss_g0_tx_pru0_fw/ti-pru-cgt/linker.cmd
@@ -21,14 +21,14 @@ MEMORY
 	PRU0_DMEM_0	: org = 0x00000000 len = 0x00001000	CREGISTER=24
 	/* 8 KB PRU Data RAM 1; reserved completely for Slice1 cores - PRU1,
 	 * RTU1 and Tx_PRU1; do not use for any Slice0 cores */
-	PRU0_DMEM_1	: org = 0x00002000 len = 0x00001000	CREGISTER=25
+	PRU1_DMEM_1	: org = 0x00002000 len = 0x00001000	CREGISTER=25
 	/* NOTE: Custom split of the second 4 KB of ICSS Data RAMs 0 and 1
 	 * split equally between the corresponding RTU and Tx_PRU cores in
 	 * each slice */
 	RTU0_DMEM_0	: org = 0x00001000 len = 0x00000800
 	TX_PRU0_DMEM_0	: org = 0x00001800 len = 0x00000800
-	RTU0_DMEM_1	: org = 0x00003000 len = 0x00000800
-	TX_PRU0_DMEM_1	: org = 0x00003800 len = 0x00000800
+	RTU1_DMEM_1	: org = 0x00003000 len = 0x00000800
+	TX_PRU1_DMEM_1	: org = 0x00003800 len = 0x00000800
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/getting_started_labs/c_and_assembly/solution/firmware/am64x-evm/icss_g0_tx_pru1_fw/ti-pru-cgt/linker.cmd b/academy/getting_started_labs/c_and_assembly/solution/firmware/am64x-evm/icss_g0_tx_pru1_fw/ti-pru-cgt/linker.cmd
index e75fb708..c230bfae 100644
--- a/academy/getting_started_labs/c_and_assembly/solution/firmware/am64x-evm/icss_g0_tx_pru1_fw/ti-pru-cgt/linker.cmd
+++ b/academy/getting_started_labs/c_and_assembly/solution/firmware/am64x-evm/icss_g0_tx_pru1_fw/ti-pru-cgt/linker.cmd
@@ -21,14 +21,14 @@ MEMORY
 	PRU1_DMEM_1	: org = 0x00000000 len = 0x00001000	CREGISTER=24
 	/* 8 KB PRU Data RAM 0; reserved completely for Slice0 cores - PRU0,
 	 * RTU0 and Tx_PRU0; do not use for any Slice1 cores */
-	PRU1_DMEM_0	: org = 0x00002000 len = 0x00001000	CREGISTER=25
+	PRU0_DMEM_0	: org = 0x00002000 len = 0x00001000	CREGISTER=25
 	/* NOTE: Custom split of the second 4 KB of ICSS Data RAMs 0 and 1
 	 * split equally between the corresponding RTU and Tx_PRU cores in
 	 * each slice */
 	RTU1_DMEM_1	: org = 0x00001000 len = 0x00000800
 	TX_PRU1_DMEM_1	: org = 0x00001800 len = 0x00000800
-	RTU1_DMEM_0	: org = 0x00003000 len = 0x00000800
-	TX_PRU1_DMEM_0	: org = 0x00003800 len = 0x00000800
+	RTU0_DMEM_0	: org = 0x00003000 len = 0x00000800
+	TX_PRU0_DMEM_0	: org = 0x00003800 len = 0x00000800
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/getting_started_labs/c_and_inline_assembly/solution/firmware/am243x-evm/icss_g0_pru0_fw/ti-pru-cgt/linker.cmd b/academy/getting_started_labs/c_and_inline_assembly/solution/firmware/am243x-evm/icss_g0_pru0_fw/ti-pru-cgt/linker.cmd
index a69842cd..389d0cbd 100644
--- a/academy/getting_started_labs/c_and_inline_assembly/solution/firmware/am243x-evm/icss_g0_pru0_fw/ti-pru-cgt/linker.cmd
+++ b/academy/getting_started_labs/c_and_inline_assembly/solution/firmware/am243x-evm/icss_g0_pru0_fw/ti-pru-cgt/linker.cmd
@@ -21,14 +21,14 @@ MEMORY
 	PRU0_DMEM_0	: org = 0x00000000 len = 0x00001000	CREGISTER=24
 	/* 8 KB PRU Data RAM 1; reserved completely for Slice1 cores - PRU1,
 	 * RTU1 and Tx_PRU1; do not use for any Slice0 cores */
-	PRU0_DMEM_1	: org = 0x00002000 len = 0x00001000	CREGISTER=25
+	PRU1_DMEM_1	: org = 0x00002000 len = 0x00001000	CREGISTER=25
 	/* NOTE: Custom split of the second 4 KB of ICSS Data RAMs 0 and 1
 	 * split equally between the corresponding RTU and Tx_PRU cores in
 	 * each slice */
 	RTU0_DMEM_0	: org = 0x00001000 len = 0x00000800
 	TX_PRU0_DMEM_0	: org = 0x00001800 len = 0x00000800
-	RTU0_DMEM_1	: org = 0x00003000 len = 0x00000800
-	TX_PRU0_DMEM_1	: org = 0x00003800 len = 0x00000800
+	RTU1_DMEM_1	: org = 0x00003000 len = 0x00000800
+	TX_PRU1_DMEM_1	: org = 0x00003800 len = 0x00000800
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/getting_started_labs/c_and_inline_assembly/solution/firmware/am243x-evm/icss_g0_pru1_fw/ti-pru-cgt/linker.cmd b/academy/getting_started_labs/c_and_inline_assembly/solution/firmware/am243x-evm/icss_g0_pru1_fw/ti-pru-cgt/linker.cmd
index 440057a7..85522291 100644
--- a/academy/getting_started_labs/c_and_inline_assembly/solution/firmware/am243x-evm/icss_g0_pru1_fw/ti-pru-cgt/linker.cmd
+++ b/academy/getting_started_labs/c_and_inline_assembly/solution/firmware/am243x-evm/icss_g0_pru1_fw/ti-pru-cgt/linker.cmd
@@ -21,14 +21,14 @@ MEMORY
 	PRU1_DMEM_1	: org = 0x00000000 len = 0x00001000	CREGISTER=24
 	/* 8 KB PRU Data RAM 0; reserved completely for Slice0 cores - PRU0,
 	 * RTU0 and Tx_PRU0; do not use for any Slice1 cores */
-	PRU1_DMEM_0	: org = 0x00002000 len = 0x00001000	CREGISTER=25
+	PRU0_DMEM_0	: org = 0x00002000 len = 0x00001000	CREGISTER=25
 	/* NOTE: Custom split of the second 4 KB of ICSS Data RAMs 0 and 1
 	 * split equally between the corresponding RTU and Tx_PRU cores in
 	 * each slice */
 	RTU1_DMEM_1	: org = 0x00001000 len = 0x00000800
 	TX_PRU1_DMEM_1	: org = 0x00001800 len = 0x00000800
-	RTU1_DMEM_0	: org = 0x00003000 len = 0x00000800
-	TX_PRU1_DMEM_0	: org = 0x00003800 len = 0x00000800
+	RTU0_DMEM_0	: org = 0x00003000 len = 0x00000800
+	TX_PRU0_DMEM_0	: org = 0x00003800 len = 0x00000800
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/getting_started_labs/c_and_inline_assembly/solution/firmware/am243x-evm/icss_g0_rtu_pru0_fw/ti-pru-cgt/linker.cmd b/academy/getting_started_labs/c_and_inline_assembly/solution/firmware/am243x-evm/icss_g0_rtu_pru0_fw/ti-pru-cgt/linker.cmd
index 64ab61bc..54cedd3c 100644
--- a/academy/getting_started_labs/c_and_inline_assembly/solution/firmware/am243x-evm/icss_g0_rtu_pru0_fw/ti-pru-cgt/linker.cmd
+++ b/academy/getting_started_labs/c_and_inline_assembly/solution/firmware/am243x-evm/icss_g0_rtu_pru0_fw/ti-pru-cgt/linker.cmd
@@ -21,14 +21,14 @@ MEMORY
 	PRU0_DMEM_0	: org = 0x00000000 len = 0x00001000	CREGISTER=24
 	/* 8 KB PRU Data RAM 1; reserved completely for Slice1 cores - PRU1,
 	 * RTU1 and Tx_PRU1; do not use for any Slice0 cores */
-	PRU0_DMEM_1	: org = 0x00002000 len = 0x00001000	CREGISTER=25
+	PRU1_DMEM_1	: org = 0x00002000 len = 0x00001000	CREGISTER=25
 	/* NOTE: Custom split of the second 4 KB of ICSS Data RAMs 0 and 1
 	 * split equally between the corresponding RTU and Tx_PRU cores in
 	 * each slice */
 	RTU0_DMEM_0	: org = 0x00001000 len = 0x00000800
 	TX_PRU0_DMEM_0	: org = 0x00001800 len = 0x00000800
-	RTU0_DMEM_1	: org = 0x00003000 len = 0x00000800
-	TX_PRU0_DMEM_1	: org = 0x00003800 len = 0x00000800
+	RTU1_DMEM_1	: org = 0x00003000 len = 0x00000800
+	TX_PRU1_DMEM_1	: org = 0x00003800 len = 0x00000800
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/getting_started_labs/c_and_inline_assembly/solution/firmware/am243x-evm/icss_g0_rtu_pru1_fw/ti-pru-cgt/linker.cmd b/academy/getting_started_labs/c_and_inline_assembly/solution/firmware/am243x-evm/icss_g0_rtu_pru1_fw/ti-pru-cgt/linker.cmd
index 14fd35a8..4cfd083e 100644
--- a/academy/getting_started_labs/c_and_inline_assembly/solution/firmware/am243x-evm/icss_g0_rtu_pru1_fw/ti-pru-cgt/linker.cmd
+++ b/academy/getting_started_labs/c_and_inline_assembly/solution/firmware/am243x-evm/icss_g0_rtu_pru1_fw/ti-pru-cgt/linker.cmd
@@ -21,14 +21,14 @@ MEMORY
 	PRU1_DMEM_1	: org = 0x00000000 len = 0x00001000	CREGISTER=24
 	/* 8 KB PRU Data RAM 0; reserved completely for Slice0 cores - PRU0,
 	 * RTU0 and Tx_PRU0; do not use for any Slice1 cores */
-	PRU1_DMEM_0	: org = 0x00002000 len = 0x00001000	CREGISTER=25
+	PRU0_DMEM_0	: org = 0x00002000 len = 0x00001000	CREGISTER=25
 	/* NOTE: Custom split of the second 4 KB of ICSS Data RAMs 0 and 1
 	 * split equally between the corresponding RTU and Tx_PRU cores in
 	 * each slice */
 	RTU1_DMEM_1	: org = 0x00001000 len = 0x00000800
 	TX_PRU1_DMEM_1	: org = 0x00001800 len = 0x00000800
-	RTU1_DMEM_0	: org = 0x00003000 len = 0x00000800
-	TX_PRU1_DMEM_0	: org = 0x00003800 len = 0x00000800
+	RTU0_DMEM_0	: org = 0x00003000 len = 0x00000800
+	TX_PRU0_DMEM_0	: org = 0x00003800 len = 0x00000800
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/getting_started_labs/c_and_inline_assembly/solution/firmware/am243x-evm/icss_g0_tx_pru0_fw/ti-pru-cgt/linker.cmd b/academy/getting_started_labs/c_and_inline_assembly/solution/firmware/am243x-evm/icss_g0_tx_pru0_fw/ti-pru-cgt/linker.cmd
index 16ea3376..853c81f6 100644
--- a/academy/getting_started_labs/c_and_inline_assembly/solution/firmware/am243x-evm/icss_g0_tx_pru0_fw/ti-pru-cgt/linker.cmd
+++ b/academy/getting_started_labs/c_and_inline_assembly/solution/firmware/am243x-evm/icss_g0_tx_pru0_fw/ti-pru-cgt/linker.cmd
@@ -21,14 +21,14 @@ MEMORY
 	PRU0_DMEM_0	: org = 0x00000000 len = 0x00001000	CREGISTER=24
 	/* 8 KB PRU Data RAM 1; reserved completely for Slice1 cores - PRU1,
 	 * RTU1 and Tx_PRU1; do not use for any Slice0 cores */
-	PRU0_DMEM_1	: org = 0x00002000 len = 0x00001000	CREGISTER=25
+	PRU1_DMEM_1	: org = 0x00002000 len = 0x00001000	CREGISTER=25
 	/* NOTE: Custom split of the second 4 KB of ICSS Data RAMs 0 and 1
 	 * split equally between the corresponding RTU and Tx_PRU cores in
 	 * each slice */
 	RTU0_DMEM_0	: org = 0x00001000 len = 0x00000800
 	TX_PRU0_DMEM_0	: org = 0x00001800 len = 0x00000800
-	RTU0_DMEM_1	: org = 0x00003000 len = 0x00000800
-	TX_PRU0_DMEM_1	: org = 0x00003800 len = 0x00000800
+	RTU1_DMEM_1	: org = 0x00003000 len = 0x00000800
+	TX_PRU1_DMEM_1	: org = 0x00003800 len = 0x00000800
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/getting_started_labs/c_and_inline_assembly/solution/firmware/am243x-evm/icss_g0_tx_pru1_fw/ti-pru-cgt/linker.cmd b/academy/getting_started_labs/c_and_inline_assembly/solution/firmware/am243x-evm/icss_g0_tx_pru1_fw/ti-pru-cgt/linker.cmd
index 709dde47..2547a2ba 100644
--- a/academy/getting_started_labs/c_and_inline_assembly/solution/firmware/am243x-evm/icss_g0_tx_pru1_fw/ti-pru-cgt/linker.cmd
+++ b/academy/getting_started_labs/c_and_inline_assembly/solution/firmware/am243x-evm/icss_g0_tx_pru1_fw/ti-pru-cgt/linker.cmd
@@ -21,14 +21,14 @@ MEMORY
 	PRU1_DMEM_1	: org = 0x00000000 len = 0x00001000	CREGISTER=24
 	/* 8 KB PRU Data RAM 0; reserved completely for Slice0 cores - PRU0,
 	 * RTU0 and Tx_PRU0; do not use for any Slice1 cores */
-	PRU1_DMEM_0	: org = 0x00002000 len = 0x00001000	CREGISTER=25
+	PRU0_DMEM_0	: org = 0x00002000 len = 0x00001000	CREGISTER=25
 	/* NOTE: Custom split of the second 4 KB of ICSS Data RAMs 0 and 1
 	 * split equally between the corresponding RTU and Tx_PRU cores in
 	 * each slice */
 	RTU1_DMEM_1	: org = 0x00001000 len = 0x00000800
 	TX_PRU1_DMEM_1	: org = 0x00001800 len = 0x00000800
-	RTU1_DMEM_0	: org = 0x00003000 len = 0x00000800
-	TX_PRU1_DMEM_0	: org = 0x00003800 len = 0x00000800
+	RTU0_DMEM_0	: org = 0x00003000 len = 0x00000800
+	TX_PRU0_DMEM_0	: org = 0x00003800 len = 0x00000800
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/getting_started_labs/c_and_inline_assembly/solution/firmware/am243x-lp/icss_g0_pru0_fw/ti-pru-cgt/linker.cmd b/academy/getting_started_labs/c_and_inline_assembly/solution/firmware/am243x-lp/icss_g0_pru0_fw/ti-pru-cgt/linker.cmd
index a69842cd..389d0cbd 100644
--- a/academy/getting_started_labs/c_and_inline_assembly/solution/firmware/am243x-lp/icss_g0_pru0_fw/ti-pru-cgt/linker.cmd
+++ b/academy/getting_started_labs/c_and_inline_assembly/solution/firmware/am243x-lp/icss_g0_pru0_fw/ti-pru-cgt/linker.cmd
@@ -21,14 +21,14 @@ MEMORY
 	PRU0_DMEM_0	: org = 0x00000000 len = 0x00001000	CREGISTER=24
 	/* 8 KB PRU Data RAM 1; reserved completely for Slice1 cores - PRU1,
 	 * RTU1 and Tx_PRU1; do not use for any Slice0 cores */
-	PRU0_DMEM_1	: org = 0x00002000 len = 0x00001000	CREGISTER=25
+	PRU1_DMEM_1	: org = 0x00002000 len = 0x00001000	CREGISTER=25
 	/* NOTE: Custom split of the second 4 KB of ICSS Data RAMs 0 and 1
 	 * split equally between the corresponding RTU and Tx_PRU cores in
 	 * each slice */
 	RTU0_DMEM_0	: org = 0x00001000 len = 0x00000800
 	TX_PRU0_DMEM_0	: org = 0x00001800 len = 0x00000800
-	RTU0_DMEM_1	: org = 0x00003000 len = 0x00000800
-	TX_PRU0_DMEM_1	: org = 0x00003800 len = 0x00000800
+	RTU1_DMEM_1	: org = 0x00003000 len = 0x00000800
+	TX_PRU1_DMEM_1	: org = 0x00003800 len = 0x00000800
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/getting_started_labs/c_and_inline_assembly/solution/firmware/am243x-lp/icss_g0_pru1_fw/ti-pru-cgt/linker.cmd b/academy/getting_started_labs/c_and_inline_assembly/solution/firmware/am243x-lp/icss_g0_pru1_fw/ti-pru-cgt/linker.cmd
index 440057a7..85522291 100644
--- a/academy/getting_started_labs/c_and_inline_assembly/solution/firmware/am243x-lp/icss_g0_pru1_fw/ti-pru-cgt/linker.cmd
+++ b/academy/getting_started_labs/c_and_inline_assembly/solution/firmware/am243x-lp/icss_g0_pru1_fw/ti-pru-cgt/linker.cmd
@@ -21,14 +21,14 @@ MEMORY
 	PRU1_DMEM_1	: org = 0x00000000 len = 0x00001000	CREGISTER=24
 	/* 8 KB PRU Data RAM 0; reserved completely for Slice0 cores - PRU0,
 	 * RTU0 and Tx_PRU0; do not use for any Slice1 cores */
-	PRU1_DMEM_0	: org = 0x00002000 len = 0x00001000	CREGISTER=25
+	PRU0_DMEM_0	: org = 0x00002000 len = 0x00001000	CREGISTER=25
 	/* NOTE: Custom split of the second 4 KB of ICSS Data RAMs 0 and 1
 	 * split equally between the corresponding RTU and Tx_PRU cores in
 	 * each slice */
 	RTU1_DMEM_1	: org = 0x00001000 len = 0x00000800
 	TX_PRU1_DMEM_1	: org = 0x00001800 len = 0x00000800
-	RTU1_DMEM_0	: org = 0x00003000 len = 0x00000800
-	TX_PRU1_DMEM_0	: org = 0x00003800 len = 0x00000800
+	RTU0_DMEM_0	: org = 0x00003000 len = 0x00000800
+	TX_PRU0_DMEM_0	: org = 0x00003800 len = 0x00000800
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/getting_started_labs/c_and_inline_assembly/solution/firmware/am243x-lp/icss_g0_rtu_pru0_fw/ti-pru-cgt/linker.cmd b/academy/getting_started_labs/c_and_inline_assembly/solution/firmware/am243x-lp/icss_g0_rtu_pru0_fw/ti-pru-cgt/linker.cmd
index 64ab61bc..54cedd3c 100644
--- a/academy/getting_started_labs/c_and_inline_assembly/solution/firmware/am243x-lp/icss_g0_rtu_pru0_fw/ti-pru-cgt/linker.cmd
+++ b/academy/getting_started_labs/c_and_inline_assembly/solution/firmware/am243x-lp/icss_g0_rtu_pru0_fw/ti-pru-cgt/linker.cmd
@@ -21,14 +21,14 @@ MEMORY
 	PRU0_DMEM_0	: org = 0x00000000 len = 0x00001000	CREGISTER=24
 	/* 8 KB PRU Data RAM 1; reserved completely for Slice1 cores - PRU1,
 	 * RTU1 and Tx_PRU1; do not use for any Slice0 cores */
-	PRU0_DMEM_1	: org = 0x00002000 len = 0x00001000	CREGISTER=25
+	PRU1_DMEM_1	: org = 0x00002000 len = 0x00001000	CREGISTER=25
 	/* NOTE: Custom split of the second 4 KB of ICSS Data RAMs 0 and 1
 	 * split equally between the corresponding RTU and Tx_PRU cores in
 	 * each slice */
 	RTU0_DMEM_0	: org = 0x00001000 len = 0x00000800
 	TX_PRU0_DMEM_0	: org = 0x00001800 len = 0x00000800
-	RTU0_DMEM_1	: org = 0x00003000 len = 0x00000800
-	TX_PRU0_DMEM_1	: org = 0x00003800 len = 0x00000800
+	RTU1_DMEM_1	: org = 0x00003000 len = 0x00000800
+	TX_PRU1_DMEM_1	: org = 0x00003800 len = 0x00000800
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/getting_started_labs/c_and_inline_assembly/solution/firmware/am243x-lp/icss_g0_rtu_pru1_fw/ti-pru-cgt/linker.cmd b/academy/getting_started_labs/c_and_inline_assembly/solution/firmware/am243x-lp/icss_g0_rtu_pru1_fw/ti-pru-cgt/linker.cmd
index 14fd35a8..4cfd083e 100644
--- a/academy/getting_started_labs/c_and_inline_assembly/solution/firmware/am243x-lp/icss_g0_rtu_pru1_fw/ti-pru-cgt/linker.cmd
+++ b/academy/getting_started_labs/c_and_inline_assembly/solution/firmware/am243x-lp/icss_g0_rtu_pru1_fw/ti-pru-cgt/linker.cmd
@@ -21,14 +21,14 @@ MEMORY
 	PRU1_DMEM_1	: org = 0x00000000 len = 0x00001000	CREGISTER=24
 	/* 8 KB PRU Data RAM 0; reserved completely for Slice0 cores - PRU0,
 	 * RTU0 and Tx_PRU0; do not use for any Slice1 cores */
-	PRU1_DMEM_0	: org = 0x00002000 len = 0x00001000	CREGISTER=25
+	PRU0_DMEM_0	: org = 0x00002000 len = 0x00001000	CREGISTER=25
 	/* NOTE: Custom split of the second 4 KB of ICSS Data RAMs 0 and 1
 	 * split equally between the corresponding RTU and Tx_PRU cores in
 	 * each slice */
 	RTU1_DMEM_1	: org = 0x00001000 len = 0x00000800
 	TX_PRU1_DMEM_1	: org = 0x00001800 len = 0x00000800
-	RTU1_DMEM_0	: org = 0x00003000 len = 0x00000800
-	TX_PRU1_DMEM_0	: org = 0x00003800 len = 0x00000800
+	RTU0_DMEM_0	: org = 0x00003000 len = 0x00000800
+	TX_PRU0_DMEM_0	: org = 0x00003800 len = 0x00000800
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/getting_started_labs/c_and_inline_assembly/solution/firmware/am243x-lp/icss_g0_tx_pru0_fw/ti-pru-cgt/linker.cmd b/academy/getting_started_labs/c_and_inline_assembly/solution/firmware/am243x-lp/icss_g0_tx_pru0_fw/ti-pru-cgt/linker.cmd
index 16ea3376..853c81f6 100644
--- a/academy/getting_started_labs/c_and_inline_assembly/solution/firmware/am243x-lp/icss_g0_tx_pru0_fw/ti-pru-cgt/linker.cmd
+++ b/academy/getting_started_labs/c_and_inline_assembly/solution/firmware/am243x-lp/icss_g0_tx_pru0_fw/ti-pru-cgt/linker.cmd
@@ -21,14 +21,14 @@ MEMORY
 	PRU0_DMEM_0	: org = 0x00000000 len = 0x00001000	CREGISTER=24
 	/* 8 KB PRU Data RAM 1; reserved completely for Slice1 cores - PRU1,
 	 * RTU1 and Tx_PRU1; do not use for any Slice0 cores */
-	PRU0_DMEM_1	: org = 0x00002000 len = 0x00001000	CREGISTER=25
+	PRU1_DMEM_1	: org = 0x00002000 len = 0x00001000	CREGISTER=25
 	/* NOTE: Custom split of the second 4 KB of ICSS Data RAMs 0 and 1
 	 * split equally between the corresponding RTU and Tx_PRU cores in
 	 * each slice */
 	RTU0_DMEM_0	: org = 0x00001000 len = 0x00000800
 	TX_PRU0_DMEM_0	: org = 0x00001800 len = 0x00000800
-	RTU0_DMEM_1	: org = 0x00003000 len = 0x00000800
-	TX_PRU0_DMEM_1	: org = 0x00003800 len = 0x00000800
+	RTU1_DMEM_1	: org = 0x00003000 len = 0x00000800
+	TX_PRU1_DMEM_1	: org = 0x00003800 len = 0x00000800
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/getting_started_labs/c_and_inline_assembly/solution/firmware/am243x-lp/icss_g0_tx_pru1_fw/ti-pru-cgt/linker.cmd b/academy/getting_started_labs/c_and_inline_assembly/solution/firmware/am243x-lp/icss_g0_tx_pru1_fw/ti-pru-cgt/linker.cmd
index 709dde47..2547a2ba 100644
--- a/academy/getting_started_labs/c_and_inline_assembly/solution/firmware/am243x-lp/icss_g0_tx_pru1_fw/ti-pru-cgt/linker.cmd
+++ b/academy/getting_started_labs/c_and_inline_assembly/solution/firmware/am243x-lp/icss_g0_tx_pru1_fw/ti-pru-cgt/linker.cmd
@@ -21,14 +21,14 @@ MEMORY
 	PRU1_DMEM_1	: org = 0x00000000 len = 0x00001000	CREGISTER=24
 	/* 8 KB PRU Data RAM 0; reserved completely for Slice0 cores - PRU0,
 	 * RTU0 and Tx_PRU0; do not use for any Slice1 cores */
-	PRU1_DMEM_0	: org = 0x00002000 len = 0x00001000	CREGISTER=25
+	PRU0_DMEM_0	: org = 0x00002000 len = 0x00001000	CREGISTER=25
 	/* NOTE: Custom split of the second 4 KB of ICSS Data RAMs 0 and 1
 	 * split equally between the corresponding RTU and Tx_PRU cores in
 	 * each slice */
 	RTU1_DMEM_1	: org = 0x00001000 len = 0x00000800
 	TX_PRU1_DMEM_1	: org = 0x00001800 len = 0x00000800
-	RTU1_DMEM_0	: org = 0x00003000 len = 0x00000800
-	TX_PRU1_DMEM_0	: org = 0x00003800 len = 0x00000800
+	RTU0_DMEM_0	: org = 0x00003000 len = 0x00000800
+	TX_PRU0_DMEM_0	: org = 0x00003800 len = 0x00000800
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/getting_started_labs/c_and_inline_assembly/solution/firmware/am261x-lp/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd b/academy/getting_started_labs/c_and_inline_assembly/solution/firmware/am261x-lp/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
index b40a3e09..93ae6753 100644
--- a/academy/getting_started_labs/c_and_inline_assembly/solution/firmware/am261x-lp/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
+++ b/academy/getting_started_labs/c_and_inline_assembly/solution/firmware/am261x-lp/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
@@ -19,7 +19,7 @@ MEMORY
 	/* 8 KB PRU Data RAM 0 */
 	PRU0_DMEM_0	: org = 0x00000000 len = 0x00002000	CREGISTER=24
 	/* 8 KB PRU Data RAM 1 */
-	PRU0_DMEM_1	: org = 0x00002000 len = 0x00002000	CREGISTER=25
+	PRU1_DMEM_1	: org = 0x00002000 len = 0x00002000	CREGISTER=25
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/getting_started_labs/c_and_inline_assembly/solution/firmware/am261x-lp/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd b/academy/getting_started_labs/c_and_inline_assembly/solution/firmware/am261x-lp/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
index cf883948..afb88a78 100644
--- a/academy/getting_started_labs/c_and_inline_assembly/solution/firmware/am261x-lp/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
+++ b/academy/getting_started_labs/c_and_inline_assembly/solution/firmware/am261x-lp/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
@@ -19,7 +19,7 @@ MEMORY
 	/* 8 KB PRU Data RAM 1 */
 	PRU1_DMEM_1	: org = 0x00000000 len = 0x00002000	CREGISTER=24
 	/* 8 KB PRU Data RAM 0 */
-	PRU1_DMEM_0	: org = 0x00002000 len = 0x00002000	CREGISTER=25
+	PRU0_DMEM_0	: org = 0x00002000 len = 0x00002000	CREGISTER=25
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/getting_started_labs/c_and_inline_assembly/solution/firmware/am261x-som/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd b/academy/getting_started_labs/c_and_inline_assembly/solution/firmware/am261x-som/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
index b40a3e09..93ae6753 100644
--- a/academy/getting_started_labs/c_and_inline_assembly/solution/firmware/am261x-som/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
+++ b/academy/getting_started_labs/c_and_inline_assembly/solution/firmware/am261x-som/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
@@ -19,7 +19,7 @@ MEMORY
 	/* 8 KB PRU Data RAM 0 */
 	PRU0_DMEM_0	: org = 0x00000000 len = 0x00002000	CREGISTER=24
 	/* 8 KB PRU Data RAM 1 */
-	PRU0_DMEM_1	: org = 0x00002000 len = 0x00002000	CREGISTER=25
+	PRU1_DMEM_1	: org = 0x00002000 len = 0x00002000	CREGISTER=25
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/getting_started_labs/c_and_inline_assembly/solution/firmware/am261x-som/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd b/academy/getting_started_labs/c_and_inline_assembly/solution/firmware/am261x-som/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
index cf883948..afb88a78 100644
--- a/academy/getting_started_labs/c_and_inline_assembly/solution/firmware/am261x-som/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
+++ b/academy/getting_started_labs/c_and_inline_assembly/solution/firmware/am261x-som/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
@@ -19,7 +19,7 @@ MEMORY
 	/* 8 KB PRU Data RAM 1 */
 	PRU1_DMEM_1	: org = 0x00000000 len = 0x00002000	CREGISTER=24
 	/* 8 KB PRU Data RAM 0 */
-	PRU1_DMEM_0	: org = 0x00002000 len = 0x00002000	CREGISTER=25
+	PRU0_DMEM_0	: org = 0x00002000 len = 0x00002000	CREGISTER=25
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/getting_started_labs/c_and_inline_assembly/solution/firmware/am263px-cc/icss_m0_pru0_fw/ti-pru-cgt/example.projectspec b/academy/getting_started_labs/c_and_inline_assembly/solution/firmware/am263px-cc/icss_m0_pru0_fw/ti-pru-cgt/example.projectspec
index 8edeaa7e..1ed376a6 100644
--- a/academy/getting_started_labs/c_and_inline_assembly/solution/firmware/am263px-cc/icss_m0_pru0_fw/ti-pru-cgt/example.projectspec
+++ b/academy/getting_started_labs/c_and_inline_assembly/solution/firmware/am263px-cc/icss_m0_pru0_fw/ti-pru-cgt/example.projectspec
@@ -4,7 +4,7 @@
         <when>
             <context
                 deviceFamily="PRU"
-                deviceId="AM263px"
+                deviceId="AM263Px"
             />
         </when>
     </applicability>
@@ -20,7 +20,7 @@
         connection="TIXDS110_Connection.xml"
         toolChain="TI"
         cgtVersion="2.3.3"
-        device="AM263px"
+        device="AM263Px"
         deviceCore="ICSSM_PRU_0"
         ignoreDefaultDeviceSettings="true"
         ignoreDefaultCCSSettings="true"
diff --git a/academy/getting_started_labs/c_and_inline_assembly/solution/firmware/am263px-cc/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd b/academy/getting_started_labs/c_and_inline_assembly/solution/firmware/am263px-cc/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
index 095f9533..45a5a1a8 100644
--- a/academy/getting_started_labs/c_and_inline_assembly/solution/firmware/am263px-cc/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
+++ b/academy/getting_started_labs/c_and_inline_assembly/solution/firmware/am263px-cc/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
@@ -1,8 +1,8 @@
 /*
- * AM263px_PRU0.cmd
+ * AM263Px_PRU0.cmd
  *
  * Example Linker command file for linking programs built with the C compiler
- * on AM263px PRU0 cores
+ * on AM263Px PRU0 cores
  */
 
 -cr		/* Link using C conventions */
@@ -19,7 +19,7 @@ MEMORY
 	/* 8 KB PRU Data RAM 0 */
 	PRU0_DMEM_0	: org = 0x00000000 len = 0x00002000	CREGISTER=24
 	/* 8 KB PRU Data RAM 1 */
-	PRU0_DMEM_1	: org = 0x00002000 len = 0x00002000	CREGISTER=25
+	PRU1_DMEM_1	: org = 0x00002000 len = 0x00002000	CREGISTER=25
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/getting_started_labs/c_and_inline_assembly/solution/firmware/am263px-cc/icss_m0_pru1_fw/ti-pru-cgt/example.projectspec b/academy/getting_started_labs/c_and_inline_assembly/solution/firmware/am263px-cc/icss_m0_pru1_fw/ti-pru-cgt/example.projectspec
index 08ed87dd..27f53d09 100644
--- a/academy/getting_started_labs/c_and_inline_assembly/solution/firmware/am263px-cc/icss_m0_pru1_fw/ti-pru-cgt/example.projectspec
+++ b/academy/getting_started_labs/c_and_inline_assembly/solution/firmware/am263px-cc/icss_m0_pru1_fw/ti-pru-cgt/example.projectspec
@@ -4,7 +4,7 @@
         <when>
             <context
                 deviceFamily="PRU"
-                deviceId="AM263px"
+                deviceId="AM263Px"
             />
         </when>
     </applicability>
@@ -20,7 +20,7 @@
         connection="TIXDS110_Connection.xml"
         toolChain="TI"
         cgtVersion="2.3.3"
-        device="AM263px"
+        device="AM263Px"
         deviceCore="ICSSM_PRU_1"
         ignoreDefaultDeviceSettings="true"
         ignoreDefaultCCSSettings="true"
diff --git a/academy/getting_started_labs/c_and_inline_assembly/solution/firmware/am263px-cc/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd b/academy/getting_started_labs/c_and_inline_assembly/solution/firmware/am263px-cc/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
index a3b557df..d54a14a7 100644
--- a/academy/getting_started_labs/c_and_inline_assembly/solution/firmware/am263px-cc/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
+++ b/academy/getting_started_labs/c_and_inline_assembly/solution/firmware/am263px-cc/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
@@ -1,8 +1,8 @@
 /*
- * AM263px_PRU1.cmd
+ * AM263Px_PRU1.cmd
  *
  * Example Linker command file for linking programs built with the C compiler
- * on AM263px PRU1 cores
+ * on AM263Px PRU1 cores
  */
 
 -cr		/* Link using C conventions */
@@ -19,7 +19,7 @@ MEMORY
 	/* 8 KB PRU Data RAM 1 */
 	PRU1_DMEM_1	: org = 0x00000000 len = 0x00002000	CREGISTER=24
 	/* 8 KB PRU Data RAM 0 */
-	PRU1_DMEM_0	: org = 0x00002000 len = 0x00002000	CREGISTER=25
+	PRU0_DMEM_0	: org = 0x00002000 len = 0x00002000	CREGISTER=25
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/getting_started_labs/c_and_inline_assembly/solution/firmware/am263px-lp/icss_m0_pru0_fw/ti-pru-cgt/example.projectspec b/academy/getting_started_labs/c_and_inline_assembly/solution/firmware/am263px-lp/icss_m0_pru0_fw/ti-pru-cgt/example.projectspec
index ad8aeef0..b418d7fd 100644
--- a/academy/getting_started_labs/c_and_inline_assembly/solution/firmware/am263px-lp/icss_m0_pru0_fw/ti-pru-cgt/example.projectspec
+++ b/academy/getting_started_labs/c_and_inline_assembly/solution/firmware/am263px-lp/icss_m0_pru0_fw/ti-pru-cgt/example.projectspec
@@ -4,7 +4,7 @@
         <when>
             <context
                 deviceFamily="PRU"
-                deviceId="AM263px"
+                deviceId="AM263Px"
             />
         </when>
     </applicability>
@@ -20,7 +20,7 @@
         connection="TIXDS110_Connection.xml"
         toolChain="TI"
         cgtVersion="2.3.3"
-        device="AM263px"
+        device="AM263Px"
         deviceCore="ICSSM_PRU_0"
         ignoreDefaultDeviceSettings="true"
         ignoreDefaultCCSSettings="true"
diff --git a/academy/getting_started_labs/c_and_inline_assembly/solution/firmware/am263px-lp/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd b/academy/getting_started_labs/c_and_inline_assembly/solution/firmware/am263px-lp/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
index 095f9533..45a5a1a8 100644
--- a/academy/getting_started_labs/c_and_inline_assembly/solution/firmware/am263px-lp/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
+++ b/academy/getting_started_labs/c_and_inline_assembly/solution/firmware/am263px-lp/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
@@ -1,8 +1,8 @@
 /*
- * AM263px_PRU0.cmd
+ * AM263Px_PRU0.cmd
  *
  * Example Linker command file for linking programs built with the C compiler
- * on AM263px PRU0 cores
+ * on AM263Px PRU0 cores
  */
 
 -cr		/* Link using C conventions */
@@ -19,7 +19,7 @@ MEMORY
 	/* 8 KB PRU Data RAM 0 */
 	PRU0_DMEM_0	: org = 0x00000000 len = 0x00002000	CREGISTER=24
 	/* 8 KB PRU Data RAM 1 */
-	PRU0_DMEM_1	: org = 0x00002000 len = 0x00002000	CREGISTER=25
+	PRU1_DMEM_1	: org = 0x00002000 len = 0x00002000	CREGISTER=25
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/getting_started_labs/c_and_inline_assembly/solution/firmware/am263px-lp/icss_m0_pru1_fw/ti-pru-cgt/example.projectspec b/academy/getting_started_labs/c_and_inline_assembly/solution/firmware/am263px-lp/icss_m0_pru1_fw/ti-pru-cgt/example.projectspec
index 251b8c01..b6fe4e74 100644
--- a/academy/getting_started_labs/c_and_inline_assembly/solution/firmware/am263px-lp/icss_m0_pru1_fw/ti-pru-cgt/example.projectspec
+++ b/academy/getting_started_labs/c_and_inline_assembly/solution/firmware/am263px-lp/icss_m0_pru1_fw/ti-pru-cgt/example.projectspec
@@ -4,7 +4,7 @@
         <when>
             <context
                 deviceFamily="PRU"
-                deviceId="AM263px"
+                deviceId="AM263Px"
             />
         </when>
     </applicability>
@@ -20,7 +20,7 @@
         connection="TIXDS110_Connection.xml"
         toolChain="TI"
         cgtVersion="2.3.3"
-        device="AM263px"
+        device="AM263Px"
         deviceCore="ICSSM_PRU_1"
         ignoreDefaultDeviceSettings="true"
         ignoreDefaultCCSSettings="true"
diff --git a/academy/getting_started_labs/c_and_inline_assembly/solution/firmware/am263px-lp/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd b/academy/getting_started_labs/c_and_inline_assembly/solution/firmware/am263px-lp/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
index a3b557df..d54a14a7 100644
--- a/academy/getting_started_labs/c_and_inline_assembly/solution/firmware/am263px-lp/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
+++ b/academy/getting_started_labs/c_and_inline_assembly/solution/firmware/am263px-lp/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
@@ -1,8 +1,8 @@
 /*
- * AM263px_PRU1.cmd
+ * AM263Px_PRU1.cmd
  *
  * Example Linker command file for linking programs built with the C compiler
- * on AM263px PRU1 cores
+ * on AM263Px PRU1 cores
  */
 
 -cr		/* Link using C conventions */
@@ -19,7 +19,7 @@ MEMORY
 	/* 8 KB PRU Data RAM 1 */
 	PRU1_DMEM_1	: org = 0x00000000 len = 0x00002000	CREGISTER=24
 	/* 8 KB PRU Data RAM 0 */
-	PRU1_DMEM_0	: org = 0x00002000 len = 0x00002000	CREGISTER=25
+	PRU0_DMEM_0	: org = 0x00002000 len = 0x00002000	CREGISTER=25
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/getting_started_labs/c_and_inline_assembly/solution/firmware/am263x-cc/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd b/academy/getting_started_labs/c_and_inline_assembly/solution/firmware/am263x-cc/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
index 7123a82a..7b3ad22a 100644
--- a/academy/getting_started_labs/c_and_inline_assembly/solution/firmware/am263x-cc/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
+++ b/academy/getting_started_labs/c_and_inline_assembly/solution/firmware/am263x-cc/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
@@ -19,7 +19,7 @@ MEMORY
 	/* 8 KB PRU Data RAM 0 */
 	PRU0_DMEM_0	: org = 0x00000000 len = 0x00002000	CREGISTER=24
 	/* 8 KB PRU Data RAM 1 */
-	PRU0_DMEM_1	: org = 0x00002000 len = 0x00002000	CREGISTER=25
+	PRU1_DMEM_1	: org = 0x00002000 len = 0x00002000	CREGISTER=25
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/getting_started_labs/c_and_inline_assembly/solution/firmware/am263x-cc/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd b/academy/getting_started_labs/c_and_inline_assembly/solution/firmware/am263x-cc/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
index 6e858dc1..4cc82157 100644
--- a/academy/getting_started_labs/c_and_inline_assembly/solution/firmware/am263x-cc/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
+++ b/academy/getting_started_labs/c_and_inline_assembly/solution/firmware/am263x-cc/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
@@ -19,7 +19,7 @@ MEMORY
 	/* 8 KB PRU Data RAM 1 */
 	PRU1_DMEM_1	: org = 0x00000000 len = 0x00002000	CREGISTER=24
 	/* 8 KB PRU Data RAM 0 */
-	PRU1_DMEM_0	: org = 0x00002000 len = 0x00002000	CREGISTER=25
+	PRU0_DMEM_0	: org = 0x00002000 len = 0x00002000	CREGISTER=25
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/getting_started_labs/c_and_inline_assembly/solution/firmware/am263x-lp/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd b/academy/getting_started_labs/c_and_inline_assembly/solution/firmware/am263x-lp/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
index 7123a82a..7b3ad22a 100644
--- a/academy/getting_started_labs/c_and_inline_assembly/solution/firmware/am263x-lp/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
+++ b/academy/getting_started_labs/c_and_inline_assembly/solution/firmware/am263x-lp/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
@@ -19,7 +19,7 @@ MEMORY
 	/* 8 KB PRU Data RAM 0 */
 	PRU0_DMEM_0	: org = 0x00000000 len = 0x00002000	CREGISTER=24
 	/* 8 KB PRU Data RAM 1 */
-	PRU0_DMEM_1	: org = 0x00002000 len = 0x00002000	CREGISTER=25
+	PRU1_DMEM_1	: org = 0x00002000 len = 0x00002000	CREGISTER=25
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/getting_started_labs/c_and_inline_assembly/solution/firmware/am263x-lp/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd b/academy/getting_started_labs/c_and_inline_assembly/solution/firmware/am263x-lp/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
index 6e858dc1..4cc82157 100644
--- a/academy/getting_started_labs/c_and_inline_assembly/solution/firmware/am263x-lp/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
+++ b/academy/getting_started_labs/c_and_inline_assembly/solution/firmware/am263x-lp/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
@@ -19,7 +19,7 @@ MEMORY
 	/* 8 KB PRU Data RAM 1 */
 	PRU1_DMEM_1	: org = 0x00000000 len = 0x00002000	CREGISTER=24
 	/* 8 KB PRU Data RAM 0 */
-	PRU1_DMEM_0	: org = 0x00002000 len = 0x00002000	CREGISTER=25
+	PRU0_DMEM_0	: org = 0x00002000 len = 0x00002000	CREGISTER=25
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/getting_started_labs/c_and_inline_assembly/solution/firmware/am62x-sk/pruss0_pru0_fw/ti-pru-cgt/linker.cmd b/academy/getting_started_labs/c_and_inline_assembly/solution/firmware/am62x-sk/pruss0_pru0_fw/ti-pru-cgt/linker.cmd
index 1782108e..604fdfd9 100644
--- a/academy/getting_started_labs/c_and_inline_assembly/solution/firmware/am62x-sk/pruss0_pru0_fw/ti-pru-cgt/linker.cmd
+++ b/academy/getting_started_labs/c_and_inline_assembly/solution/firmware/am62x-sk/pruss0_pru0_fw/ti-pru-cgt/linker.cmd
@@ -19,7 +19,7 @@ MEMORY
 	/* 8 KB PRU Data RAM 0 */
 	PRU0_DMEM_0	: org = 0x00000000 len = 0x00002000	CREGISTER=24
 	/* 8 KB PRU Data RAM 1 */
-	PRU0_DMEM_1	: org = 0x00002000 len = 0x00002000	CREGISTER=25
+	PRU1_DMEM_1	: org = 0x00002000 len = 0x00002000	CREGISTER=25
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/getting_started_labs/c_and_inline_assembly/solution/firmware/am62x-sk/pruss0_pru1_fw/ti-pru-cgt/linker.cmd b/academy/getting_started_labs/c_and_inline_assembly/solution/firmware/am62x-sk/pruss0_pru1_fw/ti-pru-cgt/linker.cmd
index 9082912c..cbf74e60 100644
--- a/academy/getting_started_labs/c_and_inline_assembly/solution/firmware/am62x-sk/pruss0_pru1_fw/ti-pru-cgt/linker.cmd
+++ b/academy/getting_started_labs/c_and_inline_assembly/solution/firmware/am62x-sk/pruss0_pru1_fw/ti-pru-cgt/linker.cmd
@@ -19,7 +19,7 @@ MEMORY
 	/* 8 KB PRU Data RAM 1 */
 	PRU1_DMEM_1	: org = 0x00000000 len = 0x00002000	CREGISTER=24
 	/* 8 KB PRU Data RAM 0 */
-	PRU1_DMEM_0	: org = 0x00002000 len = 0x00002000	CREGISTER=25
+	PRU0_DMEM_0	: org = 0x00002000 len = 0x00002000	CREGISTER=25
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/getting_started_labs/c_and_inline_assembly/solution/firmware/am64x-evm/icss_g0_pru0_fw/ti-pru-cgt/linker.cmd b/academy/getting_started_labs/c_and_inline_assembly/solution/firmware/am64x-evm/icss_g0_pru0_fw/ti-pru-cgt/linker.cmd
index 7069af79..a39ea737 100644
--- a/academy/getting_started_labs/c_and_inline_assembly/solution/firmware/am64x-evm/icss_g0_pru0_fw/ti-pru-cgt/linker.cmd
+++ b/academy/getting_started_labs/c_and_inline_assembly/solution/firmware/am64x-evm/icss_g0_pru0_fw/ti-pru-cgt/linker.cmd
@@ -21,14 +21,14 @@ MEMORY
 	PRU0_DMEM_0	: org = 0x00000000 len = 0x00001000	CREGISTER=24
 	/* 8 KB PRU Data RAM 1; reserved completely for Slice1 cores - PRU1,
 	 * RTU1 and Tx_PRU1; do not use for any Slice0 cores */
-	PRU0_DMEM_1	: org = 0x00002000 len = 0x00001000	CREGISTER=25
+	PRU1_DMEM_1	: org = 0x00002000 len = 0x00001000	CREGISTER=25
 	/* NOTE: Custom split of the second 4 KB of ICSS Data RAMs 0 and 1
 	 * split equally between the corresponding RTU and Tx_PRU cores in
 	 * each slice */
 	RTU0_DMEM_0	: org = 0x00001000 len = 0x00000800
 	TX_PRU0_DMEM_0	: org = 0x00001800 len = 0x00000800
-	RTU0_DMEM_1	: org = 0x00003000 len = 0x00000800
-	TX_PRU0_DMEM_1	: org = 0x00003800 len = 0x00000800
+	RTU1_DMEM_1	: org = 0x00003000 len = 0x00000800
+	TX_PRU1_DMEM_1	: org = 0x00003800 len = 0x00000800
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/getting_started_labs/c_and_inline_assembly/solution/firmware/am64x-evm/icss_g0_pru1_fw/ti-pru-cgt/linker.cmd b/academy/getting_started_labs/c_and_inline_assembly/solution/firmware/am64x-evm/icss_g0_pru1_fw/ti-pru-cgt/linker.cmd
index 2d0fb831..d2fda1f1 100644
--- a/academy/getting_started_labs/c_and_inline_assembly/solution/firmware/am64x-evm/icss_g0_pru1_fw/ti-pru-cgt/linker.cmd
+++ b/academy/getting_started_labs/c_and_inline_assembly/solution/firmware/am64x-evm/icss_g0_pru1_fw/ti-pru-cgt/linker.cmd
@@ -21,14 +21,14 @@ MEMORY
 	PRU1_DMEM_1	: org = 0x00000000 len = 0x00001000	CREGISTER=24
 	/* 8 KB PRU Data RAM 0; reserved completely for Slice0 cores - PRU0,
 	 * RTU0 and Tx_PRU0; do not use for any Slice1 cores */
-	PRU1_DMEM_0	: org = 0x00002000 len = 0x00001000	CREGISTER=25
+	PRU0_DMEM_0	: org = 0x00002000 len = 0x00001000	CREGISTER=25
 	/* NOTE: Custom split of the second 4 KB of ICSS Data RAMs 0 and 1
 	 * split equally between the corresponding RTU and Tx_PRU cores in
 	 * each slice */
 	RTU1_DMEM_1	: org = 0x00001000 len = 0x00000800
 	TX_PRU1_DMEM_1	: org = 0x00001800 len = 0x00000800
-	RTU1_DMEM_0	: org = 0x00003000 len = 0x00000800
-	TX_PRU1_DMEM_0	: org = 0x00003800 len = 0x00000800
+	RTU0_DMEM_0	: org = 0x00003000 len = 0x00000800
+	TX_PRU0_DMEM_0	: org = 0x00003800 len = 0x00000800
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/getting_started_labs/c_and_inline_assembly/solution/firmware/am64x-evm/icss_g0_rtu_pru0_fw/ti-pru-cgt/linker.cmd b/academy/getting_started_labs/c_and_inline_assembly/solution/firmware/am64x-evm/icss_g0_rtu_pru0_fw/ti-pru-cgt/linker.cmd
index 3704b635..ea7d05f7 100644
--- a/academy/getting_started_labs/c_and_inline_assembly/solution/firmware/am64x-evm/icss_g0_rtu_pru0_fw/ti-pru-cgt/linker.cmd
+++ b/academy/getting_started_labs/c_and_inline_assembly/solution/firmware/am64x-evm/icss_g0_rtu_pru0_fw/ti-pru-cgt/linker.cmd
@@ -21,14 +21,14 @@ MEMORY
 	PRU0_DMEM_0	: org = 0x00000000 len = 0x00001000	CREGISTER=24
 	/* 8 KB PRU Data RAM 1; reserved completely for Slice1 cores - PRU1,
 	 * RTU1 and Tx_PRU1; do not use for any Slice0 cores */
-	PRU0_DMEM_1	: org = 0x00002000 len = 0x00001000	CREGISTER=25
+	PRU1_DMEM_1	: org = 0x00002000 len = 0x00001000	CREGISTER=25
 	/* NOTE: Custom split of the second 4 KB of ICSS Data RAMs 0 and 1
 	 * split equally between the corresponding RTU and Tx_PRU cores in
 	 * each slice */
 	RTU0_DMEM_0	: org = 0x00001000 len = 0x00000800
 	TX_PRU0_DMEM_0	: org = 0x00001800 len = 0x00000800
-	RTU0_DMEM_1	: org = 0x00003000 len = 0x00000800
-	TX_PRU0_DMEM_1	: org = 0x00003800 len = 0x00000800
+	RTU1_DMEM_1	: org = 0x00003000 len = 0x00000800
+	TX_PRU1_DMEM_1	: org = 0x00003800 len = 0x00000800
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/getting_started_labs/c_and_inline_assembly/solution/firmware/am64x-evm/icss_g0_rtu_pru1_fw/ti-pru-cgt/linker.cmd b/academy/getting_started_labs/c_and_inline_assembly/solution/firmware/am64x-evm/icss_g0_rtu_pru1_fw/ti-pru-cgt/linker.cmd
index e9bad7fd..3758b8a5 100644
--- a/academy/getting_started_labs/c_and_inline_assembly/solution/firmware/am64x-evm/icss_g0_rtu_pru1_fw/ti-pru-cgt/linker.cmd
+++ b/academy/getting_started_labs/c_and_inline_assembly/solution/firmware/am64x-evm/icss_g0_rtu_pru1_fw/ti-pru-cgt/linker.cmd
@@ -21,14 +21,14 @@ MEMORY
 	PRU1_DMEM_1	: org = 0x00000000 len = 0x00001000	CREGISTER=24
 	/* 8 KB PRU Data RAM 0; reserved completely for Slice0 cores - PRU0,
 	 * RTU0 and Tx_PRU0; do not use for any Slice1 cores */
-	PRU1_DMEM_0	: org = 0x00002000 len = 0x00001000	CREGISTER=25
+	PRU0_DMEM_0	: org = 0x00002000 len = 0x00001000	CREGISTER=25
 	/* NOTE: Custom split of the second 4 KB of ICSS Data RAMs 0 and 1
 	 * split equally between the corresponding RTU and Tx_PRU cores in
 	 * each slice */
 	RTU1_DMEM_1	: org = 0x00001000 len = 0x00000800
 	TX_PRU1_DMEM_1	: org = 0x00001800 len = 0x00000800
-	RTU1_DMEM_0	: org = 0x00003000 len = 0x00000800
-	TX_PRU1_DMEM_0	: org = 0x00003800 len = 0x00000800
+	RTU0_DMEM_0	: org = 0x00003000 len = 0x00000800
+	TX_PRU0_DMEM_0	: org = 0x00003800 len = 0x00000800
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/getting_started_labs/c_and_inline_assembly/solution/firmware/am64x-evm/icss_g0_tx_pru0_fw/ti-pru-cgt/linker.cmd b/academy/getting_started_labs/c_and_inline_assembly/solution/firmware/am64x-evm/icss_g0_tx_pru0_fw/ti-pru-cgt/linker.cmd
index 348a51c4..61ec26c5 100644
--- a/academy/getting_started_labs/c_and_inline_assembly/solution/firmware/am64x-evm/icss_g0_tx_pru0_fw/ti-pru-cgt/linker.cmd
+++ b/academy/getting_started_labs/c_and_inline_assembly/solution/firmware/am64x-evm/icss_g0_tx_pru0_fw/ti-pru-cgt/linker.cmd
@@ -21,14 +21,14 @@ MEMORY
 	PRU0_DMEM_0	: org = 0x00000000 len = 0x00001000	CREGISTER=24
 	/* 8 KB PRU Data RAM 1; reserved completely for Slice1 cores - PRU1,
 	 * RTU1 and Tx_PRU1; do not use for any Slice0 cores */
-	PRU0_DMEM_1	: org = 0x00002000 len = 0x00001000	CREGISTER=25
+	PRU1_DMEM_1	: org = 0x00002000 len = 0x00001000	CREGISTER=25
 	/* NOTE: Custom split of the second 4 KB of ICSS Data RAMs 0 and 1
 	 * split equally between the corresponding RTU and Tx_PRU cores in
 	 * each slice */
 	RTU0_DMEM_0	: org = 0x00001000 len = 0x00000800
 	TX_PRU0_DMEM_0	: org = 0x00001800 len = 0x00000800
-	RTU0_DMEM_1	: org = 0x00003000 len = 0x00000800
-	TX_PRU0_DMEM_1	: org = 0x00003800 len = 0x00000800
+	RTU1_DMEM_1	: org = 0x00003000 len = 0x00000800
+	TX_PRU1_DMEM_1	: org = 0x00003800 len = 0x00000800
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/getting_started_labs/c_and_inline_assembly/solution/firmware/am64x-evm/icss_g0_tx_pru1_fw/ti-pru-cgt/linker.cmd b/academy/getting_started_labs/c_and_inline_assembly/solution/firmware/am64x-evm/icss_g0_tx_pru1_fw/ti-pru-cgt/linker.cmd
index e75fb708..c230bfae 100644
--- a/academy/getting_started_labs/c_and_inline_assembly/solution/firmware/am64x-evm/icss_g0_tx_pru1_fw/ti-pru-cgt/linker.cmd
+++ b/academy/getting_started_labs/c_and_inline_assembly/solution/firmware/am64x-evm/icss_g0_tx_pru1_fw/ti-pru-cgt/linker.cmd
@@ -21,14 +21,14 @@ MEMORY
 	PRU1_DMEM_1	: org = 0x00000000 len = 0x00001000	CREGISTER=24
 	/* 8 KB PRU Data RAM 0; reserved completely for Slice0 cores - PRU0,
 	 * RTU0 and Tx_PRU0; do not use for any Slice1 cores */
-	PRU1_DMEM_0	: org = 0x00002000 len = 0x00001000	CREGISTER=25
+	PRU0_DMEM_0	: org = 0x00002000 len = 0x00001000	CREGISTER=25
 	/* NOTE: Custom split of the second 4 KB of ICSS Data RAMs 0 and 1
 	 * split equally between the corresponding RTU and Tx_PRU cores in
 	 * each slice */
 	RTU1_DMEM_1	: org = 0x00001000 len = 0x00000800
 	TX_PRU1_DMEM_1	: org = 0x00001800 len = 0x00000800
-	RTU1_DMEM_0	: org = 0x00003000 len = 0x00000800
-	TX_PRU1_DMEM_0	: org = 0x00003800 len = 0x00000800
+	RTU0_DMEM_0	: org = 0x00003000 len = 0x00000800
+	TX_PRU0_DMEM_0	: org = 0x00003800 len = 0x00000800
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/getting_started_labs/c_code/solution/firmware/am243x-evm/icss_g0_pru0_fw/ti-pru-cgt/linker.cmd b/academy/getting_started_labs/c_code/solution/firmware/am243x-evm/icss_g0_pru0_fw/ti-pru-cgt/linker.cmd
index a69842cd..389d0cbd 100644
--- a/academy/getting_started_labs/c_code/solution/firmware/am243x-evm/icss_g0_pru0_fw/ti-pru-cgt/linker.cmd
+++ b/academy/getting_started_labs/c_code/solution/firmware/am243x-evm/icss_g0_pru0_fw/ti-pru-cgt/linker.cmd
@@ -21,14 +21,14 @@ MEMORY
 	PRU0_DMEM_0	: org = 0x00000000 len = 0x00001000	CREGISTER=24
 	/* 8 KB PRU Data RAM 1; reserved completely for Slice1 cores - PRU1,
 	 * RTU1 and Tx_PRU1; do not use for any Slice0 cores */
-	PRU0_DMEM_1	: org = 0x00002000 len = 0x00001000	CREGISTER=25
+	PRU1_DMEM_1	: org = 0x00002000 len = 0x00001000	CREGISTER=25
 	/* NOTE: Custom split of the second 4 KB of ICSS Data RAMs 0 and 1
 	 * split equally between the corresponding RTU and Tx_PRU cores in
 	 * each slice */
 	RTU0_DMEM_0	: org = 0x00001000 len = 0x00000800
 	TX_PRU0_DMEM_0	: org = 0x00001800 len = 0x00000800
-	RTU0_DMEM_1	: org = 0x00003000 len = 0x00000800
-	TX_PRU0_DMEM_1	: org = 0x00003800 len = 0x00000800
+	RTU1_DMEM_1	: org = 0x00003000 len = 0x00000800
+	TX_PRU1_DMEM_1	: org = 0x00003800 len = 0x00000800
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/getting_started_labs/c_code/solution/firmware/am243x-evm/icss_g0_pru1_fw/ti-pru-cgt/linker.cmd b/academy/getting_started_labs/c_code/solution/firmware/am243x-evm/icss_g0_pru1_fw/ti-pru-cgt/linker.cmd
index 440057a7..85522291 100644
--- a/academy/getting_started_labs/c_code/solution/firmware/am243x-evm/icss_g0_pru1_fw/ti-pru-cgt/linker.cmd
+++ b/academy/getting_started_labs/c_code/solution/firmware/am243x-evm/icss_g0_pru1_fw/ti-pru-cgt/linker.cmd
@@ -21,14 +21,14 @@ MEMORY
 	PRU1_DMEM_1	: org = 0x00000000 len = 0x00001000	CREGISTER=24
 	/* 8 KB PRU Data RAM 0; reserved completely for Slice0 cores - PRU0,
 	 * RTU0 and Tx_PRU0; do not use for any Slice1 cores */
-	PRU1_DMEM_0	: org = 0x00002000 len = 0x00001000	CREGISTER=25
+	PRU0_DMEM_0	: org = 0x00002000 len = 0x00001000	CREGISTER=25
 	/* NOTE: Custom split of the second 4 KB of ICSS Data RAMs 0 and 1
 	 * split equally between the corresponding RTU and Tx_PRU cores in
 	 * each slice */
 	RTU1_DMEM_1	: org = 0x00001000 len = 0x00000800
 	TX_PRU1_DMEM_1	: org = 0x00001800 len = 0x00000800
-	RTU1_DMEM_0	: org = 0x00003000 len = 0x00000800
-	TX_PRU1_DMEM_0	: org = 0x00003800 len = 0x00000800
+	RTU0_DMEM_0	: org = 0x00003000 len = 0x00000800
+	TX_PRU0_DMEM_0	: org = 0x00003800 len = 0x00000800
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/getting_started_labs/c_code/solution/firmware/am243x-evm/icss_g0_rtu_pru0_fw/ti-pru-cgt/linker.cmd b/academy/getting_started_labs/c_code/solution/firmware/am243x-evm/icss_g0_rtu_pru0_fw/ti-pru-cgt/linker.cmd
index 64ab61bc..54cedd3c 100644
--- a/academy/getting_started_labs/c_code/solution/firmware/am243x-evm/icss_g0_rtu_pru0_fw/ti-pru-cgt/linker.cmd
+++ b/academy/getting_started_labs/c_code/solution/firmware/am243x-evm/icss_g0_rtu_pru0_fw/ti-pru-cgt/linker.cmd
@@ -21,14 +21,14 @@ MEMORY
 	PRU0_DMEM_0	: org = 0x00000000 len = 0x00001000	CREGISTER=24
 	/* 8 KB PRU Data RAM 1; reserved completely for Slice1 cores - PRU1,
 	 * RTU1 and Tx_PRU1; do not use for any Slice0 cores */
-	PRU0_DMEM_1	: org = 0x00002000 len = 0x00001000	CREGISTER=25
+	PRU1_DMEM_1	: org = 0x00002000 len = 0x00001000	CREGISTER=25
 	/* NOTE: Custom split of the second 4 KB of ICSS Data RAMs 0 and 1
 	 * split equally between the corresponding RTU and Tx_PRU cores in
 	 * each slice */
 	RTU0_DMEM_0	: org = 0x00001000 len = 0x00000800
 	TX_PRU0_DMEM_0	: org = 0x00001800 len = 0x00000800
-	RTU0_DMEM_1	: org = 0x00003000 len = 0x00000800
-	TX_PRU0_DMEM_1	: org = 0x00003800 len = 0x00000800
+	RTU1_DMEM_1	: org = 0x00003000 len = 0x00000800
+	TX_PRU1_DMEM_1	: org = 0x00003800 len = 0x00000800
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/getting_started_labs/c_code/solution/firmware/am243x-evm/icss_g0_rtu_pru1_fw/ti-pru-cgt/linker.cmd b/academy/getting_started_labs/c_code/solution/firmware/am243x-evm/icss_g0_rtu_pru1_fw/ti-pru-cgt/linker.cmd
index 14fd35a8..4cfd083e 100644
--- a/academy/getting_started_labs/c_code/solution/firmware/am243x-evm/icss_g0_rtu_pru1_fw/ti-pru-cgt/linker.cmd
+++ b/academy/getting_started_labs/c_code/solution/firmware/am243x-evm/icss_g0_rtu_pru1_fw/ti-pru-cgt/linker.cmd
@@ -21,14 +21,14 @@ MEMORY
 	PRU1_DMEM_1	: org = 0x00000000 len = 0x00001000	CREGISTER=24
 	/* 8 KB PRU Data RAM 0; reserved completely for Slice0 cores - PRU0,
 	 * RTU0 and Tx_PRU0; do not use for any Slice1 cores */
-	PRU1_DMEM_0	: org = 0x00002000 len = 0x00001000	CREGISTER=25
+	PRU0_DMEM_0	: org = 0x00002000 len = 0x00001000	CREGISTER=25
 	/* NOTE: Custom split of the second 4 KB of ICSS Data RAMs 0 and 1
 	 * split equally between the corresponding RTU and Tx_PRU cores in
 	 * each slice */
 	RTU1_DMEM_1	: org = 0x00001000 len = 0x00000800
 	TX_PRU1_DMEM_1	: org = 0x00001800 len = 0x00000800
-	RTU1_DMEM_0	: org = 0x00003000 len = 0x00000800
-	TX_PRU1_DMEM_0	: org = 0x00003800 len = 0x00000800
+	RTU0_DMEM_0	: org = 0x00003000 len = 0x00000800
+	TX_PRU0_DMEM_0	: org = 0x00003800 len = 0x00000800
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/getting_started_labs/c_code/solution/firmware/am243x-evm/icss_g0_tx_pru0_fw/ti-pru-cgt/linker.cmd b/academy/getting_started_labs/c_code/solution/firmware/am243x-evm/icss_g0_tx_pru0_fw/ti-pru-cgt/linker.cmd
index 16ea3376..853c81f6 100644
--- a/academy/getting_started_labs/c_code/solution/firmware/am243x-evm/icss_g0_tx_pru0_fw/ti-pru-cgt/linker.cmd
+++ b/academy/getting_started_labs/c_code/solution/firmware/am243x-evm/icss_g0_tx_pru0_fw/ti-pru-cgt/linker.cmd
@@ -21,14 +21,14 @@ MEMORY
 	PRU0_DMEM_0	: org = 0x00000000 len = 0x00001000	CREGISTER=24
 	/* 8 KB PRU Data RAM 1; reserved completely for Slice1 cores - PRU1,
 	 * RTU1 and Tx_PRU1; do not use for any Slice0 cores */
-	PRU0_DMEM_1	: org = 0x00002000 len = 0x00001000	CREGISTER=25
+	PRU1_DMEM_1	: org = 0x00002000 len = 0x00001000	CREGISTER=25
 	/* NOTE: Custom split of the second 4 KB of ICSS Data RAMs 0 and 1
 	 * split equally between the corresponding RTU and Tx_PRU cores in
 	 * each slice */
 	RTU0_DMEM_0	: org = 0x00001000 len = 0x00000800
 	TX_PRU0_DMEM_0	: org = 0x00001800 len = 0x00000800
-	RTU0_DMEM_1	: org = 0x00003000 len = 0x00000800
-	TX_PRU0_DMEM_1	: org = 0x00003800 len = 0x00000800
+	RTU1_DMEM_1	: org = 0x00003000 len = 0x00000800
+	TX_PRU1_DMEM_1	: org = 0x00003800 len = 0x00000800
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/getting_started_labs/c_code/solution/firmware/am243x-evm/icss_g0_tx_pru1_fw/ti-pru-cgt/linker.cmd b/academy/getting_started_labs/c_code/solution/firmware/am243x-evm/icss_g0_tx_pru1_fw/ti-pru-cgt/linker.cmd
index 709dde47..2547a2ba 100644
--- a/academy/getting_started_labs/c_code/solution/firmware/am243x-evm/icss_g0_tx_pru1_fw/ti-pru-cgt/linker.cmd
+++ b/academy/getting_started_labs/c_code/solution/firmware/am243x-evm/icss_g0_tx_pru1_fw/ti-pru-cgt/linker.cmd
@@ -21,14 +21,14 @@ MEMORY
 	PRU1_DMEM_1	: org = 0x00000000 len = 0x00001000	CREGISTER=24
 	/* 8 KB PRU Data RAM 0; reserved completely for Slice0 cores - PRU0,
 	 * RTU0 and Tx_PRU0; do not use for any Slice1 cores */
-	PRU1_DMEM_0	: org = 0x00002000 len = 0x00001000	CREGISTER=25
+	PRU0_DMEM_0	: org = 0x00002000 len = 0x00001000	CREGISTER=25
 	/* NOTE: Custom split of the second 4 KB of ICSS Data RAMs 0 and 1
 	 * split equally between the corresponding RTU and Tx_PRU cores in
 	 * each slice */
 	RTU1_DMEM_1	: org = 0x00001000 len = 0x00000800
 	TX_PRU1_DMEM_1	: org = 0x00001800 len = 0x00000800
-	RTU1_DMEM_0	: org = 0x00003000 len = 0x00000800
-	TX_PRU1_DMEM_0	: org = 0x00003800 len = 0x00000800
+	RTU0_DMEM_0	: org = 0x00003000 len = 0x00000800
+	TX_PRU0_DMEM_0	: org = 0x00003800 len = 0x00000800
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/getting_started_labs/c_code/solution/firmware/am243x-lp/icss_g0_pru0_fw/ti-pru-cgt/linker.cmd b/academy/getting_started_labs/c_code/solution/firmware/am243x-lp/icss_g0_pru0_fw/ti-pru-cgt/linker.cmd
index a69842cd..389d0cbd 100644
--- a/academy/getting_started_labs/c_code/solution/firmware/am243x-lp/icss_g0_pru0_fw/ti-pru-cgt/linker.cmd
+++ b/academy/getting_started_labs/c_code/solution/firmware/am243x-lp/icss_g0_pru0_fw/ti-pru-cgt/linker.cmd
@@ -21,14 +21,14 @@ MEMORY
 	PRU0_DMEM_0	: org = 0x00000000 len = 0x00001000	CREGISTER=24
 	/* 8 KB PRU Data RAM 1; reserved completely for Slice1 cores - PRU1,
 	 * RTU1 and Tx_PRU1; do not use for any Slice0 cores */
-	PRU0_DMEM_1	: org = 0x00002000 len = 0x00001000	CREGISTER=25
+	PRU1_DMEM_1	: org = 0x00002000 len = 0x00001000	CREGISTER=25
 	/* NOTE: Custom split of the second 4 KB of ICSS Data RAMs 0 and 1
 	 * split equally between the corresponding RTU and Tx_PRU cores in
 	 * each slice */
 	RTU0_DMEM_0	: org = 0x00001000 len = 0x00000800
 	TX_PRU0_DMEM_0	: org = 0x00001800 len = 0x00000800
-	RTU0_DMEM_1	: org = 0x00003000 len = 0x00000800
-	TX_PRU0_DMEM_1	: org = 0x00003800 len = 0x00000800
+	RTU1_DMEM_1	: org = 0x00003000 len = 0x00000800
+	TX_PRU1_DMEM_1	: org = 0x00003800 len = 0x00000800
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/getting_started_labs/c_code/solution/firmware/am243x-lp/icss_g0_pru1_fw/ti-pru-cgt/linker.cmd b/academy/getting_started_labs/c_code/solution/firmware/am243x-lp/icss_g0_pru1_fw/ti-pru-cgt/linker.cmd
index 440057a7..85522291 100644
--- a/academy/getting_started_labs/c_code/solution/firmware/am243x-lp/icss_g0_pru1_fw/ti-pru-cgt/linker.cmd
+++ b/academy/getting_started_labs/c_code/solution/firmware/am243x-lp/icss_g0_pru1_fw/ti-pru-cgt/linker.cmd
@@ -21,14 +21,14 @@ MEMORY
 	PRU1_DMEM_1	: org = 0x00000000 len = 0x00001000	CREGISTER=24
 	/* 8 KB PRU Data RAM 0; reserved completely for Slice0 cores - PRU0,
 	 * RTU0 and Tx_PRU0; do not use for any Slice1 cores */
-	PRU1_DMEM_0	: org = 0x00002000 len = 0x00001000	CREGISTER=25
+	PRU0_DMEM_0	: org = 0x00002000 len = 0x00001000	CREGISTER=25
 	/* NOTE: Custom split of the second 4 KB of ICSS Data RAMs 0 and 1
 	 * split equally between the corresponding RTU and Tx_PRU cores in
 	 * each slice */
 	RTU1_DMEM_1	: org = 0x00001000 len = 0x00000800
 	TX_PRU1_DMEM_1	: org = 0x00001800 len = 0x00000800
-	RTU1_DMEM_0	: org = 0x00003000 len = 0x00000800
-	TX_PRU1_DMEM_0	: org = 0x00003800 len = 0x00000800
+	RTU0_DMEM_0	: org = 0x00003000 len = 0x00000800
+	TX_PRU0_DMEM_0	: org = 0x00003800 len = 0x00000800
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/getting_started_labs/c_code/solution/firmware/am243x-lp/icss_g0_rtu_pru0_fw/ti-pru-cgt/linker.cmd b/academy/getting_started_labs/c_code/solution/firmware/am243x-lp/icss_g0_rtu_pru0_fw/ti-pru-cgt/linker.cmd
index 64ab61bc..54cedd3c 100644
--- a/academy/getting_started_labs/c_code/solution/firmware/am243x-lp/icss_g0_rtu_pru0_fw/ti-pru-cgt/linker.cmd
+++ b/academy/getting_started_labs/c_code/solution/firmware/am243x-lp/icss_g0_rtu_pru0_fw/ti-pru-cgt/linker.cmd
@@ -21,14 +21,14 @@ MEMORY
 	PRU0_DMEM_0	: org = 0x00000000 len = 0x00001000	CREGISTER=24
 	/* 8 KB PRU Data RAM 1; reserved completely for Slice1 cores - PRU1,
 	 * RTU1 and Tx_PRU1; do not use for any Slice0 cores */
-	PRU0_DMEM_1	: org = 0x00002000 len = 0x00001000	CREGISTER=25
+	PRU1_DMEM_1	: org = 0x00002000 len = 0x00001000	CREGISTER=25
 	/* NOTE: Custom split of the second 4 KB of ICSS Data RAMs 0 and 1
 	 * split equally between the corresponding RTU and Tx_PRU cores in
 	 * each slice */
 	RTU0_DMEM_0	: org = 0x00001000 len = 0x00000800
 	TX_PRU0_DMEM_0	: org = 0x00001800 len = 0x00000800
-	RTU0_DMEM_1	: org = 0x00003000 len = 0x00000800
-	TX_PRU0_DMEM_1	: org = 0x00003800 len = 0x00000800
+	RTU1_DMEM_1	: org = 0x00003000 len = 0x00000800
+	TX_PRU1_DMEM_1	: org = 0x00003800 len = 0x00000800
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/getting_started_labs/c_code/solution/firmware/am243x-lp/icss_g0_rtu_pru1_fw/ti-pru-cgt/linker.cmd b/academy/getting_started_labs/c_code/solution/firmware/am243x-lp/icss_g0_rtu_pru1_fw/ti-pru-cgt/linker.cmd
index 14fd35a8..4cfd083e 100644
--- a/academy/getting_started_labs/c_code/solution/firmware/am243x-lp/icss_g0_rtu_pru1_fw/ti-pru-cgt/linker.cmd
+++ b/academy/getting_started_labs/c_code/solution/firmware/am243x-lp/icss_g0_rtu_pru1_fw/ti-pru-cgt/linker.cmd
@@ -21,14 +21,14 @@ MEMORY
 	PRU1_DMEM_1	: org = 0x00000000 len = 0x00001000	CREGISTER=24
 	/* 8 KB PRU Data RAM 0; reserved completely for Slice0 cores - PRU0,
 	 * RTU0 and Tx_PRU0; do not use for any Slice1 cores */
-	PRU1_DMEM_0	: org = 0x00002000 len = 0x00001000	CREGISTER=25
+	PRU0_DMEM_0	: org = 0x00002000 len = 0x00001000	CREGISTER=25
 	/* NOTE: Custom split of the second 4 KB of ICSS Data RAMs 0 and 1
 	 * split equally between the corresponding RTU and Tx_PRU cores in
 	 * each slice */
 	RTU1_DMEM_1	: org = 0x00001000 len = 0x00000800
 	TX_PRU1_DMEM_1	: org = 0x00001800 len = 0x00000800
-	RTU1_DMEM_0	: org = 0x00003000 len = 0x00000800
-	TX_PRU1_DMEM_0	: org = 0x00003800 len = 0x00000800
+	RTU0_DMEM_0	: org = 0x00003000 len = 0x00000800
+	TX_PRU0_DMEM_0	: org = 0x00003800 len = 0x00000800
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/getting_started_labs/c_code/solution/firmware/am243x-lp/icss_g0_tx_pru0_fw/ti-pru-cgt/linker.cmd b/academy/getting_started_labs/c_code/solution/firmware/am243x-lp/icss_g0_tx_pru0_fw/ti-pru-cgt/linker.cmd
index 16ea3376..853c81f6 100644
--- a/academy/getting_started_labs/c_code/solution/firmware/am243x-lp/icss_g0_tx_pru0_fw/ti-pru-cgt/linker.cmd
+++ b/academy/getting_started_labs/c_code/solution/firmware/am243x-lp/icss_g0_tx_pru0_fw/ti-pru-cgt/linker.cmd
@@ -21,14 +21,14 @@ MEMORY
 	PRU0_DMEM_0	: org = 0x00000000 len = 0x00001000	CREGISTER=24
 	/* 8 KB PRU Data RAM 1; reserved completely for Slice1 cores - PRU1,
 	 * RTU1 and Tx_PRU1; do not use for any Slice0 cores */
-	PRU0_DMEM_1	: org = 0x00002000 len = 0x00001000	CREGISTER=25
+	PRU1_DMEM_1	: org = 0x00002000 len = 0x00001000	CREGISTER=25
 	/* NOTE: Custom split of the second 4 KB of ICSS Data RAMs 0 and 1
 	 * split equally between the corresponding RTU and Tx_PRU cores in
 	 * each slice */
 	RTU0_DMEM_0	: org = 0x00001000 len = 0x00000800
 	TX_PRU0_DMEM_0	: org = 0x00001800 len = 0x00000800
-	RTU0_DMEM_1	: org = 0x00003000 len = 0x00000800
-	TX_PRU0_DMEM_1	: org = 0x00003800 len = 0x00000800
+	RTU1_DMEM_1	: org = 0x00003000 len = 0x00000800
+	TX_PRU1_DMEM_1	: org = 0x00003800 len = 0x00000800
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/getting_started_labs/c_code/solution/firmware/am243x-lp/icss_g0_tx_pru1_fw/ti-pru-cgt/linker.cmd b/academy/getting_started_labs/c_code/solution/firmware/am243x-lp/icss_g0_tx_pru1_fw/ti-pru-cgt/linker.cmd
index 709dde47..2547a2ba 100644
--- a/academy/getting_started_labs/c_code/solution/firmware/am243x-lp/icss_g0_tx_pru1_fw/ti-pru-cgt/linker.cmd
+++ b/academy/getting_started_labs/c_code/solution/firmware/am243x-lp/icss_g0_tx_pru1_fw/ti-pru-cgt/linker.cmd
@@ -21,14 +21,14 @@ MEMORY
 	PRU1_DMEM_1	: org = 0x00000000 len = 0x00001000	CREGISTER=24
 	/* 8 KB PRU Data RAM 0; reserved completely for Slice0 cores - PRU0,
 	 * RTU0 and Tx_PRU0; do not use for any Slice1 cores */
-	PRU1_DMEM_0	: org = 0x00002000 len = 0x00001000	CREGISTER=25
+	PRU0_DMEM_0	: org = 0x00002000 len = 0x00001000	CREGISTER=25
 	/* NOTE: Custom split of the second 4 KB of ICSS Data RAMs 0 and 1
 	 * split equally between the corresponding RTU and Tx_PRU cores in
 	 * each slice */
 	RTU1_DMEM_1	: org = 0x00001000 len = 0x00000800
 	TX_PRU1_DMEM_1	: org = 0x00001800 len = 0x00000800
-	RTU1_DMEM_0	: org = 0x00003000 len = 0x00000800
-	TX_PRU1_DMEM_0	: org = 0x00003800 len = 0x00000800
+	RTU0_DMEM_0	: org = 0x00003000 len = 0x00000800
+	TX_PRU0_DMEM_0	: org = 0x00003800 len = 0x00000800
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/getting_started_labs/c_code/solution/firmware/am261x-lp/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd b/academy/getting_started_labs/c_code/solution/firmware/am261x-lp/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
index b40a3e09..93ae6753 100644
--- a/academy/getting_started_labs/c_code/solution/firmware/am261x-lp/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
+++ b/academy/getting_started_labs/c_code/solution/firmware/am261x-lp/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
@@ -19,7 +19,7 @@ MEMORY
 	/* 8 KB PRU Data RAM 0 */
 	PRU0_DMEM_0	: org = 0x00000000 len = 0x00002000	CREGISTER=24
 	/* 8 KB PRU Data RAM 1 */
-	PRU0_DMEM_1	: org = 0x00002000 len = 0x00002000	CREGISTER=25
+	PRU1_DMEM_1	: org = 0x00002000 len = 0x00002000	CREGISTER=25
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/getting_started_labs/c_code/solution/firmware/am261x-lp/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd b/academy/getting_started_labs/c_code/solution/firmware/am261x-lp/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
index cf883948..afb88a78 100644
--- a/academy/getting_started_labs/c_code/solution/firmware/am261x-lp/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
+++ b/academy/getting_started_labs/c_code/solution/firmware/am261x-lp/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
@@ -19,7 +19,7 @@ MEMORY
 	/* 8 KB PRU Data RAM 1 */
 	PRU1_DMEM_1	: org = 0x00000000 len = 0x00002000	CREGISTER=24
 	/* 8 KB PRU Data RAM 0 */
-	PRU1_DMEM_0	: org = 0x00002000 len = 0x00002000	CREGISTER=25
+	PRU0_DMEM_0	: org = 0x00002000 len = 0x00002000	CREGISTER=25
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/getting_started_labs/c_code/solution/firmware/am261x-som/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd b/academy/getting_started_labs/c_code/solution/firmware/am261x-som/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
index b40a3e09..93ae6753 100644
--- a/academy/getting_started_labs/c_code/solution/firmware/am261x-som/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
+++ b/academy/getting_started_labs/c_code/solution/firmware/am261x-som/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
@@ -19,7 +19,7 @@ MEMORY
 	/* 8 KB PRU Data RAM 0 */
 	PRU0_DMEM_0	: org = 0x00000000 len = 0x00002000	CREGISTER=24
 	/* 8 KB PRU Data RAM 1 */
-	PRU0_DMEM_1	: org = 0x00002000 len = 0x00002000	CREGISTER=25
+	PRU1_DMEM_1	: org = 0x00002000 len = 0x00002000	CREGISTER=25
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/getting_started_labs/c_code/solution/firmware/am261x-som/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd b/academy/getting_started_labs/c_code/solution/firmware/am261x-som/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
index cf883948..afb88a78 100644
--- a/academy/getting_started_labs/c_code/solution/firmware/am261x-som/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
+++ b/academy/getting_started_labs/c_code/solution/firmware/am261x-som/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
@@ -19,7 +19,7 @@ MEMORY
 	/* 8 KB PRU Data RAM 1 */
 	PRU1_DMEM_1	: org = 0x00000000 len = 0x00002000	CREGISTER=24
 	/* 8 KB PRU Data RAM 0 */
-	PRU1_DMEM_0	: org = 0x00002000 len = 0x00002000	CREGISTER=25
+	PRU0_DMEM_0	: org = 0x00002000 len = 0x00002000	CREGISTER=25
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/getting_started_labs/c_code/solution/firmware/am263px-cc/icss_m0_pru0_fw/ti-pru-cgt/example.projectspec b/academy/getting_started_labs/c_code/solution/firmware/am263px-cc/icss_m0_pru0_fw/ti-pru-cgt/example.projectspec
index 63651330..d9a3d8f8 100644
--- a/academy/getting_started_labs/c_code/solution/firmware/am263px-cc/icss_m0_pru0_fw/ti-pru-cgt/example.projectspec
+++ b/academy/getting_started_labs/c_code/solution/firmware/am263px-cc/icss_m0_pru0_fw/ti-pru-cgt/example.projectspec
@@ -4,7 +4,7 @@
         <when>
             <context
                 deviceFamily="PRU"
-                deviceId="AM263px"
+                deviceId="AM263Px"
             />
         </when>
     </applicability>
@@ -20,7 +20,7 @@
         connection="TIXDS110_Connection.xml"
         toolChain="TI"
         cgtVersion="2.3.3"
-        device="AM263px"
+        device="AM263Px"
         deviceCore="ICSSM_PRU_0"
         ignoreDefaultDeviceSettings="true"
         ignoreDefaultCCSSettings="true"
diff --git a/academy/getting_started_labs/c_code/solution/firmware/am263px-cc/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd b/academy/getting_started_labs/c_code/solution/firmware/am263px-cc/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
index 095f9533..45a5a1a8 100644
--- a/academy/getting_started_labs/c_code/solution/firmware/am263px-cc/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
+++ b/academy/getting_started_labs/c_code/solution/firmware/am263px-cc/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
@@ -1,8 +1,8 @@
 /*
- * AM263px_PRU0.cmd
+ * AM263Px_PRU0.cmd
  *
  * Example Linker command file for linking programs built with the C compiler
- * on AM263px PRU0 cores
+ * on AM263Px PRU0 cores
  */
 
 -cr		/* Link using C conventions */
@@ -19,7 +19,7 @@ MEMORY
 	/* 8 KB PRU Data RAM 0 */
 	PRU0_DMEM_0	: org = 0x00000000 len = 0x00002000	CREGISTER=24
 	/* 8 KB PRU Data RAM 1 */
-	PRU0_DMEM_1	: org = 0x00002000 len = 0x00002000	CREGISTER=25
+	PRU1_DMEM_1	: org = 0x00002000 len = 0x00002000	CREGISTER=25
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/getting_started_labs/c_code/solution/firmware/am263px-cc/icss_m0_pru1_fw/ti-pru-cgt/example.projectspec b/academy/getting_started_labs/c_code/solution/firmware/am263px-cc/icss_m0_pru1_fw/ti-pru-cgt/example.projectspec
index 3025ba31..939d7f77 100644
--- a/academy/getting_started_labs/c_code/solution/firmware/am263px-cc/icss_m0_pru1_fw/ti-pru-cgt/example.projectspec
+++ b/academy/getting_started_labs/c_code/solution/firmware/am263px-cc/icss_m0_pru1_fw/ti-pru-cgt/example.projectspec
@@ -4,7 +4,7 @@
         <when>
             <context
                 deviceFamily="PRU"
-                deviceId="AM263px"
+                deviceId="AM263Px"
             />
         </when>
     </applicability>
@@ -20,7 +20,7 @@
         connection="TIXDS110_Connection.xml"
         toolChain="TI"
         cgtVersion="2.3.3"
-        device="AM263px"
+        device="AM263Px"
         deviceCore="ICSSM_PRU_1"
         ignoreDefaultDeviceSettings="true"
         ignoreDefaultCCSSettings="true"
diff --git a/academy/getting_started_labs/c_code/solution/firmware/am263px-cc/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd b/academy/getting_started_labs/c_code/solution/firmware/am263px-cc/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
index a3b557df..d54a14a7 100644
--- a/academy/getting_started_labs/c_code/solution/firmware/am263px-cc/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
+++ b/academy/getting_started_labs/c_code/solution/firmware/am263px-cc/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
@@ -1,8 +1,8 @@
 /*
- * AM263px_PRU1.cmd
+ * AM263Px_PRU1.cmd
  *
  * Example Linker command file for linking programs built with the C compiler
- * on AM263px PRU1 cores
+ * on AM263Px PRU1 cores
  */
 
 -cr		/* Link using C conventions */
@@ -19,7 +19,7 @@ MEMORY
 	/* 8 KB PRU Data RAM 1 */
 	PRU1_DMEM_1	: org = 0x00000000 len = 0x00002000	CREGISTER=24
 	/* 8 KB PRU Data RAM 0 */
-	PRU1_DMEM_0	: org = 0x00002000 len = 0x00002000	CREGISTER=25
+	PRU0_DMEM_0	: org = 0x00002000 len = 0x00002000	CREGISTER=25
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/getting_started_labs/c_code/solution/firmware/am263px-lp/icss_m0_pru0_fw/ti-pru-cgt/example.projectspec b/academy/getting_started_labs/c_code/solution/firmware/am263px-lp/icss_m0_pru0_fw/ti-pru-cgt/example.projectspec
index 2871e186..6aef9f50 100644
--- a/academy/getting_started_labs/c_code/solution/firmware/am263px-lp/icss_m0_pru0_fw/ti-pru-cgt/example.projectspec
+++ b/academy/getting_started_labs/c_code/solution/firmware/am263px-lp/icss_m0_pru0_fw/ti-pru-cgt/example.projectspec
@@ -4,7 +4,7 @@
         <when>
             <context
                 deviceFamily="PRU"
-                deviceId="AM263px"
+                deviceId="AM263Px"
             />
         </when>
     </applicability>
@@ -20,7 +20,7 @@
         connection="TIXDS110_Connection.xml"
         toolChain="TI"
         cgtVersion="2.3.3"
-        device="AM263px"
+        device="AM263Px"
         deviceCore="ICSSM_PRU_0"
         ignoreDefaultDeviceSettings="true"
         ignoreDefaultCCSSettings="true"
diff --git a/academy/getting_started_labs/c_code/solution/firmware/am263px-lp/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd b/academy/getting_started_labs/c_code/solution/firmware/am263px-lp/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
index 095f9533..45a5a1a8 100644
--- a/academy/getting_started_labs/c_code/solution/firmware/am263px-lp/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
+++ b/academy/getting_started_labs/c_code/solution/firmware/am263px-lp/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
@@ -1,8 +1,8 @@
 /*
- * AM263px_PRU0.cmd
+ * AM263Px_PRU0.cmd
  *
  * Example Linker command file for linking programs built with the C compiler
- * on AM263px PRU0 cores
+ * on AM263Px PRU0 cores
  */
 
 -cr		/* Link using C conventions */
@@ -19,7 +19,7 @@ MEMORY
 	/* 8 KB PRU Data RAM 0 */
 	PRU0_DMEM_0	: org = 0x00000000 len = 0x00002000	CREGISTER=24
 	/* 8 KB PRU Data RAM 1 */
-	PRU0_DMEM_1	: org = 0x00002000 len = 0x00002000	CREGISTER=25
+	PRU1_DMEM_1	: org = 0x00002000 len = 0x00002000	CREGISTER=25
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/getting_started_labs/c_code/solution/firmware/am263px-lp/icss_m0_pru1_fw/ti-pru-cgt/example.projectspec b/academy/getting_started_labs/c_code/solution/firmware/am263px-lp/icss_m0_pru1_fw/ti-pru-cgt/example.projectspec
index 14f657de..a6645734 100644
--- a/academy/getting_started_labs/c_code/solution/firmware/am263px-lp/icss_m0_pru1_fw/ti-pru-cgt/example.projectspec
+++ b/academy/getting_started_labs/c_code/solution/firmware/am263px-lp/icss_m0_pru1_fw/ti-pru-cgt/example.projectspec
@@ -4,7 +4,7 @@
         <when>
             <context
                 deviceFamily="PRU"
-                deviceId="AM263px"
+                deviceId="AM263Px"
             />
         </when>
     </applicability>
@@ -20,7 +20,7 @@
         connection="TIXDS110_Connection.xml"
         toolChain="TI"
         cgtVersion="2.3.3"
-        device="AM263px"
+        device="AM263Px"
         deviceCore="ICSSM_PRU_1"
         ignoreDefaultDeviceSettings="true"
         ignoreDefaultCCSSettings="true"
diff --git a/academy/getting_started_labs/c_code/solution/firmware/am263px-lp/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd b/academy/getting_started_labs/c_code/solution/firmware/am263px-lp/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
index a3b557df..d54a14a7 100644
--- a/academy/getting_started_labs/c_code/solution/firmware/am263px-lp/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
+++ b/academy/getting_started_labs/c_code/solution/firmware/am263px-lp/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
@@ -1,8 +1,8 @@
 /*
- * AM263px_PRU1.cmd
+ * AM263Px_PRU1.cmd
  *
  * Example Linker command file for linking programs built with the C compiler
- * on AM263px PRU1 cores
+ * on AM263Px PRU1 cores
  */
 
 -cr		/* Link using C conventions */
@@ -19,7 +19,7 @@ MEMORY
 	/* 8 KB PRU Data RAM 1 */
 	PRU1_DMEM_1	: org = 0x00000000 len = 0x00002000	CREGISTER=24
 	/* 8 KB PRU Data RAM 0 */
-	PRU1_DMEM_0	: org = 0x00002000 len = 0x00002000	CREGISTER=25
+	PRU0_DMEM_0	: org = 0x00002000 len = 0x00002000	CREGISTER=25
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/getting_started_labs/c_code/solution/firmware/am263x-cc/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd b/academy/getting_started_labs/c_code/solution/firmware/am263x-cc/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
index 7123a82a..7b3ad22a 100644
--- a/academy/getting_started_labs/c_code/solution/firmware/am263x-cc/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
+++ b/academy/getting_started_labs/c_code/solution/firmware/am263x-cc/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
@@ -19,7 +19,7 @@ MEMORY
 	/* 8 KB PRU Data RAM 0 */
 	PRU0_DMEM_0	: org = 0x00000000 len = 0x00002000	CREGISTER=24
 	/* 8 KB PRU Data RAM 1 */
-	PRU0_DMEM_1	: org = 0x00002000 len = 0x00002000	CREGISTER=25
+	PRU1_DMEM_1	: org = 0x00002000 len = 0x00002000	CREGISTER=25
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/getting_started_labs/c_code/solution/firmware/am263x-cc/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd b/academy/getting_started_labs/c_code/solution/firmware/am263x-cc/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
index 6e858dc1..4cc82157 100644
--- a/academy/getting_started_labs/c_code/solution/firmware/am263x-cc/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
+++ b/academy/getting_started_labs/c_code/solution/firmware/am263x-cc/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
@@ -19,7 +19,7 @@ MEMORY
 	/* 8 KB PRU Data RAM 1 */
 	PRU1_DMEM_1	: org = 0x00000000 len = 0x00002000	CREGISTER=24
 	/* 8 KB PRU Data RAM 0 */
-	PRU1_DMEM_0	: org = 0x00002000 len = 0x00002000	CREGISTER=25
+	PRU0_DMEM_0	: org = 0x00002000 len = 0x00002000	CREGISTER=25
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/getting_started_labs/c_code/solution/firmware/am263x-lp/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd b/academy/getting_started_labs/c_code/solution/firmware/am263x-lp/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
index 7123a82a..7b3ad22a 100644
--- a/academy/getting_started_labs/c_code/solution/firmware/am263x-lp/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
+++ b/academy/getting_started_labs/c_code/solution/firmware/am263x-lp/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
@@ -19,7 +19,7 @@ MEMORY
 	/* 8 KB PRU Data RAM 0 */
 	PRU0_DMEM_0	: org = 0x00000000 len = 0x00002000	CREGISTER=24
 	/* 8 KB PRU Data RAM 1 */
-	PRU0_DMEM_1	: org = 0x00002000 len = 0x00002000	CREGISTER=25
+	PRU1_DMEM_1	: org = 0x00002000 len = 0x00002000	CREGISTER=25
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/getting_started_labs/c_code/solution/firmware/am263x-lp/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd b/academy/getting_started_labs/c_code/solution/firmware/am263x-lp/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
index 6e858dc1..4cc82157 100644
--- a/academy/getting_started_labs/c_code/solution/firmware/am263x-lp/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
+++ b/academy/getting_started_labs/c_code/solution/firmware/am263x-lp/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
@@ -19,7 +19,7 @@ MEMORY
 	/* 8 KB PRU Data RAM 1 */
 	PRU1_DMEM_1	: org = 0x00000000 len = 0x00002000	CREGISTER=24
 	/* 8 KB PRU Data RAM 0 */
-	PRU1_DMEM_0	: org = 0x00002000 len = 0x00002000	CREGISTER=25
+	PRU0_DMEM_0	: org = 0x00002000 len = 0x00002000	CREGISTER=25
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/getting_started_labs/c_code/solution/firmware/am62x-sk/pruss0_pru0_fw/ti-pru-cgt/linker.cmd b/academy/getting_started_labs/c_code/solution/firmware/am62x-sk/pruss0_pru0_fw/ti-pru-cgt/linker.cmd
index 1782108e..604fdfd9 100644
--- a/academy/getting_started_labs/c_code/solution/firmware/am62x-sk/pruss0_pru0_fw/ti-pru-cgt/linker.cmd
+++ b/academy/getting_started_labs/c_code/solution/firmware/am62x-sk/pruss0_pru0_fw/ti-pru-cgt/linker.cmd
@@ -19,7 +19,7 @@ MEMORY
 	/* 8 KB PRU Data RAM 0 */
 	PRU0_DMEM_0	: org = 0x00000000 len = 0x00002000	CREGISTER=24
 	/* 8 KB PRU Data RAM 1 */
-	PRU0_DMEM_1	: org = 0x00002000 len = 0x00002000	CREGISTER=25
+	PRU1_DMEM_1	: org = 0x00002000 len = 0x00002000	CREGISTER=25
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/getting_started_labs/c_code/solution/firmware/am62x-sk/pruss0_pru1_fw/ti-pru-cgt/linker.cmd b/academy/getting_started_labs/c_code/solution/firmware/am62x-sk/pruss0_pru1_fw/ti-pru-cgt/linker.cmd
index 9082912c..cbf74e60 100644
--- a/academy/getting_started_labs/c_code/solution/firmware/am62x-sk/pruss0_pru1_fw/ti-pru-cgt/linker.cmd
+++ b/academy/getting_started_labs/c_code/solution/firmware/am62x-sk/pruss0_pru1_fw/ti-pru-cgt/linker.cmd
@@ -19,7 +19,7 @@ MEMORY
 	/* 8 KB PRU Data RAM 1 */
 	PRU1_DMEM_1	: org = 0x00000000 len = 0x00002000	CREGISTER=24
 	/* 8 KB PRU Data RAM 0 */
-	PRU1_DMEM_0	: org = 0x00002000 len = 0x00002000	CREGISTER=25
+	PRU0_DMEM_0	: org = 0x00002000 len = 0x00002000	CREGISTER=25
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/getting_started_labs/c_code/solution/firmware/am64x-evm/icss_g0_pru0_fw/ti-pru-cgt/linker.cmd b/academy/getting_started_labs/c_code/solution/firmware/am64x-evm/icss_g0_pru0_fw/ti-pru-cgt/linker.cmd
index 7069af79..a39ea737 100644
--- a/academy/getting_started_labs/c_code/solution/firmware/am64x-evm/icss_g0_pru0_fw/ti-pru-cgt/linker.cmd
+++ b/academy/getting_started_labs/c_code/solution/firmware/am64x-evm/icss_g0_pru0_fw/ti-pru-cgt/linker.cmd
@@ -21,14 +21,14 @@ MEMORY
 	PRU0_DMEM_0	: org = 0x00000000 len = 0x00001000	CREGISTER=24
 	/* 8 KB PRU Data RAM 1; reserved completely for Slice1 cores - PRU1,
 	 * RTU1 and Tx_PRU1; do not use for any Slice0 cores */
-	PRU0_DMEM_1	: org = 0x00002000 len = 0x00001000	CREGISTER=25
+	PRU1_DMEM_1	: org = 0x00002000 len = 0x00001000	CREGISTER=25
 	/* NOTE: Custom split of the second 4 KB of ICSS Data RAMs 0 and 1
 	 * split equally between the corresponding RTU and Tx_PRU cores in
 	 * each slice */
 	RTU0_DMEM_0	: org = 0x00001000 len = 0x00000800
 	TX_PRU0_DMEM_0	: org = 0x00001800 len = 0x00000800
-	RTU0_DMEM_1	: org = 0x00003000 len = 0x00000800
-	TX_PRU0_DMEM_1	: org = 0x00003800 len = 0x00000800
+	RTU1_DMEM_1	: org = 0x00003000 len = 0x00000800
+	TX_PRU1_DMEM_1	: org = 0x00003800 len = 0x00000800
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/getting_started_labs/c_code/solution/firmware/am64x-evm/icss_g0_pru1_fw/ti-pru-cgt/linker.cmd b/academy/getting_started_labs/c_code/solution/firmware/am64x-evm/icss_g0_pru1_fw/ti-pru-cgt/linker.cmd
index 2d0fb831..d2fda1f1 100644
--- a/academy/getting_started_labs/c_code/solution/firmware/am64x-evm/icss_g0_pru1_fw/ti-pru-cgt/linker.cmd
+++ b/academy/getting_started_labs/c_code/solution/firmware/am64x-evm/icss_g0_pru1_fw/ti-pru-cgt/linker.cmd
@@ -21,14 +21,14 @@ MEMORY
 	PRU1_DMEM_1	: org = 0x00000000 len = 0x00001000	CREGISTER=24
 	/* 8 KB PRU Data RAM 0; reserved completely for Slice0 cores - PRU0,
 	 * RTU0 and Tx_PRU0; do not use for any Slice1 cores */
-	PRU1_DMEM_0	: org = 0x00002000 len = 0x00001000	CREGISTER=25
+	PRU0_DMEM_0	: org = 0x00002000 len = 0x00001000	CREGISTER=25
 	/* NOTE: Custom split of the second 4 KB of ICSS Data RAMs 0 and 1
 	 * split equally between the corresponding RTU and Tx_PRU cores in
 	 * each slice */
 	RTU1_DMEM_1	: org = 0x00001000 len = 0x00000800
 	TX_PRU1_DMEM_1	: org = 0x00001800 len = 0x00000800
-	RTU1_DMEM_0	: org = 0x00003000 len = 0x00000800
-	TX_PRU1_DMEM_0	: org = 0x00003800 len = 0x00000800
+	RTU0_DMEM_0	: org = 0x00003000 len = 0x00000800
+	TX_PRU0_DMEM_0	: org = 0x00003800 len = 0x00000800
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/getting_started_labs/c_code/solution/firmware/am64x-evm/icss_g0_rtu_pru0_fw/ti-pru-cgt/linker.cmd b/academy/getting_started_labs/c_code/solution/firmware/am64x-evm/icss_g0_rtu_pru0_fw/ti-pru-cgt/linker.cmd
index 3704b635..ea7d05f7 100644
--- a/academy/getting_started_labs/c_code/solution/firmware/am64x-evm/icss_g0_rtu_pru0_fw/ti-pru-cgt/linker.cmd
+++ b/academy/getting_started_labs/c_code/solution/firmware/am64x-evm/icss_g0_rtu_pru0_fw/ti-pru-cgt/linker.cmd
@@ -21,14 +21,14 @@ MEMORY
 	PRU0_DMEM_0	: org = 0x00000000 len = 0x00001000	CREGISTER=24
 	/* 8 KB PRU Data RAM 1; reserved completely for Slice1 cores - PRU1,
 	 * RTU1 and Tx_PRU1; do not use for any Slice0 cores */
-	PRU0_DMEM_1	: org = 0x00002000 len = 0x00001000	CREGISTER=25
+	PRU1_DMEM_1	: org = 0x00002000 len = 0x00001000	CREGISTER=25
 	/* NOTE: Custom split of the second 4 KB of ICSS Data RAMs 0 and 1
 	 * split equally between the corresponding RTU and Tx_PRU cores in
 	 * each slice */
 	RTU0_DMEM_0	: org = 0x00001000 len = 0x00000800
 	TX_PRU0_DMEM_0	: org = 0x00001800 len = 0x00000800
-	RTU0_DMEM_1	: org = 0x00003000 len = 0x00000800
-	TX_PRU0_DMEM_1	: org = 0x00003800 len = 0x00000800
+	RTU1_DMEM_1	: org = 0x00003000 len = 0x00000800
+	TX_PRU1_DMEM_1	: org = 0x00003800 len = 0x00000800
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/getting_started_labs/c_code/solution/firmware/am64x-evm/icss_g0_rtu_pru1_fw/ti-pru-cgt/linker.cmd b/academy/getting_started_labs/c_code/solution/firmware/am64x-evm/icss_g0_rtu_pru1_fw/ti-pru-cgt/linker.cmd
index e9bad7fd..3758b8a5 100644
--- a/academy/getting_started_labs/c_code/solution/firmware/am64x-evm/icss_g0_rtu_pru1_fw/ti-pru-cgt/linker.cmd
+++ b/academy/getting_started_labs/c_code/solution/firmware/am64x-evm/icss_g0_rtu_pru1_fw/ti-pru-cgt/linker.cmd
@@ -21,14 +21,14 @@ MEMORY
 	PRU1_DMEM_1	: org = 0x00000000 len = 0x00001000	CREGISTER=24
 	/* 8 KB PRU Data RAM 0; reserved completely for Slice0 cores - PRU0,
 	 * RTU0 and Tx_PRU0; do not use for any Slice1 cores */
-	PRU1_DMEM_0	: org = 0x00002000 len = 0x00001000	CREGISTER=25
+	PRU0_DMEM_0	: org = 0x00002000 len = 0x00001000	CREGISTER=25
 	/* NOTE: Custom split of the second 4 KB of ICSS Data RAMs 0 and 1
 	 * split equally between the corresponding RTU and Tx_PRU cores in
 	 * each slice */
 	RTU1_DMEM_1	: org = 0x00001000 len = 0x00000800
 	TX_PRU1_DMEM_1	: org = 0x00001800 len = 0x00000800
-	RTU1_DMEM_0	: org = 0x00003000 len = 0x00000800
-	TX_PRU1_DMEM_0	: org = 0x00003800 len = 0x00000800
+	RTU0_DMEM_0	: org = 0x00003000 len = 0x00000800
+	TX_PRU0_DMEM_0	: org = 0x00003800 len = 0x00000800
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/getting_started_labs/c_code/solution/firmware/am64x-evm/icss_g0_tx_pru0_fw/ti-pru-cgt/linker.cmd b/academy/getting_started_labs/c_code/solution/firmware/am64x-evm/icss_g0_tx_pru0_fw/ti-pru-cgt/linker.cmd
index 348a51c4..61ec26c5 100644
--- a/academy/getting_started_labs/c_code/solution/firmware/am64x-evm/icss_g0_tx_pru0_fw/ti-pru-cgt/linker.cmd
+++ b/academy/getting_started_labs/c_code/solution/firmware/am64x-evm/icss_g0_tx_pru0_fw/ti-pru-cgt/linker.cmd
@@ -21,14 +21,14 @@ MEMORY
 	PRU0_DMEM_0	: org = 0x00000000 len = 0x00001000	CREGISTER=24
 	/* 8 KB PRU Data RAM 1; reserved completely for Slice1 cores - PRU1,
 	 * RTU1 and Tx_PRU1; do not use for any Slice0 cores */
-	PRU0_DMEM_1	: org = 0x00002000 len = 0x00001000	CREGISTER=25
+	PRU1_DMEM_1	: org = 0x00002000 len = 0x00001000	CREGISTER=25
 	/* NOTE: Custom split of the second 4 KB of ICSS Data RAMs 0 and 1
 	 * split equally between the corresponding RTU and Tx_PRU cores in
 	 * each slice */
 	RTU0_DMEM_0	: org = 0x00001000 len = 0x00000800
 	TX_PRU0_DMEM_0	: org = 0x00001800 len = 0x00000800
-	RTU0_DMEM_1	: org = 0x00003000 len = 0x00000800
-	TX_PRU0_DMEM_1	: org = 0x00003800 len = 0x00000800
+	RTU1_DMEM_1	: org = 0x00003000 len = 0x00000800
+	TX_PRU1_DMEM_1	: org = 0x00003800 len = 0x00000800
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/getting_started_labs/c_code/solution/firmware/am64x-evm/icss_g0_tx_pru1_fw/ti-pru-cgt/linker.cmd b/academy/getting_started_labs/c_code/solution/firmware/am64x-evm/icss_g0_tx_pru1_fw/ti-pru-cgt/linker.cmd
index e75fb708..c230bfae 100644
--- a/academy/getting_started_labs/c_code/solution/firmware/am64x-evm/icss_g0_tx_pru1_fw/ti-pru-cgt/linker.cmd
+++ b/academy/getting_started_labs/c_code/solution/firmware/am64x-evm/icss_g0_tx_pru1_fw/ti-pru-cgt/linker.cmd
@@ -21,14 +21,14 @@ MEMORY
 	PRU1_DMEM_1	: org = 0x00000000 len = 0x00001000	CREGISTER=24
 	/* 8 KB PRU Data RAM 0; reserved completely for Slice0 cores - PRU0,
 	 * RTU0 and Tx_PRU0; do not use for any Slice1 cores */
-	PRU1_DMEM_0	: org = 0x00002000 len = 0x00001000	CREGISTER=25
+	PRU0_DMEM_0	: org = 0x00002000 len = 0x00001000	CREGISTER=25
 	/* NOTE: Custom split of the second 4 KB of ICSS Data RAMs 0 and 1
 	 * split equally between the corresponding RTU and Tx_PRU cores in
 	 * each slice */
 	RTU1_DMEM_1	: org = 0x00001000 len = 0x00000800
 	TX_PRU1_DMEM_1	: org = 0x00001800 len = 0x00000800
-	RTU1_DMEM_0	: org = 0x00003000 len = 0x00000800
-	TX_PRU1_DMEM_0	: org = 0x00003800 len = 0x00000800
+	RTU0_DMEM_0	: org = 0x00003000 len = 0x00000800
+	TX_PRU0_DMEM_0	: org = 0x00003800 len = 0x00000800
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/gpio/gpio_toggle/firmware/am261x-lp/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd b/academy/gpio/gpio_toggle/firmware/am261x-lp/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
index 672e9b92..13fdcb5e 100644
--- a/academy/gpio/gpio_toggle/firmware/am261x-lp/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
+++ b/academy/gpio/gpio_toggle/firmware/am261x-lp/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
@@ -17,7 +17,7 @@ MEMORY
 	/* 8 KB PRU Data RAM 0 */
 	PRU0_DMEM_0	: org = 0x00000000 len = 0x00002000
 	/* 8 KB PRU Data RAM 1 */
-	PRU0_DMEM_1	: org = 0x00002000 len = 0x00002000
+	PRU1_DMEM_1	: org = 0x00002000 len = 0x00002000
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/gpio/gpio_toggle/firmware/am261x-lp/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd b/academy/gpio/gpio_toggle/firmware/am261x-lp/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
index 66f6da5e..774184dd 100644
--- a/academy/gpio/gpio_toggle/firmware/am261x-lp/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
+++ b/academy/gpio/gpio_toggle/firmware/am261x-lp/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
@@ -17,7 +17,7 @@ MEMORY
 	/* 8 KB PRU Data RAM 1 */
 	PRU1_DMEM_1	: org = 0x00000000 len = 0x00002000
 	/* 8 KB PRU Data RAM 0 */
-	PRU1_DMEM_0	: org = 0x00002000 len = 0x00002000
+	PRU0_DMEM_0	: org = 0x00002000 len = 0x00002000
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/gpio/gpio_toggle/firmware/am261x-som/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd b/academy/gpio/gpio_toggle/firmware/am261x-som/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
index 672e9b92..13fdcb5e 100644
--- a/academy/gpio/gpio_toggle/firmware/am261x-som/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
+++ b/academy/gpio/gpio_toggle/firmware/am261x-som/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
@@ -17,7 +17,7 @@ MEMORY
 	/* 8 KB PRU Data RAM 0 */
 	PRU0_DMEM_0	: org = 0x00000000 len = 0x00002000
 	/* 8 KB PRU Data RAM 1 */
-	PRU0_DMEM_1	: org = 0x00002000 len = 0x00002000
+	PRU1_DMEM_1	: org = 0x00002000 len = 0x00002000
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/gpio/gpio_toggle/firmware/am261x-som/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd b/academy/gpio/gpio_toggle/firmware/am261x-som/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
index 66f6da5e..774184dd 100644
--- a/academy/gpio/gpio_toggle/firmware/am261x-som/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
+++ b/academy/gpio/gpio_toggle/firmware/am261x-som/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
@@ -17,7 +17,7 @@ MEMORY
 	/* 8 KB PRU Data RAM 1 */
 	PRU1_DMEM_1	: org = 0x00000000 len = 0x00002000
 	/* 8 KB PRU Data RAM 0 */
-	PRU1_DMEM_0	: org = 0x00002000 len = 0x00002000
+	PRU0_DMEM_0	: org = 0x00002000 len = 0x00002000
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/gpio/gpio_toggle/firmware/am263px-cc/icss_m0_pru0_fw/ti-pru-cgt/example.projectspec b/academy/gpio/gpio_toggle/firmware/am263px-cc/icss_m0_pru0_fw/ti-pru-cgt/example.projectspec
index bb5bccae..663e99f7 100644
--- a/academy/gpio/gpio_toggle/firmware/am263px-cc/icss_m0_pru0_fw/ti-pru-cgt/example.projectspec
+++ b/academy/gpio/gpio_toggle/firmware/am263px-cc/icss_m0_pru0_fw/ti-pru-cgt/example.projectspec
@@ -4,7 +4,7 @@
         <when>
             <context
                 deviceFamily="PRU"
-                deviceId="AM263px"
+                deviceId="AM263Px"
             />
         </when>
     </applicability>
@@ -20,7 +20,7 @@
         connection="TIXDS110_Connection.xml"
         toolChain="TI"
         cgtVersion="2.3.3"
-        device="AM263px"
+        device="AM263Px"
         deviceCore="ICSSM_PRU_0"
         ignoreDefaultDeviceSettings="true"
         ignoreDefaultCCSSettings="true"
diff --git a/academy/gpio/gpio_toggle/firmware/am263px-cc/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd b/academy/gpio/gpio_toggle/firmware/am263px-cc/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
index 9da5f8e7..5b64bc7e 100644
--- a/academy/gpio/gpio_toggle/firmware/am263px-cc/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
+++ b/academy/gpio/gpio_toggle/firmware/am263px-cc/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
@@ -1,8 +1,8 @@
 /*
- * AM263px_PRU0.cmd
+ * AM263Px_PRU0.cmd
  *
  * Example Linker command file for linking assembly programs built with the TI-PRU-CGT
- * on AM263px PRU0 cores
+ * on AM263Px PRU0 cores
  */
 
 /* Specify the System Memory Map */
@@ -17,7 +17,7 @@ MEMORY
 	/* 8 KB PRU Data RAM 0 */
 	PRU0_DMEM_0	: org = 0x00000000 len = 0x00002000
 	/* 8 KB PRU Data RAM 1 */
-	PRU0_DMEM_1	: org = 0x00002000 len = 0x00002000
+	PRU1_DMEM_1	: org = 0x00002000 len = 0x00002000
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/gpio/gpio_toggle/firmware/am263px-cc/icss_m0_pru1_fw/ti-pru-cgt/example.projectspec b/academy/gpio/gpio_toggle/firmware/am263px-cc/icss_m0_pru1_fw/ti-pru-cgt/example.projectspec
index ac5037ef..901c7026 100644
--- a/academy/gpio/gpio_toggle/firmware/am263px-cc/icss_m0_pru1_fw/ti-pru-cgt/example.projectspec
+++ b/academy/gpio/gpio_toggle/firmware/am263px-cc/icss_m0_pru1_fw/ti-pru-cgt/example.projectspec
@@ -4,7 +4,7 @@
         <when>
             <context
                 deviceFamily="PRU"
-                deviceId="AM263px"
+                deviceId="AM263Px"
             />
         </when>
     </applicability>
@@ -20,7 +20,7 @@
         connection="TIXDS110_Connection.xml"
         toolChain="TI"
         cgtVersion="2.3.3"
-        device="AM263px"
+        device="AM263Px"
         deviceCore="ICSSM_PRU_1"
         ignoreDefaultDeviceSettings="true"
         ignoreDefaultCCSSettings="true"
diff --git a/academy/gpio/gpio_toggle/firmware/am263px-cc/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd b/academy/gpio/gpio_toggle/firmware/am263px-cc/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
index 23af1b71..57db723f 100644
--- a/academy/gpio/gpio_toggle/firmware/am263px-cc/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
+++ b/academy/gpio/gpio_toggle/firmware/am263px-cc/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
@@ -1,8 +1,8 @@
 /*
- * AM263px_PRU1.cmd
+ * AM263Px_PRU1.cmd
  *
  * Example Linker command file for linking assembly programs built with the TI-PRU-CGT
- * on AM263px PRU1 cores
+ * on AM263Px PRU1 cores
  */
 
 /* Specify the System Memory Map */
@@ -17,7 +17,7 @@ MEMORY
 	/* 8 KB PRU Data RAM 1 */
 	PRU1_DMEM_1	: org = 0x00000000 len = 0x00002000
 	/* 8 KB PRU Data RAM 0 */
-	PRU1_DMEM_0	: org = 0x00002000 len = 0x00002000
+	PRU0_DMEM_0	: org = 0x00002000 len = 0x00002000
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/gpio/gpio_toggle/firmware/am263px-lp/icss_m0_pru0_fw/ti-pru-cgt/example.projectspec b/academy/gpio/gpio_toggle/firmware/am263px-lp/icss_m0_pru0_fw/ti-pru-cgt/example.projectspec
index 53fd409e..7c5d18c8 100644
--- a/academy/gpio/gpio_toggle/firmware/am263px-lp/icss_m0_pru0_fw/ti-pru-cgt/example.projectspec
+++ b/academy/gpio/gpio_toggle/firmware/am263px-lp/icss_m0_pru0_fw/ti-pru-cgt/example.projectspec
@@ -4,7 +4,7 @@
         <when>
             <context
                 deviceFamily="PRU"
-                deviceId="AM263px"
+                deviceId="AM263Px"
             />
         </when>
     </applicability>
@@ -20,7 +20,7 @@
         connection="TIXDS110_Connection.xml"
         toolChain="TI"
         cgtVersion="2.3.3"
-        device="AM263px"
+        device="AM263Px"
         deviceCore="ICSSM_PRU_0"
         ignoreDefaultDeviceSettings="true"
         ignoreDefaultCCSSettings="true"
diff --git a/academy/gpio/gpio_toggle/firmware/am263px-lp/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd b/academy/gpio/gpio_toggle/firmware/am263px-lp/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
index 9da5f8e7..5b64bc7e 100644
--- a/academy/gpio/gpio_toggle/firmware/am263px-lp/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
+++ b/academy/gpio/gpio_toggle/firmware/am263px-lp/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
@@ -1,8 +1,8 @@
 /*
- * AM263px_PRU0.cmd
+ * AM263Px_PRU0.cmd
  *
  * Example Linker command file for linking assembly programs built with the TI-PRU-CGT
- * on AM263px PRU0 cores
+ * on AM263Px PRU0 cores
  */
 
 /* Specify the System Memory Map */
@@ -17,7 +17,7 @@ MEMORY
 	/* 8 KB PRU Data RAM 0 */
 	PRU0_DMEM_0	: org = 0x00000000 len = 0x00002000
 	/* 8 KB PRU Data RAM 1 */
-	PRU0_DMEM_1	: org = 0x00002000 len = 0x00002000
+	PRU1_DMEM_1	: org = 0x00002000 len = 0x00002000
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/gpio/gpio_toggle/firmware/am263px-lp/icss_m0_pru1_fw/ti-pru-cgt/example.projectspec b/academy/gpio/gpio_toggle/firmware/am263px-lp/icss_m0_pru1_fw/ti-pru-cgt/example.projectspec
index 4890ab9e..067bc4cb 100644
--- a/academy/gpio/gpio_toggle/firmware/am263px-lp/icss_m0_pru1_fw/ti-pru-cgt/example.projectspec
+++ b/academy/gpio/gpio_toggle/firmware/am263px-lp/icss_m0_pru1_fw/ti-pru-cgt/example.projectspec
@@ -4,7 +4,7 @@
         <when>
             <context
                 deviceFamily="PRU"
-                deviceId="AM263px"
+                deviceId="AM263Px"
             />
         </when>
     </applicability>
@@ -20,7 +20,7 @@
         connection="TIXDS110_Connection.xml"
         toolChain="TI"
         cgtVersion="2.3.3"
-        device="AM263px"
+        device="AM263Px"
         deviceCore="ICSSM_PRU_1"
         ignoreDefaultDeviceSettings="true"
         ignoreDefaultCCSSettings="true"
diff --git a/academy/gpio/gpio_toggle/firmware/am263px-lp/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd b/academy/gpio/gpio_toggle/firmware/am263px-lp/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
index 23af1b71..57db723f 100644
--- a/academy/gpio/gpio_toggle/firmware/am263px-lp/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
+++ b/academy/gpio/gpio_toggle/firmware/am263px-lp/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
@@ -1,8 +1,8 @@
 /*
- * AM263px_PRU1.cmd
+ * AM263Px_PRU1.cmd
  *
  * Example Linker command file for linking assembly programs built with the TI-PRU-CGT
- * on AM263px PRU1 cores
+ * on AM263Px PRU1 cores
  */
 
 /* Specify the System Memory Map */
@@ -17,7 +17,7 @@ MEMORY
 	/* 8 KB PRU Data RAM 1 */
 	PRU1_DMEM_1	: org = 0x00000000 len = 0x00002000
 	/* 8 KB PRU Data RAM 0 */
-	PRU1_DMEM_0	: org = 0x00002000 len = 0x00002000
+	PRU0_DMEM_0	: org = 0x00002000 len = 0x00002000
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/gpio/gpio_toggle/firmware/am263x-cc/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd b/academy/gpio/gpio_toggle/firmware/am263x-cc/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
index 26f02bf4..11542351 100644
--- a/academy/gpio/gpio_toggle/firmware/am263x-cc/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
+++ b/academy/gpio/gpio_toggle/firmware/am263x-cc/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
@@ -17,7 +17,7 @@ MEMORY
 	/* 8 KB PRU Data RAM 0 */
 	PRU0_DMEM_0	: org = 0x00000000 len = 0x00002000
 	/* 8 KB PRU Data RAM 1 */
-	PRU0_DMEM_1	: org = 0x00002000 len = 0x00002000
+	PRU1_DMEM_1	: org = 0x00002000 len = 0x00002000
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/gpio/gpio_toggle/firmware/am263x-cc/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd b/academy/gpio/gpio_toggle/firmware/am263x-cc/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
index 70fb0765..cf0121bf 100644
--- a/academy/gpio/gpio_toggle/firmware/am263x-cc/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
+++ b/academy/gpio/gpio_toggle/firmware/am263x-cc/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
@@ -17,7 +17,7 @@ MEMORY
 	/* 8 KB PRU Data RAM 1 */
 	PRU1_DMEM_1	: org = 0x00000000 len = 0x00002000
 	/* 8 KB PRU Data RAM 0 */
-	PRU1_DMEM_0	: org = 0x00002000 len = 0x00002000
+	PRU0_DMEM_0	: org = 0x00002000 len = 0x00002000
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/gpio/gpio_toggle/firmware/am263x-lp/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd b/academy/gpio/gpio_toggle/firmware/am263x-lp/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
index 26f02bf4..11542351 100644
--- a/academy/gpio/gpio_toggle/firmware/am263x-lp/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
+++ b/academy/gpio/gpio_toggle/firmware/am263x-lp/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
@@ -17,7 +17,7 @@ MEMORY
 	/* 8 KB PRU Data RAM 0 */
 	PRU0_DMEM_0	: org = 0x00000000 len = 0x00002000
 	/* 8 KB PRU Data RAM 1 */
-	PRU0_DMEM_1	: org = 0x00002000 len = 0x00002000
+	PRU1_DMEM_1	: org = 0x00002000 len = 0x00002000
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/gpio/gpio_toggle/firmware/am263x-lp/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd b/academy/gpio/gpio_toggle/firmware/am263x-lp/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
index 70fb0765..cf0121bf 100644
--- a/academy/gpio/gpio_toggle/firmware/am263x-lp/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
+++ b/academy/gpio/gpio_toggle/firmware/am263x-lp/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
@@ -17,7 +17,7 @@ MEMORY
 	/* 8 KB PRU Data RAM 1 */
 	PRU1_DMEM_1	: org = 0x00000000 len = 0x00002000
 	/* 8 KB PRU Data RAM 0 */
-	PRU1_DMEM_0	: org = 0x00002000 len = 0x00002000
+	PRU0_DMEM_0	: org = 0x00002000 len = 0x00002000
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/intc/intc_mcu/firmware/am261x-lp/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd b/academy/intc/intc_mcu/firmware/am261x-lp/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
index 672e9b92..13fdcb5e 100644
--- a/academy/intc/intc_mcu/firmware/am261x-lp/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
+++ b/academy/intc/intc_mcu/firmware/am261x-lp/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
@@ -17,7 +17,7 @@ MEMORY
 	/* 8 KB PRU Data RAM 0 */
 	PRU0_DMEM_0	: org = 0x00000000 len = 0x00002000
 	/* 8 KB PRU Data RAM 1 */
-	PRU0_DMEM_1	: org = 0x00002000 len = 0x00002000
+	PRU1_DMEM_1	: org = 0x00002000 len = 0x00002000
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/intc/intc_mcu/firmware/am261x-lp/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd b/academy/intc/intc_mcu/firmware/am261x-lp/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
index 66f6da5e..774184dd 100644
--- a/academy/intc/intc_mcu/firmware/am261x-lp/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
+++ b/academy/intc/intc_mcu/firmware/am261x-lp/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
@@ -17,7 +17,7 @@ MEMORY
 	/* 8 KB PRU Data RAM 1 */
 	PRU1_DMEM_1	: org = 0x00000000 len = 0x00002000
 	/* 8 KB PRU Data RAM 0 */
-	PRU1_DMEM_0	: org = 0x00002000 len = 0x00002000
+	PRU0_DMEM_0	: org = 0x00002000 len = 0x00002000
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/intc/intc_mcu/firmware/am261x-som/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd b/academy/intc/intc_mcu/firmware/am261x-som/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
index 672e9b92..13fdcb5e 100644
--- a/academy/intc/intc_mcu/firmware/am261x-som/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
+++ b/academy/intc/intc_mcu/firmware/am261x-som/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
@@ -17,7 +17,7 @@ MEMORY
 	/* 8 KB PRU Data RAM 0 */
 	PRU0_DMEM_0	: org = 0x00000000 len = 0x00002000
 	/* 8 KB PRU Data RAM 1 */
-	PRU0_DMEM_1	: org = 0x00002000 len = 0x00002000
+	PRU1_DMEM_1	: org = 0x00002000 len = 0x00002000
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/intc/intc_mcu/firmware/am261x-som/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd b/academy/intc/intc_mcu/firmware/am261x-som/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
index 66f6da5e..774184dd 100644
--- a/academy/intc/intc_mcu/firmware/am261x-som/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
+++ b/academy/intc/intc_mcu/firmware/am261x-som/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
@@ -17,7 +17,7 @@ MEMORY
 	/* 8 KB PRU Data RAM 1 */
 	PRU1_DMEM_1	: org = 0x00000000 len = 0x00002000
 	/* 8 KB PRU Data RAM 0 */
-	PRU1_DMEM_0	: org = 0x00002000 len = 0x00002000
+	PRU0_DMEM_0	: org = 0x00002000 len = 0x00002000
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/intc/intc_mcu/firmware/am263px-cc/icss_m0_pru0_fw/ti-pru-cgt/example.projectspec b/academy/intc/intc_mcu/firmware/am263px-cc/icss_m0_pru0_fw/ti-pru-cgt/example.projectspec
index a9433399..5655fda4 100644
--- a/academy/intc/intc_mcu/firmware/am263px-cc/icss_m0_pru0_fw/ti-pru-cgt/example.projectspec
+++ b/academy/intc/intc_mcu/firmware/am263px-cc/icss_m0_pru0_fw/ti-pru-cgt/example.projectspec
@@ -4,7 +4,7 @@
         <when>
             <context
                 deviceFamily="PRU"
-                deviceId="AM263px"
+                deviceId="AM263Px"
             />
         </when>
     </applicability>
@@ -20,7 +20,7 @@
         connection="TIXDS110_Connection.xml"
         toolChain="TI"
         cgtVersion="2.3.3"
-        device="AM263px"
+        device="AM263Px"
         deviceCore="ICSSM_PRU_0"
         ignoreDefaultDeviceSettings="true"
         ignoreDefaultCCSSettings="true"
diff --git a/academy/intc/intc_mcu/firmware/am263px-cc/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd b/academy/intc/intc_mcu/firmware/am263px-cc/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
index 9da5f8e7..5b64bc7e 100644
--- a/academy/intc/intc_mcu/firmware/am263px-cc/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
+++ b/academy/intc/intc_mcu/firmware/am263px-cc/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
@@ -1,8 +1,8 @@
 /*
- * AM263px_PRU0.cmd
+ * AM263Px_PRU0.cmd
  *
  * Example Linker command file for linking assembly programs built with the TI-PRU-CGT
- * on AM263px PRU0 cores
+ * on AM263Px PRU0 cores
  */
 
 /* Specify the System Memory Map */
@@ -17,7 +17,7 @@ MEMORY
 	/* 8 KB PRU Data RAM 0 */
 	PRU0_DMEM_0	: org = 0x00000000 len = 0x00002000
 	/* 8 KB PRU Data RAM 1 */
-	PRU0_DMEM_1	: org = 0x00002000 len = 0x00002000
+	PRU1_DMEM_1	: org = 0x00002000 len = 0x00002000
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/intc/intc_mcu/firmware/am263px-cc/icss_m0_pru1_fw/ti-pru-cgt/example.projectspec b/academy/intc/intc_mcu/firmware/am263px-cc/icss_m0_pru1_fw/ti-pru-cgt/example.projectspec
index 4617f29e..894250e6 100644
--- a/academy/intc/intc_mcu/firmware/am263px-cc/icss_m0_pru1_fw/ti-pru-cgt/example.projectspec
+++ b/academy/intc/intc_mcu/firmware/am263px-cc/icss_m0_pru1_fw/ti-pru-cgt/example.projectspec
@@ -4,7 +4,7 @@
         <when>
             <context
                 deviceFamily="PRU"
-                deviceId="AM263px"
+                deviceId="AM263Px"
             />
         </when>
     </applicability>
@@ -20,7 +20,7 @@
         connection="TIXDS110_Connection.xml"
         toolChain="TI"
         cgtVersion="2.3.3"
-        device="AM263px"
+        device="AM263Px"
         deviceCore="ICSSM_PRU_1"
         ignoreDefaultDeviceSettings="true"
         ignoreDefaultCCSSettings="true"
diff --git a/academy/intc/intc_mcu/firmware/am263px-cc/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd b/academy/intc/intc_mcu/firmware/am263px-cc/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
index 23af1b71..57db723f 100644
--- a/academy/intc/intc_mcu/firmware/am263px-cc/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
+++ b/academy/intc/intc_mcu/firmware/am263px-cc/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
@@ -1,8 +1,8 @@
 /*
- * AM263px_PRU1.cmd
+ * AM263Px_PRU1.cmd
  *
  * Example Linker command file for linking assembly programs built with the TI-PRU-CGT
- * on AM263px PRU1 cores
+ * on AM263Px PRU1 cores
  */
 
 /* Specify the System Memory Map */
@@ -17,7 +17,7 @@ MEMORY
 	/* 8 KB PRU Data RAM 1 */
 	PRU1_DMEM_1	: org = 0x00000000 len = 0x00002000
 	/* 8 KB PRU Data RAM 0 */
-	PRU1_DMEM_0	: org = 0x00002000 len = 0x00002000
+	PRU0_DMEM_0	: org = 0x00002000 len = 0x00002000
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/intc/intc_mcu/firmware/am263px-lp/icss_m0_pru0_fw/ti-pru-cgt/example.projectspec b/academy/intc/intc_mcu/firmware/am263px-lp/icss_m0_pru0_fw/ti-pru-cgt/example.projectspec
index d9db0c41..72c38479 100644
--- a/academy/intc/intc_mcu/firmware/am263px-lp/icss_m0_pru0_fw/ti-pru-cgt/example.projectspec
+++ b/academy/intc/intc_mcu/firmware/am263px-lp/icss_m0_pru0_fw/ti-pru-cgt/example.projectspec
@@ -4,7 +4,7 @@
         <when>
             <context
                 deviceFamily="PRU"
-                deviceId="AM263px"
+                deviceId="AM263Px"
             />
         </when>
     </applicability>
@@ -20,7 +20,7 @@
         connection="TIXDS110_Connection.xml"
         toolChain="TI"
         cgtVersion="2.3.3"
-        device="AM263px"
+        device="AM263Px"
         deviceCore="ICSSM_PRU_0"
         ignoreDefaultDeviceSettings="true"
         ignoreDefaultCCSSettings="true"
diff --git a/academy/intc/intc_mcu/firmware/am263px-lp/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd b/academy/intc/intc_mcu/firmware/am263px-lp/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
index 9da5f8e7..5b64bc7e 100644
--- a/academy/intc/intc_mcu/firmware/am263px-lp/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
+++ b/academy/intc/intc_mcu/firmware/am263px-lp/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
@@ -1,8 +1,8 @@
 /*
- * AM263px_PRU0.cmd
+ * AM263Px_PRU0.cmd
  *
  * Example Linker command file for linking assembly programs built with the TI-PRU-CGT
- * on AM263px PRU0 cores
+ * on AM263Px PRU0 cores
  */
 
 /* Specify the System Memory Map */
@@ -17,7 +17,7 @@ MEMORY
 	/* 8 KB PRU Data RAM 0 */
 	PRU0_DMEM_0	: org = 0x00000000 len = 0x00002000
 	/* 8 KB PRU Data RAM 1 */
-	PRU0_DMEM_1	: org = 0x00002000 len = 0x00002000
+	PRU1_DMEM_1	: org = 0x00002000 len = 0x00002000
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/intc/intc_mcu/firmware/am263px-lp/icss_m0_pru1_fw/ti-pru-cgt/example.projectspec b/academy/intc/intc_mcu/firmware/am263px-lp/icss_m0_pru1_fw/ti-pru-cgt/example.projectspec
index 99977c82..7c2ed95f 100644
--- a/academy/intc/intc_mcu/firmware/am263px-lp/icss_m0_pru1_fw/ti-pru-cgt/example.projectspec
+++ b/academy/intc/intc_mcu/firmware/am263px-lp/icss_m0_pru1_fw/ti-pru-cgt/example.projectspec
@@ -4,7 +4,7 @@
         <when>
             <context
                 deviceFamily="PRU"
-                deviceId="AM263px"
+                deviceId="AM263Px"
             />
         </when>
     </applicability>
@@ -20,7 +20,7 @@
         connection="TIXDS110_Connection.xml"
         toolChain="TI"
         cgtVersion="2.3.3"
-        device="AM263px"
+        device="AM263Px"
         deviceCore="ICSSM_PRU_1"
         ignoreDefaultDeviceSettings="true"
         ignoreDefaultCCSSettings="true"
diff --git a/academy/intc/intc_mcu/firmware/am263px-lp/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd b/academy/intc/intc_mcu/firmware/am263px-lp/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
index 23af1b71..57db723f 100644
--- a/academy/intc/intc_mcu/firmware/am263px-lp/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
+++ b/academy/intc/intc_mcu/firmware/am263px-lp/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
@@ -1,8 +1,8 @@
 /*
- * AM263px_PRU1.cmd
+ * AM263Px_PRU1.cmd
  *
  * Example Linker command file for linking assembly programs built with the TI-PRU-CGT
- * on AM263px PRU1 cores
+ * on AM263Px PRU1 cores
  */
 
 /* Specify the System Memory Map */
@@ -17,7 +17,7 @@ MEMORY
 	/* 8 KB PRU Data RAM 1 */
 	PRU1_DMEM_1	: org = 0x00000000 len = 0x00002000
 	/* 8 KB PRU Data RAM 0 */
-	PRU1_DMEM_0	: org = 0x00002000 len = 0x00002000
+	PRU0_DMEM_0	: org = 0x00002000 len = 0x00002000
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/intc/intc_mcu/firmware/am263x-cc/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd b/academy/intc/intc_mcu/firmware/am263x-cc/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
index 26f02bf4..11542351 100644
--- a/academy/intc/intc_mcu/firmware/am263x-cc/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
+++ b/academy/intc/intc_mcu/firmware/am263x-cc/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
@@ -17,7 +17,7 @@ MEMORY
 	/* 8 KB PRU Data RAM 0 */
 	PRU0_DMEM_0	: org = 0x00000000 len = 0x00002000
 	/* 8 KB PRU Data RAM 1 */
-	PRU0_DMEM_1	: org = 0x00002000 len = 0x00002000
+	PRU1_DMEM_1	: org = 0x00002000 len = 0x00002000
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/intc/intc_mcu/firmware/am263x-cc/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd b/academy/intc/intc_mcu/firmware/am263x-cc/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
index 70fb0765..cf0121bf 100644
--- a/academy/intc/intc_mcu/firmware/am263x-cc/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
+++ b/academy/intc/intc_mcu/firmware/am263x-cc/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
@@ -17,7 +17,7 @@ MEMORY
 	/* 8 KB PRU Data RAM 1 */
 	PRU1_DMEM_1	: org = 0x00000000 len = 0x00002000
 	/* 8 KB PRU Data RAM 0 */
-	PRU1_DMEM_0	: org = 0x00002000 len = 0x00002000
+	PRU0_DMEM_0	: org = 0x00002000 len = 0x00002000
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/intc/intc_mcu/firmware/am263x-lp/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd b/academy/intc/intc_mcu/firmware/am263x-lp/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
index 26f02bf4..11542351 100644
--- a/academy/intc/intc_mcu/firmware/am263x-lp/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
+++ b/academy/intc/intc_mcu/firmware/am263x-lp/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
@@ -17,7 +17,7 @@ MEMORY
 	/* 8 KB PRU Data RAM 0 */
 	PRU0_DMEM_0	: org = 0x00000000 len = 0x00002000
 	/* 8 KB PRU Data RAM 1 */
-	PRU0_DMEM_1	: org = 0x00002000 len = 0x00002000
+	PRU1_DMEM_1	: org = 0x00002000 len = 0x00002000
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/intc/intc_mcu/firmware/am263x-lp/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd b/academy/intc/intc_mcu/firmware/am263x-lp/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
index 70fb0765..cf0121bf 100644
--- a/academy/intc/intc_mcu/firmware/am263x-lp/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
+++ b/academy/intc/intc_mcu/firmware/am263x-lp/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
@@ -17,7 +17,7 @@ MEMORY
 	/* 8 KB PRU Data RAM 1 */
 	PRU1_DMEM_1	: org = 0x00000000 len = 0x00002000
 	/* 8 KB PRU Data RAM 0 */
-	PRU1_DMEM_0	: org = 0x00002000 len = 0x00002000
+	PRU0_DMEM_0	: org = 0x00002000 len = 0x00002000
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/mac/mac/firmware/am261x-lp/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd b/academy/mac/mac/firmware/am261x-lp/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
index 672e9b92..13fdcb5e 100644
--- a/academy/mac/mac/firmware/am261x-lp/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
+++ b/academy/mac/mac/firmware/am261x-lp/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
@@ -17,7 +17,7 @@ MEMORY
 	/* 8 KB PRU Data RAM 0 */
 	PRU0_DMEM_0	: org = 0x00000000 len = 0x00002000
 	/* 8 KB PRU Data RAM 1 */
-	PRU0_DMEM_1	: org = 0x00002000 len = 0x00002000
+	PRU1_DMEM_1	: org = 0x00002000 len = 0x00002000
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/mac/mac/firmware/am261x-lp/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd b/academy/mac/mac/firmware/am261x-lp/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
index 66f6da5e..774184dd 100644
--- a/academy/mac/mac/firmware/am261x-lp/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
+++ b/academy/mac/mac/firmware/am261x-lp/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
@@ -17,7 +17,7 @@ MEMORY
 	/* 8 KB PRU Data RAM 1 */
 	PRU1_DMEM_1	: org = 0x00000000 len = 0x00002000
 	/* 8 KB PRU Data RAM 0 */
-	PRU1_DMEM_0	: org = 0x00002000 len = 0x00002000
+	PRU0_DMEM_0	: org = 0x00002000 len = 0x00002000
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/mac/mac/firmware/am261x-som/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd b/academy/mac/mac/firmware/am261x-som/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
index 672e9b92..13fdcb5e 100644
--- a/academy/mac/mac/firmware/am261x-som/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
+++ b/academy/mac/mac/firmware/am261x-som/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
@@ -17,7 +17,7 @@ MEMORY
 	/* 8 KB PRU Data RAM 0 */
 	PRU0_DMEM_0	: org = 0x00000000 len = 0x00002000
 	/* 8 KB PRU Data RAM 1 */
-	PRU0_DMEM_1	: org = 0x00002000 len = 0x00002000
+	PRU1_DMEM_1	: org = 0x00002000 len = 0x00002000
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/mac/mac/firmware/am261x-som/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd b/academy/mac/mac/firmware/am261x-som/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
index 66f6da5e..774184dd 100644
--- a/academy/mac/mac/firmware/am261x-som/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
+++ b/academy/mac/mac/firmware/am261x-som/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
@@ -17,7 +17,7 @@ MEMORY
 	/* 8 KB PRU Data RAM 1 */
 	PRU1_DMEM_1	: org = 0x00000000 len = 0x00002000
 	/* 8 KB PRU Data RAM 0 */
-	PRU1_DMEM_0	: org = 0x00002000 len = 0x00002000
+	PRU0_DMEM_0	: org = 0x00002000 len = 0x00002000
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/mac/mac/firmware/am263px-cc/icss_m0_pru0_fw/ti-pru-cgt/example.projectspec b/academy/mac/mac/firmware/am263px-cc/icss_m0_pru0_fw/ti-pru-cgt/example.projectspec
index 5b957271..c30dd9ee 100644
--- a/academy/mac/mac/firmware/am263px-cc/icss_m0_pru0_fw/ti-pru-cgt/example.projectspec
+++ b/academy/mac/mac/firmware/am263px-cc/icss_m0_pru0_fw/ti-pru-cgt/example.projectspec
@@ -4,7 +4,7 @@
         <when>
             <context
                 deviceFamily="PRU"
-                deviceId="AM263px"
+                deviceId="AM263Px"
             />
         </when>
     </applicability>
@@ -20,7 +20,7 @@
         connection="TIXDS110_Connection.xml"
         toolChain="TI"
         cgtVersion="2.3.3"
-        device="AM263px"
+        device="AM263Px"
         deviceCore="ICSSM_PRU_0"
         ignoreDefaultDeviceSettings="true"
         ignoreDefaultCCSSettings="true"
diff --git a/academy/mac/mac/firmware/am263px-cc/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd b/academy/mac/mac/firmware/am263px-cc/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
index 9da5f8e7..5b64bc7e 100644
--- a/academy/mac/mac/firmware/am263px-cc/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
+++ b/academy/mac/mac/firmware/am263px-cc/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
@@ -1,8 +1,8 @@
 /*
- * AM263px_PRU0.cmd
+ * AM263Px_PRU0.cmd
  *
  * Example Linker command file for linking assembly programs built with the TI-PRU-CGT
- * on AM263px PRU0 cores
+ * on AM263Px PRU0 cores
  */
 
 /* Specify the System Memory Map */
@@ -17,7 +17,7 @@ MEMORY
 	/* 8 KB PRU Data RAM 0 */
 	PRU0_DMEM_0	: org = 0x00000000 len = 0x00002000
 	/* 8 KB PRU Data RAM 1 */
-	PRU0_DMEM_1	: org = 0x00002000 len = 0x00002000
+	PRU1_DMEM_1	: org = 0x00002000 len = 0x00002000
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/mac/mac/firmware/am263px-cc/icss_m0_pru1_fw/ti-pru-cgt/example.projectspec b/academy/mac/mac/firmware/am263px-cc/icss_m0_pru1_fw/ti-pru-cgt/example.projectspec
index 57fdb889..4042caa2 100644
--- a/academy/mac/mac/firmware/am263px-cc/icss_m0_pru1_fw/ti-pru-cgt/example.projectspec
+++ b/academy/mac/mac/firmware/am263px-cc/icss_m0_pru1_fw/ti-pru-cgt/example.projectspec
@@ -4,7 +4,7 @@
         <when>
             <context
                 deviceFamily="PRU"
-                deviceId="AM263px"
+                deviceId="AM263Px"
             />
         </when>
     </applicability>
@@ -20,7 +20,7 @@
         connection="TIXDS110_Connection.xml"
         toolChain="TI"
         cgtVersion="2.3.3"
-        device="AM263px"
+        device="AM263Px"
         deviceCore="ICSSM_PRU_1"
         ignoreDefaultDeviceSettings="true"
         ignoreDefaultCCSSettings="true"
diff --git a/academy/mac/mac/firmware/am263px-cc/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd b/academy/mac/mac/firmware/am263px-cc/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
index 23af1b71..57db723f 100644
--- a/academy/mac/mac/firmware/am263px-cc/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
+++ b/academy/mac/mac/firmware/am263px-cc/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
@@ -1,8 +1,8 @@
 /*
- * AM263px_PRU1.cmd
+ * AM263Px_PRU1.cmd
  *
  * Example Linker command file for linking assembly programs built with the TI-PRU-CGT
- * on AM263px PRU1 cores
+ * on AM263Px PRU1 cores
  */
 
 /* Specify the System Memory Map */
@@ -17,7 +17,7 @@ MEMORY
 	/* 8 KB PRU Data RAM 1 */
 	PRU1_DMEM_1	: org = 0x00000000 len = 0x00002000
 	/* 8 KB PRU Data RAM 0 */
-	PRU1_DMEM_0	: org = 0x00002000 len = 0x00002000
+	PRU0_DMEM_0	: org = 0x00002000 len = 0x00002000
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/mac/mac/firmware/am263px-lp/icss_m0_pru0_fw/ti-pru-cgt/example.projectspec b/academy/mac/mac/firmware/am263px-lp/icss_m0_pru0_fw/ti-pru-cgt/example.projectspec
index 3b701c2e..2b800590 100644
--- a/academy/mac/mac/firmware/am263px-lp/icss_m0_pru0_fw/ti-pru-cgt/example.projectspec
+++ b/academy/mac/mac/firmware/am263px-lp/icss_m0_pru0_fw/ti-pru-cgt/example.projectspec
@@ -4,7 +4,7 @@
         <when>
             <context
                 deviceFamily="PRU"
-                deviceId="AM263px"
+                deviceId="AM263Px"
             />
         </when>
     </applicability>
@@ -20,7 +20,7 @@
         connection="TIXDS110_Connection.xml"
         toolChain="TI"
         cgtVersion="2.3.3"
-        device="AM263px"
+        device="AM263Px"
         deviceCore="ICSSM_PRU_0"
         ignoreDefaultDeviceSettings="true"
         ignoreDefaultCCSSettings="true"
diff --git a/academy/mac/mac/firmware/am263px-lp/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd b/academy/mac/mac/firmware/am263px-lp/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
index 9da5f8e7..5b64bc7e 100644
--- a/academy/mac/mac/firmware/am263px-lp/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
+++ b/academy/mac/mac/firmware/am263px-lp/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
@@ -1,8 +1,8 @@
 /*
- * AM263px_PRU0.cmd
+ * AM263Px_PRU0.cmd
  *
  * Example Linker command file for linking assembly programs built with the TI-PRU-CGT
- * on AM263px PRU0 cores
+ * on AM263Px PRU0 cores
  */
 
 /* Specify the System Memory Map */
@@ -17,7 +17,7 @@ MEMORY
 	/* 8 KB PRU Data RAM 0 */
 	PRU0_DMEM_0	: org = 0x00000000 len = 0x00002000
 	/* 8 KB PRU Data RAM 1 */
-	PRU0_DMEM_1	: org = 0x00002000 len = 0x00002000
+	PRU1_DMEM_1	: org = 0x00002000 len = 0x00002000
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/mac/mac/firmware/am263px-lp/icss_m0_pru1_fw/ti-pru-cgt/example.projectspec b/academy/mac/mac/firmware/am263px-lp/icss_m0_pru1_fw/ti-pru-cgt/example.projectspec
index 7c70a194..9c9997b6 100644
--- a/academy/mac/mac/firmware/am263px-lp/icss_m0_pru1_fw/ti-pru-cgt/example.projectspec
+++ b/academy/mac/mac/firmware/am263px-lp/icss_m0_pru1_fw/ti-pru-cgt/example.projectspec
@@ -4,7 +4,7 @@
         <when>
             <context
                 deviceFamily="PRU"
-                deviceId="AM263px"
+                deviceId="AM263Px"
             />
         </when>
     </applicability>
@@ -20,7 +20,7 @@
         connection="TIXDS110_Connection.xml"
         toolChain="TI"
         cgtVersion="2.3.3"
-        device="AM263px"
+        device="AM263Px"
         deviceCore="ICSSM_PRU_1"
         ignoreDefaultDeviceSettings="true"
         ignoreDefaultCCSSettings="true"
diff --git a/academy/mac/mac/firmware/am263px-lp/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd b/academy/mac/mac/firmware/am263px-lp/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
index 23af1b71..57db723f 100644
--- a/academy/mac/mac/firmware/am263px-lp/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
+++ b/academy/mac/mac/firmware/am263px-lp/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
@@ -1,8 +1,8 @@
 /*
- * AM263px_PRU1.cmd
+ * AM263Px_PRU1.cmd
  *
  * Example Linker command file for linking assembly programs built with the TI-PRU-CGT
- * on AM263px PRU1 cores
+ * on AM263Px PRU1 cores
  */
 
 /* Specify the System Memory Map */
@@ -17,7 +17,7 @@ MEMORY
 	/* 8 KB PRU Data RAM 1 */
 	PRU1_DMEM_1	: org = 0x00000000 len = 0x00002000
 	/* 8 KB PRU Data RAM 0 */
-	PRU1_DMEM_0	: org = 0x00002000 len = 0x00002000
+	PRU0_DMEM_0	: org = 0x00002000 len = 0x00002000
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/mac/mac/firmware/am263x-cc/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd b/academy/mac/mac/firmware/am263x-cc/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
index 26f02bf4..11542351 100644
--- a/academy/mac/mac/firmware/am263x-cc/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
+++ b/academy/mac/mac/firmware/am263x-cc/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
@@ -17,7 +17,7 @@ MEMORY
 	/* 8 KB PRU Data RAM 0 */
 	PRU0_DMEM_0	: org = 0x00000000 len = 0x00002000
 	/* 8 KB PRU Data RAM 1 */
-	PRU0_DMEM_1	: org = 0x00002000 len = 0x00002000
+	PRU1_DMEM_1	: org = 0x00002000 len = 0x00002000
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/mac/mac/firmware/am263x-cc/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd b/academy/mac/mac/firmware/am263x-cc/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
index 70fb0765..cf0121bf 100644
--- a/academy/mac/mac/firmware/am263x-cc/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
+++ b/academy/mac/mac/firmware/am263x-cc/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
@@ -17,7 +17,7 @@ MEMORY
 	/* 8 KB PRU Data RAM 1 */
 	PRU1_DMEM_1	: org = 0x00000000 len = 0x00002000
 	/* 8 KB PRU Data RAM 0 */
-	PRU1_DMEM_0	: org = 0x00002000 len = 0x00002000
+	PRU0_DMEM_0	: org = 0x00002000 len = 0x00002000
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/mac/mac/firmware/am263x-lp/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd b/academy/mac/mac/firmware/am263x-lp/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
index 26f02bf4..11542351 100644
--- a/academy/mac/mac/firmware/am263x-lp/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
+++ b/academy/mac/mac/firmware/am263x-lp/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
@@ -17,7 +17,7 @@ MEMORY
 	/* 8 KB PRU Data RAM 0 */
 	PRU0_DMEM_0	: org = 0x00000000 len = 0x00002000
 	/* 8 KB PRU Data RAM 1 */
-	PRU0_DMEM_1	: org = 0x00002000 len = 0x00002000
+	PRU1_DMEM_1	: org = 0x00002000 len = 0x00002000
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/mac/mac/firmware/am263x-lp/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd b/academy/mac/mac/firmware/am263x-lp/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
index 70fb0765..cf0121bf 100644
--- a/academy/mac/mac/firmware/am263x-lp/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
+++ b/academy/mac/mac/firmware/am263x-lp/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
@@ -17,7 +17,7 @@ MEMORY
 	/* 8 KB PRU Data RAM 1 */
 	PRU1_DMEM_1	: org = 0x00000000 len = 0x00002000
 	/* 8 KB PRU Data RAM 0 */
-	PRU1_DMEM_0	: org = 0x00002000 len = 0x00002000
+	PRU0_DMEM_0	: org = 0x00002000 len = 0x00002000
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/mac/mac_multiply/firmware/am261x-lp/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd b/academy/mac/mac_multiply/firmware/am261x-lp/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
index 672e9b92..13fdcb5e 100644
--- a/academy/mac/mac_multiply/firmware/am261x-lp/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
+++ b/academy/mac/mac_multiply/firmware/am261x-lp/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
@@ -17,7 +17,7 @@ MEMORY
 	/* 8 KB PRU Data RAM 0 */
 	PRU0_DMEM_0	: org = 0x00000000 len = 0x00002000
 	/* 8 KB PRU Data RAM 1 */
-	PRU0_DMEM_1	: org = 0x00002000 len = 0x00002000
+	PRU1_DMEM_1	: org = 0x00002000 len = 0x00002000
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/mac/mac_multiply/firmware/am261x-lp/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd b/academy/mac/mac_multiply/firmware/am261x-lp/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
index 66f6da5e..774184dd 100644
--- a/academy/mac/mac_multiply/firmware/am261x-lp/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
+++ b/academy/mac/mac_multiply/firmware/am261x-lp/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
@@ -17,7 +17,7 @@ MEMORY
 	/* 8 KB PRU Data RAM 1 */
 	PRU1_DMEM_1	: org = 0x00000000 len = 0x00002000
 	/* 8 KB PRU Data RAM 0 */
-	PRU1_DMEM_0	: org = 0x00002000 len = 0x00002000
+	PRU0_DMEM_0	: org = 0x00002000 len = 0x00002000
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/mac/mac_multiply/firmware/am261x-som/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd b/academy/mac/mac_multiply/firmware/am261x-som/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
index 672e9b92..13fdcb5e 100644
--- a/academy/mac/mac_multiply/firmware/am261x-som/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
+++ b/academy/mac/mac_multiply/firmware/am261x-som/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
@@ -17,7 +17,7 @@ MEMORY
 	/* 8 KB PRU Data RAM 0 */
 	PRU0_DMEM_0	: org = 0x00000000 len = 0x00002000
 	/* 8 KB PRU Data RAM 1 */
-	PRU0_DMEM_1	: org = 0x00002000 len = 0x00002000
+	PRU1_DMEM_1	: org = 0x00002000 len = 0x00002000
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/mac/mac_multiply/firmware/am261x-som/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd b/academy/mac/mac_multiply/firmware/am261x-som/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
index 66f6da5e..774184dd 100644
--- a/academy/mac/mac_multiply/firmware/am261x-som/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
+++ b/academy/mac/mac_multiply/firmware/am261x-som/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
@@ -17,7 +17,7 @@ MEMORY
 	/* 8 KB PRU Data RAM 1 */
 	PRU1_DMEM_1	: org = 0x00000000 len = 0x00002000
 	/* 8 KB PRU Data RAM 0 */
-	PRU1_DMEM_0	: org = 0x00002000 len = 0x00002000
+	PRU0_DMEM_0	: org = 0x00002000 len = 0x00002000
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/mac/mac_multiply/firmware/am263px-cc/icss_m0_pru0_fw/ti-pru-cgt/example.projectspec b/academy/mac/mac_multiply/firmware/am263px-cc/icss_m0_pru0_fw/ti-pru-cgt/example.projectspec
index 83f28cc5..85cb2740 100644
--- a/academy/mac/mac_multiply/firmware/am263px-cc/icss_m0_pru0_fw/ti-pru-cgt/example.projectspec
+++ b/academy/mac/mac_multiply/firmware/am263px-cc/icss_m0_pru0_fw/ti-pru-cgt/example.projectspec
@@ -4,7 +4,7 @@
         <when>
             <context
                 deviceFamily="PRU"
-                deviceId="AM263px"
+                deviceId="AM263Px"
             />
         </when>
     </applicability>
@@ -20,7 +20,7 @@
         connection="TIXDS110_Connection.xml"
         toolChain="TI"
         cgtVersion="2.3.3"
-        device="AM263px"
+        device="AM263Px"
         deviceCore="ICSSM_PRU_0"
         ignoreDefaultDeviceSettings="true"
         ignoreDefaultCCSSettings="true"
diff --git a/academy/mac/mac_multiply/firmware/am263px-cc/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd b/academy/mac/mac_multiply/firmware/am263px-cc/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
index 9da5f8e7..5b64bc7e 100644
--- a/academy/mac/mac_multiply/firmware/am263px-cc/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
+++ b/academy/mac/mac_multiply/firmware/am263px-cc/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
@@ -1,8 +1,8 @@
 /*
- * AM263px_PRU0.cmd
+ * AM263Px_PRU0.cmd
  *
  * Example Linker command file for linking assembly programs built with the TI-PRU-CGT
- * on AM263px PRU0 cores
+ * on AM263Px PRU0 cores
  */
 
 /* Specify the System Memory Map */
@@ -17,7 +17,7 @@ MEMORY
 	/* 8 KB PRU Data RAM 0 */
 	PRU0_DMEM_0	: org = 0x00000000 len = 0x00002000
 	/* 8 KB PRU Data RAM 1 */
-	PRU0_DMEM_1	: org = 0x00002000 len = 0x00002000
+	PRU1_DMEM_1	: org = 0x00002000 len = 0x00002000
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/mac/mac_multiply/firmware/am263px-cc/icss_m0_pru1_fw/ti-pru-cgt/example.projectspec b/academy/mac/mac_multiply/firmware/am263px-cc/icss_m0_pru1_fw/ti-pru-cgt/example.projectspec
index dff25538..f9e96f5e 100644
--- a/academy/mac/mac_multiply/firmware/am263px-cc/icss_m0_pru1_fw/ti-pru-cgt/example.projectspec
+++ b/academy/mac/mac_multiply/firmware/am263px-cc/icss_m0_pru1_fw/ti-pru-cgt/example.projectspec
@@ -4,7 +4,7 @@
         <when>
             <context
                 deviceFamily="PRU"
-                deviceId="AM263px"
+                deviceId="AM263Px"
             />
         </when>
     </applicability>
@@ -20,7 +20,7 @@
         connection="TIXDS110_Connection.xml"
         toolChain="TI"
         cgtVersion="2.3.3"
-        device="AM263px"
+        device="AM263Px"
         deviceCore="ICSSM_PRU_1"
         ignoreDefaultDeviceSettings="true"
         ignoreDefaultCCSSettings="true"
diff --git a/academy/mac/mac_multiply/firmware/am263px-cc/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd b/academy/mac/mac_multiply/firmware/am263px-cc/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
index 23af1b71..57db723f 100644
--- a/academy/mac/mac_multiply/firmware/am263px-cc/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
+++ b/academy/mac/mac_multiply/firmware/am263px-cc/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
@@ -1,8 +1,8 @@
 /*
- * AM263px_PRU1.cmd
+ * AM263Px_PRU1.cmd
  *
  * Example Linker command file for linking assembly programs built with the TI-PRU-CGT
- * on AM263px PRU1 cores
+ * on AM263Px PRU1 cores
  */
 
 /* Specify the System Memory Map */
@@ -17,7 +17,7 @@ MEMORY
 	/* 8 KB PRU Data RAM 1 */
 	PRU1_DMEM_1	: org = 0x00000000 len = 0x00002000
 	/* 8 KB PRU Data RAM 0 */
-	PRU1_DMEM_0	: org = 0x00002000 len = 0x00002000
+	PRU0_DMEM_0	: org = 0x00002000 len = 0x00002000
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/mac/mac_multiply/firmware/am263px-lp/icss_m0_pru0_fw/ti-pru-cgt/example.projectspec b/academy/mac/mac_multiply/firmware/am263px-lp/icss_m0_pru0_fw/ti-pru-cgt/example.projectspec
index 88f43d7b..de642a33 100644
--- a/academy/mac/mac_multiply/firmware/am263px-lp/icss_m0_pru0_fw/ti-pru-cgt/example.projectspec
+++ b/academy/mac/mac_multiply/firmware/am263px-lp/icss_m0_pru0_fw/ti-pru-cgt/example.projectspec
@@ -4,7 +4,7 @@
         <when>
             <context
                 deviceFamily="PRU"
-                deviceId="AM263px"
+                deviceId="AM263Px"
             />
         </when>
     </applicability>
@@ -20,7 +20,7 @@
         connection="TIXDS110_Connection.xml"
         toolChain="TI"
         cgtVersion="2.3.3"
-        device="AM263px"
+        device="AM263Px"
         deviceCore="ICSSM_PRU_0"
         ignoreDefaultDeviceSettings="true"
         ignoreDefaultCCSSettings="true"
diff --git a/academy/mac/mac_multiply/firmware/am263px-lp/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd b/academy/mac/mac_multiply/firmware/am263px-lp/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
index 9da5f8e7..5b64bc7e 100644
--- a/academy/mac/mac_multiply/firmware/am263px-lp/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
+++ b/academy/mac/mac_multiply/firmware/am263px-lp/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
@@ -1,8 +1,8 @@
 /*
- * AM263px_PRU0.cmd
+ * AM263Px_PRU0.cmd
  *
  * Example Linker command file for linking assembly programs built with the TI-PRU-CGT
- * on AM263px PRU0 cores
+ * on AM263Px PRU0 cores
  */
 
 /* Specify the System Memory Map */
@@ -17,7 +17,7 @@ MEMORY
 	/* 8 KB PRU Data RAM 0 */
 	PRU0_DMEM_0	: org = 0x00000000 len = 0x00002000
 	/* 8 KB PRU Data RAM 1 */
-	PRU0_DMEM_1	: org = 0x00002000 len = 0x00002000
+	PRU1_DMEM_1	: org = 0x00002000 len = 0x00002000
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/mac/mac_multiply/firmware/am263px-lp/icss_m0_pru1_fw/ti-pru-cgt/example.projectspec b/academy/mac/mac_multiply/firmware/am263px-lp/icss_m0_pru1_fw/ti-pru-cgt/example.projectspec
index 3da253dd..31ec448e 100644
--- a/academy/mac/mac_multiply/firmware/am263px-lp/icss_m0_pru1_fw/ti-pru-cgt/example.projectspec
+++ b/academy/mac/mac_multiply/firmware/am263px-lp/icss_m0_pru1_fw/ti-pru-cgt/example.projectspec
@@ -4,7 +4,7 @@
         <when>
             <context
                 deviceFamily="PRU"
-                deviceId="AM263px"
+                deviceId="AM263Px"
             />
         </when>
     </applicability>
@@ -20,7 +20,7 @@
         connection="TIXDS110_Connection.xml"
         toolChain="TI"
         cgtVersion="2.3.3"
-        device="AM263px"
+        device="AM263Px"
         deviceCore="ICSSM_PRU_1"
         ignoreDefaultDeviceSettings="true"
         ignoreDefaultCCSSettings="true"
diff --git a/academy/mac/mac_multiply/firmware/am263px-lp/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd b/academy/mac/mac_multiply/firmware/am263px-lp/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
index 23af1b71..57db723f 100644
--- a/academy/mac/mac_multiply/firmware/am263px-lp/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
+++ b/academy/mac/mac_multiply/firmware/am263px-lp/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
@@ -1,8 +1,8 @@
 /*
- * AM263px_PRU1.cmd
+ * AM263Px_PRU1.cmd
  *
  * Example Linker command file for linking assembly programs built with the TI-PRU-CGT
- * on AM263px PRU1 cores
+ * on AM263Px PRU1 cores
  */
 
 /* Specify the System Memory Map */
@@ -17,7 +17,7 @@ MEMORY
 	/* 8 KB PRU Data RAM 1 */
 	PRU1_DMEM_1	: org = 0x00000000 len = 0x00002000
 	/* 8 KB PRU Data RAM 0 */
-	PRU1_DMEM_0	: org = 0x00002000 len = 0x00002000
+	PRU0_DMEM_0	: org = 0x00002000 len = 0x00002000
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/mac/mac_multiply/firmware/am263x-cc/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd b/academy/mac/mac_multiply/firmware/am263x-cc/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
index 26f02bf4..11542351 100644
--- a/academy/mac/mac_multiply/firmware/am263x-cc/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
+++ b/academy/mac/mac_multiply/firmware/am263x-cc/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
@@ -17,7 +17,7 @@ MEMORY
 	/* 8 KB PRU Data RAM 0 */
 	PRU0_DMEM_0	: org = 0x00000000 len = 0x00002000
 	/* 8 KB PRU Data RAM 1 */
-	PRU0_DMEM_1	: org = 0x00002000 len = 0x00002000
+	PRU1_DMEM_1	: org = 0x00002000 len = 0x00002000
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/mac/mac_multiply/firmware/am263x-cc/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd b/academy/mac/mac_multiply/firmware/am263x-cc/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
index 70fb0765..cf0121bf 100644
--- a/academy/mac/mac_multiply/firmware/am263x-cc/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
+++ b/academy/mac/mac_multiply/firmware/am263x-cc/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
@@ -17,7 +17,7 @@ MEMORY
 	/* 8 KB PRU Data RAM 1 */
 	PRU1_DMEM_1	: org = 0x00000000 len = 0x00002000
 	/* 8 KB PRU Data RAM 0 */
-	PRU1_DMEM_0	: org = 0x00002000 len = 0x00002000
+	PRU0_DMEM_0	: org = 0x00002000 len = 0x00002000
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/mac/mac_multiply/firmware/am263x-lp/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd b/academy/mac/mac_multiply/firmware/am263x-lp/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
index 26f02bf4..11542351 100644
--- a/academy/mac/mac_multiply/firmware/am263x-lp/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
+++ b/academy/mac/mac_multiply/firmware/am263x-lp/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
@@ -17,7 +17,7 @@ MEMORY
 	/* 8 KB PRU Data RAM 0 */
 	PRU0_DMEM_0	: org = 0x00000000 len = 0x00002000
 	/* 8 KB PRU Data RAM 1 */
-	PRU0_DMEM_1	: org = 0x00002000 len = 0x00002000
+	PRU1_DMEM_1	: org = 0x00002000 len = 0x00002000
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/academy/mac/mac_multiply/firmware/am263x-lp/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd b/academy/mac/mac_multiply/firmware/am263x-lp/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
index 70fb0765..cf0121bf 100644
--- a/academy/mac/mac_multiply/firmware/am263x-lp/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
+++ b/academy/mac/mac_multiply/firmware/am263x-lp/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
@@ -17,7 +17,7 @@ MEMORY
 	/* 8 KB PRU Data RAM 1 */
 	PRU1_DMEM_1	: org = 0x00000000 len = 0x00002000
 	/* 8 KB PRU Data RAM 0 */
-	PRU1_DMEM_0	: org = 0x00002000 len = 0x00002000
+	PRU0_DMEM_0	: org = 0x00002000 len = 0x00002000
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/best_practices.md b/best_practices.md
index d233d735..5452269f 100644
--- a/best_practices.md
+++ b/best_practices.md
@@ -6,7 +6,7 @@
 This document outlines best practices for developing PRU (Programmable Real-time Unit) firmware for Texas Instruments Sitara devices. The PRU is a deterministic, real-time processor subsystem that provides precise timing control and low-latency I/O operations.
 
 **Supported Devices:**
-- AM243x, AM261x, AM263x, AM263px, AM64x series
+- AM243x, AM261x, AM263x, AM263Px, AM62x, AM64x series
 
 ## General Principles
 
diff --git a/docs/getting_started.md b/docs/getting_started.md
index 5316adc5..086e93ea 100644
--- a/docs/getting_started.md
+++ b/docs/getting_started.md
@@ -30,7 +30,7 @@ cores running RTOS, bare metal, or Linux.
 TI supports initializing the PRU from an RTOS or bare metal core on:
 - AM243x (R5F)
 - AM261x (R5F)
-- AM263px (R5F)
+- AM263Px (R5F)
 - AM263x (R5F)
 - AM64x (R5F)
 
diff --git a/examples/LCD_interface/firmware/am243x-lp/icss_g0_pru0_fw/ti-pru-cgt/linker.cmd b/examples/LCD_interface/firmware/am243x-lp/icss_g0_pru0_fw/ti-pru-cgt/linker.cmd
index e58d3815..61b183f9 100644
--- a/examples/LCD_interface/firmware/am243x-lp/icss_g0_pru0_fw/ti-pru-cgt/linker.cmd
+++ b/examples/LCD_interface/firmware/am243x-lp/icss_g0_pru0_fw/ti-pru-cgt/linker.cmd
@@ -19,14 +19,14 @@ MEMORY
       PRU0_DMEM_0       : org = 0x00000000 len = 0x00001000
       /* 8 KB PRU Data RAM 1; reserved completely for Slice1 cores - PRU1,
        * RTU1 and Tx_PRU1; do not use for any Slice0 cores */
-      PRU0_DMEM_1       : org = 0x00002000 len = 0x00001000
+      PRU1_DMEM_1       : org = 0x00002000 len = 0x00001000
       /* NOTE: Custom split of the second 4 KB of ICSS Data RAMs 0 and 1
        * split equally between the corresponding RTU and Tx_PRU cores in
        * each slice */
       RTU0_DMEM_0       : org = 0x00001000 len = 0x00000800
       TX_PRU0_DMEM_0    : org = 0x00001800 len = 0x00000800
-      RTU0_DMEM_1       : org = 0x00003000 len = 0x00000800
-      TX_PRU0_DMEM_1    : org = 0x00003800 len = 0x00000800
+      RTU1_DMEM_1       : org = 0x00003000 len = 0x00000800
+      TX_PRU1_DMEM_1    : org = 0x00003800 len = 0x00000800
 
     PAGE 2:
       /* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/examples/LCD_interface/firmware/am243x-lp/icss_g0_pru1_fw/ti-pru-cgt/linker.cmd b/examples/LCD_interface/firmware/am243x-lp/icss_g0_pru1_fw/ti-pru-cgt/linker.cmd
index 67fc0bb4..8dcba5ef 100644
--- a/examples/LCD_interface/firmware/am243x-lp/icss_g0_pru1_fw/ti-pru-cgt/linker.cmd
+++ b/examples/LCD_interface/firmware/am243x-lp/icss_g0_pru1_fw/ti-pru-cgt/linker.cmd
@@ -15,19 +15,19 @@ MEMORY
 
     PAGE 1:
       /* Data RAMs */
-      /* 8 KB PRU Data RAM 0; use only the first 4 KB for PRU0 and reserve
-       * the second 4 KB for RTU0 and Tx_PRU0 */
-      PRU0_DMEM_0       : org = 0x00000000 len = 0x00001000
-      /* 8 KB PRU Data RAM 1; reserved completely for Slice1 cores - PRU1,
-       * RTU1 and Tx_PRU1; do not use for any Slice0 cores */
-      PRU0_DMEM_1       : org = 0x00002000 len = 0x00001000
+      /* 8 KB PRU Data RAM 1; use only the first 4 KB for PRU1 and reserve
+       * the second 4 KB for RTU1 and Tx_PRU1 */
+      PRU1_DMEM_1       : org = 0x00000000 len = 0x00001000
+      /* 8 KB PRU Data RAM 0; reserved completely for Slice0 cores - PRU0,
+       * RTU0 and Tx_PRU0; do not use for any Slice1 cores */
+      PRU0_DMEM_0       : org = 0x00002000 len = 0x00001000
       /* NOTE: Custom split of the second 4 KB of ICSS Data RAMs 0 and 1
        * split equally between the corresponding RTU and Tx_PRU cores in
        * each slice */
-      RTU0_DMEM_0       : org = 0x00001000 len = 0x00000800
-      TX_PRU0_DMEM_0    : org = 0x00001800 len = 0x00000800
-      RTU0_DMEM_1       : org = 0x00003000 len = 0x00000800
-      TX_PRU0_DMEM_1    : org = 0x00003800 len = 0x00000800
+      RTU1_DMEM_1       : org = 0x00001000 len = 0x00000800
+      TX_PRU1_DMEM_1    : org = 0x00001800 len = 0x00000800
+      RTU0_DMEM_0       : org = 0x00003000 len = 0x00000800
+      TX_PRU0_DMEM_0    : org = 0x00003800 len = 0x00000800
 
     PAGE 2:
       /* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
@@ -39,18 +39,18 @@ MEMORY
 SECTIONS {
 
     .text		>  PRU_IMEM,    PAGE 0
-    .stack		>  PRU0_DMEM_0, PAGE 1
-    .bss		>  PRU0_DMEM_0, PAGE 1
+    .stack		>  PRU1_DMEM_1, PAGE 1
+    .bss		>  PRU1_DMEM_1, PAGE 1
     /*
-    .cio		>  PRU0_DMEM_0, PAGE 1
-    .data		>  PRU0_DMEM_0, PAGE 1
-    .switch		>  PRU0_DMEM_0, PAGE 1
-    .sysmem		>  PRU0_DMEM_0, PAGE 1
-    .cinit		>  PRU0_DMEM_0, PAGE 1
-    .rodata		>  PRU0_DMEM_0, PAGE 1
-    .rofardata	>  PRU0_DMEM_0, PAGE 1
-    .farbss		>  PRU0_DMEM_0, PAGE 1
-    .fardata	>  PRU0_DMEM_0, PAGE 1
+    .cio		>  PRU1_DMEM_1, PAGE 1
+    .data		>  PRU1_DMEM_1, PAGE 1
+    .switch		>  PRU1_DMEM_1, PAGE 1
+    .sysmem		>  PRU1_DMEM_1, PAGE 1
+    .cinit		>  PRU1_DMEM_1, PAGE 1
+    .rodata		>  PRU1_DMEM_1, PAGE 1
+    .rofardata	>  PRU1_DMEM_1, PAGE 1
+    .farbss		>  PRU1_DMEM_1, PAGE 1
+    .fardata	>  PRU1_DMEM_1, PAGE 1
     */
     
 }
diff --git a/examples/custom_frequency_generator/firmware/am243x-lp/icss_g0_pru0_fw/ti-pru-cgt/linker.cmd b/examples/custom_frequency_generator/firmware/am243x-lp/icss_g0_pru0_fw/ti-pru-cgt/linker.cmd
index a69842cd..389d0cbd 100644
--- a/examples/custom_frequency_generator/firmware/am243x-lp/icss_g0_pru0_fw/ti-pru-cgt/linker.cmd
+++ b/examples/custom_frequency_generator/firmware/am243x-lp/icss_g0_pru0_fw/ti-pru-cgt/linker.cmd
@@ -21,14 +21,14 @@ MEMORY
 	PRU0_DMEM_0	: org = 0x00000000 len = 0x00001000	CREGISTER=24
 	/* 8 KB PRU Data RAM 1; reserved completely for Slice1 cores - PRU1,
 	 * RTU1 and Tx_PRU1; do not use for any Slice0 cores */
-	PRU0_DMEM_1	: org = 0x00002000 len = 0x00001000	CREGISTER=25
+	PRU1_DMEM_1	: org = 0x00002000 len = 0x00001000	CREGISTER=25
 	/* NOTE: Custom split of the second 4 KB of ICSS Data RAMs 0 and 1
 	 * split equally between the corresponding RTU and Tx_PRU cores in
 	 * each slice */
 	RTU0_DMEM_0	: org = 0x00001000 len = 0x00000800
 	TX_PRU0_DMEM_0	: org = 0x00001800 len = 0x00000800
-	RTU0_DMEM_1	: org = 0x00003000 len = 0x00000800
-	TX_PRU0_DMEM_1	: org = 0x00003800 len = 0x00000800
+	RTU1_DMEM_1	: org = 0x00003000 len = 0x00000800
+	TX_PRU1_DMEM_1	: org = 0x00003800 len = 0x00000800
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/examples/empty/firmware/am243x-evm/icss_g0_pru0_fw/ti-pru-cgt/linker.cmd b/examples/empty/firmware/am243x-evm/icss_g0_pru0_fw/ti-pru-cgt/linker.cmd
index 021e887d..ff7b62c7 100644
--- a/examples/empty/firmware/am243x-evm/icss_g0_pru0_fw/ti-pru-cgt/linker.cmd
+++ b/examples/empty/firmware/am243x-evm/icss_g0_pru0_fw/ti-pru-cgt/linker.cmd
@@ -19,14 +19,14 @@ MEMORY
 	PRU0_DMEM_0	: org = 0x00000000 len = 0x00001000
 	/* 8 KB PRU Data RAM 1; reserved completely for Slice1 cores - PRU1,
 	 * RTU1 and Tx_PRU1; do not use for any Slice0 cores */
-	PRU0_DMEM_1	: org = 0x00002000 len = 0x00001000
+	PRU1_DMEM_1	: org = 0x00002000 len = 0x00001000
 	/* NOTE: Custom split of the second 4 KB of ICSS Data RAMs 0 and 1
 	 * split equally between the corresponding RTU and Tx_PRU cores in
 	 * each slice */
 	RTU0_DMEM_0	: org = 0x00001000 len = 0x00000800
 	TX_PRU0_DMEM_0	: org = 0x00001800 len = 0x00000800
-	RTU0_DMEM_1	: org = 0x00003000 len = 0x00000800
-	TX_PRU0_DMEM_1	: org = 0x00003800 len = 0x00000800
+	RTU1_DMEM_1	: org = 0x00003000 len = 0x00000800
+	TX_PRU1_DMEM_1	: org = 0x00003800 len = 0x00000800
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/examples/empty/firmware/am243x-evm/icss_g0_pru1_fw/ti-pru-cgt/linker.cmd b/examples/empty/firmware/am243x-evm/icss_g0_pru1_fw/ti-pru-cgt/linker.cmd
index bd059cb2..7d044555 100644
--- a/examples/empty/firmware/am243x-evm/icss_g0_pru1_fw/ti-pru-cgt/linker.cmd
+++ b/examples/empty/firmware/am243x-evm/icss_g0_pru1_fw/ti-pru-cgt/linker.cmd
@@ -19,14 +19,14 @@ MEMORY
 	PRU1_DMEM_1	: org = 0x00000000 len = 0x00001000
 	/* 8 KB PRU Data RAM 0; reserved completely for Slice0 cores - PRU0,
 	 * RTU0 and Tx_PRU0; do not use for any Slice1 cores */
-	PRU1_DMEM_0	: org = 0x00002000 len = 0x00001000
+	PRU0_DMEM_0	: org = 0x00002000 len = 0x00001000
 	/* NOTE: Custom split of the second 4 KB of ICSS Data RAMs 0 and 1
 	 * split equally between the corresponding RTU and Tx_PRU cores in
 	 * each slice */
 	RTU1_DMEM_1	: org = 0x00001000 len = 0x00000800
 	TX_PRU1_DMEM_1	: org = 0x00001800 len = 0x00000800
-	RTU1_DMEM_0	: org = 0x00003000 len = 0x00000800
-	TX_PRU1_DMEM_0	: org = 0x00003800 len = 0x00000800
+	RTU0_DMEM_0	: org = 0x00003000 len = 0x00000800
+	TX_PRU0_DMEM_0	: org = 0x00003800 len = 0x00000800
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/examples/empty/firmware/am243x-evm/icss_g0_rtu_pru0_fw/ti-pru-cgt/linker.cmd b/examples/empty/firmware/am243x-evm/icss_g0_rtu_pru0_fw/ti-pru-cgt/linker.cmd
index ad61c5df..d0a58770 100644
--- a/examples/empty/firmware/am243x-evm/icss_g0_rtu_pru0_fw/ti-pru-cgt/linker.cmd
+++ b/examples/empty/firmware/am243x-evm/icss_g0_rtu_pru0_fw/ti-pru-cgt/linker.cmd
@@ -19,14 +19,14 @@ MEMORY
 	PRU0_DMEM_0	: org = 0x00000000 len = 0x00001000
 	/* 8 KB PRU Data RAM 1; reserved completely for Slice1 cores - PRU1,
 	 * RTU1 and Tx_PRU1; do not use for any Slice0 cores */
-	PRU0_DMEM_1	: org = 0x00002000 len = 0x00001000
+	PRU1_DMEM_1	: org = 0x00002000 len = 0x00001000
 	/* NOTE: Custom split of the second 4 KB of ICSS Data RAMs 0 and 1
 	 * split equally between the corresponding RTU and Tx_PRU cores in
 	 * each slice */
 	RTU0_DMEM_0	: org = 0x00001000 len = 0x00000800
 	TX_PRU0_DMEM_0	: org = 0x00001800 len = 0x00000800
-	RTU0_DMEM_1	: org = 0x00003000 len = 0x00000800
-	TX_PRU0_DMEM_1	: org = 0x00003800 len = 0x00000800
+	RTU1_DMEM_1	: org = 0x00003000 len = 0x00000800
+	TX_PRU1_DMEM_1	: org = 0x00003800 len = 0x00000800
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/examples/empty/firmware/am243x-evm/icss_g0_rtu_pru1_fw/ti-pru-cgt/linker.cmd b/examples/empty/firmware/am243x-evm/icss_g0_rtu_pru1_fw/ti-pru-cgt/linker.cmd
index f9573fe6..a0f7c997 100644
--- a/examples/empty/firmware/am243x-evm/icss_g0_rtu_pru1_fw/ti-pru-cgt/linker.cmd
+++ b/examples/empty/firmware/am243x-evm/icss_g0_rtu_pru1_fw/ti-pru-cgt/linker.cmd
@@ -19,14 +19,14 @@ MEMORY
 	PRU1_DMEM_1	: org = 0x00000000 len = 0x00001000
 	/* 8 KB PRU Data RAM 0; reserved completely for Slice0 cores - PRU0,
 	 * RTU0 and Tx_PRU0; do not use for any Slice1 cores */
-	PRU1_DMEM_0	: org = 0x00002000 len = 0x00001000
+	PRU0_DMEM_0	: org = 0x00002000 len = 0x00001000
 	/* NOTE: Custom split of the second 4 KB of ICSS Data RAMs 0 and 1
 	 * split equally between the corresponding RTU and Tx_PRU cores in
 	 * each slice */
 	RTU1_DMEM_1	: org = 0x00001000 len = 0x00000800
 	TX_PRU1_DMEM_1	: org = 0x00001800 len = 0x00000800
-	RTU1_DMEM_0	: org = 0x00003000 len = 0x00000800
-	TX_PRU1_DMEM_0	: org = 0x00003800 len = 0x00000800
+	RTU0_DMEM_0	: org = 0x00003000 len = 0x00000800
+	TX_PRU0_DMEM_0	: org = 0x00003800 len = 0x00000800
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/examples/empty/firmware/am243x-evm/icss_g0_tx_pru0_fw/ti-pru-cgt/linker.cmd b/examples/empty/firmware/am243x-evm/icss_g0_tx_pru0_fw/ti-pru-cgt/linker.cmd
index 7adf8ced..4f793ea1 100644
--- a/examples/empty/firmware/am243x-evm/icss_g0_tx_pru0_fw/ti-pru-cgt/linker.cmd
+++ b/examples/empty/firmware/am243x-evm/icss_g0_tx_pru0_fw/ti-pru-cgt/linker.cmd
@@ -19,14 +19,14 @@ MEMORY
 	PRU0_DMEM_0	: org = 0x00000000 len = 0x00001000
 	/* 8 KB PRU Data RAM 1; reserved completely for Slice1 cores - PRU1,
 	 * RTU1 and Tx_PRU1; do not use for any Slice0 cores */
-	PRU0_DMEM_1	: org = 0x00002000 len = 0x00001000
+	PRU1_DMEM_1	: org = 0x00002000 len = 0x00001000
 	/* NOTE: Custom split of the second 4 KB of ICSS Data RAMs 0 and 1
 	 * split equally between the corresponding RTU and Tx_PRU cores in
 	 * each slice */
 	RTU0_DMEM_0	: org = 0x00001000 len = 0x00000800
 	TX_PRU0_DMEM_0	: org = 0x00001800 len = 0x00000800
-	RTU0_DMEM_1	: org = 0x00003000 len = 0x00000800
-	TX_PRU0_DMEM_1	: org = 0x00003800 len = 0x00000800
+	RTU1_DMEM_1	: org = 0x00003000 len = 0x00000800
+	TX_PRU1_DMEM_1	: org = 0x00003800 len = 0x00000800
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/examples/empty/firmware/am243x-evm/icss_g0_tx_pru1_fw/ti-pru-cgt/linker.cmd b/examples/empty/firmware/am243x-evm/icss_g0_tx_pru1_fw/ti-pru-cgt/linker.cmd
index d61c0ae9..a9870ece 100644
--- a/examples/empty/firmware/am243x-evm/icss_g0_tx_pru1_fw/ti-pru-cgt/linker.cmd
+++ b/examples/empty/firmware/am243x-evm/icss_g0_tx_pru1_fw/ti-pru-cgt/linker.cmd
@@ -19,14 +19,14 @@ MEMORY
 	PRU1_DMEM_1	: org = 0x00000000 len = 0x00001000
 	/* 8 KB PRU Data RAM 0; reserved completely for Slice0 cores - PRU0,
 	 * RTU0 and Tx_PRU0; do not use for any Slice1 cores */
-	PRU1_DMEM_0	: org = 0x00002000 len = 0x00001000
+	PRU0_DMEM_0	: org = 0x00002000 len = 0x00001000
 	/* NOTE: Custom split of the second 4 KB of ICSS Data RAMs 0 and 1
 	 * split equally between the corresponding RTU and Tx_PRU cores in
 	 * each slice */
 	RTU1_DMEM_1	: org = 0x00001000 len = 0x00000800
 	TX_PRU1_DMEM_1	: org = 0x00001800 len = 0x00000800
-	RTU1_DMEM_0	: org = 0x00003000 len = 0x00000800
-	TX_PRU1_DMEM_0	: org = 0x00003800 len = 0x00000800
+	RTU0_DMEM_0	: org = 0x00003000 len = 0x00000800
+	TX_PRU0_DMEM_0	: org = 0x00003800 len = 0x00000800
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/examples/empty/firmware/am243x-lp/icss_g0_pru0_fw/ti-pru-cgt/linker.cmd b/examples/empty/firmware/am243x-lp/icss_g0_pru0_fw/ti-pru-cgt/linker.cmd
index 021e887d..ff7b62c7 100644
--- a/examples/empty/firmware/am243x-lp/icss_g0_pru0_fw/ti-pru-cgt/linker.cmd
+++ b/examples/empty/firmware/am243x-lp/icss_g0_pru0_fw/ti-pru-cgt/linker.cmd
@@ -19,14 +19,14 @@ MEMORY
 	PRU0_DMEM_0	: org = 0x00000000 len = 0x00001000
 	/* 8 KB PRU Data RAM 1; reserved completely for Slice1 cores - PRU1,
 	 * RTU1 and Tx_PRU1; do not use for any Slice0 cores */
-	PRU0_DMEM_1	: org = 0x00002000 len = 0x00001000
+	PRU1_DMEM_1	: org = 0x00002000 len = 0x00001000
 	/* NOTE: Custom split of the second 4 KB of ICSS Data RAMs 0 and 1
 	 * split equally between the corresponding RTU and Tx_PRU cores in
 	 * each slice */
 	RTU0_DMEM_0	: org = 0x00001000 len = 0x00000800
 	TX_PRU0_DMEM_0	: org = 0x00001800 len = 0x00000800
-	RTU0_DMEM_1	: org = 0x00003000 len = 0x00000800
-	TX_PRU0_DMEM_1	: org = 0x00003800 len = 0x00000800
+	RTU1_DMEM_1	: org = 0x00003000 len = 0x00000800
+	TX_PRU1_DMEM_1	: org = 0x00003800 len = 0x00000800
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/examples/empty/firmware/am243x-lp/icss_g0_pru1_fw/ti-pru-cgt/linker.cmd b/examples/empty/firmware/am243x-lp/icss_g0_pru1_fw/ti-pru-cgt/linker.cmd
index bd059cb2..7d044555 100644
--- a/examples/empty/firmware/am243x-lp/icss_g0_pru1_fw/ti-pru-cgt/linker.cmd
+++ b/examples/empty/firmware/am243x-lp/icss_g0_pru1_fw/ti-pru-cgt/linker.cmd
@@ -19,14 +19,14 @@ MEMORY
 	PRU1_DMEM_1	: org = 0x00000000 len = 0x00001000
 	/* 8 KB PRU Data RAM 0; reserved completely for Slice0 cores - PRU0,
 	 * RTU0 and Tx_PRU0; do not use for any Slice1 cores */
-	PRU1_DMEM_0	: org = 0x00002000 len = 0x00001000
+	PRU0_DMEM_0	: org = 0x00002000 len = 0x00001000
 	/* NOTE: Custom split of the second 4 KB of ICSS Data RAMs 0 and 1
 	 * split equally between the corresponding RTU and Tx_PRU cores in
 	 * each slice */
 	RTU1_DMEM_1	: org = 0x00001000 len = 0x00000800
 	TX_PRU1_DMEM_1	: org = 0x00001800 len = 0x00000800
-	RTU1_DMEM_0	: org = 0x00003000 len = 0x00000800
-	TX_PRU1_DMEM_0	: org = 0x00003800 len = 0x00000800
+	RTU0_DMEM_0	: org = 0x00003000 len = 0x00000800
+	TX_PRU0_DMEM_0	: org = 0x00003800 len = 0x00000800
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/examples/empty/firmware/am243x-lp/icss_g0_rtu_pru0_fw/ti-pru-cgt/linker.cmd b/examples/empty/firmware/am243x-lp/icss_g0_rtu_pru0_fw/ti-pru-cgt/linker.cmd
index ad61c5df..d0a58770 100644
--- a/examples/empty/firmware/am243x-lp/icss_g0_rtu_pru0_fw/ti-pru-cgt/linker.cmd
+++ b/examples/empty/firmware/am243x-lp/icss_g0_rtu_pru0_fw/ti-pru-cgt/linker.cmd
@@ -19,14 +19,14 @@ MEMORY
 	PRU0_DMEM_0	: org = 0x00000000 len = 0x00001000
 	/* 8 KB PRU Data RAM 1; reserved completely for Slice1 cores - PRU1,
 	 * RTU1 and Tx_PRU1; do not use for any Slice0 cores */
-	PRU0_DMEM_1	: org = 0x00002000 len = 0x00001000
+	PRU1_DMEM_1	: org = 0x00002000 len = 0x00001000
 	/* NOTE: Custom split of the second 4 KB of ICSS Data RAMs 0 and 1
 	 * split equally between the corresponding RTU and Tx_PRU cores in
 	 * each slice */
 	RTU0_DMEM_0	: org = 0x00001000 len = 0x00000800
 	TX_PRU0_DMEM_0	: org = 0x00001800 len = 0x00000800
-	RTU0_DMEM_1	: org = 0x00003000 len = 0x00000800
-	TX_PRU0_DMEM_1	: org = 0x00003800 len = 0x00000800
+	RTU1_DMEM_1	: org = 0x00003000 len = 0x00000800
+	TX_PRU1_DMEM_1	: org = 0x00003800 len = 0x00000800
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/examples/empty/firmware/am243x-lp/icss_g0_rtu_pru1_fw/ti-pru-cgt/linker.cmd b/examples/empty/firmware/am243x-lp/icss_g0_rtu_pru1_fw/ti-pru-cgt/linker.cmd
index f9573fe6..a0f7c997 100644
--- a/examples/empty/firmware/am243x-lp/icss_g0_rtu_pru1_fw/ti-pru-cgt/linker.cmd
+++ b/examples/empty/firmware/am243x-lp/icss_g0_rtu_pru1_fw/ti-pru-cgt/linker.cmd
@@ -19,14 +19,14 @@ MEMORY
 	PRU1_DMEM_1	: org = 0x00000000 len = 0x00001000
 	/* 8 KB PRU Data RAM 0; reserved completely for Slice0 cores - PRU0,
 	 * RTU0 and Tx_PRU0; do not use for any Slice1 cores */
-	PRU1_DMEM_0	: org = 0x00002000 len = 0x00001000
+	PRU0_DMEM_0	: org = 0x00002000 len = 0x00001000
 	/* NOTE: Custom split of the second 4 KB of ICSS Data RAMs 0 and 1
 	 * split equally between the corresponding RTU and Tx_PRU cores in
 	 * each slice */
 	RTU1_DMEM_1	: org = 0x00001000 len = 0x00000800
 	TX_PRU1_DMEM_1	: org = 0x00001800 len = 0x00000800
-	RTU1_DMEM_0	: org = 0x00003000 len = 0x00000800
-	TX_PRU1_DMEM_0	: org = 0x00003800 len = 0x00000800
+	RTU0_DMEM_0	: org = 0x00003000 len = 0x00000800
+	TX_PRU0_DMEM_0	: org = 0x00003800 len = 0x00000800
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/examples/empty/firmware/am243x-lp/icss_g0_tx_pru0_fw/ti-pru-cgt/linker.cmd b/examples/empty/firmware/am243x-lp/icss_g0_tx_pru0_fw/ti-pru-cgt/linker.cmd
index 7adf8ced..4f793ea1 100644
--- a/examples/empty/firmware/am243x-lp/icss_g0_tx_pru0_fw/ti-pru-cgt/linker.cmd
+++ b/examples/empty/firmware/am243x-lp/icss_g0_tx_pru0_fw/ti-pru-cgt/linker.cmd
@@ -19,14 +19,14 @@ MEMORY
 	PRU0_DMEM_0	: org = 0x00000000 len = 0x00001000
 	/* 8 KB PRU Data RAM 1; reserved completely for Slice1 cores - PRU1,
 	 * RTU1 and Tx_PRU1; do not use for any Slice0 cores */
-	PRU0_DMEM_1	: org = 0x00002000 len = 0x00001000
+	PRU1_DMEM_1	: org = 0x00002000 len = 0x00001000
 	/* NOTE: Custom split of the second 4 KB of ICSS Data RAMs 0 and 1
 	 * split equally between the corresponding RTU and Tx_PRU cores in
 	 * each slice */
 	RTU0_DMEM_0	: org = 0x00001000 len = 0x00000800
 	TX_PRU0_DMEM_0	: org = 0x00001800 len = 0x00000800
-	RTU0_DMEM_1	: org = 0x00003000 len = 0x00000800
-	TX_PRU0_DMEM_1	: org = 0x00003800 len = 0x00000800
+	RTU1_DMEM_1	: org = 0x00003000 len = 0x00000800
+	TX_PRU1_DMEM_1	: org = 0x00003800 len = 0x00000800
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/examples/empty/firmware/am243x-lp/icss_g0_tx_pru1_fw/ti-pru-cgt/linker.cmd b/examples/empty/firmware/am243x-lp/icss_g0_tx_pru1_fw/ti-pru-cgt/linker.cmd
index d61c0ae9..a9870ece 100644
--- a/examples/empty/firmware/am243x-lp/icss_g0_tx_pru1_fw/ti-pru-cgt/linker.cmd
+++ b/examples/empty/firmware/am243x-lp/icss_g0_tx_pru1_fw/ti-pru-cgt/linker.cmd
@@ -19,14 +19,14 @@ MEMORY
 	PRU1_DMEM_1	: org = 0x00000000 len = 0x00001000
 	/* 8 KB PRU Data RAM 0; reserved completely for Slice0 cores - PRU0,
 	 * RTU0 and Tx_PRU0; do not use for any Slice1 cores */
-	PRU1_DMEM_0	: org = 0x00002000 len = 0x00001000
+	PRU0_DMEM_0	: org = 0x00002000 len = 0x00001000
 	/* NOTE: Custom split of the second 4 KB of ICSS Data RAMs 0 and 1
 	 * split equally between the corresponding RTU and Tx_PRU cores in
 	 * each slice */
 	RTU1_DMEM_1	: org = 0x00001000 len = 0x00000800
 	TX_PRU1_DMEM_1	: org = 0x00001800 len = 0x00000800
-	RTU1_DMEM_0	: org = 0x00003000 len = 0x00000800
-	TX_PRU1_DMEM_0	: org = 0x00003800 len = 0x00000800
+	RTU0_DMEM_0	: org = 0x00003000 len = 0x00000800
+	TX_PRU0_DMEM_0	: org = 0x00003800 len = 0x00000800
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/examples/empty/firmware/am261x-lp/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd b/examples/empty/firmware/am261x-lp/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
index 672e9b92..13fdcb5e 100644
--- a/examples/empty/firmware/am261x-lp/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
+++ b/examples/empty/firmware/am261x-lp/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
@@ -17,7 +17,7 @@ MEMORY
 	/* 8 KB PRU Data RAM 0 */
 	PRU0_DMEM_0	: org = 0x00000000 len = 0x00002000
 	/* 8 KB PRU Data RAM 1 */
-	PRU0_DMEM_1	: org = 0x00002000 len = 0x00002000
+	PRU1_DMEM_1	: org = 0x00002000 len = 0x00002000
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/examples/empty/firmware/am261x-lp/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd b/examples/empty/firmware/am261x-lp/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
index 66f6da5e..774184dd 100644
--- a/examples/empty/firmware/am261x-lp/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
+++ b/examples/empty/firmware/am261x-lp/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
@@ -17,7 +17,7 @@ MEMORY
 	/* 8 KB PRU Data RAM 1 */
 	PRU1_DMEM_1	: org = 0x00000000 len = 0x00002000
 	/* 8 KB PRU Data RAM 0 */
-	PRU1_DMEM_0	: org = 0x00002000 len = 0x00002000
+	PRU0_DMEM_0	: org = 0x00002000 len = 0x00002000
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/examples/empty/firmware/am261x-som/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd b/examples/empty/firmware/am261x-som/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
index 672e9b92..13fdcb5e 100644
--- a/examples/empty/firmware/am261x-som/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
+++ b/examples/empty/firmware/am261x-som/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
@@ -17,7 +17,7 @@ MEMORY
 	/* 8 KB PRU Data RAM 0 */
 	PRU0_DMEM_0	: org = 0x00000000 len = 0x00002000
 	/* 8 KB PRU Data RAM 1 */
-	PRU0_DMEM_1	: org = 0x00002000 len = 0x00002000
+	PRU1_DMEM_1	: org = 0x00002000 len = 0x00002000
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/examples/empty/firmware/am261x-som/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd b/examples/empty/firmware/am261x-som/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
index 66f6da5e..774184dd 100644
--- a/examples/empty/firmware/am261x-som/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
+++ b/examples/empty/firmware/am261x-som/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
@@ -17,7 +17,7 @@ MEMORY
 	/* 8 KB PRU Data RAM 1 */
 	PRU1_DMEM_1	: org = 0x00000000 len = 0x00002000
 	/* 8 KB PRU Data RAM 0 */
-	PRU1_DMEM_0	: org = 0x00002000 len = 0x00002000
+	PRU0_DMEM_0	: org = 0x00002000 len = 0x00002000
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/examples/empty/firmware/am263px-cc/icss_m0_pru0_fw/ti-pru-cgt/example.projectspec b/examples/empty/firmware/am263px-cc/icss_m0_pru0_fw/ti-pru-cgt/example.projectspec
index bae3e632..d8ca147b 100644
--- a/examples/empty/firmware/am263px-cc/icss_m0_pru0_fw/ti-pru-cgt/example.projectspec
+++ b/examples/empty/firmware/am263px-cc/icss_m0_pru0_fw/ti-pru-cgt/example.projectspec
@@ -4,7 +4,7 @@
         <when>
             <context
                 deviceFamily="PRU"
-                deviceId="AM263px"
+                deviceId="AM263Px"
             />
         </when>
     </applicability>
@@ -20,7 +20,7 @@
         connection="TIXDS110_Connection.xml"
         toolChain="TI"
         cgtVersion="2.3.3"
-        device="AM263px"
+        device="AM263Px"
         deviceCore="ICSSM_PRU_0"
         ignoreDefaultDeviceSettings="true"
         ignoreDefaultCCSSettings="true"
diff --git a/examples/empty/firmware/am263px-cc/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd b/examples/empty/firmware/am263px-cc/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
index 9da5f8e7..5b64bc7e 100644
--- a/examples/empty/firmware/am263px-cc/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
+++ b/examples/empty/firmware/am263px-cc/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
@@ -1,8 +1,8 @@
 /*
- * AM263px_PRU0.cmd
+ * AM263Px_PRU0.cmd
  *
  * Example Linker command file for linking assembly programs built with the TI-PRU-CGT
- * on AM263px PRU0 cores
+ * on AM263Px PRU0 cores
  */
 
 /* Specify the System Memory Map */
@@ -17,7 +17,7 @@ MEMORY
 	/* 8 KB PRU Data RAM 0 */
 	PRU0_DMEM_0	: org = 0x00000000 len = 0x00002000
 	/* 8 KB PRU Data RAM 1 */
-	PRU0_DMEM_1	: org = 0x00002000 len = 0x00002000
+	PRU1_DMEM_1	: org = 0x00002000 len = 0x00002000
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/examples/empty/firmware/am263px-cc/icss_m0_pru1_fw/ti-pru-cgt/example.projectspec b/examples/empty/firmware/am263px-cc/icss_m0_pru1_fw/ti-pru-cgt/example.projectspec
index 09240e3f..ccdca12f 100644
--- a/examples/empty/firmware/am263px-cc/icss_m0_pru1_fw/ti-pru-cgt/example.projectspec
+++ b/examples/empty/firmware/am263px-cc/icss_m0_pru1_fw/ti-pru-cgt/example.projectspec
@@ -4,7 +4,7 @@
         <when>
             <context
                 deviceFamily="PRU"
-                deviceId="AM263px"
+                deviceId="AM263Px"
             />
         </when>
     </applicability>
@@ -20,7 +20,7 @@
         connection="TIXDS110_Connection.xml"
         toolChain="TI"
         cgtVersion="2.3.3"
-        device="AM263px"
+        device="AM263Px"
         deviceCore="ICSSM_PRU_1"
         ignoreDefaultDeviceSettings="true"
         ignoreDefaultCCSSettings="true"
diff --git a/examples/empty/firmware/am263px-cc/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd b/examples/empty/firmware/am263px-cc/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
index 23af1b71..57db723f 100644
--- a/examples/empty/firmware/am263px-cc/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
+++ b/examples/empty/firmware/am263px-cc/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
@@ -1,8 +1,8 @@
 /*
- * AM263px_PRU1.cmd
+ * AM263Px_PRU1.cmd
  *
  * Example Linker command file for linking assembly programs built with the TI-PRU-CGT
- * on AM263px PRU1 cores
+ * on AM263Px PRU1 cores
  */
 
 /* Specify the System Memory Map */
@@ -17,7 +17,7 @@ MEMORY
 	/* 8 KB PRU Data RAM 1 */
 	PRU1_DMEM_1	: org = 0x00000000 len = 0x00002000
 	/* 8 KB PRU Data RAM 0 */
-	PRU1_DMEM_0	: org = 0x00002000 len = 0x00002000
+	PRU0_DMEM_0	: org = 0x00002000 len = 0x00002000
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/examples/empty/firmware/am263px-lp/icss_m0_pru0_fw/ti-pru-cgt/example.projectspec b/examples/empty/firmware/am263px-lp/icss_m0_pru0_fw/ti-pru-cgt/example.projectspec
index 43790ee2..d206b00e 100644
--- a/examples/empty/firmware/am263px-lp/icss_m0_pru0_fw/ti-pru-cgt/example.projectspec
+++ b/examples/empty/firmware/am263px-lp/icss_m0_pru0_fw/ti-pru-cgt/example.projectspec
@@ -4,7 +4,7 @@
         <when>
             <context
                 deviceFamily="PRU"
-                deviceId="AM263px"
+                deviceId="AM263Px"
             />
         </when>
     </applicability>
@@ -20,7 +20,7 @@
         connection="TIXDS110_Connection.xml"
         toolChain="TI"
         cgtVersion="2.3.3"
-        device="AM263px"
+        device="AM263Px"
         deviceCore="ICSSM_PRU_0"
         ignoreDefaultDeviceSettings="true"
         ignoreDefaultCCSSettings="true"
diff --git a/examples/empty/firmware/am263px-lp/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd b/examples/empty/firmware/am263px-lp/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
index 9da5f8e7..5b64bc7e 100644
--- a/examples/empty/firmware/am263px-lp/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
+++ b/examples/empty/firmware/am263px-lp/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
@@ -1,8 +1,8 @@
 /*
- * AM263px_PRU0.cmd
+ * AM263Px_PRU0.cmd
  *
  * Example Linker command file for linking assembly programs built with the TI-PRU-CGT
- * on AM263px PRU0 cores
+ * on AM263Px PRU0 cores
  */
 
 /* Specify the System Memory Map */
@@ -17,7 +17,7 @@ MEMORY
 	/* 8 KB PRU Data RAM 0 */
 	PRU0_DMEM_0	: org = 0x00000000 len = 0x00002000
 	/* 8 KB PRU Data RAM 1 */
-	PRU0_DMEM_1	: org = 0x00002000 len = 0x00002000
+	PRU1_DMEM_1	: org = 0x00002000 len = 0x00002000
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/examples/empty/firmware/am263px-lp/icss_m0_pru1_fw/ti-pru-cgt/example.projectspec b/examples/empty/firmware/am263px-lp/icss_m0_pru1_fw/ti-pru-cgt/example.projectspec
index 92396927..3e0cf0ee 100644
--- a/examples/empty/firmware/am263px-lp/icss_m0_pru1_fw/ti-pru-cgt/example.projectspec
+++ b/examples/empty/firmware/am263px-lp/icss_m0_pru1_fw/ti-pru-cgt/example.projectspec
@@ -4,7 +4,7 @@
         <when>
             <context
                 deviceFamily="PRU"
-                deviceId="AM263px"
+                deviceId="AM263Px"
             />
         </when>
     </applicability>
@@ -20,7 +20,7 @@
         connection="TIXDS110_Connection.xml"
         toolChain="TI"
         cgtVersion="2.3.3"
-        device="AM263px"
+        device="AM263Px"
         deviceCore="ICSSM_PRU_1"
         ignoreDefaultDeviceSettings="true"
         ignoreDefaultCCSSettings="true"
diff --git a/examples/empty/firmware/am263px-lp/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd b/examples/empty/firmware/am263px-lp/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
index 23af1b71..57db723f 100644
--- a/examples/empty/firmware/am263px-lp/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
+++ b/examples/empty/firmware/am263px-lp/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
@@ -1,8 +1,8 @@
 /*
- * AM263px_PRU1.cmd
+ * AM263Px_PRU1.cmd
  *
  * Example Linker command file for linking assembly programs built with the TI-PRU-CGT
- * on AM263px PRU1 cores
+ * on AM263Px PRU1 cores
  */
 
 /* Specify the System Memory Map */
@@ -17,7 +17,7 @@ MEMORY
 	/* 8 KB PRU Data RAM 1 */
 	PRU1_DMEM_1	: org = 0x00000000 len = 0x00002000
 	/* 8 KB PRU Data RAM 0 */
-	PRU1_DMEM_0	: org = 0x00002000 len = 0x00002000
+	PRU0_DMEM_0	: org = 0x00002000 len = 0x00002000
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/examples/empty/firmware/am263x-cc/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd b/examples/empty/firmware/am263x-cc/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
index 26f02bf4..11542351 100644
--- a/examples/empty/firmware/am263x-cc/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
+++ b/examples/empty/firmware/am263x-cc/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
@@ -17,7 +17,7 @@ MEMORY
 	/* 8 KB PRU Data RAM 0 */
 	PRU0_DMEM_0	: org = 0x00000000 len = 0x00002000
 	/* 8 KB PRU Data RAM 1 */
-	PRU0_DMEM_1	: org = 0x00002000 len = 0x00002000
+	PRU1_DMEM_1	: org = 0x00002000 len = 0x00002000
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/examples/empty/firmware/am263x-cc/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd b/examples/empty/firmware/am263x-cc/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
index 70fb0765..cf0121bf 100644
--- a/examples/empty/firmware/am263x-cc/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
+++ b/examples/empty/firmware/am263x-cc/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
@@ -17,7 +17,7 @@ MEMORY
 	/* 8 KB PRU Data RAM 1 */
 	PRU1_DMEM_1	: org = 0x00000000 len = 0x00002000
 	/* 8 KB PRU Data RAM 0 */
-	PRU1_DMEM_0	: org = 0x00002000 len = 0x00002000
+	PRU0_DMEM_0	: org = 0x00002000 len = 0x00002000
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/examples/empty/firmware/am263x-lp/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd b/examples/empty/firmware/am263x-lp/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
index 26f02bf4..11542351 100644
--- a/examples/empty/firmware/am263x-lp/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
+++ b/examples/empty/firmware/am263x-lp/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
@@ -17,7 +17,7 @@ MEMORY
 	/* 8 KB PRU Data RAM 0 */
 	PRU0_DMEM_0	: org = 0x00000000 len = 0x00002000
 	/* 8 KB PRU Data RAM 1 */
-	PRU0_DMEM_1	: org = 0x00002000 len = 0x00002000
+	PRU1_DMEM_1	: org = 0x00002000 len = 0x00002000
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/examples/empty/firmware/am263x-lp/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd b/examples/empty/firmware/am263x-lp/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
index 70fb0765..cf0121bf 100644
--- a/examples/empty/firmware/am263x-lp/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
+++ b/examples/empty/firmware/am263x-lp/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
@@ -17,7 +17,7 @@ MEMORY
 	/* 8 KB PRU Data RAM 1 */
 	PRU1_DMEM_1	: org = 0x00000000 len = 0x00002000
 	/* 8 KB PRU Data RAM 0 */
-	PRU1_DMEM_0	: org = 0x00002000 len = 0x00002000
+	PRU0_DMEM_0	: org = 0x00002000 len = 0x00002000
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/examples/empty/firmware/am62x-sk/pruss0_pru0_fw/ti-pru-cgt/linker.cmd b/examples/empty/firmware/am62x-sk/pruss0_pru0_fw/ti-pru-cgt/linker.cmd
index 85c8145a..4f8f21fe 100644
--- a/examples/empty/firmware/am62x-sk/pruss0_pru0_fw/ti-pru-cgt/linker.cmd
+++ b/examples/empty/firmware/am62x-sk/pruss0_pru0_fw/ti-pru-cgt/linker.cmd
@@ -17,7 +17,7 @@ MEMORY
 	/* 8 KB PRU Data RAM 0 */
 	PRU0_DMEM_0	: org = 0x00000000 len = 0x00002000
 	/* 8 KB PRU Data RAM 1 */
-	PRU0_DMEM_1	: org = 0x00002000 len = 0x00002000
+	PRU1_DMEM_1	: org = 0x00002000 len = 0x00002000
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/examples/empty/firmware/am62x-sk/pruss0_pru1_fw/ti-pru-cgt/linker.cmd b/examples/empty/firmware/am62x-sk/pruss0_pru1_fw/ti-pru-cgt/linker.cmd
index e70c5725..7b3f96b4 100644
--- a/examples/empty/firmware/am62x-sk/pruss0_pru1_fw/ti-pru-cgt/linker.cmd
+++ b/examples/empty/firmware/am62x-sk/pruss0_pru1_fw/ti-pru-cgt/linker.cmd
@@ -17,7 +17,7 @@ MEMORY
 	/* 8 KB PRU Data RAM 1 */
 	PRU1_DMEM_1	: org = 0x00000000 len = 0x00002000
 	/* 8 KB PRU Data RAM 0 */
-	PRU1_DMEM_0	: org = 0x00002000 len = 0x00002000
+	PRU0_DMEM_0	: org = 0x00002000 len = 0x00002000
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/examples/empty/firmware/am64x-evm/icss_g0_pru0_fw/ti-pru-cgt/linker.cmd b/examples/empty/firmware/am64x-evm/icss_g0_pru0_fw/ti-pru-cgt/linker.cmd
index ca7f6092..bb67e095 100644
--- a/examples/empty/firmware/am64x-evm/icss_g0_pru0_fw/ti-pru-cgt/linker.cmd
+++ b/examples/empty/firmware/am64x-evm/icss_g0_pru0_fw/ti-pru-cgt/linker.cmd
@@ -19,14 +19,14 @@ MEMORY
 	PRU0_DMEM_0	: org = 0x00000000 len = 0x00001000
 	/* 8 KB PRU Data RAM 1; reserved completely for Slice1 cores - PRU1,
 	 * RTU1 and Tx_PRU1; do not use for any Slice0 cores */
-	PRU0_DMEM_1	: org = 0x00002000 len = 0x00001000
+	PRU1_DMEM_1	: org = 0x00002000 len = 0x00001000
 	/* NOTE: Custom split of the second 4 KB of ICSS Data RAMs 0 and 1
 	 * split equally between the corresponding RTU and Tx_PRU cores in
 	 * each slice */
 	RTU0_DMEM_0	: org = 0x00001000 len = 0x00000800
 	TX_PRU0_DMEM_0	: org = 0x00001800 len = 0x00000800
-	RTU0_DMEM_1	: org = 0x00003000 len = 0x00000800
-	TX_PRU0_DMEM_1	: org = 0x00003800 len = 0x00000800
+	RTU1_DMEM_1	: org = 0x00003000 len = 0x00000800
+	TX_PRU1_DMEM_1	: org = 0x00003800 len = 0x00000800
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/examples/empty/firmware/am64x-evm/icss_g0_pru1_fw/ti-pru-cgt/linker.cmd b/examples/empty/firmware/am64x-evm/icss_g0_pru1_fw/ti-pru-cgt/linker.cmd
index 2be2074b..4804d56c 100644
--- a/examples/empty/firmware/am64x-evm/icss_g0_pru1_fw/ti-pru-cgt/linker.cmd
+++ b/examples/empty/firmware/am64x-evm/icss_g0_pru1_fw/ti-pru-cgt/linker.cmd
@@ -19,14 +19,14 @@ MEMORY
 	PRU1_DMEM_1	: org = 0x00000000 len = 0x00001000
 	/* 8 KB PRU Data RAM 0; reserved completely for Slice0 cores - PRU0,
 	 * RTU0 and Tx_PRU0; do not use for any Slice1 cores */
-	PRU1_DMEM_0	: org = 0x00002000 len = 0x00001000
+	PRU0_DMEM_0	: org = 0x00002000 len = 0x00001000
 	/* NOTE: Custom split of the second 4 KB of ICSS Data RAMs 0 and 1
 	 * split equally between the corresponding RTU and Tx_PRU cores in
 	 * each slice */
 	RTU1_DMEM_1	: org = 0x00001000 len = 0x00000800
 	TX_PRU1_DMEM_1	: org = 0x00001800 len = 0x00000800
-	RTU1_DMEM_0	: org = 0x00003000 len = 0x00000800
-	TX_PRU1_DMEM_0	: org = 0x00003800 len = 0x00000800
+	RTU0_DMEM_0	: org = 0x00003000 len = 0x00000800
+	TX_PRU0_DMEM_0	: org = 0x00003800 len = 0x00000800
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/examples/empty/firmware/am64x-evm/icss_g0_rtu_pru0_fw/ti-pru-cgt/linker.cmd b/examples/empty/firmware/am64x-evm/icss_g0_rtu_pru0_fw/ti-pru-cgt/linker.cmd
index 9f8bbd47..fcb1c655 100644
--- a/examples/empty/firmware/am64x-evm/icss_g0_rtu_pru0_fw/ti-pru-cgt/linker.cmd
+++ b/examples/empty/firmware/am64x-evm/icss_g0_rtu_pru0_fw/ti-pru-cgt/linker.cmd
@@ -19,14 +19,14 @@ MEMORY
 	PRU0_DMEM_0	: org = 0x00000000 len = 0x00001000
 	/* 8 KB PRU Data RAM 1; reserved completely for Slice1 cores - PRU1,
 	 * RTU1 and Tx_PRU1; do not use for any Slice0 cores */
-	PRU0_DMEM_1	: org = 0x00002000 len = 0x00001000
+	PRU1_DMEM_1	: org = 0x00002000 len = 0x00001000
 	/* NOTE: Custom split of the second 4 KB of ICSS Data RAMs 0 and 1
 	 * split equally between the corresponding RTU and Tx_PRU cores in
 	 * each slice */
 	RTU0_DMEM_0	: org = 0x00001000 len = 0x00000800
 	TX_PRU0_DMEM_0	: org = 0x00001800 len = 0x00000800
-	RTU0_DMEM_1	: org = 0x00003000 len = 0x00000800
-	TX_PRU0_DMEM_1	: org = 0x00003800 len = 0x00000800
+	RTU1_DMEM_1	: org = 0x00003000 len = 0x00000800
+	TX_PRU1_DMEM_1	: org = 0x00003800 len = 0x00000800
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/examples/empty/firmware/am64x-evm/icss_g0_rtu_pru1_fw/ti-pru-cgt/linker.cmd b/examples/empty/firmware/am64x-evm/icss_g0_rtu_pru1_fw/ti-pru-cgt/linker.cmd
index 665376be..fec4329f 100644
--- a/examples/empty/firmware/am64x-evm/icss_g0_rtu_pru1_fw/ti-pru-cgt/linker.cmd
+++ b/examples/empty/firmware/am64x-evm/icss_g0_rtu_pru1_fw/ti-pru-cgt/linker.cmd
@@ -19,14 +19,14 @@ MEMORY
 	PRU1_DMEM_1	: org = 0x00000000 len = 0x00001000
 	/* 8 KB PRU Data RAM 0; reserved completely for Slice0 cores - PRU0,
 	 * RTU0 and Tx_PRU0; do not use for any Slice1 cores */
-	PRU1_DMEM_0	: org = 0x00002000 len = 0x00001000
+	PRU0_DMEM_0	: org = 0x00002000 len = 0x00001000
 	/* NOTE: Custom split of the second 4 KB of ICSS Data RAMs 0 and 1
 	 * split equally between the corresponding RTU and Tx_PRU cores in
 	 * each slice */
 	RTU1_DMEM_1	: org = 0x00001000 len = 0x00000800
 	TX_PRU1_DMEM_1	: org = 0x00001800 len = 0x00000800
-	RTU1_DMEM_0	: org = 0x00003000 len = 0x00000800
-	TX_PRU1_DMEM_0	: org = 0x00003800 len = 0x00000800
+	RTU0_DMEM_0	: org = 0x00003000 len = 0x00000800
+	TX_PRU0_DMEM_0	: org = 0x00003800 len = 0x00000800
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/examples/empty/firmware/am64x-evm/icss_g0_tx_pru0_fw/ti-pru-cgt/linker.cmd b/examples/empty/firmware/am64x-evm/icss_g0_tx_pru0_fw/ti-pru-cgt/linker.cmd
index 529f7f19..9c0c42ed 100644
--- a/examples/empty/firmware/am64x-evm/icss_g0_tx_pru0_fw/ti-pru-cgt/linker.cmd
+++ b/examples/empty/firmware/am64x-evm/icss_g0_tx_pru0_fw/ti-pru-cgt/linker.cmd
@@ -19,14 +19,14 @@ MEMORY
 	PRU0_DMEM_0	: org = 0x00000000 len = 0x00001000
 	/* 8 KB PRU Data RAM 1; reserved completely for Slice1 cores - PRU1,
 	 * RTU1 and Tx_PRU1; do not use for any Slice0 cores */
-	PRU0_DMEM_1	: org = 0x00002000 len = 0x00001000
+	PRU1_DMEM_1	: org = 0x00002000 len = 0x00001000
 	/* NOTE: Custom split of the second 4 KB of ICSS Data RAMs 0 and 1
 	 * split equally between the corresponding RTU and Tx_PRU cores in
 	 * each slice */
 	RTU0_DMEM_0	: org = 0x00001000 len = 0x00000800
 	TX_PRU0_DMEM_0	: org = 0x00001800 len = 0x00000800
-	RTU0_DMEM_1	: org = 0x00003000 len = 0x00000800
-	TX_PRU0_DMEM_1	: org = 0x00003800 len = 0x00000800
+	RTU1_DMEM_1	: org = 0x00003000 len = 0x00000800
+	TX_PRU1_DMEM_1	: org = 0x00003800 len = 0x00000800
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/examples/empty/firmware/am64x-evm/icss_g0_tx_pru1_fw/ti-pru-cgt/linker.cmd b/examples/empty/firmware/am64x-evm/icss_g0_tx_pru1_fw/ti-pru-cgt/linker.cmd
index 69fb7491..2314f4d9 100644
--- a/examples/empty/firmware/am64x-evm/icss_g0_tx_pru1_fw/ti-pru-cgt/linker.cmd
+++ b/examples/empty/firmware/am64x-evm/icss_g0_tx_pru1_fw/ti-pru-cgt/linker.cmd
@@ -19,14 +19,14 @@ MEMORY
 	PRU1_DMEM_1	: org = 0x00000000 len = 0x00001000
 	/* 8 KB PRU Data RAM 0; reserved completely for Slice0 cores - PRU0,
 	 * RTU0 and Tx_PRU0; do not use for any Slice1 cores */
-	PRU1_DMEM_0	: org = 0x00002000 len = 0x00001000
+	PRU0_DMEM_0	: org = 0x00002000 len = 0x00001000
 	/* NOTE: Custom split of the second 4 KB of ICSS Data RAMs 0 and 1
 	 * split equally between the corresponding RTU and Tx_PRU cores in
 	 * each slice */
 	RTU1_DMEM_1	: org = 0x00001000 len = 0x00000800
 	TX_PRU1_DMEM_1	: org = 0x00001800 len = 0x00000800
-	RTU1_DMEM_0	: org = 0x00003000 len = 0x00000800
-	TX_PRU1_DMEM_0	: org = 0x00003800 len = 0x00000800
+	RTU0_DMEM_0	: org = 0x00003000 len = 0x00000800
+	TX_PRU0_DMEM_0	: org = 0x00003800 len = 0x00000800
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/examples/empty_c/firmware/am243x-evm/icss_g0_pru0_fw/ti-pru-cgt/linker.cmd b/examples/empty_c/firmware/am243x-evm/icss_g0_pru0_fw/ti-pru-cgt/linker.cmd
index a69842cd..389d0cbd 100644
--- a/examples/empty_c/firmware/am243x-evm/icss_g0_pru0_fw/ti-pru-cgt/linker.cmd
+++ b/examples/empty_c/firmware/am243x-evm/icss_g0_pru0_fw/ti-pru-cgt/linker.cmd
@@ -21,14 +21,14 @@ MEMORY
 	PRU0_DMEM_0	: org = 0x00000000 len = 0x00001000	CREGISTER=24
 	/* 8 KB PRU Data RAM 1; reserved completely for Slice1 cores - PRU1,
 	 * RTU1 and Tx_PRU1; do not use for any Slice0 cores */
-	PRU0_DMEM_1	: org = 0x00002000 len = 0x00001000	CREGISTER=25
+	PRU1_DMEM_1	: org = 0x00002000 len = 0x00001000	CREGISTER=25
 	/* NOTE: Custom split of the second 4 KB of ICSS Data RAMs 0 and 1
 	 * split equally between the corresponding RTU and Tx_PRU cores in
 	 * each slice */
 	RTU0_DMEM_0	: org = 0x00001000 len = 0x00000800
 	TX_PRU0_DMEM_0	: org = 0x00001800 len = 0x00000800
-	RTU0_DMEM_1	: org = 0x00003000 len = 0x00000800
-	TX_PRU0_DMEM_1	: org = 0x00003800 len = 0x00000800
+	RTU1_DMEM_1	: org = 0x00003000 len = 0x00000800
+	TX_PRU1_DMEM_1	: org = 0x00003800 len = 0x00000800
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/examples/empty_c/firmware/am243x-evm/icss_g0_pru1_fw/ti-pru-cgt/linker.cmd b/examples/empty_c/firmware/am243x-evm/icss_g0_pru1_fw/ti-pru-cgt/linker.cmd
index 440057a7..85522291 100644
--- a/examples/empty_c/firmware/am243x-evm/icss_g0_pru1_fw/ti-pru-cgt/linker.cmd
+++ b/examples/empty_c/firmware/am243x-evm/icss_g0_pru1_fw/ti-pru-cgt/linker.cmd
@@ -21,14 +21,14 @@ MEMORY
 	PRU1_DMEM_1	: org = 0x00000000 len = 0x00001000	CREGISTER=24
 	/* 8 KB PRU Data RAM 0; reserved completely for Slice0 cores - PRU0,
 	 * RTU0 and Tx_PRU0; do not use for any Slice1 cores */
-	PRU1_DMEM_0	: org = 0x00002000 len = 0x00001000	CREGISTER=25
+	PRU0_DMEM_0	: org = 0x00002000 len = 0x00001000	CREGISTER=25
 	/* NOTE: Custom split of the second 4 KB of ICSS Data RAMs 0 and 1
 	 * split equally between the corresponding RTU and Tx_PRU cores in
 	 * each slice */
 	RTU1_DMEM_1	: org = 0x00001000 len = 0x00000800
 	TX_PRU1_DMEM_1	: org = 0x00001800 len = 0x00000800
-	RTU1_DMEM_0	: org = 0x00003000 len = 0x00000800
-	TX_PRU1_DMEM_0	: org = 0x00003800 len = 0x00000800
+	RTU0_DMEM_0	: org = 0x00003000 len = 0x00000800
+	TX_PRU0_DMEM_0	: org = 0x00003800 len = 0x00000800
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/examples/empty_c/firmware/am243x-evm/icss_g0_rtu_pru0_fw/ti-pru-cgt/linker.cmd b/examples/empty_c/firmware/am243x-evm/icss_g0_rtu_pru0_fw/ti-pru-cgt/linker.cmd
index 64ab61bc..54cedd3c 100644
--- a/examples/empty_c/firmware/am243x-evm/icss_g0_rtu_pru0_fw/ti-pru-cgt/linker.cmd
+++ b/examples/empty_c/firmware/am243x-evm/icss_g0_rtu_pru0_fw/ti-pru-cgt/linker.cmd
@@ -21,14 +21,14 @@ MEMORY
 	PRU0_DMEM_0	: org = 0x00000000 len = 0x00001000	CREGISTER=24
 	/* 8 KB PRU Data RAM 1; reserved completely for Slice1 cores - PRU1,
 	 * RTU1 and Tx_PRU1; do not use for any Slice0 cores */
-	PRU0_DMEM_1	: org = 0x00002000 len = 0x00001000	CREGISTER=25
+	PRU1_DMEM_1	: org = 0x00002000 len = 0x00001000	CREGISTER=25
 	/* NOTE: Custom split of the second 4 KB of ICSS Data RAMs 0 and 1
 	 * split equally between the corresponding RTU and Tx_PRU cores in
 	 * each slice */
 	RTU0_DMEM_0	: org = 0x00001000 len = 0x00000800
 	TX_PRU0_DMEM_0	: org = 0x00001800 len = 0x00000800
-	RTU0_DMEM_1	: org = 0x00003000 len = 0x00000800
-	TX_PRU0_DMEM_1	: org = 0x00003800 len = 0x00000800
+	RTU1_DMEM_1	: org = 0x00003000 len = 0x00000800
+	TX_PRU1_DMEM_1	: org = 0x00003800 len = 0x00000800
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/examples/empty_c/firmware/am243x-evm/icss_g0_rtu_pru1_fw/ti-pru-cgt/linker.cmd b/examples/empty_c/firmware/am243x-evm/icss_g0_rtu_pru1_fw/ti-pru-cgt/linker.cmd
index 14fd35a8..4cfd083e 100644
--- a/examples/empty_c/firmware/am243x-evm/icss_g0_rtu_pru1_fw/ti-pru-cgt/linker.cmd
+++ b/examples/empty_c/firmware/am243x-evm/icss_g0_rtu_pru1_fw/ti-pru-cgt/linker.cmd
@@ -21,14 +21,14 @@ MEMORY
 	PRU1_DMEM_1	: org = 0x00000000 len = 0x00001000	CREGISTER=24
 	/* 8 KB PRU Data RAM 0; reserved completely for Slice0 cores - PRU0,
 	 * RTU0 and Tx_PRU0; do not use for any Slice1 cores */
-	PRU1_DMEM_0	: org = 0x00002000 len = 0x00001000	CREGISTER=25
+	PRU0_DMEM_0	: org = 0x00002000 len = 0x00001000	CREGISTER=25
 	/* NOTE: Custom split of the second 4 KB of ICSS Data RAMs 0 and 1
 	 * split equally between the corresponding RTU and Tx_PRU cores in
 	 * each slice */
 	RTU1_DMEM_1	: org = 0x00001000 len = 0x00000800
 	TX_PRU1_DMEM_1	: org = 0x00001800 len = 0x00000800
-	RTU1_DMEM_0	: org = 0x00003000 len = 0x00000800
-	TX_PRU1_DMEM_0	: org = 0x00003800 len = 0x00000800
+	RTU0_DMEM_0	: org = 0x00003000 len = 0x00000800
+	TX_PRU0_DMEM_0	: org = 0x00003800 len = 0x00000800
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/examples/empty_c/firmware/am243x-evm/icss_g0_tx_pru0_fw/ti-pru-cgt/linker.cmd b/examples/empty_c/firmware/am243x-evm/icss_g0_tx_pru0_fw/ti-pru-cgt/linker.cmd
index 16ea3376..853c81f6 100644
--- a/examples/empty_c/firmware/am243x-evm/icss_g0_tx_pru0_fw/ti-pru-cgt/linker.cmd
+++ b/examples/empty_c/firmware/am243x-evm/icss_g0_tx_pru0_fw/ti-pru-cgt/linker.cmd
@@ -21,14 +21,14 @@ MEMORY
 	PRU0_DMEM_0	: org = 0x00000000 len = 0x00001000	CREGISTER=24
 	/* 8 KB PRU Data RAM 1; reserved completely for Slice1 cores - PRU1,
 	 * RTU1 and Tx_PRU1; do not use for any Slice0 cores */
-	PRU0_DMEM_1	: org = 0x00002000 len = 0x00001000	CREGISTER=25
+	PRU1_DMEM_1	: org = 0x00002000 len = 0x00001000	CREGISTER=25
 	/* NOTE: Custom split of the second 4 KB of ICSS Data RAMs 0 and 1
 	 * split equally between the corresponding RTU and Tx_PRU cores in
 	 * each slice */
 	RTU0_DMEM_0	: org = 0x00001000 len = 0x00000800
 	TX_PRU0_DMEM_0	: org = 0x00001800 len = 0x00000800
-	RTU0_DMEM_1	: org = 0x00003000 len = 0x00000800
-	TX_PRU0_DMEM_1	: org = 0x00003800 len = 0x00000800
+	RTU1_DMEM_1	: org = 0x00003000 len = 0x00000800
+	TX_PRU1_DMEM_1	: org = 0x00003800 len = 0x00000800
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/examples/empty_c/firmware/am243x-evm/icss_g0_tx_pru1_fw/ti-pru-cgt/linker.cmd b/examples/empty_c/firmware/am243x-evm/icss_g0_tx_pru1_fw/ti-pru-cgt/linker.cmd
index 709dde47..2547a2ba 100644
--- a/examples/empty_c/firmware/am243x-evm/icss_g0_tx_pru1_fw/ti-pru-cgt/linker.cmd
+++ b/examples/empty_c/firmware/am243x-evm/icss_g0_tx_pru1_fw/ti-pru-cgt/linker.cmd
@@ -21,14 +21,14 @@ MEMORY
 	PRU1_DMEM_1	: org = 0x00000000 len = 0x00001000	CREGISTER=24
 	/* 8 KB PRU Data RAM 0; reserved completely for Slice0 cores - PRU0,
 	 * RTU0 and Tx_PRU0; do not use for any Slice1 cores */
-	PRU1_DMEM_0	: org = 0x00002000 len = 0x00001000	CREGISTER=25
+	PRU0_DMEM_0	: org = 0x00002000 len = 0x00001000	CREGISTER=25
 	/* NOTE: Custom split of the second 4 KB of ICSS Data RAMs 0 and 1
 	 * split equally between the corresponding RTU and Tx_PRU cores in
 	 * each slice */
 	RTU1_DMEM_1	: org = 0x00001000 len = 0x00000800
 	TX_PRU1_DMEM_1	: org = 0x00001800 len = 0x00000800
-	RTU1_DMEM_0	: org = 0x00003000 len = 0x00000800
-	TX_PRU1_DMEM_0	: org = 0x00003800 len = 0x00000800
+	RTU0_DMEM_0	: org = 0x00003000 len = 0x00000800
+	TX_PRU0_DMEM_0	: org = 0x00003800 len = 0x00000800
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/examples/empty_c/firmware/am243x-lp/icss_g0_pru0_fw/ti-pru-cgt/linker.cmd b/examples/empty_c/firmware/am243x-lp/icss_g0_pru0_fw/ti-pru-cgt/linker.cmd
index a69842cd..389d0cbd 100644
--- a/examples/empty_c/firmware/am243x-lp/icss_g0_pru0_fw/ti-pru-cgt/linker.cmd
+++ b/examples/empty_c/firmware/am243x-lp/icss_g0_pru0_fw/ti-pru-cgt/linker.cmd
@@ -21,14 +21,14 @@ MEMORY
 	PRU0_DMEM_0	: org = 0x00000000 len = 0x00001000	CREGISTER=24
 	/* 8 KB PRU Data RAM 1; reserved completely for Slice1 cores - PRU1,
 	 * RTU1 and Tx_PRU1; do not use for any Slice0 cores */
-	PRU0_DMEM_1	: org = 0x00002000 len = 0x00001000	CREGISTER=25
+	PRU1_DMEM_1	: org = 0x00002000 len = 0x00001000	CREGISTER=25
 	/* NOTE: Custom split of the second 4 KB of ICSS Data RAMs 0 and 1
 	 * split equally between the corresponding RTU and Tx_PRU cores in
 	 * each slice */
 	RTU0_DMEM_0	: org = 0x00001000 len = 0x00000800
 	TX_PRU0_DMEM_0	: org = 0x00001800 len = 0x00000800
-	RTU0_DMEM_1	: org = 0x00003000 len = 0x00000800
-	TX_PRU0_DMEM_1	: org = 0x00003800 len = 0x00000800
+	RTU1_DMEM_1	: org = 0x00003000 len = 0x00000800
+	TX_PRU1_DMEM_1	: org = 0x00003800 len = 0x00000800
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/examples/empty_c/firmware/am243x-lp/icss_g0_pru1_fw/ti-pru-cgt/linker.cmd b/examples/empty_c/firmware/am243x-lp/icss_g0_pru1_fw/ti-pru-cgt/linker.cmd
index 440057a7..85522291 100644
--- a/examples/empty_c/firmware/am243x-lp/icss_g0_pru1_fw/ti-pru-cgt/linker.cmd
+++ b/examples/empty_c/firmware/am243x-lp/icss_g0_pru1_fw/ti-pru-cgt/linker.cmd
@@ -21,14 +21,14 @@ MEMORY
 	PRU1_DMEM_1	: org = 0x00000000 len = 0x00001000	CREGISTER=24
 	/* 8 KB PRU Data RAM 0; reserved completely for Slice0 cores - PRU0,
 	 * RTU0 and Tx_PRU0; do not use for any Slice1 cores */
-	PRU1_DMEM_0	: org = 0x00002000 len = 0x00001000	CREGISTER=25
+	PRU0_DMEM_0	: org = 0x00002000 len = 0x00001000	CREGISTER=25
 	/* NOTE: Custom split of the second 4 KB of ICSS Data RAMs 0 and 1
 	 * split equally between the corresponding RTU and Tx_PRU cores in
 	 * each slice */
 	RTU1_DMEM_1	: org = 0x00001000 len = 0x00000800
 	TX_PRU1_DMEM_1	: org = 0x00001800 len = 0x00000800
-	RTU1_DMEM_0	: org = 0x00003000 len = 0x00000800
-	TX_PRU1_DMEM_0	: org = 0x00003800 len = 0x00000800
+	RTU0_DMEM_0	: org = 0x00003000 len = 0x00000800
+	TX_PRU0_DMEM_0	: org = 0x00003800 len = 0x00000800
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/examples/empty_c/firmware/am243x-lp/icss_g0_rtu_pru0_fw/ti-pru-cgt/linker.cmd b/examples/empty_c/firmware/am243x-lp/icss_g0_rtu_pru0_fw/ti-pru-cgt/linker.cmd
index 64ab61bc..54cedd3c 100644
--- a/examples/empty_c/firmware/am243x-lp/icss_g0_rtu_pru0_fw/ti-pru-cgt/linker.cmd
+++ b/examples/empty_c/firmware/am243x-lp/icss_g0_rtu_pru0_fw/ti-pru-cgt/linker.cmd
@@ -21,14 +21,14 @@ MEMORY
 	PRU0_DMEM_0	: org = 0x00000000 len = 0x00001000	CREGISTER=24
 	/* 8 KB PRU Data RAM 1; reserved completely for Slice1 cores - PRU1,
 	 * RTU1 and Tx_PRU1; do not use for any Slice0 cores */
-	PRU0_DMEM_1	: org = 0x00002000 len = 0x00001000	CREGISTER=25
+	PRU1_DMEM_1	: org = 0x00002000 len = 0x00001000	CREGISTER=25
 	/* NOTE: Custom split of the second 4 KB of ICSS Data RAMs 0 and 1
 	 * split equally between the corresponding RTU and Tx_PRU cores in
 	 * each slice */
 	RTU0_DMEM_0	: org = 0x00001000 len = 0x00000800
 	TX_PRU0_DMEM_0	: org = 0x00001800 len = 0x00000800
-	RTU0_DMEM_1	: org = 0x00003000 len = 0x00000800
-	TX_PRU0_DMEM_1	: org = 0x00003800 len = 0x00000800
+	RTU1_DMEM_1	: org = 0x00003000 len = 0x00000800
+	TX_PRU1_DMEM_1	: org = 0x00003800 len = 0x00000800
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/examples/empty_c/firmware/am243x-lp/icss_g0_rtu_pru1_fw/ti-pru-cgt/linker.cmd b/examples/empty_c/firmware/am243x-lp/icss_g0_rtu_pru1_fw/ti-pru-cgt/linker.cmd
index 14fd35a8..4cfd083e 100644
--- a/examples/empty_c/firmware/am243x-lp/icss_g0_rtu_pru1_fw/ti-pru-cgt/linker.cmd
+++ b/examples/empty_c/firmware/am243x-lp/icss_g0_rtu_pru1_fw/ti-pru-cgt/linker.cmd
@@ -21,14 +21,14 @@ MEMORY
 	PRU1_DMEM_1	: org = 0x00000000 len = 0x00001000	CREGISTER=24
 	/* 8 KB PRU Data RAM 0; reserved completely for Slice0 cores - PRU0,
 	 * RTU0 and Tx_PRU0; do not use for any Slice1 cores */
-	PRU1_DMEM_0	: org = 0x00002000 len = 0x00001000	CREGISTER=25
+	PRU0_DMEM_0	: org = 0x00002000 len = 0x00001000	CREGISTER=25
 	/* NOTE: Custom split of the second 4 KB of ICSS Data RAMs 0 and 1
 	 * split equally between the corresponding RTU and Tx_PRU cores in
 	 * each slice */
 	RTU1_DMEM_1	: org = 0x00001000 len = 0x00000800
 	TX_PRU1_DMEM_1	: org = 0x00001800 len = 0x00000800
-	RTU1_DMEM_0	: org = 0x00003000 len = 0x00000800
-	TX_PRU1_DMEM_0	: org = 0x00003800 len = 0x00000800
+	RTU0_DMEM_0	: org = 0x00003000 len = 0x00000800
+	TX_PRU0_DMEM_0	: org = 0x00003800 len = 0x00000800
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/examples/empty_c/firmware/am243x-lp/icss_g0_tx_pru0_fw/ti-pru-cgt/linker.cmd b/examples/empty_c/firmware/am243x-lp/icss_g0_tx_pru0_fw/ti-pru-cgt/linker.cmd
index 16ea3376..853c81f6 100644
--- a/examples/empty_c/firmware/am243x-lp/icss_g0_tx_pru0_fw/ti-pru-cgt/linker.cmd
+++ b/examples/empty_c/firmware/am243x-lp/icss_g0_tx_pru0_fw/ti-pru-cgt/linker.cmd
@@ -21,14 +21,14 @@ MEMORY
 	PRU0_DMEM_0	: org = 0x00000000 len = 0x00001000	CREGISTER=24
 	/* 8 KB PRU Data RAM 1; reserved completely for Slice1 cores - PRU1,
 	 * RTU1 and Tx_PRU1; do not use for any Slice0 cores */
-	PRU0_DMEM_1	: org = 0x00002000 len = 0x00001000	CREGISTER=25
+	PRU1_DMEM_1	: org = 0x00002000 len = 0x00001000	CREGISTER=25
 	/* NOTE: Custom split of the second 4 KB of ICSS Data RAMs 0 and 1
 	 * split equally between the corresponding RTU and Tx_PRU cores in
 	 * each slice */
 	RTU0_DMEM_0	: org = 0x00001000 len = 0x00000800
 	TX_PRU0_DMEM_0	: org = 0x00001800 len = 0x00000800
-	RTU0_DMEM_1	: org = 0x00003000 len = 0x00000800
-	TX_PRU0_DMEM_1	: org = 0x00003800 len = 0x00000800
+	RTU1_DMEM_1	: org = 0x00003000 len = 0x00000800
+	TX_PRU1_DMEM_1	: org = 0x00003800 len = 0x00000800
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/examples/empty_c/firmware/am243x-lp/icss_g0_tx_pru1_fw/ti-pru-cgt/linker.cmd b/examples/empty_c/firmware/am243x-lp/icss_g0_tx_pru1_fw/ti-pru-cgt/linker.cmd
index 709dde47..2547a2ba 100644
--- a/examples/empty_c/firmware/am243x-lp/icss_g0_tx_pru1_fw/ti-pru-cgt/linker.cmd
+++ b/examples/empty_c/firmware/am243x-lp/icss_g0_tx_pru1_fw/ti-pru-cgt/linker.cmd
@@ -21,14 +21,14 @@ MEMORY
 	PRU1_DMEM_1	: org = 0x00000000 len = 0x00001000	CREGISTER=24
 	/* 8 KB PRU Data RAM 0; reserved completely for Slice0 cores - PRU0,
 	 * RTU0 and Tx_PRU0; do not use for any Slice1 cores */
-	PRU1_DMEM_0	: org = 0x00002000 len = 0x00001000	CREGISTER=25
+	PRU0_DMEM_0	: org = 0x00002000 len = 0x00001000	CREGISTER=25
 	/* NOTE: Custom split of the second 4 KB of ICSS Data RAMs 0 and 1
 	 * split equally between the corresponding RTU and Tx_PRU cores in
 	 * each slice */
 	RTU1_DMEM_1	: org = 0x00001000 len = 0x00000800
 	TX_PRU1_DMEM_1	: org = 0x00001800 len = 0x00000800
-	RTU1_DMEM_0	: org = 0x00003000 len = 0x00000800
-	TX_PRU1_DMEM_0	: org = 0x00003800 len = 0x00000800
+	RTU0_DMEM_0	: org = 0x00003000 len = 0x00000800
+	TX_PRU0_DMEM_0	: org = 0x00003800 len = 0x00000800
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/examples/empty_c/firmware/am261x-lp/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd b/examples/empty_c/firmware/am261x-lp/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
index b40a3e09..93ae6753 100644
--- a/examples/empty_c/firmware/am261x-lp/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
+++ b/examples/empty_c/firmware/am261x-lp/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
@@ -19,7 +19,7 @@ MEMORY
 	/* 8 KB PRU Data RAM 0 */
 	PRU0_DMEM_0	: org = 0x00000000 len = 0x00002000	CREGISTER=24
 	/* 8 KB PRU Data RAM 1 */
-	PRU0_DMEM_1	: org = 0x00002000 len = 0x00002000	CREGISTER=25
+	PRU1_DMEM_1	: org = 0x00002000 len = 0x00002000	CREGISTER=25
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/examples/empty_c/firmware/am261x-lp/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd b/examples/empty_c/firmware/am261x-lp/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
index cf883948..afb88a78 100644
--- a/examples/empty_c/firmware/am261x-lp/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
+++ b/examples/empty_c/firmware/am261x-lp/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
@@ -19,7 +19,7 @@ MEMORY
 	/* 8 KB PRU Data RAM 1 */
 	PRU1_DMEM_1	: org = 0x00000000 len = 0x00002000	CREGISTER=24
 	/* 8 KB PRU Data RAM 0 */
-	PRU1_DMEM_0	: org = 0x00002000 len = 0x00002000	CREGISTER=25
+	PRU0_DMEM_0	: org = 0x00002000 len = 0x00002000	CREGISTER=25
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/examples/empty_c/firmware/am261x-som/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd b/examples/empty_c/firmware/am261x-som/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
index b40a3e09..93ae6753 100644
--- a/examples/empty_c/firmware/am261x-som/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
+++ b/examples/empty_c/firmware/am261x-som/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
@@ -19,7 +19,7 @@ MEMORY
 	/* 8 KB PRU Data RAM 0 */
 	PRU0_DMEM_0	: org = 0x00000000 len = 0x00002000	CREGISTER=24
 	/* 8 KB PRU Data RAM 1 */
-	PRU0_DMEM_1	: org = 0x00002000 len = 0x00002000	CREGISTER=25
+	PRU1_DMEM_1	: org = 0x00002000 len = 0x00002000	CREGISTER=25
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/examples/empty_c/firmware/am261x-som/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd b/examples/empty_c/firmware/am261x-som/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
index cf883948..afb88a78 100644
--- a/examples/empty_c/firmware/am261x-som/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
+++ b/examples/empty_c/firmware/am261x-som/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
@@ -19,7 +19,7 @@ MEMORY
 	/* 8 KB PRU Data RAM 1 */
 	PRU1_DMEM_1	: org = 0x00000000 len = 0x00002000	CREGISTER=24
 	/* 8 KB PRU Data RAM 0 */
-	PRU1_DMEM_0	: org = 0x00002000 len = 0x00002000	CREGISTER=25
+	PRU0_DMEM_0	: org = 0x00002000 len = 0x00002000	CREGISTER=25
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/examples/empty_c/firmware/am263px-cc/icss_m0_pru0_fw/ti-pru-cgt/example.projectspec b/examples/empty_c/firmware/am263px-cc/icss_m0_pru0_fw/ti-pru-cgt/example.projectspec
index f5020bf8..3df932e6 100644
--- a/examples/empty_c/firmware/am263px-cc/icss_m0_pru0_fw/ti-pru-cgt/example.projectspec
+++ b/examples/empty_c/firmware/am263px-cc/icss_m0_pru0_fw/ti-pru-cgt/example.projectspec
@@ -4,7 +4,7 @@
         <when>
             <context
                 deviceFamily="PRU"
-                deviceId="AM263px"
+                deviceId="AM263Px"
             />
         </when>
     </applicability>
@@ -20,7 +20,7 @@
         connection="TIXDS110_Connection.xml"
         toolChain="TI"
         cgtVersion="2.3.3"
-        device="AM263px"
+        device="AM263Px"
         deviceCore="ICSSM_PRU_0"
         ignoreDefaultDeviceSettings="true"
         ignoreDefaultCCSSettings="true"
diff --git a/examples/empty_c/firmware/am263px-cc/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd b/examples/empty_c/firmware/am263px-cc/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
index 095f9533..45a5a1a8 100644
--- a/examples/empty_c/firmware/am263px-cc/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
+++ b/examples/empty_c/firmware/am263px-cc/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
@@ -1,8 +1,8 @@
 /*
- * AM263px_PRU0.cmd
+ * AM263Px_PRU0.cmd
  *
  * Example Linker command file for linking programs built with the C compiler
- * on AM263px PRU0 cores
+ * on AM263Px PRU0 cores
  */
 
 -cr		/* Link using C conventions */
@@ -19,7 +19,7 @@ MEMORY
 	/* 8 KB PRU Data RAM 0 */
 	PRU0_DMEM_0	: org = 0x00000000 len = 0x00002000	CREGISTER=24
 	/* 8 KB PRU Data RAM 1 */
-	PRU0_DMEM_1	: org = 0x00002000 len = 0x00002000	CREGISTER=25
+	PRU1_DMEM_1	: org = 0x00002000 len = 0x00002000	CREGISTER=25
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/examples/empty_c/firmware/am263px-cc/icss_m0_pru1_fw/ti-pru-cgt/example.projectspec b/examples/empty_c/firmware/am263px-cc/icss_m0_pru1_fw/ti-pru-cgt/example.projectspec
index 21d52dad..94930c9b 100644
--- a/examples/empty_c/firmware/am263px-cc/icss_m0_pru1_fw/ti-pru-cgt/example.projectspec
+++ b/examples/empty_c/firmware/am263px-cc/icss_m0_pru1_fw/ti-pru-cgt/example.projectspec
@@ -4,7 +4,7 @@
         <when>
             <context
                 deviceFamily="PRU"
-                deviceId="AM263px"
+                deviceId="AM263Px"
             />
         </when>
     </applicability>
@@ -20,7 +20,7 @@
         connection="TIXDS110_Connection.xml"
         toolChain="TI"
         cgtVersion="2.3.3"
-        device="AM263px"
+        device="AM263Px"
         deviceCore="ICSSM_PRU_1"
         ignoreDefaultDeviceSettings="true"
         ignoreDefaultCCSSettings="true"
diff --git a/examples/empty_c/firmware/am263px-cc/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd b/examples/empty_c/firmware/am263px-cc/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
index a3b557df..d54a14a7 100644
--- a/examples/empty_c/firmware/am263px-cc/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
+++ b/examples/empty_c/firmware/am263px-cc/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
@@ -1,8 +1,8 @@
 /*
- * AM263px_PRU1.cmd
+ * AM263Px_PRU1.cmd
  *
  * Example Linker command file for linking programs built with the C compiler
- * on AM263px PRU1 cores
+ * on AM263Px PRU1 cores
  */
 
 -cr		/* Link using C conventions */
@@ -19,7 +19,7 @@ MEMORY
 	/* 8 KB PRU Data RAM 1 */
 	PRU1_DMEM_1	: org = 0x00000000 len = 0x00002000	CREGISTER=24
 	/* 8 KB PRU Data RAM 0 */
-	PRU1_DMEM_0	: org = 0x00002000 len = 0x00002000	CREGISTER=25
+	PRU0_DMEM_0	: org = 0x00002000 len = 0x00002000	CREGISTER=25
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/examples/empty_c/firmware/am263px-lp/icss_m0_pru0_fw/ti-pru-cgt/example.projectspec b/examples/empty_c/firmware/am263px-lp/icss_m0_pru0_fw/ti-pru-cgt/example.projectspec
index 3a37f444..815b3baf 100644
--- a/examples/empty_c/firmware/am263px-lp/icss_m0_pru0_fw/ti-pru-cgt/example.projectspec
+++ b/examples/empty_c/firmware/am263px-lp/icss_m0_pru0_fw/ti-pru-cgt/example.projectspec
@@ -4,7 +4,7 @@
         <when>
             <context
                 deviceFamily="PRU"
-                deviceId="AM263px"
+                deviceId="AM263Px"
             />
         </when>
     </applicability>
@@ -20,7 +20,7 @@
         connection="TIXDS110_Connection.xml"
         toolChain="TI"
         cgtVersion="2.3.3"
-        device="AM263px"
+        device="AM263Px"
         deviceCore="ICSSM_PRU_0"
         ignoreDefaultDeviceSettings="true"
         ignoreDefaultCCSSettings="true"
diff --git a/examples/empty_c/firmware/am263px-lp/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd b/examples/empty_c/firmware/am263px-lp/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
index 095f9533..45a5a1a8 100644
--- a/examples/empty_c/firmware/am263px-lp/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
+++ b/examples/empty_c/firmware/am263px-lp/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
@@ -1,8 +1,8 @@
 /*
- * AM263px_PRU0.cmd
+ * AM263Px_PRU0.cmd
  *
  * Example Linker command file for linking programs built with the C compiler
- * on AM263px PRU0 cores
+ * on AM263Px PRU0 cores
  */
 
 -cr		/* Link using C conventions */
@@ -19,7 +19,7 @@ MEMORY
 	/* 8 KB PRU Data RAM 0 */
 	PRU0_DMEM_0	: org = 0x00000000 len = 0x00002000	CREGISTER=24
 	/* 8 KB PRU Data RAM 1 */
-	PRU0_DMEM_1	: org = 0x00002000 len = 0x00002000	CREGISTER=25
+	PRU1_DMEM_1	: org = 0x00002000 len = 0x00002000	CREGISTER=25
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/examples/empty_c/firmware/am263px-lp/icss_m0_pru1_fw/ti-pru-cgt/example.projectspec b/examples/empty_c/firmware/am263px-lp/icss_m0_pru1_fw/ti-pru-cgt/example.projectspec
index b316155d..fe5757f5 100644
--- a/examples/empty_c/firmware/am263px-lp/icss_m0_pru1_fw/ti-pru-cgt/example.projectspec
+++ b/examples/empty_c/firmware/am263px-lp/icss_m0_pru1_fw/ti-pru-cgt/example.projectspec
@@ -4,7 +4,7 @@
         <when>
             <context
                 deviceFamily="PRU"
-                deviceId="AM263px"
+                deviceId="AM263Px"
             />
         </when>
     </applicability>
@@ -20,7 +20,7 @@
         connection="TIXDS110_Connection.xml"
         toolChain="TI"
         cgtVersion="2.3.3"
-        device="AM263px"
+        device="AM263Px"
         deviceCore="ICSSM_PRU_1"
         ignoreDefaultDeviceSettings="true"
         ignoreDefaultCCSSettings="true"
diff --git a/examples/empty_c/firmware/am263px-lp/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd b/examples/empty_c/firmware/am263px-lp/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
index a3b557df..d54a14a7 100644
--- a/examples/empty_c/firmware/am263px-lp/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
+++ b/examples/empty_c/firmware/am263px-lp/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
@@ -1,8 +1,8 @@
 /*
- * AM263px_PRU1.cmd
+ * AM263Px_PRU1.cmd
  *
  * Example Linker command file for linking programs built with the C compiler
- * on AM263px PRU1 cores
+ * on AM263Px PRU1 cores
  */
 
 -cr		/* Link using C conventions */
@@ -19,7 +19,7 @@ MEMORY
 	/* 8 KB PRU Data RAM 1 */
 	PRU1_DMEM_1	: org = 0x00000000 len = 0x00002000	CREGISTER=24
 	/* 8 KB PRU Data RAM 0 */
-	PRU1_DMEM_0	: org = 0x00002000 len = 0x00002000	CREGISTER=25
+	PRU0_DMEM_0	: org = 0x00002000 len = 0x00002000	CREGISTER=25
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/examples/empty_c/firmware/am263x-cc/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd b/examples/empty_c/firmware/am263x-cc/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
index 7123a82a..7b3ad22a 100644
--- a/examples/empty_c/firmware/am263x-cc/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
+++ b/examples/empty_c/firmware/am263x-cc/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
@@ -19,7 +19,7 @@ MEMORY
 	/* 8 KB PRU Data RAM 0 */
 	PRU0_DMEM_0	: org = 0x00000000 len = 0x00002000	CREGISTER=24
 	/* 8 KB PRU Data RAM 1 */
-	PRU0_DMEM_1	: org = 0x00002000 len = 0x00002000	CREGISTER=25
+	PRU1_DMEM_1	: org = 0x00002000 len = 0x00002000	CREGISTER=25
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/examples/empty_c/firmware/am263x-cc/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd b/examples/empty_c/firmware/am263x-cc/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
index 6e858dc1..4cc82157 100644
--- a/examples/empty_c/firmware/am263x-cc/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
+++ b/examples/empty_c/firmware/am263x-cc/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
@@ -19,7 +19,7 @@ MEMORY
 	/* 8 KB PRU Data RAM 1 */
 	PRU1_DMEM_1	: org = 0x00000000 len = 0x00002000	CREGISTER=24
 	/* 8 KB PRU Data RAM 0 */
-	PRU1_DMEM_0	: org = 0x00002000 len = 0x00002000	CREGISTER=25
+	PRU0_DMEM_0	: org = 0x00002000 len = 0x00002000	CREGISTER=25
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/examples/empty_c/firmware/am263x-lp/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd b/examples/empty_c/firmware/am263x-lp/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
index 7123a82a..7b3ad22a 100644
--- a/examples/empty_c/firmware/am263x-lp/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
+++ b/examples/empty_c/firmware/am263x-lp/icss_m0_pru0_fw/ti-pru-cgt/linker.cmd
@@ -19,7 +19,7 @@ MEMORY
 	/* 8 KB PRU Data RAM 0 */
 	PRU0_DMEM_0	: org = 0x00000000 len = 0x00002000	CREGISTER=24
 	/* 8 KB PRU Data RAM 1 */
-	PRU0_DMEM_1	: org = 0x00002000 len = 0x00002000	CREGISTER=25
+	PRU1_DMEM_1	: org = 0x00002000 len = 0x00002000	CREGISTER=25
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/examples/empty_c/firmware/am263x-lp/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd b/examples/empty_c/firmware/am263x-lp/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
index 6e858dc1..4cc82157 100644
--- a/examples/empty_c/firmware/am263x-lp/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
+++ b/examples/empty_c/firmware/am263x-lp/icss_m0_pru1_fw/ti-pru-cgt/linker.cmd
@@ -19,7 +19,7 @@ MEMORY
 	/* 8 KB PRU Data RAM 1 */
 	PRU1_DMEM_1	: org = 0x00000000 len = 0x00002000	CREGISTER=24
 	/* 8 KB PRU Data RAM 0 */
-	PRU1_DMEM_0	: org = 0x00002000 len = 0x00002000	CREGISTER=25
+	PRU0_DMEM_0	: org = 0x00002000 len = 0x00002000	CREGISTER=25
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/examples/empty_c/firmware/am62x-sk/pruss0_pru0_fw/ti-pru-cgt/linker.cmd b/examples/empty_c/firmware/am62x-sk/pruss0_pru0_fw/ti-pru-cgt/linker.cmd
index 1782108e..604fdfd9 100644
--- a/examples/empty_c/firmware/am62x-sk/pruss0_pru0_fw/ti-pru-cgt/linker.cmd
+++ b/examples/empty_c/firmware/am62x-sk/pruss0_pru0_fw/ti-pru-cgt/linker.cmd
@@ -19,7 +19,7 @@ MEMORY
 	/* 8 KB PRU Data RAM 0 */
 	PRU0_DMEM_0	: org = 0x00000000 len = 0x00002000	CREGISTER=24
 	/* 8 KB PRU Data RAM 1 */
-	PRU0_DMEM_1	: org = 0x00002000 len = 0x00002000	CREGISTER=25
+	PRU1_DMEM_1	: org = 0x00002000 len = 0x00002000	CREGISTER=25
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/examples/empty_c/firmware/am62x-sk/pruss0_pru1_fw/ti-pru-cgt/linker.cmd b/examples/empty_c/firmware/am62x-sk/pruss0_pru1_fw/ti-pru-cgt/linker.cmd
index 9082912c..cbf74e60 100644
--- a/examples/empty_c/firmware/am62x-sk/pruss0_pru1_fw/ti-pru-cgt/linker.cmd
+++ b/examples/empty_c/firmware/am62x-sk/pruss0_pru1_fw/ti-pru-cgt/linker.cmd
@@ -19,7 +19,7 @@ MEMORY
 	/* 8 KB PRU Data RAM 1 */
 	PRU1_DMEM_1	: org = 0x00000000 len = 0x00002000	CREGISTER=24
 	/* 8 KB PRU Data RAM 0 */
-	PRU1_DMEM_0	: org = 0x00002000 len = 0x00002000	CREGISTER=25
+	PRU0_DMEM_0	: org = 0x00002000 len = 0x00002000	CREGISTER=25
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/examples/empty_c/firmware/am64x-evm/icss_g0_pru0_fw/ti-pru-cgt/linker.cmd b/examples/empty_c/firmware/am64x-evm/icss_g0_pru0_fw/ti-pru-cgt/linker.cmd
index 7069af79..a39ea737 100644
--- a/examples/empty_c/firmware/am64x-evm/icss_g0_pru0_fw/ti-pru-cgt/linker.cmd
+++ b/examples/empty_c/firmware/am64x-evm/icss_g0_pru0_fw/ti-pru-cgt/linker.cmd
@@ -21,14 +21,14 @@ MEMORY
 	PRU0_DMEM_0	: org = 0x00000000 len = 0x00001000	CREGISTER=24
 	/* 8 KB PRU Data RAM 1; reserved completely for Slice1 cores - PRU1,
 	 * RTU1 and Tx_PRU1; do not use for any Slice0 cores */
-	PRU0_DMEM_1	: org = 0x00002000 len = 0x00001000	CREGISTER=25
+	PRU1_DMEM_1	: org = 0x00002000 len = 0x00001000	CREGISTER=25
 	/* NOTE: Custom split of the second 4 KB of ICSS Data RAMs 0 and 1
 	 * split equally between the corresponding RTU and Tx_PRU cores in
 	 * each slice */
 	RTU0_DMEM_0	: org = 0x00001000 len = 0x00000800
 	TX_PRU0_DMEM_0	: org = 0x00001800 len = 0x00000800
-	RTU0_DMEM_1	: org = 0x00003000 len = 0x00000800
-	TX_PRU0_DMEM_1	: org = 0x00003800 len = 0x00000800
+	RTU1_DMEM_1	: org = 0x00003000 len = 0x00000800
+	TX_PRU1_DMEM_1	: org = 0x00003800 len = 0x00000800
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/examples/empty_c/firmware/am64x-evm/icss_g0_pru1_fw/ti-pru-cgt/linker.cmd b/examples/empty_c/firmware/am64x-evm/icss_g0_pru1_fw/ti-pru-cgt/linker.cmd
index 2d0fb831..d2fda1f1 100644
--- a/examples/empty_c/firmware/am64x-evm/icss_g0_pru1_fw/ti-pru-cgt/linker.cmd
+++ b/examples/empty_c/firmware/am64x-evm/icss_g0_pru1_fw/ti-pru-cgt/linker.cmd
@@ -21,14 +21,14 @@ MEMORY
 	PRU1_DMEM_1	: org = 0x00000000 len = 0x00001000	CREGISTER=24
 	/* 8 KB PRU Data RAM 0; reserved completely for Slice0 cores - PRU0,
 	 * RTU0 and Tx_PRU0; do not use for any Slice1 cores */
-	PRU1_DMEM_0	: org = 0x00002000 len = 0x00001000	CREGISTER=25
+	PRU0_DMEM_0	: org = 0x00002000 len = 0x00001000	CREGISTER=25
 	/* NOTE: Custom split of the second 4 KB of ICSS Data RAMs 0 and 1
 	 * split equally between the corresponding RTU and Tx_PRU cores in
 	 * each slice */
 	RTU1_DMEM_1	: org = 0x00001000 len = 0x00000800
 	TX_PRU1_DMEM_1	: org = 0x00001800 len = 0x00000800
-	RTU1_DMEM_0	: org = 0x00003000 len = 0x00000800
-	TX_PRU1_DMEM_0	: org = 0x00003800 len = 0x00000800
+	RTU0_DMEM_0	: org = 0x00003000 len = 0x00000800
+	TX_PRU0_DMEM_0	: org = 0x00003800 len = 0x00000800
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/examples/empty_c/firmware/am64x-evm/icss_g0_rtu_pru0_fw/ti-pru-cgt/linker.cmd b/examples/empty_c/firmware/am64x-evm/icss_g0_rtu_pru0_fw/ti-pru-cgt/linker.cmd
index 3704b635..ea7d05f7 100644
--- a/examples/empty_c/firmware/am64x-evm/icss_g0_rtu_pru0_fw/ti-pru-cgt/linker.cmd
+++ b/examples/empty_c/firmware/am64x-evm/icss_g0_rtu_pru0_fw/ti-pru-cgt/linker.cmd
@@ -21,14 +21,14 @@ MEMORY
 	PRU0_DMEM_0	: org = 0x00000000 len = 0x00001000	CREGISTER=24
 	/* 8 KB PRU Data RAM 1; reserved completely for Slice1 cores - PRU1,
 	 * RTU1 and Tx_PRU1; do not use for any Slice0 cores */
-	PRU0_DMEM_1	: org = 0x00002000 len = 0x00001000	CREGISTER=25
+	PRU1_DMEM_1	: org = 0x00002000 len = 0x00001000	CREGISTER=25
 	/* NOTE: Custom split of the second 4 KB of ICSS Data RAMs 0 and 1
 	 * split equally between the corresponding RTU and Tx_PRU cores in
 	 * each slice */
 	RTU0_DMEM_0	: org = 0x00001000 len = 0x00000800
 	TX_PRU0_DMEM_0	: org = 0x00001800 len = 0x00000800
-	RTU0_DMEM_1	: org = 0x00003000 len = 0x00000800
-	TX_PRU0_DMEM_1	: org = 0x00003800 len = 0x00000800
+	RTU1_DMEM_1	: org = 0x00003000 len = 0x00000800
+	TX_PRU1_DMEM_1	: org = 0x00003800 len = 0x00000800
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/examples/empty_c/firmware/am64x-evm/icss_g0_rtu_pru1_fw/ti-pru-cgt/linker.cmd b/examples/empty_c/firmware/am64x-evm/icss_g0_rtu_pru1_fw/ti-pru-cgt/linker.cmd
index e9bad7fd..3758b8a5 100644
--- a/examples/empty_c/firmware/am64x-evm/icss_g0_rtu_pru1_fw/ti-pru-cgt/linker.cmd
+++ b/examples/empty_c/firmware/am64x-evm/icss_g0_rtu_pru1_fw/ti-pru-cgt/linker.cmd
@@ -21,14 +21,14 @@ MEMORY
 	PRU1_DMEM_1	: org = 0x00000000 len = 0x00001000	CREGISTER=24
 	/* 8 KB PRU Data RAM 0; reserved completely for Slice0 cores - PRU0,
 	 * RTU0 and Tx_PRU0; do not use for any Slice1 cores */
-	PRU1_DMEM_0	: org = 0x00002000 len = 0x00001000	CREGISTER=25
+	PRU0_DMEM_0	: org = 0x00002000 len = 0x00001000	CREGISTER=25
 	/* NOTE: Custom split of the second 4 KB of ICSS Data RAMs 0 and 1
 	 * split equally between the corresponding RTU and Tx_PRU cores in
 	 * each slice */
 	RTU1_DMEM_1	: org = 0x00001000 len = 0x00000800
 	TX_PRU1_DMEM_1	: org = 0x00001800 len = 0x00000800
-	RTU1_DMEM_0	: org = 0x00003000 len = 0x00000800
-	TX_PRU1_DMEM_0	: org = 0x00003800 len = 0x00000800
+	RTU0_DMEM_0	: org = 0x00003000 len = 0x00000800
+	TX_PRU0_DMEM_0	: org = 0x00003800 len = 0x00000800
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/examples/empty_c/firmware/am64x-evm/icss_g0_tx_pru0_fw/ti-pru-cgt/linker.cmd b/examples/empty_c/firmware/am64x-evm/icss_g0_tx_pru0_fw/ti-pru-cgt/linker.cmd
index 348a51c4..61ec26c5 100644
--- a/examples/empty_c/firmware/am64x-evm/icss_g0_tx_pru0_fw/ti-pru-cgt/linker.cmd
+++ b/examples/empty_c/firmware/am64x-evm/icss_g0_tx_pru0_fw/ti-pru-cgt/linker.cmd
@@ -21,14 +21,14 @@ MEMORY
 	PRU0_DMEM_0	: org = 0x00000000 len = 0x00001000	CREGISTER=24
 	/* 8 KB PRU Data RAM 1; reserved completely for Slice1 cores - PRU1,
 	 * RTU1 and Tx_PRU1; do not use for any Slice0 cores */
-	PRU0_DMEM_1	: org = 0x00002000 len = 0x00001000	CREGISTER=25
+	PRU1_DMEM_1	: org = 0x00002000 len = 0x00001000	CREGISTER=25
 	/* NOTE: Custom split of the second 4 KB of ICSS Data RAMs 0 and 1
 	 * split equally between the corresponding RTU and Tx_PRU cores in
 	 * each slice */
 	RTU0_DMEM_0	: org = 0x00001000 len = 0x00000800
 	TX_PRU0_DMEM_0	: org = 0x00001800 len = 0x00000800
-	RTU0_DMEM_1	: org = 0x00003000 len = 0x00000800
-	TX_PRU0_DMEM_1	: org = 0x00003800 len = 0x00000800
+	RTU1_DMEM_1	: org = 0x00003000 len = 0x00000800
+	TX_PRU1_DMEM_1	: org = 0x00003800 len = 0x00000800
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/examples/empty_c/firmware/am64x-evm/icss_g0_tx_pru1_fw/ti-pru-cgt/linker.cmd b/examples/empty_c/firmware/am64x-evm/icss_g0_tx_pru1_fw/ti-pru-cgt/linker.cmd
index e75fb708..c230bfae 100644
--- a/examples/empty_c/firmware/am64x-evm/icss_g0_tx_pru1_fw/ti-pru-cgt/linker.cmd
+++ b/examples/empty_c/firmware/am64x-evm/icss_g0_tx_pru1_fw/ti-pru-cgt/linker.cmd
@@ -21,14 +21,14 @@ MEMORY
 	PRU1_DMEM_1	: org = 0x00000000 len = 0x00001000	CREGISTER=24
 	/* 8 KB PRU Data RAM 0; reserved completely for Slice0 cores - PRU0,
 	 * RTU0 and Tx_PRU0; do not use for any Slice1 cores */
-	PRU1_DMEM_0	: org = 0x00002000 len = 0x00001000	CREGISTER=25
+	PRU0_DMEM_0	: org = 0x00002000 len = 0x00001000	CREGISTER=25
 	/* NOTE: Custom split of the second 4 KB of ICSS Data RAMs 0 and 1
 	 * split equally between the corresponding RTU and Tx_PRU cores in
 	 * each slice */
 	RTU1_DMEM_1	: org = 0x00001000 len = 0x00000800
 	TX_PRU1_DMEM_1	: org = 0x00001800 len = 0x00000800
-	RTU1_DMEM_0	: org = 0x00003000 len = 0x00000800
-	TX_PRU1_DMEM_0	: org = 0x00003800 len = 0x00000800
+	RTU0_DMEM_0	: org = 0x00003000 len = 0x00000800
+	TX_PRU0_DMEM_0	: org = 0x00003800 len = 0x00000800
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/examples/fft/split_radix_fft_4k_single_core/firmware/am243x-lp/icss_g0_pru0_fw/ti-pru-cgt/AM243x_PRU0.cmd b/examples/fft/split_radix_fft_4k_single_core/firmware/am243x-lp/icss_g0_pru0_fw/ti-pru-cgt/AM243x_PRU0.cmd
index 021e887d..ff7b62c7 100644
--- a/examples/fft/split_radix_fft_4k_single_core/firmware/am243x-lp/icss_g0_pru0_fw/ti-pru-cgt/AM243x_PRU0.cmd
+++ b/examples/fft/split_radix_fft_4k_single_core/firmware/am243x-lp/icss_g0_pru0_fw/ti-pru-cgt/AM243x_PRU0.cmd
@@ -19,14 +19,14 @@ MEMORY
 	PRU0_DMEM_0	: org = 0x00000000 len = 0x00001000
 	/* 8 KB PRU Data RAM 1; reserved completely for Slice1 cores - PRU1,
 	 * RTU1 and Tx_PRU1; do not use for any Slice0 cores */
-	PRU0_DMEM_1	: org = 0x00002000 len = 0x00001000
+	PRU1_DMEM_1	: org = 0x00002000 len = 0x00001000
 	/* NOTE: Custom split of the second 4 KB of ICSS Data RAMs 0 and 1
 	 * split equally between the corresponding RTU and Tx_PRU cores in
 	 * each slice */
 	RTU0_DMEM_0	: org = 0x00001000 len = 0x00000800
 	TX_PRU0_DMEM_0	: org = 0x00001800 len = 0x00000800
-	RTU0_DMEM_1	: org = 0x00003000 len = 0x00000800
-	TX_PRU0_DMEM_1	: org = 0x00003800 len = 0x00000800
+	RTU1_DMEM_1	: org = 0x00003000 len = 0x00000800
+	TX_PRU1_DMEM_1	: org = 0x00003800 len = 0x00000800
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/examples/fft/split_radix_fft_4k_single_core/firmware/am261x-lp/icss_m0_pru0_fw/ti-pru-cgt/AM261x_PRU0.cmd b/examples/fft/split_radix_fft_4k_single_core/firmware/am261x-lp/icss_m0_pru0_fw/ti-pru-cgt/AM261x_PRU0.cmd
index 672e9b92..13fdcb5e 100644
--- a/examples/fft/split_radix_fft_4k_single_core/firmware/am261x-lp/icss_m0_pru0_fw/ti-pru-cgt/AM261x_PRU0.cmd
+++ b/examples/fft/split_radix_fft_4k_single_core/firmware/am261x-lp/icss_m0_pru0_fw/ti-pru-cgt/AM261x_PRU0.cmd
@@ -17,7 +17,7 @@ MEMORY
 	/* 8 KB PRU Data RAM 0 */
 	PRU0_DMEM_0	: org = 0x00000000 len = 0x00002000
 	/* 8 KB PRU Data RAM 1 */
-	PRU0_DMEM_1	: org = 0x00002000 len = 0x00002000
+	PRU1_DMEM_1	: org = 0x00002000 len = 0x00002000
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/examples/fft/split_radix_fft_post_processing/firmware/am243x-lp/icss_g0_pru0_fw/ti-pru-cgt/AM243x_PRU0.cmd b/examples/fft/split_radix_fft_post_processing/firmware/am243x-lp/icss_g0_pru0_fw/ti-pru-cgt/AM243x_PRU0.cmd
index a69842cd..389d0cbd 100644
--- a/examples/fft/split_radix_fft_post_processing/firmware/am243x-lp/icss_g0_pru0_fw/ti-pru-cgt/AM243x_PRU0.cmd
+++ b/examples/fft/split_radix_fft_post_processing/firmware/am243x-lp/icss_g0_pru0_fw/ti-pru-cgt/AM243x_PRU0.cmd
@@ -21,14 +21,14 @@ MEMORY
 	PRU0_DMEM_0	: org = 0x00000000 len = 0x00001000	CREGISTER=24
 	/* 8 KB PRU Data RAM 1; reserved completely for Slice1 cores - PRU1,
 	 * RTU1 and Tx_PRU1; do not use for any Slice0 cores */
-	PRU0_DMEM_1	: org = 0x00002000 len = 0x00001000	CREGISTER=25
+	PRU1_DMEM_1	: org = 0x00002000 len = 0x00001000	CREGISTER=25
 	/* NOTE: Custom split of the second 4 KB of ICSS Data RAMs 0 and 1
 	 * split equally between the corresponding RTU and Tx_PRU cores in
 	 * each slice */
 	RTU0_DMEM_0	: org = 0x00001000 len = 0x00000800
 	TX_PRU0_DMEM_0	: org = 0x00001800 len = 0x00000800
-	RTU0_DMEM_1	: org = 0x00003000 len = 0x00000800
-	TX_PRU0_DMEM_1	: org = 0x00003800 len = 0x00000800
+	RTU1_DMEM_1	: org = 0x00003000 len = 0x00000800
+	TX_PRU1_DMEM_1	: org = 0x00003800 len = 0x00000800
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/examples/fir/firmware/am243x-lp/icss_g0_pru0_fw/ti-pru-cgt/linker.cmd b/examples/fir/firmware/am243x-lp/icss_g0_pru0_fw/ti-pru-cgt/linker.cmd
index a69842cd..389d0cbd 100644
--- a/examples/fir/firmware/am243x-lp/icss_g0_pru0_fw/ti-pru-cgt/linker.cmd
+++ b/examples/fir/firmware/am243x-lp/icss_g0_pru0_fw/ti-pru-cgt/linker.cmd
@@ -21,14 +21,14 @@ MEMORY
 	PRU0_DMEM_0	: org = 0x00000000 len = 0x00001000	CREGISTER=24
 	/* 8 KB PRU Data RAM 1; reserved completely for Slice1 cores - PRU1,
 	 * RTU1 and Tx_PRU1; do not use for any Slice0 cores */
-	PRU0_DMEM_1	: org = 0x00002000 len = 0x00001000	CREGISTER=25
+	PRU1_DMEM_1	: org = 0x00002000 len = 0x00001000	CREGISTER=25
 	/* NOTE: Custom split of the second 4 KB of ICSS Data RAMs 0 and 1
 	 * split equally between the corresponding RTU and Tx_PRU cores in
 	 * each slice */
 	RTU0_DMEM_0	: org = 0x00001000 len = 0x00000800
 	TX_PRU0_DMEM_0	: org = 0x00001800 len = 0x00000800
-	RTU0_DMEM_1	: org = 0x00003000 len = 0x00000800
-	TX_PRU0_DMEM_1	: org = 0x00003800 len = 0x00000800
+	RTU1_DMEM_1	: org = 0x00003000 len = 0x00000800
+	TX_PRU1_DMEM_1	: org = 0x00003800 len = 0x00000800
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/examples/logic_scope/firmware/am243x-lp/icss_g0_pru0_fw/ti-pru-cgt/linker.cmd b/examples/logic_scope/firmware/am243x-lp/icss_g0_pru0_fw/ti-pru-cgt/linker.cmd
index a69842cd..389d0cbd 100644
--- a/examples/logic_scope/firmware/am243x-lp/icss_g0_pru0_fw/ti-pru-cgt/linker.cmd
+++ b/examples/logic_scope/firmware/am243x-lp/icss_g0_pru0_fw/ti-pru-cgt/linker.cmd
@@ -21,14 +21,14 @@ MEMORY
 	PRU0_DMEM_0	: org = 0x00000000 len = 0x00001000	CREGISTER=24
 	/* 8 KB PRU Data RAM 1; reserved completely for Slice1 cores - PRU1,
 	 * RTU1 and Tx_PRU1; do not use for any Slice0 cores */
-	PRU0_DMEM_1	: org = 0x00002000 len = 0x00001000	CREGISTER=25
+	PRU1_DMEM_1	: org = 0x00002000 len = 0x00001000	CREGISTER=25
 	/* NOTE: Custom split of the second 4 KB of ICSS Data RAMs 0 and 1
 	 * split equally between the corresponding RTU and Tx_PRU cores in
 	 * each slice */
 	RTU0_DMEM_0	: org = 0x00001000 len = 0x00000800
 	TX_PRU0_DMEM_0	: org = 0x00001800 len = 0x00000800
-	RTU0_DMEM_1	: org = 0x00003000 len = 0x00000800
-	TX_PRU0_DMEM_1	: org = 0x00003800 len = 0x00000800
+	RTU1_DMEM_1	: org = 0x00003000 len = 0x00000800
+	TX_PRU1_DMEM_1	: org = 0x00003800 len = 0x00000800
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/examples/logic_scope/firmware/am243x-lp/icss_g0_rtu_pru0_fw/ti-pru-cgt/linker.cmd b/examples/logic_scope/firmware/am243x-lp/icss_g0_rtu_pru0_fw/ti-pru-cgt/linker.cmd
index 64ab61bc..54cedd3c 100644
--- a/examples/logic_scope/firmware/am243x-lp/icss_g0_rtu_pru0_fw/ti-pru-cgt/linker.cmd
+++ b/examples/logic_scope/firmware/am243x-lp/icss_g0_rtu_pru0_fw/ti-pru-cgt/linker.cmd
@@ -21,14 +21,14 @@ MEMORY
 	PRU0_DMEM_0	: org = 0x00000000 len = 0x00001000	CREGISTER=24
 	/* 8 KB PRU Data RAM 1; reserved completely for Slice1 cores - PRU1,
 	 * RTU1 and Tx_PRU1; do not use for any Slice0 cores */
-	PRU0_DMEM_1	: org = 0x00002000 len = 0x00001000	CREGISTER=25
+	PRU1_DMEM_1	: org = 0x00002000 len = 0x00001000	CREGISTER=25
 	/* NOTE: Custom split of the second 4 KB of ICSS Data RAMs 0 and 1
 	 * split equally between the corresponding RTU and Tx_PRU cores in
 	 * each slice */
 	RTU0_DMEM_0	: org = 0x00001000 len = 0x00000800
 	TX_PRU0_DMEM_0	: org = 0x00001800 len = 0x00000800
-	RTU0_DMEM_1	: org = 0x00003000 len = 0x00000800
-	TX_PRU0_DMEM_1	: org = 0x00003800 len = 0x00000800
+	RTU1_DMEM_1	: org = 0x00003000 len = 0x00000800
+	TX_PRU1_DMEM_1	: org = 0x00003800 len = 0x00000800
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/examples/multicore_scheduler/firmware/am243x-lp/icss_g0_pru0_fw/ti-pru-cgt/linker.cmd b/examples/multicore_scheduler/firmware/am243x-lp/icss_g0_pru0_fw/ti-pru-cgt/linker.cmd
index 4a67c6e6..f3d10798 100644
--- a/examples/multicore_scheduler/firmware/am243x-lp/icss_g0_pru0_fw/ti-pru-cgt/linker.cmd
+++ b/examples/multicore_scheduler/firmware/am243x-lp/icss_g0_pru0_fw/ti-pru-cgt/linker.cmd
@@ -20,14 +20,14 @@ MEMORY
 	PRU0_DMEM_0	: org = 0x00000000 len = 0x00001000	CREGISTER=24
 	/* 8 KB PRU Data RAM 1; reserved completely for Slice1 cores - PRU1,
 	 * RTU1 and Tx_PRU1; do not use for any Slice0 cores */
-	PRU0_DMEM_1	: org = 0x00002000 len = 0x00001000	CREGISTER=25
+	PRU1_DMEM_1	: org = 0x00002000 len = 0x00001000	CREGISTER=25
 	/* NOTE: Custom split of the second 4 KB of ICSS Data RAMs 0 and 1
 	 * split equally between the corresponding RTU and Tx_PRU cores in
 	 * each slice */
 	RTU0_DMEM_0	: org = 0x00001000 len = 0x00000800
 	TX_PRU0_DMEM_0	: org = 0x00001800 len = 0x00000800
-	RTU0_DMEM_1	: org = 0x00003000 len = 0x00000800
-	TX_PRU0_DMEM_1	: org = 0x00003800 len = 0x00000800
+	RTU1_DMEM_1	: org = 0x00003000 len = 0x00000800
+	TX_PRU1_DMEM_1	: org = 0x00003800 len = 0x00000800
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/examples/multicore_scheduler/firmware/am243x-lp/icss_g0_pru1_fw/ti-pru-cgt/linker.cmd b/examples/multicore_scheduler/firmware/am243x-lp/icss_g0_pru1_fw/ti-pru-cgt/linker.cmd
index d4dd9629..c8240918 100644
--- a/examples/multicore_scheduler/firmware/am243x-lp/icss_g0_pru1_fw/ti-pru-cgt/linker.cmd
+++ b/examples/multicore_scheduler/firmware/am243x-lp/icss_g0_pru1_fw/ti-pru-cgt/linker.cmd
@@ -14,19 +14,19 @@ MEMORY
 
       PAGE 1:
 	/* Data RAMs */
-	/* 8 KB PRU Data RAM 0; use only the first 4 KB for PRU0 and reserve
-	 * the second 4 KB for RTU0 and Tx_PRU0 */
-	PRU0_DMEM_0	: org = 0x00000000 len = 0x00001000	CREGISTER=24
-	/* 8 KB PRU Data RAM 1; reserved completely for Slice1 cores - PRU1,
-	 * RTU1 and Tx_PRU1; do not use for any Slice0 cores */
-	PRU0_DMEM_1	: org = 0x00002000 len = 0x00001000	CREGISTER=25
+	/* 8 KB PRU Data RAM 1; use only the first 4 KB for PRU1 and reserve
+	 * the second 4 KB for RTU1 and Tx_PRU1 */
+	PRU1_DMEM_1	: org = 0x00000000 len = 0x00001000	CREGISTER=24
+	/* 8 KB PRU Data RAM 0; reserved completely for Slice0 cores - PRU0,
+	 * RTU0 and Tx_PRU0; do not use for any Slice1 cores */
+	PRU0_DMEM_0	: org = 0x00002000 len = 0x00001000	CREGISTER=25
 	/* NOTE: Custom split of the second 4 KB of ICSS Data RAMs 0 and 1
 	 * split equally between the corresponding RTU and Tx_PRU cores in
 	 * each slice */
-	RTU0_DMEM_0	: org = 0x00001000 len = 0x00000800
-	TX_PRU0_DMEM_0	: org = 0x00001800 len = 0x00000800
-	RTU0_DMEM_1	: org = 0x00003000 len = 0x00000800
-	TX_PRU0_DMEM_1	: org = 0x00003800 len = 0x00000800
+	RTU1_DMEM_1	: org = 0x00001000 len = 0x00000800
+	TX_PRU1_DMEM_1	: org = 0x00001800 len = 0x00000800
+	RTU0_DMEM_0	: org = 0x00003000 len = 0x00000800
+	TX_PRU0_DMEM_0	: org = 0x00003800 len = 0x00000800
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
@@ -46,17 +46,18 @@ MEMORY
 	/* XXX: PRU_INTC_0x200 is part of INTC space, and is therefore commented
 	 * out as it conflicts with PRU_INTC size above. To use PRU_INTC_0x200,
 	 * split up the pruIntc structure and CT_INTC variable in
-	 * include/PROCESSOR/pru_intc.h */
+	 * source/include/c_code/PROCESSOR/pru_intc.h */
 	/*PRU_INTC_0x200: org = 0x00020200 len = 0x00001304	CREGISTER=6*/
 	PRU_UART	: org = 0x00028000 len = 0x00000038	CREGISTER=7
 	PRU_IEP0_0x100	: org = 0x0002E100 len = 0x0000021C	CREGISTER=8
 	MII_G_RT	: org = 0x00033000 len = 0x00000F44	CREGISTER=9
-	TM_CFG_PRU0	: org = 0x0002A000 len = 0x0000004C	CREGISTER=10
-	PRU0_CTRL	: org = 0x00022000 len = 0x00000030	CREGISTER=11
+	TM_CFG_PRU1	: org = 0x0002A200 len = 0x0000004C	CREGISTER=10
+	PRU1_CTRL	: org = 0x00024000 len = 0x00000030	CREGISTER=11
+
 	PA_STATS_QRAM	: org = 0x00027000 len = 0x00001000	CREGISTER=12
 	PA_STATS_CRAM	: org = 0x0002C000 len = 0x00001000	CREGISTER=13
 	MII_MDIO	: org = 0x00032400 len = 0x00000088	CREGISTER=21
-	PRU_RTU_RAT0	: org = 0x00008000 len = 0x00000854	CREGISTER=22
+	PRU_RTU_RAT1	: org = 0x00009000 len = 0x00000854	CREGISTER=22
 	PRU_IEP0	: org = 0x0002E000 len = 0x00000100	CREGISTER=26
 	MII_RT		: org = 0x00032000 len = 0x00000070	CREGISTER=27
 
@@ -83,15 +84,15 @@ SECTIONS {
 	.text:_c_int00*	>  0x0, PAGE 0
 
 	.text		>  PRU_IMEM, PAGE 0
-	.stack		>  PRU0_DMEM_1, PAGE 1
-	.bss		>  PRU0_DMEM_1, PAGE 1
-	.cio		>  PRU0_DMEM_1, PAGE 1
-	.data		>  PRU0_DMEM_1, PAGE 1
-	.switch		>  PRU0_DMEM_1, PAGE 1
-	.sysmem		>  PRU0_DMEM_1, PAGE 1
-	.cinit		>  PRU0_DMEM_1, PAGE 1
-	.rodata		>  PRU0_DMEM_1, PAGE 1
-	.rofardata	>  PRU0_DMEM_1, PAGE 1
-	.farbss		>  PRU0_DMEM_1, PAGE 1
-	.fardata	>  PRU0_DMEM_1, PAGE 1
+	.stack		>  PRU1_DMEM_1, PAGE 1
+	.bss		>  PRU1_DMEM_1, PAGE 1
+	.cio		>  PRU1_DMEM_1, PAGE 1
+	.data		>  PRU1_DMEM_1, PAGE 1
+	.switch		>  PRU1_DMEM_1, PAGE 1
+	.sysmem		>  PRU1_DMEM_1, PAGE 1
+	.cinit		>  PRU1_DMEM_1, PAGE 1
+	.rodata		>  PRU1_DMEM_1, PAGE 1
+	.rofardata	>  PRU1_DMEM_1, PAGE 1
+	.farbss		>  PRU1_DMEM_1, PAGE 1
+	.fardata	>  PRU1_DMEM_1, PAGE 1
 }
diff --git a/examples/multicore_scheduler/firmware/am243x-lp/icss_g0_rtu_pru0_fw/ti-pru-cgt/linker.cmd b/examples/multicore_scheduler/firmware/am243x-lp/icss_g0_rtu_pru0_fw/ti-pru-cgt/linker.cmd
index be109240..855fbc2b 100644
--- a/examples/multicore_scheduler/firmware/am243x-lp/icss_g0_rtu_pru0_fw/ti-pru-cgt/linker.cmd
+++ b/examples/multicore_scheduler/firmware/am243x-lp/icss_g0_rtu_pru0_fw/ti-pru-cgt/linker.cmd
@@ -9,8 +9,8 @@
 MEMORY
 {
       PAGE 0:
-	/* 12 KB PRU Instruction RAM */
-	PRU_IMEM	: org = 0x00000000 len = 0x00003000
+	/* 8 KB RTU Instruction RAM */
+	RTU_IMEM	: org = 0x00000000 len = 0x00002000
 
       PAGE 1:
 	/* Data RAMs */
@@ -19,14 +19,14 @@ MEMORY
 	PRU0_DMEM_0	: org = 0x00000000 len = 0x00001000	CREGISTER=24
 	/* 8 KB PRU Data RAM 1; reserved completely for Slice1 cores - PRU1,
 	 * RTU1 and Tx_PRU1; do not use for any Slice0 cores */
-	PRU0_DMEM_1	: org = 0x00002000 len = 0x00001000	CREGISTER=25
+	PRU1_DMEM_1	: org = 0x00002000 len = 0x00001000	CREGISTER=25
 	/* NOTE: Custom split of the second 4 KB of ICSS Data RAMs 0 and 1
 	 * split equally between the corresponding RTU and Tx_PRU cores in
 	 * each slice */
 	RTU0_DMEM_0	: org = 0x00001000 len = 0x00000800
 	TX_PRU0_DMEM_0	: org = 0x00001800 len = 0x00000800
-	RTU0_DMEM_1	: org = 0x00003000 len = 0x00000800
-	TX_PRU0_DMEM_1	: org = 0x00003800 len = 0x00000800
+	RTU1_DMEM_1	: org = 0x00003000 len = 0x00000800
+	TX_PRU1_DMEM_1	: org = 0x00003800 len = 0x00000800
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
@@ -46,13 +46,13 @@ MEMORY
 	/* XXX: PRU_INTC_0x200 is part of INTC space, and is therefore commented
 	 * out as it conflicts with PRU_INTC size above. To use PRU_INTC_0x200,
 	 * split up the pruIntc structure and CT_INTC variable in
-	 * include/PROCESSOR/pru_intc.h */
+	 * source/include/c_code/PROCESSOR/pru_intc.h */
 	/*PRU_INTC_0x200: org = 0x00020200 len = 0x00001304	CREGISTER=6*/
 	PRU_UART	: org = 0x00028000 len = 0x00000038	CREGISTER=7
 	PRU_IEP0_0x100	: org = 0x0002E100 len = 0x0000021C	CREGISTER=8
 	MII_G_RT	: org = 0x00033000 len = 0x00000F44	CREGISTER=9
-	TM_CFG_PRU0	: org = 0x0002A000 len = 0x0000004C	CREGISTER=10
-	PRU0_CTRL	: org = 0x00022000 len = 0x00000030	CREGISTER=11
+	TM_CFG_RTU0	: org = 0x0002A100 len = 0x0000004C	CREGISTER=10
+	RTU0_CTRL	: org = 0x00023000 len = 0x00000030	CREGISTER=11
 	PA_STATS_QRAM	: org = 0x00027000 len = 0x00001000	CREGISTER=12
 	PA_STATS_CRAM	: org = 0x0002C000 len = 0x00001000	CREGISTER=13
 	MII_MDIO	: org = 0x00032400 len = 0x00000088	CREGISTER=21
@@ -78,11 +78,11 @@ MEMORY
 
 /* Specify the sections allocation into memory */
 SECTIONS {
-	/* Forces _c_int00 to the start of PRU IRAM. Not necessary when loading
+	/* Forces _c_int00 to the start of RTU IRAM. Not necessary when loading
 	   an ELF file, but useful when loading a binary */
 	.text:_c_int00*	>  0x0, PAGE 0
 
-	.text		>  PRU_IMEM, PAGE 0
+	.text		>  RTU_IMEM, PAGE 0
 	.stack		>  RTU0_DMEM_0, PAGE 1
 	.bss		>  RTU0_DMEM_0, PAGE 1
 	.cio		>  RTU0_DMEM_0, PAGE 1
diff --git a/examples/multicore_scheduler/firmware/am243x-lp/icss_g0_rtu_pru1_fw/ti-pru-cgt/linker.cmd b/examples/multicore_scheduler/firmware/am243x-lp/icss_g0_rtu_pru1_fw/ti-pru-cgt/linker.cmd
index bd1b8bb4..9e9e98f1 100644
--- a/examples/multicore_scheduler/firmware/am243x-lp/icss_g0_rtu_pru1_fw/ti-pru-cgt/linker.cmd
+++ b/examples/multicore_scheduler/firmware/am243x-lp/icss_g0_rtu_pru1_fw/ti-pru-cgt/linker.cmd
@@ -10,24 +10,24 @@
 MEMORY
 {
       PAGE 0:
-	/* 12 KB PRU Instruction RAM */
-	PRU_IMEM	: org = 0x00000000 len = 0x00003000
+	/* 8 KB RTU Instruction RAM */
+	RTU_IMEM	: org = 0x00000000 len = 0x00002000
 
       PAGE 1:
 	/* Data RAMs */
-	/* 8 KB PRU Data RAM 0; use only the first 4 KB for PRU0 and reserve
-	 * the second 4 KB for RTU0 and Tx_PRU0 */
-	PRU0_DMEM_0	: org = 0x00000000 len = 0x00001000	CREGISTER=24
-	/* 8 KB PRU Data RAM 1; reserved completely for Slice1 cores - PRU1,
-	 * RTU1 and Tx_PRU1; do not use for any Slice0 cores */
-	PRU0_DMEM_1	: org = 0x00002000 len = 0x00001000	CREGISTER=25
+	/* 8 KB PRU Data RAM 1; use only the first 4 KB for PRU1 and reserve
+	 * the second 4 KB for RTU1 and Tx_PRU1 */
+	PRU1_DMEM_1	: org = 0x00000000 len = 0x00001000	CREGISTER=24
+	/* 8 KB PRU Data RAM 0; reserved completely for Slice0 cores - PRU0,
+	 * RTU0 and Tx_PRU0; do not use for any Slice1 cores */
+	PRU0_DMEM_0	: org = 0x00002000 len = 0x00001000	CREGISTER=25
 	/* NOTE: Custom split of the second 4 KB of ICSS Data RAMs 0 and 1
 	 * split equally between the corresponding RTU and Tx_PRU cores in
 	 * each slice */
-	RTU0_DMEM_0	: org = 0x00001000 len = 0x00000800
-	TX_PRU0_DMEM_0	: org = 0x00001800 len = 0x00000800
-	RTU0_DMEM_1	: org = 0x00003000 len = 0x00000800
-	TX_PRU0_DMEM_1	: org = 0x00003800 len = 0x00000800
+	RTU1_DMEM_1	: org = 0x00001000 len = 0x00000800
+	TX_PRU1_DMEM_1	: org = 0x00001800 len = 0x00000800
+	RTU0_DMEM_0	: org = 0x00003000 len = 0x00000800
+	TX_PRU0_DMEM_0	: org = 0x00003800 len = 0x00000800
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
@@ -47,17 +47,18 @@ MEMORY
 	/* XXX: PRU_INTC_0x200 is part of INTC space, and is therefore commented
 	 * out as it conflicts with PRU_INTC size above. To use PRU_INTC_0x200,
 	 * split up the pruIntc structure and CT_INTC variable in
-	 * include/PROCESSOR/pru_intc.h */
+	 * source/include/c_code/PROCESSOR/pru_intc.h */
 	/*PRU_INTC_0x200: org = 0x00020200 len = 0x00001304	CREGISTER=6*/
 	PRU_UART	: org = 0x00028000 len = 0x00000038	CREGISTER=7
 	PRU_IEP0_0x100	: org = 0x0002E100 len = 0x0000021C	CREGISTER=8
 	MII_G_RT	: org = 0x00033000 len = 0x00000F44	CREGISTER=9
-	TM_CFG_PRU0	: org = 0x0002A000 len = 0x0000004C	CREGISTER=10
-	PRU0_CTRL	: org = 0x00022000 len = 0x00000030	CREGISTER=11
+	TM_CFG_RTU1	: org = 0x0002A300 len = 0x0000004C	CREGISTER=10
+	RTU1_CTRL	: org = 0x00023800 len = 0x00000030	CREGISTER=11
+
 	PA_STATS_QRAM	: org = 0x00027000 len = 0x00001000	CREGISTER=12
 	PA_STATS_CRAM	: org = 0x0002C000 len = 0x00001000	CREGISTER=13
 	MII_MDIO	: org = 0x00032400 len = 0x00000088	CREGISTER=21
-	PRU_RTU_RAT0	: org = 0x00008000 len = 0x00000854	CREGISTER=22
+	PRU_RTU_RAT1	: org = 0x00009000 len = 0x00000854	CREGISTER=22
 	PRU_IEP0	: org = 0x0002E000 len = 0x00000100	CREGISTER=26
 	MII_RT		: org = 0x00032000 len = 0x00000070	CREGISTER=27
 
@@ -79,20 +80,20 @@ MEMORY
 
 /* Specify the sections allocation into memory */
 SECTIONS {
-	/* Forces _c_int00 to the start of PRU IRAM. Not necessary when loading
+	/* Forces _c_int00 to the start of RTU IRAM. Not necessary when loading
 	   an ELF file, but useful when loading a binary */
 	.text:_c_int00*	>  0x0, PAGE 0
 
-	.text		>  PRU_IMEM, PAGE 0
-	.stack		>  RTU0_DMEM_1, PAGE 1
-	.bss		>  RTU0_DMEM_1, PAGE 1
-	.cio		>  RTU0_DMEM_1, PAGE 1
-	.data		>  RTU0_DMEM_1, PAGE 1
-	.switch		>  RTU0_DMEM_1, PAGE 1
-	.sysmem		>  RTU0_DMEM_1, PAGE 1
-	.cinit		>  RTU0_DMEM_1, PAGE 1
-	.rodata		>  RTU0_DMEM_1, PAGE 1
-	.rofardata	>  RTU0_DMEM_1, PAGE 1
-	.farbss		>  RTU0_DMEM_1, PAGE 1
-	.fardata	>  RTU0_DMEM_1, PAGE 1
+	.text		>  RTU_IMEM, PAGE 0
+	.stack		>  RTU1_DMEM_1, PAGE 1
+	.bss		>  RTU1_DMEM_1, PAGE 1
+	.cio		>  RTU1_DMEM_1, PAGE 1
+	.data		>  RTU1_DMEM_1, PAGE 1
+	.switch		>  RTU1_DMEM_1, PAGE 1
+	.sysmem		>  RTU1_DMEM_1, PAGE 1
+	.cinit		>  RTU1_DMEM_1, PAGE 1
+	.rodata		>  RTU1_DMEM_1, PAGE 1
+	.rofardata	>  RTU1_DMEM_1, PAGE 1
+	.farbss		>  RTU1_DMEM_1, PAGE 1
+	.fardata	>  RTU1_DMEM_1, PAGE 1
 }
diff --git a/examples/multicore_scheduler/firmware/am243x-lp/icss_g0_tx_pru0_fw/ti-pru-cgt/linker.cmd b/examples/multicore_scheduler/firmware/am243x-lp/icss_g0_tx_pru0_fw/ti-pru-cgt/linker.cmd
index 10f994db..2f8551b0 100644
--- a/examples/multicore_scheduler/firmware/am243x-lp/icss_g0_tx_pru0_fw/ti-pru-cgt/linker.cmd
+++ b/examples/multicore_scheduler/firmware/am243x-lp/icss_g0_tx_pru0_fw/ti-pru-cgt/linker.cmd
@@ -10,8 +10,8 @@
 MEMORY
 {
       PAGE 0:
-	/* 12 KB PRU Instruction RAM */
-	PRU_IMEM	: org = 0x00000000 len = 0x00003000
+	/* 6 KB TX_PRU Instruction RAM */
+	TX_PRU_IMEM	: org = 0x00000000 len = 0x00001800
 
       PAGE 1:
 	/* Data RAMs */
@@ -20,14 +20,14 @@ MEMORY
 	PRU0_DMEM_0	: org = 0x00000000 len = 0x00001000	CREGISTER=24
 	/* 8 KB PRU Data RAM 1; reserved completely for Slice1 cores - PRU1,
 	 * RTU1 and Tx_PRU1; do not use for any Slice0 cores */
-	PRU0_DMEM_1	: org = 0x00002000 len = 0x00001000	CREGISTER=25
+	PRU1_DMEM_1	: org = 0x00002000 len = 0x00001000	CREGISTER=25
 	/* NOTE: Custom split of the second 4 KB of ICSS Data RAMs 0 and 1
 	 * split equally between the corresponding RTU and Tx_PRU cores in
 	 * each slice */
 	RTU0_DMEM_0	: org = 0x00001000 len = 0x00000800
 	TX_PRU0_DMEM_0	: org = 0x00001800 len = 0x00000800
-	RTU0_DMEM_1	: org = 0x00003000 len = 0x00000800
-	TX_PRU0_DMEM_1	: org = 0x00003800 len = 0x00000800
+	RTU1_DMEM_1	: org = 0x00003000 len = 0x00000800
+	TX_PRU1_DMEM_1	: org = 0x00003800 len = 0x00000800
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
@@ -47,13 +47,13 @@ MEMORY
 	/* XXX: PRU_INTC_0x200 is part of INTC space, and is therefore commented
 	 * out as it conflicts with PRU_INTC size above. To use PRU_INTC_0x200,
 	 * split up the pruIntc structure and CT_INTC variable in
-	 * include/PROCESSOR/pru_intc.h */
+	 * source/include/c_code/PROCESSOR/pru_intc.h */
 	/*PRU_INTC_0x200: org = 0x00020200 len = 0x00001304	CREGISTER=6*/
 	PRU_UART	: org = 0x00028000 len = 0x00000038	CREGISTER=7
 	PRU_IEP0_0x100	: org = 0x0002E100 len = 0x0000021C	CREGISTER=8
 	MII_G_RT	: org = 0x00033000 len = 0x00000F44	CREGISTER=9
-	TM_CFG_PRU0	: org = 0x0002A000 len = 0x0000004C	CREGISTER=10
-	PRU0_CTRL	: org = 0x00022000 len = 0x00000030	CREGISTER=11
+	TM_CFG_TX_PRU0	: org = 0x0002A400 len = 0x0000004C	CREGISTER=10
+	TX_PRU0_CTRL	: org = 0x00025000 len = 0x00000030	CREGISTER=11
 	PA_STATS_QRAM	: org = 0x00027000 len = 0x00001000	CREGISTER=12
 	PA_STATS_CRAM	: org = 0x0002C000 len = 0x00001000	CREGISTER=13
 	MII_MDIO	: org = 0x00032400 len = 0x00000088	CREGISTER=21
@@ -79,11 +79,11 @@ MEMORY
 
 /* Specify the sections allocation into memory */
 SECTIONS {
-	/* Forces _c_int00 to the start of PRU IRAM. Not necessary when loading
+	/* Forces _c_int00 to the start of Tx_PRU IRAM. Not necessary when loading
 	   an ELF file, but useful when loading a binary */
 	.text:_c_int00*	>  0x0, PAGE 0
 
-	.text		>  PRU_IMEM, PAGE 0
+	.text		>  TX_PRU_IMEM, PAGE 0
 	.stack		>  TX_PRU0_DMEM_0, PAGE 1
 	.bss		>  TX_PRU0_DMEM_0, PAGE 1
 	.cio		>  TX_PRU0_DMEM_0, PAGE 1
diff --git a/examples/multicore_scheduler/firmware/am243x-lp/icss_g0_tx_pru1_fw/ti-pru-cgt/linker.cmd b/examples/multicore_scheduler/firmware/am243x-lp/icss_g0_tx_pru1_fw/ti-pru-cgt/linker.cmd
index 5bf421d8..bef02f03 100644
--- a/examples/multicore_scheduler/firmware/am243x-lp/icss_g0_tx_pru1_fw/ti-pru-cgt/linker.cmd
+++ b/examples/multicore_scheduler/firmware/am243x-lp/icss_g0_tx_pru1_fw/ti-pru-cgt/linker.cmd
@@ -10,24 +10,24 @@
 MEMORY
 {
       PAGE 0:
-	/* 12 KB PRU Instruction RAM */
-	PRU_IMEM	: org = 0x00000000 len = 0x00003000
+	/* 6 KB TX_PRU Instruction RAM */
+	TX_PRU_IMEM	: org = 0x00000000 len = 0x00001800
 
       PAGE 1:
 	/* Data RAMs */
-	/* 8 KB PRU Data RAM 0; use only the first 4 KB for PRU0 and reserve
-	 * the second 4 KB for RTU0 and Tx_PRU0 */
-	PRU0_DMEM_0	: org = 0x00000000 len = 0x00001000	CREGISTER=24
-	/* 8 KB PRU Data RAM 1; reserved completely for Slice1 cores - PRU1,
-	 * RTU1 and Tx_PRU1; do not use for any Slice0 cores */
-	PRU0_DMEM_1	: org = 0x00002000 len = 0x00001000	CREGISTER=25
+	/* 8 KB PRU Data RAM 1; use only the first 4 KB for PRU1 and reserve
+	 * the second 4 KB for RTU1 and Tx_PRU1 */
+	PRU1_DMEM_1	: org = 0x00000000 len = 0x00001000	CREGISTER=24
+	/* 8 KB PRU Data RAM 0; reserved completely for Slice0 cores - PRU0,
+	 * RTU0 and Tx_PRU0; do not use for any Slice1 cores */
+	PRU0_DMEM_0	: org = 0x00002000 len = 0x00001000	CREGISTER=25
 	/* NOTE: Custom split of the second 4 KB of ICSS Data RAMs 0 and 1
 	 * split equally between the corresponding RTU and Tx_PRU cores in
 	 * each slice */
-	RTU0_DMEM_0	: org = 0x00001000 len = 0x00000800
-	TX_PRU0_DMEM_0	: org = 0x00001800 len = 0x00000800
-	RTU0_DMEM_1	: org = 0x00003000 len = 0x00000800
-	TX_PRU0_DMEM_1	: org = 0x00003800 len = 0x00000800
+	RTU1_DMEM_1	: org = 0x00001000 len = 0x00000800
+	TX_PRU1_DMEM_1	: org = 0x00001800 len = 0x00000800
+	RTU0_DMEM_0	: org = 0x00003000 len = 0x00000800
+	TX_PRU0_DMEM_0	: org = 0x00003800 len = 0x00000800
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
@@ -47,17 +47,18 @@ MEMORY
 	/* XXX: PRU_INTC_0x200 is part of INTC space, and is therefore commented
 	 * out as it conflicts with PRU_INTC size above. To use PRU_INTC_0x200,
 	 * split up the pruIntc structure and CT_INTC variable in
-	 * include/PROCESSOR/pru_intc.h */
+	 * source/include/c_code/PROCESSOR/pru_intc.h */
 	/*PRU_INTC_0x200: org = 0x00020200 len = 0x00001304	CREGISTER=6*/
 	PRU_UART	: org = 0x00028000 len = 0x00000038	CREGISTER=7
 	PRU_IEP0_0x100	: org = 0x0002E100 len = 0x0000021C	CREGISTER=8
 	MII_G_RT	: org = 0x00033000 len = 0x00000F44	CREGISTER=9
-	TM_CFG_PRU0	: org = 0x0002A000 len = 0x0000004C	CREGISTER=10
-	PRU0_CTRL	: org = 0x00022000 len = 0x00000030	CREGISTER=11
+	TM_CFG_TX_PRU1	: org = 0x0002A500 len = 0x0000004C	CREGISTER=10
+	TX_PRU1_CTRL	: org = 0x00025800 len = 0x00000030	CREGISTER=11
+
 	PA_STATS_QRAM	: org = 0x00027000 len = 0x00001000	CREGISTER=12
 	PA_STATS_CRAM	: org = 0x0002C000 len = 0x00001000	CREGISTER=13
 	MII_MDIO	: org = 0x00032400 len = 0x00000088	CREGISTER=21
-	PRU_RTU_RAT0	: org = 0x00008000 len = 0x00000854	CREGISTER=22
+	PRU_RTU_RAT1	: org = 0x00009000 len = 0x00000854	CREGISTER=22
 	PRU_IEP0	: org = 0x0002E000 len = 0x00000100	CREGISTER=26
 	MII_RT		: org = 0x00032000 len = 0x00000070	CREGISTER=27
 
@@ -79,20 +80,20 @@ MEMORY
 
 /* Specify the sections allocation into memory */
 SECTIONS {
-	/* Forces _c_int00 to the start of PRU IRAM. Not necessary when loading
+	/* Forces _c_int00 to the start of Tx_PRU IRAM. Not necessary when loading
 	   an ELF file, but useful when loading a binary */
 	.text:_c_int00*	>  0x0, PAGE 0
 
-	.text		>  PRU_IMEM, PAGE 0
-	.stack		>  TX_PRU0_DMEM_1, PAGE 1
-	.bss		>  TX_PRU0_DMEM_1, PAGE 1
-	.cio		>  TX_PRU0_DMEM_1, PAGE 1
-	.data		>  TX_PRU0_DMEM_1, PAGE 1
-	.switch		>  TX_PRU0_DMEM_1, PAGE 1
-	.sysmem		>  TX_PRU0_DMEM_1, PAGE 1
-	.cinit		>  TX_PRU0_DMEM_1, PAGE 1
-	.rodata		>  TX_PRU0_DMEM_1, PAGE 1
-	.rofardata	>  TX_PRU0_DMEM_1, PAGE 1
-	.farbss		>  TX_PRU0_DMEM_1, PAGE 1
-	.fardata	>  TX_PRU0_DMEM_1, PAGE 1
+	.text		>  TX_PRU_IMEM, PAGE 0
+	.stack		>  TX_PRU1_DMEM_1, PAGE 1
+	.bss		>  TX_PRU1_DMEM_1, PAGE 1
+	.cio		>  TX_PRU1_DMEM_1, PAGE 1
+	.data		>  TX_PRU1_DMEM_1, PAGE 1
+	.switch		>  TX_PRU1_DMEM_1, PAGE 1
+	.sysmem		>  TX_PRU1_DMEM_1, PAGE 1
+	.cinit		>  TX_PRU1_DMEM_1, PAGE 1
+	.rodata		>  TX_PRU1_DMEM_1, PAGE 1
+	.rofardata	>  TX_PRU1_DMEM_1, PAGE 1
+	.farbss		>  TX_PRU1_DMEM_1, PAGE 1
+	.fardata	>  TX_PRU1_DMEM_1, PAGE 1
 }
diff --git a/examples/pru_emif/firmware/pru0/am243x-evm/icss_g0_pru0_fw/ti-pru-cgt/linker.cmd b/examples/pru_emif/firmware/pru0/am243x-evm/icss_g0_pru0_fw/ti-pru-cgt/linker.cmd
index 021e887d..ff7b62c7 100644
--- a/examples/pru_emif/firmware/pru0/am243x-evm/icss_g0_pru0_fw/ti-pru-cgt/linker.cmd
+++ b/examples/pru_emif/firmware/pru0/am243x-evm/icss_g0_pru0_fw/ti-pru-cgt/linker.cmd
@@ -19,14 +19,14 @@ MEMORY
 	PRU0_DMEM_0	: org = 0x00000000 len = 0x00001000
 	/* 8 KB PRU Data RAM 1; reserved completely for Slice1 cores - PRU1,
 	 * RTU1 and Tx_PRU1; do not use for any Slice0 cores */
-	PRU0_DMEM_1	: org = 0x00002000 len = 0x00001000
+	PRU1_DMEM_1	: org = 0x00002000 len = 0x00001000
 	/* NOTE: Custom split of the second 4 KB of ICSS Data RAMs 0 and 1
 	 * split equally between the corresponding RTU and Tx_PRU cores in
 	 * each slice */
 	RTU0_DMEM_0	: org = 0x00001000 len = 0x00000800
 	TX_PRU0_DMEM_0	: org = 0x00001800 len = 0x00000800
-	RTU0_DMEM_1	: org = 0x00003000 len = 0x00000800
-	TX_PRU0_DMEM_1	: org = 0x00003800 len = 0x00000800
+	RTU1_DMEM_1	: org = 0x00003000 len = 0x00000800
+	TX_PRU1_DMEM_1	: org = 0x00003800 len = 0x00000800
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/examples/pru_emif/firmware/pru1/am243x-evm/icss_g0_pru1_fw/ti-pru-cgt/linker.cmd b/examples/pru_emif/firmware/pru1/am243x-evm/icss_g0_pru1_fw/ti-pru-cgt/linker.cmd
index bd059cb2..7d044555 100644
--- a/examples/pru_emif/firmware/pru1/am243x-evm/icss_g0_pru1_fw/ti-pru-cgt/linker.cmd
+++ b/examples/pru_emif/firmware/pru1/am243x-evm/icss_g0_pru1_fw/ti-pru-cgt/linker.cmd
@@ -19,14 +19,14 @@ MEMORY
 	PRU1_DMEM_1	: org = 0x00000000 len = 0x00001000
 	/* 8 KB PRU Data RAM 0; reserved completely for Slice0 cores - PRU0,
 	 * RTU0 and Tx_PRU0; do not use for any Slice1 cores */
-	PRU1_DMEM_0	: org = 0x00002000 len = 0x00001000
+	PRU0_DMEM_0	: org = 0x00002000 len = 0x00001000
 	/* NOTE: Custom split of the second 4 KB of ICSS Data RAMs 0 and 1
 	 * split equally between the corresponding RTU and Tx_PRU cores in
 	 * each slice */
 	RTU1_DMEM_1	: org = 0x00001000 len = 0x00000800
 	TX_PRU1_DMEM_1	: org = 0x00001800 len = 0x00000800
-	RTU1_DMEM_0	: org = 0x00003000 len = 0x00000800
-	TX_PRU1_DMEM_0	: org = 0x00003800 len = 0x00000800
+	RTU0_DMEM_0	: org = 0x00003000 len = 0x00000800
+	TX_PRU0_DMEM_0	: org = 0x00003800 len = 0x00000800
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/examples/rpmsg_echo_linux/firmware/am62x-sk/pruss0_pru0_fw/ti-pru-cgt/linker.cmd b/examples/rpmsg_echo_linux/firmware/am62x-sk/pruss0_pru0_fw/ti-pru-cgt/linker.cmd
index feeb75d3..da7ab3b8 100644
--- a/examples/rpmsg_echo_linux/firmware/am62x-sk/pruss0_pru0_fw/ti-pru-cgt/linker.cmd
+++ b/examples/rpmsg_echo_linux/firmware/am62x-sk/pruss0_pru0_fw/ti-pru-cgt/linker.cmd
@@ -19,7 +19,7 @@ MEMORY
 	/* 8 KB PRU Data RAM 0 */
 	PRU0_DMEM_0	: org = 0x00000000 len = 0x00002000	CREGISTER=24
 	/* 8 KB PRU Data RAM 1 */
-	PRU0_DMEM_1	: org = 0x00002000 len = 0x00002000	CREGISTER=25
+	PRU1_DMEM_1	: org = 0x00002000 len = 0x00002000	CREGISTER=25
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/examples/rpmsg_echo_linux/firmware/am62x-sk/pruss0_pru1_fw/ti-pru-cgt/linker.cmd b/examples/rpmsg_echo_linux/firmware/am62x-sk/pruss0_pru1_fw/ti-pru-cgt/linker.cmd
index cc173a15..314194a1 100644
--- a/examples/rpmsg_echo_linux/firmware/am62x-sk/pruss0_pru1_fw/ti-pru-cgt/linker.cmd
+++ b/examples/rpmsg_echo_linux/firmware/am62x-sk/pruss0_pru1_fw/ti-pru-cgt/linker.cmd
@@ -19,7 +19,7 @@ MEMORY
 	/* 8 KB PRU Data RAM 1 */
 	PRU1_DMEM_1	: org = 0x00000000 len = 0x00002000	CREGISTER=24
 	/* 8 KB PRU Data RAM 0 */
-	PRU1_DMEM_0	: org = 0x00002000 len = 0x00002000	CREGISTER=25
+	PRU0_DMEM_0	: org = 0x00002000 len = 0x00002000	CREGISTER=25
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/examples/rpmsg_echo_linux/firmware/am64x-evm/icss_g0_pru0_fw/ti-pru-cgt/linker.cmd b/examples/rpmsg_echo_linux/firmware/am64x-evm/icss_g0_pru0_fw/ti-pru-cgt/linker.cmd
index c1ae31cf..21077b62 100644
--- a/examples/rpmsg_echo_linux/firmware/am64x-evm/icss_g0_pru0_fw/ti-pru-cgt/linker.cmd
+++ b/examples/rpmsg_echo_linux/firmware/am64x-evm/icss_g0_pru0_fw/ti-pru-cgt/linker.cmd
@@ -21,14 +21,14 @@ MEMORY
 	PRU0_DMEM_0	: org = 0x00000000 len = 0x00001000	CREGISTER=24
 	/* 8 KB PRU Data RAM 1; reserved completely for Slice1 cores - PRU1,
 	 * RTU1 and Tx_PRU1; do not use for any Slice0 cores */
-	PRU0_DMEM_1	: org = 0x00002000 len = 0x00001000	CREGISTER=25
+	PRU1_DMEM_1	: org = 0x00002000 len = 0x00001000	CREGISTER=25
 	/* NOTE: Custom split of the second 4 KB of ICSS Data RAMs 0 and 1
 	 * split equally between the corresponding RTU and Tx_PRU cores in
 	 * each slice */
 	RTU0_DMEM_0	: org = 0x00001000 len = 0x00000800
 	TX_PRU0_DMEM_0	: org = 0x00001800 len = 0x00000800
-	RTU0_DMEM_1	: org = 0x00003000 len = 0x00000800
-	TX_PRU0_DMEM_1	: org = 0x00003800 len = 0x00000800
+	RTU1_DMEM_1	: org = 0x00003000 len = 0x00000800
+	TX_PRU1_DMEM_1	: org = 0x00003800 len = 0x00000800
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/examples/rpmsg_echo_linux/firmware/am64x-evm/icss_g0_pru1_fw/ti-pru-cgt/linker.cmd b/examples/rpmsg_echo_linux/firmware/am64x-evm/icss_g0_pru1_fw/ti-pru-cgt/linker.cmd
index 7d0c72db..8ca5e167 100644
--- a/examples/rpmsg_echo_linux/firmware/am64x-evm/icss_g0_pru1_fw/ti-pru-cgt/linker.cmd
+++ b/examples/rpmsg_echo_linux/firmware/am64x-evm/icss_g0_pru1_fw/ti-pru-cgt/linker.cmd
@@ -21,14 +21,14 @@ MEMORY
 	PRU1_DMEM_1	: org = 0x00000000 len = 0x00001000	CREGISTER=24
 	/* 8 KB PRU Data RAM 0; reserved completely for Slice0 cores - PRU0,
 	 * RTU0 and Tx_PRU0; do not use for any Slice1 cores */
-	PRU1_DMEM_0	: org = 0x00002000 len = 0x00001000	CREGISTER=25
+	PRU0_DMEM_0	: org = 0x00002000 len = 0x00001000	CREGISTER=25
 	/* NOTE: Custom split of the second 4 KB of ICSS Data RAMs 0 and 1
 	 * split equally between the corresponding RTU and Tx_PRU cores in
 	 * each slice */
 	RTU1_DMEM_1	: org = 0x00001000 len = 0x00000800
 	TX_PRU1_DMEM_1	: org = 0x00001800 len = 0x00000800
-	RTU1_DMEM_0	: org = 0x00003000 len = 0x00000800
-	TX_PRU1_DMEM_0	: org = 0x00003800 len = 0x00000800
+	RTU0_DMEM_0	: org = 0x00003000 len = 0x00000800
+	TX_PRU0_DMEM_0	: org = 0x00003800 len = 0x00000800
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/examples/rpmsg_echo_linux/firmware/am64x-evm/icss_g0_rtu_pru0_fw/ti-pru-cgt/linker.cmd b/examples/rpmsg_echo_linux/firmware/am64x-evm/icss_g0_rtu_pru0_fw/ti-pru-cgt/linker.cmd
index 6fdcf865..4ec28cb4 100644
--- a/examples/rpmsg_echo_linux/firmware/am64x-evm/icss_g0_rtu_pru0_fw/ti-pru-cgt/linker.cmd
+++ b/examples/rpmsg_echo_linux/firmware/am64x-evm/icss_g0_rtu_pru0_fw/ti-pru-cgt/linker.cmd
@@ -21,14 +21,14 @@ MEMORY
 	PRU0_DMEM_0	: org = 0x00000000 len = 0x00001000	CREGISTER=24
 	/* 8 KB PRU Data RAM 1; reserved completely for Slice1 cores - PRU1,
 	 * RTU1 and Tx_PRU1; do not use for any Slice0 cores */
-	PRU0_DMEM_1	: org = 0x00002000 len = 0x00001000	CREGISTER=25
+	PRU1_DMEM_1	: org = 0x00002000 len = 0x00001000	CREGISTER=25
 	/* NOTE: Custom split of the second 4 KB of ICSS Data RAMs 0 and 1
 	 * split equally between the corresponding RTU and Tx_PRU cores in
 	 * each slice */
 	RTU0_DMEM_0	: org = 0x00001000 len = 0x00000800
 	TX_PRU0_DMEM_0	: org = 0x00001800 len = 0x00000800
-	RTU0_DMEM_1	: org = 0x00003000 len = 0x00000800
-	TX_PRU0_DMEM_1	: org = 0x00003800 len = 0x00000800
+	RTU1_DMEM_1	: org = 0x00003000 len = 0x00000800
+	TX_PRU1_DMEM_1	: org = 0x00003800 len = 0x00000800
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/examples/rpmsg_echo_linux/firmware/am64x-evm/icss_g0_rtu_pru1_fw/ti-pru-cgt/linker.cmd b/examples/rpmsg_echo_linux/firmware/am64x-evm/icss_g0_rtu_pru1_fw/ti-pru-cgt/linker.cmd
index 2aa1239a..5dd99a79 100644
--- a/examples/rpmsg_echo_linux/firmware/am64x-evm/icss_g0_rtu_pru1_fw/ti-pru-cgt/linker.cmd
+++ b/examples/rpmsg_echo_linux/firmware/am64x-evm/icss_g0_rtu_pru1_fw/ti-pru-cgt/linker.cmd
@@ -21,14 +21,14 @@ MEMORY
 	PRU1_DMEM_1	: org = 0x00000000 len = 0x00001000	CREGISTER=24
 	/* 8 KB PRU Data RAM 0; reserved completely for Slice0 cores - PRU0,
 	 * RTU0 and Tx_PRU0; do not use for any Slice1 cores */
-	PRU1_DMEM_0	: org = 0x00002000 len = 0x00001000	CREGISTER=25
+	PRU0_DMEM_0	: org = 0x00002000 len = 0x00001000	CREGISTER=25
 	/* NOTE: Custom split of the second 4 KB of ICSS Data RAMs 0 and 1
 	 * split equally between the corresponding RTU and Tx_PRU cores in
 	 * each slice */
 	RTU1_DMEM_1	: org = 0x00001000 len = 0x00000800
 	TX_PRU1_DMEM_1	: org = 0x00001800 len = 0x00000800
-	RTU1_DMEM_0	: org = 0x00003000 len = 0x00000800
-	TX_PRU1_DMEM_0	: org = 0x00003800 len = 0x00000800
+	RTU0_DMEM_0	: org = 0x00003000 len = 0x00000800
+	TX_PRU0_DMEM_0	: org = 0x00003800 len = 0x00000800
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/examples/rpmsg_echo_linux/firmware/am64x-evm/icss_g1_pru0_fw/ti-pru-cgt/linker.cmd b/examples/rpmsg_echo_linux/firmware/am64x-evm/icss_g1_pru0_fw/ti-pru-cgt/linker.cmd
index c1ae31cf..21077b62 100644
--- a/examples/rpmsg_echo_linux/firmware/am64x-evm/icss_g1_pru0_fw/ti-pru-cgt/linker.cmd
+++ b/examples/rpmsg_echo_linux/firmware/am64x-evm/icss_g1_pru0_fw/ti-pru-cgt/linker.cmd
@@ -21,14 +21,14 @@ MEMORY
 	PRU0_DMEM_0	: org = 0x00000000 len = 0x00001000	CREGISTER=24
 	/* 8 KB PRU Data RAM 1; reserved completely for Slice1 cores - PRU1,
 	 * RTU1 and Tx_PRU1; do not use for any Slice0 cores */
-	PRU0_DMEM_1	: org = 0x00002000 len = 0x00001000	CREGISTER=25
+	PRU1_DMEM_1	: org = 0x00002000 len = 0x00001000	CREGISTER=25
 	/* NOTE: Custom split of the second 4 KB of ICSS Data RAMs 0 and 1
 	 * split equally between the corresponding RTU and Tx_PRU cores in
 	 * each slice */
 	RTU0_DMEM_0	: org = 0x00001000 len = 0x00000800
 	TX_PRU0_DMEM_0	: org = 0x00001800 len = 0x00000800
-	RTU0_DMEM_1	: org = 0x00003000 len = 0x00000800
-	TX_PRU0_DMEM_1	: org = 0x00003800 len = 0x00000800
+	RTU1_DMEM_1	: org = 0x00003000 len = 0x00000800
+	TX_PRU1_DMEM_1	: org = 0x00003800 len = 0x00000800
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/examples/rpmsg_echo_linux/firmware/am64x-evm/icss_g1_pru1_fw/ti-pru-cgt/linker.cmd b/examples/rpmsg_echo_linux/firmware/am64x-evm/icss_g1_pru1_fw/ti-pru-cgt/linker.cmd
index 7d0c72db..8ca5e167 100644
--- a/examples/rpmsg_echo_linux/firmware/am64x-evm/icss_g1_pru1_fw/ti-pru-cgt/linker.cmd
+++ b/examples/rpmsg_echo_linux/firmware/am64x-evm/icss_g1_pru1_fw/ti-pru-cgt/linker.cmd
@@ -21,14 +21,14 @@ MEMORY
 	PRU1_DMEM_1	: org = 0x00000000 len = 0x00001000	CREGISTER=24
 	/* 8 KB PRU Data RAM 0; reserved completely for Slice0 cores - PRU0,
 	 * RTU0 and Tx_PRU0; do not use for any Slice1 cores */
-	PRU1_DMEM_0	: org = 0x00002000 len = 0x00001000	CREGISTER=25
+	PRU0_DMEM_0	: org = 0x00002000 len = 0x00001000	CREGISTER=25
 	/* NOTE: Custom split of the second 4 KB of ICSS Data RAMs 0 and 1
 	 * split equally between the corresponding RTU and Tx_PRU cores in
 	 * each slice */
 	RTU1_DMEM_1	: org = 0x00001000 len = 0x00000800
 	TX_PRU1_DMEM_1	: org = 0x00001800 len = 0x00000800
-	RTU1_DMEM_0	: org = 0x00003000 len = 0x00000800
-	TX_PRU1_DMEM_0	: org = 0x00003800 len = 0x00000800
+	RTU0_DMEM_0	: org = 0x00003000 len = 0x00000800
+	TX_PRU0_DMEM_0	: org = 0x00003800 len = 0x00000800
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/examples/rpmsg_echo_linux/firmware/am64x-evm/icss_g1_rtu_pru0_fw/ti-pru-cgt/linker.cmd b/examples/rpmsg_echo_linux/firmware/am64x-evm/icss_g1_rtu_pru0_fw/ti-pru-cgt/linker.cmd
index 6fdcf865..4ec28cb4 100644
--- a/examples/rpmsg_echo_linux/firmware/am64x-evm/icss_g1_rtu_pru0_fw/ti-pru-cgt/linker.cmd
+++ b/examples/rpmsg_echo_linux/firmware/am64x-evm/icss_g1_rtu_pru0_fw/ti-pru-cgt/linker.cmd
@@ -21,14 +21,14 @@ MEMORY
 	PRU0_DMEM_0	: org = 0x00000000 len = 0x00001000	CREGISTER=24
 	/* 8 KB PRU Data RAM 1; reserved completely for Slice1 cores - PRU1,
 	 * RTU1 and Tx_PRU1; do not use for any Slice0 cores */
-	PRU0_DMEM_1	: org = 0x00002000 len = 0x00001000	CREGISTER=25
+	PRU1_DMEM_1	: org = 0x00002000 len = 0x00001000	CREGISTER=25
 	/* NOTE: Custom split of the second 4 KB of ICSS Data RAMs 0 and 1
 	 * split equally between the corresponding RTU and Tx_PRU cores in
 	 * each slice */
 	RTU0_DMEM_0	: org = 0x00001000 len = 0x00000800
 	TX_PRU0_DMEM_0	: org = 0x00001800 len = 0x00000800
-	RTU0_DMEM_1	: org = 0x00003000 len = 0x00000800
-	TX_PRU0_DMEM_1	: org = 0x00003800 len = 0x00000800
+	RTU1_DMEM_1	: org = 0x00003000 len = 0x00000800
+	TX_PRU1_DMEM_1	: org = 0x00003800 len = 0x00000800
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/examples/rpmsg_echo_linux/firmware/am64x-evm/icss_g1_rtu_pru1_fw/ti-pru-cgt/linker.cmd b/examples/rpmsg_echo_linux/firmware/am64x-evm/icss_g1_rtu_pru1_fw/ti-pru-cgt/linker.cmd
index 2aa1239a..5dd99a79 100644
--- a/examples/rpmsg_echo_linux/firmware/am64x-evm/icss_g1_rtu_pru1_fw/ti-pru-cgt/linker.cmd
+++ b/examples/rpmsg_echo_linux/firmware/am64x-evm/icss_g1_rtu_pru1_fw/ti-pru-cgt/linker.cmd
@@ -21,14 +21,14 @@ MEMORY
 	PRU1_DMEM_1	: org = 0x00000000 len = 0x00001000	CREGISTER=24
 	/* 8 KB PRU Data RAM 0; reserved completely for Slice0 cores - PRU0,
 	 * RTU0 and Tx_PRU0; do not use for any Slice1 cores */
-	PRU1_DMEM_0	: org = 0x00002000 len = 0x00001000	CREGISTER=25
+	PRU0_DMEM_0	: org = 0x00002000 len = 0x00001000	CREGISTER=25
 	/* NOTE: Custom split of the second 4 KB of ICSS Data RAMs 0 and 1
 	 * split equally between the corresponding RTU and Tx_PRU cores in
 	 * each slice */
 	RTU1_DMEM_1	: org = 0x00001000 len = 0x00000800
 	TX_PRU1_DMEM_1	: org = 0x00001800 len = 0x00000800
-	RTU1_DMEM_0	: org = 0x00003000 len = 0x00000800
-	TX_PRU1_DMEM_0	: org = 0x00003800 len = 0x00000800
+	RTU0_DMEM_0	: org = 0x00003000 len = 0x00000800
+	TX_PRU0_DMEM_0	: org = 0x00003800 len = 0x00000800
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/examples/spi_loopback/firmware/am243x-lp/icss_g0_pru0_fw/ti-pru-cgt/linker.cmd b/examples/spi_loopback/firmware/am243x-lp/icss_g0_pru0_fw/ti-pru-cgt/linker.cmd
index 021e887d..ff7b62c7 100644
--- a/examples/spi_loopback/firmware/am243x-lp/icss_g0_pru0_fw/ti-pru-cgt/linker.cmd
+++ b/examples/spi_loopback/firmware/am243x-lp/icss_g0_pru0_fw/ti-pru-cgt/linker.cmd
@@ -19,14 +19,14 @@ MEMORY
 	PRU0_DMEM_0	: org = 0x00000000 len = 0x00001000
 	/* 8 KB PRU Data RAM 1; reserved completely for Slice1 cores - PRU1,
 	 * RTU1 and Tx_PRU1; do not use for any Slice0 cores */
-	PRU0_DMEM_1	: org = 0x00002000 len = 0x00001000
+	PRU1_DMEM_1	: org = 0x00002000 len = 0x00001000
 	/* NOTE: Custom split of the second 4 KB of ICSS Data RAMs 0 and 1
 	 * split equally between the corresponding RTU and Tx_PRU cores in
 	 * each slice */
 	RTU0_DMEM_0	: org = 0x00001000 len = 0x00000800
 	TX_PRU0_DMEM_0	: org = 0x00001800 len = 0x00000800
-	RTU0_DMEM_1	: org = 0x00003000 len = 0x00000800
-	TX_PRU0_DMEM_1	: org = 0x00003800 len = 0x00000800
+	RTU1_DMEM_1	: org = 0x00003000 len = 0x00000800
+	TX_PRU1_DMEM_1	: org = 0x00003800 len = 0x00000800
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/examples/spi_loopback/firmware/am243x-lp/icss_g0_pru1_fw/ti-pru-cgt/linker.cmd b/examples/spi_loopback/firmware/am243x-lp/icss_g0_pru1_fw/ti-pru-cgt/linker.cmd
index bd059cb2..7d044555 100644
--- a/examples/spi_loopback/firmware/am243x-lp/icss_g0_pru1_fw/ti-pru-cgt/linker.cmd
+++ b/examples/spi_loopback/firmware/am243x-lp/icss_g0_pru1_fw/ti-pru-cgt/linker.cmd
@@ -19,14 +19,14 @@ MEMORY
 	PRU1_DMEM_1	: org = 0x00000000 len = 0x00001000
 	/* 8 KB PRU Data RAM 0; reserved completely for Slice0 cores - PRU0,
 	 * RTU0 and Tx_PRU0; do not use for any Slice1 cores */
-	PRU1_DMEM_0	: org = 0x00002000 len = 0x00001000
+	PRU0_DMEM_0	: org = 0x00002000 len = 0x00001000
 	/* NOTE: Custom split of the second 4 KB of ICSS Data RAMs 0 and 1
 	 * split equally between the corresponding RTU and Tx_PRU cores in
 	 * each slice */
 	RTU1_DMEM_1	: org = 0x00001000 len = 0x00000800
 	TX_PRU1_DMEM_1	: org = 0x00001800 len = 0x00000800
-	RTU1_DMEM_0	: org = 0x00003000 len = 0x00000800
-	TX_PRU1_DMEM_0	: org = 0x00003800 len = 0x00000800
+	RTU0_DMEM_0	: org = 0x00003000 len = 0x00000800
+	TX_PRU0_DMEM_0	: org = 0x00003800 len = 0x00000800
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/source/linker_cmd/asm_code/am243x/AM243x_PRU0.cmd b/source/linker_cmd/asm_code/am243x/AM243x_PRU0.cmd
index 021e887d..ff7b62c7 100644
--- a/source/linker_cmd/asm_code/am243x/AM243x_PRU0.cmd
+++ b/source/linker_cmd/asm_code/am243x/AM243x_PRU0.cmd
@@ -19,14 +19,14 @@ MEMORY
 	PRU0_DMEM_0	: org = 0x00000000 len = 0x00001000
 	/* 8 KB PRU Data RAM 1; reserved completely for Slice1 cores - PRU1,
 	 * RTU1 and Tx_PRU1; do not use for any Slice0 cores */
-	PRU0_DMEM_1	: org = 0x00002000 len = 0x00001000
+	PRU1_DMEM_1	: org = 0x00002000 len = 0x00001000
 	/* NOTE: Custom split of the second 4 KB of ICSS Data RAMs 0 and 1
 	 * split equally between the corresponding RTU and Tx_PRU cores in
 	 * each slice */
 	RTU0_DMEM_0	: org = 0x00001000 len = 0x00000800
 	TX_PRU0_DMEM_0	: org = 0x00001800 len = 0x00000800
-	RTU0_DMEM_1	: org = 0x00003000 len = 0x00000800
-	TX_PRU0_DMEM_1	: org = 0x00003800 len = 0x00000800
+	RTU1_DMEM_1	: org = 0x00003000 len = 0x00000800
+	TX_PRU1_DMEM_1	: org = 0x00003800 len = 0x00000800
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/source/linker_cmd/asm_code/am243x/AM243x_PRU1.cmd b/source/linker_cmd/asm_code/am243x/AM243x_PRU1.cmd
index bd059cb2..7d044555 100644
--- a/source/linker_cmd/asm_code/am243x/AM243x_PRU1.cmd
+++ b/source/linker_cmd/asm_code/am243x/AM243x_PRU1.cmd
@@ -19,14 +19,14 @@ MEMORY
 	PRU1_DMEM_1	: org = 0x00000000 len = 0x00001000
 	/* 8 KB PRU Data RAM 0; reserved completely for Slice0 cores - PRU0,
 	 * RTU0 and Tx_PRU0; do not use for any Slice1 cores */
-	PRU1_DMEM_0	: org = 0x00002000 len = 0x00001000
+	PRU0_DMEM_0	: org = 0x00002000 len = 0x00001000
 	/* NOTE: Custom split of the second 4 KB of ICSS Data RAMs 0 and 1
 	 * split equally between the corresponding RTU and Tx_PRU cores in
 	 * each slice */
 	RTU1_DMEM_1	: org = 0x00001000 len = 0x00000800
 	TX_PRU1_DMEM_1	: org = 0x00001800 len = 0x00000800
-	RTU1_DMEM_0	: org = 0x00003000 len = 0x00000800
-	TX_PRU1_DMEM_0	: org = 0x00003800 len = 0x00000800
+	RTU0_DMEM_0	: org = 0x00003000 len = 0x00000800
+	TX_PRU0_DMEM_0	: org = 0x00003800 len = 0x00000800
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/source/linker_cmd/asm_code/am243x/AM243x_RTU0.cmd b/source/linker_cmd/asm_code/am243x/AM243x_RTU0.cmd
index ad61c5df..d0a58770 100644
--- a/source/linker_cmd/asm_code/am243x/AM243x_RTU0.cmd
+++ b/source/linker_cmd/asm_code/am243x/AM243x_RTU0.cmd
@@ -19,14 +19,14 @@ MEMORY
 	PRU0_DMEM_0	: org = 0x00000000 len = 0x00001000
 	/* 8 KB PRU Data RAM 1; reserved completely for Slice1 cores - PRU1,
 	 * RTU1 and Tx_PRU1; do not use for any Slice0 cores */
-	PRU0_DMEM_1	: org = 0x00002000 len = 0x00001000
+	PRU1_DMEM_1	: org = 0x00002000 len = 0x00001000
 	/* NOTE: Custom split of the second 4 KB of ICSS Data RAMs 0 and 1
 	 * split equally between the corresponding RTU and Tx_PRU cores in
 	 * each slice */
 	RTU0_DMEM_0	: org = 0x00001000 len = 0x00000800
 	TX_PRU0_DMEM_0	: org = 0x00001800 len = 0x00000800
-	RTU0_DMEM_1	: org = 0x00003000 len = 0x00000800
-	TX_PRU0_DMEM_1	: org = 0x00003800 len = 0x00000800
+	RTU1_DMEM_1	: org = 0x00003000 len = 0x00000800
+	TX_PRU1_DMEM_1	: org = 0x00003800 len = 0x00000800
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/source/linker_cmd/asm_code/am243x/AM243x_RTU1.cmd b/source/linker_cmd/asm_code/am243x/AM243x_RTU1.cmd
index f9573fe6..a0f7c997 100644
--- a/source/linker_cmd/asm_code/am243x/AM243x_RTU1.cmd
+++ b/source/linker_cmd/asm_code/am243x/AM243x_RTU1.cmd
@@ -19,14 +19,14 @@ MEMORY
 	PRU1_DMEM_1	: org = 0x00000000 len = 0x00001000
 	/* 8 KB PRU Data RAM 0; reserved completely for Slice0 cores - PRU0,
 	 * RTU0 and Tx_PRU0; do not use for any Slice1 cores */
-	PRU1_DMEM_0	: org = 0x00002000 len = 0x00001000
+	PRU0_DMEM_0	: org = 0x00002000 len = 0x00001000
 	/* NOTE: Custom split of the second 4 KB of ICSS Data RAMs 0 and 1
 	 * split equally between the corresponding RTU and Tx_PRU cores in
 	 * each slice */
 	RTU1_DMEM_1	: org = 0x00001000 len = 0x00000800
 	TX_PRU1_DMEM_1	: org = 0x00001800 len = 0x00000800
-	RTU1_DMEM_0	: org = 0x00003000 len = 0x00000800
-	TX_PRU1_DMEM_0	: org = 0x00003800 len = 0x00000800
+	RTU0_DMEM_0	: org = 0x00003000 len = 0x00000800
+	TX_PRU0_DMEM_0	: org = 0x00003800 len = 0x00000800
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/source/linker_cmd/asm_code/am243x/AM243x_TX_PRU0.cmd b/source/linker_cmd/asm_code/am243x/AM243x_TX_PRU0.cmd
index 7adf8ced..4f793ea1 100644
--- a/source/linker_cmd/asm_code/am243x/AM243x_TX_PRU0.cmd
+++ b/source/linker_cmd/asm_code/am243x/AM243x_TX_PRU0.cmd
@@ -19,14 +19,14 @@ MEMORY
 	PRU0_DMEM_0	: org = 0x00000000 len = 0x00001000
 	/* 8 KB PRU Data RAM 1; reserved completely for Slice1 cores - PRU1,
 	 * RTU1 and Tx_PRU1; do not use for any Slice0 cores */
-	PRU0_DMEM_1	: org = 0x00002000 len = 0x00001000
+	PRU1_DMEM_1	: org = 0x00002000 len = 0x00001000
 	/* NOTE: Custom split of the second 4 KB of ICSS Data RAMs 0 and 1
 	 * split equally between the corresponding RTU and Tx_PRU cores in
 	 * each slice */
 	RTU0_DMEM_0	: org = 0x00001000 len = 0x00000800
 	TX_PRU0_DMEM_0	: org = 0x00001800 len = 0x00000800
-	RTU0_DMEM_1	: org = 0x00003000 len = 0x00000800
-	TX_PRU0_DMEM_1	: org = 0x00003800 len = 0x00000800
+	RTU1_DMEM_1	: org = 0x00003000 len = 0x00000800
+	TX_PRU1_DMEM_1	: org = 0x00003800 len = 0x00000800
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/source/linker_cmd/asm_code/am243x/AM243x_TX_PRU1.cmd b/source/linker_cmd/asm_code/am243x/AM243x_TX_PRU1.cmd
index d61c0ae9..a9870ece 100644
--- a/source/linker_cmd/asm_code/am243x/AM243x_TX_PRU1.cmd
+++ b/source/linker_cmd/asm_code/am243x/AM243x_TX_PRU1.cmd
@@ -19,14 +19,14 @@ MEMORY
 	PRU1_DMEM_1	: org = 0x00000000 len = 0x00001000
 	/* 8 KB PRU Data RAM 0; reserved completely for Slice0 cores - PRU0,
 	 * RTU0 and Tx_PRU0; do not use for any Slice1 cores */
-	PRU1_DMEM_0	: org = 0x00002000 len = 0x00001000
+	PRU0_DMEM_0	: org = 0x00002000 len = 0x00001000
 	/* NOTE: Custom split of the second 4 KB of ICSS Data RAMs 0 and 1
 	 * split equally between the corresponding RTU and Tx_PRU cores in
 	 * each slice */
 	RTU1_DMEM_1	: org = 0x00001000 len = 0x00000800
 	TX_PRU1_DMEM_1	: org = 0x00001800 len = 0x00000800
-	RTU1_DMEM_0	: org = 0x00003000 len = 0x00000800
-	TX_PRU1_DMEM_0	: org = 0x00003800 len = 0x00000800
+	RTU0_DMEM_0	: org = 0x00003000 len = 0x00000800
+	TX_PRU0_DMEM_0	: org = 0x00003800 len = 0x00000800
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/source/linker_cmd/asm_code/am261x/AM261x_PRU0.cmd b/source/linker_cmd/asm_code/am261x/AM261x_PRU0.cmd
index 672e9b92..13fdcb5e 100644
--- a/source/linker_cmd/asm_code/am261x/AM261x_PRU0.cmd
+++ b/source/linker_cmd/asm_code/am261x/AM261x_PRU0.cmd
@@ -17,7 +17,7 @@ MEMORY
 	/* 8 KB PRU Data RAM 0 */
 	PRU0_DMEM_0	: org = 0x00000000 len = 0x00002000
 	/* 8 KB PRU Data RAM 1 */
-	PRU0_DMEM_1	: org = 0x00002000 len = 0x00002000
+	PRU1_DMEM_1	: org = 0x00002000 len = 0x00002000
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/source/linker_cmd/asm_code/am261x/AM261x_PRU1.cmd b/source/linker_cmd/asm_code/am261x/AM261x_PRU1.cmd
index 66f6da5e..774184dd 100644
--- a/source/linker_cmd/asm_code/am261x/AM261x_PRU1.cmd
+++ b/source/linker_cmd/asm_code/am261x/AM261x_PRU1.cmd
@@ -17,7 +17,7 @@ MEMORY
 	/* 8 KB PRU Data RAM 1 */
 	PRU1_DMEM_1	: org = 0x00000000 len = 0x00002000
 	/* 8 KB PRU Data RAM 0 */
-	PRU1_DMEM_0	: org = 0x00002000 len = 0x00002000
+	PRU0_DMEM_0	: org = 0x00002000 len = 0x00002000
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/source/linker_cmd/asm_code/am263px/AM263px_PRU0.cmd b/source/linker_cmd/asm_code/am263px/AM263Px_PRU0.cmd
similarity index 91%
rename from source/linker_cmd/asm_code/am263px/AM263px_PRU0.cmd
rename to source/linker_cmd/asm_code/am263px/AM263Px_PRU0.cmd
index 9da5f8e7..5b64bc7e 100644
--- a/source/linker_cmd/asm_code/am263px/AM263px_PRU0.cmd
+++ b/source/linker_cmd/asm_code/am263px/AM263Px_PRU0.cmd
@@ -1,8 +1,8 @@
 /*
- * AM263px_PRU0.cmd
+ * AM263Px_PRU0.cmd
  *
  * Example Linker command file for linking assembly programs built with the TI-PRU-CGT
- * on AM263px PRU0 cores
+ * on AM263Px PRU0 cores
  */
 
 /* Specify the System Memory Map */
@@ -17,7 +17,7 @@ MEMORY
 	/* 8 KB PRU Data RAM 0 */
 	PRU0_DMEM_0	: org = 0x00000000 len = 0x00002000
 	/* 8 KB PRU Data RAM 1 */
-	PRU0_DMEM_1	: org = 0x00002000 len = 0x00002000
+	PRU1_DMEM_1	: org = 0x00002000 len = 0x00002000
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/source/linker_cmd/asm_code/am263px/AM263px_PRU1.cmd b/source/linker_cmd/asm_code/am263px/AM263Px_PRU1.cmd
similarity index 91%
rename from source/linker_cmd/asm_code/am263px/AM263px_PRU1.cmd
rename to source/linker_cmd/asm_code/am263px/AM263Px_PRU1.cmd
index 23af1b71..57db723f 100644
--- a/source/linker_cmd/asm_code/am263px/AM263px_PRU1.cmd
+++ b/source/linker_cmd/asm_code/am263px/AM263Px_PRU1.cmd
@@ -1,8 +1,8 @@
 /*
- * AM263px_PRU1.cmd
+ * AM263Px_PRU1.cmd
  *
  * Example Linker command file for linking assembly programs built with the TI-PRU-CGT
- * on AM263px PRU1 cores
+ * on AM263Px PRU1 cores
  */
 
 /* Specify the System Memory Map */
@@ -17,7 +17,7 @@ MEMORY
 	/* 8 KB PRU Data RAM 1 */
 	PRU1_DMEM_1	: org = 0x00000000 len = 0x00002000
 	/* 8 KB PRU Data RAM 0 */
-	PRU1_DMEM_0	: org = 0x00002000 len = 0x00002000
+	PRU0_DMEM_0	: org = 0x00002000 len = 0x00002000
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/source/linker_cmd/asm_code/am263x/AM263x_PRU0.cmd b/source/linker_cmd/asm_code/am263x/AM263x_PRU0.cmd
index 26f02bf4..11542351 100644
--- a/source/linker_cmd/asm_code/am263x/AM263x_PRU0.cmd
+++ b/source/linker_cmd/asm_code/am263x/AM263x_PRU0.cmd
@@ -17,7 +17,7 @@ MEMORY
 	/* 8 KB PRU Data RAM 0 */
 	PRU0_DMEM_0	: org = 0x00000000 len = 0x00002000
 	/* 8 KB PRU Data RAM 1 */
-	PRU0_DMEM_1	: org = 0x00002000 len = 0x00002000
+	PRU1_DMEM_1	: org = 0x00002000 len = 0x00002000
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/source/linker_cmd/asm_code/am263x/AM263x_PRU1.cmd b/source/linker_cmd/asm_code/am263x/AM263x_PRU1.cmd
index 70fb0765..cf0121bf 100644
--- a/source/linker_cmd/asm_code/am263x/AM263x_PRU1.cmd
+++ b/source/linker_cmd/asm_code/am263x/AM263x_PRU1.cmd
@@ -17,7 +17,7 @@ MEMORY
 	/* 8 KB PRU Data RAM 1 */
 	PRU1_DMEM_1	: org = 0x00000000 len = 0x00002000
 	/* 8 KB PRU Data RAM 0 */
-	PRU1_DMEM_0	: org = 0x00002000 len = 0x00002000
+	PRU0_DMEM_0	: org = 0x00002000 len = 0x00002000
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/source/linker_cmd/asm_code/am62x/AM62x_PRU0.cmd b/source/linker_cmd/asm_code/am62x/AM62x_PRU0.cmd
index 85c8145a..4f8f21fe 100644
--- a/source/linker_cmd/asm_code/am62x/AM62x_PRU0.cmd
+++ b/source/linker_cmd/asm_code/am62x/AM62x_PRU0.cmd
@@ -17,7 +17,7 @@ MEMORY
 	/* 8 KB PRU Data RAM 0 */
 	PRU0_DMEM_0	: org = 0x00000000 len = 0x00002000
 	/* 8 KB PRU Data RAM 1 */
-	PRU0_DMEM_1	: org = 0x00002000 len = 0x00002000
+	PRU1_DMEM_1	: org = 0x00002000 len = 0x00002000
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/source/linker_cmd/asm_code/am62x/AM62x_PRU1.cmd b/source/linker_cmd/asm_code/am62x/AM62x_PRU1.cmd
index e70c5725..7b3f96b4 100644
--- a/source/linker_cmd/asm_code/am62x/AM62x_PRU1.cmd
+++ b/source/linker_cmd/asm_code/am62x/AM62x_PRU1.cmd
@@ -17,7 +17,7 @@ MEMORY
 	/* 8 KB PRU Data RAM 1 */
 	PRU1_DMEM_1	: org = 0x00000000 len = 0x00002000
 	/* 8 KB PRU Data RAM 0 */
-	PRU1_DMEM_0	: org = 0x00002000 len = 0x00002000
+	PRU0_DMEM_0	: org = 0x00002000 len = 0x00002000
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/source/linker_cmd/asm_code/am64x/AM64x_PRU0.cmd b/source/linker_cmd/asm_code/am64x/AM64x_PRU0.cmd
index ca7f6092..bb67e095 100644
--- a/source/linker_cmd/asm_code/am64x/AM64x_PRU0.cmd
+++ b/source/linker_cmd/asm_code/am64x/AM64x_PRU0.cmd
@@ -19,14 +19,14 @@ MEMORY
 	PRU0_DMEM_0	: org = 0x00000000 len = 0x00001000
 	/* 8 KB PRU Data RAM 1; reserved completely for Slice1 cores - PRU1,
 	 * RTU1 and Tx_PRU1; do not use for any Slice0 cores */
-	PRU0_DMEM_1	: org = 0x00002000 len = 0x00001000
+	PRU1_DMEM_1	: org = 0x00002000 len = 0x00001000
 	/* NOTE: Custom split of the second 4 KB of ICSS Data RAMs 0 and 1
 	 * split equally between the corresponding RTU and Tx_PRU cores in
 	 * each slice */
 	RTU0_DMEM_0	: org = 0x00001000 len = 0x00000800
 	TX_PRU0_DMEM_0	: org = 0x00001800 len = 0x00000800
-	RTU0_DMEM_1	: org = 0x00003000 len = 0x00000800
-	TX_PRU0_DMEM_1	: org = 0x00003800 len = 0x00000800
+	RTU1_DMEM_1	: org = 0x00003000 len = 0x00000800
+	TX_PRU1_DMEM_1	: org = 0x00003800 len = 0x00000800
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/source/linker_cmd/asm_code/am64x/AM64x_PRU1.cmd b/source/linker_cmd/asm_code/am64x/AM64x_PRU1.cmd
index 2be2074b..4804d56c 100644
--- a/source/linker_cmd/asm_code/am64x/AM64x_PRU1.cmd
+++ b/source/linker_cmd/asm_code/am64x/AM64x_PRU1.cmd
@@ -19,14 +19,14 @@ MEMORY
 	PRU1_DMEM_1	: org = 0x00000000 len = 0x00001000
 	/* 8 KB PRU Data RAM 0; reserved completely for Slice0 cores - PRU0,
 	 * RTU0 and Tx_PRU0; do not use for any Slice1 cores */
-	PRU1_DMEM_0	: org = 0x00002000 len = 0x00001000
+	PRU0_DMEM_0	: org = 0x00002000 len = 0x00001000
 	/* NOTE: Custom split of the second 4 KB of ICSS Data RAMs 0 and 1
 	 * split equally between the corresponding RTU and Tx_PRU cores in
 	 * each slice */
 	RTU1_DMEM_1	: org = 0x00001000 len = 0x00000800
 	TX_PRU1_DMEM_1	: org = 0x00001800 len = 0x00000800
-	RTU1_DMEM_0	: org = 0x00003000 len = 0x00000800
-	TX_PRU1_DMEM_0	: org = 0x00003800 len = 0x00000800
+	RTU0_DMEM_0	: org = 0x00003000 len = 0x00000800
+	TX_PRU0_DMEM_0	: org = 0x00003800 len = 0x00000800
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/source/linker_cmd/asm_code/am64x/AM64x_RTU0.cmd b/source/linker_cmd/asm_code/am64x/AM64x_RTU0.cmd
index 9f8bbd47..fcb1c655 100644
--- a/source/linker_cmd/asm_code/am64x/AM64x_RTU0.cmd
+++ b/source/linker_cmd/asm_code/am64x/AM64x_RTU0.cmd
@@ -19,14 +19,14 @@ MEMORY
 	PRU0_DMEM_0	: org = 0x00000000 len = 0x00001000
 	/* 8 KB PRU Data RAM 1; reserved completely for Slice1 cores - PRU1,
 	 * RTU1 and Tx_PRU1; do not use for any Slice0 cores */
-	PRU0_DMEM_1	: org = 0x00002000 len = 0x00001000
+	PRU1_DMEM_1	: org = 0x00002000 len = 0x00001000
 	/* NOTE: Custom split of the second 4 KB of ICSS Data RAMs 0 and 1
 	 * split equally between the corresponding RTU and Tx_PRU cores in
 	 * each slice */
 	RTU0_DMEM_0	: org = 0x00001000 len = 0x00000800
 	TX_PRU0_DMEM_0	: org = 0x00001800 len = 0x00000800
-	RTU0_DMEM_1	: org = 0x00003000 len = 0x00000800
-	TX_PRU0_DMEM_1	: org = 0x00003800 len = 0x00000800
+	RTU1_DMEM_1	: org = 0x00003000 len = 0x00000800
+	TX_PRU1_DMEM_1	: org = 0x00003800 len = 0x00000800
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/source/linker_cmd/asm_code/am64x/AM64x_RTU1.cmd b/source/linker_cmd/asm_code/am64x/AM64x_RTU1.cmd
index 665376be..fec4329f 100644
--- a/source/linker_cmd/asm_code/am64x/AM64x_RTU1.cmd
+++ b/source/linker_cmd/asm_code/am64x/AM64x_RTU1.cmd
@@ -19,14 +19,14 @@ MEMORY
 	PRU1_DMEM_1	: org = 0x00000000 len = 0x00001000
 	/* 8 KB PRU Data RAM 0; reserved completely for Slice0 cores - PRU0,
 	 * RTU0 and Tx_PRU0; do not use for any Slice1 cores */
-	PRU1_DMEM_0	: org = 0x00002000 len = 0x00001000
+	PRU0_DMEM_0	: org = 0x00002000 len = 0x00001000
 	/* NOTE: Custom split of the second 4 KB of ICSS Data RAMs 0 and 1
 	 * split equally between the corresponding RTU and Tx_PRU cores in
 	 * each slice */
 	RTU1_DMEM_1	: org = 0x00001000 len = 0x00000800
 	TX_PRU1_DMEM_1	: org = 0x00001800 len = 0x00000800
-	RTU1_DMEM_0	: org = 0x00003000 len = 0x00000800
-	TX_PRU1_DMEM_0	: org = 0x00003800 len = 0x00000800
+	RTU0_DMEM_0	: org = 0x00003000 len = 0x00000800
+	TX_PRU0_DMEM_0	: org = 0x00003800 len = 0x00000800
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/source/linker_cmd/asm_code/am64x/AM64x_TX_PRU0.cmd b/source/linker_cmd/asm_code/am64x/AM64x_TX_PRU0.cmd
index 529f7f19..9c0c42ed 100644
--- a/source/linker_cmd/asm_code/am64x/AM64x_TX_PRU0.cmd
+++ b/source/linker_cmd/asm_code/am64x/AM64x_TX_PRU0.cmd
@@ -19,14 +19,14 @@ MEMORY
 	PRU0_DMEM_0	: org = 0x00000000 len = 0x00001000
 	/* 8 KB PRU Data RAM 1; reserved completely for Slice1 cores - PRU1,
 	 * RTU1 and Tx_PRU1; do not use for any Slice0 cores */
-	PRU0_DMEM_1	: org = 0x00002000 len = 0x00001000
+	PRU1_DMEM_1	: org = 0x00002000 len = 0x00001000
 	/* NOTE: Custom split of the second 4 KB of ICSS Data RAMs 0 and 1
 	 * split equally between the corresponding RTU and Tx_PRU cores in
 	 * each slice */
 	RTU0_DMEM_0	: org = 0x00001000 len = 0x00000800
 	TX_PRU0_DMEM_0	: org = 0x00001800 len = 0x00000800
-	RTU0_DMEM_1	: org = 0x00003000 len = 0x00000800
-	TX_PRU0_DMEM_1	: org = 0x00003800 len = 0x00000800
+	RTU1_DMEM_1	: org = 0x00003000 len = 0x00000800
+	TX_PRU1_DMEM_1	: org = 0x00003800 len = 0x00000800
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/source/linker_cmd/asm_code/am64x/AM64x_TX_PRU1.cmd b/source/linker_cmd/asm_code/am64x/AM64x_TX_PRU1.cmd
index 69fb7491..2314f4d9 100644
--- a/source/linker_cmd/asm_code/am64x/AM64x_TX_PRU1.cmd
+++ b/source/linker_cmd/asm_code/am64x/AM64x_TX_PRU1.cmd
@@ -19,14 +19,14 @@ MEMORY
 	PRU1_DMEM_1	: org = 0x00000000 len = 0x00001000
 	/* 8 KB PRU Data RAM 0; reserved completely for Slice0 cores - PRU0,
 	 * RTU0 and Tx_PRU0; do not use for any Slice1 cores */
-	PRU1_DMEM_0	: org = 0x00002000 len = 0x00001000
+	PRU0_DMEM_0	: org = 0x00002000 len = 0x00001000
 	/* NOTE: Custom split of the second 4 KB of ICSS Data RAMs 0 and 1
 	 * split equally between the corresponding RTU and Tx_PRU cores in
 	 * each slice */
 	RTU1_DMEM_1	: org = 0x00001000 len = 0x00000800
 	TX_PRU1_DMEM_1	: org = 0x00001800 len = 0x00000800
-	RTU1_DMEM_0	: org = 0x00003000 len = 0x00000800
-	TX_PRU1_DMEM_0	: org = 0x00003800 len = 0x00000800
+	RTU0_DMEM_0	: org = 0x00003000 len = 0x00000800
+	TX_PRU0_DMEM_0	: org = 0x00003800 len = 0x00000800
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/source/linker_cmd/c_code/am243x/AM243x_PRU0.cmd b/source/linker_cmd/c_code/am243x/AM243x_PRU0.cmd
index a69842cd..389d0cbd 100644
--- a/source/linker_cmd/c_code/am243x/AM243x_PRU0.cmd
+++ b/source/linker_cmd/c_code/am243x/AM243x_PRU0.cmd
@@ -21,14 +21,14 @@ MEMORY
 	PRU0_DMEM_0	: org = 0x00000000 len = 0x00001000	CREGISTER=24
 	/* 8 KB PRU Data RAM 1; reserved completely for Slice1 cores - PRU1,
 	 * RTU1 and Tx_PRU1; do not use for any Slice0 cores */
-	PRU0_DMEM_1	: org = 0x00002000 len = 0x00001000	CREGISTER=25
+	PRU1_DMEM_1	: org = 0x00002000 len = 0x00001000	CREGISTER=25
 	/* NOTE: Custom split of the second 4 KB of ICSS Data RAMs 0 and 1
 	 * split equally between the corresponding RTU and Tx_PRU cores in
 	 * each slice */
 	RTU0_DMEM_0	: org = 0x00001000 len = 0x00000800
 	TX_PRU0_DMEM_0	: org = 0x00001800 len = 0x00000800
-	RTU0_DMEM_1	: org = 0x00003000 len = 0x00000800
-	TX_PRU0_DMEM_1	: org = 0x00003800 len = 0x00000800
+	RTU1_DMEM_1	: org = 0x00003000 len = 0x00000800
+	TX_PRU1_DMEM_1	: org = 0x00003800 len = 0x00000800
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/source/linker_cmd/c_code/am243x/AM243x_PRU1.cmd b/source/linker_cmd/c_code/am243x/AM243x_PRU1.cmd
index 440057a7..85522291 100644
--- a/source/linker_cmd/c_code/am243x/AM243x_PRU1.cmd
+++ b/source/linker_cmd/c_code/am243x/AM243x_PRU1.cmd
@@ -21,14 +21,14 @@ MEMORY
 	PRU1_DMEM_1	: org = 0x00000000 len = 0x00001000	CREGISTER=24
 	/* 8 KB PRU Data RAM 0; reserved completely for Slice0 cores - PRU0,
 	 * RTU0 and Tx_PRU0; do not use for any Slice1 cores */
-	PRU1_DMEM_0	: org = 0x00002000 len = 0x00001000	CREGISTER=25
+	PRU0_DMEM_0	: org = 0x00002000 len = 0x00001000	CREGISTER=25
 	/* NOTE: Custom split of the second 4 KB of ICSS Data RAMs 0 and 1
 	 * split equally between the corresponding RTU and Tx_PRU cores in
 	 * each slice */
 	RTU1_DMEM_1	: org = 0x00001000 len = 0x00000800
 	TX_PRU1_DMEM_1	: org = 0x00001800 len = 0x00000800
-	RTU1_DMEM_0	: org = 0x00003000 len = 0x00000800
-	TX_PRU1_DMEM_0	: org = 0x00003800 len = 0x00000800
+	RTU0_DMEM_0	: org = 0x00003000 len = 0x00000800
+	TX_PRU0_DMEM_0	: org = 0x00003800 len = 0x00000800
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/source/linker_cmd/c_code/am243x/AM243x_RTU0.cmd b/source/linker_cmd/c_code/am243x/AM243x_RTU0.cmd
index 64ab61bc..54cedd3c 100644
--- a/source/linker_cmd/c_code/am243x/AM243x_RTU0.cmd
+++ b/source/linker_cmd/c_code/am243x/AM243x_RTU0.cmd
@@ -21,14 +21,14 @@ MEMORY
 	PRU0_DMEM_0	: org = 0x00000000 len = 0x00001000	CREGISTER=24
 	/* 8 KB PRU Data RAM 1; reserved completely for Slice1 cores - PRU1,
 	 * RTU1 and Tx_PRU1; do not use for any Slice0 cores */
-	PRU0_DMEM_1	: org = 0x00002000 len = 0x00001000	CREGISTER=25
+	PRU1_DMEM_1	: org = 0x00002000 len = 0x00001000	CREGISTER=25
 	/* NOTE: Custom split of the second 4 KB of ICSS Data RAMs 0 and 1
 	 * split equally between the corresponding RTU and Tx_PRU cores in
 	 * each slice */
 	RTU0_DMEM_0	: org = 0x00001000 len = 0x00000800
 	TX_PRU0_DMEM_0	: org = 0x00001800 len = 0x00000800
-	RTU0_DMEM_1	: org = 0x00003000 len = 0x00000800
-	TX_PRU0_DMEM_1	: org = 0x00003800 len = 0x00000800
+	RTU1_DMEM_1	: org = 0x00003000 len = 0x00000800
+	TX_PRU1_DMEM_1	: org = 0x00003800 len = 0x00000800
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/source/linker_cmd/c_code/am243x/AM243x_RTU1.cmd b/source/linker_cmd/c_code/am243x/AM243x_RTU1.cmd
index 14fd35a8..4cfd083e 100644
--- a/source/linker_cmd/c_code/am243x/AM243x_RTU1.cmd
+++ b/source/linker_cmd/c_code/am243x/AM243x_RTU1.cmd
@@ -21,14 +21,14 @@ MEMORY
 	PRU1_DMEM_1	: org = 0x00000000 len = 0x00001000	CREGISTER=24
 	/* 8 KB PRU Data RAM 0; reserved completely for Slice0 cores - PRU0,
 	 * RTU0 and Tx_PRU0; do not use for any Slice1 cores */
-	PRU1_DMEM_0	: org = 0x00002000 len = 0x00001000	CREGISTER=25
+	PRU0_DMEM_0	: org = 0x00002000 len = 0x00001000	CREGISTER=25
 	/* NOTE: Custom split of the second 4 KB of ICSS Data RAMs 0 and 1
 	 * split equally between the corresponding RTU and Tx_PRU cores in
 	 * each slice */
 	RTU1_DMEM_1	: org = 0x00001000 len = 0x00000800
 	TX_PRU1_DMEM_1	: org = 0x00001800 len = 0x00000800
-	RTU1_DMEM_0	: org = 0x00003000 len = 0x00000800
-	TX_PRU1_DMEM_0	: org = 0x00003800 len = 0x00000800
+	RTU0_DMEM_0	: org = 0x00003000 len = 0x00000800
+	TX_PRU0_DMEM_0	: org = 0x00003800 len = 0x00000800
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/source/linker_cmd/c_code/am243x/AM243x_TX_PRU0.cmd b/source/linker_cmd/c_code/am243x/AM243x_TX_PRU0.cmd
index 16ea3376..853c81f6 100644
--- a/source/linker_cmd/c_code/am243x/AM243x_TX_PRU0.cmd
+++ b/source/linker_cmd/c_code/am243x/AM243x_TX_PRU0.cmd
@@ -21,14 +21,14 @@ MEMORY
 	PRU0_DMEM_0	: org = 0x00000000 len = 0x00001000	CREGISTER=24
 	/* 8 KB PRU Data RAM 1; reserved completely for Slice1 cores - PRU1,
 	 * RTU1 and Tx_PRU1; do not use for any Slice0 cores */
-	PRU0_DMEM_1	: org = 0x00002000 len = 0x00001000	CREGISTER=25
+	PRU1_DMEM_1	: org = 0x00002000 len = 0x00001000	CREGISTER=25
 	/* NOTE: Custom split of the second 4 KB of ICSS Data RAMs 0 and 1
 	 * split equally between the corresponding RTU and Tx_PRU cores in
 	 * each slice */
 	RTU0_DMEM_0	: org = 0x00001000 len = 0x00000800
 	TX_PRU0_DMEM_0	: org = 0x00001800 len = 0x00000800
-	RTU0_DMEM_1	: org = 0x00003000 len = 0x00000800
-	TX_PRU0_DMEM_1	: org = 0x00003800 len = 0x00000800
+	RTU1_DMEM_1	: org = 0x00003000 len = 0x00000800
+	TX_PRU1_DMEM_1	: org = 0x00003800 len = 0x00000800
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/source/linker_cmd/c_code/am243x/AM243x_TX_PRU1.cmd b/source/linker_cmd/c_code/am243x/AM243x_TX_PRU1.cmd
index 709dde47..2547a2ba 100644
--- a/source/linker_cmd/c_code/am243x/AM243x_TX_PRU1.cmd
+++ b/source/linker_cmd/c_code/am243x/AM243x_TX_PRU1.cmd
@@ -21,14 +21,14 @@ MEMORY
 	PRU1_DMEM_1	: org = 0x00000000 len = 0x00001000	CREGISTER=24
 	/* 8 KB PRU Data RAM 0; reserved completely for Slice0 cores - PRU0,
 	 * RTU0 and Tx_PRU0; do not use for any Slice1 cores */
-	PRU1_DMEM_0	: org = 0x00002000 len = 0x00001000	CREGISTER=25
+	PRU0_DMEM_0	: org = 0x00002000 len = 0x00001000	CREGISTER=25
 	/* NOTE: Custom split of the second 4 KB of ICSS Data RAMs 0 and 1
 	 * split equally between the corresponding RTU and Tx_PRU cores in
 	 * each slice */
 	RTU1_DMEM_1	: org = 0x00001000 len = 0x00000800
 	TX_PRU1_DMEM_1	: org = 0x00001800 len = 0x00000800
-	RTU1_DMEM_0	: org = 0x00003000 len = 0x00000800
-	TX_PRU1_DMEM_0	: org = 0x00003800 len = 0x00000800
+	RTU0_DMEM_0	: org = 0x00003000 len = 0x00000800
+	TX_PRU0_DMEM_0	: org = 0x00003800 len = 0x00000800
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/source/linker_cmd/c_code/am261x/AM261x_PRU0.cmd b/source/linker_cmd/c_code/am261x/AM261x_PRU0.cmd
index b40a3e09..93ae6753 100644
--- a/source/linker_cmd/c_code/am261x/AM261x_PRU0.cmd
+++ b/source/linker_cmd/c_code/am261x/AM261x_PRU0.cmd
@@ -19,7 +19,7 @@ MEMORY
 	/* 8 KB PRU Data RAM 0 */
 	PRU0_DMEM_0	: org = 0x00000000 len = 0x00002000	CREGISTER=24
 	/* 8 KB PRU Data RAM 1 */
-	PRU0_DMEM_1	: org = 0x00002000 len = 0x00002000	CREGISTER=25
+	PRU1_DMEM_1	: org = 0x00002000 len = 0x00002000	CREGISTER=25
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/source/linker_cmd/c_code/am261x/AM261x_PRU1.cmd b/source/linker_cmd/c_code/am261x/AM261x_PRU1.cmd
index cf883948..afb88a78 100644
--- a/source/linker_cmd/c_code/am261x/AM261x_PRU1.cmd
+++ b/source/linker_cmd/c_code/am261x/AM261x_PRU1.cmd
@@ -19,7 +19,7 @@ MEMORY
 	/* 8 KB PRU Data RAM 1 */
 	PRU1_DMEM_1	: org = 0x00000000 len = 0x00002000	CREGISTER=24
 	/* 8 KB PRU Data RAM 0 */
-	PRU1_DMEM_0	: org = 0x00002000 len = 0x00002000	CREGISTER=25
+	PRU0_DMEM_0	: org = 0x00002000 len = 0x00002000	CREGISTER=25
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/source/linker_cmd/c_code/am263px/AM263px_PRU0.cmd b/source/linker_cmd/c_code/am263px/AM263Px_PRU0.cmd
similarity index 97%
rename from source/linker_cmd/c_code/am263px/AM263px_PRU0.cmd
rename to source/linker_cmd/c_code/am263px/AM263Px_PRU0.cmd
index 095f9533..45a5a1a8 100644
--- a/source/linker_cmd/c_code/am263px/AM263px_PRU0.cmd
+++ b/source/linker_cmd/c_code/am263px/AM263Px_PRU0.cmd
@@ -1,8 +1,8 @@
 /*
- * AM263px_PRU0.cmd
+ * AM263Px_PRU0.cmd
  *
  * Example Linker command file for linking programs built with the C compiler
- * on AM263px PRU0 cores
+ * on AM263Px PRU0 cores
  */
 
 -cr		/* Link using C conventions */
@@ -19,7 +19,7 @@ MEMORY
 	/* 8 KB PRU Data RAM 0 */
 	PRU0_DMEM_0	: org = 0x00000000 len = 0x00002000	CREGISTER=24
 	/* 8 KB PRU Data RAM 1 */
-	PRU0_DMEM_1	: org = 0x00002000 len = 0x00002000	CREGISTER=25
+	PRU1_DMEM_1	: org = 0x00002000 len = 0x00002000	CREGISTER=25
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/source/linker_cmd/c_code/am263px/AM263px_PRU1.cmd b/source/linker_cmd/c_code/am263px/AM263Px_PRU1.cmd
similarity index 97%
rename from source/linker_cmd/c_code/am263px/AM263px_PRU1.cmd
rename to source/linker_cmd/c_code/am263px/AM263Px_PRU1.cmd
index a3b557df..d54a14a7 100644
--- a/source/linker_cmd/c_code/am263px/AM263px_PRU1.cmd
+++ b/source/linker_cmd/c_code/am263px/AM263Px_PRU1.cmd
@@ -1,8 +1,8 @@
 /*
- * AM263px_PRU1.cmd
+ * AM263Px_PRU1.cmd
  *
  * Example Linker command file for linking programs built with the C compiler
- * on AM263px PRU1 cores
+ * on AM263Px PRU1 cores
  */
 
 -cr		/* Link using C conventions */
@@ -19,7 +19,7 @@ MEMORY
 	/* 8 KB PRU Data RAM 1 */
 	PRU1_DMEM_1	: org = 0x00000000 len = 0x00002000	CREGISTER=24
 	/* 8 KB PRU Data RAM 0 */
-	PRU1_DMEM_0	: org = 0x00002000 len = 0x00002000	CREGISTER=25
+	PRU0_DMEM_0	: org = 0x00002000 len = 0x00002000	CREGISTER=25
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/source/linker_cmd/c_code/am263x/AM263x_PRU0.cmd b/source/linker_cmd/c_code/am263x/AM263x_PRU0.cmd
index 7123a82a..7b3ad22a 100644
--- a/source/linker_cmd/c_code/am263x/AM263x_PRU0.cmd
+++ b/source/linker_cmd/c_code/am263x/AM263x_PRU0.cmd
@@ -19,7 +19,7 @@ MEMORY
 	/* 8 KB PRU Data RAM 0 */
 	PRU0_DMEM_0	: org = 0x00000000 len = 0x00002000	CREGISTER=24
 	/* 8 KB PRU Data RAM 1 */
-	PRU0_DMEM_1	: org = 0x00002000 len = 0x00002000	CREGISTER=25
+	PRU1_DMEM_1	: org = 0x00002000 len = 0x00002000	CREGISTER=25
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/source/linker_cmd/c_code/am263x/AM263x_PRU1.cmd b/source/linker_cmd/c_code/am263x/AM263x_PRU1.cmd
index 6e858dc1..4cc82157 100644
--- a/source/linker_cmd/c_code/am263x/AM263x_PRU1.cmd
+++ b/source/linker_cmd/c_code/am263x/AM263x_PRU1.cmd
@@ -19,7 +19,7 @@ MEMORY
 	/* 8 KB PRU Data RAM 1 */
 	PRU1_DMEM_1	: org = 0x00000000 len = 0x00002000	CREGISTER=24
 	/* 8 KB PRU Data RAM 0 */
-	PRU1_DMEM_0	: org = 0x00002000 len = 0x00002000	CREGISTER=25
+	PRU0_DMEM_0	: org = 0x00002000 len = 0x00002000	CREGISTER=25
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/source/linker_cmd/c_code/am62x/AM62x_PRU0.cmd b/source/linker_cmd/c_code/am62x/AM62x_PRU0.cmd
index 1782108e..604fdfd9 100644
--- a/source/linker_cmd/c_code/am62x/AM62x_PRU0.cmd
+++ b/source/linker_cmd/c_code/am62x/AM62x_PRU0.cmd
@@ -19,7 +19,7 @@ MEMORY
 	/* 8 KB PRU Data RAM 0 */
 	PRU0_DMEM_0	: org = 0x00000000 len = 0x00002000	CREGISTER=24
 	/* 8 KB PRU Data RAM 1 */
-	PRU0_DMEM_1	: org = 0x00002000 len = 0x00002000	CREGISTER=25
+	PRU1_DMEM_1	: org = 0x00002000 len = 0x00002000	CREGISTER=25
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/source/linker_cmd/c_code/am62x/AM62x_PRU1.cmd b/source/linker_cmd/c_code/am62x/AM62x_PRU1.cmd
index 9082912c..cbf74e60 100644
--- a/source/linker_cmd/c_code/am62x/AM62x_PRU1.cmd
+++ b/source/linker_cmd/c_code/am62x/AM62x_PRU1.cmd
@@ -19,7 +19,7 @@ MEMORY
 	/* 8 KB PRU Data RAM 1 */
 	PRU1_DMEM_1	: org = 0x00000000 len = 0x00002000	CREGISTER=24
 	/* 8 KB PRU Data RAM 0 */
-	PRU1_DMEM_0	: org = 0x00002000 len = 0x00002000	CREGISTER=25
+	PRU0_DMEM_0	: org = 0x00002000 len = 0x00002000	CREGISTER=25
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/source/linker_cmd/c_code/am64x/AM64x_PRU0.cmd b/source/linker_cmd/c_code/am64x/AM64x_PRU0.cmd
index 7069af79..a39ea737 100644
--- a/source/linker_cmd/c_code/am64x/AM64x_PRU0.cmd
+++ b/source/linker_cmd/c_code/am64x/AM64x_PRU0.cmd
@@ -21,14 +21,14 @@ MEMORY
 	PRU0_DMEM_0	: org = 0x00000000 len = 0x00001000	CREGISTER=24
 	/* 8 KB PRU Data RAM 1; reserved completely for Slice1 cores - PRU1,
 	 * RTU1 and Tx_PRU1; do not use for any Slice0 cores */
-	PRU0_DMEM_1	: org = 0x00002000 len = 0x00001000	CREGISTER=25
+	PRU1_DMEM_1	: org = 0x00002000 len = 0x00001000	CREGISTER=25
 	/* NOTE: Custom split of the second 4 KB of ICSS Data RAMs 0 and 1
 	 * split equally between the corresponding RTU and Tx_PRU cores in
 	 * each slice */
 	RTU0_DMEM_0	: org = 0x00001000 len = 0x00000800
 	TX_PRU0_DMEM_0	: org = 0x00001800 len = 0x00000800
-	RTU0_DMEM_1	: org = 0x00003000 len = 0x00000800
-	TX_PRU0_DMEM_1	: org = 0x00003800 len = 0x00000800
+	RTU1_DMEM_1	: org = 0x00003000 len = 0x00000800
+	TX_PRU1_DMEM_1	: org = 0x00003800 len = 0x00000800
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/source/linker_cmd/c_code/am64x/AM64x_PRU1.cmd b/source/linker_cmd/c_code/am64x/AM64x_PRU1.cmd
index 2d0fb831..d2fda1f1 100644
--- a/source/linker_cmd/c_code/am64x/AM64x_PRU1.cmd
+++ b/source/linker_cmd/c_code/am64x/AM64x_PRU1.cmd
@@ -21,14 +21,14 @@ MEMORY
 	PRU1_DMEM_1	: org = 0x00000000 len = 0x00001000	CREGISTER=24
 	/* 8 KB PRU Data RAM 0; reserved completely for Slice0 cores - PRU0,
 	 * RTU0 and Tx_PRU0; do not use for any Slice1 cores */
-	PRU1_DMEM_0	: org = 0x00002000 len = 0x00001000	CREGISTER=25
+	PRU0_DMEM_0	: org = 0x00002000 len = 0x00001000	CREGISTER=25
 	/* NOTE: Custom split of the second 4 KB of ICSS Data RAMs 0 and 1
 	 * split equally between the corresponding RTU and Tx_PRU cores in
 	 * each slice */
 	RTU1_DMEM_1	: org = 0x00001000 len = 0x00000800
 	TX_PRU1_DMEM_1	: org = 0x00001800 len = 0x00000800
-	RTU1_DMEM_0	: org = 0x00003000 len = 0x00000800
-	TX_PRU1_DMEM_0	: org = 0x00003800 len = 0x00000800
+	RTU0_DMEM_0	: org = 0x00003000 len = 0x00000800
+	TX_PRU0_DMEM_0	: org = 0x00003800 len = 0x00000800
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/source/linker_cmd/c_code/am64x/AM64x_RTU0.cmd b/source/linker_cmd/c_code/am64x/AM64x_RTU0.cmd
index 3704b635..ea7d05f7 100644
--- a/source/linker_cmd/c_code/am64x/AM64x_RTU0.cmd
+++ b/source/linker_cmd/c_code/am64x/AM64x_RTU0.cmd
@@ -21,14 +21,14 @@ MEMORY
 	PRU0_DMEM_0	: org = 0x00000000 len = 0x00001000	CREGISTER=24
 	/* 8 KB PRU Data RAM 1; reserved completely for Slice1 cores - PRU1,
 	 * RTU1 and Tx_PRU1; do not use for any Slice0 cores */
-	PRU0_DMEM_1	: org = 0x00002000 len = 0x00001000	CREGISTER=25
+	PRU1_DMEM_1	: org = 0x00002000 len = 0x00001000	CREGISTER=25
 	/* NOTE: Custom split of the second 4 KB of ICSS Data RAMs 0 and 1
 	 * split equally between the corresponding RTU and Tx_PRU cores in
 	 * each slice */
 	RTU0_DMEM_0	: org = 0x00001000 len = 0x00000800
 	TX_PRU0_DMEM_0	: org = 0x00001800 len = 0x00000800
-	RTU0_DMEM_1	: org = 0x00003000 len = 0x00000800
-	TX_PRU0_DMEM_1	: org = 0x00003800 len = 0x00000800
+	RTU1_DMEM_1	: org = 0x00003000 len = 0x00000800
+	TX_PRU1_DMEM_1	: org = 0x00003800 len = 0x00000800
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/source/linker_cmd/c_code/am64x/AM64x_RTU1.cmd b/source/linker_cmd/c_code/am64x/AM64x_RTU1.cmd
index e9bad7fd..3758b8a5 100644
--- a/source/linker_cmd/c_code/am64x/AM64x_RTU1.cmd
+++ b/source/linker_cmd/c_code/am64x/AM64x_RTU1.cmd
@@ -21,14 +21,14 @@ MEMORY
 	PRU1_DMEM_1	: org = 0x00000000 len = 0x00001000	CREGISTER=24
 	/* 8 KB PRU Data RAM 0; reserved completely for Slice0 cores - PRU0,
 	 * RTU0 and Tx_PRU0; do not use for any Slice1 cores */
-	PRU1_DMEM_0	: org = 0x00002000 len = 0x00001000	CREGISTER=25
+	PRU0_DMEM_0	: org = 0x00002000 len = 0x00001000	CREGISTER=25
 	/* NOTE: Custom split of the second 4 KB of ICSS Data RAMs 0 and 1
 	 * split equally between the corresponding RTU and Tx_PRU cores in
 	 * each slice */
 	RTU1_DMEM_1	: org = 0x00001000 len = 0x00000800
 	TX_PRU1_DMEM_1	: org = 0x00001800 len = 0x00000800
-	RTU1_DMEM_0	: org = 0x00003000 len = 0x00000800
-	TX_PRU1_DMEM_0	: org = 0x00003800 len = 0x00000800
+	RTU0_DMEM_0	: org = 0x00003000 len = 0x00000800
+	TX_PRU0_DMEM_0	: org = 0x00003800 len = 0x00000800
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/source/linker_cmd/c_code/am64x/AM64x_TX_PRU0.cmd b/source/linker_cmd/c_code/am64x/AM64x_TX_PRU0.cmd
index 348a51c4..61ec26c5 100644
--- a/source/linker_cmd/c_code/am64x/AM64x_TX_PRU0.cmd
+++ b/source/linker_cmd/c_code/am64x/AM64x_TX_PRU0.cmd
@@ -21,14 +21,14 @@ MEMORY
 	PRU0_DMEM_0	: org = 0x00000000 len = 0x00001000	CREGISTER=24
 	/* 8 KB PRU Data RAM 1; reserved completely for Slice1 cores - PRU1,
 	 * RTU1 and Tx_PRU1; do not use for any Slice0 cores */
-	PRU0_DMEM_1	: org = 0x00002000 len = 0x00001000	CREGISTER=25
+	PRU1_DMEM_1	: org = 0x00002000 len = 0x00001000	CREGISTER=25
 	/* NOTE: Custom split of the second 4 KB of ICSS Data RAMs 0 and 1
 	 * split equally between the corresponding RTU and Tx_PRU cores in
 	 * each slice */
 	RTU0_DMEM_0	: org = 0x00001000 len = 0x00000800
 	TX_PRU0_DMEM_0	: org = 0x00001800 len = 0x00000800
-	RTU0_DMEM_1	: org = 0x00003000 len = 0x00000800
-	TX_PRU0_DMEM_1	: org = 0x00003800 len = 0x00000800
+	RTU1_DMEM_1	: org = 0x00003000 len = 0x00000800
+	TX_PRU1_DMEM_1	: org = 0x00003800 len = 0x00000800
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */
diff --git a/source/linker_cmd/c_code/am64x/AM64x_TX_PRU1.cmd b/source/linker_cmd/c_code/am64x/AM64x_TX_PRU1.cmd
index e75fb708..c230bfae 100644
--- a/source/linker_cmd/c_code/am64x/AM64x_TX_PRU1.cmd
+++ b/source/linker_cmd/c_code/am64x/AM64x_TX_PRU1.cmd
@@ -21,14 +21,14 @@ MEMORY
 	PRU1_DMEM_1	: org = 0x00000000 len = 0x00001000	CREGISTER=24
 	/* 8 KB PRU Data RAM 0; reserved completely for Slice0 cores - PRU0,
 	 * RTU0 and Tx_PRU0; do not use for any Slice1 cores */
-	PRU1_DMEM_0	: org = 0x00002000 len = 0x00001000	CREGISTER=25
+	PRU0_DMEM_0	: org = 0x00002000 len = 0x00001000	CREGISTER=25
 	/* NOTE: Custom split of the second 4 KB of ICSS Data RAMs 0 and 1
 	 * split equally between the corresponding RTU and Tx_PRU cores in
 	 * each slice */
 	RTU1_DMEM_1	: org = 0x00001000 len = 0x00000800
 	TX_PRU1_DMEM_1	: org = 0x00001800 len = 0x00000800
-	RTU1_DMEM_0	: org = 0x00003000 len = 0x00000800
-	TX_PRU1_DMEM_0	: org = 0x00003800 len = 0x00000800
+	RTU0_DMEM_0	: org = 0x00003000 len = 0x00000800
+	TX_PRU0_DMEM_0	: org = 0x00003800 len = 0x00000800
 
       PAGE 2:
 	/* C28 needs to be programmed to point to SHAREDMEM, default is 0 */