diff --git a/src/QGCApplication.cc b/src/QGCApplication.cc
index 9a1431a5ab1df0de5b2c7c4f3e111afe584fdbb0..9a55c6643489c052b80b143eb57e2c2a21181fbd 100644
--- a/src/QGCApplication.cc
+++ b/src/QGCApplication.cc
@@ -506,8 +506,8 @@ void QGCApplication::saveTelemetryLogOnMainThread(QString tempLogfile)
         QString saveDirPath = _toolbox->settingsManager()->appSettings()->telemetrySavePath()->rawValue().toString();
         QDir saveDir(saveDirPath);
 
-        QString nameFormat("%1%2.mavlink");
-        QString dtFormat("yyyy-MMM-dd hh-mm-ss");
+        QString nameFormat("%1%2.tlog");
+        QString dtFormat("yyyy-MM-dd hh-mm-ss");
 
         int tryIndex = 1;
         QString saveFileName = nameFormat.arg(QDateTime::currentDateTime().toString(dtFormat)).arg("");
diff --git a/src/comm/LogReplayLink.cc b/src/comm/LogReplayLink.cc
index d6b818467c7fc1823d7fa9aa650260bc1dd42ffa..1fc8e73e16145114d7365c4678b9dc831b3f5153 100644
--- a/src/comm/LogReplayLink.cc
+++ b/src/comm/LogReplayLink.cc
@@ -202,7 +202,7 @@ bool LogReplayLink::_loadLogFile(void)
     logFileInfo.setFile(logFilename);
     _logFileSize = logFileInfo.size();
     
-    _logTimestamped = logFilename.endsWith(".mavlink");
+    _logTimestamped = logFilename.endsWith(".tlog");
     
     if (_logTimestamped) {
         // Get the first timestamp from the log
diff --git a/src/ui/QGCMAVLinkLogPlayer.cc b/src/ui/QGCMAVLinkLogPlayer.cc
index 55f26ec585b6f1823b3af25fdc28fffb94071c9a..e7da4541372ff9ecde3784c0107f6ba4a5f0d4fc 100644
--- a/src/ui/QGCMAVLinkLogPlayer.cc
+++ b/src/ui/QGCMAVLinkLogPlayer.cc
@@ -73,7 +73,7 @@ void QGCMAVLinkLogPlayer::_selectLogFileForPlayback(void)
         this,
         tr("Load MAVLink Log File"),
         QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation),
-        tr("MAVLink Log Files (*.mavlink);;All Files (*)"));
+        tr("MAVLink Log Files (*.tlog);;All Files (*)"));
 
     if (logFilename.isEmpty()) {
         return;