diff --git a/Tools/PrintVersion.py b/Tools/PrintVersion.py
index 0b7dd84066..982c3a5b82 100644
--- a/Tools/PrintVersion.py
+++ b/Tools/PrintVersion.py
@@ -10,14 +10,14 @@ import sys
 
 from optparse import OptionParser
 
-parser = OptionParser("print_version.py [options] ArduCopter|ArduPlane|APMrover2|AntennaTracker")
+parser = OptionParser("print_version.py [options] ArduCopter|ArduPlane|Rover|AntennaTracker")
 
 (opts, args) = parser.parse_args()
 
 includefiles = {
     "ArduCopter": "version.h",
     "ArduPlane": "version.h",
-    "APMrover2": "version.h",
+    "Rover": "version.h",
     "AntennaTracker": "version.h",
     "ArduSub": "version.h",
 }
@@ -29,7 +29,7 @@ if len(args) > 0:
         sys.exit(1)
     includefilepath = "%s/%s" % (vehicle, includefiles[vehicle])
 else:
-    # assume we are in e.g. APM/APMrover2/
+    # assume we are in e.g. APM/Rover/
     vehicle = os.path.basename(os.getcwd())
     if vehicle not in includefiles:
         print("Unknown vehicle (%s) (be in a vehicle directory or supply a vehicle type as an argument)" % (vehicle,))
diff --git a/Tools/autotest/apmrover2.py b/Tools/autotest/apmrover2.py
index 14fca499e2..f81dc863f3 100644
--- a/Tools/autotest/apmrover2.py
+++ b/Tools/autotest/apmrover2.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-# Drive APMrover2 in SITL
+# Drive Rover in SITL
 from __future__ import print_function
 
 import copy
@@ -51,7 +51,7 @@ class AutoTestRover(AutoTest):
         return ["ACRO", "HOLD", "MANUAL"]
 
     def log_name(self):
-        return "APMrover2"
+        return "Rover"
 
     def test_filepath(self):
          return os.path.realpath(__file__)
@@ -5127,7 +5127,7 @@ Brakes have negligible effect (with=%0.2fm without=%0.2fm delta=%0.2fm)
 
             ("DownLoadLogs", "Download logs", lambda:
              self.log_download(
-                 self.buildlogs_path("APMrover2-log.bin"),
+                 self.buildlogs_path("Rover-log.bin"),
                  upload_logs=len(self.fail_list) > 0)),
             ])
         return ret
diff --git a/Tools/autotest/autotest.py b/Tools/autotest/autotest.py
index 8aa1c2c83d..1f26339167 100755
--- a/Tools/autotest/autotest.py
+++ b/Tools/autotest/autotest.py
@@ -167,7 +167,7 @@ def param_parse_filepath():
 def all_vehicles():
     return ('ArduPlane',
             'ArduCopter',
-            'APMrover2',
+            'Rover',
             'AntennaTracker',
             'ArduSub')
 
@@ -542,7 +542,7 @@ def write_fullresults():
     results.addglob('APM:Libraries documentation', 'docs/libraries/index.html')
     results.addglob('APM:Plane documentation', 'docs/ArduPlane/index.html')
     results.addglob('APM:Copter documentation', 'docs/ArduCopter/index.html')
-    results.addglob('APM:Rover documentation', 'docs/APMrover2/index.html')
+    results.addglob('APM:Rover documentation', 'docs/Rover/index.html')
     results.addglob('APM:Sub documentation', 'docs/ArduSub/index.html')
     results.addglobimage("Flight Track", '*.png')
 
diff --git a/Tools/autotest/balancebot.py b/Tools/autotest/balancebot.py
index 37d8eea01f..ca7d0902fe 100644
--- a/Tools/autotest/balancebot.py
+++ b/Tools/autotest/balancebot.py
@@ -19,7 +19,7 @@ def log_name(self):
 class AutoTestBalanceBot(AutoTestRover):
 
     def vehicleinfo_key(self):
-        return "APMrover2"
+        return "Rover"
 
     def init(self):
         if self.frame is None:
@@ -125,7 +125,7 @@ inherit Rover's tests!'''
 
             ("DownLoadLogs", "Download logs", lambda:
              self.log_download(
-                 self.buildlogs_path("APMrover2-log.bin"),
+                 self.buildlogs_path("Rover-log.bin"),
                  upload_logs=len(self.fail_list) > 0)),
         ])
         return ret
diff --git a/Tools/autotest/build-with-disabled-features.py b/Tools/autotest/build-with-disabled-features.py
index ee8372ed45..e8fc506ef6 100755
--- a/Tools/autotest/build-with-disabled-features.py
+++ b/Tools/autotest/build-with-disabled-features.py
@@ -248,7 +248,7 @@ specs = [
         "reverse-deps": {
         },
     }, {
-        "config": 'APMrover2/config.h',
+        "config": 'Rover/config.h',
         "autotest_target": "build.Rover",
         "target_binary": "bin/ardurover",
         "reverse-deps": {
diff --git a/Tools/autotest/common.py b/Tools/autotest/common.py
index 265b785ccc..94f65df6ea 100644
--- a/Tools/autotest/common.py
+++ b/Tools/autotest/common.py
@@ -1068,7 +1068,7 @@ class AutoTest(ABC):
         return ret
 
     def vehicle_code_dirpath(self):
-        '''returns path to vehicle-specific code directory e.g. ~/ardupilot/APMrover2'''
+        '''returns path to vehicle-specific code directory e.g. ~/ardupilot/Rover'''
         dirname = self.log_name()
         if dirname == "QuadPlane":
             dirname = "ArduPlane"
@@ -1299,7 +1299,7 @@ class AutoTest(ABC):
             "ArduPlane": "Plane",
             "QuadPlane": "Plane",
             "Soaring": "Plane",
-            "APMrover2": "Rover",
+            "Rover": "Rover",
             "AntennaTracker": "Tracker",
             "ArduSub": "Sub",
         }
diff --git a/Tools/autotest/param_metadata/param_parse.py b/Tools/autotest/param_metadata/param_parse.py
index cf597ad941..294bd5236a 100755
--- a/Tools/autotest/param_metadata/param_parse.py
+++ b/Tools/autotest/param_metadata/param_parse.py
@@ -83,7 +83,7 @@ def error(str_to_print):
 
 
 truename_map = {
-    "APMrover2": "Rover",
+    "Rover": "Rover",
     "ArduSub": "Sub",
     "ArduCopter": "Copter",
     "ArduPlane": "Plane",
diff --git a/Tools/autotest/pysim/vehicleinfo.py b/Tools/autotest/pysim/vehicleinfo.py
index 742fd161dd..116354f812 100644
--- a/Tools/autotest/pysim/vehicleinfo.py
+++ b/Tools/autotest/pysim/vehicleinfo.py
@@ -248,7 +248,7 @@ class VehicleInfo(object):
             },
         },
     },
-    "APMrover2": {
+    "Rover": {
         "default_frame": "rover",
         "frames": {
             # ROVER
diff --git a/Tools/autotest/sim_vehicle.py b/Tools/autotest/sim_vehicle.py
index edf5c42b86..98af3024d4 100755
--- a/Tools/autotest/sim_vehicle.py
+++ b/Tools/autotest/sim_vehicle.py
@@ -227,7 +227,7 @@ def kill_tasks():
             'ArduPlane.elf',
             'ArduCopter.elf',
             'ArduSub.elf',
-            'APMrover2.elf',
+            'Rover.elf',
             'AntennaTracker.elf',
             'JSBSIm.exe',
             'MAVProxy.exe',
diff --git a/Tools/autotest/win_sitl/RunRover.bat b/Tools/autotest/win_sitl/RunRover.bat
index 85d2b7d74f..3427acdc77 100644
--- a/Tools/autotest/win_sitl/RunRover.bat
+++ b/Tools/autotest/win_sitl/RunRover.bat
@@ -11,4 +11,4 @@ set pth=%pth:\=/%
 set drv=%CD:~0,1%
 set "fullpath=/cygdrive/%drv%%pth%"
 
-%CYGWIN_LOCATION%\bin\bash.exe --login -i -c "cd ""%fullpath%"" && cd ../../../APMrover2 && ../Tools/autotest/sim_vehicle.py"
+%CYGWIN_LOCATION%\bin\bash.exe --login -i -c "cd ""%fullpath%"" && cd ../../../Rover && ../Tools/autotest/sim_vehicle.py"