diff --git a/os/common/ports/ARMCMx/chcore.h b/os/common/ports/ARMCMx/chcore.h
index 0b839ed18..c93aa86f7 100644
--- a/os/common/ports/ARMCMx/chcore.h
+++ b/os/common/ports/ARMCMx/chcore.h
@@ -189,7 +189,7 @@ struct port_context {};
 #include "chcore_v7m.h"
 #elif (CORTEX_MODEL == 33) || (CORTEX_MODEL == 55)
 #include "mpu_v8m.h"
-#include "chcore_v8m-mainline.h"
+#include "chcore_v8m-ml.h"
 #else
 #error "unknown Cortex-M variant"
 #endif
diff --git a/os/common/ports/ARMCMx/chcore_v8m_mainline.c b/os/common/ports/ARMCMx/chcore_v8m-ml.c
similarity index 100%
rename from os/common/ports/ARMCMx/chcore_v8m_mainline.c
rename to os/common/ports/ARMCMx/chcore_v8m-ml.c
diff --git a/os/common/ports/ARMCMx/chcore_v8m-mainline.h b/os/common/ports/ARMCMx/chcore_v8m-ml.h
similarity index 100%
rename from os/common/ports/ARMCMx/chcore_v8m-mainline.h
rename to os/common/ports/ARMCMx/chcore_v8m-ml.h
diff --git a/os/common/ports/ARMCMx/compilers/GCC/chcoreasm_v8m-mainline.S b/os/common/ports/ARMCMx/compilers/GCC/chcoreasm_v8m-ml.S
similarity index 100%
rename from os/common/ports/ARMCMx/compilers/GCC/chcoreasm_v8m-mainline.S
rename to os/common/ports/ARMCMx/compilers/GCC/chcoreasm_v8m-ml.S
diff --git a/os/common/ports/ARMCMx/compilers/GCC/mk/port_v8m-mainline.mk b/os/common/ports/ARMCMx/compilers/GCC/mk/port_v8m-ml.mk
similarity index 79%
rename from os/common/ports/ARMCMx/compilers/GCC/mk/port_v8m-mainline.mk
rename to os/common/ports/ARMCMx/compilers/GCC/mk/port_v8m-ml.mk
index 5af4ce364..27b7b74eb 100644
--- a/os/common/ports/ARMCMx/compilers/GCC/mk/port_v8m-mainline.mk
+++ b/os/common/ports/ARMCMx/compilers/GCC/mk/port_v8m-ml.mk
@@ -1,8 +1,8 @@
 # List of the ChibiOS/RT ARMv8M-mainline generic port files.
 PORTSRC = $(CHIBIOS)/os/common/ports/ARMCMx/chcore.c \
-          $(CHIBIOS)/os/common/ports/ARMCMx/chcore_v8m_mainline.c
+          $(CHIBIOS)/os/common/ports/ARMCMx/chcore_v8m-ml.c
           
-PORTASM = $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/chcoreasm_v8m-mainline.S
+PORTASM = $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/chcoreasm_v8m-ml.S
 
 PORTINC = $(CHIBIOS)/os/common/ports/ARMCMx \
           $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC