diff --git a/libraries/AP_HAL_ChibiOS/hwdef/CubeGreen-solo/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/CubeGreen-solo/hwdef.dat
index 385e689ac1..c9da5ea185 100644
--- a/libraries/AP_HAL_ChibiOS/hwdef/CubeGreen-solo/hwdef.dat
+++ b/libraries/AP_HAL_ChibiOS/hwdef/CubeGreen-solo/hwdef.dat
@@ -10,8 +10,8 @@ include ../CubeBlack/hwdef.dat
 # these are parameters the Solo requires for proper operation that are different from the 4 standard defaults.
 env DEFAULT_PARAMETERS 'Tools/Frame_params/Solo_Copter-4_GreenCube.param'
 
-undef HAL_OREO_LED_ENABLED
-define HAL_OREO_LED_ENABLED 1
+undef AP_NOTIFY_OREOLED_ENABLED
+define AP_NOTIFY_OREOLED_ENABLED 1
 
 undef HAL_SOLO_GIMBAL_ENABLED
 define HAL_SOLO_GIMBAL_ENABLED HAL_MOUNT_ENABLED
diff --git a/libraries/AP_HAL_ChibiOS/hwdef/CubeOrange/hwdef.inc b/libraries/AP_HAL_ChibiOS/hwdef/CubeOrange/hwdef.inc
index f7b5bd8825..67d4f5ee11 100644
--- a/libraries/AP_HAL_ChibiOS/hwdef/CubeOrange/hwdef.inc
+++ b/libraries/AP_HAL_ChibiOS/hwdef/CubeOrange/hwdef.inc
@@ -330,7 +330,7 @@ ROMFS io_firmware.bin Tools/IO_Firmware/iofirmware_highpolh.bin
 DMA_NOSHARE SPI1* SPI4* USART6*
 
 # for users who have replaced their CubeSolo with a CubeOrange:
-define HAL_OREO_LED_ENABLED 1
+define AP_NOTIFY_OREOLED_ENABLED 1
 define HAL_SOLO_GIMBAL_ENABLED HAL_MOUNT_ENABLED
 
 # Enable Sagetech MXS ADSB transponder
diff --git a/libraries/AP_HAL_ChibiOS/hwdef/CubeSolo/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/CubeSolo/hwdef.dat
index c16fb1fa6f..58f2ec2fbf 100644
--- a/libraries/AP_HAL_ChibiOS/hwdef/CubeSolo/hwdef.dat
+++ b/libraries/AP_HAL_ChibiOS/hwdef/CubeSolo/hwdef.dat
@@ -49,8 +49,8 @@ COMPASS AK09916:probe_ICM20948 0 ROTATION_ROLL_180_YAW_90
 # also probe for external compasses
 define HAL_PROBE_EXTERNAL_I2C_COMPASSES
 
-undef HAL_OREO_LED_ENABLED
-define HAL_OREO_LED_ENABLED 1
+undef AP_NOTIFY_OREOLED_ENABLED
+define AP_NOTIFY_OREOLED_ENABLED 1
 
 define HAL_IMU_TEMP_MARGIN_LOW_DEFAULT 5
 
diff --git a/libraries/AP_HAL_ChibiOS/hwdef/JHEMCU-GSF405A/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/JHEMCU-GSF405A/hwdef.dat
index 5465db2d53..38b3fb4a24 100644
--- a/libraries/AP_HAL_ChibiOS/hwdef/JHEMCU-GSF405A/hwdef.dat
+++ b/libraries/AP_HAL_ChibiOS/hwdef/JHEMCU-GSF405A/hwdef.dat
@@ -167,6 +167,6 @@ define AP_GRIPPER_ENABLED 0
 define HAL_HOTT_TELEM_ENABLED 0
 define HAL_NMEA_OUTPUT_ENABLED 0
 define HAL_BUTTON_ENABLED 0
-define HAL_OREO_LED_ENABLED 0
+define AP_NOTIFY_OREOLED_ENABLED 0
 define HAL_PICCOLO_CAN_ENABLE 0
 define BARO_MAX_INSTANCES 1
diff --git a/libraries/AP_HAL_ChibiOS/hwdef/MatekF405-TE/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/MatekF405-TE/hwdef.dat
index f9e931c79e..1d26dc9507 100644
--- a/libraries/AP_HAL_ChibiOS/hwdef/MatekF405-TE/hwdef.dat
+++ b/libraries/AP_HAL_ChibiOS/hwdef/MatekF405-TE/hwdef.dat
@@ -189,5 +189,5 @@ define HAL_RUNCAM_ENABLED 0
 define HAL_HOTT_TELEM_ENABLED 0
 define HAL_NMEA_OUTPUT_ENABLED 0
 define HAL_BUTTON_ENABLED 0
-define HAL_OREO_LED_ENABLED 0
+define AP_NOTIFY_OREOLED_ENABLED 0
 define HAL_PICCOLO_CAN_ENABLE 0