diff --git a/Tools/Frame_params/Solo_Copter-3.5_GreenCube.param b/Tools/Frame_params/Solo_Copter-3.5_GreenCube.param
index 894d482c3361d..0f443af4bcaba 100644
--- a/Tools/Frame_params/Solo_Copter-3.5_GreenCube.param
+++ b/Tools/Frame_params/Solo_Copter-3.5_GreenCube.param
@@ -38,7 +38,7 @@ COMPASS_ORIENT,38
 COMPASS_ORIENT2,0
 COMPASS_ORIENT3,0
 COMPASS_PRIMARY,0
-COMPASS_TYPEMASK,15392
+COMPASS_DISBLMSK,15392
 COMPASS_USE,1
 COMPASS_USE2,1
 COMPASS_USE3,0
diff --git a/Tools/Frame_params/Solo_Copter-3.6_GreenCube.param b/Tools/Frame_params/Solo_Copter-3.6_GreenCube.param
index 61863f1579034..d80e6e9001fff 100644
--- a/Tools/Frame_params/Solo_Copter-3.6_GreenCube.param
+++ b/Tools/Frame_params/Solo_Copter-3.6_GreenCube.param
@@ -42,7 +42,7 @@ BRD_SAFETYENABLE,0
 BRD_SAFETY_MASK,16368
 CIRCLE_RADIUS,3000
 COMPASS_ORIENT,38
-COMPASS_TYPEMASK,15392
+COMPASS_DISBLMSK,15392
 COMPASS_USE3,0
 DISARM_DELAY,10
 EK2_ENABLE,0
diff --git a/Tools/Frame_params/Sub/bluerov2-4_0_0.params b/Tools/Frame_params/Sub/bluerov2-4_0_0.params
index 7704b35a13690..a5a21c5343711 100644
--- a/Tools/Frame_params/Sub/bluerov2-4_0_0.params
+++ b/Tools/Frame_params/Sub/bluerov2-4_0_0.params
@@ -169,7 +169,7 @@ COMPASS_ORIENT2,0
 COMPASS_ORIENT3,0
 COMPASS_PMOT_EN,0
 COMPASS_PRIMARY,0
-COMPASS_TYPEMASK,0
+COMPASS_DISBLMSK,0
 COMPASS_USE,1
 COMPASS_USE2,1
 COMPASS_USE3,1
diff --git a/Tools/Frame_params/Sub/bluerov2-heavy-4_0_0.params b/Tools/Frame_params/Sub/bluerov2-heavy-4_0_0.params
index 1cc38ff762b4d..88d0826b3424a 100644
--- a/Tools/Frame_params/Sub/bluerov2-heavy-4_0_0.params
+++ b/Tools/Frame_params/Sub/bluerov2-heavy-4_0_0.params
@@ -169,7 +169,7 @@ COMPASS_ORIENT2,0
 COMPASS_ORIENT3,0
 COMPASS_PMOT_EN,0
 COMPASS_PRIMARY,0
-COMPASS_TYPEMASK,0
+COMPASS_DISBLMSK,0
 COMPASS_USE,1
 COMPASS_USE2,1
 COMPASS_USE3,1
diff --git a/libraries/AP_Compass/AP_Compass.cpp b/libraries/AP_Compass/AP_Compass.cpp
index 18d2cc9136c76..45eccb97e7375 100644
--- a/libraries/AP_Compass/AP_Compass.cpp
+++ b/libraries/AP_Compass/AP_Compass.cpp
@@ -508,12 +508,12 @@ const AP_Param::GroupInfo Compass::var_info[] = {
     AP_SUBGROUPINFO(_per_motor, "PMOT", 32, Compass, Compass_PerMotor),
 #endif
 
-    // @Param: TYPEMASK
+    // @Param: DISBLMSK
     // @DisplayName: Compass disable driver type mask
     // @Description: This is a bitmask of driver types to disable. If a driver type is set in this mask then that driver will not try to find a sensor at startup
     // @Bitmask: 0:HMC5883,1:LSM303D,2:AK8963,3:BMM150,4:LSM9DS1,5:LIS3MDL,6:AK09916,7:IST8310,8:ICM20948,9:MMC3416,11:DroneCAN,12:QMC5883,14:MAG3110,15:IST8308,16:RM3100,17:MSP,18:ExternalAHRS
     // @User: Advanced
-    AP_GROUPINFO("TYPEMASK", 33, Compass, _driver_type_mask, 0),
+    AP_GROUPINFO("DISBLMSK", 33, Compass, _driver_type_mask, 0),
 
     // @Param: FLTR_RNG
     // @DisplayName: Range in which sample is accepted
diff --git a/libraries/AP_Compass/AP_Compass.h b/libraries/AP_Compass/AP_Compass.h
index 2c7b1ac7418df..66e2bc0ff409f 100644
--- a/libraries/AP_Compass/AP_Compass.h
+++ b/libraries/AP_Compass/AP_Compass.h
@@ -422,7 +422,7 @@ friend class AP_Compass_Backend;
     bool _cal_requires_reboot;
     bool _cal_has_run;
 
-    // enum of drivers for COMPASS_TYPEMASK
+    // enum of drivers for COMPASS_DISBLMSK
     enum DriverType {
 #if AP_COMPASS_HMC5843_ENABLED
         DRIVER_HMC5843  =0,
diff --git a/libraries/AP_HAL_ChibiOS/hwdef/CubeGreen-solo/defaults.parm b/libraries/AP_HAL_ChibiOS/hwdef/CubeGreen-solo/defaults.parm
index 221f9f39c8d33..127840bf7f450 100644
--- a/libraries/AP_HAL_ChibiOS/hwdef/CubeGreen-solo/defaults.parm
+++ b/libraries/AP_HAL_ChibiOS/hwdef/CubeGreen-solo/defaults.parm
@@ -49,7 +49,7 @@ BRD_SAFETY_MASK,16368
 BRD_SAFETYENABLE,0
 CIRCLE_RADIUS,3000
 COMPASS_ORIENT,38
-COMPASS_TYPEMASK,15392
+COMPASS_DISBLMSK,15392
 COMPASS_USE3,0
 EK2_ENABLE,0
 EK3_ENABLE,1
diff --git a/libraries/AP_HAL_ChibiOS/hwdef/CubeSolo/defaults.parm b/libraries/AP_HAL_ChibiOS/hwdef/CubeSolo/defaults.parm
index 0d9f09611087f..0130fe56f90d4 100644
--- a/libraries/AP_HAL_ChibiOS/hwdef/CubeSolo/defaults.parm
+++ b/libraries/AP_HAL_ChibiOS/hwdef/CubeSolo/defaults.parm
@@ -50,7 +50,7 @@ BRD_SAFETYENABLE,0
 BRD_TYPE,3
 CIRCLE_RADIUS,3000
 COMPASS_ORIENT,38
-COMPASS_TYPEMASK,15392
+COMPASS_DISBLMSK,15392
 COMPASS_USE3,0
 EK2_ENABLE,0
 EK3_ENABLE,1
diff --git a/libraries/AP_HAL_ChibiOS/hwdef/luminousbee5/defaults.parm b/libraries/AP_HAL_ChibiOS/hwdef/luminousbee5/defaults.parm
index 1d59bcecee582..f350e21253768 100644
--- a/libraries/AP_HAL_ChibiOS/hwdef/luminousbee5/defaults.parm
+++ b/libraries/AP_HAL_ChibiOS/hwdef/luminousbee5/defaults.parm
@@ -54,7 +54,7 @@ CAN_D2_PROTOCOL,0
 COMPASS_AUTODEC,1
 COMPASS_EXTERNAL,1
 COMPASS_ORIENT,12
-COMPASS_TYPEMASK,510846
+COMPASS_DISBLMSK,510846
 COMPASS_USE2,0
 COMPASS_USE3,0
 COMPASS_CAL_FIT,16
diff --git a/libraries/SITL/examples/SilentWings/Params/Rolladen-Schneider-LS8b.param b/libraries/SITL/examples/SilentWings/Params/Rolladen-Schneider-LS8b.param
index 0c7de8b67c26f..4aeda587cf4e9 100644
--- a/libraries/SITL/examples/SilentWings/Params/Rolladen-Schneider-LS8b.param
+++ b/libraries/SITL/examples/SilentWings/Params/Rolladen-Schneider-LS8b.param
@@ -117,7 +117,7 @@ COMPASS_ORIENT2,0
 COMPASS_ORIENT3,0
 COMPASS_PMOT_EN,0
 COMPASS_PRIMARY,0
-COMPASS_TYPEMASK,0
+COMPASS_DISBLMSK,0
 COMPASS_USE,0
 COMPASS_USE2,0
 COMPASS_USE3,0
diff --git a/libraries/SITL/examples/SilentWings/Params/Schleicher-ASW27B.param b/libraries/SITL/examples/SilentWings/Params/Schleicher-ASW27B.param
index 82d518a4e1246..f5ee764936dec 100644
--- a/libraries/SITL/examples/SilentWings/Params/Schleicher-ASW27B.param
+++ b/libraries/SITL/examples/SilentWings/Params/Schleicher-ASW27B.param
@@ -120,7 +120,7 @@ COMPASS_ORIENT2,0
 COMPASS_ORIENT3,0
 COMPASS_PMOT_EN,0
 COMPASS_PRIMARY,0
-COMPASS_TYPEMASK,0
+COMPASS_DISBLMSK,0
 COMPASS_USE,0
 COMPASS_USE2,0
 COMPASS_USE3,0