diff --git a/Marlin/src/HAL/HAL_STM32F1/HAL.h b/Marlin/src/HAL/HAL_STM32F1/HAL.h
index e3c81ecb5..cecdd0336 100644
--- a/Marlin/src/HAL/HAL_STM32F1/HAL.h
+++ b/Marlin/src/HAL/HAL_STM32F1/HAL.h
@@ -47,10 +47,10 @@
 #include "../shared/math_32bit.h"
 #include "../shared/HAL_SPI.h"
 
-#include "fastio_Stm32f1.h"
-#include "watchdog_Stm32f1.h"
+#include "fastio_STM32F1.h"
+#include "watchdog_STM32F1.h"
 
-#include "HAL_timers_Stm32f1.h"
+#include "HAL_timers_STM32F1.h"
 
 
 // --------------------------------------------------------------------------
diff --git a/Marlin/src/HAL/HAL_STM32F1/HAL_Servo_Stm32f1.cpp b/Marlin/src/HAL/HAL_STM32F1/HAL_Servo_STM32F1.cpp
similarity index 99%
rename from Marlin/src/HAL/HAL_STM32F1/HAL_Servo_Stm32f1.cpp
rename to Marlin/src/HAL/HAL_STM32F1/HAL_Servo_STM32F1.cpp
index 60cdfbf2f..9533dd0f0 100644
--- a/Marlin/src/HAL/HAL_STM32F1/HAL_Servo_Stm32f1.cpp
+++ b/Marlin/src/HAL/HAL_STM32F1/HAL_Servo_STM32F1.cpp
@@ -29,7 +29,7 @@
 
 uint8_t ServoCount; //=0
 
-#include "HAL_Servo_Stm32f1.h"
+#include "HAL_Servo_STM32F1.h"
 
 //#include "Servo.h"
 
diff --git a/Marlin/src/HAL/HAL_STM32F1/HAL_Servo_Stm32f1.h b/Marlin/src/HAL/HAL_STM32F1/HAL_Servo_STM32F1.h
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32F1/HAL_Servo_Stm32f1.h
rename to Marlin/src/HAL/HAL_STM32F1/HAL_Servo_STM32F1.h
diff --git a/Marlin/src/HAL/HAL_STM32F1/HAL_spi_Stm32f1.cpp b/Marlin/src/HAL/HAL_STM32F1/HAL_spi_STM32F1.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32F1/HAL_spi_Stm32f1.cpp
rename to Marlin/src/HAL/HAL_STM32F1/HAL_spi_STM32F1.cpp
diff --git a/Marlin/src/HAL/HAL_STM32F1/HAL_timers_Stm32f1.cpp b/Marlin/src/HAL/HAL_STM32F1/HAL_timers_STM32F1.cpp
similarity index 99%
rename from Marlin/src/HAL/HAL_STM32F1/HAL_timers_Stm32f1.cpp
rename to Marlin/src/HAL/HAL_STM32F1/HAL_timers_STM32F1.cpp
index 5c9f5e893..f88e46bd1 100644
--- a/Marlin/src/HAL/HAL_STM32F1/HAL_timers_Stm32f1.cpp
+++ b/Marlin/src/HAL/HAL_STM32F1/HAL_timers_STM32F1.cpp
@@ -32,7 +32,7 @@
 
 #include "HAL.h"
 
-#include "HAL_timers_Stm32f1.h"
+#include "HAL_timers_STM32F1.h"
 
 // --------------------------------------------------------------------------
 // Externals
diff --git a/Marlin/src/HAL/HAL_STM32F1/HAL_timers_Stm32f1.h b/Marlin/src/HAL/HAL_STM32F1/HAL_timers_STM32F1.h
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32F1/HAL_timers_Stm32f1.h
rename to Marlin/src/HAL/HAL_STM32F1/HAL_timers_STM32F1.h
diff --git a/Marlin/src/HAL/HAL_STM32F1/stm32f1_flag_script.py b/Marlin/src/HAL/HAL_STM32F1/STM32F1_flag_script.py
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32F1/stm32f1_flag_script.py
rename to Marlin/src/HAL/HAL_STM32F1/STM32F1_flag_script.py
diff --git a/Marlin/src/HAL/HAL_STM32F1/fastio_Stm32f1.h b/Marlin/src/HAL/HAL_STM32F1/fastio_STM32F1.h
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32F1/fastio_Stm32f1.h
rename to Marlin/src/HAL/HAL_STM32F1/fastio_STM32F1.h
diff --git a/Marlin/src/HAL/HAL_STM32F1/watchdog_Stm32f1.cpp b/Marlin/src/HAL/HAL_STM32F1/watchdog_STM32F1.cpp
similarity index 98%
rename from Marlin/src/HAL/HAL_STM32F1/watchdog_Stm32f1.cpp
rename to Marlin/src/HAL/HAL_STM32F1/watchdog_STM32F1.cpp
index 101ad5ca5..7ecf3fd3f 100644
--- a/Marlin/src/HAL/HAL_STM32F1/watchdog_Stm32f1.cpp
+++ b/Marlin/src/HAL/HAL_STM32F1/watchdog_STM32F1.cpp
@@ -31,7 +31,7 @@
 #if ENABLED(USE_WATCHDOG)
 
 #include <libmaple/iwdg.h>
-#include "watchdog_Stm32f1.h"
+#include "watchdog_STM32F1.h"
 
 void watchdogSetup(void) {
   // do whatever. don't remove this function.
diff --git a/Marlin/src/HAL/HAL_STM32F1/watchdog_Stm32f1.h b/Marlin/src/HAL/HAL_STM32F1/watchdog_STM32F1.h
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32F1/watchdog_Stm32f1.h
rename to Marlin/src/HAL/HAL_STM32F1/watchdog_STM32F1.h
diff --git a/platformio.ini b/platformio.ini
index 9301da0b7..8947e3f64 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -252,7 +252,7 @@ monitor_speed = 250000
 platform      = ststm32@<4.4.0
 framework     = arduino
 board         = genericSTM32F103RE
-build_flags   = !python Marlin/src/HAL/HAL_STM32F1/stm32f1_flag_script.py
+build_flags   = !python Marlin/src/HAL/HAL_STM32F1/STM32F1_flag_script.py
   ${common.build_flags}
 lib_deps      = ${common.lib_deps}
 lib_ignore    = U8glib-HAL
@@ -301,7 +301,7 @@ platform      = ststm32
 framework     = arduino
 board         = genericSTM32F103ZE
 extra_scripts = buildroot/share/PlatformIO/scripts/mks_robin.py
-build_flags   = !python Marlin/src/HAL/HAL_STM32F1/stm32f1_flag_script.py
+build_flags   = !python Marlin/src/HAL/HAL_STM32F1/STM32F1_flag_script.py
   ${common.build_flags}
 src_filter    = ${common.default_src_filter} +<src/HAL/HAL_STM32F1>
 lib_deps      = ${common.lib_deps}
@@ -330,7 +330,7 @@ monitor_speed = 250000
 platform    = ststm32
 framework   = arduino
 board       = malyanM200
-build_flags = !python Marlin/src/HAL/HAL_STM32F1/stm32f1_flag_script.py -DMCU_STM32F103CB -D __STM32F1__=1 -std=c++1y -D MOTHERBOARD="BOARD_MALYAN_M200" -DSERIAL_USB -ffunction-sections -fdata-sections -Wl,--gc-sections
+build_flags = !python Marlin/src/HAL/HAL_STM32F1/STM32F1_flag_script.py -DMCU_STM32F103CB -D __STM32F1__=1 -std=c++1y -D MOTHERBOARD="BOARD_MALYAN_M200" -DSERIAL_USB -ffunction-sections -fdata-sections -Wl,--gc-sections
 src_filter  = ${common.default_src_filter} +<src/HAL/HAL_STM32F1>
 #-<frameworks>
 lib_ignore  =