diff --git a/src/checkautovariables.cpp b/src/checkautovariables.cpp
index 0aec296a1..972eceac9 100644
--- a/src/checkautovariables.cpp
+++ b/src/checkautovariables.cpp
@@ -18,7 +18,7 @@
  */
 
 //---------------------------------------------------------------------------
-// Buffer overrun..
+// Auto variables checks
 //---------------------------------------------------------------------------
 
 #include "checkautovariables.h"
diff --git a/src/checkautovariables.h b/src/checkautovariables.h
index 9571c9338..d1ce96fe0 100644
--- a/src/checkautovariables.h
+++ b/src/checkautovariables.h
@@ -45,7 +45,7 @@ public:
         checkAutoVariables.autoVariables();
     }
 
-    /** Check for buffer overruns */
+    /** Check auto variables */
     void autoVariables();
 
 private:
diff --git a/src/checkdangerousfunctions.cpp b/src/checkdangerousfunctions.cpp
index f333c160b..4c045f40b 100644
--- a/src/checkdangerousfunctions.cpp
+++ b/src/checkdangerousfunctions.cpp
@@ -18,7 +18,7 @@
  */
 
 //---------------------------------------------------------------------------
-// Buffer overrun..
+// Dangerous functions
 //---------------------------------------------------------------------------
 
 #include "checkdangerousfunctions.h"
@@ -43,10 +43,6 @@ namespace
 CheckDangerousFunctionsClass instance;
 }
 
-//---------------------------------------------------------------------------
-// Dangerous functions
-//---------------------------------------------------------------------------
-
 void CheckDangerousFunctionsClass::dangerousFunctions()
 {
     for (const Token *tok = _tokenizer->tokens(); tok; tok = tok->next())
diff --git a/src/checkdangerousfunctions.h b/src/checkdangerousfunctions.h
index 45f442949..26b043509 100644
--- a/src/checkdangerousfunctions.h
+++ b/src/checkdangerousfunctions.h
@@ -43,7 +43,7 @@ public:
         checkDangerousFunctionsClass.dangerousFunctions();
     }
 
-    /** Check for buffer overruns */
+    /** Check for dangerous functions */
     void dangerousFunctions();
 
 private:
diff --git a/test/testautovariables.cpp b/test/testautovariables.cpp
index 4e573b1e7..2d611a38d 100644
--- a/test/testautovariables.cpp
+++ b/test/testautovariables.cpp
@@ -53,7 +53,7 @@ private:
         // Clear the error buffer..
         errout.str("");
 
-        // Check for buffer overruns..
+        // Check auto variables
         Settings settings;
         settings._showAll = true;
         CheckAutoVariables checkAutoVariables(&tokenizer, &settings, this);
diff --git a/test/testdangerousfunctions.cpp b/test/testdangerousfunctions.cpp
index f930b84d3..9de8f3303 100644
--- a/test/testdangerousfunctions.cpp
+++ b/test/testdangerousfunctions.cpp
@@ -53,7 +53,7 @@ private:
         // Clear the error buffer..
         errout.str("");
 
-        // Check for buffer overruns..
+        // Check for dangerous functions..
         Settings settings;
         settings._showAll = true;
         CheckDangerousFunctionsClass checkDangerousFunctions(&tokenizer, &settings, this);