diff --git a/portable/CMakeLists.txt b/portable/CMakeLists.txt
index 819e2c116..74591bf34 100644
--- a/portable/CMakeLists.txt
+++ b/portable/CMakeLists.txt
@@ -76,10 +76,10 @@ add_library(freertos_kernel_port OBJECT
         GCC/ARM_AARCH64_SRE/portASM.S>
 
     # ARMv6-M port for GCC
-    $<$<STREQUAL:${FREERTOS_PORT},GCC_ARM_CM0>:
-        GCC/ARM_CM0/port.c
-        GCC/ARM_CM0/portasm.c
-        GCC/ARM_CM0/mpu_wrappers_v2_asm.c>
+    $<$<STREQUAL:${FREERTOS_PORT},GCC_ARM_CM0_MPU>:
+        GCC/ARM_CM0_MPU/port.c
+        GCC/ARM_CM0_MPU/portasm.c
+        GCC/ARM_CM0_MPU/mpu_wrappers_v2_asm.c>
 
     # ARMv6-M / Cortex-M0 Raspberry PI RP2040 port for GCC
     $<$<STREQUAL:${FREERTOS_PORT},GCC_RP2040>:
diff --git a/portable/GCC/ARM_CM0/mpu_wrappers_v2_asm.c b/portable/GCC/ARM_CM0_MPU/mpu_wrappers_v2_asm.c
similarity index 100%
rename from portable/GCC/ARM_CM0/mpu_wrappers_v2_asm.c
rename to portable/GCC/ARM_CM0_MPU/mpu_wrappers_v2_asm.c
diff --git a/portable/GCC/ARM_CM0/port.c b/portable/GCC/ARM_CM0_MPU/port.c
similarity index 100%
rename from portable/GCC/ARM_CM0/port.c
rename to portable/GCC/ARM_CM0_MPU/port.c
diff --git a/portable/GCC/ARM_CM0/portasm.c b/portable/GCC/ARM_CM0_MPU/portasm.c
similarity index 100%
rename from portable/GCC/ARM_CM0/portasm.c
rename to portable/GCC/ARM_CM0_MPU/portasm.c
diff --git a/portable/GCC/ARM_CM0/portasm.h b/portable/GCC/ARM_CM0_MPU/portasm.h
similarity index 100%
rename from portable/GCC/ARM_CM0/portasm.h
rename to portable/GCC/ARM_CM0_MPU/portasm.h
diff --git a/portable/GCC/ARM_CM0/portmacro.h b/portable/GCC/ARM_CM0_MPU/portmacro.h
similarity index 100%
rename from portable/GCC/ARM_CM0/portmacro.h
rename to portable/GCC/ARM_CM0_MPU/portmacro.h