diff --git a/libraries/AP_HAL_ChibiOS/hwdef/MatekL431-APDTelem/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/MatekL431-APDTelem/hwdef.dat
index 4424b8b967..d8b9e61207 100644
--- a/libraries/AP_HAL_ChibiOS/hwdef/MatekL431-APDTelem/hwdef.dat
+++ b/libraries/AP_HAL_ChibiOS/hwdef/MatekL431-APDTelem/hwdef.dat
@@ -12,6 +12,6 @@ PA15  TIM2_CH1  TIM2 PWM(5) GPIO(54)
 define AP_PERIPH_RC_OUT_ENABLED 1
 
 # enable APD telemetry on rx1
-define HAL_PERIPH_ENABLE_ESC_APD
+define AP_PERIPH_ESC_APD_ENABLED 1
 define APD_ESC_INSTANCES 1
 define APD_ESC_SERIAL_0 0
diff --git a/libraries/AP_HAL_ChibiOS/hwdef/scripts/defaults_periph.h b/libraries/AP_HAL_ChibiOS/hwdef/scripts/defaults_periph.h
index c3c9241e18..8c2983ab7f 100644
--- a/libraries/AP_HAL_ChibiOS/hwdef/scripts/defaults_periph.h
+++ b/libraries/AP_HAL_ChibiOS/hwdef/scripts/defaults_periph.h
@@ -235,6 +235,9 @@
 #ifdef HAL_PERIPH_ENABLE_PWM_HARDPOINT
 #error "Change 'define HAL_PERIPH_ENABLE_PWM_HARDPOINT' to 'define AP_PERIPH_PWM_HARDPOINT_ENABLED 1'"
 #endif
+#ifdef HAL_PERIPH_ENABLE_ESC_APD
+#error "Change 'define HAL_PERIPH_ENABLE_ESC_APD' to 'define AP_PERIPH_ESC_APD_ENABLED 1'"
+#endif
 
 /*
  * defaults for various AP_Periph features:
@@ -314,6 +317,9 @@
 #ifndef AP_PERIPH_PWM_HARDPOINT_ENABLED
 #define AP_PERIPH_PWM_HARDPOINT_ENABLED 0
 #endif
+#ifndef AP_PERIPH_ESC_APD_ENABLED
+#define AP_PERIPH_ESC_APD_ENABLED 0
+#endif
 
 /*
  * turning on of ArduPilot features based on which AP_Periph features
diff --git a/libraries/AP_HAL_ChibiOS/hwdef/sw-boom-f407/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/sw-boom-f407/hwdef.dat
index ce99b0b883..2bc5515793 100644
--- a/libraries/AP_HAL_ChibiOS/hwdef/sw-boom-f407/hwdef.dat
+++ b/libraries/AP_HAL_ChibiOS/hwdef/sw-boom-f407/hwdef.dat
@@ -56,7 +56,7 @@ PA0 UART4_TX UART4 SPEED_HIGH DMA
 PA1 UART4_RX UART4 SPEED_HIGH DMA
 
 # APD telem
-define HAL_PERIPH_ENABLE_ESC_APD 1
+define AP_PERIPH_ESC_APD_ENABLED 1
 define APD_ESC_INSTANCES 2
 define APD_ESC_SERIAL_0 1
 define APD_ESC_SERIAL_1 2