diff --git a/src/plugins/qmljseditor/qmljscodecompletion.cpp b/src/plugins/qmljseditor/qmljscodecompletion.cpp
index b7fcd8797bb5db50c10571e530aee6fad15e77ad..aa00b7a8c00be4015166156e04528ef48dd9ddb0 100644
--- a/src/plugins/qmljseditor/qmljscodecompletion.cpp
+++ b/src/plugins/qmljseditor/qmljscodecompletion.cpp
@@ -30,7 +30,7 @@
 #include "qmljscodecompletion.h"
 #include "qmlexpressionundercursor.h"
 #include "qmljseditor.h"
-#include "qmlmodelmanagerinterface.h"
+#include "qmljsmodelmanagerinterface.h"
 
 #include <qmljs/parser/qmljsast_p.h>
 #include <qmljs/qmljsbind.h>
@@ -508,7 +508,7 @@ void FunctionArgumentWidget::updateHintText()
 
 } } // end of namespace QmlJSEditor::Internal
 
-CodeCompletion::CodeCompletion(QmlModelManagerInterface *modelManager, QObject *parent)
+CodeCompletion::CodeCompletion(ModelManagerInterface *modelManager, QObject *parent)
     : TextEditor::ICompletionCollector(parent),
       m_modelManager(modelManager),
       m_editor(0),
diff --git a/src/plugins/qmljseditor/qmljscodecompletion.h b/src/plugins/qmljseditor/qmljscodecompletion.h
index 34f5a0ee3fc90e286f394dbfc3362bccf6721a94..ea5029889980e9c4389d4711161acbc3426f3292 100644
--- a/src/plugins/qmljseditor/qmljscodecompletion.h
+++ b/src/plugins/qmljseditor/qmljscodecompletion.h
@@ -41,7 +41,7 @@ class ITextEditable;
 
 namespace QmlJSEditor {
 
-class QmlModelManagerInterface;
+class ModelManagerInterface;
 
 namespace Internal {
 
@@ -52,7 +52,7 @@ class CodeCompletion: public TextEditor::ICompletionCollector
     Q_OBJECT
 
 public:
-    CodeCompletion(QmlModelManagerInterface *modelManager, QObject *parent = 0);
+    CodeCompletion(ModelManagerInterface *modelManager, QObject *parent = 0);
     virtual ~CodeCompletion();
 
     Qt::CaseSensitivity caseSensitivity() const;
@@ -77,7 +77,7 @@ private:
     bool maybeTriggersCompletion(TextEditor::ITextEditable *editor);
     bool isDelimiter(const QChar &ch) const;
 
-    QmlModelManagerInterface *m_modelManager;
+    ModelManagerInterface *m_modelManager;
     TextEditor::ITextEditable *m_editor;
     int m_startPosition;
     QList<TextEditor::CompletionItem> m_completions;
diff --git a/src/plugins/qmljseditor/qmljseditor.cpp b/src/plugins/qmljseditor/qmljseditor.cpp
index f434801297564c4242c9e4367092488925464ef9..7a170075ba165b1302a07b35b930a331045b2e88 100644
--- a/src/plugins/qmljseditor/qmljseditor.cpp
+++ b/src/plugins/qmljseditor/qmljseditor.cpp
@@ -31,7 +31,7 @@
 #include "qmljseditorconstants.h"
 #include "qmljshighlighter.h"
 #include "qmljseditorplugin.h"
-#include "qmlmodelmanager.h"
+#include "qmljsmodelmanager.h"
 
 #include <qmljs/qmljsindenter.h>
 #include <qmljs/qmljsinterpreter.h>
@@ -583,7 +583,7 @@ QmlJSTextEditor::QmlJSTextEditor(QWidget *parent) :
 
     baseTextDocument()->setSyntaxHighlighter(new Highlighter(document()));
 
-    m_modelManager = ExtensionSystem::PluginManager::instance()->getObject<QmlModelManagerInterface>();
+    m_modelManager = ExtensionSystem::PluginManager::instance()->getObject<ModelManagerInterface>();
 
     if (m_modelManager) {
         connect(m_modelManager, SIGNAL(documentUpdated(QmlJS::Document::Ptr)),
diff --git a/src/plugins/qmljseditor/qmljseditor.h b/src/plugins/qmljseditor/qmljseditor.h
index 82465f9839f7977d0a6f4bbf8c877c8e38c892a6..a204585a56aaae75d088e50deeed39b403944389 100644
--- a/src/plugins/qmljseditor/qmljseditor.h
+++ b/src/plugins/qmljseditor/qmljseditor.h
@@ -45,7 +45,7 @@ class ICore;
 
 namespace QmlJSEditor {
 
-class QmlModelManagerInterface;
+class ModelManagerInterface;
 
 namespace Internal {
 
@@ -178,7 +178,7 @@ private:
     QTimer *m_updateDocumentTimer;
     QTimer *m_updateUsesTimer;
     QComboBox *m_methodCombo;
-    QmlModelManagerInterface *m_modelManager;
+    ModelManagerInterface *m_modelManager;
     QTextCharFormat m_occurrencesFormat;
     QTextCharFormat m_occurrencesUnusedFormat;
     QTextCharFormat m_occurrenceRenameFormat;
diff --git a/src/plugins/qmljseditor/qmljseditor.pro b/src/plugins/qmljseditor/qmljseditor.pro
index cda648c3bed749eb882a9ab9d2d51a81b4de9652..fd3fca3966d5a5b9a3611ab7de3793c736a208cf 100644
--- a/src/plugins/qmljseditor/qmljseditor.pro
+++ b/src/plugins/qmljseditor/qmljseditor.pro
@@ -20,8 +20,8 @@ HEADERS += \
     qmlfilewizard.h \
     qmljshighlighter.h \
     qmljshoverhandler.h \
-    qmlmodelmanager.h \
-    qmlmodelmanagerinterface.h
+    qmljsmodelmanager.h \
+    qmljsmodelmanagerinterface.h
 
 SOURCES += \
     qmljscodecompletion.cpp \
@@ -33,8 +33,8 @@ SOURCES += \
     qmlfilewizard.cpp \
     qmljshighlighter.cpp \
     qmljshoverhandler.cpp \
-    qmlmodelmanager.cpp \
-    qmlmodelmanagerinterface.cpp
+    qmljsmodelmanager.cpp \
+    qmljsmodelmanagerinterface.cpp
 
 RESOURCES += qmljseditor.qrc
 OTHER_FILES += QmlJSEditor.pluginspec QmlJSEditor.mimetypes.xml
diff --git a/src/plugins/qmljseditor/qmljseditorplugin.cpp b/src/plugins/qmljseditor/qmljseditorplugin.cpp
index c36fa3675b3f6a52c687bafa99fb43061f754fc7..34684c95adec766477f95e0cf0a6e85d70d51a85 100644
--- a/src/plugins/qmljseditor/qmljseditorplugin.cpp
+++ b/src/plugins/qmljseditor/qmljseditorplugin.cpp
@@ -34,7 +34,7 @@
 #include "qmljseditorfactory.h"
 #include "qmljscodecompletion.h"
 #include "qmljshoverhandler.h"
-#include "qmlmodelmanager.h"
+#include "qmljsmodelmanager.h"
 #include "qmlfilewizard.h"
 
 #include <coreplugin/icore.h>
@@ -90,7 +90,7 @@ bool QmlJSEditorPlugin::initialize(const QStringList & /*arguments*/, QString *e
     if (!core->mimeDatabase()->addMimeTypes(QLatin1String(":/qmljseditor/QmlJSEditor.mimetypes.xml"), error_message))
         return false;
 
-    m_modelManager = new QmlModelManager(this);
+    m_modelManager = new ModelManager(this);
     addAutoReleasedObject(m_modelManager);
 
     QList<int> context;
diff --git a/src/plugins/qmljseditor/qmljseditorplugin.h b/src/plugins/qmljseditor/qmljseditorplugin.h
index dbdcfce77fe95866186cf4bb9e8688fbf1d85531..df81b05030e6c74b355bd8d205f013125c030053 100644
--- a/src/plugins/qmljseditor/qmljseditorplugin.h
+++ b/src/plugins/qmljseditor/qmljseditorplugin.h
@@ -38,7 +38,7 @@ class TextEditorActionHandler;
 
 namespace QmlJSEditor {
 
-class QmlModelManagerInterface;
+class ModelManagerInterface;
 class QmlFileWizard;
 
 namespace Internal {
@@ -70,7 +70,7 @@ public Q_SLOTS:
 private:
     static QmlJSEditorPlugin *m_instance;
 
-    QmlModelManagerInterface *m_modelManager;
+    ModelManagerInterface *m_modelManager;
     QmlFileWizard *m_wizard;
     QmlJSEditorFactory *m_editor;
     TextEditor::TextEditorActionHandler *m_actionHandler;
diff --git a/src/plugins/qmljseditor/qmljshoverhandler.cpp b/src/plugins/qmljseditor/qmljshoverhandler.cpp
index b40f42d6945eb096feb74cf4df67acf7a6afd563..e1103325dcb33dd641e73e00dc0ac6f90f7a8c82 100644
--- a/src/plugins/qmljseditor/qmljshoverhandler.cpp
+++ b/src/plugins/qmljseditor/qmljshoverhandler.cpp
@@ -61,7 +61,7 @@ HoverHandler::HoverHandler(QObject *parent)
     : QObject(parent)
     , m_helpEngineNeedsSetup(false)
 {
-    m_modelManager = ExtensionSystem::PluginManager::instance()->getObject<QmlModelManagerInterface>();
+    m_modelManager = ExtensionSystem::PluginManager::instance()->getObject<ModelManagerInterface>();
 
     ICore *core = ICore::instance();
     QFileInfo fi(core->settings()->fileName());
diff --git a/src/plugins/qmljseditor/qmljshoverhandler.h b/src/plugins/qmljseditor/qmljshoverhandler.h
index f988652075cb022a26e0d7a2e1141ce7668e7aa2..7a187f287732757b9951ae43b2bafe2f2750771a 100644
--- a/src/plugins/qmljseditor/qmljshoverhandler.h
+++ b/src/plugins/qmljseditor/qmljshoverhandler.h
@@ -30,7 +30,7 @@
 #ifndef QMLJSHOVERHANDLER_H
 #define QMLJSHOVERHANDLER_H
 
-#include "qmlmodelmanagerinterface.h"
+#include "qmljsmodelmanagerinterface.h"
 
 #include <QtCore/QObject>
 
@@ -79,7 +79,7 @@ private:
                         QStringList *baseClasses) const;
 
 private:
-    QmlModelManagerInterface *m_modelManager;
+    ModelManagerInterface *m_modelManager;
     QHelpEngineCore *m_helpEngine;
     QString m_helpId;
     QString m_toolTip;
diff --git a/src/plugins/qmljseditor/qmlmodelmanager.cpp b/src/plugins/qmljseditor/qmljsmodelmanager.cpp
similarity index 87%
rename from src/plugins/qmljseditor/qmlmodelmanager.cpp
rename to src/plugins/qmljseditor/qmljsmodelmanager.cpp
index a885181eec3030873441afa1fe5947f9c76b40c7..2deaef8fba24732ffd2ddc2cf9c39cc9b675b4a1 100644
--- a/src/plugins/qmljseditor/qmlmodelmanager.cpp
+++ b/src/plugins/qmljseditor/qmljsmodelmanager.cpp
@@ -28,7 +28,7 @@
 **************************************************************************/
 
 #include "qmljseditorconstants.h"
-#include "qmlmodelmanager.h"
+#include "qmljsmodelmanager.h"
 #include "qmljseditor.h"
 
 #include <coreplugin/icore.h>
@@ -47,8 +47,8 @@ using namespace QmlJS;
 using namespace QmlJSEditor;
 using namespace QmlJSEditor::Internal;
 
-QmlModelManager::QmlModelManager(QObject *parent):
-        QmlModelManagerInterface(parent),
+ModelManager::ModelManager(QObject *parent):
+        ModelManagerInterface(parent),
         m_core(Core::ICore::instance())
 {
     m_synchronizer.setCancelOnWait(true);
@@ -59,19 +59,19 @@ QmlModelManager::QmlModelManager(QObject *parent):
             this, SLOT(onDocumentUpdated(QmlJS::Document::Ptr)));
 }
 
-Snapshot QmlModelManager::snapshot() const
+Snapshot ModelManager::snapshot() const
 {
     QMutexLocker locker(&m_mutex);
 
     return _snapshot;
 }
 
-void QmlModelManager::updateSourceFiles(const QStringList &files)
+void ModelManager::updateSourceFiles(const QStringList &files)
 {
     refreshSourceFiles(files);
 }
 
-QFuture<void> QmlModelManager::refreshSourceFiles(const QStringList &sourceFiles)
+QFuture<void> ModelManager::refreshSourceFiles(const QStringList &sourceFiles)
 {
     if (sourceFiles.isEmpty()) {
         return QFuture<void>();
@@ -79,7 +79,7 @@ QFuture<void> QmlModelManager::refreshSourceFiles(const QStringList &sourceFiles
 
     const QMap<QString, WorkingCopy> workingCopy = buildWorkingCopyList();
 
-    QFuture<void> result = QtConcurrent::run(&QmlModelManager::parse,
+    QFuture<void> result = QtConcurrent::run(&ModelManager::parse,
                                               workingCopy, sourceFiles,
                                               this);
 
@@ -104,7 +104,7 @@ QFuture<void> QmlModelManager::refreshSourceFiles(const QStringList &sourceFiles
     return result;
 }
 
-QMap<QString, QmlModelManager::WorkingCopy> QmlModelManager::buildWorkingCopyList()
+QMap<QString, ModelManager::WorkingCopy> ModelManager::buildWorkingCopyList()
 {
     QMap<QString, WorkingCopy> workingCopy;
     Core::EditorManager *editorManager = m_core->editorManager();
@@ -123,20 +123,20 @@ QMap<QString, QmlModelManager::WorkingCopy> QmlModelManager::buildWorkingCopyLis
     return workingCopy;
 }
 
-void QmlModelManager::emitDocumentUpdated(Document::Ptr doc)
+void ModelManager::emitDocumentUpdated(Document::Ptr doc)
 { emit documentUpdated(doc); }
 
-void QmlModelManager::onDocumentUpdated(Document::Ptr doc)
+void ModelManager::onDocumentUpdated(Document::Ptr doc)
 {
     QMutexLocker locker(&m_mutex);
 
     _snapshot.insert(doc);
 }
 
-void QmlModelManager::parse(QFutureInterface<void> &future,
+void ModelManager::parse(QFutureInterface<void> &future,
                             QMap<QString, WorkingCopy> workingCopy,
                             QStringList files,
-                            QmlModelManager *modelManager)
+                            ModelManager *modelManager)
 {
     Core::MimeDatabase *db = Core::ICore::instance()->mimeDatabase();
     Core::MimeType jsSourceTy = db->findByType(QLatin1String("application/javascript"));
@@ -186,7 +186,7 @@ void QmlModelManager::parse(QFutureInterface<void> &future,
 }
 
 // Check whether fileMimeType is the same or extends knownMimeType
-bool QmlModelManager::matchesMimeType(const Core::MimeType &fileMimeType, const Core::MimeType &knownMimeType)
+bool ModelManager::matchesMimeType(const Core::MimeType &fileMimeType, const Core::MimeType &knownMimeType)
 {
     Core::MimeDatabase *db = Core::ICore::instance()->mimeDatabase();
 
diff --git a/src/plugins/qmljseditor/qmlmodelmanager.h b/src/plugins/qmljseditor/qmljsmodelmanager.h
similarity index 90%
rename from src/plugins/qmljseditor/qmlmodelmanager.h
rename to src/plugins/qmljseditor/qmljsmodelmanager.h
index 9ac884abd461d687fa0cbafcaa41d7a472ec26c4..47192044da9d5b93bd46d5b615502796e62df758 100644
--- a/src/plugins/qmljseditor/qmlmodelmanager.h
+++ b/src/plugins/qmljseditor/qmljsmodelmanager.h
@@ -27,10 +27,10 @@
 **
 **************************************************************************/
 
-#ifndef QMLMODELMANAGER_H
-#define QMLMODELMANAGER_H
+#ifndef QMLJSMODELMANAGER_H
+#define QMLJSMODELMANAGER_H
 
-#include "qmlmodelmanagerinterface.h"
+#include "qmljsmodelmanagerinterface.h"
 
 #include <qmljs/qmljsdocument.h>
 
@@ -46,12 +46,12 @@ class MimeType;
 namespace QmlJSEditor {
 namespace Internal {
 
-class QmlModelManager: public QmlModelManagerInterface
+class ModelManager: public ModelManagerInterface
 {
     Q_OBJECT
 
 public:
-    QmlModelManager(QObject *parent = 0);
+    ModelManager(QObject *parent = 0);
 
     virtual QmlJS::Snapshot snapshot() const;
     virtual void updateSourceFiles(const QStringList &files);
@@ -80,7 +80,7 @@ protected:
     static void parse(QFutureInterface<void> &future,
                       QMap<QString, WorkingCopy> workingCopy,
                       QStringList files,
-                      QmlModelManager *modelManager);
+                      ModelManager *modelManager);
 
 private:
     static bool matchesMimeType(const Core::MimeType &fileMimeType, const Core::MimeType &knownMimeType);
@@ -95,4 +95,4 @@ private:
 } // namespace Internal
 } // namespace QmlJSEditor
 
-#endif // QMLMODELMANAGER_H
+#endif // QMLJSMODELMANAGER_H
diff --git a/src/plugins/qmljseditor/qmlmodelmanagerinterface.cpp b/src/plugins/qmljseditor/qmljsmodelmanagerinterface.cpp
similarity index 88%
rename from src/plugins/qmljseditor/qmlmodelmanagerinterface.cpp
rename to src/plugins/qmljseditor/qmljsmodelmanagerinterface.cpp
index c899703cc524e638e44bef219bff23b006d381a6..8fd31e64c77f1cd2b5fa29fdc543e0e113785ade 100644
--- a/src/plugins/qmljseditor/qmlmodelmanagerinterface.cpp
+++ b/src/plugins/qmljseditor/qmljsmodelmanagerinterface.cpp
@@ -27,15 +27,15 @@
 **
 **************************************************************************/
 
-#include "qmlmodelmanagerinterface.h"
+#include "qmljsmodelmanagerinterface.h"
 
 using namespace QmlJSEditor;
 
-QmlModelManagerInterface::QmlModelManagerInterface(QObject *parent):
+ModelManagerInterface::ModelManagerInterface(QObject *parent):
     QObject(parent)
 {
 }
 
-QmlModelManagerInterface::~QmlModelManagerInterface()
+ModelManagerInterface::~ModelManagerInterface()
 {
 }
diff --git a/src/plugins/qmljseditor/qmlmodelmanagerinterface.h b/src/plugins/qmljseditor/qmljsmodelmanagerinterface.h
similarity index 86%
rename from src/plugins/qmljseditor/qmlmodelmanagerinterface.h
rename to src/plugins/qmljseditor/qmljsmodelmanagerinterface.h
index 4ac4bb9fee6687d5d9c2c7cf923c69ed83e3293f..498e1512a0469486279556b3e3feb94be527ee62 100644
--- a/src/plugins/qmljseditor/qmlmodelmanagerinterface.h
+++ b/src/plugins/qmljseditor/qmljsmodelmanagerinterface.h
@@ -27,8 +27,8 @@
 **
 **************************************************************************/
 
-#ifndef QMLMODELMANAGERINTERFACE_H
-#define QMLMODELMANAGERINTERFACE_H
+#ifndef QMLJSMODELMANAGERINTERFACE_H
+#define QMLJSMODELMANAGERINTERFACE_H
 
 #include "qmljseditor_global.h"
 
@@ -44,13 +44,13 @@ class Snapshot;
 
 namespace QmlJSEditor {
 
-class QMLJSEDITOR_EXPORT QmlModelManagerInterface: public QObject
+class QMLJSEDITOR_EXPORT ModelManagerInterface: public QObject
 {
     Q_OBJECT
 
 public:
-    QmlModelManagerInterface(QObject *parent = 0);
-    virtual ~QmlModelManagerInterface();
+    ModelManagerInterface(QObject *parent = 0);
+    virtual ~ModelManagerInterface();
 
     virtual QmlJS::Snapshot snapshot() const = 0;
     virtual void updateSourceFiles(const QStringList &files) = 0;
@@ -61,4 +61,4 @@ signals:
 
 } // namespace QmlJSEditor
 
-#endif // QMLMODELMANAGERINTERFACE_H
+#endif // QMLJSMODELMANAGERINTERFACE_H
diff --git a/src/plugins/qmlprojectmanager/qmlproject.cpp b/src/plugins/qmlprojectmanager/qmlproject.cpp
index 8ff1071ee53ba77c800d3d78058778c0e709540c..6646e9caf063c9d17cdd8a297ff7fcc140b60974 100644
--- a/src/plugins/qmlprojectmanager/qmlproject.cpp
+++ b/src/plugins/qmlprojectmanager/qmlproject.cpp
@@ -42,7 +42,7 @@
 #include <coreplugin/editormanager/ieditor.h>
 #include <coreplugin/modemanager.h>
 
-#include <qmljseditor/qmlmodelmanagerinterface.h>
+#include <qmljseditor/qmljsmodelmanagerinterface.h>
 
 #include <utils/synchronousprocess.h>
 
@@ -85,7 +85,7 @@ const int DEFAULT_DEBUG_SERVER_PORT(3768);
 QmlProject::QmlProject(Manager *manager, const QString &fileName)
     : m_manager(manager),
       m_fileName(fileName),
-      m_modelManager(ExtensionSystem::PluginManager::instance()->getObject<QmlJSEditor::QmlModelManagerInterface>()),
+      m_modelManager(ExtensionSystem::PluginManager::instance()->getObject<QmlJSEditor::ModelManagerInterface>()),
       m_fileWatcher(new ProjectExplorer::FileWatcher(this)),
       m_targetFactory(new QmlTargetFactory(this))
 {
diff --git a/src/plugins/qmlprojectmanager/qmlproject.h b/src/plugins/qmlprojectmanager/qmlproject.h
index cd9edd84f920af4777d38315c63fc2f8e858c4b1..b5a9d3238be3a9e9cbd92e41ca19ab97f6504cda 100644
--- a/src/plugins/qmlprojectmanager/qmlproject.h
+++ b/src/plugins/qmlprojectmanager/qmlproject.h
@@ -47,7 +47,7 @@
 #include <QtDeclarative/QmlEngine>
 
 namespace QmlJSEditor {
-class QmlModelManagerInterface;
+class ModelManagerInterface;
 }
 
 namespace QmlProjectManager {
@@ -198,7 +198,7 @@ private:
     QString m_fileName;
     Internal::QmlProjectFile *m_file;
     QString m_projectName;
-    QmlJSEditor::QmlModelManagerInterface *m_modelManager;
+    QmlJSEditor::ModelManagerInterface *m_modelManager;
 
     // plain format
     QStringList m_files;
diff --git a/src/plugins/qmlprojectmanager/qmlprojectplugin.cpp b/src/plugins/qmlprojectmanager/qmlprojectplugin.cpp
index aaa84b111d5d4df056b59cf9b12d4e2a3c0ba0ce..7340bdc4f442e85674269ed646af3a92b7059652 100644
--- a/src/plugins/qmlprojectmanager/qmlprojectplugin.cpp
+++ b/src/plugins/qmlprojectmanager/qmlprojectplugin.cpp
@@ -43,7 +43,7 @@
 #include <texteditor/texteditoractionhandler.h>
 
 #include <projectexplorer/taskwindow.h>
-#include <qmljseditor/qmlmodelmanagerinterface.h>
+#include <qmljseditor/qmljsmodelmanagerinterface.h>
 
 #include <QtCore/QtPlugin>
 
@@ -88,7 +88,7 @@ void QmlProjectPlugin::extensionsInitialized()
     ProjectExplorer::TaskWindow *taskWindow = pluginManager->getObject<ProjectExplorer::TaskWindow>();
     m_qmlTaskManager->setTaskWindow(taskWindow);
 
-    QmlJSEditor::QmlModelManagerInterface *modelManager = pluginManager->getObject<QmlJSEditor::QmlModelManagerInterface>();
+    QmlJSEditor::ModelManagerInterface *modelManager = pluginManager->getObject<QmlJSEditor::ModelManagerInterface>();
     Q_ASSERT(modelManager);
     connect(modelManager, SIGNAL(documentUpdated(QmlJS::Document::Ptr)),
             m_qmlTaskManager, SLOT(documentUpdated(QmlJS::Document::Ptr)));