diff --git a/lib/templatesimplifier.cpp b/lib/templatesimplifier.cpp
index ae5d730eb..3dea9340d 100644
--- a/lib/templatesimplifier.cpp
+++ b/lib/templatesimplifier.cpp
@@ -1735,12 +1735,12 @@ void TemplateSimplifier::simplifyTemplates(
     ErrorLogger* errorlogger,
     const Settings *mSettings,
     const std::time_t maxtime,
-    bool &_codeWithTemplates
+    bool &codeWithTemplates
 )
 {
     std::set<std::string> expandedtemplates(TemplateSimplifier::expandSpecialized(tokenlist.front()));
 
-    if (TemplateSimplifier::getTemplateDeclarations(tokenlist.front(), _codeWithTemplates).empty())
+    if (TemplateSimplifier::getTemplateDeclarations(tokenlist.front(), codeWithTemplates).empty())
         return;
 
     // There are templates..
@@ -1757,7 +1757,7 @@ void TemplateSimplifier::simplifyTemplates(
         }
     }
 
-    std::list<TokenAndName> templateDeclarations(TemplateSimplifier::getTemplateDeclarations(tokenlist.front(), _codeWithTemplates));
+    std::list<TokenAndName> templateDeclarations(TemplateSimplifier::getTemplateDeclarations(tokenlist.front(), codeWithTemplates));
 
     // Locate possible instantiations of templates..
     std::list<TokenAndName> templateInstantiations(TemplateSimplifier::getTemplateInstantiations(tokenlist.front(), templateDeclarations));
diff --git a/lib/templatesimplifier.h b/lib/templatesimplifier.h
index 80c474f3b..aa992c23c 100644
--- a/lib/templatesimplifier.h
+++ b/lib/templatesimplifier.h
@@ -204,14 +204,14 @@ public:
      * @param errorlogger error logger
      * @param mSettings settings
      * @param maxtime time when the simplification should be stopped
-     * @param _codeWithTemplates output parameter that is set if code contains templates
+     * @param codeWithTemplates output parameter that is set if code contains templates
      */
     static void simplifyTemplates(
         TokenList& tokenlist,
         ErrorLogger* errorlogger,
         const Settings *mSettings,
         const std::time_t maxtime,
-        bool &_codeWithTemplates);
+        bool &codeWithTemplates);
 
     /**
      * Simplify constant calculations such as "1+2" => "3"
diff --git a/lib/tokenize.cpp b/lib/tokenize.cpp
index 70e482971..e84e65ca9 100644
--- a/lib/tokenize.cpp
+++ b/lib/tokenize.cpp
@@ -145,7 +145,7 @@ Tokenizer::Tokenizer() :
     mSymbolDatabase(nullptr),
     mVarId(0),
     _unnamedCount(0),
-    _codeWithTemplates(false), //is there any templates?
+    mCodeWithTemplates(false), //is there any templates?
     _timerResults(nullptr)
 #ifdef MAXTIME
     ,maxtime(std::time(0) + MAXTIME)
@@ -160,7 +160,7 @@ Tokenizer::Tokenizer(const Settings *settings, ErrorLogger *errorLogger) :
     mSymbolDatabase(nullptr),
     mVarId(0),
     _unnamedCount(0),
-    _codeWithTemplates(false), //is there any templates?
+    mCodeWithTemplates(false), //is there any templates?
     _timerResults(nullptr)
 #ifdef MAXTIME
     ,maxtime(std::time(0) + MAXTIME)
@@ -2299,7 +2299,7 @@ void Tokenizer::simplifyTemplates()
 #else
         0, // ignored
 #endif
-        _codeWithTemplates);
+        mCodeWithTemplates);
 }
 //---------------------------------------------------------------------------
 
diff --git a/lib/tokenize.h b/lib/tokenize.h
index f16483f7b..f2d1ec14d 100644
--- a/lib/tokenize.h
+++ b/lib/tokenize.h
@@ -764,7 +764,7 @@ public:
 
     /** Was there templates in the code? */
     bool codeWithTemplates() const {
-        return _codeWithTemplates;
+        return mCodeWithTemplates;
     }
 
 
@@ -891,7 +891,7 @@ private:
      * was there any templates? templates that are "unused" are
      * removed from the token list
      */
-    bool _codeWithTemplates;
+    bool mCodeWithTemplates;
 
     /**
      * TimerResults