diff --git a/libraries/AP_HAL_ChibiOS/hwdef/BirdCANdy/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/BirdCANdy/hwdef-bl.dat
index bfcc4b9b3c..5fd155440d 100644
--- a/libraries/AP_HAL_ChibiOS/hwdef/BirdCANdy/hwdef-bl.dat
+++ b/libraries/AP_HAL_ChibiOS/hwdef/BirdCANdy/hwdef-bl.dat
@@ -3,7 +3,7 @@
 
 # MCU class and specific type
 # note: the device is STM32F412CE, not all F412 pins are available
-MCU STM32F4xx STM32F412xx
+MCU STM32F4xx STM32F412Rx
 
 FLASH_RESERVE_START_KB 0
 # two sectors for bootloader, two for storage
diff --git a/libraries/AP_HAL_ChibiOS/hwdef/BirdCANdy/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/BirdCANdy/hwdef.dat
index 6e16fc940d..3d7c89e1c7 100644
--- a/libraries/AP_HAL_ChibiOS/hwdef/BirdCANdy/hwdef.dat
+++ b/libraries/AP_HAL_ChibiOS/hwdef/BirdCANdy/hwdef.dat
@@ -3,7 +3,7 @@
 
 # MCU class and specific type
 # note: the device is STM32F412CE, not all F412 pins are available
-MCU STM32F4xx STM32F412xx
+MCU STM32F4xx STM32F412Rx
 
 # bootloader starts firmware at 64k
 FLASH_RESERVE_START_KB 64
diff --git a/libraries/AP_HAL_ChibiOS/hwdef/CUAV_GPS/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/CUAV_GPS/hwdef-bl.dat
index d3477fa251..ba5234a856 100644
--- a/libraries/AP_HAL_ChibiOS/hwdef/CUAV_GPS/hwdef-bl.dat
+++ b/libraries/AP_HAL_ChibiOS/hwdef/CUAV_GPS/hwdef-bl.dat
@@ -1,7 +1,7 @@
 # hw definition file for processing by chibios_pins.py
 
 # MCU class and specific type
-MCU STM32F4xx STM32F412xx
+MCU STM32F4xx STM32F412Rx
 
 FLASH_RESERVE_START_KB 0
 # two sectors for bootloader, two for storage
diff --git a/libraries/AP_HAL_ChibiOS/hwdef/CUAV_GPS/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/CUAV_GPS/hwdef.dat
index c8cbcebf58..dfef2f43b9 100644
--- a/libraries/AP_HAL_ChibiOS/hwdef/CUAV_GPS/hwdef.dat
+++ b/libraries/AP_HAL_ChibiOS/hwdef/CUAV_GPS/hwdef.dat
@@ -2,7 +2,7 @@
 # MCU class and specific type
 
 # MCU class and specific type
-MCU STM32F4xx STM32F412xx
+MCU STM32F4xx STM32F412Rx
 
 # bootloader starts firmware at 64k
 FLASH_RESERVE_START_KB 64
diff --git a/libraries/AP_HAL_ChibiOS/hwdef/HolybroGPS/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/HolybroGPS/hwdef-bl.dat
index 954df0302f..53f03ca225 100644
--- a/libraries/AP_HAL_ChibiOS/hwdef/HolybroGPS/hwdef-bl.dat
+++ b/libraries/AP_HAL_ChibiOS/hwdef/HolybroGPS/hwdef-bl.dat
@@ -1,7 +1,7 @@
 # hw definition file for processing by chibios_pins.py
 
 # MCU class and specific type
-MCU STM32F4xx STM32F412xx
+MCU STM32F4xx STM32F412Rx
 
 FLASH_RESERVE_START_KB 0
 
diff --git a/libraries/AP_HAL_ChibiOS/hwdef/HolybroGPS/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/HolybroGPS/hwdef.dat
index 42f023a9ff..30551f087f 100644
--- a/libraries/AP_HAL_ChibiOS/hwdef/HolybroGPS/hwdef.dat
+++ b/libraries/AP_HAL_ChibiOS/hwdef/HolybroGPS/hwdef.dat
@@ -2,7 +2,7 @@
 # MCU class and specific type
 
 # MCU class and specific type
-MCU STM32F4xx STM32F412xx
+MCU STM32F4xx STM32F412Rx
 
 # bootloader starts firmware at 64k
 FLASH_RESERVE_START_KB 64
diff --git a/libraries/AP_HAL_ChibiOS/hwdef/scripts/STM32F412xx.py b/libraries/AP_HAL_ChibiOS/hwdef/scripts/STM32F412Rx.py
similarity index 100%
rename from libraries/AP_HAL_ChibiOS/hwdef/scripts/STM32F412xx.py
rename to libraries/AP_HAL_ChibiOS/hwdef/scripts/STM32F412Rx.py
diff --git a/libraries/AP_HAL_ChibiOS/hwdef/skyviper-f412-rev1/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/skyviper-f412-rev1/hwdef.dat
index 647d52d41f..b333d85f09 100644
--- a/libraries/AP_HAL_ChibiOS/hwdef/skyviper-f412-rev1/hwdef.dat
+++ b/libraries/AP_HAL_ChibiOS/hwdef/skyviper-f412-rev1/hwdef.dat
@@ -1,7 +1,7 @@
 # hw definition file for processing by chibios_pins.py
 # old F412 layout
 
-MCU STM32F4xx STM32F412xx
+MCU STM32F4xx STM32F412Rx
 
 # board ID for firmware load
 APJ_BOARD_ID 9
diff --git a/libraries/AP_HAL_ChibiOS/hwdef/skyviper-journey/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/skyviper-journey/hwdef.dat
index edab8b7b65..f65056e970 100644
--- a/libraries/AP_HAL_ChibiOS/hwdef/skyviper-journey/hwdef.dat
+++ b/libraries/AP_HAL_ChibiOS/hwdef/skyviper-journey/hwdef.dat
@@ -1,7 +1,7 @@
 # hw definition file for processing by chibios_pins.py
 # new SkyViper 2018 Journey
 
-MCU STM32F4xx STM32F412xx
+MCU STM32F4xx STM32F412Rx
 
 # board ID for firmware load
 APJ_BOARD_ID 9