diff --git a/Tools/autotest/default_params/copter-heli.parm b/Tools/autotest/default_params/copter-heli.parm
index ed6847815f..7750206208 100644
--- a/Tools/autotest/default_params/copter-heli.parm
+++ b/Tools/autotest/default_params/copter-heli.parm
@@ -85,7 +85,7 @@ RC7_TRIM        1500.000000
 RC8_MAX         2000.000000
 RC8_MIN         1000.000000
 RC8_TRIM        1500.000000
-RPM_TYPE 10
+RPM1_TYPE 10
 WP_YAW_BEHAVIOR 2
 IM_ACRO_COL_EXP 0.2
 PSC_VELXY_D 0.5
diff --git a/Tools/autotest/default_params/sailboat-motor.parm b/Tools/autotest/default_params/sailboat-motor.parm
index 628397caa2..e87a9bacba 100644
--- a/Tools/autotest/default_params/sailboat-motor.parm
+++ b/Tools/autotest/default_params/sailboat-motor.parm
@@ -3,8 +3,8 @@ FRAME_CLASS 2
 LOIT_TYPE 1
 MOT_SLEWRATE 0
 RC7_OPTION 74
-RPM_MIN 0
-RPM_TYPE 3
+RPM1_MIN 0
+RPM1_TYPE 3
 SAIL_ENABLE 1
 SERVO4_FUNCTION 89
 SERVO4_MIN 1000
diff --git a/Tools/autotest/default_params/sailboat.parm b/Tools/autotest/default_params/sailboat.parm
index 31a44c7481..be01673f04 100644
--- a/Tools/autotest/default_params/sailboat.parm
+++ b/Tools/autotest/default_params/sailboat.parm
@@ -2,8 +2,8 @@ ARSPD_OFFSET 2013
 FRAME_CLASS 2
 LOIT_TYPE 1
 MOT_SLEWRATE 0
-RPM_MIN 0
-RPM_TYPE 3
+RPM1_MIN 0
+RPM1_TYPE 3
 SAIL_ENABLE 1
 SERVO4_FUNCTION 89
 SERVO4_MIN 1000
diff --git a/Tools/autotest/default_params/vee-gull 005.param b/Tools/autotest/default_params/vee-gull 005.param
index 5208696c0d..254fa3c63e 100644
--- a/Tools/autotest/default_params/vee-gull 005.param	
+++ b/Tools/autotest/default_params/vee-gull 005.param	
@@ -526,13 +526,6 @@ RNGFND2_SCALING,3
 RNGFND2_SETTLE,0
 RNGFND2_STOP_PIN,-1
 RNGFND2_TYPE,0
-RPM_MAX,100000
-RPM_MIN,10
-RPM_MIN_QUAL,0.5
-RPM_SCALING,1
-RPM_TYPE,0
-RPM2_SCALING,1
-RPM2_TYPE,0
 RSSI_ANA_PIN,0
 RSSI_CHAN_HIGH,2000
 RSSI_CHAN_LOW,1000