diff --git a/src/plugins/qmldesigner/core/filemanager/addarraymembervisitor.cpp b/src/plugins/qmldesigner/core/filemanager/addarraymembervisitor.cpp
index 026591f85fd43260f558a9e923f495bdbd50a636..321377b457d7f091182bd18fa2e4b6ccd733b77e 100644
--- a/src/plugins/qmldesigner/core/filemanager/addarraymembervisitor.cpp
+++ b/src/plugins/qmldesigner/core/filemanager/addarraymembervisitor.cpp
@@ -32,8 +32,8 @@
 
 #include "addarraymembervisitor.h"
 
-using namespace QmlEditor;
-using namespace QmlEditor::Internal;
+using namespace QmlDesigner;
+using namespace QmlDesigner::Internal;
 using namespace QmlJS;
 using namespace QmlJS::AST;
 
diff --git a/src/plugins/qmldesigner/core/filemanager/addarraymembervisitor.h b/src/plugins/qmldesigner/core/filemanager/addarraymembervisitor.h
index 2b5952157451d367b1dd5777bd73de8e6e5bb24a..8cd9031d986942f3daf9017867175fae8fe6a1a3 100644
--- a/src/plugins/qmldesigner/core/filemanager/addarraymembervisitor.h
+++ b/src/plugins/qmldesigner/core/filemanager/addarraymembervisitor.h
@@ -32,7 +32,7 @@
 
 #include "qmlrewriter.h"
 
-namespace QmlEditor {
+namespace QmlDesigner {
 namespace Internal {
 
 class AddArrayMemberVisitor: public QMLRewriter
@@ -67,6 +67,6 @@ private:
 };
 
 } // namespace Internal
-} // namespace QmlEditor
+} // namespace QmlDesigner
 
 #endif // ADDARRAYMEMBERVISITOR_H
diff --git a/src/plugins/qmldesigner/core/filemanager/addobjectvisitor.cpp b/src/plugins/qmldesigner/core/filemanager/addobjectvisitor.cpp
index a9b5c9ad321849f62f3c1d87bd4b26e84ceef3bc..66cff0b732352720fdd321963eb98ac060912147 100644
--- a/src/plugins/qmldesigner/core/filemanager/addobjectvisitor.cpp
+++ b/src/plugins/qmldesigner/core/filemanager/addobjectvisitor.cpp
@@ -32,8 +32,8 @@
 
 #include "addobjectvisitor.h"
 
-using namespace QmlEditor;
-using namespace QmlEditor::Internal;
+using namespace QmlDesigner;
+using namespace QmlDesigner::Internal;
 using namespace QmlJS;
 using namespace QmlJS::AST;
 
diff --git a/src/plugins/qmldesigner/core/filemanager/addobjectvisitor.h b/src/plugins/qmldesigner/core/filemanager/addobjectvisitor.h
index 4a3097ffa5d96ee81db0abce45f7bbc8a1c072ca..784ac21c7309187ad0f4cef986ad5a82094680a3 100644
--- a/src/plugins/qmldesigner/core/filemanager/addobjectvisitor.h
+++ b/src/plugins/qmldesigner/core/filemanager/addobjectvisitor.h
@@ -32,7 +32,7 @@
 
 #include "qmlrewriter.h"
 
-namespace QmlEditor {
+namespace QmlDesigner {
 namespace Internal {
 
 class AddObjectVisitor: public QMLRewriter
@@ -57,6 +57,6 @@ private:
 };
 
 } // namespace Internal
-} // namespace QmlEditor
+} // namespace QmlDesigner
 
 #endif // ADDOBJECTVISITOR_H
diff --git a/src/plugins/qmldesigner/core/filemanager/addpropertyvisitor.cpp b/src/plugins/qmldesigner/core/filemanager/addpropertyvisitor.cpp
index b93792e563bf518cdc140550aa8eb07e587cdaea..89850272335539040e45e2c5e10e65664f438c8c 100644
--- a/src/plugins/qmldesigner/core/filemanager/addpropertyvisitor.cpp
+++ b/src/plugins/qmldesigner/core/filemanager/addpropertyvisitor.cpp
@@ -32,8 +32,8 @@
 
 #include "addpropertyvisitor.h"
 
-using namespace QmlEditor;
-using namespace QmlEditor::Internal;
+using namespace QmlDesigner;
+using namespace QmlDesigner::Internal;
 using namespace QmlJS;
 using namespace QmlJS::AST;
 
diff --git a/src/plugins/qmldesigner/core/filemanager/addpropertyvisitor.h b/src/plugins/qmldesigner/core/filemanager/addpropertyvisitor.h
index a375698a08e232e9d6195b8790d45781a9be73d4..6ab10ab0b8135fb3aeb46b5c7f7c465da9c948a9 100644
--- a/src/plugins/qmldesigner/core/filemanager/addpropertyvisitor.h
+++ b/src/plugins/qmldesigner/core/filemanager/addpropertyvisitor.h
@@ -33,7 +33,7 @@
 #include "qmlrefactoring.h"
 #include "qmlrewriter.h"
 
-namespace QmlEditor {
+namespace QmlDesigner {
 namespace Internal {
 
 class AddPropertyVisitor: public QMLRewriter
@@ -44,7 +44,7 @@ public:
                        quint32 parentLocation,
                        const QString &name,
                        const QString &value,
-                       QmlEditor::QmlRefactoring::PropertyType propertyType,
+                       QmlDesigner::QmlRefactoring::PropertyType propertyType,
                        const QStringList &propertyOrder);
 
 protected:
@@ -58,11 +58,11 @@ private:
     quint32 m_parentLocation;
     QString m_name;
     QString m_value;
-    QmlEditor::QmlRefactoring::PropertyType m_propertyType;
+    QmlDesigner::QmlRefactoring::PropertyType m_propertyType;
     QStringList m_propertyOrder;
 };
 
 } // namespace Internal
-} // namespace QmlEditor
+} // namespace QmlDesigner
 
 #endif // ADDPROPERTYVISITOR_H
diff --git a/src/plugins/qmldesigner/core/filemanager/astobjecttextextractor.cpp b/src/plugins/qmldesigner/core/filemanager/astobjecttextextractor.cpp
index e7b759041830fe7b71485213a50bb8c8ab3e2b70..8d3152567133f9a557abf843ddd054b9a4083932 100644
--- a/src/plugins/qmldesigner/core/filemanager/astobjecttextextractor.cpp
+++ b/src/plugins/qmldesigner/core/filemanager/astobjecttextextractor.cpp
@@ -30,7 +30,7 @@
 #include "astobjecttextextractor.h"
 #include "qmljsast_p.h"
 
-using namespace QmlEditor;
+using namespace QmlDesigner;
 using namespace QmlJS::AST;
 
 ASTObjectTextExtractor::ASTObjectTextExtractor(const QString &text):
diff --git a/src/plugins/qmldesigner/core/filemanager/astobjecttextextractor.h b/src/plugins/qmldesigner/core/filemanager/astobjecttextextractor.h
index 029106f44058da109ee09a900d20fa2567a70097..a22a585bf695e8083868ee3eef2ec33791c9fc85 100644
--- a/src/plugins/qmldesigner/core/filemanager/astobjecttextextractor.h
+++ b/src/plugins/qmldesigner/core/filemanager/astobjecttextextractor.h
@@ -35,7 +35,7 @@
 #include "qmldocument.h"
 #include "qmljsastvisitor_p.h"
 
-namespace QmlEditor {
+namespace QmlDesigner {
 
 class ASTObjectTextExtractor: public QmlJS::AST::Visitor
 {
@@ -54,6 +54,6 @@ private:
     QString m_text;
 };
 
-} // namespace QmlEditor
+} // namespace QmlDesigner
 
 #endif // ASTOBJECTTEXTEXTRACTOR_H
diff --git a/src/plugins/qmldesigner/core/filemanager/changeimportsvisitor.cpp b/src/plugins/qmldesigner/core/filemanager/changeimportsvisitor.cpp
index 5ecac14e1a7c4c7722bbd1e38a27f201096dd554..68833e98d54f9c085893b10f196ffb4bba6c872c 100644
--- a/src/plugins/qmldesigner/core/filemanager/changeimportsvisitor.cpp
+++ b/src/plugins/qmldesigner/core/filemanager/changeimportsvisitor.cpp
@@ -37,7 +37,7 @@ using namespace QmlJS::AST;
 
 using namespace QmlDesigner;
 using namespace QmlDesigner::Internal;
-using namespace QmlEditor::Internal;
+using namespace QmlDesigner::Internal;
 
 ChangeImportsVisitor::ChangeImportsVisitor(TextModifier &textModifier, const QSet<Import> &addedImports, const QSet<Import> &removedImports, const QString &source):
         QMLRewriter(textModifier),
diff --git a/src/plugins/qmldesigner/core/filemanager/changeimportsvisitor.h b/src/plugins/qmldesigner/core/filemanager/changeimportsvisitor.h
index 923779941545f33d008adeb9fc26d2cd62ef457c..65ede8e1f14afb8fb9d5453d38ee51e3ccc883ff 100644
--- a/src/plugins/qmldesigner/core/filemanager/changeimportsvisitor.h
+++ b/src/plugins/qmldesigner/core/filemanager/changeimportsvisitor.h
@@ -36,7 +36,7 @@
 #include "import.h"
 #include "qmlrewriter.h"
 
-namespace QmlEditor {
+namespace QmlDesigner {
 namespace Internal {
 
 class ChangeImportsVisitor: public QMLRewriter, protected QmlDesigner::Internal::CopyPasteUtil
@@ -56,6 +56,6 @@ private:
 };
 
 } // namespace Internal
-} // namespace QmlEditor
+} // namespace QmlDesigner
 
 #endif // CHANGEIMPORTSVISITOR_H
diff --git a/src/plugins/qmldesigner/core/filemanager/changeobjecttypevisitor.cpp b/src/plugins/qmldesigner/core/filemanager/changeobjecttypevisitor.cpp
index d0624f6ab8f308b06e37a01bd632a3ee66f5524a..bbb01c08936c53d5664f2449fb11e0f858c7e3eb 100644
--- a/src/plugins/qmldesigner/core/filemanager/changeobjecttypevisitor.cpp
+++ b/src/plugins/qmldesigner/core/filemanager/changeobjecttypevisitor.cpp
@@ -33,7 +33,7 @@
 
 using namespace QmlJS;
 using namespace QmlJS::AST;
-using namespace QmlEditor::Internal;
+using namespace QmlDesigner::Internal;
 
 ChangeObjectTypeVisitor::ChangeObjectTypeVisitor(QmlDesigner::TextModifier &modifier,
                                                  quint32 nodeLocation,
diff --git a/src/plugins/qmldesigner/core/filemanager/changeobjecttypevisitor.h b/src/plugins/qmldesigner/core/filemanager/changeobjecttypevisitor.h
index 01c2e360a73af2ca0a84c3d20004478ea1467851..5e52c32d16a91f2937915d5af9ac656758840a34 100644
--- a/src/plugins/qmldesigner/core/filemanager/changeobjecttypevisitor.h
+++ b/src/plugins/qmldesigner/core/filemanager/changeobjecttypevisitor.h
@@ -32,7 +32,7 @@
 
 #include "qmlrewriter.h"
 
-namespace QmlEditor {
+namespace QmlDesigner {
 namespace Internal {
 
 class ChangeObjectTypeVisitor: public QMLRewriter
@@ -55,6 +55,6 @@ private:
 };
 
 } // namespace Internal
-} // namespace QmlEditor
+} // namespace QmlDesigner
 
 #endif // CHANGEOBJECTTYPEVISITOR_H
diff --git a/src/plugins/qmldesigner/core/filemanager/changepropertyvisitor.cpp b/src/plugins/qmldesigner/core/filemanager/changepropertyvisitor.cpp
index 885671d1835f4e8a738060c2dab295e9852fbf3c..f0ea5155ba1b6aae778abf333c66657681cf057b 100644
--- a/src/plugins/qmldesigner/core/filemanager/changepropertyvisitor.cpp
+++ b/src/plugins/qmldesigner/core/filemanager/changepropertyvisitor.cpp
@@ -34,8 +34,8 @@
 
 using namespace QmlJS;
 using namespace QmlJS::AST;
-using namespace QmlEditor;
-using namespace QmlEditor::Internal;
+using namespace QmlDesigner;
+using namespace QmlDesigner::Internal;
 
 ChangePropertyVisitor::ChangePropertyVisitor(QmlDesigner::TextModifier &modifier,
                                              quint32 parentLocation,
diff --git a/src/plugins/qmldesigner/core/filemanager/changepropertyvisitor.h b/src/plugins/qmldesigner/core/filemanager/changepropertyvisitor.h
index 6cc41d8f9179399eb21feb4ff57e70976da5ae6a..ea2df61169c2f91fd6c022e0b9327d1a89af804e 100644
--- a/src/plugins/qmldesigner/core/filemanager/changepropertyvisitor.h
+++ b/src/plugins/qmldesigner/core/filemanager/changepropertyvisitor.h
@@ -33,7 +33,7 @@
 #include "qmlrefactoring.h"
 #include "qmlrewriter.h"
 
-namespace QmlEditor {
+namespace QmlDesigner {
 namespace Internal {
 
 class ChangePropertyVisitor: public QMLRewriter
@@ -65,6 +65,6 @@ private:
 };
 
 } // namespace Internal
-} // namespace QmlEditor
+} // namespace QmlDesigner
 
 #endif // CHANGEPROPERTYVISITOR_H
diff --git a/src/plugins/qmldesigner/core/filemanager/firstdefinitionfinder.cpp b/src/plugins/qmldesigner/core/filemanager/firstdefinitionfinder.cpp
index 64905c35aaf009a5e7a2fbfdc28c47ca15e6c440..de3b5fb1bedaddec381b203b0f5e1bde15f1522a 100644
--- a/src/plugins/qmldesigner/core/filemanager/firstdefinitionfinder.cpp
+++ b/src/plugins/qmldesigner/core/filemanager/firstdefinitionfinder.cpp
@@ -32,7 +32,7 @@
 #include <qmljsast_p.h>
 
 using namespace QmlDesigner;
-using namespace QmlEditor;
+using namespace QmlDesigner;
 using namespace QmlJS::AST;
 
 FirstDefinitionFinder::FirstDefinitionFinder(const QString &text):
diff --git a/src/plugins/qmldesigner/core/filemanager/firstdefinitionfinder.h b/src/plugins/qmldesigner/core/filemanager/firstdefinitionfinder.h
index 170b7a2381f7663dd1d90e4d374df21e31c19445..84bd859fe3a49e37bf587cd3c5eb5bd912041e26 100644
--- a/src/plugins/qmldesigner/core/filemanager/firstdefinitionfinder.h
+++ b/src/plugins/qmldesigner/core/filemanager/firstdefinitionfinder.h
@@ -52,7 +52,7 @@ protected:
     void extractFirstObjectDefinition(QmlJS::AST::UiObjectInitializer* ast);
 
 private:
-    QmlEditor::QmlDocument::Ptr m_doc;
+    QmlDesigner::QmlDocument::Ptr m_doc;
     quint32 m_offset;
     QmlJS::AST::UiObjectDefinition *m_firstObjectDefinition;
 
diff --git a/src/plugins/qmldesigner/core/filemanager/idcollector.cpp b/src/plugins/qmldesigner/core/filemanager/idcollector.cpp
index 54284a9fad423d0e45a15d929bb6edf54a7257ce..26ccfc18574f23adc938812156f9dbf02ace8bd4 100644
--- a/src/plugins/qmldesigner/core/filemanager/idcollector.cpp
+++ b/src/plugins/qmldesigner/core/filemanager/idcollector.cpp
@@ -33,8 +33,8 @@
 
 using namespace QmlJS;
 using namespace QmlJS::AST;
-using namespace QmlEditor;
-using namespace QmlEditor::Internal;
+using namespace QmlDesigner;
+using namespace QmlDesigner::Internal;
 
 QMap<QString, QmlIdSymbol*> IdCollector::operator()(const QString &fileName, QmlJS::AST::UiProgram *ast)
 {
diff --git a/src/plugins/qmldesigner/core/filemanager/idcollector.h b/src/plugins/qmldesigner/core/filemanager/idcollector.h
index b9f3211e9ead2a8c53f5df0643733d9b890fe08b..edd47cff089cde8625ccabb609b625e74dba7b3c 100644
--- a/src/plugins/qmldesigner/core/filemanager/idcollector.h
+++ b/src/plugins/qmldesigner/core/filemanager/idcollector.h
@@ -38,7 +38,7 @@
 #include "qmljsastvisitor_p.h"
 #include "qmlsymbol.h"
 
-namespace QmlEditor {
+namespace QmlDesigner {
 namespace Internal {
 
 class IdCollector: protected QmlJS::AST::Visitor
@@ -64,6 +64,6 @@ private:
 };
 
 } // namespace Internal
-} // namespace QmlEditor
+} // namespace QmlDesigner
 
 #endif // IDCOLLECTOR_H
diff --git a/src/plugins/qmldesigner/core/filemanager/indenter.cpp b/src/plugins/qmldesigner/core/filemanager/indenter.cpp
index 55e709d7f271b5c4c4165b2cbd53262ae0ff5ec5..86fa4511609e78a3d5c435a6e8353d5586257b9b 100644
--- a/src/plugins/qmldesigner/core/filemanager/indenter.cpp
+++ b/src/plugins/qmldesigner/core/filemanager/indenter.cpp
@@ -29,7 +29,7 @@
 
 #include "indenter.h"
 
-using namespace QmlEditor;
+using namespace QmlDesigner;
 
 Indenter::Indenter()
 {
diff --git a/src/plugins/qmldesigner/core/filemanager/indenter.h b/src/plugins/qmldesigner/core/filemanager/indenter.h
index b862003b2cad99ac74fbbc730290b4c689209f7b..7918ad01f17082440b2e2c967e3194cf58a4ea7e 100644
--- a/src/plugins/qmldesigner/core/filemanager/indenter.h
+++ b/src/plugins/qmldesigner/core/filemanager/indenter.h
@@ -30,7 +30,7 @@
 #ifndef INDENTER_H
 #define INDENTER_H
 
-namespace QmlEditor {
+namespace QmlDesigner {
 
 class Indenter
 {
@@ -38,6 +38,6 @@ public:
     Indenter();
 };
 
-} // namespace QmlEditor
+} // namespace QmlDesigner
 
 #endif // INDENTER_H
diff --git a/src/plugins/qmldesigner/core/filemanager/moveobjectbeforeobjectvisitor.cpp b/src/plugins/qmldesigner/core/filemanager/moveobjectbeforeobjectvisitor.cpp
index 62a8ed5429da9faf1678b000b2f6bd4802eeb1f1..1aa670957124b48100ae96cad1496477b02de8cd 100644
--- a/src/plugins/qmldesigner/core/filemanager/moveobjectbeforeobjectvisitor.cpp
+++ b/src/plugins/qmldesigner/core/filemanager/moveobjectbeforeobjectvisitor.cpp
@@ -37,7 +37,7 @@
 
 using namespace QmlJS;
 using namespace QmlJS::AST;
-using namespace QmlEditor::Internal;
+using namespace QmlDesigner::Internal;
 using namespace QmlDesigner;
 
 MoveObjectBeforeObjectVisitor::MoveObjectBeforeObjectVisitor(TextModifier &modifier,
diff --git a/src/plugins/qmldesigner/core/filemanager/moveobjectbeforeobjectvisitor.h b/src/plugins/qmldesigner/core/filemanager/moveobjectbeforeobjectvisitor.h
index 4b405dd306efdd1e324ab10ba7cd154a62118d59..4124b48a1dd863b17ae9ad1ec9a4d1b758d280fb 100644
--- a/src/plugins/qmldesigner/core/filemanager/moveobjectbeforeobjectvisitor.h
+++ b/src/plugins/qmldesigner/core/filemanager/moveobjectbeforeobjectvisitor.h
@@ -34,7 +34,7 @@
 
 #include <QtCore/QStack>
 
-namespace QmlEditor {
+namespace QmlDesigner {
 namespace Internal {
 
 class MoveObjectBeforeObjectVisitor: public QMLRewriter
@@ -74,6 +74,6 @@ private:
 };
 
 } // namespace Internal
-} // namespace QmlEditor
+} // namespace QmlDesigner
 
 #endif // MOVEOBJECTBEFOREOBJECTVISITOR_H
diff --git a/src/plugins/qmldesigner/core/filemanager/moveobjectvisitor.cpp b/src/plugins/qmldesigner/core/filemanager/moveobjectvisitor.cpp
index 71c4b87be03db0af961125f1b47ddaac484755fc..b3932fcfe27b340515d89aaff3c1996cfa5abc85 100644
--- a/src/plugins/qmldesigner/core/filemanager/moveobjectvisitor.cpp
+++ b/src/plugins/qmldesigner/core/filemanager/moveobjectvisitor.cpp
@@ -37,7 +37,7 @@
 
 using namespace QmlJS;
 using namespace QmlJS::AST;
-using namespace QmlEditor::Internal;
+using namespace QmlDesigner::Internal;
 using namespace QmlDesigner;
 
 class Inserter: public QMLRewriter
diff --git a/src/plugins/qmldesigner/core/filemanager/moveobjectvisitor.h b/src/plugins/qmldesigner/core/filemanager/moveobjectvisitor.h
index 5ec981cdb88948cd0f426e8f74fff052df19f435..50ff194dfbcffbb011f3b21f54fd84415cb601a1 100644
--- a/src/plugins/qmldesigner/core/filemanager/moveobjectvisitor.h
+++ b/src/plugins/qmldesigner/core/filemanager/moveobjectvisitor.h
@@ -32,7 +32,7 @@
 
 #include "qmlrewriter.h"
 
-namespace QmlEditor {
+namespace QmlDesigner {
 namespace Internal {
 
 class MoveObjectVisitor: public QMLRewriter
@@ -67,6 +67,6 @@ private:
 };
 
 } // namespace Internal
-} // namespace QmlEditor
+} // namespace QmlDesigner
 
 #endif // MOVEOBJECTVISITOR_H
diff --git a/src/plugins/qmldesigner/core/filemanager/objectlengthcalculator.cpp b/src/plugins/qmldesigner/core/filemanager/objectlengthcalculator.cpp
index cc9f229e147b723bd65daba2572d862df238b4d5..c416bbc815051e29ec49efe26bf6e619efba736c 100644
--- a/src/plugins/qmldesigner/core/filemanager/objectlengthcalculator.cpp
+++ b/src/plugins/qmldesigner/core/filemanager/objectlengthcalculator.cpp
@@ -32,7 +32,7 @@
 #include <qmljsast_p.h>
 
 using namespace QmlDesigner;
-using namespace QmlEditor;
+using namespace QmlDesigner;
 using namespace QmlJS::AST;
 
 ObjectLengthCalculator::ObjectLengthCalculator(const QString &text):
diff --git a/src/plugins/qmldesigner/core/filemanager/objectlengthcalculator.h b/src/plugins/qmldesigner/core/filemanager/objectlengthcalculator.h
index a49352c8b70da6137736e49fc6cd542ebdaeada2..970d086078e6a821a568ab242a0495936fb914d0 100644
--- a/src/plugins/qmldesigner/core/filemanager/objectlengthcalculator.h
+++ b/src/plugins/qmldesigner/core/filemanager/objectlengthcalculator.h
@@ -50,7 +50,7 @@ protected:
     virtual bool visit(QmlJS::AST::UiObjectDefinition *ast);
 
 private:
-    QmlEditor::QmlDocument::Ptr m_doc;
+    QmlDocument::Ptr m_doc;
     quint32 m_offset;
     quint32 m_length;
 };
diff --git a/src/plugins/qmldesigner/core/filemanager/qmldocument.cpp b/src/plugins/qmldesigner/core/filemanager/qmldocument.cpp
index d89e69609f5fbad669ad91ab30af8faaf71f0af0..bf05f48c67535908c67c57fed4281477269fde39 100644
--- a/src/plugins/qmldesigner/core/filemanager/qmldocument.cpp
+++ b/src/plugins/qmldesigner/core/filemanager/qmldocument.cpp
@@ -35,7 +35,7 @@
 #include "qmljsengine_p.h"
 #include "qmljsnodepool_p.h"
 
-using namespace QmlEditor;
+using namespace QmlDesigner;
 using namespace QmlJS;
 
 QmlDocument::QmlDocument(const QString &fileName)
diff --git a/src/plugins/qmldesigner/core/filemanager/qmldocument.h b/src/plugins/qmldesigner/core/filemanager/qmldocument.h
index 4e712d8327a7b1cc34efc97aaa828073371bfa3e..c9cfaa6adfbc228f5fe7e7ca1012e9c204f2684c 100644
--- a/src/plugins/qmldesigner/core/filemanager/qmldocument.h
+++ b/src/plugins/qmldesigner/core/filemanager/qmldocument.h
@@ -42,7 +42,7 @@
 #include "qmljsastfwd_p.h"
 #include "qmlsymbol.h"
 
-namespace QmlEditor {
+namespace QmlDesigner {
 
 class CORESHARED_EXPORT QmlDocument
 {
@@ -104,6 +104,6 @@ public:
     QMap<QString, QmlDocument::Ptr> componentsDefinedByImportedDocuments(const QmlDocument::Ptr &doc, const QString &importPath) const;
 };
 
-} // emd of namespace QmlEditor
+} // emd of namespace QmlDesigner
 
 #endif // QMLDOCUMENT_H
diff --git a/src/plugins/qmldesigner/core/filemanager/qmlrefactoring.cpp b/src/plugins/qmldesigner/core/filemanager/qmlrefactoring.cpp
index 530c1a9ebcc501a750ddad17cf550ca71860d54e..86165c6d8fe64fb5e08bd06a944a0f4ddbfa2a07 100644
--- a/src/plugins/qmldesigner/core/filemanager/qmlrefactoring.cpp
+++ b/src/plugins/qmldesigner/core/filemanager/qmlrefactoring.cpp
@@ -40,8 +40,8 @@
 #include "removepropertyvisitor.h"
 #include "removeuiobjectmembervisitor.h"
 
-using namespace QmlEditor;
-using namespace QmlEditor::Internal;
+using namespace QmlDesigner;
+using namespace QmlDesigner::Internal;
 
 QmlRefactoring::QmlRefactoring(const QmlDocument::Ptr &doc, QmlDesigner::TextModifier &modifier, const QStringList &propertyOrder):
         qmlDocument(doc),
@@ -56,7 +56,7 @@ bool QmlRefactoring::reparseDocument()
 
 //    qDebug() << "QmlRefactoring::reparseDocument() new QML source:" << newSource;
 
-    QmlEditor::QmlDocument::Ptr tmpDocument(QmlEditor::QmlDocument::create("<ModelToTextMerger>"));
+    QmlDesigner::QmlDocument::Ptr tmpDocument(QmlDesigner::QmlDocument::create("<ModelToTextMerger>"));
     tmpDocument->setSource(newSource);
 
     if (tmpDocument->parse()) {
diff --git a/src/plugins/qmldesigner/core/filemanager/qmlrefactoring.h b/src/plugins/qmldesigner/core/filemanager/qmlrefactoring.h
index 9739230aa31205bf295f7abee0a219ef7f7846fc..eff1d4318c1c7facbc0ea61e9f78c8e9d1a74a67 100644
--- a/src/plugins/qmldesigner/core/filemanager/qmlrefactoring.h
+++ b/src/plugins/qmldesigner/core/filemanager/qmlrefactoring.h
@@ -36,7 +36,7 @@
 #include <QSet>
 #include <QString>
 
-namespace QmlEditor {
+namespace QmlDesigner {
 
 class QmlRefactoring
 {
@@ -75,6 +75,6 @@ private:
     QStringList m_propertyOrder;
 };
 
-} // namespace QmlEditor
+} // namespace QmlDesigner
 
 #endif // QMLREFACTORING_H
diff --git a/src/plugins/qmldesigner/core/filemanager/qmlrewriter.cpp b/src/plugins/qmldesigner/core/filemanager/qmlrewriter.cpp
index 3d10930685dbce4df3a6f4da036fb91ae2c5e629..e9542212e5b7f9431ef8209ddf0c1fd3dc090a6a 100644
--- a/src/plugins/qmldesigner/core/filemanager/qmlrewriter.cpp
+++ b/src/plugins/qmldesigner/core/filemanager/qmlrewriter.cpp
@@ -39,7 +39,7 @@
 
 using namespace QmlJS;
 using namespace QmlJS::AST;
-using namespace QmlEditor::Internal;
+using namespace QmlDesigner::Internal;
 
 QMLRewriter::QMLRewriter(QmlDesigner::TextModifier &textModifier):
         m_textModifier(&textModifier),
diff --git a/src/plugins/qmldesigner/core/filemanager/qmlrewriter.h b/src/plugins/qmldesigner/core/filemanager/qmlrewriter.h
index ab58a07770ed783978af922bee83ee5a5f50808d..335bc701696d0dc01ee3ab079ca47dd508b04f84 100644
--- a/src/plugins/qmldesigner/core/filemanager/qmlrewriter.h
+++ b/src/plugins/qmldesigner/core/filemanager/qmlrewriter.h
@@ -37,7 +37,7 @@
 
 #include "textmodifier.h"
 
-namespace QmlEditor {
+namespace QmlDesigner {
 namespace Internal {
 
 class QMLRewriter: protected QmlJS::AST::Visitor
@@ -92,6 +92,6 @@ private:
 };
 
 } // namespace Internal
-} // namespace QmlEditor
+} // namespace QmlDesigner
 
 #endif // QMLREWRITER_H
diff --git a/src/plugins/qmldesigner/core/filemanager/qmlsymbol.cpp b/src/plugins/qmldesigner/core/filemanager/qmlsymbol.cpp
index baa1c1195a6df145bd2561db815cc0fd17f37269..4d561e764f41148e4d427b5cd10700e31b8d3642 100644
--- a/src/plugins/qmldesigner/core/filemanager/qmlsymbol.cpp
+++ b/src/plugins/qmldesigner/core/filemanager/qmlsymbol.cpp
@@ -30,7 +30,7 @@
 #include "qmljsast_p.h"
 #include "qmlsymbol.h"
 
-using namespace QmlEditor;
+using namespace QmlDesigner;
 using namespace QmlJS;
 using namespace QmlJS::AST;
 
diff --git a/src/plugins/qmldesigner/core/filemanager/qmlsymbol.h b/src/plugins/qmldesigner/core/filemanager/qmlsymbol.h
index 1c1aa2119230f7dfd038d19225089b797ea5ae83..197cfb9fa5fd735061630b94bf1a86cdc2be0723 100644
--- a/src/plugins/qmldesigner/core/filemanager/qmlsymbol.h
+++ b/src/plugins/qmldesigner/core/filemanager/qmlsymbol.h
@@ -34,7 +34,7 @@
 
 #include "qmljsastfwd_p.h"
 
-namespace QmlEditor {
+namespace QmlDesigner {
 
 class QmlSymbol
 {
@@ -116,6 +116,6 @@ private:
     QmlJS::AST::UiPublicMember *propertyNode() const;
 };
 
-} // namespace QmlEditor
+} // namespace QmlDesigner
 
 #endif // QMLSYMBOL_H
diff --git a/src/plugins/qmldesigner/core/filemanager/removepropertyvisitor.cpp b/src/plugins/qmldesigner/core/filemanager/removepropertyvisitor.cpp
index 5c38e7f4cde98e1559e819e0ce905ec5dfb08a30..e59a0cab6d9d4c0eceebf87dda1eab11dc7bc098 100644
--- a/src/plugins/qmldesigner/core/filemanager/removepropertyvisitor.cpp
+++ b/src/plugins/qmldesigner/core/filemanager/removepropertyvisitor.cpp
@@ -32,7 +32,7 @@
 
 #include "removepropertyvisitor.h"
 
-using namespace QmlEditor::Internal;
+using namespace QmlDesigner::Internal;
 using namespace QmlJS;
 using namespace QmlJS::AST;
 
diff --git a/src/plugins/qmldesigner/core/filemanager/removepropertyvisitor.h b/src/plugins/qmldesigner/core/filemanager/removepropertyvisitor.h
index a396b8bac02cdcc4f22d084501e87d1c3547a14a..79813e958907d8c96c24e40b5c79ecc0c757d74b 100644
--- a/src/plugins/qmldesigner/core/filemanager/removepropertyvisitor.h
+++ b/src/plugins/qmldesigner/core/filemanager/removepropertyvisitor.h
@@ -34,7 +34,7 @@
 
 #include "qmlrewriter.h"
 
-namespace QmlEditor {
+namespace QmlDesigner {
 namespace Internal {
 
 class RemovePropertyVisitor: public QMLRewriter
@@ -58,6 +58,6 @@ private:
 };
 
 } // namespace Internal
-} // namespace QmlEditor
+} // namespace QmlDesigner
 
 #endif // REMOVEPROPERTYVISITOR_H
diff --git a/src/plugins/qmldesigner/core/filemanager/removeuiobjectmembervisitor.cpp b/src/plugins/qmldesigner/core/filemanager/removeuiobjectmembervisitor.cpp
index bf0bcfb5ef5caf8c0a06832b269965f352dc677a..ec5ff404b76cb07003b52257cab65251cc3e6815 100644
--- a/src/plugins/qmldesigner/core/filemanager/removeuiobjectmembervisitor.cpp
+++ b/src/plugins/qmldesigner/core/filemanager/removeuiobjectmembervisitor.cpp
@@ -33,8 +33,8 @@
 
 #include "removeuiobjectmembervisitor.h"
 
-using namespace QmlEditor;
-using namespace QmlEditor::Internal;
+using namespace QmlDesigner;
+using namespace QmlDesigner::Internal;
 using namespace QmlJS;
 using namespace QmlJS::AST;
 
diff --git a/src/plugins/qmldesigner/core/filemanager/removeuiobjectmembervisitor.h b/src/plugins/qmldesigner/core/filemanager/removeuiobjectmembervisitor.h
index 85816f197ad7eee41d5c341ebe253a101d3d05cf..b3a1dd8efdd03a25524c5dfa63a3e72b5f8f8d33 100644
--- a/src/plugins/qmldesigner/core/filemanager/removeuiobjectmembervisitor.h
+++ b/src/plugins/qmldesigner/core/filemanager/removeuiobjectmembervisitor.h
@@ -34,7 +34,7 @@
 
 #include "qmlrewriter.h"
 
-namespace QmlEditor {
+namespace QmlDesigner {
 namespace Internal {
 
 class RemoveUIObjectMemberVisitor: public QMLRewriter
@@ -70,6 +70,6 @@ private:
 };
 
 } // namespace Internal
-} // namespace QmlEditor
+} // namespace QmlDesigner
 
 #endif // REMOVEUIOBJECTMEMBERVISITOR_H
diff --git a/src/plugins/qmldesigner/core/model/modeltotextmerger.cpp b/src/plugins/qmldesigner/core/model/modeltotextmerger.cpp
index 03b626826696a888d17023bfda009f474fb21864..362573a7735676ee9c9e8c16b5db89c0aedc4387 100644
--- a/src/plugins/qmldesigner/core/model/modeltotextmerger.cpp
+++ b/src/plugins/qmldesigner/core/model/modeltotextmerger.cpp
@@ -193,7 +193,7 @@ void ModelToTextMerger::applyChanges()
     if (m_rewriteActions.isEmpty())
         return;
 
-    QmlEditor::QmlDocument::Ptr tmpDocument(QmlEditor::QmlDocument::create(QLatin1String("<ModelToTextMerger>")));
+    QmlDocument::Ptr tmpDocument(QmlDocument::create(QLatin1String("<ModelToTextMerger>")));
     tmpDocument->setSource(m_rewriterView->textModifier()->text());
     if (!tmpDocument->parse()) {
         qDebug() << "*** Possible problem: QML file wasn't parsed correctly.";
@@ -207,7 +207,7 @@ void ModelToTextMerger::applyChanges()
         ModelNodePositionRecalculator positionRecalculator(m_rewriterView->positionStorage(), m_rewriterView->positionStorage()->modelNodes());
         positionRecalculator.connectTo(textModifier);
 
-        QmlEditor::QmlRefactoring refactoring(tmpDocument, *textModifier, getPropertyOrder());
+        QmlDesigner::QmlRefactoring refactoring(tmpDocument, *textModifier, getPropertyOrder());
 
         textModifier->deactivateChangeSignals();
         textModifier->startGroup();
@@ -259,19 +259,19 @@ void ModelToTextMerger::schedule(RewriteAction *action)
     m_rewriteActions.append(action);
 }
 
-QmlEditor::QmlRefactoring::PropertyType ModelToTextMerger::propertyType(const AbstractProperty &property)
+QmlDesigner::QmlRefactoring::PropertyType ModelToTextMerger::propertyType(const AbstractProperty &property)
 {
     if (property.isBindingProperty())
-        return QmlEditor::QmlRefactoring::ObjectBinding;
+        return QmlDesigner::QmlRefactoring::ObjectBinding;
     else if (property.isNodeListProperty())
-        return QmlEditor::QmlRefactoring::ArrayBinding;
+        return QmlDesigner::QmlRefactoring::ArrayBinding;
     else if (property.isNodeProperty())
-        return QmlEditor::QmlRefactoring::ObjectBinding;
+        return QmlDesigner::QmlRefactoring::ObjectBinding;
     else if (property.isVariantProperty())
-        return QmlEditor::QmlRefactoring::ScriptBinding;
+        return QmlDesigner::QmlRefactoring::ScriptBinding;
 
     Q_ASSERT(!"cannot convert property type");
-    return (QmlEditor::QmlRefactoring::PropertyType) -1;
+    return (QmlDesigner::QmlRefactoring::PropertyType) -1;
 }
 
 QStringList ModelToTextMerger::m_propertyOrder;
diff --git a/src/plugins/qmldesigner/core/model/modeltotextmerger.h b/src/plugins/qmldesigner/core/model/modeltotextmerger.h
index 3511625a78cefdb0c086ca68b863d72149864ed6..c3bc38ebadda240c5bd9880497e8e67adb3c2004 100644
--- a/src/plugins/qmldesigner/core/model/modeltotextmerger.h
+++ b/src/plugins/qmldesigner/core/model/modeltotextmerger.h
@@ -77,7 +77,7 @@ protected:
     QList<RewriteAction *> scheduledRewriteActions() const
     { return m_rewriteActions; }
 
-    static QmlEditor::QmlRefactoring::PropertyType propertyType(const AbstractProperty &property);
+    static QmlDesigner::QmlRefactoring::PropertyType propertyType(const AbstractProperty &property);
     static QStringList getPropertyOrder();
 
     static bool isInHierarchy(const AbstractProperty &property);
diff --git a/src/plugins/qmldesigner/core/model/rewriteaction.cpp b/src/plugins/qmldesigner/core/model/rewriteaction.cpp
index 363995bbaddaf4ba816d7db13c62c1247b985225..2a1a8652d93d063c58dbf651624cd54b8ac4c302 100644
--- a/src/plugins/qmldesigner/core/model/rewriteaction.cpp
+++ b/src/plugins/qmldesigner/core/model/rewriteaction.cpp
@@ -34,7 +34,7 @@
 
 using namespace QmlDesigner;
 using namespace QmlDesigner::Internal;
-using namespace QmlEditor;
+using namespace QmlDesigner;
 
 static inline QString toString(QmlRefactoring::PropertyType type)
 {
@@ -69,7 +69,7 @@ void AddPropertyRewriteAction::dump(const QString &prefix) const
              ;
 }
 
-bool ChangeIdRewriteAction::execute(QmlEditor::QmlRefactoring &refactoring, ModelNodePositionStorage &positionStore)
+bool ChangeIdRewriteAction::execute(QmlDesigner::QmlRefactoring &refactoring, ModelNodePositionStorage &positionStore)
 {
     const int nodeLocation = positionStore.nodeOffset(m_node);
     static const QLatin1String idPropertyName("id");
@@ -93,7 +93,7 @@ void ChangeIdRewriteAction::dump(const QString &prefix) const
              ;
 }
 
-bool ChangePropertyRewriteAction::execute(QmlEditor::QmlRefactoring &refactoring, ModelNodePositionStorage &positionStore)
+bool ChangePropertyRewriteAction::execute(QmlDesigner::QmlRefactoring &refactoring, ModelNodePositionStorage &positionStore)
 {
     const int nodeLocation = positionStore.nodeOffset(m_property.parentModelNode());
     bool result = false;
@@ -124,7 +124,7 @@ void ChangePropertyRewriteAction::dump(const QString &prefix) const
              ;
 }
 
-bool ChangeTypeRewriteAction::execute(QmlEditor::QmlRefactoring &refactoring, ModelNodePositionStorage &positionStore)
+bool ChangeTypeRewriteAction::execute(QmlDesigner::QmlRefactoring &refactoring, ModelNodePositionStorage &positionStore)
 {
     const int nodeLocation = positionStore.nodeOffset(m_node);
     bool result = false;
@@ -147,7 +147,7 @@ void ChangeTypeRewriteAction::dump(const QString &prefix) const
              ;
 }
 
-bool RemoveNodeRewriteAction::execute(QmlEditor::QmlRefactoring &refactoring, ModelNodePositionStorage &positionStore)
+bool RemoveNodeRewriteAction::execute(QmlDesigner::QmlRefactoring &refactoring, ModelNodePositionStorage &positionStore)
 {
     const int nodeLocation = positionStore.nodeOffset(m_node);
     bool result = false;
@@ -165,7 +165,7 @@ void RemoveNodeRewriteAction::dump(const QString &prefix) const
              ;
 }
 
-bool RemovePropertyRewriteAction::execute(QmlEditor::QmlRefactoring &refactoring, ModelNodePositionStorage &positionStore)
+bool RemovePropertyRewriteAction::execute(QmlDesigner::QmlRefactoring &refactoring, ModelNodePositionStorage &positionStore)
 {
     const int nodeLocation = positionStore.nodeOffset(m_property.parentModelNode());
     bool result = false;
@@ -184,7 +184,7 @@ void RemovePropertyRewriteAction::dump(const QString &prefix) const
              ;
 }
 
-bool ReparentNodeRewriteAction::execute(QmlEditor::QmlRefactoring &refactoring, ModelNodePositionStorage &positionStore)
+bool ReparentNodeRewriteAction::execute(QmlDesigner::QmlRefactoring &refactoring, ModelNodePositionStorage &positionStore)
 {
     const int nodeLocation = positionStore.nodeOffset(m_node);
     const int targetParentObjectLocation = positionStore.nodeOffset(m_targetProperty.parentModelNode());
diff --git a/src/plugins/qmldesigner/core/model/rewriteaction.h b/src/plugins/qmldesigner/core/model/rewriteaction.h
index 2027d5258a644d60815bad5329a679465d4d8406..6afaf222923866c25976cb273d224b73d3b9c105 100644
--- a/src/plugins/qmldesigner/core/model/rewriteaction.h
+++ b/src/plugins/qmldesigner/core/model/rewriteaction.h
@@ -50,7 +50,7 @@ class MoveNodeRewriteAction;
 class RewriteAction
 {
 public:
-    virtual bool execute(QmlEditor::QmlRefactoring &refactoring, ModelNodePositionStorage &positionStore) = 0;
+    virtual bool execute(QmlDesigner::QmlRefactoring &refactoring, ModelNodePositionStorage &positionStore) = 0;
     virtual void dump(const QString &prefix) const = 0;
 
     virtual AddPropertyRewriteAction const *asAddPropertyRewriteAction() const { return 0; }
@@ -74,11 +74,11 @@ private:
 class AddPropertyRewriteAction: public RewriteAction
 {
 public:
-    AddPropertyRewriteAction(const AbstractProperty &property, const QString &valueText, QmlEditor::QmlRefactoring::PropertyType propertyType, const ModelNode &containedModelNode/* = ModelNode()*/):
+    AddPropertyRewriteAction(const AbstractProperty &property, const QString &valueText, QmlDesigner::QmlRefactoring::PropertyType propertyType, const ModelNode &containedModelNode/* = ModelNode()*/):
             m_property(property), m_valueText(valueText), m_propertyType(propertyType), m_containedModelNode(containedModelNode)
     {}
 
-    virtual bool execute(QmlEditor::QmlRefactoring &refactoring, ModelNodePositionStorage &positionStore);
+    virtual bool execute(QmlDesigner::QmlRefactoring &refactoring, ModelNodePositionStorage &positionStore);
     virtual void dump(const QString &prefix) const;
 
     virtual AddPropertyRewriteAction const *asAddPropertyRewriteAction() const { return this; }
@@ -89,7 +89,7 @@ public:
     QString valueText() const
     { return m_valueText; }
 
-    QmlEditor::QmlRefactoring::PropertyType propertyType() const
+    QmlDesigner::QmlRefactoring::PropertyType propertyType() const
     { return m_propertyType; }
 
     ModelNode containedModelNode() const
@@ -98,7 +98,7 @@ public:
 private:
     AbstractProperty m_property;
     QString m_valueText;
-    QmlEditor::QmlRefactoring::PropertyType m_propertyType;
+    QmlDesigner::QmlRefactoring::PropertyType m_propertyType;
     ModelNode m_containedModelNode;
 };
 
@@ -109,7 +109,7 @@ public:
             m_node(node), m_oldId(oldId), m_newId(newId)
     {}
 
-    virtual bool execute(QmlEditor::QmlRefactoring &refactoring, ModelNodePositionStorage &positionStore);
+    virtual bool execute(QmlDesigner::QmlRefactoring &refactoring, ModelNodePositionStorage &positionStore);
     virtual void dump(const QString &prefix) const;
 
     virtual ChangeIdRewriteAction const *asChangeIdRewriteAction() const { return this; }
@@ -126,11 +126,11 @@ private:
 class ChangePropertyRewriteAction: public RewriteAction
 {
 public:
-    ChangePropertyRewriteAction(const AbstractProperty &property, const QString &valueText, QmlEditor::QmlRefactoring::PropertyType propertyType, const ModelNode &containedModelNode/* = ModelNode()*/):
+    ChangePropertyRewriteAction(const AbstractProperty &property, const QString &valueText, QmlDesigner::QmlRefactoring::PropertyType propertyType, const ModelNode &containedModelNode/* = ModelNode()*/):
             m_property(property), m_valueText(valueText), m_propertyType(propertyType), m_containedModelNode(containedModelNode)
     {}
 
-    virtual bool execute(QmlEditor::QmlRefactoring &refactoring, ModelNodePositionStorage &positionStore);
+    virtual bool execute(QmlDesigner::QmlRefactoring &refactoring, ModelNodePositionStorage &positionStore);
     virtual void dump(const QString &prefix) const;
 
     virtual ChangePropertyRewriteAction const *asChangePropertyRewriteAction() const { return this; }
@@ -141,7 +141,7 @@ public:
     QString valueText() const
     { return m_valueText; }
 
-    QmlEditor::QmlRefactoring::PropertyType propertyType() const
+    QmlDesigner::QmlRefactoring::PropertyType propertyType() const
     { return m_propertyType; }
 
     ModelNode containedModelNode() const
@@ -150,7 +150,7 @@ public:
 private:
     AbstractProperty m_property;
     QString m_valueText;
-    QmlEditor::QmlRefactoring::PropertyType m_propertyType;
+    QmlDesigner::QmlRefactoring::PropertyType m_propertyType;
     ModelNode m_containedModelNode;
 };
 
@@ -161,7 +161,7 @@ public:
             m_node(node)
     {}
 
-    virtual bool execute(QmlEditor::QmlRefactoring &refactoring, ModelNodePositionStorage &positionStore);
+    virtual bool execute(QmlDesigner::QmlRefactoring &refactoring, ModelNodePositionStorage &positionStore);
     virtual void dump(const QString &prefix) const;
 
     virtual ChangeTypeRewriteAction const *asChangeTypeRewriteAction() const { return this; }
@@ -180,7 +180,7 @@ public:
             m_node(node)
     {}
 
-    virtual bool execute(QmlEditor::QmlRefactoring &refactoring, ModelNodePositionStorage &positionStore);
+    virtual bool execute(QmlDesigner::QmlRefactoring &refactoring, ModelNodePositionStorage &positionStore);
     virtual void dump(const QString &prefix) const;
 
     virtual RemoveNodeRewriteAction const *asRemoveNodeRewriteAction() const { return this; }
@@ -199,7 +199,7 @@ public:
             m_property(property)
     {}
 
-    virtual bool execute(QmlEditor::QmlRefactoring &refactoring, ModelNodePositionStorage &positionStore);
+    virtual bool execute(QmlDesigner::QmlRefactoring &refactoring, ModelNodePositionStorage &positionStore);
     virtual void dump(const QString &prefix) const;
 
     virtual RemovePropertyRewriteAction const *asRemovePropertyRewriteAction() const { return this; }
@@ -214,11 +214,11 @@ private:
 class ReparentNodeRewriteAction: public RewriteAction
 {
 public:
-    ReparentNodeRewriteAction(const ModelNode &node, const AbstractProperty &targetProperty, QmlEditor::QmlRefactoring::PropertyType propertyType):
+    ReparentNodeRewriteAction(const ModelNode &node, const AbstractProperty &targetProperty, QmlDesigner::QmlRefactoring::PropertyType propertyType):
             m_node(node), m_targetProperty(targetProperty), m_propertyType(propertyType)
     {}
 
-    virtual bool execute(QmlEditor::QmlRefactoring &refactoring, ModelNodePositionStorage &positionStore);
+    virtual bool execute(QmlDesigner::QmlRefactoring &refactoring, ModelNodePositionStorage &positionStore);
     virtual void dump(const QString &prefix) const;
 
     virtual ReparentNodeRewriteAction const *asReparentNodeRewriteAction() const { return this; }
@@ -229,13 +229,13 @@ public:
     AbstractProperty targetProperty() const
     { return m_targetProperty; }
 
-    QmlEditor::QmlRefactoring::PropertyType propertyType() const
+    QmlDesigner::QmlRefactoring::PropertyType propertyType() const
     { return m_propertyType; }
 
 private:
     ModelNode m_node;
     AbstractProperty m_targetProperty;
-    QmlEditor::QmlRefactoring::PropertyType m_propertyType;
+    QmlDesigner::QmlRefactoring::PropertyType m_propertyType;
 };
 
 class MoveNodeRewriteAction: public RewriteAction
@@ -245,7 +245,7 @@ public:
             m_movingNode(movingNode), m_newTrailingNode(newTrailingNode)
     {}
 
-    virtual bool execute(QmlEditor::QmlRefactoring &refactoring, ModelNodePositionStorage &positionStore);
+    virtual bool execute(QmlDesigner::QmlRefactoring &refactoring, ModelNodePositionStorage &positionStore);
     virtual void dump(const QString &prefix) const;
 
     virtual MoveNodeRewriteAction const *asMoveNodeRewriteAction() const { return this; }
diff --git a/src/plugins/qmldesigner/core/model/rewriterview.cpp b/src/plugins/qmldesigner/core/model/rewriterview.cpp
index 95d753dac4593423dfd643b0e424950df7a31d57..e209b9b71ec18d0c9d09736d16db76728acb2799 100644
--- a/src/plugins/qmldesigner/core/model/rewriterview.cpp
+++ b/src/plugins/qmldesigner/core/model/rewriterview.cpp
@@ -391,7 +391,7 @@ void RewriterView::addError(const RewriterView::Error &error)
 
 QMap<ModelNode, QString> RewriterView::extractText(const QList<ModelNode> &nodes) const
 {
-    QmlEditor::ASTObjectTextExtractor extract(m_textModifier->text());
+    QmlDesigner::ASTObjectTextExtractor extract(m_textModifier->text());
     QMap<ModelNode, QString> result;
 
     foreach (const ModelNode &node, nodes) {
diff --git a/src/plugins/qmleditor/qmlcodecompletion.cpp b/src/plugins/qmleditor/qmlcodecompletion.cpp
index 81f64a1d663083a19244c6931897c4038f593aaa..48fa5512a1af02011efd66e67c2103a9548a0f62 100644
--- a/src/plugins/qmleditor/qmlcodecompletion.cpp
+++ b/src/plugins/qmleditor/qmlcodecompletion.cpp
@@ -90,7 +90,7 @@ int QmlCodeCompletion::startCompletion(TextEditor::ITextEditable *editor)
     m_startPosition = pos;
     m_completions.clear();
 
-    QmlDocument::Ptr qmlDocument = edit->qmlDocument();
+    Qml::QmlDocument::Ptr qmlDocument = edit->qmlDocument();
 //    qDebug() << "*** document:" << qmlDocument;
     if (qmlDocument.isNull())
         return pos;
diff --git a/src/plugins/qmleditor/qmleditor.cpp b/src/plugins/qmleditor/qmleditor.cpp
index 14bf8236a876dd7f8f7245340b6f58c57f23f92a..4513984d4a6ad9c4adf1d9459a48a2c1dec23812 100644
--- a/src/plugins/qmleditor/qmleditor.cpp
+++ b/src/plugins/qmleditor/qmleditor.cpp
@@ -338,8 +338,8 @@ QmlTextEditor::QmlTextEditor(QWidget *parent) :
     m_typeSystem = ExtensionSystem::PluginManager::instance()->getObject<Qml::QmlTypeSystem>();
 
     if (m_modelManager) {
-        connect(m_modelManager, SIGNAL(documentUpdated(QmlEditor::QmlDocument::Ptr)),
-                this, SLOT(onDocumentUpdated(QmlEditor::QmlDocument::Ptr)));
+        connect(m_modelManager, SIGNAL(documentUpdated(Qml::QmlDocument::Ptr)),
+                this, SLOT(onDocumentUpdated(Qml::QmlDocument::Ptr)));
     }
 }
 
@@ -384,7 +384,7 @@ void QmlTextEditor::updateDocumentNow()
     m_modelManager->updateSourceFiles(QStringList() << fileName);
 }
 
-void QmlTextEditor::onDocumentUpdated(QmlEditor::QmlDocument::Ptr doc)
+void QmlTextEditor::onDocumentUpdated(Qml::QmlDocument::Ptr doc)
 {
     if (file()->fileName() != doc->fileName())
         return;
diff --git a/src/plugins/qmleditor/qmleditor.h b/src/plugins/qmleditor/qmleditor.h
index edd3c8db2056ae09c44363a5ebb651b73989b342..8e220bf022ccde54ac711deb6d0eb89abaac020d 100644
--- a/src/plugins/qmleditor/qmleditor.h
+++ b/src/plugins/qmleditor/qmleditor.h
@@ -108,13 +108,13 @@ public:
 
     virtual void unCommentSelection();
 
-    QmlDocument::Ptr qmlDocument() const { return m_document; }
+    Qml::QmlDocument::Ptr qmlDocument() const { return m_document; }
 
 public slots:
     virtual void setFontSettings(const TextEditor::FontSettings &);
 
 private slots:
-    void onDocumentUpdated(QmlEditor::QmlDocument::Ptr doc);
+    void onDocumentUpdated(Qml::QmlDocument::Ptr doc);
 
     void updateDocument();
     void updateDocumentNow();
@@ -157,7 +157,7 @@ private:
     QMap<QString, QList<QmlJS::AST::SourceLocation> > m_ids; // ### use QMultiMap
     int m_idsRevision;
     QList<QmlJS::DiagnosticMessage> m_diagnosticMessages;
-    QmlDocument::Ptr m_document;
+    Qml::QmlDocument::Ptr m_document;
     QmlModelManagerInterface *m_modelManager;
     Qml::QmlTypeSystem *m_typeSystem;
     QTextCharFormat m_occurrencesFormat;
diff --git a/src/plugins/qmleditor/qmlexpressionundercursor.h b/src/plugins/qmleditor/qmlexpressionundercursor.h
index 5cf78c92d3741003d12a5f707c5e86faa8599af5..11b46a60ead54d6fecccf5b5a82d998354c1298e 100644
--- a/src/plugins/qmleditor/qmlexpressionundercursor.h
+++ b/src/plugins/qmleditor/qmlexpressionundercursor.h
@@ -53,7 +53,7 @@ public:
     QmlExpressionUnderCursor();
     virtual ~QmlExpressionUnderCursor();
 
-    void operator()(const QTextCursor &cursor, const QmlDocument::Ptr &doc);
+    void operator()(const QTextCursor &cursor, const Qml::QmlDocument::Ptr &doc);
 
     QStack<Qml::QmlSymbol *> expressionScopes() const
     { return _expressionScopes; }
diff --git a/src/plugins/qmleditor/qmllookupcontext.h b/src/plugins/qmleditor/qmllookupcontext.h
index a78673280c7c538affaf3024f110d25e21b6a26d..7f2f300ee2cd81171b359ef734414aa029719dd1 100644
--- a/src/plugins/qmleditor/qmllookupcontext.h
+++ b/src/plugins/qmleditor/qmllookupcontext.h
@@ -44,8 +44,8 @@ class QmlLookupContext
 {
 public:
     QmlLookupContext(const QStack<Qml::QmlSymbol *> &scopes,
-                     const QmlDocument::Ptr &doc,
-                     const Snapshot &snapshot,
+                     const Qml::QmlDocument::Ptr &doc,
+                     const Qml::Snapshot &snapshot,
                      Qml::QmlTypeSystem *typeSystem);
 
     Qml::QmlSymbol *resolve(const QString &name);
@@ -54,7 +54,7 @@ public:
     Qml::QmlSymbol *resolveType(QmlJS::AST::UiQualifiedId *name)
     { return resolveType(toString(name), _doc->fileName()); }
 
-    QmlDocument::Ptr document() const
+    Qml::QmlDocument::Ptr document() const
     { return _doc; }
 
     QList<Qml::QmlSymbol*> visibleSymbolsInScope();
@@ -71,8 +71,8 @@ private:
 
 private:
     QStack<Qml::QmlSymbol *> _scopes;
-    QmlDocument::Ptr _doc;
-    Snapshot _snapshot;
+    Qml::QmlDocument::Ptr _doc;
+    Qml::Snapshot _snapshot;
     Qml::QmlTypeSystem *m_typeSystem;
 };
 
diff --git a/src/plugins/qmleditor/qmlmodelmanager.cpp b/src/plugins/qmleditor/qmlmodelmanager.cpp
index 184c3b53855a9651b4b2ee46df33dd5be92bfad7..8b8c46c9f60c5240b3373cec464c1cf803d5b822 100644
--- a/src/plugins/qmleditor/qmlmodelmanager.cpp
+++ b/src/plugins/qmleditor/qmlmodelmanager.cpp
@@ -52,13 +52,13 @@ QmlModelManager::QmlModelManager(QObject *parent):
 {
     m_synchronizer.setCancelOnWait(true);
 
-    qRegisterMetaType<QmlEditor::QmlDocument::Ptr>("QmlEditor::QmlDocument::Ptr");
+    qRegisterMetaType<Qml::QmlDocument::Ptr>("Qml::QmlDocument::Ptr");
 
-    connect(this, SIGNAL(documentUpdated(QmlEditor::QmlDocument::Ptr)),
-            this, SLOT(onDocumentUpdated(QmlEditor::QmlDocument::Ptr)));
+    connect(this, SIGNAL(documentUpdated(Qml::QmlDocument::Ptr)),
+            this, SLOT(onDocumentUpdated(Qml::QmlDocument::Ptr)));
 }
 
-Snapshot QmlModelManager::snapshot() const
+Qml::Snapshot QmlModelManager::snapshot() const
 {
     QMutexLocker locker(&m_mutex);
 
@@ -119,10 +119,10 @@ QMap<QString, QString> QmlModelManager::buildWorkingCopyList()
     return workingCopy;
 }
 
-void QmlModelManager::emitDocumentUpdated(QmlDocument::Ptr doc)
+void QmlModelManager::emitDocumentUpdated(Qml::QmlDocument::Ptr doc)
 { emit documentUpdated(doc); }
 
-void QmlModelManager::onDocumentUpdated(QmlEditor::QmlDocument::Ptr doc)
+void QmlModelManager::onDocumentUpdated(Qml::QmlDocument::Ptr doc)
 {
     QMutexLocker locker(&m_mutex);
 
@@ -154,7 +154,7 @@ void QmlModelManager::parse(QFutureInterface<void> &future,
             }
         }
 
-        QmlDocument::Ptr doc = QmlDocument::create(fileName);
+        Qml::QmlDocument::Ptr doc = Qml::QmlDocument::create(fileName);
         doc->setSource(contents);
         doc->parse();
 
diff --git a/src/plugins/qmleditor/qmlmodelmanager.h b/src/plugins/qmleditor/qmlmodelmanager.h
index d4a2b8d05c45d278c4fb2977c2db48c18e7941b5..25ed28ac9b284f83e079ec80078f25d4090d3fc6 100644
--- a/src/plugins/qmleditor/qmlmodelmanager.h
+++ b/src/plugins/qmleditor/qmlmodelmanager.h
@@ -52,10 +52,10 @@ class QmlModelManager: public QmlModelManagerInterface
 public:
     QmlModelManager(QObject *parent = 0);
 
-    virtual Snapshot snapshot() const;
+    virtual Qml::Snapshot snapshot() const;
     virtual void updateSourceFiles(const QStringList &files);
 
-    void emitDocumentUpdated(QmlDocument::Ptr doc);
+    void emitDocumentUpdated(Qml::QmlDocument::Ptr doc);
 
 Q_SIGNALS:
     void projectPathChanged(const QString &projectPath);
@@ -63,7 +63,7 @@ Q_SIGNALS:
 
 private Q_SLOTS:
     // this should be executed in the GUI thread.
-    void onDocumentUpdated(QmlEditor::QmlDocument::Ptr doc);
+    void onDocumentUpdated(Qml::QmlDocument::Ptr doc);
 
 protected:
     QFuture<void> refreshSourceFiles(const QStringList &sourceFiles);
@@ -77,7 +77,7 @@ protected:
 private:
     mutable QMutex m_mutex;
     Core::ICore *m_core;
-    Snapshot _snapshot;
+    Qml::Snapshot _snapshot;
 
     QFutureSynchronizer<void> m_synchronizer;
 };
diff --git a/src/plugins/qmleditor/qmlmodelmanagerinterface.h b/src/plugins/qmleditor/qmlmodelmanagerinterface.h
index 896f76a871da167e434c9cf5cb6baae1cd15da1a..a221e6d13c7d16ba8a4924618beef264076f1b6a 100644
--- a/src/plugins/qmleditor/qmlmodelmanagerinterface.h
+++ b/src/plugins/qmleditor/qmlmodelmanagerinterface.h
@@ -39,9 +39,13 @@
 #include <qml/qmldocument.h>
 #include <qml/metatype/qmltypesystem.h>
 
-namespace QmlEditor {
 
+namespace Qml {
 class Snapshot;
+}
+
+
+namespace QmlEditor {
 
 class QMLEDITOR_EXPORT QmlModelManagerInterface: public QObject
 {
@@ -51,11 +55,11 @@ public:
     QmlModelManagerInterface(QObject *parent = 0);
     virtual ~QmlModelManagerInterface();
 
-    virtual Snapshot snapshot() const = 0;
+    virtual Qml::Snapshot snapshot() const = 0;
     virtual void updateSourceFiles(const QStringList &files) = 0;
 
 signals:
-    void documentUpdated(QmlEditor::QmlDocument::Ptr doc);
+    void documentUpdated(Qml::QmlDocument::Ptr doc);
 };
 
 }
diff --git a/src/plugins/qmlprojectmanager/qmlprojectplugin.cpp b/src/plugins/qmlprojectmanager/qmlprojectplugin.cpp
index afc0dc81aab0d60950e73555ec27b3df80a6234c..d07909d5f07c048c5c521603349e39d70b6fae50 100644
--- a/src/plugins/qmlprojectmanager/qmlprojectplugin.cpp
+++ b/src/plugins/qmlprojectmanager/qmlprojectplugin.cpp
@@ -100,8 +100,8 @@ void QmlProjectPlugin::extensionsInitialized()
 
     QmlEditor::QmlModelManagerInterface *modelManager = pluginManager->getObject<QmlEditor::QmlModelManagerInterface>();
     Q_ASSERT(modelManager);
-    connect(modelManager, SIGNAL(documentUpdated(QmlEditor::QmlDocument::Ptr)),
-            m_qmlTaskManager, SLOT(documentUpdated(QmlEditor::QmlDocument::Ptr)));
+    connect(modelManager, SIGNAL(documentUpdated(Qml::QmlDocument::Ptr)),
+            m_qmlTaskManager, SLOT(documentUpdated(Qml::QmlDocument::Ptr)));
 }
 
 Q_EXPORT_PLUGIN(QmlProjectPlugin)
diff --git a/src/plugins/qmlprojectmanager/qmltaskmanager.cpp b/src/plugins/qmlprojectmanager/qmltaskmanager.cpp
index 041a009d7dc3f5e0bbebf7e3a011946cdd27078e..ad34a1a227be1f8691c757f9500572585b6315ea 100644
--- a/src/plugins/qmlprojectmanager/qmltaskmanager.cpp
+++ b/src/plugins/qmlprojectmanager/qmltaskmanager.cpp
@@ -48,7 +48,7 @@ void QmlTaskManager::setTaskWindow(ProjectExplorer::TaskWindow *taskWindow)
     m_taskWindow->addCategory(Constants::TASK_CATEGORY_QML, "Qml");
 }
 
-void QmlTaskManager::documentUpdated(QmlEditor::QmlDocument::Ptr doc)
+void QmlTaskManager::documentUpdated(Qml::QmlDocument::Ptr doc)
 {
 #if 0 // This will give way too many flickering errors in the build-results pane *when you're typing*
     m_taskWindow->clearTasks(Constants::TASK_CATEGORY_QML);
diff --git a/src/plugins/qmlprojectmanager/qmltaskmanager.h b/src/plugins/qmlprojectmanager/qmltaskmanager.h
index ab0b95f3f37a80db35033b77c72f73a2b83a6c4c..460f09005dd11361d16edfda0c4e3072afdf228d 100644
--- a/src/plugins/qmlprojectmanager/qmltaskmanager.h
+++ b/src/plugins/qmlprojectmanager/qmltaskmanager.h
@@ -46,7 +46,7 @@ public:
     void setTaskWindow(ProjectExplorer::TaskWindow *taskWindow);
 
 public slots:
-    void documentUpdated(QmlEditor::QmlDocument::Ptr doc);
+    void documentUpdated(Qml::QmlDocument::Ptr doc);
 
 private:
     ProjectExplorer::TaskWindow *m_taskWindow;
diff --git a/src/shared/qml/metatype/exception.cpp b/src/shared/qml/metatype/exception.cpp
index ecac16398d4bc4947e43099df9bfa9e67ea371ba..7c7c228c4c1e15e5eb9850b6e372312f90fd50a3 100644
--- a/src/shared/qml/metatype/exception.cpp
+++ b/src/shared/qml/metatype/exception.cpp
@@ -41,7 +41,7 @@
 \defgroup CoreExceptions
 */
 /*!
-\class QmlDesigner::Exception
+\class Qml::Exception
 \ingroup CoreExceptions
 \brief This is the abstract base class for all excetions.
     Exceptions should be used in cases there is no other way to say something goes wrong. For example
diff --git a/src/shared/qml/metatype/invalidmetainfoexception.cpp b/src/shared/qml/metatype/invalidmetainfoexception.cpp
index 9d8aa37b0c104e5ffd271e29432e4f986ef9dcde..fe2df242372d0f7f85b5a4b7408c0f6b1dc8e31a 100644
--- a/src/shared/qml/metatype/invalidmetainfoexception.cpp
+++ b/src/shared/qml/metatype/invalidmetainfoexception.cpp
@@ -30,7 +30,7 @@
 #include "invalidmetainfoexception.h"
 
 /*!
-\class QmlDesigner::InvalidMetaInfoException
+\class Qml::InvalidMetaInfoException
 \ingroup CoreExceptions
 \brief Exception for a invalid meta info
 
diff --git a/src/shared/qml/metatype/metainfo.cpp b/src/shared/qml/metatype/metainfo.cpp
index f6ace0f95a28a2cc0d0b64c6c0e93e2903fc74be..a95ea9e833970c07f63e22cee0644ff918b42e32 100644
--- a/src/shared/qml/metatype/metainfo.cpp
+++ b/src/shared/qml/metatype/metainfo.cpp
@@ -254,7 +254,7 @@ QStringList MetaInfo::s_pluginDirs;
 
 
 /*!
-\class QmlDesigner::MetaInfo
+\class Qml::MetaInfo
 \ingroup CoreModel
 \brief The MetaInfo class provides meta information about qml types and properties.
 
@@ -268,7 +268,7 @@ The MetaInfo object should always be accessed via the model (see Model::metaInfo
 Otherwise types specific to a model (like sub components) might
 be missed.
 
-\see Model::metaInfo(), QmlDesigner::NodeMetaInfo, QmlDesigner::PropertyMetaInfo, QmlDesigner::EnumeratorMetaInfo
+\see Model::metaInfo(), Qml::NodeMetaInfo, Qml::PropertyMetaInfo, Qml::EnumeratorMetaInfo
 */
 
 /*!
@@ -486,4 +486,4 @@ bool operator!=(const MetaInfo &first, const MetaInfo &second)
 {
     return !(first == second);
 }
-} //namespace QmlDesigner
+} //namespace Qml
diff --git a/src/shared/qml/metatype/nodemetainfo.cpp b/src/shared/qml/metatype/nodemetainfo.cpp
index 86132aa4e0c9c3f9b63b0ee35222baf97b869122..9163e86c011c87cd5e9a30543919cd4a665cedde 100644
--- a/src/shared/qml/metatype/nodemetainfo.cpp
+++ b/src/shared/qml/metatype/nodemetainfo.cpp
@@ -80,7 +80,7 @@ public:
 } // namespace Internal
 
 /*!
-\class QmlDesigner::NodeMetaInfo
+\class Qml::NodeMetaInfo
 \ingroup CoreModel
 \brief The NodeMetaInfo class provides meta information about a qml type.
 
@@ -93,7 +93,7 @@ if the enclosing type is deregistered from the meta type system (e.g.
 a sub component qml file is deleted). Trying to call any accessor methods on an invalid
 NodeMetaInfo object will result in an InvalidMetaInfoException being thrown.
 
-\see QmlDesigner::MetaInfo, QmlDesigner::PropertyMetaInfo, QmlDesigner::EnumeratorMetaInfo
+\see Qml::MetaInfo, Qml::PropertyMetaInfo, Qml::EnumeratorMetaInfo
 */
 
 NodeMetaInfo::NodeMetaInfo()
diff --git a/src/shared/qml/metatype/propertymetainfo.cpp b/src/shared/qml/metatype/propertymetainfo.cpp
index 6596a9cfa4945cdf74e85b4b6cb9e213c11e31a7..0d011210badb3455ab71eccbf351615a06b832c3 100644
--- a/src/shared/qml/metatype/propertymetainfo.cpp
+++ b/src/shared/qml/metatype/propertymetainfo.cpp
@@ -72,7 +72,7 @@ public:
 } // namespace Internal
 
 /*!
-\class QmlDesigner::PropertyMetaInfo
+\class Qml::PropertyMetaInfo
 \ingroup CoreModel
 \brief The PropertyMetaInfo class provides meta information about a qml type property.
 
@@ -86,7 +86,7 @@ a sub component qml file is deleted). Trying to call any accessor methods on an
 PropertyMetaInfo object will result in an InvalidMetaInfoException being thrown.
 
 
-\see QmlDesigner::MetaInfo, QmlDesigner::NodeMetaInfo, QmlDesigner::EnumeratorMetaInfo
+\see Qml::MetaInfo, Qml::NodeMetaInfo, Qml::EnumeratorMetaInfo
 */
 
 PropertyMetaInfo::PropertyMetaInfo()
diff --git a/src/shared/qml/qmldocument.cpp b/src/shared/qml/qmldocument.cpp
index 95698a21c997585eb704f96e1df913f6070ec7e7..473fb259d822aeea35746de706a0895184cccb44 100644
--- a/src/shared/qml/qmldocument.cpp
+++ b/src/shared/qml/qmldocument.cpp
@@ -36,7 +36,6 @@
 #include "qmljsastfwd_p.h"
 
 using namespace Qml;
-using namespace QmlEditor;
 using namespace QmlJS;
 
 QmlDocument::QmlDocument(const QString &fileName)
diff --git a/src/shared/qml/qmldocument.h b/src/shared/qml/qmldocument.h
index c45a3af09d6b00d4b83228447d25fa581ed91960..15edb168e7e3f96dfec51195907b23c7f9b42964 100644
--- a/src/shared/qml/qmldocument.h
+++ b/src/shared/qml/qmldocument.h
@@ -39,7 +39,7 @@
 #include "qml_global.h"
 #include "qmlsymbol.h"
 
-namespace QmlEditor {
+namespace Qml {
 
 class QML_EXPORT QmlDocument
 {
@@ -106,6 +106,6 @@ public:
     QMap<QString, QmlDocument::Ptr> componentsDefinedByImportedDocuments(const QmlDocument::Ptr &doc, const QString &importPath) const;
 };
 
-} // emd of namespace QmlEditor
+} // end of namespace Qml
 
 #endif // QMLDOCUMENT_H
diff --git a/src/shared/qml/qmlidcollector.cpp b/src/shared/qml/qmlidcollector.cpp
index 381af48d280d7131ae06046978f40e5058a5b703..096728641a5c78a9adb825dfa9ddc9a1f853c6b7 100644
--- a/src/shared/qml/qmlidcollector.cpp
+++ b/src/shared/qml/qmlidcollector.cpp
@@ -37,7 +37,7 @@ using namespace QmlJS::AST;
 using namespace Qml;
 using namespace Qml::Internal;
 
-QMap<QString, QmlIdSymbol*> QmlIdCollector::operator()(QmlEditor::QmlDocument &doc)
+QMap<QString, QmlIdSymbol*> QmlIdCollector::operator()(Qml::QmlDocument &doc)
 {
     _doc = &doc;
     _ids.clear();
diff --git a/src/shared/qml/qmlidcollector.h b/src/shared/qml/qmlidcollector.h
index 3db91fe4b9df22d2888f492b83ef6950c66aae54..9fb93018dd81f5522e6305dbec141c908330daf5 100644
--- a/src/shared/qml/qmlidcollector.h
+++ b/src/shared/qml/qmlidcollector.h
@@ -46,7 +46,7 @@ namespace Internal {
 class QML_EXPORT QmlIdCollector: protected QmlJS::AST::Visitor
 {
 public:
-    QMap<QString, Qml::QmlIdSymbol*> operator()(QmlEditor::QmlDocument &doc);
+    QMap<QString, Qml::QmlIdSymbol*> operator()(Qml::QmlDocument &doc);
 
     QList<QmlJS::DiagnosticMessage> diagnosticMessages()
     { return _diagnosticMessages; }
@@ -62,7 +62,7 @@ private:
     void addId(const QString &id, QmlJS::AST::UiScriptBinding *ast);
 
 private:
-    QmlEditor::QmlDocument *_doc;
+    Qml::QmlDocument *_doc;
     QMap<QString, Qml::QmlIdSymbol*> _ids;
     Qml::QmlSymbolFromFile *_currentSymbol;
     QList<QmlJS::DiagnosticMessage> _diagnosticMessages;
diff --git a/tests/auto/qml/qmldesigner/coretests/coretests.pro b/tests/auto/qml/qmldesigner/coretests/coretests.pro
index 9ed993bb048b0a3c743e3cc838671147efe7d88c..2466ac00943dc7e52cf66d2eb859ce2ae656d270 100644
--- a/tests/auto/qml/qmldesigner/coretests/coretests.pro
+++ b/tests/auto/qml/qmldesigner/coretests/coretests.pro
@@ -4,6 +4,7 @@ QT += testlib \
     declarative
 DESTDIR = $$DESIGNER_BINARY_DIRECTORY
 include(../../../../../src/plugins/qmldesigner/core/core.pri)
+include(../../../../../src/shared/qml/qml.pri)
 DEFINES+=QTCREATOR_UTILS_STATIC_LIB
 
 DEPENDPATH += ..