diff --git a/src/audio/QGCAudioWorker.cpp b/src/audio/QGCAudioWorker.cpp
index 4425a7908725de69f00159264cb6106cbe5405d3..4fa827cd51c05cb537b7b6906da20c63770e9e77 100644
--- a/src/audio/QGCAudioWorker.cpp
+++ b/src/audio/QGCAudioWorker.cpp
@@ -191,14 +191,28 @@ QString QGCAudioWorker::_fixTextMessageForAudio(const QString& string) {
     QString match;
     QString newNumber;
     QString result = string;
-    //-- Look for modes
+    //-- Look for codified terms
+    if(result.contains("ERR ", Qt::CaseInsensitive)) {
+        result.replace("ERR ", "error ", Qt::CaseInsensitive);
+    }
+    if(result.contains("ERR:", Qt::CaseInsensitive)) {
+        result.replace("ERR:", "error.", Qt::CaseInsensitive);
+    }
     if(result.contains("POSCTL", Qt::CaseInsensitive)) {
         result.replace("POSCTL", "Position Control", Qt::CaseInsensitive);
-    } else if(result.contains("ALTCTL", Qt::CaseInsensitive)) {
+    }
+    if(result.contains("ALTCTL", Qt::CaseInsensitive)) {
         result.replace("ALTCTL", "Altitude Control", Qt::CaseInsensitive);
-    } else if(result.contains("RTL", Qt::CaseInsensitive)) {
+    }
+    if(result.contains("RTL", Qt::CaseInsensitive)) {
         result.replace("RTL", "Return To Land", Qt::CaseInsensitive);
     }
+    if(result.contains("ACCEL ", Qt::CaseInsensitive)) {
+        result.replace("ACCEL ", "accelerometer ", Qt::CaseInsensitive);
+    }
+    if(result.contains("RC_MAP_MODE_SW", Qt::CaseInsensitive)) {
+        result.replace("RC_MAP_MODE_SW", "RC mode switch", Qt::CaseInsensitive);
+    }
     int number;
     if(_getMillisecondString(string, match, number) && number > 1000) {
         if(number < 60000) {