diff --git a/portable/CMakeLists.txt b/portable/CMakeLists.txt
index 98dcf8ed3..c067e9706 100644
--- a/portable/CMakeLists.txt
+++ b/portable/CMakeLists.txt
@@ -68,12 +68,12 @@ add_library(freertos_kernel_port OBJECT
 
     # ARMv8-A ports for GCC
     $<$<STREQUAL:${FREERTOS_PORT},GCC_ARM_AARCH64>:
-        GCC/Arm_AARCH64/port.c
-        GCC/Arm_AARCH64/portASM.S>
+        GCC/ARM_AARCH64/port.c
+        GCC/ARM_AARCH64/portASM.S>
 
     $<$<STREQUAL:${FREERTOS_PORT},GCC_ARM_AARCH64_SRE>:
-        GCC/Arm_AARCH64_SRE/port.c
-        GCC/Arm_AARCH64_SRE/portASM.S>
+        GCC/ARM_AARCH64_SRE/port.c
+        GCC/ARM_AARCH64_SRE/portASM.S>
 
     # ARMv6-M port for GCC
     $<$<STREQUAL:${FREERTOS_PORT},GCC_ARM_CM0>:
diff --git a/portable/GCC/Arm_AARCH64/README.md b/portable/GCC/ARM_AARCH64/README.md
similarity index 96%
rename from portable/GCC/Arm_AARCH64/README.md
rename to portable/GCC/ARM_AARCH64/README.md
index 70552c202..0bee96951 100644
--- a/portable/GCC/Arm_AARCH64/README.md
+++ b/portable/GCC/ARM_AARCH64/README.md
@@ -13,11 +13,11 @@ the T32 and A32 instruction sets. Follow the
 [link](https://developer.arm.com/Architectures/A-Profile%20Architecture)
 for more information.
 
-## Arm_AARCH64 port
+## ARM_AARCH64 port
 
 This port adds support for Armv8-A architecture AArch64 execution state.
 This port is generic and can be used as a starting point for Armv8-A
 application processors.
 
-* Arm_AARCH64
+* ARM_AARCH64
     * Memory mapped interace to access Arm GIC registers
diff --git a/portable/GCC/Arm_AARCH64/port.c b/portable/GCC/ARM_AARCH64/port.c
similarity index 100%
rename from portable/GCC/Arm_AARCH64/port.c
rename to portable/GCC/ARM_AARCH64/port.c
diff --git a/portable/GCC/Arm_AARCH64/portASM.S b/portable/GCC/ARM_AARCH64/portASM.S
similarity index 100%
rename from portable/GCC/Arm_AARCH64/portASM.S
rename to portable/GCC/ARM_AARCH64/portASM.S
diff --git a/portable/GCC/Arm_AARCH64/portmacro.h b/portable/GCC/ARM_AARCH64/portmacro.h
similarity index 100%
rename from portable/GCC/Arm_AARCH64/portmacro.h
rename to portable/GCC/ARM_AARCH64/portmacro.h
diff --git a/portable/GCC/Arm_AARCH64_SRE/README.md b/portable/GCC/ARM_AARCH64_SRE/README.md
similarity index 95%
rename from portable/GCC/Arm_AARCH64_SRE/README.md
rename to portable/GCC/ARM_AARCH64_SRE/README.md
index 0b2e0e485..4c9a55af0 100644
--- a/portable/GCC/Arm_AARCH64_SRE/README.md
+++ b/portable/GCC/ARM_AARCH64_SRE/README.md
@@ -13,11 +13,11 @@ the T32 and A32 instruction sets. Follow the
 [link](https://developer.arm.com/Architectures/A-Profile%20Architecture)
 for more information.
 
-## Arm_AARCH64_SRE port
+## ARM_AARCH64_SRE port
 
 This port adds support for Armv8-A architecture AArch64 execution state.
 This port is generic and can be used as a starting point for Armv8-A
 application processors.
 
-* Arm_AARCH64_SRE
+* ARM_AARCH64_SRE
     * System Register interace to access Arm GIC registers
diff --git a/portable/GCC/Arm_AARCH64_SRE/port.c b/portable/GCC/ARM_AARCH64_SRE/port.c
similarity index 100%
rename from portable/GCC/Arm_AARCH64_SRE/port.c
rename to portable/GCC/ARM_AARCH64_SRE/port.c
diff --git a/portable/GCC/Arm_AARCH64_SRE/portASM.S b/portable/GCC/ARM_AARCH64_SRE/portASM.S
similarity index 100%
rename from portable/GCC/Arm_AARCH64_SRE/portASM.S
rename to portable/GCC/ARM_AARCH64_SRE/portASM.S
diff --git a/portable/GCC/Arm_AARCH64_SRE/portmacro.h b/portable/GCC/ARM_AARCH64_SRE/portmacro.h
similarity index 100%
rename from portable/GCC/Arm_AARCH64_SRE/portmacro.h
rename to portable/GCC/ARM_AARCH64_SRE/portmacro.h
diff --git a/portable/GCC/ARM_CA53_64_BIT/README.md b/portable/GCC/ARM_CA53_64_BIT/README.md
index b3d56c040..a8df29e91 100644
--- a/portable/GCC/ARM_CA53_64_BIT/README.md
+++ b/portable/GCC/ARM_CA53_64_BIT/README.md
@@ -8,8 +8,8 @@ Arm Cortex-A53 processor.
 
 This port is generic and can be used as a starting point for other Armv8-A
 application processors. Therefore, the port `ARM_CA53_64_BIT` is renamed as
-`Arm_AARCH64`. The existing projects that use old port `ARM_CA53_64_BIT`,
-should migrate to renamed port `Arm_AARCH64`.
+`ARM_AARCH64`. The existing projects that use old port `ARM_CA53_64_BIT`,
+should migrate to renamed port `ARM_AARCH64`.
 
 **NOTE**
 
diff --git a/portable/GCC/ARM_CA53_64_BIT_SRE/README.md b/portable/GCC/ARM_CA53_64_BIT_SRE/README.md
index fb5d7936a..a5d415fc2 100644
--- a/portable/GCC/ARM_CA53_64_BIT_SRE/README.md
+++ b/portable/GCC/ARM_CA53_64_BIT_SRE/README.md
@@ -7,9 +7,9 @@ Arm Cortex-A53 processor.
     * System Register interace to access Arm GIC registers
 
 This port is generic and can be used as a starting point for other Armv8-A
-application processors. Therefore, the port `Arm_AARCH64_SRE` is renamed as
-`Arm_AARCH64_SRE`. The existing projects that use old port `Arm_AARCH64_SRE`,
-should migrate to renamed port `Arm_AARCH64_SRE`.
+application processors. Therefore, the port `ARM_AARCH64_SRE` is renamed as
+`ARM_AARCH64_SRE`. The existing projects that use old port `ARM_AARCH64_SRE`,
+should migrate to renamed port `ARM_AARCH64_SRE`.
 
 **NOTE**