diff --git a/src/libs/qmljs/qmljsindenter.cpp b/src/libs/qmljs/qmljsindenter.cpp
index 4286c649eb6b0cfce4b6fd03022599a398f01f5d..aa200e01034353bfeddac986322bf7691f79348a 100644
--- a/src/libs/qmljs/qmljsindenter.cpp
+++ b/src/libs/qmljs/qmljsindenter.cpp
@@ -205,7 +205,7 @@ void QmlJSIndenter::eraseChar(QString &t, int k, QChar ch) const
 */
 QString QmlJSIndenter::trimmedCodeLine(const QString &t)
 {
-    QmlJSScanner scanner;
+    Scanner scanner;
 
     QTextBlock currentLine = yyLinizerState.iter;
     int startState = qMax(0, currentLine.previous().userState()) & 0xff;
diff --git a/src/libs/qmljs/qmljsscanner.cpp b/src/libs/qmljs/qmljsscanner.cpp
index 8567bf60026d3c91184c4e9705d2d5f76c9d8a48..c1c0b2b44e403919e8cc1e478582228e4d03a160 100644
--- a/src/libs/qmljs/qmljsscanner.cpp
+++ b/src/libs/qmljs/qmljsscanner.cpp
@@ -76,22 +76,22 @@ const _Tp *end(const _Tp (&a)[N])
     return a + N;
 }
 
-QmlJSScanner::QmlJSScanner()
+Scanner::Scanner()
     : _state(0),
       _scanComments(true)
 {
 }
 
-QmlJSScanner::~QmlJSScanner()
+Scanner::~Scanner()
 {
 }
 
-bool QmlJSScanner::scanComments() const
+bool Scanner::scanComments() const
 {
     return _scanComments;
 }
 
-void QmlJSScanner::setScanComments(bool scanComments)
+void Scanner::setScanComments(bool scanComments)
 {
     _scanComments = scanComments;
 }
@@ -120,7 +120,7 @@ static bool isNumberChar(QChar ch)
     }
 }
 
-QList<Token> QmlJSScanner::operator()(const QString &text, int startState)
+QList<Token> Scanner::operator()(const QString &text, int startState)
 {
     enum {
         Normal = 0,
@@ -297,12 +297,12 @@ QList<Token> QmlJSScanner::operator()(const QString &text, int startState)
     return tokens;
 }
 
-int QmlJSScanner::state() const
+int Scanner::state() const
 {
     return _state;
 }
 
-bool QmlJSScanner::isKeyword(const QString &text) const
+bool Scanner::isKeyword(const QString &text) const
 {
     if (qBinaryFind(begin(js_keywords), end(js_keywords), text) != end(js_keywords))
         return true;
diff --git a/src/libs/qmljs/qmljsscanner.h b/src/libs/qmljs/qmljsscanner.h
index 3c3c12b360fb2555e18628af34835edac0086229..8c240d3c47947316d3e7e721cd27afd4e634216e 100644
--- a/src/libs/qmljs/qmljsscanner.h
+++ b/src/libs/qmljs/qmljsscanner.h
@@ -74,11 +74,11 @@ public:
     Kind kind;
 };
 
-class QMLJS_EXPORT QmlJSScanner
+class QMLJS_EXPORT Scanner
 {
 public:
-    QmlJSScanner();
-    virtual ~QmlJSScanner();
+    Scanner();
+    virtual ~Scanner();
 
     bool scanComments() const;
     void setScanComments(bool scanComments);
diff --git a/src/plugins/qmljseditor/qmlcodecompletion.cpp b/src/plugins/qmljseditor/qmlcodecompletion.cpp
index e24a6b50fe70d4f528ce9f8f9dc23ac0924ee9fa..116b9390397123c5522aa03b1fdb1af217d782c5 100644
--- a/src/plugins/qmljseditor/qmlcodecompletion.cpp
+++ b/src/plugins/qmljseditor/qmlcodecompletion.cpp
@@ -402,7 +402,7 @@ void FunctionArgumentWidget::updateArgumentHighlight()
     QString str = m_editor->textAt(m_startpos, curpos - m_startpos);
     int argnr = 0;
     int parcount = 0;
-    QmlJSScanner tokenize;
+    Scanner tokenize;
     const QList<Token> tokens = tokenize(str);
     for (int i = 0; i < tokens.count(); ++i) {
         const Token &tk = tokens.at(i);
@@ -557,7 +557,7 @@ bool QmlCodeCompletion::triggersCompletion(TextEditor::ITextEditable *editor)
             const int blockState = qMax(0, block.previous().userState()) & 0xff;
             const QString blockText = block.text();
 
-            QmlJSScanner scanner;
+            Scanner scanner;
             const QList<Token> tokens = scanner(blockText, blockState);
             foreach (const Token &tk, tokens) {
                 if (column >= tk.begin() && column <= tk.end()) {
diff --git a/src/plugins/qmljseditor/qmlexpressionundercursor.cpp b/src/plugins/qmljseditor/qmlexpressionundercursor.cpp
index 30fff086c9cc16abaf5262d8e2d2ffa47fa633b6..47be306a23ab600526a14f019314183549e365ab 100644
--- a/src/plugins/qmljseditor/qmlexpressionundercursor.cpp
+++ b/src/plugins/qmljseditor/qmlexpressionundercursor.cpp
@@ -45,7 +45,7 @@ namespace QmlJSEditor {
         class ExpressionUnderCursor
         {
             QTextCursor _cursor;
-            QmlJSScanner scanner;
+            Scanner scanner;
 
         public:
             ExpressionUnderCursor()
diff --git a/src/plugins/qmljseditor/qmljseditor.cpp b/src/plugins/qmljseditor/qmljseditor.cpp
index 7428113f0a091bb983448f1d7d2dbefd1fb98d33..f434801297564c4242c9e4367092488925464ef9 100644
--- a/src/plugins/qmljseditor/qmljseditor.cpp
+++ b/src/plugins/qmljseditor/qmljseditor.cpp
@@ -1048,7 +1048,7 @@ bool QmlJSTextEditor::contextAllowsAutoParentheses(const QTextCursor &cursor, co
     const QString blockText = cursor.block().text();
     const int blockState = blockStartState(cursor.block());
 
-    QmlJSScanner tokenize;
+    Scanner tokenize;
     const QList<Token> tokens = tokenize(blockText, blockState);
     const int pos = cursor.columnNumber();
 
diff --git a/src/plugins/qmljseditor/qmljshighlighter.h b/src/plugins/qmljseditor/qmljshighlighter.h
index 68c2a1e472cdc3456cbade6b94a6111c6c170e66..75b74d23ba8fbcef38e44177faf5dd1c435b01ac 100644
--- a/src/plugins/qmljseditor/qmljshighlighter.h
+++ b/src/plugins/qmljseditor/qmljshighlighter.h
@@ -94,7 +94,7 @@ private:
     bool m_qmlEnabled;
     int m_braceDepth;
 
-    QmlJS::QmlJSScanner m_scanner;
+    QmlJS::Scanner m_scanner;
     Parentheses m_currentBlockParentheses;
 
     QTextCharFormat m_formats[NumFormats];