diff --git a/Tools/Frame_params/Parrot_Disco/Parrot_Disco.param b/Tools/Frame_params/Parrot_Disco/Parrot_Disco.param
index 07f5cc0aed..8246d37b16 100644
--- a/Tools/Frame_params/Parrot_Disco/Parrot_Disco.param
+++ b/Tools/Frame_params/Parrot_Disco/Parrot_Disco.param
@@ -1,7 +1,7 @@
 ALT_HOLD_RTL     6000
 ARMING_RUDDER    2
-ARSPD_FBW_MAX    17
-ARSPD_FBW_MIN    12
+AIRSPEED_MAX    17
+AIRSPEED_MIN    12
 ARSPD_PSI_RANGE  0.05
 ARSPD_TUBE_ORDR 2
 ARSPD_USE        1
diff --git a/Tools/Frame_params/QuadPlanes/Aerofox_AYK320.param b/Tools/Frame_params/QuadPlanes/Aerofox_AYK320.param
index e3094fb70b..d8edcc34a9 100644
--- a/Tools/Frame_params/QuadPlanes/Aerofox_AYK320.param
+++ b/Tools/Frame_params/QuadPlanes/Aerofox_AYK320.param
@@ -1,8 +1,8 @@
 # parameters for Foxtech AYK320
 
 # airspeed
-ARSPD_FBW_MAX    35
-ARSPD_FBW_MIN    18
+AIRSPEED_MAX    35
+AIRSPEED_MIN    18
 AIRSPEED_CRUISE 23.00
 TRIM_THROTTLE    60
 
diff --git a/Tools/Frame_params/QuadPlanes/Foxtech_Altair370.parm b/Tools/Frame_params/QuadPlanes/Foxtech_Altair370.parm
index 022e36053e..04a094a7b6 100644
--- a/Tools/Frame_params/QuadPlanes/Foxtech_Altair370.parm
+++ b/Tools/Frame_params/QuadPlanes/Foxtech_Altair370.parm
@@ -7,8 +7,8 @@
 # the rear two elevons are setup for roll only (ailerons)
 
 # setup airspeed range
-ARSPD_FBW_MAX    35
-ARSPD_FBW_MIN    22
+AIRSPEED_MAX    35
+AIRSPEED_MIN    22
 AIRSPEED_CRUISE 27.00
 
 # fixed wing limits
diff --git a/Tools/Frame_params/QuadPlanes/Foxtech_GreatShark.param b/Tools/Frame_params/QuadPlanes/Foxtech_GreatShark.param
index 3807ebc77a..4968c7b71e 100644
--- a/Tools/Frame_params/QuadPlanes/Foxtech_GreatShark.param
+++ b/Tools/Frame_params/QuadPlanes/Foxtech_GreatShark.param
@@ -3,8 +3,8 @@
 # https://www.foxtechfpv.com/foxtech-great-shark-330-vtol.html
 
 # airspeed
-ARSPD_FBW_MAX    35
-ARSPD_FBW_MIN    18
+AIRSPEED_MAX    35
+AIRSPEED_MIN    18
 AIRSPEED_CRUISE 23.00
 TRIM_THROTTLE    60
 
diff --git a/Tools/Frame_params/QuadPlanes/MFD_Crosswind_VTOL.param b/Tools/Frame_params/QuadPlanes/MFD_Crosswind_VTOL.param
index 486a4049c0..ff039c001e 100644
--- a/Tools/Frame_params/QuadPlanes/MFD_Crosswind_VTOL.param
+++ b/Tools/Frame_params/QuadPlanes/MFD_Crosswind_VTOL.param
@@ -3,8 +3,8 @@
 # http://myflydream.com/products/c-0/369.html
 
 # airspeed
-ARSPD_FBW_MAX    29
-ARSPD_FBW_MIN    16
+AIRSPEED_MAX    29
+AIRSPEED_MIN    16
 AIRSPEED_CRUISE 20.00
 TRIM_THROTTLE    52
 
diff --git a/Tools/Frame_params/QuadPlanes/MFE_StriverMini.param b/Tools/Frame_params/QuadPlanes/MFE_StriverMini.param
index f2eeb5398f..693f1e7735 100644
--- a/Tools/Frame_params/QuadPlanes/MFE_StriverMini.param
+++ b/Tools/Frame_params/QuadPlanes/MFE_StriverMini.param
@@ -22,8 +22,8 @@ INS_HNTCH_REF    0.26
 
 # airspeed
 AIRSPEED_CRUISE 23.00
-ARSPD_FBW_MAX    30
-ARSPD_FBW_MIN    15
+AIRSPEED_MAX    30
+AIRSPEED_MIN    15
 
 # limits
 LIM_PITCH_MAX    2000
diff --git a/Tools/Frame_params/QuadPlanes/Mugin_EV350.param b/Tools/Frame_params/QuadPlanes/Mugin_EV350.param
index 3b0eba2a1a..d9b3ba1ab7 100644
--- a/Tools/Frame_params/QuadPlanes/Mugin_EV350.param
+++ b/Tools/Frame_params/QuadPlanes/Mugin_EV350.param
@@ -25,8 +25,8 @@ INS_HNTCH_REF   0.245000
 
 # airspeed
 AIRSPEED_CRUISE 23.00
-ARSPD_FBW_MAX   28
-ARSPD_FBW_MIN   18
+AIRSPEED_MAX   28
+AIRSPEED_MIN   18
 
 # FW pitch tuning
 PTCH_RATE_D     0.021381
diff --git a/Tools/Frame_params/QuadPlanes/SparkleTech-EagleHero.param b/Tools/Frame_params/QuadPlanes/SparkleTech-EagleHero.param
index d4a92a84ef..b68d619c39 100644
--- a/Tools/Frame_params/QuadPlanes/SparkleTech-EagleHero.param
+++ b/Tools/Frame_params/QuadPlanes/SparkleTech-EagleHero.param
@@ -3,8 +3,8 @@
 # http://www.sparkletech.hk/%E9%B9%B0%E7%9C%BC-%E6%97%A0%E4%BA%BA%E6%9C%BA/electric-power/eagle-plus-vtol/
 
 # airspeed
-ARSPD_FBW_MAX    31
-ARSPD_FBW_MIN    22
+AIRSPEED_MAX    31
+AIRSPEED_MIN    22
 AIRSPEED_CRUISE 24.00
 SCALING_SPEED    20
 TRIM_THROTTLE    55
diff --git a/Tools/Frame_params/QuadPlanes/XPlane-Alia.parm b/Tools/Frame_params/QuadPlanes/XPlane-Alia.parm
index 5edf1c897f..7625ee6bf4 100644
--- a/Tools/Frame_params/QuadPlanes/XPlane-Alia.parm
+++ b/Tools/Frame_params/QuadPlanes/XPlane-Alia.parm
@@ -6,8 +6,8 @@ USE_REV_THRUST,1075
 WP_RADIUS,400
 WP_LOITER_RAD,1000
 RTL_RADIUS,500
-ARSPD_FBW_MIN,30
-ARSPD_FBW_MAX,65
+AIRSPEED_MIN,30
+AIRSPEED_MAX,65
 TERRAIN_FOLLOW,1
 THR_MIN,-25
 THR_SLEWRATE,30
diff --git a/Tools/autotest/arduplane.py b/Tools/autotest/arduplane.py
index 1697e260a1..31d621b111 100644
--- a/Tools/autotest/arduplane.py
+++ b/Tools/autotest/arduplane.py
@@ -2922,8 +2922,8 @@ class AutoTestPlane(vehicle_test_suite.TestSuite):
         trim_airspeed = m.airspeed
         self.progress("Using trim_airspeed=%f" % (trim_airspeed,))
 
-        min_airspeed = self.get_parameter("ARSPD_FBW_MIN")
-        max_airspeed = self.get_parameter("ARSPD_FBW_MAX")
+        min_airspeed = self.get_parameter("AIRSPEED_MIN")
+        max_airspeed = self.get_parameter("AIRSPEED_MAX")
 
         if trim_airspeed > max_airspeed:
             raise NotAchievedException("trim airspeed > max_airspeed (%f>%f)" %
diff --git a/Tools/autotest/default_params/firefly.parm b/Tools/autotest/default_params/firefly.parm
index 74cf8b0f71..b36262d43c 100644
--- a/Tools/autotest/default_params/firefly.parm
+++ b/Tools/autotest/default_params/firefly.parm
@@ -8,8 +8,8 @@ SERVO2_MAX = 2000
 SERVO2_MIN = 1000
 AHRS_EKF_TYPE    2
 ARMING_RUDDER    2
-ARSPD_FBW_MAX    35
-ARSPD_FBW_MIN    6
+AIRSPEED_MAX    35
+AIRSPEED_MIN    6
 ARSPD_USE        1
 AUTOTUNE_LEVEL   8
 COMPASS_OFS2_X   -0.420265
diff --git a/Tools/autotest/default_params/plane-jet.parm b/Tools/autotest/default_params/plane-jet.parm
index 0b55e09d9f..e3fcec547c 100644
--- a/Tools/autotest/default_params/plane-jet.parm
+++ b/Tools/autotest/default_params/plane-jet.parm
@@ -1,6 +1,6 @@
 ALT_HOLD_RTL       20000.0000
-ARSPD_FBW_MAX         80.0000
-ARSPD_FBW_MIN         25.0000
+AIRSPEED_MAX         80.0000
+AIRSPEED_MIN         25.0000
 FBWB_CLIMB_RATE        5.0000
 LAND_FLARE_SEC         2.0000
 LIM_PITCH_MAX       2000.0000
diff --git a/Tools/autotest/default_params/plane-jsbsim.parm b/Tools/autotest/default_params/plane-jsbsim.parm
index e09571352f..ce790ed597 100644
--- a/Tools/autotest/default_params/plane-jsbsim.parm
+++ b/Tools/autotest/default_params/plane-jsbsim.parm
@@ -11,8 +11,8 @@ LAND_DISARMDELAY 3
 LAND_PITCH_CD   100
 LAND_FLARE_SEC  3
 ARSPD_USE       1
-ARSPD_FBW_MAX   30
-ARSPD_FBW_MIN   10
+AIRSPEED_MAX   30
+AIRSPEED_MIN   10
 KFF_RDDRMIX     0.5
 THR_MAX		100
 RC2_REVERSED	1
diff --git a/Tools/autotest/default_params/plane-soaring.parm b/Tools/autotest/default_params/plane-soaring.parm
index 7d4c27f8e9..a7f1aa65d4 100644
--- a/Tools/autotest/default_params/plane-soaring.parm
+++ b/Tools/autotest/default_params/plane-soaring.parm
@@ -1,5 +1,5 @@
-ARSPD_FBW_MAX   20
-ARSPD_FBW_MIN   8
+AIRSPEED_MAX   20
+AIRSPEED_MIN   8
 
 FLIGHT_OPTIONS   2
 
diff --git a/Tools/autotest/default_params/plane-tailsitter.parm b/Tools/autotest/default_params/plane-tailsitter.parm
index 14cb1ca14e..9589c5d917 100644
--- a/Tools/autotest/default_params/plane-tailsitter.parm
+++ b/Tools/autotest/default_params/plane-tailsitter.parm
@@ -5,8 +5,8 @@ LIM_PITCH_MIN   -2000
 LIM_PITCH_MAX   2500
 LIM_ROLL_CD     6500
 ARSPD_USE       1
-ARSPD_FBW_MAX   30
-ARSPD_FBW_MIN   10
+AIRSPEED_MAX   30
+AIRSPEED_MIN   10
 THR_MAX		100
 KFF_RDDRMIX     1
 RC1_MAX         2000
diff --git a/Tools/autotest/default_params/quadplane-cl84.parm b/Tools/autotest/default_params/quadplane-cl84.parm
index 4c3f89f3b4..28cecf6573 100644
--- a/Tools/autotest/default_params/quadplane-cl84.parm
+++ b/Tools/autotest/default_params/quadplane-cl84.parm
@@ -1,7 +1,7 @@
 ARMING_RUDDER    2
 ARSPD_TYPE       0
-ARSPD_FBW_MAX    35
-ARSPD_FBW_MIN    6
+AIRSPEED_MAX    35
+AIRSPEED_MIN    6
 AUTOTUNE_LEVEL   8
 COMPASS_OFS2_X   -0.420265
 COMPASS_OFS2_Y   -0.726942
diff --git a/Tools/autotest/default_params/quadplane-tilttri.parm b/Tools/autotest/default_params/quadplane-tilttri.parm
index 314071ed46..b7962154c7 100644
--- a/Tools/autotest/default_params/quadplane-tilttri.parm
+++ b/Tools/autotest/default_params/quadplane-tilttri.parm
@@ -1,7 +1,7 @@
 AHRS_EKF_TYPE    2
 ARMING_RUDDER    2
-ARSPD_FBW_MAX    35
-ARSPD_FBW_MIN    6
+AIRSPEED_MAX    35
+AIRSPEED_MIN    6
 ARSPD_USE        1
 AUTOTUNE_LEVEL   8
 COMPASS_OFS2_X   -0.420265
diff --git a/Tools/autotest/default_params/quadplane-tilttrivec.parm b/Tools/autotest/default_params/quadplane-tilttrivec.parm
index 1d8bd5b114..6eb0703bdb 100644
--- a/Tools/autotest/default_params/quadplane-tilttrivec.parm
+++ b/Tools/autotest/default_params/quadplane-tilttrivec.parm
@@ -1,7 +1,7 @@
 AHRS_EKF_TYPE    2
 ARMING_RUDDER    2
-ARSPD_FBW_MAX    35
-ARSPD_FBW_MIN    6
+AIRSPEED_MAX    35
+AIRSPEED_MIN    6
 ARSPD_USE        1
 AUTOTUNE_LEVEL   8
 COMPASS_OFS2_X   -0.420265
diff --git a/Tools/autotest/default_params/quadplane-tri.parm b/Tools/autotest/default_params/quadplane-tri.parm
index 608db644be..238ca6389a 100644
--- a/Tools/autotest/default_params/quadplane-tri.parm
+++ b/Tools/autotest/default_params/quadplane-tri.parm
@@ -1,7 +1,7 @@
 AHRS_EKF_TYPE    2
 ARMING_RUDDER    2
-ARSPD_FBW_MAX    35
-ARSPD_FBW_MIN    13
+AIRSPEED_MAX    35
+AIRSPEED_MIN    13
 ARSPD_USE        1
 AUTOTUNE_LEVEL   8
 COMPASS_OFS2_X   -0.420265
diff --git a/Tools/autotest/default_params/quadplane.parm b/Tools/autotest/default_params/quadplane.parm
index 402f86e521..a57da4367c 100644
--- a/Tools/autotest/default_params/quadplane.parm
+++ b/Tools/autotest/default_params/quadplane.parm
@@ -1,6 +1,6 @@
 ARMING_RUDDER    2
-ARSPD_FBW_MAX    35
-ARSPD_FBW_MIN    13
+AIRSPEED_MAX    35
+AIRSPEED_MIN    13
 ARSPD_USE        1
 AUTOTUNE_LEVEL   8
 COMPASS_OFS2_X   -0.420265
diff --git a/Tools/autotest/default_params/vee-gull 005.param b/Tools/autotest/default_params/vee-gull 005.param
index 8171c9cb2a..9d3ebd430f 100644
--- a/Tools/autotest/default_params/vee-gull 005.param	
+++ b/Tools/autotest/default_params/vee-gull 005.param	
@@ -26,8 +26,8 @@ ARMING_REQUIRE,0
 ARMING_RUDDER,1
 ARSPD_AUTOCAL,0
 ARSPD_BUS,1
-ARSPD_FBW_MAX,15
-ARSPD_FBW_MIN,10
+AIRSPEED_MAX,15
+AIRSPEED_MIN,10
 ARSPD_OFFSET,2015.877
 ARSPD_PIN,1
 ARSPD_PSI_RANGE,1
diff --git a/Tools/autotest/models/plane-3d.parm b/Tools/autotest/models/plane-3d.parm
index 1058eba8b8..c56365a6ef 100644
--- a/Tools/autotest/models/plane-3d.parm
+++ b/Tools/autotest/models/plane-3d.parm
@@ -29,7 +29,7 @@ AHRS_EKF_TYPE    10
 TRIM_THROTTLE    30
 NAVL1_PERIOD     7
 AIRSPEED_CRUISE 24.00
-ARSPD_FBW_MAX    30
+AIRSPEED_MAX    30
 LIM_ROLL_CD      7000
 # setup for scripting
 SCR_ENABLE       1
diff --git a/Tools/autotest/models/plane.parm b/Tools/autotest/models/plane.parm
index a5f2a91f98..2c9b6cedd1 100644
--- a/Tools/autotest/models/plane.parm
+++ b/Tools/autotest/models/plane.parm
@@ -10,8 +10,8 @@ LIM_ROLL_CD     6500
 LAND_PITCH_CD   100
 LAND_FLARE_SEC  3
 ARSPD_USE       1
-ARSPD_FBW_MAX   30
-ARSPD_FBW_MIN   10
+AIRSPEED_MAX   30
+AIRSPEED_MIN   10
 KFF_RDDRMIX     0.5
 THR_MAX		100
 RC1_MAX         2000