diff --git a/Tools/autotest/apmrover2.py b/Tools/autotest/apmrover2.py
index b33003e0e8..0262d07adb 100644
--- a/Tools/autotest/apmrover2.py
+++ b/Tools/autotest/apmrover2.py
@@ -107,7 +107,7 @@ def drive_APMrover2(viewerip=None):
     logfile = mavproxy.match.group(1)
     print("LOGFILE %s" % logfile)
 
-    buildlog = util.reltopdir("../buildlogs/APMrover2-test.mavlog")
+    buildlog = util.reltopdir("../buildlogs/APMrover2-test.tlog")
     print("buildlog=%s" % buildlog)
     if os.path.exists(buildlog):
         os.unlink(buildlog)
diff --git a/Tools/autotest/arducopter.py b/Tools/autotest/arducopter.py
index 6ce623cd8b..04157ae49d 100644
--- a/Tools/autotest/arducopter.py
+++ b/Tools/autotest/arducopter.py
@@ -382,7 +382,7 @@ def fly_ArduCopter(viewerip=None):
     logfile = mavproxy.match.group(1)
     print("LOGFILE %s" % logfile)
 
-    buildlog = util.reltopdir("../buildlogs/ArduCopter-test.mavlog")
+    buildlog = util.reltopdir("../buildlogs/ArduCopter-test.tlog")
     print("buildlog=%s" % buildlog)
     if os.path.exists(buildlog):
         os.unlink(buildlog)
diff --git a/Tools/autotest/arduplane.py b/Tools/autotest/arduplane.py
index b91dec6de5..1f3ea6ecac 100644
--- a/Tools/autotest/arduplane.py
+++ b/Tools/autotest/arduplane.py
@@ -257,7 +257,7 @@ def fly_ArduPlane(viewerip=None):
     logfile = mavproxy.match.group(1)
     print("LOGFILE %s" % logfile)
 
-    buildlog = util.reltopdir("../buildlogs/ArduPlane-test.mavlog")
+    buildlog = util.reltopdir("../buildlogs/ArduPlane-test.tlog")
     print("buildlog=%s" % buildlog)
     if os.path.exists(buildlog):
         os.unlink(buildlog)
diff --git a/Tools/autotest/autotest.py b/Tools/autotest/autotest.py
index 1e9ed3bb7e..1a75374508 100755
--- a/Tools/autotest/autotest.py
+++ b/Tools/autotest/autotest.py
@@ -101,9 +101,9 @@ def build_examples():
 
 
 def convert_gpx():
-    '''convert any mavlog files to GPX and KML'''
+    '''convert any tlog files to GPX and KML'''
     import glob
-    mavlog = glob.glob(util.reltopdir("../buildlogs/*.mavlog"))
+    mavlog = glob.glob(util.reltopdir("../buildlogs/*.tlog"))
     for m in mavlog:
         util.run_cmd(util.reltopdir("../mavlink/pymavlink/examples/mavtogpx.py") + " --nofixcheck " + m)
         gpx = m + '.gpx'
@@ -129,7 +129,7 @@ def alarm_handler(signum, frame):
         results.addglob("Google Earth track", '*.kmz')
         results.addfile('Full Logs', 'autotest-output.txt')
         results.addglob('DataFlash Log', '*.flashlog')
-        results.addglob("MAVLink log", '*.mavlog')
+        results.addglob("MAVLink log", '*.tlog')
         results.addfile('ArduPlane build log', 'ArduPlane.txt')
         results.addfile('ArduPlane defaults', 'ArduPlane.defaults.txt')
         results.addfile('ArduCopter build log', 'ArduCopter.txt')
@@ -364,7 +364,7 @@ def run_tests(steps):
     results.addglob("Google Earth track", '*.kmz')
     results.addfile('Full Logs', 'autotest-output.txt')
     results.addglob('DataFlash Log', '*.flashlog')
-    results.addglob("MAVLink log", '*.mavlog')
+    results.addglob("MAVLink log", '*.tlog')
     results.addglob("GPX track", '*.gpx')
     results.addfile('ArduPlane build log', 'ArduPlane.txt')
     results.addfile('ArduPlane code size', 'ArduPlane.sizes.txt')
diff --git a/Tools/autotest/autotest_jenkins.py b/Tools/autotest/autotest_jenkins.py
index 4f085ccec6..cf75f9c0ba 100755
--- a/Tools/autotest/autotest_jenkins.py
+++ b/Tools/autotest/autotest_jenkins.py
@@ -86,9 +86,9 @@ def dump_logs(atype):
     return True
 
 def convert_gpx():
-    '''convert any mavlog files to GPX and KML'''
+    '''convert any tlog files to GPX and KML'''
     import glob
-    mavlog = glob.glob(util.reltopdir("../buildlogs/*.mavlog"))
+    mavlog = glob.glob(util.reltopdir("../buildlogs/*.tlog"))
     for m in mavlog:
         util.run_cmd(util.reltopdir("../mavlink/pymavlink/examples/mavtogpx.py") + " --nofixcheck " + m)
         gpx = m + '.gpx'
@@ -113,7 +113,7 @@ def alarm_handler(signum, frame):
         util.pexpect_close_all()
         results.addfile('Full Logs', 'autotest-output.txt')
         results.addglob('DataFlash Log', '*.flashlog')
-        results.addglob("MAVLink log", '*.mavlog')
+        results.addglob("MAVLink log", '*.tlog')
         results.addfile('ArduPlane build log', 'ArduPlane.txt')
         results.addfile('ArduPlane defaults', 'ArduPlane.defaults.txt')
         results.addfile('ArduCopter build log', 'ArduCopter.txt')
@@ -170,7 +170,7 @@ def fly_ArduCopter_scripted(testname):
     logfile = mavproxy.match.group(1)
     print("LOGFILE %s" % logfile)
 
-    buildlog = util.reltopdir("../buildlogs/ArduCopter-test.mavlog")
+    buildlog = util.reltopdir("../buildlogs/ArduCopter-test.tlog")
     print("buildlog=%s" % buildlog)
     if os.path.exists(buildlog):
         os.unlink(buildlog)
@@ -359,7 +359,7 @@ def run_tests(tests):
     results.addglob("Google Earth track", '*.kmz')
     results.addfile('Full Logs', 'autotest-output.txt')
     results.addglob('DataFlash Log', '*.flashlog')
-    results.addglob("MAVLink log", '*.mavlog')
+    results.addglob("MAVLink log", '*.tlog')
     results.addglob("GPX track", '*.gpx')
     
     unit_test_results.num_tests = len(results.tests)