diff --git a/Tools/autotest/README b/Tools/autotest/README
index ba3d36dd04..53f31d8140 100644
--- a/Tools/autotest/README
+++ b/Tools/autotest/README
@@ -1 +1 @@
-This is an automated test suite for APM
+This is an automated test suite for ArduPilot
diff --git a/Tools/autotest/autotest.py b/Tools/autotest/autotest.py
index 676747bfb7..be00a22f94 100755
--- a/Tools/autotest/autotest.py
+++ b/Tools/autotest/autotest.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 """
-APM automatic test suite.
+ArduPilot automatic test suite.
 
 Andrew Tridgell, October 2011
 
diff --git a/Tools/autotest/rover.py b/Tools/autotest/rover.py
index 60b2c41a89..001ee00508 100644
--- a/Tools/autotest/rover.py
+++ b/Tools/autotest/rover.py
@@ -219,7 +219,7 @@ class AutoTestRover(AutoTest):
     #
     #     # reduce throttle
     #     self.mavproxy.send('rc 3 1500\n')
-    #     self.mavproxy.expect('APM: Failsafe ended')
+    #     self.mavproxy.expect('AP: Failsafe ended')
     #     self.mavproxy.send('switch 2\n')  # manual mode
     #     self.wait_heartbeat()
     #     self.wait_mode('MANUAL')