diff --git a/libraries/AP_HAL_ChibiOS/hwdef/BeastF7/defaults.parm b/libraries/AP_HAL_ChibiOS/hwdef/BeastF7/defaults.parm
index 0765495966..4737b843cb 100644
--- a/libraries/AP_HAL_ChibiOS/hwdef/BeastF7/defaults.parm
+++ b/libraries/AP_HAL_ChibiOS/hwdef/BeastF7/defaults.parm
@@ -2,8 +2,8 @@
 SERVO5_FUNCTION 120
 NTF_LED_TYPES 257
 # disable compass
-COMPASS1_USE 0
-COMPASS2_USE 0
-COMPASS3_USE 0
+COMPASS_USE 0
+COMPASS_USE2 0
+COMPASS_USE3 0
 # setup SERIAL3 for RCIN
 SERIAL3_BAUD 115
diff --git a/libraries/AP_HAL_ChibiOS/hwdef/BeastH7/defaults.parm b/libraries/AP_HAL_ChibiOS/hwdef/BeastH7/defaults.parm
index 0765495966..4737b843cb 100644
--- a/libraries/AP_HAL_ChibiOS/hwdef/BeastH7/defaults.parm
+++ b/libraries/AP_HAL_ChibiOS/hwdef/BeastH7/defaults.parm
@@ -2,8 +2,8 @@
 SERVO5_FUNCTION 120
 NTF_LED_TYPES 257
 # disable compass
-COMPASS1_USE 0
-COMPASS2_USE 0
-COMPASS3_USE 0
+COMPASS_USE 0
+COMPASS_USE2 0
+COMPASS_USE3 0
 # setup SERIAL3 for RCIN
 SERIAL3_BAUD 115
diff --git a/libraries/AP_HAL_ChibiOS/hwdef/skyviper-journey/defaults.parm b/libraries/AP_HAL_ChibiOS/hwdef/skyviper-journey/defaults.parm
index 5b3c58170b..375c5df8ec 100644
--- a/libraries/AP_HAL_ChibiOS/hwdef/skyviper-journey/defaults.parm
+++ b/libraries/AP_HAL_ChibiOS/hwdef/skyviper-journey/defaults.parm
@@ -29,17 +29,17 @@ RELAY_PIN2 1
 RELAY_DEFAULT 1
 
 AHRS_ORIENTATION 2
-COMPASS1_EXTERN 1
-COMPASS1_ORIENT   10
-COMPASS2_USE2     0
-COMPASS3_USE3     0
+COMPASS_EXTERNAL 1
+COMPASS_ORIENT   10
+COMPASS_USE2     0
+COMPASS_USE3     0
 COMPASS_OFFS_MAX 2000
-COMPASS1_DIA_X    1.20
-COMPASS1_DIA_Y    1.11
-COMPASS1_DIA_Z    0.89
-COMPASS1_ODI_X   -0.051
-COMPASS1_ODI_Y    0.141
-COMPASS1_ODI_Z    0.091
+COMPASS_DIA_X    1.20
+COMPASS_DIA_Y    1.11
+COMPASS_DIA_Z    0.89
+COMPASS_ODI_X   -0.051
+COMPASS_ODI_Y    0.141
+COMPASS_ODI_Z    0.091
 
 # battery setup
 BATT_MONITOR     3