diff --git a/Tools/autotest/logger_metadata/parse.py b/Tools/autotest/logger_metadata/parse.py
index 7d8adcc090..7ea418e861 100755
--- a/Tools/autotest/logger_metadata/parse.py
+++ b/Tools/autotest/logger_metadata/parse.py
@@ -31,7 +31,7 @@ re_vehicles = re.compile(r"\s*//\s*@Vehicles\s*:\s*(.*)")
 class LoggerDocco(object):
 
     vehicle_map = {
-        "Rover": "APMrover2",
+        "Rover": "Rover",
         "Sub": "ArduSub",
         "Copter": "ArduCopter",
         "Plane": "ArduPlane",
diff --git a/Tools/scripts/build_appveyor.sh b/Tools/scripts/build_appveyor.sh
index 72c582e35a..23de342765 100755
--- a/Tools/scripts/build_appveyor.sh
+++ b/Tools/scripts/build_appveyor.sh
@@ -21,7 +21,7 @@ cd /cygdrive/c/work
     /usr/bin/python waf -j4 copter plane rover heli sub
 
     # map to the names that MissionPlanner expects
-    cp /cygdrive/c/work/build/sitl/bin/ardurover.exe /cygdrive/c/work/sitl/APMrover2.elf
+    cp /cygdrive/c/work/build/sitl/bin/ardurover.exe /cygdrive/c/work/sitl/Rover.elf
     cp /cygdrive/c/work/build/sitl/bin/arduplane.exe /cygdrive/c/work/sitl/ArduPlane.elf
     cp /cygdrive/c/work/build/sitl/bin/arducopter.exe /cygdrive/c/work/sitl/ArduCopter.elf
     cp /cygdrive/c/work/build/sitl/bin/arducopter-heli.exe /cygdrive/c/work/sitl/ArduHeli.elf
diff --git a/Tools/scripts/build_binaries.py b/Tools/scripts/build_binaries.py
index 4127f7aefa..8c12e8aa4d 100755
--- a/Tools/scripts/build_binaries.py
+++ b/Tools/scripts/build_binaries.py
@@ -654,11 +654,11 @@ is bob we will attempt to checkout bob-AVR'''
         '''build Rover binaries'''
         boards = self.common_boards()
         self.build_vehicle(tag,
-                           "APMrover2",
+                           "Rover",
                            boards,
                            "Rover",
                            "ardurover",
-                           "APMrover2")
+                           "Rover")
 
     def build_ardusub(self, tag):
         '''build Sub binaries'''
diff --git a/Tools/scripts/build_ci.sh b/Tools/scripts/build_ci.sh
index 4986c977eb..767e9750ac 100755
--- a/Tools/scripts/build_ci.sh
+++ b/Tools/scripts/build_ci.sh
@@ -203,7 +203,7 @@ for t in $CI_BUILD_TARGET; do
     fi
 done
 
-python Tools/autotest/param_metadata/param_parse.py --vehicle APMrover2
+python Tools/autotest/param_metadata/param_parse.py --vehicle Rover
 python Tools/autotest/param_metadata/param_parse.py --vehicle AntennaTracker
 python Tools/autotest/param_metadata/param_parse.py --vehicle ArduCopter
 python Tools/autotest/param_metadata/param_parse.py --vehicle ArduPlane
diff --git a/Tools/scripts/build_parameters.sh b/Tools/scripts/build_parameters.sh
index 2e5663aa3e..3974e0936e 100755
--- a/Tools/scripts/build_parameters.sh
+++ b/Tools/scripts/build_parameters.sh
@@ -30,7 +30,7 @@ generate_parameters ArduPlane
 
 generate_parameters ArduCopter
 
-generate_parameters APMrover2
+generate_parameters Rover
 
 generate_parameters ArduSub