diff --git a/interpreter/cling/docs/tools/cling.pod.in b/interpreter/cling/docs/tools/cling.pod.in
index 7d76d0f282084..27c6cbaeed829 100644
--- a/interpreter/cling/docs/tools/cling.pod.in
+++ b/interpreter/cling/docs/tools/cling.pod.in
@@ -27,8 +27,8 @@ CSharpRepl) of such kind of software applications name them interactive
 compilers.
 
 One of Cling's main goals is to provide contemporary, high-performance
-alternative of the current C++ interpreter in the ROOT project - CINT. The
-backward-compatibility with CINT is major priority during the development.
+alternative of the forerunner C++ interpreter in the ROOT project - CINT. The
+backward-compatibility with CINT was major priority during the development.
 Cling serves as a core component of the ROOT system for storing and analyzing
 the data of the Large Hadron Collider (LHC) experiments.
 
diff --git a/interpreter/cling/lib/Interpreter/Interpreter.cpp b/interpreter/cling/lib/Interpreter/Interpreter.cpp
index 2fbd36f833d41..7ba3ab1ff9989 100644
--- a/interpreter/cling/lib/Interpreter/Interpreter.cpp
+++ b/interpreter/cling/lib/Interpreter/Interpreter.cpp
@@ -821,7 +821,7 @@ namespace cling {
     return Value;
   }
 
-  ///\brief Maybe transform the input line to implement cint command line
+  ///\brief Maybe transform the input line to implement Cling command line
   /// semantics (declarations are global) and compile to produce a module.
   ///
   Interpreter::CompilationResult
diff --git a/interpreter/cling/lib/MetaProcessor/Display.cpp b/interpreter/cling/lib/MetaProcessor/Display.cpp
index 3f16b107777aa..40b76b9be704f 100644
--- a/interpreter/cling/lib/MetaProcessor/Display.cpp
+++ b/interpreter/cling/lib/MetaProcessor/Display.cpp
@@ -778,7 +778,7 @@ void ClassPrinter::DisplayClassDecl(const CXXRecordDecl* classDecl)const
     DisplayDataMembers(classDecl, 0);
 
     fOut.Print("List of member functions: -------------------------------------------------\n");
-    //CINT has a format like %-15s blah-blah.
+    //CINT had a format like %-15s blah-blah.
     fOut.Print("filename     line:size busy function type and name\n");
     DisplayMemberFunctions(classDecl);
   }
@@ -1201,7 +1201,7 @@ void GlobalsPrinter::DisplayGlobal(const std::string& name)const
   count += DisplayDCDecls(tuDecl, [&name] (NamedDecl *D)
                                   { return D->getNameAsString() == name; });
 
-  //Do as CINT does:
+  //Do as CINT did:
   if (!count)
     fOut.Print(("Variable " + name + " not found\n").c_str());
 }
diff --git a/interpreter/cling/test/Lookup/func.C b/interpreter/cling/test/Lookup/func.C
index 92e487e8df511..f12467d97ee78 100644
--- a/interpreter/cling/test/Lookup/func.C
+++ b/interpreter/cling/test/Lookup/func.C
@@ -55,7 +55,7 @@ void G_b(int vi, double vd) { int x = vi; double y = vd; }
 void G_c(int vi, int vj) { int x = vi; int y = vj; }
 void G_c(int vi, double vd) { int x = vi; double y = vd; }
 template <class T> void G_d(T v) { T x = v; }
-// Note: In CINT, looking up a class template specialization causes
+// Note: In CINT, looking up a class template specialization causes (TODO: recheck with Cling)
 //       instantiation, but looking up a function template specialization
 //       does not, so we explicitly request the instantiations we are
 //       going to lookup so they will be there to find.
@@ -68,7 +68,7 @@ void H_b(int vi, double vd) { int x = vi; double y = vd; }
 void H_c(int vi, int vj) { int x = vi; int y = vj; }
 void H_c(int vi, double vd) { int x = vi; double y = vd; }
 template <class T> void H_d(T v) { T x = v; }
-// Note: In CINT, looking up a class template specialization causes
+// Note: In CINT, looking up a class template specialization causes (TODO: recheck with Cling)
 //       instantiation, but looking up a function template specialization
 //       does not, so we explicitly request the instantiations we are
 //       going to lookup so they will be there to find.
diff --git a/interpreter/cling/www/index.html b/interpreter/cling/www/index.html
index fc6550cb09347..1dbcba8761a74 100644
--- a/interpreter/cling/www/index.html
+++ b/interpreter/cling/www/index.html
@@ -29,7 +29,7 @@ <h1>Cling interprets C++</h1>
         <p>
           Cling is built on the top of LLVM and Clang libraries. In addition to standard interpreters it has a command line prompt and uses just-in-time (JIT) compiler. This kind of software application is commonly known as an interactive compiler.
         <br/>
-          Cling started off as a contemporary, high-performance alternative of the current C++ interpreter in the ROOT project - CINT.
+          Cling started off as a contemporary, high-performance alternative of the forerunner C++ interpreter in the ROOT project - CINT.
         </p>
 
         <h3>Why interpreting C++ with Cling?</h3>