diff --git a/Tools/autotest/ArduPlane_Tests/Terrain/ap-terrain.txt b/Tools/autotest/ArduPlane_Tests/TerrainMission/ap-terrain.txt
similarity index 100%
rename from Tools/autotest/ArduPlane_Tests/Terrain/ap-terrain.txt
rename to Tools/autotest/ArduPlane_Tests/TerrainMission/ap-terrain.txt
diff --git a/Tools/autotest/arduplane.py b/Tools/autotest/arduplane.py
index 0a3e88549c..fc064aa10e 100644
--- a/Tools/autotest/arduplane.py
+++ b/Tools/autotest/arduplane.py
@@ -2388,7 +2388,7 @@ function'''
             self.context_pop()
         self.reboot_sitl()
 
-    def fly_terrain_mission(self):
+    def TerrainMission(self):
 
         self.wait_ready_to_arm()
         self.arm_vehicle()
@@ -3603,9 +3603,9 @@ function'''
              "Test Soaring feature",
              self.fly_soaring),
 
-            ("Terrain",
+            ("TerrainMission",
              "Test terrain following in mission",
-             self.fly_terrain_mission),
+             self.TerrainMission),
 
             ("Terrain-loiter",
              "Test terrain following in loiter",