diff --git a/libraries/AP_HAL_ChibiOS/hwdef/HitecMosaic/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/HitecMosaic/hwdef-bl.dat
index 2692910c02..7afba4a39f 100644
--- a/libraries/AP_HAL_ChibiOS/hwdef/HitecMosaic/hwdef-bl.dat
+++ b/libraries/AP_HAL_ChibiOS/hwdef/HitecMosaic/hwdef-bl.dat
@@ -44,8 +44,8 @@ define STM32_SERIAL_USE_USART1 FALSE
 define STM32_SERIAL_USE_USART2 TRUE
 define STM32_SERIAL_USE_USART3 TRUE
 
-PA13 SWDIO-JTMS SWD
-PA14 SWCLK-JTCK SWD
+PA13 JTMS-SWDIO SWD
+PA14 JTCK-SWCLK SWD
 
 define HAL_NO_GPIO_IRQ
 define CH_CFG_ST_TIMEDELTA 0
diff --git a/libraries/AP_HAL_ChibiOS/hwdef/f303-MatekGPS/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/f303-MatekGPS/hwdef-bl.dat
index 3b890aa991..a1b7bd07b6 100644
--- a/libraries/AP_HAL_ChibiOS/hwdef/f303-MatekGPS/hwdef-bl.dat
+++ b/libraries/AP_HAL_ChibiOS/hwdef/f303-MatekGPS/hwdef-bl.dat
@@ -49,8 +49,8 @@ define STM32_SERIAL_USE_USART1 TRUE
 define STM32_SERIAL_USE_USART2 TRUE
 define STM32_SERIAL_USE_USART3 FALSE
 
-PA13 SWDIO-JTMS SWD
-PA14 SWCLK-JTCK SWD
+PA13 JTMS-SWDIO SWD
+PA14 JTCK-SWCLK SWD
 
 define HAL_NO_GPIO_IRQ
 define CH_CFG_ST_TIMEDELTA 0