diff --git a/test/configs/samd21.config b/test/configs/samd21g18.config
similarity index 70%
rename from test/configs/samd21.config
rename to test/configs/samd21g18.config
index 8dd361d1..bdbc3971 100644
--- a/test/configs/samd21.config
+++ b/test/configs/samd21g18.config
@@ -1,3 +1,3 @@
 # Base config file for SAMD21 boards
 CONFIG_MACH_ATSAMD=y
-CONFIG_MACH_SAMD21=y
+CONFIG_MACH_SAMD21G18=y
diff --git a/test/configs/stm32f0.config b/test/configs/stm32f0_hal.config
similarity index 100%
rename from test/configs/stm32f0.config
rename to test/configs/stm32f0_hal.config
diff --git a/test/configs/stm32f1-serial.config b/test/configs/stm32f103-serial.config
similarity index 100%
rename from test/configs/stm32f1-serial.config
rename to test/configs/stm32f103-serial.config
diff --git a/test/configs/stm32f1.config b/test/configs/stm32f103.config
similarity index 100%
rename from test/configs/stm32f1.config
rename to test/configs/stm32f103.config
diff --git a/test/klippy/printers.test b/test/klippy/printers.test
index 86d93ff0..73a6eb76 100644
--- a/test/klippy/printers.test
+++ b/test/klippy/printers.test
@@ -88,14 +88,14 @@ CONFIG ../../config/generic-re-arm.cfg
 CONFIG ../../config/generic-smoothieboard.cfg
 
 # Printers using the stm32f103
-DICTIONARY stm32f1.dict
+DICTIONARY stm32f103.dict
 CONFIG ../../config/generic-bigtreetech-skr-mini.cfg
 CONFIG ../../config/generic-bigtreetech-skr-mini-e3-v1.0.cfg
 CONFIG ../../config/generic-bigtreetech-skr-mini-e3-v1.2.cfg
 CONFIG ../../config/generic-bigtreetech-skr-e3-dip.cfg
 
 # Printers using the stm32f103 via serial
-DICTIONARY stm32f1-serial.dict
+DICTIONARY stm32f103-serial.dict
 CONFIG ../../config/generic-fysetc-cheetah-v1.1.cfg
 CONFIG ../../config/generic-fysetc-cheetah-v1.2.cfg