diff --git a/Tools/autotest/apmrover2.py b/Tools/autotest/apmrover2.py
index f6b5d9e306..d0d4b6c9b9 100644
--- a/Tools/autotest/apmrover2.py
+++ b/Tools/autotest/apmrover2.py
@@ -101,7 +101,7 @@ def drive_APMrover2(binary, viewerip=None, map=False, valgrind=False, gdb=False)
     mavproxy.expect('Received [0-9]+ parameters')
 
     # setup test parameters
-    mavproxy.send("param load %s/default_params/Rover.parm\n" % testdir)
+    mavproxy.send("param load %s/default_params/rover.parm\n" % testdir)
     mavproxy.expect('Loaded [0-9]+ parameters')
     mavproxy.send("param set LOG_REPLAY 1\n")
     mavproxy.send("param set LOG_DISARMED 1\n")
diff --git a/Tools/autotest/arducopter.py b/Tools/autotest/arducopter.py
index 725f58315f..dffe1642db 100644
--- a/Tools/autotest/arducopter.py
+++ b/Tools/autotest/arducopter.py
@@ -937,7 +937,7 @@ def fly_ArduCopter(binary, viewerip=None, use_map=False, valgrind=False, gdb=Fal
     mavproxy.expect('Received [0-9]+ parameters')
 
     # setup test parameters
-    mavproxy.send("param load %s/default_params/copter_params.parm\n" % testdir)
+    mavproxy.send("param load %s/default_params/copter.parm\n" % testdir)
     mavproxy.expect('Loaded [0-9]+ parameters')
     mavproxy.send("param set LOG_REPLAY 1\n")
     mavproxy.send("param set LOG_DISARMED 1\n")
@@ -1285,7 +1285,7 @@ def fly_CopterAVC(binary, viewerip=None, map=False, valgrind=False, gdb=False):
     mavproxy.expect('Received [0-9]+ parameters')
 
     # setup test parameters
-    mavproxy.send("param load %s/default_params/Helicopter.parm\n" % testdir)
+    mavproxy.send("param load %s/default_params/copter-heli.parm\n" % testdir)
     mavproxy.expect('Loaded [0-9]+ parameters')
     mavproxy.send("param set LOG_REPLAY 1\n")
     mavproxy.send("param set LOG_DISARMED 1\n")
diff --git a/Tools/autotest/arduplane.py b/Tools/autotest/arduplane.py
index 1075ddbe0e..069fa27bcf 100644
--- a/Tools/autotest/arduplane.py
+++ b/Tools/autotest/arduplane.py
@@ -442,7 +442,7 @@ def fly_ArduPlane(binary, viewerip=None, map=False, valgrind=False, gdb=False):
 
     sil = util.start_SIL(binary, model='plane-elevrev', home=HOME_LOCATION, speedup=10,
                          valgrind=valgrind, gdb=gdb,
-                         defaults_file=os.path.join(testdir, 'default_params/ArduPlane.parm'))
+                         defaults_file=os.path.join(testdir, 'default_params/plane-jsbsim.parm'))
     mavproxy = util.start_MAVProxy_SIL('ArduPlane', options=options)
     mavproxy.expect('Telemetry log: (\S+)')
     logfile = mavproxy.match.group(1)
diff --git a/Tools/autotest/default_params/copter_AVC2013_params.parm b/Tools/autotest/default_params/copter-AVC2013.parm
similarity index 100%
rename from Tools/autotest/default_params/copter_AVC2013_params.parm
rename to Tools/autotest/default_params/copter-AVC2013.parm
diff --git a/Tools/autotest/default_params/CoaxCopter.parm b/Tools/autotest/default_params/copter-coax.parm
similarity index 100%
rename from Tools/autotest/default_params/CoaxCopter.parm
rename to Tools/autotest/default_params/copter-coax.parm
diff --git a/Tools/autotest/default_params/Helicopter.parm b/Tools/autotest/default_params/copter-heli.parm
similarity index 100%
rename from Tools/autotest/default_params/Helicopter.parm
rename to Tools/autotest/default_params/copter-heli.parm
diff --git a/Tools/autotest/default_params/copter_optflow.parm b/Tools/autotest/default_params/copter-optflow.parm
similarity index 100%
rename from Tools/autotest/default_params/copter_optflow.parm
rename to Tools/autotest/default_params/copter-optflow.parm
diff --git a/Tools/autotest/default_params/copter_rangefinder.parm b/Tools/autotest/default_params/copter-rangefinder.parm
similarity index 100%
rename from Tools/autotest/default_params/copter_rangefinder.parm
rename to Tools/autotest/default_params/copter-rangefinder.parm
diff --git a/Tools/autotest/default_params/SingleCopter.parm b/Tools/autotest/default_params/copter-single.parm
similarity index 100%
rename from Tools/autotest/default_params/SingleCopter.parm
rename to Tools/autotest/default_params/copter-single.parm
diff --git a/Tools/autotest/default_params/tri_params.parm b/Tools/autotest/default_params/copter-tri.parm
similarity index 100%
rename from Tools/autotest/default_params/tri_params.parm
rename to Tools/autotest/default_params/copter-tri.parm
diff --git a/Tools/autotest/default_params/y6_params.parm b/Tools/autotest/default_params/copter-y6.parm
similarity index 100%
rename from Tools/autotest/default_params/y6_params.parm
rename to Tools/autotest/default_params/copter-y6.parm
diff --git a/Tools/autotest/default_params/copter_params.parm b/Tools/autotest/default_params/copter.parm
similarity index 100%
rename from Tools/autotest/default_params/copter_params.parm
rename to Tools/autotest/default_params/copter.parm
diff --git a/Tools/autotest/default_params/ArduPlane.parm b/Tools/autotest/default_params/plane-jsbsim.parm
similarity index 100%
rename from Tools/autotest/default_params/ArduPlane.parm
rename to Tools/autotest/default_params/plane-jsbsim.parm
diff --git a/Tools/autotest/default_params/Rover-skid.parm b/Tools/autotest/default_params/rover-skid.parm
similarity index 100%
rename from Tools/autotest/default_params/Rover-skid.parm
rename to Tools/autotest/default_params/rover-skid.parm
diff --git a/Tools/autotest/default_params/Rover.parm b/Tools/autotest/default_params/rover.parm
similarity index 100%
rename from Tools/autotest/default_params/Rover.parm
rename to Tools/autotest/default_params/rover.parm
diff --git a/Tools/autotest/sim_vehicle.py b/Tools/autotest/sim_vehicle.py
index e86f09cfd0..bde977c1bd 100755
--- a/Tools/autotest/sim_vehicle.py
+++ b/Tools/autotest/sim_vehicle.py
@@ -344,44 +344,44 @@ _options_for_frame = {
     # COPTER
     "+": {
         "waf_target": "bin/arducopter-quad",
-        "default_params_filename": "default_params/copter_params.parm",
+        "default_params_filename": "default_params/copter.parm",
     },
     "quad": {
         "model": "+",
         "waf_target": "bin/arducopter-quad",
-        "default_params_filename": "default_params/copter_params.parm",
+        "default_params_filename": "default_params/copter.parm",
     },
     "X": {
         "waf_target": "bin/arducopter-quad",
         # this param set FRAME doesn't actually work because mavproxy
         # won't set a parameter unless it knows of it, and the param fetch happens asynchronously
-        "default_params_filename": "default_params/copter_params.parm",
+        "default_params_filename": "default_params/copter.parm",
         "extra_mavlink_cmds": "param fetch frame; param set FRAME 1;",
     },
     "hexa": {
         "make_target": "sitl-hexa",
         "waf_target": "bin/arducopter-hexa",
-        "default_params_filename": "default_params/copter_params.parm",
+        "default_params_filename": "default_params/copter.parm",
     },
     "octa": {
         "make_target": "sitl-octa",
         "waf_target": "bin/arducopter-octa",
-        "default_params_filename": "default_params/copter_params.parm",
+        "default_params_filename": "default_params/copter.parm",
     },
     "tri": {
         "make_target": "sitl-tri",
         "waf_target": "bin/arducopter-tri",
-        "default_params_filename": "default_params/tri_params.parm",
+        "default_params_filename": "default_params/copter-tri.parm",
     },
     "y6": {
         "make_target": "sitl-y6",
         "waf_target": "bin/arducopter-y6",
-        "default_params_filename": "default_params/y6_params.parm",
+        "default_params_filename": "default_params/copter-y6.parm",
     },
     # COPTER TYPES
     "IrisRos": {
         "waf_target": "bin/arducopter-quad",
-        "default_params_filename": "default_params/copter_params.parm",
+        "default_params_filename": "default_params/copter.parm",
     },
     "firefly": {
         "waf_target": "bin/arducopter-firefly",
@@ -391,7 +391,7 @@ _options_for_frame = {
     "heli": {
         "make_target": "sitl-heli",
         "waf_target": "bin/arducopter-heli",
-        "default_params_filename": "default_params/Helicopter.parm",
+        "default_params_filename": "default_params/copter-heli.parm",
     },
     "heli-dual": {
         "make_target": "sitl-heli-dual",
@@ -404,12 +404,12 @@ _options_for_frame = {
     "singlecopter": {
         "make_target": "sitl-single",
         "waf_target": "bin/arducopter-single",
-        "default_params_filename": "default_params/SingleCopter.parm",
+        "default_params_filename": "default_params/copter-single.parm",
     },
     "coaxcopter": {
         "make_target": "sitl-coax",
         "waf_target": "bin/arducopter-coax",
-        "default_params_filename": "default_params/CoaxCopter.parm",
+        "default_params_filename": "default_params/copter-coax.parm",
     },
     # PLANE
     "quadplane-tilttri": {
@@ -441,16 +441,16 @@ _options_for_frame = {
     # ROVER
     "rover": {
         "waf_target": "bin/ardurover",
-        "default_params_filename": "default_params/Rover.parm",
+        "default_params_filename": "default_params/rover.parm",
     },
     "rover-skid": {
         "waf_target": "bin/ardurover",
-        "default_params_filename": "default_params/Rover-skid.parm",
+        "default_params_filename": "default_params/rover-skid.parm",
     },
     # SIM
     "Gazebo": {
         "waf_target": "bin/arducopter-quad",
-        "default_params_filename": "default_params/copter_params.parm",
+        "default_params_filename": "default_params/copter.parm",
     },
     "last_letter": {
         "waf_target": "bin/arduplane",
@@ -460,7 +460,7 @@ _options_for_frame = {
     },
     "jsbsim": {
         "waf_target": "bin/arduplane",
-        "default_params_filename": "default_params/ArduPlane.parm",
+        "default_params_filename": "default_params/plane-jsbsim.parm",
     },
 }
 
diff --git a/Tools/autotest/sim_vehicle.sh b/Tools/autotest/sim_vehicle.sh
index 0fafcbcd8e..f1d68b2b9a 100755
--- a/Tools/autotest/sim_vehicle.sh
+++ b/Tools/autotest/sim_vehicle.sh
@@ -250,28 +250,28 @@ case $FRAME in
     +|quad|quad-*)
 	BUILD_TARGET="sitl"
         MODEL="$FRAME"
-        DEFAULTS_PATH="$autotest/default_params/copter_params.parm"
+        DEFAULTS_PATH="$autotest/default_params/copter.parm"
 	;;
     X*)
 	BUILD_TARGET="sitl"
         EXTRA_PARM="param set FRAME 1;"
         MODEL="$FRAME"
-        DEFAULTS_PATH="$autotest/default_params/copter_params.parm"
+        DEFAULTS_PATH="$autotest/default_params/copter.parm"
 	;;
     octa*)
 	BUILD_TARGET="sitl-octa"
         MODEL="$FRAME"
-        DEFAULTS_PATH="$autotest/default_params/copter_params.parm"
+        DEFAULTS_PATH="$autotest/default_params/copter.parm"
 	;;
     tri*)
 	BUILD_TARGET="sitl-tri"
         MODEL="$FRAME"
-        DEFAULTS_PATH="$autotest/default_params/tri_params.parm"
+        DEFAULTS_PATH="$autotest/default_params/copter-tri.parm"
 	;;
     y6*)
 	BUILD_TARGET="sitl-y6"
         MODEL="$FRAME"
-        DEFAULTS_PATH="$autotest/default_params/y6_params.parm"
+        DEFAULTS_PATH="$autotest/default_params/copter-y6.parm"
 	;;
     firefly*)
 	BUILD_TARGET="sitl"
@@ -289,26 +289,26 @@ case $FRAME in
     heli*)
 	BUILD_TARGET="sitl-heli"
         MODEL="$FRAME"
-        DEFAULTS_PATH="$autotest/default_params/Helicopter.parm"
+        DEFAULTS_PATH="$autotest/default_params/copter-heli.parm"
 	;;
     singlecopter*)
 	BUILD_TARGET="sitl-single"
         MODEL="$FRAME"
-        DEFAULTS_PATH="$autotest/default_params/SingleCopter.parm"
+        DEFAULTS_PATH="$autotest/default_params/copter-single.parm"
 	;;
     coaxcopter*)
 	BUILD_TARGET="sitl-coax"
         MODEL="$FRAME"
-        DEFAULTS_PATH="$autotest/default_params/CoaxCopter.parm"
+        DEFAULTS_PATH="$autotest/default_params/copter-coax.parm"
 	;;
     IrisRos)
 	BUILD_TARGET="sitl"
-        DEFAULTS_PATH="$autotest/default_params/copter_params.parm"
+        DEFAULTS_PATH="$autotest/default_params/copter.parm"
 	;;
     Gazebo)
 	BUILD_TARGET="sitl"
         MODEL="$FRAME"
-        DEFAULTS_PATH="$autotest/default_params/copter_params.parm"
+        DEFAULTS_PATH="$autotest/default_params/copter.parm"
 	;;
     CRRCSim|last_letter*)
 	BUILD_TARGET="sitl"
@@ -318,7 +318,7 @@ case $FRAME in
 	BUILD_TARGET="sitl"
         MODEL="$FRAME"
         check_jsbsim_version
-        DEFAULTS_PATH="$autotest/default_params/ArduPlane.parm"
+        DEFAULTS_PATH="$autotest/default_params/plane-jsbsim.parm"
 	;;
     quadplane-tilttri*)
 	BUILD_TARGET="sitl-tri"
@@ -348,7 +348,7 @@ case $FRAME in
     rover-skid)
 	BUILD_TARGET="sitl"
         MODEL="$FRAME"
-        DEFAULTS_PATH="$autotest/default_params/Rover-skid.parm"
+        DEFAULTS_PATH="$autotest/default_params/rover-skid.parm"
 	;;
     flightaxis*)
         MODEL="$FRAME"
@@ -361,7 +361,7 @@ case $FRAME in
     *-heli)
 	BUILD_TARGET="sitl-heli"
         MODEL="$FRAME"
-        DEFAULTS_PATH="$autotest/default_params/Helicopter.parm"
+        DEFAULTS_PATH="$autotest/default_params/copter-heli.parm"
 	;;
     *)
         MODEL="$FRAME"