diff --git a/lib/token.cpp b/lib/token.cpp
index ce30afae8..3e3545f63 100644
--- a/lib/token.cpp
+++ b/lib/token.cpp
@@ -47,7 +47,7 @@ Token::Token(TokensFrontBack *tokensFrontBack) :
     _linenr(0),
     _col(0),
     _progressValue(0),
-    _tokType(eNone),
+    mTokType(eNone),
     mFlags(0),
     _bits(0),
     mAstOperand1(nullptr),
@@ -90,7 +90,7 @@ void Token::update_property_info()
         else if (std::isalpha((unsigned char)_str[0]) || _str[0] == '_' || _str[0] == '$') { // Name
             if (mVarId)
                 tokType(eVariable);
-            else if (_tokType != eVariable && _tokType != eFunction && _tokType != eType && _tokType != eKeyword)
+            else if (mTokType != eVariable && mTokType != eFunction && mTokType != eType && mTokType != eKeyword)
                 tokType(eName);
         } else if (std::isdigit((unsigned char)_str[0]) || (_str.length() > 1 && _str[0] == '-' && std::isdigit((unsigned char)_str[1])))
             tokType(eNumber);
@@ -183,7 +183,7 @@ void Token::concatStr(std::string const& b)
 
 std::string Token::strValue() const
 {
-    assert(_tokType == eString);
+    assert(mTokType == eString);
     std::string ret(_str.substr(1, _str.length() - 2));
     std::string::size_type pos = 0U;
     while ((pos = ret.find('\\', pos)) != std::string::npos) {
@@ -247,7 +247,7 @@ void Token::swapWithNext()
 {
     if (mNext) {
         std::swap(_str, mNext->_str);
-        std::swap(_tokType, mNext->_tokType);
+        std::swap(mTokType, mNext->mTokType);
         std::swap(mFlags, mNext->mFlags);
         std::swap(mVarId, mNext->mVarId);
         std::swap(_fileIndex, mNext->_fileIndex);
@@ -269,7 +269,7 @@ void Token::swapWithNext()
 void Token::takeData(Token *fromToken)
 {
     _str = fromToken->_str;
-    tokType(fromToken->_tokType);
+    tokType(fromToken->mTokType);
     mFlags = fromToken->mFlags;
     mVarId = fromToken->mVarId;
     _fileIndex = fromToken->_fileIndex;
@@ -710,7 +710,7 @@ bool Token::Match(const Token *tok, const char pattern[], unsigned int varid)
 std::size_t Token::getStrLength(const Token *tok)
 {
     assert(tok != nullptr);
-    assert(tok->_tokType == eString);
+    assert(tok->mTokType == eString);
 
     std::size_t len = 0;
     std::string::const_iterator it = tok->str().begin() + 1U;
@@ -1001,7 +1001,7 @@ void Token::stringify(std::ostream& os, bool varid, bool attributes, bool macro)
         if (isComplex())
             os << "_Complex ";
         if (isLong()) {
-            if (_tokType == eString || _tokType == eChar)
+            if (mTokType == eString || mTokType == eChar)
                 os << "L";
             else
                 os << "long ";
@@ -1670,7 +1670,7 @@ void Token::type(const ::Type *t)
     if (t) {
         tokType(eType);
         isEnumType(_type->isEnumType());
-    } else if (_tokType == eType)
+    } else if (mTokType == eType)
         tokType(eName);
 }
 
diff --git a/lib/token.h b/lib/token.h
index 3956c5d0c..46141a79e 100644
--- a/lib/token.h
+++ b/lib/token.h
@@ -246,28 +246,28 @@ public:
     }
 
     Token::Type tokType() const {
-        return _tokType;
+        return mTokType;
     }
     void tokType(Token::Type t) {
-        _tokType = t;
+        mTokType = t;
 
-        const bool memoizedIsName = (_tokType == eName || _tokType == eType || _tokType == eVariable ||
-                                     _tokType == eFunction || _tokType == eKeyword || _tokType == eBoolean ||
-                                     _tokType == eEnumerator); // TODO: "true"/"false" aren't really a name...
+        const bool memoizedIsName = (mTokType == eName || mTokType == eType || mTokType == eVariable ||
+                                     mTokType == eFunction || mTokType == eKeyword || mTokType == eBoolean ||
+                                     mTokType == eEnumerator); // TODO: "true"/"false" aren't really a name...
         setFlag(fIsName, memoizedIsName);
 
-        const bool memoizedIsLiteral = (_tokType == eNumber || _tokType == eString || _tokType == eChar ||
-                                        _tokType == eBoolean || _tokType == eLiteral || _tokType == eEnumerator);
+        const bool memoizedIsLiteral = (mTokType == eNumber || mTokType == eString || mTokType == eChar ||
+                                        mTokType == eBoolean || mTokType == eLiteral || mTokType == eEnumerator);
         setFlag(fIsLiteral, memoizedIsLiteral);
     }
     void isKeyword(const bool kwd) {
         if (kwd)
             tokType(eKeyword);
-        else if (_tokType == eKeyword)
+        else if (mTokType == eKeyword)
             tokType(eName);
     }
     bool isKeyword() const {
-        return _tokType == eKeyword;
+        return mTokType == eKeyword;
     }
     bool isName() const {
         return getFlag(fIsName);
@@ -277,37 +277,37 @@ public:
         return getFlag(fIsLiteral);
     }
     bool isNumber() const {
-        return _tokType == eNumber;
+        return mTokType == eNumber;
     }
     bool isEnumerator() const {
-        return _tokType == eEnumerator;
+        return mTokType == eEnumerator;
     }
     bool isOp() const {
         return (isConstOp() ||
                 isAssignmentOp() ||
-                _tokType == eIncDecOp);
+                mTokType == eIncDecOp);
     }
     bool isConstOp() const {
         return (isArithmeticalOp() ||
-                _tokType == eLogicalOp ||
-                _tokType == eComparisonOp ||
-                _tokType == eBitOp);
+                mTokType == eLogicalOp ||
+                mTokType == eComparisonOp ||
+                mTokType == eBitOp);
     }
     bool isExtendedOp() const {
         return isConstOp() ||
-               _tokType == eExtendedOp;
+               mTokType == eExtendedOp;
     }
     bool isArithmeticalOp() const {
-        return _tokType == eArithmeticalOp;
+        return mTokType == eArithmeticalOp;
     }
     bool isComparisonOp() const {
-        return _tokType == eComparisonOp;
+        return mTokType == eComparisonOp;
     }
     bool isAssignmentOp() const {
-        return _tokType == eAssignmentOp;
+        return mTokType == eAssignmentOp;
     }
     bool isBoolean() const {
-        return _tokType == eBoolean;
+        return mTokType == eBoolean;
     }
     bool isUnaryPreOp() const;
 
@@ -679,7 +679,7 @@ public:
         _function = f;
         if (f)
             tokType(eFunction);
-        else if (_tokType == eFunction)
+        else if (mTokType == eFunction)
             tokType(eName);
     }
 
@@ -687,7 +687,7 @@ public:
      * @return a pointer to the Function associated with this token.
      */
     const Function *function() const {
-        return _tokType == eFunction ? _function : nullptr;
+        return mTokType == eFunction ? _function : nullptr;
     }
 
     /**
@@ -698,7 +698,7 @@ public:
         _variable = v;
         if (v || mVarId)
             tokType(eVariable);
-        else if (_tokType == eVariable)
+        else if (mTokType == eVariable)
             tokType(eName);
     }
 
@@ -706,7 +706,7 @@ public:
      * @return a pointer to the variable associated with this token.
      */
     const Variable *variable() const {
-        return _tokType == eVariable ? _variable : nullptr;
+        return mTokType == eVariable ? _variable : nullptr;
     }
 
     /**
@@ -719,14 +719,14 @@ public:
     * @return a pointer to the type associated with this token.
     */
     const ::Type *type() const {
-        return _tokType == eType ? _type : nullptr;
+        return mTokType == eType ? _type : nullptr;
     }
 
     /**
     * @return a pointer to the Enumerator associated with this token.
     */
     const Enumerator *enumerator() const {
-        return _tokType == eEnumerator ? _enumerator : nullptr;
+        return mTokType == eEnumerator ? _enumerator : nullptr;
     }
 
     /**
@@ -737,7 +737,7 @@ public:
         _enumerator = e;
         if (e)
             tokType(eEnumerator);
-        else if (_tokType == eEnumerator)
+        else if (mTokType == eEnumerator)
             tokType(eName);
     }
 
@@ -929,7 +929,7 @@ private:
      */
     unsigned int _progressValue;
 
-    Token::Type _tokType;
+    Token::Type mTokType;
 
     enum {
         fIsUnsigned             = (1 << 0),