diff --git a/libraries/AP_HAL_ChibiOS/hwdef/MatekF405/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/MatekF405/hwdef.dat
index bf105bee05..c06fb581f5 100644
--- a/libraries/AP_HAL_ChibiOS/hwdef/MatekF405/hwdef.dat
+++ b/libraries/AP_HAL_ChibiOS/hwdef/MatekF405/hwdef.dat
@@ -93,7 +93,7 @@ PA10 USART1_RX USART1
 #PA3 USART3_RX USART3
 
 # rcinput 
-PA3 TIM9_CH2 TIM2 RCININT FLOAT LOW
+PA3 TIM9_CH2 TIM9 RCININT FLOAT LOW
 
 # USART3
 PC10 USART3_TX USART3
diff --git a/libraries/AP_HAL_ChibiOS/hwdef/OMNIBUSF7V2/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/OMNIBUSF7V2/hwdef.dat
index 62fb179422..6113f09405 100644
--- a/libraries/AP_HAL_ChibiOS/hwdef/OMNIBUSF7V2/hwdef.dat
+++ b/libraries/AP_HAL_ChibiOS/hwdef/OMNIBUSF7V2/hwdef.dat
@@ -91,7 +91,7 @@ PA10 USART1_RX USART1
 PA9  USART1_TX USART1
 
 # USART2 for RC input, RX only
-PA3 TIM9_CH2 TIM2 RCININT FLOAT LOW
+PA3 TIM9_CH2 TIM9 RCININT FLOAT LOW
 
 # USART3
 PD9 USART3_RX USART3
diff --git a/libraries/AP_HAL_ChibiOS/hwdef/revo-mini/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/revo-mini/hwdef.dat
index aff931c187..c53c0ff036 100644
--- a/libraries/AP_HAL_ChibiOS/hwdef/revo-mini/hwdef.dat
+++ b/libraries/AP_HAL_ChibiOS/hwdef/revo-mini/hwdef.dat
@@ -105,8 +105,8 @@ PA3 TIM2_CH4 TIM2 PWM(3) GPIO(52)
 PA2 TIM2_CH3 TIM2 PWM(4) GPIO(53)
 PA1 TIM2_CH2 TIM2 PWM(5) GPIO(54)
 PA0 TIM2_CH1 TIM2 PWM(6) GPIO(55)
-PC8 TIM8_CH3 TIM2 PWM(7) GPIO(56)
-PC9 TIM8_CH4 TIM2 PWM(8) GPIO(57)
+PC8 TIM8_CH3 TIM8 PWM(7) GPIO(56)
+PC9 TIM8_CH4 TIM8 PWM(8) GPIO(57)
 
 PB7 DRDY_HMC5883 INPUT PULLUP
 
diff --git a/libraries/AP_HAL_ChibiOS/hwdef/speedybeef4/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/speedybeef4/hwdef.dat
index a47b4f3195..9d3fafb521 100644
--- a/libraries/AP_HAL_ChibiOS/hwdef/speedybeef4/hwdef.dat
+++ b/libraries/AP_HAL_ChibiOS/hwdef/speedybeef4/hwdef.dat
@@ -86,7 +86,7 @@ PA10 USART1_RX USART1
 #PA3 USART3_RX USART3
 
 # rcinput 
-PA3 TIM9_CH2 TIM2 RCININT FLOAT LOW
+PA3 TIM9_CH2 TIM9 RCININT FLOAT LOW
 
 # USART3
 PC10 USART3_TX USART3