Change class prefix to from QmlXXX to QDeclarativeXXX, QmlGraphicsXXX to QDeclarativeXXX.

1166 files changed, 3310 insertions, 3307 deletions

diff --git a/tests/auto/declarative/declarative.pro b/tests/auto/declarative/declarative.pro
index c9b1052..669213c 100644
--- a/tests/auto/declarative/declarative.pro
+++ b/tests/auto/declarative/declarative.pro
@@ -4,66 +4,66 @@ SUBDIRS += \
            layouts \                # Cover
            parserstress \           # Cover
            qmetaobjectbuilder \     # Cover
-           qmlanimations \          # Cover
-           qmlbehaviors \           # Cover
-           qmlbinding \             # Cover
-           qmlconnection \          # Cover
-           qmlcontext \             # Cover
-           qmldatetimeformatter \   # Cover
-           qmldebug \               # Cover
-           qmldebugclient \         # Cover
-           qmldebugservice \        # Cover
-           qmldom \                 # Cover
-           qmleasefollow \          # Cover
-           qmlecmascript \          # Cover
-           qmlengine     \          # Cover
-           qmlerror \               # Cover
-           qmlfontloader \          # Cover
-           qmlgraphicsanchors \     # Cover
-           qmlgraphicsanimatedimage \ # Cover
-           qmlgraphicsimage \       # Cover
-           qmlgraphicsborderimage \ # Cover
-           qmlgraphicsflickable   \ # Cover
-           qmlgraphicsflipable    \ # Cover
-           qmlgraphicsgridview \    # Cover
-           qmlgraphicsitem \        # Cover
-           qmlgraphicslistview \    # Cover
-           qmlgraphicsloader \      # Cover
-           qmlgraphicsmousearea \   # Cover
-           qmlgraphicsparticles \   # Cover
-           qmlgraphicspathview \    # Cover
-           qmlgraphicspositioners \ # Cover
-           qmlgraphicstext \        # Cover
-           qmlgraphicstextedit \    # Cover
-           qmlgraphicstextinput \   # Cover
-           qmlinfo \                # Cover
-           qmlinstruction \         # Cover
-           qmllanguage \            # Cover
-           qmllistreference \       # Cover
-           qmllistmodel \           # Cover
-           qmlmetaproperty \        # Cover
-           qmlmetatype \            # Cover
-           qmlmoduleplugin \        # Cover
-           qmlnumberformatter \     # Cover
-           qmlpixmapcache \         # Cover
-           qmlpropertymap \         # Cover
-           qmlqt \                  # Cover
-           qmlspringfollow \        # Cover
-           qmlstates \              # Cover
-           qmlsystempalette \       # Cover
-           qmltimer \               # Cover
-           qmlxmllistmodel \        # Cover
+           qdeclarativeanimations \          # Cover
+           qdeclarativebehaviors \           # Cover
+           qdeclarativebinding \             # Cover
+           qdeclarativeconnection \          # Cover
+           qdeclarativecontext \             # Cover
+           qdeclarativedatetimeformatter \   # Cover
+           qdeclarativedebug \               # Cover
+           qdeclarativedebugclient \         # Cover
+           qdeclarativedebugservice \        # Cover
+           qdeclarativedom \                 # Cover
+           qdeclarativeeasefollow \          # Cover
+           qdeclarativeecmascript \          # Cover
+           qdeclarativeengine     \          # Cover
+           qdeclarativeerror \               # Cover
+           qdeclarativefontloader \          # Cover
+           qdeclarativeanchors \     # Cover
+           qdeclarativeanimatedimage \ # Cover
+           qdeclarativeimage \       # Cover
+           qdeclarativeborderimage \ # Cover
+           qdeclarativeflickable   \ # Cover
+           qdeclarativeflipable    \ # Cover
+           qdeclarativegridview \    # Cover
+           qdeclarativeitem \        # Cover
+           qdeclarativelistview \    # Cover
+           qdeclarativeloader \      # Cover
+           qdeclarativemousearea \   # Cover
+           qdeclarativeparticles \   # Cover
+           qdeclarativepathview \    # Cover
+           qdeclarativepositioners \ # Cover
+           qdeclarativetext \        # Cover
+           qdeclarativetextedit \    # Cover
+           qdeclarativetextinput \   # Cover
+           qdeclarativeinfo \                # Cover
+           qdeclarativeinstruction \         # Cover
+           qdeclarativelanguage \            # Cover
+           qdeclarativelistreference \       # Cover
+           qdeclarativelistmodel \           # Cover
+           qdeclarativemetaproperty \        # Cover
+           qdeclarativemetatype \            # Cover
+           qdeclarativemoduleplugin \        # Cover
+           qdeclarativenumberformatter \     # Cover
+           qdeclarativepixmapcache \         # Cover
+           qdeclarativepropertymap \         # Cover
+           qdeclarativeqt \                  # Cover
+           qdeclarativespringfollow \        # Cover
+           qdeclarativestates \              # Cover
+           qdeclarativesystempalette \       # Cover
+           qdeclarativetimer \               # Cover
+           qdeclarativexmllistmodel \        # Cover
            qpacketprotocol \        # Cover
-           qmlgraphicsrepeater \    # Cover
-           qmlvaluetypes \          # Cover
-           qmlxmlhttprequest \      # Cover
-           qmlimageprovider \       # Cover
-           qmlstyledtext \          # Cover
+           qdeclarativerepeater \    # Cover
+           qdeclarativevaluetypes \          # Cover
+           qdeclarativexmlhttprequest \      # Cover
+           qdeclarativeimageprovider \       # Cover
+           qdeclarativestyledtext \          # Cover
            sql                      # Cover
 
 contains(QT_CONFIG, webkit) {
     SUBDIRS += \
-           qmlgraphicswebview       # Cover
+           qdeclarativewebview       # Cover
 }
 
 # Tests which should run in Pulse
diff --git a/tests/auto/declarative/examples/tst_examples.cpp b/tests/auto/declarative/examples/tst_examples.cpp
index 104c2d3..6160e7c 100644
--- a/tests/auto/declarative/examples/tst_examples.cpp
+++ b/tests/auto/declarative/examples/tst_examples.cpp
@@ -56,7 +56,7 @@ private slots:
 
     void namingConvention();
 private:
-    QString qmlviewer;
+    QString qmlruntime;
     QStringList excludedDirs;
 
     void namingConvention(const QDir &);
@@ -68,11 +68,11 @@ tst_examples::tst_examples()
     QString binaries = QLibraryInfo::location(QLibraryInfo::BinariesPath);
 
 #if defined(Q_WS_MAC)
-    qmlviewer = QDir(binaries).absoluteFilePath("qmlviewer.app/Contents/MacOS/qmlviewer");
+    qmlruntime = QDir(binaries).absoluteFilePath("qml.app/Contents/MacOS/qml");
 #elif defined(Q_WS_WIN)
-    qmlviewer = QDir(binaries).absoluteFilePath("qmlviewer.exe");
+    qmlruntime = QDir(binaries).absoluteFilePath("qml.exe");
 #else
-    qmlviewer = QDir(binaries).absoluteFilePath("qmlviewer");
+    qmlruntime = QDir(binaries).absoluteFilePath("qml");
 #endif
 
 
@@ -190,7 +190,8 @@ void tst_examples::examples()
               << "-scriptopts" << "play,testerror,exitoncomplete,exitonfailure" 
               << file;
     QProcess p;
-    p.start(qmlviewer, arguments);
+qDebug() << qmlruntime << arguments;
+    p.start(qmlruntime, arguments);
     QVERIFY(p.waitForFinished());
     QCOMPARE(p.exitStatus(), QProcess::NormalExit);
     QCOMPARE(p.exitCode(), 0);
diff --git a/tests/auto/declarative/graphicswidgets/tst_graphicswidgets.cpp b/tests/auto/declarative/graphicswidgets/tst_graphicswidgets.cpp
index cb618c6..a85ceed 100644
--- a/tests/auto/declarative/graphicswidgets/tst_graphicswidgets.cpp
+++ b/tests/auto/declarative/graphicswidgets/tst_graphicswidgets.cpp
@@ -40,9 +40,9 @@
 ****************************************************************************/
 #include <qtest.h>
 #include <QFile>
-#include <QtDeclarative/qmlengine.h>
-#include <QtDeclarative/qmlcomponent.h>
-#include <private/graphicswidgets_p.h>
+#include <QtDeclarative/qdeclarativeengine.h>
+#include <QtDeclarative/qdeclarativecomponent.h>
+#include <QtGui/qgraphicsview.h>
 
 class tst_graphicswidgets : public QObject
 
@@ -61,8 +61,8 @@ tst_graphicswidgets::tst_graphicswidgets()
 
 void tst_graphicswidgets::widgets()
 {
-    QmlEngine engine;
-    QmlComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/graphicswidgets.qml"));
+    QDeclarativeEngine engine;
+    QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/graphicswidgets.qml"));
     QGraphicsView *obj = qobject_cast<QGraphicsView*>(c.create());
 
     QVERIFY(obj != 0);
diff --git a/tests/auto/declarative/layouts/tst_layouts.cpp b/tests/auto/declarative/layouts/tst_layouts.cpp
index 53c1ede..b580336 100644
--- a/tests/auto/declarative/layouts/tst_layouts.cpp
+++ b/tests/auto/declarative/layouts/tst_layouts.cpp
@@ -40,9 +40,9 @@
 ****************************************************************************/
 #include <QtTest/QtTest>
 #include <private/qlistmodelinterface_p.h>
-#include <qmlview.h>
-#include <private/qmlgraphicslayoutitem_p.h>
-#include <qmlexpression.h>
+#include <qdeclarativeview.h>
+#include <private/qdeclarativelayoutitem_p.h>
+#include <qdeclarativeexpression.h>
 #include <QStyle>
 
 class tst_QmlGraphicsLayouts : public QObject
@@ -56,7 +56,7 @@ private slots:
     void test_cpp();//GraphicsLayout set up in C++
 
 private:
-    QmlView *createView(const QString &filename);
+    QDeclarativeView *createView(const QString &filename);
 };
 
 tst_QmlGraphicsLayouts::tst_QmlGraphicsLayouts()
@@ -65,13 +65,13 @@ tst_QmlGraphicsLayouts::tst_QmlGraphicsLayouts()
 
 void tst_QmlGraphicsLayouts::test_qml()
 {
-    QmlView *canvas = createView(SRCDIR "/data/layouts.qml");
+    QDeclarativeView *canvas = createView(SRCDIR "/data/layouts.qml");
 
     qApp->processEvents();
-    QmlGraphicsLayoutItem *left = static_cast<QmlGraphicsLayoutItem*>(canvas->rootObject()->findChild<QmlGraphicsItem*>("left"));
+    QDeclarativeLayoutItem *left = static_cast<QDeclarativeLayoutItem*>(canvas->rootObject()->findChild<QDeclarativeItem*>("left"));
     QVERIFY(left != 0);
 
-    QmlGraphicsLayoutItem *right = static_cast<QmlGraphicsLayoutItem*>(canvas->rootObject()->findChild<QmlGraphicsItem*>("right"));
+    QDeclarativeLayoutItem *right = static_cast<QDeclarativeLayoutItem*>(canvas->rootObject()->findChild<QDeclarativeItem*>("right"));
     QVERIFY(right != 0);
 
     qreal l = QApplication::style()->pixelMetric(QStyle::PM_LayoutLeftMargin);
@@ -81,7 +81,7 @@ void tst_QmlGraphicsLayouts::test_qml()
     QVERIFY2(l == r && r == t && t == b, "Test assumes equal margins.");
     qreal gvMargin = l;
 
-    QmlGraphicsItem *rootItem = qobject_cast<QmlGraphicsItem*>(canvas->rootObject());
+    QDeclarativeItem *rootItem = qobject_cast<QDeclarativeItem*>(canvas->rootObject());
     QVERIFY(rootItem != 0);
 
     //Preferred Size
@@ -133,9 +133,9 @@ void tst_QmlGraphicsLayouts::test_cpp()
     //TODO: Waiting on QT-2407 to write this test
 }
 
-QmlView *tst_QmlGraphicsLayouts::createView(const QString &filename)
+QDeclarativeView *tst_QmlGraphicsLayouts::createView(const QString &filename)
 {
-    QmlView *canvas = new QmlView(0);
+    QDeclarativeView *canvas = new QDeclarativeView(0);
     canvas->setSource(QUrl::fromLocalFile(filename));
 
     return canvas;
diff --git a/tests/auto/declarative/parserstress/tst_parserstress.cpp b/tests/auto/declarative/parserstress/tst_parserstress.cpp
index 8af1b12..6ff5515 100644
--- a/tests/auto/declarative/parserstress/tst_parserstress.cpp
+++ b/tests/auto/declarative/parserstress/tst_parserstress.cpp
@@ -40,8 +40,8 @@
 ****************************************************************************/
 
 #include <qtest.h>
-#include <QmlEngine>
-#include <QmlComponent>
+#include <QDeclarativeEngine>
+#include <QDeclarativeComponent>
 #include <QDebug>
 #include <QDir>
 #include <QFile>
@@ -58,7 +58,7 @@ private slots:
 
 private:
     static QStringList findJSFiles(const QDir &);
-    QmlEngine engine;
+    QDeclarativeEngine engine;
 };
 
 QStringList tst_parserstress::findJSFiles(const QDir &d)
@@ -130,7 +130,7 @@ void tst_parserstress::ecmascript()
 
     QByteArray qmlData = qml.toUtf8();
 
-    QmlComponent component(&engine);
+    QDeclarativeComponent component(&engine);
     component.setData(qmlData, QUrl::fromLocalFile(SRCDIR + QString("/dummy.qml")));
     QSet<QString> failingTests;
     failingTests << "uc-003.js" << "uc-005.js" << "regress-352044-02-n.js"
diff --git a/tests/auto/declarative/qmlgraphicsanchors/data/anchors.qml b/tests/auto/declarative/qdeclarativeanchors/data/anchors.qml
index b64d0b0..b64d0b0 100644
--- a/tests/auto/declarative/qmlgraphicsanchors/data/anchors.qml
+++ b/tests/auto/declarative/qdeclarativeanchors/data/anchors.qml
diff --git a/tests/auto/declarative/qmlgraphicsanchors/data/centerin.qml b/tests/auto/declarative/qdeclarativeanchors/data/centerin.qml
index 09b97f6..09b97f6 100644
--- a/tests/auto/declarative/qmlgraphicsanchors/data/centerin.qml
+++ b/tests/auto/declarative/qdeclarativeanchors/data/centerin.qml
diff --git a/tests/auto/declarative/qmlgraphicsanchors/data/crash1.qml b/tests/auto/declarative/qdeclarativeanchors/data/crash1.qml
index fd9dc55..fd9dc55 100644
--- a/tests/auto/declarative/qmlgraphicsanchors/data/crash1.qml
+++ b/tests/auto/declarative/qdeclarativeanchors/data/crash1.qml
diff --git a/tests/auto/declarative/qmlgraphicsanchors/data/fill.qml b/tests/auto/declarative/qdeclarativeanchors/data/fill.qml
index 902465c..902465c 100644
--- a/tests/auto/declarative/qmlgraphicsanchors/data/fill.qml
+++ b/tests/auto/declarative/qdeclarativeanchors/data/fill.qml
diff --git a/tests/auto/declarative/qmlgraphicsanchors/data/loop1.qml b/tests/auto/declarative/qdeclarativeanchors/data/loop1.qml
index a266612..a266612 100644
--- a/tests/auto/declarative/qmlgraphicsanchors/data/loop1.qml
+++ b/tests/auto/declarative/qdeclarativeanchors/data/loop1.qml
diff --git a/tests/auto/declarative/qmlgraphicsanchors/data/loop2.qml b/tests/auto/declarative/qdeclarativeanchors/data/loop2.qml
index acb57cd..acb57cd 100644
--- a/tests/auto/declarative/qmlgraphicsanchors/data/loop2.qml
+++ b/tests/auto/declarative/qdeclarativeanchors/data/loop2.qml
diff --git a/tests/auto/declarative/qmlgraphicsanchors/data/margins.qml b/tests/auto/declarative/qdeclarativeanchors/data/margins.qml
index 4a29e77..4a29e77 100644
--- a/tests/auto/declarative/qmlgraphicsanchors/data/margins.qml
+++ b/tests/auto/declarative/qdeclarativeanchors/data/margins.qml
diff --git a/tests/auto/declarative/qmlanimations/qmlanimations.pro b/tests/auto/declarative/qdeclarativeanchors/qdeclarativeanchors.pro
index 447fb0f..ca2f68f 100644
--- a/tests/auto/declarative/qmlanimations/qmlanimations.pro
+++ b/tests/auto/declarative/qdeclarativeanchors/qdeclarativeanchors.pro
@@ -1,6 +1,6 @@
 load(qttest_p4)
 contains(QT_CONFIG,declarative): QT += declarative
-SOURCES += tst_qmlanimations.cpp
+SOURCES += tst_qdeclarativeanchors.cpp
 macx:CONFIG -= app_bundle
 
 DEFINES += SRCDIR=\\\"$$PWD\\\"
diff --git a/tests/auto/declarative/qmlgraphicsanchors/tst_qmlgraphicsanchors.cpp b/tests/auto/declarative/qdeclarativeanchors/tst_qdeclarativeanchors.cpp
index 721608e..ccc0ec7 100644
--- a/tests/auto/declarative/qmlgraphicsanchors/tst_qmlgraphicsanchors.cpp
+++ b/tests/auto/declarative/qdeclarativeanchors/tst_qdeclarativeanchors.cpp
@@ -40,15 +40,15 @@
 ****************************************************************************/
 #include <qtest.h>
 #include <QSignalSpy>
-#include <QtDeclarative/qmlengine.h>
-#include <QtDeclarative/qmlcomponent.h>
-#include <QtDeclarative/qmlview.h>
-#include <private/qmlgraphicsrectangle_p.h>
-#include <private/qmlgraphicstext_p.h>
-#include <QtDeclarative/private/qmlgraphicsanchors_p_p.h>
+#include <QtDeclarative/qdeclarativeengine.h>
+#include <QtDeclarative/qdeclarativecomponent.h>
+#include <QtDeclarative/qdeclarativeview.h>
+#include <private/qdeclarativerectangle_p.h>
+#include <private/qdeclarativetext_p.h>
+#include <QtDeclarative/private/qdeclarativeanchors_p_p.h>
 
-Q_DECLARE_METATYPE(QmlGraphicsAnchors::UsedAnchor)
-Q_DECLARE_METATYPE(QmlGraphicsAnchorLine::AnchorLine)
+Q_DECLARE_METATYPE(QDeclarativeAnchors::UsedAnchor)
+Q_DECLARE_METATYPE(QDeclarativeAnchorLine::AnchorLine)
 
 
 class tst_qmlgraphicsanchors : public QObject
@@ -85,7 +85,7 @@ T *tst_qmlgraphicsanchors::findItem(QGraphicsObject *parent, const QString &obje
     const QMetaObject &mo = T::staticMetaObject;
     QList<QGraphicsItem *> children = parent->childItems();
     for (int i = 0; i < children.count(); ++i) {
-        QmlGraphicsItem *item = qobject_cast<QmlGraphicsItem *>(children.at(i)->toGraphicsObject());
+        QDeclarativeItem *item = qobject_cast<QDeclarativeItem *>(children.at(i)->toGraphicsObject());
         if (item) {
             if (mo.cast(item) && (objectName.isEmpty() || item->objectName() == objectName)) {
                 return static_cast<T*>(item);
@@ -101,66 +101,66 @@ T *tst_qmlgraphicsanchors::findItem(QGraphicsObject *parent, const QString &obje
 
 void tst_qmlgraphicsanchors::basicAnchors()
 {
-    QmlView *view = new QmlView;
+    QDeclarativeView *view = new QDeclarativeView;
     view->setSource(QUrl::fromLocalFile(SRCDIR "/data/anchors.qml"));
 
     qApp->processEvents();
 
     //sibling horizontal
-    QCOMPARE(findItem<QmlGraphicsRectangle>(view->rootObject(), QLatin1String("rect1"))->x(), 26.0);
-    QCOMPARE(findItem<QmlGraphicsRectangle>(view->rootObject(), QLatin1String("rect2"))->x(), 122.0);
-    QCOMPARE(findItem<QmlGraphicsRectangle>(view->rootObject(), QLatin1String("rect3"))->x(), 74.0);
-    QCOMPARE(findItem<QmlGraphicsRectangle>(view->rootObject(), QLatin1String("rect4"))->x(), 16.0);
-    QCOMPARE(findItem<QmlGraphicsRectangle>(view->rootObject(), QLatin1String("rect5"))->x(), 112.0);
-    QCOMPARE(findItem<QmlGraphicsRectangle>(view->rootObject(), QLatin1String("rect6"))->x(), 64.0);
+    QCOMPARE(findItem<QDeclarativeRectangle>(view->rootObject(), QLatin1String("rect1"))->x(), 26.0);
+    QCOMPARE(findItem<QDeclarativeRectangle>(view->rootObject(), QLatin1String("rect2"))->x(), 122.0);
+    QCOMPARE(findItem<QDeclarativeRectangle>(view->rootObject(), QLatin1String("rect3"))->x(), 74.0);
+    QCOMPARE(findItem<QDeclarativeRectangle>(view->rootObject(), QLatin1String("rect4"))->x(), 16.0);
+    QCOMPARE(findItem<QDeclarativeRectangle>(view->rootObject(), QLatin1String("rect5"))->x(), 112.0);
+    QCOMPARE(findItem<QDeclarativeRectangle>(view->rootObject(), QLatin1String("rect6"))->x(), 64.0);
 
     //parent horizontal
-    QCOMPARE(findItem<QmlGraphicsRectangle>(view->rootObject(), QLatin1String("rect7"))->x(), 0.0);
-    QCOMPARE(findItem<QmlGraphicsRectangle>(view->rootObject(), QLatin1String("rect8"))->x(), 240.0);
-    QCOMPARE(findItem<QmlGraphicsRectangle>(view->rootObject(), QLatin1String("rect9"))->x(), 120.0);
-    QCOMPARE(findItem<QmlGraphicsRectangle>(view->rootObject(), QLatin1String("rect10"))->x(), -10.0);
-    QCOMPARE(findItem<QmlGraphicsRectangle>(view->rootObject(), QLatin1String("rect11"))->x(), 230.0);
-    QCOMPARE(findItem<QmlGraphicsRectangle>(view->rootObject(), QLatin1String("rect12"))->x(), 110.0);
+    QCOMPARE(findItem<QDeclarativeRectangle>(view->rootObject(), QLatin1String("rect7"))->x(), 0.0);
+    QCOMPARE(findItem<QDeclarativeRectangle>(view->rootObject(), QLatin1String("rect8"))->x(), 240.0);
+    QCOMPARE(findItem<QDeclarativeRectangle>(view->rootObject(), QLatin1String("rect9"))->x(), 120.0);
+    QCOMPARE(findItem<QDeclarativeRectangle>(view->rootObject(), QLatin1String("rect10"))->x(), -10.0);
+    QCOMPARE(findItem<QDeclarativeRectangle>(view->rootObject(), QLatin1String("rect11"))->x(), 230.0);
+    QCOMPARE(findItem<QDeclarativeRectangle>(view->rootObject(), QLatin1String("rect12"))->x(), 110.0);
 
     //vertical
-    QCOMPARE(findItem<QmlGraphicsRectangle>(view->rootObject(), QLatin1String("rect13"))->y(), 20.0);
-    QCOMPARE(findItem<QmlGraphicsRectangle>(view->rootObject(), QLatin1String("rect14"))->y(), 155.0);
+    QCOMPARE(findItem<QDeclarativeRectangle>(view->rootObject(), QLatin1String("rect13"))->y(), 20.0);
+    QCOMPARE(findItem<QDeclarativeRectangle>(view->rootObject(), QLatin1String("rect14"))->y(), 155.0);
 
     //stretch
-    QCOMPARE(findItem<QmlGraphicsRectangle>(view->rootObject(), QLatin1String("rect15"))->x(), 26.0);
-    QCOMPARE(findItem<QmlGraphicsRectangle>(view->rootObject(), QLatin1String("rect15"))->width(), 96.0);
-    QCOMPARE(findItem<QmlGraphicsRectangle>(view->rootObject(), QLatin1String("rect16"))->x(), 26.0);
-    QCOMPARE(findItem<QmlGraphicsRectangle>(view->rootObject(), QLatin1String("rect16"))->width(), 192.0);
-    QCOMPARE(findItem<QmlGraphicsRectangle>(view->rootObject(), QLatin1String("rect17"))->x(), -70.0);
-    QCOMPARE(findItem<QmlGraphicsRectangle>(view->rootObject(), QLatin1String("rect17"))->width(), 192.0);
+    QCOMPARE(findItem<QDeclarativeRectangle>(view->rootObject(), QLatin1String("rect15"))->x(), 26.0);
+    QCOMPARE(findItem<QDeclarativeRectangle>(view->rootObject(), QLatin1String("rect15"))->width(), 96.0);
+    QCOMPARE(findItem<QDeclarativeRectangle>(view->rootObject(), QLatin1String("rect16"))->x(), 26.0);
+    QCOMPARE(findItem<QDeclarativeRectangle>(view->rootObject(), QLatin1String("rect16"))->width(), 192.0);
+    QCOMPARE(findItem<QDeclarativeRectangle>(view->rootObject(), QLatin1String("rect17"))->x(), -70.0);
+    QCOMPARE(findItem<QDeclarativeRectangle>(view->rootObject(), QLatin1String("rect17"))->width(), 192.0);
 
     //vertical stretch
-    QCOMPARE(findItem<QmlGraphicsRectangle>(view->rootObject(), QLatin1String("rect18"))->y(), 20.0);
-    QCOMPARE(findItem<QmlGraphicsRectangle>(view->rootObject(), QLatin1String("rect18"))->height(), 40.0);
+    QCOMPARE(findItem<QDeclarativeRectangle>(view->rootObject(), QLatin1String("rect18"))->y(), 20.0);
+    QCOMPARE(findItem<QDeclarativeRectangle>(view->rootObject(), QLatin1String("rect18"))->height(), 40.0);
 
     //more parent horizontal
-    QCOMPARE(findItem<QmlGraphicsRectangle>(view->rootObject(), QLatin1String("rect19"))->x(), 115.0);
-    QCOMPARE(findItem<QmlGraphicsRectangle>(view->rootObject(), QLatin1String("rect20"))->x(), 235.0);
-    QCOMPARE(findItem<QmlGraphicsRectangle>(view->rootObject(), QLatin1String("rect21"))->x(), -5.0);
+    QCOMPARE(findItem<QDeclarativeRectangle>(view->rootObject(), QLatin1String("rect19"))->x(), 115.0);
+    QCOMPARE(findItem<QDeclarativeRectangle>(view->rootObject(), QLatin1String("rect20"))->x(), 235.0);
+    QCOMPARE(findItem<QDeclarativeRectangle>(view->rootObject(), QLatin1String("rect21"))->x(), -5.0);
 
     //centerIn
-    QCOMPARE(findItem<QmlGraphicsRectangle>(view->rootObject(), QLatin1String("rect22"))->x(), 69.0);
-    QCOMPARE(findItem<QmlGraphicsRectangle>(view->rootObject(), QLatin1String("rect22"))->y(), 5.0);
+    QCOMPARE(findItem<QDeclarativeRectangle>(view->rootObject(), QLatin1String("rect22"))->x(), 69.0);
+    QCOMPARE(findItem<QDeclarativeRectangle>(view->rootObject(), QLatin1String("rect22"))->y(), 5.0);
 
      //margins
-    QCOMPARE(findItem<QmlGraphicsRectangle>(view->rootObject(), QLatin1String("rect23"))->x(), 31.0);
-    QCOMPARE(findItem<QmlGraphicsRectangle>(view->rootObject(), QLatin1String("rect23"))->y(), 5.0);
-    QCOMPARE(findItem<QmlGraphicsRectangle>(view->rootObject(), QLatin1String("rect23"))->width(), 86.0);
-    QCOMPARE(findItem<QmlGraphicsRectangle>(view->rootObject(), QLatin1String("rect23"))->height(), 10.0);
+    QCOMPARE(findItem<QDeclarativeRectangle>(view->rootObject(), QLatin1String("rect23"))->x(), 31.0);
+    QCOMPARE(findItem<QDeclarativeRectangle>(view->rootObject(), QLatin1String("rect23"))->y(), 5.0);
+    QCOMPARE(findItem<QDeclarativeRectangle>(view->rootObject(), QLatin1String("rect23"))->width(), 86.0);
+    QCOMPARE(findItem<QDeclarativeRectangle>(view->rootObject(), QLatin1String("rect23"))->height(), 10.0);
 
     // offsets
-    QCOMPARE(findItem<QmlGraphicsRectangle>(view->rootObject(), QLatin1String("rect24"))->x(), 26.0);
-    QCOMPARE(findItem<QmlGraphicsRectangle>(view->rootObject(), QLatin1String("rect25"))->y(), 60.0);
-    QCOMPARE(findItem<QmlGraphicsRectangle>(view->rootObject(), QLatin1String("rect26"))->y(), 5.0);
+    QCOMPARE(findItem<QDeclarativeRectangle>(view->rootObject(), QLatin1String("rect24"))->x(), 26.0);
+    QCOMPARE(findItem<QDeclarativeRectangle>(view->rootObject(), QLatin1String("rect25"))->y(), 60.0);
+    QCOMPARE(findItem<QDeclarativeRectangle>(view->rootObject(), QLatin1String("rect26"))->y(), 5.0);
 
     //baseline
-    QmlGraphicsText *text1 = findItem<QmlGraphicsText>(view->rootObject(), QLatin1String("text1"));
-    QmlGraphicsText *text2 = findItem<QmlGraphicsText>(view->rootObject(), QLatin1String("text2"));
+    QDeclarativeText *text1 = findItem<QDeclarativeText>(view->rootObject(), QLatin1String("text1"));
+    QDeclarativeText *text2 = findItem<QDeclarativeText>(view->rootObject(), QLatin1String("text2"));
     QCOMPARE(text1->y(), text2->y());
 
     delete view;
@@ -177,7 +177,7 @@ void tst_qmlgraphicsanchors::loops()
         QTest::ignoreMessage(QtWarningMsg, expect.toLatin1());
         QTest::ignoreMessage(QtWarningMsg, expect.toLatin1());
 
-        QmlView *view = new QmlView;
+        QDeclarativeView *view = new QDeclarativeView;
         view->setSource(source);
         qApp->processEvents();
 
@@ -190,7 +190,7 @@ void tst_qmlgraphicsanchors::loops()
         QString expect = "QML Image (" + source.toString() + ":8:3" + ") Possible anchor loop detected on horizontal anchor.";
         QTest::ignoreMessage(QtWarningMsg, expect.toLatin1());
 
-        QmlView *view = new QmlView;
+        QDeclarativeView *view = new QDeclarativeView;
         view->setSource(source);
         qApp->processEvents();
 
@@ -205,8 +205,8 @@ void tst_qmlgraphicsanchors::illegalSets()
 
     QTest::ignoreMessage(QtWarningMsg, warning.toLatin1());
 
-    QmlEngine engine;
-    QmlComponent component(&engine);
+    QDeclarativeEngine engine;
+    QDeclarativeComponent component(&engine);
     component.setData(QByteArray("import Qt 4.6\n" + qml.toUtf8()), QUrl::fromLocalFile(""));
     if (!component.isReady())
         qWarning() << "Test errors:" << component.errors();
@@ -276,16 +276,16 @@ void tst_qmlgraphicsanchors::illegalSets_data()
 void tst_qmlgraphicsanchors::reset()
 {
     QFETCH(QString, side);
-    QFETCH(QmlGraphicsAnchorLine::AnchorLine, anchorLine);
-    QFETCH(QmlGraphicsAnchors::UsedAnchor, usedAnchor);
+    QFETCH(QDeclarativeAnchorLine::AnchorLine, anchorLine);
+    QFETCH(QDeclarativeAnchors::UsedAnchor, usedAnchor);
 
-    QmlGraphicsItem *baseItem = new QmlGraphicsItem;
+    QDeclarativeItem *baseItem = new QDeclarativeItem;
 
-    QmlGraphicsAnchorLine anchor;
+    QDeclarativeAnchorLine anchor;
     anchor.item = baseItem;
     anchor.anchorLine = anchorLine;
 
-    QmlGraphicsItem *item = new QmlGraphicsItem;
+    QDeclarativeItem *item = new QDeclarativeItem;
 
     const QMetaObject *meta = item->anchors()->metaObject();
     QMetaProperty p = meta->property(meta->indexOfProperty(side.toUtf8().constData()));
@@ -303,23 +303,23 @@ void tst_qmlgraphicsanchors::reset()
 void tst_qmlgraphicsanchors::reset_data()
 {
     QTest::addColumn<QString>("side");
-    QTest::addColumn<QmlGraphicsAnchorLine::AnchorLine>("anchorLine");
-    QTest::addColumn<QmlGraphicsAnchors::UsedAnchor>("usedAnchor");
+    QTest::addColumn<QDeclarativeAnchorLine::AnchorLine>("anchorLine");
+    QTest::addColumn<QDeclarativeAnchors::UsedAnchor>("usedAnchor");
 
-    QTest::newRow("left") << "left" << QmlGraphicsAnchorLine::Left << QmlGraphicsAnchors::HasLeftAnchor;
-    QTest::newRow("top") << "top" << QmlGraphicsAnchorLine::Top << QmlGraphicsAnchors::HasTopAnchor;
-    QTest::newRow("right") << "right" << QmlGraphicsAnchorLine::Right << QmlGraphicsAnchors::HasRightAnchor;
-    QTest::newRow("bottom") << "bottom" << QmlGraphicsAnchorLine::Bottom << QmlGraphicsAnchors::HasBottomAnchor;
+    QTest::newRow("left") << "left" << QDeclarativeAnchorLine::Left << QDeclarativeAnchors::HasLeftAnchor;
+    QTest::newRow("top") << "top" << QDeclarativeAnchorLine::Top << QDeclarativeAnchors::HasTopAnchor;
+    QTest::newRow("right") << "right" << QDeclarativeAnchorLine::Right << QDeclarativeAnchors::HasRightAnchor;
+    QTest::newRow("bottom") << "bottom" << QDeclarativeAnchorLine::Bottom << QDeclarativeAnchors::HasBottomAnchor;
 
-    QTest::newRow("hcenter") << "horizontalCenter" << QmlGraphicsAnchorLine::HCenter << QmlGraphicsAnchors::HasHCenterAnchor;
-    QTest::newRow("vcenter") << "verticalCenter" << QmlGraphicsAnchorLine::VCenter << QmlGraphicsAnchors::HasVCenterAnchor;
-    QTest::newRow("baseline") << "baseline" << QmlGraphicsAnchorLine::Baseline << QmlGraphicsAnchors::HasBaselineAnchor;
+    QTest::newRow("hcenter") << "horizontalCenter" << QDeclarativeAnchorLine::HCenter << QDeclarativeAnchors::HasHCenterAnchor;
+    QTest::newRow("vcenter") << "verticalCenter" << QDeclarativeAnchorLine::VCenter << QDeclarativeAnchors::HasVCenterAnchor;
+    QTest::newRow("baseline") << "baseline" << QDeclarativeAnchorLine::Baseline << QDeclarativeAnchors::HasBaselineAnchor;
 }
 
 void tst_qmlgraphicsanchors::resetConvenience()
 {
-    QmlGraphicsItem *baseItem = new QmlGraphicsItem;
-    QmlGraphicsItem *item = new QmlGraphicsItem;
+    QDeclarativeItem *baseItem = new QDeclarativeItem;
+    QDeclarativeItem *item = new QDeclarativeItem;
 
     //fill
     item->anchors()->setFill(baseItem);
@@ -341,8 +341,8 @@ void tst_qmlgraphicsanchors::nullItem()
 {
     QFETCH(QString, side);
 
-    QmlGraphicsAnchorLine anchor;
-    QmlGraphicsItem *item = new QmlGraphicsItem;
+    QDeclarativeAnchorLine anchor;
+    QDeclarativeItem *item = new QDeclarativeItem;
 
     const QMetaObject *meta = item->anchors()->metaObject();
     QMetaProperty p = meta->property(meta->indexOfProperty(side.toUtf8().constData()));
@@ -375,7 +375,7 @@ void tst_qmlgraphicsanchors::crash1()
     QTest::ignoreMessage(QtWarningMsg, expect.toLatin1());
     QTest::ignoreMessage(QtWarningMsg, expect.toLatin1()); // XXX ideally, should be one message
 
-    QmlView *view = new QmlView(source);
+    QDeclarativeView *view = new QDeclarativeView(source);
     qApp->processEvents();
 
     delete view;
@@ -383,10 +383,10 @@ void tst_qmlgraphicsanchors::crash1()
 
 void tst_qmlgraphicsanchors::fill()
 {
-    QmlView *view = new QmlView(QUrl::fromLocalFile(SRCDIR "/data/fill.qml"));
+    QDeclarativeView *view = new QDeclarativeView(QUrl::fromLocalFile(SRCDIR "/data/fill.qml"));
 
     qApp->processEvents();
-    QmlGraphicsRectangle* rect = findItem<QmlGraphicsRectangle>(view->rootObject(), QLatin1String("filler"));
+    QDeclarativeRectangle* rect = findItem<QDeclarativeRectangle>(view->rootObject(), QLatin1String("filler"));
     QCOMPARE(rect->x(), 0.0 + 10.0);
     QCOMPARE(rect->y(), 0.0 + 30.0);
     QCOMPARE(rect->width(), 200.0 - 10.0 - 20.0);
@@ -406,10 +406,10 @@ void tst_qmlgraphicsanchors::fill()
 
 void tst_qmlgraphicsanchors::centerIn()
 {
-    QmlView *view = new QmlView(QUrl::fromLocalFile(SRCDIR "/data/centerin.qml"));
+    QDeclarativeView *view = new QDeclarativeView(QUrl::fromLocalFile(SRCDIR "/data/centerin.qml"));
 
     qApp->processEvents();
-    QmlGraphicsRectangle* rect = findItem<QmlGraphicsRectangle>(view->rootObject(), QLatin1String("centered"));
+    QDeclarativeRectangle* rect = findItem<QDeclarativeRectangle>(view->rootObject(), QLatin1String("centered"));
     QCOMPARE(rect->x(), 75.0 + 10);
     QCOMPARE(rect->y(), 75.0 + 30);
     //Alter Offsets (QTBUG-6631)
@@ -423,10 +423,10 @@ void tst_qmlgraphicsanchors::centerIn()
 
 void tst_qmlgraphicsanchors::margins()
 {
-    QmlView *view = new QmlView(QUrl::fromLocalFile(SRCDIR "/data/margins.qml"));
+    QDeclarativeView *view = new QDeclarativeView(QUrl::fromLocalFile(SRCDIR "/data/margins.qml"));
 
     qApp->processEvents();
-    QmlGraphicsRectangle* rect = findItem<QmlGraphicsRectangle>(view->rootObject(), QLatin1String("filler"));
+    QDeclarativeRectangle* rect = findItem<QDeclarativeRectangle>(view->rootObject(), QLatin1String("filler"));
     QCOMPARE(rect->x(), 5.0);
     QCOMPARE(rect->y(), 6.0);
     QCOMPARE(rect->width(), 200.0 - 5.0 - 10.0);
@@ -445,4 +445,4 @@ void tst_qmlgraphicsanchors::margins()
 
 QTEST_MAIN(tst_qmlgraphicsanchors)
 
-#include "tst_qmlgraphicsanchors.moc"
+#include "tst_qdeclarativeanchors.moc"
diff --git a/tests/auto/declarative/qmlgraphicsanimatedimage/data/colors.gif b/tests/auto/declarative/qdeclarativeanimatedimage/data/colors.gif
index 1270bfa..1270bfa 100644
--- a/tests/auto/declarative/qmlgraphicsanimatedimage/data/colors.gif
+++ b/tests/auto/declarative/qdeclarativeanimatedimage/data/colors.gif
diff --git a/tests/auto/declarative/qmlgraphicsanimatedimage/data/colors.qml b/tests/auto/declarative/qdeclarativeanimatedimage/data/colors.qml
index 5bada34..5bada34 100644
--- a/tests/auto/declarative/qmlgraphicsanimatedimage/data/colors.qml
+++ b/tests/auto/declarative/qdeclarativeanimatedimage/data/colors.qml
diff --git a/tests/auto/declarative/qmlgraphicsanimatedimage/data/stickman.gif b/tests/auto/declarative/qdeclarativeanimatedimage/data/stickman.gif
index 7c4cd18..7c4cd18 100644
--- a/tests/auto/declarative/qmlgraphicsanimatedimage/data/stickman.gif
+++ b/tests/auto/declarative/qdeclarativeanimatedimage/data/stickman.gif
diff --git a/tests/auto/declarative/qmlgraphicsanimatedimage/data/stickman.qml b/tests/auto/declarative/qdeclarativeanimatedimage/data/stickman.qml
index a70db5d..a70db5d 100644
--- a/tests/auto/declarative/qmlgraphicsanimatedimage/data/stickman.qml
+++ b/tests/auto/declarative/qdeclarativeanimatedimage/data/stickman.qml
diff --git a/tests/auto/declarative/qmlgraphicsanimatedimage/data/stickmanpause.qml b/tests/auto/declarative/qdeclarativeanimatedimage/data/stickmanpause.qml
index 7ab17d4..7ab17d4 100644
--- a/tests/auto/declarative/qmlgraphicsanimatedimage/data/stickmanpause.qml
+++ b/tests/auto/declarative/qdeclarativeanimatedimage/data/stickmanpause.qml
diff --git a/tests/auto/declarative/qmlgraphicsanimatedimage/data/stickmanstopped.qml b/tests/auto/declarative/qdeclarativeanimatedimage/data/stickmanstopped.qml
index 53b0c3a..53b0c3a 100644
--- a/tests/auto/declarative/qmlgraphicsanimatedimage/data/stickmanstopped.qml
+++ b/tests/auto/declarative/qdeclarativeanimatedimage/data/stickmanstopped.qml
diff --git a/tests/auto/declarative/qmlgraphicsanimatedimage/qmlgraphicsanimatedimage.pro b/tests/auto/declarative/qdeclarativeanimatedimage/qdeclarativeanimatedimage.pro
index 877dfab..2904986 100644
--- a/tests/auto/declarative/qmlgraphicsanimatedimage/qmlgraphicsanimatedimage.pro
+++ b/tests/auto/declarative/qdeclarativeanimatedimage/qdeclarativeanimatedimage.pro
@@ -1,7 +1,7 @@
 load(qttest_p4)
 contains(QT_CONFIG,declarative): QT += declarative network
 HEADERS += ../shared/testhttpserver.h
-SOURCES += tst_qmlgraphicsanimatedimage.cpp ../shared/testhttpserver.cpp
+SOURCES += tst_qdeclarativeanimatedimage.cpp ../shared/testhttpserver.cpp
 macx:CONFIG -= app_bundle
 
 DEFINES += SRCDIR=\\\"$$PWD\\\"
diff --git a/tests/auto/declarative/qmlgraphicsanimatedimage/tst_qmlgraphicsanimatedimage.cpp b/tests/auto/declarative/qdeclarativeanimatedimage/tst_qdeclarativeanimatedimage.cpp
index 2342f25..cb56813 100644
--- a/tests/auto/declarative/qmlgraphicsanimatedimage/tst_qmlgraphicsanimatedimage.cpp
+++ b/tests/auto/declarative/qdeclarativeanimatedimage/tst_qdeclarativeanimatedimage.cpp
@@ -39,12 +39,12 @@
 **
 ****************************************************************************/
 #include <qtest.h>
-#include <QtDeclarative/qmlengine.h>
-#include <QtDeclarative/qmlcomponent.h>
-#include <QtDeclarative/qmlview.h>
-#include <private/qmlgraphicsrectangle_p.h>
-#include <private/qmlgraphicsimage_p.h>
-#include <private/qmlgraphicsanimatedimage_p.h>
+#include <QtDeclarative/qdeclarativeengine.h>
+#include <QtDeclarative/qdeclarativecomponent.h>
+#include <QtDeclarative/qdeclarativeview.h>
+#include <private/qdeclarativerectangle_p.h>
+#include <private/qdeclarativeimage_p.h>
+#include <private/qdeclarativeanimatedimage_p.h>
 
 #include "../shared/testhttpserver.h"
 
@@ -77,9 +77,9 @@ private slots:
 
 void tst_qmlgraphicsanimatedimage::play()
 {
-    QmlEngine engine;
-    QmlComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/stickman.qml"));
-    QmlGraphicsAnimatedImage *anim = qobject_cast<QmlGraphicsAnimatedImage *>(component.create());
+    QDeclarativeEngine engine;
+    QDeclarativeComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/stickman.qml"));
+    QDeclarativeAnimatedImage *anim = qobject_cast<QDeclarativeAnimatedImage *>(component.create());
     QVERIFY(anim);
     QVERIFY(anim->isPlaying());
 
@@ -88,9 +88,9 @@ void tst_qmlgraphicsanimatedimage::play()
 
 void tst_qmlgraphicsanimatedimage::pause()
 {
-    QmlEngine engine;
-    QmlComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/stickmanpause.qml"));
-    QmlGraphicsAnimatedImage *anim = qobject_cast<QmlGraphicsAnimatedImage *>(component.create());
+    QDeclarativeEngine engine;
+    QDeclarativeComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/stickmanpause.qml"));
+    QDeclarativeAnimatedImage *anim = qobject_cast<QDeclarativeAnimatedImage *>(component.create());
     QVERIFY(anim);
     QVERIFY(anim->isPlaying());
     QVERIFY(anim->isPaused());
@@ -100,9 +100,9 @@ void tst_qmlgraphicsanimatedimage::pause()
 
 void tst_qmlgraphicsanimatedimage::stopped()
 {
-    QmlEngine engine;
-    QmlComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/stickmanstopped.qml"));
-    QmlGraphicsAnimatedImage *anim = qobject_cast<QmlGraphicsAnimatedImage *>(component.create());
+    QDeclarativeEngine engine;
+    QDeclarativeComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/stickmanstopped.qml"));
+    QDeclarativeAnimatedImage *anim = qobject_cast<QDeclarativeAnimatedImage *>(component.create());
     QVERIFY(anim);
     QVERIFY(!anim->isPlaying());
     QCOMPARE(anim->currentFrame(), 0);
@@ -112,9 +112,9 @@ void tst_qmlgraphicsanimatedimage::stopped()
 
 void tst_qmlgraphicsanimatedimage::setFrame()
 {
-    QmlEngine engine;
-    QmlComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/stickmanpause.qml"));
-    QmlGraphicsAnimatedImage *anim = qobject_cast<QmlGraphicsAnimatedImage *>(component.create());
+    QDeclarativeEngine engine;
+    QDeclarativeComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/stickmanpause.qml"));
+    QDeclarativeAnimatedImage *anim = qobject_cast<QDeclarativeAnimatedImage *>(component.create());
     QVERIFY(anim);
     QVERIFY(anim->isPlaying());
     QCOMPARE(anim->currentFrame(), 2);
@@ -124,9 +124,9 @@ void tst_qmlgraphicsanimatedimage::setFrame()
 
 void tst_qmlgraphicsanimatedimage::frameCount()
 {
-    QmlEngine engine;
-    QmlComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/colors.qml"));
-    QmlGraphicsAnimatedImage *anim = qobject_cast<QmlGraphicsAnimatedImage *>(component.create());
+    QDeclarativeEngine engine;
+    QDeclarativeComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/colors.qml"));
+    QDeclarativeAnimatedImage *anim = qobject_cast<QDeclarativeAnimatedImage *>(component.create());
     QVERIFY(anim);
     QVERIFY(anim->isPlaying());
     QCOMPARE(anim->frameCount(), 3);
@@ -143,11 +143,11 @@ void tst_qmlgraphicsanimatedimage::remote()
     QVERIFY(server.isValid());
     server.serveDirectory(SRCDIR "/data");
 
-    QmlEngine engine;
-    QmlComponent component(&engine, QUrl("http://127.0.0.1:14445/" + fileName));
+    QDeclarativeEngine engine;
+    QDeclarativeComponent component(&engine, QUrl("http://127.0.0.1:14445/" + fileName));
     TRY_WAIT(component.isReady());
 
-    QmlGraphicsAnimatedImage *anim = qobject_cast<QmlGraphicsAnimatedImage *>(component.create());
+    QDeclarativeAnimatedImage *anim = qobject_cast<QDeclarativeAnimatedImage *>(component.create());
     QVERIFY(anim);
 
     TRY_WAIT(anim->isPlaying());
@@ -170,14 +170,14 @@ void tst_qmlgraphicsanimatedimage::remote_data()
 
 void tst_qmlgraphicsanimatedimage::invalidSource()
 {
-    QmlEngine engine;
-    QmlComponent component(&engine);
+    QDeclarativeEngine engine;
+    QDeclarativeComponent component(&engine);
     component.setData("import Qt 4.6\n AnimatedImage { source: \"no-such-file.gif\" }", QUrl::fromLocalFile(""));
     QVERIFY(component.isReady());
 
     QTest::ignoreMessage(QtWarningMsg, "Error Reading Animated Image File  QUrl( \"file:no-such-file.gif\" )  ");
 
-    QmlGraphicsAnimatedImage *anim = qobject_cast<QmlGraphicsAnimatedImage *>(component.create());
+    QDeclarativeAnimatedImage *anim = qobject_cast<QDeclarativeAnimatedImage *>(component.create());
     QVERIFY(anim);
 
     QVERIFY(!anim->isPlaying());
@@ -188,4 +188,4 @@ void tst_qmlgraphicsanimatedimage::invalidSource()
 
 QTEST_MAIN(tst_qmlgraphicsanimatedimage)
 
-#include "tst_qmlgraphicsanimatedimage.moc"
+#include "tst_qdeclarativeanimatedimage.moc"
diff --git a/tests/auto/declarative/qmlanimations/data/attached.qml b/tests/auto/declarative/qdeclarativeanimations/data/attached.qml
index 0fb6f8c..0fb6f8c 100644
--- a/tests/auto/declarative/qmlanimations/data/attached.qml
+++ b/tests/auto/declarative/qdeclarativeanimations/data/attached.qml
diff --git a/tests/auto/declarative/qmlanimations/data/badproperty1.qml b/tests/auto/declarative/qdeclarativeanimations/data/badproperty1.qml
index d31cae9..d31cae9 100644
--- a/tests/auto/declarative/qmlanimations/data/badproperty1.qml
+++ b/tests/auto/declarative/qdeclarativeanimations/data/badproperty1.qml
diff --git a/tests/auto/declarative/qmlanimations/data/badproperty2.qml b/tests/auto/declarative/qdeclarativeanimations/data/badproperty2.qml
index 3b8b111..3b8b111 100644
--- a/tests/auto/declarative/qmlanimations/data/badproperty2.qml
+++ b/tests/auto/declarative/qdeclarativeanimations/data/badproperty2.qml
diff --git a/tests/auto/declarative/qmlanimations/data/badtype1.qml b/tests/auto/declarative/qdeclarativeanimations/data/badtype1.qml
index 6381df3..6381df3 100644
--- a/tests/auto/declarative/qmlanimations/data/badtype1.qml
+++ b/tests/auto/declarative/qdeclarativeanimations/data/badtype1.qml
diff --git a/tests/auto/declarative/qmlanimations/data/badtype2.qml b/tests/auto/declarative/qdeclarativeanimations/data/badtype2.qml
index 8d57e41..8d57e41 100644
--- a/tests/auto/declarative/qmlanimations/data/badtype2.qml
+++ b/tests/auto/declarative/qdeclarativeanimations/data/badtype2.qml
diff --git a/tests/auto/declarative/qmlanimations/data/badtype3.qml b/tests/auto/declarative/qdeclarativeanimations/data/badtype3.qml
index c4867c3..c4867c3 100644
--- a/tests/auto/declarative/qmlanimations/data/badtype3.qml
+++ b/tests/auto/declarative/qdeclarativeanimations/data/badtype3.qml
diff --git a/tests/auto/declarative/qmlanimations/data/badtype4.qml b/tests/auto/declarative/qdeclarativeanimations/data/badtype4.qml
index e80762f..e80762f 100644
--- a/tests/auto/declarative/qmlanimations/data/badtype4.qml
+++ b/tests/auto/declarative/qdeclarativeanimations/data/badtype4.qml
diff --git a/tests/auto/declarative/qmlanimations/data/dontAutoStart.qml b/tests/auto/declarative/qdeclarativeanimations/data/dontAutoStart.qml
index d9660b6..d9660b6 100644
--- a/tests/auto/declarative/qmlanimations/data/dontAutoStart.qml
+++ b/tests/auto/declarative/qdeclarativeanimations/data/dontAutoStart.qml
diff --git a/tests/auto/declarative/qmlanimations/data/dontStart.qml b/tests/auto/declarative/qdeclarativeanimations/data/dontStart.qml
index 36417db..36417db 100644
--- a/tests/auto/declarative/qmlanimations/data/dontStart.qml
+++ b/tests/auto/declarative/qdeclarativeanimations/data/dontStart.qml
diff --git a/tests/auto/declarative/qmlanimations/data/dontStart2.qml b/tests/auto/declarative/qdeclarativeanimations/data/dontStart2.qml
index 1a6540f..1a6540f 100644
--- a/tests/auto/declarative/qmlanimations/data/dontStart2.qml
+++ b/tests/auto/declarative/qdeclarativeanimations/data/dontStart2.qml
diff --git a/tests/auto/declarative/qmlanimations/data/dotproperty.qml b/tests/auto/declarative/qdeclarativeanimations/data/dotproperty.qml
index 9f0e699..9f0e699 100644
--- a/tests/auto/declarative/qmlanimations/data/dotproperty.qml
+++ b/tests/auto/declarative/qdeclarativeanimations/data/dotproperty.qml
diff --git a/tests/auto/declarative/qmlanimations/data/mixedtype1.qml b/tests/auto/declarative/qdeclarativeanimations/data/mixedtype1.qml
index 6770366..6770366 100644
--- a/tests/auto/declarative/qmlanimations/data/mixedtype1.qml
+++ b/tests/auto/declarative/qdeclarativeanimations/data/mixedtype1.qml
diff --git a/tests/auto/declarative/qmlanimations/data/mixedtype2.qml b/tests/auto/declarative/qdeclarativeanimations/data/mixedtype2.qml
index 80c9473..80c9473 100644
--- a/tests/auto/declarative/qmlanimations/data/mixedtype2.qml
+++ b/tests/auto/declarative/qdeclarativeanimations/data/mixedtype2.qml
diff --git a/tests/auto/declarative/qmlanimations/data/properties.qml b/tests/auto/declarative/qdeclarativeanimations/data/properties.qml
index 7e73f57..7e73f57 100644
--- a/tests/auto/declarative/qmlanimations/data/properties.qml
+++ b/tests/auto/declarative/qdeclarativeanimations/data/properties.qml
diff --git a/tests/auto/declarative/qmlanimations/data/properties2.qml b/tests/auto/declarative/qdeclarativeanimations/data/properties2.qml
index 6c96155..6c96155 100644
--- a/tests/auto/declarative/qmlanimations/data/properties2.qml
+++ b/tests/auto/declarative/qdeclarativeanimations/data/properties2.qml
diff --git a/tests/auto/declarative/qmlanimations/data/properties3.qml b/tests/auto/declarative/qdeclarativeanimations/data/properties3.qml
index ff08885..ff08885 100644
--- a/tests/auto/declarative/qmlanimations/data/properties3.qml
+++ b/tests/auto/declarative/qdeclarativeanimations/data/properties3.qml
diff --git a/tests/auto/declarative/qmlanimations/data/properties4.qml b/tests/auto/declarative/qdeclarativeanimations/data/properties4.qml
index dab7e5f..dab7e5f 100644
--- a/tests/auto/declarative/qmlanimations/data/properties4.qml
+++ b/tests/auto/declarative/qdeclarativeanimations/data/properties4.qml
diff --git a/tests/auto/declarative/qmlanimations/data/properties5.qml b/tests/auto/declarative/qdeclarativeanimations/data/properties5.qml
index 38396b1..38396b1 100644
--- a/tests/auto/declarative/qmlanimations/data/properties5.qml
+++ b/tests/auto/declarative/qdeclarativeanimations/data/properties5.qml
diff --git a/tests/auto/declarative/qmlanimations/data/propertiesTransition.qml b/tests/auto/declarative/qdeclarativeanimations/data/propertiesTransition.qml
index b13b94b..b13b94b 100644
--- a/tests/auto/declarative/qmlanimations/data/propertiesTransition.qml
+++ b/tests/auto/declarative/qdeclarativeanimations/data/propertiesTransition.qml
diff --git a/tests/auto/declarative/qmlanimations/data/propertiesTransition2.qml b/tests/auto/declarative/qdeclarativeanimations/data/propertiesTransition2.qml
index 033c5c1..033c5c1 100644
--- a/tests/auto/declarative/qmlanimations/data/propertiesTransition2.qml
+++ b/tests/auto/declarative/qdeclarativeanimations/data/propertiesTransition2.qml
diff --git a/tests/auto/declarative/qmlanimations/data/propertiesTransition3.qml b/tests/auto/declarative/qdeclarativeanimations/data/propertiesTransition3.qml
index d0704c9..d0704c9 100644
--- a/tests/auto/declarative/qmlanimations/data/propertiesTransition3.qml
+++ b/tests/auto/declarative/qdeclarativeanimations/data/propertiesTransition3.qml
diff --git a/tests/auto/declarative/qmlanimations/data/propertiesTransition4.qml b/tests/auto/declarative/qdeclarativeanimations/data/propertiesTransition4.qml
index e70c95c..e70c95c 100644
--- a/tests/auto/declarative/qmlanimations/data/propertiesTransition4.qml
+++ b/tests/auto/declarative/qdeclarativeanimations/data/propertiesTransition4.qml
diff --git a/tests/auto/declarative/qmlanimations/data/propertiesTransition5.qml b/tests/auto/declarative/qdeclarativeanimations/data/propertiesTransition5.qml
index b9e27da..b9e27da 100644
--- a/tests/auto/declarative/qmlanimations/data/propertiesTransition5.qml
+++ b/tests/auto/declarative/qdeclarativeanimations/data/propertiesTransition5.qml
diff --git a/tests/auto/declarative/qmlanimations/data/propertiesTransition6.qml b/tests/auto/declarative/qdeclarativeanimations/data/propertiesTransition6.qml
index 7417ed1..7417ed1 100644
--- a/tests/auto/declarative/qmlanimations/data/propertiesTransition6.qml
+++ b/tests/auto/declarative/qdeclarativeanimations/data/propertiesTransition6.qml
diff --git a/tests/auto/declarative/qmlanimations/data/valuesource.qml b/tests/auto/declarative/qdeclarativeanimations/data/valuesource.qml
index c35063d..c35063d 100644
--- a/tests/auto/declarative/qmlanimations/data/valuesource.qml
+++ b/tests/auto/declarative/qdeclarativeanimations/data/valuesource.qml
diff --git a/tests/auto/declarative/qmlanimations/data/valuesource2.qml b/tests/auto/declarative/qdeclarativeanimations/data/valuesource2.qml
index 1a60542..1a60542 100644
--- a/tests/auto/declarative/qmlanimations/data/valuesource2.qml
+++ b/tests/auto/declarative/qdeclarativeanimations/data/valuesource2.qml
diff --git a/tests/auto/declarative/qdeclarativeanimations/qdeclarativeanimations.pro b/tests/auto/declarative/qdeclarativeanimations/qdeclarativeanimations.pro
new file mode 100644
index 0000000..8eac75f
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeanimations/qdeclarativeanimations.pro
@@ -0,0 +1,6 @@
+load(qttest_p4)
+contains(QT_CONFIG,declarative): QT += declarative
+SOURCES += tst_qdeclarativeanimations.cpp
+macx:CONFIG -= app_bundle
+
+DEFINES += SRCDIR=\\\"$$PWD\\\"
diff --git a/tests/auto/declarative/qmlanimations/tst_qmlanimations.cpp b/tests/auto/declarative/qdeclarativeanimations/tst_qdeclarativeanimations.cpp
index 00e099e..9894fe0 100644
--- a/tests/auto/declarative/qmlanimations/tst_qmlanimations.cpp
+++ b/tests/auto/declarative/qdeclarativeanimations/tst_qdeclarativeanimations.cpp
@@ -39,11 +39,11 @@
 **
 ****************************************************************************/
 #include <qtest.h>
-#include <QtDeclarative/qmlengine.h>
-#include <QtDeclarative/qmlcomponent.h>
-#include <QtDeclarative/qmlview.h>
-#include <private/qmlgraphicsrectangle_p.h>
-#include <private/qmlanimation_p.h>
+#include <QtDeclarative/qdeclarativeengine.h>
+#include <QtDeclarative/qdeclarativecomponent.h>
+#include <QtDeclarative/qdeclarativeview.h>
+#include <private/qdeclarativerectangle_p.h>
+#include <private/qdeclarativeanimation_p.h>
 #include <QVariantAnimation>
 #include <QEasingCurve>
 
@@ -54,7 +54,7 @@ public:
     tst_qmlanimations() {}
 
 private slots:
-    void initTestCase() { QmlEngine engine; } // ensure types are registered
+    void initTestCase() { QDeclarativeEngine engine; } // ensure types are registered
 
     void simpleProperty();
     void simpleNumber();
@@ -86,8 +86,8 @@ private slots:
 
 void tst_qmlanimations::simpleProperty()
 {
-    QmlGraphicsRectangle rect;
-    QmlPropertyAnimation animation;
+    QDeclarativeRectangle rect;
+    QDeclarativePropertyAnimation animation;
     animation.setTarget(&rect);
     animation.setProperty("pos");
     animation.setTo(QPointF(200,200));
@@ -111,8 +111,8 @@ void tst_qmlanimations::simpleProperty()
 
 void tst_qmlanimations::simpleNumber()
 {
-    QmlGraphicsRectangle rect;
-    QmlNumberAnimation animation;
+    QDeclarativeRectangle rect;
+    QDeclarativeNumberAnimation animation;
     animation.setTarget(&rect);
     animation.setProperty("x");
     animation.setTo(200);
@@ -136,8 +136,8 @@ void tst_qmlanimations::simpleNumber()
 
 void tst_qmlanimations::simpleColor()
 {
-    QmlGraphicsRectangle rect;
-    QmlColorAnimation animation;
+    QDeclarativeRectangle rect;
+    QDeclarativeColorAnimation animation;
     animation.setTarget(&rect);
     animation.setProperty("color");
     animation.setTo(QColor("red"));
@@ -170,8 +170,8 @@ void tst_qmlanimations::simpleColor()
 
 void tst_qmlanimations::alwaysRunToEnd()
 {
-    QmlGraphicsRectangle rect;
-    QmlPropertyAnimation animation;
+    QDeclarativeRectangle rect;
+    QDeclarativePropertyAnimation animation;
     animation.setTarget(&rect);
     animation.setProperty("x");
     animation.setTo(200);
@@ -190,8 +190,8 @@ void tst_qmlanimations::alwaysRunToEnd()
 
 void tst_qmlanimations::complete()
 {
-    QmlGraphicsRectangle rect;
-    QmlPropertyAnimation animation;
+    QDeclarativeRectangle rect;
+    QDeclarativePropertyAnimation animation;
     animation.setTarget(&rect);
     animation.setProperty("x");
     animation.setFrom(1);
@@ -211,8 +211,8 @@ void tst_qmlanimations::complete()
 
 void tst_qmlanimations::resume()
 {
-    QmlGraphicsRectangle rect;
-    QmlPropertyAnimation animation;
+    QDeclarativeRectangle rect;
+    QDeclarativePropertyAnimation animation;
     animation.setTarget(&rect);
     animation.setProperty("x");
     animation.setFrom(10);
@@ -238,8 +238,8 @@ void tst_qmlanimations::resume()
 
 void tst_qmlanimations::dotProperty()
 {
-    QmlGraphicsRectangle rect;
-    QmlNumberAnimation animation;
+    QDeclarativeRectangle rect;
+    QDeclarativeNumberAnimation animation;
     animation.setTarget(&rect);
     animation.setProperty("border.width");
     animation.setTo(10);
@@ -259,7 +259,7 @@ void tst_qmlanimations::badTypes()
 {
     //don't crash
     {
-        QmlView *view = new QmlView;
+        QDeclarativeView *view = new QDeclarativeView;
         view->setSource(QUrl::fromLocalFile(SRCDIR "/data/badtype1.qml"));
 
         qApp->processEvents();
@@ -269,9 +269,9 @@ void tst_qmlanimations::badTypes()
 
     //make sure we get a compiler error
     {
-        QmlEngine engine;
-        QmlComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/badtype2.qml"));
-        QTest::ignoreMessage(QtWarningMsg, "QmlComponent: Component is not ready");
+        QDeclarativeEngine engine;
+        QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/badtype2.qml"));
+        QTest::ignoreMessage(QtWarningMsg, "QDeclarativeComponent: Component is not ready");
         c.create();
 
         QVERIFY(c.errors().count() == 1);
@@ -280,9 +280,9 @@ void tst_qmlanimations::badTypes()
 
     //make sure we get a compiler error
     {
-        QmlEngine engine;
-        QmlComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/badtype3.qml"));
-        QTest::ignoreMessage(QtWarningMsg, "QmlComponent: Component is not ready");
+        QDeclarativeEngine engine;
+        QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/badtype3.qml"));
+        QTest::ignoreMessage(QtWarningMsg, "QDeclarativeComponent: Component is not ready");
         c.create();
 
         QVERIFY(c.errors().count() == 1);
@@ -291,14 +291,14 @@ void tst_qmlanimations::badTypes()
 
     //don't crash
     {
-        QmlEngine engine;
-        QmlComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/badtype4.qml"));
-        QmlGraphicsRectangle *rect = qobject_cast<QmlGraphicsRectangle*>(c.create());
+        QDeclarativeEngine engine;
+        QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/badtype4.qml"));
+        QDeclarativeRectangle *rect = qobject_cast<QDeclarativeRectangle*>(c.create());
         QVERIFY(rect);
 
         rect->setState("state1");
         QTest::qWait(1000 + 50);
-        QmlGraphicsRectangle *myRect = rect->findChild<QmlGraphicsRectangle*>("MyRect");
+        QDeclarativeRectangle *myRect = rect->findChild<QDeclarativeRectangle*>("MyRect");
         QVERIFY(myRect);
         QCOMPARE(myRect->x(),qreal(200));
     }
@@ -308,18 +308,18 @@ void tst_qmlanimations::badProperties()
 {
     //make sure we get a runtime error
     {
-        QmlEngine engine;
+        QDeclarativeEngine engine;
 
-        QmlComponent c1(&engine, QUrl::fromLocalFile(SRCDIR "/data/badproperty1.qml"));
+        QDeclarativeComponent c1(&engine, QUrl::fromLocalFile(SRCDIR "/data/badproperty1.qml"));
         QByteArray message = "QML ColorAnimation (" + QUrl::fromLocalFile(SRCDIR "/data/badproperty1.qml").toString().toUtf8() + ":18:9) Cannot animate non-existent property \"border.colr\"";
         QTest::ignoreMessage(QtWarningMsg, message);
-        QmlGraphicsRectangle *rect = qobject_cast<QmlGraphicsRectangle*>(c1.create());
+        QDeclarativeRectangle *rect = qobject_cast<QDeclarativeRectangle*>(c1.create());
         QVERIFY(rect);
 
-        QmlComponent c2(&engine, QUrl::fromLocalFile(SRCDIR "/data/badproperty2.qml"));
+        QDeclarativeComponent c2(&engine, QUrl::fromLocalFile(SRCDIR "/data/badproperty2.qml"));
         message = "QML ColorAnimation (" + QUrl::fromLocalFile(SRCDIR "/data/badproperty2.qml").toString().toUtf8() + ":18:9) Cannot animate read-only property \"border\"";
         QTest::ignoreMessage(QtWarningMsg, message);
-        rect = qobject_cast<QmlGraphicsRectangle*>(c2.create());
+        rect = qobject_cast<QDeclarativeRectangle*>(c2.create());
         QVERIFY(rect);
 
         //### should we warn here are well?
@@ -333,14 +333,14 @@ void tst_qmlanimations::mixedTypes()
 {
     //assumes border.width stays a real -- not real robust
     {
-        QmlEngine engine;
-        QmlComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/mixedtype1.qml"));
-        QmlGraphicsRectangle *rect = qobject_cast<QmlGraphicsRectangle*>(c.create());
+        QDeclarativeEngine engine;
+        QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/mixedtype1.qml"));
+        QDeclarativeRectangle *rect = qobject_cast<QDeclarativeRectangle*>(c.create());
         QVERIFY(rect);
 
         rect->setState("state1");
         QTest::qWait(500);
-        QmlGraphicsRectangle *myRect = rect->findChild<QmlGraphicsRectangle*>("MyRect");
+        QDeclarativeRectangle *myRect = rect->findChild<QDeclarativeRectangle*>("MyRect");
         QVERIFY(myRect);
 
         //rather inexact -- is there a better way?
@@ -349,14 +349,14 @@ void tst_qmlanimations::mixedTypes()
     }
 
     {
-        QmlEngine engine;
-        QmlComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/mixedtype2.qml"));
-        QmlGraphicsRectangle *rect = qobject_cast<QmlGraphicsRectangle*>(c.create());
+        QDeclarativeEngine engine;
+        QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/mixedtype2.qml"));
+        QDeclarativeRectangle *rect = qobject_cast<QDeclarativeRectangle*>(c.create());
         QVERIFY(rect);
 
         rect->setState("state1");
         QTest::qWait(500);
-        QmlGraphicsRectangle *myRect = rect->findChild<QmlGraphicsRectangle*>("MyRect");
+        QDeclarativeRectangle *myRect = rect->findChild<QDeclarativeRectangle*>("MyRect");
         QVERIFY(myRect);
 
         //rather inexact -- is there a better way?
@@ -369,48 +369,48 @@ void tst_qmlanimations::properties()
 {
     const int waitDuration = 300;
     {
-        QmlEngine engine;
-        QmlComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/properties.qml"));
-        QmlGraphicsRectangle *rect = qobject_cast<QmlGraphicsRectangle*>(c.create());
+        QDeclarativeEngine engine;
+        QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/properties.qml"));
+        QDeclarativeRectangle *rect = qobject_cast<QDeclarativeRectangle*>(c.create());
         QVERIFY(rect);
 
-        QmlGraphicsRectangle *myRect = rect->findChild<QmlGraphicsRectangle*>("TheRect");
+        QDeclarativeRectangle *myRect = rect->findChild<QDeclarativeRectangle*>("TheRect");
         QVERIFY(myRect);
         QTest::qWait(waitDuration);
         QTIMED_COMPARE(myRect->x(),qreal(200));
     }
 
     {
-        QmlEngine engine;
-        QmlComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/properties2.qml"));
-        QmlGraphicsRectangle *rect = qobject_cast<QmlGraphicsRectangle*>(c.create());
+        QDeclarativeEngine engine;
+        QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/properties2.qml"));
+        QDeclarativeRectangle *rect = qobject_cast<QDeclarativeRectangle*>(c.create());
         QVERIFY(rect);
 
-        QmlGraphicsRectangle *myRect = rect->findChild<QmlGraphicsRectangle*>("TheRect");
+        QDeclarativeRectangle *myRect = rect->findChild<QDeclarativeRectangle*>("TheRect");
         QVERIFY(myRect);
         QTest::qWait(waitDuration);
         QTIMED_COMPARE(myRect->x(),qreal(200));
     }
 
     {
-        QmlEngine engine;
-        QmlComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/properties3.qml"));
-        QmlGraphicsRectangle *rect = qobject_cast<QmlGraphicsRectangle*>(c.create());
+        QDeclarativeEngine engine;
+        QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/properties3.qml"));
+        QDeclarativeRectangle *rect = qobject_cast<QDeclarativeRectangle*>(c.create());
         QVERIFY(rect);
 
-        QmlGraphicsRectangle *myRect = rect->findChild<QmlGraphicsRectangle*>("TheRect");
+        QDeclarativeRectangle *myRect = rect->findChild<QDeclarativeRectangle*>("TheRect");
         QVERIFY(myRect);
         QTest::qWait(waitDuration);
         QTIMED_COMPARE(myRect->x(),qreal(300));
     }
 
     {
-        QmlEngine engine;
-        QmlComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/properties4.qml"));
-        QmlGraphicsRectangle *rect = qobject_cast<QmlGraphicsRectangle*>(c.create());
+        QDeclarativeEngine engine;
+        QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/properties4.qml"));
+        QDeclarativeRectangle *rect = qobject_cast<QDeclarativeRectangle*>(c.create());
         QVERIFY(rect);
 
-        QmlGraphicsRectangle *myRect = rect->findChild<QmlGraphicsRectangle*>("TheRect");
+        QDeclarativeRectangle *myRect = rect->findChild<QDeclarativeRectangle*>("TheRect");
         QVERIFY(myRect);
         QTest::qWait(waitDuration);
         QTIMED_COMPARE(myRect->y(),qreal(200));
@@ -418,12 +418,12 @@ void tst_qmlanimations::properties()
     }
 
     {
-        QmlEngine engine;
-        QmlComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/properties5.qml"));
-        QmlGraphicsRectangle *rect = qobject_cast<QmlGraphicsRectangle*>(c.create());
+        QDeclarativeEngine engine;
+        QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/properties5.qml"));
+        QDeclarativeRectangle *rect = qobject_cast<QDeclarativeRectangle*>(c.create());
         QVERIFY(rect);
 
-        QmlGraphicsRectangle *myRect = rect->findChild<QmlGraphicsRectangle*>("TheRect");
+        QDeclarativeRectangle *myRect = rect->findChild<QDeclarativeRectangle*>("TheRect");
         QVERIFY(myRect);
         QTest::qWait(waitDuration);
         QTIMED_COMPARE(myRect->x(),qreal(100));
@@ -435,25 +435,25 @@ void tst_qmlanimations::propertiesTransition()
 {
     const int waitDuration = 300;
     {
-        QmlEngine engine;
-        QmlComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/propertiesTransition.qml"));
-        QmlGraphicsRectangle *rect = qobject_cast<QmlGraphicsRectangle*>(c.create());
+        QDeclarativeEngine engine;
+        QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/propertiesTransition.qml"));
+        QDeclarativeRectangle *rect = qobject_cast<QDeclarativeRectangle*>(c.create());
         QVERIFY(rect);
 
         rect->setState("moved");
-        QmlGraphicsRectangle *myRect = rect->findChild<QmlGraphicsRectangle*>("TheRect");
+        QDeclarativeRectangle *myRect = rect->findChild<QDeclarativeRectangle*>("TheRect");
         QVERIFY(myRect);
         QTest::qWait(waitDuration);
         QTIMED_COMPARE(myRect->x(),qreal(200));
     }
 
     {
-        QmlEngine engine;
-        QmlComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/propertiesTransition2.qml"));
-        QmlGraphicsRectangle *rect = qobject_cast<QmlGraphicsRectangle*>(c.create());
+        QDeclarativeEngine engine;
+        QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/propertiesTransition2.qml"));
+        QDeclarativeRectangle *rect = qobject_cast<QDeclarativeRectangle*>(c.create());
         QVERIFY(rect);
 
-        QmlGraphicsRectangle *myRect = rect->findChild<QmlGraphicsRectangle*>("TheRect");
+        QDeclarativeRectangle *myRect = rect->findChild<QDeclarativeRectangle*>("TheRect");
         QVERIFY(myRect);
         rect->setState("moved");
         QCOMPARE(myRect->x(),qreal(200));
@@ -463,12 +463,12 @@ void tst_qmlanimations::propertiesTransition()
     }
 
     {
-        QmlEngine engine;
-        QmlComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/propertiesTransition3.qml"));
-        QmlGraphicsRectangle *rect = qobject_cast<QmlGraphicsRectangle*>(c.create());
+        QDeclarativeEngine engine;
+        QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/propertiesTransition3.qml"));
+        QDeclarativeRectangle *rect = qobject_cast<QDeclarativeRectangle*>(c.create());
         QVERIFY(rect);
 
-        QmlGraphicsRectangle *myRect = rect->findChild<QmlGraphicsRectangle*>("TheRect");
+        QDeclarativeRectangle *myRect = rect->findChild<QDeclarativeRectangle*>("TheRect");
         QVERIFY(myRect);
         rect->setState("moved");
         QCOMPARE(myRect->x(),qreal(200));
@@ -476,12 +476,12 @@ void tst_qmlanimations::propertiesTransition()
     }
 
     {
-        QmlEngine engine;
-        QmlComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/propertiesTransition4.qml"));
-        QmlGraphicsRectangle *rect = qobject_cast<QmlGraphicsRectangle*>(c.create());
+        QDeclarativeEngine engine;
+        QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/propertiesTransition4.qml"));
+        QDeclarativeRectangle *rect = qobject_cast<QDeclarativeRectangle*>(c.create());
         QVERIFY(rect);
 
-        QmlGraphicsRectangle *myRect = rect->findChild<QmlGraphicsRectangle*>("TheRect");
+        QDeclarativeRectangle *myRect = rect->findChild<QDeclarativeRectangle*>("TheRect");
         QVERIFY(myRect);
         rect->setState("moved");
         QCOMPARE(myRect->x(),qreal(100));
@@ -490,12 +490,12 @@ void tst_qmlanimations::propertiesTransition()
     }
 
     {
-        QmlEngine engine;
-        QmlComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/propertiesTransition5.qml"));
-        QmlGraphicsRectangle *rect = qobject_cast<QmlGraphicsRectangle*>(c.create());
+        QDeclarativeEngine engine;
+        QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/propertiesTransition5.qml"));
+        QDeclarativeRectangle *rect = qobject_cast<QDeclarativeRectangle*>(c.create());
         QVERIFY(rect);
 
-        QmlGraphicsRectangle *myRect = rect->findChild<QmlGraphicsRectangle*>("TheRect");
+        QDeclarativeRectangle *myRect = rect->findChild<QDeclarativeRectangle*>("TheRect");
         QVERIFY(myRect);
         rect->setState("moved");
         QCOMPARE(myRect->x(),qreal(100));
@@ -504,12 +504,12 @@ void tst_qmlanimations::propertiesTransition()
     }
 
     /*{
-        QmlEngine engine;
-        QmlComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/propertiesTransition6.qml"));
-        QmlGraphicsRectangle *rect = qobject_cast<QmlGraphicsRectangle*>(c.create());
+        QDeclarativeEngine engine;
+        QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/propertiesTransition6.qml"));
+        QDeclarativeRectangle *rect = qobject_cast<QDeclarativeRectangle*>(c.create());
         QVERIFY(rect);
 
-        QmlGraphicsRectangle *myRect = rect->findChild<QmlGraphicsRectangle*>("TheRect");
+        QDeclarativeRectangle *myRect = rect->findChild<QDeclarativeRectangle*>("TheRect");
         QVERIFY(myRect);
         rect->setState("moved");
         QCOMPARE(myRect->x(),qreal(100));
@@ -520,12 +520,12 @@ void tst_qmlanimations::propertiesTransition()
 
 void tst_qmlanimations::invalidDuration()
 {
-    QmlPropertyAnimation *animation = new QmlPropertyAnimation;
+    QDeclarativePropertyAnimation *animation = new QDeclarativePropertyAnimation;
     QTest::ignoreMessage(QtWarningMsg, "QML PropertyAnimation (unknown location) Cannot set a duration of < 0");
     animation->setDuration(-1);
     QCOMPARE(animation->duration(), 250);
 
-    QmlPauseAnimation *pauseAnimation = new QmlPauseAnimation;
+    QDeclarativePauseAnimation *pauseAnimation = new QDeclarativePauseAnimation;
     QTest::ignoreMessage(QtWarningMsg, "QML PauseAnimation (unknown location) Cannot set a duration of < 0");
     pauseAnimation->setDuration(-1);
     QCOMPARE(pauseAnimation->duration(), 250);
@@ -533,52 +533,52 @@ void tst_qmlanimations::invalidDuration()
 
 void tst_qmlanimations::attached()
 {
-    QmlEngine engine;
+    QDeclarativeEngine engine;
 
-    QmlComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/attached.qml"));
+    QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/attached.qml"));
     QTest::ignoreMessage(QtDebugMsg, "off");
     QTest::ignoreMessage(QtDebugMsg, "on");
-    QmlGraphicsRectangle *rect = qobject_cast<QmlGraphicsRectangle*>(c.create());
+    QDeclarativeRectangle *rect = qobject_cast<QDeclarativeRectangle*>(c.create());
     QVERIFY(rect);
 }
 
 void tst_qmlanimations::propertyValueSourceDefaultStart()
 {
     {
-        QmlEngine engine;
+        QDeclarativeEngine engine;
 
-        QmlComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/valuesource.qml"));
+        QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/valuesource.qml"));
 
-        QmlGraphicsRectangle *rect = qobject_cast<QmlGraphicsRectangle*>(c.create());
+        QDeclarativeRectangle *rect = qobject_cast<QDeclarativeRectangle*>(c.create());
         QVERIFY(rect);
 
-        QmlAbstractAnimation *myAnim = rect->findChild<QmlAbstractAnimation*>("MyAnim");
+        QDeclarativeAbstractAnimation *myAnim = rect->findChild<QDeclarativeAbstractAnimation*>("MyAnim");
         QVERIFY(myAnim);
         QVERIFY(myAnim->isRunning());
     }
 
     {
-        QmlEngine engine;
+        QDeclarativeEngine engine;
 
-        QmlComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/valuesource2.qml"));
+        QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/valuesource2.qml"));
 
-        QmlGraphicsRectangle *rect = qobject_cast<QmlGraphicsRectangle*>(c.create());
+        QDeclarativeRectangle *rect = qobject_cast<QDeclarativeRectangle*>(c.create());
         QVERIFY(rect);
 
-        QmlAbstractAnimation *myAnim = rect->findChild<QmlAbstractAnimation*>("MyAnim");
+        QDeclarativeAbstractAnimation *myAnim = rect->findChild<QDeclarativeAbstractAnimation*>("MyAnim");
         QVERIFY(myAnim);
         QVERIFY(myAnim->isRunning() == false);
     }
 
     {
-        QmlEngine engine;
+        QDeclarativeEngine engine;
 
-        QmlComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/dontAutoStart.qml"));
+        QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/dontAutoStart.qml"));
 
-        QmlGraphicsRectangle *rect = qobject_cast<QmlGraphicsRectangle*>(c.create());
+        QDeclarativeRectangle *rect = qobject_cast<QDeclarativeRectangle*>(c.create());
         QVERIFY(rect);
 
-        QmlAbstractAnimation *myAnim = rect->findChild<QmlAbstractAnimation*>("MyAnim");
+        QDeclarativeAbstractAnimation *myAnim = rect->findChild<QDeclarativeAbstractAnimation*>("MyAnim");
         QVERIFY(myAnim && myAnim->qtAnimation());
         QVERIFY(myAnim->qtAnimation()->state() == QAbstractAnimation::Stopped);
     }
@@ -588,29 +588,29 @@ void tst_qmlanimations::propertyValueSourceDefaultStart()
 void tst_qmlanimations::dontStart()
 {
     {
-        QmlEngine engine;
+        QDeclarativeEngine engine;
 
-        QmlComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/dontStart.qml"));
+        QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/dontStart.qml"));
 
-        QTest::ignoreMessage(QtWarningMsg, "QmlAbstractAnimation: setRunning() cannot be used on non-root animation nodes");
-        QmlGraphicsRectangle *rect = qobject_cast<QmlGraphicsRectangle*>(c.create());
+        QTest::ignoreMessage(QtWarningMsg, "QDeclarativeAbstractAnimation: setRunning() cannot be used on non-root animation nodes");
+        QDeclarativeRectangle *rect = qobject_cast<QDeclarativeRectangle*>(c.create());
         QVERIFY(rect);
 
-        QmlAbstractAnimation *myAnim = rect->findChild<QmlAbstractAnimation*>("MyAnim");
+        QDeclarativeAbstractAnimation *myAnim = rect->findChild<QDeclarativeAbstractAnimation*>("MyAnim");
         QVERIFY(myAnim && myAnim->qtAnimation());
         QVERIFY(myAnim->qtAnimation()->state() == QAbstractAnimation::Stopped);
     }
 
     {
-        QmlEngine engine;
+        QDeclarativeEngine engine;
 
-        QmlComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/dontStart2.qml"));
+        QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/dontStart2.qml"));
 
-        QTest::ignoreMessage(QtWarningMsg, "QmlAbstractAnimation: setRunning() cannot be used on non-root animation nodes");
-        QmlGraphicsRectangle *rect = qobject_cast<QmlGraphicsRectangle*>(c.create());
+        QTest::ignoreMessage(QtWarningMsg, "QDeclarativeAbstractAnimation: setRunning() cannot be used on non-root animation nodes");
+        QDeclarativeRectangle *rect = qobject_cast<QDeclarativeRectangle*>(c.create());
         QVERIFY(rect);
 
-        QmlAbstractAnimation *myAnim = rect->findChild<QmlAbstractAnimation*>("MyAnim");
+        QDeclarativeAbstractAnimation *myAnim = rect->findChild<QDeclarativeAbstractAnimation*>("MyAnim");
         QVERIFY(myAnim && myAnim->qtAnimation());
         QVERIFY(myAnim->qtAnimation()->state() == QAbstractAnimation::Stopped);
     }
@@ -619,22 +619,22 @@ void tst_qmlanimations::dontStart()
 void tst_qmlanimations::easingProperties()
 {
     {
-        QmlEngine engine;
+        QDeclarativeEngine engine;
         QString componentStr = "import Qt 4.6\nNumberAnimation { easing.type: \"InOutQuad\" }";
-        QmlComponent animationComponent(&engine);
+        QDeclarativeComponent animationComponent(&engine);
         animationComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
-        QmlPropertyAnimation *animObject = qobject_cast<QmlPropertyAnimation*>(animationComponent.create());
+        QDeclarativePropertyAnimation *animObject = qobject_cast<QDeclarativePropertyAnimation*>(animationComponent.create());
 
         QVERIFY(animObject != 0);
         QCOMPARE(animObject->easing().type(), QEasingCurve::InOutQuad);
     }
 
     {
-        QmlEngine engine;
+        QDeclarativeEngine engine;
         QString componentStr = "import Qt 4.6\nPropertyAnimation { easing.type: \"OutBounce\"; easing.amplitude: 5.0 }";
-        QmlComponent animationComponent(&engine);
+        QDeclarativeComponent animationComponent(&engine);
         animationComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
-        QmlPropertyAnimation *animObject = qobject_cast<QmlPropertyAnimation*>(animationComponent.create());
+        QDeclarativePropertyAnimation *animObject = qobject_cast<QDeclarativePropertyAnimation*>(animationComponent.create());
 
         QVERIFY(animObject != 0);
         QCOMPARE(animObject->easing().type(), QEasingCurve::OutBounce);
@@ -642,11 +642,11 @@ void tst_qmlanimations::easingProperties()
     }
 
     {
-        QmlEngine engine;
+        QDeclarativeEngine engine;
         QString componentStr = "import Qt 4.6\nPropertyAnimation { easing.type: \"OutElastic\"; easing.amplitude: 5.0; easing.period: 3.0}";
-        QmlComponent animationComponent(&engine);
+        QDeclarativeComponent animationComponent(&engine);
         animationComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
-        QmlPropertyAnimation *animObject = qobject_cast<QmlPropertyAnimation*>(animationComponent.create());
+        QDeclarativePropertyAnimation *animObject = qobject_cast<QDeclarativePropertyAnimation*>(animationComponent.create());
 
         QVERIFY(animObject != 0);
         QCOMPARE(animObject->easing().type(), QEasingCurve::OutElastic);
@@ -655,11 +655,11 @@ void tst_qmlanimations::easingProperties()
     }
 
     {
-        QmlEngine engine;
+        QDeclarativeEngine engine;
         QString componentStr = "import Qt 4.6\nPropertyAnimation { easing.type: \"InOutBack\"; easing.overshoot: 2 }";
-        QmlComponent animationComponent(&engine);
+        QDeclarativeComponent animationComponent(&engine);
         animationComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
-        QmlPropertyAnimation *animObject = qobject_cast<QmlPropertyAnimation*>(animationComponent.create());
+        QDeclarativePropertyAnimation *animObject = qobject_cast<QDeclarativePropertyAnimation*>(animationComponent.create());
 
         QVERIFY(animObject != 0);
         QCOMPARE(animObject->easing().type(), QEasingCurve::InOutBack);
@@ -669,4 +669,4 @@ void tst_qmlanimations::easingProperties()
 
 QTEST_MAIN(tst_qmlanimations)
 
-#include "tst_qmlanimations.moc"
+#include "tst_qdeclarativeanimations.moc"
diff --git a/tests/auto/declarative/qmlbehaviors/data/binding.qml b/tests/auto/declarative/qdeclarativebehaviors/data/binding.qml
index 201da37..201da37 100644
--- a/tests/auto/declarative/qmlbehaviors/data/binding.qml
+++ b/tests/auto/declarative/qdeclarativebehaviors/data/binding.qml
diff --git a/tests/auto/declarative/qmlbehaviors/data/color.qml b/tests/auto/declarative/qdeclarativebehaviors/data/color.qml
index 91dbbd1..91dbbd1 100644
--- a/tests/auto/declarative/qmlbehaviors/data/color.qml
+++ b/tests/auto/declarative/qdeclarativebehaviors/data/color.qml
diff --git a/tests/auto/declarative/qmlbehaviors/data/cpptrigger.qml b/tests/auto/declarative/qdeclarativebehaviors/data/cpptrigger.qml
index 8d032f0..8d032f0 100644
--- a/tests/auto/declarative/qmlbehaviors/data/cpptrigger.qml
+++ b/tests/auto/declarative/qdeclarativebehaviors/data/cpptrigger.qml
diff --git a/tests/auto/declarative/qmlbehaviors/data/disabled.qml b/tests/auto/declarative/qdeclarativebehaviors/data/disabled.qml
index 3c7078a..3c7078a 100644
--- a/tests/auto/declarative/qmlbehaviors/data/disabled.qml
+++ b/tests/auto/declarative/qdeclarativebehaviors/data/disabled.qml
diff --git a/tests/auto/declarative/qmlbehaviors/data/dontStart.qml b/tests/auto/declarative/qdeclarativebehaviors/data/dontStart.qml
index ba7cc9c..ba7cc9c 100644
--- a/tests/auto/declarative/qmlbehaviors/data/dontStart.qml
+++ b/tests/auto/declarative/qdeclarativebehaviors/data/dontStart.qml
diff --git a/tests/auto/declarative/qmlbehaviors/data/empty.qml b/tests/auto/declarative/qdeclarativebehaviors/data/empty.qml
index 95d934a..95d934a 100644
--- a/tests/auto/declarative/qmlbehaviors/data/empty.qml
+++ b/tests/auto/declarative/qdeclarativebehaviors/data/empty.qml
diff --git a/tests/auto/declarative/qmlbehaviors/data/explicit.qml b/tests/auto/declarative/qdeclarativebehaviors/data/explicit.qml
index 1b2025a..1b2025a 100644
--- a/tests/auto/declarative/qmlbehaviors/data/explicit.qml
+++ b/tests/auto/declarative/qdeclarativebehaviors/data/explicit.qml
diff --git a/tests/auto/declarative/qmlbehaviors/data/groupProperty.qml b/tests/auto/declarative/qdeclarativebehaviors/data/groupProperty.qml
index 14883d4..14883d4 100644
--- a/tests/auto/declarative/qmlbehaviors/data/groupProperty.qml
+++ b/tests/auto/declarative/qdeclarativebehaviors/data/groupProperty.qml
diff --git a/tests/auto/declarative/qmlbehaviors/data/groupProperty2.qml b/tests/auto/declarative/qdeclarativebehaviors/data/groupProperty2.qml
index b43ddbc..b43ddbc 100644
--- a/tests/auto/declarative/qmlbehaviors/data/groupProperty2.qml
+++ b/tests/auto/declarative/qdeclarativebehaviors/data/groupProperty2.qml
diff --git a/tests/auto/declarative/qmlbehaviors/data/loop.qml b/tests/auto/declarative/qdeclarativebehaviors/data/loop.qml
index 5f2c057..5f2c057 100644
--- a/tests/auto/declarative/qmlbehaviors/data/loop.qml
+++ b/tests/auto/declarative/qdeclarativebehaviors/data/loop.qml
diff --git a/tests/auto/declarative/qmlbehaviors/data/nonSelecting2.qml b/tests/auto/declarative/qdeclarativebehaviors/data/nonSelecting2.qml
index f267a05..f267a05 100644
--- a/tests/auto/declarative/qmlbehaviors/data/nonSelecting2.qml
+++ b/tests/auto/declarative/qdeclarativebehaviors/data/nonSelecting2.qml
diff --git a/tests/auto/declarative/qmlbehaviors/data/parent.qml b/tests/auto/declarative/qdeclarativebehaviors/data/parent.qml
index 7c7fdcb..7c7fdcb 100644
--- a/tests/auto/declarative/qmlbehaviors/data/parent.qml
+++ b/tests/auto/declarative/qdeclarativebehaviors/data/parent.qml
diff --git a/tests/auto/declarative/qmlbehaviors/data/reassignedAnimation.qml b/tests/auto/declarative/qdeclarativebehaviors/data/reassignedAnimation.qml
index ba744b1..ba744b1 100644
--- a/tests/auto/declarative/qmlbehaviors/data/reassignedAnimation.qml
+++ b/tests/auto/declarative/qdeclarativebehaviors/data/reassignedAnimation.qml
diff --git a/tests/auto/declarative/qmlbehaviors/data/scripttrigger.qml b/tests/auto/declarative/qdeclarativebehaviors/data/scripttrigger.qml
index a91ca88..a91ca88 100644
--- a/tests/auto/declarative/qmlbehaviors/data/scripttrigger.qml
+++ b/tests/auto/declarative/qdeclarativebehaviors/data/scripttrigger.qml
diff --git a/tests/auto/declarative/qmlbehaviors/data/simple.qml b/tests/auto/declarative/qdeclarativebehaviors/data/simple.qml
index ac98ed0..ac98ed0 100644
--- a/tests/auto/declarative/qmlbehaviors/data/simple.qml
+++ b/tests/auto/declarative/qdeclarativebehaviors/data/simple.qml
diff --git a/tests/auto/declarative/qdeclarativebehaviors/qdeclarativebehaviors.pro b/tests/auto/declarative/qdeclarativebehaviors/qdeclarativebehaviors.pro
new file mode 100644
index 0000000..a1dac32
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativebehaviors/qdeclarativebehaviors.pro
@@ -0,0 +1,6 @@
+load(qttest_p4)
+contains(QT_CONFIG,declarative): QT += declarative
+SOURCES += tst_qdeclarativebehaviors.cpp
+macx:CONFIG -= app_bundle
+
+DEFINES += SRCDIR=\\\"$$PWD\\\"
diff --git a/tests/auto/declarative/qmlbehaviors/tst_qmlbehaviors.cpp b/tests/auto/declarative/qdeclarativebehaviors/tst_qdeclarativebehaviors.cpp
index e31b600..a177247 100644
--- a/tests/auto/declarative/qmlbehaviors/tst_qmlbehaviors.cpp
+++ b/tests/auto/declarative/qdeclarativebehaviors/tst_qdeclarativebehaviors.cpp
@@ -39,12 +39,12 @@
 **
 ****************************************************************************/
 #include <qtest.h>
-#include <QtDeclarative/qmlengine.h>
-#include <QtDeclarative/qmlcomponent.h>
-#include <QtDeclarative/qmlview.h>
-#include <private/qmlgraphicsrectangle_p.h>
-#include <private/qmlbehavior_p.h>
-#include <private/qmlanimation_p.h>
+#include <QtDeclarative/qdeclarativeengine.h>
+#include <QtDeclarative/qdeclarativecomponent.h>
+#include <QtDeclarative/qdeclarativeview.h>
+#include <private/qdeclarativerectangle_p.h>
+#include <private/qdeclarativebehavior_p.h>
+#include <private/qdeclarativeanimation_p.h>
 
 class tst_qmlbehaviors : public QObject
 {
@@ -72,39 +72,39 @@ private slots:
 
 void tst_qmlbehaviors::simpleBehavior()
 {
-    QmlEngine engine;
-    QmlComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/simple.qml"));
-    QmlGraphicsRectangle *rect = qobject_cast<QmlGraphicsRectangle*>(c.create());
+    QDeclarativeEngine engine;
+    QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/simple.qml"));
+    QDeclarativeRectangle *rect = qobject_cast<QDeclarativeRectangle*>(c.create());
     QVERIFY(rect);
-    QVERIFY(qobject_cast<QmlBehavior*>(rect->findChild<QmlBehavior*>("MyBehavior"))->animation());
+    QVERIFY(qobject_cast<QDeclarativeBehavior*>(rect->findChild<QDeclarativeBehavior*>("MyBehavior"))->animation());
 
     rect->setState("moved");
     QTest::qWait(200);
-    qreal x = qobject_cast<QmlGraphicsRectangle*>(rect->findChild<QmlGraphicsRectangle*>("MyRect"))->x();
+    qreal x = qobject_cast<QDeclarativeRectangle*>(rect->findChild<QDeclarativeRectangle*>("MyRect"))->x();
     QVERIFY(x > 0 && x < 200);  //i.e. the behavior has been triggered
 }
 
 void tst_qmlbehaviors::scriptTriggered()
 {
-    QmlEngine engine;
-    QmlComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/scripttrigger.qml"));
-    QmlGraphicsRectangle *rect = qobject_cast<QmlGraphicsRectangle*>(c.create());
+    QDeclarativeEngine engine;
+    QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/scripttrigger.qml"));
+    QDeclarativeRectangle *rect = qobject_cast<QDeclarativeRectangle*>(c.create());
     QVERIFY(rect);
 
     rect->setColor(QColor("red"));
     QTest::qWait(200);
-    qreal x = qobject_cast<QmlGraphicsRectangle*>(rect->findChild<QmlGraphicsRectangle*>("MyRect"))->x();
+    qreal x = qobject_cast<QDeclarativeRectangle*>(rect->findChild<QDeclarativeRectangle*>("MyRect"))->x();
     QVERIFY(x > 0 && x < 200);  //i.e. the behavior has been triggered
 }
 
 void tst_qmlbehaviors::cppTriggered()
 {
-    QmlEngine engine;
-    QmlComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/cpptrigger.qml"));
-    QmlGraphicsRectangle *rect = qobject_cast<QmlGraphicsRectangle*>(c.create());
+    QDeclarativeEngine engine;
+    QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/cpptrigger.qml"));
+    QDeclarativeRectangle *rect = qobject_cast<QDeclarativeRectangle*>(c.create());
     QVERIFY(rect);
 
-    QmlGraphicsRectangle *innerRect = qobject_cast<QmlGraphicsRectangle*>(rect->findChild<QmlGraphicsRectangle*>("MyRect"));
+    QDeclarativeRectangle *innerRect = qobject_cast<QDeclarativeRectangle*>(rect->findChild<QDeclarativeRectangle*>("MyRect"));
     QVERIFY(innerRect);
 
     innerRect->setProperty("x", 200);
@@ -115,9 +115,9 @@ void tst_qmlbehaviors::cppTriggered()
 
 void tst_qmlbehaviors::loop()
 {
-    QmlEngine engine;
-    QmlComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/loop.qml"));
-    QmlGraphicsRectangle *rect = qobject_cast<QmlGraphicsRectangle*>(c.create());
+    QDeclarativeEngine engine;
+    QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/loop.qml"));
+    QDeclarativeRectangle *rect = qobject_cast<QDeclarativeRectangle*>(c.create());
     QVERIFY(rect);
 
     //don't crash
@@ -126,44 +126,44 @@ void tst_qmlbehaviors::loop()
 
 void tst_qmlbehaviors::colorBehavior()
 {
-    QmlEngine engine;
-    QmlComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/color.qml"));
-    QmlGraphicsRectangle *rect = qobject_cast<QmlGraphicsRectangle*>(c.create());
+    QDeclarativeEngine engine;
+    QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/color.qml"));
+    QDeclarativeRectangle *rect = qobject_cast<QDeclarativeRectangle*>(c.create());
     QVERIFY(rect);
 
     rect->setState("red");
     QTest::qWait(200);
-    QColor color = qobject_cast<QmlGraphicsRectangle*>(rect->findChild<QmlGraphicsRectangle*>("MyRect"))->color();
+    QColor color = qobject_cast<QDeclarativeRectangle*>(rect->findChild<QDeclarativeRectangle*>("MyRect"))->color();
     QVERIFY(color != QColor("red") && color != QColor("green"));  //i.e. the behavior has been triggered
 }
 
 void tst_qmlbehaviors::parentBehavior()
 {
-    QmlEngine engine;
-    QmlComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/parent.qml"));
-    QmlGraphicsRectangle *rect = qobject_cast<QmlGraphicsRectangle*>(c.create());
+    QDeclarativeEngine engine;
+    QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/parent.qml"));
+    QDeclarativeRectangle *rect = qobject_cast<QDeclarativeRectangle*>(c.create());
     QVERIFY(rect);
 
     rect->setState("reparented");
     QTest::qWait(200);
-    QmlGraphicsItem *newParent = rect->findChild<QmlGraphicsItem*>("NewParent");
-    QmlGraphicsItem *parent = rect->findChild<QmlGraphicsRectangle*>("MyRect")->parentItem();
+    QDeclarativeItem *newParent = rect->findChild<QDeclarativeItem*>("NewParent");
+    QDeclarativeItem *parent = rect->findChild<QDeclarativeRectangle*>("MyRect")->parentItem();
     QVERIFY(parent != newParent);
     QTest::qWait(600);
-    parent = rect->findChild<QmlGraphicsRectangle*>("MyRect")->parentItem();
+    parent = rect->findChild<QDeclarativeRectangle*>("MyRect")->parentItem();
     QVERIFY(parent == newParent);
 }
 
 void tst_qmlbehaviors::replaceBinding()
 {
-    QmlEngine engine;
-    QmlComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/binding.qml"));
-    QmlGraphicsRectangle *rect = qobject_cast<QmlGraphicsRectangle*>(c.create());
+    QDeclarativeEngine engine;
+    QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/binding.qml"));
+    QDeclarativeRectangle *rect = qobject_cast<QDeclarativeRectangle*>(c.create());
     QVERIFY(rect);
 
     rect->setState("moved");
     QTest::qWait(200);
-    QmlGraphicsRectangle *innerRect = qobject_cast<QmlGraphicsRectangle*>(rect->findChild<QmlGraphicsRectangle*>("MyRect"));
+    QDeclarativeRectangle *innerRect = qobject_cast<QDeclarativeRectangle*>(rect->findChild<QDeclarativeRectangle*>("MyRect"));
     QVERIFY(innerRect);
     qreal x = innerRect->x();
     QVERIFY(x > 0 && x < 200);  //i.e. the behavior has been triggered
@@ -191,53 +191,53 @@ void tst_qmlbehaviors::replaceBinding()
 void tst_qmlbehaviors::group()
 {
     {
-        QmlEngine engine;
-        QmlComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/groupProperty.qml"));
-        QmlGraphicsRectangle *rect = qobject_cast<QmlGraphicsRectangle*>(c.create());
+        QDeclarativeEngine engine;
+        QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/groupProperty.qml"));
+        QDeclarativeRectangle *rect = qobject_cast<QDeclarativeRectangle*>(c.create());
         QVERIFY(rect);
 
         rect->setState("moved");
         QTest::qWait(200);
-        qreal x = qobject_cast<QmlGraphicsRectangle*>(rect->findChild<QmlGraphicsRectangle*>("MyRect"))->x();
+        qreal x = qobject_cast<QDeclarativeRectangle*>(rect->findChild<QDeclarativeRectangle*>("MyRect"))->x();
         QVERIFY(x > 0 && x < 200);  //i.e. the behavior has been triggered
     }
 
     {
-        QmlEngine engine;
-        QmlComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/groupProperty2.qml"));
-        QmlGraphicsRectangle *rect = qobject_cast<QmlGraphicsRectangle*>(c.create());
+        QDeclarativeEngine engine;
+        QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/groupProperty2.qml"));
+        QDeclarativeRectangle *rect = qobject_cast<QDeclarativeRectangle*>(c.create());
         QVERIFY(rect);
 
         rect->setState("moved");
         QTest::qWait(200);
-        qreal x = qobject_cast<QmlGraphicsRectangle*>(rect->findChild<QmlGraphicsRectangle*>("MyRect"))->x();
+        qreal x = qobject_cast<QDeclarativeRectangle*>(rect->findChild<QDeclarativeRectangle*>("MyRect"))->x();
         QVERIFY(x > 0 && x < 200);  //i.e. the behavior has been triggered
     }
 }
 
 void tst_qmlbehaviors::emptyBehavior()
 {
-    QmlEngine engine;
-    QmlComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/empty.qml"));
-    QmlGraphicsRectangle *rect = qobject_cast<QmlGraphicsRectangle*>(c.create());
+    QDeclarativeEngine engine;
+    QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/empty.qml"));
+    QDeclarativeRectangle *rect = qobject_cast<QDeclarativeRectangle*>(c.create());
     QVERIFY(rect);
 
     rect->setState("moved");
-    qreal x = qobject_cast<QmlGraphicsRectangle*>(rect->findChild<QmlGraphicsRectangle*>("MyRect"))->x();
+    qreal x = qobject_cast<QDeclarativeRectangle*>(rect->findChild<QDeclarativeRectangle*>("MyRect"))->x();
     QCOMPARE(x, qreal(200));    //should change immediately
 }
 
 void tst_qmlbehaviors::explicitSelection()
 {
     {
-        QmlEngine engine;
-        QmlComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/explicit.qml"));
-        QmlGraphicsRectangle *rect = qobject_cast<QmlGraphicsRectangle*>(c.create());
+        QDeclarativeEngine engine;
+        QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/explicit.qml"));
+        QDeclarativeRectangle *rect = qobject_cast<QDeclarativeRectangle*>(c.create());
         QVERIFY(rect);
 
         rect->setState("moved");
         QTest::qWait(200);
-        qreal x = qobject_cast<QmlGraphicsRectangle*>(rect->findChild<QmlGraphicsRectangle*>("MyRect"))->x();
+        qreal x = qobject_cast<QDeclarativeRectangle*>(rect->findChild<QDeclarativeRectangle*>("MyRect"))->x();
         QVERIFY(x > 0 && x < 200);  //i.e. the behavior has been triggered
     }
 }
@@ -245,57 +245,57 @@ void tst_qmlbehaviors::explicitSelection()
 void tst_qmlbehaviors::nonSelectingBehavior()
 {
     {
-        QmlEngine engine;
-        QmlComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/nonSelecting2.qml"));
-        QmlGraphicsRectangle *rect = qobject_cast<QmlGraphicsRectangle*>(c.create());
+        QDeclarativeEngine engine;
+        QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/nonSelecting2.qml"));
+        QDeclarativeRectangle *rect = qobject_cast<QDeclarativeRectangle*>(c.create());
         QVERIFY(rect);
 
         rect->setState("moved");
-        qreal x = qobject_cast<QmlGraphicsRectangle*>(rect->findChild<QmlGraphicsRectangle*>("MyRect"))->x();
+        qreal x = qobject_cast<QDeclarativeRectangle*>(rect->findChild<QDeclarativeRectangle*>("MyRect"))->x();
         QCOMPARE(x, qreal(200));    //should change immediately
     }
 }
 
 void tst_qmlbehaviors::reassignedAnimation()
 {
-    QmlEngine engine;
-    QmlComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/reassignedAnimation.qml"));
+    QDeclarativeEngine engine;
+    QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/reassignedAnimation.qml"));
     QTest::ignoreMessage(QtWarningMsg, QString("QML Behavior (" + QUrl::fromLocalFile(SRCDIR "/data/reassignedAnimation.qml").toString() + ":9:12) Cannot change the animation assigned to a Behavior.").toUtf8().constData());
-    QmlGraphicsRectangle *rect = qobject_cast<QmlGraphicsRectangle*>(c.create());
+    QDeclarativeRectangle *rect = qobject_cast<QDeclarativeRectangle*>(c.create());
     QVERIFY(rect);
-    QCOMPARE(qobject_cast<QmlNumberAnimation*>(
-                 qobject_cast<QmlBehavior*>(
-                     rect->findChild<QmlBehavior*>("MyBehavior"))->animation())->duration(), 200);
+    QCOMPARE(qobject_cast<QDeclarativeNumberAnimation*>(
+                 qobject_cast<QDeclarativeBehavior*>(
+                     rect->findChild<QDeclarativeBehavior*>("MyBehavior"))->animation())->duration(), 200);
 }
 
 void tst_qmlbehaviors::disabled()
 {
-    QmlEngine engine;
-    QmlComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/disabled.qml"));
-    QmlGraphicsRectangle *rect = qobject_cast<QmlGraphicsRectangle*>(c.create());
+    QDeclarativeEngine engine;
+    QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/disabled.qml"));
+    QDeclarativeRectangle *rect = qobject_cast<QDeclarativeRectangle*>(c.create());
     QVERIFY(rect);
-    QCOMPARE(rect->findChild<QmlBehavior*>("MyBehavior")->enabled(), false);
+    QCOMPARE(rect->findChild<QDeclarativeBehavior*>("MyBehavior")->enabled(), false);
 
     rect->setState("moved");
-    qreal x = qobject_cast<QmlGraphicsRectangle*>(rect->findChild<QmlGraphicsRectangle*>("MyRect"))->x();
+    qreal x = qobject_cast<QDeclarativeRectangle*>(rect->findChild<QDeclarativeRectangle*>("MyRect"))->x();
     QCOMPARE(x, qreal(200));    //should change immediately
 }
 
 void tst_qmlbehaviors::dontStart()
 {
-    QmlEngine engine;
+    QDeclarativeEngine engine;
 
-    QmlComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/dontStart.qml"));
+    QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/dontStart.qml"));
 
-    QTest::ignoreMessage(QtWarningMsg, "QmlAbstractAnimation: setRunning() cannot be used on non-root animation nodes");
-    QmlGraphicsRectangle *rect = qobject_cast<QmlGraphicsRectangle*>(c.create());
+    QTest::ignoreMessage(QtWarningMsg, "QDeclarativeAbstractAnimation: setRunning() cannot be used on non-root animation nodes");
+    QDeclarativeRectangle *rect = qobject_cast<QDeclarativeRectangle*>(c.create());
     QVERIFY(rect);
 
-    QmlAbstractAnimation *myAnim = rect->findChild<QmlAbstractAnimation*>("MyAnim");
+    QDeclarativeAbstractAnimation *myAnim = rect->findChild<QDeclarativeAbstractAnimation*>("MyAnim");
     QVERIFY(myAnim && myAnim->qtAnimation());
     QVERIFY(myAnim->qtAnimation()->state() == QAbstractAnimation::Stopped);
 }
 
 QTEST_MAIN(tst_qmlbehaviors)
 
-#include "tst_qmlbehaviors.moc"
+#include "tst_qdeclarativebehaviors.moc"
diff --git a/tests/auto/declarative/qmlbinding/data/test-binding.qml b/tests/auto/declarative/qdeclarativebinding/data/test-binding.qml
index e9101e4..e9101e4 100644
--- a/tests/auto/declarative/qmlbinding/data/test-binding.qml
+++ b/tests/auto/declarative/qdeclarativebinding/data/test-binding.qml
diff --git a/tests/auto/declarative/qmlbinding/data/test-binding2.qml b/tests/auto/declarative/qdeclarativebinding/data/test-binding2.qml
index ea20c16..ea20c16 100644
--- a/tests/auto/declarative/qmlbinding/data/test-binding2.qml
+++ b/tests/auto/declarative/qdeclarativebinding/data/test-binding2.qml
diff --git a/tests/auto/declarative/qmlfontloader/qmlfontloader.pro b/tests/auto/declarative/qdeclarativebinding/qdeclarativebinding.pro
index bc89639..7879976 100644
--- a/tests/auto/declarative/qmlfontloader/qmlfontloader.pro
+++ b/tests/auto/declarative/qdeclarativebinding/qdeclarativebinding.pro
@@ -2,7 +2,7 @@ load(qttest_p4)
 contains(QT_CONFIG,declarative): QT += declarative gui
 macx:CONFIG -= app_bundle
 
-SOURCES += tst_qmlfontloader.cpp
+SOURCES += tst_qdeclarativebinding.cpp
 
 # Define SRCDIR equal to test's source directory
 DEFINES += SRCDIR=\\\"$$PWD\\\"
diff --git a/tests/auto/declarative/qmlbinding/tst_qmlbinding.cpp b/tests/auto/declarative/qdeclarativebinding/tst_qdeclarativebinding.cpp
index 92d1b69..36d8483 100644
--- a/tests/auto/declarative/qmlbinding/tst_qmlbinding.cpp
+++ b/tests/auto/declarative/qdeclarativebinding/tst_qdeclarativebinding.cpp
@@ -39,10 +39,10 @@
 **
 ****************************************************************************/
 #include <qtest.h>
-#include <QtDeclarative/qmlengine.h>
-#include <QtDeclarative/qmlcomponent.h>
-#include <private/qmlbind_p.h>
-#include <private/qmlgraphicsrectangle_p.h>
+#include <QtDeclarative/qdeclarativeengine.h>
+#include <QtDeclarative/qdeclarativecomponent.h>
+#include <private/qdeclarativebind_p.h>
+#include <private/qdeclarativerectangle_p.h>
 #include "../../../shared/util.h"
 
 class tst_qmlbinding : public QObject
@@ -57,7 +57,7 @@ private slots:
     void whenAfterValue();
 
 private:
-    QmlEngine engine;
+    QDeclarativeEngine engine;
 };
 
 tst_qmlbinding::tst_qmlbinding()
@@ -66,9 +66,9 @@ tst_qmlbinding::tst_qmlbinding()
 
 void tst_qmlbinding::binding()
 {
-    QmlEngine engine;
-    QmlComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/test-binding.qml"));
-    QmlGraphicsRectangle *rect = qobject_cast<QmlGraphicsRectangle*>(c.create());
+    QDeclarativeEngine engine;
+    QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/test-binding.qml"));
+    QDeclarativeRectangle *rect = qobject_cast<QDeclarativeRectangle*>(c.create());
 
     QVERIFY(rect != 0);
     QCOMPARE(rect->color(), QColor("yellow"));
@@ -77,7 +77,7 @@ void tst_qmlbinding::binding()
     rect->setProperty("changeColor", true);
     QCOMPARE(rect->color(), QColor("red"));
 
-    QmlBind *binding = qobject_cast<QmlBind*>(rect->findChild<QmlBind*>("binding1"));
+    QDeclarativeBind *binding = qobject_cast<QDeclarativeBind*>(rect->findChild<QDeclarativeBind*>("binding1"));
     QVERIFY(binding != 0);
     QCOMPARE(binding->object(), rect);
     QCOMPARE(binding->property(), QLatin1String("text"));
@@ -88,9 +88,9 @@ void tst_qmlbinding::binding()
 
 void tst_qmlbinding::whenAfterValue()
 {
-    QmlEngine engine;
-    QmlComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/test-binding2.qml"));
-    QmlGraphicsRectangle *rect = qobject_cast<QmlGraphicsRectangle*>(c.create());
+    QDeclarativeEngine engine;
+    QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/test-binding2.qml"));
+    QDeclarativeRectangle *rect = qobject_cast<QDeclarativeRectangle*>(c.create());
 
     QVERIFY(rect != 0);
     QCOMPARE(rect->color(), QColor("yellow"));
@@ -104,4 +104,4 @@ void tst_qmlbinding::whenAfterValue()
 
 QTEST_MAIN(tst_qmlbinding)
 
-#include "tst_qmlbinding.moc"
+#include "tst_qdeclarativebinding.moc"
diff --git a/tests/auto/declarative/qmlgraphicsborderimage/data/colors-round.sci b/tests/auto/declarative/qdeclarativeborderimage/data/colors-round.sci
index 5d2f49f..5d2f49f 100644
--- a/tests/auto/declarative/qmlgraphicsborderimage/data/colors-round.sci
+++ b/tests/auto/declarative/qdeclarativeborderimage/data/colors-round.sci
diff --git a/tests/auto/declarative/visual/qmlgraphicsborderimage/content/colors.png b/tests/auto/declarative/qdeclarativeborderimage/data/colors.png
index dfb62f3..dfb62f3 100644
--- a/tests/auto/declarative/visual/qmlgraphicsborderimage/content/colors.png
+++ b/tests/auto/declarative/qdeclarativeborderimage/data/colors.png
diff --git a/tests/auto/declarative/qmlgraphicsborderimage/data/invalid.sci b/tests/auto/declarative/qdeclarativeborderimage/data/invalid.sci
index 98c72c9..98c72c9 100644
--- a/tests/auto/declarative/qmlgraphicsborderimage/data/invalid.sci
+++ b/tests/auto/declarative/qdeclarativeborderimage/data/invalid.sci
diff --git a/tests/auto/declarative/qmlgraphicsborderimage/qmlgraphicsborderimage.pro b/tests/auto/declarative/qdeclarativeborderimage/qdeclarativeborderimage.pro
index 1f606e5..0574ddb 100644
--- a/tests/auto/declarative/qmlgraphicsborderimage/qmlgraphicsborderimage.pro
+++ b/tests/auto/declarative/qdeclarativeborderimage/qdeclarativeborderimage.pro
@@ -3,7 +3,7 @@ contains(QT_CONFIG,declarative): QT += declarative gui network
 macx:CONFIG -= app_bundle
 
 HEADERS += ../shared/testhttpserver.h
-SOURCES += tst_qmlgraphicsborderimage.cpp ../shared/testhttpserver.cpp
+SOURCES += tst_qdeclarativeborderimage.cpp ../shared/testhttpserver.cpp
 
 # Define SRCDIR equal to test's source directory
 DEFINES += SRCDIR=\\\"$$PWD\\\"
diff --git a/tests/auto/declarative/qmlgraphicsborderimage/tst_qmlgraphicsborderimage.cpp b/tests/auto/declarative/qdeclarativeborderimage/tst_qdeclarativeborderimage.cpp
index 183f7e4..b220f00 100644
--- a/tests/auto/declarative/qmlgraphicsborderimage/tst_qmlgraphicsborderimage.cpp
+++ b/tests/auto/declarative/qdeclarativeborderimage/tst_qdeclarativeborderimage.cpp
@@ -44,13 +44,13 @@
 #include <QTcpSocket>
 #include <QDir>
 
-#include <QtDeclarative/qmlengine.h>
-#include <QtDeclarative/qmlcomponent.h>
-#include <private/qmlgraphicsborderimage_p.h>
-#include <private/qmlgraphicsimagebase_p.h>
-#include <private/qmlgraphicsscalegrid_p_p.h>
-#include <private/qmlgraphicsloader_p.h>
-#include <QtDeclarative/qmlcontext.h>
+#include <QtDeclarative/qdeclarativeengine.h>
+#include <QtDeclarative/qdeclarativecomponent.h>
+#include <private/qdeclarativeborderimage_p.h>
+#include <private/qdeclarativeimagebase_p.h>
+#include <private/qdeclarativescalegrid_p_p.h>
+#include <private/qdeclarativeloader_p.h>
+#include <QtDeclarative/qdeclarativecontext.h>
 
 #include "../shared/testhttpserver.h"
 
@@ -90,7 +90,7 @@ private slots:
     void pendingRemoteRequest_data();
 
 private:
-    QmlEngine engine;
+    QDeclarativeEngine engine;
 };
 
 tst_qmlgraphicsborderimage::tst_qmlgraphicsborderimage()
@@ -100,15 +100,15 @@ tst_qmlgraphicsborderimage::tst_qmlgraphicsborderimage()
 void tst_qmlgraphicsborderimage::noSource()
 {
     QString componentStr = "import Qt 4.6\nBorderImage { source: \"\" }";
-    QmlComponent component(&engine);
+    QDeclarativeComponent component(&engine);
     component.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
-    QmlGraphicsBorderImage *obj = qobject_cast<QmlGraphicsBorderImage*>(component.create());
+    QDeclarativeBorderImage *obj = qobject_cast<QDeclarativeBorderImage*>(component.create());
     QVERIFY(obj != 0);
     QCOMPARE(obj->source(), QUrl());
     QCOMPARE(obj->width(), 0.);
     QCOMPARE(obj->height(), 0.);
-    QCOMPARE(obj->horizontalTileMode(), QmlGraphicsBorderImage::Stretch);
-    QCOMPARE(obj->verticalTileMode(), QmlGraphicsBorderImage::Stretch);
+    QCOMPARE(obj->horizontalTileMode(), QDeclarativeBorderImage::Stretch);
+    QCOMPARE(obj->verticalTileMode(), QDeclarativeBorderImage::Stretch);
 
     delete obj;
 }
@@ -144,24 +144,24 @@ void tst_qmlgraphicsborderimage::imageSource()
         QTest::ignoreMessage(QtWarningMsg, error.toUtf8());
 
     QString componentStr = "import Qt 4.6\nBorderImage { source: \"" + source + "\" }";
-    QmlComponent component(&engine);
+    QDeclarativeComponent component(&engine);
     component.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
-    QmlGraphicsBorderImage *obj = qobject_cast<QmlGraphicsBorderImage*>(component.create());
+    QDeclarativeBorderImage *obj = qobject_cast<QDeclarativeBorderImage*>(component.create());
     QVERIFY(obj != 0);
     
     if (remote)
-        TRY_WAIT(obj->status() == QmlGraphicsBorderImage::Loading);
+        TRY_WAIT(obj->status() == QDeclarativeBorderImage::Loading);
 
     QCOMPARE(obj->source(), remote ? source : QUrl(source));
 
     if (error.isEmpty()) {
-        TRY_WAIT(obj->status() == QmlGraphicsBorderImage::Ready);
+        TRY_WAIT(obj->status() == QDeclarativeBorderImage::Ready);
         QCOMPARE(obj->width(), 120.);
         QCOMPARE(obj->height(), 120.);
-        QCOMPARE(obj->horizontalTileMode(), QmlGraphicsBorderImage::Stretch);
-        QCOMPARE(obj->verticalTileMode(), QmlGraphicsBorderImage::Stretch);
+        QCOMPARE(obj->horizontalTileMode(), QDeclarativeBorderImage::Stretch);
+        QCOMPARE(obj->verticalTileMode(), QDeclarativeBorderImage::Stretch);
     } else {
-        TRY_WAIT(obj->status() == QmlGraphicsBorderImage::Error);
+        TRY_WAIT(obj->status() == QDeclarativeBorderImage::Error);
     }
 
     delete obj;
@@ -171,19 +171,19 @@ void tst_qmlgraphicsborderimage::imageSource()
 void tst_qmlgraphicsborderimage::clearSource()
 {
     QString componentStr = "import Qt 4.6\nBorderImage { source: srcImage }";
-    QmlContext *ctxt = engine.rootContext();
+    QDeclarativeContext *ctxt = engine.rootContext();
     ctxt->setContextProperty("srcImage", QUrl::fromLocalFile(SRCDIR "/data/colors.png"));
-    QmlComponent component(&engine);
+    QDeclarativeComponent component(&engine);
     component.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
-    QmlGraphicsBorderImage *obj = qobject_cast<QmlGraphicsBorderImage*>(component.create());
+    QDeclarativeBorderImage *obj = qobject_cast<QDeclarativeBorderImage*>(component.create());
     QVERIFY(obj != 0);
-    QVERIFY(obj->status() == QmlGraphicsBorderImage::Ready);
+    QVERIFY(obj->status() == QDeclarativeBorderImage::Ready);
     QCOMPARE(obj->width(), 120.);
     QCOMPARE(obj->height(), 120.);
 
     ctxt->setContextProperty("srcImage", "");
     QVERIFY(obj->source().isEmpty());
-    QVERIFY(obj->status() == QmlGraphicsBorderImage::Null);
+    QVERIFY(obj->status() == QDeclarativeBorderImage::Null);
     QCOMPARE(obj->width(), 0.);
     QCOMPARE(obj->height(), 0.);
 }
@@ -191,14 +191,14 @@ void tst_qmlgraphicsborderimage::clearSource()
 void tst_qmlgraphicsborderimage::resized()
 {
     QString componentStr = "import Qt 4.6\nBorderImage { source: \"" + QUrl::fromLocalFile(SRCDIR "/data/colors.png").toString() + "\"; width: 300; height: 300 }";
-    QmlComponent component(&engine);
+    QDeclarativeComponent component(&engine);
     component.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
-    QmlGraphicsBorderImage *obj = qobject_cast<QmlGraphicsBorderImage*>(component.create());
+    QDeclarativeBorderImage *obj = qobject_cast<QDeclarativeBorderImage*>(component.create());
     QVERIFY(obj != 0);
     QCOMPARE(obj->width(), 300.);
     QCOMPARE(obj->height(), 300.);
-    QCOMPARE(obj->horizontalTileMode(), QmlGraphicsBorderImage::Stretch);
-    QCOMPARE(obj->verticalTileMode(), QmlGraphicsBorderImage::Stretch);
+    QCOMPARE(obj->horizontalTileMode(), QDeclarativeBorderImage::Stretch);
+    QCOMPARE(obj->verticalTileMode(), QDeclarativeBorderImage::Stretch);
 
     delete obj;
 }
@@ -206,15 +206,15 @@ void tst_qmlgraphicsborderimage::resized()
 void tst_qmlgraphicsborderimage::smooth()
 {
     QString componentStr = "import Qt 4.6\nBorderImage { source: \"" SRCDIR "/data/colors.png\"; smooth: true; width: 300; height: 300 }";
-    QmlComponent component(&engine);
+    QDeclarativeComponent component(&engine);
     component.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
-    QmlGraphicsBorderImage *obj = qobject_cast<QmlGraphicsBorderImage*>(component.create());
+    QDeclarativeBorderImage *obj = qobject_cast<QDeclarativeBorderImage*>(component.create());
     QVERIFY(obj != 0);
     QCOMPARE(obj->width(), 300.);
     QCOMPARE(obj->height(), 300.);
     QCOMPARE(obj->smooth(), true);
-    QCOMPARE(obj->horizontalTileMode(), QmlGraphicsBorderImage::Stretch);
-    QCOMPARE(obj->verticalTileMode(), QmlGraphicsBorderImage::Stretch);
+    QCOMPARE(obj->horizontalTileMode(), QDeclarativeBorderImage::Stretch);
+    QCOMPARE(obj->verticalTileMode(), QDeclarativeBorderImage::Stretch);
 
     delete obj;
 }
@@ -223,27 +223,27 @@ void tst_qmlgraphicsborderimage::tileModes()
 {
     {
         QString componentStr = "import Qt 4.6\nBorderImage { source: \"" SRCDIR "/data/colors.png\"; width: 100; height: 300; horizontalTileMode: BorderImage.Repeat; verticalTileMode: BorderImage.Repeat }";
-        QmlComponent component(&engine);
+        QDeclarativeComponent component(&engine);
         component.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
-        QmlGraphicsBorderImage *obj = qobject_cast<QmlGraphicsBorderImage*>(component.create());
+        QDeclarativeBorderImage *obj = qobject_cast<QDeclarativeBorderImage*>(component.create());
         QVERIFY(obj != 0);
         QCOMPARE(obj->width(), 100.);
         QCOMPARE(obj->height(), 300.);
-        QCOMPARE(obj->horizontalTileMode(), QmlGraphicsBorderImage::Repeat);
-        QCOMPARE(obj->verticalTileMode(), QmlGraphicsBorderImage::Repeat);
+        QCOMPARE(obj->horizontalTileMode(), QDeclarativeBorderImage::Repeat);
+        QCOMPARE(obj->verticalTileMode(), QDeclarativeBorderImage::Repeat);
 
         delete obj;
     }
     {
         QString componentStr = "import Qt 4.6\nBorderImage { source: \"" SRCDIR "/data/colors.png\"; width: 300; height: 150; horizontalTileMode: BorderImage.Round; verticalTileMode: BorderImage.Round }";
-        QmlComponent component(&engine);
+        QDeclarativeComponent component(&engine);
         component.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
-        QmlGraphicsBorderImage *obj = qobject_cast<QmlGraphicsBorderImage*>(component.create());
+        QDeclarativeBorderImage *obj = qobject_cast<QDeclarativeBorderImage*>(component.create());
         QVERIFY(obj != 0);
         QCOMPARE(obj->width(), 300.);
         QCOMPARE(obj->height(), 150.);
-        QCOMPARE(obj->horizontalTileMode(), QmlGraphicsBorderImage::Round);
-        QCOMPARE(obj->verticalTileMode(), QmlGraphicsBorderImage::Round);
+        QCOMPARE(obj->horizontalTileMode(), QDeclarativeBorderImage::Round);
+        QCOMPARE(obj->verticalTileMode(), QDeclarativeBorderImage::Round);
 
         delete obj;
     }
@@ -263,28 +263,28 @@ void tst_qmlgraphicsborderimage::sciSource()
     }
 
     QString componentStr = "import Qt 4.6\nBorderImage { source: \"" + source + "\"; width: 300; height: 300 }";
-    QmlComponent component(&engine);
+    QDeclarativeComponent component(&engine);
     component.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
-    QmlGraphicsBorderImage *obj = qobject_cast<QmlGraphicsBorderImage*>(component.create());
+    QDeclarativeBorderImage *obj = qobject_cast<QDeclarativeBorderImage*>(component.create());
     QVERIFY(obj != 0);
     
     if (remote)
-        TRY_WAIT(obj->status() == QmlGraphicsBorderImage::Loading);
+        TRY_WAIT(obj->status() == QDeclarativeBorderImage::Loading);
     
     QCOMPARE(obj->source(), remote ? source : QUrl(source));
     QCOMPARE(obj->width(), 300.);
     QCOMPARE(obj->height(), 300.);
     
     if (valid) {
-        TRY_WAIT(obj->status() == QmlGraphicsBorderImage::Ready);
+        TRY_WAIT(obj->status() == QDeclarativeBorderImage::Ready);
         QCOMPARE(obj->border()->left(), 10);
         QCOMPARE(obj->border()->top(), 20);
         QCOMPARE(obj->border()->right(), 30);
         QCOMPARE(obj->border()->bottom(), 40);
-        QCOMPARE(obj->horizontalTileMode(), QmlGraphicsBorderImage::Round);
-        QCOMPARE(obj->verticalTileMode(), QmlGraphicsBorderImage::Repeat);
+        QCOMPARE(obj->horizontalTileMode(), QDeclarativeBorderImage::Round);
+        QCOMPARE(obj->verticalTileMode(), QDeclarativeBorderImage::Repeat);
     } else {
-        TRY_WAIT(obj->status() == QmlGraphicsBorderImage::Error);
+        TRY_WAIT(obj->status() == QDeclarativeBorderImage::Error);
     }
 
     delete obj;
@@ -308,15 +308,15 @@ void tst_qmlgraphicsborderimage::invalidSciFile()
     QTest::ignoreMessage(QtWarningMsg, "Unknown tile rule specified. Using Stretch "); // for "Repea"
 
     QString componentStr = "import Qt 4.6\nBorderImage { source: \"" + QUrl::fromLocalFile(SRCDIR "/data/invalid.sci").toString() +"\"; width: 300; height: 300 }";
-    QmlComponent component(&engine);
+    QDeclarativeComponent component(&engine);
     component.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
-    QmlGraphicsBorderImage *obj = qobject_cast<QmlGraphicsBorderImage*>(component.create());
+    QDeclarativeBorderImage *obj = qobject_cast<QDeclarativeBorderImage*>(component.create());
     QVERIFY(obj != 0);
     QCOMPARE(obj->width(), 300.);
     QCOMPARE(obj->height(), 300.);
-    QCOMPARE(obj->status(), QmlGraphicsImageBase::Error);
-    QCOMPARE(obj->horizontalTileMode(), QmlGraphicsBorderImage::Stretch);
-    QCOMPARE(obj->verticalTileMode(), QmlGraphicsBorderImage::Stretch);
+    QCOMPARE(obj->status(), QDeclarativeImageBase::Error);
+    QCOMPARE(obj->horizontalTileMode(), QDeclarativeBorderImage::Stretch);
+    QCOMPARE(obj->verticalTileMode(), QDeclarativeBorderImage::Stretch);
 
     delete obj;
 }
@@ -326,11 +326,11 @@ void tst_qmlgraphicsborderimage::pendingRemoteRequest()
     QFETCH(QString, source);
 
     QString componentStr = "import Qt 4.6\nBorderImage { source: \"" + source + "\" }";
-    QmlComponent component(&engine);
+    QDeclarativeComponent component(&engine);
     component.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
-    QmlGraphicsBorderImage *obj = qobject_cast<QmlGraphicsBorderImage*>(component.create());
+    QDeclarativeBorderImage *obj = qobject_cast<QDeclarativeBorderImage*>(component.create());
     QVERIFY(obj != 0);
-    QCOMPARE(obj->status(), QmlGraphicsBorderImage::Loading);
+    QCOMPARE(obj->status(), QDeclarativeBorderImage::Loading);
 
     // verify no crash
     // This will cause a delayed "QThread: Destroyed while thread is still running" warning
@@ -348,4 +348,4 @@ void tst_qmlgraphicsborderimage::pendingRemoteRequest_data()
 
 QTEST_MAIN(tst_qmlgraphicsborderimage)
 
-#include "tst_qmlgraphicsborderimage.moc"
+#include "tst_qdeclarativeborderimage.moc"
diff --git a/tests/auto/declarative/qmlconnection/data/test-connection.qml b/tests/auto/declarative/qdeclarativeconnection/data/test-connection.qml
index 9534621..9534621 100644
--- a/tests/auto/declarative/qmlconnection/data/test-connection.qml
+++ b/tests/auto/declarative/qdeclarativeconnection/data/test-connection.qml
diff --git a/tests/auto/declarative/qmlconnection/data/test-connection2.qml b/tests/auto/declarative/qdeclarativeconnection/data/test-connection2.qml
index 65fe23a..65fe23a 100644
--- a/tests/auto/declarative/qmlconnection/data/test-connection2.qml
+++ b/tests/auto/declarative/qdeclarativeconnection/data/test-connection2.qml
diff --git a/tests/auto/declarative/qmlconnection/data/test-connection3.qml b/tests/auto/declarative/qdeclarativeconnection/data/test-connection3.qml
index 32133f9..32133f9 100644
--- a/tests/auto/declarative/qmlconnection/data/test-connection3.qml
+++ b/tests/auto/declarative/qdeclarativeconnection/data/test-connection3.qml
diff --git a/tests/auto/declarative/qmlconnection/data/trimming.qml b/tests/auto/declarative/qdeclarativeconnection/data/trimming.qml
index c27dc46..c27dc46 100644
--- a/tests/auto/declarative/qmlconnection/data/trimming.qml
+++ b/tests/auto/declarative/qdeclarativeconnection/data/trimming.qml
diff --git a/tests/auto/declarative/qdeclarativeconnection/qdeclarativeconnection.pro b/tests/auto/declarative/qdeclarativeconnection/qdeclarativeconnection.pro
new file mode 100644
index 0000000..a6adfa4
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeconnection/qdeclarativeconnection.pro
@@ -0,0 +1,8 @@
+load(qttest_p4)
+contains(QT_CONFIG,declarative): QT += declarative gui
+macx:CONFIG -= app_bundle
+
+SOURCES += tst_qdeclarativeconnection.cpp
+
+# Define SRCDIR equal to test's source directory
+DEFINES += SRCDIR=\\\"$$PWD\\\"
diff --git a/tests/auto/declarative/qmlconnection/tst_qmlconnection.cpp b/tests/auto/declarative/qdeclarativeconnection/tst_qdeclarativeconnection.cpp
index 2aba7b5..5e3de5e 100644
--- a/tests/auto/declarative/qmlconnection/tst_qmlconnection.cpp
+++ b/tests/auto/declarative/qdeclarativeconnection/tst_qdeclarativeconnection.cpp
@@ -39,12 +39,12 @@
 **
 ****************************************************************************/
 #include <qtest.h>
-#include <QtDeclarative/qmlengine.h>
-#include <QtDeclarative/qmlcomponent.h>
-#include <private/qmlconnection_p.h>
-#include <private/qmlgraphicsitem_p.h>
+#include <QtDeclarative/qdeclarativeengine.h>
+#include <QtDeclarative/qdeclarativecomponent.h>
+#include <private/qdeclarativeconnection_p.h>
+#include <private/qdeclarativeitem_p.h>
 #include "../../../shared/util.h"
-#include <QtDeclarative/qmlscriptstring.h>
+#include <QtDeclarative/qdeclarativescriptstring.h>
 
 class tst_qmlconnection : public QObject
 
@@ -60,7 +60,7 @@ private slots:
     void trimming();
 
 private:
-    QmlEngine engine;
+    QDeclarativeEngine engine;
 };
 
 tst_qmlconnection::tst_qmlconnection()
@@ -69,9 +69,9 @@ tst_qmlconnection::tst_qmlconnection()
 
 void tst_qmlconnection::defaultValues()
 {
-    QmlEngine engine;
-    QmlComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/test-connection3.qml"));
-    QmlConnection *item = qobject_cast<QmlConnection*>(c.create());
+    QDeclarativeEngine engine;
+    QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/test-connection3.qml"));
+    QDeclarativeConnection *item = qobject_cast<QDeclarativeConnection*>(c.create());
 
     QVERIFY(item != 0);
     QVERIFY(item->signalSender() == 0);
@@ -83,9 +83,9 @@ void tst_qmlconnection::defaultValues()
 
 void tst_qmlconnection::properties()
 {
-    QmlEngine engine;
-    QmlComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/test-connection2.qml"));
-    QmlConnection *item = qobject_cast<QmlConnection*>(c.create());
+    QDeclarativeEngine engine;
+    QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/test-connection2.qml"));
+    QDeclarativeConnection *item = qobject_cast<QDeclarativeConnection*>(c.create());
 
     QVERIFY(item != 0);
 
@@ -99,9 +99,9 @@ void tst_qmlconnection::properties()
 
 void tst_qmlconnection::connection()
 {
-    QmlEngine engine;
-    QmlComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/test-connection.qml"));
-    QmlGraphicsItem *item = qobject_cast<QmlGraphicsItem*>(c.create());
+    QDeclarativeEngine engine;
+    QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/test-connection.qml"));
+    QDeclarativeItem *item = qobject_cast<QDeclarativeItem*>(c.create());
 
     QVERIFY(item != 0);
 
@@ -116,9 +116,9 @@ void tst_qmlconnection::connection()
 
 void tst_qmlconnection::trimming()
 {
-    QmlEngine engine;
-    QmlComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/trimming.qml"));
-    QmlGraphicsItem *item = qobject_cast<QmlGraphicsItem*>(c.create());
+    QDeclarativeEngine engine;
+    QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/trimming.qml"));
+    QDeclarativeItem *item = qobject_cast<QDeclarativeItem*>(c.create());
 
     QVERIFY(item != 0);
 
@@ -136,4 +136,4 @@ void tst_qmlconnection::trimming()
 
 QTEST_MAIN(tst_qmlconnection)
 
-#include "tst_qmlconnection.moc"
+#include "tst_qdeclarativeconnection.moc"
diff --git a/tests/auto/declarative/qmlbehaviors/qmlbehaviors.pro b/tests/auto/declarative/qdeclarativecontext/qdeclarativecontext.pro
index 1e685ee..adace70 100644
--- a/tests/auto/declarative/qmlbehaviors/qmlbehaviors.pro
+++ b/tests/auto/declarative/qdeclarativecontext/qdeclarativecontext.pro
@@ -1,6 +1,6 @@
 load(qttest_p4)
 contains(QT_CONFIG,declarative): QT += declarative
-SOURCES += tst_qmlbehaviors.cpp
+SOURCES += tst_qdeclarativecontext.cpp
 macx:CONFIG -= app_bundle
 
 DEFINES += SRCDIR=\\\"$$PWD\\\"
diff --git a/tests/auto/declarative/qmlcontext/tst_qmlcontext.cpp b/tests/auto/declarative/qdeclarativecontext/tst_qdeclarativecontext.cpp
index 7ff7af2..c1d6bdb 100644
--- a/tests/auto/declarative/qmlcontext/tst_qmlcontext.cpp
+++ b/tests/auto/declarative/qdeclarativecontext/tst_qdeclarativecontext.cpp
@@ -41,10 +41,10 @@
 
 #include <qtest.h>
 #include <QDebug>
-#include <QmlEngine>
-#include <QmlContext>
-#include <QmlComponent>
-#include <QmlExpression>
+#include <QDeclarativeEngine>
+#include <QDeclarativeContext>
+#include <QDeclarativeComponent>
+#include <QDeclarativeExpression>
 
 class tst_qmlcontext : public QObject
 {
@@ -62,12 +62,12 @@ private slots:
     void destruction();
 
 private:
-    QmlEngine engine;
+    QDeclarativeEngine engine;
 };
 
 void tst_qmlcontext::baseUrl()
 {
-    QmlContext ctxt(&engine);
+    QDeclarativeContext ctxt(&engine);
 
     QCOMPARE(ctxt.baseUrl(), QUrl());
 
@@ -80,7 +80,7 @@ void tst_qmlcontext::resolvedUrl()
 {
     // Relative to the component
     {
-        QmlContext ctxt(&engine);
+        QDeclarativeContext ctxt(&engine);
         ctxt.setBaseUrl(QUrl("http://www.nokia.com/"));
 
         QCOMPARE(ctxt.resolvedUrl(QUrl("main.qml")), QUrl("http://www.nokia.com/main.qml"));
@@ -88,25 +88,25 @@ void tst_qmlcontext::resolvedUrl()
 
     // Relative to a parent
     {
-        QmlContext ctxt(&engine);
+        QDeclarativeContext ctxt(&engine);
         ctxt.setBaseUrl(QUrl("http://www.nokia.com/"));
 
-        QmlContext ctxt2(&ctxt);
+        QDeclarativeContext ctxt2(&ctxt);
         QCOMPARE(ctxt2.resolvedUrl(QUrl("main2.qml")), QUrl("http://www.nokia.com/main2.qml"));
     }
 
     // Relative to the engine
     {
-        QmlContext ctxt(&engine);
+        QDeclarativeContext ctxt(&engine);
         QCOMPARE(ctxt.resolvedUrl(QUrl("main.qml")), engine.baseUrl().resolved(QUrl("main.qml")));
     }
 
     // Relative to a deleted parent
     {
-        QmlContext *ctxt = new QmlContext(&engine);
+        QDeclarativeContext *ctxt = new QDeclarativeContext(&engine);
         ctxt->setBaseUrl(QUrl("http://www.nokia.com/"));
 
-        QmlContext ctxt2(ctxt);
+        QDeclarativeContext ctxt2(ctxt);
         QCOMPARE(ctxt2.resolvedUrl(QUrl("main2.qml")), QUrl("http://www.nokia.com/main2.qml"));
 
         delete ctxt; ctxt = 0;
@@ -116,7 +116,7 @@ void tst_qmlcontext::resolvedUrl()
 
     // Absolute
     {
-        QmlContext ctxt(&engine);
+        QDeclarativeContext ctxt(&engine);
 
         QCOMPARE(ctxt.resolvedUrl(QUrl("http://www.nokia.com/main2.qml")), QUrl("http://www.nokia.com/main2.qml"));
         QCOMPARE(ctxt.resolvedUrl(QUrl("file:///main2.qml")), QUrl("file:///main2.qml"));
@@ -125,12 +125,12 @@ void tst_qmlcontext::resolvedUrl()
 
 void tst_qmlcontext::engineMethod()
 {
-    QmlEngine *engine = new QmlEngine;
+    QDeclarativeEngine *engine = new QDeclarativeEngine;
 
-    QmlContext ctxt(engine);
-    QmlContext ctxt2(&ctxt);
-    QmlContext ctxt3(&ctxt2);
-    QmlContext ctxt4(&ctxt2);
+    QDeclarativeContext ctxt(engine);
+    QDeclarativeContext ctxt2(&ctxt);
+    QDeclarativeContext ctxt3(&ctxt2);
+    QDeclarativeContext ctxt4(&ctxt2);
 
     QCOMPARE(ctxt.engine(), engine);
     QCOMPARE(ctxt2.engine(), engine);
@@ -147,17 +147,17 @@ void tst_qmlcontext::engineMethod()
 
 void tst_qmlcontext::parentContext()
 {
-    QmlEngine *engine = new QmlEngine;
+    QDeclarativeEngine *engine = new QDeclarativeEngine;
 
-    QCOMPARE(engine->rootContext()->parentContext(), (QmlContext *)0);
+    QCOMPARE(engine->rootContext()->parentContext(), (QDeclarativeContext *)0);
 
-    QmlContext *ctxt = new QmlContext(engine);
-    QmlContext *ctxt2 = new QmlContext(ctxt);
-    QmlContext *ctxt3 = new QmlContext(ctxt2);
-    QmlContext *ctxt4 = new QmlContext(ctxt2);
-    QmlContext *ctxt5 = new QmlContext(ctxt);
-    QmlContext *ctxt6 = new QmlContext(engine);
-    QmlContext *ctxt7 = new QmlContext(engine->rootContext());
+    QDeclarativeContext *ctxt = new QDeclarativeContext(engine);
+    QDeclarativeContext *ctxt2 = new QDeclarativeContext(ctxt);
+    QDeclarativeContext *ctxt3 = new QDeclarativeContext(ctxt2);
+    QDeclarativeContext *ctxt4 = new QDeclarativeContext(ctxt2);
+    QDeclarativeContext *ctxt5 = new QDeclarativeContext(ctxt);
+    QDeclarativeContext *ctxt6 = new QDeclarativeContext(engine);
+    QDeclarativeContext *ctxt7 = new QDeclarativeContext(engine->rootContext());
 
     QCOMPARE(ctxt->parentContext(), engine->rootContext());
     QCOMPARE(ctxt2->parentContext(), ctxt);
@@ -178,12 +178,12 @@ void tst_qmlcontext::parentContext()
 
     delete engine; engine = 0;
 
-    QCOMPARE(ctxt->parentContext(), (QmlContext *)0);
+    QCOMPARE(ctxt->parentContext(), (QDeclarativeContext *)0);
     QCOMPARE(ctxt3->parentContext(), ctxt2);
     QCOMPARE(ctxt4->parentContext(), ctxt2);
     QCOMPARE(ctxt5->parentContext(), ctxt);
-    QCOMPARE(ctxt6->parentContext(), (QmlContext *)0);
-    QCOMPARE(ctxt7->parentContext(), (QmlContext *)0);
+    QCOMPARE(ctxt6->parentContext(), (QDeclarativeContext *)0);
+    QCOMPARE(ctxt7->parentContext(), (QDeclarativeContext *)0);
 
     delete ctxt7;
     delete ctxt6;
@@ -243,7 +243,7 @@ private:
 
 #define TEST_CONTEXT_PROPERTY(ctxt, name, value) \
 { \
-    QmlComponent component(&engine); \
+    QDeclarativeComponent component(&engine); \
     component.setData("import Qt 4.6; QtObject { property var test: " #name " }", QUrl()); \
 \
     QObject *obj = component.create(ctxt); \
@@ -255,8 +255,8 @@ private:
 
 void tst_qmlcontext::setContextProperty()
 {
-    QmlContext ctxt(&engine);
-    QmlContext ctxt2(&ctxt);
+    QDeclarativeContext ctxt(&engine);
+    QDeclarativeContext ctxt2(&ctxt);
 
     TestObject obj1;
     obj1.setA(3345);
@@ -293,7 +293,7 @@ void tst_qmlcontext::setContextProperty()
 
     // Changes in context properties
     {
-        QmlComponent component(&engine); 
+        QDeclarativeComponent component(&engine); 
         component.setData("import Qt 4.6; QtObject { property var test: a }", QUrl()); 
 
         QObject *obj = component.create(&ctxt2); 
@@ -305,7 +305,7 @@ void tst_qmlcontext::setContextProperty()
         delete obj; 
     }
     {
-        QmlComponent component(&engine); 
+        QDeclarativeComponent component(&engine); 
         component.setData("import Qt 4.6; QtObject { property var test: b }", QUrl()); 
 
         QObject *obj = component.create(&ctxt2); 
@@ -319,7 +319,7 @@ void tst_qmlcontext::setContextProperty()
         delete obj; 
     }
     {
-        QmlComponent component(&engine); 
+        QDeclarativeComponent component(&engine); 
         component.setData("import Qt 4.6; QtObject { property var test: e.a }", QUrl()); 
 
         QObject *obj = component.create(&ctxt2); 
@@ -333,7 +333,7 @@ void tst_qmlcontext::setContextProperty()
 
     // New context properties
     {
-        QmlComponent component(&engine); 
+        QDeclarativeComponent component(&engine); 
         component.setData("import Qt 4.6; QtObject { property var test: a }", QUrl()); 
 
         QObject *obj = component.create(&ctxt2); 
@@ -347,10 +347,10 @@ void tst_qmlcontext::setContextProperty()
 
     // Setting an object-variant context property
     {
-        QmlComponent component(&engine);
+        QDeclarativeComponent component(&engine);
         component.setData("import Qt 4.6; QtObject { id: root; property int a: 10; property int test: ctxtProp.a; property var obj: root; }", QUrl());
 
-        QmlContext ctxt(engine.rootContext());
+        QDeclarativeContext ctxt(engine.rootContext());
         ctxt.setContextProperty("ctxtProp", QVariant());
 
         QTest::ignoreMessage(QtWarningMsg, "<Unknown File>:1: TypeError: Result of expression 'ctxtProp' [undefined] is not an object.");
@@ -368,7 +368,7 @@ void tst_qmlcontext::setContextProperty()
 
 void tst_qmlcontext::addDefaultObject()
 {
-    QmlContext ctxt(&engine);
+    QDeclarativeContext ctxt(&engine);
 
     TestObject to;
     TestObject2 to2;
@@ -399,7 +399,7 @@ void tst_qmlcontext::addDefaultObject()
 
     // Changes in context properties
     {
-        QmlComponent component(&engine); 
+        QDeclarativeComponent component(&engine); 
         component.setData("import Qt 4.6; QtObject { property var test: a }", QUrl()); 
 
         QObject *obj = component.create(&ctxt); 
@@ -414,21 +414,21 @@ void tst_qmlcontext::addDefaultObject()
 
 void tst_qmlcontext::destruction()
 {
-    QmlContext *ctxt = new QmlContext(&engine);
+    QDeclarativeContext *ctxt = new QDeclarativeContext(&engine);
 
     QObject obj;
-    QmlEngine::setContextForObject(&obj, ctxt);
-    QmlExpression expr(ctxt, "a", 0);
+    QDeclarativeEngine::setContextForObject(&obj, ctxt);
+    QDeclarativeExpression expr(ctxt, "a", 0);
 
-    QCOMPARE(ctxt, QmlEngine::contextForObject(&obj));
+    QCOMPARE(ctxt, QDeclarativeEngine::contextForObject(&obj));
     QCOMPARE(ctxt, expr.context());
 
     delete ctxt; ctxt = 0;
 
-    QCOMPARE(ctxt, QmlEngine::contextForObject(&obj));
+    QCOMPARE(ctxt, QDeclarativeEngine::contextForObject(&obj));
     QCOMPARE(ctxt, expr.context());
 }
 
 QTEST_MAIN(tst_qmlcontext)
 
-#include "tst_qmlcontext.moc"
+#include "tst_qdeclarativecontext.moc"
diff --git a/tests/auto/declarative/qmllistreference/qmllistreference.pro b/tests/auto/declarative/qdeclarativedatetimeformatter/qdeclarativedatetimeformatter.pro
index fa49d5a..22f53e6 100644
--- a/tests/auto/declarative/qmllistreference/qmllistreference.pro
+++ b/tests/auto/declarative/qdeclarativedatetimeformatter/qdeclarativedatetimeformatter.pro
@@ -2,4 +2,4 @@ load(qttest_p4)
 contains(QT_CONFIG,declarative): QT += declarative
 macx:CONFIG -= app_bundle
 
-SOURCES += tst_qmllistreference.cpp
+SOURCES += tst_qdeclarativedatetimeformatter.cpp
diff --git a/tests/auto/declarative/qmldatetimeformatter/tst_qmldatetimeformatter.cpp b/tests/auto/declarative/qdeclarativedatetimeformatter/tst_qdeclarativedatetimeformatter.cpp
index 4b5dc1d..5970cc2 100644
--- a/tests/auto/declarative/qmldatetimeformatter/tst_qmldatetimeformatter.cpp
+++ b/tests/auto/declarative/qdeclarativedatetimeformatter/tst_qdeclarativedatetimeformatter.cpp
@@ -39,9 +39,9 @@
 **
 ****************************************************************************/
 #include <qtest.h>
-#include <QtDeclarative/qmlengine.h>
-#include <QtDeclarative/qmlcomponent.h>
-#include <private/qmldatetimeformatter_p.h>
+#include <QtDeclarative/qdeclarativeengine.h>
+#include <QtDeclarative/qdeclarativecomponent.h>
+#include <private/qdeclarativedatetimeformatter_p.h>
 #include <QDebug>
 
 class tst_qmldatetimeformatter : public QObject
@@ -58,11 +58,11 @@ private slots:
 
 void tst_qmldatetimeformatter::date()
 {
-    QmlEngine engine;
-    QmlComponent formatterComponent(&engine);
+    QDeclarativeEngine engine;
+    QDeclarativeComponent formatterComponent(&engine);
     formatterComponent.setData(QByteArray("import Qt 4.6\n DateTimeFormatter { date: \"2008-12-24\" }"),
                                QUrl::fromLocalFile(""));
-    QmlDateTimeFormatter *formatter = qobject_cast<QmlDateTimeFormatter*>(formatterComponent.create());
+    QDeclarativeDateTimeFormatter *formatter = qobject_cast<QDeclarativeDateTimeFormatter*>(formatterComponent.create());
     if(formatterComponent.isError())
         qDebug() << formatterComponent.errors();
     QVERIFY(formatter != 0);
@@ -88,10 +88,10 @@ void tst_qmldatetimeformatter::date()
 
 void tst_qmldatetimeformatter::time()
 {
-    QmlEngine engine;
-    QmlComponent formatterComponent(&engine);
+    QDeclarativeEngine engine;
+    QDeclarativeComponent formatterComponent(&engine);
     formatterComponent.setData("import Qt 4.6\n DateTimeFormatter { time: \"14:15:38.200\" }", QUrl::fromLocalFile(""));
-    QmlDateTimeFormatter *formatter = qobject_cast<QmlDateTimeFormatter*>(formatterComponent.create());
+    QDeclarativeDateTimeFormatter *formatter = qobject_cast<QDeclarativeDateTimeFormatter*>(formatterComponent.create());
     if(formatterComponent.isError())
         qDebug() << formatterComponent.errors();
     QVERIFY(formatter != 0);
@@ -121,10 +121,10 @@ void tst_qmldatetimeformatter::time()
 
 void tst_qmldatetimeformatter::dateTime()
 {
-    QmlEngine engine;
-    QmlComponent formatterComponent(&engine);
+    QDeclarativeEngine engine;
+    QDeclarativeComponent formatterComponent(&engine);
     formatterComponent.setData("import Qt 4.6\n DateTimeFormatter { dateTime: \"1978-03-04T09:13:54\" }", QUrl::fromLocalFile(""));
-    QmlDateTimeFormatter *formatter = qobject_cast<QmlDateTimeFormatter*>(formatterComponent.create());
+    QDeclarativeDateTimeFormatter *formatter = qobject_cast<QDeclarativeDateTimeFormatter*>(formatterComponent.create());
     if(formatterComponent.isError())
         qDebug() << formatterComponent.errors();
     QVERIFY(formatter != 0);
@@ -147,4 +147,4 @@ void tst_qmldatetimeformatter::dateTime()
 
 QTEST_MAIN(tst_qmldatetimeformatter)
 
-#include "tst_qmldatetimeformatter.moc"
+#include "tst_qdeclarativedatetimeformatter.moc"
diff --git a/tests/auto/declarative/qmldebug/qmldebug.pro b/tests/auto/declarative/qdeclarativedebug/qdeclarativedebug.pro
index f79829d..ff1d0d4 100644
--- a/tests/auto/declarative/qmldebug/qmldebug.pro
+++ b/tests/auto/declarative/qdeclarativedebug/qdeclarativedebug.pro
@@ -3,5 +3,5 @@ contains(QT_CONFIG,declarative): QT += network declarative
 macx:CONFIG -= app_bundle
 
 HEADERS += ../shared/debugutil_p.h
-SOURCES += tst_qmldebug.cpp \
+SOURCES += tst_qdeclarativedebug.cpp \
            ../shared/debugutil.cpp
diff --git a/tests/auto/declarative/qmldebug/tst_qmldebug.cpp b/tests/auto/declarative/qdeclarativedebug/tst_qdeclarativedebug.cpp
index 2f1a557..b23bddc 100644
--- a/tests/auto/declarative/qmldebug/tst_qmldebug.cpp
+++ b/tests/auto/declarative/qdeclarativedebug/tst_qdeclarativedebug.cpp
@@ -45,23 +45,23 @@
 #include <QDebug>
 #include <QThread>
 
-#include <QtDeclarative/qmlengine.h>
-#include <QtDeclarative/qmlcontext.h>
-#include <QtDeclarative/qmlcomponent.h>
-#include <QtDeclarative/qmlexpression.h>
-#include <QtDeclarative/qmlmetatype.h>
-#include <QtDeclarative/qmlmetaproperty.h>
-
-#include <private/qmlbinding_p.h>
-#include <private/qmldebug_p.h>
-#include <private/qmlenginedebug_p.h>
-#include <private/qmldebugclient_p.h>
-#include <private/qmldebugservice_p.h>
-#include <private/qmlgraphicsrectangle_p.h>
+#include <QtDeclarative/qdeclarativeengine.h>
+#include <QtDeclarative/qdeclarativecontext.h>
+#include <QtDeclarative/qdeclarativecomponent.h>
+#include <QtDeclarative/qdeclarativeexpression.h>
+#include <QtDeclarative/qdeclarativemetatype.h>
+#include <QtDeclarative/qdeclarativemetaproperty.h>
+
+#include <private/qdeclarativebinding_p.h>
+#include <private/qdeclarativedebug_p.h>
+#include <private/qdeclarativeenginedebug_p.h>
+#include <private/qdeclarativedebugclient_p.h>
+#include <private/qdeclarativedebugservice_p.h>
+#include <private/qdeclarativerectangle_p.h>
 
 #include "../shared/debugutil_p.h"
 
-Q_DECLARE_METATYPE(QmlDebugWatch::State)
+Q_DECLARE_METATYPE(QDeclarativeDebugWatch::State)
 
 
 class tst_QmlDebug : public QObject
@@ -69,7 +69,7 @@ class tst_QmlDebug : public QObject
     Q_OBJECT
 
 public:
-    tst_QmlDebug(QmlDebugTestData *data)
+    tst_QmlDebug(QDeclarativeDebugTestData *data)
     {
         m_conn = data->conn;
         m_engine = data->engine;
@@ -77,20 +77,20 @@ public:
     }
 
 private:
-    QmlDebugObjectReference findRootObject();
-    QmlDebugPropertyReference findProperty(const QList<QmlDebugPropertyReference> &props, const QString &name) const;
-    void waitForQuery(QmlDebugQuery *query);
+    QDeclarativeDebugObjectReference findRootObject();
+    QDeclarativeDebugPropertyReference findProperty(const QList<QDeclarativeDebugPropertyReference> &props, const QString &name) const;
+    void waitForQuery(QDeclarativeDebugQuery *query);
 
-    void recursiveObjectTest(QObject *o, const QmlDebugObjectReference &oref, bool recursive) const;
+    void recursiveObjectTest(QObject *o, const QDeclarativeDebugObjectReference &oref, bool recursive) const;
 
-    void recursiveCompareObjects(const QmlDebugObjectReference &a, const QmlDebugObjectReference &b) const;
-    void recursiveCompareContexts(const QmlDebugContextReference &a, const QmlDebugContextReference &b) const;
-    void compareProperties(const QmlDebugPropertyReference &a, const QmlDebugPropertyReference &b) const;
+    void recursiveCompareObjects(const QDeclarativeDebugObjectReference &a, const QDeclarativeDebugObjectReference &b) const;
+    void recursiveCompareContexts(const QDeclarativeDebugContextReference &a, const QDeclarativeDebugContextReference &b) const;
+    void compareProperties(const QDeclarativeDebugPropertyReference &a, const QDeclarativeDebugPropertyReference &b) const;
     
-    QmlDebugConnection *m_conn;
-    QmlEngineDebug *m_dbg;
-    QmlEngine *m_engine;
-    QmlGraphicsItem *m_rootItem;
+    QDeclarativeDebugConnection *m_conn;
+    QDeclarativeEngineDebug *m_dbg;
+    QDeclarativeEngine *m_engine;
+    QDeclarativeItem *m_rootItem;
 
 private slots:
     void initTestCase();
@@ -116,22 +116,22 @@ private slots:
     void tst_QmlDebugPropertyReference();
 };
 
-QmlDebugObjectReference tst_QmlDebug::findRootObject()
+QDeclarativeDebugObjectReference tst_QmlDebug::findRootObject()
 {
-    QmlDebugEnginesQuery *q_engines = m_dbg->queryAvailableEngines(this);
+    QDeclarativeDebugEnginesQuery *q_engines = m_dbg->queryAvailableEngines(this);
     waitForQuery(q_engines);
     
     if (q_engines->engines().count() == 0)
-        return QmlDebugObjectReference();
-    QmlDebugRootContextQuery *q_context = m_dbg->queryRootContexts(q_engines->engines()[0].debugId(), this);
+        return QDeclarativeDebugObjectReference();
+    QDeclarativeDebugRootContextQuery *q_context = m_dbg->queryRootContexts(q_engines->engines()[0].debugId(), this);
     waitForQuery(q_context);
 
     if (q_context->rootContext().objects().count() == 0)
-        return QmlDebugObjectReference();
-    QmlDebugObjectQuery *q_obj = m_dbg->queryObject(q_context->rootContext().objects()[0], this);
+        return QDeclarativeDebugObjectReference();
+    QDeclarativeDebugObjectQuery *q_obj = m_dbg->queryObject(q_context->rootContext().objects()[0], this);
     waitForQuery(q_obj);
 
-    QmlDebugObjectReference result = q_obj->object();
+    QDeclarativeDebugObjectReference result = q_obj->object();
 
     delete q_engines;
     delete q_context;
@@ -140,47 +140,47 @@ QmlDebugObjectReference tst_QmlDebug::findRootObject()
     return result;
 }
 
-QmlDebugPropertyReference tst_QmlDebug::findProperty(const QList<QmlDebugPropertyReference> &props, const QString &name) const
+QDeclarativeDebugPropertyReference tst_QmlDebug::findProperty(const QList<QDeclarativeDebugPropertyReference> &props, const QString &name) const
 {
-    foreach(const QmlDebugPropertyReference &p, props) {
+    foreach(const QDeclarativeDebugPropertyReference &p, props) {
         if (p.name() == name)
             return p;
     }
-    return QmlDebugPropertyReference();
+    return QDeclarativeDebugPropertyReference();
 }
 
-void tst_QmlDebug::waitForQuery(QmlDebugQuery *query)
+void tst_QmlDebug::waitForQuery(QDeclarativeDebugQuery *query)
 {
     QVERIFY(query);
     QCOMPARE(query->parent(), this);
-    QVERIFY(query->state() == QmlDebugQuery::Waiting);
-    if (!QmlDebugTest::waitForSignal(query, SIGNAL(stateChanged(QmlDebugQuery::State))))
+    QVERIFY(query->state() == QDeclarativeDebugQuery::Waiting);
+    if (!QDeclarativeDebugTest::waitForSignal(query, SIGNAL(stateChanged(QDeclarativeDebugQuery::State))))
         QFAIL("query timed out");
 }
 
-void tst_QmlDebug::recursiveObjectTest(QObject *o, const QmlDebugObjectReference &oref, bool recursive) const
+void tst_QmlDebug::recursiveObjectTest(QObject *o, const QDeclarativeDebugObjectReference &oref, bool recursive) const
 {
     const QMetaObject *meta = o->metaObject();
 
-    QmlType *type = QmlMetaType::qmlType(o->metaObject());
+    QDeclarativeType *type = QDeclarativeMetaType::qmlType(o->metaObject());
     QString className = type ? type->qmlTypeName() : QString();
     className = className.mid(className.lastIndexOf(QLatin1Char('/'))+1);
 
-    QCOMPARE(oref.debugId(), QmlDebugService::idForObject(o));
+    QCOMPARE(oref.debugId(), QDeclarativeDebugService::idForObject(o));
     QCOMPARE(oref.name(), o->objectName());
     QCOMPARE(oref.className(), className);
-    QCOMPARE(oref.contextDebugId(), QmlDebugService::idForObject(qmlContext(o)));
+    QCOMPARE(oref.contextDebugId(), QDeclarativeDebugService::idForObject(qmlContext(o)));
 
     const QObjectList &children = o->children();
     for (int i=0; i<children.count(); i++) {
         QObject *child = children[i];
         if (!qmlContext(child))
             continue;
-        int debugId = QmlDebugService::idForObject(child);
+        int debugId = QDeclarativeDebugService::idForObject(child);
         QVERIFY(debugId >= 0);
 
-        QmlDebugObjectReference cref;
-        foreach (const QmlDebugObjectReference &ref, oref.children()) {
+        QDeclarativeDebugObjectReference cref;
+        foreach (const QDeclarativeDebugObjectReference &ref, oref.children()) {
             if (ref.debugId() == debugId) {
                 cref = ref;
                 break;
@@ -192,10 +192,10 @@ void tst_QmlDebug::recursiveObjectTest(QObject *o, const QmlDebugObjectReference
             recursiveObjectTest(child, cref, true);
     }
 
-    foreach (const QmlDebugPropertyReference &p, oref.properties()) {
-        QCOMPARE(p.objectDebugId(), QmlDebugService::idForObject(o));
+    foreach (const QDeclarativeDebugPropertyReference &p, oref.properties()) {
+        QCOMPARE(p.objectDebugId(), QDeclarativeDebugService::idForObject(o));
 
-        // signal properties are fake - they are generated from QmlBoundSignal children
+        // signal properties are fake - they are generated from QDeclarativeBoundSignal children
         if (p.name().startsWith("on") && p.name().length() > 2 && p.name()[2].isUpper()) {
             QVERIFY(p.value().toString().startsWith('{') && p.value().toString().endsWith('}'));
             QVERIFY(p.valueTypeName().isEmpty());
@@ -212,11 +212,11 @@ void tst_QmlDebug::recursiveObjectTest(QObject *o, const QmlDebugObjectReference
             QCOMPARE(p.value(), pmeta.read(o));
 
         if (p.name() == "parent")
-            QVERIFY(p.valueTypeName() == "QGraphicsObject*" || p.valueTypeName() == "QmlGraphicsItem*");
+            QVERIFY(p.valueTypeName() == "QGraphicsObject*" || p.valueTypeName() == "QDeclarativeItem*");
         else
             QCOMPARE(p.valueTypeName(), QString::fromUtf8(pmeta.typeName()));
 
-        QmlAbstractBinding *binding = QmlMetaProperty(o, p.name()).binding();
+        QDeclarativeAbstractBinding *binding = QDeclarativeMetaProperty(o, p.name()).binding();
         if (binding)
             QCOMPARE(binding->expression(), p.binding());
 
@@ -226,7 +226,7 @@ void tst_QmlDebug::recursiveObjectTest(QObject *o, const QmlDebugObjectReference
     }
 }
 
-void tst_QmlDebug::recursiveCompareObjects(const QmlDebugObjectReference &a, const QmlDebugObjectReference &b) const
+void tst_QmlDebug::recursiveCompareObjects(const QDeclarativeDebugObjectReference &a, const QDeclarativeDebugObjectReference &b) const
 {
     QCOMPARE(a.debugId(), b.debugId());
     QCOMPARE(a.className(), b.className());
@@ -240,8 +240,8 @@ void tst_QmlDebug::recursiveCompareObjects(const QmlDebugObjectReference &a, con
     QCOMPARE(a.properties().count(), b.properties().count());
     QCOMPARE(a.children().count(), b.children().count());
 
-    QList<QmlDebugPropertyReference> aprops = a.properties();
-    QList<QmlDebugPropertyReference> bprops = b.properties();
+    QList<QDeclarativeDebugPropertyReference> aprops = a.properties();
+    QList<QDeclarativeDebugPropertyReference> bprops = b.properties();
 
     for (int i=0; i<aprops.count(); i++)
         compareProperties(aprops[i], bprops[i]);
@@ -250,7 +250,7 @@ void tst_QmlDebug::recursiveCompareObjects(const QmlDebugObjectReference &a, con
         recursiveCompareObjects(a.children()[i], b.children()[i]);
 }
 
-void tst_QmlDebug::recursiveCompareContexts(const QmlDebugContextReference &a, const QmlDebugContextReference &b) const
+void tst_QmlDebug::recursiveCompareContexts(const QDeclarativeDebugContextReference &a, const QDeclarativeDebugContextReference &b) const
 {
     QCOMPARE(a.debugId(), b.debugId());
     QCOMPARE(a.name(), b.name());
@@ -264,7 +264,7 @@ void tst_QmlDebug::recursiveCompareContexts(const QmlDebugContextReference &a, c
         recursiveCompareContexts(a.contexts()[i], b.contexts()[i]);
 }
 
-void tst_QmlDebug::compareProperties(const QmlDebugPropertyReference &a, const QmlDebugPropertyReference &b) const
+void tst_QmlDebug::compareProperties(const QDeclarativeDebugPropertyReference &a, const QDeclarativeDebugPropertyReference &b) const
 {
     QCOMPARE(a.objectDebugId(), b.objectDebugId());
     QCOMPARE(a.name(), b.name());
@@ -276,31 +276,31 @@ void tst_QmlDebug::compareProperties(const QmlDebugPropertyReference &a, const Q
 
 void tst_QmlDebug::initTestCase()
 {
-    m_dbg = new QmlEngineDebug(m_conn, this);
+    m_dbg = new QDeclarativeEngineDebug(m_conn, this);
 
-    qRegisterMetaType<QmlDebugWatch::State>();
+    qRegisterMetaType<QDeclarativeDebugWatch::State>();
 }
 
 void tst_QmlDebug::watch_property()
 {
-    QmlDebugObjectReference obj = findRootObject();
-    QmlDebugPropertyReference prop = findProperty(obj.properties(), "width");
+    QDeclarativeDebugObjectReference obj = findRootObject();
+    QDeclarativeDebugPropertyReference prop = findProperty(obj.properties(), "width");
 
-    QmlDebugPropertyWatch *watch;
+    QDeclarativeDebugPropertyWatch *watch;
     
-    QmlEngineDebug *unconnected = new QmlEngineDebug(0);
+    QDeclarativeEngineDebug *unconnected = new QDeclarativeEngineDebug(0);
     watch = unconnected->addWatch(prop, this);
-    QCOMPARE(watch->state(), QmlDebugWatch::Dead);
+    QCOMPARE(watch->state(), QDeclarativeDebugWatch::Dead);
     delete watch;
     delete unconnected;
 
-    watch = m_dbg->addWatch(QmlDebugPropertyReference(), this);
-    QVERIFY(QmlDebugTest::waitForSignal(watch, SIGNAL(stateChanged(QmlDebugWatch::State))));
-    QCOMPARE(watch->state(), QmlDebugWatch::Inactive);
+    watch = m_dbg->addWatch(QDeclarativeDebugPropertyReference(), this);
+    QVERIFY(QDeclarativeDebugTest::waitForSignal(watch, SIGNAL(stateChanged(QDeclarativeDebugWatch::State))));
+    QCOMPARE(watch->state(), QDeclarativeDebugWatch::Inactive);
     delete watch;
     
     watch = m_dbg->addWatch(prop, this);
-    QCOMPARE(watch->state(), QmlDebugWatch::Waiting);
+    QCOMPARE(watch->state(), QDeclarativeDebugWatch::Waiting);
     QCOMPARE(watch->objectDebugId(), obj.debugId());
     QCOMPARE(watch->name(), prop.name());
 
@@ -310,8 +310,8 @@ void tst_QmlDebug::watch_property()
     m_rootItem->setProperty("width", origWidth*2);
 
     // stateChanged() is received before valueChanged()
-    QVERIFY(QmlDebugTest::waitForSignal(watch, SIGNAL(stateChanged(QmlDebugWatch::State))));
-    QCOMPARE(watch->state(), QmlDebugWatch::Active);
+    QVERIFY(QDeclarativeDebugTest::waitForSignal(watch, SIGNAL(stateChanged(QDeclarativeDebugWatch::State))));
+    QCOMPARE(watch->state(), QDeclarativeDebugWatch::Active);
     QCOMPARE(spy.count(), 1);
 
     m_dbg->removeWatch(watch);
@@ -328,38 +328,38 @@ void tst_QmlDebug::watch_property()
 
 void tst_QmlDebug::watch_object()
 {
-    QmlDebugEnginesQuery *q_engines = m_dbg->queryAvailableEngines(this);
+    QDeclarativeDebugEnginesQuery *q_engines = m_dbg->queryAvailableEngines(this);
     waitForQuery(q_engines);
     
     Q_ASSERT(q_engines->engines().count() > 0);
-    QmlDebugRootContextQuery *q_context = m_dbg->queryRootContexts(q_engines->engines()[0].debugId(), this);
+    QDeclarativeDebugRootContextQuery *q_context = m_dbg->queryRootContexts(q_engines->engines()[0].debugId(), this);
     waitForQuery(q_context);
 
     Q_ASSERT(q_context->rootContext().objects().count() > 0);
-    QmlDebugObjectQuery *q_obj = m_dbg->queryObject(q_context->rootContext().objects()[0], this);
+    QDeclarativeDebugObjectQuery *q_obj = m_dbg->queryObject(q_context->rootContext().objects()[0], this);
     waitForQuery(q_obj);
 
-    QmlDebugObjectReference obj = q_obj->object();
+    QDeclarativeDebugObjectReference obj = q_obj->object();
 
     delete q_engines;
     delete q_context;
     delete q_obj;
 
-    QmlDebugWatch *watch;
+    QDeclarativeDebugWatch *watch;
 
-    QmlEngineDebug *unconnected = new QmlEngineDebug(0);
+    QDeclarativeEngineDebug *unconnected = new QDeclarativeEngineDebug(0);
     watch = unconnected->addWatch(obj, this);
-    QCOMPARE(watch->state(), QmlDebugWatch::Dead);
+    QCOMPARE(watch->state(), QDeclarativeDebugWatch::Dead);
     delete watch;
     delete unconnected;
     
-    watch = m_dbg->addWatch(QmlDebugObjectReference(), this);
-    QVERIFY(QmlDebugTest::waitForSignal(watch, SIGNAL(stateChanged(QmlDebugWatch::State))));
-    QCOMPARE(watch->state(), QmlDebugWatch::Inactive);
+    watch = m_dbg->addWatch(QDeclarativeDebugObjectReference(), this);
+    QVERIFY(QDeclarativeDebugTest::waitForSignal(watch, SIGNAL(stateChanged(QDeclarativeDebugWatch::State))));
+    QCOMPARE(watch->state(), QDeclarativeDebugWatch::Inactive);
     delete watch;
 
     watch = m_dbg->addWatch(obj, this);
-    QCOMPARE(watch->state(), QmlDebugWatch::Waiting);
+    QCOMPARE(watch->state(), QDeclarativeDebugWatch::Waiting);
     QCOMPARE(watch->objectDebugId(), obj.debugId());
 
     QSignalSpy spy(watch, SIGNAL(valueChanged(QByteArray,QVariant)));
@@ -370,8 +370,8 @@ void tst_QmlDebug::watch_object()
     m_rootItem->setProperty("height", origHeight*2);
 
     // stateChanged() is received before any valueChanged() signals
-    QVERIFY(QmlDebugTest::waitForSignal(watch, SIGNAL(stateChanged(QmlDebugWatch::State))));
-    QCOMPARE(watch->state(), QmlDebugWatch::Active);
+    QVERIFY(QDeclarativeDebugTest::waitForSignal(watch, SIGNAL(stateChanged(QDeclarativeDebugWatch::State))));
+    QCOMPARE(watch->state(), QDeclarativeDebugWatch::Active);
     QVERIFY(spy.count() > 0);
 
     int newWidth = -1;
@@ -407,27 +407,27 @@ void tst_QmlDebug::watch_expression()
 
     int origWidth = m_rootItem->property("width").toInt();
     
-    QmlDebugObjectReference obj = findRootObject();
+    QDeclarativeDebugObjectReference obj = findRootObject();
 
-    QmlDebugObjectExpressionWatch *watch;
+    QDeclarativeDebugObjectExpressionWatch *watch;
 
-    QmlEngineDebug *unconnected = new QmlEngineDebug(0);
+    QDeclarativeEngineDebug *unconnected = new QDeclarativeEngineDebug(0);
     watch = unconnected->addWatch(obj, expr, this);
-    QCOMPARE(watch->state(), QmlDebugWatch::Dead);
+    QCOMPARE(watch->state(), QDeclarativeDebugWatch::Dead);
     delete watch;
     delete unconnected;
     
-    watch = m_dbg->addWatch(QmlDebugObjectReference(), expr, this);
-    QVERIFY(QmlDebugTest::waitForSignal(watch, SIGNAL(stateChanged(QmlDebugWatch::State))));
-    QCOMPARE(watch->state(), QmlDebugWatch::Inactive);
+    watch = m_dbg->addWatch(QDeclarativeDebugObjectReference(), expr, this);
+    QVERIFY(QDeclarativeDebugTest::waitForSignal(watch, SIGNAL(stateChanged(QDeclarativeDebugWatch::State))));
+    QCOMPARE(watch->state(), QDeclarativeDebugWatch::Inactive);
     delete watch;
     
     watch = m_dbg->addWatch(obj, expr, this);
-    QCOMPARE(watch->state(), QmlDebugWatch::Waiting);
+    QCOMPARE(watch->state(), QDeclarativeDebugWatch::Waiting);
     QCOMPARE(watch->objectDebugId(), obj.debugId());
     QCOMPARE(watch->expression(), expr);
 
-    QSignalSpy spyState(watch, SIGNAL(stateChanged(QmlDebugWatch::State)));
+    QSignalSpy spyState(watch, SIGNAL(stateChanged(QDeclarativeDebugWatch::State)));
 
     QSignalSpy spy(watch, SIGNAL(valueChanged(QByteArray,QVariant)));
     int expectedSpyCount = incrementCount + 1;  // should also get signal with expression's initial value
@@ -438,14 +438,14 @@ void tst_QmlDebug::watch_expression()
             width += increment;
             m_rootItem->setProperty("width", width);
         }
-        if (!QmlDebugTest::waitForSignal(watch, SIGNAL(valueChanged(QByteArray,QVariant))))
+        if (!QDeclarativeDebugTest::waitForSignal(watch, SIGNAL(valueChanged(QByteArray,QVariant))))
             QFAIL("Did not receive valueChanged() for expression");
     }
 
     if (spyState.count() == 0)
-        QVERIFY(QmlDebugTest::waitForSignal(watch, SIGNAL(stateChanged(QmlDebugWatch::State))));
+        QVERIFY(QDeclarativeDebugTest::waitForSignal(watch, SIGNAL(stateChanged(QDeclarativeDebugWatch::State))));
     QCOMPARE(spyState.count(), 1);
-    QCOMPARE(watch->state(), QmlDebugWatch::Active);
+    QCOMPARE(watch->state(), QDeclarativeDebugWatch::Active);
 
     m_dbg->removeWatch(watch);
     delete watch;
@@ -474,25 +474,25 @@ void tst_QmlDebug::watch_expression_data()
 
 void tst_QmlDebug::watch_context()
 {
-    QmlDebugContextReference c;
-    QTest::ignoreMessage(QtWarningMsg, "QmlEngineDebug::addWatch(): Not implemented");
+    QDeclarativeDebugContextReference c;
+    QTest::ignoreMessage(QtWarningMsg, "QDeclarativeEngineDebug::addWatch(): Not implemented");
     QVERIFY(!m_dbg->addWatch(c, QString(), this));
 }
 
 void tst_QmlDebug::watch_file()
 {
-    QmlDebugFileReference f;
-    QTest::ignoreMessage(QtWarningMsg, "QmlEngineDebug::addWatch(): Not implemented");
+    QDeclarativeDebugFileReference f;
+    QTest::ignoreMessage(QtWarningMsg, "QDeclarativeEngineDebug::addWatch(): Not implemented");
     QVERIFY(!m_dbg->addWatch(f, this));
 }
 
 void tst_QmlDebug::queryAvailableEngines()
 {
-    QmlDebugEnginesQuery *q_engines;
+    QDeclarativeDebugEnginesQuery *q_engines;
 
-    QmlEngineDebug *unconnected = new QmlEngineDebug(0);
+    QDeclarativeEngineDebug *unconnected = new QDeclarativeEngineDebug(0);
     q_engines = unconnected->queryAvailableEngines(0);
-    QCOMPARE(q_engines->state(), QmlDebugQuery::Error);
+    QCOMPARE(q_engines->state(), QDeclarativeDebugQuery::Error);
     delete q_engines;
     delete unconnected;
 
@@ -504,11 +504,11 @@ void tst_QmlDebug::queryAvailableEngines()
     waitForQuery(q_engines);
 
     // TODO test multiple engines
-    QList<QmlDebugEngineReference> engines = q_engines->engines();
+    QList<QDeclarativeDebugEngineReference> engines = q_engines->engines();
     QCOMPARE(engines.count(), 1);
 
-    foreach(const QmlDebugEngineReference &e, engines) {
-        QCOMPARE(e.debugId(), QmlDebugService::idForObject(m_engine));
+    foreach(const QDeclarativeDebugEngineReference &e, engines) {
+        QCOMPARE(e.debugId(), QDeclarativeDebugService::idForObject(m_engine));
         QCOMPARE(e.name(), m_engine->objectName());
     }
 
@@ -517,15 +517,15 @@ void tst_QmlDebug::queryAvailableEngines()
 
 void tst_QmlDebug::queryRootContexts()
 {
-    QmlDebugEnginesQuery *q_engines = m_dbg->queryAvailableEngines(this);
+    QDeclarativeDebugEnginesQuery *q_engines = m_dbg->queryAvailableEngines(this);
     waitForQuery(q_engines);
     int engineId = q_engines->engines()[0].debugId();
 
-    QmlDebugRootContextQuery *q_context;
+    QDeclarativeDebugRootContextQuery *q_context;
     
-    QmlEngineDebug *unconnected = new QmlEngineDebug(0);
+    QDeclarativeEngineDebug *unconnected = new QDeclarativeEngineDebug(0);
     q_context = unconnected->queryRootContexts(engineId, this);
-    QCOMPARE(q_context->state(), QmlDebugQuery::Error);
+    QCOMPARE(q_context->state(), QDeclarativeDebugQuery::Error);
     delete q_context;
     delete unconnected;
 
@@ -535,9 +535,9 @@ void tst_QmlDebug::queryRootContexts()
     q_context = m_dbg->queryRootContexts(engineId, this);
     waitForQuery(q_context);
 
-    QmlContext *actualContext = m_engine->rootContext();
-    QmlDebugContextReference context = q_context->rootContext();
-    QCOMPARE(context.debugId(), QmlDebugService::idForObject(actualContext));
+    QDeclarativeContext *actualContext = m_engine->rootContext();
+    QDeclarativeDebugContextReference context = q_context->rootContext();
+    QCOMPARE(context.debugId(), QDeclarativeDebugService::idForObject(actualContext));
     QCOMPARE(context.name(), actualContext->objectName());
 
     QCOMPARE(context.objects().count(), 2); // 2 qml component objects created for context in main()
@@ -559,18 +559,18 @@ void tst_QmlDebug::queryObject()
 {
     QFETCH(bool, recursive);
 
-    QmlDebugEnginesQuery *q_engines = m_dbg->queryAvailableEngines(this);
+    QDeclarativeDebugEnginesQuery *q_engines = m_dbg->queryAvailableEngines(this);
     waitForQuery(q_engines);
     
-    QmlDebugRootContextQuery *q_context = m_dbg->queryRootContexts(q_engines->engines()[0].debugId(), this);
+    QDeclarativeDebugRootContextQuery *q_context = m_dbg->queryRootContexts(q_engines->engines()[0].debugId(), this);
     waitForQuery(q_context);
-    QmlDebugObjectReference rootObject = q_context->rootContext().objects()[0];
+    QDeclarativeDebugObjectReference rootObject = q_context->rootContext().objects()[0];
 
-    QmlDebugObjectQuery *q_obj = 0;
+    QDeclarativeDebugObjectQuery *q_obj = 0;
 
-    QmlEngineDebug *unconnected = new QmlEngineDebug(0);
+    QDeclarativeEngineDebug *unconnected = new QDeclarativeEngineDebug(0);
     q_obj = recursive ? unconnected->queryObjectRecursive(rootObject, this) : unconnected->queryObject(rootObject, this);
-    QCOMPARE(q_obj->state(), QmlDebugQuery::Error);
+    QCOMPARE(q_obj->state(), QDeclarativeDebugQuery::Error);
     delete q_obj;
     delete unconnected;
 
@@ -580,14 +580,14 @@ void tst_QmlDebug::queryObject()
     q_obj = recursive ? m_dbg->queryObjectRecursive(rootObject, this) : m_dbg->queryObject(rootObject, this);
     waitForQuery(q_obj);
 
-    QmlDebugObjectReference obj = q_obj->object();
+    QDeclarativeDebugObjectReference obj = q_obj->object();
 
     delete q_engines;
     delete q_context;
     delete q_obj;
 
     // check source as defined in main()
-    QmlDebugFileReference source = obj.source();
+    QDeclarativeDebugFileReference source = obj.source();
     QCOMPARE(source.url(), QUrl::fromLocalFile(""));
     QCOMPARE(source.lineNumber(), 2);
     QCOMPARE(source.columnNumber(), 1);
@@ -596,12 +596,12 @@ void tst_QmlDebug::queryObject()
     recursiveObjectTest(m_rootItem, obj, recursive);
 
     if (recursive) {
-        foreach(const QmlDebugObjectReference &child, obj.children())
+        foreach(const QDeclarativeDebugObjectReference &child, obj.children())
             QVERIFY(child.properties().count() > 0);
 
-        QmlDebugObjectReference rect;
-        QmlDebugObjectReference text;
-        foreach (const QmlDebugObjectReference &child, obj.children()) {
+        QDeclarativeDebugObjectReference rect;
+        QDeclarativeDebugObjectReference text;
+        foreach (const QDeclarativeDebugObjectReference &child, obj.children()) {
             if (child.className() == "Rectangle")
                 rect = child;
             else if (child.className() == "Text")
@@ -616,7 +616,7 @@ void tst_QmlDebug::queryObject()
         QCOMPARE(findProperty(text.properties(), "color").value(), qVariantFromValue(QColor("blue")));
 
     } else {
-        foreach(const QmlDebugObjectReference &child, obj.children())
+        foreach(const QDeclarativeDebugObjectReference &child, obj.children())
             QCOMPARE(child.properties().count(), 0);
     }
 }
@@ -634,18 +634,18 @@ void tst_QmlDebug::queryExpressionResult()
     QFETCH(QString, expr);
     QFETCH(QVariant, result);
 
-    QmlDebugEnginesQuery *q_engines = m_dbg->queryAvailableEngines(this);
+    QDeclarativeDebugEnginesQuery *q_engines = m_dbg->queryAvailableEngines(this);
     waitForQuery(q_engines);    // check immediate deletion is ok
     
-    QmlDebugRootContextQuery *q_context = m_dbg->queryRootContexts(q_engines->engines()[0].debugId(), this);
+    QDeclarativeDebugRootContextQuery *q_context = m_dbg->queryRootContexts(q_engines->engines()[0].debugId(), this);
     waitForQuery(q_context);
     int objectId = q_context->rootContext().objects()[0].debugId();
 
-    QmlDebugExpressionQuery *q_expr;
+    QDeclarativeDebugExpressionQuery *q_expr;
 
-    QmlEngineDebug *unconnected = new QmlEngineDebug(0);
+    QDeclarativeEngineDebug *unconnected = new QDeclarativeEngineDebug(0);
     q_expr = unconnected->queryExpressionResult(objectId, expr, this);
-    QCOMPARE(q_expr->state(), QmlDebugQuery::Error);
+    QCOMPARE(q_expr->state(), QDeclarativeDebugQuery::Error);
     delete q_expr;
     delete unconnected;
     
@@ -675,7 +675,7 @@ void tst_QmlDebug::queryExpressionResult_data()
 
 void tst_QmlDebug::tst_QmlDebugFileReference()
 {
-    QmlDebugFileReference ref;
+    QDeclarativeDebugFileReference ref;
     QVERIFY(ref.url().isEmpty());
     QCOMPARE(ref.lineNumber(), -1);
     QCOMPARE(ref.columnNumber(), -1);
@@ -687,10 +687,10 @@ void tst_QmlDebug::tst_QmlDebugFileReference()
     ref.setColumnNumber(1);
     QCOMPARE(ref.columnNumber(), 1);
 
-    QmlDebugFileReference copy(ref);
-    QmlDebugFileReference copyAssign;
+    QDeclarativeDebugFileReference copy(ref);
+    QDeclarativeDebugFileReference copyAssign;
     copyAssign = ref;
-    foreach (const QmlDebugFileReference &r, (QList<QmlDebugFileReference>() << copy << copyAssign)) {
+    foreach (const QDeclarativeDebugFileReference &r, (QList<QDeclarativeDebugFileReference>() << copy << copyAssign)) {
         QCOMPARE(r.url(), ref.url());
         QCOMPARE(r.lineNumber(), ref.lineNumber());
         QCOMPARE(r.columnNumber(), ref.columnNumber());
@@ -699,23 +699,23 @@ void tst_QmlDebug::tst_QmlDebugFileReference()
 
 void tst_QmlDebug::tst_QmlDebugEngineReference()
 {
-    QmlDebugEngineReference ref;
+    QDeclarativeDebugEngineReference ref;
     QCOMPARE(ref.debugId(), -1);
     QVERIFY(ref.name().isEmpty());
 
-    ref = QmlDebugEngineReference(1);
+    ref = QDeclarativeDebugEngineReference(1);
     QCOMPARE(ref.debugId(), 1);
     QVERIFY(ref.name().isEmpty());
 
-    QmlDebugEnginesQuery *q_engines = m_dbg->queryAvailableEngines(this);
+    QDeclarativeDebugEnginesQuery *q_engines = m_dbg->queryAvailableEngines(this);
     waitForQuery(q_engines);
     ref = q_engines->engines()[0];
     delete q_engines;
 
-    QmlDebugEngineReference copy(ref);
-    QmlDebugEngineReference copyAssign;
+    QDeclarativeDebugEngineReference copy(ref);
+    QDeclarativeDebugEngineReference copyAssign;
     copyAssign = ref;
-    foreach (const QmlDebugEngineReference &r, (QList<QmlDebugEngineReference>() << copy << copyAssign)) {
+    foreach (const QDeclarativeDebugEngineReference &r, (QList<QDeclarativeDebugEngineReference>() << copy << copyAssign)) {
         QCOMPARE(r.debugId(), ref.debugId());
         QCOMPARE(r.name(), ref.name());
     }
@@ -723,7 +723,7 @@ void tst_QmlDebug::tst_QmlDebugEngineReference()
 
 void tst_QmlDebug::tst_QmlDebugObjectReference()
 {
-    QmlDebugObjectReference ref;
+    QDeclarativeDebugObjectReference ref;
     QCOMPARE(ref.debugId(), -1);
     QCOMPARE(ref.className(), QString());
     QCOMPARE(ref.name(), QString());
@@ -731,40 +731,40 @@ void tst_QmlDebug::tst_QmlDebugObjectReference()
     QVERIFY(ref.properties().isEmpty());
     QVERIFY(ref.children().isEmpty());
 
-    QmlDebugFileReference source = ref.source();
+    QDeclarativeDebugFileReference source = ref.source();
     QVERIFY(source.url().isEmpty());
     QVERIFY(source.lineNumber() < 0);
     QVERIFY(source.columnNumber() < 0);
 
-    ref = QmlDebugObjectReference(1);
+    ref = QDeclarativeDebugObjectReference(1);
     QCOMPARE(ref.debugId(), 1);
 
-    QmlDebugObjectReference rootObject = findRootObject();
-    QmlDebugObjectQuery *query = m_dbg->queryObjectRecursive(rootObject, this);
+    QDeclarativeDebugObjectReference rootObject = findRootObject();
+    QDeclarativeDebugObjectQuery *query = m_dbg->queryObjectRecursive(rootObject, this);
     waitForQuery(query);
     ref = query->object();
     delete query;
 
     QVERIFY(ref.debugId() >= 0);
 
-    QmlDebugObjectReference copy(ref);
-    QmlDebugObjectReference copyAssign;
+    QDeclarativeDebugObjectReference copy(ref);
+    QDeclarativeDebugObjectReference copyAssign;
     copyAssign = ref;
-    foreach (const QmlDebugObjectReference &r, (QList<QmlDebugObjectReference>() << copy << copyAssign))
+    foreach (const QDeclarativeDebugObjectReference &r, (QList<QDeclarativeDebugObjectReference>() << copy << copyAssign))
         recursiveCompareObjects(r, ref);
 }
 
 void tst_QmlDebug::tst_QmlDebugContextReference()
 {
-    QmlDebugContextReference ref;
+    QDeclarativeDebugContextReference ref;
     QCOMPARE(ref.debugId(), -1);
     QVERIFY(ref.name().isEmpty());
     QVERIFY(ref.objects().isEmpty());
     QVERIFY(ref.contexts().isEmpty());
 
-    QmlDebugEnginesQuery *q_engines = m_dbg->queryAvailableEngines(this);
+    QDeclarativeDebugEnginesQuery *q_engines = m_dbg->queryAvailableEngines(this);
     waitForQuery(q_engines);
-    QmlDebugRootContextQuery *q_context = m_dbg->queryRootContexts(q_engines->engines()[0].debugId(), this);
+    QDeclarativeDebugRootContextQuery *q_context = m_dbg->queryRootContexts(q_engines->engines()[0].debugId(), this);
     waitForQuery(q_context);
 
     ref = q_context->rootContext();
@@ -772,22 +772,22 @@ void tst_QmlDebug::tst_QmlDebugContextReference()
     delete q_context;
     QVERIFY(ref.debugId() >= 0);
 
-    QmlDebugContextReference copy(ref);
-    QmlDebugContextReference copyAssign;
+    QDeclarativeDebugContextReference copy(ref);
+    QDeclarativeDebugContextReference copyAssign;
     copyAssign = ref;
-    foreach (const QmlDebugContextReference &r, (QList<QmlDebugContextReference>() << copy << copyAssign))
+    foreach (const QDeclarativeDebugContextReference &r, (QList<QDeclarativeDebugContextReference>() << copy << copyAssign))
         recursiveCompareContexts(r, ref);
 }
 
 void tst_QmlDebug::tst_QmlDebugPropertyReference()
 {
-    QmlDebugObjectReference rootObject = findRootObject();
-    QmlDebugObjectQuery *query = m_dbg->queryObject(rootObject, this);
+    QDeclarativeDebugObjectReference rootObject = findRootObject();
+    QDeclarativeDebugObjectQuery *query = m_dbg->queryObject(rootObject, this);
     waitForQuery(query);
-    QmlDebugObjectReference obj = query->object();
+    QDeclarativeDebugObjectReference obj = query->object();
     delete query;   
 
-    QmlDebugPropertyReference ref = findProperty(obj.properties(), "scale");
+    QDeclarativeDebugPropertyReference ref = findProperty(obj.properties(), "scale");
     QVERIFY(ref.objectDebugId() > 0);
     QVERIFY(!ref.name().isEmpty());
     QVERIFY(!ref.value().isNull());
@@ -795,21 +795,21 @@ void tst_QmlDebug::tst_QmlDebugPropertyReference()
     QVERIFY(!ref.binding().isEmpty());
     QVERIFY(ref.hasNotifySignal());
   
-    QmlDebugPropertyReference copy(ref);
-    QmlDebugPropertyReference copyAssign;
+    QDeclarativeDebugPropertyReference copy(ref);
+    QDeclarativeDebugPropertyReference copyAssign;
     copyAssign = ref;
-    foreach (const QmlDebugPropertyReference &r, (QList<QmlDebugPropertyReference>() << copy << copyAssign))
+    foreach (const QDeclarativeDebugPropertyReference &r, (QList<QDeclarativeDebugPropertyReference>() << copy << copyAssign))
         compareProperties(r, ref);
 }
 
 
-class tst_QmlDebug_Factory : public QmlTestFactory
+class tst_QmlDebug_Factory : public QDeclarativeTestFactory
 {
 public:
-    QObject *createTest(QmlDebugTestData *data)
+    QObject *createTest(QDeclarativeDebugTestData *data)
     {
         tst_QmlDebug *test = new tst_QmlDebug(data);
-        QmlContext *c = new QmlContext(data->engine->rootContext(), test);
+        QDeclarativeContext *c = new QDeclarativeContext(data->engine->rootContext(), test);
         c->setObjectName("tst_QmlDebug_childContext");
         return test;
     }
@@ -833,9 +833,9 @@ int main(int argc, char *argv[])
     qml << "import Qt 4.6\n"
             "Item {}";
     tst_QmlDebug_Factory factory;
-    return QmlDebugTest::runTests(&factory, qml);
+    return QDeclarativeDebugTest::runTests(&factory, qml);
 }
 
 //QTEST_MAIN(tst_QmlDebug)
 
-#include "tst_qmldebug.moc"
+#include "tst_qdeclarativedebug.moc"
diff --git a/tests/auto/declarative/qmldebugclient/qmldebugclient.pro b/tests/auto/declarative/qdeclarativedebugclient/qdeclarativedebugclient.pro
index 36aa818..a3afd99 100644
--- a/tests/auto/declarative/qmldebugclient/qmldebugclient.pro
+++ b/tests/auto/declarative/qdeclarativedebugclient/qdeclarativedebugclient.pro
@@ -3,5 +3,5 @@ contains(QT_CONFIG,declarative): QT += network declarative
 macx:CONFIG -= app_bundle
 
 HEADERS += ../shared/debugutil_p.h
-SOURCES += tst_qmldebugclient.cpp \
+SOURCES += tst_qdeclarativedebugclient.cpp \
            ../shared/debugutil.cpp
diff --git a/tests/auto/declarative/qmldebugclient/tst_qmldebugclient.cpp b/tests/auto/declarative/qdeclarativedebugclient/tst_qdeclarativedebugclient.cpp
index 3c87d71..7e68ae8 100644
--- a/tests/auto/declarative/qmldebugclient/tst_qmldebugclient.cpp
+++ b/tests/auto/declarative/qdeclarativedebugclient/tst_qdeclarativedebugclient.cpp
@@ -45,12 +45,12 @@
 #include <QDebug>
 #include <QThread>
 
-#include <QtDeclarative/qmlengine.h>
+#include <QtDeclarative/qdeclarativeengine.h>
 
-#include <private/qmldebug_p.h>
-#include <private/qmlenginedebug_p.h>
-#include <private/qmldebugclient_p.h>
-#include <private/qmldebugservice_p.h>
+#include <private/qdeclarativedebug_p.h>
+#include <private/qdeclarativeenginedebug_p.h>
+#include <private/qdeclarativedebugclient_p.h>
+#include <private/qdeclarativedebugservice_p.h>
 
 #include "../shared/debugutil_p.h"
 
@@ -59,12 +59,12 @@ class tst_QmlDebugClient : public QObject
     Q_OBJECT
 
 public:
-    tst_QmlDebugClient(QmlDebugTestData *data)
+    tst_QmlDebugClient(QDeclarativeDebugTestData *data)
     {
         m_conn = data->conn;
     }
 
-    QmlDebugConnection *m_conn;
+    QDeclarativeDebugConnection *m_conn;
 
 private slots:
     void name();
@@ -78,56 +78,56 @@ void tst_QmlDebugClient::name()
 {
     QString name = "tst_QmlDebugClient::name()";
 
-    QmlDebugClient client(name, m_conn);
+    QDeclarativeDebugClient client(name, m_conn);
     QCOMPARE(client.name(), name);
 }
 
 void tst_QmlDebugClient::isEnabled()
 {
-    QmlDebugClient client("tst_QmlDebugClient::isEnabled()", m_conn);
+    QDeclarativeDebugClient client("tst_QmlDebugClient::isEnabled()", m_conn);
     QCOMPARE(client.isEnabled(), false);
 }
 
 void tst_QmlDebugClient::setEnabled()
 {
-    QmlDebugTestService service("tst_QmlDebugClient::setEnabled()");
-    QmlDebugTestClient client("tst_QmlDebugClient::setEnabled()", m_conn);
+    QDeclarativeDebugTestService service("tst_QmlDebugClient::setEnabled()");
+    QDeclarativeDebugTestClient client("tst_QmlDebugClient::setEnabled()", m_conn);
 
     QCOMPARE(service.isEnabled(), false);
 
     client.setEnabled(true);
     QCOMPARE(client.isEnabled(), true);
-    QmlDebugTest::waitForSignal(&service, SIGNAL(enabledStateChanged()));
+    QDeclarativeDebugTest::waitForSignal(&service, SIGNAL(enabledStateChanged()));
     QCOMPARE(service.isEnabled(), true);
 
     client.setEnabled(false);
     QCOMPARE(client.isEnabled(), false);
-    QmlDebugTest::waitForSignal(&service, SIGNAL(enabledStateChanged()));
+    QDeclarativeDebugTest::waitForSignal(&service, SIGNAL(enabledStateChanged()));
     QCOMPARE(service.isEnabled(), false);
 }
 
 void tst_QmlDebugClient::isConnected()
 {
-    QmlDebugClient client1("tst_QmlDebugClient::isConnected() A", m_conn);
+    QDeclarativeDebugClient client1("tst_QmlDebugClient::isConnected() A", m_conn);
     QCOMPARE(client1.isConnected(), true);
 
-    QmlDebugConnection conn;
-    QmlDebugClient client2("tst_QmlDebugClient::isConnected() B", &conn);
+    QDeclarativeDebugConnection conn;
+    QDeclarativeDebugClient client2("tst_QmlDebugClient::isConnected() B", &conn);
     QCOMPARE(client2.isConnected(), false);
 
-    QmlDebugClient client3("tst_QmlDebugClient::isConnected() C", 0);
+    QDeclarativeDebugClient client3("tst_QmlDebugClient::isConnected() C", 0);
     QCOMPARE(client3.isConnected(), false);
 
     // duplicate plugin name
-    QTest::ignoreMessage(QtWarningMsg, "QmlDebugClient: Conflicting plugin name \"tst_QmlDebugClient::isConnected() A\" ");
-    QmlDebugClient client4("tst_QmlDebugClient::isConnected() A", m_conn);
+    QTest::ignoreMessage(QtWarningMsg, "QDeclarativeDebugClient: Conflicting plugin name \"tst_QmlDebugClient::isConnected() A\" ");
+    QDeclarativeDebugClient client4("tst_QmlDebugClient::isConnected() A", m_conn);
     QCOMPARE(client4.isConnected(), false);
 }
 
 void tst_QmlDebugClient::sendMessage()
 {
-    QmlDebugTestService service("tst_QmlDebugClient::sendMessage()");
-    QmlDebugTestClient client("tst_QmlDebugClient::sendMessage()", m_conn);
+    QDeclarativeDebugTestService service("tst_QmlDebugClient::sendMessage()");
+    QDeclarativeDebugTestClient client("tst_QmlDebugClient::sendMessage()", m_conn);
 
     QByteArray msg = "hello!";
 
@@ -137,10 +137,10 @@ void tst_QmlDebugClient::sendMessage()
 }
 
 
-class tst_QmlDebugClient_Factory : public QmlTestFactory
+class tst_QmlDebugClient_Factory : public QDeclarativeTestFactory
 {
 public:
-    QObject *createTest(QmlDebugTestData *data) { return new tst_QmlDebugClient(data); }
+    QObject *createTest(QDeclarativeDebugTestData *data) { return new tst_QmlDebugClient(data); }
 };
 
 
@@ -151,7 +151,7 @@ int main(int argc, char *argv[])
     QApplication app(argc, argv);
 
     tst_QmlDebugClient_Factory factory;
-    return QmlDebugTest::runTests(&factory);
+    return QDeclarativeDebugTest::runTests(&factory);
 }
 
-#include "tst_qmldebugclient.moc"
+#include "tst_qdeclarativedebugclient.moc"
diff --git a/tests/auto/declarative/qmldebugservice/qmldebugservice.pro b/tests/auto/declarative/qdeclarativedebugservice/qdeclarativedebugservice.pro
index 9995f1f..e375889 100644
--- a/tests/auto/declarative/qmldebugservice/qmldebugservice.pro
+++ b/tests/auto/declarative/qdeclarativedebugservice/qdeclarativedebugservice.pro
@@ -3,5 +3,5 @@ contains(QT_CONFIG,declarative): QT += network declarative
 macx:CONFIG -= app_bundle
 
 HEADERS += ../shared/debugutil_p.h
-SOURCES += tst_qmldebugservice.cpp \
+SOURCES += tst_qdeclarativedebugservice.cpp \
            ../shared/debugutil.cpp
diff --git a/tests/auto/declarative/qmldebugservice/tst_qmldebugservice.cpp b/tests/auto/declarative/qdeclarativedebugservice/tst_qdeclarativedebugservice.cpp
index e9e31ca..69def9a 100644
--- a/tests/auto/declarative/qmldebugservice/tst_qmldebugservice.cpp
+++ b/tests/auto/declarative/qdeclarativedebugservice/tst_qdeclarativedebugservice.cpp
@@ -45,12 +45,12 @@
 #include <QDebug>
 #include <QThread>
 
-#include <QtDeclarative/qmlengine.h>
+#include <QtDeclarative/qdeclarativeengine.h>
 
-#include <private/qmldebug_p.h>
-#include <private/qmlenginedebug_p.h>
-#include <private/qmldebugclient_p.h>
-#include <private/qmldebugservice_p.h>
+#include <private/qdeclarativedebug_p.h>
+#include <private/qdeclarativeenginedebug_p.h>
+#include <private/qdeclarativedebugclient_p.h>
+#include <private/qdeclarativedebugservice_p.h>
 
 #include "../shared/debugutil_p.h"
 
@@ -59,12 +59,12 @@ class tst_QmlDebugService : public QObject
     Q_OBJECT
 
 public:
-    tst_QmlDebugService(QmlDebugTestData *data)
+    tst_QmlDebugService(QDeclarativeDebugTestData *data)
     {
         m_conn = data->conn;
     }
 
-    QmlDebugConnection *m_conn;
+    QDeclarativeDebugConnection *m_conn;
 
 private slots:
     void name();
@@ -80,41 +80,41 @@ void tst_QmlDebugService::name()
 {
     QString name = "tst_QmlDebugService::name()";
 
-    QmlDebugService service(name);
+    QDeclarativeDebugService service(name);
     QCOMPARE(service.name(), name);
 }
 
 void tst_QmlDebugService::isEnabled()
 {
-    QmlDebugTestService service("tst_QmlDebugService::isEnabled()", m_conn);
+    QDeclarativeDebugTestService service("tst_QmlDebugService::isEnabled()", m_conn);
     QCOMPARE(service.isEnabled(), false);
 
-    QmlDebugTestClient client("tst_QmlDebugService::isEnabled()", m_conn);
+    QDeclarativeDebugTestClient client("tst_QmlDebugService::isEnabled()", m_conn);
     client.setEnabled(true);
-    QmlDebugTest::waitForSignal(&service, SIGNAL(enabledStateChanged()));
+    QDeclarativeDebugTest::waitForSignal(&service, SIGNAL(enabledStateChanged()));
     QCOMPARE(service.isEnabled(), true);
 
-    QTest::ignoreMessage(QtWarningMsg, "QmlDebugService: Conflicting plugin name \"tst_QmlDebugService::isEnabled()\" ");
-    QmlDebugService duplicate("tst_QmlDebugService::isEnabled()", m_conn);
+    QTest::ignoreMessage(QtWarningMsg, "QDeclarativeDebugService: Conflicting plugin name \"tst_QmlDebugService::isEnabled()\" ");
+    QDeclarativeDebugService duplicate("tst_QmlDebugService::isEnabled()", m_conn);
     QCOMPARE(duplicate.isEnabled(), false);
 }
 
 void tst_QmlDebugService::enabledChanged()
 {
-    QmlDebugTestService service("tst_QmlDebugService::enabledChanged()");
-    QmlDebugTestClient client("tst_QmlDebugService::enabledChanged()", m_conn);
+    QDeclarativeDebugTestService service("tst_QmlDebugService::enabledChanged()");
+    QDeclarativeDebugTestClient client("tst_QmlDebugService::enabledChanged()", m_conn);
 
     QCOMPARE(service.enabled, false);
 
     client.setEnabled(true);
-    QmlDebugTest::waitForSignal(&service, SIGNAL(enabledStateChanged()));
+    QDeclarativeDebugTest::waitForSignal(&service, SIGNAL(enabledStateChanged()));
     QCOMPARE(service.enabled, true);
 }
 
 void tst_QmlDebugService::sendMessage()
 {
-    QmlDebugTestService service("tst_QmlDebugService::sendMessage()");
-    QmlDebugTestClient client("tst_QmlDebugService::sendMessage()", m_conn);
+    QDeclarativeDebugTestService service("tst_QmlDebugService::sendMessage()");
+    QDeclarativeDebugTestClient client("tst_QmlDebugService::sendMessage()", m_conn);
 
     QByteArray msg = "hello!";
 
@@ -125,21 +125,21 @@ void tst_QmlDebugService::sendMessage()
 
 void tst_QmlDebugService::idForObject()
 {
-    QCOMPARE(QmlDebugService::idForObject(0), -1);
+    QCOMPARE(QDeclarativeDebugService::idForObject(0), -1);
 
     QObject *objA = new QObject;
 
-    int idA = QmlDebugService::idForObject(objA);
+    int idA = QDeclarativeDebugService::idForObject(objA);
     QVERIFY(idA >= 0);
-    QCOMPARE(QmlDebugService::objectForId(idA), objA);
+    QCOMPARE(QDeclarativeDebugService::objectForId(idA), objA);
 
-    int idAA = QmlDebugService::idForObject(objA);
+    int idAA = QDeclarativeDebugService::idForObject(objA);
     QCOMPARE(idAA, idA);
 
     QObject *objB = new QObject;
-    int idB = QmlDebugService::idForObject(objB);
+    int idB = QDeclarativeDebugService::idForObject(objB);
     QVERIFY(idB != idA);
-    QCOMPARE(QmlDebugService::objectForId(idB), objB);
+    QCOMPARE(QDeclarativeDebugService::objectForId(idB), objB);
  
     delete objA;
     delete objB;
@@ -147,34 +147,34 @@ void tst_QmlDebugService::idForObject()
 
 void tst_QmlDebugService::objectForId()
 {
-    QCOMPARE(QmlDebugService::objectForId(-1), static_cast<QObject*>(0));
-    QCOMPARE(QmlDebugService::objectForId(1), static_cast<QObject*>(0));
+    QCOMPARE(QDeclarativeDebugService::objectForId(-1), static_cast<QObject*>(0));
+    QCOMPARE(QDeclarativeDebugService::objectForId(1), static_cast<QObject*>(0));
 
     QObject *obj = new QObject;
-    int id = QmlDebugService::idForObject(obj);
-    QCOMPARE(QmlDebugService::objectForId(id), obj);
+    int id = QDeclarativeDebugService::idForObject(obj);
+    QCOMPARE(QDeclarativeDebugService::objectForId(id), obj);
 
     delete obj;
-    QCOMPARE(QmlDebugService::objectForId(id), static_cast<QObject*>(0));
+    QCOMPARE(QDeclarativeDebugService::objectForId(id), static_cast<QObject*>(0));
 }
 
 void tst_QmlDebugService::objectToString()
 {
-    QCOMPARE(QmlDebugService::objectToString(0), QString("NULL"));
+    QCOMPARE(QDeclarativeDebugService::objectToString(0), QString("NULL"));
 
     QObject *obj = new QObject;
-    QCOMPARE(QmlDebugService::objectToString(obj), QString("QObject: <unnamed>"));
+    QCOMPARE(QDeclarativeDebugService::objectToString(obj), QString("QObject: <unnamed>"));
 
     obj->setObjectName("Hello");
-    QCOMPARE(QmlDebugService::objectToString(obj), QString("QObject: Hello"));
+    QCOMPARE(QDeclarativeDebugService::objectToString(obj), QString("QObject: Hello"));
     delete obj;
 }
 
 
-class tst_QmlDebugService_Factory : public QmlTestFactory
+class tst_QmlDebugService_Factory : public QDeclarativeTestFactory
 {
 public:
-    QObject *createTest(QmlDebugTestData *data) { return new tst_QmlDebugService(data); }
+    QObject *createTest(QDeclarativeDebugTestData *data) { return new tst_QmlDebugService(data); }
 };
 
 // This does not use QTEST_MAIN because the test has to be created and run
@@ -184,7 +184,7 @@ int main(int argc, char *argv[])
     QApplication app(argc, argv);
 
     tst_QmlDebugService_Factory factory;
-    return QmlDebugTest::runTests(&factory);
+    return QDeclarativeDebugTest::runTests(&factory);
 }
 
-#include "tst_qmldebugservice.moc"
+#include "tst_qdeclarativedebugservice.moc"
diff --git a/tests/auto/declarative/qmldom/data/MyComponent.qml b/tests/auto/declarative/qdeclarativedom/data/MyComponent.qml
index 1472f01..1472f01 100644
--- a/tests/auto/declarative/qmldom/data/MyComponent.qml
+++ b/tests/auto/declarative/qdeclarativedom/data/MyComponent.qml
diff --git a/tests/auto/declarative/qmldom/data/MyItem.qml b/tests/auto/declarative/qdeclarativedom/data/MyItem.qml
index 1472f01..1472f01 100644
--- a/tests/auto/declarative/qmldom/data/MyItem.qml
+++ b/tests/auto/declarative/qdeclarativedom/data/MyItem.qml
diff --git a/tests/auto/declarative/qmldom/data/importdir/Bar.qml b/tests/auto/declarative/qdeclarativedom/data/importdir/Bar.qml
index 2d1a4a3..2d1a4a3 100644
--- a/tests/auto/declarative/qmldom/data/importdir/Bar.qml
+++ b/tests/auto/declarative/qdeclarativedom/data/importdir/Bar.qml
diff --git a/tests/auto/declarative/qmldom/data/importlib/sublib/qmldir/Foo.qml b/tests/auto/declarative/qdeclarativedom/data/importlib/sublib/qmldir/Foo.qml
index 2d1a4a3..2d1a4a3 100644
--- a/tests/auto/declarative/qmldom/data/importlib/sublib/qmldir/Foo.qml
+++ b/tests/auto/declarative/qdeclarativedom/data/importlib/sublib/qmldir/Foo.qml
diff --git a/tests/auto/declarative/qmldom/data/top.qml b/tests/auto/declarative/qdeclarativedom/data/top.qml
index 2681993..2681993 100644
--- a/tests/auto/declarative/qmldom/data/top.qml
+++ b/tests/auto/declarative/qdeclarativedom/data/top.qml
diff --git a/tests/auto/declarative/qmlinfo/qmlinfo.pro b/tests/auto/declarative/qdeclarativedom/qdeclarativedom.pro
index dbebf92..35df26e 100644
--- a/tests/auto/declarative/qmlinfo/qmlinfo.pro
+++ b/tests/auto/declarative/qdeclarativedom/qdeclarativedom.pro
@@ -2,6 +2,6 @@ load(qttest_p4)
 contains(QT_CONFIG,declarative): QT += declarative
 macx:CONFIG -= app_bundle
 
-SOURCES += tst_qmlinfo.cpp
+SOURCES += tst_qdeclarativedom.cpp
 
 DEFINES += SRCDIR=\\\"$$PWD\\\"
diff --git a/tests/auto/declarative/qmldom/tst_qmldom.cpp b/tests/auto/declarative/qdeclarativedom/tst_qdeclarativedom.cpp
index 16cdef0..a92a240 100644
--- a/tests/auto/declarative/qmldom/tst_qmldom.cpp
+++ b/tests/auto/declarative/qdeclarativedom/tst_qdeclarativedom.cpp
@@ -39,9 +39,9 @@
 **
 ****************************************************************************/
 #include <qtest.h>
-#include <QtDeclarative/qmlengine.h>
-#include <QtDeclarative/qmlcomponent.h>
-#include <QtDeclarative/private/qmldom_p.h>
+#include <QtDeclarative/qdeclarativeengine.h>
+#include <QtDeclarative/qdeclarativecomponent.h>
+#include <QtDeclarative/private/qdeclarativedom_p.h>
 
 #include <QtCore/QDebug>
 #include <QtCore/QFile>
@@ -75,7 +75,7 @@ private slots:
     void copy();
     void position();
 private:
-    QmlEngine engine;
+    QDeclarativeEngine engine;
 };
 
 
@@ -84,11 +84,11 @@ void tst_qmldom::loadSimple()
     QByteArray qml = "import Qt 4.6\n"
                       "Item {}";
 
-    QmlDomDocument document;
+    QDeclarativeDomDocument document;
     QVERIFY(document.load(&engine, qml));
     QVERIFY(document.errors().isEmpty());
 
-    QmlDomObject rootObject = document.rootObject();
+    QDeclarativeDomObject rootObject = document.rootObject();
     QVERIFY(rootObject.isValid());
     QVERIFY(!rootObject.isComponent());
     QVERIFY(!rootObject.isCustomType());
@@ -103,15 +103,15 @@ void tst_qmldom::loadProperties()
     QByteArray qml = "import Qt 4.6\n"
                      "Item { id : item; x : 300; visible : true }";
 
-    QmlDomDocument document;
+    QDeclarativeDomDocument document;
     QVERIFY(document.load(&engine, qml));
 
-    QmlDomObject rootObject = document.rootObject();
+    QDeclarativeDomObject rootObject = document.rootObject();
     QVERIFY(rootObject.isValid());
     QVERIFY(rootObject.objectId() == "item");
     QCOMPARE(rootObject.properties().size(), 3);
 
-    QmlDomProperty xProperty = rootObject.property("x");
+    QDeclarativeDomProperty xProperty = rootObject.property("x");
     QVERIFY(xProperty.propertyName() == "x");
     QCOMPARE(xProperty.propertyNameParts().count(), 1);
     QVERIFY(xProperty.propertyNameParts().at(0) == "x");
@@ -120,7 +120,7 @@ void tst_qmldom::loadProperties()
     QVERIFY(xProperty.value().isLiteral());
     QVERIFY(xProperty.value().toLiteral().literal() == "300");
 
-    QmlDomProperty visibleProperty = rootObject.property("visible");
+    QDeclarativeDomProperty visibleProperty = rootObject.property("visible");
     QVERIFY(visibleProperty.propertyName() == "visible");
     QCOMPARE(visibleProperty.propertyNameParts().count(), 1);
     QVERIFY(visibleProperty.propertyNameParts().at(0) == "visible");
@@ -137,18 +137,18 @@ void tst_qmldom::loadGroupedProperties()
         QByteArray qml = "import Qt 4.6\n"
                          "Item { anchors.left: parent.left; anchors.right: parent.right }";
 
-        QmlDomDocument document;
+        QDeclarativeDomDocument document;
         QVERIFY(document.load(&engine, qml));
 
-        QmlDomObject rootItem = document.rootObject();
+        QDeclarativeDomObject rootItem = document.rootObject();
         QVERIFY(rootItem.isValid());
         QVERIFY(rootItem.properties().size() == 2);
 
         // Order is not deterministic
-        QmlDomProperty p0 = rootItem.properties().at(0);
-        QmlDomProperty p1 = rootItem.properties().at(1);
-        QmlDomProperty leftProperty;
-        QmlDomProperty rightProperty;
+        QDeclarativeDomProperty p0 = rootItem.properties().at(0);
+        QDeclarativeDomProperty p1 = rootItem.properties().at(1);
+        QDeclarativeDomProperty leftProperty;
+        QDeclarativeDomProperty rightProperty;
         if (p0.propertyName() == "anchors.left") {
             leftProperty = p0;
             rightProperty = p1;
@@ -185,18 +185,18 @@ void tst_qmldom::loadGroupedProperties()
                          "    }\n"
                          "}";
 
-        QmlDomDocument document;
+        QDeclarativeDomDocument document;
         QVERIFY(document.load(&engine, qml));
 
-        QmlDomObject rootItem = document.rootObject();
+        QDeclarativeDomObject rootItem = document.rootObject();
         QVERIFY(rootItem.isValid());
         QVERIFY(rootItem.properties().size() == 2);
 
         // Order is not deterministic
-        QmlDomProperty p0 = rootItem.properties().at(0);
-        QmlDomProperty p1 = rootItem.properties().at(1);
-        QmlDomProperty leftProperty;
-        QmlDomProperty rightProperty;
+        QDeclarativeDomProperty p0 = rootItem.properties().at(0);
+        QDeclarativeDomProperty p1 = rootItem.properties().at(1);
+        QDeclarativeDomProperty leftProperty;
+        QDeclarativeDomProperty rightProperty;
         if (p0.propertyName() == "anchors.left") {
             leftProperty = p0;
             rightProperty = p1;
@@ -231,21 +231,21 @@ void tst_qmldom::loadChildObject()
     QByteArray qml = "import Qt 4.6\n"
                      "Item { Item {} }";
 
-    QmlDomDocument document;
+    QDeclarativeDomDocument document;
     QVERIFY(document.load(&engine, qml));
 
-    QmlDomObject rootItem = document.rootObject();
+    QDeclarativeDomObject rootItem = document.rootObject();
     QVERIFY(rootItem.isValid());
     QVERIFY(rootItem.properties().size() == 1);
 
-    QmlDomProperty listProperty = rootItem.properties().at(0);
+    QDeclarativeDomProperty listProperty = rootItem.properties().at(0);
     QVERIFY(listProperty.isDefaultProperty());
     QVERIFY(listProperty.value().isList());
 
-    QmlDomList list = listProperty.value().toList();
+    QDeclarativeDomList list = listProperty.value().toList();
     QVERIFY(list.values().size() == 1);
 
-    QmlDomObject childItem = list.values().first().toObject();
+    QDeclarativeDomObject childItem = list.values().first().toObject();
     QVERIFY(childItem.isValid());
     QVERIFY(childItem.objectType() == "Qt/Item");
 }
@@ -255,19 +255,19 @@ void tst_qmldom::loadComposite()
     QFile file(SRCDIR  "/data/top.qml");
     QVERIFY(file.open(QIODevice::ReadOnly | QIODevice::Text));
 
-    QmlDomDocument document;
+    QDeclarativeDomDocument document;
     QVERIFY(document.load(&engine, file.readAll(), QUrl::fromLocalFile(file.fileName())));
     QVERIFY(document.errors().isEmpty());
 
-    QmlDomObject rootItem = document.rootObject();
+    QDeclarativeDomObject rootItem = document.rootObject();
     QVERIFY(rootItem.isValid());
     QCOMPARE(rootItem.objectType(), QByteArray("MyComponent"));
     QCOMPARE(rootItem.properties().size(), 2);
 
-    QmlDomProperty widthProperty = rootItem.property("width");
+    QDeclarativeDomProperty widthProperty = rootItem.property("width");
     QVERIFY(widthProperty.value().isLiteral());
 
-    QmlDomProperty heightProperty = rootItem.property("height");
+    QDeclarativeDomProperty heightProperty = rootItem.property("height");
     QVERIFY(heightProperty.value().isLiteral());
 }
 
@@ -276,28 +276,28 @@ void tst_qmldom::testValueSource()
     QByteArray qml = "import Qt 4.6\n"
                      "Rectangle { height: SpringFollow { spring: 1.4; damping: .15; source: Math.min(Math.max(-130, value*2.2 - 130), 133); }}";
 
-    QmlEngine freshEngine;
-    QmlDomDocument document;
+    QDeclarativeEngine freshEngine;
+    QDeclarativeDomDocument document;
     QVERIFY(document.load(&freshEngine, qml));
 
-    QmlDomObject rootItem = document.rootObject();
+    QDeclarativeDomObject rootItem = document.rootObject();
     QVERIFY(rootItem.isValid());
-    QmlDomProperty heightProperty = rootItem.properties().at(0);
+    QDeclarativeDomProperty heightProperty = rootItem.properties().at(0);
     QVERIFY(heightProperty.propertyName() == "height");
     QVERIFY(heightProperty.value().isValueSource());
 
-    const QmlDomValueValueSource valueSource = heightProperty.value().toValueSource();
-    QmlDomObject valueSourceObject = valueSource.object();
+    const QDeclarativeDomValueValueSource valueSource = heightProperty.value().toValueSource();
+    QDeclarativeDomObject valueSourceObject = valueSource.object();
     QVERIFY(valueSourceObject.isValid());
 
     QVERIFY(valueSourceObject.objectType() == "Qt/SpringFollow");
     
-    const QmlDomValue springValue = valueSourceObject.property("spring").value();
+    const QDeclarativeDomValue springValue = valueSourceObject.property("spring").value();
     QVERIFY(!springValue.isInvalid());
     QVERIFY(springValue.isLiteral());
     QVERIFY(springValue.toLiteral().literal() == "1.4");
 
-    const QmlDomValue sourceValue = valueSourceObject.property("source").value();
+    const QDeclarativeDomValue sourceValue = valueSourceObject.property("source").value();
     QVERIFY(!sourceValue.isInvalid());
     QVERIFY(sourceValue.isBinding());
     QVERIFY(sourceValue.toBinding().binding() == "Math.min(Math.max(-130, value*2.2 - 130), 133)");
@@ -308,28 +308,28 @@ void tst_qmldom::testValueInterceptor()
     QByteArray qml = "import Qt 4.6\n"
                      "Rectangle { height: Behavior { NumberAnimation { duration: 100 } } }";
 
-    QmlEngine freshEngine;
-    QmlDomDocument document;
+    QDeclarativeEngine freshEngine;
+    QDeclarativeDomDocument document;
     QVERIFY(document.load(&freshEngine, qml));
 
-    QmlDomObject rootItem = document.rootObject();
+    QDeclarativeDomObject rootItem = document.rootObject();
     QVERIFY(rootItem.isValid());
-    QmlDomProperty heightProperty = rootItem.properties().at(0);
+    QDeclarativeDomProperty heightProperty = rootItem.properties().at(0);
     QVERIFY(heightProperty.propertyName() == "height");
     QVERIFY(heightProperty.value().isValueInterceptor());
 
-    const QmlDomValueValueInterceptor valueInterceptor = heightProperty.value().toValueInterceptor();
-    QmlDomObject valueInterceptorObject = valueInterceptor.object();
+    const QDeclarativeDomValueValueInterceptor valueInterceptor = heightProperty.value().toValueInterceptor();
+    QDeclarativeDomObject valueInterceptorObject = valueInterceptor.object();
     QVERIFY(valueInterceptorObject.isValid());
 
     QVERIFY(valueInterceptorObject.objectType() == "Qt/Behavior");
 
-    const QmlDomValue animationValue = valueInterceptorObject.property("animation").value();
+    const QDeclarativeDomValue animationValue = valueInterceptorObject.property("animation").value();
     QVERIFY(!animationValue.isInvalid());
     QVERIFY(animationValue.isObject());
 }
 
-// Test QmlDomDocument::imports()
+// Test QDeclarativeDomDocument::imports()
 void tst_qmldom::loadImports()
 {
     QByteArray qml = "import Qt 4.6\n"
@@ -339,39 +339,39 @@ void tst_qmldom::loadImports()
                      "import 'import' as X\n"
                      "Item {}";
 
-    QmlEngine engine;
+    QDeclarativeEngine engine;
     engine.addImportPath(SRCDIR "/data");
-    QmlDomDocument document;
+    QDeclarativeDomDocument document;
     QVERIFY(document.load(&engine, qml));
 
     QCOMPARE(document.imports().size(), 5);
 
-    QmlDomImport import = document.imports().at(0);
-    QCOMPARE(import.type(), QmlDomImport::Library);
+    QDeclarativeDomImport import = document.imports().at(0);
+    QCOMPARE(import.type(), QDeclarativeDomImport::Library);
     QCOMPARE(import.uri(), QLatin1String("Qt"));
     QCOMPARE(import.qualifier(), QString());
     QCOMPARE(import.version(), QLatin1String("4.6"));
 
     import = document.imports().at(1);
-    QCOMPARE(import.type(), QmlDomImport::Library);
+    QCOMPARE(import.type(), QDeclarativeDomImport::Library);
     QCOMPARE(import.uri(), QLatin1String("importlib.sublib"));
     QCOMPARE(import.qualifier(), QString());
     QCOMPARE(import.version(), QLatin1String("4.7"));
 
     import = document.imports().at(2);
-    QCOMPARE(import.type(), QmlDomImport::Library);
+    QCOMPARE(import.type(), QDeclarativeDomImport::Library);
     QCOMPARE(import.uri(), QLatin1String("importlib.sublib"));
     QCOMPARE(import.qualifier(), QLatin1String("NewFoo"));
     QCOMPARE(import.version(), QLatin1String("4.6"));
 
     import = document.imports().at(3);
-    QCOMPARE(import.type(), QmlDomImport::File);
+    QCOMPARE(import.type(), QDeclarativeDomImport::File);
     QCOMPARE(import.uri(), QLatin1String("import"));
     QCOMPARE(import.qualifier(), QLatin1String(""));
     QCOMPARE(import.version(), QLatin1String(""));
 
     import = document.imports().at(4);
-    QCOMPARE(import.type(), QmlDomImport::File);
+    QCOMPARE(import.type(), QDeclarativeDomImport::File);
     QCOMPARE(import.uri(), QLatin1String("import"));
     QCOMPARE(import.qualifier(), QLatin1String("X"));
     QCOMPARE(import.version(), QLatin1String(""));
@@ -385,11 +385,11 @@ void tst_qmldom::loadErrors()
                      "  foo: 12\n"
                      "}";
 
-    QmlDomDocument document;
+    QDeclarativeDomDocument document;
     QVERIFY(false == document.load(&engine, qml));
 
     QCOMPARE(document.errors().count(), 1);
-    QmlError error = document.errors().first();
+    QDeclarativeError error = document.errors().first();
 
     QCOMPARE(error.url(), QUrl());
     QCOMPARE(error.line(), 3);
@@ -403,11 +403,11 @@ void tst_qmldom::loadSyntaxErrors()
     QByteArray qml = "import Qt 4.6\n"
                      "asdf";
 
-    QmlDomDocument document;
+    QDeclarativeDomDocument document;
     QVERIFY(false == document.load(&engine, qml));
 
     QCOMPARE(document.errors().count(), 1);
-    QmlError error = document.errors().first();
+    QDeclarativeError error = document.errors().first();
 
     QCOMPARE(error.url(), QUrl());
     QCOMPARE(error.line(), 2);
@@ -424,16 +424,16 @@ void tst_qmldom::loadRemoteErrors()
                      "        source: \"http://localhost/exampleQmlScript.js\""
                      "    }\n"
                      "}";
-    QmlDomDocument document;
+    QDeclarativeDomDocument document;
     QVERIFY(false == document.load(&engine, qml));
 
     QCOMPARE(document.errors().count(), 1);
-    QmlError error = document.errors().first();
+    QDeclarativeError error = document.errors().first();
 
     QCOMPARE(error.url(), QUrl());
     QCOMPARE(error.line(), -1);
     QCOMPARE(error.column(), -1);
-    QCOMPARE(error.description(), QString("QmlDomDocument supports local types only"));
+    QCOMPARE(error.description(), QString("QDeclarativeDomDocument supports local types only"));
 }
 
 // Test dynamic property declarations
@@ -455,17 +455,17 @@ void tst_qmldom::loadDynamicProperty()
                          "    property QtObject k\n"
                          "}";
 
-        QmlDomDocument document;
+        QDeclarativeDomDocument document;
         QVERIFY(document.load(&engine, qml));
 
-        QmlDomObject rootObject = document.rootObject();
+        QDeclarativeDomObject rootObject = document.rootObject();
         QVERIFY(rootObject.isValid());
 
         QCOMPARE(rootObject.dynamicProperties().count(), 11);
 
 #define DP_TEST(index, name, type, test_position, test_length, propTypeName) \
     { \
-        QmlDomDynamicProperty d = rootObject.dynamicProperties().at(index); \
+        QDeclarativeDomDynamicProperty d = rootObject.dynamicProperties().at(index); \
         QVERIFY(d.isValid()); \
         QVERIFY(d.propertyName() == # name ); \
         QVERIFY(d.propertyType() == type); \
@@ -497,16 +497,16 @@ void tst_qmldom::loadDynamicProperty()
                          "    default property QtObject c\n"
                          "}\n";
 
-        QmlDomDocument document;
+        QDeclarativeDomDocument document;
         QVERIFY(document.load(&engine, qml));
 
-        QmlDomObject rootObject = document.rootObject();
+        QDeclarativeDomObject rootObject = document.rootObject();
         QVERIFY(rootObject.isValid());
 
         QCOMPARE(rootObject.dynamicProperties().count(), 3);
         
         {
-            QmlDomDynamicProperty d = rootObject.dynamicProperties().at(0);
+            QDeclarativeDomDynamicProperty d = rootObject.dynamicProperties().at(0);
             QVERIFY(d.isDefaultProperty() == false);
             QVERIFY(d.defaultValue().isValid());
             QVERIFY(d.defaultValue().propertyName() == "a");
@@ -514,7 +514,7 @@ void tst_qmldom::loadDynamicProperty()
         }
 
         {
-            QmlDomDynamicProperty d = rootObject.dynamicProperties().at(1);
+            QDeclarativeDomDynamicProperty d = rootObject.dynamicProperties().at(1);
             QVERIFY(d.isDefaultProperty() == false);
             QVERIFY(d.defaultValue().isValid());
             QVERIFY(d.defaultValue().propertyName() == "b");
@@ -522,7 +522,7 @@ void tst_qmldom::loadDynamicProperty()
         }
 
         {
-            QmlDomDynamicProperty d = rootObject.dynamicProperties().at(2);
+            QDeclarativeDomDynamicProperty d = rootObject.dynamicProperties().at(2);
             QVERIFY(d.isDefaultProperty() == true);
             QVERIFY(d.defaultValue().isValid() == false);
         }
@@ -542,26 +542,26 @@ void tst_qmldom::loadComponent()
                          "    }\n"
                          "}";
 
-        QmlDomDocument document;
+        QDeclarativeDomDocument document;
         QVERIFY(document.load(&engine, qml));
 
-        QmlDomObject rootItem = document.rootObject();
+        QDeclarativeDomObject rootItem = document.rootObject();
         QVERIFY(rootItem.isValid());
         QVERIFY(rootItem.properties().size() == 1);
 
-        QmlDomProperty listProperty = rootItem.properties().at(0);
+        QDeclarativeDomProperty listProperty = rootItem.properties().at(0);
         QVERIFY(listProperty.isDefaultProperty());
         QVERIFY(listProperty.value().isList());
 
-        QmlDomList list = listProperty.value().toList();
+        QDeclarativeDomList list = listProperty.value().toList();
         QVERIFY(list.values().size() == 1);
 
-        QmlDomObject componentObject = list.values().first().toObject();
+        QDeclarativeDomObject componentObject = list.values().first().toObject();
         QVERIFY(componentObject.isValid());
         QVERIFY(componentObject.objectClassName() == "Component");
         QVERIFY(componentObject.isComponent());
 
-        QmlDomComponent component = componentObject.toComponent();
+        QDeclarativeDomComponent component = componentObject.toComponent();
         QVERIFY(component.isValid());
         QVERIFY(component.objectType() == "Qt/Component");
         QVERIFY(component.objectTypeMajorVersion() == 4);
@@ -587,21 +587,21 @@ void tst_qmldom::loadComponent()
                          "    delegate: Item {}\n"
                          "}";
 
-        QmlDomDocument document;
+        QDeclarativeDomDocument document;
         QVERIFY(document.load(&engine, qml));
 
-        QmlDomObject rootItem = document.rootObject();
+        QDeclarativeDomObject rootItem = document.rootObject();
         QVERIFY(rootItem.isValid());
         QVERIFY(rootItem.properties().size() == 1);
 
-        QmlDomProperty delegate = rootItem.property("delegate");
+        QDeclarativeDomProperty delegate = rootItem.property("delegate");
 
-        QmlDomObject componentObject = delegate.value().toObject();
+        QDeclarativeDomObject componentObject = delegate.value().toObject();
         QVERIFY(componentObject.isValid());
         QVERIFY(componentObject.objectClassName() == "Component");
         QVERIFY(componentObject.isComponent());
 
-        QmlDomComponent component = componentObject.toComponent();
+        QDeclarativeDomComponent component = componentObject.toComponent();
         QVERIFY(component.isValid());
         QVERIFY(component.objectType() == "Qt/Component");
         QVERIFY(component.objectClassName() == "Component");
@@ -619,12 +619,12 @@ void tst_qmldom::loadComponent()
     }
 }
 
-// Test QmlDomObject::dynamicProperty() method
+// Test QDeclarativeDomObject::dynamicProperty() method
 void tst_qmldom::object_dynamicProperty()
 {
     // Invalid object
     {
-        QmlDomObject object;
+        QDeclarativeDomObject object;
         QVERIFY(object.dynamicProperty("").isValid() == false);
         QVERIFY(object.dynamicProperty("foo").isValid() == false);
     }
@@ -635,10 +635,10 @@ void tst_qmldom::object_dynamicProperty()
         QByteArray qml = "import Qt 4.6\n"
                          "Item {}";
 
-        QmlDomDocument document;
+        QDeclarativeDomDocument document;
         QVERIFY(document.load(&engine, qml));
 
-        QmlDomObject rootObject = document.rootObject();
+        QDeclarativeDomObject rootObject = document.rootObject();
         QVERIFY(rootObject.isValid());
 
         QVERIFY(rootObject.dynamicProperty("").isValid() == false);
@@ -652,16 +652,16 @@ void tst_qmldom::object_dynamicProperty()
                          "    property int a\n"
                          "}";
 
-        QmlDomDocument document;
+        QDeclarativeDomDocument document;
         QVERIFY(document.load(&engine, qml));
 
-        QmlDomObject rootObject = document.rootObject();
+        QDeclarativeDomObject rootObject = document.rootObject();
         QVERIFY(rootObject.isValid());
 
         QVERIFY(rootObject.dynamicProperty("").isValid() == false);
         QVERIFY(rootObject.dynamicProperty("foo").isValid() == false);
 
-        QmlDomDynamicProperty p = rootObject.dynamicProperty("a");
+        QDeclarativeDomDynamicProperty p = rootObject.dynamicProperty("a");
         QVERIFY(p.isValid());
         QVERIFY(p.propertyName() == "a");
         QVERIFY(p.propertyType() == QVariant::Int);
@@ -673,12 +673,12 @@ void tst_qmldom::object_dynamicProperty()
 
 }
 
-// Test QmlObject::property() method
+// Test QDeclarativeObject::property() method
 void tst_qmldom::object_property()
 {
     // Invalid object
     {
-        QmlDomObject object;
+        QDeclarativeDomObject object;
         QVERIFY(object.property("").isValid() == false);
         QVERIFY(object.property("foo").isValid() == false);
     }
@@ -691,16 +691,16 @@ void tst_qmldom::object_property()
                          "    y: 12\n"
                          "}\n";
 
-        QmlDomDocument document;
+        QDeclarativeDomDocument document;
         QVERIFY(document.load(&engine, qml));
 
-        QmlDomObject rootObject = document.rootObject();
+        QDeclarativeDomObject rootObject = document.rootObject();
         QVERIFY(rootObject.isValid());
 
         QVERIFY(rootObject.property("").isValid() == false);
         QVERIFY(rootObject.property("foo").isValid() == false);
 
-        QmlDomProperty x = rootObject.property("x");
+        QDeclarativeDomProperty x = rootObject.property("x");
         QVERIFY(x.isValid());
         QVERIFY(x.propertyName() == "x");
         QVERIFY(x.propertyNameParts().count() == 1);
@@ -711,7 +711,7 @@ void tst_qmldom::object_property()
         QCOMPARE(x.position(), 25);
         QCOMPARE(x.length(), 1);
 
-        QmlDomProperty y = rootObject.property("y");
+        QDeclarativeDomProperty y = rootObject.property("y");
         QVERIFY(y.isValid());
         QVERIFY(y.propertyName() == "y");
         QVERIFY(y.propertyNameParts().count() == 1);
@@ -732,16 +732,16 @@ void tst_qmldom::object_property()
                          "    Item {}\n"
                          "}\n";
 
-        QmlDomDocument document;
+        QDeclarativeDomDocument document;
         QVERIFY(document.load(&engine, qml));
 
-        QmlDomObject rootObject = document.rootObject();
+        QDeclarativeDomObject rootObject = document.rootObject();
         QVERIFY(rootObject.isValid());
 
         QVERIFY(rootObject.property("").isValid() == false);
         QVERIFY(rootObject.property("foo").isValid() == false);
 
-        QmlDomProperty x = rootObject.property("x");
+        QDeclarativeDomProperty x = rootObject.property("x");
         QVERIFY(x.isValid());
         QVERIFY(x.propertyName() == "x");
         QVERIFY(x.propertyNameParts().count() == 1);
@@ -752,7 +752,7 @@ void tst_qmldom::object_property()
         QCOMPARE(x.position(), 25);
         QCOMPARE(x.length(), 1);
 
-        QmlDomProperty y = rootObject.property("y");
+        QDeclarativeDomProperty y = rootObject.property("y");
         QVERIFY(y.isValid());
         QVERIFY(y.propertyName() == "y");
         QVERIFY(y.propertyNameParts().count() == 1);
@@ -763,7 +763,7 @@ void tst_qmldom::object_property()
         QCOMPARE(y.position(), 35);
         QCOMPARE(y.length(), 1);
         
-        QmlDomProperty data = rootObject.property("data");
+        QDeclarativeDomProperty data = rootObject.property("data");
         QVERIFY(data.isValid());
         QVERIFY(data.propertyName() == "data");
         QVERIFY(data.propertyNameParts().count() == 1);
@@ -775,12 +775,12 @@ void tst_qmldom::object_property()
     }
 }
 
-// Tests the QmlDomObject::url() method
+// Tests the QDeclarativeDomObject::url() method
 void tst_qmldom::object_url()
 {
     // Invalid object
     {
-        QmlDomObject object;
+        QDeclarativeDomObject object;
         QCOMPARE(object.url(), QUrl());
     }
 
@@ -789,10 +789,10 @@ void tst_qmldom::object_url()
         QByteArray qml = "import Qt 4.6\n"
                          "Item {}";
 
-        QmlDomDocument document;
+        QDeclarativeDomDocument document;
         QVERIFY(document.load(&engine, qml));
 
-        QmlDomObject rootObject = document.rootObject();
+        QDeclarativeDomObject rootObject = document.rootObject();
         QVERIFY(rootObject.isValid());
         QCOMPARE(rootObject.url(), QUrl());
     }
@@ -805,10 +805,10 @@ void tst_qmldom::object_url()
         QUrl myUrl = QUrl::fromLocalFile(SRCDIR "/data/main.qml");
         QUrl subUrl = QUrl::fromLocalFile(SRCDIR "/data/MyItem.qml");
 
-        QmlDomDocument document;
+        QDeclarativeDomDocument document;
         QVERIFY(document.load(&engine, qml, myUrl));
 
-        QmlDomObject rootObject = document.rootObject();
+        QDeclarativeDomObject rootObject = document.rootObject();
         QVERIFY(rootObject.isValid());
         QCOMPARE(rootObject.url(), subUrl);
     }
@@ -833,13 +833,13 @@ void tst_qmldom::copy()
 
     QUrl myUrl = QUrl::fromLocalFile(SRCDIR "/data/main.qml");
 
-    QmlDomDocument document;
+    QDeclarativeDomDocument document;
     QVERIFY(document.load(&engine, qml, myUrl));
 
-    // QmlDomDocument
+    // QDeclarativeDomDocument
     {
-        QmlDomDocument document2(document);
-        QmlDomDocument document3;
+        QDeclarativeDomDocument document2(document);
+        QDeclarativeDomDocument document3;
         document3 = document;
 
         QCOMPARE(document.imports().count(), document2.imports().count());
@@ -851,13 +851,13 @@ void tst_qmldom::copy()
         QCOMPARE(document.rootObject().objectClassName(), document3.rootObject().objectClassName());
     }
 
-    // QmlDomImport
+    // QDeclarativeDomImport
     {
         QCOMPARE(document.imports().count(), 1);
-        QmlDomImport import = document.imports().at(0);
+        QDeclarativeDomImport import = document.imports().at(0);
 
-        QmlDomImport import2(import);
-        QmlDomImport import3;
+        QDeclarativeDomImport import2(import);
+        QDeclarativeDomImport import3;
         import3 = import2;
 
         QCOMPARE(import.type(), import2.type());
@@ -871,13 +871,13 @@ void tst_qmldom::copy()
         QCOMPARE(import.qualifier(), import3.qualifier());
     }
 
-    // QmlDomObject
+    // QDeclarativeDomObject
     {
-        QmlDomObject object = document.rootObject();
+        QDeclarativeDomObject object = document.rootObject();
         QVERIFY(object.isValid());
 
-        QmlDomObject object2(object);
-        QmlDomObject object3;
+        QDeclarativeDomObject object2(object);
+        QDeclarativeDomObject object3;
         object3 = object;
 
         QCOMPARE(object.isValid(), object2.isValid());
@@ -911,13 +911,13 @@ void tst_qmldom::copy()
         QCOMPARE(object.url(), object3.url());
     }
 
-    // QmlDomDynamicProperty
+    // QDeclarativeDomDynamicProperty
     {
-        QmlDomObject object = document.rootObject();
-        QmlDomDynamicProperty property = object.dynamicProperty("a");
+        QDeclarativeDomObject object = document.rootObject();
+        QDeclarativeDomDynamicProperty property = object.dynamicProperty("a");
 
-        QmlDomDynamicProperty property2(property);
-        QmlDomDynamicProperty property3;
+        QDeclarativeDomDynamicProperty property2(property);
+        QDeclarativeDomDynamicProperty property3;
         property3 = property;
 
         QCOMPARE(property.isValid(), property2.isValid());
@@ -939,13 +939,13 @@ void tst_qmldom::copy()
         QCOMPARE(property.length(), property3.length());
     }
 
-    // QmlDomProperty
+    // QDeclarativeDomProperty
     {
-        QmlDomObject object = document.rootObject();
-        QmlDomProperty property = object.property("opacity");
+        QDeclarativeDomObject object = document.rootObject();
+        QDeclarativeDomProperty property = object.property("opacity");
 
-        QmlDomProperty property2(property);
-        QmlDomProperty property3;
+        QDeclarativeDomProperty property2(property);
+        QDeclarativeDomProperty property3;
         property3 = property;
 
         QCOMPARE(property.isValid(), property2.isValid());
@@ -965,15 +965,15 @@ void tst_qmldom::copy()
         QCOMPARE(property.length(), property3.length());
     }
 
-    // QmlDomValueLiteral
+    // QDeclarativeDomValueLiteral
     {
-        QmlDomObject object = document.rootObject();
-        QmlDomProperty property = object.property("x");
-        QmlDomValueLiteral literal = property.value().toLiteral();
+        QDeclarativeDomObject object = document.rootObject();
+        QDeclarativeDomProperty property = object.property("x");
+        QDeclarativeDomValueLiteral literal = property.value().toLiteral();
         QCOMPARE(literal.literal(), QString("10"));
 
-        QmlDomValueLiteral literal2(literal);
-        QmlDomValueLiteral literal3;
+        QDeclarativeDomValueLiteral literal2(literal);
+        QDeclarativeDomValueLiteral literal3;
         literal3 = literal2;
 
         QCOMPARE(literal2.literal(), QString("10"));
@@ -981,62 +981,62 @@ void tst_qmldom::copy()
     }
 
 
-    // QmlDomValueBinding
+    // QDeclarativeDomValueBinding
     {
-        QmlDomObject object = document.rootObject();
-        QmlDomProperty property = object.property("y");
-        QmlDomValueBinding binding = property.value().toBinding();
+        QDeclarativeDomObject object = document.rootObject();
+        QDeclarativeDomProperty property = object.property("y");
+        QDeclarativeDomValueBinding binding = property.value().toBinding();
         QCOMPARE(binding.binding(), QString("x + 10"));
 
-        QmlDomValueBinding binding2(binding);
-        QmlDomValueBinding binding3;
+        QDeclarativeDomValueBinding binding2(binding);
+        QDeclarativeDomValueBinding binding3;
         binding3 = binding2;
 
         QCOMPARE(binding2.binding(), QString("x + 10"));
         QCOMPARE(binding3.binding(), QString("x + 10"));
     }
 
-    // QmlDomValueValueSource
+    // QDeclarativeDomValueValueSource
     {
-        QmlDomObject object = document.rootObject();
-        QmlDomProperty property = object.property("z");
-        QmlDomValueValueSource source = property.value().toValueSource();
+        QDeclarativeDomObject object = document.rootObject();
+        QDeclarativeDomProperty property = object.property("z");
+        QDeclarativeDomValueValueSource source = property.value().toValueSource();
         QCOMPARE(source.object().objectClassName(), QByteArray("NumberAnimation"));
 
-        QmlDomValueValueSource source2(source);
-        QmlDomValueValueSource source3;
+        QDeclarativeDomValueValueSource source2(source);
+        QDeclarativeDomValueValueSource source3;
         source3 = source;
 
         QCOMPARE(source2.object().objectClassName(), QByteArray("NumberAnimation"));
         QCOMPARE(source3.object().objectClassName(), QByteArray("NumberAnimation"));
     }
 
-    // QmlDomValueValueInterceptor
+    // QDeclarativeDomValueValueInterceptor
     {
-        QmlDomObject object = document.rootObject();
-        QmlDomProperty property = object.property("opacity");
-        QmlDomValueValueInterceptor interceptor = property.value().toValueInterceptor();
+        QDeclarativeDomObject object = document.rootObject();
+        QDeclarativeDomProperty property = object.property("opacity");
+        QDeclarativeDomValueValueInterceptor interceptor = property.value().toValueInterceptor();
         QCOMPARE(interceptor.object().objectClassName(), QByteArray("Behavior"));
 
-        QmlDomValueValueInterceptor interceptor2(interceptor);
-        QmlDomValueValueInterceptor interceptor3;
+        QDeclarativeDomValueValueInterceptor interceptor2(interceptor);
+        QDeclarativeDomValueValueInterceptor interceptor3;
         interceptor3 = interceptor;
 
         QCOMPARE(interceptor2.object().objectClassName(), QByteArray("Behavior"));
         QCOMPARE(interceptor3.object().objectClassName(), QByteArray("Behavior"));
     }
 
-    // QmlDomComponent
+    // QDeclarativeDomComponent
     {
-        QmlDomObject object = document.rootObject();
-        QmlDomProperty property = object.property("data");
+        QDeclarativeDomObject object = document.rootObject();
+        QDeclarativeDomProperty property = object.property("data");
         QCOMPARE(property.value().toList().values().count(), 1);
-        QmlDomComponent component = 
+        QDeclarativeDomComponent component = 
             property.value().toList().values().at(0).toObject().toComponent();
         QCOMPARE(component.componentRoot().objectClassName(), QByteArray("Item"));
 
-        QmlDomComponent component2(component);
-        QmlDomComponent component3;
+        QDeclarativeDomComponent component2(component);
+        QDeclarativeDomComponent component3;
         component3 = component;
 
         QCOMPARE(component.componentRoot().objectClassName(), component2.componentRoot().objectClassName());
@@ -1072,14 +1072,14 @@ void tst_qmldom::copy()
         QCOMPARE(component.url(), component3.url());
     }
 
-    // QmlDomValue
+    // QDeclarativeDomValue
     {
-        QmlDomObject object = document.rootObject();
-        QmlDomProperty property = object.property("data");
-        QmlDomValue value = property.value();
+        QDeclarativeDomObject object = document.rootObject();
+        QDeclarativeDomProperty property = object.property("data");
+        QDeclarativeDomValue value = property.value();
 
-        QmlDomValue value2(value);
-        QmlDomValue value3;
+        QDeclarativeDomValue value2(value);
+        QDeclarativeDomValue value3;
         value3 = value;
 
         QCOMPARE(value.type(), value2.type());
@@ -1105,12 +1105,12 @@ void tst_qmldom::copy()
         QCOMPARE(value.length(), value3.length());
     }
     {
-        QmlDomObject object = document.rootObject();
-        QmlDomProperty property = object.property("x");
-        QmlDomValue value = property.value();
+        QDeclarativeDomObject object = document.rootObject();
+        QDeclarativeDomProperty property = object.property("x");
+        QDeclarativeDomValue value = property.value();
 
-        QmlDomValue value2(value);
-        QmlDomValue value3;
+        QDeclarativeDomValue value2(value);
+        QDeclarativeDomValue value3;
         value3 = value;
 
         QCOMPARE(value.type(), value2.type());
@@ -1136,10 +1136,10 @@ void tst_qmldom::copy()
         QCOMPARE(value.length(), value3.length());
     }
     {
-        QmlDomValue value;
+        QDeclarativeDomValue value;
 
-        QmlDomValue value2(value);
-        QmlDomValue value3;
+        QDeclarativeDomValue value2(value);
+        QDeclarativeDomValue value3;
         value3 = value;
 
         QCOMPARE(value.type(), value2.type());
@@ -1165,15 +1165,15 @@ void tst_qmldom::copy()
         QCOMPARE(value.length(), value3.length());
     }
 
-    // QmlDomList
+    // QDeclarativeDomList
     {
-        QmlDomObject object = document.rootObject();
-        QmlDomProperty property = object.property("children");
-        QmlDomList list = property.value().toList();
+        QDeclarativeDomObject object = document.rootObject();
+        QDeclarativeDomProperty property = object.property("children");
+        QDeclarativeDomList list = property.value().toList();
         QCOMPARE(list.values().count(), 2);
 
-        QmlDomList list2(list);
-        QmlDomList list3;
+        QDeclarativeDomList list2(list);
+        QDeclarativeDomList list3;
         list3 = list2;
 
         QCOMPARE(list.values().count(), list2.values().count());
@@ -1207,107 +1207,107 @@ void tst_qmldom::position()
         /*204*/      "}\n";
 
 
-    QmlDomDocument document;
+    QDeclarativeDomDocument document;
     QVERIFY(document.load(&engine, qml));
 
-    QmlDomObject root = document.rootObject();
+    QDeclarativeDomObject root = document.rootObject();
 
-    // All QmlDomDynamicProperty
-    QmlDomDynamicProperty dynProp = root.dynamicProperty("a");
+    // All QDeclarativeDomDynamicProperty
+    QDeclarativeDomDynamicProperty dynProp = root.dynamicProperty("a");
     QCOMPARE(dynProp.position(), 40);
     QCOMPARE(dynProp.length(), 18);
 
-    // All QmlDomProperty
-    QmlDomProperty x = root.property("x");
+    // All QDeclarativeDomProperty
+    QDeclarativeDomProperty x = root.property("x");
     QCOMPARE(x.position(), 63);
     QCOMPARE(x.length(), 1);
 
-    QmlDomProperty y = root.property("y");
+    QDeclarativeDomProperty y = root.property("y");
     QCOMPARE(y.position(), 73);
     QCOMPARE(y.length(), 1);
 
-    QmlDomProperty z = root.property("z");
+    QDeclarativeDomProperty z = root.property("z");
     QCOMPARE(z.position(), 87);
     QCOMPARE(z.length(), 1);
 
-    QmlDomProperty opacity = root.property("opacity");
+    QDeclarativeDomProperty opacity = root.property("opacity");
     QCOMPARE(opacity.position(), 113);
     QCOMPARE(opacity.length(), 7);
 
-    QmlDomProperty data = root.property("data");
+    QDeclarativeDomProperty data = root.property("data");
     QCOMPARE(data.position(), 138);
     QCOMPARE(data.length(), 0);
 
-    QmlDomProperty children = root.property("children");
+    QDeclarativeDomProperty children = root.property("children");
     QCOMPARE(children.position(), 175);
     QCOMPARE(children.length(), 8);
 
-    QmlDomList dataList = data.value().toList();
+    QDeclarativeDomList dataList = data.value().toList();
     QCOMPARE(dataList.values().count(), 1);
-    QmlDomList childrenList = children.value().toList();
+    QDeclarativeDomList childrenList = children.value().toList();
     QCOMPARE(childrenList.values().count(), 2);
 
-    // All QmlDomObject
+    // All QDeclarativeDomObject
     QCOMPARE(root.position(), 14);
     QCOMPARE(root.length(), 191);
 
-    QmlDomObject numberAnimation = z.value().toValueSource().object();
+    QDeclarativeDomObject numberAnimation = z.value().toValueSource().object();
     QCOMPARE(numberAnimation.position(), 90);
     QCOMPARE(numberAnimation.length(), 18);
 
-    QmlDomObject behavior = opacity.value().toValueInterceptor().object();
+    QDeclarativeDomObject behavior = opacity.value().toValueInterceptor().object();
     QCOMPARE(behavior.position(), 122);
     QCOMPARE(behavior.length(), 11);
 
-    QmlDomObject component = dataList.values().at(0).toObject();
+    QDeclarativeDomObject component = dataList.values().at(0).toObject();
     QCOMPARE(component.position(), 138);
     QCOMPARE(component.length(), 32);
 
-    QmlDomObject componentRoot = component.toComponent().componentRoot();
+    QDeclarativeDomObject componentRoot = component.toComponent().componentRoot();
     QCOMPARE(componentRoot.position(), 158);
     QCOMPARE(componentRoot.length(), 6);
 
-    QmlDomObject child1 = childrenList.values().at(0).toObject();
+    QDeclarativeDomObject child1 = childrenList.values().at(0).toObject();
     QCOMPARE(child1.position(), 187);
     QCOMPARE(child1.length(), 6);
 
-    QmlDomObject child2 = childrenList.values().at(1).toObject();
+    QDeclarativeDomObject child2 = childrenList.values().at(1).toObject();
     QCOMPARE(child2.position(), 195);
     QCOMPARE(child2.length(), 6);
 
-    // All QmlDomValue
-    QmlDomValue xValue = x.value();
+    // All QDeclarativeDomValue
+    QDeclarativeDomValue xValue = x.value();
     QCOMPARE(xValue.position(), 66);
     QCOMPARE(xValue.length(), 2);
 
-    QmlDomValue yValue = y.value();
+    QDeclarativeDomValue yValue = y.value();
     QCOMPARE(yValue.position(), 76);
     QCOMPARE(yValue.length(), 6);
 
-    QmlDomValue zValue = z.value();
+    QDeclarativeDomValue zValue = z.value();
     QCOMPARE(zValue.position(), 90);
     QCOMPARE(zValue.length(), 18);
 
-    QmlDomValue opacityValue = opacity.value();
+    QDeclarativeDomValue opacityValue = opacity.value();
     QCOMPARE(opacityValue.position(), 122);
     QCOMPARE(opacityValue.length(), 11);
 
-    QmlDomValue dataValue = data.value();
+    QDeclarativeDomValue dataValue = data.value();
     QCOMPARE(dataValue.position(), 138);
     QCOMPARE(dataValue.length(), 32);
 
-    QmlDomValue child1Value = childrenList.values().at(0);
+    QDeclarativeDomValue child1Value = childrenList.values().at(0);
     QCOMPARE(child1Value.position(), 187);
     QCOMPARE(child1Value.length(), 6);
 
-    QmlDomValue child2Value = childrenList.values().at(1);
+    QDeclarativeDomValue child2Value = childrenList.values().at(1);
     QCOMPARE(child2Value.position(), 195);
     QCOMPARE(child2Value.length(), 6);
 
-    // All QmlDomList
-    qWarning("QmlListValue position test required");
+    // All QDeclarativeDomList
+    qWarning("QDeclarativeListValue position test required");
 }
 
 QTEST_MAIN(tst_qmldom)
 
-#include "tst_qmldom.moc"
+#include "tst_qdeclarativedom.moc"
diff --git a/tests/auto/declarative/qmleasefollow/data/easefollow1.qml b/tests/auto/declarative/qdeclarativeeasefollow/data/easefollow1.qml
index 0cc19eb..0cc19eb 100644
--- a/tests/auto/declarative/qmleasefollow/data/easefollow1.qml
+++ b/tests/auto/declarative/qdeclarativeeasefollow/data/easefollow1.qml
diff --git a/tests/auto/declarative/qmleasefollow/data/easefollow2.qml b/tests/auto/declarative/qdeclarativeeasefollow/data/easefollow2.qml
index b65964e..b65964e 100644
--- a/tests/auto/declarative/qmleasefollow/data/easefollow2.qml
+++ b/tests/auto/declarative/qdeclarativeeasefollow/data/easefollow2.qml
diff --git a/tests/auto/declarative/qmleasefollow/data/easefollow3.qml b/tests/auto/declarative/qdeclarativeeasefollow/data/easefollow3.qml
index f8886e9..f8886e9 100644
--- a/tests/auto/declarative/qmleasefollow/data/easefollow3.qml
+++ b/tests/auto/declarative/qdeclarativeeasefollow/data/easefollow3.qml
diff --git a/tests/auto/declarative/qdeclarativeeasefollow/qdeclarativeeasefollow.pro b/tests/auto/declarative/qdeclarativeeasefollow/qdeclarativeeasefollow.pro
new file mode 100644
index 0000000..71df4f4
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeeasefollow/qdeclarativeeasefollow.pro
@@ -0,0 +1,8 @@
+load(qttest_p4)
+contains(QT_CONFIG,declarative): QT += declarative gui
+macx:CONFIG -= app_bundle
+
+SOURCES += tst_qdeclarativeeasefollow.cpp
+
+# Define SRCDIR equal to test's source directory
+DEFINES += SRCDIR=\\\"$$PWD\\\"
diff --git a/tests/auto/declarative/qmleasefollow/tst_qmleasefollow.cpp b/tests/auto/declarative/qdeclarativeeasefollow/tst_qdeclarativeeasefollow.cpp
index f28311f..60c74ef 100644
--- a/tests/auto/declarative/qmleasefollow/tst_qmleasefollow.cpp
+++ b/tests/auto/declarative/qdeclarativeeasefollow/tst_qdeclarativeeasefollow.cpp
@@ -39,10 +39,10 @@
 **
 ****************************************************************************/
 #include <qtest.h>
-#include <QtDeclarative/qmlengine.h>
-#include <QtDeclarative/qmlcomponent.h>
-#include <private/qmleasefollow_p.h>
-#include <private/qmlvaluetype_p.h>
+#include <QtDeclarative/qdeclarativeengine.h>
+#include <QtDeclarative/qdeclarativecomponent.h>
+#include <private/qdeclarativeeasefollow_p.h>
+#include <private/qdeclarativevaluetype_p.h>
 #include "../../../shared/util.h"
 
 class tst_qmleasefollow : public QObject
@@ -57,7 +57,7 @@ private slots:
     void disabled();
 
 private:
-    QmlEngine engine;
+    QDeclarativeEngine engine;
 };
 
 tst_qmleasefollow::tst_qmleasefollow()
@@ -66,9 +66,9 @@ tst_qmleasefollow::tst_qmleasefollow()
 
 void tst_qmleasefollow::defaultValues()
 {
-    QmlEngine engine;
-    QmlComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/easefollow1.qml"));
-    QmlEaseFollow *obj = qobject_cast<QmlEaseFollow*>(c.create());
+    QDeclarativeEngine engine;
+    QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/easefollow1.qml"));
+    QDeclarativeEaseFollow *obj = qobject_cast<QDeclarativeEaseFollow*>(c.create());
 
     QVERIFY(obj != 0);
 
@@ -77,16 +77,16 @@ void tst_qmleasefollow::defaultValues()
     QCOMPARE(obj->enabled(), true);
     QCOMPARE(obj->duration(), -1.);
     QCOMPARE(obj->maximumEasingTime(), -1.);
-    QCOMPARE(obj->reversingMode(), QmlEaseFollow::Eased);
+    QCOMPARE(obj->reversingMode(), QDeclarativeEaseFollow::Eased);
 
     delete obj;
 }
 
 void tst_qmleasefollow::values()
 {
-    QmlEngine engine;
-    QmlComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/easefollow2.qml"));
-    QmlEaseFollow *obj = qobject_cast<QmlEaseFollow*>(c.create());
+    QDeclarativeEngine engine;
+    QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/easefollow2.qml"));
+    QDeclarativeEaseFollow *obj = qobject_cast<QDeclarativeEaseFollow*>(c.create());
 
     QVERIFY(obj != 0);
 
@@ -95,16 +95,16 @@ void tst_qmleasefollow::values()
     QCOMPARE(obj->enabled(), true);
     QCOMPARE(obj->duration(), 300.);
     QCOMPARE(obj->maximumEasingTime(), -1.);
-    QCOMPARE(obj->reversingMode(), QmlEaseFollow::Immediate);
+    QCOMPARE(obj->reversingMode(), QDeclarativeEaseFollow::Immediate);
 
     delete obj;
 }
 
 void tst_qmleasefollow::disabled()
 {
-    QmlEngine engine;
-    QmlComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/easefollow3.qml"));
-    QmlEaseFollow *obj = qobject_cast<QmlEaseFollow*>(c.create());
+    QDeclarativeEngine engine;
+    QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/easefollow3.qml"));
+    QDeclarativeEaseFollow *obj = qobject_cast<QDeclarativeEaseFollow*>(c.create());
 
     QVERIFY(obj != 0);
 
@@ -112,11 +112,11 @@ void tst_qmleasefollow::disabled()
     QCOMPARE(obj->velocity(), 250.);
     QCOMPARE(obj->enabled(), false);
     QCOMPARE(obj->maximumEasingTime(), 150.);
-    QCOMPARE(obj->reversingMode(), QmlEaseFollow::Sync);
+    QCOMPARE(obj->reversingMode(), QDeclarativeEaseFollow::Sync);
 
     delete obj;
 }
 
 QTEST_MAIN(tst_qmleasefollow)
 
-#include "tst_qmleasefollow.moc"
+#include "tst_qdeclarativeeasefollow.moc"
diff --git a/tests/auto/declarative/qmlecmascript/data/ConstantsOverrideBindings.qml b/tests/auto/declarative/qdeclarativeecmascript/data/ConstantsOverrideBindings.qml
index b4a702b..b4a702b 100644
--- a/tests/auto/declarative/qmlecmascript/data/ConstantsOverrideBindings.qml
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/ConstantsOverrideBindings.qml
diff --git a/tests/auto/declarative/qmlecmascript/data/CustomObject.qml b/tests/auto/declarative/qdeclarativeecmascript/data/CustomObject.qml
index 691d9ec..691d9ec 100644
--- a/tests/auto/declarative/qmlecmascript/data/CustomObject.qml
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/CustomObject.qml
diff --git a/tests/auto/declarative/qmlecmascript/data/MethodsObject.qml b/tests/auto/declarative/qdeclarativeecmascript/data/MethodsObject.qml
index f51ca86..f51ca86 100644
--- a/tests/auto/declarative/qmlecmascript/data/MethodsObject.qml
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/MethodsObject.qml
diff --git a/tests/auto/declarative/qmlecmascript/data/NestedTypeTransientErrors.qml b/tests/auto/declarative/qdeclarativeecmascript/data/NestedTypeTransientErrors.qml
index 7c32e56..7c32e56 100644
--- a/tests/auto/declarative/qmlecmascript/data/NestedTypeTransientErrors.qml
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/NestedTypeTransientErrors.qml
diff --git a/tests/auto/declarative/qmlecmascript/data/ScopeObject.qml b/tests/auto/declarative/qdeclarativeecmascript/data/ScopeObject.qml
index b7bec63..b7bec63 100644
--- a/tests/auto/declarative/qmlecmascript/data/ScopeObject.qml
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/ScopeObject.qml
diff --git a/tests/auto/declarative/qmlecmascript/data/TypeForDynamicCreation.qml b/tests/auto/declarative/qdeclarativeecmascript/data/TypeForDynamicCreation.qml
index 56e0625..56e0625 100644
--- a/tests/auto/declarative/qmlecmascript/data/TypeForDynamicCreation.qml
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/TypeForDynamicCreation.qml
diff --git a/tests/auto/declarative/qmlecmascript/data/aliasPropertyAndBinding.qml b/tests/auto/declarative/qdeclarativeecmascript/data/aliasPropertyAndBinding.qml
index 5c3ea1f..5c3ea1f 100644
--- a/tests/auto/declarative/qmlecmascript/data/aliasPropertyAndBinding.qml
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/aliasPropertyAndBinding.qml
diff --git a/tests/auto/declarative/qmlecmascript/data/assignBasicTypes.2.qml b/tests/auto/declarative/qdeclarativeecmascript/data/assignBasicTypes.2.qml
index db7f2b5..db7f2b5 100644
--- a/tests/auto/declarative/qmlecmascript/data/assignBasicTypes.2.qml
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/assignBasicTypes.2.qml
diff --git a/tests/auto/declarative/qmlecmascript/data/assignBasicTypes.qml b/tests/auto/declarative/qdeclarativeecmascript/data/assignBasicTypes.qml
index 128db69..128db69 100644
--- a/tests/auto/declarative/qmlecmascript/data/assignBasicTypes.qml
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/assignBasicTypes.qml
diff --git a/tests/auto/declarative/qmlecmascript/data/attachedProperty.qml b/tests/auto/declarative/qdeclarativeecmascript/data/attachedProperty.qml
index 061eda0..061eda0 100644
--- a/tests/auto/declarative/qmlecmascript/data/attachedProperty.qml
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/attachedProperty.qml
diff --git a/tests/auto/declarative/qmlecmascript/data/bindingLoop.qml b/tests/auto/declarative/qdeclarativeecmascript/data/bindingLoop.qml
index 80545cf..80545cf 100644
--- a/tests/auto/declarative/qmlecmascript/data/bindingLoop.qml
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/bindingLoop.qml
diff --git a/tests/auto/declarative/qmlecmascript/data/boolPropertiesEvaluateAsBool.1.qml b/tests/auto/declarative/qdeclarativeecmascript/data/boolPropertiesEvaluateAsBool.1.qml
index 3147f63..3147f63 100644
--- a/tests/auto/declarative/qmlecmascript/data/boolPropertiesEvaluateAsBool.1.qml
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/boolPropertiesEvaluateAsBool.1.qml
diff --git a/tests/auto/declarative/qmlecmascript/data/boolPropertiesEvaluateAsBool.2.qml b/tests/auto/declarative/qdeclarativeecmascript/data/boolPropertiesEvaluateAsBool.2.qml
index c89bb49..c89bb49 100644
--- a/tests/auto/declarative/qmlecmascript/data/boolPropertiesEvaluateAsBool.2.qml
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/boolPropertiesEvaluateAsBool.2.qml
diff --git a/tests/auto/declarative/qmlecmascript/data/bug.1.qml b/tests/auto/declarative/qdeclarativeecmascript/data/bug.1.qml
index 266de76..266de76 100644
--- a/tests/auto/declarative/qmlecmascript/data/bug.1.qml
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/bug.1.qml
diff --git a/tests/auto/declarative/qmlecmascript/data/compositePropertyType.qml b/tests/auto/declarative/qdeclarativeecmascript/data/compositePropertyType.qml
index 80a2814..80a2814 100644
--- a/tests/auto/declarative/qmlecmascript/data/compositePropertyType.qml
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/compositePropertyType.qml
diff --git a/tests/auto/declarative/qmlecmascript/data/constantsOverrideBindings.1.qml b/tests/auto/declarative/qdeclarativeecmascript/data/constantsOverrideBindings.1.qml
index 13c5ae5..13c5ae5 100644
--- a/tests/auto/declarative/qmlecmascript/data/constantsOverrideBindings.1.qml
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/constantsOverrideBindings.1.qml
diff --git a/tests/auto/declarative/qmlecmascript/data/constantsOverrideBindings.2.qml b/tests/auto/declarative/qdeclarativeecmascript/data/constantsOverrideBindings.2.qml
index 207a06b..207a06b 100644
--- a/tests/auto/declarative/qmlecmascript/data/constantsOverrideBindings.2.qml
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/constantsOverrideBindings.2.qml
diff --git a/tests/auto/declarative/qmlecmascript/data/constantsOverrideBindings.3.qml b/tests/auto/declarative/qdeclarativeecmascript/data/constantsOverrideBindings.3.qml
index ca9d1d8..ca9d1d8 100644
--- a/tests/auto/declarative/qmlecmascript/data/constantsOverrideBindings.3.qml
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/constantsOverrideBindings.3.qml
diff --git a/tests/auto/declarative/qmlecmascript/data/deferredProperties.qml b/tests/auto/declarative/qdeclarativeecmascript/data/deferredProperties.qml
index e01f708..e01f708 100644
--- a/tests/auto/declarative/qmlecmascript/data/deferredProperties.qml
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/deferredProperties.qml
diff --git a/tests/auto/declarative/qmlecmascript/data/deletedObject.qml b/tests/auto/declarative/qdeclarativeecmascript/data/deletedObject.qml
index 6bc3a17..6bc3a17 100644
--- a/tests/auto/declarative/qmlecmascript/data/deletedObject.qml
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/deletedObject.qml
diff --git a/tests/auto/declarative/qmlecmascript/data/dynamicCreation.helper.qml b/tests/auto/declarative/qdeclarativeecmascript/data/dynamicCreation.helper.qml
index d790d63..d790d63 100644
--- a/tests/auto/declarative/qmlecmascript/data/dynamicCreation.helper.qml
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/dynamicCreation.helper.qml
diff --git a/tests/auto/declarative/qmlecmascript/data/dynamicCreation.qml b/tests/auto/declarative/qdeclarativeecmascript/data/dynamicCreation.qml
index ed5e571..ed5e571 100644
--- a/tests/auto/declarative/qmlecmascript/data/dynamicCreation.qml
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/dynamicCreation.qml
diff --git a/tests/auto/declarative/qmlecmascript/data/dynamicDeletion.qml b/tests/auto/declarative/qdeclarativeecmascript/data/dynamicDeletion.qml
index 0855b29..0855b29 100644
--- a/tests/auto/declarative/qmlecmascript/data/dynamicDeletion.qml
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/dynamicDeletion.qml
diff --git a/tests/auto/declarative/qmlecmascript/data/enums.1.qml b/tests/auto/declarative/qdeclarativeecmascript/data/enums.1.qml
index 6351823..6351823 100644
--- a/tests/auto/declarative/qmlecmascript/data/enums.1.qml
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/enums.1.qml
diff --git a/tests/auto/declarative/qmlecmascript/data/enums.2.qml b/tests/auto/declarative/qdeclarativeecmascript/data/enums.2.qml
index bdc672f..bdc672f 100644
--- a/tests/auto/declarative/qmlecmascript/data/enums.2.qml
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/enums.2.qml
diff --git a/tests/auto/declarative/qmlecmascript/data/exceptionClearsOnReeval.qml b/tests/auto/declarative/qdeclarativeecmascript/data/exceptionClearsOnReeval.qml
index a2f0d1a..a2f0d1a 100644
--- a/tests/auto/declarative/qmlecmascript/data/exceptionClearsOnReeval.qml
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/exceptionClearsOnReeval.qml
diff --git a/tests/auto/declarative/qmlecmascript/data/exceptionProducesWarning.qml b/tests/auto/declarative/qdeclarativeecmascript/data/exceptionProducesWarning.qml
index acc3163..acc3163 100644
--- a/tests/auto/declarative/qmlecmascript/data/exceptionProducesWarning.qml
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/exceptionProducesWarning.qml
diff --git a/tests/auto/declarative/qmlecmascript/data/exceptionProducesWarning2.qml b/tests/auto/declarative/qdeclarativeecmascript/data/exceptionProducesWarning2.qml
index 44e10c1..44e10c1 100644
--- a/tests/auto/declarative/qmlecmascript/data/exceptionProducesWarning2.qml
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/exceptionProducesWarning2.qml
diff --git a/tests/auto/declarative/qmlecmascript/data/extendedObjectPropertyLookup.qml b/tests/auto/declarative/qdeclarativeecmascript/data/extendedObjectPropertyLookup.qml
index 9a82ad1..9a82ad1 100644
--- a/tests/auto/declarative/qmlecmascript/data/extendedObjectPropertyLookup.qml
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/extendedObjectPropertyLookup.qml
diff --git a/tests/auto/declarative/qmlecmascript/data/extensionObjects.qml b/tests/auto/declarative/qdeclarativeecmascript/data/extensionObjects.qml
index a902312..a902312 100644
--- a/tests/auto/declarative/qmlecmascript/data/extensionObjects.qml
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/extensionObjects.qml
diff --git a/tests/auto/declarative/qmlecmascript/data/externalScript.1.qml b/tests/auto/declarative/qdeclarativeecmascript/data/externalScript.1.qml
index 2ac7b6e..2ac7b6e 100644
--- a/tests/auto/declarative/qmlecmascript/data/externalScript.1.qml
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/externalScript.1.qml
diff --git a/tests/auto/declarative/qmlecmascript/data/externalScript.2.js b/tests/auto/declarative/qdeclarativeecmascript/data/externalScript.2.js
index 78c3a86..78c3a86 100644
--- a/tests/auto/declarative/qmlecmascript/data/externalScript.2.js
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/externalScript.2.js
diff --git a/tests/auto/declarative/qmlecmascript/data/externalScript.2.qml b/tests/auto/declarative/qdeclarativeecmascript/data/externalScript.2.qml
index dec657c..dec657c 100644
--- a/tests/auto/declarative/qmlecmascript/data/externalScript.2.qml
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/externalScript.2.qml
diff --git a/tests/auto/declarative/qmlecmascript/data/externalScript.3.qml b/tests/auto/declarative/qdeclarativeecmascript/data/externalScript.3.qml
index d7acf38..d7acf38 100644
--- a/tests/auto/declarative/qmlecmascript/data/externalScript.3.qml
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/externalScript.3.qml
diff --git a/tests/auto/declarative/qmlecmascript/data/externalScript.4.qml b/tests/auto/declarative/qdeclarativeecmascript/data/externalScript.4.qml
index 16211aa..16211aa 100644
--- a/tests/auto/declarative/qmlecmascript/data/externalScript.4.qml
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/externalScript.4.qml
diff --git a/tests/auto/declarative/qmlecmascript/data/externalScript.js b/tests/auto/declarative/qdeclarativeecmascript/data/externalScript.js
index 8928652..8928652 100644
--- a/tests/auto/declarative/qmlecmascript/data/externalScript.js
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/externalScript.js
diff --git a/tests/auto/declarative/qmlecmascript/data/idShortcutInvalidates.1.qml b/tests/auto/declarative/qdeclarativeecmascript/data/idShortcutInvalidates.1.qml
index 2db0fc6..2db0fc6 100644
--- a/tests/auto/declarative/qmlecmascript/data/idShortcutInvalidates.1.qml
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/idShortcutInvalidates.1.qml
diff --git a/tests/auto/declarative/qmlecmascript/data/idShortcutInvalidates.qml b/tests/auto/declarative/qdeclarativeecmascript/data/idShortcutInvalidates.qml
index f66428d..f66428d 100644
--- a/tests/auto/declarative/qmlecmascript/data/idShortcutInvalidates.qml
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/idShortcutInvalidates.qml
diff --git a/tests/auto/declarative/qmlecmascript/data/jsObject.qml b/tests/auto/declarative/qdeclarativeecmascript/data/jsObject.qml
index 4128c92..4128c92 100644
--- a/tests/auto/declarative/qmlecmascript/data/jsObject.qml
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/jsObject.qml
diff --git a/tests/auto/declarative/qmlecmascript/data/listProperties.qml b/tests/auto/declarative/qdeclarativeecmascript/data/listProperties.qml
index 810f9b6..810f9b6 100644
--- a/tests/auto/declarative/qmlecmascript/data/listProperties.qml
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/listProperties.qml
diff --git a/tests/auto/declarative/qmlecmascript/data/listToVariant.qml b/tests/auto/declarative/qdeclarativeecmascript/data/listToVariant.qml
index 47f4e50..47f4e50 100644
--- a/tests/auto/declarative/qmlecmascript/data/listToVariant.qml
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/listToVariant.qml
diff --git a/tests/auto/declarative/qmlecmascript/data/methods.1.qml b/tests/auto/declarative/qdeclarativeecmascript/data/methods.1.qml
index 0bbee16..0bbee16 100644
--- a/tests/auto/declarative/qmlecmascript/data/methods.1.qml
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/methods.1.qml
diff --git a/tests/auto/declarative/qmlecmascript/data/methods.2.qml b/tests/auto/declarative/qdeclarativeecmascript/data/methods.2.qml
index 9f0c6b1..9f0c6b1 100644
--- a/tests/auto/declarative/qmlecmascript/data/methods.2.qml
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/methods.2.qml
diff --git a/tests/auto/declarative/qmlecmascript/data/methods.3.qml b/tests/auto/declarative/qdeclarativeecmascript/data/methods.3.qml
index 79efc50..79efc50 100644
--- a/tests/auto/declarative/qmlecmascript/data/methods.3.qml
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/methods.3.qml
diff --git a/tests/auto/declarative/qmlecmascript/data/methods.4.qml b/tests/auto/declarative/qdeclarativeecmascript/data/methods.4.qml
index aac711c..aac711c 100644
--- a/tests/auto/declarative/qmlecmascript/data/methods.4.qml
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/methods.4.qml
diff --git a/tests/auto/declarative/qmlecmascript/data/methods.5.qml b/tests/auto/declarative/qdeclarativeecmascript/data/methods.5.qml
index 3d45b15..3d45b15 100644
--- a/tests/auto/declarative/qmlecmascript/data/methods.5.qml
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/methods.5.qml
diff --git a/tests/auto/declarative/qmlecmascript/data/multiEngineObject.qml b/tests/auto/declarative/qdeclarativeecmascript/data/multiEngineObject.qml
index 7da09e4..7da09e4 100644
--- a/tests/auto/declarative/qmlecmascript/data/multiEngineObject.qml
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/multiEngineObject.qml
diff --git a/tests/auto/declarative/qmlecmascript/data/nonExistantAttachedObject.qml b/tests/auto/declarative/qdeclarativeecmascript/data/nonExistantAttachedObject.qml
index f9585db..f9585db 100644
--- a/tests/auto/declarative/qmlecmascript/data/nonExistantAttachedObject.qml
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/nonExistantAttachedObject.qml
diff --git a/tests/auto/declarative/qmlecmascript/data/objectsCompareAsEqual.qml b/tests/auto/declarative/qdeclarativeecmascript/data/objectsCompareAsEqual.qml
index 18e488a..18e488a 100644
--- a/tests/auto/declarative/qmlecmascript/data/objectsCompareAsEqual.qml
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/objectsCompareAsEqual.qml
diff --git a/tests/auto/declarative/qmlecmascript/data/outerBindingOverridesInnerBinding.qml b/tests/auto/declarative/qdeclarativeecmascript/data/outerBindingOverridesInnerBinding.qml
index 0a933e8..0a933e8 100644
--- a/tests/auto/declarative/qmlecmascript/data/outerBindingOverridesInnerBinding.qml
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/outerBindingOverridesInnerBinding.qml
diff --git a/tests/auto/declarative/qmlecmascript/data/qmlToString.qml b/tests/auto/declarative/qdeclarativeecmascript/data/qdeclarativeToString.qml
index ac296ce..ac296ce 100644
--- a/tests/auto/declarative/qmlecmascript/data/qmlToString.qml
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/qdeclarativeToString.qml
diff --git a/tests/auto/declarative/qmlecmascript/data/scope.2.qml b/tests/auto/declarative/qdeclarativeecmascript/data/scope.2.qml
index 8e5aa0b..8e5aa0b 100644
--- a/tests/auto/declarative/qmlecmascript/data/scope.2.qml
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/scope.2.qml
diff --git a/tests/auto/declarative/qmlecmascript/data/scope.qml b/tests/auto/declarative/qdeclarativeecmascript/data/scope.qml
index cccd3d3..cccd3d3 100644
--- a/tests/auto/declarative/qmlecmascript/data/scope.qml
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/scope.qml
diff --git a/tests/auto/declarative/qmlecmascript/data/scriptAccess.js b/tests/auto/declarative/qdeclarativeecmascript/data/scriptAccess.js
index c00d285..c00d285 100644
--- a/tests/auto/declarative/qmlecmascript/data/scriptAccess.js
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/scriptAccess.js
diff --git a/tests/auto/declarative/qmlecmascript/data/scriptAccess.qml b/tests/auto/declarative/qdeclarativeecmascript/data/scriptAccess.qml
index feb6d16..feb6d16 100644
--- a/tests/auto/declarative/qmlecmascript/data/scriptAccess.qml
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/scriptAccess.qml
diff --git a/tests/auto/declarative/qmlecmascript/data/scriptErrors.js b/tests/auto/declarative/qdeclarativeecmascript/data/scriptErrors.js
index 1d7b357..1d7b357 100644
--- a/tests/auto/declarative/qmlecmascript/data/scriptErrors.js
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/scriptErrors.js
diff --git a/tests/auto/declarative/qmlecmascript/data/scriptErrors.qml b/tests/auto/declarative/qdeclarativeecmascript/data/scriptErrors.qml
index c2edb41..c2edb41 100644
--- a/tests/auto/declarative/qmlecmascript/data/scriptErrors.qml
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/scriptErrors.qml
diff --git a/tests/auto/declarative/qmlecmascript/data/selfDeletingBinding.2.qml b/tests/auto/declarative/qdeclarativeecmascript/data/selfDeletingBinding.2.qml
index 58cf805..58cf805 100644
--- a/tests/auto/declarative/qmlecmascript/data/selfDeletingBinding.2.qml
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/selfDeletingBinding.2.qml
diff --git a/tests/auto/declarative/qmlecmascript/data/selfDeletingBinding.qml b/tests/auto/declarative/qdeclarativeecmascript/data/selfDeletingBinding.qml
index 074851a..074851a 100644
--- a/tests/auto/declarative/qmlecmascript/data/selfDeletingBinding.qml
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/selfDeletingBinding.qml
diff --git a/tests/auto/declarative/qmlecmascript/data/shutdownErrors.qml b/tests/auto/declarative/qdeclarativeecmascript/data/shutdownErrors.qml
index 5a19639..5a19639 100644
--- a/tests/auto/declarative/qmlecmascript/data/shutdownErrors.qml
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/shutdownErrors.qml
diff --git a/tests/auto/declarative/qmlecmascript/data/signalAssignment.1.qml b/tests/auto/declarative/qdeclarativeecmascript/data/signalAssignment.1.qml
index fbd0914..fbd0914 100644
--- a/tests/auto/declarative/qmlecmascript/data/signalAssignment.1.qml
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/signalAssignment.1.qml
diff --git a/tests/auto/declarative/qmlecmascript/data/signalAssignment.2.qml b/tests/auto/declarative/qdeclarativeecmascript/data/signalAssignment.2.qml
index 8addcb9..8addcb9 100644
--- a/tests/auto/declarative/qmlecmascript/data/signalAssignment.2.qml
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/signalAssignment.2.qml
diff --git a/tests/auto/declarative/qmlecmascript/data/signalParameterTypes.qml b/tests/auto/declarative/qdeclarativeecmascript/data/signalParameterTypes.qml
index 6fc8b02..6fc8b02 100644
--- a/tests/auto/declarative/qmlecmascript/data/signalParameterTypes.qml
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/signalParameterTypes.qml
diff --git a/tests/auto/declarative/qmlecmascript/data/signalTriggeredBindings.qml b/tests/auto/declarative/qdeclarativeecmascript/data/signalTriggeredBindings.qml
index 7d419cd..7d419cd 100644
--- a/tests/auto/declarative/qmlecmascript/data/signalTriggeredBindings.qml
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/signalTriggeredBindings.qml
diff --git a/tests/auto/declarative/qmlecmascript/data/transientErrors.qml b/tests/auto/declarative/qdeclarativeecmascript/data/transientErrors.qml
index fa7e01c..fa7e01c 100644
--- a/tests/auto/declarative/qmlecmascript/data/transientErrors.qml
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/transientErrors.qml
diff --git a/tests/auto/declarative/qmlecmascript/data/undefinedResetsProperty.2.qml b/tests/auto/declarative/qdeclarativeecmascript/data/undefinedResetsProperty.2.qml
index e73d38e2..e73d38e2 100644
--- a/tests/auto/declarative/qmlecmascript/data/undefinedResetsProperty.2.qml
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/undefinedResetsProperty.2.qml
diff --git a/tests/auto/declarative/qmlecmascript/data/undefinedResetsProperty.qml b/tests/auto/declarative/qdeclarativeecmascript/data/undefinedResetsProperty.qml
index eceff60..eceff60 100644
--- a/tests/auto/declarative/qmlecmascript/data/undefinedResetsProperty.qml
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/undefinedResetsProperty.qml
diff --git a/tests/auto/declarative/qmlecmascript/data/valueTypeFunctions.qml b/tests/auto/declarative/qdeclarativeecmascript/data/valueTypeFunctions.qml
index 33b4a68..33b4a68 100644
--- a/tests/auto/declarative/qmlecmascript/data/valueTypeFunctions.qml
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/valueTypeFunctions.qml
diff --git a/tests/auto/declarative/qmlecmascript/qmlecmascript.pro b/tests/auto/declarative/qdeclarativeecmascript/qdeclarativeecmascript.pro
index 9f592e8..0e21cb2 100644
--- a/tests/auto/declarative/qmlecmascript/qmlecmascript.pro
+++ b/tests/auto/declarative/qdeclarativeecmascript/qdeclarativeecmascript.pro
@@ -2,7 +2,7 @@ load(qttest_p4)
 contains(QT_CONFIG,declarative): QT += declarative script
 macx:CONFIG -= app_bundle
 
-SOURCES += tst_qmlecmascript.cpp \
+SOURCES += tst_qdeclarativeecmascript.cpp \
            testtypes.cpp
 HEADERS += testtypes.h
 
diff --git a/tests/auto/declarative/qmlecmascript/testtypes.cpp b/tests/auto/declarative/qdeclarativeecmascript/testtypes.cpp
index 6a04704..6a04704 100644
--- a/tests/auto/declarative/qmlecmascript/testtypes.cpp
+++ b/tests/auto/declarative/qdeclarativeecmascript/testtypes.cpp
diff --git a/tests/auto/declarative/qmlecmascript/testtypes.h b/tests/auto/declarative/qdeclarativeecmascript/testtypes.h
index 9d7d0a7..779e4e4 100644
--- a/tests/auto/declarative/qmlecmascript/testtypes.h
+++ b/tests/auto/declarative/qdeclarativeecmascript/testtypes.h
@@ -42,19 +42,19 @@
 #define TESTTYPES_H
 
 #include <QtCore/qobject.h>
-#include <QtDeclarative/qml.h>
-#include <QtDeclarative/qmlexpression.h>
+#include <QtDeclarative/qdeclarative.h>
+#include <QtDeclarative/qdeclarativeexpression.h>
 #include <QtCore/qpoint.h>
 #include <QtCore/qsize.h>
-#include <QtDeclarative/qmllist.h>
+#include <QtDeclarative/qdeclarativelist.h>
 #include <QtCore/qrect.h>
 #include <QtGui/qmatrix.h>
 #include <QtGui/qcolor.h>
 #include <QtGui/qvector3d.h>
 #include <QtCore/qdatetime.h>
 #include <QtScript/qscriptvalue.h>
-#include <QtDeclarative/qmlscriptstring.h>
-#include <QtDeclarative/qmlcomponent.h>
+#include <QtDeclarative/qdeclarativescriptstring.h>
+#include <QtDeclarative/qdeclarativecomponent.h>
 
 class MyQmlAttachedObject : public QObject
 {
@@ -77,7 +77,7 @@ class MyQmlObject : public QObject
     Q_PROPERTY(int value READ value WRITE setValue)
     Q_PROPERTY(QString stringProperty READ stringProperty WRITE setStringProperty NOTIFY stringChanged)
     Q_PROPERTY(QObject *objectProperty READ objectProperty WRITE setObjectProperty NOTIFY objectChanged)
-    Q_PROPERTY(QmlListProperty<QObject> objectListProperty READ objectListProperty CONSTANT)
+    Q_PROPERTY(QDeclarativeListProperty<QObject> objectListProperty READ objectListProperty CONSTANT)
     Q_PROPERTY(int resettableProperty READ resettableProperty WRITE setResettableProperty RESET resetProperty)
 
 public:
@@ -106,7 +106,7 @@ public:
         emit objectChanged();
     }
 
-    QmlListProperty<QObject> objectListProperty() { return QmlListProperty<QObject>(this, m_objectQList); }
+    QDeclarativeListProperty<QObject> objectListProperty() { return QDeclarativeListProperty<QObject>(this, m_objectQList); }
 
     bool methodCalled() const { return m_methodCalled; }
     bool methodIntCalled() const { return m_methodIntCalled; }
@@ -159,11 +159,11 @@ QML_DECLARE_TYPE(MyQmlObject);
 class MyQmlContainer : public QObject
 {
     Q_OBJECT
-    Q_PROPERTY(QmlListProperty<MyQmlObject> children READ children CONSTANT)
+    Q_PROPERTY(QDeclarativeListProperty<MyQmlObject> children READ children CONSTANT)
 public:
     MyQmlContainer() {}
 
-    QmlListProperty<MyQmlObject> children() { return QmlListProperty<MyQmlObject>(this, m_children); }
+    QDeclarativeListProperty<MyQmlObject> children() { return QDeclarativeListProperty<MyQmlObject>(this, m_children); }
 
 private:
     QList<MyQmlObject*> m_children;
@@ -171,12 +171,12 @@ private:
 
 QML_DECLARE_TYPE(MyQmlContainer);
 
-class MyExpression : public QmlExpression
+class MyExpression : public QDeclarativeExpression
 {
     Q_OBJECT
 public:
-    MyExpression(QmlContext *ctxt, const QString &expr)
-        : QmlExpression(ctxt, expr, 0), changed(false)
+    MyExpression(QDeclarativeContext *ctxt, const QString &expr)
+        : QDeclarativeExpression(ctxt, expr, 0), changed(false)
     {
         QObject::connect(this, SIGNAL(valueChanged()), this, SLOT(expressionValueChanged()));
         setNotifyOnValueChanged(true);
@@ -290,7 +290,7 @@ class MyTypeObject : public QObject
 
     Q_PROPERTY(QString id READ id WRITE setId);
     Q_PROPERTY(QObject *objectProperty READ objectProperty WRITE setObjectProperty);
-    Q_PROPERTY(QmlComponent *componentProperty READ componentProperty WRITE setComponentProperty);
+    Q_PROPERTY(QDeclarativeComponent *componentProperty READ componentProperty WRITE setComponentProperty);
     Q_PROPERTY(MyFlags flagProperty READ flagProperty WRITE setFlagProperty);
     Q_PROPERTY(MyEnum enumProperty READ enumProperty WRITE setEnumProperty);
     Q_PROPERTY(QString stringProperty READ stringProperty WRITE setStringProperty);
@@ -315,7 +315,7 @@ class MyTypeObject : public QObject
     Q_PROPERTY(QVector3D vectorProperty READ vectorProperty WRITE setVectorProperty);
     Q_PROPERTY(QUrl urlProperty READ urlProperty WRITE setUrlProperty);
 
-    Q_PROPERTY(QmlScriptString scriptProperty READ scriptProperty WRITE setScriptProperty);
+    Q_PROPERTY(QDeclarativeScriptString scriptProperty READ scriptProperty WRITE setScriptProperty);
 
 public:
     MyTypeObject()
@@ -337,11 +337,11 @@ public:
         objectPropertyValue = v;
     }
 
-    QmlComponent *componentPropertyValue;
-    QmlComponent *componentProperty() const {
+    QDeclarativeComponent *componentPropertyValue;
+    QDeclarativeComponent *componentProperty() const {
         return componentPropertyValue;
     }
-    void setComponentProperty(QmlComponent *v) {
+    void setComponentProperty(QDeclarativeComponent *v) {
         componentPropertyValue = v;
     }
 
@@ -533,11 +533,11 @@ public:
         urlPropertyValue = v;
     }
 
-    QmlScriptString scriptPropertyValue;
-    QmlScriptString scriptProperty() const {
+    QDeclarativeScriptString scriptPropertyValue;
+    QDeclarativeScriptString scriptProperty() const {
         return scriptPropertyValue;
     }
-    void setScriptProperty(const QmlScriptString &v) {
+    void setScriptProperty(const QDeclarativeScriptString &v) {
         scriptPropertyValue = v;
     }
 
diff --git a/tests/auto/declarative/qmlecmascript/tst_qmlecmascript.cpp b/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp
index 88f06ad..0c8dcb5 100644
--- a/tests/auto/declarative/qmlecmascript/tst_qmlecmascript.cpp
+++ b/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp
@@ -39,17 +39,17 @@
 **
 ****************************************************************************/
 #include <qtest.h>
-#include <QtDeclarative/qmlcomponent.h>
-#include <QtDeclarative/qmlengine.h>
-#include <QtDeclarative/qmlexpression.h>
-#include <QtDeclarative/qmlcontext.h>
+#include <QtDeclarative/qdeclarativecomponent.h>
+#include <QtDeclarative/qdeclarativeengine.h>
+#include <QtDeclarative/qdeclarativeexpression.h>
+#include <QtDeclarative/qdeclarativecontext.h>
 #include <QtCore/qfileinfo.h>
 #include <QtCore/qdebug.h>
-#include <QtDeclarative/private/qmlguard_p.h>
+#include <QtDeclarative/private/qdeclarativeguard_p.h>
 #include <QtCore/qdir.h>
 #include <QtCore/qnumeric.h>
-#include <private/qmlengine_p.h>
-#include <private/qmlglobalscriptclass_p.h>
+#include <private/qdeclarativeengine_p.h>
+#include <private/qdeclarativeglobalscriptclass_p.h>
 #include "testtypes.h"
 
 /*
@@ -127,7 +127,7 @@ private slots:
 
     void callQtInvokables();
 private:
-    QmlEngine engine;
+    QDeclarativeEngine engine;
 };
 
 void tst_qmlecmascript::initTestCase() { registerTypes(); }
@@ -135,7 +135,7 @@ void tst_qmlecmascript::initTestCase() { registerTypes(); }
 void tst_qmlecmascript::assignBasicTypes()
 {
     {
-    QmlComponent component(&engine, TEST_FILE("assignBasicTypes.qml"));
+    QDeclarativeComponent component(&engine, TEST_FILE("assignBasicTypes.qml"));
     MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create());
     QVERIFY(object != 0);
     QCOMPARE(object->flagProperty(), MyTypeObject::FlagVal1 | MyTypeObject::FlagVal3);
@@ -163,7 +163,7 @@ void tst_qmlecmascript::assignBasicTypes()
     delete object;
     }
     {
-    QmlComponent component(&engine, TEST_FILE("assignBasicTypes.2.qml"));
+    QDeclarativeComponent component(&engine, TEST_FILE("assignBasicTypes.2.qml"));
     MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create());
     QVERIFY(object != 0);
     QCOMPARE(object->flagProperty(), MyTypeObject::FlagVal1 | MyTypeObject::FlagVal3);
@@ -195,7 +195,7 @@ void tst_qmlecmascript::assignBasicTypes()
 void tst_qmlecmascript::idShortcutInvalidates()
 {
     {
-        QmlComponent component(&engine, TEST_FILE("idShortcutInvalidates.qml"));
+        QDeclarativeComponent component(&engine, TEST_FILE("idShortcutInvalidates.qml"));
         MyQmlObject *object = qobject_cast<MyQmlObject *>(component.create());
         QVERIFY(object != 0);
         QVERIFY(object->objectProperty() != 0);
@@ -204,7 +204,7 @@ void tst_qmlecmascript::idShortcutInvalidates()
     }
 
     {
-        QmlComponent component(&engine, TEST_FILE("idShortcutInvalidates.1.qml"));
+        QDeclarativeComponent component(&engine, TEST_FILE("idShortcutInvalidates.1.qml"));
         MyQmlObject *object = qobject_cast<MyQmlObject *>(component.create());
         QVERIFY(object != 0);
         QVERIFY(object->objectProperty() != 0);
@@ -216,13 +216,13 @@ void tst_qmlecmascript::idShortcutInvalidates()
 void tst_qmlecmascript::boolPropertiesEvaluateAsBool()
 {
     {
-        QmlComponent component(&engine, TEST_FILE("boolPropertiesEvaluateAsBool.1.qml"));
+        QDeclarativeComponent component(&engine, TEST_FILE("boolPropertiesEvaluateAsBool.1.qml"));
         MyQmlObject *object = qobject_cast<MyQmlObject *>(component.create());
         QVERIFY(object != 0);
         QCOMPARE(object->stringProperty(), QLatin1String("pass"));
     }
     {
-        QmlComponent component(&engine, TEST_FILE("boolPropertiesEvaluateAsBool.2.qml"));
+        QDeclarativeComponent component(&engine, TEST_FILE("boolPropertiesEvaluateAsBool.2.qml"));
         MyQmlObject *object = qobject_cast<MyQmlObject *>(component.create());
         QVERIFY(object != 0);
         QCOMPARE(object->stringProperty(), QLatin1String("pass"));
@@ -232,7 +232,7 @@ void tst_qmlecmascript::boolPropertiesEvaluateAsBool()
 void tst_qmlecmascript::signalAssignment()
 {
     {
-        QmlComponent component(&engine, TEST_FILE("signalAssignment.1.qml"));
+        QDeclarativeComponent component(&engine, TEST_FILE("signalAssignment.1.qml"));
         MyQmlObject *object = qobject_cast<MyQmlObject *>(component.create());
         QVERIFY(object != 0);
         QCOMPARE(object->string(), QString());
@@ -241,7 +241,7 @@ void tst_qmlecmascript::signalAssignment()
     }
 
     {
-        QmlComponent component(&engine, TEST_FILE("signalAssignment.2.qml"));
+        QDeclarativeComponent component(&engine, TEST_FILE("signalAssignment.2.qml"));
         MyQmlObject *object = qobject_cast<MyQmlObject *>(component.create());
         QVERIFY(object != 0);
         QCOMPARE(object->string(), QString());
@@ -253,7 +253,7 @@ void tst_qmlecmascript::signalAssignment()
 void tst_qmlecmascript::methods()
 {
     {
-        QmlComponent component(&engine, TEST_FILE("methods.1.qml"));
+        QDeclarativeComponent component(&engine, TEST_FILE("methods.1.qml"));
         MyQmlObject *object = qobject_cast<MyQmlObject *>(component.create());
         QVERIFY(object != 0);
         QCOMPARE(object->methodCalled(), false);
@@ -264,7 +264,7 @@ void tst_qmlecmascript::methods()
     }
 
     {
-        QmlComponent component(&engine, TEST_FILE("methods.2.qml"));
+        QDeclarativeComponent component(&engine, TEST_FILE("methods.2.qml"));
         MyQmlObject *object = qobject_cast<MyQmlObject *>(component.create());
         QVERIFY(object != 0);
         QCOMPARE(object->methodCalled(), false);
@@ -275,14 +275,14 @@ void tst_qmlecmascript::methods()
     }
 
     {
-        QmlComponent component(&engine, TEST_FILE("methods.3.qml"));
+        QDeclarativeComponent component(&engine, TEST_FILE("methods.3.qml"));
         QObject *object = component.create();
         QVERIFY(object != 0);
         QCOMPARE(object->property("test").toInt(), 19);
     }
 
     {
-        QmlComponent component(&engine, TEST_FILE("methods.4.qml"));
+        QDeclarativeComponent component(&engine, TEST_FILE("methods.4.qml"));
         QObject *object = component.create();
         QVERIFY(object != 0);
         QCOMPARE(object->property("test").toInt(), 19);
@@ -291,7 +291,7 @@ void tst_qmlecmascript::methods()
     }
 
     {
-        QmlComponent component(&engine, TEST_FILE("methods.5.qml"));
+        QDeclarativeComponent component(&engine, TEST_FILE("methods.5.qml"));
         QObject *object = component.create();
         QVERIFY(object != 0);
         QCOMPARE(object->property("test").toInt(), 9);
@@ -300,7 +300,7 @@ void tst_qmlecmascript::methods()
 
 void tst_qmlecmascript::bindingLoop()
 {
-    QmlComponent component(&engine, TEST_FILE("bindingLoop.qml"));
+    QDeclarativeComponent component(&engine, TEST_FILE("bindingLoop.qml"));
     QString warning = "QML MyQmlObject (" + component.url().toString() + ":9:9) Binding loop detected for property \"stringProperty\"";
     QTest::ignoreMessage(QtWarningMsg, warning.toLatin1().constData());
     QObject *object = component.create();
@@ -350,8 +350,8 @@ void tst_qmlecmascript::basicExpressions()
     object2.setStringProperty("Object2");
     object3.setStringProperty("Object3");
 
-    QmlContext context(engine.rootContext());
-    QmlContext nestedContext(&context);
+    QDeclarativeContext context(engine.rootContext());
+    QDeclarativeContext nestedContext(&context);
 
     context.addDefaultObject(&default1);
     context.addDefaultObject(&default2);
@@ -374,7 +374,7 @@ void tst_qmlecmascript::arrayExpressions()
     QObject obj2;
     QObject obj3;
 
-    QmlContext context(engine.rootContext());
+    QDeclarativeContext context(engine.rootContext());
     context.setContextProperty("a", &obj1);
     context.setContextProperty("b", &obj2);
     context.setContextProperty("c", &obj3);
@@ -393,7 +393,7 @@ void tst_qmlecmascript::arrayExpressions()
 // Tests that modifying a context property will reevaluate expressions
 void tst_qmlecmascript::contextPropertiesTriggerReeval()
 {
-    QmlContext context(engine.rootContext());
+    QDeclarativeContext context(engine.rootContext());
     MyQmlObject object1;
     MyQmlObject object2;
     MyQmlObject *object3 = new MyQmlObject;
@@ -455,7 +455,7 @@ void tst_qmlecmascript::contextPropertiesTriggerReeval()
 
 void tst_qmlecmascript::objectPropertiesTriggerReeval()
 {
-    QmlContext context(engine.rootContext());
+    QDeclarativeContext context(engine.rootContext());
     MyQmlObject object1;
     MyQmlObject object2;
     MyQmlObject object3;
@@ -509,7 +509,7 @@ void tst_qmlecmascript::objectPropertiesTriggerReeval()
 
 void tst_qmlecmascript::deferredProperties()
 {
-    QmlComponent component(&engine, TEST_FILE("deferredProperties.qml"));
+    QDeclarativeComponent component(&engine, TEST_FILE("deferredProperties.qml"));
     MyDeferredObject *object = 
         qobject_cast<MyDeferredObject *>(component.create());
     QVERIFY(object != 0);
@@ -529,7 +529,7 @@ void tst_qmlecmascript::deferredProperties()
 
 void tst_qmlecmascript::extensionObjects()
 {
-    QmlComponent component(&engine, TEST_FILE("extensionObjects.qml"));
+    QDeclarativeComponent component(&engine, TEST_FILE("extensionObjects.qml"));
     MyExtendedObject *object = 
         qobject_cast<MyExtendedObject *>(component.create());
     QVERIFY(object != 0);
@@ -544,7 +544,7 @@ void tst_qmlecmascript::extensionObjects()
 
 void tst_qmlecmascript::attachedProperties()
 {
-    QmlComponent component(&engine, TEST_FILE("attachedProperty.qml"));
+    QDeclarativeComponent component(&engine, TEST_FILE("attachedProperty.qml"));
     QObject *object = component.create();
     QVERIFY(object != 0);
     QCOMPARE(object->property("a").toInt(), 19);
@@ -559,7 +559,7 @@ void tst_qmlecmascript::enums()
 {
     // Existant enums
     {
-    QmlComponent component(&engine, TEST_FILE("enums.1.qml"));
+    QDeclarativeComponent component(&engine, TEST_FILE("enums.1.qml"));
     QObject *object = component.create();
     QVERIFY(object != 0);
 
@@ -576,7 +576,7 @@ void tst_qmlecmascript::enums()
     }
     // Non-existent enums
     {
-    QmlComponent component(&engine, TEST_FILE("enums.2.qml"));
+    QDeclarativeComponent component(&engine, TEST_FILE("enums.2.qml"));
 
     QString warning1 = component.url().toString() + ":5: Unable to assign [undefined] to int";
     QString warning2 = component.url().toString() + ":6: Unable to assign [undefined] to int";
@@ -592,7 +592,7 @@ void tst_qmlecmascript::enums()
 
 void tst_qmlecmascript::valueTypeFunctions()
 {
-    QmlComponent component(&engine, TEST_FILE("valueTypeFunctions.qml"));
+    QDeclarativeComponent component(&engine, TEST_FILE("valueTypeFunctions.qml"));
     MyTypeObject *obj = qobject_cast<MyTypeObject*>(component.create());
     QVERIFY(obj != 0);
     QCOMPARE(obj->rectProperty(), QRect(0,0,100,100));
@@ -607,7 +607,7 @@ void tst_qmlecmascript::constantsOverrideBindings()
 {
     // From ECMAScript
     {
-        QmlComponent component(&engine, TEST_FILE("constantsOverrideBindings.1.qml"));
+        QDeclarativeComponent component(&engine, TEST_FILE("constantsOverrideBindings.1.qml"));
         MyQmlObject *object = qobject_cast<MyQmlObject *>(component.create());
         QVERIFY(object != 0);
 
@@ -624,7 +624,7 @@ void tst_qmlecmascript::constantsOverrideBindings()
 
     // During construction
     {
-        QmlComponent component(&engine, TEST_FILE("constantsOverrideBindings.2.qml"));
+        QDeclarativeComponent component(&engine, TEST_FILE("constantsOverrideBindings.2.qml"));
         MyQmlObject *object = qobject_cast<MyQmlObject *>(component.create());
         QVERIFY(object != 0);
 
@@ -638,7 +638,7 @@ void tst_qmlecmascript::constantsOverrideBindings()
 #if 0
     // From C++
     {
-        QmlComponent component(&engine, TEST_FILE("constantsOverrideBindings.3.qml"));
+        QDeclarativeComponent component(&engine, TEST_FILE("constantsOverrideBindings.3.qml"));
         MyQmlObject *object = qobject_cast<MyQmlObject *>(component.create());
         QVERIFY(object != 0);
 
@@ -661,7 +661,7 @@ the original binding to be disabled.
 */
 void tst_qmlecmascript::outerBindingOverridesInnerBinding()
 {
-    QmlComponent component(&engine, 
+    QDeclarativeComponent component(&engine, 
                            TEST_FILE("outerBindingOverridesInnerBinding.qml"));
     MyQmlObject *object = qobject_cast<MyQmlObject *>(component.create());
     QVERIFY(object != 0);
@@ -688,7 +688,7 @@ Tests for a regression where this used to crash.
 */
 void tst_qmlecmascript::nonExistantAttachedObject()
 {
-    QmlComponent component(&engine, TEST_FILE("nonExistantAttachedObject.qml"));
+    QDeclarativeComponent component(&engine, TEST_FILE("nonExistantAttachedObject.qml"));
 
     QString warning = component.url().toString() + ":4: Unable to assign [undefined] to QString";
     QTest::ignoreMessage(QtWarningMsg, qPrintable(warning));
@@ -700,7 +700,7 @@ void tst_qmlecmascript::nonExistantAttachedObject()
 void tst_qmlecmascript::scope()
 {
     {
-        QmlComponent component(&engine, TEST_FILE("scope.qml"));
+        QDeclarativeComponent component(&engine, TEST_FILE("scope.qml"));
         QObject *object = component.create();
         QVERIFY(object != 0);
 
@@ -717,7 +717,7 @@ void tst_qmlecmascript::scope()
     }
 
     {
-        QmlComponent component(&engine, TEST_FILE("scope.2.qml"));
+        QDeclarativeComponent component(&engine, TEST_FILE("scope.2.qml"));
         QObject *object = component.create();
         QVERIFY(object != 0);
 
@@ -732,11 +732,11 @@ void tst_qmlecmascript::scope()
 
 /*
 Tests that "any" type passes through a synthesized signal parameter.  This
-is essentially a test of QmlMetaType::copy()
+is essentially a test of QDeclarativeMetaType::copy()
 */
 void tst_qmlecmascript::signalParameterTypes()
 {
-    QmlComponent component(&engine, TEST_FILE("signalParameterTypes.qml"));
+    QDeclarativeComponent component(&engine, TEST_FILE("signalParameterTypes.qml"));
     MyQmlObject *object = qobject_cast<MyQmlObject *>(component.create());
     QVERIFY(object != 0);
 
@@ -753,7 +753,7 @@ Test that two JS objects for the same QObject compare as equal.
 */
 void tst_qmlecmascript::objectsCompareAsEqual()
 {
-    QmlComponent component(&engine, TEST_FILE("objectsCompareAsEqual.qml"));
+    QDeclarativeComponent component(&engine, TEST_FILE("objectsCompareAsEqual.qml"));
     QObject *object = component.create();
     QVERIFY(object != 0);
 
@@ -771,7 +771,7 @@ Tests for a regression where the binding would not reevaluate.
 */
 void tst_qmlecmascript::aliasPropertyAndBinding()
 {
-    QmlComponent component(&engine, TEST_FILE("aliasPropertyAndBinding.qml"));
+    QDeclarativeComponent component(&engine, TEST_FILE("aliasPropertyAndBinding.qml"));
     QObject *object = component.create();
     QVERIFY(object != 0);
 
@@ -789,7 +789,7 @@ Tests that only methods of Script {} blocks are exposed.
 */
 void tst_qmlecmascript::scriptAccess()
 {
-    QmlComponent component(&engine, TEST_FILE("scriptAccess.qml"));
+    QDeclarativeComponent component(&engine, TEST_FILE("scriptAccess.qml"));
 
     QString warning = component.url().toString() + ":16: Unable to assign [undefined] to int";
     QTest::ignoreMessage(QtWarningMsg, qPrintable(warning));
@@ -821,7 +821,7 @@ void tst_qmlecmascript::dynamicCreation()
     QFETCH(QString, method);
     QFETCH(QString, createdName);
 
-    QmlComponent component(&engine, TEST_FILE("dynamicCreation.qml"));
+    QDeclarativeComponent component(&engine, TEST_FILE("dynamicCreation.qml"));
     MyQmlObject *object = qobject_cast<MyQmlObject*>(component.create());
     QVERIFY(object != 0);
 
@@ -836,10 +836,10 @@ void tst_qmlecmascript::dynamicCreation()
 */
 void tst_qmlecmascript::dynamicDestruction()
 {
-    QmlComponent component(&engine, TEST_FILE("dynamicDeletion.qml"));
-    QmlGuard<MyQmlObject> object = qobject_cast<MyQmlObject*>(component.create());
+    QDeclarativeComponent component(&engine, TEST_FILE("dynamicDeletion.qml"));
+    QDeclarativeGuard<MyQmlObject> object = qobject_cast<MyQmlObject*>(component.create());
     QVERIFY(object != 0);
-    QmlGuard<QObject> createdQmlObject = 0;
+    QDeclarativeGuard<QObject> createdQmlObject = 0;
 
     QMetaObject::invokeMethod(object, "create");
     createdQmlObject = object->objectProperty();
@@ -870,7 +870,7 @@ void tst_qmlecmascript::dynamicDestruction()
 */
 void tst_qmlecmascript::objectToString()
 {
-    QmlComponent component(&engine, TEST_FILE("qmlToString.qml"));
+    QDeclarativeComponent component(&engine, TEST_FILE("qmlToString.qml"));
     MyQmlObject *object = qobject_cast<MyQmlObject*>(component.create());
     QVERIFY(object != 0);
     QMetaObject::invokeMethod(object, "testToString");
@@ -886,14 +886,14 @@ This test is best run under valgrind to ensure no invalid memory access occur.
 void tst_qmlecmascript::selfDeletingBinding()
 {
     {
-        QmlComponent component(&engine, TEST_FILE("selfDeletingBinding.qml"));
+        QDeclarativeComponent component(&engine, TEST_FILE("selfDeletingBinding.qml"));
         QObject *object = component.create();
         QVERIFY(object != 0);
         object->setProperty("triggerDelete", true);
     }
 
     {
-        QmlComponent component(&engine, TEST_FILE("selfDeletingBinding.2.qml"));
+        QDeclarativeComponent component(&engine, TEST_FILE("selfDeletingBinding.2.qml"));
         QObject *object = component.create();
         QVERIFY(object != 0);
         object->setProperty("triggerDelete", true);
@@ -909,7 +909,7 @@ and no synthesiszed properties).
 */
 void tst_qmlecmascript::extendedObjectPropertyLookup()
 {
-    QmlComponent component(&engine, TEST_FILE("extendedObjectPropertyLookup.qml"));
+    QDeclarativeComponent component(&engine, TEST_FILE("extendedObjectPropertyLookup.qml"));
     QObject *object = component.create();
     QVERIFY(object != 0);
 }
@@ -919,7 +919,7 @@ Test file/lineNumbers for binding/Script errors.
 */
 void tst_qmlecmascript::scriptErrors()
 {
-    QmlComponent component(&engine, TEST_FILE("scriptErrors.qml"));
+    QDeclarativeComponent component(&engine, TEST_FILE("scriptErrors.qml"));
     QString url = component.url().toString();
 
     QString warning1 = url.left(url.length() - 3) + "js:2: Error: Invalid write to global property \"a\"";
@@ -955,7 +955,7 @@ a signal script.
 */
 void tst_qmlecmascript::signalTriggeredBindings()
 {
-    QmlComponent component(&engine, TEST_FILE("signalTriggeredBindings.qml"));
+    QDeclarativeComponent component(&engine, TEST_FILE("signalTriggeredBindings.qml"));
     MyQmlObject *object = qobject_cast<MyQmlObject*>(component.create());
     QVERIFY(object != 0);
 
@@ -981,7 +981,7 @@ Test that list properties can be iterated from ECMAScript
 */
 void tst_qmlecmascript::listProperties()
 {
-    QmlComponent component(&engine, TEST_FILE("listProperties.qml"));
+    QDeclarativeComponent component(&engine, TEST_FILE("listProperties.qml"));
     MyQmlObject *object = qobject_cast<MyQmlObject*>(component.create());
     QVERIFY(object != 0);
 
@@ -993,7 +993,7 @@ void tst_qmlecmascript::listProperties()
 
 void tst_qmlecmascript::exceptionClearsOnReeval()
 {
-    QmlComponent component(&engine, TEST_FILE("exceptionClearsOnReeval.qml"));
+    QDeclarativeComponent component(&engine, TEST_FILE("exceptionClearsOnReeval.qml"));
     QString url = component.url().toString();
 
     QString warning = url + ":4: TypeError: Result of expression 'objectProperty.objectProperty' [undefined] is not an object.";
@@ -1014,7 +1014,7 @@ void tst_qmlecmascript::exceptionClearsOnReeval()
 
 void tst_qmlecmascript::exceptionSlotProducesWarning()
 {
-    QmlComponent component(&engine, TEST_FILE("exceptionProducesWarning.qml"));
+    QDeclarativeComponent component(&engine, TEST_FILE("exceptionProducesWarning.qml"));
     QString url = component.url().toString();
 
     QString warning = component.url().toString() + ":6: Error: JS exception";
@@ -1026,7 +1026,7 @@ void tst_qmlecmascript::exceptionSlotProducesWarning()
 
 void tst_qmlecmascript::exceptionBindingProducesWarning()
 {
-    QmlComponent component(&engine, TEST_FILE("exceptionProducesWarning2.qml"));
+    QDeclarativeComponent component(&engine, TEST_FILE("exceptionProducesWarning2.qml"));
     QString url = component.url().toString();
 
     QString warning = component.url().toString() + ":5: Error: JS exception";
@@ -1045,7 +1045,7 @@ static void transientErrorsMsgHandler(QtMsgType, const char *)
 // Check that transient binding errors are not displayed
 void tst_qmlecmascript::transientErrors()
 {
-    QmlComponent component(&engine, TEST_FILE("transientErrors.qml"));
+    QDeclarativeComponent component(&engine, TEST_FILE("transientErrors.qml"));
 
     transientErrorsMsgCount = 0;
     QtMsgHandler old = qInstallMsgHandler(transientErrorsMsgHandler);
@@ -1061,7 +1061,7 @@ void tst_qmlecmascript::transientErrors()
 // Check that errors during shutdown are minimized
 void tst_qmlecmascript::shutdownErrors()
 {
-    QmlComponent component(&engine, TEST_FILE("shutdownErrors.qml"));
+    QDeclarativeComponent component(&engine, TEST_FILE("shutdownErrors.qml"));
     QObject *object = component.create();
     QVERIFY(object != 0);
 
@@ -1078,7 +1078,7 @@ void tst_qmlecmascript::shutdownErrors()
 void tst_qmlecmascript::externalScript()
 {
     {
-        QmlComponent component(&engine, TEST_FILE("externalScript.1.qml"));
+        QDeclarativeComponent component(&engine, TEST_FILE("externalScript.1.qml"));
         QObject *object = component.create();
         QVERIFY(object != 0);
 
@@ -1088,7 +1088,7 @@ void tst_qmlecmascript::externalScript()
     }
 
     {
-        QmlComponent component(&engine, TEST_FILE("externalScript.2.qml"));
+        QDeclarativeComponent component(&engine, TEST_FILE("externalScript.2.qml"));
         QObject *object = component.create();
         QVERIFY(object != 0);
 
@@ -1098,7 +1098,7 @@ void tst_qmlecmascript::externalScript()
     }
 
     {
-        QmlComponent component(&engine, TEST_FILE("externalScript.3.qml"));
+        QDeclarativeComponent component(&engine, TEST_FILE("externalScript.3.qml"));
         QObject *object = component.create();
         QVERIFY(object != 0);
 
@@ -1110,7 +1110,7 @@ void tst_qmlecmascript::externalScript()
     }
 
     {
-        QmlComponent component(&engine, TEST_FILE("externalScript.4.qml"));
+        QDeclarativeComponent component(&engine, TEST_FILE("externalScript.4.qml"));
         QObject *object = component.create();
         QVERIFY(object != 0);
 
@@ -1123,7 +1123,7 @@ void tst_qmlecmascript::externalScript()
 
 void tst_qmlecmascript::compositePropertyType()
 {
-    QmlComponent component(&engine, TEST_FILE("compositePropertyType.qml"));
+    QDeclarativeComponent component(&engine, TEST_FILE("compositePropertyType.qml"));
     QTest::ignoreMessage(QtDebugMsg, "hello world");
     QObject *object = qobject_cast<QObject *>(component.create());
     delete object;
@@ -1132,7 +1132,7 @@ void tst_qmlecmascript::compositePropertyType()
 // QTBUG-5759
 void tst_qmlecmascript::jsObject()
 {
-    QmlComponent component(&engine, TEST_FILE("jsObject.qml"));
+    QDeclarativeComponent component(&engine, TEST_FILE("jsObject.qml"));
     QObject *object = component.create();
     QVERIFY(object != 0);
 
@@ -1144,7 +1144,7 @@ void tst_qmlecmascript::jsObject()
 void tst_qmlecmascript::undefinedResetsProperty()
 {
     {
-    QmlComponent component(&engine, TEST_FILE("undefinedResetsProperty.qml"));
+    QDeclarativeComponent component(&engine, TEST_FILE("undefinedResetsProperty.qml"));
     QObject *object = component.create();
     QVERIFY(object != 0);
 
@@ -1161,7 +1161,7 @@ void tst_qmlecmascript::undefinedResetsProperty()
     delete object;
     }
     {
-    QmlComponent component(&engine, TEST_FILE("undefinedResetsProperty.2.qml"));
+    QDeclarativeComponent component(&engine, TEST_FILE("undefinedResetsProperty.2.qml"));
     QObject *object = component.create();
     QVERIFY(object != 0);
 
@@ -1178,7 +1178,7 @@ void tst_qmlecmascript::undefinedResetsProperty()
 // QTBUG-6781
 void tst_qmlecmascript::bug1()
 {
-    QmlComponent component(&engine, TEST_FILE("bug.1.qml"));
+    QDeclarativeComponent component(&engine, TEST_FILE("bug.1.qml"));
     QObject *object = component.create();
     QVERIFY(object != 0);
 
@@ -1199,8 +1199,8 @@ void tst_qmlecmascript::callQtInvokables()
 {
     MyInvokableObject o;
 
-    QmlEngine qmlengine;
-    QmlEnginePrivate *ep = QmlEnginePrivate::get(&qmlengine);
+    QDeclarativeEngine qmlengine;
+    QDeclarativeEnginePrivate *ep = QDeclarativeEnginePrivate::get(&qmlengine);
     QScriptEngine *engine = &ep->scriptEngine;
     ep->globalClass->explicitSetProperty("object", ep->objectClass->newQObject(&o));
 
@@ -1600,19 +1600,19 @@ void tst_qmlecmascript::callQtInvokables()
 // QTBUG-5675
 void tst_qmlecmascript::listToVariant()
 {
-    QmlComponent component(&engine, TEST_FILE("listToVariant.qml"));
+    QDeclarativeComponent component(&engine, TEST_FILE("listToVariant.qml"));
 
     MyQmlContainer container;
 
-    QmlContext context(engine.rootContext());
+    QDeclarativeContext context(engine.rootContext());
     context.addDefaultObject(&container);
 
     QObject *object = component.create(&context);
     QVERIFY(object != 0);
 
     QVariant v = object->property("test");
-    QCOMPARE(v.userType(), qMetaTypeId<QmlListReference>());
-    QVERIFY(qvariant_cast<QmlListReference>(v).object() == &container);
+    QCOMPARE(v.userType(), qMetaTypeId<QDeclarativeListReference>());
+    QVERIFY(qvariant_cast<QDeclarativeListReference>(v).object() == &container);
 
     delete object;
 }
@@ -1623,13 +1623,13 @@ void tst_qmlecmascript::multiEngineObject()
     MyQmlObject obj;
     obj.setStringProperty("Howdy planet");
 
-    QmlEngine e1;
+    QDeclarativeEngine e1;
     e1.rootContext()->setContextProperty("thing", &obj);
-    QmlComponent c1(&e1, TEST_FILE("multiEngineObject.qml"));
+    QDeclarativeComponent c1(&e1, TEST_FILE("multiEngineObject.qml"));
 
-    QmlEngine e2;
+    QDeclarativeEngine e2;
     e2.rootContext()->setContextProperty("thing", &obj);
-    QmlComponent c2(&e2, TEST_FILE("multiEngineObject.qml"));
+    QDeclarativeComponent c2(&e2, TEST_FILE("multiEngineObject.qml"));
 
     QObject *o1 = c1.create();
     QObject *o2 = c2.create();
@@ -1644,7 +1644,7 @@ void tst_qmlecmascript::multiEngineObject()
 // Test that references to QObjects are cleanup when the object is destroyed
 void tst_qmlecmascript::deletedObject()
 {
-    QmlComponent component(&engine, TEST_FILE("deletedObject.qml"));
+    QDeclarativeComponent component(&engine, TEST_FILE("deletedObject.qml"));
 
     QObject *object = component.create();
 
@@ -1659,4 +1659,4 @@ void tst_qmlecmascript::deletedObject()
 
 QTEST_MAIN(tst_qmlecmascript)
 
-#include "tst_qmlecmascript.moc"
+#include "tst_qdeclarativeecmascript.moc"
diff --git a/tests/auto/declarative/qmlengine/qmlengine.pro b/tests/auto/declarative/qdeclarativeengine/qdeclarativeengine.pro
index 1a0e5f4..5b6530d 100644
--- a/tests/auto/declarative/qmlengine/qmlengine.pro
+++ b/tests/auto/declarative/qdeclarativeengine/qdeclarativeengine.pro
@@ -2,7 +2,7 @@ load(qttest_p4)
 contains(QT_CONFIG,declarative): QT += declarative network
 macx:CONFIG -= app_bundle
 
-SOURCES += tst_qmlengine.cpp 
+SOURCES += tst_qdeclarativeengine.cpp 
 
 # Define SRCDIR equal to test's source directory
 DEFINES += SRCDIR=\\\"$$PWD\\\"
diff --git a/tests/auto/declarative/qmlengine/tst_qmlengine.cpp b/tests/auto/declarative/qdeclarativeengine/tst_qdeclarativeengine.cpp
index 6504d03..ca48bd2 100644
--- a/tests/auto/declarative/qmlengine/tst_qmlengine.cpp
+++ b/tests/auto/declarative/qdeclarativeengine/tst_qdeclarativeengine.cpp
@@ -40,15 +40,15 @@
 ****************************************************************************/
 
 #include <qtest.h>
-#include <QmlEngine>
-#include <QmlContext>
+#include <QDeclarativeEngine>
+#include <QDeclarativeContext>
 #include <QNetworkAccessManager>
 #include <QPointer>
 #include <QDir>
 #include <QDesktopServices>
 #include <QDebug>
-#include <QmlComponent>
-#include <QmlNetworkAccessManagerFactory>
+#include <QDeclarativeComponent>
+#include <QDeclarativeNetworkAccessManagerFactory>
 
 class tst_qmlengine : public QObject
 {
@@ -67,7 +67,7 @@ private slots:
 
 void tst_qmlengine::rootContext()
 {
-    QmlEngine engine;
+    QDeclarativeEngine engine;
 
     QVERIFY(engine.rootContext());
 
@@ -75,7 +75,7 @@ void tst_qmlengine::rootContext()
     QVERIFY(engine.rootContext()->parentContext() == 0);
 }
 
-class NetworkAccessManagerFactory : public QmlNetworkAccessManagerFactory
+class NetworkAccessManagerFactory : public QDeclarativeNetworkAccessManagerFactory
 {
 public:
     NetworkAccessManagerFactory() : manager(0) {}
@@ -90,15 +90,15 @@ public:
 
 void tst_qmlengine::networkAccessManager()
 {
-    QmlEngine *engine = new QmlEngine;
+    QDeclarativeEngine *engine = new QDeclarativeEngine;
 
-    // Test QmlEngine created manager
+    // Test QDeclarativeEngine created manager
     QPointer<QNetworkAccessManager> manager = engine->networkAccessManager();
     QVERIFY(manager != 0);
     delete engine;
 
     // Test factory created manager
-    engine = new QmlEngine;
+    engine = new QDeclarativeEngine;
     NetworkAccessManagerFactory factory;
     engine->setNetworkAccessManagerFactory(&factory);
     QVERIFY(engine->networkAccessManager() == factory.manager);
@@ -107,7 +107,7 @@ void tst_qmlengine::networkAccessManager()
 
 void tst_qmlengine::baseUrl()
 {
-    QmlEngine engine;
+    QDeclarativeEngine engine;
 
     QUrl cwd = QUrl::fromLocalFile(QDir::currentPath() + QDir::separator());
 
@@ -131,35 +131,35 @@ void tst_qmlengine::baseUrl()
 
 void tst_qmlengine::contextForObject()
 {
-    QmlEngine *engine = new QmlEngine;
+    QDeclarativeEngine *engine = new QDeclarativeEngine;
 
     // Test null-object
-    QVERIFY(QmlEngine::contextForObject(0) == 0);
+    QVERIFY(QDeclarativeEngine::contextForObject(0) == 0);
 
     // Test an object with no context
     QObject object;
-    QVERIFY(QmlEngine::contextForObject(&object) == 0);
+    QVERIFY(QDeclarativeEngine::contextForObject(&object) == 0);
 
     // Test setting null-object
-    QmlEngine::setContextForObject(0, engine->rootContext());
+    QDeclarativeEngine::setContextForObject(0, engine->rootContext());
 
     // Test setting null-context
-    QmlEngine::setContextForObject(&object, 0);
+    QDeclarativeEngine::setContextForObject(&object, 0);
 
     // Test setting context
-    QmlEngine::setContextForObject(&object, engine->rootContext());
-    QVERIFY(QmlEngine::contextForObject(&object) == engine->rootContext());
+    QDeclarativeEngine::setContextForObject(&object, engine->rootContext());
+    QVERIFY(QDeclarativeEngine::contextForObject(&object) == engine->rootContext());
 
-    QmlContext context(engine->rootContext());
+    QDeclarativeContext context(engine->rootContext());
 
     // Try changing context
-    QTest::ignoreMessage(QtWarningMsg, "QmlEngine::setContextForObject(): Object already has a QmlContext");
-    QmlEngine::setContextForObject(&object, &context);
-    QVERIFY(QmlEngine::contextForObject(&object) == engine->rootContext());
+    QTest::ignoreMessage(QtWarningMsg, "QDeclarativeEngine::setContextForObject(): Object already has a QDeclarativeContext");
+    QDeclarativeEngine::setContextForObject(&object, &context);
+    QVERIFY(QDeclarativeEngine::contextForObject(&object) == engine->rootContext());
 
     // Delete context
     delete engine; engine = 0;
-    QVERIFY(QmlEngine::contextForObject(&object) == 0);
+    QVERIFY(QDeclarativeEngine::contextForObject(&object) == 0);
 }
 
 void tst_qmlengine::offlineStoragePath()
@@ -170,7 +170,7 @@ void tst_qmlengine::offlineStoragePath()
     qApp->setOrganizationName("Nokia");
     qApp->setOrganizationDomain("nokia.com");
 
-    QmlEngine engine;
+    QDeclarativeEngine engine;
 
     QDir dir(QDesktopServices::storageLocation(QDesktopServices::DataLocation));
     dir.mkpath("QML");
@@ -186,7 +186,7 @@ void tst_qmlengine::offlineStoragePath()
 
 void tst_qmlengine::clearComponentCache()
 {
-    QmlEngine engine;
+    QDeclarativeEngine engine;
 
     // Create original qml file
     {
@@ -198,7 +198,7 @@ void tst_qmlengine::clearComponentCache()
 
     // Test "test" property
     {
-        QmlComponent component(&engine, "temp.qml");
+        QDeclarativeComponent component(&engine, "temp.qml");
         QObject *obj = component.create();
         QVERIFY(obj != 0);
         QCOMPARE(obj->property("test").toInt(), 10);
@@ -215,7 +215,7 @@ void tst_qmlengine::clearComponentCache()
 
     // Test cache hit
     {
-        QmlComponent component(&engine, "temp.qml");
+        QDeclarativeComponent component(&engine, "temp.qml");
         QObject *obj = component.create();
         QVERIFY(obj != 0);
         QCOMPARE(obj->property("test").toInt(), 10);
@@ -227,7 +227,7 @@ void tst_qmlengine::clearComponentCache()
 
     // Test cache refresh
     {
-        QmlComponent component(&engine, "temp.qml");
+        QDeclarativeComponent component(&engine, "temp.qml");
         QObject *obj = component.create();
         QVERIFY(obj != 0);
         QCOMPARE(obj->property("test").toInt(), 11);
@@ -237,4 +237,4 @@ void tst_qmlengine::clearComponentCache()
 
 QTEST_MAIN(tst_qmlengine)
 
-#include "tst_qmlengine.moc"
+#include "tst_qdeclarativeengine.moc"
diff --git a/tests/auto/declarative/qmlcontext/qmlcontext.pro b/tests/auto/declarative/qdeclarativeerror/qdeclarativeerror.pro
index 9e66429..6591406 100644
--- a/tests/auto/declarative/qmlcontext/qmlcontext.pro
+++ b/tests/auto/declarative/qdeclarativeerror/qdeclarativeerror.pro
@@ -1,6 +1,6 @@
 load(qttest_p4)
 contains(QT_CONFIG,declarative): QT += declarative
-SOURCES += tst_qmlcontext.cpp
+SOURCES += tst_qdeclarativeerror.cpp
 macx:CONFIG -= app_bundle
 
 DEFINES += SRCDIR=\\\"$$PWD\\\"
diff --git a/tests/auto/declarative/qmlerror/test.txt b/tests/auto/declarative/qdeclarativeerror/test.txt
index cdafd9e..cdafd9e 100644
--- a/tests/auto/declarative/qmlerror/test.txt
+++ b/tests/auto/declarative/qdeclarativeerror/test.txt
diff --git a/tests/auto/declarative/qmlerror/tst_qmlerror.cpp b/tests/auto/declarative/qdeclarativeerror/tst_qdeclarativeerror.cpp
index 12dde57..2df11d3 100644
--- a/tests/auto/declarative/qmlerror/tst_qmlerror.cpp
+++ b/tests/auto/declarative/qdeclarativeerror/tst_qdeclarativeerror.cpp
@@ -40,7 +40,7 @@
 ****************************************************************************/
 
 #include <qtest.h>
-#include <QmlError>
+#include <QDeclarativeError>
 #include <QDebug>
 
 class tst_qmlerror : public QObject
@@ -59,7 +59,7 @@ private slots:
 
 void tst_qmlerror::url()
 {
-    QmlError error;
+    QDeclarativeError error;
 
     QCOMPARE(error.url(), QUrl());
 
@@ -67,7 +67,7 @@ void tst_qmlerror::url()
 
     QCOMPARE(error.url(), QUrl("http://www.nokia.com/main.qml"));
 
-    QmlError error2 = error;
+    QDeclarativeError error2 = error;
 
     QCOMPARE(error2.url(), QUrl("http://www.nokia.com/main.qml"));
 
@@ -79,7 +79,7 @@ void tst_qmlerror::url()
 
 void tst_qmlerror::description()
 {
-    QmlError error;
+    QDeclarativeError error;
 
     QCOMPARE(error.description(), QString());
 
@@ -87,7 +87,7 @@ void tst_qmlerror::description()
 
     QCOMPARE(error.description(), QString("An Error"));
 
-    QmlError error2 = error;
+    QDeclarativeError error2 = error;
 
     QCOMPARE(error2.description(), QString("An Error"));
 
@@ -99,7 +99,7 @@ void tst_qmlerror::description()
 
 void tst_qmlerror::line()
 {
-    QmlError error;
+    QDeclarativeError error;
 
     QCOMPARE(error.line(), -1);
 
@@ -107,7 +107,7 @@ void tst_qmlerror::line()
 
     QCOMPARE(error.line(), 102);
 
-    QmlError error2 = error;
+    QDeclarativeError error2 = error;
 
     QCOMPARE(error2.line(), 102);
 
@@ -119,7 +119,7 @@ void tst_qmlerror::line()
 
 void tst_qmlerror::column()
 {
-    QmlError error;
+    QDeclarativeError error;
 
     QCOMPARE(error.column(), -1);
 
@@ -127,7 +127,7 @@ void tst_qmlerror::column()
 
     QCOMPARE(error.column(), 16);
 
-    QmlError error2 = error;
+    QDeclarativeError error2 = error;
 
     QCOMPARE(error2.column(), 16);
 
@@ -140,7 +140,7 @@ void tst_qmlerror::column()
 void tst_qmlerror::toString()
 {
     {
-        QmlError error;
+        QDeclarativeError error;
         error.setUrl(QUrl("http://www.nokia.com/main.qml"));
         error.setDescription("An Error");
         error.setLine(92);
@@ -150,7 +150,7 @@ void tst_qmlerror::toString()
     }
 
     {
-        QmlError error;
+        QDeclarativeError error;
         error.setUrl(QUrl("http://www.nokia.com/main.qml"));
         error.setDescription("An Error");
         error.setLine(92);
@@ -161,14 +161,14 @@ void tst_qmlerror::toString()
 
 void tst_qmlerror::copy()
 {
-    QmlError error;
+    QDeclarativeError error;
     error.setUrl(QUrl("http://www.nokia.com/main.qml"));
     error.setDescription("An Error");
     error.setLine(92);
     error.setColumn(13);
 
-    QmlError error2(error);
-    QmlError error3;
+    QDeclarativeError error2(error);
+    QDeclarativeError error3;
     error3 = error;
 
     error.setUrl(QUrl("http://qt.nokia.com/main.qml"));
@@ -196,7 +196,7 @@ void tst_qmlerror::copy()
 void tst_qmlerror::debug()
 {
     {
-        QmlError error;
+        QDeclarativeError error;
         error.setUrl(QUrl("http://www.nokia.com/main.qml"));
         error.setDescription("An Error");
         error.setLine(92);
@@ -208,7 +208,7 @@ void tst_qmlerror::debug()
 
     {
         QUrl url(QUrl::fromLocalFile(QString(SRCDIR) + "/").resolved(QUrl("test.txt")));
-        QmlError error;
+        QDeclarativeError error;
         error.setUrl(url);
         error.setDescription("An Error");
         error.setLine(2);
@@ -222,7 +222,7 @@ void tst_qmlerror::debug()
 
     {
         QUrl url(QUrl::fromLocalFile(QString(SRCDIR) + "/").resolved(QUrl("foo.txt")));
-        QmlError error;
+        QDeclarativeError error;
         error.setUrl(url);
         error.setDescription("An Error");
         error.setLine(2);
@@ -239,4 +239,4 @@ void tst_qmlerror::debug()
 
 QTEST_MAIN(tst_qmlerror)
 
-#include "tst_qmlerror.moc"
+#include "tst_qdeclarativeerror.moc"
diff --git a/tests/auto/declarative/qmlgraphicsflickable/data/flickable01.qml b/tests/auto/declarative/qdeclarativeflickable/data/flickable01.qml
index 8a1843c..8a1843c 100644
--- a/tests/auto/declarative/qmlgraphicsflickable/data/flickable01.qml
+++ b/tests/auto/declarative/qdeclarativeflickable/data/flickable01.qml
diff --git a/tests/auto/declarative/qmlgraphicsflickable/data/flickable02.qml b/tests/auto/declarative/qdeclarativeflickable/data/flickable02.qml
index 3e08359..3e08359 100644
--- a/tests/auto/declarative/qmlgraphicsflickable/data/flickable02.qml
+++ b/tests/auto/declarative/qdeclarativeflickable/data/flickable02.qml
diff --git a/tests/auto/declarative/qmlgraphicsflickable/data/flickable03.qml b/tests/auto/declarative/qdeclarativeflickable/data/flickable03.qml
index 3ed173d..3ed173d 100644
--- a/tests/auto/declarative/qmlgraphicsflickable/data/flickable03.qml
+++ b/tests/auto/declarative/qdeclarativeflickable/data/flickable03.qml
diff --git a/tests/auto/declarative/qmlgraphicsflickable/data/flickable04.qml b/tests/auto/declarative/qdeclarativeflickable/data/flickable04.qml
index 1425d85..1425d85 100644
--- a/tests/auto/declarative/qmlgraphicsflickable/data/flickable04.qml
+++ b/tests/auto/declarative/qdeclarativeflickable/data/flickable04.qml
diff --git a/tests/auto/declarative/qmlbinding/qmlbinding.pro b/tests/auto/declarative/qdeclarativeflickable/qdeclarativeflickable.pro
index dfaca91..4b71381 100644
--- a/tests/auto/declarative/qmlbinding/qmlbinding.pro
+++ b/tests/auto/declarative/qdeclarativeflickable/qdeclarativeflickable.pro
@@ -2,7 +2,7 @@ load(qttest_p4)
 contains(QT_CONFIG,declarative): QT += declarative gui
 macx:CONFIG -= app_bundle
 
-SOURCES += tst_qmlbinding.cpp
+SOURCES += tst_qdeclarativeflickable.cpp
 
 # Define SRCDIR equal to test's source directory
 DEFINES += SRCDIR=\\\"$$PWD\\\"
diff --git a/tests/auto/declarative/qmlgraphicsflickable/tst_qmlgraphicsflickable.cpp b/tests/auto/declarative/qdeclarativeflickable/tst_qdeclarativeflickable.cpp
index b503571..9e5238e 100644
--- a/tests/auto/declarative/qmlgraphicsflickable/tst_qmlgraphicsflickable.cpp
+++ b/tests/auto/declarative/qdeclarativeflickable/tst_qdeclarativeflickable.cpp
@@ -40,10 +40,10 @@
 ****************************************************************************/
 #include <qtest.h>
 #include <QtTest/QSignalSpy>
-#include <QtDeclarative/qmlengine.h>
-#include <QtDeclarative/qmlcomponent.h>
-#include <private/qmlgraphicsflickable_p.h>
-#include <private/qmlvaluetype_p.h>
+#include <QtDeclarative/qdeclarativeengine.h>
+#include <QtDeclarative/qdeclarativecomponent.h>
+#include <private/qdeclarativeflickable_p.h>
+#include <private/qdeclarativevaluetype_p.h>
 #include <math.h>
 
 class tst_qmlgraphicsflickable : public QObject
@@ -63,7 +63,7 @@ private slots:
     void pressDelay();
 
 private:
-    QmlEngine engine;
+    QDeclarativeEngine engine;
 };
 
 tst_qmlgraphicsflickable::tst_qmlgraphicsflickable()
@@ -72,9 +72,9 @@ tst_qmlgraphicsflickable::tst_qmlgraphicsflickable()
 
 void tst_qmlgraphicsflickable::create()
 {
-    QmlEngine engine;
-    QmlComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/flickable01.qml"));
-    QmlGraphicsFlickable *obj = qobject_cast<QmlGraphicsFlickable*>(c.create());
+    QDeclarativeEngine engine;
+    QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/flickable01.qml"));
+    QDeclarativeFlickable *obj = qobject_cast<QDeclarativeFlickable*>(c.create());
 
     QVERIFY(obj != 0);
     QCOMPARE(obj->isAtXBeginning(), true);
@@ -98,9 +98,9 @@ void tst_qmlgraphicsflickable::create()
 
 void tst_qmlgraphicsflickable::horizontalViewportSize()
 {
-    QmlEngine engine;
-    QmlComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/flickable02.qml"));
-    QmlGraphicsFlickable *obj = qobject_cast<QmlGraphicsFlickable*>(c.create());
+    QDeclarativeEngine engine;
+    QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/flickable02.qml"));
+    QDeclarativeFlickable *obj = qobject_cast<QDeclarativeFlickable*>(c.create());
 
     QVERIFY(obj != 0);
     QCOMPARE(obj->viewportWidth(), 800.);
@@ -115,9 +115,9 @@ void tst_qmlgraphicsflickable::horizontalViewportSize()
 
 void tst_qmlgraphicsflickable::verticalViewportSize()
 {
-    QmlEngine engine;
-    QmlComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/flickable03.qml"));
-    QmlGraphicsFlickable *obj = qobject_cast<QmlGraphicsFlickable*>(c.create());
+    QDeclarativeEngine engine;
+    QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/flickable03.qml"));
+    QDeclarativeFlickable *obj = qobject_cast<QDeclarativeFlickable*>(c.create());
 
     QVERIFY(obj != 0);
     QCOMPARE(obj->viewportWidth(), 200.);
@@ -132,9 +132,9 @@ void tst_qmlgraphicsflickable::verticalViewportSize()
 
 void tst_qmlgraphicsflickable::properties()
 {
-    QmlEngine engine;
-    QmlComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/flickable04.qml"));
-    QmlGraphicsFlickable *obj = qobject_cast<QmlGraphicsFlickable*>(c.create());
+    QDeclarativeEngine engine;
+    QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/flickable04.qml"));
+    QDeclarativeFlickable *obj = qobject_cast<QDeclarativeFlickable*>(c.create());
 
     QVERIFY(obj != 0);
     QCOMPARE(obj->isInteractive(), false);
@@ -147,9 +147,9 @@ void tst_qmlgraphicsflickable::properties()
 
 void tst_qmlgraphicsflickable::overShoot()
 {
-    QmlComponent component(&engine);
+    QDeclarativeComponent component(&engine);
     component.setData("import Qt 4.6; Flickable { overShoot: false; }", QUrl::fromLocalFile(""));
-    QmlGraphicsFlickable *flickable = qobject_cast<QmlGraphicsFlickable*>(component.create());
+    QDeclarativeFlickable *flickable = qobject_cast<QDeclarativeFlickable*>(component.create());
     QSignalSpy spy(flickable, SIGNAL(overShootChanged()));
 
     QVERIFY(flickable);
@@ -170,9 +170,9 @@ void tst_qmlgraphicsflickable::overShoot()
 
 void tst_qmlgraphicsflickable::maximumFlickVelocity()
 {
-    QmlComponent component(&engine);
+    QDeclarativeComponent component(&engine);
     component.setData("import Qt 4.6; Flickable { maximumFlickVelocity: 1.0; }", QUrl::fromLocalFile(""));
-    QmlGraphicsFlickable *flickable = qobject_cast<QmlGraphicsFlickable*>(component.create());
+    QDeclarativeFlickable *flickable = qobject_cast<QDeclarativeFlickable*>(component.create());
     QSignalSpy spy(flickable, SIGNAL(maximumFlickVelocityChanged()));
 
     QVERIFY(flickable);
@@ -187,9 +187,9 @@ void tst_qmlgraphicsflickable::maximumFlickVelocity()
 
 void tst_qmlgraphicsflickable::flickDeceleration()
 {
-    QmlComponent component(&engine);
+    QDeclarativeComponent component(&engine);
     component.setData("import Qt 4.6; Flickable { flickDeceleration: 1.0; }", QUrl::fromLocalFile(""));
-    QmlGraphicsFlickable *flickable = qobject_cast<QmlGraphicsFlickable*>(component.create());
+    QDeclarativeFlickable *flickable = qobject_cast<QDeclarativeFlickable*>(component.create());
     QSignalSpy spy(flickable, SIGNAL(flickDecelerationChanged()));
 
     QVERIFY(flickable);
@@ -204,9 +204,9 @@ void tst_qmlgraphicsflickable::flickDeceleration()
 
 void tst_qmlgraphicsflickable::pressDelay()
 {
-    QmlComponent component(&engine);
+    QDeclarativeComponent component(&engine);
     component.setData("import Qt 4.6; Flickable { pressDelay: 100; }", QUrl::fromLocalFile(""));
-    QmlGraphicsFlickable *flickable = qobject_cast<QmlGraphicsFlickable*>(component.create());
+    QDeclarativeFlickable *flickable = qobject_cast<QDeclarativeFlickable*>(component.create());
     QSignalSpy spy(flickable, SIGNAL(pressDelayChanged()));
 
     QVERIFY(flickable);
@@ -221,4 +221,4 @@ void tst_qmlgraphicsflickable::pressDelay()
 
 QTEST_MAIN(tst_qmlgraphicsflickable)
 
-#include "tst_qmlgraphicsflickable.moc"
+#include "tst_qdeclarativeflickable.moc"
diff --git a/tests/auto/declarative/qmlgraphicsflipable/data/test-flipable.qml b/tests/auto/declarative/qdeclarativeflipable/data/test-flipable.qml
index 21d356d..21d356d 100644
--- a/tests/auto/declarative/qmlgraphicsflipable/data/test-flipable.qml
+++ b/tests/auto/declarative/qdeclarativeflipable/data/test-flipable.qml
diff --git a/tests/auto/declarative/qmlconnection/qmlconnection.pro b/tests/auto/declarative/qdeclarativeflipable/qdeclarativeflipable.pro
index 3d46fa6..e29d324 100644
--- a/tests/auto/declarative/qmlconnection/qmlconnection.pro
+++ b/tests/auto/declarative/qdeclarativeflipable/qdeclarativeflipable.pro
@@ -2,7 +2,7 @@ load(qttest_p4)
 contains(QT_CONFIG,declarative): QT += declarative gui
 macx:CONFIG -= app_bundle
 
-SOURCES += tst_qmlconnection.cpp
+SOURCES += tst_qdeclarativeflipable.cpp
 
 # Define SRCDIR equal to test's source directory
 DEFINES += SRCDIR=\\\"$$PWD\\\"
diff --git a/tests/auto/declarative/qmlgraphicsflipable/tst_qmlgraphicsflipable.cpp b/tests/auto/declarative/qdeclarativeflipable/tst_qdeclarativeflipable.cpp
index 24dc2e8..f29ed18 100644
--- a/tests/auto/declarative/qmlgraphicsflipable/tst_qmlgraphicsflipable.cpp
+++ b/tests/auto/declarative/qdeclarativeflipable/tst_qdeclarativeflipable.cpp
@@ -39,12 +39,12 @@
 **
 ****************************************************************************/
 #include <qtest.h>
-#include <QtDeclarative/qmlengine.h>
-#include <QtDeclarative/qmlcomponent.h>
-#include <private/qmlgraphicsflipable_p.h>
-#include <private/qmlvaluetype_p.h>
+#include <QtDeclarative/qdeclarativeengine.h>
+#include <QtDeclarative/qdeclarativecomponent.h>
+#include <private/qdeclarativeflipable_p.h>
+#include <private/qdeclarativevaluetype_p.h>
 #include <QFontMetrics>
-#include <private/qmlgraphicsrectangle_p.h>
+#include <private/qdeclarativerectangle_p.h>
 #include <math.h>
 
 class tst_qmlgraphicsflipable : public QObject
@@ -59,7 +59,7 @@ private slots:
     void setFrontAndBack();
 
 private:
-    QmlEngine engine;
+    QDeclarativeEngine engine;
 };
 
 tst_qmlgraphicsflipable::tst_qmlgraphicsflipable()
@@ -68,9 +68,9 @@ tst_qmlgraphicsflipable::tst_qmlgraphicsflipable()
 
 void tst_qmlgraphicsflipable::create()
 {
-    QmlEngine engine;
-    QmlComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/test-flipable.qml"));
-    QmlGraphicsFlipable *obj = qobject_cast<QmlGraphicsFlipable*>(c.create());
+    QDeclarativeEngine engine;
+    QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/test-flipable.qml"));
+    QDeclarativeFlipable *obj = qobject_cast<QDeclarativeFlipable*>(c.create());
 
     QVERIFY(obj != 0);
     delete obj;
@@ -78,9 +78,9 @@ void tst_qmlgraphicsflipable::create()
 
 void tst_qmlgraphicsflipable::checkFrontAndBack()
 {
-    QmlEngine engine;
-    QmlComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/test-flipable.qml"));
-    QmlGraphicsFlipable *obj = qobject_cast<QmlGraphicsFlipable*>(c.create());
+    QDeclarativeEngine engine;
+    QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/test-flipable.qml"));
+    QDeclarativeFlipable *obj = qobject_cast<QDeclarativeFlipable*>(c.create());
 
     QVERIFY(obj != 0);
     QVERIFY(obj->front() != 0);
@@ -90,9 +90,9 @@ void tst_qmlgraphicsflipable::checkFrontAndBack()
 
 void tst_qmlgraphicsflipable::setFrontAndBack()
 {
-    QmlEngine engine;
-    QmlComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/test-flipable.qml"));
-    QmlGraphicsFlipable *obj = qobject_cast<QmlGraphicsFlipable*>(c.create());
+    QDeclarativeEngine engine;
+    QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/test-flipable.qml"));
+    QDeclarativeFlipable *obj = qobject_cast<QDeclarativeFlipable*>(c.create());
 
     QVERIFY(obj != 0);
     QVERIFY(obj->front() != 0);
@@ -100,14 +100,14 @@ void tst_qmlgraphicsflipable::setFrontAndBack()
 
     QString message = "QML Flipable (" + c.url().toString() + ":3:1) front is a write-once property";
     QTest::ignoreMessage(QtWarningMsg, qPrintable(message));
-    obj->setFront(new QmlGraphicsRectangle());
+    obj->setFront(new QDeclarativeRectangle());
 
     message = "QML Flipable (" + c.url().toString() + ":3:1) back is a write-once property";
     QTest::ignoreMessage(QtWarningMsg, qPrintable(message));
-    obj->setBack(new QmlGraphicsRectangle());
+    obj->setBack(new QDeclarativeRectangle());
     delete obj;
 }
 
 QTEST_MAIN(tst_qmlgraphicsflipable)
 
-#include "tst_qmlgraphicsflipable.moc"
+#include "tst_qdeclarativeflipable.moc"
diff --git a/tests/auto/declarative/qmlfontloader/data/dummy.ttf b/tests/auto/declarative/qdeclarativefontloader/data/dummy.ttf
index e69de29..e69de29 100644
--- a/tests/auto/declarative/qmlfontloader/data/dummy.ttf
+++ b/tests/auto/declarative/qdeclarativefontloader/data/dummy.ttf
diff --git a/tests/auto/declarative/qmlfontloader/data/tarzeau_ocr_a.ttf b/tests/auto/declarative/qdeclarativefontloader/data/tarzeau_ocr_a.ttf
index cf93f96..cf93f96 100644
--- a/tests/auto/declarative/qmlfontloader/data/tarzeau_ocr_a.ttf
+++ b/tests/auto/declarative/qdeclarativefontloader/data/tarzeau_ocr_a.ttf
diff --git a/tests/auto/declarative/qdeclarativefontloader/qdeclarativefontloader.pro b/tests/auto/declarative/qdeclarativefontloader/qdeclarativefontloader.pro
new file mode 100644
index 0000000..0c736b4
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativefontloader/qdeclarativefontloader.pro
@@ -0,0 +1,8 @@
+load(qttest_p4)
+contains(QT_CONFIG,declarative): QT += declarative gui
+macx:CONFIG -= app_bundle
+
+SOURCES += tst_qdeclarativefontloader.cpp
+
+# Define SRCDIR equal to test's source directory
+DEFINES += SRCDIR=\\\"$$PWD\\\"
diff --git a/tests/auto/declarative/qmlfontloader/tst_qmlfontloader.cpp b/tests/auto/declarative/qdeclarativefontloader/tst_qdeclarativefontloader.cpp
index 41b5359..5a1259d 100644
--- a/tests/auto/declarative/qmlfontloader/tst_qmlfontloader.cpp
+++ b/tests/auto/declarative/qdeclarativefontloader/tst_qdeclarativefontloader.cpp
@@ -39,9 +39,9 @@
 **
 ****************************************************************************/
 #include <qtest.h>
-#include <QtDeclarative/qmlengine.h>
-#include <QtDeclarative/qmlcomponent.h>
-#include <private/qmlfontloader_p.h>
+#include <QtDeclarative/qdeclarativeengine.h>
+#include <QtDeclarative/qdeclarativecomponent.h>
+#include <private/qdeclarativefontloader_p.h>
 #include "../../../shared/util.h"
 
 class tst_qmlfontloader : public QObject
@@ -62,7 +62,7 @@ private slots:
 private slots:
 
 private:
-    QmlEngine engine;
+    QDeclarativeEngine engine;
 };
 
 tst_qmlfontloader::tst_qmlfontloader()
@@ -72,14 +72,14 @@ tst_qmlfontloader::tst_qmlfontloader()
 void tst_qmlfontloader::noFont()
 {
     QString componentStr = "import Qt 4.6\nFontLoader { }";
-    QmlComponent component(&engine);
+    QDeclarativeComponent component(&engine);
     component.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
-    QmlFontLoader *fontObject = qobject_cast<QmlFontLoader*>(component.create());
+    QDeclarativeFontLoader *fontObject = qobject_cast<QDeclarativeFontLoader*>(component.create());
 
     QVERIFY(fontObject != 0);
     QCOMPARE(fontObject->name(), QString(""));
     QCOMPARE(fontObject->source(), QUrl(""));
-    QTRY_VERIFY(fontObject->status() == QmlFontLoader::Null);
+    QTRY_VERIFY(fontObject->status() == QDeclarativeFontLoader::Null);
 
     delete fontObject;
 }
@@ -87,70 +87,70 @@ void tst_qmlfontloader::noFont()
 void tst_qmlfontloader::namedFont()
 {
     QString componentStr = "import Qt 4.6\nFontLoader { name: \"Helvetica\" }";
-    QmlComponent component(&engine);
+    QDeclarativeComponent component(&engine);
     component.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
-    QmlFontLoader *fontObject = qobject_cast<QmlFontLoader*>(component.create());
+    QDeclarativeFontLoader *fontObject = qobject_cast<QDeclarativeFontLoader*>(component.create());
 
     QVERIFY(fontObject != 0);
     QCOMPARE(fontObject->source(), QUrl(""));
     QCOMPARE(fontObject->name(), QString("Helvetica"));
-    QTRY_VERIFY(fontObject->status() == QmlFontLoader::Ready);
+    QTRY_VERIFY(fontObject->status() == QDeclarativeFontLoader::Ready);
 }
 
 void tst_qmlfontloader::localFont()
 {
     QString componentStr = "import Qt 4.6\nFontLoader { source: \"" SRCDIR  "/data/tarzeau_ocr_a.ttf\" }";
-    QmlComponent component(&engine);
+    QDeclarativeComponent component(&engine);
     component.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
-    QmlFontLoader *fontObject = qobject_cast<QmlFontLoader*>(component.create());
+    QDeclarativeFontLoader *fontObject = qobject_cast<QDeclarativeFontLoader*>(component.create());
 
     QVERIFY(fontObject != 0);
     QVERIFY(fontObject->source() != QUrl(""));
     QTRY_COMPARE(fontObject->name(), QString("OCRA"));
-    QTRY_VERIFY(fontObject->status() == QmlFontLoader::Ready);
+    QTRY_VERIFY(fontObject->status() == QDeclarativeFontLoader::Ready);
 }
 
 void tst_qmlfontloader::failLocalFont()
 {
     QString componentStr = "import Qt 4.6\nFontLoader { source: \"" + QUrl::fromLocalFile(SRCDIR "/data/dummy.ttf").toString() + "\" }";
     QTest::ignoreMessage(QtWarningMsg, QString("Cannot load font:  QUrl( \"" + QUrl::fromLocalFile(SRCDIR "/data/dummy.ttf").toString() + "\" )  ").toUtf8().constData());
-    QmlComponent component(&engine);
+    QDeclarativeComponent component(&engine);
     component.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
-    QmlFontLoader *fontObject = qobject_cast<QmlFontLoader*>(component.create());
+    QDeclarativeFontLoader *fontObject = qobject_cast<QDeclarativeFontLoader*>(component.create());
 
     QVERIFY(fontObject != 0);
     QVERIFY(fontObject->source() != QUrl(""));
     QTRY_COMPARE(fontObject->name(), QString(""));
-    QTRY_VERIFY(fontObject->status() == QmlFontLoader::Error);
+    QTRY_VERIFY(fontObject->status() == QDeclarativeFontLoader::Error);
 }
 
 void tst_qmlfontloader::webFont()
 {
     QString componentStr = "import Qt 4.6\nFontLoader { source: \"http://www.princexml.com/fonts/steffmann/Starburst.ttf\" }";
-    QmlComponent component(&engine);
+    QDeclarativeComponent component(&engine);
     component.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
-    QmlFontLoader *fontObject = qobject_cast<QmlFontLoader*>(component.create());
+    QDeclarativeFontLoader *fontObject = qobject_cast<QDeclarativeFontLoader*>(component.create());
 
     QVERIFY(fontObject != 0);
     QVERIFY(fontObject->source() != QUrl(""));
     QTRY_COMPARE(fontObject->name(), QString("Starburst"));
-    QTRY_VERIFY(fontObject->status() == QmlFontLoader::Ready);
+    QTRY_VERIFY(fontObject->status() == QDeclarativeFontLoader::Ready);
 }
 
 void tst_qmlfontloader::failWebFont()
 {
     QString componentStr = "import Qt 4.6\nFontLoader { source: \"http://wrong.address.com/Starburst.ttf\" }";
     QTest::ignoreMessage(QtWarningMsg, "Cannot load font:  QUrl( \"http://wrong.address.com/Starburst.ttf\" )  ");
-    QmlComponent component(&engine);
+    QDeclarativeComponent component(&engine);
     component.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
-    QmlFontLoader *fontObject = qobject_cast<QmlFontLoader*>(component.create());
+    QDeclarativeFontLoader *fontObject = qobject_cast<QDeclarativeFontLoader*>(component.create());
 
     QVERIFY(fontObject != 0);
     QVERIFY(fontObject->source() != QUrl(""));
     QTRY_COMPARE(fontObject->name(), QString(""));
-    QTRY_VERIFY(fontObject->status() == QmlFontLoader::Error);
+    QTRY_VERIFY(fontObject->status() == QDeclarativeFontLoader::Error);
 }
 
 QTEST_MAIN(tst_qmlfontloader)
 
-#include "tst_qmlfontloader.moc"
+#include "tst_qdeclarativefontloader.moc"
diff --git a/tests/auto/declarative/qmlgraphicsgridview/data/gridview-initCurrent.qml b/tests/auto/declarative/qdeclarativegridview/data/gridview-initCurrent.qml
index 32833d2..32833d2 100644
--- a/tests/auto/declarative/qmlgraphicsgridview/data/gridview-initCurrent.qml
+++ b/tests/auto/declarative/qdeclarativegridview/data/gridview-initCurrent.qml
diff --git a/tests/auto/declarative/qmlgraphicsgridview/data/gridview.qml b/tests/auto/declarative/qdeclarativegridview/data/gridview.qml
index 344b4b5..344b4b5 100644
--- a/tests/auto/declarative/qmlgraphicsgridview/data/gridview.qml
+++ b/tests/auto/declarative/qdeclarativegridview/data/gridview.qml
diff --git a/tests/auto/declarative/qmlgraphicsgridview/data/gridview2.qml b/tests/auto/declarative/qdeclarativegridview/data/gridview2.qml
index 62b5bd3..62b5bd3 100644
--- a/tests/auto/declarative/qmlgraphicsgridview/data/gridview2.qml
+++ b/tests/auto/declarative/qdeclarativegridview/data/gridview2.qml
diff --git a/tests/auto/declarative/qmlgraphicsgridview/data/gridview3.qml b/tests/auto/declarative/qdeclarativegridview/data/gridview3.qml
index b133d55..b133d55 100644
--- a/tests/auto/declarative/qmlgraphicsgridview/data/gridview3.qml
+++ b/tests/auto/declarative/qdeclarativegridview/data/gridview3.qml
diff --git a/tests/auto/declarative/qmlgraphicsgridview/qmlgraphicsgridview.pro b/tests/auto/declarative/qdeclarativegridview/qdeclarativegridview.pro
index 8eae8ae..af206d7 100644
--- a/tests/auto/declarative/qmlgraphicsgridview/qmlgraphicsgridview.pro
+++ b/tests/auto/declarative/qdeclarativegridview/qdeclarativegridview.pro
@@ -2,7 +2,7 @@ load(qttest_p4)
 contains(QT_CONFIG,declarative): QT += declarative
 macx:CONFIG -= app_bundle
 
-SOURCES += tst_qmlgraphicsgridview.cpp
+SOURCES += tst_qdeclarativegridview.cpp
 
 # Define SRCDIR equal to test's source directory
 DEFINES += SRCDIR=\\\"$$PWD\\\"
diff --git a/tests/auto/declarative/qmlgraphicsgridview/tst_qmlgraphicsgridview.cpp b/tests/auto/declarative/qdeclarativegridview/tst_qdeclarativegridview.cpp
index 7c8501c..0deb43d 100644
--- a/tests/auto/declarative/qmlgraphicsgridview/tst_qmlgraphicsgridview.cpp
+++ b/tests/auto/declarative/qdeclarativegridview/tst_qdeclarativegridview.cpp
@@ -39,15 +39,15 @@
 **
 ****************************************************************************/
 
-#include <qmlengine.h>
-#include <qmlcomponent.h>
+#include <qdeclarativeengine.h>
+#include <qdeclarativecomponent.h>
 #include <QtTest/QtTest>
 #include <private/qlistmodelinterface_p.h>
-#include <qmlview.h>
-#include <private/qmlgraphicsgridview_p.h>
-#include <private/qmlgraphicstext_p.h>
-#include <qmlcontext.h>
-#include <qmlexpression.h>
+#include <qdeclarativeview.h>
+#include <private/qdeclarativegridview_p.h>
+#include <private/qdeclarativetext_p.h>
+#include <qdeclarativecontext.h>
+#include <qdeclarativeexpression.h>
 
 class tst_QmlGraphicsGridView : public QObject
 {
@@ -68,12 +68,12 @@ private slots:
     void positionViewAtIndex();
 
 private:
-    QmlView *createView();
+    QDeclarativeView *createView();
     template<typename T>
     T *findItem(QGraphicsObject *parent, const QString &id, int index=-1);
     template<typename T>
     QList<T*> findItems(QGraphicsObject *parent, const QString &objectName);
-    void dumpTree(QmlGraphicsItem *parent, int depth = 0);
+    void dumpTree(QDeclarativeItem *parent, int depth = 0);
 };
 
 class TestModel : public QAbstractListModel
@@ -142,7 +142,7 @@ tst_QmlGraphicsGridView::tst_QmlGraphicsGridView()
 
 void tst_QmlGraphicsGridView::items()
 {
-    QmlView *canvas = createView();
+    QDeclarativeView *canvas = createView();
 
     TestModel model;
     model.addItem("Fred", "12345");
@@ -153,27 +153,27 @@ void tst_QmlGraphicsGridView::items()
     model.addItem("Ben", "04321");
     model.addItem("Jim", "0780");
 
-    QmlContext *ctxt = canvas->rootContext();
+    QDeclarativeContext *ctxt = canvas->rootContext();
     ctxt->setContextProperty("testModel", &model);
     ctxt->setContextProperty("testTopToBottom", QVariant(false));
 
     canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/gridview.qml"));
     qApp->processEvents();
 
-    QmlGraphicsGridView *gridview = findItem<QmlGraphicsGridView>(canvas->rootObject(), "grid");
+    QDeclarativeGridView *gridview = findItem<QDeclarativeGridView>(canvas->rootObject(), "grid");
     QVERIFY(gridview != 0);
 
-    QmlGraphicsItem *viewport = gridview->viewport();
+    QDeclarativeItem *viewport = gridview->viewport();
     QVERIFY(viewport != 0);
 
     QCOMPARE(gridview->count(), model.count());
     QCOMPARE(viewport->childItems().count(), model.count()+1); // assumes all are visible, +1 for the (default) highlight item
 
     for (int i = 0; i < model.count(); ++i) {
-        QmlGraphicsText *name = findItem<QmlGraphicsText>(viewport, "textName", i);
+        QDeclarativeText *name = findItem<QDeclarativeText>(viewport, "textName", i);
         QVERIFY(name != 0);
         QCOMPARE(name->text(), model.name(i));
-        QmlGraphicsText *number = findItem<QmlGraphicsText>(viewport, "textNumber", i);
+        QDeclarativeText *number = findItem<QDeclarativeText>(viewport, "textNumber", i);
         QVERIFY(number != 0);
         QCOMPARE(number->text(), model.number(i));
     }
@@ -182,7 +182,7 @@ void tst_QmlGraphicsGridView::items()
     TestModel model2;
     ctxt->setContextProperty("testModel", &model2);
 
-    int itemCount = findItems<QmlGraphicsItem>(viewport, "wrapper").count();
+    int itemCount = findItems<QDeclarativeItem>(viewport, "wrapper").count();
     QVERIFY(itemCount == 0);
 
     delete canvas;
@@ -190,7 +190,7 @@ void tst_QmlGraphicsGridView::items()
 
 void tst_QmlGraphicsGridView::changed()
 {
-    QmlView *canvas = createView();
+    QDeclarativeView *canvas = createView();
 
     TestModel model;
     model.addItem("Fred", "12345");
@@ -201,24 +201,24 @@ void tst_QmlGraphicsGridView::changed()
     model.addItem("Ben", "04321");
     model.addItem("Jim", "0780");
 
-    QmlContext *ctxt = canvas->rootContext();
+    QDeclarativeContext *ctxt = canvas->rootContext();
     ctxt->setContextProperty("testModel", &model);
     ctxt->setContextProperty("testTopToBottom", QVariant(false));
 
     canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/gridview.qml"));
     qApp->processEvents();
 
-    QmlGraphicsFlickable *gridview = findItem<QmlGraphicsFlickable>(canvas->rootObject(), "grid");
+    QDeclarativeFlickable *gridview = findItem<QDeclarativeFlickable>(canvas->rootObject(), "grid");
     QVERIFY(gridview != 0);
 
-    QmlGraphicsItem *viewport = gridview->viewport();
+    QDeclarativeItem *viewport = gridview->viewport();
     QVERIFY(viewport != 0);
 
     model.modifyItem(1, "Will", "9876");
-    QmlGraphicsText *name = findItem<QmlGraphicsText>(viewport, "textName", 1);
+    QDeclarativeText *name = findItem<QDeclarativeText>(viewport, "textName", 1);
     QVERIFY(name != 0);
     QCOMPARE(name->text(), model.name(1));
-    QmlGraphicsText *number = findItem<QmlGraphicsText>(viewport, "textNumber", 1);
+    QDeclarativeText *number = findItem<QDeclarativeText>(viewport, "textNumber", 1);
     QVERIFY(number != 0);
     QCOMPARE(number->text(), model.number(1));
 
@@ -227,24 +227,24 @@ void tst_QmlGraphicsGridView::changed()
 
 void tst_QmlGraphicsGridView::inserted()
 {
-    QmlView *canvas = createView();
+    QDeclarativeView *canvas = createView();
 
     TestModel model;
     model.addItem("Fred", "12345");
     model.addItem("John", "2345");
     model.addItem("Bob", "54321");
 
-    QmlContext *ctxt = canvas->rootContext();
+    QDeclarativeContext *ctxt = canvas->rootContext();
     ctxt->setContextProperty("testModel", &model);
     ctxt->setContextProperty("testTopToBottom", QVariant(false));
 
     canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/gridview.qml"));
     qApp->processEvents();
 
-    QmlGraphicsGridView *gridview = findItem<QmlGraphicsGridView>(canvas->rootObject(), "grid");
+    QDeclarativeGridView *gridview = findItem<QDeclarativeGridView>(canvas->rootObject(), "grid");
     QVERIFY(gridview != 0);
 
-    QmlGraphicsItem *viewport = gridview->viewport();
+    QDeclarativeItem *viewport = gridview->viewport();
     QVERIFY(viewport != 0);
 
     model.insertItem(1, "Will", "9876");
@@ -254,16 +254,16 @@ void tst_QmlGraphicsGridView::inserted()
 
     QCOMPARE(viewport->childItems().count(), model.count()+1); // assumes all are visible, +1 for the (default) highlight item
 
-    QmlGraphicsText *name = findItem<QmlGraphicsText>(viewport, "textName", 1);
+    QDeclarativeText *name = findItem<QDeclarativeText>(viewport, "textName", 1);
     QVERIFY(name != 0);
     QCOMPARE(name->text(), model.name(1));
-    QmlGraphicsText *number = findItem<QmlGraphicsText>(viewport, "textNumber", 1);
+    QDeclarativeText *number = findItem<QDeclarativeText>(viewport, "textNumber", 1);
     QVERIFY(number != 0);
     QCOMPARE(number->text(), model.number(1));
 
     // Confirm items positioned correctly
     for (int i = 0; i < model.count(); ++i) {
-        QmlGraphicsItem *item = findItem<QmlGraphicsItem>(viewport, "wrapper", i);
+        QDeclarativeItem *item = findItem<QDeclarativeItem>(viewport, "wrapper", i);
         QCOMPARE(item->x(), (i%3)*80.0);
         QCOMPARE(item->y(), (i/3)*60.0);
     }
@@ -275,10 +275,10 @@ void tst_QmlGraphicsGridView::inserted()
 
     QCOMPARE(viewport->childItems().count(), model.count()+1); // assumes all are visible, +1 for the (default) highlight item
 
-    name = findItem<QmlGraphicsText>(viewport, "textName", 0);
+    name = findItem<QDeclarativeText>(viewport, "textName", 0);
     QVERIFY(name != 0);
     QCOMPARE(name->text(), model.name(0));
-    number = findItem<QmlGraphicsText>(viewport, "textNumber", 0);
+    number = findItem<QDeclarativeText>(viewport, "textNumber", 0);
     QVERIFY(number != 0);
     QCOMPARE(number->text(), model.number(0));
 
@@ -286,7 +286,7 @@ void tst_QmlGraphicsGridView::inserted()
 
     // Confirm items positioned correctly
     for (int i = 0; i < model.count(); ++i) {
-        QmlGraphicsItem *item = findItem<QmlGraphicsItem>(viewport, "wrapper", i);
+        QDeclarativeItem *item = findItem<QDeclarativeItem>(viewport, "wrapper", i);
         QVERIFY(item->x() == (i%3)*80);
         QVERIFY(item->y() == (i/3)*60);
     }
@@ -309,23 +309,23 @@ void tst_QmlGraphicsGridView::inserted()
 
 void tst_QmlGraphicsGridView::removed()
 {
-    QmlView *canvas = createView();
+    QDeclarativeView *canvas = createView();
 
     TestModel model;
     for (int i = 0; i < 40; i++)
         model.addItem("Item" + QString::number(i), "");
 
-    QmlContext *ctxt = canvas->rootContext();
+    QDeclarativeContext *ctxt = canvas->rootContext();
     ctxt->setContextProperty("testModel", &model);
     ctxt->setContextProperty("testTopToBottom", QVariant(false));
 
     canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/gridview.qml"));
     qApp->processEvents();
 
-    QmlGraphicsGridView *gridview = findItem<QmlGraphicsGridView>(canvas->rootObject(), "grid");
+    QDeclarativeGridView *gridview = findItem<QDeclarativeGridView>(canvas->rootObject(), "grid");
     QVERIFY(gridview != 0);
 
-    QmlGraphicsItem *viewport = gridview->viewport();
+    QDeclarativeItem *viewport = gridview->viewport();
     QVERIFY(viewport != 0);
 
     model.removeItem(1);
@@ -333,17 +333,17 @@ void tst_QmlGraphicsGridView::removed()
     // let transitions settle.
     QTest::qWait(300);
 
-    QmlGraphicsText *name = findItem<QmlGraphicsText>(viewport, "textName", 1);
+    QDeclarativeText *name = findItem<QDeclarativeText>(viewport, "textName", 1);
     QVERIFY(name != 0);
     QCOMPARE(name->text(), model.name(1));
-    QmlGraphicsText *number = findItem<QmlGraphicsText>(viewport, "textNumber", 1);
+    QDeclarativeText *number = findItem<QDeclarativeText>(viewport, "textNumber", 1);
     QVERIFY(number != 0);
     QCOMPARE(number->text(), model.number(1));
 
     // Confirm items positioned correctly
-    int itemCount = findItems<QmlGraphicsItem>(viewport, "wrapper").count();
+    int itemCount = findItems<QDeclarativeItem>(viewport, "wrapper").count();
     for (int i = 0; i < model.count() && i < itemCount; ++i) {
-        QmlGraphicsItem *item = findItem<QmlGraphicsItem>(viewport, "wrapper", i);
+        QDeclarativeItem *item = findItem<QDeclarativeItem>(viewport, "wrapper", i);
         if (!item) qWarning() << "Item" << i << "not found";
         QVERIFY(item);
         QVERIFY(item->x() == (i%3)*80);
@@ -356,17 +356,17 @@ void tst_QmlGraphicsGridView::removed()
     // let transitions settle.
     QTest::qWait(300);
 
-    name = findItem<QmlGraphicsText>(viewport, "textName", 0);
+    name = findItem<QDeclarativeText>(viewport, "textName", 0);
     QVERIFY(name != 0);
     QCOMPARE(name->text(), model.name(0));
-    number = findItem<QmlGraphicsText>(viewport, "textNumber", 0);
+    number = findItem<QDeclarativeText>(viewport, "textNumber", 0);
     QVERIFY(number != 0);
     QCOMPARE(number->text(), model.number(0));
 
     // Confirm items positioned correctly
-    itemCount = findItems<QmlGraphicsItem>(viewport, "wrapper").count();
+    itemCount = findItems<QDeclarativeItem>(viewport, "wrapper").count();
     for (int i = 0; i < model.count() && i < itemCount; ++i) {
-        QmlGraphicsItem *item = findItem<QmlGraphicsItem>(viewport, "wrapper", i);
+        QDeclarativeItem *item = findItem<QDeclarativeItem>(viewport, "wrapper", i);
         if (!item) qWarning() << "Item" << i << "not found";
         QVERIFY(item);
         QVERIFY(item->x() == (i%3)*80);
@@ -379,9 +379,9 @@ void tst_QmlGraphicsGridView::removed()
     QTest::qWait(300);
 
     // Confirm items positioned correctly
-    itemCount = findItems<QmlGraphicsItem>(viewport, "wrapper").count();
+    itemCount = findItems<QDeclarativeItem>(viewport, "wrapper").count();
     for (int i = 0; i < model.count() && i < itemCount; ++i) {
-        QmlGraphicsItem *item = findItem<QmlGraphicsItem>(viewport, "wrapper", i);
+        QDeclarativeItem *item = findItem<QDeclarativeItem>(viewport, "wrapper", i);
         if (!item) qWarning() << "Item" << i << "not found";
         QVERIFY(item);
         QVERIFY(item->x() == (i%3)*80);
@@ -406,7 +406,7 @@ void tst_QmlGraphicsGridView::removed()
 
     // Confirm items positioned correctly
     for (int i = 6; i < 18; ++i) {
-        QmlGraphicsItem *item = findItem<QmlGraphicsItem>(viewport, "wrapper", i);
+        QDeclarativeItem *item = findItem<QDeclarativeItem>(viewport, "wrapper", i);
         if (!item) qWarning() << "Item" << i << "not found";
         QVERIFY(item);
         QVERIFY(item->x() == (i%3)*80);
@@ -414,7 +414,7 @@ void tst_QmlGraphicsGridView::removed()
     }
 
     // Remove currentIndex
-    QmlGraphicsItem *oldCurrent = gridview->currentItem();
+    QDeclarativeItem *oldCurrent = gridview->currentItem();
     model.removeItem(9);
     QTest::qWait(500);
 
@@ -426,9 +426,9 @@ void tst_QmlGraphicsGridView::removed()
     QTest::qWait(300);
 
     // Confirm items positioned correctly
-    itemCount = findItems<QmlGraphicsItem>(viewport, "wrapper").count();
+    itemCount = findItems<QDeclarativeItem>(viewport, "wrapper").count();
     for (int i = 0; i < model.count() && i < itemCount; ++i) {
-        QmlGraphicsItem *item = findItem<QmlGraphicsItem>(viewport, "wrapper", i);
+        QDeclarativeItem *item = findItem<QDeclarativeItem>(viewport, "wrapper", i);
         if (!item) qWarning() << "Item" << i << "not found";
         QVERIFY(item);
         QVERIFY(item->x() == (i%3)*80);
@@ -469,23 +469,23 @@ void tst_QmlGraphicsGridView::removed()
 
 void tst_QmlGraphicsGridView::moved()
 {
-    QmlView *canvas = createView();
+    QDeclarativeView *canvas = createView();
 
     TestModel model;
     for (int i = 0; i < 30; i++)
         model.addItem("Item" + QString::number(i), "");
 
-    QmlContext *ctxt = canvas->rootContext();
+    QDeclarativeContext *ctxt = canvas->rootContext();
     ctxt->setContextProperty("testModel", &model);
     ctxt->setContextProperty("testTopToBottom", QVariant(false));
 
     canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/gridview.qml"));
     qApp->processEvents();
 
-    QmlGraphicsGridView *gridview = findItem<QmlGraphicsGridView>(canvas->rootObject(), "grid");
+    QDeclarativeGridView *gridview = findItem<QDeclarativeGridView>(canvas->rootObject(), "grid");
     QVERIFY(gridview != 0);
 
-    QmlGraphicsItem *viewport = gridview->viewport();
+    QDeclarativeItem *viewport = gridview->viewport();
     QVERIFY(viewport != 0);
 
     model.moveItem(1, 8);
@@ -493,24 +493,24 @@ void tst_QmlGraphicsGridView::moved()
     // let transitions settle.
     QTest::qWait(300);
 
-    QmlGraphicsText *name = findItem<QmlGraphicsText>(viewport, "textName", 1);
+    QDeclarativeText *name = findItem<QDeclarativeText>(viewport, "textName", 1);
     QVERIFY(name != 0);
     QCOMPARE(name->text(), model.name(1));
-    QmlGraphicsText *number = findItem<QmlGraphicsText>(viewport, "textNumber", 1);
+    QDeclarativeText *number = findItem<QDeclarativeText>(viewport, "textNumber", 1);
     QVERIFY(number != 0);
     QCOMPARE(number->text(), model.number(1));
 
-    name = findItem<QmlGraphicsText>(viewport, "textName", 8);
+    name = findItem<QDeclarativeText>(viewport, "textName", 8);
     QVERIFY(name != 0);
     QCOMPARE(name->text(), model.name(8));
-    number = findItem<QmlGraphicsText>(viewport, "textNumber", 8);
+    number = findItem<QDeclarativeText>(viewport, "textNumber", 8);
     QVERIFY(number != 0);
     QCOMPARE(number->text(), model.number(8));
 
     // Confirm items positioned correctly
-    int itemCount = findItems<QmlGraphicsItem>(viewport, "wrapper").count();
+    int itemCount = findItems<QDeclarativeItem>(viewport, "wrapper").count();
     for (int i = 0; i < model.count() && i < itemCount; ++i) {
-        QmlGraphicsItem *item = findItem<QmlGraphicsItem>(viewport, "wrapper", i);
+        QDeclarativeItem *item = findItem<QDeclarativeItem>(viewport, "wrapper", i);
         if (!item) qWarning() << "Item" << i << "not found";
         QVERIFY(item);
         QVERIFY(item->x() == (i%3)*80);
@@ -526,17 +526,17 @@ void tst_QmlGraphicsGridView::moved()
     QTest::qWait(300);
 
     // Confirm items positioned correctly and indexes correct
-    itemCount = findItems<QmlGraphicsItem>(viewport, "wrapper").count()-1;
+    itemCount = findItems<QDeclarativeItem>(viewport, "wrapper").count()-1;
     for (int i = 6; i < model.count()-6 && i < itemCount+6; ++i) {
-        QmlGraphicsItem *item = findItem<QmlGraphicsItem>(viewport, "wrapper", i);
+        QDeclarativeItem *item = findItem<QDeclarativeItem>(viewport, "wrapper", i);
         if (!item) qWarning() << "Item" << i << "not found";
         QVERIFY(item);
         QCOMPARE(item->x(), qreal((i%3)*80));
         QCOMPARE(item->y(), qreal((i/3)*60));
-        name = findItem<QmlGraphicsText>(viewport, "textName", i);
+        name = findItem<QDeclarativeText>(viewport, "textName", i);
         QVERIFY(name != 0);
         QCOMPARE(name->text(), model.name(i));
-        number = findItem<QmlGraphicsText>(viewport, "textNumber", i);
+        number = findItem<QDeclarativeText>(viewport, "textNumber", i);
         QVERIFY(number != 0);
         QCOMPARE(number->text(), model.number(i));
     }
@@ -549,15 +549,15 @@ void tst_QmlGraphicsGridView::moved()
 
     // Confirm items positioned correctly and indexes correct
     for (int i = 6; i < model.count()-6 && i < itemCount+6; ++i) {
-        QmlGraphicsItem *item = findItem<QmlGraphicsItem>(viewport, "wrapper", i);
+        QDeclarativeItem *item = findItem<QDeclarativeItem>(viewport, "wrapper", i);
         if (!item) qWarning() << "Item" << i << "not found";
         QVERIFY(item);
         QVERIFY(item->x() == (i%3)*80);
         QVERIFY(item->y() == (i/3)*60);
-        name = findItem<QmlGraphicsText>(viewport, "textName", i);
+        name = findItem<QDeclarativeText>(viewport, "textName", i);
         QVERIFY(name != 0);
         QCOMPARE(name->text(), model.name(i));
-        number = findItem<QmlGraphicsText>(viewport, "textNumber", i);
+        number = findItem<QDeclarativeText>(viewport, "textNumber", i);
         QVERIFY(number != 0);
         QCOMPARE(number->text(), model.number(i));
     }
@@ -571,10 +571,10 @@ void tst_QmlGraphicsGridView::currentIndex()
     for (int i = 0; i < 30; i++)
         model.addItem("Item" + QString::number(i), QString::number(i));
 
-    QmlView *canvas = new QmlView(0);
+    QDeclarativeView *canvas = new QDeclarativeView(0);
     canvas->setFixedSize(240,320);
 
-    QmlContext *ctxt = canvas->rootContext();
+    QDeclarativeContext *ctxt = canvas->rootContext();
     ctxt->setContextProperty("testModel", &model);
 
     QString filename(SRCDIR "/data/gridview-initCurrent.qml");
@@ -582,17 +582,17 @@ void tst_QmlGraphicsGridView::currentIndex()
 
     qApp->processEvents();
 
-    QmlGraphicsGridView *gridview = findItem<QmlGraphicsGridView>(canvas->rootObject(), "grid");
+    QDeclarativeGridView *gridview = findItem<QDeclarativeGridView>(canvas->rootObject(), "grid");
     QVERIFY(gridview != 0);
 
-    QmlGraphicsItem *viewport = gridview->viewport();
+    QDeclarativeItem *viewport = gridview->viewport();
     QVERIFY(viewport != 0);
 
     QTest::qWait(500);
 
     // current item should be third item
     QCOMPARE(gridview->currentIndex(), 5);
-    QCOMPARE(gridview->currentItem(), findItem<QmlGraphicsItem>(viewport, "wrapper", 5));
+    QCOMPARE(gridview->currentItem(), findItem<QDeclarativeItem>(viewport, "wrapper", 5));
     QCOMPARE(gridview->currentItem()->y(), gridview->highlightItem()->y());
 
     gridview->moveCurrentIndexRight();
@@ -655,7 +655,7 @@ void tst_QmlGraphicsGridView::currentIndex()
     QTest::keyClick(canvas, Qt::Key_Up);
     QCOMPARE(gridview->currentIndex(), 0);
 
-    gridview->setFlow(QmlGraphicsGridView::TopToBottom);
+    gridview->setFlow(QDeclarativeGridView::TopToBottom);
 
     QTest::keyClick(canvas, Qt::Key_Right);
     QCOMPARE(gridview->currentIndex(), 5);
@@ -689,37 +689,37 @@ void tst_QmlGraphicsGridView::currentIndex()
 
 void tst_QmlGraphicsGridView::changeFlow()
 {
-    QmlView *canvas = createView();
+    QDeclarativeView *canvas = createView();
 
     TestModel model;
     for (int i = 0; i < 30; i++)
         model.addItem("Item" + QString::number(i), QString::number(i));
 
-    QmlContext *ctxt = canvas->rootContext();
+    QDeclarativeContext *ctxt = canvas->rootContext();
     ctxt->setContextProperty("testModel", &model);
     ctxt->setContextProperty("testTopToBottom", QVariant(false));
 
     canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/gridview.qml"));
     qApp->processEvents();
 
-    QmlGraphicsGridView *gridview = findItem<QmlGraphicsGridView>(canvas->rootObject(), "grid");
+    QDeclarativeGridView *gridview = findItem<QDeclarativeGridView>(canvas->rootObject(), "grid");
     QVERIFY(gridview != 0);
 
-    QmlGraphicsItem *viewport = gridview->viewport();
+    QDeclarativeItem *viewport = gridview->viewport();
     QVERIFY(viewport != 0);
 
     // Confirm items positioned correctly and indexes correct
-    int itemCount = findItems<QmlGraphicsItem>(viewport, "wrapper").count();
+    int itemCount = findItems<QDeclarativeItem>(viewport, "wrapper").count();
     for (int i = 0; i < model.count() && i < itemCount; ++i) {
-        QmlGraphicsItem *item = findItem<QmlGraphicsItem>(viewport, "wrapper", i);
+        QDeclarativeItem *item = findItem<QDeclarativeItem>(viewport, "wrapper", i);
         if (!item) qWarning() << "Item" << i << "not found";
         QVERIFY(item);
         QCOMPARE(item->x(), qreal((i%3)*80));
         QCOMPARE(item->y(), qreal((i/3)*60));
-        QmlGraphicsText *name = findItem<QmlGraphicsText>(viewport, "textName", i);
+        QDeclarativeText *name = findItem<QDeclarativeText>(viewport, "textName", i);
         QVERIFY(name != 0);
         QCOMPARE(name->text(), model.name(i));
-        QmlGraphicsText *number = findItem<QmlGraphicsText>(viewport, "textNumber", i);
+        QDeclarativeText *number = findItem<QDeclarativeText>(viewport, "textNumber", i);
         QVERIFY(number != 0);
         QCOMPARE(number->text(), model.number(i));
     }
@@ -728,17 +728,17 @@ void tst_QmlGraphicsGridView::changeFlow()
     QTest::qWait(500);
 
     // Confirm items positioned correctly and indexes correct
-    itemCount = findItems<QmlGraphicsItem>(viewport, "wrapper").count();
+    itemCount = findItems<QDeclarativeItem>(viewport, "wrapper").count();
     for (int i = 0; i < model.count() && i < itemCount; ++i) {
-        QmlGraphicsItem *item = findItem<QmlGraphicsItem>(viewport, "wrapper", i);
+        QDeclarativeItem *item = findItem<QDeclarativeItem>(viewport, "wrapper", i);
         if (!item) qWarning() << "Item" << i << "not found";
         QVERIFY(item);
         QCOMPARE(item->x(), qreal((i/5)*80));
         QCOMPARE(item->y(), qreal((i%5)*60));
-        QmlGraphicsText *name = findItem<QmlGraphicsText>(viewport, "textName", i);
+        QDeclarativeText *name = findItem<QDeclarativeText>(viewport, "textName", i);
         QVERIFY(name != 0);
         QCOMPARE(name->text(), model.name(i));
-        QmlGraphicsText *number = findItem<QmlGraphicsText>(viewport, "textNumber", i);
+        QDeclarativeText *number = findItem<QDeclarativeText>(viewport, "textNumber", i);
         QVERIFY(number != 0);
         QCOMPARE(number->text(), model.number(i));
     }
@@ -748,9 +748,9 @@ void tst_QmlGraphicsGridView::changeFlow()
 
 void tst_QmlGraphicsGridView::defaultValues()
 {
-    QmlEngine engine;
-    QmlComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/gridview3.qml"));
-    QmlGraphicsGridView *obj = qobject_cast<QmlGraphicsGridView*>(c.create());
+    QDeclarativeEngine engine;
+    QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/gridview3.qml"));
+    QDeclarativeGridView *obj = qobject_cast<QDeclarativeGridView*>(c.create());
 
     QVERIFY(obj != 0);
     QVERIFY(obj->model() == QVariant());
@@ -771,9 +771,9 @@ void tst_QmlGraphicsGridView::defaultValues()
 
 void tst_QmlGraphicsGridView::properties()
 {
-    QmlEngine engine;
-    QmlComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/gridview2.qml"));
-    QmlGraphicsGridView *obj = qobject_cast<QmlGraphicsGridView*>(c.create());
+    QDeclarativeEngine engine;
+    QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/gridview2.qml"));
+    QDeclarativeGridView *obj = qobject_cast<QDeclarativeGridView*>(c.create());
 
     QVERIFY(obj != 0);
     QVERIFY(obj->model() != QVariant());
@@ -794,29 +794,29 @@ void tst_QmlGraphicsGridView::properties()
 
 void tst_QmlGraphicsGridView::positionViewAtIndex()
 {
-    QmlView *canvas = createView();
+    QDeclarativeView *canvas = createView();
 
     TestModel model;
     for (int i = 0; i < 40; i++)
         model.addItem("Item" + QString::number(i), "");
 
-    QmlContext *ctxt = canvas->rootContext();
+    QDeclarativeContext *ctxt = canvas->rootContext();
     ctxt->setContextProperty("testModel", &model);
     ctxt->setContextProperty("testTopToBottom", QVariant(false));
 
     canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/gridview.qml"));
     qApp->processEvents();
 
-    QmlGraphicsGridView *gridview = findItem<QmlGraphicsGridView>(canvas->rootObject(), "grid");
+    QDeclarativeGridView *gridview = findItem<QDeclarativeGridView>(canvas->rootObject(), "grid");
     QVERIFY(gridview != 0);
 
-    QmlGraphicsItem *viewport = gridview->viewport();
+    QDeclarativeItem *viewport = gridview->viewport();
     QVERIFY(viewport != 0);
 
     // Confirm items positioned correctly
-    int itemCount = findItems<QmlGraphicsItem>(viewport, "wrapper").count();
+    int itemCount = findItems<QDeclarativeItem>(viewport, "wrapper").count();
     for (int i = 0; i < model.count() && i < itemCount-1; ++i) {
-        QmlGraphicsItem *item = findItem<QmlGraphicsItem>(viewport, "wrapper", i);
+        QDeclarativeItem *item = findItem<QDeclarativeItem>(viewport, "wrapper", i);
         if (!item) qWarning() << "Item" << i << "not found";
         QVERIFY(item);
         QCOMPARE(item->x(), (i%3)*80.);
@@ -828,9 +828,9 @@ void tst_QmlGraphicsGridView::positionViewAtIndex()
     QCOMPARE(gridview->viewportY(), 60.);
 
     // Confirm items positioned correctly
-    itemCount = findItems<QmlGraphicsItem>(viewport, "wrapper").count();
+    itemCount = findItems<QDeclarativeItem>(viewport, "wrapper").count();
     for (int i = 3; i < model.count() && i < itemCount-3-1; ++i) {
-        QmlGraphicsItem *item = findItem<QmlGraphicsItem>(viewport, "wrapper", i);
+        QDeclarativeItem *item = findItem<QDeclarativeItem>(viewport, "wrapper", i);
         if (!item) qWarning() << "Item" << i << "not found";
         QVERIFY(item);
         QCOMPARE(item->x(), (i%3)*80.);
@@ -842,9 +842,9 @@ void tst_QmlGraphicsGridView::positionViewAtIndex()
     QCOMPARE(gridview->viewportY(), 420.);
 
     // Confirm items positioned correctly
-    itemCount = findItems<QmlGraphicsItem>(viewport, "wrapper").count();
+    itemCount = findItems<QDeclarativeItem>(viewport, "wrapper").count();
     for (int i = 22; i < model.count() && i < itemCount-22-1; ++i) {
-        QmlGraphicsItem *item = findItem<QmlGraphicsItem>(viewport, "wrapper", i);
+        QDeclarativeItem *item = findItem<QDeclarativeItem>(viewport, "wrapper", i);
         if (!item) qWarning() << "Item" << i << "not found";
         QVERIFY(item);
         QCOMPARE(item->x(), (i%3)*80.);
@@ -856,9 +856,9 @@ void tst_QmlGraphicsGridView::positionViewAtIndex()
     QCOMPARE(gridview->viewportY(), 520.);
 
     // Confirm items positioned correctly
-    itemCount = findItems<QmlGraphicsItem>(viewport, "wrapper").count();
+    itemCount = findItems<QDeclarativeItem>(viewport, "wrapper").count();
     for (int i = 24; i < model.count() && i < itemCount-24-1; ++i) {
-        QmlGraphicsItem *item = findItem<QmlGraphicsItem>(viewport, "wrapper", i);
+        QDeclarativeItem *item = findItem<QDeclarativeItem>(viewport, "wrapper", i);
         if (!item) qWarning() << "Item" << i << "not found";
         QVERIFY(item);
         QCOMPARE(item->x(), (i%3)*80.);
@@ -870,9 +870,9 @@ void tst_QmlGraphicsGridView::positionViewAtIndex()
     QCOMPARE(gridview->viewportY(), 0.);
 
     // Confirm items positioned correctly
-    itemCount = findItems<QmlGraphicsItem>(viewport, "wrapper").count();
+    itemCount = findItems<QDeclarativeItem>(viewport, "wrapper").count();
     for (int i = 0; i < model.count() && i < itemCount-1; ++i) {
-        QmlGraphicsItem *item = findItem<QmlGraphicsItem>(viewport, "wrapper", i);
+        QDeclarativeItem *item = findItem<QDeclarativeItem>(viewport, "wrapper", i);
         if (!item) qWarning() << "Item" << i << "not found";
         QVERIFY(item);
         QCOMPARE(item->x(), (i%3)*80.);
@@ -882,9 +882,9 @@ void tst_QmlGraphicsGridView::positionViewAtIndex()
     delete canvas;
 }
 
-QmlView *tst_QmlGraphicsGridView::createView()
+QDeclarativeView *tst_QmlGraphicsGridView::createView()
 {
-    QmlView *canvas = new QmlView(0);
+    QDeclarativeView *canvas = new QDeclarativeView(0);
     canvas->setFixedSize(240,320);
 
     return canvas;
@@ -900,13 +900,13 @@ T *tst_QmlGraphicsGridView::findItem(QGraphicsObject *parent, const QString &obj
     const QMetaObject &mo = T::staticMetaObject;
     //qDebug() << parent->childItems().count() << "children";
     for (int i = 0; i < parent->childItems().count(); ++i) {
-        QmlGraphicsItem *item = qobject_cast<QmlGraphicsItem*>(parent->childItems().at(i));
+        QDeclarativeItem *item = qobject_cast<QDeclarativeItem*>(parent->childItems().at(i));
         if(!item)
             continue;
         //qDebug() << "try" << item;
         if (mo.cast(item) && (objectName.isEmpty() || item->objectName() == objectName)) {
             if (index != -1) {
-                QmlContext *context = QmlEngine::contextForObject(item);
+                QDeclarativeContext *context = QDeclarativeEngine::contextForObject(item);
                 if (context) {
                     if (context->contextProperty("index").toInt() == index) {
                         return static_cast<T*>(item);
@@ -931,7 +931,7 @@ QList<T*> tst_QmlGraphicsGridView::findItems(QGraphicsObject *parent, const QStr
     const QMetaObject &mo = T::staticMetaObject;
     //qDebug() << parent->childItems().count() << "children";
     for (int i = 0; i < parent->childItems().count(); ++i) {
-        QmlGraphicsItem *item = qobject_cast<QmlGraphicsItem*>(parent->childItems().at(i));
+        QDeclarativeItem *item = qobject_cast<QDeclarativeItem*>(parent->childItems().at(i));
         if(!item)
             continue;
         //qDebug() << "try" << item;
@@ -945,14 +945,14 @@ QList<T*> tst_QmlGraphicsGridView::findItems(QGraphicsObject *parent, const QStr
     return items;
 }
 
-void tst_QmlGraphicsGridView::dumpTree(QmlGraphicsItem *parent, int depth)
+void tst_QmlGraphicsGridView::dumpTree(QDeclarativeItem *parent, int depth)
 {
     static QString padding("                       ");
     for (int i = 0; i < parent->childItems().count(); ++i) {
-        QmlGraphicsItem *item = qobject_cast<QmlGraphicsItem*>(parent->childItems().at(i));
+        QDeclarativeItem *item = qobject_cast<QDeclarativeItem*>(parent->childItems().at(i));
         if(!item)
             continue;
-        QmlContext *context = QmlEngine::contextForObject(item);
+        QDeclarativeContext *context = QDeclarativeEngine::contextForObject(item);
         qDebug() << padding.left(depth*2) << item << (context ? context->contextProperty("index").toInt() : -1);
         dumpTree(item, depth+1);
     }
@@ -961,4 +961,4 @@ void tst_QmlGraphicsGridView::dumpTree(QmlGraphicsItem *parent, int depth)
 
 QTEST_MAIN(tst_QmlGraphicsGridView)
 
-#include "tst_qmlgraphicsgridview.moc"
+#include "tst_qdeclarativegridview.moc"
diff --git a/tests/auto/declarative/qmlgraphicsimage/data/colors.png b/tests/auto/declarative/qdeclarativeimage/data/colors.png
index dfb62f3..dfb62f3 100644
--- a/tests/auto/declarative/qmlgraphicsimage/data/colors.png
+++ b/tests/auto/declarative/qdeclarativeimage/data/colors.png
diff --git a/tests/auto/declarative/qmlgraphicsimage/qmlgraphicsimage.pro b/tests/auto/declarative/qdeclarativeimage/qdeclarativeimage.pro
index b5f7f83..7634c12 100644
--- a/tests/auto/declarative/qmlgraphicsimage/qmlgraphicsimage.pro
+++ b/tests/auto/declarative/qdeclarativeimage/qdeclarativeimage.pro
@@ -3,7 +3,7 @@ contains(QT_CONFIG,declarative): QT += declarative gui network
 macx:CONFIG -= app_bundle
 
 HEADERS += ../shared/testhttpserver.h
-SOURCES += tst_qmlgraphicsimage.cpp ../shared/testhttpserver.cpp
+SOURCES += tst_qdeclarativeimage.cpp ../shared/testhttpserver.cpp
 
 # Define SRCDIR equal to test's source directory
 DEFINES += SRCDIR=\\\"$$PWD\\\"
diff --git a/tests/auto/declarative/qmlgraphicsimage/tst_qmlgraphicsimage.cpp b/tests/auto/declarative/qdeclarativeimage/tst_qdeclarativeimage.cpp
index 503b05e..097e5fc 100644
--- a/tests/auto/declarative/qmlgraphicsimage/tst_qmlgraphicsimage.cpp
+++ b/tests/auto/declarative/qdeclarativeimage/tst_qdeclarativeimage.cpp
@@ -44,12 +44,12 @@
 #include <QTcpSocket>
 #include <QDir>
 
-#include <QtDeclarative/qmlengine.h>
-#include <QtDeclarative/qmlcomponent.h>
-#include <private/qmlgraphicsimage_p.h>
-#include <private/qmlgraphicsimagebase_p.h>
-#include <private/qmlgraphicsloader_p.h>
-#include <QtDeclarative/qmlcontext.h>
+#include <QtDeclarative/qdeclarativeengine.h>
+#include <QtDeclarative/qdeclarativecomponent.h>
+#include <private/qdeclarativeimage_p.h>
+#include <private/qdeclarativeimagebase_p.h>
+#include <private/qdeclarativeloader_p.h>
+#include <QtDeclarative/qdeclarativecontext.h>
 
 #include "../shared/testhttpserver.h"
 
@@ -84,7 +84,7 @@ private slots:
     void pixmap();
 
 private:
-    QmlEngine engine;
+    QDeclarativeEngine engine;
 };
 
 tst_qmlgraphicsimage::tst_qmlgraphicsimage()
@@ -94,15 +94,15 @@ tst_qmlgraphicsimage::tst_qmlgraphicsimage()
 void tst_qmlgraphicsimage::noSource()
 {
     QString componentStr = "import Qt 4.6\nImage { source: \"\" }";
-    QmlComponent component(&engine);
+    QDeclarativeComponent component(&engine);
     component.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
-    QmlGraphicsImage *obj = qobject_cast<QmlGraphicsImage*>(component.create());
+    QDeclarativeImage *obj = qobject_cast<QDeclarativeImage*>(component.create());
     QVERIFY(obj != 0);
     QCOMPARE(obj->source(), QUrl());
-    QVERIFY(obj->status() == QmlGraphicsImage::Null);
+    QVERIFY(obj->status() == QDeclarativeImage::Null);
     QCOMPARE(obj->width(), 0.);
     QCOMPARE(obj->height(), 0.);
-    QCOMPARE(obj->fillMode(), QmlGraphicsImage::Stretch);
+    QCOMPARE(obj->fillMode(), QDeclarativeImage::Stretch);
     QCOMPARE(obj->progress(), 0.0);
 
     delete obj;
@@ -138,24 +138,24 @@ void tst_qmlgraphicsimage::imageSource()
         QTest::ignoreMessage(QtWarningMsg, error.toUtf8());
 
     QString componentStr = "import Qt 4.6\nImage { source: \"" + source + "\" }";
-    QmlComponent component(&engine);
+    QDeclarativeComponent component(&engine);
     component.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
-    QmlGraphicsImage *obj = qobject_cast<QmlGraphicsImage*>(component.create());
+    QDeclarativeImage *obj = qobject_cast<QDeclarativeImage*>(component.create());
     QVERIFY(obj != 0);
     
     if (remote)
-        TRY_WAIT(obj->status() == QmlGraphicsImage::Loading);
+        TRY_WAIT(obj->status() == QDeclarativeImage::Loading);
 
     QCOMPARE(obj->source(), remote ? source : QUrl(source));
 
     if (error.isEmpty()) {
-        TRY_WAIT(obj->status() == QmlGraphicsImage::Ready);
+        TRY_WAIT(obj->status() == QDeclarativeImage::Ready);
         QCOMPARE(obj->width(), 120.);
         QCOMPARE(obj->height(), 120.);
-        QCOMPARE(obj->fillMode(), QmlGraphicsImage::Stretch);
+        QCOMPARE(obj->fillMode(), QDeclarativeImage::Stretch);
         QCOMPARE(obj->progress(), 1.0);
     } else {
-        TRY_WAIT(obj->status() == QmlGraphicsImage::Error);
+        TRY_WAIT(obj->status() == QDeclarativeImage::Error);
     }
 
     delete obj;
@@ -164,20 +164,20 @@ void tst_qmlgraphicsimage::imageSource()
 void tst_qmlgraphicsimage::clearSource()
 {
     QString componentStr = "import Qt 4.6\nImage { source: srcImage }";
-    QmlContext *ctxt = engine.rootContext();
+    QDeclarativeContext *ctxt = engine.rootContext();
     ctxt->setContextProperty("srcImage", QUrl::fromLocalFile(SRCDIR "/data/colors.png"));
-    QmlComponent component(&engine);
+    QDeclarativeComponent component(&engine);
     component.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
-    QmlGraphicsImage *obj = qobject_cast<QmlGraphicsImage*>(component.create());
+    QDeclarativeImage *obj = qobject_cast<QDeclarativeImage*>(component.create());
     QVERIFY(obj != 0);
-    QVERIFY(obj->status() == QmlGraphicsImage::Ready);
+    QVERIFY(obj->status() == QDeclarativeImage::Ready);
     QCOMPARE(obj->width(), 120.);
     QCOMPARE(obj->height(), 120.);
     QCOMPARE(obj->progress(), 1.0);
 
     ctxt->setContextProperty("srcImage", "");
     QVERIFY(obj->source().isEmpty());
-    QVERIFY(obj->status() == QmlGraphicsImage::Null);
+    QVERIFY(obj->status() == QDeclarativeImage::Null);
     QCOMPARE(obj->width(), 0.);
     QCOMPARE(obj->height(), 0.);
     QCOMPARE(obj->progress(), 0.0);
@@ -186,13 +186,13 @@ void tst_qmlgraphicsimage::clearSource()
 void tst_qmlgraphicsimage::resized()
 {
     QString componentStr = "import Qt 4.6\nImage { source: \"" SRCDIR "/data/colors.png\"; width: 300; height: 300 }";
-    QmlComponent component(&engine);
+    QDeclarativeComponent component(&engine);
     component.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
-    QmlGraphicsImage *obj = qobject_cast<QmlGraphicsImage*>(component.create());
+    QDeclarativeImage *obj = qobject_cast<QDeclarativeImage*>(component.create());
     QVERIFY(obj != 0);
     QCOMPARE(obj->width(), 300.);
     QCOMPARE(obj->height(), 300.);
-    QCOMPARE(obj->fillMode(), QmlGraphicsImage::Stretch);
+    QCOMPARE(obj->fillMode(), QDeclarativeImage::Stretch);
 
     delete obj;
 }
@@ -200,14 +200,14 @@ void tst_qmlgraphicsimage::resized()
 void tst_qmlgraphicsimage::smooth()
 {
     QString componentStr = "import Qt 4.6\nImage { source: \"" SRCDIR "/data/colors.png\"; smooth: true; width: 300; height: 300 }";
-    QmlComponent component(&engine);
+    QDeclarativeComponent component(&engine);
     component.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
-    QmlGraphicsImage *obj = qobject_cast<QmlGraphicsImage*>(component.create());
+    QDeclarativeImage *obj = qobject_cast<QDeclarativeImage*>(component.create());
     QVERIFY(obj != 0);
     QCOMPARE(obj->width(), 300.);
     QCOMPARE(obj->height(), 300.);
     QCOMPARE(obj->smooth(), true);
-    QCOMPARE(obj->fillMode(), QmlGraphicsImage::Stretch);
+    QCOMPARE(obj->fillMode(), QDeclarativeImage::Stretch);
 
     delete obj;
 }
@@ -217,19 +217,19 @@ void tst_qmlgraphicsimage::pixmap()
     QString componentStr = "import Qt 4.6\nImage { pixmap: testPixmap }";
 
     QPixmap pixmap;
-    QmlContext *ctxt = engine.rootContext();
+    QDeclarativeContext *ctxt = engine.rootContext();
     ctxt->setContextProperty("testPixmap", pixmap);
 
-    QmlComponent component(&engine);
+    QDeclarativeComponent component(&engine);
     component.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
 
-    QmlGraphicsImage *obj = qobject_cast<QmlGraphicsImage*>(component.create());
+    QDeclarativeImage *obj = qobject_cast<QDeclarativeImage*>(component.create());
     QVERIFY(obj != 0);
     QCOMPARE(obj->source(), QUrl());
-    QVERIFY(obj->status() == QmlGraphicsImage::Null);
+    QVERIFY(obj->status() == QDeclarativeImage::Null);
     QCOMPARE(obj->width(), 0.);
     QCOMPARE(obj->height(), 0.);
-    QCOMPARE(obj->fillMode(), QmlGraphicsImage::Stretch);
+    QCOMPARE(obj->fillMode(), QDeclarativeImage::Stretch);
     QCOMPARE(obj->progress(), 0.0);
     QVERIFY(obj->pixmap().isNull());
 
@@ -237,11 +237,11 @@ void tst_qmlgraphicsimage::pixmap()
     ctxt->setContextProperty("testPixmap", pixmap);
     QCOMPARE(obj->width(), 120.);
     QCOMPARE(obj->height(), 120.);
-    QVERIFY(obj->status() == QmlGraphicsImage::Ready);
+    QVERIFY(obj->status() == QDeclarativeImage::Ready);
 
     delete obj;
 }
 
 QTEST_MAIN(tst_qmlgraphicsimage)
 
-#include "tst_qmlgraphicsimage.moc"
+#include "tst_qdeclarativeimage.moc"
diff --git a/tests/auto/declarative/qmlpixmapcache/data/exists.png b/tests/auto/declarative/qdeclarativeimageprovider/data/exists.png
index 399bd0b..399bd0b 100644
--- a/tests/auto/declarative/qmlpixmapcache/data/exists.png
+++ b/tests/auto/declarative/qdeclarativeimageprovider/data/exists.png
diff --git a/tests/auto/declarative/qmlpixmapcache/data/exists1.png b/tests/auto/declarative/qdeclarativeimageprovider/data/exists1.png
index 399bd0b..399bd0b 100644
--- a/tests/auto/declarative/qmlpixmapcache/data/exists1.png
+++ b/tests/auto/declarative/qdeclarativeimageprovider/data/exists1.png
diff --git a/tests/auto/declarative/qmlpixmapcache/data/exists2.png b/tests/auto/declarative/qdeclarativeimageprovider/data/exists2.png
index 399bd0b..399bd0b 100644
--- a/tests/auto/declarative/qmlpixmapcache/data/exists2.png
+++ b/tests/auto/declarative/qdeclarativeimageprovider/data/exists2.png
diff --git a/tests/auto/declarative/qmlimageprovider/qmlimageprovider.pro b/tests/auto/declarative/qdeclarativeimageprovider/qdeclarativeimageprovider.pro
index 0ef7739..a4d3eb2 100644
--- a/tests/auto/declarative/qmlimageprovider/qmlimageprovider.pro
+++ b/tests/auto/declarative/qdeclarativeimageprovider/qdeclarativeimageprovider.pro
@@ -3,7 +3,7 @@ contains(QT_CONFIG,declarative): QT += declarative
 QT += network
 macx:CONFIG -= app_bundle
 
-SOURCES += tst_qmlimageprovider.cpp
+SOURCES += tst_qdeclarativeimageprovider.cpp
 
 # QMAKE_CXXFLAGS = -fprofile-arcs -ftest-coverage
 # LIBS += -lgcov
diff --git a/tests/auto/declarative/qmlimageprovider/tst_qmlimageprovider.cpp b/tests/auto/declarative/qdeclarativeimageprovider/tst_qdeclarativeimageprovider.cpp
index d07558a..704899d 100644
--- a/tests/auto/declarative/qmlimageprovider/tst_qmlimageprovider.cpp
+++ b/tests/auto/declarative/qdeclarativeimageprovider/tst_qdeclarativeimageprovider.cpp
@@ -40,11 +40,11 @@
 ****************************************************************************/
 #include <qtest.h>
 #include <QtTest/QtTest>
-#include <QtDeclarative/qmlengine.h>
-#include <QtDeclarative/qmlimageprovider.h>
-#include <private/qmlgraphicsimage_p.h>
+#include <QtDeclarative/qdeclarativeengine.h>
+#include <QtDeclarative/qdeclarativeimageprovider.h>
+#include <private/qdeclarativeimage_p.h>
 
-// QmlImageProvider::request() is run in an idle thread where possible
+// QDeclarativeImageProvider::request() is run in an idle thread where possible
 // Be generous in our timeout.
 #define TRY_WAIT(expr) \
     do { \
@@ -70,10 +70,10 @@ private slots:
     void removeProvider();
 
 private:
-    QmlEngine engine;
+    QDeclarativeEngine engine;
 };
 
-class TestProvider : public QmlImageProvider
+class TestProvider : public QDeclarativeImageProvider
 {
 public:
     QImage request(const QString &id) {
@@ -107,23 +107,23 @@ void tst_qmlimageprovider::imageSource()
     QVERIFY(engine.imageProvider("test") != 0);
 
     QString componentStr = "import Qt 4.6\nImage { source: \"" + source + "\" }";
-    QmlComponent component(&engine);
+    QDeclarativeComponent component(&engine);
     component.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
-    QmlGraphicsImage *obj = qobject_cast<QmlGraphicsImage*>(component.create());
+    QDeclarativeImage *obj = qobject_cast<QDeclarativeImage*>(component.create());
     QVERIFY(obj != 0);
 
-    TRY_WAIT(obj->status() == QmlGraphicsImage::Loading);
+    TRY_WAIT(obj->status() == QDeclarativeImage::Loading);
 
     QCOMPARE(obj->source(), QUrl(source));
 
     if (error.isEmpty()) {
-        TRY_WAIT(obj->status() == QmlGraphicsImage::Ready);
+        TRY_WAIT(obj->status() == QDeclarativeImage::Ready);
         QCOMPARE(obj->width(), 100.);
         QCOMPARE(obj->height(), 100.);
-        QCOMPARE(obj->fillMode(), QmlGraphicsImage::Stretch);
+        QCOMPARE(obj->fillMode(), QDeclarativeImage::Stretch);
         QCOMPARE(obj->progress(), 1.0);
     } else {
-        TRY_WAIT(obj->status() == QmlGraphicsImage::Error);
+        TRY_WAIT(obj->status() == QDeclarativeImage::Error);
     }
 
     delete obj;
@@ -136,13 +136,13 @@ void tst_qmlimageprovider::removeProvider()
 
     // add provider, confirm it works
     QString componentStr = "import Qt 4.6\nImage { source: \"image://test2/exists1.png\" }";
-    QmlComponent component(&engine);
+    QDeclarativeComponent component(&engine);
     component.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
-    QmlGraphicsImage *obj = qobject_cast<QmlGraphicsImage*>(component.create());
+    QDeclarativeImage *obj = qobject_cast<QDeclarativeImage*>(component.create());
     QVERIFY(obj != 0);
 
-    TRY_WAIT(obj->status() == QmlGraphicsImage::Loading);
-    TRY_WAIT(obj->status() == QmlGraphicsImage::Ready);
+    TRY_WAIT(obj->status() == QDeclarativeImage::Loading);
+    TRY_WAIT(obj->status() == QDeclarativeImage::Ready);
 
     QCOMPARE(obj->width(), 100.0);
 
@@ -154,8 +154,8 @@ void tst_qmlimageprovider::removeProvider()
 
     obj->setSource(QUrl("image://test2/exists2.png"));
 
-    TRY_WAIT(obj->status() == QmlGraphicsImage::Loading);
-    TRY_WAIT(obj->status() == QmlGraphicsImage::Error);
+    TRY_WAIT(obj->status() == QDeclarativeImage::Loading);
+    TRY_WAIT(obj->status() == QDeclarativeImage::Error);
 
     delete obj;
 }
@@ -163,4 +163,4 @@ void tst_qmlimageprovider::removeProvider()
 
 QTEST_MAIN(tst_qmlimageprovider)
 
-#include "tst_qmlimageprovider.moc"
+#include "tst_qdeclarativeimageprovider.moc"
diff --git a/tests/auto/declarative/qmlinfo/data/NestedObject.qml b/tests/auto/declarative/qdeclarativeinfo/data/NestedObject.qml
index cd5b426..cd5b426 100644
--- a/tests/auto/declarative/qmlinfo/data/NestedObject.qml
+++ b/tests/auto/declarative/qdeclarativeinfo/data/NestedObject.qml
diff --git a/tests/auto/declarative/qmlinfo/data/nestedQmlObject.qml b/tests/auto/declarative/qdeclarativeinfo/data/nestedQmlObject.qml
index a2ce78a..a2ce78a 100644
--- a/tests/auto/declarative/qmlinfo/data/nestedQmlObject.qml
+++ b/tests/auto/declarative/qdeclarativeinfo/data/nestedQmlObject.qml
diff --git a/tests/auto/declarative/qmlinfo/data/qmlObject.qml b/tests/auto/declarative/qdeclarativeinfo/data/qdeclarativeObject.qml
index ce05f89..ce05f89 100644
--- a/tests/auto/declarative/qmlinfo/data/qmlObject.qml
+++ b/tests/auto/declarative/qdeclarativeinfo/data/qdeclarativeObject.qml
diff --git a/tests/auto/declarative/qmldom/qmldom.pro b/tests/auto/declarative/qdeclarativeinfo/qdeclarativeinfo.pro
index 7ff317d..015c094 100644
--- a/tests/auto/declarative/qmldom/qmldom.pro
+++ b/tests/auto/declarative/qdeclarativeinfo/qdeclarativeinfo.pro
@@ -2,6 +2,6 @@ load(qttest_p4)
 contains(QT_CONFIG,declarative): QT += declarative
 macx:CONFIG -= app_bundle
 
-SOURCES += tst_qmldom.cpp
+SOURCES += tst_qdeclarativeinfo.cpp
 
 DEFINES += SRCDIR=\\\"$$PWD\\\"
diff --git a/tests/auto/declarative/qmlinfo/tst_qmlinfo.cpp b/tests/auto/declarative/qdeclarativeinfo/tst_qdeclarativeinfo.cpp
index e4da993..dc3e816 100644
--- a/tests/auto/declarative/qmlinfo/tst_qmlinfo.cpp
+++ b/tests/auto/declarative/qdeclarativeinfo/tst_qdeclarativeinfo.cpp
@@ -40,11 +40,11 @@
 ****************************************************************************/
 
 #include <qtest.h>
-#include <QmlEngine>
-#include <QmlComponent>
+#include <QDeclarativeEngine>
+#include <QDeclarativeComponent>
 #include <QPushButton>
-#include <QmlContext>
-#include <qmlinfo.h>
+#include <QDeclarativeContext>
+#include <qdeclarativeinfo.h>
 
 class tst_qmlinfo : public QObject
 {
@@ -60,7 +60,7 @@ private slots:
     void nonQmlContextedObject();
 
 private:
-    QmlEngine engine;
+    QDeclarativeEngine engine;
 };
 
 inline QUrl TEST_FILE(const QString &filename)
@@ -70,7 +70,7 @@ inline QUrl TEST_FILE(const QString &filename)
 
 void tst_qmlinfo::qmlObject()
 {
-    QmlComponent component(&engine, TEST_FILE("qmlObject.qml"));
+    QDeclarativeComponent component(&engine, TEST_FILE("qmlObject.qml"));
 
     QObject *object = component.create();
     QVERIFY(object != 0);
@@ -89,7 +89,7 @@ void tst_qmlinfo::qmlObject()
 
 void tst_qmlinfo::nestedQmlObject()
 {
-    QmlComponent component(&engine, TEST_FILE("nestedQmlObject.qml"));
+    QDeclarativeComponent component(&engine, TEST_FILE("nestedQmlObject.qml"));
 
     QObject *object = component.create();
     QVERIFY(object != 0);
@@ -128,12 +128,12 @@ void tst_qmlinfo::nullObject()
 void tst_qmlinfo::nonQmlContextedObject()
 {
     QObject object;
-    QmlContext context(&engine);
-    QmlEngine::setContextForObject(&object, &context);
+    QDeclarativeContext context(&engine);
+    QDeclarativeEngine::setContextForObject(&object, &context);
     QTest::ignoreMessage(QtWarningMsg, "QML QtObject (unknown location) Test Message");
     qmlInfo(&object) << "Test Message";
 }
 
 QTEST_MAIN(tst_qmlinfo)
 
-#include "tst_qmlinfo.moc"
+#include "tst_qdeclarativeinfo.moc"
diff --git a/tests/auto/declarative/qmlinstruction/qmlinstruction.pro b/tests/auto/declarative/qdeclarativeinstruction/qdeclarativeinstruction.pro
index 41be488..b8f7d27 100644
--- a/tests/auto/declarative/qmlinstruction/qmlinstruction.pro
+++ b/tests/auto/declarative/qdeclarativeinstruction/qdeclarativeinstruction.pro
@@ -1,6 +1,6 @@
 load(qttest_p4)
 contains(QT_CONFIG,declarative): QT += declarative script
-SOURCES += tst_qmlinstruction.cpp
+SOURCES += tst_qdeclarativeinstruction.cpp
 macx:CONFIG -= app_bundle
 
 DEFINES += SRCDIR=\\\"$$PWD\\\"
diff --git a/tests/auto/declarative/qmlinstruction/tst_qmlinstruction.cpp b/tests/auto/declarative/qdeclarativeinstruction/tst_qdeclarativeinstruction.cpp
index 38d024a..71495f3 100644
--- a/tests/auto/declarative/qmlinstruction/tst_qmlinstruction.cpp
+++ b/tests/auto/declarative/qdeclarativeinstruction/tst_qdeclarativeinstruction.cpp
@@ -40,7 +40,7 @@
 ****************************************************************************/
 
 #include <qtest.h>
-#include <private/qmlcompiler_p.h>
+#include <private/qdeclarativecompiler_p.h>
 
 class tst_qmlinstruction : public QObject
 {
@@ -60,11 +60,11 @@ static void msgHandler(QtMsgType, const char *msg)
 
 void tst_qmlinstruction::dump()
 {
-    QmlCompiledData *data = new QmlCompiledData(0);
+    QDeclarativeCompiledData *data = new QDeclarativeCompiledData(0);
     {
-        QmlInstruction i;
+        QDeclarativeInstruction i;
         i.line = 0;
-        i.type = QmlInstruction::Init;
+        i.type = QDeclarativeInstruction::Init;
         i.init.bindingsSize = 0;
         i.init.parserStatusSize = 3;
         i.init.contextCache = -1;
@@ -73,13 +73,13 @@ void tst_qmlinstruction::dump()
     }
 
     {
-        QmlCompiledData::TypeReference ref;
+        QDeclarativeCompiledData::TypeReference ref;
         ref.className = "Test";
         data->types << ref;
 
-        QmlInstruction i;
+        QDeclarativeInstruction i;
         i.line = 1;
-        i.type = QmlInstruction::CreateObject;
+        i.type = QDeclarativeInstruction::CreateObject;
         i.create.type = 0;
         i.create.data = -1;
         i.create.bindingBits = -1;
@@ -90,25 +90,25 @@ void tst_qmlinstruction::dump()
     {
         data->primitives << "testId";
 
-        QmlInstruction i;
+        QDeclarativeInstruction i;
         i.line = 2;
-        i.type = QmlInstruction::SetId;
+        i.type = QDeclarativeInstruction::SetId;
         i.setId.value = 0;
         i.setId.index = 0;
         data->bytecode << i;
     }
 
     {
-        QmlInstruction i;
+        QDeclarativeInstruction i;
         i.line = 3;
-        i.type = QmlInstruction::SetDefault;
+        i.type = QDeclarativeInstruction::SetDefault;
         data->bytecode << i;
     }
 
     {
-        QmlInstruction i;
+        QDeclarativeInstruction i;
         i.line = 4;
-        i.type = QmlInstruction::CreateComponent;
+        i.type = QDeclarativeInstruction::CreateComponent;
         i.createComponent.count = 3;
         i.createComponent.column = 4;
         i.createComponent.endLine = 14;
@@ -118,9 +118,9 @@ void tst_qmlinstruction::dump()
     }
 
     {
-        QmlInstruction i;
+        QDeclarativeInstruction i;
         i.line = 5;
-        i.type = QmlInstruction::StoreMetaObject;
+        i.type = QDeclarativeInstruction::StoreMetaObject;
         i.storeMeta.data = 3;
         i.storeMeta.aliasData = 6;
         i.storeMeta.propertyCache = 7;
@@ -129,36 +129,36 @@ void tst_qmlinstruction::dump()
     }
 
     {
-        QmlInstruction i;
+        QDeclarativeInstruction i;
         i.line = 6;
-        i.type = QmlInstruction::StoreFloat;
+        i.type = QDeclarativeInstruction::StoreFloat;
         i.storeFloat.propertyIndex = 3;
         i.storeFloat.value = 11.3;
         data->bytecode << i;
     }
 
     {
-        QmlInstruction i;
+        QDeclarativeInstruction i;
         i.line = 7;
-        i.type = QmlInstruction::StoreDouble;
+        i.type = QDeclarativeInstruction::StoreDouble;
         i.storeDouble.propertyIndex = 4;
         i.storeDouble.value = 14.8;
         data->bytecode << i;
     }
 
     {
-        QmlInstruction i;
+        QDeclarativeInstruction i;
         i.line = 8;
-        i.type = QmlInstruction::StoreInteger;
+        i.type = QDeclarativeInstruction::StoreInteger;
         i.storeInteger.propertyIndex = 5;
         i.storeInteger.value = 9;
         data->bytecode << i;
     }
 
     {
-        QmlInstruction i;
+        QDeclarativeInstruction i;
         i.line = 9;
-        i.type = QmlInstruction::StoreBool;
+        i.type = QDeclarativeInstruction::StoreBool;
         i.storeBool.propertyIndex = 6;
         i.storeBool.value = true;
 
@@ -167,9 +167,9 @@ void tst_qmlinstruction::dump()
 
     {
         data->primitives << "Test String";
-        QmlInstruction i;
+        QDeclarativeInstruction i;
         i.line = 10;
-        i.type = QmlInstruction::StoreString;
+        i.type = QDeclarativeInstruction::StoreString;
         i.storeString.propertyIndex = 7;
         i.storeString.value = 1;
         data->bytecode << i;
@@ -177,108 +177,108 @@ void tst_qmlinstruction::dump()
 
     {
         data->primitives << "http://www.nokia.com";
-        QmlInstruction i;
+        QDeclarativeInstruction i;
         i.line = 11;
-        i.type = QmlInstruction::StoreUrl;
+        i.type = QDeclarativeInstruction::StoreUrl;
         i.storeUrl.propertyIndex = 8;
         i.storeUrl.value = 2;
         data->bytecode << i;
     }
 
     {
-        QmlInstruction i;
+        QDeclarativeInstruction i;
         i.line = 12;
-        i.type = QmlInstruction::StoreColor;
+        i.type = QDeclarativeInstruction::StoreColor;
         i.storeColor.propertyIndex = 9;
         i.storeColor.value = 0xFF00FF00;
         data->bytecode << i;
     }
 
     {
-        QmlInstruction i;
+        QDeclarativeInstruction i;
         i.line = 13;
-        i.type = QmlInstruction::StoreDate;
+        i.type = QDeclarativeInstruction::StoreDate;
         i.storeDate.propertyIndex = 10;
         i.storeDate.value = 9;
         data->bytecode << i;
     }
 
     {
-        QmlInstruction i;
+        QDeclarativeInstruction i;
         i.line = 14;
-        i.type = QmlInstruction::StoreTime;
+        i.type = QDeclarativeInstruction::StoreTime;
         i.storeTime.propertyIndex = 11;
         i.storeTime.valueIndex = 33;
         data->bytecode << i;
     }
 
     {
-        QmlInstruction i;
+        QDeclarativeInstruction i;
         i.line = 15;
-        i.type = QmlInstruction::StoreDateTime;
+        i.type = QDeclarativeInstruction::StoreDateTime;
         i.storeDateTime.propertyIndex = 12;
         i.storeDateTime.valueIndex = 44;
         data->bytecode << i;
     }
 
     {
-        QmlInstruction i;
+        QDeclarativeInstruction i;
         i.line = 16;
-        i.type = QmlInstruction::StorePoint;
+        i.type = QDeclarativeInstruction::StorePoint;
         i.storeRealPair.propertyIndex = 13;
         i.storeRealPair.valueIndex = 3;
         data->bytecode << i;
     }
 
     {
-        QmlInstruction i;
+        QDeclarativeInstruction i;
         i.line = 17;
-        i.type = QmlInstruction::StorePointF;
+        i.type = QDeclarativeInstruction::StorePointF;
         i.storeRealPair.propertyIndex = 14;
         i.storeRealPair.valueIndex = 9;
         data->bytecode << i;
     }
 
     {
-        QmlInstruction i;
+        QDeclarativeInstruction i;
         i.line = 18;
-        i.type = QmlInstruction::StoreSize;
+        i.type = QDeclarativeInstruction::StoreSize;
         i.storeRealPair.propertyIndex = 15;
         i.storeRealPair.valueIndex = 8;
         data->bytecode << i;
     }
 
     {
-        QmlInstruction i;
+        QDeclarativeInstruction i;
         i.line = 19;
-        i.type = QmlInstruction::StoreSizeF;
+        i.type = QDeclarativeInstruction::StoreSizeF;
         i.storeRealPair.propertyIndex = 16;
         i.storeRealPair.valueIndex = 99;
         data->bytecode << i;
     }
 
     {
-        QmlInstruction i;
+        QDeclarativeInstruction i;
         i.line = 20;
-        i.type = QmlInstruction::StoreRect;
+        i.type = QDeclarativeInstruction::StoreRect;
         i.storeRect.propertyIndex = 17;
         i.storeRect.valueIndex = 2;
         data->bytecode << i;
     }
 
     {
-        QmlInstruction i;
+        QDeclarativeInstruction i;
         i.line = 21;
-        i.type = QmlInstruction::StoreRectF;
+        i.type = QDeclarativeInstruction::StoreRectF;
         i.storeRect.propertyIndex = 18;
         i.storeRect.valueIndex = 19;
         data->bytecode << i;
     }
 
     {
-        QmlInstruction i;
+        QDeclarativeInstruction i;
         i.line = 22;
-        i.type = QmlInstruction::StoreVector3D;
+        i.type = QDeclarativeInstruction::StoreVector3D;
         i.storeVector3D.propertyIndex = 19;
         i.storeVector3D.valueIndex = 9;
         data->bytecode << i;
@@ -286,9 +286,9 @@ void tst_qmlinstruction::dump()
 
     {
         data->primitives << "color(1, 1, 1, 1)";
-        QmlInstruction i;
+        QDeclarativeInstruction i;
         i.line = 23;
-        i.type = QmlInstruction::StoreVariant;
+        i.type = QDeclarativeInstruction::StoreVariant;
         i.storeString.propertyIndex = 20;
         i.storeString.value = 3;
 
@@ -296,25 +296,25 @@ void tst_qmlinstruction::dump()
     }
 
     {
-        QmlInstruction i;
+        QDeclarativeInstruction i;
         i.line = 24;
-        i.type = QmlInstruction::StoreObject;
+        i.type = QDeclarativeInstruction::StoreObject;
         i.storeObject.propertyIndex = 21;
         data->bytecode << i;
     }
 
     {
-        QmlInstruction i;
+        QDeclarativeInstruction i;
         i.line = 25;
-        i.type = QmlInstruction::StoreVariantObject;
+        i.type = QDeclarativeInstruction::StoreVariantObject;
         i.storeObject.propertyIndex = 22;
         data->bytecode << i;
     }
 
     {
-        QmlInstruction i;
+        QDeclarativeInstruction i;
         i.line = 26;
-        i.type = QmlInstruction::StoreInterface;
+        i.type = QDeclarativeInstruction::StoreInterface;
         i.storeObject.propertyIndex = 23;
         data->bytecode << i;
     }
@@ -322,18 +322,18 @@ void tst_qmlinstruction::dump()
     {
         data->primitives << "console.log(1921)";
 
-        QmlInstruction i;
+        QDeclarativeInstruction i;
         i.line = 27;
-        i.type = QmlInstruction::StoreSignal;
+        i.type = QDeclarativeInstruction::StoreSignal;
         i.storeSignal.signalIndex = 2;
         i.storeSignal.value = 4;
         data->bytecode << i;
     }
 
     {
-        QmlInstruction i;
+        QDeclarativeInstruction i;
         i.line = 28;
-        i.type = QmlInstruction::StoreScript;
+        i.type = QDeclarativeInstruction::StoreScript;
         i.storeScript.value = 2;
         //i.storeScript.fileName = 18;
         //i.storeScript.lineNumber = 28;
@@ -341,9 +341,9 @@ void tst_qmlinstruction::dump()
     }
 
     {
-        QmlInstruction i;
+        QDeclarativeInstruction i;
         i.line = 29;
-        i.type = QmlInstruction::StoreScriptString;
+        i.type = QDeclarativeInstruction::StoreScriptString;
         i.storeScriptString.propertyIndex = 24;
         i.storeScriptString.value = 3;
         i.storeScriptString.scope = 1;
@@ -353,26 +353,26 @@ void tst_qmlinstruction::dump()
     {
         data->datas << "mySignal";
 
-        QmlInstruction i;
+        QDeclarativeInstruction i;
         i.line = 30;
-        i.type = QmlInstruction::AssignSignalObject;
+        i.type = QDeclarativeInstruction::AssignSignalObject;
         i.assignSignalObject.signal = 0;
         data->bytecode << i;
     }
 
     {
-        QmlInstruction i;
+        QDeclarativeInstruction i;
         i.line = 31;
-        i.type = QmlInstruction::AssignCustomType;
+        i.type = QDeclarativeInstruction::AssignCustomType;
         i.assignCustomType.propertyIndex = 25;
         i.assignCustomType.valueIndex = 4;
         data->bytecode << i;
     }
 
     {
-        QmlInstruction i;
+        QDeclarativeInstruction i;
         i.line = 32;
-        i.type = QmlInstruction::StoreBinding;
+        i.type = QDeclarativeInstruction::StoreBinding;
         i.assignBinding.property = 26;
         i.assignBinding.value = 3;
         i.assignBinding.context = 2;
@@ -381,9 +381,9 @@ void tst_qmlinstruction::dump()
     }
 
     {
-        QmlInstruction i;
+        QDeclarativeInstruction i;
         i.line = 33;
-        i.type = QmlInstruction::StoreCompiledBinding;
+        i.type = QDeclarativeInstruction::StoreCompiledBinding;
         i.assignBinding.property = 27;
         i.assignBinding.value = 2;
         i.assignBinding.context = 4;
@@ -392,9 +392,9 @@ void tst_qmlinstruction::dump()
     }
 
     {
-        QmlInstruction i;
+        QDeclarativeInstruction i;
         i.line = 34;
-        i.type = QmlInstruction::StoreValueSource;
+        i.type = QDeclarativeInstruction::StoreValueSource;
         i.assignValueSource.property = 29;
         i.assignValueSource.owner = 1;
         i.assignValueSource.castValue = 4;
@@ -402,9 +402,9 @@ void tst_qmlinstruction::dump()
     }
 
     {
-        QmlInstruction i;
+        QDeclarativeInstruction i;
         i.line = 35;
-        i.type = QmlInstruction::StoreValueInterceptor;
+        i.type = QDeclarativeInstruction::StoreValueInterceptor;
         i.assignValueInterceptor.property = 30;
         i.assignValueInterceptor.owner = 2;
         i.assignValueInterceptor.castValue = -4;
@@ -412,103 +412,103 @@ void tst_qmlinstruction::dump()
     }
 
     {
-        QmlInstruction i;
+        QDeclarativeInstruction i;
         i.line = 36;
-        i.type = QmlInstruction::BeginObject;
+        i.type = QDeclarativeInstruction::BeginObject;
         i.begin.castValue = 4;
         data->bytecode << i;
     }
 
     {
-        QmlInstruction i;
+        QDeclarativeInstruction i;
         i.line = 38;
-        i.type = QmlInstruction::StoreObjectQList;
+        i.type = QDeclarativeInstruction::StoreObjectQList;
         data->bytecode << i;
     }
 
     {
-        QmlInstruction i;
+        QDeclarativeInstruction i;
         i.line = 39;
-        i.type = QmlInstruction::AssignObjectList;
+        i.type = QDeclarativeInstruction::AssignObjectList;
         data->bytecode << i;
     }
 
     {
-        QmlInstruction i;
+        QDeclarativeInstruction i;
         i.line = 40;
-        i.type = QmlInstruction::FetchAttached;
+        i.type = QDeclarativeInstruction::FetchAttached;
         i.fetchAttached.id = 23;
         data->bytecode << i;
     }
 
     {
-        QmlInstruction i;
+        QDeclarativeInstruction i;
         i.line = 42;
-        i.type = QmlInstruction::FetchQList;
+        i.type = QDeclarativeInstruction::FetchQList;
         i.fetch.property = 32;
         data->bytecode << i;
     }
 
     {
-        QmlInstruction i;
+        QDeclarativeInstruction i;
         i.line = 43;
-        i.type = QmlInstruction::FetchObject;
+        i.type = QDeclarativeInstruction::FetchObject;
         i.fetch.property = 33;
         data->bytecode << i;
     }
 
     {
-        QmlInstruction i;
+        QDeclarativeInstruction i;
         i.line = 44;
-        i.type = QmlInstruction::FetchValueType;
+        i.type = QDeclarativeInstruction::FetchValueType;
         i.fetchValue.property = 34;
         i.fetchValue.type = 6;
         data->bytecode << i;
     }
 
     {
-        QmlInstruction i;
+        QDeclarativeInstruction i;
         i.line = 45;
-        i.type = QmlInstruction::PopFetchedObject;
+        i.type = QDeclarativeInstruction::PopFetchedObject;
         data->bytecode << i;
     }
 
     {
-        QmlInstruction i;
+        QDeclarativeInstruction i;
         i.line = 46;
-        i.type = QmlInstruction::PopQList;
+        i.type = QDeclarativeInstruction::PopQList;
         data->bytecode << i;
     }
 
     {
-        QmlInstruction i;
+        QDeclarativeInstruction i;
         i.line = 47;
-        i.type = QmlInstruction::PopValueType;
+        i.type = QDeclarativeInstruction::PopValueType;
         i.fetchValue.property = 35;
         i.fetchValue.type = 8;
         data->bytecode << i;
     }
 
     {
-        QmlInstruction i;
+        QDeclarativeInstruction i;
         i.line = 48;
-        i.type = QmlInstruction::Defer;
+        i.type = QDeclarativeInstruction::Defer;
         i.defer.deferCount = 7;
         data->bytecode << i;
     }
 
     {
-        QmlInstruction i;
+        QDeclarativeInstruction i;
         i.line = -1;
-        i.type = QmlInstruction::Defer;
+        i.type = QDeclarativeInstruction::Defer;
         i.defer.deferCount = 7;
         data->bytecode << i;
     }
 
     {
-        QmlInstruction i;
+        QDeclarativeInstruction i;
         i.line = 50;
-        i.type = (QmlInstruction::Type)(QmlInstruction::Defer + 1); // Non-existant
+        i.type = (QDeclarativeInstruction::Type)(QDeclarativeInstruction::Defer + 1); // Non-existant
         data->bytecode << i;
     }
 
@@ -582,4 +582,4 @@ void tst_qmlinstruction::dump()
 
 QTEST_MAIN(tst_qmlinstruction)
 
-#include "tst_qmlinstruction.moc"
+#include "tst_qdeclarativeinstruction.moc"
diff --git a/tests/auto/declarative/qmlgraphicsitem/data/keynavigation.qml b/tests/auto/declarative/qdeclarativeitem/data/keynavigation.qml
index 9281a17..9281a17 100644
--- a/tests/auto/declarative/qmlgraphicsitem/data/keynavigation.qml
+++ b/tests/auto/declarative/qdeclarativeitem/data/keynavigation.qml
diff --git a/tests/auto/declarative/qmlgraphicsitem/data/keys.qml b/tests/auto/declarative/qdeclarativeitem/data/keys.qml
index f3c1f7b..f3c1f7b 100644
--- a/tests/auto/declarative/qmlgraphicsitem/data/keys.qml
+++ b/tests/auto/declarative/qdeclarativeitem/data/keys.qml
diff --git a/tests/auto/declarative/qmlgraphicsitem/qmlgraphicsitem.pro b/tests/auto/declarative/qdeclarativeitem/qdeclarativeitem.pro
index ddabf9a..0eb2141 100644
--- a/tests/auto/declarative/qmlgraphicsitem/qmlgraphicsitem.pro
+++ b/tests/auto/declarative/qdeclarativeitem/qdeclarativeitem.pro
@@ -2,6 +2,6 @@ load(qttest_p4)
 contains(QT_CONFIG,declarative): QT += declarative gui
 macx:CONFIG -= app_bundle
 
-SOURCES += tst_qmlgraphicsitem.cpp
+SOURCES += tst_qdeclarativeitem.cpp
 
 DEFINES += SRCDIR=\\\"$$PWD\\\"
diff --git a/tests/auto/declarative/qmlgraphicsitem/tst_qmlgraphicsitem.cpp b/tests/auto/declarative/qdeclarativeitem/tst_qdeclarativeitem.cpp
index 1bface4..9feabdb 100644
--- a/tests/auto/declarative/qmlgraphicsitem/tst_qmlgraphicsitem.cpp
+++ b/tests/auto/declarative/qdeclarativeitem/tst_qdeclarativeitem.cpp
@@ -40,11 +40,11 @@
 ****************************************************************************/
 #include <qtest.h>
 #include <QtTest/QSignalSpy>
-#include <QtDeclarative/qmlengine.h>
-#include <QtDeclarative/qmlcomponent.h>
-#include <QtDeclarative/qmlcontext.h>
-#include <QtDeclarative/qmlview.h>
-#include <QtDeclarative/qmlgraphicsitem.h>
+#include <QtDeclarative/qdeclarativeengine.h>
+#include <QtDeclarative/qdeclarativecomponent.h>
+#include <QtDeclarative/qdeclarativecontext.h>
+#include <QtDeclarative/qdeclarativeview.h>
+#include <QtDeclarative/qdeclarativeitem.h>
 
 class tst_QmlGraphicsItem : public QObject
 
@@ -62,7 +62,7 @@ private slots:
 private:
     template<typename T>
     T *findItem(QGraphicsObject *parent, const QString &objectName);
-    QmlEngine engine;
+    QDeclarativeEngine engine;
 };
 
 class KeysTestObject : public QObject
@@ -109,7 +109,7 @@ tst_QmlGraphicsItem::tst_QmlGraphicsItem()
 
 void tst_QmlGraphicsItem::keys()
 {
-    QmlView *canvas = new QmlView(0);
+    QDeclarativeView *canvas = new QDeclarativeView(0);
     canvas->setFixedSize(240,320);
 
     KeysTestObject *testObject = new KeysTestObject;
@@ -189,7 +189,7 @@ void tst_QmlGraphicsItem::keys()
 
 void tst_QmlGraphicsItem::keyNavigation()
 {
-    QmlView *canvas = new QmlView(0);
+    QDeclarativeView *canvas = new QDeclarativeView(0);
     canvas->setFixedSize(240,320);
 
     canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/keynavigation.qml"));
@@ -201,7 +201,7 @@ void tst_QmlGraphicsItem::keyNavigation()
     QFocusEvent fe(QEvent::FocusIn);
     QApplication::sendEvent(canvas, &fe);
 
-    QmlGraphicsItem *item = findItem<QmlGraphicsItem>(canvas->rootObject(), "item1");
+    QDeclarativeItem *item = findItem<QDeclarativeItem>(canvas->rootObject(), "item1");
     QVERIFY(item);
     QVERIFY(item->hasFocus());
 
@@ -210,7 +210,7 @@ void tst_QmlGraphicsItem::keyNavigation()
     QApplication::sendEvent(canvas, &key);
     QVERIFY(key.isAccepted());
 
-    item = findItem<QmlGraphicsItem>(canvas->rootObject(), "item2");
+    item = findItem<QDeclarativeItem>(canvas->rootObject(), "item2");
     QVERIFY(item);
     QVERIFY(item->hasFocus());
 
@@ -219,7 +219,7 @@ void tst_QmlGraphicsItem::keyNavigation()
     QApplication::sendEvent(canvas, &key);
     QVERIFY(key.isAccepted());
 
-    item = findItem<QmlGraphicsItem>(canvas->rootObject(), "item4");
+    item = findItem<QDeclarativeItem>(canvas->rootObject(), "item4");
     QVERIFY(item);
     QVERIFY(item->hasFocus());
 
@@ -228,7 +228,7 @@ void tst_QmlGraphicsItem::keyNavigation()
     QApplication::sendEvent(canvas, &key);
     QVERIFY(key.isAccepted());
 
-    item = findItem<QmlGraphicsItem>(canvas->rootObject(), "item3");
+    item = findItem<QDeclarativeItem>(canvas->rootObject(), "item3");
     QVERIFY(item);
     QVERIFY(item->hasFocus());
 
@@ -237,16 +237,16 @@ void tst_QmlGraphicsItem::keyNavigation()
     QApplication::sendEvent(canvas, &key);
     QVERIFY(key.isAccepted());
 
-    item = findItem<QmlGraphicsItem>(canvas->rootObject(), "item1");
+    item = findItem<QDeclarativeItem>(canvas->rootObject(), "item1");
     QVERIFY(item);
     QVERIFY(item->hasFocus());
 }
 
 void tst_QmlGraphicsItem::smooth()
 {
-    QmlComponent component(&engine);
+    QDeclarativeComponent component(&engine);
     component.setData("import Qt 4.6; Item { smooth: false; }", QUrl::fromLocalFile(""));
-    QmlGraphicsItem *item = qobject_cast<QmlGraphicsItem*>(component.create());
+    QDeclarativeItem *item = qobject_cast<QDeclarativeItem*>(component.create());
     QSignalSpy spy(item, SIGNAL(smoothChanged()));
 
     QVERIFY(item);
@@ -267,9 +267,9 @@ void tst_QmlGraphicsItem::smooth()
 
 void tst_QmlGraphicsItem::clip()
 {
-    QmlComponent component(&engine);
+    QDeclarativeComponent component(&engine);
     component.setData("import Qt 4.6\nItem { clip: false\n }", QUrl::fromLocalFile(""));
-    QmlGraphicsItem *item = qobject_cast<QmlGraphicsItem*>(component.create());
+    QDeclarativeItem *item = qobject_cast<QDeclarativeItem*>(component.create());
     QSignalSpy spy(item, SIGNAL(clipChanged()));
 
     QVERIFY(item);
@@ -297,7 +297,7 @@ T *tst_QmlGraphicsItem::findItem(QGraphicsObject *parent, const QString &objectN
     const QMetaObject &mo = T::staticMetaObject;
     //qDebug() << parent->QGraphicsObject::children().count() << "children";
     for (int i = 0; i < parent->childItems().count(); ++i) {
-        QmlGraphicsItem *item = qobject_cast<QmlGraphicsItem*>(parent->childItems().at(i));
+        QDeclarativeItem *item = qobject_cast<QDeclarativeItem*>(parent->childItems().at(i));
         if(!item)
             continue;
         //qDebug() << "try" << item;
@@ -315,4 +315,4 @@ T *tst_QmlGraphicsItem::findItem(QGraphicsObject *parent, const QString &objectN
 
 QTEST_MAIN(tst_QmlGraphicsItem)
 
-#include "tst_qmlgraphicsitem.moc"
+#include "tst_qdeclarativeitem.moc"
diff --git a/tests/auto/declarative/qmllanguage/data/Alias.qml b/tests/auto/declarative/qdeclarativelanguage/data/Alias.qml
index 55aa231..55aa231 100644
--- a/tests/auto/declarative/qmllanguage/data/Alias.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/Alias.qml
diff --git a/tests/auto/declarative/qmllanguage/data/Alias2.qml b/tests/auto/declarative/qdeclarativelanguage/data/Alias2.qml
index 6362b2d..6362b2d 100644
--- a/tests/auto/declarative/qmllanguage/data/Alias2.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/Alias2.qml
diff --git a/tests/auto/declarative/qmllanguage/data/Alias3.qml b/tests/auto/declarative/qdeclarativelanguage/data/Alias3.qml
index d1e78f8..d1e78f8 100644
--- a/tests/auto/declarative/qmllanguage/data/Alias3.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/Alias3.qml
diff --git a/tests/auto/declarative/qmllanguage/data/Alias4.qml b/tests/auto/declarative/qdeclarativelanguage/data/Alias4.qml
index 573674c..573674c 100644
--- a/tests/auto/declarative/qmllanguage/data/Alias4.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/Alias4.qml
diff --git a/tests/auto/declarative/qmllanguage/data/ComponentComposite.qml b/tests/auto/declarative/qdeclarativelanguage/data/ComponentComposite.qml
index 05fbc3f..05fbc3f 100644
--- a/tests/auto/declarative/qmllanguage/data/ComponentComposite.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/ComponentComposite.qml
diff --git a/tests/auto/declarative/qmllanguage/data/CompositeType.qml b/tests/auto/declarative/qdeclarativelanguage/data/CompositeType.qml
index 99d010f..99d010f 100644
--- a/tests/auto/declarative/qmllanguage/data/CompositeType.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/CompositeType.qml
diff --git a/tests/auto/declarative/qmllanguage/data/CompositeType2.qml b/tests/auto/declarative/qdeclarativelanguage/data/CompositeType2.qml
index 86210e9..86210e9 100644
--- a/tests/auto/declarative/qmllanguage/data/CompositeType2.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/CompositeType2.qml
diff --git a/tests/auto/declarative/qmllanguage/data/CompositeType3.qml b/tests/auto/declarative/qdeclarativelanguage/data/CompositeType3.qml
index d08f35b..d08f35b 100644
--- a/tests/auto/declarative/qmllanguage/data/CompositeType3.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/CompositeType3.qml
diff --git a/tests/auto/declarative/qmllanguage/data/CompositeType4.qml b/tests/auto/declarative/qdeclarativelanguage/data/CompositeType4.qml
index a6a8168..a6a8168 100644
--- a/tests/auto/declarative/qmllanguage/data/CompositeType4.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/CompositeType4.qml
diff --git a/tests/auto/declarative/qmllanguage/data/DynamicPropertiesNestedType.qml b/tests/auto/declarative/qdeclarativelanguage/data/DynamicPropertiesNestedType.qml
index aefbf9a..aefbf9a 100644
--- a/tests/auto/declarative/qmllanguage/data/DynamicPropertiesNestedType.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/DynamicPropertiesNestedType.qml
diff --git a/tests/auto/declarative/qmllanguage/data/HelperAlias.qml b/tests/auto/declarative/qdeclarativelanguage/data/HelperAlias.qml
index dc3b382..dc3b382 100644
--- a/tests/auto/declarative/qmllanguage/data/HelperAlias.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/HelperAlias.qml
diff --git a/tests/auto/declarative/qmllanguage/data/I18n.qml b/tests/auto/declarative/qdeclarativelanguage/data/I18n.qml
index 558c836..558c836 100644
--- a/tests/auto/declarative/qmllanguage/data/I18n.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/I18n.qml
diff --git a/tests/auto/declarative/qmllanguage/data/I18nType30.qml b/tests/auto/declarative/qdeclarativelanguage/data/I18nType30.qml
index 42dbc69..42dbc69 100644
--- a/tests/auto/declarative/qmllanguage/data/I18nType30.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/I18nType30.qml
diff --git a/tests/auto/declarative/qmllanguage/data/MyComponent.qml b/tests/auto/declarative/qdeclarativelanguage/data/MyComponent.qml
index 1a23277..1a23277 100644
--- a/tests/auto/declarative/qmllanguage/data/MyComponent.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/MyComponent.qml
diff --git a/tests/auto/declarative/qmllanguage/data/MyCompositeValueSource.qml b/tests/auto/declarative/qdeclarativelanguage/data/MyCompositeValueSource.qml
index e620e26..e620e26 100644
--- a/tests/auto/declarative/qmllanguage/data/MyCompositeValueSource.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/MyCompositeValueSource.qml
diff --git a/tests/auto/declarative/qmllanguage/data/MyContainerComponent.qml b/tests/auto/declarative/qdeclarativelanguage/data/MyContainerComponent.qml
index 61f54c5..61f54c5 100644
--- a/tests/auto/declarative/qmllanguage/data/MyContainerComponent.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/MyContainerComponent.qml
diff --git a/tests/auto/declarative/qmllanguage/data/NestedAlias.qml b/tests/auto/declarative/qdeclarativelanguage/data/NestedAlias.qml
index 5155612..5155612 100644
--- a/tests/auto/declarative/qmllanguage/data/NestedAlias.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/NestedAlias.qml
diff --git a/tests/auto/declarative/qmllanguage/data/NestedErrorsType.qml b/tests/auto/declarative/qdeclarativelanguage/data/NestedErrorsType.qml
index 5cc8d20..5cc8d20 100644
--- a/tests/auto/declarative/qmllanguage/data/NestedErrorsType.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/NestedErrorsType.qml
diff --git a/tests/auto/declarative/qmllanguage/data/OnCompletedType.qml b/tests/auto/declarative/qdeclarativelanguage/data/OnCompletedType.qml
index 2889caf..2889caf 100644
--- a/tests/auto/declarative/qmllanguage/data/OnCompletedType.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/OnCompletedType.qml
diff --git a/tests/auto/declarative/qmllanguage/data/alias.1.qml b/tests/auto/declarative/qdeclarativelanguage/data/alias.1.qml
index 500b0f6..500b0f6 100644
--- a/tests/auto/declarative/qmllanguage/data/alias.1.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/alias.1.qml
diff --git a/tests/auto/declarative/qmllanguage/data/alias.2.qml b/tests/auto/declarative/qdeclarativelanguage/data/alias.2.qml
index 5c92270..5c92270 100644
--- a/tests/auto/declarative/qmllanguage/data/alias.2.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/alias.2.qml
diff --git a/tests/auto/declarative/qmllanguage/data/alias.3.qml b/tests/auto/declarative/qdeclarativelanguage/data/alias.3.qml
index e059937..e059937 100644
--- a/tests/auto/declarative/qmllanguage/data/alias.3.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/alias.3.qml
diff --git a/tests/auto/declarative/qmllanguage/data/alias.4.qml b/tests/auto/declarative/qdeclarativelanguage/data/alias.4.qml
index bd6a769..bd6a769 100644
--- a/tests/auto/declarative/qmllanguage/data/alias.4.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/alias.4.qml
diff --git a/tests/auto/declarative/qmllanguage/data/alias.5.qml b/tests/auto/declarative/qdeclarativelanguage/data/alias.5.qml
index 4316d0d..4316d0d 100644
--- a/tests/auto/declarative/qmllanguage/data/alias.5.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/alias.5.qml
diff --git a/tests/auto/declarative/qmllanguage/data/alias.6.qml b/tests/auto/declarative/qdeclarativelanguage/data/alias.6.qml
index e3af230..e3af230 100644
--- a/tests/auto/declarative/qmllanguage/data/alias.6.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/alias.6.qml
diff --git a/tests/auto/declarative/qmllanguage/data/alias.7.qml b/tests/auto/declarative/qdeclarativelanguage/data/alias.7.qml
index a9a57eb..a9a57eb 100644
--- a/tests/auto/declarative/qmllanguage/data/alias.7.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/alias.7.qml
diff --git a/tests/auto/declarative/qmllanguage/data/alias.8.qml b/tests/auto/declarative/qdeclarativelanguage/data/alias.8.qml
index 2b9ad85..2b9ad85 100644
--- a/tests/auto/declarative/qmllanguage/data/alias.8.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/alias.8.qml
diff --git a/tests/auto/declarative/qmllanguage/data/alias.9.qml b/tests/auto/declarative/qdeclarativelanguage/data/alias.9.qml
index a2a41a1..a2a41a1 100644
--- a/tests/auto/declarative/qmllanguage/data/alias.9.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/alias.9.qml
diff --git a/tests/auto/declarative/qmllanguage/data/assignBasicTypes.qml b/tests/auto/declarative/qdeclarativelanguage/data/assignBasicTypes.qml
index c86c96b..c86c96b 100644
--- a/tests/auto/declarative/qmllanguage/data/assignBasicTypes.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/assignBasicTypes.qml
diff --git a/tests/auto/declarative/qmllanguage/data/assignCompositeToType.qml b/tests/auto/declarative/qdeclarativelanguage/data/assignCompositeToType.qml
index f6422bd..f6422bd 100644
--- a/tests/auto/declarative/qmllanguage/data/assignCompositeToType.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/assignCompositeToType.qml
diff --git a/tests/auto/declarative/qmllanguage/data/assignLiteralSignalProperty.qml b/tests/auto/declarative/qdeclarativelanguage/data/assignLiteralSignalProperty.qml
index 399fcea..399fcea 100644
--- a/tests/auto/declarative/qmllanguage/data/assignLiteralSignalProperty.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/assignLiteralSignalProperty.qml
diff --git a/tests/auto/declarative/qmllanguage/data/assignObjectToSignal.qml b/tests/auto/declarative/qdeclarativelanguage/data/assignObjectToSignal.qml
index 789cc66..789cc66 100644
--- a/tests/auto/declarative/qmllanguage/data/assignObjectToSignal.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/assignObjectToSignal.qml
diff --git a/tests/auto/declarative/qmllanguage/data/assignObjectToVariant.qml b/tests/auto/declarative/qdeclarativelanguage/data/assignObjectToVariant.qml
index 0ff9370..0ff9370 100644
--- a/tests/auto/declarative/qmllanguage/data/assignObjectToVariant.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/assignObjectToVariant.qml
diff --git a/tests/auto/declarative/qmllanguage/data/assignQmlComponent.qml b/tests/auto/declarative/qdeclarativelanguage/data/assignQmlComponent.qml
index 20bdc55..20bdc55 100644
--- a/tests/auto/declarative/qmllanguage/data/assignQmlComponent.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/assignQmlComponent.qml
diff --git a/tests/auto/declarative/qmllanguage/data/assignSignal.qml b/tests/auto/declarative/qdeclarativelanguage/data/assignSignal.qml
index 2a48df8..2a48df8 100644
--- a/tests/auto/declarative/qmllanguage/data/assignSignal.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/assignSignal.qml
diff --git a/tests/auto/declarative/qmllanguage/data/assignTypeExtremes.qml b/tests/auto/declarative/qdeclarativelanguage/data/assignTypeExtremes.qml
index 60ede52..60ede52 100644
--- a/tests/auto/declarative/qmllanguage/data/assignTypeExtremes.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/assignTypeExtremes.qml
diff --git a/tests/auto/declarative/qmllanguage/data/attachedProperties.qml b/tests/auto/declarative/qdeclarativelanguage/data/attachedProperties.qml
index b46ec34..b46ec34 100644
--- a/tests/auto/declarative/qmllanguage/data/attachedProperties.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/attachedProperties.qml
diff --git a/tests/auto/declarative/qmllanguage/data/autoComponentCreation.qml b/tests/auto/declarative/qdeclarativelanguage/data/autoComponentCreation.qml
index 5d00144..5d00144 100644
--- a/tests/auto/declarative/qmllanguage/data/autoComponentCreation.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/autoComponentCreation.qml
diff --git a/tests/auto/declarative/qmllanguage/data/component.1.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/component.1.errors.txt
index 091aad6..091aad6 100644
--- a/tests/auto/declarative/qmllanguage/data/component.1.errors.txt
+++ b/tests/auto/declarative/qdeclarativelanguage/data/component.1.errors.txt
diff --git a/tests/auto/declarative/qmllanguage/data/component.1.qml b/tests/auto/declarative/qdeclarativelanguage/data/component.1.qml
index 07e463a..07e463a 100644
--- a/tests/auto/declarative/qmllanguage/data/component.1.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/component.1.qml
diff --git a/tests/auto/declarative/qmllanguage/data/component.2.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/component.2.errors.txt
index 76e7656..76e7656 100644
--- a/tests/auto/declarative/qmllanguage/data/component.2.errors.txt
+++ b/tests/auto/declarative/qdeclarativelanguage/data/component.2.errors.txt
diff --git a/tests/auto/declarative/qmllanguage/data/component.2.qml b/tests/auto/declarative/qdeclarativelanguage/data/component.2.qml
index 88e0f73..88e0f73 100644
--- a/tests/auto/declarative/qmllanguage/data/component.2.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/component.2.qml
diff --git a/tests/auto/declarative/qmllanguage/data/component.3.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/component.3.errors.txt
index 9a13142..9a13142 100644
--- a/tests/auto/declarative/qmllanguage/data/component.3.errors.txt
+++ b/tests/auto/declarative/qdeclarativelanguage/data/component.3.errors.txt
diff --git a/tests/auto/declarative/qmllanguage/data/component.3.qml b/tests/auto/declarative/qdeclarativelanguage/data/component.3.qml
index 287a959..287a959 100644
--- a/tests/auto/declarative/qmllanguage/data/component.3.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/component.3.qml
diff --git a/tests/auto/declarative/qmllanguage/data/component.4.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/component.4.errors.txt
index 2ab18685..2ab18685 100644
--- a/tests/auto/declarative/qmllanguage/data/component.4.errors.txt
+++ b/tests/auto/declarative/qdeclarativelanguage/data/component.4.errors.txt
diff --git a/tests/auto/declarative/qmllanguage/data/component.4.qml b/tests/auto/declarative/qdeclarativelanguage/data/component.4.qml
index ab1e29b..ab1e29b 100644
--- a/tests/auto/declarative/qmllanguage/data/component.4.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/component.4.qml
diff --git a/tests/auto/declarative/qmllanguage/data/component.5.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/component.5.errors.txt
index e3c2df7..e3c2df7 100644
--- a/tests/auto/declarative/qmllanguage/data/component.5.errors.txt
+++ b/tests/auto/declarative/qdeclarativelanguage/data/component.5.errors.txt
diff --git a/tests/auto/declarative/qmllanguage/data/component.5.qml b/tests/auto/declarative/qdeclarativelanguage/data/component.5.qml
index 629e998..629e998 100644
--- a/tests/auto/declarative/qmllanguage/data/component.5.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/component.5.qml
diff --git a/tests/auto/declarative/qmllanguage/data/component.6.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/component.6.errors.txt
index 2b1c6ca..2b1c6ca 100644
--- a/tests/auto/declarative/qmllanguage/data/component.6.errors.txt
+++ b/tests/auto/declarative/qdeclarativelanguage/data/component.6.errors.txt
diff --git a/tests/auto/declarative/qmllanguage/data/component.6.qml b/tests/auto/declarative/qdeclarativelanguage/data/component.6.qml
index 2303ebf..2303ebf 100644
--- a/tests/auto/declarative/qmllanguage/data/component.6.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/component.6.qml
diff --git a/tests/auto/declarative/qmllanguage/data/componentCompositeType.qml b/tests/auto/declarative/qdeclarativelanguage/data/componentCompositeType.qml
index 0a7249a..0a7249a 100644
--- a/tests/auto/declarative/qmllanguage/data/componentCompositeType.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/componentCompositeType.qml
diff --git a/tests/auto/declarative/qmllanguage/data/cppnamespace.2.qml b/tests/auto/declarative/qdeclarativelanguage/data/cppnamespace.2.qml
index e3b32ca..e3b32ca 100644
--- a/tests/auto/declarative/qmllanguage/data/cppnamespace.2.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/cppnamespace.2.qml
diff --git a/tests/auto/declarative/qmllanguage/data/cppnamespace.qml b/tests/auto/declarative/qdeclarativelanguage/data/cppnamespace.qml
index e1daf3b..e1daf3b 100644
--- a/tests/auto/declarative/qmllanguage/data/cppnamespace.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/cppnamespace.qml
diff --git a/tests/auto/declarative/qmllanguage/data/crash2.qml b/tests/auto/declarative/qdeclarativelanguage/data/crash2.qml
index a22c776..a22c776 100644
--- a/tests/auto/declarative/qmllanguage/data/crash2.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/crash2.qml
diff --git a/tests/auto/declarative/qmllanguage/data/customParserIdNotAllowed.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/customParserIdNotAllowed.errors.txt
index 43a8bb2..43a8bb2 100644
--- a/tests/auto/declarative/qmllanguage/data/customParserIdNotAllowed.errors.txt
+++ b/tests/auto/declarative/qdeclarativelanguage/data/customParserIdNotAllowed.errors.txt
diff --git a/tests/auto/declarative/qmllanguage/data/customParserIdNotAllowed.qml b/tests/auto/declarative/qdeclarativelanguage/data/customParserIdNotAllowed.qml
index 00cc0c4..00cc0c4 100644
--- a/tests/auto/declarative/qmllanguage/data/customParserIdNotAllowed.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/customParserIdNotAllowed.qml
diff --git a/tests/auto/declarative/qmllanguage/data/customParserTypes.qml b/tests/auto/declarative/qdeclarativelanguage/data/customParserTypes.qml
index cf2f272..cf2f272 100644
--- a/tests/auto/declarative/qmllanguage/data/customParserTypes.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/customParserTypes.qml
diff --git a/tests/auto/declarative/qmllanguage/data/customVariantTypes.qml b/tests/auto/declarative/qdeclarativelanguage/data/customVariantTypes.qml
index 0263ed2..0263ed2 100644
--- a/tests/auto/declarative/qmllanguage/data/customVariantTypes.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/customVariantTypes.qml
diff --git a/tests/auto/declarative/qmllanguage/data/declaredPropertyValues.qml b/tests/auto/declarative/qdeclarativelanguage/data/declaredPropertyValues.qml
index 3987a3c..3987a3c 100644
--- a/tests/auto/declarative/qmllanguage/data/declaredPropertyValues.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/declaredPropertyValues.qml
diff --git a/tests/auto/declarative/qmllanguage/data/defaultGrouped.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/defaultGrouped.errors.txt
index 945d51b..945d51b 100644
--- a/tests/auto/declarative/qmllanguage/data/defaultGrouped.errors.txt
+++ b/tests/auto/declarative/qdeclarativelanguage/data/defaultGrouped.errors.txt
diff --git a/tests/auto/declarative/qmllanguage/data/defaultGrouped.qml b/tests/auto/declarative/qdeclarativelanguage/data/defaultGrouped.qml
index 0fd1404..0fd1404 100644
--- a/tests/auto/declarative/qmllanguage/data/defaultGrouped.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/defaultGrouped.qml
diff --git a/tests/auto/declarative/qmllanguage/data/defaultPropertyListOrder.qml b/tests/auto/declarative/qdeclarativelanguage/data/defaultPropertyListOrder.qml
index 3651511..3651511 100644
--- a/tests/auto/declarative/qmllanguage/data/defaultPropertyListOrder.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/defaultPropertyListOrder.qml
diff --git a/tests/auto/declarative/qmllanguage/data/doubleSignal.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/doubleSignal.errors.txt
index 2aea251..2aea251 100644
--- a/tests/auto/declarative/qmllanguage/data/doubleSignal.errors.txt
+++ b/tests/auto/declarative/qdeclarativelanguage/data/doubleSignal.errors.txt
diff --git a/tests/auto/declarative/qmllanguage/data/doubleSignal.qml b/tests/auto/declarative/qdeclarativelanguage/data/doubleSignal.qml
index fb07b9f..fb07b9f 100644
--- a/tests/auto/declarative/qmllanguage/data/doubleSignal.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/doubleSignal.qml
diff --git a/tests/auto/declarative/qmllanguage/data/duplicateIDs.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/duplicateIDs.errors.txt
index 66241cf..66241cf 100644
--- a/tests/auto/declarative/qmllanguage/data/duplicateIDs.errors.txt
+++ b/tests/auto/declarative/qdeclarativelanguage/data/duplicateIDs.errors.txt
diff --git a/tests/auto/declarative/qmllanguage/data/duplicateIDs.qml b/tests/auto/declarative/qdeclarativelanguage/data/duplicateIDs.qml
index a993abd..a993abd 100644
--- a/tests/auto/declarative/qmllanguage/data/duplicateIDs.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/duplicateIDs.qml
diff --git a/tests/auto/declarative/qmllanguage/data/dynamicObject.1.qml b/tests/auto/declarative/qdeclarativelanguage/data/dynamicObject.1.qml
index 85d1052..85d1052 100644
--- a/tests/auto/declarative/qmllanguage/data/dynamicObject.1.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/dynamicObject.1.qml
diff --git a/tests/auto/declarative/qmllanguage/data/dynamicObjectProperties.qml b/tests/auto/declarative/qdeclarativelanguage/data/dynamicObjectProperties.qml
index c80a7c0..c80a7c0 100644
--- a/tests/auto/declarative/qmllanguage/data/dynamicObjectProperties.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/dynamicObjectProperties.qml
diff --git a/tests/auto/declarative/qmllanguage/data/dynamicProperties.qml b/tests/auto/declarative/qdeclarativelanguage/data/dynamicProperties.qml
index aef3269..aef3269 100644
--- a/tests/auto/declarative/qmllanguage/data/dynamicProperties.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/dynamicProperties.qml
diff --git a/tests/auto/declarative/qmllanguage/data/dynamicPropertiesNested.qml b/tests/auto/declarative/qdeclarativelanguage/data/dynamicPropertiesNested.qml
index 7bfab67..7bfab67 100644
--- a/tests/auto/declarative/qmllanguage/data/dynamicPropertiesNested.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/dynamicPropertiesNested.qml
diff --git a/tests/auto/declarative/qmllanguage/data/dynamicSignalsAndSlots.qml b/tests/auto/declarative/qdeclarativelanguage/data/dynamicSignalsAndSlots.qml
index 2a834e8..2a834e8 100644
--- a/tests/auto/declarative/qmllanguage/data/dynamicSignalsAndSlots.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/dynamicSignalsAndSlots.qml
diff --git a/tests/auto/declarative/qmllanguage/data/empty.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/empty.errors.txt
index d416e76..d416e76 100644
--- a/tests/auto/declarative/qmllanguage/data/empty.errors.txt
+++ b/tests/auto/declarative/qdeclarativelanguage/data/empty.errors.txt
diff --git a/tests/auto/declarative/qmllanguage/data/empty.qml b/tests/auto/declarative/qdeclarativelanguage/data/empty.qml
index e69de29..e69de29 100644
--- a/tests/auto/declarative/qmllanguage/data/empty.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/empty.qml
diff --git a/tests/auto/declarative/qmllanguage/data/emptySignal.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/emptySignal.errors.txt
index 353bbf5..353bbf5 100644
--- a/tests/auto/declarative/qmllanguage/data/emptySignal.errors.txt
+++ b/tests/auto/declarative/qdeclarativelanguage/data/emptySignal.errors.txt
diff --git a/tests/auto/declarative/qmllanguage/data/emptySignal.qml b/tests/auto/declarative/qdeclarativelanguage/data/emptySignal.qml
index 4c5a122..4c5a122 100644
--- a/tests/auto/declarative/qmllanguage/data/emptySignal.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/emptySignal.qml
diff --git a/tests/auto/declarative/qmllanguage/data/failingComponent.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/failingComponent.errors.txt
index 0cf0ef3..0cf0ef3 100644
--- a/tests/auto/declarative/qmllanguage/data/failingComponent.errors.txt
+++ b/tests/auto/declarative/qdeclarativelanguage/data/failingComponent.errors.txt
diff --git a/tests/auto/declarative/qmllanguage/data/failingComponentTest.qml b/tests/auto/declarative/qdeclarativelanguage/data/failingComponentTest.qml
index 74a6acf..74a6acf 100644
--- a/tests/auto/declarative/qmllanguage/data/failingComponentTest.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/failingComponentTest.qml
diff --git a/tests/auto/declarative/qmllanguage/data/fakeDotProperty.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/fakeDotProperty.errors.txt
index 3074823..3074823 100644
--- a/tests/auto/declarative/qmllanguage/data/fakeDotProperty.errors.txt
+++ b/tests/auto/declarative/qdeclarativelanguage/data/fakeDotProperty.errors.txt
diff --git a/tests/auto/declarative/qmllanguage/data/fakeDotProperty.qml b/tests/auto/declarative/qdeclarativelanguage/data/fakeDotProperty.qml
index d971eee..d971eee 100644
--- a/tests/auto/declarative/qmllanguage/data/fakeDotProperty.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/fakeDotProperty.qml
diff --git a/tests/auto/declarative/qmllanguage/data/finalOverride.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/finalOverride.errors.txt
index 49e06cb..49e06cb 100644
--- a/tests/auto/declarative/qmllanguage/data/finalOverride.errors.txt
+++ b/tests/auto/declarative/qdeclarativelanguage/data/finalOverride.errors.txt
diff --git a/tests/auto/declarative/qmllanguage/data/finalOverride.qml b/tests/auto/declarative/qdeclarativelanguage/data/finalOverride.qml
index a84393a..a84393a 100644
--- a/tests/auto/declarative/qmllanguage/data/finalOverride.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/finalOverride.qml
diff --git a/tests/auto/declarative/qmllanguage/data/i18nDeclaredPropertyNames.qml b/tests/auto/declarative/qdeclarativelanguage/data/i18nDeclaredPropertyNames.qml
index 558c836..558c836 100644
--- a/tests/auto/declarative/qmllanguage/data/i18nDeclaredPropertyNames.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/i18nDeclaredPropertyNames.qml
diff --git a/tests/auto/declarative/qmllanguage/data/i18nDeclaredPropertyUse.qml b/tests/auto/declarative/qdeclarativelanguage/data/i18nDeclaredPropertyUse.qml
index 74918e2..74918e2 100644
--- a/tests/auto/declarative/qmllanguage/data/i18nDeclaredPropertyUse.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/i18nDeclaredPropertyUse.qml
diff --git a/tests/auto/declarative/qmllanguage/data/i18nNameSpace.qml b/tests/auto/declarative/qdeclarativelanguage/data/i18nNameSpace.qml
index c0b2f94..c0b2f94 100644
--- a/tests/auto/declarative/qmllanguage/data/i18nNameSpace.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/i18nNameSpace.qml
diff --git a/tests/auto/declarative/qmllanguage/data/i18nScript.qml b/tests/auto/declarative/qdeclarativelanguage/data/i18nScript.qml
index 942ed90..942ed90 100644
--- a/tests/auto/declarative/qmllanguage/data/i18nScript.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/i18nScript.qml
diff --git a/tests/auto/declarative/qmllanguage/data/i18nStrings.qml b/tests/auto/declarative/qdeclarativelanguage/data/i18nStrings.qml
index 764c926..764c926 100644
--- a/tests/auto/declarative/qmllanguage/data/i18nStrings.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/i18nStrings.qml
diff --git a/tests/auto/declarative/qmllanguage/data/i18nType.qml b/tests/auto/declarative/qdeclarativelanguage/data/i18nType.qml
index d7954ef..d7954ef 100644
--- a/tests/auto/declarative/qmllanguage/data/i18nType.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/i18nType.qml
diff --git a/tests/auto/declarative/qmllanguage/data/idProperty.qml b/tests/auto/declarative/qdeclarativelanguage/data/idProperty.qml
index 90c1483..90c1483 100644
--- a/tests/auto/declarative/qmllanguage/data/idProperty.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/idProperty.qml
diff --git a/tests/auto/declarative/qmllanguage/data/importNamespaceConflict.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/importNamespaceConflict.errors.txt
index 231998d..231998d 100644
--- a/tests/auto/declarative/qmllanguage/data/importNamespaceConflict.errors.txt
+++ b/tests/auto/declarative/qdeclarativelanguage/data/importNamespaceConflict.errors.txt
diff --git a/tests/auto/declarative/qmllanguage/data/importNamespaceConflict.qml b/tests/auto/declarative/qdeclarativelanguage/data/importNamespaceConflict.qml
index cd112af..cd112af 100644
--- a/tests/auto/declarative/qmllanguage/data/importNamespaceConflict.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/importNamespaceConflict.qml
diff --git a/tests/auto/declarative/qmllanguage/data/importVersionMissingBuiltIn.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/importVersionMissingBuiltIn.errors.txt
index c7d880e..c7d880e 100644
--- a/tests/auto/declarative/qmllanguage/data/importVersionMissingBuiltIn.errors.txt
+++ b/tests/auto/declarative/qdeclarativelanguage/data/importVersionMissingBuiltIn.errors.txt
diff --git a/tests/auto/declarative/qmllanguage/data/importVersionMissingBuiltIn.qml b/tests/auto/declarative/qdeclarativelanguage/data/importVersionMissingBuiltIn.qml
index 23ed566..23ed566 100644
--- a/tests/auto/declarative/qmllanguage/data/importVersionMissingBuiltIn.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/importVersionMissingBuiltIn.qml
diff --git a/tests/auto/declarative/qmllanguage/data/importVersionMissingInstalled.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/importVersionMissingInstalled.errors.txt
index 89e58ee..89e58ee 100644
--- a/tests/auto/declarative/qmllanguage/data/importVersionMissingInstalled.errors.txt
+++ b/tests/auto/declarative/qdeclarativelanguage/data/importVersionMissingInstalled.errors.txt
diff --git a/tests/auto/declarative/qmllanguage/data/importVersionMissingInstalled.qml b/tests/auto/declarative/qdeclarativelanguage/data/importVersionMissingInstalled.qml
index 97ec222..97ec222 100644
--- a/tests/auto/declarative/qmllanguage/data/importVersionMissingInstalled.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/importVersionMissingInstalled.qml
diff --git a/tests/auto/declarative/qmllanguage/data/inlineQmlComponents.qml b/tests/auto/declarative/qdeclarativelanguage/data/inlineQmlComponents.qml
index 478f06a..478f06a 100644
--- a/tests/auto/declarative/qmllanguage/data/inlineQmlComponents.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/inlineQmlComponents.qml
diff --git a/tests/auto/declarative/qmllanguage/data/interfaceProperty.qml b/tests/auto/declarative/qdeclarativelanguage/data/interfaceProperty.qml
index 70879ff..70879ff 100644
--- a/tests/auto/declarative/qmllanguage/data/interfaceProperty.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/interfaceProperty.qml
diff --git a/tests/auto/declarative/qmllanguage/data/interfaceQList.qml b/tests/auto/declarative/qdeclarativelanguage/data/interfaceQList.qml
index c87dfae..c87dfae 100644
--- a/tests/auto/declarative/qmllanguage/data/interfaceQList.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/interfaceQList.qml
diff --git a/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.1.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.1.errors.txt
index 492bbb4..492bbb4 100644
--- a/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.1.errors.txt
+++ b/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.1.errors.txt
diff --git a/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.1.qml b/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.1.qml
index 324f79c..324f79c 100644
--- a/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.1.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.1.qml
diff --git a/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.10.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.10.errors.txt
index ff2409b..ff2409b 100644
--- a/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.10.errors.txt
+++ b/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.10.errors.txt
diff --git a/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.10.qml b/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.10.qml
index b768e9f..b768e9f 100644
--- a/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.10.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.10.qml
diff --git a/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.11.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.11.errors.txt
index fee5050..fee5050 100644
--- a/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.11.errors.txt
+++ b/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.11.errors.txt
diff --git a/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.11.qml b/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.11.qml
index 7b782be..7b782be 100644
--- a/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.11.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.11.qml
diff --git a/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.2.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.2.errors.txt
index 34de769..34de769 100644
--- a/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.2.errors.txt
+++ b/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.2.errors.txt
diff --git a/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.2.qml b/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.2.qml
index 1f47c61..1f47c61 100644
--- a/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.2.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.2.qml
diff --git a/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.3.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.3.errors.txt
index 05161c4..05161c4 100644
--- a/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.3.errors.txt
+++ b/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.3.errors.txt
diff --git a/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.3.qml b/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.3.qml
index 79c2981..79c2981 100644
--- a/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.3.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.3.qml
diff --git a/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.4.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.4.errors.txt
index a208bcf..a208bcf 100644
--- a/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.4.errors.txt
+++ b/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.4.errors.txt
diff --git a/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.4.qml b/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.4.qml
index af0be80..af0be80 100644
--- a/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.4.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.4.qml
diff --git a/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.5.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.5.errors.txt
index 05161c4..05161c4 100644
--- a/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.5.errors.txt
+++ b/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.5.errors.txt
diff --git a/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.5.qml b/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.5.qml
index 0546322..0546322 100644
--- a/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.5.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.5.qml
diff --git a/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.6.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.6.errors.txt
index 6770e1f..6770e1f 100644
--- a/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.6.errors.txt
+++ b/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.6.errors.txt
diff --git a/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.6.qml b/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.6.qml
index 108109a..108109a 100644
--- a/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.6.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.6.qml
diff --git a/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.7.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.7.errors.txt
index 6770e1f..6770e1f 100644
--- a/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.7.errors.txt
+++ b/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.7.errors.txt
diff --git a/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.7.qml b/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.7.qml
index ccf0353..ccf0353 100644
--- a/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.7.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.7.qml
diff --git a/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.8.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.8.errors.txt
index ff2409b..ff2409b 100644
--- a/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.8.errors.txt
+++ b/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.8.errors.txt
diff --git a/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.8.qml b/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.8.qml
index e736379..e736379 100644
--- a/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.8.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.8.qml
diff --git a/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.9.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.9.errors.txt
index 6770e1f..6770e1f 100644
--- a/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.9.errors.txt
+++ b/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.9.errors.txt
diff --git a/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.9.qml b/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.9.qml
index a095229..a095229 100644
--- a/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.9.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.9.qml
diff --git a/tests/auto/declarative/qmllanguage/data/invalidGroupedProperty.1.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.1.errors.txt
index 810fd31..810fd31 100644
--- a/tests/auto/declarative/qmllanguage/data/invalidGroupedProperty.1.errors.txt
+++ b/tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.1.errors.txt
diff --git a/tests/auto/declarative/qmllanguage/data/invalidGroupedProperty.1.qml b/tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.1.qml
index 1167e39..1167e39 100644
--- a/tests/auto/declarative/qmllanguage/data/invalidGroupedProperty.1.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.1.qml
diff --git a/tests/auto/declarative/qmllanguage/data/invalidGroupedProperty.2.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.2.errors.txt
index 810fd31..810fd31 100644
--- a/tests/auto/declarative/qmllanguage/data/invalidGroupedProperty.2.errors.txt
+++ b/tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.2.errors.txt
diff --git a/tests/auto/declarative/qmllanguage/data/invalidGroupedProperty.2.qml b/tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.2.qml
index a0c8306..a0c8306 100644
--- a/tests/auto/declarative/qmllanguage/data/invalidGroupedProperty.2.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.2.qml
diff --git a/tests/auto/declarative/qmllanguage/data/invalidGroupedProperty.3.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.3.errors.txt
index f6d6f29..f6d6f29 100644
--- a/tests/auto/declarative/qmllanguage/data/invalidGroupedProperty.3.errors.txt
+++ b/tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.3.errors.txt
diff --git a/tests/auto/declarative/qmllanguage/data/invalidGroupedProperty.3.qml b/tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.3.qml
index 0bbfc4f..0bbfc4f 100644
--- a/tests/auto/declarative/qmllanguage/data/invalidGroupedProperty.3.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.3.qml
diff --git a/tests/auto/declarative/qmllanguage/data/invalidGroupedProperty.4.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.4.errors.txt
index 69c6871..69c6871 100644
--- a/tests/auto/declarative/qmllanguage/data/invalidGroupedProperty.4.errors.txt
+++ b/tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.4.errors.txt
diff --git a/tests/auto/declarative/qmllanguage/data/invalidGroupedProperty.4.qml b/tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.4.qml
index 134fef9..134fef9 100644
--- a/tests/auto/declarative/qmllanguage/data/invalidGroupedProperty.4.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.4.qml
diff --git a/tests/auto/declarative/qmllanguage/data/invalidGroupedProperty.5.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.5.errors.txt
index 2c8a970..2c8a970 100644
--- a/tests/auto/declarative/qmllanguage/data/invalidGroupedProperty.5.errors.txt
+++ b/tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.5.errors.txt
diff --git a/tests/auto/declarative/qmllanguage/data/invalidGroupedProperty.5.qml b/tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.5.qml
index 55cefe6..55cefe6 100644
--- a/tests/auto/declarative/qmllanguage/data/invalidGroupedProperty.5.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.5.qml
diff --git a/tests/auto/declarative/qmllanguage/data/invalidGroupedProperty.6.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.6.errors.txt
index 8331725..8331725 100644
--- a/tests/auto/declarative/qmllanguage/data/invalidGroupedProperty.6.errors.txt
+++ b/tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.6.errors.txt
diff --git a/tests/auto/declarative/qmllanguage/data/invalidGroupedProperty.6.qml b/tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.6.qml
index 9ec33ab..9ec33ab 100644
--- a/tests/auto/declarative/qmllanguage/data/invalidGroupedProperty.6.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.6.qml
diff --git a/tests/auto/declarative/qmllanguage/data/invalidGroupedProperty.7.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.7.errors.txt
index 4a7e383..4a7e383 100644
--- a/tests/auto/declarative/qmllanguage/data/invalidGroupedProperty.7.errors.txt
+++ b/tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.7.errors.txt
diff --git a/tests/auto/declarative/qmllanguage/data/invalidGroupedProperty.7.qml b/tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.7.qml
index 977539a..977539a 100644
--- a/tests/auto/declarative/qmllanguage/data/invalidGroupedProperty.7.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.7.qml
diff --git a/tests/auto/declarative/qmllanguage/data/invalidID.2.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/invalidID.2.errors.txt
index 56e3eeb..56e3eeb 100644
--- a/tests/auto/declarative/qmllanguage/data/invalidID.2.errors.txt
+++ b/tests/auto/declarative/qdeclarativelanguage/data/invalidID.2.errors.txt
diff --git a/tests/auto/declarative/qmllanguage/data/invalidID.2.qml b/tests/auto/declarative/qdeclarativelanguage/data/invalidID.2.qml
index 4fb3b29..4fb3b29 100644
--- a/tests/auto/declarative/qmllanguage/data/invalidID.2.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/invalidID.2.qml
diff --git a/tests/auto/declarative/qmllanguage/data/invalidID.3.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/invalidID.3.errors.txt
index bb811cf..bb811cf 100644
--- a/tests/auto/declarative/qmllanguage/data/invalidID.3.errors.txt
+++ b/tests/auto/declarative/qdeclarativelanguage/data/invalidID.3.errors.txt
diff --git a/tests/auto/declarative/qmllanguage/data/invalidID.3.qml b/tests/auto/declarative/qdeclarativelanguage/data/invalidID.3.qml
index 6684172..6684172 100644
--- a/tests/auto/declarative/qmllanguage/data/invalidID.3.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/invalidID.3.qml
diff --git a/tests/auto/declarative/qmllanguage/data/invalidID.4.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/invalidID.4.errors.txt
index cfe8756..cfe8756 100644
--- a/tests/auto/declarative/qmllanguage/data/invalidID.4.errors.txt
+++ b/tests/auto/declarative/qdeclarativelanguage/data/invalidID.4.errors.txt
diff --git a/tests/auto/declarative/qmllanguage/data/invalidID.4.qml b/tests/auto/declarative/qdeclarativelanguage/data/invalidID.4.qml
index 86010bf..86010bf 100644
--- a/tests/auto/declarative/qmllanguage/data/invalidID.4.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/invalidID.4.qml
diff --git a/tests/auto/declarative/qmllanguage/data/invalidID.5.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/invalidID.5.errors.txt
index c167de3..c167de3 100644
--- a/tests/auto/declarative/qmllanguage/data/invalidID.5.errors.txt
+++ b/tests/auto/declarative/qdeclarativelanguage/data/invalidID.5.errors.txt
diff --git a/tests/auto/declarative/qmllanguage/data/invalidID.5.qml b/tests/auto/declarative/qdeclarativelanguage/data/invalidID.5.qml
index 5b92a1a..5b92a1a 100644
--- a/tests/auto/declarative/qmllanguage/data/invalidID.5.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/invalidID.5.qml
diff --git a/tests/auto/declarative/qmllanguage/data/invalidID.6.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/invalidID.6.errors.txt
index 160e8b5..160e8b5 100644
--- a/tests/auto/declarative/qmllanguage/data/invalidID.6.errors.txt
+++ b/tests/auto/declarative/qdeclarativelanguage/data/invalidID.6.errors.txt
diff --git a/tests/auto/declarative/qmllanguage/data/invalidID.6.qml b/tests/auto/declarative/qdeclarativelanguage/data/invalidID.6.qml
index 62187d9..62187d9 100644
--- a/tests/auto/declarative/qmllanguage/data/invalidID.6.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/invalidID.6.qml
diff --git a/tests/auto/declarative/qmllanguage/data/invalidID.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/invalidID.errors.txt
index 1ca678c..1ca678c 100644
--- a/tests/auto/declarative/qmllanguage/data/invalidID.errors.txt
+++ b/tests/auto/declarative/qdeclarativelanguage/data/invalidID.errors.txt
diff --git a/tests/auto/declarative/qmllanguage/data/invalidID.qml b/tests/auto/declarative/qdeclarativelanguage/data/invalidID.qml
index 04db3eb..04db3eb 100644
--- a/tests/auto/declarative/qmllanguage/data/invalidID.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/invalidID.qml
diff --git a/tests/auto/declarative/qmllanguage/data/invalidImportID.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/invalidImportID.errors.txt
index a65f5fd..a65f5fd 100644
--- a/tests/auto/declarative/qmllanguage/data/invalidImportID.errors.txt
+++ b/tests/auto/declarative/qdeclarativelanguage/data/invalidImportID.errors.txt
diff --git a/tests/auto/declarative/qmllanguage/data/invalidImportID.qml b/tests/auto/declarative/qdeclarativelanguage/data/invalidImportID.qml
index 30d88d5..30d88d5 100644
--- a/tests/auto/declarative/qmllanguage/data/invalidImportID.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/invalidImportID.qml
diff --git a/tests/auto/declarative/qmllanguage/data/invalidRoot.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/invalidRoot.errors.txt
index 4bcc948..4bcc948 100644
--- a/tests/auto/declarative/qmllanguage/data/invalidRoot.errors.txt
+++ b/tests/auto/declarative/qdeclarativelanguage/data/invalidRoot.errors.txt
diff --git a/tests/auto/declarative/qmllanguage/data/invalidRoot.qml b/tests/auto/declarative/qdeclarativelanguage/data/invalidRoot.qml
index 427827c..427827c 100644
--- a/tests/auto/declarative/qmllanguage/data/invalidRoot.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/invalidRoot.qml
diff --git a/tests/auto/declarative/qmllanguage/data/lib/com/nokia/installedtest/InstalledTest.qml b/tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/installedtest/InstalledTest.qml
index d8a22a8..d8a22a8 100644
--- a/tests/auto/declarative/qmllanguage/data/lib/com/nokia/installedtest/InstalledTest.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/installedtest/InstalledTest.qml
diff --git a/tests/auto/declarative/qmllanguage/data/lib/com/nokia/installedtest/InstalledTest2.qml b/tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/installedtest/InstalledTest2.qml
index a0706ad..a0706ad 100644
--- a/tests/auto/declarative/qmllanguage/data/lib/com/nokia/installedtest/InstalledTest2.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/installedtest/InstalledTest2.qml
diff --git a/tests/auto/declarative/qmllanguage/data/lib/com/nokia/installedtest/PrivateType.qml b/tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/installedtest/PrivateType.qml
index 93c7630..93c7630 100644
--- a/tests/auto/declarative/qmllanguage/data/lib/com/nokia/installedtest/PrivateType.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/installedtest/PrivateType.qml
diff --git a/tests/auto/declarative/qmllanguage/data/lib/com/nokia/installedtest/qmldir b/tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/installedtest/qmldir
index eeb9a05..eeb9a05 100644
--- a/tests/auto/declarative/qmllanguage/data/lib/com/nokia/installedtest/qmldir
+++ b/tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/installedtest/qmldir
diff --git a/tests/auto/declarative/qmllanguage/data/listAssignment.2.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/listAssignment.2.errors.txt
index 8b40aa3..8b40aa3 100644
--- a/tests/auto/declarative/qmllanguage/data/listAssignment.2.errors.txt
+++ b/tests/auto/declarative/qdeclarativelanguage/data/listAssignment.2.errors.txt
diff --git a/tests/auto/declarative/qmllanguage/data/listAssignment.2.qml b/tests/auto/declarative/qdeclarativelanguage/data/listAssignment.2.qml
index e3baadb..e3baadb 100644
--- a/tests/auto/declarative/qmllanguage/data/listAssignment.2.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/listAssignment.2.qml
diff --git a/tests/auto/declarative/qmllanguage/data/listAssignment.3.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/listAssignment.3.errors.txt
index 8c7b7e9..8c7b7e9 100644
--- a/tests/auto/declarative/qmllanguage/data/listAssignment.3.errors.txt
+++ b/tests/auto/declarative/qdeclarativelanguage/data/listAssignment.3.errors.txt
diff --git a/tests/auto/declarative/qmllanguage/data/listAssignment.3.qml b/tests/auto/declarative/qdeclarativelanguage/data/listAssignment.3.qml
index 00c4c6b..00c4c6b 100644
--- a/tests/auto/declarative/qmllanguage/data/listAssignment.3.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/listAssignment.3.qml
diff --git a/tests/auto/declarative/qmllanguage/data/listItemDeleteSelf.qml b/tests/auto/declarative/qdeclarativelanguage/data/listItemDeleteSelf.qml
index 32b5b6c..32b5b6c 100644
--- a/tests/auto/declarative/qmllanguage/data/listItemDeleteSelf.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/listItemDeleteSelf.qml
diff --git a/tests/auto/declarative/qmllanguage/data/listProperties.qml b/tests/auto/declarative/qdeclarativelanguage/data/listProperties.qml
index ba9e37c..ba9e37c 100644
--- a/tests/auto/declarative/qmllanguage/data/listProperties.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/listProperties.qml
diff --git a/tests/auto/declarative/qmllanguage/data/missingObject.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/missingObject.errors.txt
index b31b562..b31b562 100644
--- a/tests/auto/declarative/qmllanguage/data/missingObject.errors.txt
+++ b/tests/auto/declarative/qdeclarativelanguage/data/missingObject.errors.txt
diff --git a/tests/auto/declarative/qmllanguage/data/missingObject.qml b/tests/auto/declarative/qdeclarativelanguage/data/missingObject.qml
index 2f17045..2f17045 100644
--- a/tests/auto/declarative/qmllanguage/data/missingObject.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/missingObject.qml
diff --git a/tests/auto/declarative/qmllanguage/data/missingSignal.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/missingSignal.errors.txt
index f562246..f562246 100644
--- a/tests/auto/declarative/qmllanguage/data/missingSignal.errors.txt
+++ b/tests/auto/declarative/qdeclarativelanguage/data/missingSignal.errors.txt
diff --git a/tests/auto/declarative/qmllanguage/data/missingSignal.qml b/tests/auto/declarative/qdeclarativelanguage/data/missingSignal.qml
index 3bf75f6..3bf75f6 100644
--- a/tests/auto/declarative/qmllanguage/data/missingSignal.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/missingSignal.qml
diff --git a/tests/auto/declarative/qmllanguage/data/missingValueTypeProperty.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/missingValueTypeProperty.errors.txt
index caf7e55..caf7e55 100644
--- a/tests/auto/declarative/qmllanguage/data/missingValueTypeProperty.errors.txt
+++ b/tests/auto/declarative/qdeclarativelanguage/data/missingValueTypeProperty.errors.txt
diff --git a/tests/auto/declarative/qmllanguage/data/missingValueTypeProperty.qml b/tests/auto/declarative/qdeclarativelanguage/data/missingValueTypeProperty.qml
index 9a0fa6a..9a0fa6a 100644
--- a/tests/auto/declarative/qmllanguage/data/missingValueTypeProperty.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/missingValueTypeProperty.qml
diff --git a/tests/auto/declarative/qmllanguage/data/nestedErrors.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/nestedErrors.errors.txt
index 886da55..886da55 100644
--- a/tests/auto/declarative/qmllanguage/data/nestedErrors.errors.txt
+++ b/tests/auto/declarative/qdeclarativelanguage/data/nestedErrors.errors.txt
diff --git a/tests/auto/declarative/qmllanguage/data/nestedErrors.qml b/tests/auto/declarative/qdeclarativelanguage/data/nestedErrors.qml
index c0d755a..c0d755a 100644
--- a/tests/auto/declarative/qmllanguage/data/nestedErrors.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/nestedErrors.qml
diff --git a/tests/auto/declarative/qmllanguage/data/nonexistantProperty.1.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/nonexistantProperty.1.errors.txt
index 6bfce9a..6bfce9a 100644
--- a/tests/auto/declarative/qmllanguage/data/nonexistantProperty.1.errors.txt
+++ b/tests/auto/declarative/qdeclarativelanguage/data/nonexistantProperty.1.errors.txt
diff --git a/tests/auto/declarative/qmllanguage/data/nonexistantProperty.1.qml b/tests/auto/declarative/qdeclarativelanguage/data/nonexistantProperty.1.qml
index df7406c..df7406c 100644
--- a/tests/auto/declarative/qmllanguage/data/nonexistantProperty.1.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/nonexistantProperty.1.qml
diff --git a/tests/auto/declarative/qmllanguage/data/nonexistantProperty.2.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/nonexistantProperty.2.errors.txt
index 4b30056..4b30056 100644
--- a/tests/auto/declarative/qmllanguage/data/nonexistantProperty.2.errors.txt
+++ b/tests/auto/declarative/qdeclarativelanguage/data/nonexistantProperty.2.errors.txt
diff --git a/tests/auto/declarative/qmllanguage/data/nonexistantProperty.2.qml b/tests/auto/declarative/qdeclarativelanguage/data/nonexistantProperty.2.qml
index 06ccd37..06ccd37 100644
--- a/tests/auto/declarative/qmllanguage/data/nonexistantProperty.2.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/nonexistantProperty.2.qml
diff --git a/tests/auto/declarative/qmllanguage/data/nonexistantProperty.3.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/nonexistantProperty.3.errors.txt
index 4b30056..4b30056 100644
--- a/tests/auto/declarative/qmllanguage/data/nonexistantProperty.3.errors.txt
+++ b/tests/auto/declarative/qdeclarativelanguage/data/nonexistantProperty.3.errors.txt
diff --git a/tests/auto/declarative/qmllanguage/data/nonexistantProperty.3.qml b/tests/auto/declarative/qdeclarativelanguage/data/nonexistantProperty.3.qml
index 5b08608..5b08608 100644
--- a/tests/auto/declarative/qmllanguage/data/nonexistantProperty.3.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/nonexistantProperty.3.qml
diff --git a/tests/auto/declarative/qmllanguage/data/nonexistantProperty.4.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/nonexistantProperty.4.errors.txt
index 4b30056..4b30056 100644
--- a/tests/auto/declarative/qmllanguage/data/nonexistantProperty.4.errors.txt
+++ b/tests/auto/declarative/qdeclarativelanguage/data/nonexistantProperty.4.errors.txt
diff --git a/tests/auto/declarative/qmllanguage/data/nonexistantProperty.4.qml b/tests/auto/declarative/qdeclarativelanguage/data/nonexistantProperty.4.qml
index 6579191..6579191 100644
--- a/tests/auto/declarative/qmllanguage/data/nonexistantProperty.4.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/nonexistantProperty.4.qml
diff --git a/tests/auto/declarative/qmllanguage/data/nonexistantProperty.5.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/nonexistantProperty.5.errors.txt
index c07f2b9..c07f2b9 100644
--- a/tests/auto/declarative/qmllanguage/data/nonexistantProperty.5.errors.txt
+++ b/tests/auto/declarative/qdeclarativelanguage/data/nonexistantProperty.5.errors.txt
diff --git a/tests/auto/declarative/qmllanguage/data/nonexistantProperty.5.qml b/tests/auto/declarative/qdeclarativelanguage/data/nonexistantProperty.5.qml
index 37af057..37af057 100644
--- a/tests/auto/declarative/qmllanguage/data/nonexistantProperty.5.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/nonexistantProperty.5.qml
diff --git a/tests/auto/declarative/qmllanguage/data/nonexistantProperty.6.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/nonexistantProperty.6.errors.txt
index 89925b7..89925b7 100644
--- a/tests/auto/declarative/qmllanguage/data/nonexistantProperty.6.errors.txt
+++ b/tests/auto/declarative/qdeclarativelanguage/data/nonexistantProperty.6.errors.txt
diff --git a/tests/auto/declarative/qmllanguage/data/nonexistantProperty.6.qml b/tests/auto/declarative/qdeclarativelanguage/data/nonexistantProperty.6.qml
index 5cd55d0..5cd55d0 100644
--- a/tests/auto/declarative/qmllanguage/data/nonexistantProperty.6.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/nonexistantProperty.6.qml
diff --git a/tests/auto/declarative/qmllanguage/data/nullDotProperty.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/nullDotProperty.errors.txt
index 07a4094..07a4094 100644
--- a/tests/auto/declarative/qmllanguage/data/nullDotProperty.errors.txt
+++ b/tests/auto/declarative/qdeclarativelanguage/data/nullDotProperty.errors.txt
diff --git a/tests/auto/declarative/qmllanguage/data/nullDotProperty.qml b/tests/auto/declarative/qdeclarativelanguage/data/nullDotProperty.qml
index 4e36779..4e36779 100644
--- a/tests/auto/declarative/qmllanguage/data/nullDotProperty.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/nullDotProperty.qml
diff --git a/tests/auto/declarative/qmllanguage/data/objectValueTypeProperty.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/objectValueTypeProperty.errors.txt
index db7d9c0..db7d9c0 100644
--- a/tests/auto/declarative/qmllanguage/data/objectValueTypeProperty.errors.txt
+++ b/tests/auto/declarative/qdeclarativelanguage/data/objectValueTypeProperty.errors.txt
diff --git a/tests/auto/declarative/qmllanguage/data/objectValueTypeProperty.qml b/tests/auto/declarative/qdeclarativelanguage/data/objectValueTypeProperty.qml
index 9924773..9924773 100644
--- a/tests/auto/declarative/qmllanguage/data/objectValueTypeProperty.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/objectValueTypeProperty.qml
diff --git a/tests/auto/declarative/qmllanguage/data/onCompleted.qml b/tests/auto/declarative/qdeclarativelanguage/data/onCompleted.qml
index 5725f85..5725f85 100644
--- a/tests/auto/declarative/qmllanguage/data/onCompleted.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/onCompleted.qml
diff --git a/tests/auto/declarative/qmllanguage/data/property.1.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/property.1.errors.txt
index 3ae6c46..3ae6c46 100644
--- a/tests/auto/declarative/qmllanguage/data/property.1.errors.txt
+++ b/tests/auto/declarative/qdeclarativelanguage/data/property.1.errors.txt
diff --git a/tests/auto/declarative/qmllanguage/data/property.1.qml b/tests/auto/declarative/qdeclarativelanguage/data/property.1.qml
index cadc39a..cadc39a 100644
--- a/tests/auto/declarative/qmllanguage/data/property.1.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/property.1.qml
diff --git a/tests/auto/declarative/qmllanguage/data/property.2.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/property.2.errors.txt
index a18e21a..a18e21a 100644
--- a/tests/auto/declarative/qmllanguage/data/property.2.errors.txt
+++ b/tests/auto/declarative/qdeclarativelanguage/data/property.2.errors.txt
diff --git a/tests/auto/declarative/qmllanguage/data/property.2.qml b/tests/auto/declarative/qdeclarativelanguage/data/property.2.qml
index e810c6c..e810c6c 100644
--- a/tests/auto/declarative/qmllanguage/data/property.2.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/property.2.qml
diff --git a/tests/auto/declarative/qmllanguage/data/property.3.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/property.3.errors.txt
index 5e09a25..5e09a25 100644
--- a/tests/auto/declarative/qmllanguage/data/property.3.errors.txt
+++ b/tests/auto/declarative/qdeclarativelanguage/data/property.3.errors.txt
diff --git a/tests/auto/declarative/qmllanguage/data/property.3.qml b/tests/auto/declarative/qdeclarativelanguage/data/property.3.qml
index 04147c2..04147c2 100644
--- a/tests/auto/declarative/qmllanguage/data/property.3.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/property.3.qml
diff --git a/tests/auto/declarative/qmllanguage/data/property.4.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/property.4.errors.txt
index b447186..b447186 100644
--- a/tests/auto/declarative/qmllanguage/data/property.4.errors.txt
+++ b/tests/auto/declarative/qdeclarativelanguage/data/property.4.errors.txt
diff --git a/tests/auto/declarative/qmllanguage/data/property.4.qml b/tests/auto/declarative/qdeclarativelanguage/data/property.4.qml
index b2ec482..b2ec482 100644
--- a/tests/auto/declarative/qmllanguage/data/property.4.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/property.4.qml
diff --git a/tests/auto/declarative/qmllanguage/data/property.5.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/property.5.errors.txt
index 32a8dc1..32a8dc1 100644
--- a/tests/auto/declarative/qmllanguage/data/property.5.errors.txt
+++ b/tests/auto/declarative/qdeclarativelanguage/data/property.5.errors.txt
diff --git a/tests/auto/declarative/qmllanguage/data/property.5.qml b/tests/auto/declarative/qdeclarativelanguage/data/property.5.qml
index 65fafbb..65fafbb 100644
--- a/tests/auto/declarative/qmllanguage/data/property.5.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/property.5.qml
diff --git a/tests/auto/declarative/qmllanguage/data/propertyValueSource.2.qml b/tests/auto/declarative/qdeclarativelanguage/data/propertyValueSource.2.qml
index 57a6070..57a6070 100644
--- a/tests/auto/declarative/qmllanguage/data/propertyValueSource.2.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/propertyValueSource.2.qml
diff --git a/tests/auto/declarative/qmllanguage/data/propertyValueSource.qml b/tests/auto/declarative/qdeclarativelanguage/data/propertyValueSource.qml
index ad71fcf..ad71fcf 100644
--- a/tests/auto/declarative/qmllanguage/data/propertyValueSource.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/propertyValueSource.qml
diff --git a/tests/auto/declarative/qmllanguage/data/qmlAttachedPropertiesObjectMethod.1.qml b/tests/auto/declarative/qdeclarativelanguage/data/qdeclarativeAttachedPropertiesObjectMethod.1.qml
index 429c327..429c327 100644
--- a/tests/auto/declarative/qmllanguage/data/qmlAttachedPropertiesObjectMethod.1.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/qdeclarativeAttachedPropertiesObjectMethod.1.qml
diff --git a/tests/auto/declarative/qmllanguage/data/qmlAttachedPropertiesObjectMethod.2.qml b/tests/auto/declarative/qdeclarativelanguage/data/qdeclarativeAttachedPropertiesObjectMethod.2.qml
index 0f57b61..0f57b61 100644
--- a/tests/auto/declarative/qmllanguage/data/qmlAttachedPropertiesObjectMethod.2.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/qdeclarativeAttachedPropertiesObjectMethod.2.qml
diff --git a/tests/auto/declarative/qmllanguage/data/readOnly.1.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/readOnly.1.errors.txt
index b8c3404..b8c3404 100644
--- a/tests/auto/declarative/qmllanguage/data/readOnly.1.errors.txt
+++ b/tests/auto/declarative/qdeclarativelanguage/data/readOnly.1.errors.txt
diff --git a/tests/auto/declarative/qmllanguage/data/readOnly.1.qml b/tests/auto/declarative/qdeclarativelanguage/data/readOnly.1.qml
index 60757bd..60757bd 100644
--- a/tests/auto/declarative/qmllanguage/data/readOnly.1.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/readOnly.1.qml
diff --git a/tests/auto/declarative/qmllanguage/data/readOnly.2.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/readOnly.2.errors.txt
index d857a04..d857a04 100644
--- a/tests/auto/declarative/qmllanguage/data/readOnly.2.errors.txt
+++ b/tests/auto/declarative/qdeclarativelanguage/data/readOnly.2.errors.txt
diff --git a/tests/auto/declarative/qmllanguage/data/readOnly.2.qml b/tests/auto/declarative/qdeclarativelanguage/data/readOnly.2.qml
index 8f1633c..8f1633c 100644
--- a/tests/auto/declarative/qmllanguage/data/readOnly.2.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/readOnly.2.qml
diff --git a/tests/auto/declarative/qmllanguage/data/readOnly.3.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/readOnly.3.errors.txt
index c7e9e1b..c7e9e1b 100644
--- a/tests/auto/declarative/qmllanguage/data/readOnly.3.errors.txt
+++ b/tests/auto/declarative/qdeclarativelanguage/data/readOnly.3.errors.txt
diff --git a/tests/auto/declarative/qmllanguage/data/readOnly.3.qml b/tests/auto/declarative/qdeclarativelanguage/data/readOnly.3.qml
index cd86a48..cd86a48 100644
--- a/tests/auto/declarative/qmllanguage/data/readOnly.3.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/readOnly.3.qml
diff --git a/tests/auto/declarative/qmllanguage/data/rootAsQmlComponent.qml b/tests/auto/declarative/qdeclarativelanguage/data/rootAsQmlComponent.qml
index 8d72cd3..8d72cd3 100644
--- a/tests/auto/declarative/qmllanguage/data/rootAsQmlComponent.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/rootAsQmlComponent.qml
diff --git a/tests/auto/declarative/qmllanguage/data/script.1.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/script.1.errors.txt
index 50518cc..50518cc 100644
--- a/tests/auto/declarative/qmllanguage/data/script.1.errors.txt
+++ b/tests/auto/declarative/qdeclarativelanguage/data/script.1.errors.txt
diff --git a/tests/auto/declarative/qmllanguage/data/script.1.qml b/tests/auto/declarative/qdeclarativelanguage/data/script.1.qml
index 8dac8b7..8dac8b7 100644
--- a/tests/auto/declarative/qmllanguage/data/script.1.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/script.1.qml
diff --git a/tests/auto/declarative/qmllanguage/data/script.10.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/script.10.errors.txt
index 13f47d1..13f47d1 100644
--- a/tests/auto/declarative/qmllanguage/data/script.10.errors.txt
+++ b/tests/auto/declarative/qdeclarativelanguage/data/script.10.errors.txt
diff --git a/tests/auto/declarative/qmllanguage/data/script.10.qml b/tests/auto/declarative/qdeclarativelanguage/data/script.10.qml
index 516e878..516e878 100644
--- a/tests/auto/declarative/qmllanguage/data/script.10.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/script.10.qml
diff --git a/tests/auto/declarative/qmllanguage/data/script.11.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/script.11.errors.txt
index a664203..a664203 100644
--- a/tests/auto/declarative/qmllanguage/data/script.11.errors.txt
+++ b/tests/auto/declarative/qdeclarativelanguage/data/script.11.errors.txt
diff --git a/tests/auto/declarative/qmllanguage/data/script.11.qml b/tests/auto/declarative/qdeclarativelanguage/data/script.11.qml
index 6d2d598..6d2d598 100644
--- a/tests/auto/declarative/qmllanguage/data/script.11.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/script.11.qml
diff --git a/tests/auto/declarative/qmllanguage/data/script.12.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/script.12.errors.txt
index 85c8396..85c8396 100644
--- a/tests/auto/declarative/qmllanguage/data/script.12.errors.txt
+++ b/tests/auto/declarative/qdeclarativelanguage/data/script.12.errors.txt
diff --git a/tests/auto/declarative/qmllanguage/data/script.12.qml b/tests/auto/declarative/qdeclarativelanguage/data/script.12.qml
index 9ecb5d9..9ecb5d9 100644
--- a/tests/auto/declarative/qmllanguage/data/script.12.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/script.12.qml
diff --git a/tests/auto/declarative/qmllanguage/data/script.2.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/script.2.errors.txt
index 8fb3bbd..8fb3bbd 100644
--- a/tests/auto/declarative/qmllanguage/data/script.2.errors.txt
+++ b/tests/auto/declarative/qdeclarativelanguage/data/script.2.errors.txt
diff --git a/tests/auto/declarative/qmllanguage/data/script.2.qml b/tests/auto/declarative/qdeclarativelanguage/data/script.2.qml
index dce1a41..dce1a41 100644
--- a/tests/auto/declarative/qmllanguage/data/script.2.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/script.2.qml
diff --git a/tests/auto/declarative/qmllanguage/data/script.3.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/script.3.errors.txt
index 8fb3bbd..8fb3bbd 100644
--- a/tests/auto/declarative/qmllanguage/data/script.3.errors.txt
+++ b/tests/auto/declarative/qdeclarativelanguage/data/script.3.errors.txt
diff --git a/tests/auto/declarative/qmllanguage/data/script.3.qml b/tests/auto/declarative/qdeclarativelanguage/data/script.3.qml
index 8621a9a..8621a9a 100644
--- a/tests/auto/declarative/qmllanguage/data/script.3.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/script.3.qml
diff --git a/tests/auto/declarative/qmllanguage/data/script.4.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/script.4.errors.txt
index 49a507f..49a507f 100644
--- a/tests/auto/declarative/qmllanguage/data/script.4.errors.txt
+++ b/tests/auto/declarative/qdeclarativelanguage/data/script.4.errors.txt
diff --git a/tests/auto/declarative/qmllanguage/data/script.4.qml b/tests/auto/declarative/qdeclarativelanguage/data/script.4.qml
index d89817c..d89817c 100644
--- a/tests/auto/declarative/qmllanguage/data/script.4.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/script.4.qml
diff --git a/tests/auto/declarative/qmllanguage/data/script.5.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/script.5.errors.txt
index 49a507f..49a507f 100644
--- a/tests/auto/declarative/qmllanguage/data/script.5.errors.txt
+++ b/tests/auto/declarative/qdeclarativelanguage/data/script.5.errors.txt
diff --git a/tests/auto/declarative/qmllanguage/data/script.5.qml b/tests/auto/declarative/qdeclarativelanguage/data/script.5.qml
index 8986b3b..8986b3b 100644
--- a/tests/auto/declarative/qmllanguage/data/script.5.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/script.5.qml
diff --git a/tests/auto/declarative/qmllanguage/data/script.6.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/script.6.errors.txt
index 4e53b6b..4e53b6b 100644
--- a/tests/auto/declarative/qmllanguage/data/script.6.errors.txt
+++ b/tests/auto/declarative/qdeclarativelanguage/data/script.6.errors.txt
diff --git a/tests/auto/declarative/qmllanguage/data/script.6.qml b/tests/auto/declarative/qdeclarativelanguage/data/script.6.qml
index 07e9d78..07e9d78 100644
--- a/tests/auto/declarative/qmllanguage/data/script.6.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/script.6.qml
diff --git a/tests/auto/declarative/qmllanguage/data/script.7.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/script.7.errors.txt
index dc15ddf..dc15ddf 100644
--- a/tests/auto/declarative/qmllanguage/data/script.7.errors.txt
+++ b/tests/auto/declarative/qdeclarativelanguage/data/script.7.errors.txt
diff --git a/tests/auto/declarative/qmllanguage/data/script.7.qml b/tests/auto/declarative/qdeclarativelanguage/data/script.7.qml
index fa905e6..fa905e6 100644
--- a/tests/auto/declarative/qmllanguage/data/script.7.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/script.7.qml
diff --git a/tests/auto/declarative/qmllanguage/data/script.8.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/script.8.errors.txt
index b5bf1a8..b5bf1a8 100644
--- a/tests/auto/declarative/qmllanguage/data/script.8.errors.txt
+++ b/tests/auto/declarative/qdeclarativelanguage/data/script.8.errors.txt
diff --git a/tests/auto/declarative/qmllanguage/data/script.8.qml b/tests/auto/declarative/qdeclarativelanguage/data/script.8.qml
index f600c88..f600c88 100644
--- a/tests/auto/declarative/qmllanguage/data/script.8.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/script.8.qml
diff --git a/tests/auto/declarative/qmllanguage/data/script.9.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/script.9.errors.txt
index 41e8d46..41e8d46 100644
--- a/tests/auto/declarative/qmllanguage/data/script.9.errors.txt
+++ b/tests/auto/declarative/qdeclarativelanguage/data/script.9.errors.txt
diff --git a/tests/auto/declarative/qmllanguage/data/script.9.qml b/tests/auto/declarative/qdeclarativelanguage/data/script.9.qml
index 79aa504..79aa504 100644
--- a/tests/auto/declarative/qmllanguage/data/script.9.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/script.9.qml
diff --git a/tests/auto/declarative/qmllanguage/data/scriptString.qml b/tests/auto/declarative/qdeclarativelanguage/data/scriptString.qml
index 40a3bbe..40a3bbe 100644
--- a/tests/auto/declarative/qmllanguage/data/scriptString.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/scriptString.qml
diff --git a/tests/auto/declarative/qmllanguage/data/signal.1.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/signal.1.errors.txt
index 78d9960..78d9960 100644
--- a/tests/auto/declarative/qmllanguage/data/signal.1.errors.txt
+++ b/tests/auto/declarative/qdeclarativelanguage/data/signal.1.errors.txt
diff --git a/tests/auto/declarative/qmllanguage/data/signal.1.qml b/tests/auto/declarative/qdeclarativelanguage/data/signal.1.qml
index fbaf017..fbaf017 100644
--- a/tests/auto/declarative/qmllanguage/data/signal.1.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/signal.1.qml
diff --git a/tests/auto/declarative/qmllanguage/data/signal.2.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/signal.2.errors.txt
index fce8928..fce8928 100644
--- a/tests/auto/declarative/qmllanguage/data/signal.2.errors.txt
+++ b/tests/auto/declarative/qdeclarativelanguage/data/signal.2.errors.txt
diff --git a/tests/auto/declarative/qmllanguage/data/signal.2.qml b/tests/auto/declarative/qdeclarativelanguage/data/signal.2.qml
index 5049192..5049192 100644
--- a/tests/auto/declarative/qmllanguage/data/signal.2.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/signal.2.qml
diff --git a/tests/auto/declarative/qmllanguage/data/signal.3.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/signal.3.errors.txt
index bf043ac..bf043ac 100644
--- a/tests/auto/declarative/qmllanguage/data/signal.3.errors.txt
+++ b/tests/auto/declarative/qdeclarativelanguage/data/signal.3.errors.txt
diff --git a/tests/auto/declarative/qmllanguage/data/signal.3.qml b/tests/auto/declarative/qdeclarativelanguage/data/signal.3.qml
index 9dd4cc7..9dd4cc7 100644
--- a/tests/auto/declarative/qmllanguage/data/signal.3.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/signal.3.qml
diff --git a/tests/auto/declarative/qmllanguage/data/simpleBindings.qml b/tests/auto/declarative/qdeclarativelanguage/data/simpleBindings.qml
index 2fcd1a5..2fcd1a5 100644
--- a/tests/auto/declarative/qmllanguage/data/simpleBindings.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/simpleBindings.qml
diff --git a/tests/auto/declarative/qmllanguage/data/simpleContainer.qml b/tests/auto/declarative/qdeclarativelanguage/data/simpleContainer.qml
index c3a795f..c3a795f 100644
--- a/tests/auto/declarative/qmllanguage/data/simpleContainer.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/simpleContainer.qml
diff --git a/tests/auto/declarative/qmllanguage/data/simpleObject.qml b/tests/auto/declarative/qdeclarativelanguage/data/simpleObject.qml
index 30c7823..30c7823 100644
--- a/tests/auto/declarative/qmllanguage/data/simpleObject.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/simpleObject.qml
diff --git a/tests/auto/declarative/qmllanguage/qtest/declarative/qmllanguage/Test.qml b/tests/auto/declarative/qdeclarativelanguage/data/subdir/Test.qml
index c4d5905..c4d5905 100644
--- a/tests/auto/declarative/qmllanguage/qtest/declarative/qmllanguage/Test.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/subdir/Test.qml
diff --git a/tests/auto/declarative/qmllanguage/data/subdir/subsubdir/SubTest.qml b/tests/auto/declarative/qdeclarativelanguage/data/subdir/subsubdir/SubTest.qml
index c4d5905..c4d5905 100644
--- a/tests/auto/declarative/qmllanguage/data/subdir/subsubdir/SubTest.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/subdir/subsubdir/SubTest.qml
diff --git a/tests/auto/declarative/qmllanguage/data/test.js b/tests/auto/declarative/qdeclarativelanguage/data/test.js
index e69de29..e69de29 100644
--- a/tests/auto/declarative/qmllanguage/data/test.js
+++ b/tests/auto/declarative/qdeclarativelanguage/data/test.js
diff --git a/tests/auto/declarative/qmllanguage/data/test2.js b/tests/auto/declarative/qdeclarativelanguage/data/test2.js
index e69de29..e69de29 100644
--- a/tests/auto/declarative/qmllanguage/data/test2.js
+++ b/tests/auto/declarative/qdeclarativelanguage/data/test2.js
diff --git a/tests/auto/declarative/qmllanguage/data/unregisteredObject.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/unregisteredObject.errors.txt
index 347db05..347db05 100644
--- a/tests/auto/declarative/qmllanguage/data/unregisteredObject.errors.txt
+++ b/tests/auto/declarative/qdeclarativelanguage/data/unregisteredObject.errors.txt
diff --git a/tests/auto/declarative/qmllanguage/data/unregisteredObject.qml b/tests/auto/declarative/qdeclarativelanguage/data/unregisteredObject.qml
index 4969f62..4969f62 100644
--- a/tests/auto/declarative/qmllanguage/data/unregisteredObject.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/unregisteredObject.qml
diff --git a/tests/auto/declarative/qmllanguage/data/unsupportedProperty.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/unsupportedProperty.errors.txt
index 3cd626d..3cd626d 100644
--- a/tests/auto/declarative/qmllanguage/data/unsupportedProperty.errors.txt
+++ b/tests/auto/declarative/qdeclarativelanguage/data/unsupportedProperty.errors.txt
diff --git a/tests/auto/declarative/qmllanguage/data/unsupportedProperty.qml b/tests/auto/declarative/qdeclarativelanguage/data/unsupportedProperty.qml
index 9f19680..9f19680 100644
--- a/tests/auto/declarative/qmllanguage/data/unsupportedProperty.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/unsupportedProperty.qml
diff --git a/tests/auto/declarative/qmllanguage/data/valueTypes.qml b/tests/auto/declarative/qdeclarativelanguage/data/valueTypes.qml
index bf325a7..bf325a7 100644
--- a/tests/auto/declarative/qmllanguage/data/valueTypes.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/valueTypes.qml
diff --git a/tests/auto/declarative/qmllanguage/data/wrongType.1.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/wrongType.1.errors.txt
index ba7a076..ba7a076 100644
--- a/tests/auto/declarative/qmllanguage/data/wrongType.1.errors.txt
+++ b/tests/auto/declarative/qdeclarativelanguage/data/wrongType.1.errors.txt
diff --git a/tests/auto/declarative/qmllanguage/data/wrongType.1.qml b/tests/auto/declarative/qdeclarativelanguage/data/wrongType.1.qml
index 289d37f..289d37f 100644
--- a/tests/auto/declarative/qmllanguage/data/wrongType.1.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/wrongType.1.qml
diff --git a/tests/auto/declarative/qmllanguage/data/wrongType.10.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/wrongType.10.errors.txt
index ae75b52..ae75b52 100644
--- a/tests/auto/declarative/qmllanguage/data/wrongType.10.errors.txt
+++ b/tests/auto/declarative/qdeclarativelanguage/data/wrongType.10.errors.txt
diff --git a/tests/auto/declarative/qmllanguage/data/wrongType.10.qml b/tests/auto/declarative/qdeclarativelanguage/data/wrongType.10.qml
index 2cf0e50..2cf0e50 100644
--- a/tests/auto/declarative/qmllanguage/data/wrongType.10.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/wrongType.10.qml
diff --git a/tests/auto/declarative/qmllanguage/data/wrongType.11.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/wrongType.11.errors.txt
index 23a4cda..23a4cda 100644
--- a/tests/auto/declarative/qmllanguage/data/wrongType.11.errors.txt
+++ b/tests/auto/declarative/qdeclarativelanguage/data/wrongType.11.errors.txt
diff --git a/tests/auto/declarative/qmllanguage/data/wrongType.11.qml b/tests/auto/declarative/qdeclarativelanguage/data/wrongType.11.qml
index ae77ba1..ae77ba1 100644
--- a/tests/auto/declarative/qmllanguage/data/wrongType.11.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/wrongType.11.qml
diff --git a/tests/auto/declarative/qmllanguage/data/wrongType.12.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/wrongType.12.errors.txt
index 3092100..3092100 100644
--- a/tests/auto/declarative/qmllanguage/data/wrongType.12.errors.txt
+++ b/tests/auto/declarative/qdeclarativelanguage/data/wrongType.12.errors.txt
diff --git a/tests/auto/declarative/qmllanguage/data/wrongType.12.qml b/tests/auto/declarative/qdeclarativelanguage/data/wrongType.12.qml
index b7a366f..b7a366f 100644
--- a/tests/auto/declarative/qmllanguage/data/wrongType.12.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/wrongType.12.qml
diff --git a/tests/auto/declarative/qmllanguage/data/wrongType.13.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/wrongType.13.errors.txt
index ba7a076..ba7a076 100644
--- a/tests/auto/declarative/qmllanguage/data/wrongType.13.errors.txt
+++ b/tests/auto/declarative/qdeclarativelanguage/data/wrongType.13.errors.txt
diff --git a/tests/auto/declarative/qmllanguage/data/wrongType.13.qml b/tests/auto/declarative/qdeclarativelanguage/data/wrongType.13.qml
index 477aff1..477aff1 100644
--- a/tests/auto/declarative/qmllanguage/data/wrongType.13.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/wrongType.13.qml
diff --git a/tests/auto/declarative/qmllanguage/data/wrongType.14.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/wrongType.14.errors.txt
index d621fdd..d621fdd 100644
--- a/tests/auto/declarative/qmllanguage/data/wrongType.14.errors.txt
+++ b/tests/auto/declarative/qdeclarativelanguage/data/wrongType.14.errors.txt
diff --git a/tests/auto/declarative/qmllanguage/data/wrongType.14.qml b/tests/auto/declarative/qdeclarativelanguage/data/wrongType.14.qml
index 672d693..672d693 100644
--- a/tests/auto/declarative/qmllanguage/data/wrongType.14.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/wrongType.14.qml
diff --git a/tests/auto/declarative/qmllanguage/data/wrongType.15.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/wrongType.15.errors.txt
index 44768e3..44768e3 100644
--- a/tests/auto/declarative/qmllanguage/data/wrongType.15.errors.txt
+++ b/tests/auto/declarative/qdeclarativelanguage/data/wrongType.15.errors.txt
diff --git a/tests/auto/declarative/qmllanguage/data/wrongType.15.qml b/tests/auto/declarative/qdeclarativelanguage/data/wrongType.15.qml
index 633a5ba..633a5ba 100644
--- a/tests/auto/declarative/qmllanguage/data/wrongType.15.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/wrongType.15.qml
diff --git a/tests/auto/declarative/qmllanguage/data/wrongType.2.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/wrongType.2.errors.txt
index 9ff9f25..9ff9f25 100644
--- a/tests/auto/declarative/qmllanguage/data/wrongType.2.errors.txt
+++ b/tests/auto/declarative/qdeclarativelanguage/data/wrongType.2.errors.txt
diff --git a/tests/auto/declarative/qmllanguage/data/wrongType.2.qml b/tests/auto/declarative/qdeclarativelanguage/data/wrongType.2.qml
index 34b74f7..34b74f7 100644
--- a/tests/auto/declarative/qmllanguage/data/wrongType.2.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/wrongType.2.qml
diff --git a/tests/auto/declarative/qmllanguage/data/wrongType.3.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/wrongType.3.errors.txt
index 6d971c6..6d971c6 100644
--- a/tests/auto/declarative/qmllanguage/data/wrongType.3.errors.txt
+++ b/tests/auto/declarative/qdeclarativelanguage/data/wrongType.3.errors.txt
diff --git a/tests/auto/declarative/qmllanguage/data/wrongType.3.qml b/tests/auto/declarative/qdeclarativelanguage/data/wrongType.3.qml
index 384181a..384181a 100644
--- a/tests/auto/declarative/qmllanguage/data/wrongType.3.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/wrongType.3.qml
diff --git a/tests/auto/declarative/qmllanguage/data/wrongType.4.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/wrongType.4.errors.txt
index ef34d0e..ef34d0e 100644
--- a/tests/auto/declarative/qmllanguage/data/wrongType.4.errors.txt
+++ b/tests/auto/declarative/qdeclarativelanguage/data/wrongType.4.errors.txt
diff --git a/tests/auto/declarative/qmllanguage/data/wrongType.4.qml b/tests/auto/declarative/qdeclarativelanguage/data/wrongType.4.qml
index 0787bf5..0787bf5 100644
--- a/tests/auto/declarative/qmllanguage/data/wrongType.4.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/wrongType.4.qml
diff --git a/tests/auto/declarative/qmllanguage/data/wrongType.5.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/wrongType.5.errors.txt
index cab10bd..cab10bd 100644
--- a/tests/auto/declarative/qmllanguage/data/wrongType.5.errors.txt
+++ b/tests/auto/declarative/qdeclarativelanguage/data/wrongType.5.errors.txt
diff --git a/tests/auto/declarative/qmllanguage/data/wrongType.5.qml b/tests/auto/declarative/qdeclarativelanguage/data/wrongType.5.qml
index c50ae9a..c50ae9a 100644
--- a/tests/auto/declarative/qmllanguage/data/wrongType.5.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/wrongType.5.qml
diff --git a/tests/auto/declarative/qmllanguage/data/wrongType.6.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/wrongType.6.errors.txt
index d0a0b00..d0a0b00 100644
--- a/tests/auto/declarative/qmllanguage/data/wrongType.6.errors.txt
+++ b/tests/auto/declarative/qdeclarativelanguage/data/wrongType.6.errors.txt
diff --git a/tests/auto/declarative/qmllanguage/data/wrongType.6.qml b/tests/auto/declarative/qdeclarativelanguage/data/wrongType.6.qml
index da10b78..da10b78 100644
--- a/tests/auto/declarative/qmllanguage/data/wrongType.6.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/wrongType.6.qml
diff --git a/tests/auto/declarative/qmllanguage/data/wrongType.7.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/wrongType.7.errors.txt
index 614346b..614346b 100644
--- a/tests/auto/declarative/qmllanguage/data/wrongType.7.errors.txt
+++ b/tests/auto/declarative/qdeclarativelanguage/data/wrongType.7.errors.txt
diff --git a/tests/auto/declarative/qmllanguage/data/wrongType.7.qml b/tests/auto/declarative/qdeclarativelanguage/data/wrongType.7.qml
index ddc3835..ddc3835 100644
--- a/tests/auto/declarative/qmllanguage/data/wrongType.7.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/wrongType.7.qml
diff --git a/tests/auto/declarative/qmllanguage/data/wrongType.8.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/wrongType.8.errors.txt
index 1773c00..1773c00 100644
--- a/tests/auto/declarative/qmllanguage/data/wrongType.8.errors.txt
+++ b/tests/auto/declarative/qdeclarativelanguage/data/wrongType.8.errors.txt
diff --git a/tests/auto/declarative/qmllanguage/data/wrongType.8.qml b/tests/auto/declarative/qdeclarativelanguage/data/wrongType.8.qml
index a5f6756..a5f6756 100644
--- a/tests/auto/declarative/qmllanguage/data/wrongType.8.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/wrongType.8.qml
diff --git a/tests/auto/declarative/qmllanguage/data/wrongType.9.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/wrongType.9.errors.txt
index 8630975..8630975 100644
--- a/tests/auto/declarative/qmllanguage/data/wrongType.9.errors.txt
+++ b/tests/auto/declarative/qdeclarativelanguage/data/wrongType.9.errors.txt
diff --git a/tests/auto/declarative/qmllanguage/data/wrongType.9.qml b/tests/auto/declarative/qdeclarativelanguage/data/wrongType.9.qml
index a3db732..a3db732 100644
--- a/tests/auto/declarative/qmllanguage/data/wrongType.9.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/wrongType.9.qml
diff --git a/tests/auto/declarative/qmllanguage/qmllanguage.pro b/tests/auto/declarative/qdeclarativelanguage/qdeclarativelanguage.pro
index d1876ef..d7c1def 100644
--- a/tests/auto/declarative/qmllanguage/qmllanguage.pro
+++ b/tests/auto/declarative/qdeclarativelanguage/qdeclarativelanguage.pro
@@ -3,7 +3,7 @@ contains(QT_CONFIG,declarative): QT += declarative
 QT += script network
 macx:CONFIG -= app_bundle
 
-SOURCES += tst_qmllanguage.cpp \
+SOURCES += tst_qdeclarativelanguage.cpp \
            testtypes.cpp
 HEADERS += testtypes.h
 
diff --git a/tests/auto/declarative/qmllanguage/qtest/declarative/qmllanguage/LocalInternal.qml b/tests/auto/declarative/qdeclarativelanguage/qtest/declarative/qmllanguage/LocalInternal.qml
index 836c20a..836c20a 100644
--- a/tests/auto/declarative/qmllanguage/qtest/declarative/qmllanguage/LocalInternal.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/qtest/declarative/qmllanguage/LocalInternal.qml
diff --git a/tests/auto/declarative/qmllanguage/data/subdir/Test.qml b/tests/auto/declarative/qdeclarativelanguage/qtest/declarative/qmllanguage/Test.qml
index c4d5905..c4d5905 100644
--- a/tests/auto/declarative/qmllanguage/data/subdir/Test.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/qtest/declarative/qmllanguage/Test.qml
diff --git a/tests/auto/declarative/qmllanguage/qtest/declarative/qmllanguage/TestLocal.qml b/tests/auto/declarative/qdeclarativelanguage/qtest/declarative/qmllanguage/TestLocal.qml
index 11443ca..11443ca 100644
--- a/tests/auto/declarative/qmllanguage/qtest/declarative/qmllanguage/TestLocal.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/qtest/declarative/qmllanguage/TestLocal.qml
diff --git a/tests/auto/declarative/qmllanguage/qtest/declarative/qmllanguage/TestSubDir.qml b/tests/auto/declarative/qdeclarativelanguage/qtest/declarative/qmllanguage/TestSubDir.qml
index 0dfede4..0dfede4 100644
--- a/tests/auto/declarative/qmllanguage/qtest/declarative/qmllanguage/TestSubDir.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/qtest/declarative/qmllanguage/TestSubDir.qml
diff --git a/tests/auto/declarative/qmllanguage/qtest/declarative/qmllanguage/pics/blue.png b/tests/auto/declarative/qdeclarativelanguage/qtest/declarative/qmllanguage/pics/blue.png
index 46f815f..46f815f 100644
--- a/tests/auto/declarative/qmllanguage/qtest/declarative/qmllanguage/pics/blue.png
+++ b/tests/auto/declarative/qdeclarativelanguage/qtest/declarative/qmllanguage/pics/blue.png
diff --git a/tests/auto/declarative/qmllanguage/qtest/declarative/qmllanguage/qmldir b/tests/auto/declarative/qdeclarativelanguage/qtest/declarative/qmllanguage/qmldir
index b32f82b..b32f82b 100644
--- a/tests/auto/declarative/qmllanguage/qtest/declarative/qmllanguage/qmldir
+++ b/tests/auto/declarative/qdeclarativelanguage/qtest/declarative/qmllanguage/qmldir
diff --git a/tests/auto/declarative/qmllanguage/qtest/declarative/qmllanguage/subdir/SubTest.qml b/tests/auto/declarative/qdeclarativelanguage/qtest/declarative/qmllanguage/subdir/SubTest.qml
index 0ea9ec6..0ea9ec6 100644
--- a/tests/auto/declarative/qmllanguage/qtest/declarative/qmllanguage/subdir/SubTest.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/qtest/declarative/qmllanguage/subdir/SubTest.qml
diff --git a/tests/auto/declarative/qmllanguage/qtest/declarative/qmllanguage/subdir/qmldir b/tests/auto/declarative/qdeclarativelanguage/qtest/declarative/qmllanguage/subdir/qmldir
index f7016c7..f7016c7 100644
--- a/tests/auto/declarative/qmllanguage/qtest/declarative/qmllanguage/subdir/qmldir
+++ b/tests/auto/declarative/qdeclarativelanguage/qtest/declarative/qmllanguage/subdir/qmldir
diff --git a/tests/auto/declarative/qmllanguage/testtypes.cpp b/tests/auto/declarative/qdeclarativelanguage/testtypes.cpp
index 9ffe28a..9ffe28a 100644
--- a/tests/auto/declarative/qmllanguage/testtypes.cpp
+++ b/tests/auto/declarative/qdeclarativelanguage/testtypes.cpp
diff --git a/tests/auto/declarative/qmllanguage/testtypes.h b/tests/auto/declarative/qdeclarativelanguage/testtypes.h
index 9fd0973..21f3e70 100644
--- a/tests/auto/declarative/qmllanguage/testtypes.h
+++ b/tests/auto/declarative/qdeclarativelanguage/testtypes.h
@@ -47,11 +47,11 @@
 #include <QtGui/qmatrix.h>
 #include <QtGui/qcolor.h>
 #include <QtGui/qvector3d.h>
-#include <QtDeclarative/qml.h>
-#include <QtDeclarative/qmlcomponent.h>
-#include <QtDeclarative/qmlparserstatus.h>
-#include <QtDeclarative/qmlpropertyvaluesource.h>
-#include <QtDeclarative/qmlscriptstring.h>
+#include <QtDeclarative/qdeclarative.h>
+#include <QtDeclarative/qdeclarativecomponent.h>
+#include <QtDeclarative/qdeclarativeparserstatus.h>
+#include <QtDeclarative/qdeclarativepropertyvaluesource.h>
+#include <QtDeclarative/qdeclarativescriptstring.h>
 
 QVariant myCustomVariantTypeConverter(const QString &data);
 
@@ -90,7 +90,7 @@ private:
     int m_value2;
 };
 
-class MyQmlObject : public QObject, public MyInterface, public QmlParserStatus
+class MyQmlObject : public QObject, public MyInterface, public QDeclarativeParserStatus
 {
     Q_OBJECT
     Q_PROPERTY(int value READ value WRITE setValue FINAL)
@@ -103,7 +103,7 @@ class MyQmlObject : public QObject, public MyInterface, public QmlParserStatus
     Q_PROPERTY(MyCustomVariantType customType READ customType WRITE setCustomType);
     Q_PROPERTY(MyQmlObject *qmlobjectProperty READ qmlobject WRITE setQmlobject)
 
-    Q_INTERFACES(MyInterface QmlParserStatus)
+    Q_INTERFACES(MyInterface QDeclarativeParserStatus)
 public:
     MyQmlObject() : m_value(-1), m_interface(0), m_qmlobject(0) { qRegisterMetaType<MyCustomVariantType>("MyCustomVariantType"); }
 
@@ -158,13 +158,13 @@ QML_DECLARE_TYPE(MyQmlObject);
 class MyGroupedObject : public QObject
 {
     Q_OBJECT
-    Q_PROPERTY(QmlScriptString script READ script WRITE setScript);
+    Q_PROPERTY(QDeclarativeScriptString script READ script WRITE setScript);
 public:
-    QmlScriptString script() const { return m_script; }
-    void setScript(const QmlScriptString &s) { m_script = s; }
+    QDeclarativeScriptString script() const { return m_script; }
+    void setScript(const QDeclarativeScriptString &s) { m_script = s; }
 
 private:
-    QmlScriptString m_script;
+    QDeclarativeScriptString m_script;
 };
 
 QML_DECLARE_TYPE(MyGroupedObject);
@@ -178,7 +178,7 @@ class MyTypeObject : public QObject
 
     Q_PROPERTY(QString id READ id WRITE setId);
     Q_PROPERTY(QObject *objectProperty READ objectProperty WRITE setObjectProperty);
-    Q_PROPERTY(QmlComponent *componentProperty READ componentProperty WRITE setComponentProperty);
+    Q_PROPERTY(QDeclarativeComponent *componentProperty READ componentProperty WRITE setComponentProperty);
     Q_PROPERTY(MyFlags flagProperty READ flagProperty WRITE setFlagProperty);
     Q_PROPERTY(MyEnum enumProperty READ enumProperty WRITE setEnumProperty);
     Q_PROPERTY(QString stringProperty READ stringProperty WRITE setStringProperty);
@@ -203,7 +203,7 @@ class MyTypeObject : public QObject
     Q_PROPERTY(QVector3D vectorProperty READ vectorProperty WRITE setVectorProperty);
     Q_PROPERTY(QUrl urlProperty READ urlProperty WRITE setUrlProperty);
 
-    Q_PROPERTY(QmlScriptString scriptProperty READ scriptProperty WRITE setScriptProperty);
+    Q_PROPERTY(QDeclarativeScriptString scriptProperty READ scriptProperty WRITE setScriptProperty);
     Q_PROPERTY(MyGroupedObject *grouped READ grouped CONSTANT);
     Q_PROPERTY(MyGroupedObject *nullGrouped READ nullGrouped CONSTANT);
 
@@ -227,11 +227,11 @@ public:
         objectPropertyValue = v;
     }
 
-    QmlComponent *componentPropertyValue;
-    QmlComponent *componentProperty() const {
+    QDeclarativeComponent *componentPropertyValue;
+    QDeclarativeComponent *componentProperty() const {
         return componentPropertyValue;
     }
-    void setComponentProperty(QmlComponent *v) {
+    void setComponentProperty(QDeclarativeComponent *v) {
         componentPropertyValue = v;
     }
 
@@ -423,11 +423,11 @@ public:
         urlPropertyValue = v;
     }
 
-    QmlScriptString scriptPropertyValue;
-    QmlScriptString scriptProperty() const {
+    QDeclarativeScriptString scriptPropertyValue;
+    QDeclarativeScriptString scriptProperty() const {
         return scriptPropertyValue;
     }
-    void setScriptProperty(const QmlScriptString &v) {
+    void setScriptProperty(const QDeclarativeScriptString &v) {
         scriptPropertyValue = v;
     }
 
@@ -447,15 +447,15 @@ QML_DECLARE_TYPE(MyTypeObject);
 class MyContainer : public QObject
 {
     Q_OBJECT
-    Q_PROPERTY(QmlListProperty<QObject> children READ children)
-    Q_PROPERTY(QmlListProperty<MyInterface> qlistInterfaces READ qlistInterfaces)
+    Q_PROPERTY(QDeclarativeListProperty<QObject> children READ children)
+    Q_PROPERTY(QDeclarativeListProperty<MyInterface> qlistInterfaces READ qlistInterfaces)
     Q_CLASSINFO("DefaultProperty", "children");
 public:
     MyContainer() {}
 
-    QmlListProperty<QObject> children() { return QmlListProperty<QObject>(this, m_children); }
+    QDeclarativeListProperty<QObject> children() { return QDeclarativeListProperty<QObject>(this, m_children); }
     QList<QObject *> *getChildren() { return &m_children; }
-    QmlListProperty<MyInterface> qlistInterfaces() { return QmlListProperty<MyInterface>(this, m_interfaces); }
+    QDeclarativeListProperty<MyInterface> qlistInterfaces() { return QDeclarativeListProperty<MyInterface>(this, m_interfaces); }
     QList<MyInterface *> *getQListInterfaces() { return &m_interfaces; }
 
     QList<QObject*> m_children;
@@ -465,16 +465,16 @@ public:
 QML_DECLARE_TYPE(MyContainer);
 
 
-class MyPropertyValueSource : public QObject, public QmlPropertyValueSource
+class MyPropertyValueSource : public QObject, public QDeclarativePropertyValueSource
 {
     Q_OBJECT
-    Q_INTERFACES(QmlPropertyValueSource)
+    Q_INTERFACES(QDeclarativePropertyValueSource)
 public:
     MyPropertyValueSource()
-        : QmlPropertyValueSource() {}
+        : QDeclarativePropertyValueSource() {}
 
-    QmlMetaProperty prop;
-    virtual void setTarget(const QmlMetaProperty &p)
+    QDeclarativeMetaProperty prop;
+    virtual void setTarget(const QDeclarativeMetaProperty &p)
     {
         prop = p;
     }
@@ -531,9 +531,9 @@ namespace MyNamespace {
     class MySecondNamespacedType : public QObject
     {
         Q_OBJECT
-        Q_PROPERTY(QmlListProperty<MyNamespace::MyNamespacedType> list READ list);
+        Q_PROPERTY(QDeclarativeListProperty<MyNamespace::MyNamespacedType> list READ list);
     public:
-        QmlListProperty<MyNamespacedType> list() { return QmlListProperty<MyNamespacedType>(this, m_list); }
+        QDeclarativeListProperty<MyNamespacedType> list() { return QDeclarativeListProperty<MyNamespacedType>(this, m_list); }
 
     private:
         QList<MyNamespacedType *> m_list;
diff --git a/tests/auto/declarative/qmllanguage/tst_qmllanguage.cpp b/tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp
index ecdd33a..cb59f47 100644
--- a/tests/auto/declarative/qmllanguage/tst_qmllanguage.cpp
+++ b/tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp
@@ -39,13 +39,13 @@
 **
 ****************************************************************************/
 #include <qtest.h>
-#include <QtDeclarative/qmlengine.h>
-#include <QtDeclarative/qmlcomponent.h>
+#include <QtDeclarative/qdeclarativeengine.h>
+#include <QtDeclarative/qdeclarativecomponent.h>
 #include <QtCore/qfile.h>
 #include <QtCore/qdebug.h>
 #include <QtCore/qfileinfo.h>
 #include <QtCore/qdir.h>
-#include <private/qmlmetaproperty_p.h>
+#include <private/qdeclarativemetaproperty_p.h>
 #include "testtypes.h"
 
 #include "../../../shared/util.h"
@@ -61,7 +61,7 @@ class tst_qmllanguage : public QObject
     Q_OBJECT
 public:
     tst_qmllanguage() {
-        QmlMetaType::registerCustomStringConverter(qMetaTypeId<MyCustomVariantType>(), myCustomVariantTypeConverter);
+        QDeclarativeMetaType::registerCustomStringConverter(qMetaTypeId<MyCustomVariantType>(), myCustomVariantTypeConverter);
         QFileInfo fileInfo(__FILE__);
         engine.addImportPath(fileInfo.absoluteDir().filePath(QLatin1String("data/lib")));
     }
@@ -129,7 +129,7 @@ private slots:
     void crash2();
 
 private:
-    QmlEngine engine;
+    QDeclarativeEngine engine;
     void testType(const QString& qml, const QString& type);
 };
 
@@ -146,10 +146,10 @@ private:
         file.close(); \
         QList<QByteArray> expected = data.split('\n'); \
         expected.removeAll(QByteArray("")); \
-        QList<QmlError> errors = component.errors(); \
+        QList<QDeclarativeError> errors = component.errors(); \
         QList<QByteArray> actual; \
         for (int ii = 0; ii < errors.count(); ++ii) { \
-            const QmlError &error = errors.at(ii); \
+            const QDeclarativeError &error = errors.at(ii); \
             QByteArray errorStr = QByteArray::number(error.line()) + ":" +  \
                                   QByteArray::number(error.column()) + ":" + \
                                   error.description().toUtf8(); \
@@ -157,7 +157,7 @@ private:
         } \
         if (qgetenv("DEBUG") != "" && expected != actual) \
             qWarning() << "Expected:" << expected << "Actual:" << actual;  \
-        if (qgetenv("QMLLANGUAGE_UPDATEERRORS") != "" && expected != actual) {\
+        if (qgetenv("QDECLARATIVELANGUAGE_UPDATEERRORS") != "" && expected != actual) {\
             QFile file(QLatin1String("data/") + QLatin1String(errorfile)); \
             QVERIFY(file.open(QIODevice::WriteOnly)); \
             for (int ii = 0; ii < actual.count(); ++ii) { \
@@ -180,28 +180,6 @@ inline QUrl TEST_FILE(const char *filename)
     return TEST_FILE(QLatin1String(filename));
 }
 
-void tst_qmllanguage::initTestCase()
-{
-    registerTypes();
-
-    QML_REGISTER_TYPE(com.nokia.Test, 0, 0, TestTP, TestType)
-    QML_REGISTER_TYPE(com.nokia.Test, 1, 0, Test, TestType)
-    QML_REGISTER_TYPE(com.nokia.Test, 1, 5, Test, TestType)
-    QML_REGISTER_TYPE(com.nokia.Test, 1, 8, Test, TestType2)
-    QML_REGISTER_TYPE(com.nokia.Test, 1, 9, OldTest, TestType)
-    QML_REGISTER_TYPE(com.nokia.Test, 1, 12, Test, TestType2)
-
-    // Create locale-specific file
-    // For POSIX, this will just be data/I18nType.qml, since POSIX is 7-bit
-    // For iso8859-1 locale, this will just be data/I18nType?????.qml where ????? is 5 8-bit characters
-    // For utf-8 locale, this will be data/I18nType??????????.qml where ?????????? is 5 8-bit characters, UTF-8 encoded
-    QFile in(TEST_FILE(QLatin1String("I18nType30.qml")).toLocalFile());
-    QVERIFY(in.open(QIODevice::ReadOnly));
-    QFile out(TEST_FILE(QString::fromUtf8("I18nType\303\201\303\242\303\243\303\244\303\245.qml")).toLocalFile());
-    QVERIFY(out.open(QIODevice::WriteOnly));
-    out.write(in.readAll());
-}
-
 void tst_qmllanguage::cleanupTestCase()
 {
     QVERIFY(QFile::remove(TEST_FILE(QString::fromUtf8("I18nType\303\201\303\242\303\243\303\244\303\245.qml")).toLocalFile()));
@@ -337,7 +315,7 @@ void tst_qmllanguage::errors()
     if (file == "invalidID.6.qml")
         QTest::ignoreMessage(QtWarningMsg, "id \"StartsWithUpperCase\" is invalid: ids cannot start with uppercase letters");
 
-    QmlComponent component(&engine, TEST_FILE(file));
+    QDeclarativeComponent component(&engine, TEST_FILE(file));
 
     if(create) {
         QObject *object = component.create();
@@ -349,7 +327,7 @@ void tst_qmllanguage::errors()
 
 void tst_qmllanguage::simpleObject()
 {
-    QmlComponent component(&engine, TEST_FILE("simpleObject.qml"));
+    QDeclarativeComponent component(&engine, TEST_FILE("simpleObject.qml"));
     VERIFY_ERRORS(0);
     QObject *object = component.create();
     QVERIFY(object != 0);
@@ -357,7 +335,7 @@ void tst_qmllanguage::simpleObject()
 
 void tst_qmllanguage::simpleContainer()
 {
-    QmlComponent component(&engine, TEST_FILE("simpleContainer.qml"));
+    QDeclarativeComponent component(&engine, TEST_FILE("simpleContainer.qml"));
     VERIFY_ERRORS(0);
     MyContainer *container= qobject_cast<MyContainer*>(component.create());
     QVERIFY(container != 0);
@@ -366,7 +344,7 @@ void tst_qmllanguage::simpleContainer()
 
 void tst_qmllanguage::interfaceProperty()
 {
-    QmlComponent component(&engine, TEST_FILE("interfaceProperty.qml"));
+    QDeclarativeComponent component(&engine, TEST_FILE("interfaceProperty.qml"));
     VERIFY_ERRORS(0);
     MyQmlObject *object = qobject_cast<MyQmlObject*>(component.create());
     QVERIFY(object != 0);
@@ -376,7 +354,7 @@ void tst_qmllanguage::interfaceProperty()
 
 void tst_qmllanguage::interfaceQList()
 {
-    QmlComponent component(&engine, TEST_FILE("interfaceQList.qml"));
+    QDeclarativeComponent component(&engine, TEST_FILE("interfaceQList.qml"));
     VERIFY_ERRORS(0);
     MyContainer *container= qobject_cast<MyContainer*>(component.create());
     QVERIFY(container != 0);
@@ -387,7 +365,7 @@ void tst_qmllanguage::interfaceQList()
 
 void tst_qmllanguage::assignObjectToSignal()
 {
-    QmlComponent component(&engine, TEST_FILE("assignObjectToSignal.qml"));
+    QDeclarativeComponent component(&engine, TEST_FILE("assignObjectToSignal.qml"));
     VERIFY_ERRORS(0);
     MyQmlObject *object = qobject_cast<MyQmlObject *>(component.create());
     QVERIFY(object != 0);
@@ -397,7 +375,7 @@ void tst_qmllanguage::assignObjectToSignal()
 
 void tst_qmllanguage::assignObjectToVariant()
 {
-    QmlComponent component(&engine, TEST_FILE("assignObjectToVariant.qml"));
+    QDeclarativeComponent component(&engine, TEST_FILE("assignObjectToVariant.qml"));
     VERIFY_ERRORS(0);
     QObject *object = component.create();
     QVERIFY(object != 0);
@@ -407,7 +385,7 @@ void tst_qmllanguage::assignObjectToVariant()
 
 void tst_qmllanguage::assignLiteralSignalProperty()
 {
-    QmlComponent component(&engine, TEST_FILE("assignLiteralSignalProperty.qml"));
+    QDeclarativeComponent component(&engine, TEST_FILE("assignLiteralSignalProperty.qml"));
     VERIFY_ERRORS(0);
     MyQmlObject *object = qobject_cast<MyQmlObject *>(component.create());
     QVERIFY(object != 0);
@@ -417,7 +395,7 @@ void tst_qmllanguage::assignLiteralSignalProperty()
 // Test is an external component can be loaded and assigned (to a qlist)
 void tst_qmllanguage::assignQmlComponent()
 {
-    QmlComponent component(&engine, TEST_FILE("assignQmlComponent.qml"));
+    QDeclarativeComponent component(&engine, TEST_FILE("assignQmlComponent.qml"));
     VERIFY_ERRORS(0);
     MyContainer *object = qobject_cast<MyContainer *>(component.create());
     QVERIFY(object != 0);
@@ -430,7 +408,7 @@ void tst_qmllanguage::assignQmlComponent()
 // Test literal assignment to all the basic types 
 void tst_qmllanguage::assignBasicTypes()
 {
-    QmlComponent component(&engine, TEST_FILE("assignBasicTypes.qml"));
+    QDeclarativeComponent component(&engine, TEST_FILE("assignBasicTypes.qml"));
     VERIFY_ERRORS(0);
     MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create());
     QVERIFY(object != 0);
@@ -465,7 +443,7 @@ void tst_qmllanguage::assignBasicTypes()
 // Test edge case type assignments
 void tst_qmllanguage::assignTypeExtremes()
 {
-    QmlComponent component(&engine, TEST_FILE("assignTypeExtremes.qml"));
+    QDeclarativeComponent component(&engine, TEST_FILE("assignTypeExtremes.qml"));
     VERIFY_ERRORS(0);
     MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create());
     QVERIFY(object != 0);
@@ -476,7 +454,7 @@ void tst_qmllanguage::assignTypeExtremes()
 // Test that a composite type can assign to a property of its base type
 void tst_qmllanguage::assignCompositeToType()
 {
-    QmlComponent component(&engine, TEST_FILE("assignCompositeToType.qml"));
+    QDeclarativeComponent component(&engine, TEST_FILE("assignCompositeToType.qml"));
     VERIFY_ERRORS(0);
     QObject *object = component.create();
     QVERIFY(object != 0);
@@ -485,7 +463,7 @@ void tst_qmllanguage::assignCompositeToType()
 // Tests that custom parser types can be instantiated
 void tst_qmllanguage::customParserTypes()
 {
-    QmlComponent component(&engine, TEST_FILE("customParserTypes.qml"));
+    QDeclarativeComponent component(&engine, TEST_FILE("customParserTypes.qml"));
     VERIFY_ERRORS(0);
     QObject *object = component.create();
     QVERIFY(object != 0);
@@ -495,7 +473,7 @@ void tst_qmllanguage::customParserTypes()
 // Tests that the root item can be a custom component
 void tst_qmllanguage::rootAsQmlComponent()
 {
-    QmlComponent component(&engine, TEST_FILE("rootAsQmlComponent.qml"));
+    QDeclarativeComponent component(&engine, TEST_FILE("rootAsQmlComponent.qml"));
     VERIFY_ERRORS(0);
     MyContainer *object = qobject_cast<MyContainer *>(component.create());
     QVERIFY(object != 0);
@@ -506,12 +484,12 @@ void tst_qmllanguage::rootAsQmlComponent()
 // Tests that components can be specified inline
 void tst_qmllanguage::inlineQmlComponents()
 {
-    QmlComponent component(&engine, TEST_FILE("inlineQmlComponents.qml"));
+    QDeclarativeComponent component(&engine, TEST_FILE("inlineQmlComponents.qml"));
     VERIFY_ERRORS(0);
     MyContainer *object = qobject_cast<MyContainer *>(component.create());
     QVERIFY(object != 0);
     QCOMPARE(object->getChildren()->count(), 1);
-    QmlComponent *comp = qobject_cast<QmlComponent *>(object->getChildren()->at(0));
+    QDeclarativeComponent *comp = qobject_cast<QDeclarativeComponent *>(object->getChildren()->at(0));
     QVERIFY(comp != 0);
     MyQmlObject *compObject = qobject_cast<MyQmlObject *>(comp->create());
     QVERIFY(compObject != 0);
@@ -521,7 +499,7 @@ void tst_qmllanguage::inlineQmlComponents()
 // Tests that types that have an id property have it set
 void tst_qmllanguage::idProperty()
 {
-    QmlComponent component(&engine, TEST_FILE("idProperty.qml"));
+    QDeclarativeComponent component(&engine, TEST_FILE("idProperty.qml"));
     VERIFY_ERRORS(0);
     MyContainer *object = qobject_cast<MyContainer *>(component.create());
     QVERIFY(object != 0);
@@ -536,7 +514,7 @@ void tst_qmllanguage::idProperty()
 // Tests that signals can be assigned to
 void tst_qmllanguage::assignSignal()
 {
-    QmlComponent component(&engine, TEST_FILE("assignSignal.qml"));
+    QDeclarativeComponent component(&engine, TEST_FILE("assignSignal.qml"));
     VERIFY_ERRORS(0);
     MyQmlObject *object = qobject_cast<MyQmlObject *>(component.create());
     QVERIFY(object != 0);
@@ -549,7 +527,7 @@ void tst_qmllanguage::assignSignal()
 // Tests the creation and assignment of dynamic properties
 void tst_qmllanguage::dynamicProperties()
 {
-    QmlComponent component(&engine, TEST_FILE("dynamicProperties.qml"));
+    QDeclarativeComponent component(&engine, TEST_FILE("dynamicProperties.qml"));
     VERIFY_ERRORS(0);
     QObject *object = component.create();
     QVERIFY(object != 0);
@@ -568,7 +546,7 @@ void tst_qmllanguage::dynamicProperties()
 // Test that nested types can use dynamic properties
 void tst_qmllanguage::dynamicPropertiesNested()
 {
-    QmlComponent component(&engine, TEST_FILE("dynamicPropertiesNested.qml"));
+    QDeclarativeComponent component(&engine, TEST_FILE("dynamicPropertiesNested.qml"));
     VERIFY_ERRORS(0);
     QObject *object = component.create();
     QVERIFY(object != 0);
@@ -584,7 +562,7 @@ void tst_qmllanguage::dynamicPropertiesNested()
 // Tests the creation and assignment to dynamic list properties
 void tst_qmllanguage::listProperties()
 {
-    QmlComponent component(&engine, TEST_FILE("listProperties.qml"));
+    QDeclarativeComponent component(&engine, TEST_FILE("listProperties.qml"));
     VERIFY_ERRORS(0);
     QObject *object = component.create();
     QVERIFY(object != 0);
@@ -596,7 +574,7 @@ void tst_qmllanguage::listProperties()
 // ### Not complete
 void tst_qmllanguage::dynamicObjectProperties()
 {
-    QmlComponent component(&engine, TEST_FILE("dynamicObjectProperties.qml"));
+    QDeclarativeComponent component(&engine, TEST_FILE("dynamicObjectProperties.qml"));
     VERIFY_ERRORS(0);
     QObject *object = component.create();
     QVERIFY(object != 0);
@@ -610,7 +588,7 @@ void tst_qmllanguage::dynamicSignalsAndSlots()
 {
     QTest::ignoreMessage(QtDebugMsg, "1921");
 
-    QmlComponent component(&engine, TEST_FILE("dynamicSignalsAndSlots.qml"));
+    QDeclarativeComponent component(&engine, TEST_FILE("dynamicSignalsAndSlots.qml"));
     VERIFY_ERRORS(0);
     QObject *object = component.create();
     QVERIFY(object != 0);
@@ -626,7 +604,7 @@ void tst_qmllanguage::dynamicSignalsAndSlots()
 
 void tst_qmllanguage::simpleBindings()
 {
-    QmlComponent component(&engine, TEST_FILE("simpleBindings.qml"));
+    QDeclarativeComponent component(&engine, TEST_FILE("simpleBindings.qml"));
     VERIFY_ERRORS(0);
     QObject *object = component.create();
     QVERIFY(object != 0);
@@ -639,7 +617,7 @@ void tst_qmllanguage::simpleBindings()
 
 void tst_qmllanguage::autoComponentCreation()
 {
-    QmlComponent component(&engine, TEST_FILE("autoComponentCreation.qml"));
+    QDeclarativeComponent component(&engine, TEST_FILE("autoComponentCreation.qml"));
     VERIFY_ERRORS(0);
     MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create());
     QVERIFY(object != 0);
@@ -652,7 +630,7 @@ void tst_qmllanguage::autoComponentCreation()
 void tst_qmllanguage::propertyValueSource()
 {
     {
-    QmlComponent component(&engine, TEST_FILE("propertyValueSource.qml"));
+    QDeclarativeComponent component(&engine, TEST_FILE("propertyValueSource.qml"));
     VERIFY_ERRORS(0);
     MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create());
     QVERIFY(object != 0);
@@ -660,7 +638,7 @@ void tst_qmllanguage::propertyValueSource()
     QList<QObject *> valueSources;
     QObjectList allChildren = object->findChildren<QObject*>();
     foreach (QObject *child, allChildren) {
-        if (qobject_cast<QmlPropertyValueSource *>(child)) 
+        if (qobject_cast<QDeclarativePropertyValueSource *>(child)) 
             valueSources.append(child);
     }
 
@@ -673,7 +651,7 @@ void tst_qmllanguage::propertyValueSource()
     }
 
     {
-    QmlComponent component(&engine, TEST_FILE("propertyValueSource.2.qml"));
+    QDeclarativeComponent component(&engine, TEST_FILE("propertyValueSource.2.qml"));
     VERIFY_ERRORS(0);
     MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create());
     QVERIFY(object != 0);
@@ -681,7 +659,7 @@ void tst_qmllanguage::propertyValueSource()
     QList<QObject *> valueSources;
     QObjectList allChildren = object->findChildren<QObject*>();
     foreach (QObject *child, allChildren) {
-        if (qobject_cast<QmlPropertyValueSource *>(child)) 
+        if (qobject_cast<QDeclarativePropertyValueSource *>(child)) 
             valueSources.append(child);
     }
 
@@ -696,7 +674,7 @@ void tst_qmllanguage::propertyValueSource()
 
 void tst_qmllanguage::attachedProperties()
 {
-    QmlComponent component(&engine, TEST_FILE("attachedProperties.qml"));
+    QDeclarativeComponent component(&engine, TEST_FILE("attachedProperties.qml"));
     VERIFY_ERRORS(0);
     QObject *object = component.create();
     QVERIFY(object != 0);
@@ -709,7 +687,7 @@ void tst_qmllanguage::attachedProperties()
 // Tests non-static object properties
 void tst_qmllanguage::dynamicObjects()
 {
-    QmlComponent component(&engine, TEST_FILE("dynamicObject.1.qml"));
+    QDeclarativeComponent component(&engine, TEST_FILE("dynamicObject.1.qml"));
     VERIFY_ERRORS(0);
     QObject *object = component.create();
     QVERIFY(object != 0);
@@ -718,7 +696,7 @@ void tst_qmllanguage::dynamicObjects()
 // Tests the registration of custom variant string converters
 void tst_qmllanguage::customVariantTypes()
 {
-    QmlComponent component(&engine, TEST_FILE("customVariantTypes.qml"));
+    QDeclarativeComponent component(&engine, TEST_FILE("customVariantTypes.qml"));
     VERIFY_ERRORS(0);
     MyQmlObject *object = qobject_cast<MyQmlObject*>(component.create());
     QVERIFY(object != 0);
@@ -727,7 +705,7 @@ void tst_qmllanguage::customVariantTypes()
 
 void tst_qmllanguage::valueTypes()
 {
-    QmlComponent component(&engine, TEST_FILE("valueTypes.qml"));
+    QDeclarativeComponent component(&engine, TEST_FILE("valueTypes.qml"));
     VERIFY_ERRORS(0);
 
     QString message = QLatin1String("QML MyTypeObject (") + component.url().toString() + 
@@ -749,14 +727,14 @@ void tst_qmllanguage::valueTypes()
 
     // ###
 #if 0
-    QmlMetaProperty p = QmlMetaProperty::createProperty(object, "rectProperty.x");
+    QDeclarativeMetaProperty p = QDeclarativeMetaProperty::createProperty(object, "rectProperty.x");
     QCOMPARE(p.read(), QVariant(12));
     p.write(13);
     QCOMPARE(p.read(), QVariant(13));
 
-    quint32 r = QmlMetaPropertyPrivate::saveValueType(p.coreIndex(), p.valueTypeCoreIndex());
-    QmlMetaProperty p2;
-    QmlMetaPropertyPrivate::restore(p2, r, object);
+    quint32 r = QDeclarativeMetaPropertyPrivate::saveValueType(p.coreIndex(), p.valueTypeCoreIndex());
+    QDeclarativeMetaProperty p2;
+    QDeclarativeMetaPropertyPrivate::restore(p2, r, object);
     QCOMPARE(p2.read(), QVariant(13));
 #endif
 }
@@ -764,7 +742,7 @@ void tst_qmllanguage::valueTypes()
 void tst_qmllanguage::cppnamespace()
 {
     {
-        QmlComponent component(&engine, TEST_FILE("cppnamespace.qml"));
+        QDeclarativeComponent component(&engine, TEST_FILE("cppnamespace.qml"));
         VERIFY_ERRORS(0);
         QObject *object = component.create();
         QVERIFY(object != 0);
@@ -772,7 +750,7 @@ void tst_qmllanguage::cppnamespace()
     }
 
     {
-        QmlComponent component(&engine, TEST_FILE("cppnamespace.2.qml"));
+        QDeclarativeComponent component(&engine, TEST_FILE("cppnamespace.2.qml"));
         VERIFY_ERRORS(0);
         QObject *object = component.create();
         QVERIFY(object != 0);
@@ -784,7 +762,7 @@ void tst_qmllanguage::aliasProperties()
 {
     // Simple "int" alias
     {
-        QmlComponent component(&engine, TEST_FILE("alias.1.qml"));
+        QDeclarativeComponent component(&engine, TEST_FILE("alias.1.qml"));
         VERIFY_ERRORS(0);
         QObject *object = component.create();
         QVERIFY(object != 0);
@@ -804,7 +782,7 @@ void tst_qmllanguage::aliasProperties()
 
     // Complex object alias
     {
-        QmlComponent component(&engine, TEST_FILE("alias.2.qml"));
+        QDeclarativeComponent component(&engine, TEST_FILE("alias.2.qml"));
         VERIFY_ERRORS(0);
         QObject *object = component.create();
         QVERIFY(object != 0);
@@ -829,7 +807,7 @@ void tst_qmllanguage::aliasProperties()
 
     // Nested aliases
     {
-        QmlComponent component(&engine, TEST_FILE("alias.3.qml"));
+        QDeclarativeComponent component(&engine, TEST_FILE("alias.3.qml"));
         VERIFY_ERRORS(0);
         QObject *object = component.create();
         QVERIFY(object != 0);
@@ -850,7 +828,7 @@ void tst_qmllanguage::aliasProperties()
 
     // Enum aliases
     {
-        QmlComponent component(&engine, TEST_FILE("alias.4.qml"));
+        QDeclarativeComponent component(&engine, TEST_FILE("alias.4.qml"));
         VERIFY_ERRORS(0);
         QObject *object = component.create();
         QVERIFY(object != 0);
@@ -862,7 +840,7 @@ void tst_qmllanguage::aliasProperties()
 
     // Id aliases
     {
-        QmlComponent component(&engine, TEST_FILE("alias.5.qml"));
+        QDeclarativeComponent component(&engine, TEST_FILE("alias.5.qml"));
         VERIFY_ERRORS(0);
         QObject *object = component.create();
         QVERIFY(object != 0);
@@ -884,7 +862,7 @@ void tst_qmllanguage::aliasProperties()
 
     // Nested aliases - this used to cause a crash
     {
-        QmlComponent component(&engine, TEST_FILE("alias.6.qml"));
+        QDeclarativeComponent component(&engine, TEST_FILE("alias.6.qml"));
         VERIFY_ERRORS(0);
         QObject *object = component.create();
         QVERIFY(object != 0);
@@ -895,7 +873,7 @@ void tst_qmllanguage::aliasProperties()
     // Ptr Alias Cleanup - check that aliases to ptr types return 0 
     // if the object aliased to is removed
     {
-        QmlComponent component(&engine, TEST_FILE("alias.7.qml"));
+        QDeclarativeComponent component(&engine, TEST_FILE("alias.7.qml"));
         VERIFY_ERRORS(0);
 
         QObject *object = component.create();
@@ -921,7 +899,7 @@ void tst_qmllanguage::aliasProperties()
 
     // Simple composite type
     {
-        QmlComponent component(&engine, TEST_FILE("alias.8.qml"));
+        QDeclarativeComponent component(&engine, TEST_FILE("alias.8.qml"));
         VERIFY_ERRORS(0);
         QObject *object = component.create();
         QVERIFY(object != 0);
@@ -933,7 +911,7 @@ void tst_qmllanguage::aliasProperties()
 
     // Complex composite type
     {
-        QmlComponent component(&engine, TEST_FILE("alias.9.qml"));
+        QDeclarativeComponent component(&engine, TEST_FILE("alias.9.qml"));
         VERIFY_ERRORS(0);
         QObject *object = component.create();
         QVERIFY(object != 0);
@@ -947,7 +925,7 @@ void tst_qmllanguage::aliasProperties()
 // Test that the root element in a composite type can be a Component
 void tst_qmllanguage::componentCompositeType()
 {
-    QmlComponent component(&engine, TEST_FILE("componentCompositeType.qml"));
+    QDeclarativeComponent component(&engine, TEST_FILE("componentCompositeType.qml"));
     VERIFY_ERRORS(0);
     QObject *object = component.create();
     QVERIFY(object != 0);
@@ -981,7 +959,7 @@ void tst_qmllanguage::i18n()
 {
     QFETCH(QString, file);
     QFETCH(QString, stringProperty);
-    QmlComponent component(&engine, TEST_FILE(file));
+    QDeclarativeComponent component(&engine, TEST_FILE(file));
     VERIFY_ERRORS(0);
     MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create());
     QVERIFY(object != 0);
@@ -993,7 +971,7 @@ void tst_qmllanguage::i18n()
 // Check that the Component::onCompleted attached property works
 void tst_qmllanguage::onCompleted()
 {
-    QmlComponent component(&engine, TEST_FILE("onCompleted.qml"));
+    QDeclarativeComponent component(&engine, TEST_FILE("onCompleted.qml"));
     VERIFY_ERRORS(0);
     QTest::ignoreMessage(QtDebugMsg, "Completed 6 10");
     QTest::ignoreMessage(QtDebugMsg, "Completed 6 10");
@@ -1002,10 +980,10 @@ void tst_qmllanguage::onCompleted()
     QVERIFY(object != 0);
 }
 
-// Check that assignments to QmlScriptString properties work
+// Check that assignments to QDeclarativeScriptString properties work
 void tst_qmllanguage::scriptString()
 {
-    QmlComponent component(&engine, TEST_FILE("scriptString.qml"));
+    QDeclarativeComponent component(&engine, TEST_FILE("scriptString.qml"));
     VERIFY_ERRORS(0);
 
     MyTypeObject *object = qobject_cast<MyTypeObject*>(component.create());
@@ -1024,7 +1002,7 @@ void tst_qmllanguage::scriptString()
 // property assignments
 void tst_qmllanguage::defaultPropertyListOrder()
 {
-    QmlComponent component(&engine, TEST_FILE("defaultPropertyListOrder.qml"));
+    QDeclarativeComponent component(&engine, TEST_FILE("defaultPropertyListOrder.qml"));
     VERIFY_ERRORS(0);
 
     MyContainer *container = qobject_cast<MyContainer *>(component.create());
@@ -1041,7 +1019,7 @@ void tst_qmllanguage::defaultPropertyListOrder()
 
 void tst_qmllanguage::declaredPropertyValues()
 {
-    QmlComponent component(&engine, TEST_FILE("declaredPropertyValues.qml"));
+    QDeclarativeComponent component(&engine, TEST_FILE("declaredPropertyValues.qml"));
     QEXPECT_FAIL("", "QTBUG-7860", Abort);
     VERIFY_ERRORS(0);
 }
@@ -1049,7 +1027,7 @@ void tst_qmllanguage::declaredPropertyValues()
 // Check that first child of qml is of given type. Empty type insists on error.
 void tst_qmllanguage::testType(const QString& qml, const QString& type)
 {
-    QmlComponent component(&engine);
+    QDeclarativeComponent component(&engine);
     component.setData(qml.toUtf8(), TEST_FILE("empty.qml")); // just a file for relative local imports
 
     QTRY_VERIFY(!component.isLoading());
@@ -1174,15 +1152,15 @@ void tst_qmllanguage::importsLocal_data()
     QTest::newRow("local import")
         << "import \"subdir\"\n" // QT-613
            "Test {}"
-        << "QmlGraphicsRectangle";
+        << "QDeclarativeRectangle";
     QTest::newRow("local import second")
         << "import Qt 4.6\nimport \"subdir\"\n"
            "Test {}"
-        << "QmlGraphicsRectangle";
+        << "QDeclarativeRectangle";
     QTest::newRow("local import subsubdir")
         << "import Qt 4.6\nimport \"subdir/subsubdir\"\n"
            "SubTest {}"
-        << "QmlGraphicsRectangle";
+        << "QDeclarativeRectangle";
     QTest::newRow("local import QTBUG-7721 A")
         << "subdir.Test {}" // no longer allowed (QTBUG-7721)
         << "";
@@ -1193,7 +1171,7 @@ void tst_qmllanguage::importsLocal_data()
     QTest::newRow("local import as")
         << "import \"subdir\" as T\n"
            "T.Test {}"
-        << "QmlGraphicsRectangle";
+        << "QDeclarativeRectangle";
     QTest::newRow("wrong local import as")
         << "import \"subdir\" as T\n"
            "Test {}"
@@ -1219,9 +1197,9 @@ void tst_qmllanguage::importsRemote_data()
 
     QString serverdir = "http://127.0.0.1:14445/qtest/declarative/qmllanguage";
 
-    QTest::newRow("remote import") << "import \""+serverdir+"\"\nTest {}" << "QmlGraphicsRectangle";
-    QTest::newRow("remote import with subdir") << "import \""+serverdir+"\"\nTestSubDir {}" << "QmlGraphicsText";
-    QTest::newRow("remote import with local") << "import \""+serverdir+"\"\nTestLocal {}" << "QmlGraphicsImage";
+    QTest::newRow("remote import") << "import \""+serverdir+"\"\nTest {}" << "QDeclarativeRectangle";
+    QTest::newRow("remote import with subdir") << "import \""+serverdir+"\"\nTestSubDir {}" << "QDeclarativeText";
+    QTest::newRow("remote import with local") << "import \""+serverdir+"\"\nTestLocal {}" << "QDeclarativeImage";
 }
 
 #include "testhttpserver.h"
@@ -1248,27 +1226,27 @@ void tst_qmllanguage::importsInstalled_data()
     QTest::newRow("installed import 0")
         << "import com.nokia.installedtest 0.0\n"
            "InstalledTestTP {}"
-        << "QmlGraphicsRectangle";
+        << "QDeclarativeRectangle";
     QTest::newRow("installed import 0 as TP")
         << "import com.nokia.installedtest 0.0 as TP\n"
            "TP.InstalledTestTP {}"
-        << "QmlGraphicsRectangle";
+        << "QDeclarativeRectangle";
     QTest::newRow("installed import 1")
         << "import com.nokia.installedtest 1.0\n"
            "InstalledTest {}"
-        << "QmlGraphicsRectangle";
+        << "QDeclarativeRectangle";
     QTest::newRow("installed import 2")
         << "import com.nokia.installedtest 1.3\n"
            "InstalledTest {}"
-        << "QmlGraphicsRectangle";
+        << "QDeclarativeRectangle";
     QTest::newRow("installed import 3")
         << "import com.nokia.installedtest 1.4\n"
            "InstalledTest {}"
-        << "QmlGraphicsText";
+        << "QDeclarativeText";
     QTest::newRow("installed import 4")
         << "import com.nokia.installedtest 1.10\n"
            "InstalledTest {}"
-        << "QmlGraphicsText";
+        << "QDeclarativeText";
     QTest::newRow("installed import visibility") // QT-614
         << "import com.nokia.installedtest 1.4\n"
            "PrivateType {}"
@@ -1292,36 +1270,36 @@ void tst_qmllanguage::importsOrder_data()
            "import com.nokia.installedtest 1.0\n"
            "import com.nokia.installedtest 1.4\n"
            "InstalledTest {}"
-        << "QmlGraphicsText";
+        << "QDeclarativeText";
     QTest::newRow("installed import overrides 2") <<
            "import com.nokia.installedtest 1.4\n"
            "import com.nokia.installedtest 1.0\n"
            "InstalledTest {}"
-        << "QmlGraphicsRectangle";
+        << "QDeclarativeRectangle";
     QTest::newRow("installed import re-overrides 1") <<
            "import com.nokia.installedtest 1.4\n"
            "import com.nokia.installedtest 1.0\n"
            "import com.nokia.installedtest 1.4\n"
            "InstalledTest {}"
-        << "QmlGraphicsText";
+        << "QDeclarativeText";
     QTest::newRow("installed import re-overrides 2") <<
            "import com.nokia.installedtest 1.4\n"
            "import com.nokia.installedtest 1.0\n"
            "import com.nokia.installedtest 1.4\n"
            "import com.nokia.installedtest 1.0\n"
            "InstalledTest {}"
-        << "QmlGraphicsRectangle";
+        << "QDeclarativeRectangle";
 
     QTest::newRow("installed import versus builtin 1") <<
            "import com.nokia.installedtest 1.5\n"
            "import Qt 4.6\n"
            "Rectangle {}"
-        << "QmlGraphicsRectangle";
+        << "QDeclarativeRectangle";
     QTest::newRow("installed import versus builtin 2") <<
            "import Qt 4.6\n"
            "import com.nokia.installedtest 1.5\n"
            "Rectangle {}"
-        << "QmlGraphicsText";
+        << "QDeclarativeText";
     QTest::newRow("namespaces cannot be overridden by types 1") <<
            "import Qt 4.6 as Rectangle\n"
            "import com.nokia.installedtest 1.5\n"
@@ -1331,7 +1309,7 @@ void tst_qmllanguage::importsOrder_data()
            "import Qt 4.6 as Rectangle\n"
            "import com.nokia.installedtest 1.5\n"
            "Rectangle.Image {}"
-        << "QmlGraphicsImage";
+        << "QDeclarativeImage";
 }
 
 void tst_qmllanguage::importsOrder()
@@ -1349,7 +1327,7 @@ void tst_qmllanguage::qmlAttachedPropertiesObjectMethod()
     QCOMPARE(qmlAttachedPropertiesObject<MyQmlObject>(&object, true), (QObject *)0);
 
     {
-        QmlComponent component(&engine, TEST_FILE("qmlAttachedPropertiesObjectMethod.1.qml"));
+        QDeclarativeComponent component(&engine, TEST_FILE("qmlAttachedPropertiesObjectMethod.1.qml"));
         VERIFY_ERRORS(0);
         QObject *object = component.create();
         QVERIFY(object != 0);
@@ -1359,7 +1337,7 @@ void tst_qmllanguage::qmlAttachedPropertiesObjectMethod()
     }
 
     {
-        QmlComponent component(&engine, TEST_FILE("qmlAttachedPropertiesObjectMethod.2.qml"));
+        QDeclarativeComponent component(&engine, TEST_FILE("qmlAttachedPropertiesObjectMethod.2.qml"));
         VERIFY_ERRORS(0);
         QObject *object = component.create();
         QVERIFY(object != 0);
@@ -1371,15 +1349,38 @@ void tst_qmllanguage::qmlAttachedPropertiesObjectMethod()
 
 void tst_qmllanguage::crash1()
 {
-    QmlComponent component(&engine);
+    QDeclarativeComponent component(&engine);
     component.setData("import Qt 4.6\nComponent {}", QUrl());
 }
 
 void tst_qmllanguage::crash2()
 {
-    QmlComponent component(&engine, TEST_FILE("crash2.qml"));
+    QDeclarativeComponent component(&engine, TEST_FILE("crash2.qml"));
+}
+
+
+void tst_qmllanguage::initTestCase()
+{
+    registerTypes();
+
+    QML_REGISTER_TYPE(com.nokia.Test, 0, 0, TestTP, TestType);
+    QML_REGISTER_TYPE(com.nokia.Test, 1, 0, Test, TestType);
+    QML_REGISTER_TYPE(com.nokia.Test, 1, 5, Test, TestType);
+    QML_REGISTER_TYPE(com.nokia.Test, 1, 8, Test, TestType2);
+    QML_REGISTER_TYPE(com.nokia.Test, 1, 9, OldTest, TestType);
+    QML_REGISTER_TYPE(com.nokia.Test, 1, 12, Test, TestType2);
+
+    // Create locale-specific file
+    // For POSIX, this will just be data/I18nType.qml, since POSIX is 7-bit
+    // For iso8859-1 locale, this will just be data/I18nType?????.qml where ????? is 5 8-bit characters
+    // For utf-8 locale, this will be data/I18nType??????????.qml where ?????????? is 5 8-bit characters, UTF-8 encoded
+    QFile in(TEST_FILE(QLatin1String("I18nType30.qml")).toLocalFile());
+    QVERIFY(in.open(QIODevice::ReadOnly));
+    QFile out(TEST_FILE(QString::fromUtf8("I18nType\303\201\303\242\303\243\303\244\303\245.qml")).toLocalFile());
+    QVERIFY(out.open(QIODevice::WriteOnly));
+    out.write(in.readAll());
 }
 
 QTEST_MAIN(tst_qmllanguage)
 
-#include "tst_qmllanguage.moc"
+#include "tst_qdeclarativelanguage.moc"
diff --git a/tests/auto/declarative/qmllistmodel/qmllistmodel.pro b/tests/auto/declarative/qdeclarativelistmodel/qdeclarativelistmodel.pro
index 60b0c4b..d728d08 100644
--- a/tests/auto/declarative/qmllistmodel/qmllistmodel.pro
+++ b/tests/auto/declarative/qdeclarativelistmodel/qdeclarativelistmodel.pro
@@ -3,4 +3,4 @@ contains(QT_CONFIG,declarative): QT += declarative
 QT += script
 macx:CONFIG -= app_bundle
 
-SOURCES += tst_qmllistmodel.cpp
+SOURCES += tst_qdeclarativelistmodel.cpp
diff --git a/tests/auto/declarative/qmllistmodel/tst_qmllistmodel.cpp b/tests/auto/declarative/qdeclarativelistmodel/tst_qdeclarativelistmodel.cpp
index 8513a3b..390ebe0 100644
--- a/tests/auto/declarative/qmllistmodel/tst_qmllistmodel.cpp
+++ b/tests/auto/declarative/qdeclarativelistmodel/tst_qdeclarativelistmodel.cpp
@@ -39,9 +39,9 @@
 **
 ****************************************************************************/
 #include <qtest.h>
-#include <QtDeclarative/private/qmllistmodel_p.h>
-#include <QtDeclarative/private/qmlexpression_p.h>
-#include <QmlComponent>
+#include <QtDeclarative/private/qdeclarativelistmodel_p.h>
+#include <QtDeclarative/private/qdeclarativeexpression_p.h>
+#include <QDeclarativeComponent>
 #include <QDebug>
 
 class tst_QmlListModel : public QObject
@@ -66,10 +66,10 @@ void tst_QmlListModel::static_i18n()
 {
     QString expect = QString::fromUtf8("na\303\257ve");
     QString componentStr = "import Qt 4.6\nListModel { ListElement { prop1: \""+expect+"\" } }";
-    QmlEngine engine;
-    QmlComponent component(&engine);
+    QDeclarativeEngine engine;
+    QDeclarativeComponent component(&engine);
     component.setData(componentStr.toUtf8(), QUrl::fromLocalFile(""));
-    QmlListModel *obj = qobject_cast<QmlListModel*>(component.create());
+    QDeclarativeListModel *obj = qobject_cast<QDeclarativeListModel*>(component.create());
     QVERIFY(obj != 0);
     QString prop = obj->get(0).property(QLatin1String("prop1")).toString();
     QCOMPARE(prop,expect);
@@ -96,11 +96,11 @@ void tst_QmlListModel::static_nestedElements()
         "   }\n"
         "}";
 
-    QmlEngine engine;
-    QmlComponent component(&engine);
+    QDeclarativeEngine engine;
+    QDeclarativeComponent component(&engine);
     component.setData(componentStr.toUtf8(), QUrl::fromLocalFile(""));
 
-    QmlListModel *obj = qobject_cast<QmlListModel*>(component.create());
+    QDeclarativeListModel *obj = qobject_cast<QDeclarativeListModel*>(component.create());
     QVERIFY(obj != 0);
 
     QScriptValue prop = obj->get(0).property(QLatin1String("attributes")).property(QLatin1String("count"));
@@ -211,11 +211,11 @@ void tst_QmlListModel::dynamic()
     QFETCH(int, result);
     QFETCH(QString, warning);
 
-    QmlEngine engine;
-    QmlListModel model;
-    QmlEngine::setContextForObject(&model,engine.rootContext());
+    QDeclarativeEngine engine;
+    QDeclarativeListModel model;
+    QDeclarativeEngine::setContextForObject(&model,engine.rootContext());
     engine.rootContext()->addDefaultObject(&model);
-    QmlExpression e(engine.rootContext(), script, &model);
+    QDeclarativeExpression e(engine.rootContext(), script, &model);
     if (!warning.isEmpty())
         QTest::ignoreMessage(QtWarningMsg, warning.toLatin1());
     int actual = e.value().toInt();
@@ -262,8 +262,8 @@ void tst_QmlListModel::static_types()
 
     qml = "import Qt 4.6\nListModel { " + qml + " }";
 
-    QmlEngine engine;
-    QmlComponent component(&engine);
+    QDeclarativeEngine engine;
+    QDeclarativeComponent component(&engine);
     component.setData(qml.toUtf8(),
                       QUrl::fromLocalFile(QString("dummy.qml")));
 
@@ -272,7 +272,7 @@ void tst_QmlListModel::static_types()
 
     QVERIFY(!component.isError());
 
-    QmlListModel *obj = qobject_cast<QmlListModel*>(component.create());
+    QDeclarativeListModel *obj = qobject_cast<QDeclarativeListModel*>(component.create());
     QVERIFY(obj != 0);
 
     QScriptValue actual = obj->get(0).property(QLatin1String("foo"));
@@ -325,8 +325,8 @@ void tst_QmlListModel::error()
     QFETCH(QString, qml);
     QFETCH(QString, error);
 
-    QmlEngine engine;
-    QmlComponent component(&engine);
+    QDeclarativeEngine engine;
+    QDeclarativeComponent component(&engine);
     component.setData(qml.toUtf8(),
                       QUrl::fromLocalFile(QString("dummy.qml")));
     if (error.isEmpty()) {
@@ -335,7 +335,7 @@ void tst_QmlListModel::error()
         if (error.startsWith(QLatin1String("QTBUG-")))
             QEXPECT_FAIL("",error.toLatin1(),Abort);
         QVERIFY(component.isError());
-        QList<QmlError> errors = component.errors();
+        QList<QDeclarativeError> errors = component.errors();
         QCOMPARE(errors.count(),1);
         QCOMPARE(errors.at(0).description(),error);
     }
@@ -343,4 +343,4 @@ void tst_QmlListModel::error()
 
 QTEST_MAIN(tst_QmlListModel)
 
-#include "tst_qmllistmodel.moc"
+#include "tst_qdeclarativelistmodel.moc"
diff --git a/tests/auto/declarative/qmllistreference/data/MyType.qml b/tests/auto/declarative/qdeclarativelistreference/data/MyType.qml
index d08f35b..d08f35b 100644
--- a/tests/auto/declarative/qmllistreference/data/MyType.qml
+++ b/tests/auto/declarative/qdeclarativelistreference/data/MyType.qml
diff --git a/tests/auto/declarative/qmllistreference/data/engineTypes.qml b/tests/auto/declarative/qdeclarativelistreference/data/engineTypes.qml
index 670aee4..670aee4 100644
--- a/tests/auto/declarative/qmllistreference/data/engineTypes.qml
+++ b/tests/auto/declarative/qdeclarativelistreference/data/engineTypes.qml
diff --git a/tests/auto/declarative/qmllistreference/data/variantToList.qml b/tests/auto/declarative/qdeclarativelistreference/data/variantToList.qml
index 0c2d0aa..0c2d0aa 100644
--- a/tests/auto/declarative/qmllistreference/data/variantToList.qml
+++ b/tests/auto/declarative/qdeclarativelistreference/data/variantToList.qml
diff --git a/tests/auto/declarative/qmlmetaproperty/qmlmetaproperty.pro b/tests/auto/declarative/qdeclarativelistreference/qdeclarativelistreference.pro
index 542c14e..0c9b2d9 100644
--- a/tests/auto/declarative/qmlmetaproperty/qmlmetaproperty.pro
+++ b/tests/auto/declarative/qdeclarativelistreference/qdeclarativelistreference.pro
@@ -2,4 +2,4 @@ load(qttest_p4)
 contains(QT_CONFIG,declarative): QT += declarative
 macx:CONFIG -= app_bundle
 
-SOURCES += tst_qmlmetaproperty.cpp
+SOURCES += tst_qdeclarativelistreference.cpp
diff --git a/tests/auto/declarative/qmllistreference/tst_qmllistreference.cpp b/tests/auto/declarative/qdeclarativelistreference/tst_qdeclarativelistreference.cpp
index db9f218..9eafc7c 100644
--- a/tests/auto/declarative/qmllistreference/tst_qmllistreference.cpp
+++ b/tests/auto/declarative/qdeclarativelistreference/tst_qdeclarativelistreference.cpp
@@ -43,10 +43,10 @@
 #include <QUrl>
 #include <QFileInfo>
 #include <QDir>
-#include <QmlEngine>
-#include <QmlComponent>
-#include <QtDeclarative/qml.h>
-#include <QtDeclarative/qmlprivate.h>
+#include <QDeclarativeEngine>
+#include <QDeclarativeComponent>
+#include <QtDeclarative/qdeclarative.h>
+#include <QtDeclarative/qdeclarativeprivate.h>
 #include <QDebug>
 
 inline QUrl TEST_FILE(const QString &filename)
@@ -90,16 +90,16 @@ private slots:
 class TestType : public QObject
 {
     Q_OBJECT
-    Q_PROPERTY(QmlListProperty<TestType> data READ dataProperty);
+    Q_PROPERTY(QDeclarativeListProperty<TestType> data READ dataProperty);
     Q_PROPERTY(int intProperty READ intProperty);
 
 public:
     TestType() : property(this, data) {}
-    QmlListProperty<TestType> dataProperty() { return property; }
+    QDeclarativeListProperty<TestType> dataProperty() { return property; }
     int intProperty() const { return 10; }
 
     QList<TestType *> data;
-    QmlListProperty<TestType> property;
+    QDeclarativeListProperty<TestType> property;
 };
 QML_DECLARE_TYPE(TestType);
 
@@ -112,7 +112,7 @@ void tst_qmllistreference::qmllistreference()
 {
     TestType tt;
 
-    QmlListReference r(&tt, "data");
+    QDeclarativeListReference r(&tt, "data");
     QVERIFY(r.isValid() == true);
     QCOMPARE(r.count(), 0);
 
@@ -126,7 +126,7 @@ void tst_qmllistreference::qmllistreference_invalid()
 
     // Invalid
     {
-    QmlListReference r;
+    QDeclarativeListReference r;
     QVERIFY(r.isValid() == false);
     QVERIFY(r.object() == 0);
     QVERIFY(r.listElementType() == 0);
@@ -141,7 +141,7 @@ void tst_qmllistreference::qmllistreference_invalid()
 
     // Non-property
     {
-    QmlListReference r(&tt, "blah");
+    QDeclarativeListReference r(&tt, "blah");
     QVERIFY(r.isValid() == false);
     QVERIFY(r.object() == 0);
     QVERIFY(r.listElementType() == 0);
@@ -156,7 +156,7 @@ void tst_qmllistreference::qmllistreference_invalid()
 
     // Non-list property
     {
-    QmlListReference r(&tt, "intProperty");
+    QDeclarativeListReference r(&tt, "intProperty");
     QVERIFY(r.isValid() == false);
     QVERIFY(r.object() == 0);
     QVERIFY(r.listElementType() == 0);
@@ -175,17 +175,17 @@ void tst_qmllistreference::isValid()
     TestType *tt = new TestType;
 
     {
-    QmlListReference ref;
+    QDeclarativeListReference ref;
     QVERIFY(ref.isValid() == false);
     }
 
     {
-    QmlListReference ref(tt, "blah");
+    QDeclarativeListReference ref(tt, "blah");
     QVERIFY(ref.isValid() == false);
     }
 
     {
-    QmlListReference ref(tt, "data");
+    QDeclarativeListReference ref(tt, "data");
     QVERIFY(ref.isValid() == true);
     delete tt;
     QVERIFY(ref.isValid() == false);
@@ -197,17 +197,17 @@ void tst_qmllistreference::object()
     TestType *tt = new TestType;
 
     {
-    QmlListReference ref;
+    QDeclarativeListReference ref;
     QVERIFY(ref.object() == 0);
     }
 
     {
-    QmlListReference ref(tt, "blah");
+    QDeclarativeListReference ref(tt, "blah");
     QVERIFY(ref.object() == 0);
     }
 
     {
-    QmlListReference ref(tt, "data");
+    QDeclarativeListReference ref(tt, "data");
     QVERIFY(ref.object() == tt);
     delete tt;
     QVERIFY(ref.object() == 0);
@@ -219,17 +219,17 @@ void tst_qmllistreference::listElementType()
     TestType *tt = new TestType;
 
     {
-    QmlListReference ref;
+    QDeclarativeListReference ref;
     QVERIFY(ref.listElementType() == 0);
     }
 
     {
-    QmlListReference ref(tt, "blah");
+    QDeclarativeListReference ref(tt, "blah");
     QVERIFY(ref.listElementType() == 0);
     }
 
     {
-    QmlListReference ref(tt, "data");
+    QDeclarativeListReference ref(tt, "data");
     QVERIFY(ref.listElementType() == &TestType::staticMetaObject);
     delete tt;
     QVERIFY(ref.listElementType() == 0);
@@ -241,17 +241,17 @@ void tst_qmllistreference::canAppend()
     TestType *tt = new TestType;
 
     {
-    QmlListReference ref;
+    QDeclarativeListReference ref;
     QVERIFY(ref.canAppend() == false);
     }
 
     {
-    QmlListReference ref(tt, "blah");
+    QDeclarativeListReference ref(tt, "blah");
     QVERIFY(ref.canAppend() == false);
     }
 
     {
-    QmlListReference ref(tt, "data");
+    QDeclarativeListReference ref(tt, "data");
     QVERIFY(ref.canAppend() == true);
     delete tt;
     QVERIFY(ref.canAppend() == false);
@@ -260,7 +260,7 @@ void tst_qmllistreference::canAppend()
     {
     TestType tt;
     tt.property.append = 0;
-    QmlListReference ref(&tt, "data");
+    QDeclarativeListReference ref(&tt, "data");
     QVERIFY(ref.canAppend() == false);
     }
 }
@@ -270,17 +270,17 @@ void tst_qmllistreference::canAt()
     TestType *tt = new TestType;
 
     {
-    QmlListReference ref;
+    QDeclarativeListReference ref;
     QVERIFY(ref.canAt() == false);
     }
 
     {
-    QmlListReference ref(tt, "blah");
+    QDeclarativeListReference ref(tt, "blah");
     QVERIFY(ref.canAt() == false);
     }
 
     {
-    QmlListReference ref(tt, "data");
+    QDeclarativeListReference ref(tt, "data");
     QVERIFY(ref.canAt() == true);
     delete tt;
     QVERIFY(ref.canAt() == false);
@@ -289,7 +289,7 @@ void tst_qmllistreference::canAt()
     {
     TestType tt;
     tt.property.at = 0;
-    QmlListReference ref(&tt, "data");
+    QDeclarativeListReference ref(&tt, "data");
     QVERIFY(ref.canAt() == false);
     }
 }
@@ -299,17 +299,17 @@ void tst_qmllistreference::canClear()
     TestType *tt = new TestType;
 
     {
-    QmlListReference ref;
+    QDeclarativeListReference ref;
     QVERIFY(ref.canClear() == false);
     }
 
     {
-    QmlListReference ref(tt, "blah");
+    QDeclarativeListReference ref(tt, "blah");
     QVERIFY(ref.canClear() == false);
     }
 
     {
-    QmlListReference ref(tt, "data");
+    QDeclarativeListReference ref(tt, "data");
     QVERIFY(ref.canClear() == true);
     delete tt;
     QVERIFY(ref.canClear() == false);
@@ -318,7 +318,7 @@ void tst_qmllistreference::canClear()
     {
     TestType tt;
     tt.property.clear = 0;
-    QmlListReference ref(&tt, "data");
+    QDeclarativeListReference ref(&tt, "data");
     QVERIFY(ref.canClear() == false);
     }
 }
@@ -328,17 +328,17 @@ void tst_qmllistreference::canCount()
     TestType *tt = new TestType;
 
     {
-    QmlListReference ref;
+    QDeclarativeListReference ref;
     QVERIFY(ref.canCount() == false);
     }
 
     {
-    QmlListReference ref(tt, "blah");
+    QDeclarativeListReference ref(tt, "blah");
     QVERIFY(ref.canCount() == false);
     }
 
     {
-    QmlListReference ref(tt, "data");
+    QDeclarativeListReference ref(tt, "data");
     QVERIFY(ref.canCount() == true);
     delete tt;
     QVERIFY(ref.canCount() == false);
@@ -347,7 +347,7 @@ void tst_qmllistreference::canCount()
     {
     TestType tt;
     tt.property.count = 0;
-    QmlListReference ref(&tt, "data");
+    QDeclarativeListReference ref(&tt, "data");
     QVERIFY(ref.canCount() == false);
     }
 }
@@ -358,17 +358,17 @@ void tst_qmllistreference::append()
     QObject object;
 
     {
-    QmlListReference ref;
+    QDeclarativeListReference ref;
     QVERIFY(ref.append(tt) == false);
     }
 
     {
-    QmlListReference ref(tt, "blah");
+    QDeclarativeListReference ref(tt, "blah");
     QVERIFY(ref.append(tt) == false);
     }
 
     {
-    QmlListReference ref(tt, "data");
+    QDeclarativeListReference ref(tt, "data");
     QVERIFY(ref.append(tt) == true);
     QVERIFY(tt->data.count() == 1);
     QVERIFY(tt->data.at(0) == tt);
@@ -386,7 +386,7 @@ void tst_qmllistreference::append()
     {
     TestType tt;
     tt.property.append = 0;
-    QmlListReference ref(&tt, "data");
+    QDeclarativeListReference ref(&tt, "data");
     QVERIFY(ref.append(&tt) == false);
     }
 }
@@ -399,17 +399,17 @@ void tst_qmllistreference::at()
     tt->data.append(tt);
 
     {
-    QmlListReference ref;
+    QDeclarativeListReference ref;
     QVERIFY(ref.at(0) == 0);
     }
 
     {
-    QmlListReference ref(tt, "blah");
+    QDeclarativeListReference ref(tt, "blah");
     QVERIFY(ref.at(0) == 0);
     }
 
     {
-    QmlListReference ref(tt, "data");
+    QDeclarativeListReference ref(tt, "data");
     QVERIFY(ref.at(0) == tt);
     QVERIFY(ref.at(1) == 0);
     QVERIFY(ref.at(2) == tt);
@@ -421,7 +421,7 @@ void tst_qmllistreference::at()
     TestType tt;
     tt.data.append(&tt);
     tt.property.at = 0;
-    QmlListReference ref(&tt, "data");
+    QDeclarativeListReference ref(&tt, "data");
     QVERIFY(ref.at(0) == 0);
     }
 }
@@ -434,17 +434,17 @@ void tst_qmllistreference::clear()
     tt->data.append(tt);
 
     {
-    QmlListReference ref;
+    QDeclarativeListReference ref;
     QVERIFY(ref.clear() == false);
     }
 
     {
-    QmlListReference ref(tt, "blah");
+    QDeclarativeListReference ref(tt, "blah");
     QVERIFY(ref.clear() == false);
     }
 
     {
-    QmlListReference ref(tt, "data");
+    QDeclarativeListReference ref(tt, "data");
     QVERIFY(ref.clear() == true);
     QVERIFY(tt->data.count() == 0);
     delete tt;
@@ -454,7 +454,7 @@ void tst_qmllistreference::clear()
     {
     TestType tt;
     tt.property.clear = 0;
-    QmlListReference ref(&tt, "data");
+    QDeclarativeListReference ref(&tt, "data");
     QVERIFY(ref.clear() == false);
     }
 }
@@ -467,17 +467,17 @@ void tst_qmllistreference::count()
     tt->data.append(tt);
 
     {
-    QmlListReference ref;
+    QDeclarativeListReference ref;
     QVERIFY(ref.count() == 0);
     }
 
     {
-    QmlListReference ref(tt, "blah");
+    QDeclarativeListReference ref(tt, "blah");
     QVERIFY(ref.count() == 0);
     }
 
     {
-    QmlListReference ref(tt, "data");
+    QDeclarativeListReference ref(tt, "data");
     QVERIFY(ref.count() == 3);
     tt->data.removeAt(1);
     QVERIFY(ref.count() == 2);
@@ -489,7 +489,7 @@ void tst_qmllistreference::count()
     TestType tt;
     tt.data.append(&tt);
     tt.property.count = 0;
-    QmlListReference ref(&tt, "data");
+    QDeclarativeListReference ref(&tt, "data");
     QVERIFY(ref.count() == 0);
     }
 }
@@ -501,11 +501,11 @@ void tst_qmllistreference::copy()
     tt.data.append(0);
     tt.data.append(&tt);
 
-    QmlListReference *r1 = new QmlListReference(&tt, "data");
+    QDeclarativeListReference *r1 = new QDeclarativeListReference(&tt, "data");
     QVERIFY(r1->count() == 3);
 
-    QmlListReference r2(*r1);
-    QmlListReference r3;
+    QDeclarativeListReference r2(*r1);
+    QDeclarativeListReference r3;
     r3 = *r1;
 
     QVERIFY(r2.count() == 3);
@@ -529,30 +529,30 @@ void tst_qmllistreference::qmlmetaproperty()
     tt.data.append(0);
     tt.data.append(&tt);
 
-    QmlMetaProperty prop(&tt, QLatin1String("data"));
+    QDeclarativeMetaProperty prop(&tt, QLatin1String("data"));
     QVariant v = prop.read();
-    QVERIFY(v.userType() == qMetaTypeId<QmlListReference>());
-    QmlListReference ref = qvariant_cast<QmlListReference>(v);
+    QVERIFY(v.userType() == qMetaTypeId<QDeclarativeListReference>());
+    QDeclarativeListReference ref = qvariant_cast<QDeclarativeListReference>(v);
     QVERIFY(ref.count() == 3);
     QVERIFY(ref.listElementType() == &TestType::staticMetaObject);
 }
 
 void tst_qmllistreference::engineTypes()
 {
-    QmlEngine engine;
-    QmlComponent component(&engine, TEST_FILE("engineTypes.qml"));
+    QDeclarativeEngine engine;
+    QDeclarativeComponent component(&engine, TEST_FILE("engineTypes.qml"));
 
     QObject *o = component.create();
     QVERIFY(o);
 
-    QmlMetaProperty p1(o, QLatin1String("myList"));
-    QVERIFY(p1.propertyCategory() == QmlMetaProperty::Normal);
+    QDeclarativeMetaProperty p1(o, QLatin1String("myList"));
+    QVERIFY(p1.propertyCategory() == QDeclarativeMetaProperty::Normal);
 
-    QmlMetaProperty p2(o, QLatin1String("myList"), engine.rootContext());
-    QVERIFY(p2.propertyCategory() == QmlMetaProperty::List);
+    QDeclarativeMetaProperty p2(o, QLatin1String("myList"), engine.rootContext());
+    QVERIFY(p2.propertyCategory() == QDeclarativeMetaProperty::List);
     QVariant v = p2.read();
-    QVERIFY(v.userType() == qMetaTypeId<QmlListReference>());
-    QmlListReference ref = qvariant_cast<QmlListReference>(v);
+    QVERIFY(v.userType() == qMetaTypeId<QDeclarativeListReference>());
+    QDeclarativeListReference ref = qvariant_cast<QDeclarativeListReference>(v);
     QVERIFY(ref.count() == 2);
     QVERIFY(ref.listElementType());
     QVERIFY(ref.listElementType() != &QObject::staticMetaObject);
@@ -562,13 +562,13 @@ void tst_qmllistreference::engineTypes()
 
 void tst_qmllistreference::variantToList()
 {
-    QmlEngine engine;
-    QmlComponent component(&engine, TEST_FILE("variantToList.qml"));
+    QDeclarativeEngine engine;
+    QDeclarativeComponent component(&engine, TEST_FILE("variantToList.qml"));
 
     QObject *o = component.create();
     QVERIFY(o);
 
-    QVERIFY(o->property("value").userType() == qMetaTypeId<QmlListReference>());
+    QVERIFY(o->property("value").userType() == qMetaTypeId<QDeclarativeListReference>());
     QCOMPARE(o->property("test").toInt(), 1);
 
     delete o;
@@ -576,4 +576,4 @@ void tst_qmllistreference::variantToList()
 
 QTEST_MAIN(tst_qmllistreference)
 
-#include "tst_qmllistreference.moc"
+#include "tst_qdeclarativelistreference.moc"
diff --git a/tests/auto/declarative/qmlgraphicslistview/data/itemlist.qml b/tests/auto/declarative/qdeclarativelistview/data/itemlist.qml
index e6b5c8f..e6b5c8f 100644
--- a/tests/auto/declarative/qmlgraphicslistview/data/itemlist.qml
+++ b/tests/auto/declarative/qdeclarativelistview/data/itemlist.qml
diff --git a/tests/auto/declarative/qmlgraphicslistview/data/listview-enforcerange.qml b/tests/auto/declarative/qdeclarativelistview/data/listview-enforcerange.qml
index 46fddae..46fddae 100644
--- a/tests/auto/declarative/qmlgraphicslistview/data/listview-enforcerange.qml
+++ b/tests/auto/declarative/qdeclarativelistview/data/listview-enforcerange.qml
diff --git a/tests/auto/declarative/qmlgraphicslistview/data/listview-initCurrent.qml b/tests/auto/declarative/qdeclarativelistview/data/listview-initCurrent.qml
index 74f5ef4..74f5ef4 100644
--- a/tests/auto/declarative/qmlgraphicslistview/data/listview-initCurrent.qml
+++ b/tests/auto/declarative/qdeclarativelistview/data/listview-initCurrent.qml
diff --git a/tests/auto/declarative/qmlgraphicslistview/data/listview-sections.qml b/tests/auto/declarative/qdeclarativelistview/data/listview-sections.qml
index 4b5bea6..4b5bea6 100644
--- a/tests/auto/declarative/qmlgraphicslistview/data/listview-sections.qml
+++ b/tests/auto/declarative/qdeclarativelistview/data/listview-sections.qml
diff --git a/tests/auto/declarative/qmlgraphicslistview/data/listview.qml b/tests/auto/declarative/qdeclarativelistview/data/listview.qml
index 1c1b3f8..1c1b3f8 100644
--- a/tests/auto/declarative/qmlgraphicslistview/data/listview.qml
+++ b/tests/auto/declarative/qdeclarativelistview/data/listview.qml
diff --git a/tests/auto/declarative/qmlgraphicslistview/qmlgraphicslistview.pro b/tests/auto/declarative/qdeclarativelistview/qdeclarativelistview.pro
index f00de39..3a076f8 100644
--- a/tests/auto/declarative/qmlgraphicslistview/qmlgraphicslistview.pro
+++ b/tests/auto/declarative/qdeclarativelistview/qdeclarativelistview.pro
@@ -2,7 +2,7 @@ load(qttest_p4)
 contains(QT_CONFIG,declarative): QT += declarative
 macx:CONFIG -= app_bundle
 
-SOURCES += tst_qmlgraphicslistview.cpp
+SOURCES += tst_qdeclarativelistview.cpp
 
 # Define SRCDIR equal to test's source directory
 DEFINES += SRCDIR=\\\"$$PWD\\\"
diff --git a/tests/auto/declarative/qmlgraphicslistview/tst_qmlgraphicslistview.cpp b/tests/auto/declarative/qdeclarativelistview/tst_qdeclarativelistview.cpp
index cf96ad5..2b6e7f0 100644
--- a/tests/auto/declarative/qmlgraphicslistview/tst_qmlgraphicslistview.cpp
+++ b/tests/auto/declarative/qdeclarativelistview/tst_qdeclarativelistview.cpp
@@ -40,12 +40,12 @@
 ****************************************************************************/
 #include <QtTest/QtTest>
 #include <private/qlistmodelinterface_p.h>
-#include <qmlview.h>
-#include <private/qmlgraphicslistview_p.h>
-#include <private/qmlgraphicstext_p.h>
-#include <private/qmlgraphicsvisualitemmodel_p.h>
-#include <qmlcontext.h>
-#include <qmlexpression.h>
+#include <qdeclarativeview.h>
+#include <private/qdeclarativelistview_p.h>
+#include <private/qdeclarativetext_p.h>
+#include <private/qdeclarativevisualitemmodel_p.h>
+#include <qdeclarativecontext.h>
+#include <qdeclarativeexpression.h>
 
 class tst_QmlGraphicsListView : public QObject
 {
@@ -88,12 +88,12 @@ private:
     template <class T> void removed(bool animated);
     template <class T> void moved();
     template <class T> void clear();
-    QmlView *createView();
+    QDeclarativeView *createView();
     template<typename T>
     T *findItem(QGraphicsObject *parent, const QString &id, int index=-1);
     template<typename T>
     QList<T*> findItems(QGraphicsObject *parent, const QString &objectName);
-    void dumpTree(QmlGraphicsItem *parent, int depth = 0);
+    void dumpTree(QDeclarativeItem *parent, int depth = 0);
 };
 
 class TestObject : public QObject
@@ -300,14 +300,14 @@ tst_QmlGraphicsListView::tst_QmlGraphicsListView()
 template <class T>
 void tst_QmlGraphicsListView::items()
 {
-    QmlView *canvas = createView();
+    QDeclarativeView *canvas = createView();
 
     T model;
     model.addItem("Fred", "12345");
     model.addItem("John", "2345");
     model.addItem("Bob", "54321");
 
-    QmlContext *ctxt = canvas->rootContext();
+    QDeclarativeContext *ctxt = canvas->rootContext();
     ctxt->setContextProperty("testModel", &model);
 
     TestObject *testObject = new TestObject;
@@ -316,10 +316,10 @@ void tst_QmlGraphicsListView::items()
     canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/listview.qml"));
     qApp->processEvents();
 
-    QmlGraphicsListView *listview = findItem<QmlGraphicsListView>(canvas->rootObject(), "list");
+    QDeclarativeListView *listview = findItem<QDeclarativeListView>(canvas->rootObject(), "list");
     QVERIFY(listview != 0);
 
-    QmlGraphicsItem *viewport = listview->viewport();
+    QDeclarativeItem *viewport = listview->viewport();
     QVERIFY(viewport != 0);
 
     QMetaObject::invokeMethod(canvas->rootObject(), "checkProperties");
@@ -330,13 +330,13 @@ void tst_QmlGraphicsListView::items()
     QCOMPARE(viewport->childItems().count(), model.count()+1); // assumes all are visible, +1 for the (default) highlight item
 
     // current item should be first item
-    QCOMPARE(listview->currentItem(), findItem<QmlGraphicsItem>(viewport, "wrapper", 0));
+    QCOMPARE(listview->currentItem(), findItem<QDeclarativeItem>(viewport, "wrapper", 0));
 
     for (int i = 0; i < model.count(); ++i) {
-        QmlGraphicsText *name = findItem<QmlGraphicsText>(viewport, "textName", i);
+        QDeclarativeText *name = findItem<QDeclarativeText>(viewport, "textName", i);
         QVERIFY(name != 0);
         QCOMPARE(name->text(), model.name(i));
-        QmlGraphicsText *number = findItem<QmlGraphicsText>(viewport, "textNumber", i);
+        QDeclarativeText *number = findItem<QDeclarativeText>(viewport, "textNumber", i);
         QVERIFY(number != 0);
         QCOMPARE(number->text(), model.number(i));
     }
@@ -368,7 +368,7 @@ void tst_QmlGraphicsListView::items()
     // Allow deleteLaters to process
     QTest::qWait(500);
 
-    int itemCount = findItems<QmlGraphicsItem>(viewport, "wrapper").count();
+    int itemCount = findItems<QDeclarativeItem>(viewport, "wrapper").count();
     QVERIFY(itemCount == 0);
 
     QCOMPARE(listview->highlightResizeSpeed(), 1000.0);
@@ -380,14 +380,14 @@ void tst_QmlGraphicsListView::items()
 template <class T>
 void tst_QmlGraphicsListView::changed()
 {
-    QmlView *canvas = createView();
+    QDeclarativeView *canvas = createView();
 
     T model;
     model.addItem("Fred", "12345");
     model.addItem("John", "2345");
     model.addItem("Bob", "54321");
 
-    QmlContext *ctxt = canvas->rootContext();
+    QDeclarativeContext *ctxt = canvas->rootContext();
     ctxt->setContextProperty("testModel", &model);
 
     TestObject *testObject = new TestObject;
@@ -396,17 +396,17 @@ void tst_QmlGraphicsListView::changed()
     canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/listview.qml"));
     qApp->processEvents();
 
-    QmlGraphicsFlickable *listview = findItem<QmlGraphicsFlickable>(canvas->rootObject(), "list");
+    QDeclarativeFlickable *listview = findItem<QDeclarativeFlickable>(canvas->rootObject(), "list");
     QVERIFY(listview != 0);
 
-    QmlGraphicsItem *viewport = listview->viewport();
+    QDeclarativeItem *viewport = listview->viewport();
     QVERIFY(viewport != 0);
 
     model.modifyItem(1, "Will", "9876");
-    QmlGraphicsText *name = findItem<QmlGraphicsText>(viewport, "textName", 1);
+    QDeclarativeText *name = findItem<QDeclarativeText>(viewport, "textName", 1);
     QVERIFY(name != 0);
     QCOMPARE(name->text(), model.name(1));
-    QmlGraphicsText *number = findItem<QmlGraphicsText>(viewport, "textNumber", 1);
+    QDeclarativeText *number = findItem<QDeclarativeText>(viewport, "textNumber", 1);
     QVERIFY(number != 0);
     QCOMPARE(number->text(), model.number(1));
 
@@ -416,14 +416,14 @@ void tst_QmlGraphicsListView::changed()
 template <class T>
 void tst_QmlGraphicsListView::inserted()
 {
-    QmlView *canvas = createView();
+    QDeclarativeView *canvas = createView();
 
     T model;
     model.addItem("Fred", "12345");
     model.addItem("John", "2345");
     model.addItem("Bob", "54321");
 
-    QmlContext *ctxt = canvas->rootContext();
+    QDeclarativeContext *ctxt = canvas->rootContext();
     ctxt->setContextProperty("testModel", &model);
 
     TestObject *testObject = new TestObject;
@@ -432,10 +432,10 @@ void tst_QmlGraphicsListView::inserted()
     canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/listview.qml"));
     qApp->processEvents();
 
-    QmlGraphicsListView *listview = findItem<QmlGraphicsListView>(canvas->rootObject(), "list");
+    QDeclarativeListView *listview = findItem<QDeclarativeListView>(canvas->rootObject(), "list");
     QVERIFY(listview != 0);
 
-    QmlGraphicsItem *viewport = listview->viewport();
+    QDeclarativeItem *viewport = listview->viewport();
     QVERIFY(viewport != 0);
 
     model.insertItem(1, "Will", "9876");
@@ -445,16 +445,16 @@ void tst_QmlGraphicsListView::inserted()
 
     QCOMPARE(viewport->childItems().count(), model.count()+1); // assumes all are visible, +1 for the (default) highlight item
 
-    QmlGraphicsText *name = findItem<QmlGraphicsText>(viewport, "textName", 1);
+    QDeclarativeText *name = findItem<QDeclarativeText>(viewport, "textName", 1);
     QVERIFY(name != 0);
     QCOMPARE(name->text(), model.name(1));
-    QmlGraphicsText *number = findItem<QmlGraphicsText>(viewport, "textNumber", 1);
+    QDeclarativeText *number = findItem<QDeclarativeText>(viewport, "textNumber", 1);
     QVERIFY(number != 0);
     QCOMPARE(number->text(), model.number(1));
 
     // Confirm items positioned correctly
     for (int i = 0; i < model.count(); ++i) {
-        QmlGraphicsItem *item = findItem<QmlGraphicsItem>(viewport, "wrapper", i);
+        QDeclarativeItem *item = findItem<QDeclarativeItem>(viewport, "wrapper", i);
         QCOMPARE(item->y(), i*20.0);
     }
 
@@ -465,10 +465,10 @@ void tst_QmlGraphicsListView::inserted()
 
     QCOMPARE(viewport->childItems().count(), model.count()+1); // assumes all are visible, +1 for the (default) highlight item
 
-    name = findItem<QmlGraphicsText>(viewport, "textName", 0);
+    name = findItem<QDeclarativeText>(viewport, "textName", 0);
     QVERIFY(name != 0);
     QCOMPARE(name->text(), model.name(0));
-    number = findItem<QmlGraphicsText>(viewport, "textNumber", 0);
+    number = findItem<QDeclarativeText>(viewport, "textNumber", 0);
     QVERIFY(number != 0);
     QCOMPARE(number->text(), model.number(0));
 
@@ -476,7 +476,7 @@ void tst_QmlGraphicsListView::inserted()
 
     // Confirm items positioned correctly
     for (int i = 0; i < model.count(); ++i) {
-        QmlGraphicsItem *item = findItem<QmlGraphicsItem>(viewport, "wrapper", i);
+        QDeclarativeItem *item = findItem<QDeclarativeItem>(viewport, "wrapper", i);
         QCOMPARE(item->y(), i*20.0);
     }
 
@@ -495,7 +495,7 @@ void tst_QmlGraphicsListView::inserted()
 
     // Confirm items positioned correctly
     for (int i = 5; i < 5+15; ++i) {
-        QmlGraphicsItem *item = findItem<QmlGraphicsItem>(viewport, "wrapper", i);
+        QDeclarativeItem *item = findItem<QDeclarativeItem>(viewport, "wrapper", i);
         if (!item) qWarning() << "Item" << i << "not found";
         QVERIFY(item);
         QCOMPARE(item->y(), i*20.0 - 20.0);
@@ -509,13 +509,13 @@ void tst_QmlGraphicsListView::inserted()
 template <class T>
 void tst_QmlGraphicsListView::removed(bool animated)
 {
-    QmlView *canvas = createView();
+    QDeclarativeView *canvas = createView();
 
     T model;
     for (int i = 0; i < 30; i++)
         model.addItem("Item" + QString::number(i), "");
 
-    QmlContext *ctxt = canvas->rootContext();
+    QDeclarativeContext *ctxt = canvas->rootContext();
     ctxt->setContextProperty("testModel", &model);
 
     TestObject *testObject = new TestObject;
@@ -525,10 +525,10 @@ void tst_QmlGraphicsListView::removed(bool animated)
     canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/listview.qml"));
     qApp->processEvents();
 
-    QmlGraphicsListView *listview = findItem<QmlGraphicsListView>(canvas->rootObject(), "list");
+    QDeclarativeListView *listview = findItem<QDeclarativeListView>(canvas->rootObject(), "list");
     QVERIFY(listview != 0);
 
-    QmlGraphicsItem *viewport = listview->viewport();
+    QDeclarativeItem *viewport = listview->viewport();
     QVERIFY(viewport != 0);
 
     model.removeItem(1);
@@ -536,17 +536,17 @@ void tst_QmlGraphicsListView::removed(bool animated)
     // let transitions settle.
     QTest::qWait(500);
 
-    QmlGraphicsText *name = findItem<QmlGraphicsText>(viewport, "textName", 1);
+    QDeclarativeText *name = findItem<QDeclarativeText>(viewport, "textName", 1);
     QVERIFY(name != 0);
     QCOMPARE(name->text(), model.name(1));
-    QmlGraphicsText *number = findItem<QmlGraphicsText>(viewport, "textNumber", 1);
+    QDeclarativeText *number = findItem<QDeclarativeText>(viewport, "textNumber", 1);
     QVERIFY(number != 0);
     QCOMPARE(number->text(), model.number(1));
 
     // Confirm items positioned correctly
-    int itemCount = findItems<QmlGraphicsItem>(viewport, "wrapper").count();
+    int itemCount = findItems<QDeclarativeItem>(viewport, "wrapper").count();
     for (int i = 0; i < model.count() && i < itemCount; ++i) {
-        QmlGraphicsItem *item = findItem<QmlGraphicsItem>(viewport, "wrapper", i);
+        QDeclarativeItem *item = findItem<QDeclarativeItem>(viewport, "wrapper", i);
         if (!item) qWarning() << "Item" << i << "not found";
         QVERIFY(item);
         QVERIFY(item->y() == i*20);
@@ -558,17 +558,17 @@ void tst_QmlGraphicsListView::removed(bool animated)
     // let transitions settle.
     QTest::qWait(500);
 
-    name = findItem<QmlGraphicsText>(viewport, "textName", 0);
+    name = findItem<QDeclarativeText>(viewport, "textName", 0);
     QVERIFY(name != 0);
     QCOMPARE(name->text(), model.name(0));
-    number = findItem<QmlGraphicsText>(viewport, "textNumber", 0);
+    number = findItem<QDeclarativeText>(viewport, "textNumber", 0);
     QVERIFY(number != 0);
     QCOMPARE(number->text(), model.number(0));
 
     // Confirm items positioned correctly
-    itemCount = findItems<QmlGraphicsItem>(viewport, "wrapper").count();
+    itemCount = findItems<QDeclarativeItem>(viewport, "wrapper").count();
     for (int i = 0; i < model.count() && i < itemCount; ++i) {
-        QmlGraphicsItem *item = findItem<QmlGraphicsItem>(viewport, "wrapper", i);
+        QDeclarativeItem *item = findItem<QDeclarativeItem>(viewport, "wrapper", i);
         if (!item) qWarning() << "Item" << i << "not found";
         QVERIFY(item);
         QCOMPARE(item->y(),i*20.0 + 20.0);
@@ -580,9 +580,9 @@ void tst_QmlGraphicsListView::removed(bool animated)
     QTest::qWait(500);
 
     // Confirm items positioned correctly
-    itemCount = findItems<QmlGraphicsItem>(viewport, "wrapper").count();
+    itemCount = findItems<QDeclarativeItem>(viewport, "wrapper").count();
     for (int i = 0; i < model.count() && i < itemCount; ++i) {
-        QmlGraphicsItem *item = findItem<QmlGraphicsItem>(viewport, "wrapper", i);
+        QDeclarativeItem *item = findItem<QDeclarativeItem>(viewport, "wrapper", i);
         if (!item) qWarning() << "Item" << i << "not found";
         QVERIFY(item);
         QCOMPARE(item->y(),i*20.0+20.0);
@@ -598,7 +598,7 @@ void tst_QmlGraphicsListView::removed(bool animated)
 
     // Confirm items positioned correctly
     for (int i = 2; i < 18; ++i) {
-        QmlGraphicsItem *item = findItem<QmlGraphicsItem>(viewport, "wrapper", i);
+        QDeclarativeItem *item = findItem<QDeclarativeItem>(viewport, "wrapper", i);
         if (!item) qWarning() << "Item" << i << "not found";
         QVERIFY(item);
         QCOMPARE(item->y(),40+i*20.0);
@@ -606,7 +606,7 @@ void tst_QmlGraphicsListView::removed(bool animated)
 
     // Remove current index
     QVERIFY(listview->currentIndex() == 9);
-    QmlGraphicsItem *oldCurrent = listview->currentItem();
+    QDeclarativeItem *oldCurrent = listview->currentItem();
     model.removeItem(9);
     QTest::qWait(500);
 
@@ -618,9 +618,9 @@ void tst_QmlGraphicsListView::removed(bool animated)
     QTest::qWait(500);
 
     // Confirm items positioned correctly
-    itemCount = findItems<QmlGraphicsItem>(viewport, "wrapper").count();
+    itemCount = findItems<QDeclarativeItem>(viewport, "wrapper").count();
     for (int i = 0; i < model.count() && i < itemCount; ++i) {
-        QmlGraphicsItem *item = findItem<QmlGraphicsItem>(viewport, "wrapper", i);
+        QDeclarativeItem *item = findItem<QDeclarativeItem>(viewport, "wrapper", i);
         if (!item) qWarning() << "Item" << i << "not found";
         QVERIFY(item);
         QCOMPARE(item->y(),40+i*20.0);
@@ -652,13 +652,13 @@ void tst_QmlGraphicsListView::removed(bool animated)
 template <class T>
 void tst_QmlGraphicsListView::clear()
 {
-    QmlView *canvas = createView();
+    QDeclarativeView *canvas = createView();
 
     T model;
     for (int i = 0; i < 30; i++)
         model.addItem("Item" + QString::number(i), "");
 
-    QmlContext *ctxt = canvas->rootContext();
+    QDeclarativeContext *ctxt = canvas->rootContext();
     ctxt->setContextProperty("testModel", &model);
 
     TestObject *testObject = new TestObject;
@@ -667,10 +667,10 @@ void tst_QmlGraphicsListView::clear()
     canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/listview.qml"));
     qApp->processEvents();
 
-    QmlGraphicsListView *listview = findItem<QmlGraphicsListView>(canvas->rootObject(), "list");
+    QDeclarativeListView *listview = findItem<QDeclarativeListView>(canvas->rootObject(), "list");
     QVERIFY(listview != 0);
 
-    QmlGraphicsItem *viewport = listview->viewport();
+    QDeclarativeItem *viewport = listview->viewport();
     QVERIFY(viewport != 0);
 
     model.clear();
@@ -689,13 +689,13 @@ void tst_QmlGraphicsListView::clear()
 template <class T>
 void tst_QmlGraphicsListView::moved()
 {
-    QmlView *canvas = createView();
+    QDeclarativeView *canvas = createView();
 
     T model;
     for (int i = 0; i < 30; i++)
         model.addItem("Item" + QString::number(i), "");
 
-    QmlContext *ctxt = canvas->rootContext();
+    QDeclarativeContext *ctxt = canvas->rootContext();
     ctxt->setContextProperty("testModel", &model);
 
     TestObject *testObject = new TestObject;
@@ -704,10 +704,10 @@ void tst_QmlGraphicsListView::moved()
     canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/listview.qml"));
     qApp->processEvents();
 
-    QmlGraphicsListView *listview = findItem<QmlGraphicsListView>(canvas->rootObject(), "list");
+    QDeclarativeListView *listview = findItem<QDeclarativeListView>(canvas->rootObject(), "list");
     QVERIFY(listview != 0);
 
-    QmlGraphicsItem *viewport = listview->viewport();
+    QDeclarativeItem *viewport = listview->viewport();
     QVERIFY(viewport != 0);
 
     model.moveItem(1, 4);
@@ -715,24 +715,24 @@ void tst_QmlGraphicsListView::moved()
     // let transitions settle.
     QTest::qWait(500);
 
-    QmlGraphicsText *name = findItem<QmlGraphicsText>(viewport, "textName", 1);
+    QDeclarativeText *name = findItem<QDeclarativeText>(viewport, "textName", 1);
     QVERIFY(name != 0);
     QCOMPARE(name->text(), model.name(1));
-    QmlGraphicsText *number = findItem<QmlGraphicsText>(viewport, "textNumber", 1);
+    QDeclarativeText *number = findItem<QDeclarativeText>(viewport, "textNumber", 1);
     QVERIFY(number != 0);
     QCOMPARE(number->text(), model.number(1));
 
-    name = findItem<QmlGraphicsText>(viewport, "textName", 4);
+    name = findItem<QDeclarativeText>(viewport, "textName", 4);
     QVERIFY(name != 0);
     QCOMPARE(name->text(), model.name(4));
-    number = findItem<QmlGraphicsText>(viewport, "textNumber", 4);
+    number = findItem<QDeclarativeText>(viewport, "textNumber", 4);
     QVERIFY(number != 0);
     QCOMPARE(number->text(), model.number(4));
 
     // Confirm items positioned correctly
-    int itemCount = findItems<QmlGraphicsItem>(viewport, "wrapper").count();
+    int itemCount = findItems<QDeclarativeItem>(viewport, "wrapper").count();
     for (int i = 0; i < model.count() && i < itemCount; ++i) {
-        QmlGraphicsItem *item = findItem<QmlGraphicsItem>(viewport, "wrapper", i);
+        QDeclarativeItem *item = findItem<QDeclarativeItem>(viewport, "wrapper", i);
         if (!item) qWarning() << "Item" << i << "not found";
         QVERIFY(item);
         QVERIFY(item->y() == i*20);
@@ -748,14 +748,14 @@ void tst_QmlGraphicsListView::moved()
 
     // Confirm items positioned correctly and indexes correct
     for (int i = 3; i < model.count() && i < itemCount; ++i) {
-        QmlGraphicsItem *item = findItem<QmlGraphicsItem>(viewport, "wrapper", i);
+        QDeclarativeItem *item = findItem<QDeclarativeItem>(viewport, "wrapper", i);
         if (!item) qWarning() << "Item" << i << "not found";
         QVERIFY(item);
         QCOMPARE(item->y(), i*20.0 + 20);
-        name = findItem<QmlGraphicsText>(viewport, "textName", i);
+        name = findItem<QDeclarativeText>(viewport, "textName", i);
         QVERIFY(name != 0);
         QCOMPARE(name->text(), model.name(i));
-        number = findItem<QmlGraphicsText>(viewport, "textNumber", i);
+        number = findItem<QDeclarativeText>(viewport, "textNumber", i);
         QVERIFY(number != 0);
         QCOMPARE(number->text(), model.number(i));
     }
@@ -768,14 +768,14 @@ void tst_QmlGraphicsListView::moved()
 
     // Confirm items positioned correctly and indexes correct
     for (int i = 3; i < model.count() && i < itemCount; ++i) {
-        QmlGraphicsItem *item = findItem<QmlGraphicsItem>(viewport, "wrapper", i);
+        QDeclarativeItem *item = findItem<QDeclarativeItem>(viewport, "wrapper", i);
         if (!item) qWarning() << "Item" << i << "not found";
         QVERIFY(item);
         QCOMPARE(item->y(), i*20.0 + 20);
-        name = findItem<QmlGraphicsText>(viewport, "textName", i);
+        name = findItem<QDeclarativeText>(viewport, "textName", i);
         QVERIFY(name != 0);
         QCOMPARE(name->text(), model.name(i));
-        number = findItem<QmlGraphicsText>(viewport, "textNumber", i);
+        number = findItem<QDeclarativeText>(viewport, "textNumber", i);
         QVERIFY(number != 0);
         QCOMPARE(number->text(), model.number(i));
     }
@@ -785,37 +785,37 @@ void tst_QmlGraphicsListView::moved()
 
 void tst_QmlGraphicsListView::enforceRange()
 {
-    QmlView *canvas = createView();
+    QDeclarativeView *canvas = createView();
 
     TestModel model;
     for (int i = 0; i < 30; i++)
         model.addItem("Item" + QString::number(i), "");
 
-    QmlContext *ctxt = canvas->rootContext();
+    QDeclarativeContext *ctxt = canvas->rootContext();
     ctxt->setContextProperty("testModel", &model);
 
     canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/listview-enforcerange.qml"));
     qApp->processEvents();
 
-    QmlGraphicsListView *listview = findItem<QmlGraphicsListView>(canvas->rootObject(), "list");
+    QDeclarativeListView *listview = findItem<QDeclarativeListView>(canvas->rootObject(), "list");
     QVERIFY(listview != 0);
 
     QCOMPARE(listview->preferredHighlightBegin(), 100.0);
     QCOMPARE(listview->preferredHighlightEnd(), 100.0);
-    QCOMPARE(listview->highlightRangeMode(), QmlGraphicsListView::StrictlyEnforceRange);
+    QCOMPARE(listview->highlightRangeMode(), QDeclarativeListView::StrictlyEnforceRange);
 
-    QmlGraphicsItem *viewport = listview->viewport();
+    QDeclarativeItem *viewport = listview->viewport();
     QVERIFY(viewport != 0);
 
     // view should be positioned at the top of the range.
-    QmlGraphicsItem *item = findItem<QmlGraphicsItem>(viewport, "wrapper", 0);
+    QDeclarativeItem *item = findItem<QDeclarativeItem>(viewport, "wrapper", 0);
     QVERIFY(item);
     QCOMPARE(listview->viewportY(), -100.0);
 
-    QmlGraphicsText *name = findItem<QmlGraphicsText>(viewport, "textName", 0);
+    QDeclarativeText *name = findItem<QDeclarativeText>(viewport, "textName", 0);
     QVERIFY(name != 0);
     QCOMPARE(name->text(), model.name(0));
-    QmlGraphicsText *number = findItem<QmlGraphicsText>(viewport, "textNumber", 0);
+    QDeclarativeText *number = findItem<QDeclarativeText>(viewport, "textNumber", 0);
     QVERIFY(number != 0);
     QCOMPARE(number->text(), model.number(0));
 
@@ -830,13 +830,13 @@ void tst_QmlGraphicsListView::enforceRange()
 
 void tst_QmlGraphicsListView::spacing()
 {
-    QmlView *canvas = createView();
+    QDeclarativeView *canvas = createView();
 
     TestModel model;
     for (int i = 0; i < 30; i++)
         model.addItem("Item" + QString::number(i), "");
 
-    QmlContext *ctxt = canvas->rootContext();
+    QDeclarativeContext *ctxt = canvas->rootContext();
     ctxt->setContextProperty("testModel", &model);
 
     TestObject *testObject = new TestObject;
@@ -845,16 +845,16 @@ void tst_QmlGraphicsListView::spacing()
     canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/listview.qml"));
     qApp->processEvents();
 
-    QmlGraphicsListView *listview = findItem<QmlGraphicsListView>(canvas->rootObject(), "list");
+    QDeclarativeListView *listview = findItem<QDeclarativeListView>(canvas->rootObject(), "list");
     QVERIFY(listview != 0);
 
-    QmlGraphicsItem *viewport = listview->viewport();
+    QDeclarativeItem *viewport = listview->viewport();
     QVERIFY(viewport != 0);
 
     // Confirm items positioned correctly
-    int itemCount = findItems<QmlGraphicsItem>(viewport, "wrapper").count();
+    int itemCount = findItems<QDeclarativeItem>(viewport, "wrapper").count();
     for (int i = 0; i < model.count() && i < itemCount; ++i) {
-        QmlGraphicsItem *item = findItem<QmlGraphicsItem>(viewport, "wrapper", i);
+        QDeclarativeItem *item = findItem<QDeclarativeItem>(viewport, "wrapper", i);
         if (!item) qWarning() << "Item" << i << "not found";
         QVERIFY(item);
         QVERIFY(item->y() == i*20);
@@ -864,9 +864,9 @@ void tst_QmlGraphicsListView::spacing()
     QVERIFY(listview->spacing() == 10);
 
     // Confirm items positioned correctly
-    itemCount = findItems<QmlGraphicsItem>(viewport, "wrapper").count();
+    itemCount = findItems<QDeclarativeItem>(viewport, "wrapper").count();
     for (int i = 0; i < model.count() && i < itemCount; ++i) {
-        QmlGraphicsItem *item = findItem<QmlGraphicsItem>(viewport, "wrapper", i);
+        QDeclarativeItem *item = findItem<QDeclarativeItem>(viewport, "wrapper", i);
         if (!item) qWarning() << "Item" << i << "not found";
         QVERIFY(item);
         QVERIFY(item->y() == i*30);
@@ -875,9 +875,9 @@ void tst_QmlGraphicsListView::spacing()
     listview->setSpacing(0);
 
     // Confirm items positioned correctly
-    itemCount = findItems<QmlGraphicsItem>(viewport, "wrapper").count();
+    itemCount = findItems<QDeclarativeItem>(viewport, "wrapper").count();
     for (int i = 0; i < model.count() && i < itemCount; ++i) {
-        QmlGraphicsItem *item = findItem<QmlGraphicsItem>(viewport, "wrapper", i);
+        QDeclarativeItem *item = findItem<QDeclarativeItem>(viewport, "wrapper", i);
         if (!item) qWarning() << "Item" << i << "not found";
         QVERIFY(item);
         QCOMPARE(item->y(), i*20.0);
@@ -888,28 +888,28 @@ void tst_QmlGraphicsListView::spacing()
 
 void tst_QmlGraphicsListView::sections()
 {
-    QmlView *canvas = createView();
+    QDeclarativeView *canvas = createView();
 
     TestModel model;
     for (int i = 0; i < 30; i++)
         model.addItem("Item" + QString::number(i), QString::number(i/5));
 
-    QmlContext *ctxt = canvas->rootContext();
+    QDeclarativeContext *ctxt = canvas->rootContext();
     ctxt->setContextProperty("testModel", &model);
 
     canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/listview-sections.qml"));
     qApp->processEvents();
 
-    QmlGraphicsListView *listview = findItem<QmlGraphicsListView>(canvas->rootObject(), "list");
+    QDeclarativeListView *listview = findItem<QDeclarativeListView>(canvas->rootObject(), "list");
     QVERIFY(listview != 0);
 
-    QmlGraphicsItem *viewport = listview->viewport();
+    QDeclarativeItem *viewport = listview->viewport();
     QVERIFY(viewport != 0);
 
     // Confirm items positioned correctly
-    int itemCount = findItems<QmlGraphicsItem>(viewport, "wrapper").count();
+    int itemCount = findItems<QDeclarativeItem>(viewport, "wrapper").count();
     for (int i = 0; i < model.count() && i < itemCount; ++i) {
-        QmlGraphicsItem *item = findItem<QmlGraphicsItem>(viewport, "wrapper", i);
+        QDeclarativeItem *item = findItem<QDeclarativeItem>(viewport, "wrapper", i);
         QVERIFY(item);
         QCOMPARE(item->y(), qreal(i*20 + ((i+4)/5) * 20));
     }
@@ -918,29 +918,29 @@ void tst_QmlGraphicsListView::sections()
     model.removeItem(5);
 
     // New section header created
-    QmlGraphicsItem *item = findItem<QmlGraphicsItem>(viewport, "wrapper", 5);
+    QDeclarativeItem *item = findItem<QDeclarativeItem>(viewport, "wrapper", 5);
     QVERIFY(item);
     QCOMPARE(item->height(), 40.0);
 
     model.insertItem(3, "New Item", "0");
 
     // Section header moved
-    item = findItem<QmlGraphicsItem>(viewport, "wrapper", 5);
+    item = findItem<QDeclarativeItem>(viewport, "wrapper", 5);
     QVERIFY(item);
     QCOMPARE(item->height(), 20.0);
 
-    item = findItem<QmlGraphicsItem>(viewport, "wrapper", 6);
+    item = findItem<QDeclarativeItem>(viewport, "wrapper", 6);
     QVERIFY(item);
     QCOMPARE(item->height(), 40.0);
 
     // insert item which will become a section header
     model.insertItem(6, "Replace header", "1");
 
-    item = findItem<QmlGraphicsItem>(viewport, "wrapper", 6);
+    item = findItem<QDeclarativeItem>(viewport, "wrapper", 6);
     QVERIFY(item);
     QCOMPARE(item->height(), 40.0);
 
-    item = findItem<QmlGraphicsItem>(viewport, "wrapper", 7);
+    item = findItem<QDeclarativeItem>(viewport, "wrapper", 7);
     QVERIFY(item);
     QCOMPARE(item->height(), 20.0);
 
@@ -952,7 +952,7 @@ void tst_QmlGraphicsListView::sections()
     listview->setViewportY(20);
     QCOMPARE(listview->currentSection(), QString("0"));
 
-    item = findItem<QmlGraphicsItem>(viewport, "wrapper", 1);
+    item = findItem<QDeclarativeItem>(viewport, "wrapper", 1);
     QVERIFY(item);
     QCOMPARE(item->height(), 20.0);
 
@@ -965,10 +965,10 @@ void tst_QmlGraphicsListView::currentIndex()
     for (int i = 0; i < 30; i++)
         model.addItem("Item" + QString::number(i), QString::number(i));
 
-    QmlView *canvas = new QmlView(0);
+    QDeclarativeView *canvas = new QDeclarativeView(0);
     canvas->setFixedSize(240,320);
 
-    QmlContext *ctxt = canvas->rootContext();
+    QDeclarativeContext *ctxt = canvas->rootContext();
     ctxt->setContextProperty("testModel", &model);
     ctxt->setContextProperty("testWrap", QVariant(false));
 
@@ -977,17 +977,17 @@ void tst_QmlGraphicsListView::currentIndex()
 
     qApp->processEvents();
 
-    QmlGraphicsListView *listview = findItem<QmlGraphicsListView>(canvas->rootObject(), "list");
+    QDeclarativeListView *listview = findItem<QDeclarativeListView>(canvas->rootObject(), "list");
     QVERIFY(listview != 0);
 
-    QmlGraphicsItem *viewport = listview->viewport();
+    QDeclarativeItem *viewport = listview->viewport();
     QVERIFY(viewport != 0);
 
     QTest::qWait(500);
 
     // current item should be third item
     QCOMPARE(listview->currentIndex(), 3);
-    QCOMPARE(listview->currentItem(), findItem<QmlGraphicsItem>(viewport, "wrapper", 3));
+    QCOMPARE(listview->currentItem(), findItem<QDeclarativeItem>(viewport, "wrapper", 3));
     QCOMPARE(listview->highlightItem()->y(), listview->currentItem()->y());
 
     // no wrap
@@ -1054,39 +1054,39 @@ void tst_QmlGraphicsListView::currentIndex()
 
 void tst_QmlGraphicsListView::itemList()
 {
-    QmlView *canvas = createView();
+    QDeclarativeView *canvas = createView();
 
     canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/itemlist.qml"));
     qApp->processEvents();
 
-    QmlGraphicsListView *listview = findItem<QmlGraphicsListView>(canvas->rootObject(), "view");
+    QDeclarativeListView *listview = findItem<QDeclarativeListView>(canvas->rootObject(), "view");
     QVERIFY(listview != 0);
 
-    QmlGraphicsItem *viewport = listview->viewport();
+    QDeclarativeItem *viewport = listview->viewport();
     QVERIFY(viewport != 0);
 
-    QmlGraphicsVisualItemModel *model = canvas->rootObject()->findChild<QmlGraphicsVisualItemModel*>("itemModel");
+    QDeclarativeVisualItemModel *model = canvas->rootObject()->findChild<QDeclarativeVisualItemModel*>("itemModel");
     QVERIFY(model != 0);
 
     QVERIFY(model->count() == 3);
     QCOMPARE(listview->currentIndex(), 0);
 
-    QmlGraphicsItem *item = findItem<QmlGraphicsItem>(viewport, "item1");
+    QDeclarativeItem *item = findItem<QDeclarativeItem>(viewport, "item1");
     QVERIFY(item);
     QCOMPARE(item->x(), 0.0);
 
-    QmlGraphicsText *text = findItem<QmlGraphicsText>(viewport, "text1");
+    QDeclarativeText *text = findItem<QDeclarativeText>(viewport, "text1");
     QVERIFY(text);
     QCOMPARE(text->text(), QLatin1String("index: 0"));
 
     listview->setCurrentIndex(2);
     QTest::qWait(1000);
 
-    item = findItem<QmlGraphicsItem>(viewport, "item3");
+    item = findItem<QDeclarativeItem>(viewport, "item3");
     QVERIFY(item);
     QCOMPARE(item->x(), 480.0);
 
-    text = findItem<QmlGraphicsText>(viewport, "text3");
+    text = findItem<QDeclarativeText>(viewport, "text3");
     QVERIFY(text);
     QCOMPARE(text->text(), QLatin1String("index: 2"));
 
@@ -1095,13 +1095,13 @@ void tst_QmlGraphicsListView::itemList()
 
 void tst_QmlGraphicsListView::cacheBuffer()
 {
-    QmlView *canvas = createView();
+    QDeclarativeView *canvas = createView();
 
     TestModel model;
     for (int i = 0; i < 30; i++)
         model.addItem("Item" + QString::number(i), "");
 
-    QmlContext *ctxt = canvas->rootContext();
+    QDeclarativeContext *ctxt = canvas->rootContext();
     ctxt->setContextProperty("testModel", &model);
 
     TestObject *testObject = new TestObject;
@@ -1110,19 +1110,19 @@ void tst_QmlGraphicsListView::cacheBuffer()
     canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/listview.qml"));
     qApp->processEvents();
 
-    QmlGraphicsListView *listview = findItem<QmlGraphicsListView>(canvas->rootObject(), "list");
+    QDeclarativeListView *listview = findItem<QDeclarativeListView>(canvas->rootObject(), "list");
     QVERIFY(listview != 0);
 
-    QmlGraphicsItem *viewport = listview->viewport();
+    QDeclarativeItem *viewport = listview->viewport();
     QVERIFY(viewport != 0);
     QVERIFY(listview->delegate() != 0);
     QVERIFY(listview->model() != 0);
     QVERIFY(listview->highlight() != 0);
 
     // Confirm items positioned correctly
-    int itemCount = findItems<QmlGraphicsItem>(viewport, "wrapper").count();
+    int itemCount = findItems<QDeclarativeItem>(viewport, "wrapper").count();
     for (int i = 0; i < model.count() && i < itemCount; ++i) {
-        QmlGraphicsItem *item = findItem<QmlGraphicsItem>(viewport, "wrapper", i);
+        QDeclarativeItem *item = findItem<QDeclarativeItem>(viewport, "wrapper", i);
         if (!item) qWarning() << "Item" << i << "not found";
         QVERIFY(item);
         QVERIFY(item->y() == i*20);
@@ -1131,12 +1131,12 @@ void tst_QmlGraphicsListView::cacheBuffer()
     testObject->setCacheBuffer(400);
     QVERIFY(listview->cacheBuffer() == 400);
 
-    int newItemCount = findItems<QmlGraphicsItem>(viewport, "wrapper").count();
+    int newItemCount = findItems<QDeclarativeItem>(viewport, "wrapper").count();
     QVERIFY(newItemCount > itemCount);
 
     // Confirm items positioned correctly
     for (int i = 0; i < model.count() && i < newItemCount; ++i) {
-        QmlGraphicsItem *item = findItem<QmlGraphicsItem>(viewport, "wrapper", i);
+        QDeclarativeItem *item = findItem<QDeclarativeItem>(viewport, "wrapper", i);
         if (!item) qWarning() << "Item" << i << "not found";
         QVERIFY(item);
         QVERIFY(item->y() == i*20);
@@ -1147,13 +1147,13 @@ void tst_QmlGraphicsListView::cacheBuffer()
 
 void tst_QmlGraphicsListView::positionViewAtIndex()
 {
-    QmlView *canvas = createView();
+    QDeclarativeView *canvas = createView();
 
     TestModel model;
     for (int i = 0; i < 40; i++)
         model.addItem("Item" + QString::number(i), "");
 
-    QmlContext *ctxt = canvas->rootContext();
+    QDeclarativeContext *ctxt = canvas->rootContext();
     ctxt->setContextProperty("testModel", &model);
 
     TestObject *testObject = new TestObject;
@@ -1162,16 +1162,16 @@ void tst_QmlGraphicsListView::positionViewAtIndex()
     canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/listview.qml"));
     qApp->processEvents();
 
-    QmlGraphicsListView *listview = findItem<QmlGraphicsListView>(canvas->rootObject(), "list");
+    QDeclarativeListView *listview = findItem<QDeclarativeListView>(canvas->rootObject(), "list");
     QVERIFY(listview != 0);
 
-    QmlGraphicsItem *viewport = listview->viewport();
+    QDeclarativeItem *viewport = listview->viewport();
     QVERIFY(viewport != 0);
 
     // Confirm items positioned correctly
-    int itemCount = findItems<QmlGraphicsItem>(viewport, "wrapper").count();
+    int itemCount = findItems<QDeclarativeItem>(viewport, "wrapper").count();
     for (int i = 0; i < model.count() && i < itemCount; ++i) {
-        QmlGraphicsItem *item = findItem<QmlGraphicsItem>(viewport, "wrapper", i);
+        QDeclarativeItem *item = findItem<QDeclarativeItem>(viewport, "wrapper", i);
         if (!item) qWarning() << "Item" << i << "not found";
         QVERIFY(item);
         QCOMPARE(item->y(), i*20.);
@@ -1182,9 +1182,9 @@ void tst_QmlGraphicsListView::positionViewAtIndex()
     QCOMPARE(listview->viewportY(), 60.);
 
     // Confirm items positioned correctly
-    itemCount = findItems<QmlGraphicsItem>(viewport, "wrapper").count();
+    itemCount = findItems<QDeclarativeItem>(viewport, "wrapper").count();
     for (int i = 3; i < model.count() && i < itemCount-3-1; ++i) {
-        QmlGraphicsItem *item = findItem<QmlGraphicsItem>(viewport, "wrapper", i);
+        QDeclarativeItem *item = findItem<QDeclarativeItem>(viewport, "wrapper", i);
         if (!item) qWarning() << "Item" << i << "not found";
         QVERIFY(item);
         QCOMPARE(item->y(), i*20.);
@@ -1195,9 +1195,9 @@ void tst_QmlGraphicsListView::positionViewAtIndex()
     QCOMPARE(listview->viewportY(), 440.);
 
     // Confirm items positioned correctly
-    itemCount = findItems<QmlGraphicsItem>(viewport, "wrapper").count();
+    itemCount = findItems<QDeclarativeItem>(viewport, "wrapper").count();
     for (int i = 22; i < model.count() && i < itemCount-22-1; ++i) {
-        QmlGraphicsItem *item = findItem<QmlGraphicsItem>(viewport, "wrapper", i);
+        QDeclarativeItem *item = findItem<QDeclarativeItem>(viewport, "wrapper", i);
         if (!item) qWarning() << "Item" << i << "not found";
         QVERIFY(item);
         QCOMPARE(item->y(), i*20.);
@@ -1208,9 +1208,9 @@ void tst_QmlGraphicsListView::positionViewAtIndex()
     QCOMPARE(listview->viewportY(), 480.);
 
     // Confirm items positioned correctly
-    itemCount = findItems<QmlGraphicsItem>(viewport, "wrapper").count();
+    itemCount = findItems<QDeclarativeItem>(viewport, "wrapper").count();
     for (int i = 24; i < model.count() && i < itemCount-24-1; ++i) {
-        QmlGraphicsItem *item = findItem<QmlGraphicsItem>(viewport, "wrapper", i);
+        QDeclarativeItem *item = findItem<QDeclarativeItem>(viewport, "wrapper", i);
         if (!item) qWarning() << "Item" << i << "not found";
         QVERIFY(item);
         QCOMPARE(item->y(), i*20.);
@@ -1221,9 +1221,9 @@ void tst_QmlGraphicsListView::positionViewAtIndex()
     QCOMPARE(listview->viewportY(), 0.);
 
     // Confirm items positioned correctly
-    itemCount = findItems<QmlGraphicsItem>(viewport, "wrapper").count();
+    itemCount = findItems<QDeclarativeItem>(viewport, "wrapper").count();
     for (int i = 0; i < model.count() && i < itemCount-1; ++i) {
-        QmlGraphicsItem *item = findItem<QmlGraphicsItem>(viewport, "wrapper", i);
+        QDeclarativeItem *item = findItem<QDeclarativeItem>(viewport, "wrapper", i);
         if (!item) qWarning() << "Item" << i << "not found";
         QVERIFY(item);
         QCOMPARE(item->y(), i*20.);
@@ -1294,9 +1294,9 @@ void tst_QmlGraphicsListView::qAbstractItemModel_clear()
     clear<TestModel2>();
 }
 
-QmlView *tst_QmlGraphicsListView::createView()
+QDeclarativeView *tst_QmlGraphicsListView::createView()
 {
-    QmlView *canvas = new QmlView(0);
+    QDeclarativeView *canvas = new QDeclarativeView(0);
     canvas->setFixedSize(240,320);
 
     return canvas;
@@ -1312,13 +1312,13 @@ T *tst_QmlGraphicsListView::findItem(QGraphicsObject *parent, const QString &obj
     const QMetaObject &mo = T::staticMetaObject;
     //qDebug() << parent->childItems().count() << "children";
     for (int i = 0; i < parent->childItems().count(); ++i) {
-        QmlGraphicsItem *item = qobject_cast<QmlGraphicsItem*>(parent->childItems().at(i));
+        QDeclarativeItem *item = qobject_cast<QDeclarativeItem*>(parent->childItems().at(i));
         if(!item)
             continue;
         //qDebug() << "try" << item;
         if (mo.cast(item) && (objectName.isEmpty() || item->objectName() == objectName)) {
             if (index != -1) {
-                QmlExpression e(qmlContext(item), "index", item);
+                QDeclarativeExpression e(qmlContext(item), "index", item);
                 if (e.value().toInt() == index)
                     return static_cast<T*>(item);
             } else {
@@ -1340,7 +1340,7 @@ QList<T*> tst_QmlGraphicsListView::findItems(QGraphicsObject *parent, const QStr
     const QMetaObject &mo = T::staticMetaObject;
     //qDebug() << parent->childItems().count() << "children";
     for (int i = 0; i < parent->childItems().count(); ++i) {
-        QmlGraphicsItem *item = qobject_cast<QmlGraphicsItem*>(parent->childItems().at(i));
+        QDeclarativeItem *item = qobject_cast<QDeclarativeItem*>(parent->childItems().at(i));
         if(!item)
             continue;
         //qDebug() << "try" << item;
@@ -1352,11 +1352,11 @@ QList<T*> tst_QmlGraphicsListView::findItems(QGraphicsObject *parent, const QStr
     return items;
 }
 
-void tst_QmlGraphicsListView::dumpTree(QmlGraphicsItem *parent, int depth)
+void tst_QmlGraphicsListView::dumpTree(QDeclarativeItem *parent, int depth)
 {
     static QString padding("                       ");
     for (int i = 0; i < parent->childItems().count(); ++i) {
-        QmlGraphicsItem *item = qobject_cast<QmlGraphicsItem*>(parent->childItems().at(i));
+        QDeclarativeItem *item = qobject_cast<QDeclarativeItem*>(parent->childItems().at(i));
         if(!item)
             continue;
         qDebug() << padding.left(depth*2) << item;
@@ -1367,4 +1367,4 @@ void tst_QmlGraphicsListView::dumpTree(QmlGraphicsItem *parent, int depth)
 
 QTEST_MAIN(tst_QmlGraphicsListView)
 
-#include "tst_qmlgraphicslistview.moc"
+#include "tst_qdeclarativelistview.moc"
diff --git a/tests/auto/declarative/qmlgraphicsloader/data/GraphicsWidget250x250.qml b/tests/auto/declarative/qdeclarativeloader/data/GraphicsWidget250x250.qml
index 627c7df..627c7df 100644
--- a/tests/auto/declarative/qmlgraphicsloader/data/GraphicsWidget250x250.qml
+++ b/tests/auto/declarative/qdeclarativeloader/data/GraphicsWidget250x250.qml
diff --git a/tests/auto/declarative/qmlgraphicsloader/data/NoResize.qml b/tests/auto/declarative/qdeclarativeloader/data/NoResize.qml
index cfbb55a..cfbb55a 100644
--- a/tests/auto/declarative/qmlgraphicsloader/data/NoResize.qml
+++ b/tests/auto/declarative/qdeclarativeloader/data/NoResize.qml
diff --git a/tests/auto/declarative/qmlgraphicsloader/data/NoResizeGraphicsWidget.qml b/tests/auto/declarative/qdeclarativeloader/data/NoResizeGraphicsWidget.qml
index 5eab965..5eab965 100644
--- a/tests/auto/declarative/qmlgraphicsloader/data/NoResizeGraphicsWidget.qml
+++ b/tests/auto/declarative/qdeclarativeloader/data/NoResizeGraphicsWidget.qml
diff --git a/tests/auto/declarative/qmlgraphicsloader/data/Rect120x60.qml b/tests/auto/declarative/qdeclarativeloader/data/Rect120x60.qml
index aa4b0c2..aa4b0c2 100644
--- a/tests/auto/declarative/qmlgraphicsloader/data/Rect120x60.qml
+++ b/tests/auto/declarative/qdeclarativeloader/data/Rect120x60.qml
diff --git a/tests/auto/declarative/qmlgraphicsloader/data/SetSourceComponent.qml b/tests/auto/declarative/qdeclarativeloader/data/SetSourceComponent.qml
index 1db56c4..1db56c4 100644
--- a/tests/auto/declarative/qmlgraphicsloader/data/SetSourceComponent.qml
+++ b/tests/auto/declarative/qdeclarativeloader/data/SetSourceComponent.qml
diff --git a/tests/auto/declarative/qmlgraphicsloader/data/SizeGraphicsWidgetToLoader.qml b/tests/auto/declarative/qdeclarativeloader/data/SizeGraphicsWidgetToLoader.qml
index 568a136..568a136 100644
--- a/tests/auto/declarative/qmlgraphicsloader/data/SizeGraphicsWidgetToLoader.qml
+++ b/tests/auto/declarative/qdeclarativeloader/data/SizeGraphicsWidgetToLoader.qml
diff --git a/tests/auto/declarative/qmlgraphicsloader/data/SizeLoaderToGraphicsWidget.qml b/tests/auto/declarative/qdeclarativeloader/data/SizeLoaderToGraphicsWidget.qml
index a710803..a710803 100644
--- a/tests/auto/declarative/qmlgraphicsloader/data/SizeLoaderToGraphicsWidget.qml
+++ b/tests/auto/declarative/qdeclarativeloader/data/SizeLoaderToGraphicsWidget.qml
diff --git a/tests/auto/declarative/qmlgraphicsloader/data/SizeToItem.qml b/tests/auto/declarative/qdeclarativeloader/data/SizeToItem.qml
index b52fa03..b52fa03 100644
--- a/tests/auto/declarative/qmlgraphicsloader/data/SizeToItem.qml
+++ b/tests/auto/declarative/qdeclarativeloader/data/SizeToItem.qml
diff --git a/tests/auto/declarative/qmlgraphicsloader/data/SizeToLoader.qml b/tests/auto/declarative/qdeclarativeloader/data/SizeToLoader.qml
index 1a107e1..1a107e1 100644
--- a/tests/auto/declarative/qmlgraphicsloader/data/SizeToLoader.qml
+++ b/tests/auto/declarative/qdeclarativeloader/data/SizeToLoader.qml
diff --git a/tests/auto/declarative/qmlgraphicsloader/qmlgraphicsloader.pro b/tests/auto/declarative/qdeclarativeloader/qdeclarativeloader.pro
index 4837075..8ff2be4 100644
--- a/tests/auto/declarative/qmlgraphicsloader/qmlgraphicsloader.pro
+++ b/tests/auto/declarative/qdeclarativeloader/qdeclarativeloader.pro
@@ -4,7 +4,7 @@ macx:CONFIG -= app_bundle
 
 INCLUDEPATH += ../shared/
 HEADERS += ../shared/testhttpserver.h
-SOURCES += tst_qmlgraphicsloader.cpp \
+SOURCES += tst_qdeclarativeloader.cpp \
            ../shared/testhttpserver.cpp
 
 DEFINES += SRCDIR=\\\"$$PWD\\\"
diff --git a/tests/auto/declarative/qmlgraphicsloader/tst_qmlgraphicsloader.cpp b/tests/auto/declarative/qdeclarativeloader/tst_qdeclarativeloader.cpp
index 2d3d5ee..235487c 100644
--- a/tests/auto/declarative/qmlgraphicsloader/tst_qmlgraphicsloader.cpp
+++ b/tests/auto/declarative/qdeclarativeloader/tst_qdeclarativeloader.cpp
@@ -43,9 +43,9 @@
 #include <QtGui/QGraphicsScene>
 
 #include <QSignalSpy>
-#include <QtDeclarative/qmlengine.h>
-#include <QtDeclarative/qmlcomponent.h>
-#include <private/qmlgraphicsloader_p.h>
+#include <QtDeclarative/qdeclarativeengine.h>
+#include <QtDeclarative/qdeclarativecomponent.h>
+#include <private/qdeclarativeloader_p.h>
 #include "testhttpserver.h"
 
 #define SERVER_PORT 14445
@@ -89,7 +89,7 @@ private slots:
 //    void networkComponent();
 
 private:
-    QmlEngine engine;
+    QDeclarativeEngine engine;
 };
 
 
@@ -99,14 +99,14 @@ tst_QmlGraphicsLoader::tst_QmlGraphicsLoader()
 
 void tst_QmlGraphicsLoader::url()
 {
-    QmlComponent component(&engine);
+    QDeclarativeComponent component(&engine);
     component.setData(QByteArray("import Qt 4.6\nLoader { source: \"Rect120x60.qml\" }"), TEST_FILE(""));
-    QmlGraphicsLoader *loader = qobject_cast<QmlGraphicsLoader*>(component.create());
+    QDeclarativeLoader *loader = qobject_cast<QDeclarativeLoader*>(component.create());
     QVERIFY(loader != 0);
     QVERIFY(loader->item());
     QVERIFY(loader->source() == QUrl::fromLocalFile(SRCDIR "/data/Rect120x60.qml"));
     QCOMPARE(loader->progress(), 1.0);
-    QCOMPARE(loader->status(), QmlGraphicsLoader::Ready);
+    QCOMPARE(loader->status(), QDeclarativeLoader::Ready);
     QCOMPARE(static_cast<QGraphicsItem*>(loader)->children().count(), 1);
 
     delete loader;
@@ -114,15 +114,15 @@ void tst_QmlGraphicsLoader::url()
 
 void tst_QmlGraphicsLoader::component()
 {
-    QmlComponent component(&engine, TEST_FILE("/SetSourceComponent.qml"));
-    QmlGraphicsItem *item = qobject_cast<QmlGraphicsItem*>(component.create());
+    QDeclarativeComponent component(&engine, TEST_FILE("/SetSourceComponent.qml"));
+    QDeclarativeItem *item = qobject_cast<QDeclarativeItem*>(component.create());
     QVERIFY(item);
 
-    QmlGraphicsLoader *loader = qobject_cast<QmlGraphicsLoader*>(item->QGraphicsObject::children().at(1)); 
+    QDeclarativeLoader *loader = qobject_cast<QDeclarativeLoader*>(item->QGraphicsObject::children().at(1)); 
     QVERIFY(loader);
     QVERIFY(loader->item());
     QCOMPARE(loader->progress(), 1.0);
-    QCOMPARE(loader->status(), QmlGraphicsLoader::Ready);
+    QCOMPARE(loader->status(), QDeclarativeLoader::Ready);
     QCOMPARE(static_cast<QGraphicsItem*>(loader)->children().count(), 1);
 
     delete loader;
@@ -132,13 +132,13 @@ void tst_QmlGraphicsLoader::invalidUrl()
 {
     QTest::ignoreMessage(QtWarningMsg, QString("(:-1: File error for URL " + QUrl::fromLocalFile(SRCDIR "/data/IDontExist.qml").toString() + ") ").toUtf8().constData());
 
-    QmlComponent component(&engine);
+    QDeclarativeComponent component(&engine);
     component.setData(QByteArray("import Qt 4.6\nLoader { source: \"IDontExist.qml\" }"), TEST_FILE(""));
-    QmlGraphicsLoader *loader = qobject_cast<QmlGraphicsLoader*>(component.create());
+    QDeclarativeLoader *loader = qobject_cast<QDeclarativeLoader*>(component.create());
     QVERIFY(loader != 0);
     QVERIFY(loader->item() == 0);
     QCOMPARE(loader->progress(), 1.0);
-    QCOMPARE(loader->status(), QmlGraphicsLoader::Error);
+    QCOMPARE(loader->status(), QDeclarativeLoader::Error);
     QCOMPARE(static_cast<QGraphicsItem*>(loader)->children().count(), 0);
 
     delete loader;
@@ -147,7 +147,7 @@ void tst_QmlGraphicsLoader::invalidUrl()
 void tst_QmlGraphicsLoader::clear()
 {
     {
-        QmlComponent component(&engine);
+        QDeclarativeComponent component(&engine);
         component.setData(QByteArray(
                     "import Qt 4.6\n"
                     " Loader { id: loader\n"
@@ -155,7 +155,7 @@ void tst_QmlGraphicsLoader::clear()
                     "  Timer { interval: 200; running: true; onTriggered: loader.source = '' }\n"
                     " }")
                 , TEST_FILE(""));
-        QmlGraphicsLoader *loader = qobject_cast<QmlGraphicsLoader*>(component.create());
+        QDeclarativeLoader *loader = qobject_cast<QDeclarativeLoader*>(component.create());
         QVERIFY(loader != 0);
         QVERIFY(loader->item());
         QCOMPARE(loader->progress(), 1.0);
@@ -165,17 +165,17 @@ void tst_QmlGraphicsLoader::clear()
 
         QVERIFY(loader->item() == 0);
         QCOMPARE(loader->progress(), 0.0);
-        QCOMPARE(loader->status(), QmlGraphicsLoader::Null);
+        QCOMPARE(loader->status(), QDeclarativeLoader::Null);
         QCOMPARE(static_cast<QGraphicsItem*>(loader)->children().count(), 0);
 
         delete loader;
     }
     {
-        QmlComponent component(&engine, TEST_FILE("/SetSourceComponent.qml"));
-        QmlGraphicsItem *item = qobject_cast<QmlGraphicsItem*>(component.create());
+        QDeclarativeComponent component(&engine, TEST_FILE("/SetSourceComponent.qml"));
+        QDeclarativeItem *item = qobject_cast<QDeclarativeItem*>(component.create());
         QVERIFY(item);
 
-        QmlGraphicsLoader *loader = qobject_cast<QmlGraphicsLoader*>(item->QGraphicsObject::children().at(1)); 
+        QDeclarativeLoader *loader = qobject_cast<QDeclarativeLoader*>(item->QGraphicsObject::children().at(1)); 
         QVERIFY(loader);
         QVERIFY(loader->item());
         QCOMPARE(loader->progress(), 1.0);
@@ -185,7 +185,7 @@ void tst_QmlGraphicsLoader::clear()
 
         QVERIFY(loader->item() == 0);
         QCOMPARE(loader->progress(), 0.0);
-        QCOMPARE(loader->status(), QmlGraphicsLoader::Null);
+        QCOMPARE(loader->status(), QDeclarativeLoader::Null);
         QCOMPARE(static_cast<QGraphicsItem*>(loader)->children().count(), 0);
 
         delete loader;
@@ -194,7 +194,7 @@ void tst_QmlGraphicsLoader::clear()
 
 void tst_QmlGraphicsLoader::urlToComponent()
 {
-    QmlComponent component(&engine);
+    QDeclarativeComponent component(&engine);
     component.setData(QByteArray("import Qt 4.6\n"
                 "Loader {\n"
                 " id: loader\n"
@@ -203,7 +203,7 @@ void tst_QmlGraphicsLoader::urlToComponent()
                 " Timer { interval: 100; running: true; onTriggered: loader.sourceComponent = myComp }\n"
                 "}" )
             , TEST_FILE(""));
-    QmlGraphicsLoader *loader = qobject_cast<QmlGraphicsLoader*>(component.create());
+    QDeclarativeLoader *loader = qobject_cast<QDeclarativeLoader*>(component.create());
     QTest::qWait(500);
     QVERIFY(loader != 0);
     QVERIFY(loader->item());
@@ -217,11 +217,11 @@ void tst_QmlGraphicsLoader::urlToComponent()
 
 void tst_QmlGraphicsLoader::componentToUrl()
 {
-    QmlComponent component(&engine, TEST_FILE("/SetSourceComponent.qml"));
-    QmlGraphicsItem *item = qobject_cast<QmlGraphicsItem*>(component.create());
+    QDeclarativeComponent component(&engine, TEST_FILE("/SetSourceComponent.qml"));
+    QDeclarativeItem *item = qobject_cast<QDeclarativeItem*>(component.create());
     QVERIFY(item);
 
-    QmlGraphicsLoader *loader = qobject_cast<QmlGraphicsLoader*>(item->QGraphicsObject::children().at(1)); 
+    QDeclarativeLoader *loader = qobject_cast<QDeclarativeLoader*>(item->QGraphicsObject::children().at(1)); 
     QVERIFY(loader);
     QVERIFY(loader->item());
     QCOMPARE(loader->progress(), 1.0);
@@ -239,15 +239,15 @@ void tst_QmlGraphicsLoader::componentToUrl()
 
 void tst_QmlGraphicsLoader::sizeLoaderToItem()
 {
-    QmlComponent component(&engine, TEST_FILE("/SizeToItem.qml"));
-    QmlGraphicsLoader *loader = qobject_cast<QmlGraphicsLoader*>(component.create());
+    QDeclarativeComponent component(&engine, TEST_FILE("/SizeToItem.qml"));
+    QDeclarativeLoader *loader = qobject_cast<QDeclarativeLoader*>(component.create());
     QVERIFY(loader != 0);
-    QVERIFY(loader->resizeMode() == QmlGraphicsLoader::SizeLoaderToItem);
+    QVERIFY(loader->resizeMode() == QDeclarativeLoader::SizeLoaderToItem);
     QCOMPARE(loader->width(), 120.0);
     QCOMPARE(loader->height(), 60.0);
 
     // Check resize
-    QmlGraphicsItem *rect = qobject_cast<QmlGraphicsItem*>(loader->item());
+    QDeclarativeItem *rect = qobject_cast<QDeclarativeItem*>(loader->item());
     QVERIFY(rect);
     rect->setWidth(150);
     rect->setHeight(45);
@@ -255,7 +255,7 @@ void tst_QmlGraphicsLoader::sizeLoaderToItem()
     QCOMPARE(loader->height(), 45.0);
 
     // Switch mode
-    loader->setResizeMode(QmlGraphicsLoader::SizeItemToLoader);
+    loader->setResizeMode(QDeclarativeLoader::SizeItemToLoader);
     loader->setWidth(180);
     loader->setHeight(30);
     QCOMPARE(rect->width(), 180.0);
@@ -263,22 +263,22 @@ void tst_QmlGraphicsLoader::sizeLoaderToItem()
 
     // notify
     QSignalSpy spy(loader, SIGNAL(resizeModeChanged()));
-    loader->setResizeMode(QmlGraphicsLoader::NoResize);
+    loader->setResizeMode(QDeclarativeLoader::NoResize);
     QCOMPARE(spy.count(),1);
-    loader->setResizeMode(QmlGraphicsLoader::NoResize);
+    loader->setResizeMode(QDeclarativeLoader::NoResize);
     QCOMPARE(spy.count(),1);
 }
 
 void tst_QmlGraphicsLoader::sizeItemToLoader()
 {
-    QmlComponent component(&engine, TEST_FILE("/SizeToLoader.qml"));
-    QmlGraphicsLoader *loader = qobject_cast<QmlGraphicsLoader*>(component.create());
+    QDeclarativeComponent component(&engine, TEST_FILE("/SizeToLoader.qml"));
+    QDeclarativeLoader *loader = qobject_cast<QDeclarativeLoader*>(component.create());
     QVERIFY(loader != 0);
-    QVERIFY(loader->resizeMode() == QmlGraphicsLoader::SizeItemToLoader);
+    QVERIFY(loader->resizeMode() == QDeclarativeLoader::SizeItemToLoader);
     QCOMPARE(loader->width(), 200.0);
     QCOMPARE(loader->height(), 80.0);
 
-    QmlGraphicsItem *rect = qobject_cast<QmlGraphicsItem*>(loader->item());
+    QDeclarativeItem *rect = qobject_cast<QDeclarativeItem*>(loader->item());
     QVERIFY(rect);
     QCOMPARE(rect->width(), 200.0);
     QCOMPARE(rect->height(), 80.0);
@@ -290,7 +290,7 @@ void tst_QmlGraphicsLoader::sizeItemToLoader()
     QCOMPARE(rect->height(), 30.0);
 
     // Switch mode
-    loader->setResizeMode(QmlGraphicsLoader::SizeLoaderToItem);
+    loader->setResizeMode(QDeclarativeLoader::SizeLoaderToItem);
     rect->setWidth(160);
     rect->setHeight(45);
     QCOMPARE(loader->width(), 160.0);
@@ -299,13 +299,13 @@ void tst_QmlGraphicsLoader::sizeItemToLoader()
 
 void tst_QmlGraphicsLoader::noResize()
 {
-    QmlComponent component(&engine, TEST_FILE("/NoResize.qml"));
-    QmlGraphicsLoader *loader = qobject_cast<QmlGraphicsLoader*>(component.create());
+    QDeclarativeComponent component(&engine, TEST_FILE("/NoResize.qml"));
+    QDeclarativeLoader *loader = qobject_cast<QDeclarativeLoader*>(component.create());
     QVERIFY(loader != 0);
     QCOMPARE(loader->width(), 200.0);
     QCOMPARE(loader->height(), 80.0);
 
-    QmlGraphicsItem *rect = qobject_cast<QmlGraphicsItem*>(loader->item());
+    QDeclarativeItem *rect = qobject_cast<QDeclarativeItem*>(loader->item());
     QVERIFY(rect);
     QCOMPARE(rect->width(), 120.0);
     QCOMPARE(rect->height(), 60.0);
@@ -313,13 +313,13 @@ void tst_QmlGraphicsLoader::noResize()
 
 void tst_QmlGraphicsLoader::sizeLoaderToGraphicsWidget()
 {
-    QmlComponent component(&engine, TEST_FILE("/SizeLoaderToGraphicsWidget.qml"));
-    QmlGraphicsLoader *loader = qobject_cast<QmlGraphicsLoader*>(component.create());
+    QDeclarativeComponent component(&engine, TEST_FILE("/SizeLoaderToGraphicsWidget.qml"));
+    QDeclarativeLoader *loader = qobject_cast<QDeclarativeLoader*>(component.create());
     QGraphicsScene scene;
     scene.addItem(loader);
 
     QVERIFY(loader != 0);
-    QVERIFY(loader->resizeMode() == QmlGraphicsLoader::SizeLoaderToItem);
+    QVERIFY(loader->resizeMode() == QDeclarativeLoader::SizeLoaderToItem);
     QCOMPARE(loader->width(), 250.0);
     QCOMPARE(loader->height(), 250.0);
 
@@ -331,7 +331,7 @@ void tst_QmlGraphicsLoader::sizeLoaderToGraphicsWidget()
     QCOMPARE(loader->height(), 45.0);
 
     // Switch mode
-    loader->setResizeMode(QmlGraphicsLoader::SizeItemToLoader);
+    loader->setResizeMode(QDeclarativeLoader::SizeItemToLoader);
     loader->setWidth(180);
     loader->setHeight(30);
     QCOMPARE(widget->size().width(), 180.0);
@@ -340,13 +340,13 @@ void tst_QmlGraphicsLoader::sizeLoaderToGraphicsWidget()
 
 void tst_QmlGraphicsLoader::sizeGraphicsWidgetToLoader()
 {
-    QmlComponent component(&engine, TEST_FILE("/SizeGraphicsWidgetToLoader.qml"));
-    QmlGraphicsLoader *loader = qobject_cast<QmlGraphicsLoader*>(component.create());
+    QDeclarativeComponent component(&engine, TEST_FILE("/SizeGraphicsWidgetToLoader.qml"));
+    QDeclarativeLoader *loader = qobject_cast<QDeclarativeLoader*>(component.create());
     QGraphicsScene scene;
     scene.addItem(loader);
 
     QVERIFY(loader != 0);
-    QVERIFY(loader->resizeMode() == QmlGraphicsLoader::SizeItemToLoader);
+    QVERIFY(loader->resizeMode() == QDeclarativeLoader::SizeItemToLoader);
     QCOMPARE(loader->width(), 200.0);
     QCOMPARE(loader->height(), 80.0);
 
@@ -362,7 +362,7 @@ void tst_QmlGraphicsLoader::sizeGraphicsWidgetToLoader()
     QCOMPARE(widget->size().height(), 30.0);
 
     // Switch mode
-    loader->setResizeMode(QmlGraphicsLoader::SizeLoaderToItem);
+    loader->setResizeMode(QDeclarativeLoader::SizeLoaderToItem);
     widget->resize(QSizeF(160,45));
     QCOMPARE(loader->width(), 160.0);
     QCOMPARE(loader->height(), 45.0);
@@ -370,8 +370,8 @@ void tst_QmlGraphicsLoader::sizeGraphicsWidgetToLoader()
 
 void tst_QmlGraphicsLoader::noResizeGraphicsWidget()
 {
-    QmlComponent component(&engine, TEST_FILE("/NoResizeGraphicsWidget.qml"));
-    QmlGraphicsLoader *loader = qobject_cast<QmlGraphicsLoader*>(component.create());
+    QDeclarativeComponent component(&engine, TEST_FILE("/NoResizeGraphicsWidget.qml"));
+    QDeclarativeLoader *loader = qobject_cast<QDeclarativeLoader*>(component.create());
     QGraphicsScene scene;
     scene.addItem(loader);
 
@@ -391,12 +391,12 @@ void tst_QmlGraphicsLoader::networkRequestUrl()
     QVERIFY(server.isValid());
     server.serveDirectory(SRCDIR "/data");
 
-    QmlComponent component(&engine);
+    QDeclarativeComponent component(&engine);
     component.setData(QByteArray("import Qt 4.6\nLoader { source: \"http://127.0.0.1:14445/Rect120x60.qml\" }"), TEST_FILE(""));
-    QmlGraphicsLoader *loader = qobject_cast<QmlGraphicsLoader*>(component.create());
+    QDeclarativeLoader *loader = qobject_cast<QDeclarativeLoader*>(component.create());
     QVERIFY(loader != 0);
 
-    TRY_WAIT(loader->status() == QmlGraphicsLoader::Ready);
+    TRY_WAIT(loader->status() == QDeclarativeLoader::Ready);
 
     QVERIFY(loader->item());
     QCOMPARE(loader->progress(), 1.0);
@@ -412,7 +412,7 @@ void tst_QmlGraphicsLoader::networkComponent()
     QVERIFY(server.isValid());
     server.serveDirectory("slowdata", TestHTTPServer::Delay);
 
-    QmlComponent component(&engine);
+    QDeclarativeComponent component(&engine);
     component.setData(QByteArray(
                 "import Qt 4.6\n"
                 "import \"http://127.0.0.1:14445/\" as NW\n"
@@ -421,16 +421,16 @@ void tst_QmlGraphicsLoader::networkComponent()
                 " Loader { sourceComponent: comp } }")
             , TEST_FILE(""));
 
-    QmlGraphicsItem *item = qobject_cast<QmlGraphicsItem*>(component.create());
+    QDeclarativeItem *item = qobject_cast<QDeclarativeItem*>(component.create());
     QVERIFY(item);
 
-    QmlGraphicsLoader *loader = qobject_cast<QmlGraphicsLoader*>(item->QGraphicsObject::children().at(1)); 
+    QDeclarativeLoader *loader = qobject_cast<QDeclarativeLoader*>(item->QGraphicsObject::children().at(1)); 
     QVERIFY(loader);
-    TRY_WAIT(loader->status() == QmlGraphicsLoader::Ready);
+    TRY_WAIT(loader->status() == QDeclarativeLoader::Ready);
 
     QVERIFY(loader->item());
     QCOMPARE(loader->progress(), 1.0);
-    QCOMPARE(loader->status(), QmlGraphicsLoader::Ready);
+    QCOMPARE(loader->status(), QDeclarativeLoader::Ready);
     QCOMPARE(static_cast<QGraphicsItem*>(loader)->children().count(), 1);
 
     delete loader;
@@ -445,12 +445,12 @@ void tst_QmlGraphicsLoader::failNetworkRequest()
 
     QTest::ignoreMessage(QtWarningMsg, "(:-1: Network error for URL http://127.0.0.1:14445/IDontExist.qml) ");
 
-    QmlComponent component(&engine);
+    QDeclarativeComponent component(&engine);
     component.setData(QByteArray("import Qt 4.6\nLoader { source: \"http://127.0.0.1:14445/IDontExist.qml\" }"), TEST_FILE(""));
-    QmlGraphicsLoader *loader = qobject_cast<QmlGraphicsLoader*>(component.create());
+    QDeclarativeLoader *loader = qobject_cast<QDeclarativeLoader*>(component.create());
     QVERIFY(loader != 0);
 
-    TRY_WAIT(loader->status() == QmlGraphicsLoader::Error);
+    TRY_WAIT(loader->status() == QDeclarativeLoader::Error);
 
     QVERIFY(loader->item() == 0);
     QCOMPARE(loader->progress(), 0.0);
@@ -461,4 +461,4 @@ void tst_QmlGraphicsLoader::failNetworkRequest()
 
 QTEST_MAIN(tst_QmlGraphicsLoader)
 
-#include "tst_qmlgraphicsloader.moc"
+#include "tst_qdeclarativeloader.moc"
diff --git a/tests/auto/declarative/qmlpropertymap/qmlpropertymap.pro b/tests/auto/declarative/qdeclarativemetaproperty/qdeclarativemetaproperty.pro
index 967ab76..7170469 100644
--- a/tests/auto/declarative/qmlpropertymap/qmlpropertymap.pro
+++ b/tests/auto/declarative/qdeclarativemetaproperty/qdeclarativemetaproperty.pro
@@ -2,4 +2,4 @@ load(qttest_p4)
 contains(QT_CONFIG,declarative): QT += declarative
 macx:CONFIG -= app_bundle
 
-SOURCES += tst_qmlpropertymap.cpp
+SOURCES += tst_qdeclarativemetaproperty.cpp
diff --git a/tests/auto/declarative/qmlmetaproperty/tst_qmlmetaproperty.cpp b/tests/auto/declarative/qdeclarativemetaproperty/tst_qdeclarativemetaproperty.cpp
index 7bb3e96..0271c64 100644
--- a/tests/auto/declarative/qmlmetaproperty/tst_qmlmetaproperty.cpp
+++ b/tests/auto/declarative/qdeclarativemetaproperty/tst_qdeclarativemetaproperty.cpp
@@ -39,11 +39,11 @@
 **
 ****************************************************************************/
 #include <qtest.h>
-#include <QtDeclarative/qmlengine.h>
-#include <QtDeclarative/qmlcomponent.h>
-#include <QtDeclarative/qmlmetaproperty.h>
+#include <QtDeclarative/qdeclarativeengine.h>
+#include <QtDeclarative/qdeclarativecomponent.h>
+#include <QtDeclarative/qdeclarativemetaproperty.h>
 #include <private/qguard_p.h>
-#include <private/qmlbinding_p.h>
+#include <private/qdeclarativebinding_p.h>
 #include <QtGui/QLineEdit>
 
 class MyQmlObject : public QObject
@@ -72,11 +72,11 @@ private:
 class MyContainer : public QObject
 {
     Q_OBJECT
-    Q_PROPERTY(QmlListProperty<MyQmlObject> children READ children)
+    Q_PROPERTY(QDeclarativeListProperty<MyQmlObject> children READ children)
 public:
     MyContainer() {}
 
-    QmlListProperty<MyQmlObject> children() { return QmlListProperty<MyQmlObject>(this, m_children); }
+    QDeclarativeListProperty<MyQmlObject> children() { return QDeclarativeListProperty<MyQmlObject>(this, m_children); }
 
     static MyAttached *qmlAttachedProperties(QObject *o) {
         return new MyAttached(o);
@@ -122,23 +122,16 @@ private slots:
 
     void copy();
 private:
-    QmlEngine engine;
+    QDeclarativeEngine engine;
 };
 
-void tst_qmlmetaproperty::initTestCase()
-{
-    QML_REGISTER_TYPE(Test,1,0,MyQmlObject,MyQmlObject);
-    QML_REGISTER_TYPE(Test,1,0,PropertyObject,PropertyObject);
-    QML_REGISTER_TYPE(Test,1,0,MyContainer,MyContainer);
-}
-
 void tst_qmlmetaproperty::qmlmetaproperty()
 {
-    QmlMetaProperty prop;
+    QDeclarativeMetaProperty prop;
 
-    QGuard<QmlBinding> binding(new QmlBinding(QLatin1String("null"), 0, engine.rootContext()));
+    QGuard<QDeclarativeBinding> binding(new QDeclarativeBinding(QLatin1String("null"), 0, engine.rootContext()));
     QVERIFY(binding != 0);
-    QGuard<QmlExpression> expression(new QmlExpression());
+    QGuard<QDeclarativeExpression> expression(new QDeclarativeExpression());
     QVERIFY(expression != 0);
 
     QObject *obj = new QObject;
@@ -155,7 +148,7 @@ void tst_qmlmetaproperty::qmlmetaproperty()
     QCOMPARE(prop.connectNotifier(obj, obj->metaObject()->indexOfMethod("deleteLater()")), false);
     QCOMPARE(prop.connectNotifier(obj, -1), false);
     QVERIFY(prop.method().signature() == 0);
-    QCOMPARE(prop.type(), QmlMetaProperty::Invalid);
+    QCOMPARE(prop.type(), QDeclarativeMetaProperty::Invalid);
     QCOMPARE(prop.isProperty(), false);
     QCOMPARE(prop.isDefault(), false);
     QCOMPARE(prop.isWritable(), false);
@@ -163,7 +156,7 @@ void tst_qmlmetaproperty::qmlmetaproperty()
     QCOMPARE(prop.isResettable(), false);
     QCOMPARE(prop.isValid(), false);
     QCOMPARE(prop.object(), (QObject *)0);
-    QCOMPARE(prop.propertyCategory(), QmlMetaProperty::InvalidProperty);
+    QCOMPARE(prop.propertyCategory(), QDeclarativeMetaProperty::InvalidProperty);
     QCOMPARE(prop.propertyType(), 0);
     QCOMPARE(prop.propertyTypeName(), (const char *)0);
     QVERIFY(prop.property().name() == 0);
@@ -222,11 +215,11 @@ void tst_qmlmetaproperty::qmlmetaproperty_object()
     PropertyObject dobject; // Has default property
 
     {
-        QmlMetaProperty prop(&object);
+        QDeclarativeMetaProperty prop(&object);
 
-        QGuard<QmlBinding> binding(new QmlBinding(QLatin1String("null"), 0, engine.rootContext()));
+        QGuard<QDeclarativeBinding> binding(new QDeclarativeBinding(QLatin1String("null"), 0, engine.rootContext()));
         QVERIFY(binding != 0);
-        QGuard<QmlExpression> expression(new QmlExpression());
+        QGuard<QDeclarativeExpression> expression(new QDeclarativeExpression());
         QVERIFY(expression != 0);
 
         QObject *obj = new QObject;
@@ -243,7 +236,7 @@ void tst_qmlmetaproperty::qmlmetaproperty_object()
         QCOMPARE(prop.connectNotifier(obj, obj->metaObject()->indexOfMethod("deleteLater()")), false);
         QCOMPARE(prop.connectNotifier(obj, -1), false);
         QVERIFY(prop.method().signature() == 0);
-        QCOMPARE(prop.type(), QmlMetaProperty::Invalid);
+        QCOMPARE(prop.type(), QDeclarativeMetaProperty::Invalid);
         QCOMPARE(prop.isProperty(), false);
         QCOMPARE(prop.isDefault(), false);
         QCOMPARE(prop.isWritable(), false);
@@ -251,7 +244,7 @@ void tst_qmlmetaproperty::qmlmetaproperty_object()
         QCOMPARE(prop.isResettable(), false);
         QCOMPARE(prop.isValid(), false);
         QCOMPARE(prop.object(), (QObject *)0);
-        QCOMPARE(prop.propertyCategory(), QmlMetaProperty::InvalidProperty);
+        QCOMPARE(prop.propertyCategory(), QDeclarativeMetaProperty::InvalidProperty);
         QCOMPARE(prop.propertyType(), 0);
         QCOMPARE(prop.propertyTypeName(), (const char *)0);
         QVERIFY(prop.property().name() == 0);
@@ -268,12 +261,12 @@ void tst_qmlmetaproperty::qmlmetaproperty_object()
     }
 
     {
-        QmlMetaProperty prop(&dobject);
+        QDeclarativeMetaProperty prop(&dobject);
 
-        QGuard<QmlBinding> binding(new QmlBinding(QLatin1String("null"), 0, engine.rootContext()));
+        QGuard<QDeclarativeBinding> binding(new QDeclarativeBinding(QLatin1String("null"), 0, engine.rootContext()));
         binding->setTarget(prop);
         QVERIFY(binding != 0);
-        QGuard<QmlExpression> expression(new QmlExpression());
+        QGuard<QDeclarativeExpression> expression(new QDeclarativeExpression());
         QVERIFY(expression != 0);
 
         QObject *obj = new QObject;
@@ -290,7 +283,7 @@ void tst_qmlmetaproperty::qmlmetaproperty_object()
         QCOMPARE(prop.connectNotifier(obj, obj->metaObject()->indexOfMethod("deleteLater()")), false);
         QCOMPARE(prop.connectNotifier(obj, -1), false);
         QVERIFY(prop.method().signature() == 0);
-        QCOMPARE(prop.type(), (QmlMetaProperty::Type)(QmlMetaProperty::Property | QmlMetaProperty::Default));
+        QCOMPARE(prop.type(), (QDeclarativeMetaProperty::Type)(QDeclarativeMetaProperty::Property | QDeclarativeMetaProperty::Default));
         QCOMPARE(prop.isProperty(), true);
         QCOMPARE(prop.isDefault(), true);
         QCOMPARE(prop.isWritable(), false);
@@ -298,7 +291,7 @@ void tst_qmlmetaproperty::qmlmetaproperty_object()
         QCOMPARE(prop.isResettable(), false);
         QCOMPARE(prop.isValid(), true);
         QCOMPARE(prop.object(), &dobject);
-        QCOMPARE(prop.propertyCategory(), QmlMetaProperty::Normal);
+        QCOMPARE(prop.propertyCategory(), QDeclarativeMetaProperty::Normal);
         QCOMPARE(prop.propertyType(), (int)QVariant::Int);
         QCOMPARE(prop.propertyTypeName(), "int");
         QCOMPARE(QString(prop.property().name()), QString("defaultProperty"));
@@ -323,11 +316,11 @@ void tst_qmlmetaproperty::qmlmetaproperty_object_string()
     PropertyObject dobject; 
 
     {
-        QmlMetaProperty prop(&object, QString("defaultProperty"));
+        QDeclarativeMetaProperty prop(&object, QString("defaultProperty"));
 
-        QGuard<QmlBinding> binding(new QmlBinding(QLatin1String("null"), 0, engine.rootContext()));
+        QGuard<QDeclarativeBinding> binding(new QDeclarativeBinding(QLatin1String("null"), 0, engine.rootContext()));
         QVERIFY(binding != 0);
-        QGuard<QmlExpression> expression(new QmlExpression());
+        QGuard<QDeclarativeExpression> expression(new QDeclarativeExpression());
         QVERIFY(expression != 0);
 
         QObject *obj = new QObject;
@@ -344,7 +337,7 @@ void tst_qmlmetaproperty::qmlmetaproperty_object_string()
         QCOMPARE(prop.connectNotifier(obj, obj->metaObject()->indexOfMethod("deleteLater()")), false);
         QCOMPARE(prop.connectNotifier(obj, -1), false);
         QVERIFY(prop.method().signature() == 0);
-        QCOMPARE(prop.type(), QmlMetaProperty::Invalid);
+        QCOMPARE(prop.type(), QDeclarativeMetaProperty::Invalid);
         QCOMPARE(prop.isProperty(), false);
         QCOMPARE(prop.isDefault(), false);
         QCOMPARE(prop.isWritable(), false);
@@ -352,7 +345,7 @@ void tst_qmlmetaproperty::qmlmetaproperty_object_string()
         QCOMPARE(prop.isResettable(), false);
         QCOMPARE(prop.isValid(), false);
         QCOMPARE(prop.object(), (QObject *)0);
-        QCOMPARE(prop.propertyCategory(), QmlMetaProperty::InvalidProperty);
+        QCOMPARE(prop.propertyCategory(), QDeclarativeMetaProperty::InvalidProperty);
         QCOMPARE(prop.propertyType(), 0);
         QCOMPARE(prop.propertyTypeName(), (const char *)0);
         QVERIFY(prop.property().name() == 0);
@@ -369,12 +362,12 @@ void tst_qmlmetaproperty::qmlmetaproperty_object_string()
     }
 
     {
-        QmlMetaProperty prop(&dobject, QString("defaultProperty"));
+        QDeclarativeMetaProperty prop(&dobject, QString("defaultProperty"));
 
-        QGuard<QmlBinding> binding(new QmlBinding(QLatin1String("null"), 0, engine.rootContext()));
+        QGuard<QDeclarativeBinding> binding(new QDeclarativeBinding(QLatin1String("null"), 0, engine.rootContext()));
         binding->setTarget(prop);
         QVERIFY(binding != 0);
-        QGuard<QmlExpression> expression(new QmlExpression());
+        QGuard<QDeclarativeExpression> expression(new QDeclarativeExpression());
         QVERIFY(expression != 0);
 
         QObject *obj = new QObject;
@@ -391,7 +384,7 @@ void tst_qmlmetaproperty::qmlmetaproperty_object_string()
         QCOMPARE(prop.connectNotifier(obj, obj->metaObject()->indexOfMethod("deleteLater()")), false);
         QCOMPARE(prop.connectNotifier(obj, -1), false);
         QVERIFY(prop.method().signature() == 0);
-        QCOMPARE(prop.type(), QmlMetaProperty::Property);
+        QCOMPARE(prop.type(), QDeclarativeMetaProperty::Property);
         QCOMPARE(prop.isProperty(), true);
         QCOMPARE(prop.isDefault(), false);
         QCOMPARE(prop.isWritable(), false);
@@ -399,7 +392,7 @@ void tst_qmlmetaproperty::qmlmetaproperty_object_string()
         QCOMPARE(prop.isResettable(), false);
         QCOMPARE(prop.isValid(), true);
         QCOMPARE(prop.object(), &dobject);
-        QCOMPARE(prop.propertyCategory(), QmlMetaProperty::Normal);
+        QCOMPARE(prop.propertyCategory(), QDeclarativeMetaProperty::Normal);
         QCOMPARE(prop.propertyType(), (int)QVariant::Int);
         QCOMPARE(prop.propertyTypeName(), "int");
         QCOMPARE(QString(prop.property().name()), QString("defaultProperty"));
@@ -418,12 +411,12 @@ void tst_qmlmetaproperty::qmlmetaproperty_object_string()
     }
 
     {
-        QmlMetaProperty prop(&dobject, QString("onClicked"));
+        QDeclarativeMetaProperty prop(&dobject, QString("onClicked"));
 
-        QGuard<QmlBinding> binding(new QmlBinding(QLatin1String("null"), 0, engine.rootContext()));
+        QGuard<QDeclarativeBinding> binding(new QDeclarativeBinding(QLatin1String("null"), 0, engine.rootContext()));
         binding->setTarget(prop);
         QVERIFY(binding != 0);
-        QGuard<QmlExpression> expression(new QmlExpression());
+        QGuard<QDeclarativeExpression> expression(new QDeclarativeExpression());
         QVERIFY(expression != 0);
 
         QObject *obj = new QObject;
@@ -440,7 +433,7 @@ void tst_qmlmetaproperty::qmlmetaproperty_object_string()
         QCOMPARE(prop.connectNotifier(obj, obj->metaObject()->indexOfMethod("deleteLater()")), false);
         QCOMPARE(prop.connectNotifier(obj, -1), false);
         QCOMPARE(QString(prop.method().signature()), QString("clicked()"));
-        QCOMPARE(prop.type(), QmlMetaProperty::SignalProperty);
+        QCOMPARE(prop.type(), QDeclarativeMetaProperty::SignalProperty);
         QCOMPARE(prop.isProperty(), false);
         QCOMPARE(prop.isDefault(), false);
         QCOMPARE(prop.isWritable(), false);
@@ -448,7 +441,7 @@ void tst_qmlmetaproperty::qmlmetaproperty_object_string()
         QCOMPARE(prop.isResettable(), false);
         QCOMPARE(prop.isValid(), true);
         QCOMPARE(prop.object(), &dobject);
-        QCOMPARE(prop.propertyCategory(), QmlMetaProperty::InvalidProperty);
+        QCOMPARE(prop.propertyCategory(), QDeclarativeMetaProperty::InvalidProperty);
         QCOMPARE(prop.propertyType(), 0);
         QCOMPARE(prop.propertyTypeName(), (const char *)0);
         QCOMPARE(prop.property().name(), (const char *)0);
@@ -472,11 +465,11 @@ void tst_qmlmetaproperty::qmlmetaproperty_object_context()
     PropertyObject dobject; // Has default property
 
     {
-        QmlMetaProperty prop(&object, engine.rootContext());
+        QDeclarativeMetaProperty prop(&object, engine.rootContext());
 
-        QGuard<QmlBinding> binding(new QmlBinding(QLatin1String("null"), 0, engine.rootContext()));
+        QGuard<QDeclarativeBinding> binding(new QDeclarativeBinding(QLatin1String("null"), 0, engine.rootContext()));
         QVERIFY(binding != 0);
-        QGuard<QmlExpression> expression(new QmlExpression());
+        QGuard<QDeclarativeExpression> expression(new QDeclarativeExpression());
         QVERIFY(expression != 0);
 
         QObject *obj = new QObject;
@@ -493,7 +486,7 @@ void tst_qmlmetaproperty::qmlmetaproperty_object_context()
         QCOMPARE(prop.connectNotifier(obj, obj->metaObject()->indexOfMethod("deleteLater()")), false);
         QCOMPARE(prop.connectNotifier(obj, -1), false);
         QVERIFY(prop.method().signature() == 0);
-        QCOMPARE(prop.type(), QmlMetaProperty::Invalid);
+        QCOMPARE(prop.type(), QDeclarativeMetaProperty::Invalid);
         QCOMPARE(prop.isProperty(), false);
         QCOMPARE(prop.isDefault(), false);
         QCOMPARE(prop.isWritable(), false);
@@ -501,7 +494,7 @@ void tst_qmlmetaproperty::qmlmetaproperty_object_context()
         QCOMPARE(prop.isResettable(), false);
         QCOMPARE(prop.isValid(), false);
         QCOMPARE(prop.object(), (QObject *)0);
-        QCOMPARE(prop.propertyCategory(), QmlMetaProperty::InvalidProperty);
+        QCOMPARE(prop.propertyCategory(), QDeclarativeMetaProperty::InvalidProperty);
         QCOMPARE(prop.propertyType(), 0);
         QCOMPARE(prop.propertyTypeName(), (const char *)0);
         QVERIFY(prop.property().name() == 0);
@@ -518,12 +511,12 @@ void tst_qmlmetaproperty::qmlmetaproperty_object_context()
     }
 
     {
-        QmlMetaProperty prop(&dobject, engine.rootContext());
+        QDeclarativeMetaProperty prop(&dobject, engine.rootContext());
 
-        QGuard<QmlBinding> binding(new QmlBinding(QLatin1String("null"), 0, engine.rootContext()));
+        QGuard<QDeclarativeBinding> binding(new QDeclarativeBinding(QLatin1String("null"), 0, engine.rootContext()));
         binding->setTarget(prop);
         QVERIFY(binding != 0);
-        QGuard<QmlExpression> expression(new QmlExpression());
+        QGuard<QDeclarativeExpression> expression(new QDeclarativeExpression());
         QVERIFY(expression != 0);
 
         QObject *obj = new QObject;
@@ -540,7 +533,7 @@ void tst_qmlmetaproperty::qmlmetaproperty_object_context()
         QCOMPARE(prop.connectNotifier(obj, obj->metaObject()->indexOfMethod("deleteLater()")), false);
         QCOMPARE(prop.connectNotifier(obj, -1), false);
         QVERIFY(prop.method().signature() == 0);
-        QCOMPARE(prop.type(), (QmlMetaProperty::Type)(QmlMetaProperty::Property | QmlMetaProperty::Default));
+        QCOMPARE(prop.type(), (QDeclarativeMetaProperty::Type)(QDeclarativeMetaProperty::Property | QDeclarativeMetaProperty::Default));
         QCOMPARE(prop.isProperty(), true);
         QCOMPARE(prop.isDefault(), true);
         QCOMPARE(prop.isWritable(), false);
@@ -548,7 +541,7 @@ void tst_qmlmetaproperty::qmlmetaproperty_object_context()
         QCOMPARE(prop.isResettable(), false);
         QCOMPARE(prop.isValid(), true);
         QCOMPARE(prop.object(), &dobject);
-        QCOMPARE(prop.propertyCategory(), QmlMetaProperty::Normal);
+        QCOMPARE(prop.propertyCategory(), QDeclarativeMetaProperty::Normal);
         QCOMPARE(prop.propertyType(), (int)QVariant::Int);
         QCOMPARE(prop.propertyTypeName(), "int");
         QCOMPARE(QString(prop.property().name()), QString("defaultProperty"));
@@ -573,11 +566,11 @@ void tst_qmlmetaproperty::qmlmetaproperty_object_string_context()
     PropertyObject dobject; 
 
     {
-        QmlMetaProperty prop(&object, QString("defaultProperty"), engine.rootContext());
+        QDeclarativeMetaProperty prop(&object, QString("defaultProperty"), engine.rootContext());
 
-        QGuard<QmlBinding> binding(new QmlBinding(QLatin1String("null"), 0, engine.rootContext()));
+        QGuard<QDeclarativeBinding> binding(new QDeclarativeBinding(QLatin1String("null"), 0, engine.rootContext()));
         QVERIFY(binding != 0);
-        QGuard<QmlExpression> expression(new QmlExpression());
+        QGuard<QDeclarativeExpression> expression(new QDeclarativeExpression());
         QVERIFY(expression != 0);
 
         QObject *obj = new QObject;
@@ -594,7 +587,7 @@ void tst_qmlmetaproperty::qmlmetaproperty_object_string_context()
         QCOMPARE(prop.connectNotifier(obj, obj->metaObject()->indexOfMethod("deleteLater()")), false);
         QCOMPARE(prop.connectNotifier(obj, -1), false);
         QVERIFY(prop.method().signature() == 0);
-        QCOMPARE(prop.type(), QmlMetaProperty::Invalid);
+        QCOMPARE(prop.type(), QDeclarativeMetaProperty::Invalid);
         QCOMPARE(prop.isProperty(), false);
         QCOMPARE(prop.isDefault(), false);
         QCOMPARE(prop.isWritable(), false);
@@ -602,7 +595,7 @@ void tst_qmlmetaproperty::qmlmetaproperty_object_string_context()
         QCOMPARE(prop.isResettable(), false);
         QCOMPARE(prop.isValid(), false);
         QCOMPARE(prop.object(), (QObject *)0);
-        QCOMPARE(prop.propertyCategory(), QmlMetaProperty::InvalidProperty);
+        QCOMPARE(prop.propertyCategory(), QDeclarativeMetaProperty::InvalidProperty);
         QCOMPARE(prop.propertyType(), 0);
         QCOMPARE(prop.propertyTypeName(), (const char *)0);
         QVERIFY(prop.property().name() == 0);
@@ -619,12 +612,12 @@ void tst_qmlmetaproperty::qmlmetaproperty_object_string_context()
     }
 
     {
-        QmlMetaProperty prop(&dobject, QString("defaultProperty"), engine.rootContext());
+        QDeclarativeMetaProperty prop(&dobject, QString("defaultProperty"), engine.rootContext());
 
-        QGuard<QmlBinding> binding(new QmlBinding(QLatin1String("null"), 0, engine.rootContext()));
+        QGuard<QDeclarativeBinding> binding(new QDeclarativeBinding(QLatin1String("null"), 0, engine.rootContext()));
         binding->setTarget(prop);
         QVERIFY(binding != 0);
-        QGuard<QmlExpression> expression(new QmlExpression());
+        QGuard<QDeclarativeExpression> expression(new QDeclarativeExpression());
         QVERIFY(expression != 0);
 
         QObject *obj = new QObject;
@@ -641,7 +634,7 @@ void tst_qmlmetaproperty::qmlmetaproperty_object_string_context()
         QCOMPARE(prop.connectNotifier(obj, obj->metaObject()->indexOfMethod("deleteLater()")), false);
         QCOMPARE(prop.connectNotifier(obj, -1), false);
         QVERIFY(prop.method().signature() == 0);
-        QCOMPARE(prop.type(), QmlMetaProperty::Property);
+        QCOMPARE(prop.type(), QDeclarativeMetaProperty::Property);
         QCOMPARE(prop.isProperty(), true);
         QCOMPARE(prop.isDefault(), false);
         QCOMPARE(prop.isWritable(), false);
@@ -649,7 +642,7 @@ void tst_qmlmetaproperty::qmlmetaproperty_object_string_context()
         QCOMPARE(prop.isResettable(), false);
         QCOMPARE(prop.isValid(), true);
         QCOMPARE(prop.object(), &dobject);
-        QCOMPARE(prop.propertyCategory(), QmlMetaProperty::Normal);
+        QCOMPARE(prop.propertyCategory(), QDeclarativeMetaProperty::Normal);
         QCOMPARE(prop.propertyType(), (int)QVariant::Int);
         QCOMPARE(prop.propertyTypeName(), "int");
         QCOMPARE(QString(prop.property().name()), QString("defaultProperty"));
@@ -668,12 +661,12 @@ void tst_qmlmetaproperty::qmlmetaproperty_object_string_context()
     }
 
     {
-        QmlMetaProperty prop(&dobject, QString("onClicked"), engine.rootContext());
+        QDeclarativeMetaProperty prop(&dobject, QString("onClicked"), engine.rootContext());
 
-        QGuard<QmlBinding> binding(new QmlBinding(QLatin1String("null"), 0, engine.rootContext()));
+        QGuard<QDeclarativeBinding> binding(new QDeclarativeBinding(QLatin1String("null"), 0, engine.rootContext()));
         binding->setTarget(prop);
         QVERIFY(binding != 0);
-        QGuard<QmlExpression> expression(new QmlExpression());
+        QGuard<QDeclarativeExpression> expression(new QDeclarativeExpression());
         QVERIFY(expression != 0);
 
         QObject *obj = new QObject;
@@ -690,7 +683,7 @@ void tst_qmlmetaproperty::qmlmetaproperty_object_string_context()
         QCOMPARE(prop.connectNotifier(obj, obj->metaObject()->indexOfMethod("deleteLater()")), false);
         QCOMPARE(prop.connectNotifier(obj, -1), false);
         QCOMPARE(QString(prop.method().signature()), QString("clicked()"));
-        QCOMPARE(prop.type(), QmlMetaProperty::SignalProperty);
+        QCOMPARE(prop.type(), QDeclarativeMetaProperty::SignalProperty);
         QCOMPARE(prop.isProperty(), false);
         QCOMPARE(prop.isDefault(), false);
         QCOMPARE(prop.isWritable(), false);
@@ -698,7 +691,7 @@ void tst_qmlmetaproperty::qmlmetaproperty_object_string_context()
         QCOMPARE(prop.isResettable(), false);
         QCOMPARE(prop.isValid(), true);
         QCOMPARE(prop.object(), &dobject);
-        QCOMPARE(prop.propertyCategory(), QmlMetaProperty::InvalidProperty);
+        QCOMPARE(prop.propertyCategory(), QDeclarativeMetaProperty::InvalidProperty);
         QCOMPARE(prop.propertyType(), 0);
         QCOMPARE(prop.propertyTypeName(), (const char *)0);
         QCOMPARE(prop.property().name(), (const char *)0);
@@ -719,60 +712,60 @@ void tst_qmlmetaproperty::qmlmetaproperty_object_string_context()
 void tst_qmlmetaproperty::name()
 {
     { 
-        QmlMetaProperty p;
+        QDeclarativeMetaProperty p;
         QCOMPARE(p.name(), QString());
     }
 
     {
         PropertyObject o;
-        QmlMetaProperty p(&o);
+        QDeclarativeMetaProperty p(&o);
         QCOMPARE(p.name(), QString("defaultProperty"));
     }
 
     {
         QObject o;
-        QmlMetaProperty p(&o, QString("objectName"));
+        QDeclarativeMetaProperty p(&o, QString("objectName"));
         QCOMPARE(p.name(), QString("objectName"));
     }
 
     {
         PropertyObject o;
-        QmlMetaProperty p(&o, "onClicked");
+        QDeclarativeMetaProperty p(&o, "onClicked");
         QCOMPARE(p.name(), QString("onClicked"));
     }
 
     {
         QObject o;
-        QmlMetaProperty p(&o, "onClicked");
+        QDeclarativeMetaProperty p(&o, "onClicked");
         QCOMPARE(p.name(), QString());
     }
 
     {
         QObject o;
-        QmlMetaProperty p(&o, "foo");
+        QDeclarativeMetaProperty p(&o, "foo");
         QCOMPARE(p.name(), QString());
     }
 
     {
-        QmlMetaProperty p(0, "foo");
+        QDeclarativeMetaProperty p(0, "foo");
         QCOMPARE(p.name(), QString());
     }
 
     {
         PropertyObject o;
-        QmlMetaProperty p = QmlMetaProperty::createProperty(&o, "rectProperty");
+        QDeclarativeMetaProperty p = QDeclarativeMetaProperty::createProperty(&o, "rectProperty");
         QCOMPARE(p.name(), QString("rectProperty"));
     }
 
     {
         PropertyObject o;
-        QmlMetaProperty p = QmlMetaProperty::createProperty(&o, "rectProperty.x");
+        QDeclarativeMetaProperty p = QDeclarativeMetaProperty::createProperty(&o, "rectProperty.x");
         QCOMPARE(p.name(), QString("rectProperty.x"));
     }
 
     {
         PropertyObject o;
-        QmlMetaProperty p = QmlMetaProperty::createProperty(&o, "rectProperty.foo");
+        QDeclarativeMetaProperty p = QDeclarativeMetaProperty::createProperty(&o, "rectProperty.foo");
         QCOMPARE(p.name(), QString());
     }
 }
@@ -781,21 +774,21 @@ void tst_qmlmetaproperty::read()
 {
     // Invalid 
     {
-        QmlMetaProperty p;
+        QDeclarativeMetaProperty p;
         QCOMPARE(p.read(), QVariant());
     }
 
     // Default prop
     {
         PropertyObject o;
-        QmlMetaProperty p(&o);
+        QDeclarativeMetaProperty p(&o);
         QCOMPARE(p.read(), QVariant(10));
     }
 
     // Invalid default prop
     {
         QObject o;
-        QmlMetaProperty p(&o);
+        QDeclarativeMetaProperty p(&o);
         QCOMPARE(p.read(), QVariant());
     }
 
@@ -803,7 +796,7 @@ void tst_qmlmetaproperty::read()
     {
         QObject o;
 
-        QmlMetaProperty p(&o, "objectName");
+        QDeclarativeMetaProperty p(&o, "objectName");
         QCOMPARE(p.read(), QVariant(QString()));
 
         o.setObjectName("myName");
@@ -814,24 +807,24 @@ void tst_qmlmetaproperty::read()
     // Value-type prop
     {
         PropertyObject o;
-        QmlMetaProperty p = QmlMetaProperty::createProperty(&o, "rectProperty.x");
+        QDeclarativeMetaProperty p = QDeclarativeMetaProperty::createProperty(&o, "rectProperty.x");
         QCOMPARE(p.read(), QVariant(10));
     }
 
     // Invalid value-type prop
     {
         PropertyObject o;
-        QmlMetaProperty p = QmlMetaProperty::createProperty(&o, "rectProperty.foo");
+        QDeclarativeMetaProperty p = QDeclarativeMetaProperty::createProperty(&o, "rectProperty.foo");
         QCOMPARE(p.read(), QVariant());
     }
 
     // Signal property
     {
         PropertyObject o;
-        QmlMetaProperty p(&o, "onClicked");
+        QDeclarativeMetaProperty p(&o, "onClicked");
         QCOMPARE(p.read(), QVariant());
 
-        QVERIFY(0 == p.setSignalExpression(new QmlExpression()));
+        QVERIFY(0 == p.setSignalExpression(new QDeclarativeExpression()));
         QVERIFY(0 != p.signalExpression());
 
         QCOMPARE(p.read(), QVariant());
@@ -840,7 +833,7 @@ void tst_qmlmetaproperty::read()
     // Deleted object
     {
         PropertyObject *o = new PropertyObject;
-        QmlMetaProperty p = QmlMetaProperty::createProperty(o, "rectProperty.x");
+        QDeclarativeMetaProperty p = QDeclarativeMetaProperty::createProperty(o, "rectProperty.x");
         QCOMPARE(p.read(), QVariant(10));
         delete o;
         QCOMPARE(p.read(), QVariant());
@@ -848,32 +841,32 @@ void tst_qmlmetaproperty::read()
 
     // Attached property
     {
-        QmlComponent component(&engine);
+        QDeclarativeComponent component(&engine);
         component.setData("import Test 1.0\nMyContainer { }", QUrl());
         QObject *object = component.create();
         QVERIFY(object != 0);
 
-        QmlMetaProperty p = QmlMetaProperty::createProperty(object, "MyContainer.foo", qmlContext(object));
+        QDeclarativeMetaProperty p = QDeclarativeMetaProperty::createProperty(object, "MyContainer.foo", qmlContext(object));
         QCOMPARE(p.read(), QVariant(13));
         delete object;
     }
     {
-        QmlComponent component(&engine);
+        QDeclarativeComponent component(&engine);
         component.setData("import Test 1.0\nMyContainer { MyContainer.foo: 10 }", QUrl());
         QObject *object = component.create();
         QVERIFY(object != 0);
 
-        QmlMetaProperty p = QmlMetaProperty::createProperty(object, "MyContainer.foo", qmlContext(object));
+        QDeclarativeMetaProperty p = QDeclarativeMetaProperty::createProperty(object, "MyContainer.foo", qmlContext(object));
         QCOMPARE(p.read(), QVariant(10));
         delete object;
     }
     {
-        QmlComponent component(&engine);
+        QDeclarativeComponent component(&engine);
         component.setData("import Test 1.0 as Foo\nFoo.MyContainer { Foo.MyContainer.foo: 10 }", QUrl());
         QObject *object = component.create();
         QVERIFY(object != 0);
 
-        QmlMetaProperty p = QmlMetaProperty::createProperty(object, "Foo.MyContainer.foo", qmlContext(object));
+        QDeclarativeMetaProperty p = QDeclarativeMetaProperty::createProperty(object, "Foo.MyContainer.foo", qmlContext(object));
         QCOMPARE(p.read(), QVariant(10));
         delete object;
     }
@@ -883,35 +876,35 @@ void tst_qmlmetaproperty::write()
 {
     // Invalid
     {
-        QmlMetaProperty p;
+        QDeclarativeMetaProperty p;
         QCOMPARE(p.write(QVariant(10)), false);
     }
 
     // Read-only default prop
     {
         PropertyObject o;
-        QmlMetaProperty p(&o);
+        QDeclarativeMetaProperty p(&o);
         QCOMPARE(p.write(QVariant(10)), false);
     }
 
     // Invalid default prop
     {
         QObject o;
-        QmlMetaProperty p(&o);
+        QDeclarativeMetaProperty p(&o);
         QCOMPARE(p.write(QVariant(10)), false);
     }
 
     // Read-only prop by name
     {
         PropertyObject o;
-        QmlMetaProperty p(&o, QString("defaultProperty"));
+        QDeclarativeMetaProperty p(&o, QString("defaultProperty"));
         QCOMPARE(p.write(QVariant(10)), false);
     }
 
     // Writable prop by name
     {
         PropertyObject o;
-        QmlMetaProperty p(&o, QString("objectName"));
+        QDeclarativeMetaProperty p(&o, QString("objectName"));
         QCOMPARE(o.objectName(), QString());
         QCOMPARE(p.write(QVariant(QString("myName"))), true);
         QCOMPARE(o.objectName(), QString("myName"));
@@ -920,7 +913,7 @@ void tst_qmlmetaproperty::write()
     // Deleted object
     {
         PropertyObject *o = new PropertyObject;
-        QmlMetaProperty p(o, QString("objectName"));
+        QDeclarativeMetaProperty p(o, QString("objectName"));
         QCOMPARE(p.write(QVariant(QString("myName"))), true);
         QCOMPARE(o->objectName(), QString("myName"));
 
@@ -932,10 +925,10 @@ void tst_qmlmetaproperty::write()
     // Signal property
     {
         PropertyObject o;
-        QmlMetaProperty p(&o, "onClicked");
+        QDeclarativeMetaProperty p(&o, "onClicked");
         QCOMPARE(p.write(QVariant("console.log(1921)")), false);
 
-        QVERIFY(0 == p.setSignalExpression(new QmlExpression()));
+        QVERIFY(0 == p.setSignalExpression(new QDeclarativeExpression()));
         QVERIFY(0 != p.signalExpression());
 
         QCOMPARE(p.write(QVariant("console.log(1921)")), false);
@@ -946,13 +939,13 @@ void tst_qmlmetaproperty::write()
     // Value-type property
     {
         PropertyObject o;
-        QmlMetaProperty p(&o, "wrectProperty");
+        QDeclarativeMetaProperty p(&o, "wrectProperty");
 
         QCOMPARE(o.wrectProperty(), QRect());
         QCOMPARE(p.write(QRect(1, 13, 99, 8)), true);
         QCOMPARE(o.wrectProperty(), QRect(1, 13, 99, 8));
 
-        QmlMetaProperty p2 = QmlMetaProperty::createProperty(&o, "wrectProperty.x");
+        QDeclarativeMetaProperty p2 = QDeclarativeMetaProperty::createProperty(&o, "wrectProperty.x");
         QCOMPARE(p2.read(), QVariant(1));
         QCOMPARE(p2.write(QVariant(6)), true);
         QCOMPARE(p2.read(), QVariant(6));
@@ -962,12 +955,12 @@ void tst_qmlmetaproperty::write()
     // URL-property
     {
         PropertyObject o;
-        QmlMetaProperty p(&o, "url");
+        QDeclarativeMetaProperty p(&o, "url");
 
         QCOMPARE(p.write(QUrl("main.qml")), true);
         QCOMPARE(o.url(), QUrl("main.qml"));
 
-        QmlMetaProperty p2(&o, "url", engine.rootContext());
+        QDeclarativeMetaProperty p2(&o, "url", engine.rootContext());
 
         QUrl result = engine.baseUrl().resolved(QUrl("main.qml"));
         QVERIFY(result != QUrl("main.qml"));
@@ -978,23 +971,23 @@ void tst_qmlmetaproperty::write()
 
     // Attached property
     {
-        QmlComponent component(&engine);
+        QDeclarativeComponent component(&engine);
         component.setData("import Test 1.0\nMyContainer { }", QUrl());
         QObject *object = component.create();
         QVERIFY(object != 0);
 
-        QmlMetaProperty p = QmlMetaProperty::createProperty(object, "MyContainer.foo", qmlContext(object));
+        QDeclarativeMetaProperty p = QDeclarativeMetaProperty::createProperty(object, "MyContainer.foo", qmlContext(object));
         p.write(QVariant(99));
         QCOMPARE(p.read(), QVariant(99));
         delete object;
     }
     {
-        QmlComponent component(&engine);
+        QDeclarativeComponent component(&engine);
         component.setData("import Test 1.0 as Foo\nFoo.MyContainer { Foo.MyContainer.foo: 10 }", QUrl());
         QObject *object = component.create();
         QVERIFY(object != 0);
 
-        QmlMetaProperty p = QmlMetaProperty::createProperty(object, "Foo.MyContainer.foo", qmlContext(object));
+        QDeclarativeMetaProperty p = QDeclarativeMetaProperty::createProperty(object, "Foo.MyContainer.foo", qmlContext(object));
         p.write(QVariant(99));
         QCOMPARE(p.read(), QVariant(99));
         delete object;
@@ -1005,7 +998,7 @@ void tst_qmlmetaproperty::reset()
 {
     // Invalid
     {
-        QmlMetaProperty p;
+        QDeclarativeMetaProperty p;
         QCOMPARE(p.isResettable(), false);
         QCOMPARE(p.reset(), false);
     }
@@ -1013,7 +1006,7 @@ void tst_qmlmetaproperty::reset()
     // Read-only default prop
     {
         PropertyObject o;
-        QmlMetaProperty p(&o);
+        QDeclarativeMetaProperty p(&o);
         QCOMPARE(p.isResettable(), false);
         QCOMPARE(p.reset(), false);
     }
@@ -1021,7 +1014,7 @@ void tst_qmlmetaproperty::reset()
     // Invalid default prop
     {
         QObject o;
-        QmlMetaProperty p(&o);
+        QDeclarativeMetaProperty p(&o);
         QCOMPARE(p.isResettable(), false);
         QCOMPARE(p.reset(), false);
     }
@@ -1029,7 +1022,7 @@ void tst_qmlmetaproperty::reset()
     // Non-resettable-only prop by name
     {
         PropertyObject o;
-        QmlMetaProperty p(&o, QString("defaultProperty"));
+        QDeclarativeMetaProperty p(&o, QString("defaultProperty"));
         QCOMPARE(p.isResettable(), false);
         QCOMPARE(p.reset(), false);
     }
@@ -1037,7 +1030,7 @@ void tst_qmlmetaproperty::reset()
     // Resettable prop by name
     {
         PropertyObject o;
-        QmlMetaProperty p(&o, QString("resettableProperty"));
+        QDeclarativeMetaProperty p(&o, QString("resettableProperty"));
 
         QCOMPARE(p.read(), QVariant(9));
         QCOMPARE(p.write(QVariant(11)), true);
@@ -1053,7 +1046,7 @@ void tst_qmlmetaproperty::reset()
     {
         PropertyObject *o = new PropertyObject;
 
-        QmlMetaProperty p(o, QString("resettableProperty"));
+        QDeclarativeMetaProperty p(o, QString("resettableProperty"));
 
         QCOMPARE(p.isResettable(), true);
         QCOMPARE(p.reset(), true);
@@ -1067,7 +1060,7 @@ void tst_qmlmetaproperty::reset()
     // Signal property
     {
         PropertyObject o;
-        QmlMetaProperty p(&o, "onClicked");
+        QDeclarativeMetaProperty p(&o, "onClicked");
 
         QCOMPARE(p.isResettable(), false);
         QCOMPARE(p.reset(), false);
@@ -1076,15 +1069,15 @@ void tst_qmlmetaproperty::reset()
 
 void tst_qmlmetaproperty::writeObjectToList()
 {
-    QmlComponent containerComponent(&engine);
+    QDeclarativeComponent containerComponent(&engine);
     containerComponent.setData("import Test 1.0\nMyContainer { children: MyQmlObject {} }", QUrl());
     MyContainer *container = qobject_cast<MyContainer*>(containerComponent.create());
     QVERIFY(container != 0);
-    QmlListReference list(container, "children");
+    QDeclarativeListReference list(container, "children");
     QVERIFY(list.count() == 1);
 
     MyQmlObject *object = new MyQmlObject;
-    QmlMetaProperty prop(container, "children");
+    QDeclarativeMetaProperty prop(container, "children");
     prop.write(qVariantFromValue(object));
     QCOMPARE(list.count(), 1);
     QCOMPARE(list.at(0), object);
@@ -1093,16 +1086,16 @@ void tst_qmlmetaproperty::writeObjectToList()
 Q_DECLARE_METATYPE(QList<QObject *>);
 void tst_qmlmetaproperty::writeListToList()
 {
-    QmlComponent containerComponent(&engine);
+    QDeclarativeComponent containerComponent(&engine);
     containerComponent.setData("import Test 1.0\nMyContainer { children: MyQmlObject {} }", QUrl());
     MyContainer *container = qobject_cast<MyContainer*>(containerComponent.create());
     QVERIFY(container != 0);
-    QmlListReference list(container, "children");
+    QDeclarativeListReference list(container, "children");
     QVERIFY(list.count() == 1);
 
     QList<QObject*> objList;
     objList << new MyQmlObject() << new MyQmlObject() << new MyQmlObject() << new MyQmlObject();
-    QmlMetaProperty prop(container, "children");
+    QDeclarativeMetaProperty prop(container, "children");
     prop.write(qVariantFromValue(objList));
     QCOMPARE(list.count(), 4);
 
@@ -1115,14 +1108,14 @@ void tst_qmlmetaproperty::writeListToList()
 
 void tst_qmlmetaproperty::crashOnValueProperty()
 {
-    QmlEngine *engine = new QmlEngine;
-    QmlComponent component(engine);
+    QDeclarativeEngine *engine = new QDeclarativeEngine;
+    QDeclarativeComponent component(engine);
 
     component.setData("import Test 1.0\nPropertyObject { wrectProperty.x: 10 }", QUrl());
     PropertyObject *obj = qobject_cast<PropertyObject*>(component.create());
     QVERIFY(obj != 0);
 
-    QmlMetaProperty p = QmlMetaProperty::createProperty(obj, "wrectProperty.x", qmlContext(obj));
+    QDeclarativeMetaProperty p = QDeclarativeMetaProperty::createProperty(obj, "wrectProperty.x", qmlContext(obj));
     QCOMPARE(p.name(), QString("wrectProperty.x"));
 
     QCOMPARE(p.read(), QVariant(10));
@@ -1141,44 +1134,52 @@ void tst_qmlmetaproperty::copy()
 {
     PropertyObject object;
 
-    QmlMetaProperty *property = new QmlMetaProperty(&object, QLatin1String("defaultProperty"));
+    QDeclarativeMetaProperty *property = new QDeclarativeMetaProperty(&object, QLatin1String("defaultProperty"));
     QCOMPARE(property->name(), QString("defaultProperty"));
     QCOMPARE(property->read(), QVariant(10));
-    QCOMPARE(property->type(), QmlMetaProperty::Property);
-    QCOMPARE(property->propertyCategory(), QmlMetaProperty::Normal);
+    QCOMPARE(property->type(), QDeclarativeMetaProperty::Property);
+    QCOMPARE(property->propertyCategory(), QDeclarativeMetaProperty::Normal);
     QCOMPARE(property->propertyType(), (int)QVariant::Int);
 
-    QmlMetaProperty p1(*property);
+    QDeclarativeMetaProperty p1(*property);
     QCOMPARE(p1.name(), QString("defaultProperty"));
     QCOMPARE(p1.read(), QVariant(10));
-    QCOMPARE(p1.type(), QmlMetaProperty::Property);
-    QCOMPARE(p1.propertyCategory(), QmlMetaProperty::Normal);
+    QCOMPARE(p1.type(), QDeclarativeMetaProperty::Property);
+    QCOMPARE(p1.propertyCategory(), QDeclarativeMetaProperty::Normal);
     QCOMPARE(p1.propertyType(), (int)QVariant::Int);
 
-    QmlMetaProperty p2(&object, QLatin1String("url"));
+    QDeclarativeMetaProperty p2(&object, QLatin1String("url"));
     QCOMPARE(p2.name(), QString("url"));
     p2 = *property;
     QCOMPARE(p2.name(), QString("defaultProperty"));
     QCOMPARE(p2.read(), QVariant(10));
-    QCOMPARE(p2.type(), QmlMetaProperty::Property);
-    QCOMPARE(p2.propertyCategory(), QmlMetaProperty::Normal);
+    QCOMPARE(p2.type(), QDeclarativeMetaProperty::Property);
+    QCOMPARE(p2.propertyCategory(), QDeclarativeMetaProperty::Normal);
     QCOMPARE(p2.propertyType(), (int)QVariant::Int);
 
     delete property; property = 0;
 
     QCOMPARE(p1.name(), QString("defaultProperty"));
     QCOMPARE(p1.read(), QVariant(10));
-    QCOMPARE(p1.type(), QmlMetaProperty::Property);
-    QCOMPARE(p1.propertyCategory(), QmlMetaProperty::Normal);
+    QCOMPARE(p1.type(), QDeclarativeMetaProperty::Property);
+    QCOMPARE(p1.propertyCategory(), QDeclarativeMetaProperty::Normal);
     QCOMPARE(p1.propertyType(), (int)QVariant::Int);
 
     QCOMPARE(p2.name(), QString("defaultProperty"));
     QCOMPARE(p2.read(), QVariant(10));
-    QCOMPARE(p2.type(), QmlMetaProperty::Property);
-    QCOMPARE(p2.propertyCategory(), QmlMetaProperty::Normal);
+    QCOMPARE(p2.type(), QDeclarativeMetaProperty::Property);
+    QCOMPARE(p2.propertyCategory(), QDeclarativeMetaProperty::Normal);
     QCOMPARE(p2.propertyType(), (int)QVariant::Int);
 }
 
+void tst_qmlmetaproperty::initTestCase()
+{
+    QML_REGISTER_TYPE(Test,1,0,MyQmlObject,MyQmlObject);
+    QML_REGISTER_TYPE(Test,1,0,PropertyObject,PropertyObject);
+    QML_REGISTER_TYPE(Test,1,0,MyContainer,MyContainer);
+}
+
+
 QTEST_MAIN(tst_qmlmetaproperty)
 
-#include "tst_qmlmetaproperty.moc"
+#include "tst_qdeclarativemetaproperty.moc"
diff --git a/tests/auto/declarative/qdeclarativemetatype/qdeclarativemetatype.pro b/tests/auto/declarative/qdeclarativemetatype/qdeclarativemetatype.pro
new file mode 100644
index 0000000..2f7ff82
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativemetatype/qdeclarativemetatype.pro
@@ -0,0 +1,6 @@
+load(qttest_p4)
+contains(QT_CONFIG,declarative): QT += declarative
+SOURCES += tst_qdeclarativemetatype.cpp
+macx:CONFIG -= app_bundle
+
+DEFINES += SRCDIR=\\\"$$PWD\\\"
diff --git a/tests/auto/declarative/qmlmetatype/tst_qmlmetatype.cpp b/tests/auto/declarative/qdeclarativemetatype/tst_qdeclarativemetatype.cpp
index 027b607..e7372d3 100644
--- a/tests/auto/declarative/qmlmetatype/tst_qmlmetatype.cpp
+++ b/tests/auto/declarative/qdeclarativemetatype/tst_qdeclarativemetatype.cpp
@@ -40,7 +40,7 @@
 ****************************************************************************/
 
 #include <qtest.h>
-#include <QmlMetaType>
+#include <QDeclarativeMetaType>
 #include <QLocale>
 #include <QPixmap>
 #include <QBitmap>
@@ -51,7 +51,7 @@
 #include <QVector3D>
 #include <QVector4D>
 #include <QQuaternion>
-#include <qml.h>
+#include <qdeclarative.h>
 
 class tst_qmlmetatype : public QObject
 {
@@ -84,28 +84,28 @@ public:
 };
 QML_DECLARE_TYPE(TestType);
 
-class ParserStatusTestType : public QObject, public QmlParserStatus
+class ParserStatusTestType : public QObject, public QDeclarativeParserStatus
 {
     Q_OBJECT
     Q_CLASSINFO("DefaultProperty", "foo"); // Missing default property
 };
 QML_DECLARE_TYPE(ParserStatusTestType);
 
-class ValueSourceTestType : public QObject, public QmlPropertyValueSource
+class ValueSourceTestType : public QObject, public QDeclarativePropertyValueSource
 {
     Q_OBJECT
-    Q_INTERFACES(QmlPropertyValueSource)
+    Q_INTERFACES(QDeclarativePropertyValueSource)
 public:
-    virtual void setTarget(const QmlMetaProperty &) {}
+    virtual void setTarget(const QDeclarativeMetaProperty &) {}
 };
 QML_DECLARE_TYPE(ValueSourceTestType);
 
-class ValueInterceptorTestType : public QObject, public QmlPropertyValueInterceptor
+class ValueInterceptorTestType : public QObject, public QDeclarativePropertyValueInterceptor
 {
     Q_OBJECT
-    Q_INTERFACES(QmlPropertyValueInterceptor)
+    Q_INTERFACES(QDeclarativePropertyValueInterceptor)
 public:
-    virtual void setTarget(const QmlMetaProperty &) {}
+    virtual void setTarget(const QDeclarativeMetaProperty &) {}
     virtual void write(const QVariant &) {}
 };
 QML_DECLARE_TYPE(ValueInterceptorTestType);
@@ -114,18 +114,18 @@ QML_DECLARE_TYPE(ValueInterceptorTestType);
 #define COPY_TEST(cpptype, metatype, value, defaultvalue) \
 { \
     cpptype v = (value); cpptype v2 = (value); \
-    QVERIFY(QmlMetaType::copy(QMetaType:: metatype, &v, 0)); \
+    QVERIFY(QDeclarativeMetaType::copy(QMetaType:: metatype, &v, 0)); \
     QVERIFY(v == (defaultvalue)); \
-    QVERIFY(QmlMetaType::copy(QMetaType:: metatype, &v, &v2)); \
+    QVERIFY(QDeclarativeMetaType::copy(QMetaType:: metatype, &v, &v2)); \
     QVERIFY(v == (value)); \
 }
 
 #define QT_COPY_TEST(type, value) \
 { \
     type v = (value); type v2 = (value); \
-    QVERIFY(QmlMetaType::copy(QMetaType:: type, &v, 0)); \
+    QVERIFY(QDeclarativeMetaType::copy(QMetaType:: type, &v, 0)); \
     QVERIFY(v == (type ())); \
-    QVERIFY(QmlMetaType::copy(QMetaType:: type, &v, &v2)); \
+    QVERIFY(QDeclarativeMetaType::copy(QMetaType:: type, &v, &v2)); \
     QVERIFY(v == (value)); \
 }
 
@@ -139,7 +139,7 @@ void tst_qmlmetatype::initTestCase()
 
 void tst_qmlmetatype::copy()
 {
-    QVERIFY(QmlMetaType::copy(QMetaType::Void, 0, 0));
+    QVERIFY(QDeclarativeMetaType::copy(QMetaType::Void, 0, 0));
 
     COPY_TEST(bool, Bool, true, false);
     COPY_TEST(int, Int, 10, 0);
@@ -189,9 +189,9 @@ void tst_qmlmetatype::copy()
 
     {
         QPixmap v = QPixmap(100, 100); QPixmap v2 = QPixmap(100, 100);
-        QVERIFY(QmlMetaType::copy(QMetaType::QPixmap, &v, 0)); 
+        QVERIFY(QDeclarativeMetaType::copy(QMetaType::QPixmap, &v, 0)); 
         QVERIFY(v.size() == QPixmap().size());
-        QVERIFY(QmlMetaType::copy(QMetaType::QPixmap , &v, &v2)); 
+        QVERIFY(QDeclarativeMetaType::copy(QMetaType::QPixmap , &v, &v2)); 
         QVERIFY(v.size() == QPixmap(100,100).size());
     }
 
@@ -203,18 +203,18 @@ void tst_qmlmetatype::copy()
         QPixmap icon(100, 100);
 
         QIcon v = QIcon(icon); QIcon v2 = QIcon(icon);
-        QVERIFY(QmlMetaType::copy(QMetaType::QIcon, &v, 0)); 
+        QVERIFY(QDeclarativeMetaType::copy(QMetaType::QIcon, &v, 0)); 
         QVERIFY(v.isNull() == QIcon().isNull());
-        QVERIFY(QmlMetaType::copy(QMetaType::QIcon , &v, &v2)); 
+        QVERIFY(QDeclarativeMetaType::copy(QMetaType::QIcon , &v, &v2)); 
         QVERIFY(v.isNull() == QIcon(icon).isNull());
     }
 
     {
         QImage v = QImage(100, 100, QImage::Format_RGB32); 
         QImage v2 = QImage(100, 100, QImage::Format_RGB32);
-        QVERIFY(QmlMetaType::copy(QMetaType::QImage, &v, 0)); 
+        QVERIFY(QDeclarativeMetaType::copy(QMetaType::QImage, &v, 0)); 
         QVERIFY(v.size() == QImage().size());
-        QVERIFY(QmlMetaType::copy(QMetaType::QImage , &v, &v2)); 
+        QVERIFY(QDeclarativeMetaType::copy(QMetaType::QImage , &v, &v2)); 
         QVERIFY(v.size() == QImage(100,100, QImage::Format_RGB32).size());
     }
 
@@ -223,17 +223,17 @@ void tst_qmlmetatype::copy()
 
     {
         QBitmap v = QBitmap(100, 100); QBitmap v2 = QBitmap(100, 100);
-        QVERIFY(QmlMetaType::copy(QMetaType::QBitmap, &v, 0)); 
+        QVERIFY(QDeclarativeMetaType::copy(QMetaType::QBitmap, &v, 0)); 
         QVERIFY(v.size() == QBitmap().size());
-        QVERIFY(QmlMetaType::copy(QMetaType::QBitmap , &v, &v2)); 
+        QVERIFY(QDeclarativeMetaType::copy(QMetaType::QBitmap , &v, &v2)); 
         QVERIFY(v.size() == QBitmap(100,100).size());
     }
 
     {
         QCursor v = QCursor(Qt::SizeFDiagCursor); QCursor v2 = QCursor(Qt::SizeFDiagCursor);
-        QVERIFY(QmlMetaType::copy(QMetaType::QCursor, &v, 0)); 
+        QVERIFY(QDeclarativeMetaType::copy(QMetaType::QCursor, &v, 0)); 
         QVERIFY(v.shape() == QCursor().shape());
-        QVERIFY(QmlMetaType::copy(QMetaType::QCursor , &v, &v2)); 
+        QVERIFY(QDeclarativeMetaType::copy(QMetaType::QCursor , &v, &v2)); 
         QVERIFY(v.shape() == QCursor(Qt::SizeFDiagCursor).shape());
     }
 
@@ -269,9 +269,9 @@ void tst_qmlmetatype::copy()
     {
         QVariant tv = QVariant::fromValue(QVariant(10));
         QVariant v(tv); QVariant v2(tv);
-        QVERIFY(QmlMetaType::copy(qMetaTypeId<QVariant>(), &v, 0)); 
+        QVERIFY(QDeclarativeMetaType::copy(qMetaTypeId<QVariant>(), &v, 0)); 
         QVERIFY(v == QVariant());
-        QVERIFY(QmlMetaType::copy(qMetaTypeId<QVariant>(), &v, &v2)); 
+        QVERIFY(QDeclarativeMetaType::copy(qMetaTypeId<QVariant>(), &v, &v2)); 
         QVERIFY(v == tv);
     }
 
@@ -279,99 +279,99 @@ void tst_qmlmetatype::copy()
         TestType t;  QVariant tv = QVariant::fromValue(&t);
 
         QVariant v(tv); QVariant v2(tv);
-        QVERIFY(QmlMetaType::copy(qMetaTypeId<TestType *>(), &v, 0)); 
+        QVERIFY(QDeclarativeMetaType::copy(qMetaTypeId<TestType *>(), &v, 0)); 
         QVERIFY(v == QVariant::fromValue((TestType *)0));
-        QVERIFY(QmlMetaType::copy(qMetaTypeId<TestType *>(), &v, &v2)); 
+        QVERIFY(QDeclarativeMetaType::copy(qMetaTypeId<TestType *>(), &v, &v2)); 
         QVERIFY(v == tv);
     }
 }
 
 void tst_qmlmetatype::qmlParserStatusCast()
 {
-    QVERIFY(QmlMetaType::qmlType(QVariant::Int) == 0);
-    QVERIFY(QmlMetaType::qmlType(qMetaTypeId<TestType *>()) != 0);
-    QCOMPARE(QmlMetaType::qmlType(qMetaTypeId<TestType *>())->parserStatusCast(), -1);
-    QVERIFY(QmlMetaType::qmlType(qMetaTypeId<ValueSourceTestType *>()) != 0);
-    QCOMPARE(QmlMetaType::qmlType(qMetaTypeId<ValueSourceTestType *>())->parserStatusCast(), -1);
+    QVERIFY(QDeclarativeMetaType::qmlType(QVariant::Int) == 0);
+    QVERIFY(QDeclarativeMetaType::qmlType(qMetaTypeId<TestType *>()) != 0);
+    QCOMPARE(QDeclarativeMetaType::qmlType(qMetaTypeId<TestType *>())->parserStatusCast(), -1);
+    QVERIFY(QDeclarativeMetaType::qmlType(qMetaTypeId<ValueSourceTestType *>()) != 0);
+    QCOMPARE(QDeclarativeMetaType::qmlType(qMetaTypeId<ValueSourceTestType *>())->parserStatusCast(), -1);
             
-    QVERIFY(QmlMetaType::qmlType(qMetaTypeId<ParserStatusTestType *>()) != 0);
-    int cast = QmlMetaType::qmlType(qMetaTypeId<ParserStatusTestType *>())->parserStatusCast();
+    QVERIFY(QDeclarativeMetaType::qmlType(qMetaTypeId<ParserStatusTestType *>()) != 0);
+    int cast = QDeclarativeMetaType::qmlType(qMetaTypeId<ParserStatusTestType *>())->parserStatusCast();
     QVERIFY(cast != -1);
     QVERIFY(cast != 0);
 
     ParserStatusTestType t;
-    QVERIFY(reinterpret_cast<char *>((QObject *)&t) != reinterpret_cast<char *>((QmlParserStatus *)&t));
+    QVERIFY(reinterpret_cast<char *>((QObject *)&t) != reinterpret_cast<char *>((QDeclarativeParserStatus *)&t));
 
-    QmlParserStatus *status = reinterpret_cast<QmlParserStatus *>(reinterpret_cast<char *>((QObject *)&t) + cast);
+    QDeclarativeParserStatus *status = reinterpret_cast<QDeclarativeParserStatus *>(reinterpret_cast<char *>((QObject *)&t) + cast);
     QCOMPARE(status, &t);
 }
 
 void tst_qmlmetatype::qmlPropertyValueSourceCast()
 {
-    QVERIFY(QmlMetaType::qmlType(QVariant::Int) == 0);
-    QVERIFY(QmlMetaType::qmlType(qMetaTypeId<TestType *>()) != 0);
-    QCOMPARE(QmlMetaType::qmlType(qMetaTypeId<TestType *>())->propertyValueSourceCast(), -1);
-    QVERIFY(QmlMetaType::qmlType(qMetaTypeId<ParserStatusTestType *>()) != 0);
-    QCOMPARE(QmlMetaType::qmlType(qMetaTypeId<ParserStatusTestType *>())->propertyValueSourceCast(), -1);
+    QVERIFY(QDeclarativeMetaType::qmlType(QVariant::Int) == 0);
+    QVERIFY(QDeclarativeMetaType::qmlType(qMetaTypeId<TestType *>()) != 0);
+    QCOMPARE(QDeclarativeMetaType::qmlType(qMetaTypeId<TestType *>())->propertyValueSourceCast(), -1);
+    QVERIFY(QDeclarativeMetaType::qmlType(qMetaTypeId<ParserStatusTestType *>()) != 0);
+    QCOMPARE(QDeclarativeMetaType::qmlType(qMetaTypeId<ParserStatusTestType *>())->propertyValueSourceCast(), -1);
             
-    QVERIFY(QmlMetaType::qmlType(qMetaTypeId<ValueSourceTestType *>()) != 0);
-    int cast = QmlMetaType::qmlType(qMetaTypeId<ValueSourceTestType *>())->propertyValueSourceCast();
+    QVERIFY(QDeclarativeMetaType::qmlType(qMetaTypeId<ValueSourceTestType *>()) != 0);
+    int cast = QDeclarativeMetaType::qmlType(qMetaTypeId<ValueSourceTestType *>())->propertyValueSourceCast();
     QVERIFY(cast != -1);
     QVERIFY(cast != 0);
 
     ValueSourceTestType t;
-    QVERIFY(reinterpret_cast<char *>((QObject *)&t) != reinterpret_cast<char *>((QmlPropertyValueSource *)&t));
+    QVERIFY(reinterpret_cast<char *>((QObject *)&t) != reinterpret_cast<char *>((QDeclarativePropertyValueSource *)&t));
 
-    QmlPropertyValueSource *source = reinterpret_cast<QmlPropertyValueSource *>(reinterpret_cast<char *>((QObject *)&t) + cast);
+    QDeclarativePropertyValueSource *source = reinterpret_cast<QDeclarativePropertyValueSource *>(reinterpret_cast<char *>((QObject *)&t) + cast);
     QCOMPARE(source, &t);
 }
 
 void tst_qmlmetatype::qmlPropertyValueInterceptorCast()
 {
-    QVERIFY(QmlMetaType::qmlType(QVariant::Int) == 0);
-    QVERIFY(QmlMetaType::qmlType(qMetaTypeId<TestType *>()) != 0);
-    QCOMPARE(QmlMetaType::qmlType(qMetaTypeId<TestType *>())->propertyValueInterceptorCast(), -1);
-    QVERIFY(QmlMetaType::qmlType(qMetaTypeId<ParserStatusTestType *>()) != 0);
-    QCOMPARE(QmlMetaType::qmlType(qMetaTypeId<ParserStatusTestType *>())->propertyValueInterceptorCast(), -1);
+    QVERIFY(QDeclarativeMetaType::qmlType(QVariant::Int) == 0);
+    QVERIFY(QDeclarativeMetaType::qmlType(qMetaTypeId<TestType *>()) != 0);
+    QCOMPARE(QDeclarativeMetaType::qmlType(qMetaTypeId<TestType *>())->propertyValueInterceptorCast(), -1);
+    QVERIFY(QDeclarativeMetaType::qmlType(qMetaTypeId<ParserStatusTestType *>()) != 0);
+    QCOMPARE(QDeclarativeMetaType::qmlType(qMetaTypeId<ParserStatusTestType *>())->propertyValueInterceptorCast(), -1);
             
-    QVERIFY(QmlMetaType::qmlType(qMetaTypeId<ValueInterceptorTestType *>()) != 0);
-    int cast = QmlMetaType::qmlType(qMetaTypeId<ValueInterceptorTestType *>())->propertyValueInterceptorCast();
+    QVERIFY(QDeclarativeMetaType::qmlType(qMetaTypeId<ValueInterceptorTestType *>()) != 0);
+    int cast = QDeclarativeMetaType::qmlType(qMetaTypeId<ValueInterceptorTestType *>())->propertyValueInterceptorCast();
     QVERIFY(cast != -1);
     QVERIFY(cast != 0);
 
     ValueInterceptorTestType t;
-    QVERIFY(reinterpret_cast<char *>((QObject *)&t) != reinterpret_cast<char *>((QmlPropertyValueInterceptor *)&t));
+    QVERIFY(reinterpret_cast<char *>((QObject *)&t) != reinterpret_cast<char *>((QDeclarativePropertyValueInterceptor *)&t));
 
-    QmlPropertyValueInterceptor *interceptor = reinterpret_cast<QmlPropertyValueInterceptor *>(reinterpret_cast<char *>((QObject *)&t) + cast);
+    QDeclarativePropertyValueInterceptor *interceptor = reinterpret_cast<QDeclarativePropertyValueInterceptor *>(reinterpret_cast<char *>((QObject *)&t) + cast);
     QCOMPARE(interceptor, &t);
 }
 
 void tst_qmlmetatype::isList()
 {
-    QCOMPARE(QmlMetaType::isList(QVariant::Invalid), false);
-    QCOMPARE(QmlMetaType::isList(QVariant::Int), false);
+    QCOMPARE(QDeclarativeMetaType::isList(QVariant::Invalid), false);
+    QCOMPARE(QDeclarativeMetaType::isList(QVariant::Int), false);
 
-    QmlListProperty<TestType> list;
+    QDeclarativeListProperty<TestType> list;
 
-    QCOMPARE(QmlMetaType::isList(qMetaTypeId<QmlListProperty<TestType> >()), true);
+    QCOMPARE(QDeclarativeMetaType::isList(qMetaTypeId<QDeclarativeListProperty<TestType> >()), true);
 }
 
 void tst_qmlmetatype::defaultObject()
 {
-    QVERIFY(QmlMetaType::defaultProperty(&QObject::staticMetaObject).name() == 0);
-    QVERIFY(QmlMetaType::defaultProperty(&ParserStatusTestType::staticMetaObject).name() == 0);
-    QCOMPARE(QString(QmlMetaType::defaultProperty(&TestType::staticMetaObject).name()), QString("foo"));
+    QVERIFY(QDeclarativeMetaType::defaultProperty(&QObject::staticMetaObject).name() == 0);
+    QVERIFY(QDeclarativeMetaType::defaultProperty(&ParserStatusTestType::staticMetaObject).name() == 0);
+    QCOMPARE(QString(QDeclarativeMetaType::defaultProperty(&TestType::staticMetaObject).name()), QString("foo"));
 
     QObject o;
     TestType t;
     ParserStatusTestType p;
 
-    QVERIFY(QmlMetaType::defaultProperty((QObject *)0).name() == 0);
-    QVERIFY(QmlMetaType::defaultProperty(&o).name() == 0);
-    QVERIFY(QmlMetaType::defaultProperty(&p).name() == 0);
-    QCOMPARE(QString(QmlMetaType::defaultProperty(&t).name()), QString("foo"));
+    QVERIFY(QDeclarativeMetaType::defaultProperty((QObject *)0).name() == 0);
+    QVERIFY(QDeclarativeMetaType::defaultProperty(&o).name() == 0);
+    QVERIFY(QDeclarativeMetaType::defaultProperty(&p).name() == 0);
+    QCOMPARE(QString(QDeclarativeMetaType::defaultProperty(&t).name()), QString("foo"));
 }
 
 QTEST_MAIN(tst_qmlmetatype)
 
-#include "tst_qmlmetatype.moc"
+#include "tst_qdeclarativemetatype.moc"
diff --git a/tests/auto/declarative/qmlmoduleplugin/plugin.qml b/tests/auto/declarative/qdeclarativemoduleplugin/plugin.qml
index f29ae24..f29ae24 100644
--- a/tests/auto/declarative/qmlmoduleplugin/plugin.qml
+++ b/tests/auto/declarative/qdeclarativemoduleplugin/plugin.qml
diff --git a/tests/auto/declarative/qmlmoduleplugin/plugin/plugin.cpp b/tests/auto/declarative/qdeclarativemoduleplugin/plugin/plugin.cpp
index 8af9c0d..6433791 100644
--- a/tests/auto/declarative/qmlmoduleplugin/plugin/plugin.cpp
+++ b/tests/auto/declarative/qdeclarativemoduleplugin/plugin/plugin.cpp
@@ -38,8 +38,8 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include <QtDeclarative/qmlextensionplugin.h>
-#include <QtDeclarative/qml.h>
+#include <QtDeclarative/qdeclarativeextensionplugin.h>
+#include <QtDeclarative/qdeclarative.h>
 #include <QDebug>
 
 class MyPluginType : public QObject
@@ -63,7 +63,7 @@ private:
 QML_DECLARE_TYPE(MyPluginType);
 
 
-class MyPlugin : public QmlExtensionPlugin
+class MyPlugin : public QDeclarativeExtensionPlugin
 {
     Q_OBJECT
 public:
@@ -77,7 +77,7 @@ public:
         return QStringList() << QLatin1String("com.nokia.AutoTestQmlPluginType");
     }
 
-    void initialize(QmlEngine*, const char *uri)
+    void initialize(QDeclarativeEngine*, const char *uri)
     {
         Q_ASSERT(QLatin1String(uri) == "com.nokia.AutoTestQmlPluginType");
         QML_REGISTER_TYPE(com.nokia.AutoTestQmlPluginType,1,0,MyPluginType,MyPluginType);
diff --git a/tests/auto/declarative/qmlmoduleplugin/plugin/plugin.pro b/tests/auto/declarative/qdeclarativemoduleplugin/plugin/plugin.pro
index 0625ea3..348080d 100644
--- a/tests/auto/declarative/qmlmoduleplugin/plugin/plugin.pro
+++ b/tests/auto/declarative/qdeclarativemoduleplugin/plugin/plugin.pro
@@ -2,4 +2,4 @@ TEMPLATE = lib
 CONFIG += plugin
 SOURCES = plugin.cpp
 QT = core declarative
-DESTDIR = qmlmodules
+DESTDIR = qdeclarativemodules
diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/qdeclarativemoduleplugin.pro b/tests/auto/declarative/qdeclarativemoduleplugin/qdeclarativemoduleplugin.pro
new file mode 100644
index 0000000..96f4454
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativemoduleplugin/qdeclarativemoduleplugin.pro
@@ -0,0 +1,7 @@
+QT = core
+TEMPLATE = subdirs
+SUBDIRS = plugin
+tst_qdeclarativemoduleplugin_pro.depends += plugin
+SUBDIRS += tst_qdeclarativemoduleplugin.pro
+
+
diff --git a/tests/auto/declarative/qmlmoduleplugin/tst_qmlmoduleplugin.cpp b/tests/auto/declarative/qdeclarativemoduleplugin/tst_qdeclarativemoduleplugin.cpp
index 87125fc..64c7499 100644
--- a/tests/auto/declarative/qmlmoduleplugin/tst_qmlmoduleplugin.cpp
+++ b/tests/auto/declarative/qdeclarativemoduleplugin/tst_qdeclarativemoduleplugin.cpp
@@ -40,8 +40,8 @@
 ****************************************************************************/
 #include <qtest.h>
 #include <qdir.h>
-#include <QtDeclarative/qmlengine.h>
-#include <QtDeclarative/qmlcomponent.h>
+#include <QtDeclarative/qdeclarativeengine.h>
+#include <QtDeclarative/qdeclarativecomponent.h>
 #include <QDebug>
 
 class tst_qmlmoduleplugin : public QObject
@@ -70,10 +70,10 @@ private slots:
         file.close(); \
         QList<QByteArray> expected = data.split('\n'); \
         expected.removeAll(QByteArray("")); \
-        QList<QmlError> errors = component.errors(); \
+        QList<QDeclarativeError> errors = component.errors(); \
         QList<QByteArray> actual; \
         for (int ii = 0; ii < errors.count(); ++ii) { \
-            const QmlError &error = errors.at(ii); \
+            const QDeclarativeError &error = errors.at(ii); \
             QByteArray errorStr = QByteArray::number(error.line()) + ":" +  \
                                   QByteArray::number(error.column()) + ":" + \
                                   error.description().toUtf8(); \
@@ -81,7 +81,7 @@ private slots:
         } \
         if (qgetenv("DEBUG") != "" && expected != actual) \
             qWarning() << "Expected:" << expected << "Actual:" << actual;  \
-        if (qgetenv("QMLLANGUAGE_UPDATEERRORS") != "" && expected != actual) {\
+        if (qgetenv("QDECLARATIVELANGUAGE_UPDATEERRORS") != "" && expected != actual) {\
             QFile file(QLatin1String("data/") + QLatin1String(errorfile)); \
             QVERIFY(file.open(QIODevice::WriteOnly)); \
             for (int ii = 0; ii < actual.count(); ++ii) { \
@@ -102,10 +102,10 @@ inline QUrl TEST_FILE(const QString &filename)
 
 void tst_qmlmoduleplugin::importsPlugin()
 {
-    QmlEngine engine;
+    QDeclarativeEngine engine;
     QTest::ignoreMessage(QtWarningMsg, "plugin created");
     QTest::ignoreMessage(QtWarningMsg, "import worked");
-    QmlComponent component(&engine, TEST_FILE("plugin.qml"));
+    QDeclarativeComponent component(&engine, TEST_FILE("plugin.qml"));
     VERIFY_ERRORS(0);
     QObject *object = component.create();
     QVERIFY(object != 0);
@@ -114,4 +114,4 @@ void tst_qmlmoduleplugin::importsPlugin()
 
 QTEST_MAIN(tst_qmlmoduleplugin)
 
-#include "tst_qmlmoduleplugin.moc"
+#include "tst_qdeclarativemoduleplugin.moc"
diff --git a/tests/auto/declarative/qmlmoduleplugin/tst_qmlmoduleplugin.pro b/tests/auto/declarative/qdeclarativemoduleplugin/tst_qdeclarativemoduleplugin.pro
index 3c8a568..dd65511 100644
--- a/tests/auto/declarative/qmlmoduleplugin/tst_qmlmoduleplugin.pro
+++ b/tests/auto/declarative/qdeclarativemoduleplugin/tst_qdeclarativemoduleplugin.pro
@@ -1,4 +1,4 @@
 load(qttest_p4)
-SOURCES = tst_qmlmoduleplugin.cpp
+SOURCES = tst_qdeclarativemoduleplugin.cpp
 QT += declarative
 DEFINES += SRCDIR=\\\"$$PWD\\\"
diff --git a/tests/auto/declarative/qmlgraphicsmousearea/data/dragproperties.qml b/tests/auto/declarative/qdeclarativemousearea/data/dragproperties.qml
index 4cd78da..4cd78da 100644
--- a/tests/auto/declarative/qmlgraphicsmousearea/data/dragproperties.qml
+++ b/tests/auto/declarative/qdeclarativemousearea/data/dragproperties.qml
diff --git a/tests/auto/declarative/qmlgraphicstextedit/qmlgraphicstextedit.pro b/tests/auto/declarative/qdeclarativemousearea/qdeclarativemousearea.pro
index a129120..d01955b 100644
--- a/tests/auto/declarative/qmlgraphicstextedit/qmlgraphicstextedit.pro
+++ b/tests/auto/declarative/qdeclarativemousearea/qdeclarativemousearea.pro
@@ -2,8 +2,8 @@ load(qttest_p4)
 contains(QT_CONFIG,declarative): QT += declarative gui network
 macx:CONFIG -= app_bundle
 
-SOURCES += tst_qmlgraphicstextedit.cpp ../shared/testhttpserver.cpp
 HEADERS += ../shared/testhttpserver.h
+SOURCES += tst_qdeclarativemousearea.cpp ../shared/testhttpserver.cpp
 
 # Define SRCDIR equal to test's source directory
 DEFINES += SRCDIR=\\\"$$PWD\\\"
diff --git a/tests/auto/declarative/qmlgraphicsmousearea/tst_qmlgraphicsmousearea.cpp b/tests/auto/declarative/qdeclarativemousearea/tst_qdeclarativemousearea.cpp
index 22a12a9..42a1e69 100644
--- a/tests/auto/declarative/qmlgraphicsmousearea/tst_qmlgraphicsmousearea.cpp
+++ b/tests/auto/declarative/qdeclarativemousearea/tst_qdeclarativemousearea.cpp
@@ -41,8 +41,8 @@
 
 #include <QtTest/QtTest>
 #include <QtTest/QSignalSpy>
-#include <private/qmlgraphicsmousearea_p.h>
-#include <QtDeclarative/qmlview.h>
+#include <private/qdeclarativemousearea_p.h>
+#include <QtDeclarative/qdeclarativeview.h>
 
 class tst_QmlGraphicsMouseArea: public QObject
 {
@@ -50,26 +50,26 @@ class tst_QmlGraphicsMouseArea: public QObject
 private slots:
     void dragProperties();
 private:
-    QmlView *createView(const QString &filename);
+    QDeclarativeView *createView(const QString &filename);
 };
 
 void tst_QmlGraphicsMouseArea::dragProperties()
 {
-    QmlView *canvas = createView(SRCDIR "/data/dragproperties.qml");
+    QDeclarativeView *canvas = createView(SRCDIR "/data/dragproperties.qml");
     canvas->show();
     canvas->setFocus();
     QVERIFY(canvas->rootObject() != 0);
 
-    QmlGraphicsMouseArea *mouseRegion = canvas->rootObject()->findChild<QmlGraphicsMouseArea*>("mouseregion");
-    QmlGraphicsDrag *drag = mouseRegion->drag();
+    QDeclarativeMouseArea *mouseRegion = canvas->rootObject()->findChild<QDeclarativeMouseArea*>("mouseregion");
+    QDeclarativeDrag *drag = mouseRegion->drag();
     QVERIFY(mouseRegion != 0);
     QVERIFY(drag != 0);
 
     // target
-    QmlGraphicsItem *blackRect = canvas->rootObject()->findChild<QmlGraphicsItem*>("blackrect");
+    QDeclarativeItem *blackRect = canvas->rootObject()->findChild<QDeclarativeItem*>("blackrect");
     QVERIFY(blackRect != 0);
     QVERIFY(blackRect == drag->target());
-    QmlGraphicsItem *rootItem = qobject_cast<QmlGraphicsItem*>(canvas->rootObject());
+    QDeclarativeItem *rootItem = qobject_cast<QDeclarativeItem*>(canvas->rootObject());
     QVERIFY(rootItem != 0);
     QSignalSpy targetSpy(drag, SIGNAL(targetChanged()));
     drag->setTarget(rootItem);
@@ -78,12 +78,12 @@ void tst_QmlGraphicsMouseArea::dragProperties()
     QCOMPARE(targetSpy.count(),1);
 
     // axis
-    QCOMPARE(drag->axis(), QmlGraphicsDrag::XandYAxis);
+    QCOMPARE(drag->axis(), QDeclarativeDrag::XandYAxis);
     QSignalSpy axisSpy(drag, SIGNAL(axisChanged()));
-    drag->setAxis(QmlGraphicsDrag::XAxis);
-    QCOMPARE(drag->axis(), QmlGraphicsDrag::XAxis);
+    drag->setAxis(QDeclarativeDrag::XAxis);
+    QCOMPARE(drag->axis(), QDeclarativeDrag::XAxis);
     QCOMPARE(axisSpy.count(),1);
-    drag->setAxis(QmlGraphicsDrag::XAxis);
+    drag->setAxis(QDeclarativeDrag::XAxis);
     QCOMPARE(axisSpy.count(),1);
 
     // minimum and maximum properties
@@ -123,9 +123,9 @@ void tst_QmlGraphicsMouseArea::dragProperties()
     QCOMPARE(ymaxSpy.count(),1);
 }
 
-QmlView *tst_QmlGraphicsMouseArea::createView(const QString &filename)
+QDeclarativeView *tst_QmlGraphicsMouseArea::createView(const QString &filename)
 {
-    QmlView *canvas = new QmlView(0);
+    QDeclarativeView *canvas = new QDeclarativeView(0);
     canvas->setFixedSize(240,320);
 
     canvas->setSource(QUrl::fromLocalFile(filename));
@@ -135,4 +135,4 @@ QmlView *tst_QmlGraphicsMouseArea::createView(const QString &filename)
 
 QTEST_MAIN(tst_QmlGraphicsMouseArea)
 
-#include "tst_qmlgraphicsmousearea.moc"
+#include "tst_qdeclarativemousearea.moc"
diff --git a/tests/auto/declarative/qmlnumberformatter/qmlnumberformatter.pro b/tests/auto/declarative/qdeclarativenumberformatter/qdeclarativenumberformatter.pro
index 8113278..672e95c 100644
--- a/tests/auto/declarative/qmlnumberformatter/qmlnumberformatter.pro
+++ b/tests/auto/declarative/qdeclarativenumberformatter/qdeclarativenumberformatter.pro
@@ -2,4 +2,4 @@ load(qttest_p4)
 contains(QT_CONFIG,declarative): QT += declarative 
 macx:CONFIG -= app_bundle
 
-SOURCES += tst_qmlnumberformatter.cpp
+SOURCES += tst_qdeclarativenumberformatter.cpp
diff --git a/tests/auto/declarative/qmlnumberformatter/tst_qmlnumberformatter.cpp b/tests/auto/declarative/qdeclarativenumberformatter/tst_qdeclarativenumberformatter.cpp
index 30f2fea..77ad442 100644
--- a/tests/auto/declarative/qmlnumberformatter/tst_qmlnumberformatter.cpp
+++ b/tests/auto/declarative/qdeclarativenumberformatter/tst_qdeclarativenumberformatter.cpp
@@ -40,10 +40,10 @@
 ****************************************************************************/
 #include <qtest.h>
 #include <QDebug>
-#include <QtDeclarative/qmlengine.h>
-#include <QtDeclarative/qmlcomponent.h>
+#include <QtDeclarative/qdeclarativeengine.h>
+#include <QtDeclarative/qdeclarativecomponent.h>
 #include <private/qnumberformat_p.h>
-#include <private/qmlnumberformatter_p.h>
+#include <private/qdeclarativenumberformatter_p.h>
 
 class tst_qmlnumberformatter : public QObject
 {
@@ -202,13 +202,13 @@ void tst_qmlnumberformatter::text()
 
     QString componentStr = QString("import Qt 4.6\nNumberFormatter { number: ") + string + QString("; format: \"") + format + QString("\" }");
 
-    QmlEngine engine;
-    QmlComponent formatterComponent(&engine);
+    QDeclarativeEngine engine;
+    QDeclarativeComponent formatterComponent(&engine);
     formatterComponent.setData(componentStr.toUtf8(), QUrl::fromLocalFile(""));
     if(formatterComponent.isError())
         qDebug() << formatterComponent.errors();
     QVERIFY(formatterComponent.isReady());
-    QmlNumberFormatter *formatter = qobject_cast<QmlNumberFormatter*>(formatterComponent.create());
+    QDeclarativeNumberFormatter *formatter = qobject_cast<QDeclarativeNumberFormatter*>(formatterComponent.create());
     QVERIFY(formatter != 0);
 
     QCOMPARE(formatter->format(), format);
@@ -219,4 +219,4 @@ void tst_qmlnumberformatter::text()
 
 QTEST_MAIN(tst_qmlnumberformatter)
 
-#include "tst_qmlnumberformatter.moc"
+#include "tst_qdeclarativenumberformatter.moc"
diff --git a/tests/auto/declarative/qmlgraphicsparticles/data/particle.png b/tests/auto/declarative/qdeclarativeparticles/data/particle.png
index defbde5..defbde5 100644
--- a/tests/auto/declarative/qmlgraphicsparticles/data/particle.png
+++ b/tests/auto/declarative/qdeclarativeparticles/data/particle.png
diff --git a/tests/auto/declarative/qmlgraphicsparticles/data/particlemotion.qml b/tests/auto/declarative/qdeclarativeparticles/data/particlemotion.qml
index ace61fe..ace61fe 100644
--- a/tests/auto/declarative/qmlgraphicsparticles/data/particlemotion.qml
+++ b/tests/auto/declarative/qdeclarativeparticles/data/particlemotion.qml
diff --git a/tests/auto/declarative/qmlgraphicsparticles/data/particles.qml b/tests/auto/declarative/qdeclarativeparticles/data/particles.qml
index c58927e..c58927e 100644
--- a/tests/auto/declarative/qmlgraphicsparticles/data/particles.qml
+++ b/tests/auto/declarative/qdeclarativeparticles/data/particles.qml
diff --git a/tests/auto/declarative/qmleasefollow/qmleasefollow.pro b/tests/auto/declarative/qdeclarativeparticles/qdeclarativeparticles.pro
index 4224a7e..043bb85 100644
--- a/tests/auto/declarative/qmleasefollow/qmleasefollow.pro
+++ b/tests/auto/declarative/qdeclarativeparticles/qdeclarativeparticles.pro
@@ -2,7 +2,7 @@ load(qttest_p4)
 contains(QT_CONFIG,declarative): QT += declarative gui
 macx:CONFIG -= app_bundle
 
-SOURCES += tst_qmleasefollow.cpp
+SOURCES += tst_qdeclarativeparticles.cpp
 
 # Define SRCDIR equal to test's source directory
 DEFINES += SRCDIR=\\\"$$PWD\\\"
diff --git a/tests/auto/declarative/qmlgraphicsparticles/tst_qmlgraphicsparticles.cpp b/tests/auto/declarative/qdeclarativeparticles/tst_qdeclarativeparticles.cpp
index 9436772..328a480 100644
--- a/tests/auto/declarative/qmlgraphicsparticles/tst_qmlgraphicsparticles.cpp
+++ b/tests/auto/declarative/qdeclarativeparticles/tst_qdeclarativeparticles.cpp
@@ -40,8 +40,8 @@
 ****************************************************************************/
 #include <QtTest/QtTest>
 #include <QtTest/QSignalSpy>
-#include <qmlview.h>
-#include <private/qmlgraphicsparticles_p.h>
+#include <qdeclarativeview.h>
+#include <private/qdeclarativeparticles_p.h>
 
 class tst_QmlGraphicsParticles : public QObject
 {
@@ -55,7 +55,7 @@ private slots:
     void motionWander();
     void runs();
 private:
-    QmlView *createView(const QString &filename);
+    QDeclarativeView *createView(const QString &filename);
 
 };
 
@@ -65,9 +65,9 @@ tst_QmlGraphicsParticles::tst_QmlGraphicsParticles()
 
 void tst_QmlGraphicsParticles::properties()
 {
-    QmlView *canvas = createView(SRCDIR "/data/particles.qml");
+    QDeclarativeView *canvas = createView(SRCDIR "/data/particles.qml");
     QVERIFY(canvas->rootObject());
-    QmlGraphicsParticles* particles = canvas->rootObject()->findChild<QmlGraphicsParticles*>("particles");
+    QDeclarativeParticles* particles = canvas->rootObject()->findChild<QDeclarativeParticles*>("particles");
     QVERIFY(particles);
 
     particles->setSource(QUrl::fromLocalFile(SRCDIR "/data/particle.png"));
@@ -103,12 +103,12 @@ void tst_QmlGraphicsParticles::properties()
 
 void tst_QmlGraphicsParticles::motionGravity()
 {
-    QmlView *canvas = createView(SRCDIR "/data/particlemotion.qml");
+    QDeclarativeView *canvas = createView(SRCDIR "/data/particlemotion.qml");
     QVERIFY(canvas->rootObject());
-    QmlGraphicsParticles* particles = canvas->rootObject()->findChild<QmlGraphicsParticles*>("particles");
+    QDeclarativeParticles* particles = canvas->rootObject()->findChild<QDeclarativeParticles*>("particles");
     QVERIFY(particles);
 
-    QmlGraphicsParticleMotionGravity* motionGravity = canvas->rootObject()->findChild<QmlGraphicsParticleMotionGravity*>("motionGravity");
+    QDeclarativeParticleMotionGravity* motionGravity = canvas->rootObject()->findChild<QDeclarativeParticleMotionGravity*>("motionGravity");
     QCOMPARE(particles->motion(), motionGravity);
 
     QSignalSpy xattractorSpy(motionGravity, SIGNAL(xattractorChanged()));
@@ -142,13 +142,13 @@ void tst_QmlGraphicsParticles::motionGravity()
 
 void tst_QmlGraphicsParticles::motionWander()
 {
-    QmlView *canvas = createView(SRCDIR "/data/particlemotion.qml");
+    QDeclarativeView *canvas = createView(SRCDIR "/data/particlemotion.qml");
     QVERIFY(canvas->rootObject());
-    QmlGraphicsParticles* particles = canvas->rootObject()->findChild<QmlGraphicsParticles*>("particles");
+    QDeclarativeParticles* particles = canvas->rootObject()->findChild<QDeclarativeParticles*>("particles");
     QVERIFY(particles);
     
     QSignalSpy motionSpy(particles, SIGNAL(motionChanged()));
-    QmlGraphicsParticleMotionWander* motionWander = canvas->rootObject()->findChild<QmlGraphicsParticleMotionWander*>("motionWander");
+    QDeclarativeParticleMotionWander* motionWander = canvas->rootObject()->findChild<QDeclarativeParticleMotionWander*>("motionWander");
     
     particles->setMotion(motionWander);
     QCOMPARE(particles->motion(),motionWander);
@@ -188,16 +188,16 @@ void tst_QmlGraphicsParticles::motionWander()
 
 void tst_QmlGraphicsParticles::runs()
 {
-    QmlView *canvas = createView(SRCDIR "/data/particles.qml");
+    QDeclarativeView *canvas = createView(SRCDIR "/data/particles.qml");
     QVERIFY(canvas->rootObject());
-    QmlGraphicsParticles* particles = canvas->rootObject()->findChild<QmlGraphicsParticles*>("particles");
+    QDeclarativeParticles* particles = canvas->rootObject()->findChild<QDeclarativeParticles*>("particles");
     QVERIFY(particles);
     QTest::qWait(1000);//Run for one second. Test passes if it doesn't crash.
 }
 
-QmlView *tst_QmlGraphicsParticles::createView(const QString &filename)
+QDeclarativeView *tst_QmlGraphicsParticles::createView(const QString &filename)
 {
-    QmlView *canvas = new QmlView(0);
+    QDeclarativeView *canvas = new QDeclarativeView(0);
     canvas->setFixedSize(240,320);
 
     canvas->setSource(QUrl::fromLocalFile(filename));
@@ -206,4 +206,4 @@ QmlView *tst_QmlGraphicsParticles::createView(const QString &filename)
 }
 QTEST_MAIN(tst_QmlGraphicsParticles)
 
-#include "tst_qmlgraphicsparticles.moc"
+#include "tst_qdeclarativeparticles.moc"
diff --git a/tests/auto/declarative/qmlgraphicspathview/data/datamodel.qml b/tests/auto/declarative/qdeclarativepathview/data/datamodel.qml
index 8d07db2..8d07db2 100644
--- a/tests/auto/declarative/qmlgraphicspathview/data/datamodel.qml
+++ b/tests/auto/declarative/qdeclarativepathview/data/datamodel.qml
diff --git a/tests/auto/declarative/qmlgraphicspathview/data/path.qml b/tests/auto/declarative/qdeclarativepathview/data/path.qml
index 7e82a48..7e82a48 100644
--- a/tests/auto/declarative/qmlgraphicspathview/data/path.qml
+++ b/tests/auto/declarative/qdeclarativepathview/data/path.qml
diff --git a/tests/auto/declarative/qmlgraphicspathview/data/pathview.qml b/tests/auto/declarative/qdeclarativepathview/data/pathview.qml
index 8fa8d59..8fa8d59 100644
--- a/tests/auto/declarative/qmlgraphicspathview/data/pathview.qml
+++ b/tests/auto/declarative/qdeclarativepathview/data/pathview.qml
diff --git a/tests/auto/declarative/qmlgraphicspathview/data/pathview1.qml b/tests/auto/declarative/qdeclarativepathview/data/pathview1.qml
index b3b0a9a..b3b0a9a 100644
--- a/tests/auto/declarative/qmlgraphicspathview/data/pathview1.qml
+++ b/tests/auto/declarative/qdeclarativepathview/data/pathview1.qml
diff --git a/tests/auto/declarative/qmlgraphicspathview/data/pathview2.qml b/tests/auto/declarative/qdeclarativepathview/data/pathview2.qml
index 0d5c98b..0d5c98b 100644
--- a/tests/auto/declarative/qmlgraphicspathview/data/pathview2.qml
+++ b/tests/auto/declarative/qdeclarativepathview/data/pathview2.qml
diff --git a/tests/auto/declarative/qmlgraphicspathview/data/pathview3.qml b/tests/auto/declarative/qdeclarativepathview/data/pathview3.qml
index 412cca2..412cca2 100644
--- a/tests/auto/declarative/qmlgraphicspathview/data/pathview3.qml
+++ b/tests/auto/declarative/qdeclarativepathview/data/pathview3.qml
diff --git a/tests/auto/declarative/qmlgraphicsrepeater/qmlgraphicsrepeater.pro b/tests/auto/declarative/qdeclarativepathview/qdeclarativepathview.pro
index 0a10ec6..2f6ae32 100644
--- a/tests/auto/declarative/qmlgraphicsrepeater/qmlgraphicsrepeater.pro
+++ b/tests/auto/declarative/qdeclarativepathview/qdeclarativepathview.pro
@@ -2,7 +2,7 @@ load(qttest_p4)
 contains(QT_CONFIG,declarative): QT += declarative
 macx:CONFIG -= app_bundle
 
-SOURCES += tst_qmlgraphicsrepeater.cpp
+SOURCES += tst_qdeclarativepathview.cpp
 
 # Define SRCDIR equal to test's source directory
 DEFINES += SRCDIR=\\\"$$PWD\\\"
diff --git a/tests/auto/declarative/qmlgraphicspathview/tst_qmlgraphicspathview.cpp b/tests/auto/declarative/qdeclarativepathview/tst_qdeclarativepathview.cpp
index b57142e..6873757 100644
--- a/tests/auto/declarative/qmlgraphicspathview/tst_qmlgraphicspathview.cpp
+++ b/tests/auto/declarative/qdeclarativepathview/tst_qdeclarativepathview.cpp
@@ -38,19 +38,19 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include <private/qmlgraphicspathview_p.h>
-#include <private/qmlgraphicspath_p.h>
-#include <qmlcontext.h>
-#include <qmlexpression.h>
+#include <private/qdeclarativepathview_p.h>
+#include <private/qdeclarativepath_p.h>
+#include <qdeclarativecontext.h>
+#include <qdeclarativeexpression.h>
 #include <qtest.h>
-#include <QtDeclarative/qmlengine.h>
-#include <QtDeclarative/qmlcomponent.h>
-#include <QtDeclarative/qmlview.h>
-#include <QtDeclarative/private/qmlgraphicstext_p.h>
-#include <QtDeclarative/private/qmlgraphicsrectangle_p.h>
+#include <QtDeclarative/qdeclarativeengine.h>
+#include <QtDeclarative/qdeclarativecomponent.h>
+#include <QtDeclarative/qdeclarativeview.h>
+#include <QtDeclarative/private/qdeclarativetext_p.h>
+#include <QtDeclarative/private/qdeclarativerectangle_p.h>
 #include <QAbstractListModel>
 #include <QFile>
-#include <private/qmlvaluetype_p.h>
+#include <private/qdeclarativevaluetype_p.h>
 #include "../../../shared/util.h"
 
 class tst_QmlGraphicsPathView : public QObject
@@ -69,7 +69,7 @@ private slots:
     void pathMoved();
 
 private:
-    QmlView *createView();
+    QDeclarativeView *createView();
     template<typename T>
     T *findItem(QGraphicsObject *parent, const QString &objectName, int index=-1);
     template<typename T>
@@ -173,9 +173,9 @@ tst_QmlGraphicsPathView::tst_QmlGraphicsPathView()
 
 void tst_QmlGraphicsPathView::initValues()
 {
-    QmlEngine engine;
-    QmlComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/pathview1.qml"));
-    QmlGraphicsPathView *obj = qobject_cast<QmlGraphicsPathView*>(c.create());
+    QDeclarativeEngine engine;
+    QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/pathview1.qml"));
+    QDeclarativePathView *obj = qobject_cast<QDeclarativePathView*>(c.create());
 
     QVERIFY(obj != 0);
     QVERIFY(obj->path() == 0);
@@ -191,29 +191,29 @@ void tst_QmlGraphicsPathView::initValues()
 
 void tst_QmlGraphicsPathView::items()
 {
-    QmlView *canvas = createView();
+    QDeclarativeView *canvas = createView();
 
     TestModel model;
     model.addItem("Fred", "12345");
     model.addItem("John", "2345");
     model.addItem("Bob", "54321");
 
-    QmlContext *ctxt = canvas->rootContext();
+    QDeclarativeContext *ctxt = canvas->rootContext();
     ctxt->setContextProperty("testModel", &model);
 
     canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/pathview.qml"));
     qApp->processEvents();
 
-    QmlGraphicsPathView *pathview = findItem<QmlGraphicsPathView>(canvas->rootObject(), "view");
+    QDeclarativePathView *pathview = findItem<QDeclarativePathView>(canvas->rootObject(), "view");
     QVERIFY(pathview != 0);
 
     QCOMPARE(pathview->childItems().count(), model.count()); // assumes all are visible
 
     for (int i = 0; i < model.count(); ++i) {
-        QmlGraphicsText *name = findItem<QmlGraphicsText>(pathview, "textName", i);
+        QDeclarativeText *name = findItem<QDeclarativeText>(pathview, "textName", i);
         QVERIFY(name != 0);
         QCOMPARE(name->text(), model.name(i));
-        QmlGraphicsText *number = findItem<QmlGraphicsText>(pathview, "textNumber", i);
+        QDeclarativeText *number = findItem<QDeclarativeText>(pathview, "textNumber", i);
         QVERIFY(number != 0);
         QCOMPARE(number->text(), model.number(i));
     }
@@ -223,9 +223,9 @@ void tst_QmlGraphicsPathView::items()
 
 void tst_QmlGraphicsPathView::pathview2()
 {
-    QmlEngine engine;
-    QmlComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/pathview2.qml"));
-    QmlGraphicsPathView *obj = qobject_cast<QmlGraphicsPathView*>(c.create());
+    QDeclarativeEngine engine;
+    QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/pathview2.qml"));
+    QDeclarativePathView *obj = qobject_cast<QDeclarativePathView*>(c.create());
 
     QVERIFY(obj != 0);
     QVERIFY(obj->path() != 0);
@@ -241,9 +241,9 @@ void tst_QmlGraphicsPathView::pathview2()
 
 void tst_QmlGraphicsPathView::pathview3()
 {
-    QmlEngine engine;
-    QmlComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/pathview3.qml"));
-    QmlGraphicsPathView *obj = qobject_cast<QmlGraphicsPathView*>(c.create());
+    QDeclarativeEngine engine;
+    QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/pathview3.qml"));
+    QDeclarativePathView *obj = qobject_cast<QDeclarativePathView*>(c.create());
 
     QVERIFY(obj != 0);
     QVERIFY(obj->path() != 0);
@@ -259,40 +259,40 @@ void tst_QmlGraphicsPathView::pathview3()
 
 void tst_QmlGraphicsPathView::path()
 {
-    QmlEngine engine;
-    QmlComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/path.qml"));
-    QmlGraphicsPath *obj = qobject_cast<QmlGraphicsPath*>(c.create());
+    QDeclarativeEngine engine;
+    QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/path.qml"));
+    QDeclarativePath *obj = qobject_cast<QDeclarativePath*>(c.create());
 
     QVERIFY(obj != 0);
     QCOMPARE(obj->startX(), 120.);
     QCOMPARE(obj->startY(), 100.);
     QVERIFY(obj->path() != QPainterPath());
 
-    QmlListReference list(obj, "pathElements");
+    QDeclarativeListReference list(obj, "pathElements");
     QCOMPARE(list.count(), 5);
 
-    QmlGraphicsPathAttribute* attr = qobject_cast<QmlGraphicsPathAttribute*>(list.at(0));
+    QDeclarativePathAttribute* attr = qobject_cast<QDeclarativePathAttribute*>(list.at(0));
     QVERIFY(attr != 0);
     QCOMPARE(attr->name(), QString("scale"));
     QCOMPARE(attr->value(), 1.0);
 
-    QmlGraphicsPathQuad* quad = qobject_cast<QmlGraphicsPathQuad*>(list.at(1));
+    QDeclarativePathQuad* quad = qobject_cast<QDeclarativePathQuad*>(list.at(1));
     QVERIFY(quad != 0);
     QCOMPARE(quad->x(), 120.);
     QCOMPARE(quad->y(), 25.);
     QCOMPARE(quad->controlX(), 260.);
     QCOMPARE(quad->controlY(), 75.);
 
-    QmlGraphicsPathPercent* perc = qobject_cast<QmlGraphicsPathPercent*>(list.at(2));
+    QDeclarativePathPercent* perc = qobject_cast<QDeclarativePathPercent*>(list.at(2));
     QVERIFY(perc != 0);
     QCOMPARE(perc->value(), 0.3);
 
-    QmlGraphicsPathLine* line = qobject_cast<QmlGraphicsPathLine*>(list.at(3));
+    QDeclarativePathLine* line = qobject_cast<QDeclarativePathLine*>(list.at(3));
     QVERIFY(line != 0);
     QCOMPARE(line->x(), 120.);
     QCOMPARE(line->y(), 100.);
 
-    QmlGraphicsPathCubic* cubic = qobject_cast<QmlGraphicsPathCubic*>(list.at(4));
+    QDeclarativePathCubic* cubic = qobject_cast<QDeclarativePathCubic*>(list.at(4));
     QVERIFY(cubic != 0);
     QCOMPARE(cubic->x(), 180.);
     QCOMPARE(cubic->y(), 0.);
@@ -304,9 +304,9 @@ void tst_QmlGraphicsPathView::path()
 
 void tst_QmlGraphicsPathView::dataModel()
 {
-    QmlView *canvas = createView();
+    QDeclarativeView *canvas = createView();
 
-    QmlContext *ctxt = canvas->rootContext();
+    QDeclarativeContext *ctxt = canvas->rootContext();
     TestObject *testObject = new TestObject;
     ctxt->setContextProperty("testObject", testObject);
 
@@ -326,28 +326,28 @@ void tst_QmlGraphicsPathView::dataModel()
     canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/datamodel.qml"));
     qApp->processEvents();
 
-    QmlGraphicsPathView *pathview = qobject_cast<QmlGraphicsPathView*>(canvas->rootObject());
+    QDeclarativePathView *pathview = qobject_cast<QDeclarativePathView*>(canvas->rootObject());
     QVERIFY(pathview != 0);
 
     QMetaObject::invokeMethod(canvas->rootObject(), "checkProperties");
     QVERIFY(testObject->error() == false);
 
-    QmlGraphicsItem *item = findItem<QmlGraphicsItem>(pathview, "wrapper", 0);
+    QDeclarativeItem *item = findItem<QDeclarativeItem>(pathview, "wrapper", 0);
     QVERIFY(item);
     QCOMPARE(item->x(), 110.0);
     QCOMPARE(item->y(), 10.0);
 
     model.insertItem(4, "orange", "10");
 
-    int itemCount = findItems<QmlGraphicsItem>(pathview, "wrapper").count();
+    int itemCount = findItems<QDeclarativeItem>(pathview, "wrapper").count();
     QCOMPARE(itemCount, 10);
 
-    QmlGraphicsText *text = findItem<QmlGraphicsText>(pathview, "myText", 4);
+    QDeclarativeText *text = findItem<QDeclarativeText>(pathview, "myText", 4);
     QVERIFY(text);
     QCOMPARE(text->text(), model.name(4));
 
     model.removeItem(2);
-    text = findItem<QmlGraphicsText>(pathview, "myText", 2);
+    text = findItem<QDeclarativeText>(pathview, "myText", 2);
     QVERIFY(text);
     QCOMPARE(text->text(), model.name(2));
 
@@ -355,27 +355,27 @@ void tst_QmlGraphicsPathView::dataModel()
     QMetaObject::invokeMethod(canvas->rootObject(), "checkProperties");
     QVERIFY(testObject->error() == false);
 
-    itemCount = findItems<QmlGraphicsItem>(pathview, "wrapper").count();
+    itemCount = findItems<QDeclarativeItem>(pathview, "wrapper").count();
     QCOMPARE(itemCount, 5);
 
-    QmlGraphicsRectangle *testItem = findItem<QmlGraphicsRectangle>(pathview, "wrapper", 4);
+    QDeclarativeRectangle *testItem = findItem<QDeclarativeRectangle>(pathview, "wrapper", 4);
     QVERIFY(testItem != 0);
-    testItem = findItem<QmlGraphicsRectangle>(pathview, "wrapper", 5);
+    testItem = findItem<QDeclarativeRectangle>(pathview, "wrapper", 5);
     QVERIFY(testItem == 0);
 
     model.insertItem(2, "pink", "2");
 
-    itemCount = findItems<QmlGraphicsItem>(pathview, "wrapper").count();
+    itemCount = findItems<QDeclarativeItem>(pathview, "wrapper").count();
     QCOMPARE(itemCount, 5);
 
-    text = findItem<QmlGraphicsText>(pathview, "myText", 2);
+    text = findItem<QDeclarativeText>(pathview, "myText", 2);
     QVERIFY(text);
     QCOMPARE(text->text(), model.name(2));
 
     model.removeItem(3);
-    itemCount = findItems<QmlGraphicsItem>(pathview, "wrapper").count();
+    itemCount = findItems<QDeclarativeItem>(pathview, "wrapper").count();
     QCOMPARE(itemCount, 5);
-    text = findItem<QmlGraphicsText>(pathview, "myText", 3);
+    text = findItem<QDeclarativeText>(pathview, "myText", 3);
     QVERIFY(text);
     QCOMPARE(text->text(), model.name(3));
 
@@ -384,7 +384,7 @@ void tst_QmlGraphicsPathView::dataModel()
 
 void tst_QmlGraphicsPathView::pathMoved()
 {
-    QmlView *canvas = createView();
+    QDeclarativeView *canvas = createView();
 
     TestModel model;
     model.addItem("Ben", "12345");
@@ -392,18 +392,18 @@ void tst_QmlGraphicsPathView::pathMoved()
     model.addItem("Bob", "54321");
     model.addItem("Bill", "4321");
 
-    QmlContext *ctxt = canvas->rootContext();
+    QDeclarativeContext *ctxt = canvas->rootContext();
     ctxt->setContextProperty("testModel", &model);
 
     canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/pathview.qml"));
     qApp->processEvents();
 
-    QmlGraphicsPathView *pathview = findItem<QmlGraphicsPathView>(canvas->rootObject(), "view");
+    QDeclarativePathView *pathview = findItem<QDeclarativePathView>(canvas->rootObject(), "view");
     QVERIFY(pathview != 0);
 
-    QmlGraphicsRectangle *firstItem = findItem<QmlGraphicsRectangle>(pathview, "wrapper", 0);
+    QDeclarativeRectangle *firstItem = findItem<QDeclarativeRectangle>(pathview, "wrapper", 0);
     QVERIFY(firstItem);
-    QmlGraphicsPath *path = qobject_cast<QmlGraphicsPath*>(pathview->path());
+    QDeclarativePath *path = qobject_cast<QDeclarativePath*>(pathview->path());
     QVERIFY(path);
     QPointF start = path->pointAt(0.0);
     QPointF offset;//Center of item is at point, but pos is from corner
@@ -414,7 +414,7 @@ void tst_QmlGraphicsPathView::pathMoved()
     QTest::qWait(1000);//Moving is animated?
 
     for(int i=0; i<model.count(); i++){
-        QmlGraphicsRectangle *curItem = findItem<QmlGraphicsRectangle>(pathview, "wrapper", i);
+        QDeclarativeRectangle *curItem = findItem<QDeclarativeRectangle>(pathview, "wrapper", i);
         QCOMPARE(curItem->pos() + offset, path->pointAt(0.1 + i*0.25));
     }
 
@@ -425,9 +425,9 @@ void tst_QmlGraphicsPathView::pathMoved()
     delete canvas;
 }
 
-QmlView *tst_QmlGraphicsPathView::createView()
+QDeclarativeView *tst_QmlGraphicsPathView::createView()
 {
-    QmlView *canvas = new QmlView(0);
+    QDeclarativeView *canvas = new QDeclarativeView(0);
     canvas->setFixedSize(240,320);
 
     return canvas;
@@ -443,13 +443,13 @@ T *tst_QmlGraphicsPathView::findItem(QGraphicsObject *parent, const QString &obj
     const QMetaObject &mo = T::staticMetaObject;
     //qDebug() << parent->childItems().count() << "children";
     for (int i = 0; i < parent->childItems().count(); ++i) {
-        QmlGraphicsItem *item = qobject_cast<QmlGraphicsItem*>(parent->childItems().at(i));
+        QDeclarativeItem *item = qobject_cast<QDeclarativeItem*>(parent->childItems().at(i));
         if(!item)
             continue;
         //qDebug() << "try" << item;
         if (mo.cast(item) && (objectName.isEmpty() || item->objectName() == objectName)) {
             if (index != -1) {
-                QmlExpression e(qmlContext(item), "index", item);
+                QDeclarativeExpression e(qmlContext(item), "index", item);
                 if (e.value().toInt() == index)
                     return static_cast<T*>(item);
             } else {
@@ -471,7 +471,7 @@ QList<T*> tst_QmlGraphicsPathView::findItems(QGraphicsObject *parent, const QStr
     const QMetaObject &mo = T::staticMetaObject;
     //qDebug() << parent->QGraphicsObject::children().count() << "children";
     for (int i = 0; i < parent->childItems().count(); ++i) {
-        QmlGraphicsItem *item = qobject_cast<QmlGraphicsItem*>(parent->childItems().at(i));
+        QDeclarativeItem *item = qobject_cast<QDeclarativeItem*>(parent->childItems().at(i));
         if(!item)
             continue;
         //qDebug() << "try" << item;
@@ -485,4 +485,4 @@ QList<T*> tst_QmlGraphicsPathView::findItems(QGraphicsObject *parent, const QStr
 
 QTEST_MAIN(tst_QmlGraphicsPathView)
 
-#include "tst_qmlgraphicspathview.moc"
+#include "tst_qdeclarativepathview.moc"
diff --git a/tests/auto/declarative/qmlimageprovider/data/exists.png b/tests/auto/declarative/qdeclarativepixmapcache/data/exists.png
index 399bd0b..399bd0b 100644
--- a/tests/auto/declarative/qmlimageprovider/data/exists.png
+++ b/tests/auto/declarative/qdeclarativepixmapcache/data/exists.png
diff --git a/tests/auto/declarative/qmlimageprovider/data/exists1.png b/tests/auto/declarative/qdeclarativepixmapcache/data/exists1.png
index 399bd0b..399bd0b 100644
--- a/tests/auto/declarative/qmlimageprovider/data/exists1.png
+++ b/tests/auto/declarative/qdeclarativepixmapcache/data/exists1.png
diff --git a/tests/auto/declarative/qmlimageprovider/data/exists2.png b/tests/auto/declarative/qdeclarativepixmapcache/data/exists2.png
index 399bd0b..399bd0b 100644
--- a/tests/auto/declarative/qmlimageprovider/data/exists2.png
+++ b/tests/auto/declarative/qdeclarativepixmapcache/data/exists2.png
diff --git a/tests/auto/declarative/qmlpixmapcache/qmlpixmapcache.pro b/tests/auto/declarative/qdeclarativepixmapcache/qdeclarativepixmapcache.pro
index 423fa2f..899c43f 100644
--- a/tests/auto/declarative/qmlpixmapcache/qmlpixmapcache.pro
+++ b/tests/auto/declarative/qdeclarativepixmapcache/qdeclarativepixmapcache.pro
@@ -3,7 +3,7 @@ contains(QT_CONFIG,declarative): QT += declarative
 QT += network
 macx:CONFIG -= app_bundle
 
-SOURCES += tst_qmlpixmapcache.cpp
+SOURCES += tst_qdeclarativepixmapcache.cpp
 
 # QMAKE_CXXFLAGS = -fprofile-arcs -ftest-coverage
 # LIBS += -lgcov
diff --git a/tests/auto/declarative/qmlpixmapcache/tst_qmlpixmapcache.cpp b/tests/auto/declarative/qdeclarativepixmapcache/tst_qdeclarativepixmapcache.cpp
index 019fc2a..ccf41c6 100644
--- a/tests/auto/declarative/qmlpixmapcache/tst_qmlpixmapcache.cpp
+++ b/tests/auto/declarative/qdeclarativepixmapcache/tst_qdeclarativepixmapcache.cpp
@@ -40,8 +40,8 @@
 ****************************************************************************/
 #include <qtest.h>
 #include <QtTest/QtTest>
-#include <private/qmlpixmapcache_p.h>
-#include <QtDeclarative/qmlengine.h>
+#include <private/qdeclarativepixmapcache_p.h>
+#include <QtDeclarative/qdeclarativeengine.h>
 #include <QNetworkReply>
 
 // These don't let normal people run tests!
@@ -63,7 +63,7 @@ private slots:
     void parallel_data();
 
 private:
-    QmlEngine engine;
+    QDeclarativeEngine engine;
     QUrl thisfile;
 };
 
@@ -99,7 +99,7 @@ static const bool localfile_optimized = false;
 
 void tst_qmlpixmapcache::single_data()
 {
-    // Note, since QmlPixmapCache is shared, tests affect each other!
+    // Note, since QDeclarativePixmapCache is shared, tests affect each other!
     // so use different files fore all test functions.
 
     QTest::addColumn<QUrl>("target");
@@ -131,18 +131,18 @@ void tst_qmlpixmapcache::single()
 
     QPixmap pixmap;
     QVERIFY(pixmap.width() <= 0); // Check Qt assumption
-    QmlPixmapReply::Status status = QmlPixmapCache::get(target, &pixmap);
+    QDeclarativePixmapReply::Status status = QDeclarativePixmapCache::get(target, &pixmap);
 
     if (incache) {
         if (exists) {
-            QVERIFY(status == QmlPixmapReply::Ready);
+            QVERIFY(status == QDeclarativePixmapReply::Ready);
             QVERIFY(pixmap.width() > 0);
         } else {
-            QVERIFY(status == QmlPixmapReply::Error);
+            QVERIFY(status == QDeclarativePixmapReply::Error);
             QVERIFY(pixmap.width() <= 0);
         }
     } else {
-        QmlPixmapReply *reply = QmlPixmapCache::request(&engine, target);
+        QDeclarativePixmapReply *reply = QDeclarativePixmapCache::request(&engine, target);
         QVERIFY(reply);
         QVERIFY(pixmap.width() <= 0);
 
@@ -152,20 +152,20 @@ void tst_qmlpixmapcache::single()
         QVERIFY(!QTestEventLoop::instance().timeout());
         QVERIFY(getter.gotslot);
         if (exists) {
-            QVERIFY(QmlPixmapCache::get(target, &pixmap) == QmlPixmapReply::Ready);
+            QVERIFY(QDeclarativePixmapCache::get(target, &pixmap) == QDeclarativePixmapReply::Ready);
             QVERIFY(pixmap.width() > 0);
         } else {
-            QVERIFY(QmlPixmapCache::get(target, &pixmap) == QmlPixmapReply::Error);
+            QVERIFY(QDeclarativePixmapCache::get(target, &pixmap) == QDeclarativePixmapReply::Error);
             QVERIFY(pixmap.width() <= 0);
         }
     }
 
-    QCOMPARE(QmlPixmapCache::pendingRequests(), 0);
+    QCOMPARE(QDeclarativePixmapCache::pendingRequests(), 0);
 }
 
 void tst_qmlpixmapcache::parallel_data()
 {
-    // Note, since QmlPixmapCache is shared, tests affect each other!
+    // Note, since QDeclarativePixmapCache is shared, tests affect each other!
     // so use different files fore all test functions.
 
     QTest::addColumn<QUrl>("target1");
@@ -226,15 +226,15 @@ void tst_qmlpixmapcache::parallel()
     QList<QUrl> targets;
     targets << target1 << target2;
 
-    QList<QmlPixmapReply*> replies;
+    QList<QDeclarativePixmapReply*> replies;
     QList<Slotter*> getters;
     for (int i=0; i<targets.count(); ++i) {
         QUrl target = targets.at(i);
         QPixmap pixmap;
-        QmlPixmapReply::Status status = QmlPixmapCache::get(target, &pixmap);
-        QmlPixmapReply *reply = 0;
-        if (status != QmlPixmapReply::Error && status != QmlPixmapReply::Ready)
-            reply = QmlPixmapCache::request(&engine, target);
+        QDeclarativePixmapReply::Status status = QDeclarativePixmapCache::get(target, &pixmap);
+        QDeclarativePixmapReply *reply = 0;
+        if (status != QDeclarativePixmapReply::Error && status != QDeclarativePixmapReply::Ready)
+            reply = QDeclarativePixmapCache::request(&engine, target);
         replies.append(reply);
         if (!reply) {
             QVERIFY(pixmap.width() > 0);
@@ -247,10 +247,10 @@ void tst_qmlpixmapcache::parallel()
     }
 
     QCOMPARE(incache+slotters, targets.count());
-    QCOMPARE(QmlPixmapCache::pendingRequests(), requests);
+    QCOMPARE(QDeclarativePixmapCache::pendingRequests(), requests);
 
     if (cancel >= 0) {
-        QmlPixmapCache::cancel(targets.at(cancel), getters[cancel]);
+        QDeclarativePixmapCache::cancel(targets.at(cancel), getters[cancel]);
         slotters--;
     }
 
@@ -260,23 +260,23 @@ void tst_qmlpixmapcache::parallel()
     }
 
     for (int i=0; i<targets.count(); ++i) {
-        QmlPixmapReply *reply = replies[i];
+        QDeclarativePixmapReply *reply = replies[i];
         if (reply) {
             if (i == cancel) {
                 QVERIFY(!getters[i]->gotslot);
             } else {
                 QVERIFY(getters[i]->gotslot);
                 QPixmap pixmap;
-                QVERIFY(QmlPixmapCache::get(targets[i], &pixmap) == QmlPixmapReply::Ready);
+                QVERIFY(QDeclarativePixmapCache::get(targets[i], &pixmap) == QDeclarativePixmapReply::Ready);
                 QVERIFY(pixmap.width() > 0);
             }
             delete getters[i];
         }
     }
 
-    QCOMPARE(QmlPixmapCache::pendingRequests(), 0);
+    QCOMPARE(QDeclarativePixmapCache::pendingRequests(), 0);
 }
 
 QTEST_MAIN(tst_qmlpixmapcache)
 
-#include "tst_qmlpixmapcache.moc"
+#include "tst_qdeclarativepixmapcache.moc"
diff --git a/tests/auto/declarative/qmlgraphicspositioners/data/grid-animated.qml b/tests/auto/declarative/qdeclarativepositioners/data/grid-animated.qml
index f6376a1..f6376a1 100644
--- a/tests/auto/declarative/qmlgraphicspositioners/data/grid-animated.qml
+++ b/tests/auto/declarative/qdeclarativepositioners/data/grid-animated.qml
diff --git a/tests/auto/declarative/qmlgraphicspositioners/data/grid-spacing.qml b/tests/auto/declarative/qdeclarativepositioners/data/grid-spacing.qml
index 5b4a30d..5b4a30d 100644
--- a/tests/auto/declarative/qmlgraphicspositioners/data/grid-spacing.qml
+++ b/tests/auto/declarative/qdeclarativepositioners/data/grid-spacing.qml
diff --git a/tests/auto/declarative/qmlgraphicspositioners/data/grid.qml b/tests/auto/declarative/qdeclarativepositioners/data/grid.qml
index 830df6a..830df6a 100644
--- a/tests/auto/declarative/qmlgraphicspositioners/data/grid.qml
+++ b/tests/auto/declarative/qdeclarativepositioners/data/grid.qml
diff --git a/tests/auto/declarative/qmlgraphicspositioners/data/horizontal-animated.qml b/tests/auto/declarative/qdeclarativepositioners/data/horizontal-animated.qml
index c113a36..c113a36 100644
--- a/tests/auto/declarative/qmlgraphicspositioners/data/horizontal-animated.qml
+++ b/tests/auto/declarative/qdeclarativepositioners/data/horizontal-animated.qml
diff --git a/tests/auto/declarative/qmlgraphicspositioners/data/horizontal-spacing.qml b/tests/auto/declarative/qdeclarativepositioners/data/horizontal-spacing.qml
index 32bf775..32bf775 100644
--- a/tests/auto/declarative/qmlgraphicspositioners/data/horizontal-spacing.qml
+++ b/tests/auto/declarative/qdeclarativepositioners/data/horizontal-spacing.qml
diff --git a/tests/auto/declarative/qmlgraphicspositioners/data/horizontal.qml b/tests/auto/declarative/qdeclarativepositioners/data/horizontal.qml
index 06ae151..06ae151 100644
--- a/tests/auto/declarative/qmlgraphicspositioners/data/horizontal.qml
+++ b/tests/auto/declarative/qdeclarativepositioners/data/horizontal.qml
diff --git a/tests/auto/declarative/qmlgraphicspositioners/data/propertychanges.qml b/tests/auto/declarative/qdeclarativepositioners/data/propertychanges.qml
index 4370a18..4370a18 100644
--- a/tests/auto/declarative/qmlgraphicspositioners/data/propertychanges.qml
+++ b/tests/auto/declarative/qdeclarativepositioners/data/propertychanges.qml
diff --git a/tests/auto/declarative/qmlgraphicspositioners/data/repeater.qml b/tests/auto/declarative/qdeclarativepositioners/data/repeater.qml
index 2bc5e94..2bc5e94 100644
--- a/tests/auto/declarative/qmlgraphicspositioners/data/repeater.qml
+++ b/tests/auto/declarative/qdeclarativepositioners/data/repeater.qml
diff --git a/tests/auto/declarative/qmlgraphicspositioners/data/vertical-animated.qml b/tests/auto/declarative/qdeclarativepositioners/data/vertical-animated.qml
index 10f6cbb..10f6cbb 100644
--- a/tests/auto/declarative/qmlgraphicspositioners/data/vertical-animated.qml
+++ b/tests/auto/declarative/qdeclarativepositioners/data/vertical-animated.qml
diff --git a/tests/auto/declarative/qmlgraphicspositioners/data/vertical-spacing.qml b/tests/auto/declarative/qdeclarativepositioners/data/vertical-spacing.qml
index 69a8256..69a8256 100644
--- a/tests/auto/declarative/qmlgraphicspositioners/data/vertical-spacing.qml
+++ b/tests/auto/declarative/qdeclarativepositioners/data/vertical-spacing.qml
diff --git a/tests/auto/declarative/qmlgraphicspositioners/data/vertical.qml b/tests/auto/declarative/qdeclarativepositioners/data/vertical.qml
index 856c180..856c180 100644
--- a/tests/auto/declarative/qmlgraphicspositioners/data/vertical.qml
+++ b/tests/auto/declarative/qdeclarativepositioners/data/vertical.qml
diff --git a/tests/auto/declarative/qmlgraphicspositioners/qmlgraphicspositioners.pro b/tests/auto/declarative/qdeclarativepositioners/qdeclarativepositioners.pro
index d151026..5edfa55 100644
--- a/tests/auto/declarative/qmlgraphicspositioners/qmlgraphicspositioners.pro
+++ b/tests/auto/declarative/qdeclarativepositioners/qdeclarativepositioners.pro
@@ -1,6 +1,6 @@
 load(qttest_p4)
 contains(QT_CONFIG,declarative): QT += declarative
-SOURCES += tst_qmlgraphicspositioners.cpp
+SOURCES += tst_qdeclarativepositioners.cpp
 macx:CONFIG -= app_bundle
 
 # Define SRCDIR equal to test's source directory
diff --git a/tests/auto/declarative/qmlgraphicspositioners/tst_qmlgraphicspositioners.cpp b/tests/auto/declarative/qdeclarativepositioners/tst_qdeclarativepositioners.cpp
index 27db5fe..a8de83b 100644
--- a/tests/auto/declarative/qmlgraphicspositioners/tst_qmlgraphicspositioners.cpp
+++ b/tests/auto/declarative/qdeclarativepositioners/tst_qdeclarativepositioners.cpp
@@ -40,11 +40,11 @@
 ****************************************************************************/
 #include <QtTest/QtTest>
 #include <private/qlistmodelinterface_p.h>
-#include <qmlview.h>
-#include <private/qmlgraphicsrectangle_p.h>
-#include <private/qmlgraphicspositioners_p.h>
-#include <private/qmltransition_p.h>
-#include <qmlexpression.h>
+#include <qdeclarativeview.h>
+#include <private/qdeclarativerectangle_p.h>
+#include <private/qdeclarativepositioners_p.h>
+#include <private/qdeclarativetransition_p.h>
+#include <qdeclarativeexpression.h>
 #include "../../../shared/util.h"
 
 class tst_QmlGraphicsPositioners : public QObject
@@ -66,7 +66,7 @@ private slots:
     void test_propertychanges();
     void test_repeater();
 private:
-    QmlView *createView(const QString &filename);
+    QDeclarativeView *createView(const QString &filename);
 };
 
 tst_QmlGraphicsPositioners::tst_QmlGraphicsPositioners()
@@ -75,15 +75,15 @@ tst_QmlGraphicsPositioners::tst_QmlGraphicsPositioners()
 
 void tst_QmlGraphicsPositioners::test_horizontal()
 {
-    QmlView *canvas = createView(SRCDIR "/data/horizontal.qml");
+    QDeclarativeView *canvas = createView(SRCDIR "/data/horizontal.qml");
 
-    QmlGraphicsRectangle *one = canvas->rootObject()->findChild<QmlGraphicsRectangle*>("one");
+    QDeclarativeRectangle *one = canvas->rootObject()->findChild<QDeclarativeRectangle*>("one");
     QVERIFY(one != 0);
 
-    QmlGraphicsRectangle *two = canvas->rootObject()->findChild<QmlGraphicsRectangle*>("two");
+    QDeclarativeRectangle *two = canvas->rootObject()->findChild<QDeclarativeRectangle*>("two");
     QVERIFY(two != 0);
 
-    QmlGraphicsRectangle *three = canvas->rootObject()->findChild<QmlGraphicsRectangle*>("three");
+    QDeclarativeRectangle *three = canvas->rootObject()->findChild<QDeclarativeRectangle*>("three");
     QVERIFY(three != 0);
 
     QCOMPARE(one->x(), 0.0);
@@ -96,15 +96,15 @@ void tst_QmlGraphicsPositioners::test_horizontal()
 
 void tst_QmlGraphicsPositioners::test_horizontal_spacing()
 {
-    QmlView *canvas = createView(SRCDIR "/data/horizontal-spacing.qml");
+    QDeclarativeView *canvas = createView(SRCDIR "/data/horizontal-spacing.qml");
 
-    QmlGraphicsRectangle *one = canvas->rootObject()->findChild<QmlGraphicsRectangle*>("one");
+    QDeclarativeRectangle *one = canvas->rootObject()->findChild<QDeclarativeRectangle*>("one");
     QVERIFY(one != 0);
 
-    QmlGraphicsRectangle *two = canvas->rootObject()->findChild<QmlGraphicsRectangle*>("two");
+    QDeclarativeRectangle *two = canvas->rootObject()->findChild<QDeclarativeRectangle*>("two");
     QVERIFY(two != 0);
 
-    QmlGraphicsRectangle *three = canvas->rootObject()->findChild<QmlGraphicsRectangle*>("three");
+    QDeclarativeRectangle *three = canvas->rootObject()->findChild<QDeclarativeRectangle*>("three");
     QVERIFY(three != 0);
 
     QCOMPARE(one->x(), 0.0);
@@ -117,15 +117,15 @@ void tst_QmlGraphicsPositioners::test_horizontal_spacing()
 
 void tst_QmlGraphicsPositioners::test_horizontal_animated()
 {
-    QmlView *canvas = createView(SRCDIR "/data/horizontal-animated.qml");
+    QDeclarativeView *canvas = createView(SRCDIR "/data/horizontal-animated.qml");
 
-    QmlGraphicsRectangle *one = canvas->rootObject()->findChild<QmlGraphicsRectangle*>("one");
+    QDeclarativeRectangle *one = canvas->rootObject()->findChild<QDeclarativeRectangle*>("one");
     QVERIFY(one != 0);
 
-    QmlGraphicsRectangle *two = canvas->rootObject()->findChild<QmlGraphicsRectangle*>("two");
+    QDeclarativeRectangle *two = canvas->rootObject()->findChild<QDeclarativeRectangle*>("two");
     QVERIFY(two != 0);
 
-    QmlGraphicsRectangle *three = canvas->rootObject()->findChild<QmlGraphicsRectangle*>("three");
+    QDeclarativeRectangle *three = canvas->rootObject()->findChild<QDeclarativeRectangle*>("three");
     QVERIFY(three != 0);
 
     //Note that they animate in
@@ -157,15 +157,15 @@ void tst_QmlGraphicsPositioners::test_horizontal_animated()
 
 void tst_QmlGraphicsPositioners::test_vertical()
 {
-    QmlView *canvas = createView(SRCDIR "/data/vertical.qml");
+    QDeclarativeView *canvas = createView(SRCDIR "/data/vertical.qml");
 
-    QmlGraphicsRectangle *one = canvas->rootObject()->findChild<QmlGraphicsRectangle*>("one");
+    QDeclarativeRectangle *one = canvas->rootObject()->findChild<QDeclarativeRectangle*>("one");
     QVERIFY(one != 0);
 
-    QmlGraphicsRectangle *two = canvas->rootObject()->findChild<QmlGraphicsRectangle*>("two");
+    QDeclarativeRectangle *two = canvas->rootObject()->findChild<QDeclarativeRectangle*>("two");
     QVERIFY(two != 0);
 
-    QmlGraphicsRectangle *three = canvas->rootObject()->findChild<QmlGraphicsRectangle*>("three");
+    QDeclarativeRectangle *three = canvas->rootObject()->findChild<QDeclarativeRectangle*>("three");
     QVERIFY(three != 0);
 
     QCOMPARE(one->x(), 0.0);
@@ -178,15 +178,15 @@ void tst_QmlGraphicsPositioners::test_vertical()
 
 void tst_QmlGraphicsPositioners::test_vertical_spacing()
 {
-    QmlView *canvas = createView(SRCDIR "/data/vertical-spacing.qml");
+    QDeclarativeView *canvas = createView(SRCDIR "/data/vertical-spacing.qml");
 
-    QmlGraphicsRectangle *one = canvas->rootObject()->findChild<QmlGraphicsRectangle*>("one");
+    QDeclarativeRectangle *one = canvas->rootObject()->findChild<QDeclarativeRectangle*>("one");
     QVERIFY(one != 0);
 
-    QmlGraphicsRectangle *two = canvas->rootObject()->findChild<QmlGraphicsRectangle*>("two");
+    QDeclarativeRectangle *two = canvas->rootObject()->findChild<QDeclarativeRectangle*>("two");
     QVERIFY(two != 0);
 
-    QmlGraphicsRectangle *three = canvas->rootObject()->findChild<QmlGraphicsRectangle*>("three");
+    QDeclarativeRectangle *three = canvas->rootObject()->findChild<QDeclarativeRectangle*>("three");
     QVERIFY(three != 0);
 
     QCOMPARE(one->x(), 0.0);
@@ -199,18 +199,18 @@ void tst_QmlGraphicsPositioners::test_vertical_spacing()
 
 void tst_QmlGraphicsPositioners::test_vertical_animated()
 {
-    QmlView *canvas = createView(SRCDIR "/data/vertical-animated.qml");
+    QDeclarativeView *canvas = createView(SRCDIR "/data/vertical-animated.qml");
 
     //Note that they animate in
-    QmlGraphicsRectangle *one = canvas->rootObject()->findChild<QmlGraphicsRectangle*>("one");
+    QDeclarativeRectangle *one = canvas->rootObject()->findChild<QDeclarativeRectangle*>("one");
     QVERIFY(one != 0);
     QCOMPARE(one->y(), -100.0);
 
-    QmlGraphicsRectangle *two = canvas->rootObject()->findChild<QmlGraphicsRectangle*>("two");
+    QDeclarativeRectangle *two = canvas->rootObject()->findChild<QDeclarativeRectangle*>("two");
     QVERIFY(two != 0);
     QCOMPARE(two->y(), -100.0);
 
-    QmlGraphicsRectangle *three = canvas->rootObject()->findChild<QmlGraphicsRectangle*>("three");
+    QDeclarativeRectangle *three = canvas->rootObject()->findChild<QDeclarativeRectangle*>("three");
     QVERIFY(three != 0);
     QCOMPARE(three->y(), -100.0);
 
@@ -239,17 +239,17 @@ void tst_QmlGraphicsPositioners::test_vertical_animated()
 
 void tst_QmlGraphicsPositioners::test_grid()
 {
-    QmlView *canvas = createView(SRCDIR "/data/grid.qml");
+    QDeclarativeView *canvas = createView(SRCDIR "/data/grid.qml");
 
-    QmlGraphicsRectangle *one = canvas->rootObject()->findChild<QmlGraphicsRectangle*>("one");
+    QDeclarativeRectangle *one = canvas->rootObject()->findChild<QDeclarativeRectangle*>("one");
     QVERIFY(one != 0);
-    QmlGraphicsRectangle *two = canvas->rootObject()->findChild<QmlGraphicsRectangle*>("two");
+    QDeclarativeRectangle *two = canvas->rootObject()->findChild<QDeclarativeRectangle*>("two");
     QVERIFY(two != 0);
-    QmlGraphicsRectangle *three = canvas->rootObject()->findChild<QmlGraphicsRectangle*>("three");
+    QDeclarativeRectangle *three = canvas->rootObject()->findChild<QDeclarativeRectangle*>("three");
     QVERIFY(three != 0);
-    QmlGraphicsRectangle *four = canvas->rootObject()->findChild<QmlGraphicsRectangle*>("four");
+    QDeclarativeRectangle *four = canvas->rootObject()->findChild<QDeclarativeRectangle*>("four");
     QVERIFY(four != 0);
-    QmlGraphicsRectangle *five = canvas->rootObject()->findChild<QmlGraphicsRectangle*>("five");
+    QDeclarativeRectangle *five = canvas->rootObject()->findChild<QDeclarativeRectangle*>("five");
     QVERIFY(five != 0);
 
     QCOMPARE(one->x(), 0.0);
@@ -266,17 +266,17 @@ void tst_QmlGraphicsPositioners::test_grid()
 
 void tst_QmlGraphicsPositioners::test_grid_spacing()
 {
-    QmlView *canvas = createView(SRCDIR "/data/grid-spacing.qml");
+    QDeclarativeView *canvas = createView(SRCDIR "/data/grid-spacing.qml");
 
-    QmlGraphicsRectangle *one = canvas->rootObject()->findChild<QmlGraphicsRectangle*>("one");
+    QDeclarativeRectangle *one = canvas->rootObject()->findChild<QDeclarativeRectangle*>("one");
     QVERIFY(one != 0);
-    QmlGraphicsRectangle *two = canvas->rootObject()->findChild<QmlGraphicsRectangle*>("two");
+    QDeclarativeRectangle *two = canvas->rootObject()->findChild<QDeclarativeRectangle*>("two");
     QVERIFY(two != 0);
-    QmlGraphicsRectangle *three = canvas->rootObject()->findChild<QmlGraphicsRectangle*>("three");
+    QDeclarativeRectangle *three = canvas->rootObject()->findChild<QDeclarativeRectangle*>("three");
     QVERIFY(three != 0);
-    QmlGraphicsRectangle *four = canvas->rootObject()->findChild<QmlGraphicsRectangle*>("four");
+    QDeclarativeRectangle *four = canvas->rootObject()->findChild<QDeclarativeRectangle*>("four");
     QVERIFY(four != 0);
-    QmlGraphicsRectangle *five = canvas->rootObject()->findChild<QmlGraphicsRectangle*>("five");
+    QDeclarativeRectangle *five = canvas->rootObject()->findChild<QDeclarativeRectangle*>("five");
     QVERIFY(five != 0);
 
     QCOMPARE(one->x(), 0.0);
@@ -293,30 +293,30 @@ void tst_QmlGraphicsPositioners::test_grid_spacing()
 
 void tst_QmlGraphicsPositioners::test_grid_animated()
 {
-    QmlView *canvas = createView(SRCDIR "/data/grid-animated.qml");
+    QDeclarativeView *canvas = createView(SRCDIR "/data/grid-animated.qml");
 
     //Note that all animate in
-    QmlGraphicsRectangle *one = canvas->rootObject()->findChild<QmlGraphicsRectangle*>("one");
+    QDeclarativeRectangle *one = canvas->rootObject()->findChild<QDeclarativeRectangle*>("one");
     QVERIFY(one != 0);
     QCOMPARE(one->x(), -100.0);
     QCOMPARE(one->y(), -100.0);
 
-    QmlGraphicsRectangle *two = canvas->rootObject()->findChild<QmlGraphicsRectangle*>("two");
+    QDeclarativeRectangle *two = canvas->rootObject()->findChild<QDeclarativeRectangle*>("two");
     QVERIFY(two != 0);
     QCOMPARE(two->x(), -100.0);
     QCOMPARE(two->y(), -100.0);
 
-    QmlGraphicsRectangle *three = canvas->rootObject()->findChild<QmlGraphicsRectangle*>("three");
+    QDeclarativeRectangle *three = canvas->rootObject()->findChild<QDeclarativeRectangle*>("three");
     QVERIFY(three != 0);
     QCOMPARE(three->x(), -100.0);
     QCOMPARE(three->y(), -100.0);
 
-    QmlGraphicsRectangle *four = canvas->rootObject()->findChild<QmlGraphicsRectangle*>("four");
+    QDeclarativeRectangle *four = canvas->rootObject()->findChild<QDeclarativeRectangle*>("four");
     QVERIFY(four != 0);
     QCOMPARE(four->x(), -100.0);
     QCOMPARE(four->y(), -100.0);
 
-    QmlGraphicsRectangle *five = canvas->rootObject()->findChild<QmlGraphicsRectangle*>("five");
+    QDeclarativeRectangle *five = canvas->rootObject()->findChild<QDeclarativeRectangle*>("five");
     QVERIFY(five != 0);
     QCOMPARE(five->x(), -100.0);
     QCOMPARE(five->y(), -100.0);
@@ -365,11 +365,11 @@ void tst_QmlGraphicsPositioners::test_grid_animated()
 }
 void tst_QmlGraphicsPositioners::test_propertychanges()
 {
-    QmlView *canvas = createView("data/propertychanges.qml");
+    QDeclarativeView *canvas = createView("data/propertychanges.qml");
 
-    QmlGraphicsGrid *grid = qobject_cast<QmlGraphicsGrid*>(canvas->rootObject());
-    QmlTransition *rowTransition = canvas->rootObject()->findChild<QmlTransition*>("rowTransition");
-    QmlTransition *columnTransition = canvas->rootObject()->findChild<QmlTransition*>("columnTransition");
+    QDeclarativeGrid *grid = qobject_cast<QDeclarativeGrid*>(canvas->rootObject());
+    QDeclarativeTransition *rowTransition = canvas->rootObject()->findChild<QDeclarativeTransition*>("rowTransition");
+    QDeclarativeTransition *columnTransition = canvas->rootObject()->findChild<QDeclarativeTransition*>("columnTransition");
 
     QSignalSpy addSpy(grid, SIGNAL(addChanged()));
     QSignalSpy moveSpy(grid, SIGNAL(moveChanged()));
@@ -421,15 +421,15 @@ void tst_QmlGraphicsPositioners::test_propertychanges()
 
 void tst_QmlGraphicsPositioners::test_repeater()
 {
-    QmlView *canvas = createView(SRCDIR "/data/repeater.qml");
+    QDeclarativeView *canvas = createView(SRCDIR "/data/repeater.qml");
 
-    QmlGraphicsRectangle *one = canvas->rootObject()->findChild<QmlGraphicsRectangle*>("one");
+    QDeclarativeRectangle *one = canvas->rootObject()->findChild<QDeclarativeRectangle*>("one");
     QVERIFY(one != 0);
 
-    QmlGraphicsRectangle *two = canvas->rootObject()->findChild<QmlGraphicsRectangle*>("two");
+    QDeclarativeRectangle *two = canvas->rootObject()->findChild<QDeclarativeRectangle*>("two");
     QVERIFY(two != 0);
 
-    QmlGraphicsRectangle *three = canvas->rootObject()->findChild<QmlGraphicsRectangle*>("three");
+    QDeclarativeRectangle *three = canvas->rootObject()->findChild<QDeclarativeRectangle*>("three");
     QVERIFY(three != 0);
 
     QCOMPARE(one->x(), 0.0);
@@ -440,9 +440,9 @@ void tst_QmlGraphicsPositioners::test_repeater()
     QCOMPARE(three->y(), 0.0);
 }
 
-QmlView *tst_QmlGraphicsPositioners::createView(const QString &filename)
+QDeclarativeView *tst_QmlGraphicsPositioners::createView(const QString &filename)
 {
-    QmlView *canvas = new QmlView(0);
+    QDeclarativeView *canvas = new QDeclarativeView(0);
 
     canvas->setSource(QUrl::fromLocalFile(filename));
 
@@ -452,4 +452,4 @@ QmlView *tst_QmlGraphicsPositioners::createView(const QString &filename)
 
 QTEST_MAIN(tst_QmlGraphicsPositioners)
 
-#include "tst_qmlgraphicspositioners.moc"
+#include "tst_qdeclarativepositioners.moc"
diff --git a/tests/auto/declarative/qmldatetimeformatter/qmldatetimeformatter.pro b/tests/auto/declarative/qdeclarativepropertymap/qdeclarativepropertymap.pro
index 2b1947d..aeccf9b 100644
--- a/tests/auto/declarative/qmldatetimeformatter/qmldatetimeformatter.pro
+++ b/tests/auto/declarative/qdeclarativepropertymap/qdeclarativepropertymap.pro
@@ -2,4 +2,4 @@ load(qttest_p4)
 contains(QT_CONFIG,declarative): QT += declarative
 macx:CONFIG -= app_bundle
 
-SOURCES += tst_qmldatetimeformatter.cpp
+SOURCES += tst_qdeclarativepropertymap.cpp
diff --git a/tests/auto/declarative/qmlpropertymap/tst_qmlpropertymap.cpp b/tests/auto/declarative/qdeclarativepropertymap/tst_qdeclarativepropertymap.cpp
index 26b89a6..1a65bd9 100644
--- a/tests/auto/declarative/qmlpropertymap/tst_qmlpropertymap.cpp
+++ b/tests/auto/declarative/qdeclarativepropertymap/tst_qdeclarativepropertymap.cpp
@@ -39,11 +39,11 @@
 **
 ****************************************************************************/
 #include <qtest.h>
-#include <QtDeclarative/qmlengine.h>
-#include <QtDeclarative/qmlcontext.h>
-#include <QtDeclarative/qmlpropertymap.h>
-#include <QtDeclarative/qmlcomponent.h>
-#include <private/qmlgraphicstext_p.h>
+#include <QtDeclarative/qdeclarativeengine.h>
+#include <QtDeclarative/qdeclarativecontext.h>
+#include <QtDeclarative/qdeclarativepropertymap.h>
+#include <QtDeclarative/qdeclarativecomponent.h>
+#include <private/qdeclarativetext_p.h>
 #include <QSignalSpy>
 
 class tst_QmlPropertyMap : public QObject
@@ -63,7 +63,7 @@ private slots:
 
 void tst_QmlPropertyMap::insert()
 {
-    QmlPropertyMap map;
+    QDeclarativePropertyMap map;
     map.insert(QLatin1String("key1"),100);
     map.insert(QLatin1String("key2"),200);
     QVERIFY(map.keys().count() == 2);
@@ -78,7 +78,7 @@ void tst_QmlPropertyMap::insert()
 
 void tst_QmlPropertyMap::operatorInsert()
 {
-    QmlPropertyMap map;
+    QDeclarativePropertyMap map;
     map[QLatin1String("key1")] = 100;
     map[QLatin1String("key2")] = 200;
     QVERIFY(map.keys().count() == 2);
@@ -92,13 +92,13 @@ void tst_QmlPropertyMap::operatorInsert()
 
 void tst_QmlPropertyMap::operatorValue()
 {
-    QmlPropertyMap map;
+    QDeclarativePropertyMap map;
     map.insert(QLatin1String("key1"),100);
     map.insert(QLatin1String("key2"),200);
     QVERIFY(map.count() == 2);
     QVERIFY(map.contains(QLatin1String("key1")));
 
-    const QmlPropertyMap &constMap = map;
+    const QDeclarativePropertyMap &constMap = map;
 
     QCOMPARE(constMap.value(QLatin1String("key1")), QVariant(100));
     QCOMPARE(constMap.value(QLatin1String("key2")), QVariant(200));
@@ -108,7 +108,7 @@ void tst_QmlPropertyMap::operatorValue()
 
 void tst_QmlPropertyMap::clear()
 {
-    QmlPropertyMap map;
+    QDeclarativePropertyMap map;
     map.insert(QLatin1String("key1"),100);
     QVERIFY(map.keys().count() == 1);
 
@@ -122,7 +122,7 @@ void tst_QmlPropertyMap::clear()
 
 void tst_QmlPropertyMap::changed()
 {
-    QmlPropertyMap map;
+    QDeclarativePropertyMap map;
     QSignalSpy spy(&map, SIGNAL(valueChanged(const QString&)));
     map.insert(QLatin1String("key1"),100);
     map.insert(QLatin1String("key2"),200);
@@ -132,14 +132,14 @@ void tst_QmlPropertyMap::changed()
     QCOMPARE(spy.count(), 0);
 
     //make changes in QML
-    QmlEngine engine;
-    QmlContext *ctxt = engine.rootContext();
+    QDeclarativeEngine engine;
+    QDeclarativeContext *ctxt = engine.rootContext();
     ctxt->setContextProperty(QLatin1String("testdata"), &map);
-    QmlComponent component(&engine);
+    QDeclarativeComponent component(&engine);
     component.setData("import Qt 4.6\nText { text: { testdata.key1 = 'Hello World'; 'X' } }",
             QUrl::fromLocalFile(""));
     QVERIFY(component.isReady());
-    QmlGraphicsText *txt = qobject_cast<QmlGraphicsText*>(component.create());
+    QDeclarativeText *txt = qobject_cast<QDeclarativeText*>(component.create());
     QVERIFY(txt);
     QCOMPARE(txt->text(), QString('X'));
     QCOMPARE(spy.count(), 1);
@@ -150,7 +150,7 @@ void tst_QmlPropertyMap::changed()
 
 void tst_QmlPropertyMap::count()
 {
-    QmlPropertyMap map;
+    QDeclarativePropertyMap map;
     QCOMPARE(map.isEmpty(), true);
     map.insert(QLatin1String("key1"),100);
     map.insert(QLatin1String("key2"),200);
@@ -168,4 +168,4 @@ void tst_QmlPropertyMap::count()
 
 QTEST_MAIN(tst_QmlPropertyMap)
 
-#include "tst_qmlpropertymap.moc"
+#include "tst_qdeclarativepropertymap.moc"
diff --git a/tests/auto/declarative/qmlqt/data/closestangle.qml b/tests/auto/declarative/qdeclarativeqt/data/closestangle.qml
index b5f7fc6..b5f7fc6 100644
--- a/tests/auto/declarative/qmlqt/data/closestangle.qml
+++ b/tests/auto/declarative/qdeclarativeqt/data/closestangle.qml
diff --git a/tests/auto/declarative/qmlqt/data/consoleLog.qml b/tests/auto/declarative/qdeclarativeqt/data/consoleLog.qml
index e657ff1..e657ff1 100644
--- a/tests/auto/declarative/qmlqt/data/consoleLog.qml
+++ b/tests/auto/declarative/qdeclarativeqt/data/consoleLog.qml
diff --git a/tests/auto/declarative/qmlqt/data/createComponent.qml b/tests/auto/declarative/qdeclarativeqt/data/createComponent.qml
index d9b70ec..d9b70ec 100644
--- a/tests/auto/declarative/qmlqt/data/createComponent.qml
+++ b/tests/auto/declarative/qdeclarativeqt/data/createComponent.qml
diff --git a/tests/auto/declarative/qmlqt/data/createComponentData.qml b/tests/auto/declarative/qdeclarativeqt/data/createComponentData.qml
index a5e99a0..a5e99a0 100644
--- a/tests/auto/declarative/qmlqt/data/createComponentData.qml
+++ b/tests/auto/declarative/qdeclarativeqt/data/createComponentData.qml
diff --git a/tests/auto/declarative/qmlqt/data/createQmlObject.qml b/tests/auto/declarative/qdeclarativeqt/data/createQmlObject.qml
index 9150782..9150782 100644
--- a/tests/auto/declarative/qmlqt/data/createQmlObject.qml
+++ b/tests/auto/declarative/qdeclarativeqt/data/createQmlObject.qml
diff --git a/tests/auto/declarative/qmlqt/data/darker.qml b/tests/auto/declarative/qdeclarativeqt/data/darker.qml
index 2df067e..2df067e 100644
--- a/tests/auto/declarative/qmlqt/data/darker.qml
+++ b/tests/auto/declarative/qdeclarativeqt/data/darker.qml
diff --git a/tests/auto/declarative/qmlqt/data/enums.qml b/tests/auto/declarative/qdeclarativeqt/data/enums.qml
index 1efa6f5..1efa6f5 100644
--- a/tests/auto/declarative/qmlqt/data/enums.qml
+++ b/tests/auto/declarative/qdeclarativeqt/data/enums.qml
diff --git a/tests/auto/declarative/qmlqt/data/hsla.qml b/tests/auto/declarative/qdeclarativeqt/data/hsla.qml
index df51ccd..df51ccd 100644
--- a/tests/auto/declarative/qmlqt/data/hsla.qml
+++ b/tests/auto/declarative/qdeclarativeqt/data/hsla.qml
diff --git a/tests/auto/declarative/qmlqt/data/lighter.qml b/tests/auto/declarative/qdeclarativeqt/data/lighter.qml
index 4e0c431..4e0c431 100644
--- a/tests/auto/declarative/qmlqt/data/lighter.qml
+++ b/tests/auto/declarative/qdeclarativeqt/data/lighter.qml
diff --git a/tests/auto/declarative/qmlqt/data/md5.qml b/tests/auto/declarative/qdeclarativeqt/data/md5.qml
index c474b71..c474b71 100644
--- a/tests/auto/declarative/qmlqt/data/md5.qml
+++ b/tests/auto/declarative/qdeclarativeqt/data/md5.qml
diff --git a/tests/auto/declarative/qmlqt/data/point.qml b/tests/auto/declarative/qdeclarativeqt/data/point.qml
index c383beb..c383beb 100644
--- a/tests/auto/declarative/qmlqt/data/point.qml
+++ b/tests/auto/declarative/qdeclarativeqt/data/point.qml
diff --git a/tests/auto/declarative/qmlqt/data/rect.qml b/tests/auto/declarative/qdeclarativeqt/data/rect.qml
index 82b6428..82b6428 100644
--- a/tests/auto/declarative/qmlqt/data/rect.qml
+++ b/tests/auto/declarative/qdeclarativeqt/data/rect.qml
diff --git a/tests/auto/declarative/qmlqt/data/rgba.qml b/tests/auto/declarative/qdeclarativeqt/data/rgba.qml
index 6dd6565..6dd6565 100644
--- a/tests/auto/declarative/qmlqt/data/rgba.qml
+++ b/tests/auto/declarative/qdeclarativeqt/data/rgba.qml
diff --git a/tests/auto/declarative/qmlqt/data/size.qml b/tests/auto/declarative/qdeclarativeqt/data/size.qml
index 05b0317..05b0317 100644
--- a/tests/auto/declarative/qmlqt/data/size.qml
+++ b/tests/auto/declarative/qdeclarativeqt/data/size.qml
diff --git a/tests/auto/declarative/qmlqt/data/tint.qml b/tests/auto/declarative/qdeclarativeqt/data/tint.qml
index da8afe2..da8afe2 100644
--- a/tests/auto/declarative/qmlqt/data/tint.qml
+++ b/tests/auto/declarative/qdeclarativeqt/data/tint.qml
diff --git a/tests/auto/declarative/qmlqt/data/vector.qml b/tests/auto/declarative/qdeclarativeqt/data/vector.qml
index a471c7a..a471c7a 100644
--- a/tests/auto/declarative/qmlqt/data/vector.qml
+++ b/tests/auto/declarative/qdeclarativeqt/data/vector.qml
diff --git a/tests/auto/declarative/qmlqt/qmlqt.pro b/tests/auto/declarative/qdeclarativeqt/qdeclarativeqt.pro
index 5e79ea6..aff00ad 100644
--- a/tests/auto/declarative/qmlqt/qmlqt.pro
+++ b/tests/auto/declarative/qdeclarativeqt/qdeclarativeqt.pro
@@ -1,6 +1,6 @@
 load(qttest_p4)
 contains(QT_CONFIG,declarative): QT += declarative
-SOURCES += tst_qmlqt.cpp
+SOURCES += tst_qdeclarativeqt.cpp
 macx:CONFIG -= app_bundle
 
 DEFINES += SRCDIR=\\\"$$PWD\\\"
diff --git a/tests/auto/declarative/qmlqt/tst_qmlqt.cpp b/tests/auto/declarative/qdeclarativeqt/tst_qdeclarativeqt.cpp
index c3c2521..9cbcaec 100644
--- a/tests/auto/declarative/qmlqt/tst_qmlqt.cpp
+++ b/tests/auto/declarative/qdeclarativeqt/tst_qdeclarativeqt.cpp
@@ -41,13 +41,13 @@
 
 #include <qtest.h>
 #include <QDebug>
-#include <QmlEngine>
+#include <QDeclarativeEngine>
 #include <QFileInfo>
-#include <QmlComponent>
+#include <QDeclarativeComponent>
 #include <QDir>
 #include <QVector3D>
 #include <QCryptographicHash>
-#include <QmlGraphicsItem>
+#include <QDeclarativeItem>
 
 class tst_qmlqt : public QObject
 {
@@ -75,7 +75,7 @@ private slots:
     void consoleLog();
 
 private:
-    QmlEngine engine;
+    QDeclarativeEngine engine;
 };
 
 inline QUrl TEST_FILE(const QString &filename)
@@ -85,7 +85,7 @@ inline QUrl TEST_FILE(const QString &filename)
 
 void tst_qmlqt::enums()
 {
-    QmlComponent component(&engine, TEST_FILE("enums.qml"));
+    QDeclarativeComponent component(&engine, TEST_FILE("enums.qml"));
     QObject *object = component.create();
     QVERIFY(object != 0);
 
@@ -99,7 +99,7 @@ void tst_qmlqt::enums()
 
 void tst_qmlqt::rgba()
 {
-    QmlComponent component(&engine, TEST_FILE("rgba.qml"));
+    QDeclarativeComponent component(&engine, TEST_FILE("rgba.qml"));
 
     QString warning1 = component.url().toString() + ":6: Unable to assign null to QColor";
     QString warning2 = component.url().toString() + ":7: Unable to assign null to QColor";
@@ -126,7 +126,7 @@ void tst_qmlqt::rgba()
 
 void tst_qmlqt::hsla()
 {
-    QmlComponent component(&engine, TEST_FILE("hsla.qml"));
+    QDeclarativeComponent component(&engine, TEST_FILE("hsla.qml"));
 
     QString warning1 = component.url().toString() + ":6: Unable to assign null to QColor";
     QString warning2 = component.url().toString() + ":7: Unable to assign null to QColor";
@@ -152,7 +152,7 @@ void tst_qmlqt::hsla()
 
 void tst_qmlqt::rect()
 {
-    QmlComponent component(&engine, TEST_FILE("rect.qml"));
+    QDeclarativeComponent component(&engine, TEST_FILE("rect.qml"));
     QObject *object = component.create();
     QVERIFY(object != 0);
 
@@ -167,7 +167,7 @@ void tst_qmlqt::rect()
 
 void tst_qmlqt::point()
 {
-    QmlComponent component(&engine, TEST_FILE("point.qml"));
+    QDeclarativeComponent component(&engine, TEST_FILE("point.qml"));
     QObject *object = component.create();
     QVERIFY(object != 0);
 
@@ -181,7 +181,7 @@ void tst_qmlqt::point()
 
 void tst_qmlqt::size()
 {
-    QmlComponent component(&engine, TEST_FILE("size.qml"));
+    QDeclarativeComponent component(&engine, TEST_FILE("size.qml"));
     QObject *object = component.create();
     QVERIFY(object != 0);
 
@@ -196,7 +196,7 @@ void tst_qmlqt::size()
 
 void tst_qmlqt::vector()
 {
-    QmlComponent component(&engine, TEST_FILE("vector.qml"));
+    QDeclarativeComponent component(&engine, TEST_FILE("vector.qml"));
     QObject *object = component.create();
     QVERIFY(object != 0);
 
@@ -210,7 +210,7 @@ void tst_qmlqt::vector()
 
 void tst_qmlqt::lighter()
 {
-    QmlComponent component(&engine, TEST_FILE("lighter.qml"));
+    QDeclarativeComponent component(&engine, TEST_FILE("lighter.qml"));
     QObject *object = component.create();
     QVERIFY(object != 0);
 
@@ -226,7 +226,7 @@ void tst_qmlqt::lighter()
 
 void tst_qmlqt::darker()
 {
-    QmlComponent component(&engine, TEST_FILE("darker.qml"));
+    QDeclarativeComponent component(&engine, TEST_FILE("darker.qml"));
     QObject *object = component.create();
     QVERIFY(object != 0);
 
@@ -242,7 +242,7 @@ void tst_qmlqt::darker()
 
 void tst_qmlqt::tint()
 {
-    QmlComponent component(&engine, TEST_FILE("tint.qml"));
+    QDeclarativeComponent component(&engine, TEST_FILE("tint.qml"));
 
     QString warning1 = component.url().toString() + ":7: Unable to assign null to QColor";
     QString warning2 = component.url().toString() + ":8: Unable to assign null to QColor";
@@ -264,7 +264,7 @@ void tst_qmlqt::tint()
 
 void tst_qmlqt::closestAngle()
 {
-    QmlComponent component(&engine, TEST_FILE("closestangle.qml"));
+    QDeclarativeComponent component(&engine, TEST_FILE("closestangle.qml"));
     QObject *object = component.create();
     QVERIFY(object != 0);
 
@@ -293,7 +293,7 @@ void tst_qmlqt::openUrlExternally()
 
 void tst_qmlqt::md5()
 {
-    QmlComponent component(&engine, TEST_FILE("md5.qml"));
+    QDeclarativeComponent component(&engine, TEST_FILE("md5.qml"));
     QObject *object = component.create();
     QVERIFY(object != 0);
 
@@ -305,7 +305,7 @@ void tst_qmlqt::md5()
 
 void tst_qmlqt::createComponent()
 {
-    QmlComponent component(&engine, TEST_FILE("createComponent.qml"));
+    QDeclarativeComponent component(&engine, TEST_FILE("createComponent.qml"));
     QObject *object = component.create();
     QVERIFY(object != 0);
 
@@ -321,12 +321,12 @@ void tst_qmlqt::createComponent()
 
 void tst_qmlqt::createQmlObject()
 {
-    QmlComponent component(&engine, TEST_FILE("createQmlObject.qml"));
+    QDeclarativeComponent component(&engine, TEST_FILE("createQmlObject.qml"));
 
-    QString warning1 = "QmlEngine::createQmlObject():";
+    QString warning1 = "QDeclarativeEngine::createQmlObject():";
     QString warning2 = "    " + TEST_FILE("main.qml").toString() + ":4:1: Duplicate property name";
-    QString warning3 = "QmlEngine::createQmlObject(): Component is not ready";
-    QString warning4 = "QmlEngine::createQmlObject():";
+    QString warning3 = "QDeclarativeEngine::createQmlObject(): Component is not ready";
+    QString warning4 = "QDeclarativeEngine::createQmlObject():";
     QString warning5 = "    " + TEST_FILE("inline").toString() + ":3: Cannot assign object type QObject with no default method";
 
     QTest::ignoreMessage(QtWarningMsg, qPrintable(warning1));
@@ -347,7 +347,7 @@ void tst_qmlqt::createQmlObject()
     QCOMPARE(object->property("runtimeError").toBool(), true);
     QCOMPARE(object->property("success").toBool(), true);
 
-    QmlGraphicsItem *item = qobject_cast<QmlGraphicsItem *>(object);
+    QDeclarativeItem *item = qobject_cast<QDeclarativeItem *>(object);
     QVERIFY(item != 0);
     QVERIFY(item->childItems().count() == 1);
 
@@ -358,7 +358,7 @@ void tst_qmlqt::consoleLog()
 {
     QTest::ignoreMessage(QtDebugMsg, "completed ok");
     QTest::ignoreMessage(QtDebugMsg, "completed ok");
-    QmlComponent component(&engine, TEST_FILE("consoleLog.qml"));
+    QDeclarativeComponent component(&engine, TEST_FILE("consoleLog.qml"));
     QObject *object = component.create();
     QVERIFY(object != 0);
     delete object;
@@ -366,4 +366,4 @@ void tst_qmlqt::consoleLog()
 
 QTEST_MAIN(tst_qmlqt)
 
-#include "tst_qmlqt.moc"
+#include "tst_qdeclarativeqt.moc"
diff --git a/tests/auto/declarative/qmlgraphicsrepeater/data/intmodel.qml b/tests/auto/declarative/qdeclarativerepeater/data/intmodel.qml
index cf1fb4d..cf1fb4d 100644
--- a/tests/auto/declarative/qmlgraphicsrepeater/data/intmodel.qml
+++ b/tests/auto/declarative/qdeclarativerepeater/data/intmodel.qml
diff --git a/tests/auto/declarative/qmlgraphicsrepeater/data/itemlist.qml b/tests/auto/declarative/qdeclarativerepeater/data/itemlist.qml
index fc6b34c..fc6b34c 100644
--- a/tests/auto/declarative/qmlgraphicsrepeater/data/itemlist.qml
+++ b/tests/auto/declarative/qdeclarativerepeater/data/itemlist.qml
diff --git a/tests/auto/declarative/qmlgraphicsrepeater/data/objlist.qml b/tests/auto/declarative/qdeclarativerepeater/data/objlist.qml
index e6d0acb..e6d0acb 100644
--- a/tests/auto/declarative/qmlgraphicsrepeater/data/objlist.qml
+++ b/tests/auto/declarative/qdeclarativerepeater/data/objlist.qml
diff --git a/tests/auto/declarative/qmlgraphicsrepeater/data/properties.qml b/tests/auto/declarative/qdeclarativerepeater/data/properties.qml
index 550ce8d..550ce8d 100644
--- a/tests/auto/declarative/qmlgraphicsrepeater/data/properties.qml
+++ b/tests/auto/declarative/qdeclarativerepeater/data/properties.qml
diff --git a/tests/auto/declarative/qmlgraphicsrepeater/data/repeater.qml b/tests/auto/declarative/qdeclarativerepeater/data/repeater.qml
index 7d83230..7d83230 100644
--- a/tests/auto/declarative/qmlgraphicsrepeater/data/repeater.qml
+++ b/tests/auto/declarative/qdeclarativerepeater/data/repeater.qml
diff --git a/tests/auto/declarative/qmlgraphicsrepeater/data/repeater2.qml b/tests/auto/declarative/qdeclarativerepeater/data/repeater2.qml
index c3c3260..c3c3260 100644
--- a/tests/auto/declarative/qmlgraphicsrepeater/data/repeater2.qml
+++ b/tests/auto/declarative/qdeclarativerepeater/data/repeater2.qml
diff --git a/tests/auto/declarative/qmlgraphicspathview/qmlgraphicspathview.pro b/tests/auto/declarative/qdeclarativerepeater/qdeclarativerepeater.pro
index 142a256..132123a 100644
--- a/tests/auto/declarative/qmlgraphicspathview/qmlgraphicspathview.pro
+++ b/tests/auto/declarative/qdeclarativerepeater/qdeclarativerepeater.pro
@@ -2,7 +2,7 @@ load(qttest_p4)
 contains(QT_CONFIG,declarative): QT += declarative
 macx:CONFIG -= app_bundle
 
-SOURCES += tst_qmlgraphicspathview.cpp
+SOURCES += tst_qdeclarativerepeater.cpp
 
 # Define SRCDIR equal to test's source directory
 DEFINES += SRCDIR=\\\"$$PWD\\\"
diff --git a/tests/auto/declarative/qmlgraphicsrepeater/tst_qmlgraphicsrepeater.cpp b/tests/auto/declarative/qdeclarativerepeater/tst_qdeclarativerepeater.cpp
index 9f3ff45..e442989 100644
--- a/tests/auto/declarative/qmlgraphicsrepeater/tst_qmlgraphicsrepeater.cpp
+++ b/tests/auto/declarative/qdeclarativerepeater/tst_qdeclarativerepeater.cpp
@@ -42,11 +42,11 @@
 #include <QtTest/QtTest>
 #include <QtTest/QSignalSpy>
 #include <private/qlistmodelinterface_p.h>
-#include <QtDeclarative/qmlengine.h>
-#include <QtDeclarative/qmlview.h>
-#include <QtDeclarative/qmlcontext.h>
-#include <private/qmlgraphicsrepeater_p.h>
-#include <private/qmlgraphicstext_p.h>
+#include <QtDeclarative/qdeclarativeengine.h>
+#include <QtDeclarative/qdeclarativeview.h>
+#include <QtDeclarative/qdeclarativecontext.h>
+#include <private/qdeclarativerepeater_p.h>
+#include <private/qdeclarativetext_p.h>
 
 inline QUrl TEST_FILE(const QString &filename)
 {
@@ -68,7 +68,7 @@ private slots:
     void properties();
 
 private:
-    QmlView *createView();
+    QDeclarativeView *createView();
     template<typename T>
     T *findItem(QGraphicsObject *parent, const QString &id);
 };
@@ -164,9 +164,9 @@ tst_QmlGraphicsRepeater::tst_QmlGraphicsRepeater()
 
 void tst_QmlGraphicsRepeater::numberModel()
 {
-    QmlView *canvas = createView();
+    QDeclarativeView *canvas = createView();
 
-    QmlContext *ctxt = canvas->rootContext();
+    QDeclarativeContext *ctxt = canvas->rootContext();
     ctxt->setContextProperty("testData", 5);
     TestObject *testObject = new TestObject;
     ctxt->setContextProperty("testObject", testObject);
@@ -174,7 +174,7 @@ void tst_QmlGraphicsRepeater::numberModel()
     canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/intmodel.qml"));
     qApp->processEvents();
 
-    QmlGraphicsRepeater *repeater = findItem<QmlGraphicsRepeater>(canvas->rootObject(), "repeater");
+    QDeclarativeRepeater *repeater = findItem<QDeclarativeRepeater>(canvas->rootObject(), "repeater");
     QVERIFY(repeater != 0);
     QCOMPARE(repeater->parentItem()->childItems().count(), 5+1);
 
@@ -186,7 +186,7 @@ void tst_QmlGraphicsRepeater::numberModel()
 
 void tst_QmlGraphicsRepeater::objectList()
 {
-    QmlView *canvas = createView();
+    QDeclarativeView *canvas = createView();
 
     QObjectList data;
     for(int i=0; i<100; i++){
@@ -194,13 +194,13 @@ void tst_QmlGraphicsRepeater::objectList()
         data.back()->setProperty("idx", i);
     }
 
-    QmlContext *ctxt = canvas->rootContext();
+    QDeclarativeContext *ctxt = canvas->rootContext();
     ctxt->setContextProperty("testData", QVariant::fromValue(data));
 
     canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/objlist.qml"));
     qApp->processEvents();
 
-    QmlGraphicsRepeater *repeater = findItem<QmlGraphicsRepeater>(canvas->rootObject(), "repeater");
+    QDeclarativeRepeater *repeater = findItem<QDeclarativeRepeater>(canvas->rootObject(), "repeater");
     QVERIFY(repeater != 0);
     QCOMPARE(repeater->property("errors").toInt(), 0);//If this fails either they are out of order or can't find the object's data
     QCOMPARE(repeater->property("instantiated").toInt(), 100);
@@ -213,7 +213,7 @@ elements to test this.
 */
 void tst_QmlGraphicsRepeater::stringList()
 {
-    QmlView *canvas = createView();
+    QDeclarativeView *canvas = createView();
 
     QStringList data;
     data << "One";
@@ -221,16 +221,16 @@ void tst_QmlGraphicsRepeater::stringList()
     data << "Three";
     data << "Four";
 
-    QmlContext *ctxt = canvas->rootContext();
+    QDeclarativeContext *ctxt = canvas->rootContext();
     ctxt->setContextProperty("testData", data);
 
     canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/repeater.qml"));
     qApp->processEvents();
 
-    QmlGraphicsRepeater *repeater = findItem<QmlGraphicsRepeater>(canvas->rootObject(), "repeater");
+    QDeclarativeRepeater *repeater = findItem<QDeclarativeRepeater>(canvas->rootObject(), "repeater");
     QVERIFY(repeater != 0);
 
-    QmlGraphicsItem *container = findItem<QmlGraphicsItem>(canvas->rootObject(), "container");
+    QDeclarativeItem *container = findItem<QDeclarativeItem>(canvas->rootObject(), "container");
     QVERIFY(container != 0);
 
     QCOMPARE(container->childItems().count(), data.count() + 3);
@@ -239,21 +239,21 @@ void tst_QmlGraphicsRepeater::stringList()
     for (int i = 0; i < container->childItems().count(); ++i) {
 
         if (i == 0) {
-            QmlGraphicsText *name = qobject_cast<QmlGraphicsText*>(container->childItems().at(i));
+            QDeclarativeText *name = qobject_cast<QDeclarativeText*>(container->childItems().at(i));
             QVERIFY(name != 0);
             QCOMPARE(name->text(), QLatin1String("Zero"));
         } else if (i == container->childItems().count() - 2) {
             // The repeater itself
-            QmlGraphicsRepeater *rep = qobject_cast<QmlGraphicsRepeater*>(container->childItems().at(i));
+            QDeclarativeRepeater *rep = qobject_cast<QDeclarativeRepeater*>(container->childItems().at(i));
             QCOMPARE(rep, repeater);
             saw_repeater = true;
             continue;
         } else if (i == container->childItems().count() - 1) {
-            QmlGraphicsText *name = qobject_cast<QmlGraphicsText*>(container->childItems().at(i));
+            QDeclarativeText *name = qobject_cast<QDeclarativeText*>(container->childItems().at(i));
             QVERIFY(name != 0);
             QCOMPARE(name->text(), QLatin1String("Last"));
         } else {
-            QmlGraphicsText *name = qobject_cast<QmlGraphicsText*>(container->childItems().at(i));
+            QDeclarativeText *name = qobject_cast<QDeclarativeText*>(container->childItems().at(i));
             QVERIFY(name != 0);
             QCOMPARE(name->text(), data.at(i-1));
         }
@@ -265,8 +265,8 @@ void tst_QmlGraphicsRepeater::stringList()
 
 void tst_QmlGraphicsRepeater::dataModel()
 {
-    QmlView *canvas = createView();
-    QmlContext *ctxt = canvas->rootContext();
+    QDeclarativeView *canvas = createView();
+    QDeclarativeContext *ctxt = canvas->rootContext();
     TestObject *testObject = new TestObject;
     ctxt->setContextProperty("testObject", testObject);
 
@@ -280,10 +280,10 @@ void tst_QmlGraphicsRepeater::dataModel()
     canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/repeater2.qml"));
     qApp->processEvents();
 
-    QmlGraphicsRepeater *repeater = findItem<QmlGraphicsRepeater>(canvas->rootObject(), "repeater");
+    QDeclarativeRepeater *repeater = findItem<QDeclarativeRepeater>(canvas->rootObject(), "repeater");
     QVERIFY(repeater != 0);
 
-    QmlGraphicsItem *container = findItem<QmlGraphicsItem>(canvas->rootObject(), "container");
+    QDeclarativeItem *container = findItem<QDeclarativeItem>(canvas->rootObject(), "container");
     QVERIFY(container != 0);
 
     QCOMPARE(container->childItems().count(), 4);
@@ -297,18 +297,18 @@ void tst_QmlGraphicsRepeater::dataModel()
 
 void tst_QmlGraphicsRepeater::itemModel()
 {
-    QmlView *canvas = createView();
-    QmlContext *ctxt = canvas->rootContext();
+    QDeclarativeView *canvas = createView();
+    QDeclarativeContext *ctxt = canvas->rootContext();
     TestObject *testObject = new TestObject;
     ctxt->setContextProperty("testObject", testObject);
 
     canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/itemlist.qml"));
     qApp->processEvents();
 
-    QmlGraphicsRepeater *repeater = findItem<QmlGraphicsRepeater>(canvas->rootObject(), "repeater");
+    QDeclarativeRepeater *repeater = findItem<QDeclarativeRepeater>(canvas->rootObject(), "repeater");
     QVERIFY(repeater != 0);
 
-    QmlGraphicsItem *container = findItem<QmlGraphicsItem>(canvas->rootObject(), "container");
+    QDeclarativeItem *container = findItem<QDeclarativeItem>(canvas->rootObject(), "container");
     QVERIFY(container != 0);
 
     QCOMPARE(container->childItems().count(), 1);
@@ -328,13 +328,13 @@ void tst_QmlGraphicsRepeater::itemModel()
 
 void tst_QmlGraphicsRepeater::properties()
 {
-    QmlEngine engine;
-    QmlComponent component(&engine, TEST_FILE("/properties.qml"));
+    QDeclarativeEngine engine;
+    QDeclarativeComponent component(&engine, TEST_FILE("/properties.qml"));
 
-    QmlGraphicsItem *rootObject = qobject_cast<QmlGraphicsItem*>(component.create());
+    QDeclarativeItem *rootObject = qobject_cast<QDeclarativeItem*>(component.create());
     QVERIFY(rootObject);
 
-    QmlGraphicsRepeater *repeater = findItem<QmlGraphicsRepeater>(rootObject, "repeater");
+    QDeclarativeRepeater *repeater = findItem<QDeclarativeRepeater>(rootObject, "repeater");
     QVERIFY(repeater);
 
     QSignalSpy modelSpy(repeater, SIGNAL(modelChanged()));
@@ -345,7 +345,7 @@ void tst_QmlGraphicsRepeater::properties()
 
     QSignalSpy delegateSpy(repeater, SIGNAL(delegateChanged()));
 
-    QmlComponent rectComponent(&engine);
+    QDeclarativeComponent rectComponent(&engine);
     rectComponent.setData("import Qt 4.6; Rectangle {}", QUrl::fromLocalFile(""));
 
     repeater->setDelegate(&rectComponent);
@@ -354,9 +354,9 @@ void tst_QmlGraphicsRepeater::properties()
     QCOMPARE(delegateSpy.count(),1);
 }
 
-QmlView *tst_QmlGraphicsRepeater::createView()
+QDeclarativeView *tst_QmlGraphicsRepeater::createView()
 {
-    QmlView *canvas = new QmlView(0);
+    QDeclarativeView *canvas = new QDeclarativeView(0);
     canvas->setFixedSize(240,320);
 
     return canvas;
@@ -369,10 +369,10 @@ T *tst_QmlGraphicsRepeater::findItem(QGraphicsObject *parent, const QString &obj
     if (mo.cast(parent) && (objectName.isEmpty() || parent->objectName() == objectName))
         return static_cast<T*>(parent);
     for (int i = 0; i < parent->childItems().count(); ++i) {
-        QmlGraphicsItem *child = qobject_cast<QmlGraphicsItem*>(parent->childItems().at(i));
+        QDeclarativeItem *child = qobject_cast<QDeclarativeItem*>(parent->childItems().at(i));
         if (!child)
             continue;
-        QmlGraphicsItem *item = findItem<T>(child, objectName);
+        QDeclarativeItem *item = findItem<T>(child, objectName);
         if (item)
             return static_cast<T*>(item);
     }
@@ -382,4 +382,4 @@ T *tst_QmlGraphicsRepeater::findItem(QGraphicsObject *parent, const QString &obj
 
 QTEST_MAIN(tst_QmlGraphicsRepeater)
 
-#include "tst_qmlgraphicsrepeater.moc"
+#include "tst_qdeclarativerepeater.moc"
diff --git a/tests/auto/declarative/qmlspringfollow/data/springfollow1.qml b/tests/auto/declarative/qdeclarativespringfollow/data/springfollow1.qml
index 959d206..959d206 100644
--- a/tests/auto/declarative/qmlspringfollow/data/springfollow1.qml
+++ b/tests/auto/declarative/qdeclarativespringfollow/data/springfollow1.qml
diff --git a/tests/auto/declarative/qmlspringfollow/data/springfollow2.qml b/tests/auto/declarative/qdeclarativespringfollow/data/springfollow2.qml
index 7c81fb5..7c81fb5 100644
--- a/tests/auto/declarative/qmlspringfollow/data/springfollow2.qml
+++ b/tests/auto/declarative/qdeclarativespringfollow/data/springfollow2.qml
diff --git a/tests/auto/declarative/qmlspringfollow/data/springfollow3.qml b/tests/auto/declarative/qdeclarativespringfollow/data/springfollow3.qml
index 6fec55b..6fec55b 100644
--- a/tests/auto/declarative/qmlspringfollow/data/springfollow3.qml
+++ b/tests/auto/declarative/qdeclarativespringfollow/data/springfollow3.qml
diff --git a/tests/auto/declarative/qdeclarativespringfollow/qdeclarativespringfollow.pro b/tests/auto/declarative/qdeclarativespringfollow/qdeclarativespringfollow.pro
new file mode 100644
index 0000000..61aad0f
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativespringfollow/qdeclarativespringfollow.pro
@@ -0,0 +1,8 @@
+load(qttest_p4)
+contains(QT_CONFIG,declarative): QT += declarative gui
+macx:CONFIG -= app_bundle
+
+SOURCES += tst_qdeclarativespringfollow.cpp
+
+# Define SRCDIR equal to test's source directory
+DEFINES += SRCDIR=\\\"$$PWD\\\"
diff --git a/tests/auto/declarative/qmlspringfollow/tst_qmlspringfollow.cpp b/tests/auto/declarative/qdeclarativespringfollow/tst_qdeclarativespringfollow.cpp
index 393b351..594b9a0 100644
--- a/tests/auto/declarative/qmlspringfollow/tst_qmlspringfollow.cpp
+++ b/tests/auto/declarative/qdeclarativespringfollow/tst_qdeclarativespringfollow.cpp
@@ -39,10 +39,10 @@
 **
 ****************************************************************************/
 #include <qtest.h>
-#include <QtDeclarative/qmlengine.h>
-#include <QtDeclarative/qmlcomponent.h>
-#include <private/qmlspringfollow_p.h>
-#include <private/qmlvaluetype_p.h>
+#include <QtDeclarative/qdeclarativeengine.h>
+#include <QtDeclarative/qdeclarativecomponent.h>
+#include <private/qdeclarativespringfollow_p.h>
+#include <private/qdeclarativevaluetype_p.h>
 #include "../../../shared/util.h"
 
 class tst_qmlspringfollow : public QObject
@@ -57,7 +57,7 @@ private slots:
     void disabled();
 
 private:
-    QmlEngine engine;
+    QDeclarativeEngine engine;
 };
 
 tst_qmlspringfollow::tst_qmlspringfollow()
@@ -66,9 +66,9 @@ tst_qmlspringfollow::tst_qmlspringfollow()
 
 void tst_qmlspringfollow::defaultValues()
 {
-    QmlEngine engine;
-    QmlComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/springfollow1.qml"));
-    QmlSpringFollow *obj = qobject_cast<QmlSpringFollow*>(c.create());
+    QDeclarativeEngine engine;
+    QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/springfollow1.qml"));
+    QDeclarativeSpringFollow *obj = qobject_cast<QDeclarativeSpringFollow*>(c.create());
 
     QVERIFY(obj != 0);
 
@@ -88,9 +88,9 @@ void tst_qmlspringfollow::defaultValues()
 
 void tst_qmlspringfollow::values()
 {
-    QmlEngine engine;
-    QmlComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/springfollow2.qml"));
-    QmlSpringFollow *obj = qobject_cast<QmlSpringFollow*>(c.create());
+    QDeclarativeEngine engine;
+    QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/springfollow2.qml"));
+    QDeclarativeSpringFollow *obj = qobject_cast<QDeclarativeSpringFollow*>(c.create());
 
     QVERIFY(obj != 0);
 
@@ -111,9 +111,9 @@ void tst_qmlspringfollow::values()
 
 void tst_qmlspringfollow::disabled()
 {
-    QmlEngine engine;
-    QmlComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/springfollow3.qml"));
-    QmlSpringFollow *obj = qobject_cast<QmlSpringFollow*>(c.create());
+    QDeclarativeEngine engine;
+    QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/springfollow3.qml"));
+    QDeclarativeSpringFollow *obj = qobject_cast<QDeclarativeSpringFollow*>(c.create());
 
     QVERIFY(obj != 0);
 
@@ -134,4 +134,4 @@ void tst_qmlspringfollow::disabled()
 
 QTEST_MAIN(tst_qmlspringfollow)
 
-#include "tst_qmlspringfollow.moc"
+#include "tst_qdeclarativespringfollow.moc"
diff --git a/tests/auto/declarative/qmlstates/data/ExtendedRectangle.qml b/tests/auto/declarative/qdeclarativestates/data/ExtendedRectangle.qml
index 8d64663..8d64663 100644
--- a/tests/auto/declarative/qmlstates/data/ExtendedRectangle.qml
+++ b/tests/auto/declarative/qdeclarativestates/data/ExtendedRectangle.qml
diff --git a/tests/auto/declarative/qmlstates/data/anchorChanges.qml b/tests/auto/declarative/qdeclarativestates/data/anchorChanges.qml
index 7dce889..7dce889 100644
--- a/tests/auto/declarative/qmlstates/data/anchorChanges.qml
+++ b/tests/auto/declarative/qdeclarativestates/data/anchorChanges.qml
diff --git a/tests/auto/declarative/qmlstates/data/anchorChanges2.qml b/tests/auto/declarative/qdeclarativestates/data/anchorChanges2.qml
index 545345e..545345e 100644
--- a/tests/auto/declarative/qmlstates/data/anchorChanges2.qml
+++ b/tests/auto/declarative/qdeclarativestates/data/anchorChanges2.qml
diff --git a/tests/auto/declarative/qmlstates/data/anchorChanges3.qml b/tests/auto/declarative/qdeclarativestates/data/anchorChanges3.qml
index 9d5b317..9d5b317 100644
--- a/tests/auto/declarative/qmlstates/data/anchorChanges3.qml
+++ b/tests/auto/declarative/qdeclarativestates/data/anchorChanges3.qml
diff --git a/tests/auto/declarative/qmlstates/data/anchorChanges4.qml b/tests/auto/declarative/qdeclarativestates/data/anchorChanges4.qml
index f128989..f128989 100644
--- a/tests/auto/declarative/qmlstates/data/anchorChanges4.qml
+++ b/tests/auto/declarative/qdeclarativestates/data/anchorChanges4.qml
diff --git a/tests/auto/declarative/qmlstates/data/anchorChanges5.qml b/tests/auto/declarative/qdeclarativestates/data/anchorChanges5.qml
index 4e6d34b..4e6d34b 100644
--- a/tests/auto/declarative/qmlstates/data/anchorChanges5.qml
+++ b/tests/auto/declarative/qdeclarativestates/data/anchorChanges5.qml
diff --git a/tests/auto/declarative/qmlstates/data/autoStateAtStartupRestoreBug.qml b/tests/auto/declarative/qdeclarativestates/data/autoStateAtStartupRestoreBug.qml
index 693a5c5..693a5c5 100644
--- a/tests/auto/declarative/qmlstates/data/autoStateAtStartupRestoreBug.qml
+++ b/tests/auto/declarative/qdeclarativestates/data/autoStateAtStartupRestoreBug.qml
diff --git a/tests/auto/declarative/qmlstates/data/basicBinding.qml b/tests/auto/declarative/qdeclarativestates/data/basicBinding.qml
index 6528113..6528113 100644
--- a/tests/auto/declarative/qmlstates/data/basicBinding.qml
+++ b/tests/auto/declarative/qdeclarativestates/data/basicBinding.qml
diff --git a/tests/auto/declarative/qmlstates/data/basicBinding2.qml b/tests/auto/declarative/qdeclarativestates/data/basicBinding2.qml
index 2e7b4cf..2e7b4cf 100644
--- a/tests/auto/declarative/qmlstates/data/basicBinding2.qml
+++ b/tests/auto/declarative/qdeclarativestates/data/basicBinding2.qml
diff --git a/tests/auto/declarative/qmlstates/data/basicBinding3.qml b/tests/auto/declarative/qdeclarativestates/data/basicBinding3.qml
index a3c47d9..a3c47d9 100644
--- a/tests/auto/declarative/qmlstates/data/basicBinding3.qml
+++ b/tests/auto/declarative/qdeclarativestates/data/basicBinding3.qml
diff --git a/tests/auto/declarative/qmlstates/data/basicBinding4.qml b/tests/auto/declarative/qdeclarativestates/data/basicBinding4.qml
index 1f52d0e..1f52d0e 100644
--- a/tests/auto/declarative/qmlstates/data/basicBinding4.qml
+++ b/tests/auto/declarative/qdeclarativestates/data/basicBinding4.qml
diff --git a/tests/auto/declarative/qmlstates/data/basicChanges.qml b/tests/auto/declarative/qdeclarativestates/data/basicChanges.qml
index 88ea256..88ea256 100644
--- a/tests/auto/declarative/qmlstates/data/basicChanges.qml
+++ b/tests/auto/declarative/qdeclarativestates/data/basicChanges.qml
diff --git a/tests/auto/declarative/qmlstates/data/basicChanges2.qml b/tests/auto/declarative/qdeclarativestates/data/basicChanges2.qml
index 4dd293f..4dd293f 100644
--- a/tests/auto/declarative/qmlstates/data/basicChanges2.qml
+++ b/tests/auto/declarative/qdeclarativestates/data/basicChanges2.qml
diff --git a/tests/auto/declarative/qmlstates/data/basicChanges3.qml b/tests/auto/declarative/qdeclarativestates/data/basicChanges3.qml
index 62ab1d5..62ab1d5 100644
--- a/tests/auto/declarative/qmlstates/data/basicChanges3.qml
+++ b/tests/auto/declarative/qdeclarativestates/data/basicChanges3.qml
diff --git a/tests/auto/declarative/qmlstates/data/basicExtension.qml b/tests/auto/declarative/qdeclarativestates/data/basicExtension.qml
index 1836f8a..1836f8a 100644
--- a/tests/auto/declarative/qmlstates/data/basicExtension.qml
+++ b/tests/auto/declarative/qdeclarativestates/data/basicExtension.qml
diff --git a/tests/auto/declarative/qmlstates/data/deleting.qml b/tests/auto/declarative/qdeclarativestates/data/deleting.qml
index 3da0b12..3da0b12 100644
--- a/tests/auto/declarative/qmlstates/data/deleting.qml
+++ b/tests/auto/declarative/qdeclarativestates/data/deleting.qml
diff --git a/tests/auto/declarative/qmlstates/data/deletingState.qml b/tests/auto/declarative/qdeclarativestates/data/deletingState.qml
index a5e8ed3..a5e8ed3 100644
--- a/tests/auto/declarative/qmlstates/data/deletingState.qml
+++ b/tests/auto/declarative/qdeclarativestates/data/deletingState.qml
diff --git a/tests/auto/declarative/qmlstates/data/explicit.qml b/tests/auto/declarative/qdeclarativestates/data/explicit.qml
index 7543f84..7543f84 100644
--- a/tests/auto/declarative/qmlstates/data/explicit.qml
+++ b/tests/auto/declarative/qdeclarativestates/data/explicit.qml
diff --git a/tests/auto/declarative/qmlstates/data/fakeExtension.qml b/tests/auto/declarative/qdeclarativestates/data/fakeExtension.qml
index c7975e1..c7975e1 100644
--- a/tests/auto/declarative/qmlstates/data/fakeExtension.qml
+++ b/tests/auto/declarative/qdeclarativestates/data/fakeExtension.qml
diff --git a/tests/auto/declarative/qmlstates/data/illegalTempState.qml b/tests/auto/declarative/qdeclarativestates/data/illegalTempState.qml
index 0dc39ae..0dc39ae 100644
--- a/tests/auto/declarative/qmlstates/data/illegalTempState.qml
+++ b/tests/auto/declarative/qdeclarativestates/data/illegalTempState.qml
diff --git a/tests/auto/declarative/qmlstates/data/legalTempState.qml b/tests/auto/declarative/qdeclarativestates/data/legalTempState.qml
index 9be984c..9be984c 100644
--- a/tests/auto/declarative/qmlstates/data/legalTempState.qml
+++ b/tests/auto/declarative/qdeclarativestates/data/legalTempState.qml
diff --git a/tests/auto/declarative/qmlstates/data/nonExistantProp.qml b/tests/auto/declarative/qdeclarativestates/data/nonExistantProp.qml
index a5dd86a..a5dd86a 100644
--- a/tests/auto/declarative/qmlstates/data/nonExistantProp.qml
+++ b/tests/auto/declarative/qdeclarativestates/data/nonExistantProp.qml
diff --git a/tests/auto/declarative/qmlstates/data/parentChange.qml b/tests/auto/declarative/qdeclarativestates/data/parentChange.qml
index b8c7818..b8c7818 100644
--- a/tests/auto/declarative/qmlstates/data/parentChange.qml
+++ b/tests/auto/declarative/qdeclarativestates/data/parentChange.qml
diff --git a/tests/auto/declarative/qmlstates/data/parentChange2.qml b/tests/auto/declarative/qdeclarativestates/data/parentChange2.qml
index 8b23591..8b23591 100644
--- a/tests/auto/declarative/qmlstates/data/parentChange2.qml
+++ b/tests/auto/declarative/qdeclarativestates/data/parentChange2.qml
diff --git a/tests/auto/declarative/qmlstates/data/parentChange3.qml b/tests/auto/declarative/qdeclarativestates/data/parentChange3.qml
index ddf9268..ddf9268 100644
--- a/tests/auto/declarative/qmlstates/data/parentChange3.qml
+++ b/tests/auto/declarative/qdeclarativestates/data/parentChange3.qml
diff --git a/tests/auto/declarative/qmlstates/data/parentChange4.qml b/tests/auto/declarative/qdeclarativestates/data/parentChange4.qml
index 34d667a..34d667a 100644
--- a/tests/auto/declarative/qmlstates/data/parentChange4.qml
+++ b/tests/auto/declarative/qdeclarativestates/data/parentChange4.qml
diff --git a/tests/auto/declarative/qmlstates/data/parentChange5.qml b/tests/auto/declarative/qdeclarativestates/data/parentChange5.qml
index 56bdd89..56bdd89 100644
--- a/tests/auto/declarative/qmlstates/data/parentChange5.qml
+++ b/tests/auto/declarative/qdeclarativestates/data/parentChange5.qml
diff --git a/tests/auto/declarative/qmlstates/data/propertyErrors.qml b/tests/auto/declarative/qdeclarativestates/data/propertyErrors.qml
index 080e833..080e833 100644
--- a/tests/auto/declarative/qmlstates/data/propertyErrors.qml
+++ b/tests/auto/declarative/qdeclarativestates/data/propertyErrors.qml
diff --git a/tests/auto/declarative/qmlstates/data/restoreEntryValues.qml b/tests/auto/declarative/qdeclarativestates/data/restoreEntryValues.qml
index 088c608..088c608 100644
--- a/tests/auto/declarative/qmlstates/data/restoreEntryValues.qml
+++ b/tests/auto/declarative/qdeclarativestates/data/restoreEntryValues.qml
diff --git a/tests/auto/declarative/qmlstates/data/script.qml b/tests/auto/declarative/qdeclarativestates/data/script.qml
index 3c5f33e..3c5f33e 100644
--- a/tests/auto/declarative/qmlstates/data/script.qml
+++ b/tests/auto/declarative/qdeclarativestates/data/script.qml
diff --git a/tests/auto/declarative/qmlstates/data/signalOverride.qml b/tests/auto/declarative/qdeclarativestates/data/signalOverride.qml
index 5ba1566..5ba1566 100644
--- a/tests/auto/declarative/qmlstates/data/signalOverride.qml
+++ b/tests/auto/declarative/qdeclarativestates/data/signalOverride.qml
diff --git a/tests/auto/declarative/qmlstates/data/signalOverride2.qml b/tests/auto/declarative/qdeclarativestates/data/signalOverride2.qml
index 527e165..527e165 100644
--- a/tests/auto/declarative/qmlstates/data/signalOverride2.qml
+++ b/tests/auto/declarative/qdeclarativestates/data/signalOverride2.qml
diff --git a/tests/auto/declarative/qmlstates/data/signalOverrideCrash.qml b/tests/auto/declarative/qdeclarativestates/data/signalOverrideCrash.qml
index 702fa86..702fa86 100644
--- a/tests/auto/declarative/qmlstates/data/signalOverrideCrash.qml
+++ b/tests/auto/declarative/qdeclarativestates/data/signalOverrideCrash.qml
diff --git a/tests/auto/declarative/qmlstates/qmlstates.pro b/tests/auto/declarative/qdeclarativestates/qdeclarativestates.pro
index 538734a..f874803 100644
--- a/tests/auto/declarative/qmlstates/qmlstates.pro
+++ b/tests/auto/declarative/qdeclarativestates/qdeclarativestates.pro
@@ -2,7 +2,7 @@ load(qttest_p4)
 contains(QT_CONFIG,declarative): QT += declarative
 macx:CONFIG -= app_bundle
 
-SOURCES += tst_qmlstates.cpp
+SOURCES += tst_qdeclarativestates.cpp
 
 # Define SRCDIR equal to test's source directory
 DEFINES += SRCDIR=\\\"$$PWD\\\"
diff --git a/tests/auto/declarative/qmlstates/tst_qmlstates.cpp b/tests/auto/declarative/qdeclarativestates/tst_qdeclarativestates.cpp
index c372a15..1bc67e9 100644
--- a/tests/auto/declarative/qmlstates/tst_qmlstates.cpp
+++ b/tests/auto/declarative/qdeclarativestates/tst_qdeclarativestates.cpp
@@ -39,12 +39,12 @@
 **
 ****************************************************************************/
 #include <qtest.h>
-#include <QtDeclarative/qmlengine.h>
-#include <QtDeclarative/qmlcomponent.h>
-#include <private/qmlgraphicsanchors_p_p.h>
-#include <private/qmlgraphicsrectangle_p.h>
-#include <private/qmlpropertychanges_p.h>
-#include <private/qmlstategroup_p.h>
+#include <QtDeclarative/qdeclarativeengine.h>
+#include <QtDeclarative/qdeclarativecomponent.h>
+#include <private/qdeclarativeanchors_p_p.h>
+#include <private/qdeclarativerectangle_p.h>
+#include <private/qdeclarativepropertychanges_p.h>
+#include <private/qdeclarativestategroup_p.h>
 
 class tst_qmlstates : public QObject
 {
@@ -90,11 +90,11 @@ QByteArray tst_qmlstates::fullDataPath(const QString &path)
 
 void tst_qmlstates::basicChanges()
 {
-    QmlEngine engine;
+    QDeclarativeEngine engine;
 
     {
-        QmlComponent rectComponent(&engine, SRCDIR "/data/basicChanges.qml");
-        QmlGraphicsRectangle *rect = qobject_cast<QmlGraphicsRectangle*>(rectComponent.create());
+        QDeclarativeComponent rectComponent(&engine, SRCDIR "/data/basicChanges.qml");
+        QDeclarativeRectangle *rect = qobject_cast<QDeclarativeRectangle*>(rectComponent.create());
         QVERIFY(rect != 0);
 
         QCOMPARE(rect->color(),QColor("red"));
@@ -107,8 +107,8 @@ void tst_qmlstates::basicChanges()
     }
 
     {
-        QmlComponent rectComponent(&engine, SRCDIR "/data/basicChanges2.qml");
-        QmlGraphicsRectangle *rect = qobject_cast<QmlGraphicsRectangle*>(rectComponent.create());
+        QDeclarativeComponent rectComponent(&engine, SRCDIR "/data/basicChanges2.qml");
+        QDeclarativeRectangle *rect = qobject_cast<QDeclarativeRectangle*>(rectComponent.create());
         QVERIFY(rect != 0);
 
         QCOMPARE(rect->color(),QColor("red"));
@@ -127,8 +127,8 @@ void tst_qmlstates::basicChanges()
     }
 
     {
-        QmlComponent rectComponent(&engine, SRCDIR "/data/basicChanges3.qml");
-        QmlGraphicsRectangle *rect = qobject_cast<QmlGraphicsRectangle*>(rectComponent.create());
+        QDeclarativeComponent rectComponent(&engine, SRCDIR "/data/basicChanges3.qml");
+        QDeclarativeRectangle *rect = qobject_cast<QDeclarativeRectangle*>(rectComponent.create());
         QVERIFY(rect != 0);
 
         QCOMPARE(rect->color(),QColor("red"));
@@ -160,11 +160,11 @@ void tst_qmlstates::basicChanges()
 
 void tst_qmlstates::basicExtension()
 {
-    QmlEngine engine;
+    QDeclarativeEngine engine;
 
     {
-        QmlComponent rectComponent(&engine, SRCDIR "/data/basicExtension.qml");
-        QmlGraphicsRectangle *rect = qobject_cast<QmlGraphicsRectangle*>(rectComponent.create());
+        QDeclarativeComponent rectComponent(&engine, SRCDIR "/data/basicExtension.qml");
+        QDeclarativeRectangle *rect = qobject_cast<QDeclarativeRectangle*>(rectComponent.create());
         QVERIFY(rect != 0);
 
         QCOMPARE(rect->color(),QColor("red"));
@@ -196,8 +196,8 @@ void tst_qmlstates::basicExtension()
     }
 
     {
-        QmlComponent rectComponent(&engine, SRCDIR "/data/fakeExtension.qml");
-        QmlGraphicsRectangle *rect = qobject_cast<QmlGraphicsRectangle*>(rectComponent.create());
+        QDeclarativeComponent rectComponent(&engine, SRCDIR "/data/fakeExtension.qml");
+        QDeclarativeRectangle *rect = qobject_cast<QDeclarativeRectangle*>(rectComponent.create());
         QVERIFY(rect != 0);
 
         QCOMPARE(rect->color(),QColor("red"));
@@ -224,11 +224,11 @@ void tst_qmlstates::basicExtension()
 
 void tst_qmlstates::basicBinding()
 {
-    QmlEngine engine;
+    QDeclarativeEngine engine;
 
     {
-        QmlComponent rectComponent(&engine, SRCDIR "/data/basicBinding.qml");
-        QmlGraphicsRectangle *rect = qobject_cast<QmlGraphicsRectangle*>(rectComponent.create());
+        QDeclarativeComponent rectComponent(&engine, SRCDIR "/data/basicBinding.qml");
+        QDeclarativeRectangle *rect = qobject_cast<QDeclarativeRectangle*>(rectComponent.create());
         QVERIFY(rect != 0);
 
         QCOMPARE(rect->color(),QColor("red"));
@@ -254,8 +254,8 @@ void tst_qmlstates::basicBinding()
     }
 
     {
-        QmlComponent rectComponent(&engine, SRCDIR "/data/basicBinding2.qml");
-        QmlGraphicsRectangle *rect = qobject_cast<QmlGraphicsRectangle*>(rectComponent.create());
+        QDeclarativeComponent rectComponent(&engine, SRCDIR "/data/basicBinding2.qml");
+        QDeclarativeRectangle *rect = qobject_cast<QDeclarativeRectangle*>(rectComponent.create());
         QVERIFY(rect != 0);
 
         QCOMPARE(rect->color(),QColor("red"));
@@ -284,8 +284,8 @@ void tst_qmlstates::basicBinding()
     }
 
     {
-        QmlComponent rectComponent(&engine, SRCDIR "/data/basicBinding3.qml");
-        QmlGraphicsRectangle *rect = qobject_cast<QmlGraphicsRectangle*>(rectComponent.create());
+        QDeclarativeComponent rectComponent(&engine, SRCDIR "/data/basicBinding3.qml");
+        QDeclarativeRectangle *rect = qobject_cast<QDeclarativeRectangle*>(rectComponent.create());
         QVERIFY(rect != 0);
 
         QCOMPARE(rect->color(),QColor("red"));
@@ -308,8 +308,8 @@ void tst_qmlstates::basicBinding()
     }
 
     {
-        QmlComponent rectComponent(&engine, SRCDIR "/data/basicBinding4.qml");
-        QmlGraphicsRectangle *rect = qobject_cast<QmlGraphicsRectangle*>(rectComponent.create());
+        QDeclarativeComponent rectComponent(&engine, SRCDIR "/data/basicBinding4.qml");
+        QDeclarativeRectangle *rect = qobject_cast<QDeclarativeRectangle*>(rectComponent.create());
         QVERIFY(rect != 0);
 
         QCOMPARE(rect->color(),QColor("red"));
@@ -335,7 +335,7 @@ void tst_qmlstates::basicBinding()
     }
 }
 
-class MyRect : public QmlGraphicsRectangle
+class MyRect : public QDeclarativeRectangle
 {
    Q_OBJECT
 public:
@@ -354,10 +354,10 @@ void tst_qmlstates::initTestCase()
 
 void tst_qmlstates::signalOverride()
 {
-    QmlEngine engine;
+    QDeclarativeEngine engine;
 
     {
-        QmlComponent rectComponent(&engine, SRCDIR "/data/signalOverride.qml");
+        QDeclarativeComponent rectComponent(&engine, SRCDIR "/data/signalOverride.qml");
         MyRect *rect = qobject_cast<MyRect*>(rectComponent.create());
         QVERIFY(rect != 0);
 
@@ -371,7 +371,7 @@ void tst_qmlstates::signalOverride()
     }
 
     {
-        QmlComponent rectComponent(&engine, SRCDIR "/data/signalOverride2.qml");
+        QDeclarativeComponent rectComponent(&engine, SRCDIR "/data/signalOverride2.qml");
         MyRect *rect = qobject_cast<MyRect*>(rectComponent.create());
         QVERIFY(rect != 0);
 
@@ -379,7 +379,7 @@ void tst_qmlstates::signalOverride()
         rect->doSomething();
         QCOMPARE(rect->color(),QColor("blue"));
 
-        QmlGraphicsRectangle *innerRect = qobject_cast<QmlGraphicsRectangle*>(rect->findChild<QmlGraphicsRectangle*>("extendedRect"));
+        QDeclarativeRectangle *innerRect = qobject_cast<QDeclarativeRectangle*>(rect->findChild<QDeclarativeRectangle*>("extendedRect"));
 
         innerRect->setState("green");
         rect->doSomething();
@@ -391,9 +391,9 @@ void tst_qmlstates::signalOverride()
 
 void tst_qmlstates::signalOverrideCrash()
 {
-    QmlEngine engine;
+    QDeclarativeEngine engine;
 
-    QmlComponent rectComponent(&engine, SRCDIR "/data/signalOverrideCrash.qml");
+    QDeclarativeComponent rectComponent(&engine, SRCDIR "/data/signalOverrideCrash.qml");
     MyRect *rect = qobject_cast<MyRect*>(rectComponent.create());
     QVERIFY(rect != 0);
 
@@ -403,24 +403,24 @@ void tst_qmlstates::signalOverrideCrash()
 
 void tst_qmlstates::parentChange()
 {
-    QmlEngine engine;
+    QDeclarativeEngine engine;
 
     {
-        QmlComponent rectComponent(&engine, SRCDIR "/data/parentChange.qml");
-        QmlGraphicsRectangle *rect = qobject_cast<QmlGraphicsRectangle*>(rectComponent.create());
+        QDeclarativeComponent rectComponent(&engine, SRCDIR "/data/parentChange.qml");
+        QDeclarativeRectangle *rect = qobject_cast<QDeclarativeRectangle*>(rectComponent.create());
         QVERIFY(rect != 0);
 
-        QmlGraphicsRectangle *innerRect = qobject_cast<QmlGraphicsRectangle*>(rect->findChild<QmlGraphicsRectangle*>("MyRect"));
+        QDeclarativeRectangle *innerRect = qobject_cast<QDeclarativeRectangle*>(rect->findChild<QDeclarativeRectangle*>("MyRect"));
         QVERIFY(innerRect != 0);
 
-        QmlListReference list(rect, "states");
-        QmlState *state = qobject_cast<QmlState*>(list.at(0));
+        QDeclarativeListReference list(rect, "states");
+        QDeclarativeState *state = qobject_cast<QDeclarativeState*>(list.at(0));
         QVERIFY(state != 0);
 
         qmlExecuteDeferred(state);
-        QmlParentChange *pChange = qobject_cast<QmlParentChange*>(state->operationAt(0));
+        QDeclarativeParentChange *pChange = qobject_cast<QDeclarativeParentChange*>(state->operationAt(0));
         QVERIFY(pChange != 0);
-        QmlGraphicsItem *nParent = qobject_cast<QmlGraphicsItem*>(rect->findChild<QmlGraphicsItem*>("NewParent"));
+        QDeclarativeItem *nParent = qobject_cast<QDeclarativeItem*>(rect->findChild<QDeclarativeItem*>("NewParent"));
         QVERIFY(nParent != 0);
 
         QCOMPARE(pChange->parent(), nParent);
@@ -433,11 +433,11 @@ void tst_qmlstates::parentChange()
     }
 
     {
-        QmlComponent rectComponent(&engine, SRCDIR "/data/parentChange2.qml");
-        QmlGraphicsRectangle *rect = qobject_cast<QmlGraphicsRectangle*>(rectComponent.create());
+        QDeclarativeComponent rectComponent(&engine, SRCDIR "/data/parentChange2.qml");
+        QDeclarativeRectangle *rect = qobject_cast<QDeclarativeRectangle*>(rectComponent.create());
         QVERIFY(rect != 0);
 
-        QmlGraphicsRectangle *innerRect = qobject_cast<QmlGraphicsRectangle*>(rect->findChild<QmlGraphicsRectangle*>("MyRect"));
+        QDeclarativeRectangle *innerRect = qobject_cast<QDeclarativeRectangle*>(rect->findChild<QDeclarativeRectangle*>("MyRect"));
         QVERIFY(innerRect != 0);
 
         rect->setState("reparented");
@@ -450,11 +450,11 @@ void tst_qmlstates::parentChange()
     }
 
     {
-        QmlComponent rectComponent(&engine, SRCDIR "/data/parentChange3.qml");
-        QmlGraphicsRectangle *rect = qobject_cast<QmlGraphicsRectangle*>(rectComponent.create());
+        QDeclarativeComponent rectComponent(&engine, SRCDIR "/data/parentChange3.qml");
+        QDeclarativeRectangle *rect = qobject_cast<QDeclarativeRectangle*>(rectComponent.create());
         QVERIFY(rect != 0);
 
-        QmlGraphicsRectangle *innerRect = qobject_cast<QmlGraphicsRectangle*>(rect->findChild<QmlGraphicsRectangle*>("MyRect"));
+        QDeclarativeRectangle *innerRect = qobject_cast<QDeclarativeRectangle*>(rect->findChild<QDeclarativeRectangle*>("MyRect"));
         QVERIFY(innerRect != 0);
 
         rect->setState("reparented");
@@ -474,14 +474,14 @@ void tst_qmlstates::parentChange()
 
 void tst_qmlstates::parentChangeErrors()
 {
-    QmlEngine engine;
+    QDeclarativeEngine engine;
 
     {
-        QmlComponent rectComponent(&engine, SRCDIR "/data/parentChange4.qml");
-        QmlGraphicsRectangle *rect = qobject_cast<QmlGraphicsRectangle*>(rectComponent.create());
+        QDeclarativeComponent rectComponent(&engine, SRCDIR "/data/parentChange4.qml");
+        QDeclarativeRectangle *rect = qobject_cast<QDeclarativeRectangle*>(rectComponent.create());
         QVERIFY(rect != 0);
 
-        QmlGraphicsRectangle *innerRect = qobject_cast<QmlGraphicsRectangle*>(rect->findChild<QmlGraphicsRectangle*>("MyRect"));
+        QDeclarativeRectangle *innerRect = qobject_cast<QDeclarativeRectangle*>(rect->findChild<QDeclarativeRectangle*>("MyRect"));
         QVERIFY(innerRect != 0);
 
         QTest::ignoreMessage(QtWarningMsg, QByteArray("QML ParentChange (" + fullDataPath("/data/parentChange4.qml") + ":25:9) Unable to preserve appearance under non-uniform scale").constData());
@@ -493,11 +493,11 @@ void tst_qmlstates::parentChangeErrors()
     }
 
     {
-        QmlComponent rectComponent(&engine, SRCDIR "/data/parentChange5.qml");
-        QmlGraphicsRectangle *rect = qobject_cast<QmlGraphicsRectangle*>(rectComponent.create());
+        QDeclarativeComponent rectComponent(&engine, SRCDIR "/data/parentChange5.qml");
+        QDeclarativeRectangle *rect = qobject_cast<QDeclarativeRectangle*>(rectComponent.create());
         QVERIFY(rect != 0);
 
-        QmlGraphicsRectangle *innerRect = qobject_cast<QmlGraphicsRectangle*>(rect->findChild<QmlGraphicsRectangle*>("MyRect"));
+        QDeclarativeRectangle *innerRect = qobject_cast<QDeclarativeRectangle*>(rect->findChild<QDeclarativeRectangle*>("MyRect"));
         QVERIFY(innerRect != 0);
 
         QTest::ignoreMessage(QtWarningMsg, QByteArray("QML ParentChange (" + fullDataPath("/data/parentChange5.qml") + ":25:9) Unable to preserve appearance under complex transform").constData());
@@ -511,21 +511,21 @@ void tst_qmlstates::parentChangeErrors()
 
 void tst_qmlstates::anchorChanges()
 {
-    QmlEngine engine;
+    QDeclarativeEngine engine;
 
-    QmlComponent rectComponent(&engine, SRCDIR "/data/anchorChanges.qml");
-    QmlGraphicsRectangle *rect = qobject_cast<QmlGraphicsRectangle*>(rectComponent.create());
+    QDeclarativeComponent rectComponent(&engine, SRCDIR "/data/anchorChanges.qml");
+    QDeclarativeRectangle *rect = qobject_cast<QDeclarativeRectangle*>(rectComponent.create());
     QVERIFY(rect != 0);
 
-    QmlGraphicsRectangle *innerRect = qobject_cast<QmlGraphicsRectangle*>(rect->findChild<QmlGraphicsRectangle*>("MyRect"));
+    QDeclarativeRectangle *innerRect = qobject_cast<QDeclarativeRectangle*>(rect->findChild<QDeclarativeRectangle*>("MyRect"));
     QVERIFY(innerRect != 0);
 
-    QmlListReference list(rect, "states");
-    QmlState *state = qobject_cast<QmlState*>(list.at(0));
+    QDeclarativeListReference list(rect, "states");
+    QDeclarativeState *state = qobject_cast<QDeclarativeState*>(list.at(0));
     QVERIFY(state != 0);
 
     qmlExecuteDeferred(state);
-    QmlAnchorChanges *aChanges = qobject_cast<QmlAnchorChanges*>(state->operationAt(0));
+    QDeclarativeAnchorChanges *aChanges = qobject_cast<QDeclarativeAnchorChanges*>(state->operationAt(0));
     QVERIFY(aChanges != 0);
 
     rect->setState("right");
@@ -543,13 +543,13 @@ void tst_qmlstates::anchorChanges()
 
 void tst_qmlstates::anchorChanges2()
 {
-    QmlEngine engine;
+    QDeclarativeEngine engine;
 
-    QmlComponent rectComponent(&engine, SRCDIR "/data/anchorChanges2.qml");
-    QmlGraphicsRectangle *rect = qobject_cast<QmlGraphicsRectangle*>(rectComponent.create());
+    QDeclarativeComponent rectComponent(&engine, SRCDIR "/data/anchorChanges2.qml");
+    QDeclarativeRectangle *rect = qobject_cast<QDeclarativeRectangle*>(rectComponent.create());
     QVERIFY(rect != 0);
 
-    QmlGraphicsRectangle *innerRect = qobject_cast<QmlGraphicsRectangle*>(rect->findChild<QmlGraphicsRectangle*>("MyRect"));
+    QDeclarativeRectangle *innerRect = qobject_cast<QDeclarativeRectangle*>(rect->findChild<QDeclarativeRectangle*>("MyRect"));
     QVERIFY(innerRect != 0);
 
     rect->setState("right");
@@ -564,27 +564,27 @@ void tst_qmlstates::anchorChanges2()
 
 void tst_qmlstates::anchorChanges3()
 {
-    QmlEngine engine;
+    QDeclarativeEngine engine;
 
-    QmlComponent rectComponent(&engine, SRCDIR "/data/anchorChanges3.qml");
-    QmlGraphicsRectangle *rect = qobject_cast<QmlGraphicsRectangle*>(rectComponent.create());
+    QDeclarativeComponent rectComponent(&engine, SRCDIR "/data/anchorChanges3.qml");
+    QDeclarativeRectangle *rect = qobject_cast<QDeclarativeRectangle*>(rectComponent.create());
     QVERIFY(rect != 0);
 
-    QmlGraphicsRectangle *innerRect = qobject_cast<QmlGraphicsRectangle*>(rect->findChild<QmlGraphicsRectangle*>("MyRect"));
+    QDeclarativeRectangle *innerRect = qobject_cast<QDeclarativeRectangle*>(rect->findChild<QDeclarativeRectangle*>("MyRect"));
     QVERIFY(innerRect != 0);
 
-    QmlGraphicsItem *leftGuideline = qobject_cast<QmlGraphicsItem*>(rect->findChild<QmlGraphicsItem*>("LeftGuideline"));
+    QDeclarativeItem *leftGuideline = qobject_cast<QDeclarativeItem*>(rect->findChild<QDeclarativeItem*>("LeftGuideline"));
     QVERIFY(leftGuideline != 0);
 
-    QmlGraphicsItem *bottomGuideline = qobject_cast<QmlGraphicsItem*>(rect->findChild<QmlGraphicsItem*>("BottomGuideline"));
+    QDeclarativeItem *bottomGuideline = qobject_cast<QDeclarativeItem*>(rect->findChild<QDeclarativeItem*>("BottomGuideline"));
     QVERIFY(bottomGuideline != 0);
 
-    QmlListReference list(rect, "states");
-    QmlState *state = qobject_cast<QmlState*>(list.at(0));
+    QDeclarativeListReference list(rect, "states");
+    QDeclarativeState *state = qobject_cast<QDeclarativeState*>(list.at(0));
     QVERIFY(state != 0);
 
     qmlExecuteDeferred(state);
-    QmlAnchorChanges *aChanges = qobject_cast<QmlAnchorChanges*>(state->operationAt(0));
+    QDeclarativeAnchorChanges *aChanges = qobject_cast<QDeclarativeAnchorChanges*>(state->operationAt(0));
     QVERIFY(aChanges != 0);
 
     rect->setState("reanchored");
@@ -614,27 +614,27 @@ void tst_qmlstates::anchorChanges3()
 
 void tst_qmlstates::anchorChanges4()
 {
-    QmlEngine engine;
+    QDeclarativeEngine engine;
 
-    QmlComponent rectComponent(&engine, SRCDIR "/data/anchorChanges4.qml");
-    QmlGraphicsRectangle *rect = qobject_cast<QmlGraphicsRectangle*>(rectComponent.create());
+    QDeclarativeComponent rectComponent(&engine, SRCDIR "/data/anchorChanges4.qml");
+    QDeclarativeRectangle *rect = qobject_cast<QDeclarativeRectangle*>(rectComponent.create());
     QVERIFY(rect != 0);
 
-    QmlGraphicsRectangle *innerRect = qobject_cast<QmlGraphicsRectangle*>(rect->findChild<QmlGraphicsRectangle*>("MyRect"));
+    QDeclarativeRectangle *innerRect = qobject_cast<QDeclarativeRectangle*>(rect->findChild<QDeclarativeRectangle*>("MyRect"));
     QVERIFY(innerRect != 0);
 
-    QmlGraphicsItem *leftGuideline = qobject_cast<QmlGraphicsItem*>(rect->findChild<QmlGraphicsItem*>("LeftGuideline"));
+    QDeclarativeItem *leftGuideline = qobject_cast<QDeclarativeItem*>(rect->findChild<QDeclarativeItem*>("LeftGuideline"));
     QVERIFY(leftGuideline != 0);
 
-    QmlGraphicsItem *bottomGuideline = qobject_cast<QmlGraphicsItem*>(rect->findChild<QmlGraphicsItem*>("BottomGuideline"));
+    QDeclarativeItem *bottomGuideline = qobject_cast<QDeclarativeItem*>(rect->findChild<QDeclarativeItem*>("BottomGuideline"));
     QVERIFY(bottomGuideline != 0);
 
-    QmlListReference list(rect, "states");
-    QmlState *state = qobject_cast<QmlState*>(list.at(0));
+    QDeclarativeListReference list(rect, "states");
+    QDeclarativeState *state = qobject_cast<QDeclarativeState*>(list.at(0));
     QVERIFY(state != 0);
 
     qmlExecuteDeferred(state);
-    QmlAnchorChanges *aChanges = qobject_cast<QmlAnchorChanges*>(state->operationAt(0));
+    QDeclarativeAnchorChanges *aChanges = qobject_cast<QDeclarativeAnchorChanges*>(state->operationAt(0));
     QVERIFY(aChanges != 0);
 
     rect->setState("reanchored");
@@ -649,27 +649,27 @@ void tst_qmlstates::anchorChanges4()
 
 void tst_qmlstates::anchorChanges5()
 {
-    QmlEngine engine;
+    QDeclarativeEngine engine;
 
-    QmlComponent rectComponent(&engine, SRCDIR "/data/anchorChanges5.qml");
-    QmlGraphicsRectangle *rect = qobject_cast<QmlGraphicsRectangle*>(rectComponent.create());
+    QDeclarativeComponent rectComponent(&engine, SRCDIR "/data/anchorChanges5.qml");
+    QDeclarativeRectangle *rect = qobject_cast<QDeclarativeRectangle*>(rectComponent.create());
     QVERIFY(rect != 0);
 
-    QmlGraphicsRectangle *innerRect = qobject_cast<QmlGraphicsRectangle*>(rect->findChild<QmlGraphicsRectangle*>("MyRect"));
+    QDeclarativeRectangle *innerRect = qobject_cast<QDeclarativeRectangle*>(rect->findChild<QDeclarativeRectangle*>("MyRect"));
     QVERIFY(innerRect != 0);
 
-    QmlGraphicsItem *leftGuideline = qobject_cast<QmlGraphicsItem*>(rect->findChild<QmlGraphicsItem*>("LeftGuideline"));
+    QDeclarativeItem *leftGuideline = qobject_cast<QDeclarativeItem*>(rect->findChild<QDeclarativeItem*>("LeftGuideline"));
     QVERIFY(leftGuideline != 0);
 
-    QmlGraphicsItem *bottomGuideline = qobject_cast<QmlGraphicsItem*>(rect->findChild<QmlGraphicsItem*>("BottomGuideline"));
+    QDeclarativeItem *bottomGuideline = qobject_cast<QDeclarativeItem*>(rect->findChild<QDeclarativeItem*>("BottomGuideline"));
     QVERIFY(bottomGuideline != 0);
 
-    QmlListReference list(rect, "states");
-    QmlState *state = qobject_cast<QmlState*>(list.at(0));
+    QDeclarativeListReference list(rect, "states");
+    QDeclarativeState *state = qobject_cast<QDeclarativeState*>(list.at(0));
     QVERIFY(state != 0);
 
     qmlExecuteDeferred(state);
-    QmlAnchorChanges *aChanges = qobject_cast<QmlAnchorChanges*>(state->operationAt(0));
+    QDeclarativeAnchorChanges *aChanges = qobject_cast<QDeclarativeAnchorChanges*>(state->operationAt(0));
     QVERIFY(aChanges != 0);
 
     rect->setState("reanchored");
@@ -684,11 +684,11 @@ void tst_qmlstates::anchorChanges5()
 
 void tst_qmlstates::script()
 {
-    QmlEngine engine;
+    QDeclarativeEngine engine;
 
     {
-        QmlComponent rectComponent(&engine, SRCDIR "/data/script.qml");
-        QmlGraphicsRectangle *rect = qobject_cast<QmlGraphicsRectangle*>(rectComponent.create());
+        QDeclarativeComponent rectComponent(&engine, SRCDIR "/data/script.qml");
+        QDeclarativeRectangle *rect = qobject_cast<QDeclarativeRectangle*>(rectComponent.create());
         QVERIFY(rect != 0);
 
         QCOMPARE(rect->color(),QColor("red"));
@@ -703,10 +703,10 @@ void tst_qmlstates::script()
 
 void tst_qmlstates::restoreEntryValues()
 {
-    QmlEngine engine;
+    QDeclarativeEngine engine;
 
-    QmlComponent rectComponent(&engine, SRCDIR "/data/restoreEntryValues.qml");
-    QmlGraphicsRectangle *rect = qobject_cast<QmlGraphicsRectangle*>(rectComponent.create());
+    QDeclarativeComponent rectComponent(&engine, SRCDIR "/data/restoreEntryValues.qml");
+    QDeclarativeRectangle *rect = qobject_cast<QDeclarativeRectangle*>(rectComponent.create());
     QVERIFY(rect != 0);
 
     QCOMPARE(rect->color(),QColor("red"));
@@ -720,18 +720,18 @@ void tst_qmlstates::restoreEntryValues()
 
 void tst_qmlstates::explicitChanges()
 {
-    QmlEngine engine;
+    QDeclarativeEngine engine;
 
-    QmlComponent rectComponent(&engine, SRCDIR "/data/explicit.qml");
-    QmlGraphicsRectangle *rect = qobject_cast<QmlGraphicsRectangle*>(rectComponent.create());
+    QDeclarativeComponent rectComponent(&engine, SRCDIR "/data/explicit.qml");
+    QDeclarativeRectangle *rect = qobject_cast<QDeclarativeRectangle*>(rectComponent.create());
     QVERIFY(rect != 0);
 
-    QmlListReference list(rect, "states");
-    QmlState *state = qobject_cast<QmlState*>(list.at(0));
+    QDeclarativeListReference list(rect, "states");
+    QDeclarativeState *state = qobject_cast<QDeclarativeState*>(list.at(0));
     QVERIFY(state != 0);
 
     qmlExecuteDeferred(state);
-    QmlPropertyChanges *changes = qobject_cast<QmlPropertyChanges*>(rect->findChild<QmlPropertyChanges*>("changes"));
+    QDeclarativePropertyChanges *changes = qobject_cast<QDeclarativePropertyChanges*>(rect->findChild<QDeclarativePropertyChanges*>("changes"));
     QVERIFY(changes != 0);
     QVERIFY(changes->isExplicit());
 
@@ -754,9 +754,9 @@ void tst_qmlstates::explicitChanges()
 
 void tst_qmlstates::propertyErrors()
 {
-    QmlEngine engine;
-    QmlComponent rectComponent(&engine, SRCDIR "/data/propertyErrors.qml");
-    QmlGraphicsRectangle *rect = qobject_cast<QmlGraphicsRectangle*>(rectComponent.create());
+    QDeclarativeEngine engine;
+    QDeclarativeComponent rectComponent(&engine, SRCDIR "/data/propertyErrors.qml");
+    QDeclarativeRectangle *rect = qobject_cast<QDeclarativeRectangle*>(rectComponent.create());
     QVERIFY(rect != 0);
 
     QCOMPARE(rect->color(),QColor("red"));
@@ -768,10 +768,10 @@ void tst_qmlstates::propertyErrors()
 
 void tst_qmlstates::incorrectRestoreBug()
 {
-    QmlEngine engine;
+    QDeclarativeEngine engine;
 
-    QmlComponent rectComponent(&engine, SRCDIR "/data/basicChanges.qml");
-    QmlGraphicsRectangle *rect = qobject_cast<QmlGraphicsRectangle*>(rectComponent.create());
+    QDeclarativeComponent rectComponent(&engine, SRCDIR "/data/basicChanges.qml");
+    QDeclarativeRectangle *rect = qobject_cast<QDeclarativeRectangle*>(rectComponent.create());
     QVERIFY(rect != 0);
 
     QCOMPARE(rect->color(),QColor("red"));
@@ -794,9 +794,9 @@ void tst_qmlstates::incorrectRestoreBug()
 
 void tst_qmlstates::autoStateAtStartupRestoreBug()
 {
-    QmlEngine engine;
+    QDeclarativeEngine engine;
 
-    QmlComponent component(&engine, SRCDIR "/data/autoStateAtStartupRestoreBug.qml");
+    QDeclarativeComponent component(&engine, SRCDIR "/data/autoStateAtStartupRestoreBug.qml");
     QObject *obj = component.create();
 
     QVERIFY(obj != 0);
@@ -811,10 +811,10 @@ void tst_qmlstates::autoStateAtStartupRestoreBug()
 
 void tst_qmlstates::deletingChange()
 {
-    QmlEngine engine;
+    QDeclarativeEngine engine;
 
-    QmlComponent rectComponent(&engine, SRCDIR "/data/deleting.qml");
-    QmlGraphicsRectangle *rect = qobject_cast<QmlGraphicsRectangle*>(rectComponent.create());
+    QDeclarativeComponent rectComponent(&engine, SRCDIR "/data/deleting.qml");
+    QDeclarativeRectangle *rect = qobject_cast<QDeclarativeRectangle*>(rectComponent.create());
     QVERIFY(rect != 0);
 
     rect->setState("blue");
@@ -825,11 +825,11 @@ void tst_qmlstates::deletingChange()
     QCOMPARE(rect->color(),QColor("red"));
     QCOMPARE(rect->radius(),qreal(0));
 
-    QmlPropertyChanges *pc = rect->findChild<QmlPropertyChanges*>("pc1");
+    QDeclarativePropertyChanges *pc = rect->findChild<QDeclarativePropertyChanges*>("pc1");
     QVERIFY(pc != 0);
     delete pc;
 
-    QmlState *state = rect->findChild<QmlState*>();
+    QDeclarativeState *state = rect->findChild<QDeclarativeState*>();
     QVERIFY(state != 0);
     qmlExecuteDeferred(state);
     QCOMPARE(state->operationCount(), 1);
@@ -843,13 +843,13 @@ void tst_qmlstates::deletingChange()
 
 void tst_qmlstates::deletingState()
 {
-    QmlEngine engine;
+    QDeclarativeEngine engine;
 
-    QmlComponent rectComponent(&engine, SRCDIR "/data/deletingState.qml");
-    QmlGraphicsRectangle *rect = qobject_cast<QmlGraphicsRectangle*>(rectComponent.create());
+    QDeclarativeComponent rectComponent(&engine, SRCDIR "/data/deletingState.qml");
+    QDeclarativeRectangle *rect = qobject_cast<QDeclarativeRectangle*>(rectComponent.create());
     QVERIFY(rect != 0);
 
-    QmlStateGroup *sg = rect->findChild<QmlStateGroup*>();
+    QDeclarativeStateGroup *sg = rect->findChild<QDeclarativeStateGroup*>();
     QVERIFY(sg != 0);
     QVERIFY(sg->findState("blue") != 0);
 
@@ -859,7 +859,7 @@ void tst_qmlstates::deletingState()
     sg->setState("");
     QCOMPARE(rect->color(),QColor("red"));
 
-    QmlState *state = rect->findChild<QmlState*>();
+    QDeclarativeState *state = rect->findChild<QDeclarativeState*>();
     QVERIFY(state != 0);
     delete state;
 
@@ -874,10 +874,10 @@ void tst_qmlstates::deletingState()
 
 void tst_qmlstates::tempState()
 {
-    QmlEngine engine;
+    QDeclarativeEngine engine;
 
-    QmlComponent rectComponent(&engine, SRCDIR "/data/legalTempState.qml");
-    QmlGraphicsRectangle *rect = qobject_cast<QmlGraphicsRectangle*>(rectComponent.create());
+    QDeclarativeComponent rectComponent(&engine, SRCDIR "/data/legalTempState.qml");
+    QDeclarativeRectangle *rect = qobject_cast<QDeclarativeRectangle*>(rectComponent.create());
     QVERIFY(rect != 0);
 
     QTest::ignoreMessage(QtDebugMsg, "entering placed");
@@ -888,10 +888,10 @@ void tst_qmlstates::tempState()
 
 void tst_qmlstates::illegalTempState()
 {
-    QmlEngine engine;
+    QDeclarativeEngine engine;
 
-    QmlComponent rectComponent(&engine, SRCDIR "/data/illegalTempState.qml");
-    QmlGraphicsRectangle *rect = qobject_cast<QmlGraphicsRectangle*>(rectComponent.create());
+    QDeclarativeComponent rectComponent(&engine, SRCDIR "/data/illegalTempState.qml");
+    QDeclarativeRectangle *rect = qobject_cast<QDeclarativeRectangle*>(rectComponent.create());
     QVERIFY(rect != 0);
 
     QTest::ignoreMessage(QtWarningMsg, "Can't apply a state change as part of a state definition. ");
@@ -901,10 +901,10 @@ void tst_qmlstates::illegalTempState()
 
 void tst_qmlstates::nonExistantProperty()
 {
-    QmlEngine engine;
+    QDeclarativeEngine engine;
 
-    QmlComponent rectComponent(&engine, SRCDIR "/data/nonExistantProp.qml");
-    QmlGraphicsRectangle *rect = qobject_cast<QmlGraphicsRectangle*>(rectComponent.create());
+    QDeclarativeComponent rectComponent(&engine, SRCDIR "/data/nonExistantProp.qml");
+    QDeclarativeRectangle *rect = qobject_cast<QDeclarativeRectangle*>(rectComponent.create());
     QVERIFY(rect != 0);
 
     QTest::ignoreMessage(QtWarningMsg, QByteArray("QML PropertyChanges (" + fullDataPath("/data/nonExistantProp.qml") + ":9:9) Cannot assign to non-existent property \"colr\"").constData());
@@ -914,4 +914,4 @@ void tst_qmlstates::nonExistantProperty()
 
 QTEST_MAIN(tst_qmlstates)
 
-#include "tst_qmlstates.moc"
+#include "tst_qdeclarativestates.moc"
diff --git a/tests/auto/declarative/qmlstyledtext/qmlstyledtext.pro b/tests/auto/declarative/qdeclarativestyledtext/qdeclarativestyledtext.pro
index d535835..bd4d829 100644
--- a/tests/auto/declarative/qmlstyledtext/qmlstyledtext.pro
+++ b/tests/auto/declarative/qdeclarativestyledtext/qdeclarativestyledtext.pro
@@ -3,7 +3,7 @@ contains(QT_CONFIG,declarative): QT += declarative
 QT += network
 macx:CONFIG -= app_bundle
 
-SOURCES += tst_qmlstyledtext.cpp
+SOURCES += tst_qdeclarativestyledtext.cpp
 
 # QMAKE_CXXFLAGS = -fprofile-arcs -ftest-coverage
 # LIBS += -lgcov
diff --git a/tests/auto/declarative/qmlstyledtext/tst_qmlstyledtext.cpp b/tests/auto/declarative/qdeclarativestyledtext/tst_qdeclarativestyledtext.cpp
index 5e675b1..1968300 100644
--- a/tests/auto/declarative/qmlstyledtext/tst_qmlstyledtext.cpp
+++ b/tests/auto/declarative/qdeclarativestyledtext/tst_qdeclarativestyledtext.cpp
@@ -41,7 +41,7 @@
 #include <qtest.h>
 #include <QtTest/QtTest>
 #include <QtGui/QTextLayout>
-#include <private/qmlstyledtext_p.h>
+#include <private/qdeclarativestyledtext_p.h>
 
 class tst_qmlstyledtext : public QObject
 {
@@ -85,7 +85,7 @@ void tst_qmlstyledtext::textOutput()
     QFETCH(QString, output);
 
     QTextLayout layout;
-    QmlStyledText::parse(input, layout);
+    QDeclarativeStyledText::parse(input, layout);
 
     QCOMPARE(layout.text(), output);
 }
@@ -93,4 +93,4 @@ void tst_qmlstyledtext::textOutput()
 
 QTEST_MAIN(tst_qmlstyledtext)
 
-#include "tst_qmlstyledtext.moc"
+#include "tst_qdeclarativestyledtext.moc"
diff --git a/tests/auto/declarative/qmlsystempalette/qmlsystempalette.pro b/tests/auto/declarative/qdeclarativesystempalette/qdeclarativesystempalette.pro
index 4d55b46..0781774 100644
--- a/tests/auto/declarative/qmlsystempalette/qmlsystempalette.pro
+++ b/tests/auto/declarative/qdeclarativesystempalette/qdeclarativesystempalette.pro
@@ -2,4 +2,4 @@ load(qttest_p4)
 contains(QT_CONFIG,declarative): QT += declarative gui
 macx:CONFIG -= app_bundle
 
-SOURCES += tst_qmlsystempalette.cpp
+SOURCES += tst_qdeclarativesystempalette.cpp
diff --git a/tests/auto/declarative/qmlsystempalette/tst_qmlsystempalette.cpp b/tests/auto/declarative/qdeclarativesystempalette/tst_qdeclarativesystempalette.cpp
index 06e4d1c..0f6383e 100644
--- a/tests/auto/declarative/qmlsystempalette/tst_qmlsystempalette.cpp
+++ b/tests/auto/declarative/qdeclarativesystempalette/tst_qdeclarativesystempalette.cpp
@@ -41,9 +41,9 @@
 
 #include <qtest.h>
 #include <QDebug>
-#include <QtDeclarative/qmlengine.h>
-#include <QtDeclarative/qmlcomponent.h>
-#include <private/qmlsystempalette_p.h>
+#include <QtDeclarative/qdeclarativeengine.h>
+#include <QtDeclarative/qdeclarativecomponent.h>
+#include <private/qdeclarativesystempalette_p.h>
 #include <qpalette.h>
 #include "../../../shared/util.h"
 
@@ -61,7 +61,7 @@ private slots:
     void paletteChanged();
 
 private:
-    QmlEngine engine;
+    QDeclarativeEngine engine;
 };
 
 tst_qmlsystempalette::tst_qmlsystempalette()
@@ -71,9 +71,9 @@ tst_qmlsystempalette::tst_qmlsystempalette()
 void tst_qmlsystempalette::activePalette()
 {
     QString componentStr = "import Qt 4.6\nSystemPalette { }";
-    QmlComponent component(&engine);
+    QDeclarativeComponent component(&engine);
     component.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
-    QmlSystemPalette *object = qobject_cast<QmlSystemPalette*>(component.create());
+    QDeclarativeSystemPalette *object = qobject_cast<QDeclarativeSystemPalette*>(component.create());
 
     QVERIFY(object != 0);
 
@@ -100,12 +100,12 @@ void tst_qmlsystempalette::activePalette()
 void tst_qmlsystempalette::inactivePalette()
 {
     QString componentStr = "import Qt 4.6\nSystemPalette { colorGroup: SystemPalette.Inactive }";
-    QmlComponent component(&engine);
+    QDeclarativeComponent component(&engine);
     component.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
-    QmlSystemPalette *object = qobject_cast<QmlSystemPalette*>(component.create());
+    QDeclarativeSystemPalette *object = qobject_cast<QDeclarativeSystemPalette*>(component.create());
 
     QVERIFY(object != 0);
-    QVERIFY(object->colorGroup() == QmlSystemPalette::Inactive);
+    QVERIFY(object->colorGroup() == QDeclarativeSystemPalette::Inactive);
 
     QPalette palette;
     palette.setCurrentColorGroup(QPalette::Inactive);
@@ -130,12 +130,12 @@ void tst_qmlsystempalette::inactivePalette()
 void tst_qmlsystempalette::disabledPalette()
 {
     QString componentStr = "import Qt 4.6\nSystemPalette { colorGroup: SystemPalette.Disabled }";
-    QmlComponent component(&engine);
+    QDeclarativeComponent component(&engine);
     component.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
-    QmlSystemPalette *object = qobject_cast<QmlSystemPalette*>(component.create());
+    QDeclarativeSystemPalette *object = qobject_cast<QDeclarativeSystemPalette*>(component.create());
 
     QVERIFY(object != 0);
-    QVERIFY(object->colorGroup() == QmlSystemPalette::Disabled);
+    QVERIFY(object->colorGroup() == QDeclarativeSystemPalette::Disabled);
 
     QPalette palette;
     palette.setCurrentColorGroup(QPalette::Disabled);
@@ -160,9 +160,9 @@ void tst_qmlsystempalette::disabledPalette()
 void tst_qmlsystempalette::paletteChanged()
 {
     QString componentStr = "import Qt 4.6\nSystemPalette { }";
-    QmlComponent component(&engine);
+    QDeclarativeComponent component(&engine);
     component.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
-    QmlSystemPalette *object = qobject_cast<QmlSystemPalette*>(component.create());
+    QDeclarativeSystemPalette *object = qobject_cast<QDeclarativeSystemPalette*>(component.create());
 
     QVERIFY(object != 0);
 
@@ -174,7 +174,7 @@ void tst_qmlsystempalette::paletteChanged()
 
     qApp->setPalette(p);
 
-    object->setColorGroup(QmlSystemPalette::Active);
+    object->setColorGroup(QDeclarativeSystemPalette::Active);
     QTRY_COMPARE(QColor("red"), object->text());
     QTRY_COMPARE(QColor("green"), object->buttonText());
     QTRY_COMPARE(QColor("blue"), object->windowText());
@@ -184,4 +184,4 @@ void tst_qmlsystempalette::paletteChanged()
 
 QTEST_MAIN(tst_qmlsystempalette)
 
-#include "tst_qmlsystempalette.moc"
+#include "tst_qdeclarativesystempalette.moc"
diff --git a/tests/auto/declarative/qmlgraphicstext/qmlgraphicstext.pro b/tests/auto/declarative/qdeclarativetext/qdeclarativetext.pro
index 1d8c59f..8b4b4d1 100644
--- a/tests/auto/declarative/qmlgraphicstext/qmlgraphicstext.pro
+++ b/tests/auto/declarative/qdeclarativetext/qdeclarativetext.pro
@@ -2,4 +2,4 @@ load(qttest_p4)
 contains(QT_CONFIG,declarative): QT += declarative gui
 macx:CONFIG -= app_bundle
 
-SOURCES += tst_qmlgraphicstext.cpp
+SOURCES += tst_qdeclarativetext.cpp
diff --git a/tests/auto/declarative/qmlgraphicstext/tst_qmlgraphicstext.cpp b/tests/auto/declarative/qdeclarativetext/tst_qdeclarativetext.cpp
index 2c1e09b..8026f1a 100644
--- a/tests/auto/declarative/qmlgraphicstext/tst_qmlgraphicstext.cpp
+++ b/tests/auto/declarative/qdeclarativetext/tst_qdeclarativetext.cpp
@@ -40,10 +40,10 @@
 ****************************************************************************/
 #include <qtest.h>
 #include <QTextDocument>
-#include <QtDeclarative/qmlengine.h>
-#include <QtDeclarative/qmlcomponent.h>
-#include <private/qmlgraphicstext_p.h>
-#include <private/qmlvaluetype_p.h>
+#include <QtDeclarative/qdeclarativeengine.h>
+#include <QtDeclarative/qdeclarativecomponent.h>
+#include <private/qdeclarativetext_p.h>
+#include <private/qdeclarativevaluetype_p.h>
 #include <QFontMetrics>
 #include <QGraphicsSceneMouseEvent>
 #include <qmath.h>
@@ -70,7 +70,7 @@ private slots:
     void color();
     void smooth();
 
-    // QmlFontValueType
+    // QDeclarativeFontValueType
     void weight();
     void underline();
     void overline();
@@ -92,11 +92,11 @@ private:
     QList<Qt::Alignment> horizontalAlignmentments;
 
     QStringList styleStrings;
-    QList<QmlGraphicsText::TextStyle> styles;
+    QList<QDeclarativeText::TextStyle> styles;
 
     QStringList colorStrings;
 
-    QmlEngine engine;
+    QDeclarativeEngine engine;
 };
 
 tst_qmlgraphicstext::tst_qmlgraphicstext()
@@ -128,10 +128,10 @@ tst_qmlgraphicstext::tst_qmlgraphicstext()
             << "Raised"
             << "Sunken";
 
-    styles << QmlGraphicsText::Normal
-            << QmlGraphicsText::Outline
-            << QmlGraphicsText::Raised
-            << QmlGraphicsText::Sunken;
+    styles << QDeclarativeText::Normal
+            << QDeclarativeText::Outline
+            << QDeclarativeText::Raised
+            << QDeclarativeText::Sunken;
 
     colorStrings << "aliceblue"
             << "antiquewhite"
@@ -155,9 +155,9 @@ tst_qmlgraphicstext::tst_qmlgraphicstext()
 void tst_qmlgraphicstext::text()
 {
     {
-        QmlComponent textComponent(&engine);
+        QDeclarativeComponent textComponent(&engine);
         textComponent.setData("import Qt 4.6\nText { text: \"\" }", QUrl::fromLocalFile(""));
-        QmlGraphicsText *textObject = qobject_cast<QmlGraphicsText*>(textComponent.create());
+        QDeclarativeText *textObject = qobject_cast<QDeclarativeText*>(textComponent.create());
 
         QVERIFY(textObject != 0);
         QCOMPARE(textObject->text(), QString(""));
@@ -169,10 +169,10 @@ void tst_qmlgraphicstext::text()
     for (int i = 0; i < standard.size(); i++)
     {
         QString componentStr = "import Qt 4.6\nText { text: \"" + standard.at(i) + "\" }";
-        QmlComponent textComponent(&engine);
+        QDeclarativeComponent textComponent(&engine);
         textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
 
-        QmlGraphicsText *textObject = qobject_cast<QmlGraphicsText*>(textComponent.create());
+        QDeclarativeText *textObject = qobject_cast<QDeclarativeText*>(textComponent.create());
 
         QVERIFY(textObject != 0);
         QCOMPARE(textObject->text(), standard.at(i));
@@ -182,9 +182,9 @@ void tst_qmlgraphicstext::text()
     for (int i = 0; i < richText.size(); i++)
     {
         QString componentStr = "import Qt 4.6\nText { text: \"" + richText.at(i) + "\" }";
-        QmlComponent textComponent(&engine);
+        QDeclarativeComponent textComponent(&engine);
         textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
-        QmlGraphicsText *textObject = qobject_cast<QmlGraphicsText*>(textComponent.create());
+        QDeclarativeText *textObject = qobject_cast<QDeclarativeText*>(textComponent.create());
 
         QVERIFY(textObject != 0);
         QString expected = richText.at(i);
@@ -197,9 +197,9 @@ void tst_qmlgraphicstext::width()
 {
     // uses Font metrics to find the width for standard and document to find the width for rich
     {
-        QmlComponent textComponent(&engine);
+        QDeclarativeComponent textComponent(&engine);
         textComponent.setData("import Qt 4.6\nText { text: \"\" }", QUrl::fromLocalFile(""));
-        QmlGraphicsText *textObject = qobject_cast<QmlGraphicsText*>(textComponent.create());
+        QDeclarativeText *textObject = qobject_cast<QDeclarativeText*>(textComponent.create());
 
         QVERIFY(textObject != 0);
         QCOMPARE(textObject->width(), 0.);
@@ -215,13 +215,13 @@ void tst_qmlgraphicstext::width()
         metricWidth = qCeil(metricWidth);
 
         QString componentStr = "import Qt 4.6\nText { text: \"" + standard.at(i) + "\" }";
-        QmlComponent textComponent(&engine);
+        QDeclarativeComponent textComponent(&engine);
         textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
-        QmlGraphicsText *textObject = qobject_cast<QmlGraphicsText*>(textComponent.create());
+        QDeclarativeText *textObject = qobject_cast<QDeclarativeText*>(textComponent.create());
 
         QVERIFY(textObject != 0);
         QCOMPARE(textObject->width(), qreal(metricWidth));
-        QVERIFY(textObject->textFormat() == QmlGraphicsText::AutoText); // setting text doesn't change format
+        QVERIFY(textObject->textFormat() == QDeclarativeText::AutoText); // setting text doesn't change format
     }
 
     for (int i = 0; i < richText.size(); i++)
@@ -235,13 +235,13 @@ void tst_qmlgraphicstext::width()
         int documentWidth = document.idealWidth();
 
         QString componentStr = "import Qt 4.6\nText { text: \"" + richText.at(i) + "\" }";
-        QmlComponent textComponent(&engine);
+        QDeclarativeComponent textComponent(&engine);
         textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
-        QmlGraphicsText *textObject = qobject_cast<QmlGraphicsText*>(textComponent.create());
+        QDeclarativeText *textObject = qobject_cast<QDeclarativeText*>(textComponent.create());
 
         QVERIFY(textObject != 0);
         QCOMPARE(textObject->width(), qreal(documentWidth));
-        QVERIFY(textObject->textFormat() == QmlGraphicsText::AutoText); // setting text doesn't change format
+        QVERIFY(textObject->textFormat() == QDeclarativeText::AutoText); // setting text doesn't change format
     }
 }
 
@@ -250,9 +250,9 @@ void tst_qmlgraphicstext::wrap()
     int textHeight = 0;
     // for specified width and wrap set true
     {
-        QmlComponent textComponent(&engine);
+        QDeclarativeComponent textComponent(&engine);
         textComponent.setData("import Qt 4.6\nText { text: \"Hello\"; wrap: true; width: 300 }", QUrl::fromLocalFile(""));
-        QmlGraphicsText *textObject = qobject_cast<QmlGraphicsText*>(textComponent.create());
+        QDeclarativeText *textObject = qobject_cast<QDeclarativeText*>(textComponent.create());
         textHeight = textObject->height();
 
         QVERIFY(textObject != 0);
@@ -263,9 +263,9 @@ void tst_qmlgraphicstext::wrap()
     for (int i = 0; i < standard.size(); i++)
     {
         QString componentStr = "import Qt 4.6\nText { wrap: true; width: 30; text: \"" + standard.at(i) + "\" }";
-        QmlComponent textComponent(&engine);
+        QDeclarativeComponent textComponent(&engine);
         textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
-        QmlGraphicsText *textObject = qobject_cast<QmlGraphicsText*>(textComponent.create());
+        QDeclarativeText *textObject = qobject_cast<QDeclarativeText*>(textComponent.create());
 
         QVERIFY(textObject != 0);
         QCOMPARE(textObject->width(), 30.);
@@ -279,9 +279,9 @@ void tst_qmlgraphicstext::wrap()
     for (int i = 0; i < richText.size(); i++)
     {
         QString componentStr = "import Qt 4.6\nText { wrap: true; width: 30; text: \"" + richText.at(i) + "\" }";
-        QmlComponent textComponent(&engine);
+        QDeclarativeComponent textComponent(&engine);
         textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
-        QmlGraphicsText *textObject = qobject_cast<QmlGraphicsText*>(textComponent.create());
+        QDeclarativeText *textObject = qobject_cast<QDeclarativeText*>(textComponent.create());
 
         QVERIFY(textObject != 0);
         QCOMPARE(textObject->width(), 30.);
@@ -292,16 +292,16 @@ void tst_qmlgraphicstext::wrap()
 
 void tst_qmlgraphicstext::elide()
 {
-    for (QmlGraphicsText::TextElideMode m = QmlGraphicsText::ElideLeft; m<=QmlGraphicsText::ElideNone; m=QmlGraphicsText::TextElideMode(int(m)+1)) {
+    for (QDeclarativeText::TextElideMode m = QDeclarativeText::ElideLeft; m<=QDeclarativeText::ElideNone; m=QDeclarativeText::TextElideMode(int(m)+1)) {
         const char* elidename[]={"ElideLeft", "ElideRight", "ElideMiddle", "ElideNone"};
         QString elide = "elide: Text." + QString(elidename[int(m)]) + ";";
 
         // XXX Poor coverage.
 
         {
-            QmlComponent textComponent(&engine);
+            QDeclarativeComponent textComponent(&engine);
             textComponent.setData(("import Qt 4.6\nText { text: \"\"; "+elide+" width: 100 }").toLatin1(), QUrl::fromLocalFile(""));
-            QmlGraphicsText *textObject = qobject_cast<QmlGraphicsText*>(textComponent.create());
+            QDeclarativeText *textObject = qobject_cast<QDeclarativeText*>(textComponent.create());
 
             QCOMPARE(textObject->elideMode(), m);
             QCOMPARE(textObject->width(), 100.);
@@ -310,9 +310,9 @@ void tst_qmlgraphicstext::elide()
         for (int i = 0; i < standard.size(); i++)
         {
             QString componentStr = "import Qt 4.6\nText { "+elide+" width: 100; text: \"" + standard.at(i) + "\" }";
-            QmlComponent textComponent(&engine);
+            QDeclarativeComponent textComponent(&engine);
             textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
-            QmlGraphicsText *textObject = qobject_cast<QmlGraphicsText*>(textComponent.create());
+            QDeclarativeText *textObject = qobject_cast<QDeclarativeText*>(textComponent.create());
 
             QCOMPARE(textObject->elideMode(), m);
             QCOMPARE(textObject->width(), 100.);
@@ -322,9 +322,9 @@ void tst_qmlgraphicstext::elide()
         for (int i = 0; i < richText.size(); i++)
         {
             QString componentStr = "import Qt 4.6\nText { "+elide+" width: 100; text: \"" + richText.at(i) + "\" }";
-            QmlComponent textComponent(&engine);
+            QDeclarativeComponent textComponent(&engine);
             textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
-            QmlGraphicsText *textObject = qobject_cast<QmlGraphicsText*>(textComponent.create());
+            QDeclarativeText *textObject = qobject_cast<QDeclarativeText*>(textComponent.create());
 
             QCOMPARE(textObject->elideMode(), m);
             QCOMPARE(textObject->width(), 100.);
@@ -335,20 +335,20 @@ void tst_qmlgraphicstext::elide()
 void tst_qmlgraphicstext::textFormat()
 {
     {
-        QmlComponent textComponent(&engine);
+        QDeclarativeComponent textComponent(&engine);
         textComponent.setData("import Qt 4.6\nText { text: \"Hello\"; textFormat: Text.RichText }", QUrl::fromLocalFile(""));
-        QmlGraphicsText *textObject = qobject_cast<QmlGraphicsText*>(textComponent.create());
+        QDeclarativeText *textObject = qobject_cast<QDeclarativeText*>(textComponent.create());
 
         QVERIFY(textObject != 0);
-        QVERIFY(textObject->textFormat() == QmlGraphicsText::RichText);
+        QVERIFY(textObject->textFormat() == QDeclarativeText::RichText);
     }
     {
-        QmlComponent textComponent(&engine);
+        QDeclarativeComponent textComponent(&engine);
         textComponent.setData("import Qt 4.6\nText { text: \"<b>Hello</b>\"; textFormat: Text.PlainText }", QUrl::fromLocalFile(""));
-        QmlGraphicsText *textObject = qobject_cast<QmlGraphicsText*>(textComponent.create());
+        QDeclarativeText *textObject = qobject_cast<QDeclarativeText*>(textComponent.create());
 
         QVERIFY(textObject != 0);
-        QVERIFY(textObject->textFormat() == QmlGraphicsText::PlainText);
+        QVERIFY(textObject->textFormat() == QDeclarativeText::PlainText);
     }
 }
 
@@ -362,9 +362,9 @@ void tst_qmlgraphicstext::horizontalAlignment()
         for (int j=0; j < horizontalAlignmentmentStrings.size(); j++)
         {
             QString componentStr = "import Qt 4.6\nText { horizontalAlignment: \"" + horizontalAlignmentmentStrings.at(j) + "\"; text: \"" + standard.at(i) + "\" }";
-            QmlComponent textComponent(&engine);
+            QDeclarativeComponent textComponent(&engine);
             textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
-            QmlGraphicsText *textObject = qobject_cast<QmlGraphicsText*>(textComponent.create());
+            QDeclarativeText *textObject = qobject_cast<QDeclarativeText*>(textComponent.create());
 
             QCOMPARE((int)textObject->hAlign(), (int)horizontalAlignmentments.at(j));
         }
@@ -375,9 +375,9 @@ void tst_qmlgraphicstext::horizontalAlignment()
         for (int j=0; j < horizontalAlignmentmentStrings.size(); j++)
         {
             QString componentStr = "import Qt 4.6\nText { horizontalAlignment: \"" + horizontalAlignmentmentStrings.at(j) + "\"; text: \"" + richText.at(i) + "\" }";
-            QmlComponent textComponent(&engine);
+            QDeclarativeComponent textComponent(&engine);
             textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
-            QmlGraphicsText *textObject = qobject_cast<QmlGraphicsText*>(textComponent.create());
+            QDeclarativeText *textObject = qobject_cast<QDeclarativeText*>(textComponent.create());
 
             QCOMPARE((int)textObject->hAlign(), (int)horizontalAlignmentments.at(j));
         }
@@ -394,9 +394,9 @@ void tst_qmlgraphicstext::verticalAlignment()
         for (int j=0; j < verticalAlignmentmentStrings.size(); j++)
         {
             QString componentStr = "import Qt 4.6\nText { verticalAlignment: \"" + verticalAlignmentmentStrings.at(j) + "\"; text: \"" + standard.at(i) + "\" }";
-            QmlComponent textComponent(&engine);
+            QDeclarativeComponent textComponent(&engine);
             textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
-            QmlGraphicsText *textObject = qobject_cast<QmlGraphicsText*>(textComponent.create());
+            QDeclarativeText *textObject = qobject_cast<QDeclarativeText*>(textComponent.create());
 
             QVERIFY(textObject != 0);
             QCOMPARE((int)textObject->vAlign(), (int)verticalAlignmentments.at(j));
@@ -408,9 +408,9 @@ void tst_qmlgraphicstext::verticalAlignment()
         for (int j=0; j < verticalAlignmentmentStrings.size(); j++)
         {
             QString componentStr = "import Qt 4.6\nText { verticalAlignment: \"" + verticalAlignmentmentStrings.at(j) + "\"; text: \"" + richText.at(i) + "\" }";
-            QmlComponent textComponent(&engine);
+            QDeclarativeComponent textComponent(&engine);
             textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
-            QmlGraphicsText *textObject = qobject_cast<QmlGraphicsText*>(textComponent.create());
+            QDeclarativeText *textObject = qobject_cast<QDeclarativeText*>(textComponent.create());
 
             QVERIFY(textObject != 0);
             QCOMPARE((int)textObject->vAlign(), (int)verticalAlignmentments.at(j));
@@ -424,9 +424,9 @@ void tst_qmlgraphicstext::font()
     //test size, then bold, then italic, then family
     {
         QString componentStr = "import Qt 4.6\nText { font.pointSize: 40; text: \"Hello World\" }";
-        QmlComponent textComponent(&engine);
+        QDeclarativeComponent textComponent(&engine);
         textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
-        QmlGraphicsText *textObject = qobject_cast<QmlGraphicsText*>(textComponent.create());
+        QDeclarativeText *textObject = qobject_cast<QDeclarativeText*>(textComponent.create());
 
         QCOMPARE(textObject->font().pointSize(), 40);
         QCOMPARE(textObject->font().bold(), false);
@@ -435,9 +435,9 @@ void tst_qmlgraphicstext::font()
 
     {
         QString componentStr = "import Qt 4.6\nText { font.pixelSize: 40; text: \"Hello World\" }";
-        QmlComponent textComponent(&engine);
+        QDeclarativeComponent textComponent(&engine);
         textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
-        QmlGraphicsText *textObject = qobject_cast<QmlGraphicsText*>(textComponent.create());
+        QDeclarativeText *textObject = qobject_cast<QDeclarativeText*>(textComponent.create());
 
         QCOMPARE(textObject->font().pixelSize(), 40);
         QCOMPARE(textObject->font().bold(), false);
@@ -446,9 +446,9 @@ void tst_qmlgraphicstext::font()
 
     { 
         QString componentStr = "import Qt 4.6\nText { font.bold: true; text: \"Hello World\" }";
-        QmlComponent textComponent(&engine);
+        QDeclarativeComponent textComponent(&engine);
         textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
-        QmlGraphicsText *textObject = qobject_cast<QmlGraphicsText*>(textComponent.create());
+        QDeclarativeText *textObject = qobject_cast<QDeclarativeText*>(textComponent.create());
 
         QCOMPARE(textObject->font().bold(), true);
         QCOMPARE(textObject->font().italic(), false);
@@ -456,9 +456,9 @@ void tst_qmlgraphicstext::font()
 
     { 
         QString componentStr = "import Qt 4.6\nText { font.italic: true; text: \"Hello World\" }";
-        QmlComponent textComponent(&engine);
+        QDeclarativeComponent textComponent(&engine);
         textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
-        QmlGraphicsText *textObject = qobject_cast<QmlGraphicsText*>(textComponent.create());
+        QDeclarativeText *textObject = qobject_cast<QDeclarativeText*>(textComponent.create());
 
         QCOMPARE(textObject->font().italic(), true);
         QCOMPARE(textObject->font().bold(), false);
@@ -466,9 +466,9 @@ void tst_qmlgraphicstext::font()
 
     { 
         QString componentStr = "import Qt 4.6\nText { font.family: \"Helvetica\"; text: \"Hello World\" }";
-        QmlComponent textComponent(&engine);
+        QDeclarativeComponent textComponent(&engine);
         textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
-        QmlGraphicsText *textObject = qobject_cast<QmlGraphicsText*>(textComponent.create());
+        QDeclarativeText *textObject = qobject_cast<QDeclarativeText*>(textComponent.create());
 
         QCOMPARE(textObject->font().family(), QString("Helvetica"));
         QCOMPARE(textObject->font().bold(), false);
@@ -477,9 +477,9 @@ void tst_qmlgraphicstext::font()
 
     { 
         QString componentStr = "import Qt 4.6\nText { font.family: \"\"; text: \"Hello World\" }";
-        QmlComponent textComponent(&engine);
+        QDeclarativeComponent textComponent(&engine);
         textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
-        QmlGraphicsText *textObject = qobject_cast<QmlGraphicsText*>(textComponent.create());
+        QDeclarativeText *textObject = qobject_cast<QDeclarativeText*>(textComponent.create());
 
         QCOMPARE(textObject->font().family(), QString(""));
     }
@@ -491,9 +491,9 @@ void tst_qmlgraphicstext::style()
     for (int i = 0; i < styles.size(); i++)
     { 
         QString componentStr = "import Qt 4.6\nText { style: \"" + styleStrings.at(i) + "\"; styleColor: \"white\"; text: \"Hello World\" }";
-        QmlComponent textComponent(&engine);
+        QDeclarativeComponent textComponent(&engine);
         textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
-        QmlGraphicsText *textObject = qobject_cast<QmlGraphicsText*>(textComponent.create());
+        QDeclarativeText *textObject = qobject_cast<QDeclarativeText*>(textComponent.create());
 
         QCOMPARE((int)textObject->style(), (int)styles.at(i));
         QCOMPARE(textObject->styleColor(), QColor("white"));
@@ -506,9 +506,9 @@ void tst_qmlgraphicstext::color()
     for (int i = 0; i < colorStrings.size(); i++)
     { 
         QString componentStr = "import Qt 4.6\nText { color: \"" + colorStrings.at(i) + "\"; text: \"Hello World\" }";
-        QmlComponent textComponent(&engine);
+        QDeclarativeComponent textComponent(&engine);
         textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
-        QmlGraphicsText *textObject = qobject_cast<QmlGraphicsText*>(textComponent.create());
+        QDeclarativeText *textObject = qobject_cast<QDeclarativeText*>(textComponent.create());
 
         QCOMPARE(textObject->color(), QColor(colorStrings.at(i)));
         QCOMPARE(textObject->styleColor(), QColor());
@@ -517,9 +517,9 @@ void tst_qmlgraphicstext::color()
     for (int i = 0; i < colorStrings.size(); i++)
     { 
         QString componentStr = "import Qt 4.6\nText { styleColor: \"" + colorStrings.at(i) + "\"; text: \"Hello World\" }";
-        QmlComponent textComponent(&engine);
+        QDeclarativeComponent textComponent(&engine);
         textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
-        QmlGraphicsText *textObject = qobject_cast<QmlGraphicsText*>(textComponent.create());
+        QDeclarativeText *textObject = qobject_cast<QDeclarativeText*>(textComponent.create());
 
         QCOMPARE(textObject->styleColor(), QColor(colorStrings.at(i)));
         // default color to black?
@@ -531,9 +531,9 @@ void tst_qmlgraphicstext::color()
         for (int j = 0; j < colorStrings.size(); j++)
         {
             QString componentStr = "import Qt 4.6\nText { color: \"" + colorStrings.at(i) + "\"; styleColor: \"" + colorStrings.at(j) + "\"; text: \"Hello World\" }";
-            QmlComponent textComponent(&engine);
+            QDeclarativeComponent textComponent(&engine);
             textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
-            QmlGraphicsText *textObject = qobject_cast<QmlGraphicsText*>(textComponent.create());
+            QDeclarativeText *textObject = qobject_cast<QDeclarativeText*>(textComponent.create());
 
             QCOMPARE(textObject->color(), QColor(colorStrings.at(i)));
             QCOMPARE(textObject->styleColor(), QColor(colorStrings.at(j)));
@@ -545,9 +545,9 @@ void tst_qmlgraphicstext::color()
         testColor.setAlpha(170);
 
         QString componentStr = "import Qt 4.6\nText { color: \"" + colorStr + "\"; text: \"Hello World\" }";
-        QmlComponent textComponent(&engine);
+        QDeclarativeComponent textComponent(&engine);
         textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
-        QmlGraphicsText *textObject = qobject_cast<QmlGraphicsText*>(textComponent.create());
+        QDeclarativeText *textObject = qobject_cast<QDeclarativeText*>(textComponent.create());
 
         QCOMPARE(textObject->color(), testColor);
     }
@@ -559,16 +559,16 @@ void tst_qmlgraphicstext::smooth()
     {
         {
             QString componentStr = "import Qt 4.6\nText { smooth: true; text: \"" + standard.at(i) + "\" }";
-            QmlComponent textComponent(&engine);
+            QDeclarativeComponent textComponent(&engine);
             textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
-            QmlGraphicsText *textObject = qobject_cast<QmlGraphicsText*>(textComponent.create());
+            QDeclarativeText *textObject = qobject_cast<QDeclarativeText*>(textComponent.create());
             QCOMPARE(textObject->smooth(), true);
         }
         {
             QString componentStr = "import Qt 4.6\nText { text: \"" + standard.at(i) + "\" }";
-            QmlComponent textComponent(&engine);
+            QDeclarativeComponent textComponent(&engine);
             textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
-            QmlGraphicsText *textObject = qobject_cast<QmlGraphicsText*>(textComponent.create());
+            QDeclarativeText *textObject = qobject_cast<QDeclarativeText*>(textComponent.create());
             QCOMPARE(textObject->smooth(), false);
         }
     }
@@ -576,16 +576,16 @@ void tst_qmlgraphicstext::smooth()
     {
         {
             QString componentStr = "import Qt 4.6\nText { smooth: true; text: \"" + richText.at(i) + "\" }";
-            QmlComponent textComponent(&engine);
+            QDeclarativeComponent textComponent(&engine);
             textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
-            QmlGraphicsText *textObject = qobject_cast<QmlGraphicsText*>(textComponent.create());
+            QDeclarativeText *textObject = qobject_cast<QDeclarativeText*>(textComponent.create());
             QCOMPARE(textObject->smooth(), true);
         }
         {
             QString componentStr = "import Qt 4.6\nText { text: \"" + richText.at(i) + "\" }";
-            QmlComponent textComponent(&engine);
+            QDeclarativeComponent textComponent(&engine);
             textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
-            QmlGraphicsText *textObject = qobject_cast<QmlGraphicsText*>(textComponent.create());
+            QDeclarativeText *textObject = qobject_cast<QDeclarativeText*>(textComponent.create());
             QCOMPARE(textObject->smooth(), false);
         }
     }
@@ -595,21 +595,21 @@ void tst_qmlgraphicstext::weight()
 {
     {
         QString componentStr = "import Qt 4.6\nText { text: \"Hello world!\" }";
-        QmlComponent textComponent(&engine);
+        QDeclarativeComponent textComponent(&engine);
         textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
-        QmlGraphicsText *textObject = qobject_cast<QmlGraphicsText*>(textComponent.create());
+        QDeclarativeText *textObject = qobject_cast<QDeclarativeText*>(textComponent.create());
 
         QVERIFY(textObject != 0);
-        QCOMPARE((int)textObject->font().weight(), (int)QmlFontValueType::Normal);
+        QCOMPARE((int)textObject->font().weight(), (int)QDeclarativeFontValueType::Normal);
     }
     {
         QString componentStr = "import Qt 4.6\nText { font.weight: \"Bold\"; text: \"Hello world!\" }";
-        QmlComponent textComponent(&engine);
+        QDeclarativeComponent textComponent(&engine);
         textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
-        QmlGraphicsText *textObject = qobject_cast<QmlGraphicsText*>(textComponent.create());
+        QDeclarativeText *textObject = qobject_cast<QDeclarativeText*>(textComponent.create());
 
         QVERIFY(textObject != 0);
-        QCOMPARE((int)textObject->font().weight(), (int)QmlFontValueType::Bold);
+        QCOMPARE((int)textObject->font().weight(), (int)QDeclarativeFontValueType::Bold);
     }
 }
 
@@ -617,18 +617,18 @@ void tst_qmlgraphicstext::underline()
 {
     {
         QString componentStr = "import Qt 4.6\nText { text: \"Hello world!\" }";
-        QmlComponent textComponent(&engine);
+        QDeclarativeComponent textComponent(&engine);
         textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
-        QmlGraphicsText *textObject = qobject_cast<QmlGraphicsText*>(textComponent.create());
+        QDeclarativeText *textObject = qobject_cast<QDeclarativeText*>(textComponent.create());
 
         QVERIFY(textObject != 0);
         QCOMPARE(textObject->font().underline(), false);
     }
     {
         QString componentStr = "import Qt 4.6\nText { font.underline: true; text: \"Hello world!\" }";
-        QmlComponent textComponent(&engine);
+        QDeclarativeComponent textComponent(&engine);
         textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
-        QmlGraphicsText *textObject = qobject_cast<QmlGraphicsText*>(textComponent.create());
+        QDeclarativeText *textObject = qobject_cast<QDeclarativeText*>(textComponent.create());
 
         QVERIFY(textObject != 0);
         QCOMPARE(textObject->font().underline(), true);
@@ -639,18 +639,18 @@ void tst_qmlgraphicstext::overline()
 {
     {
         QString componentStr = "import Qt 4.6\nText { text: \"Hello world!\" }";
-        QmlComponent textComponent(&engine);
+        QDeclarativeComponent textComponent(&engine);
         textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
-        QmlGraphicsText *textObject = qobject_cast<QmlGraphicsText*>(textComponent.create());
+        QDeclarativeText *textObject = qobject_cast<QDeclarativeText*>(textComponent.create());
 
         QVERIFY(textObject != 0);
         QCOMPARE(textObject->font().overline(), false);
     }
     {
         QString componentStr = "import Qt 4.6\nText { font.overline: true; text: \"Hello world!\" }";
-        QmlComponent textComponent(&engine);
+        QDeclarativeComponent textComponent(&engine);
         textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
-        QmlGraphicsText *textObject = qobject_cast<QmlGraphicsText*>(textComponent.create());
+        QDeclarativeText *textObject = qobject_cast<QDeclarativeText*>(textComponent.create());
 
         QVERIFY(textObject != 0);
         QCOMPARE(textObject->font().overline(), true);
@@ -661,18 +661,18 @@ void tst_qmlgraphicstext::strikeout()
 {
     {
         QString componentStr = "import Qt 4.6\nText { text: \"Hello world!\" }";
-        QmlComponent textComponent(&engine);
+        QDeclarativeComponent textComponent(&engine);
         textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
-        QmlGraphicsText *textObject = qobject_cast<QmlGraphicsText*>(textComponent.create());
+        QDeclarativeText *textObject = qobject_cast<QDeclarativeText*>(textComponent.create());
 
         QVERIFY(textObject != 0);
         QCOMPARE(textObject->font().strikeOut(), false);
     }
     {
         QString componentStr = "import Qt 4.6\nText { font.strikeout: true; text: \"Hello world!\" }";
-        QmlComponent textComponent(&engine);
+        QDeclarativeComponent textComponent(&engine);
         textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
-        QmlGraphicsText *textObject = qobject_cast<QmlGraphicsText*>(textComponent.create());
+        QDeclarativeText *textObject = qobject_cast<QDeclarativeText*>(textComponent.create());
 
         QVERIFY(textObject != 0);
         QCOMPARE(textObject->font().strikeOut(), true);
@@ -683,48 +683,48 @@ void tst_qmlgraphicstext::capitalization()
 {
     {
         QString componentStr = "import Qt 4.6\nText { text: \"Hello world!\" }";
-        QmlComponent textComponent(&engine);
+        QDeclarativeComponent textComponent(&engine);
         textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
-        QmlGraphicsText *textObject = qobject_cast<QmlGraphicsText*>(textComponent.create());
+        QDeclarativeText *textObject = qobject_cast<QDeclarativeText*>(textComponent.create());
 
         QVERIFY(textObject != 0);
-        QCOMPARE((int)textObject->font().capitalization(), (int)QmlFontValueType::MixedCase);
+        QCOMPARE((int)textObject->font().capitalization(), (int)QDeclarativeFontValueType::MixedCase);
     }
     {
         QString componentStr = "import Qt 4.6\nText { text: \"Hello world!\"; font.capitalization: \"AllUppercase\" }";
-        QmlComponent textComponent(&engine);
+        QDeclarativeComponent textComponent(&engine);
         textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
-        QmlGraphicsText *textObject = qobject_cast<QmlGraphicsText*>(textComponent.create());
+        QDeclarativeText *textObject = qobject_cast<QDeclarativeText*>(textComponent.create());
 
         QVERIFY(textObject != 0);
-        QCOMPARE((int)textObject->font().capitalization(), (int)QmlFontValueType::AllUppercase);
+        QCOMPARE((int)textObject->font().capitalization(), (int)QDeclarativeFontValueType::AllUppercase);
     }
     {
         QString componentStr = "import Qt 4.6\nText { text: \"Hello world!\"; font.capitalization: \"AllLowercase\" }";
-        QmlComponent textComponent(&engine);
+        QDeclarativeComponent textComponent(&engine);
         textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
-        QmlGraphicsText *textObject = qobject_cast<QmlGraphicsText*>(textComponent.create());
+        QDeclarativeText *textObject = qobject_cast<QDeclarativeText*>(textComponent.create());
 
         QVERIFY(textObject != 0);
-        QCOMPARE((int)textObject->font().capitalization(), (int)QmlFontValueType::AllLowercase);
+        QCOMPARE((int)textObject->font().capitalization(), (int)QDeclarativeFontValueType::AllLowercase);
     }
     {
         QString componentStr = "import Qt 4.6\nText { text: \"Hello world!\"; font.capitalization: \"SmallCaps\" }";
-        QmlComponent textComponent(&engine);
+        QDeclarativeComponent textComponent(&engine);
         textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
-        QmlGraphicsText *textObject = qobject_cast<QmlGraphicsText*>(textComponent.create());
+        QDeclarativeText *textObject = qobject_cast<QDeclarativeText*>(textComponent.create());
 
         QVERIFY(textObject != 0);
-        QCOMPARE((int)textObject->font().capitalization(), (int)QmlFontValueType::SmallCaps);
+        QCOMPARE((int)textObject->font().capitalization(), (int)QDeclarativeFontValueType::SmallCaps);
     }
     {
         QString componentStr = "import Qt 4.6\nText { text: \"Hello world!\"; font.capitalization: \"Capitalize\" }";
-        QmlComponent textComponent(&engine);
+        QDeclarativeComponent textComponent(&engine);
         textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
-        QmlGraphicsText *textObject = qobject_cast<QmlGraphicsText*>(textComponent.create());
+        QDeclarativeText *textObject = qobject_cast<QDeclarativeText*>(textComponent.create());
 
         QVERIFY(textObject != 0);
-        QCOMPARE((int)textObject->font().capitalization(), (int)QmlFontValueType::Capitalize);
+        QCOMPARE((int)textObject->font().capitalization(), (int)QDeclarativeFontValueType::Capitalize);
     }
 }
 
@@ -732,27 +732,27 @@ void tst_qmlgraphicstext::letterSpacing()
 {
     {
         QString componentStr = "import Qt 4.6\nText { text: \"Hello world!\" }";
-        QmlComponent textComponent(&engine);
+        QDeclarativeComponent textComponent(&engine);
         textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
-        QmlGraphicsText *textObject = qobject_cast<QmlGraphicsText*>(textComponent.create());
+        QDeclarativeText *textObject = qobject_cast<QDeclarativeText*>(textComponent.create());
 
         QVERIFY(textObject != 0);
         QCOMPARE(textObject->font().letterSpacing(), 0.0);
     }
     {
         QString componentStr = "import Qt 4.6\nText { text: \"Hello world!\"; font.letterSpacing: -50 }";
-        QmlComponent textComponent(&engine);
+        QDeclarativeComponent textComponent(&engine);
         textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
-        QmlGraphicsText *textObject = qobject_cast<QmlGraphicsText*>(textComponent.create());
+        QDeclarativeText *textObject = qobject_cast<QDeclarativeText*>(textComponent.create());
 
         QVERIFY(textObject != 0);
         QCOMPARE(textObject->font().letterSpacing(), -50.);
     }
     {
         QString componentStr = "import Qt 4.6\nText { text: \"Hello world!\"; font.letterSpacing: 200 }";
-        QmlComponent textComponent(&engine);
+        QDeclarativeComponent textComponent(&engine);
         textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
-        QmlGraphicsText *textObject = qobject_cast<QmlGraphicsText*>(textComponent.create());
+        QDeclarativeText *textObject = qobject_cast<QDeclarativeText*>(textComponent.create());
 
         QVERIFY(textObject != 0);
         QCOMPARE(textObject->font().letterSpacing(), 200.);
@@ -763,27 +763,27 @@ void tst_qmlgraphicstext::wordSpacing()
 {
     {
         QString componentStr = "import Qt 4.6\nText { text: \"Hello world!\" }";
-        QmlComponent textComponent(&engine);
+        QDeclarativeComponent textComponent(&engine);
         textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
-        QmlGraphicsText *textObject = qobject_cast<QmlGraphicsText*>(textComponent.create());
+        QDeclarativeText *textObject = qobject_cast<QDeclarativeText*>(textComponent.create());
 
         QVERIFY(textObject != 0);
         QCOMPARE(textObject->font().wordSpacing(), 0.0);
     }
     {
         QString componentStr = "import Qt 4.6\nText { text: \"Hello world!\"; font.wordSpacing: -50 }";
-        QmlComponent textComponent(&engine);
+        QDeclarativeComponent textComponent(&engine);
         textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
-        QmlGraphicsText *textObject = qobject_cast<QmlGraphicsText*>(textComponent.create());
+        QDeclarativeText *textObject = qobject_cast<QDeclarativeText*>(textComponent.create());
 
         QVERIFY(textObject != 0);
         QCOMPARE(textObject->font().wordSpacing(), -50.);
     }
     {
         QString componentStr = "import Qt 4.6\nText { text: \"Hello world!\"; font.wordSpacing: 200 }";
-        QmlComponent textComponent(&engine);
+        QDeclarativeComponent textComponent(&engine);
         textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
-        QmlGraphicsText *textObject = qobject_cast<QmlGraphicsText*>(textComponent.create());
+        QDeclarativeText *textObject = qobject_cast<QDeclarativeText*>(textComponent.create());
 
         QVERIFY(textObject != 0);
         QCOMPARE(textObject->font().wordSpacing(), 200.);
@@ -812,9 +812,9 @@ void tst_qmlgraphicstext::clickLink()
 {
     {
         QString componentStr = "import Qt 4.6\nText { text: \"<a href=\\\"http://qt.nokia.com\\\">Hello world!</a>\" }";
-        QmlComponent textComponent(&engine);
+        QDeclarativeComponent textComponent(&engine);
         textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
-        QmlGraphicsText *textObject = qobject_cast<QmlGraphicsText*>(textComponent.create());
+        QDeclarativeText *textObject = qobject_cast<QDeclarativeText*>(textComponent.create());
 
         QVERIFY(textObject != 0);
 
@@ -841,4 +841,4 @@ void tst_qmlgraphicstext::clickLink()
 
 QTEST_MAIN(tst_qmlgraphicstext)
 
-#include "tst_qmlgraphicstext.moc"
+#include "tst_qdeclarativetext.moc"
diff --git a/tests/auto/declarative/qmlgraphicstextedit/data/cursorTest.qml b/tests/auto/declarative/qdeclarativetextedit/data/cursorTest.qml
index e5df8f1..e5df8f1 100644
--- a/tests/auto/declarative/qmlgraphicstextedit/data/cursorTest.qml
+++ b/tests/auto/declarative/qdeclarativetextedit/data/cursorTest.qml
diff --git a/tests/auto/declarative/qmlgraphicstextedit/data/http/ErrItem.qml b/tests/auto/declarative/qdeclarativetextedit/data/http/ErrItem.qml
index 34b3883..34b3883 100644
--- a/tests/auto/declarative/qmlgraphicstextedit/data/http/ErrItem.qml
+++ b/tests/auto/declarative/qdeclarativetextedit/data/http/ErrItem.qml
diff --git a/tests/auto/declarative/qmlgraphicstextedit/data/http/NormItem.qml b/tests/auto/declarative/qdeclarativetextedit/data/http/NormItem.qml
index 718cb71..718cb71 100644
--- a/tests/auto/declarative/qmlgraphicstextedit/data/http/NormItem.qml
+++ b/tests/auto/declarative/qdeclarativetextedit/data/http/NormItem.qml
diff --git a/tests/auto/declarative/qmlgraphicstextedit/data/http/cursorHttpTest.qml b/tests/auto/declarative/qdeclarativetextedit/data/http/cursorHttpTest.qml
index 3c31e11..3c31e11 100644
--- a/tests/auto/declarative/qmlgraphicstextedit/data/http/cursorHttpTest.qml
+++ b/tests/auto/declarative/qdeclarativetextedit/data/http/cursorHttpTest.qml
diff --git a/tests/auto/declarative/qmlgraphicstextedit/data/http/cursorHttpTestFail1.qml b/tests/auto/declarative/qdeclarativetextedit/data/http/cursorHttpTestFail1.qml
index a44aec2..a44aec2 100644
--- a/tests/auto/declarative/qmlgraphicstextedit/data/http/cursorHttpTestFail1.qml
+++ b/tests/auto/declarative/qdeclarativetextedit/data/http/cursorHttpTestFail1.qml
diff --git a/tests/auto/declarative/qmlgraphicstextedit/data/http/cursorHttpTestFail2.qml b/tests/auto/declarative/qdeclarativetextedit/data/http/cursorHttpTestFail2.qml
index 57d3e47..57d3e47 100644
--- a/tests/auto/declarative/qmlgraphicstextedit/data/http/cursorHttpTestFail2.qml
+++ b/tests/auto/declarative/qdeclarativetextedit/data/http/cursorHttpTestFail2.qml
diff --git a/tests/auto/declarative/qmlgraphicstextedit/data/http/cursorHttpTestPass.qml b/tests/auto/declarative/qdeclarativetextedit/data/http/cursorHttpTestPass.qml
index a44e867..a44e867 100644
--- a/tests/auto/declarative/qmlgraphicstextedit/data/http/cursorHttpTestPass.qml
+++ b/tests/auto/declarative/qdeclarativetextedit/data/http/cursorHttpTestPass.qml
diff --git a/tests/auto/declarative/qmlgraphicstextedit/data/httpfail/FailItem.qml b/tests/auto/declarative/qdeclarativetextedit/data/httpfail/FailItem.qml
index ddbf526..ddbf526 100644
--- a/tests/auto/declarative/qmlgraphicstextedit/data/httpfail/FailItem.qml
+++ b/tests/auto/declarative/qdeclarativetextedit/data/httpfail/FailItem.qml
diff --git a/tests/auto/declarative/qmlgraphicstextedit/data/httpslow/WaitItem.qml b/tests/auto/declarative/qdeclarativetextedit/data/httpslow/WaitItem.qml
index ddbf526..ddbf526 100644
--- a/tests/auto/declarative/qmlgraphicstextedit/data/httpslow/WaitItem.qml
+++ b/tests/auto/declarative/qdeclarativetextedit/data/httpslow/WaitItem.qml
diff --git a/tests/auto/declarative/qmlgraphicstextedit/data/inputmethodhints.qml b/tests/auto/declarative/qdeclarativetextedit/data/inputmethodhints.qml
index c3d4c16..c3d4c16 100644
--- a/tests/auto/declarative/qmlgraphicstextedit/data/inputmethodhints.qml
+++ b/tests/auto/declarative/qdeclarativetextedit/data/inputmethodhints.qml
diff --git a/tests/auto/declarative/qmlgraphicstextedit/data/navigation.qml b/tests/auto/declarative/qdeclarativetextedit/data/navigation.qml
index 8d7dbbc..8d7dbbc 100644
--- a/tests/auto/declarative/qmlgraphicstextedit/data/navigation.qml
+++ b/tests/auto/declarative/qdeclarativetextedit/data/navigation.qml
diff --git a/tests/auto/declarative/qmlgraphicstextedit/data/readOnly.qml b/tests/auto/declarative/qdeclarativetextedit/data/readOnly.qml
index 103a627..103a627 100644
--- a/tests/auto/declarative/qmlgraphicstextedit/data/readOnly.qml
+++ b/tests/auto/declarative/qdeclarativetextedit/data/readOnly.qml
diff --git a/tests/auto/declarative/qmlgraphicsmousearea/qmlgraphicsmousearea.pro b/tests/auto/declarative/qdeclarativetextedit/qdeclarativetextedit.pro
index f85bf0f..2228f11 100644
--- a/tests/auto/declarative/qmlgraphicsmousearea/qmlgraphicsmousearea.pro
+++ b/tests/auto/declarative/qdeclarativetextedit/qdeclarativetextedit.pro
@@ -2,8 +2,8 @@ load(qttest_p4)
 contains(QT_CONFIG,declarative): QT += declarative gui network
 macx:CONFIG -= app_bundle
 
+SOURCES += tst_qdeclarativetextedit.cpp ../shared/testhttpserver.cpp
 HEADERS += ../shared/testhttpserver.h
-SOURCES += tst_qmlgraphicsmousearea.cpp ../shared/testhttpserver.cpp
 
 # Define SRCDIR equal to test's source directory
 DEFINES += SRCDIR=\\\"$$PWD\\\"
diff --git a/tests/auto/declarative/qmlgraphicstextedit/tst_qmlgraphicstextedit.cpp b/tests/auto/declarative/qdeclarativetextedit/tst_qdeclarativetextedit.cpp
index 0d6ac77..e08783f 100644
--- a/tests/auto/declarative/qmlgraphicstextedit/tst_qmlgraphicstextedit.cpp
+++ b/tests/auto/declarative/qdeclarativetextedit/tst_qdeclarativetextedit.cpp
@@ -44,13 +44,13 @@
 #include <math.h>
 #include <QFile>
 #include <QTextDocument>
-#include <QtDeclarative/qmlengine.h>
-#include <QtDeclarative/qmlcontext.h>
-#include <QtDeclarative/qmlexpression.h>
-#include <QtDeclarative/qmlcomponent.h>
-#include <private/qmlgraphicstextedit_p.h>
+#include <QtDeclarative/qdeclarativeengine.h>
+#include <QtDeclarative/qdeclarativecontext.h>
+#include <QtDeclarative/qdeclarativeexpression.h>
+#include <QtDeclarative/qdeclarativecomponent.h>
+#include <private/qdeclarativetextedit_p.h>
 #include <QFontMetrics>
-#include <QmlView>
+#include <QDeclarativeView>
 #include <QStyle>
 #include <QInputContext>
 
@@ -85,8 +85,8 @@ private slots:
     void sendRequestSoftwareInputPanelEvent();
 
 private:
-    void simulateKey(QmlView *, int key);
-    QmlView *createView(const QString &filename);
+    void simulateKey(QDeclarativeView *, int key);
+    QDeclarativeView *createView(const QString &filename);
 
     QStringList standard;
     QStringList richText;
@@ -99,7 +99,7 @@ private:
 
     QStringList colorStrings;
 
-    QmlEngine engine;
+    QDeclarativeEngine engine;
 };
 
 tst_qmlgraphicstextedit::tst_qmlgraphicstextedit()
@@ -148,9 +148,9 @@ tst_qmlgraphicstextedit::tst_qmlgraphicstextedit()
 void tst_qmlgraphicstextedit::text()
 {
     {
-        QmlComponent texteditComponent(&engine);
+        QDeclarativeComponent texteditComponent(&engine);
         texteditComponent.setData("import Qt 4.6\nTextEdit {  text: \"\"  }", QUrl());
-        QmlGraphicsTextEdit *textEditObject = qobject_cast<QmlGraphicsTextEdit*>(texteditComponent.create());
+        QDeclarativeTextEdit *textEditObject = qobject_cast<QDeclarativeTextEdit*>(texteditComponent.create());
 
         QVERIFY(textEditObject != 0);
         QCOMPARE(textEditObject->text(), QString(""));
@@ -159,9 +159,9 @@ void tst_qmlgraphicstextedit::text()
     for (int i = 0; i < standard.size(); i++)
     {
         QString componentStr = "import Qt 4.6\nTextEdit { text: \"" + standard.at(i) + "\" }";
-        QmlComponent texteditComponent(&engine);
+        QDeclarativeComponent texteditComponent(&engine);
         texteditComponent.setData(componentStr.toLatin1(), QUrl());
-        QmlGraphicsTextEdit *textEditObject = qobject_cast<QmlGraphicsTextEdit*>(texteditComponent.create());
+        QDeclarativeTextEdit *textEditObject = qobject_cast<QDeclarativeTextEdit*>(texteditComponent.create());
 
         QVERIFY(textEditObject != 0);
         QCOMPARE(textEditObject->text(), standard.at(i));
@@ -170,9 +170,9 @@ void tst_qmlgraphicstextedit::text()
     for (int i = 0; i < richText.size(); i++)
     {
         QString componentStr = "import Qt 4.6\nTextEdit { text: \"" + richText.at(i) + "\" }";
-        QmlComponent texteditComponent(&engine);
+        QDeclarativeComponent texteditComponent(&engine);
         texteditComponent.setData(componentStr.toLatin1(), QUrl());
-        QmlGraphicsTextEdit *textEditObject = qobject_cast<QmlGraphicsTextEdit*>(texteditComponent.create());
+        QDeclarativeTextEdit *textEditObject = qobject_cast<QDeclarativeTextEdit*>(texteditComponent.create());
 
         QVERIFY(textEditObject != 0);
         QString actual = textEditObject->text();
@@ -188,9 +188,9 @@ void tst_qmlgraphicstextedit::width()
 {
     // uses Font metrics to find the width for standard and document to find the width for rich
     {
-        QmlComponent texteditComponent(&engine);
+        QDeclarativeComponent texteditComponent(&engine);
         texteditComponent.setData("import Qt 4.6\nTextEdit {  text: \"\" }", QUrl());
-        QmlGraphicsTextEdit *textEditObject = qobject_cast<QmlGraphicsTextEdit*>(texteditComponent.create());
+        QDeclarativeTextEdit *textEditObject = qobject_cast<QDeclarativeTextEdit*>(texteditComponent.create());
 
         QVERIFY(textEditObject != 0);
         QCOMPARE(textEditObject->width(), 1.);//+1 for cursor
@@ -204,9 +204,9 @@ void tst_qmlgraphicstextedit::width()
         metricWidth = floor(metricWidth);
 
         QString componentStr = "import Qt 4.6\nTextEdit { text: \"" + standard.at(i) + "\" }";
-        QmlComponent texteditComponent(&engine);
+        QDeclarativeComponent texteditComponent(&engine);
         texteditComponent.setData(componentStr.toLatin1(), QUrl());
-        QmlGraphicsTextEdit *textEditObject = qobject_cast<QmlGraphicsTextEdit*>(texteditComponent.create());
+        QDeclarativeTextEdit *textEditObject = qobject_cast<QDeclarativeTextEdit*>(texteditComponent.create());
 
         QVERIFY(textEditObject != 0);
         QCOMPARE(textEditObject->width(), qreal(metricWidth + 1 + 3));//+3 is the current way of accounting for space between cursor and last character.
@@ -221,9 +221,9 @@ void tst_qmlgraphicstextedit::width()
         int documentWidth = document.idealWidth();
 
         QString componentStr = "import Qt 4.6\nTextEdit { text: \"" + richText.at(i) + "\" }";
-        QmlComponent texteditComponent(&engine);
+        QDeclarativeComponent texteditComponent(&engine);
         texteditComponent.setData(componentStr.toLatin1(), QUrl());
-        QmlGraphicsTextEdit *textEditObject = qobject_cast<QmlGraphicsTextEdit*>(texteditComponent.create());
+        QDeclarativeTextEdit *textEditObject = qobject_cast<QDeclarativeTextEdit*>(texteditComponent.create());
 
         QVERIFY(textEditObject != 0);
         QCOMPARE(textEditObject->width(), qreal(documentWidth + 1 + 3));
@@ -234,9 +234,9 @@ void tst_qmlgraphicstextedit::wrap()
 {
     // for specified width and wrap set true
     {
-        QmlComponent texteditComponent(&engine);
+        QDeclarativeComponent texteditComponent(&engine);
         texteditComponent.setData("import Qt 4.6\nTextEdit {  text: \"\"; wrap: true; width: 300 }", QUrl());
-        QmlGraphicsTextEdit *textEditObject = qobject_cast<QmlGraphicsTextEdit*>(texteditComponent.create());
+        QDeclarativeTextEdit *textEditObject = qobject_cast<QDeclarativeTextEdit*>(texteditComponent.create());
 
         QVERIFY(textEditObject != 0);
         QCOMPARE(textEditObject->width(), 300.);
@@ -245,9 +245,9 @@ void tst_qmlgraphicstextedit::wrap()
     for (int i = 0; i < standard.size(); i++)
     {
         QString componentStr = "import Qt 4.6\nTextEdit {  wrap: true; width: 300; text: \"" + standard.at(i) + "\" }";
-        QmlComponent texteditComponent(&engine);
+        QDeclarativeComponent texteditComponent(&engine);
         texteditComponent.setData(componentStr.toLatin1(), QUrl());
-        QmlGraphicsTextEdit *textEditObject = qobject_cast<QmlGraphicsTextEdit*>(texteditComponent.create());
+        QDeclarativeTextEdit *textEditObject = qobject_cast<QDeclarativeTextEdit*>(texteditComponent.create());
 
         QVERIFY(textEditObject != 0);
         QCOMPARE(textEditObject->width(), 300.);
@@ -256,9 +256,9 @@ void tst_qmlgraphicstextedit::wrap()
     for (int i = 0; i < richText.size(); i++)
     {
         QString componentStr = "import Qt 4.6\nTextEdit {  wrap: true; width: 300; text: \"" + richText.at(i) + "\" }";
-        QmlComponent texteditComponent(&engine);
+        QDeclarativeComponent texteditComponent(&engine);
         texteditComponent.setData(componentStr.toLatin1(), QUrl());
-        QmlGraphicsTextEdit *textEditObject = qobject_cast<QmlGraphicsTextEdit*>(texteditComponent.create());
+        QDeclarativeTextEdit *textEditObject = qobject_cast<QDeclarativeTextEdit*>(texteditComponent.create());
 
         QVERIFY(textEditObject != 0);
         QCOMPARE(textEditObject->width(), 300.);
@@ -269,20 +269,20 @@ void tst_qmlgraphicstextedit::wrap()
 void tst_qmlgraphicstextedit::textFormat()
 {
     {
-        QmlComponent textComponent(&engine);
+        QDeclarativeComponent textComponent(&engine);
         textComponent.setData("import Qt 4.6\nTextEdit { text: \"Hello\"; textFormat: Text.RichText }", QUrl::fromLocalFile(""));
-        QmlGraphicsTextEdit *textObject = qobject_cast<QmlGraphicsTextEdit*>(textComponent.create());
+        QDeclarativeTextEdit *textObject = qobject_cast<QDeclarativeTextEdit*>(textComponent.create());
 
         QVERIFY(textObject != 0);
-        QVERIFY(textObject->textFormat() == QmlGraphicsTextEdit::RichText);
+        QVERIFY(textObject->textFormat() == QDeclarativeTextEdit::RichText);
     }
     {
-        QmlComponent textComponent(&engine);
+        QDeclarativeComponent textComponent(&engine);
         textComponent.setData("import Qt 4.6\nTextEdit { text: \"<b>Hello</b>\"; textFormat: Text.PlainText }", QUrl::fromLocalFile(""));
-        QmlGraphicsTextEdit *textObject = qobject_cast<QmlGraphicsTextEdit*>(textComponent.create());
+        QDeclarativeTextEdit *textObject = qobject_cast<QDeclarativeTextEdit*>(textComponent.create());
 
         QVERIFY(textObject != 0);
-        QVERIFY(textObject->textFormat() == QmlGraphicsTextEdit::PlainText);
+        QVERIFY(textObject->textFormat() == QDeclarativeTextEdit::PlainText);
     }
 }
 
@@ -296,9 +296,9 @@ void tst_qmlgraphicstextedit::hAlign()
         for (int j=0; j < hAlignmentStrings.size(); j++)
         {
             QString componentStr = "import Qt 4.6\nTextEdit {  horizontalAlignment: \"" + hAlignmentStrings.at(j) + "\"; text: \"" + standard.at(i) + "\" }";
-            QmlComponent texteditComponent(&engine);
+            QDeclarativeComponent texteditComponent(&engine);
             texteditComponent.setData(componentStr.toLatin1(), QUrl());
-            QmlGraphicsTextEdit *textEditObject = qobject_cast<QmlGraphicsTextEdit*>(texteditComponent.create());
+            QDeclarativeTextEdit *textEditObject = qobject_cast<QDeclarativeTextEdit*>(texteditComponent.create());
 
             QVERIFY(textEditObject != 0);
             QCOMPARE((int)textEditObject->hAlign(), (int)hAlignments.at(j));
@@ -310,9 +310,9 @@ void tst_qmlgraphicstextedit::hAlign()
         for (int j=0; j < hAlignmentStrings.size(); j++)
         {
             QString componentStr = "import Qt 4.6\nTextEdit {  horizontalAlignment: \"" + hAlignmentStrings.at(j) + "\"; text: \"" + richText.at(i) + "\" }";
-            QmlComponent texteditComponent(&engine);
+            QDeclarativeComponent texteditComponent(&engine);
             texteditComponent.setData(componentStr.toLatin1(), QUrl());
-            QmlGraphicsTextEdit *textEditObject = qobject_cast<QmlGraphicsTextEdit*>(texteditComponent.create());
+            QDeclarativeTextEdit *textEditObject = qobject_cast<QDeclarativeTextEdit*>(texteditComponent.create());
 
             QVERIFY(textEditObject != 0);
             QCOMPARE((int)textEditObject->hAlign(), (int)hAlignments.at(j));
@@ -330,9 +330,9 @@ void tst_qmlgraphicstextedit::vAlign()
         for (int j=0; j < vAlignmentStrings.size(); j++)
         {
             QString componentStr = "import Qt 4.6\nTextEdit {  verticalAlignment: \"" + vAlignmentStrings.at(j) + "\"; text: \"" + standard.at(i) + "\" }";
-            QmlComponent texteditComponent(&engine);
+            QDeclarativeComponent texteditComponent(&engine);
             texteditComponent.setData(componentStr.toLatin1(), QUrl());
-            QmlGraphicsTextEdit *textEditObject = qobject_cast<QmlGraphicsTextEdit*>(texteditComponent.create());
+            QDeclarativeTextEdit *textEditObject = qobject_cast<QDeclarativeTextEdit*>(texteditComponent.create());
 
             QVERIFY(textEditObject != 0);
             QCOMPARE((int)textEditObject->vAlign(), (int)vAlignments.at(j));
@@ -344,9 +344,9 @@ void tst_qmlgraphicstextedit::vAlign()
         for (int j=0; j < vAlignmentStrings.size(); j++)
         {
             QString componentStr = "import Qt 4.6\nTextEdit {  verticalAlignment: \"" + vAlignmentStrings.at(j) + "\"; text: \"" + richText.at(i) + "\" }";
-            QmlComponent texteditComponent(&engine);
+            QDeclarativeComponent texteditComponent(&engine);
             texteditComponent.setData(componentStr.toLatin1(), QUrl());
-            QmlGraphicsTextEdit *textEditObject = qobject_cast<QmlGraphicsTextEdit*>(texteditComponent.create());
+            QDeclarativeTextEdit *textEditObject = qobject_cast<QDeclarativeTextEdit*>(texteditComponent.create());
 
             QVERIFY(textEditObject != 0);
             QCOMPARE((int)textEditObject->vAlign(), (int)vAlignments.at(j));
@@ -360,9 +360,9 @@ void tst_qmlgraphicstextedit::font()
     //test size, then bold, then italic, then family
     { 
         QString componentStr = "import Qt 4.6\nTextEdit {  font.pointSize: 40; text: \"Hello World\" }";
-        QmlComponent texteditComponent(&engine);
+        QDeclarativeComponent texteditComponent(&engine);
         texteditComponent.setData(componentStr.toLatin1(), QUrl());
-        QmlGraphicsTextEdit *textEditObject = qobject_cast<QmlGraphicsTextEdit*>(texteditComponent.create());
+        QDeclarativeTextEdit *textEditObject = qobject_cast<QDeclarativeTextEdit*>(texteditComponent.create());
 
         QVERIFY(textEditObject != 0);
         QCOMPARE(textEditObject->font().pointSize(), 40);
@@ -372,9 +372,9 @@ void tst_qmlgraphicstextedit::font()
 
     { 
         QString componentStr = "import Qt 4.6\nTextEdit {  font.bold: true; text: \"Hello World\" }";
-        QmlComponent texteditComponent(&engine);
+        QDeclarativeComponent texteditComponent(&engine);
         texteditComponent.setData(componentStr.toLatin1(), QUrl());
-        QmlGraphicsTextEdit *textEditObject = qobject_cast<QmlGraphicsTextEdit*>(texteditComponent.create());
+        QDeclarativeTextEdit *textEditObject = qobject_cast<QDeclarativeTextEdit*>(texteditComponent.create());
 
         QVERIFY(textEditObject != 0);
         QCOMPARE(textEditObject->font().bold(), true);
@@ -383,9 +383,9 @@ void tst_qmlgraphicstextedit::font()
 
     { 
         QString componentStr = "import Qt 4.6\nTextEdit {  font.italic: true; text: \"Hello World\" }";
-        QmlComponent texteditComponent(&engine);
+        QDeclarativeComponent texteditComponent(&engine);
         texteditComponent.setData(componentStr.toLatin1(), QUrl());
-        QmlGraphicsTextEdit *textEditObject = qobject_cast<QmlGraphicsTextEdit*>(texteditComponent.create());
+        QDeclarativeTextEdit *textEditObject = qobject_cast<QDeclarativeTextEdit*>(texteditComponent.create());
 
         QVERIFY(textEditObject != 0);
         QCOMPARE(textEditObject->font().italic(), true);
@@ -394,9 +394,9 @@ void tst_qmlgraphicstextedit::font()
  
     { 
         QString componentStr = "import Qt 4.6\nTextEdit {  font.family: \"Helvetica\"; text: \"Hello World\" }";
-        QmlComponent texteditComponent(&engine);
+        QDeclarativeComponent texteditComponent(&engine);
         texteditComponent.setData(componentStr.toLatin1(), QUrl());
-        QmlGraphicsTextEdit *textEditObject = qobject_cast<QmlGraphicsTextEdit*>(texteditComponent.create());
+        QDeclarativeTextEdit *textEditObject = qobject_cast<QDeclarativeTextEdit*>(texteditComponent.create());
 
         QVERIFY(textEditObject != 0);
         QCOMPARE(textEditObject->font().family(), QString("Helvetica"));
@@ -406,9 +406,9 @@ void tst_qmlgraphicstextedit::font()
 
     { 
         QString componentStr = "import Qt 4.6\nTextEdit {  font.family: \"\"; text: \"Hello World\" }";
-        QmlComponent texteditComponent(&engine);
+        QDeclarativeComponent texteditComponent(&engine);
         texteditComponent.setData(componentStr.toLatin1(), QUrl());
-        QmlGraphicsTextEdit *textEditObject = qobject_cast<QmlGraphicsTextEdit*>(texteditComponent.create());
+        QDeclarativeTextEdit *textEditObject = qobject_cast<QDeclarativeTextEdit*>(texteditComponent.create());
 
         QVERIFY(textEditObject != 0);
         QCOMPARE(textEditObject->font().family(), QString(""));
@@ -421,9 +421,9 @@ void tst_qmlgraphicstextedit::color()
     for (int i = 0; i < colorStrings.size(); i++)
     { 
         QString componentStr = "import Qt 4.6\nTextEdit {  color: \"" + colorStrings.at(i) + "\"; text: \"Hello World\" }";
-        QmlComponent texteditComponent(&engine);
+        QDeclarativeComponent texteditComponent(&engine);
         texteditComponent.setData(componentStr.toLatin1(), QUrl());
-        QmlGraphicsTextEdit *textEditObject = qobject_cast<QmlGraphicsTextEdit*>(texteditComponent.create());
+        QDeclarativeTextEdit *textEditObject = qobject_cast<QDeclarativeTextEdit*>(texteditComponent.create());
         //qDebug() << "textEditObject: " << textEditObject->color() << "vs. " << QColor(colorStrings.at(i));
         QVERIFY(textEditObject != 0);
         QCOMPARE(textEditObject->color(), QColor(colorStrings.at(i)));
@@ -433,9 +433,9 @@ void tst_qmlgraphicstextedit::color()
     for (int i = 0; i < colorStrings.size(); i++)
     {
         QString componentStr = "import Qt 4.6\nTextEdit {  selectionColor: \"" + colorStrings.at(i) + "\"; text: \"Hello World\" }";
-        QmlComponent texteditComponent(&engine);
+        QDeclarativeComponent texteditComponent(&engine);
         texteditComponent.setData(componentStr.toLatin1(), QUrl());
-        QmlGraphicsTextEdit *textEditObject = qobject_cast<QmlGraphicsTextEdit*>(texteditComponent.create());
+        QDeclarativeTextEdit *textEditObject = qobject_cast<QDeclarativeTextEdit*>(texteditComponent.create());
         QVERIFY(textEditObject != 0);
         QCOMPARE(textEditObject->selectionColor(), QColor(colorStrings.at(i)));
     }
@@ -444,9 +444,9 @@ void tst_qmlgraphicstextedit::color()
     for (int i = 0; i < colorStrings.size(); i++)
     {
         QString componentStr = "import Qt 4.6\nTextEdit {  selectedTextColor: \"" + colorStrings.at(i) + "\"; text: \"Hello World\" }";
-        QmlComponent texteditComponent(&engine);
+        QDeclarativeComponent texteditComponent(&engine);
         texteditComponent.setData(componentStr.toLatin1(), QUrl());
-        QmlGraphicsTextEdit *textEditObject = qobject_cast<QmlGraphicsTextEdit*>(texteditComponent.create());
+        QDeclarativeTextEdit *textEditObject = qobject_cast<QDeclarativeTextEdit*>(texteditComponent.create());
         QVERIFY(textEditObject != 0);
         QCOMPARE(textEditObject->selectedTextColor(), QColor(colorStrings.at(i)));
     }
@@ -457,9 +457,9 @@ void tst_qmlgraphicstextedit::color()
         testColor.setAlpha(170);
 
         QString componentStr = "import Qt 4.6\nTextEdit {  color: \"" + colorStr + "\"; text: \"Hello World\" }";
-        QmlComponent texteditComponent(&engine);
+        QDeclarativeComponent texteditComponent(&engine);
         texteditComponent.setData(componentStr.toLatin1(), QUrl());
-        QmlGraphicsTextEdit *textEditObject = qobject_cast<QmlGraphicsTextEdit*>(texteditComponent.create());
+        QDeclarativeTextEdit *textEditObject = qobject_cast<QDeclarativeTextEdit*>(texteditComponent.create());
 
         QVERIFY(textEditObject != 0);
         QCOMPARE(textEditObject->color(), testColor);
@@ -470,9 +470,9 @@ void tst_qmlgraphicstextedit::textMargin()
 {
     for(qreal i=0; i<=10; i+=0.3){
         QString componentStr = "import Qt 4.6\nTextEdit {  textMargin: " + QString::number(i) + "; text: \"Hello World\" }";
-        QmlComponent texteditComponent(&engine);
+        QDeclarativeComponent texteditComponent(&engine);
         texteditComponent.setData(componentStr.toLatin1(), QUrl());
-        QmlGraphicsTextEdit *textEditObject = qobject_cast<QmlGraphicsTextEdit*>(texteditComponent.create());
+        QDeclarativeTextEdit *textEditObject = qobject_cast<QDeclarativeTextEdit*>(texteditComponent.create());
         QVERIFY(textEditObject != 0);
         QCOMPARE(textEditObject->textMargin(), i);
     }
@@ -482,18 +482,18 @@ void tst_qmlgraphicstextedit::persistentSelection()
 {
     {
         QString componentStr = "import Qt 4.6\nTextEdit {  persistentSelection: true; text: \"Hello World\" }";
-        QmlComponent texteditComponent(&engine);
+        QDeclarativeComponent texteditComponent(&engine);
         texteditComponent.setData(componentStr.toLatin1(), QUrl());
-        QmlGraphicsTextEdit *textEditObject = qobject_cast<QmlGraphicsTextEdit*>(texteditComponent.create());
+        QDeclarativeTextEdit *textEditObject = qobject_cast<QDeclarativeTextEdit*>(texteditComponent.create());
         QVERIFY(textEditObject != 0);
         QCOMPARE(textEditObject->persistentSelection(), true);
     }
 
     {
         QString componentStr = "import Qt 4.6\nTextEdit {  persistentSelection: false; text: \"Hello World\" }";
-        QmlComponent texteditComponent(&engine);
+        QDeclarativeComponent texteditComponent(&engine);
         texteditComponent.setData(componentStr.toLatin1(), QUrl());
-        QmlGraphicsTextEdit *textEditObject = qobject_cast<QmlGraphicsTextEdit*>(texteditComponent.create());
+        QDeclarativeTextEdit *textEditObject = qobject_cast<QDeclarativeTextEdit*>(texteditComponent.create());
         QVERIFY(textEditObject != 0);
         QCOMPARE(textEditObject->persistentSelection(), false);
     }
@@ -503,18 +503,18 @@ void tst_qmlgraphicstextedit::focusOnPress()
 {
     {
         QString componentStr = "import Qt 4.6\nTextEdit {  focusOnPress: true; text: \"Hello World\" }";
-        QmlComponent texteditComponent(&engine);
+        QDeclarativeComponent texteditComponent(&engine);
         texteditComponent.setData(componentStr.toLatin1(), QUrl());
-        QmlGraphicsTextEdit *textEditObject = qobject_cast<QmlGraphicsTextEdit*>(texteditComponent.create());
+        QDeclarativeTextEdit *textEditObject = qobject_cast<QDeclarativeTextEdit*>(texteditComponent.create());
         QVERIFY(textEditObject != 0);
         QCOMPARE(textEditObject->focusOnPress(), true);
     }
 
     {
         QString componentStr = "import Qt 4.6\nTextEdit {  focusOnPress: false; text: \"Hello World\" }";
-        QmlComponent texteditComponent(&engine);
+        QDeclarativeComponent texteditComponent(&engine);
         texteditComponent.setData(componentStr.toLatin1(), QUrl());
-        QmlGraphicsTextEdit *textEditObject = qobject_cast<QmlGraphicsTextEdit*>(texteditComponent.create());
+        QDeclarativeTextEdit *textEditObject = qobject_cast<QDeclarativeTextEdit*>(texteditComponent.create());
         QVERIFY(textEditObject != 0);
         QCOMPARE(textEditObject->focusOnPress(), false);
     }
@@ -524,9 +524,9 @@ void tst_qmlgraphicstextedit::selection()
 {
     QString testStr = standard[0];//TODO: What should happen for multiline/rich text?
     QString componentStr = "import Qt 4.6\nTextEdit {  text: \""+ testStr +"\"; }";
-    QmlComponent texteditComponent(&engine);
+    QDeclarativeComponent texteditComponent(&engine);
     texteditComponent.setData(componentStr.toLatin1(), QUrl());
-    QmlGraphicsTextEdit *textEditObject = qobject_cast<QmlGraphicsTextEdit*>(texteditComponent.create());
+    QDeclarativeTextEdit *textEditObject = qobject_cast<QDeclarativeTextEdit*>(texteditComponent.create());
     QVERIFY(textEditObject != 0);
 
 
@@ -603,12 +603,12 @@ void tst_qmlgraphicstextedit::selection()
 
 void tst_qmlgraphicstextedit::inputMethodHints()
 {
-    QmlView *canvas = createView(SRCDIR "/data/inputmethodhints.qml");
+    QDeclarativeView *canvas = createView(SRCDIR "/data/inputmethodhints.qml");
     canvas->show();
     canvas->setFocus();
 
     QVERIFY(canvas->rootObject() != 0);
-    QmlGraphicsTextEdit *textEditObject = qobject_cast<QmlGraphicsTextEdit *>(canvas->rootObject());
+    QDeclarativeTextEdit *textEditObject = qobject_cast<QDeclarativeTextEdit *>(canvas->rootObject());
     QVERIFY(textEditObject != 0);
     QVERIFY(textEditObject->inputMethodHints() & Qt::ImhNoPredictiveText);
     textEditObject->setInputMethodHints(Qt::ImhUppercaseOnly);
@@ -617,15 +617,15 @@ void tst_qmlgraphicstextedit::inputMethodHints()
 
 void tst_qmlgraphicstextedit::cursorDelegate()
 {
-    QmlView* view = createView(SRCDIR "/data/cursorTest.qml");
+    QDeclarativeView* view = createView(SRCDIR "/data/cursorTest.qml");
     view->show();
     view->setFocus();
-    QmlGraphicsTextEdit *textEditObject = view->rootObject()->findChild<QmlGraphicsTextEdit*>("textEditObject");
+    QDeclarativeTextEdit *textEditObject = view->rootObject()->findChild<QDeclarativeTextEdit*>("textEditObject");
     QVERIFY(textEditObject != 0);
-    QVERIFY(textEditObject->findChild<QmlGraphicsItem*>("cursorInstance"));
+    QVERIFY(textEditObject->findChild<QDeclarativeItem*>("cursorInstance"));
     //Test Delegate gets created
     textEditObject->setFocus(true);
-    QmlGraphicsItem* delegateObject = textEditObject->findChild<QmlGraphicsItem*>("cursorInstance");
+    QDeclarativeItem* delegateObject = textEditObject->findChild<QDeclarativeItem*>("cursorInstance");
     QVERIFY(delegateObject);
     //Test Delegate gets moved
     for(int i=0; i<= textEditObject->text().length(); i++){
@@ -638,7 +638,7 @@ void tst_qmlgraphicstextedit::cursorDelegate()
     QCOMPARE(textEditObject->cursorRect().y(), qRound(delegateObject->y()));
     //Test Delegate gets deleted
     textEditObject->setCursorDelegate(0);
-    QVERIFY(!textEditObject->findChild<QmlGraphicsItem*>("cursorInstance"));
+    QVERIFY(!textEditObject->findChild<QDeclarativeItem*>("cursorInstance"));
 }
 
 void tst_qmlgraphicstextedit::delegateLoading()
@@ -647,19 +647,19 @@ void tst_qmlgraphicstextedit::delegateLoading()
     server.serveDirectory(SRCDIR "/data/httpfail", TestHTTPServer::Disconnect);
     server.serveDirectory(SRCDIR "/data/httpslow", TestHTTPServer::Delay);
     server.serveDirectory(SRCDIR "/data/http");
-    QmlView* view = new QmlView(0);
+    QDeclarativeView* view = new QDeclarativeView(0);
     view->setSource(QUrl("http://localhost:42332/cursorHttpTestPass.qml"));
     view->show();
     view->setFocus();
     QTRY_VERIFY(view->rootObject());//Wait for loading to finish.
-    QmlGraphicsTextEdit *textEditObject = view->rootObject()->findChild<QmlGraphicsTextEdit*>("textEditObject");
+    QDeclarativeTextEdit *textEditObject = view->rootObject()->findChild<QDeclarativeTextEdit*>("textEditObject");
     //    view->rootObject()->dumpObjectTree();
     QVERIFY(textEditObject != 0);
     textEditObject->setFocus(true);
-    QmlGraphicsItem *delegate;
-    delegate = view->rootObject()->findChild<QmlGraphicsItem*>("delegateOkay");
+    QDeclarativeItem *delegate;
+    delegate = view->rootObject()->findChild<QDeclarativeItem*>("delegateOkay");
     QVERIFY(delegate);
-    delegate = view->rootObject()->findChild<QmlGraphicsItem*>("delegateSlow");
+    delegate = view->rootObject()->findChild<QDeclarativeItem*>("delegateSlow");
     QVERIFY(delegate);
     view->setSource(QUrl("http://localhost:42332/cursorHttpTestFail1.qml"));
     view->show();
@@ -670,9 +670,9 @@ void tst_qmlgraphicstextedit::delegateLoading()
     view->setFocus();
     QTRY_VERIFY(!view->rootObject()); // there is fail item inside this test
     //ErrorB should get a component which is ready but component.create() returns null
-    //Not sure how to accomplish this with QmlGraphicsTextEdits cursor delegate
+    //Not sure how to accomplish this with QDeclarativeTextEdits cursor delegate
     //###This could be a case of overzealous defensive programming
-    //delegate = view->rootObject()->findChild<QmlGraphicsItem*>("delegateErrorB");
+    //delegate = view->rootObject()->findChild<QDeclarativeItem*>("delegateErrorB");
     //QVERIFY(!delegate);
 }
 
@@ -682,13 +682,13 @@ the extent of the text, then they should ignore the keys.
 */
 void tst_qmlgraphicstextedit::navigation()
 {
-    QmlView *canvas = createView(SRCDIR "/data/navigation.qml");
+    QDeclarativeView *canvas = createView(SRCDIR "/data/navigation.qml");
     canvas->show();
     canvas->setFocus();
 
     QVERIFY(canvas->rootObject() != 0);
 
-    QmlGraphicsItem *input = qobject_cast<QmlGraphicsItem *>(qvariant_cast<QObject *>(canvas->rootObject()->property("myInput")));
+    QDeclarativeItem *input = qobject_cast<QDeclarativeItem *>(qvariant_cast<QObject *>(canvas->rootObject()->property("myInput")));
 
     QVERIFY(input != 0);
     QTRY_VERIFY(input->hasFocus() == true);
@@ -704,13 +704,13 @@ void tst_qmlgraphicstextedit::navigation()
 
 void tst_qmlgraphicstextedit::readOnly()
 {
-    QmlView *canvas = createView(SRCDIR "/data/readOnly.qml");
+    QDeclarativeView *canvas = createView(SRCDIR "/data/readOnly.qml");
     canvas->show();
     canvas->setFocus();
 
     QVERIFY(canvas->rootObject() != 0);
 
-    QmlGraphicsTextEdit *edit = qobject_cast<QmlGraphicsTextEdit *>(qvariant_cast<QObject *>(canvas->rootObject()->property("myInput")));
+    QDeclarativeTextEdit *edit = qobject_cast<QDeclarativeTextEdit *>(qvariant_cast<QObject *>(canvas->rootObject()->property("myInput")));
 
     QVERIFY(edit != 0);
     QTRY_VERIFY(edit->hasFocus() == true);
@@ -724,7 +724,7 @@ void tst_qmlgraphicstextedit::readOnly()
     QCOMPARE(edit->text(), initial);
 }
 
-void tst_qmlgraphicstextedit::simulateKey(QmlView *view, int key)
+void tst_qmlgraphicstextedit::simulateKey(QDeclarativeView *view, int key)
 {
     QKeyEvent press(QKeyEvent::KeyPress, key, 0);
     QKeyEvent release(QKeyEvent::KeyRelease, key, 0);
@@ -733,9 +733,9 @@ void tst_qmlgraphicstextedit::simulateKey(QmlView *view, int key)
     QApplication::sendEvent(view, &release);
 }
 
-QmlView *tst_qmlgraphicstextedit::createView(const QString &filename)
+QDeclarativeView *tst_qmlgraphicstextedit::createView(const QString &filename)
 {
-    QmlView *canvas = new QmlView(0);
+    QDeclarativeView *canvas = new QDeclarativeView(0);
 
     canvas->setSource(QUrl::fromLocalFile(filename));
     return canvas;
@@ -773,7 +773,7 @@ void tst_qmlgraphicstextedit::sendRequestSoftwareInputPanelEvent()
             view.style()->styleHint(QStyle::SH_RequestSoftwareInputPanel));
     if ((behavior != QStyle::RSIP_OnMouseClick))
         QSKIP("This test need to have a style with RSIP_OnMouseClick", SkipSingle);
-    QmlGraphicsTextEdit edit;
+    QDeclarativeTextEdit edit;
     edit.setText("Hello world");
     edit.setPos(0, 0);
     scene.addItem(&edit);
@@ -788,4 +788,4 @@ void tst_qmlgraphicstextedit::sendRequestSoftwareInputPanelEvent()
 }
 QTEST_MAIN(tst_qmlgraphicstextedit)
 
-#include "tst_qmlgraphicstextedit.moc"
+#include "tst_qdeclarativetextedit.moc"
diff --git a/tests/auto/declarative/qmlgraphicstextinput/data/cursorTest.qml b/tests/auto/declarative/qdeclarativetextinput/data/cursorTest.qml
index ddc98cc..ddc98cc 100644
--- a/tests/auto/declarative/qmlgraphicstextinput/data/cursorTest.qml
+++ b/tests/auto/declarative/qdeclarativetextinput/data/cursorTest.qml
diff --git a/tests/auto/declarative/qmlgraphicstextinput/data/inputmethodhints.qml b/tests/auto/declarative/qdeclarativetextinput/data/inputmethodhints.qml
index b404682..b404682 100644
--- a/tests/auto/declarative/qmlgraphicstextinput/data/inputmethodhints.qml
+++ b/tests/auto/declarative/qdeclarativetextinput/data/inputmethodhints.qml
diff --git a/tests/auto/declarative/qmlgraphicstextinput/data/masks.qml b/tests/auto/declarative/qdeclarativetextinput/data/masks.qml
index 08a857c..08a857c 100644
--- a/tests/auto/declarative/qmlgraphicstextinput/data/masks.qml
+++ b/tests/auto/declarative/qdeclarativetextinput/data/masks.qml
diff --git a/tests/auto/declarative/qmlgraphicstextinput/data/maxLength.qml b/tests/auto/declarative/qdeclarativetextinput/data/maxLength.qml
index 7cbeadd..7cbeadd 100644
--- a/tests/auto/declarative/qmlgraphicstextinput/data/maxLength.qml
+++ b/tests/auto/declarative/qdeclarativetextinput/data/maxLength.qml
diff --git a/tests/auto/declarative/qmlgraphicstextinput/data/navigation.qml b/tests/auto/declarative/qdeclarativetextinput/data/navigation.qml
index 493db5b..493db5b 100644
--- a/tests/auto/declarative/qmlgraphicstextinput/data/navigation.qml
+++ b/tests/auto/declarative/qdeclarativetextinput/data/navigation.qml
diff --git a/tests/auto/declarative/qmlgraphicstextinput/data/readOnly.qml b/tests/auto/declarative/qdeclarativetextinput/data/readOnly.qml
index c47371a..c47371a 100644
--- a/tests/auto/declarative/qmlgraphicstextinput/data/readOnly.qml
+++ b/tests/auto/declarative/qdeclarativetextinput/data/readOnly.qml
diff --git a/tests/auto/declarative/qmlgraphicstextinput/data/validators.qml b/tests/auto/declarative/qdeclarativetextinput/data/validators.qml
index 0c81548..0c81548 100644
--- a/tests/auto/declarative/qmlgraphicstextinput/data/validators.qml
+++ b/tests/auto/declarative/qdeclarativetextinput/data/validators.qml
diff --git a/tests/auto/declarative/qdeclarativetextinput/qdeclarativetextinput.pro b/tests/auto/declarative/qdeclarativetextinput/qdeclarativetextinput.pro
new file mode 100644
index 0000000..5aed51f
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativetextinput/qdeclarativetextinput.pro
@@ -0,0 +1,8 @@
+load(qttest_p4)
+contains(QT_CONFIG,declarative): QT += declarative gui
+macx:CONFIG -= app_bundle
+
+SOURCES += tst_qdeclarativetextinput.cpp
+
+# Define SRCDIR equal to test's source directory
+DEFINES += SRCDIR=\\\"$$PWD\\\"
diff --git a/tests/auto/declarative/qmlgraphicstextinput/tst_qmlgraphicstextinput.cpp b/tests/auto/declarative/qdeclarativetextinput/tst_qdeclarativetextinput.cpp
index 748cf5e..5b98455 100644
--- a/tests/auto/declarative/qmlgraphicstextinput/tst_qmlgraphicstextinput.cpp
+++ b/tests/auto/declarative/qdeclarativetextinput/tst_qdeclarativetextinput.cpp
@@ -40,10 +40,10 @@
 ****************************************************************************/
 #include <qtest.h>
 #include "../../../shared/util.h"
-#include <QtDeclarative/qmlengine.h>
+#include <QtDeclarative/qdeclarativeengine.h>
 #include <QFile>
-#include <QtDeclarative/qmlview.h>
-#include <private/qmlgraphicstextinput_p.h>
+#include <QtDeclarative/qdeclarativeview.h>
+#include <private/qdeclarativetextinput_p.h>
 #include <QDebug>
 #include <QStyle>
 #include <QInputContext>
@@ -74,10 +74,10 @@ private slots:
     void sendRequestSoftwareInputPanelEvent();
 
 private:
-    void simulateKey(QmlView *, int key);
-    QmlView *createView(const QString &filename);
+    void simulateKey(QDeclarativeView *, int key);
+    QDeclarativeView *createView(const QString &filename);
 
-    QmlEngine engine;
+    QDeclarativeEngine engine;
     QStringList standard;
     QStringList colorStrings;
 };
@@ -105,9 +105,9 @@ tst_qmlgraphicstextinput::tst_qmlgraphicstextinput()
 void tst_qmlgraphicstextinput::text()
 {
     {
-        QmlComponent textinputComponent(&engine);
+        QDeclarativeComponent textinputComponent(&engine);
         textinputComponent.setData("import Qt 4.6\nTextInput {  text: \"\"  }", QUrl());
-        QmlGraphicsTextInput *textinputObject = qobject_cast<QmlGraphicsTextInput*>(textinputComponent.create());
+        QDeclarativeTextInput *textinputObject = qobject_cast<QDeclarativeTextInput*>(textinputComponent.create());
 
         QVERIFY(textinputObject != 0);
         QCOMPARE(textinputObject->text(), QString(""));
@@ -116,9 +116,9 @@ void tst_qmlgraphicstextinput::text()
     for (int i = 0; i < standard.size(); i++)
     {
         QString componentStr = "import Qt 4.6\nTextInput { text: \"" + standard.at(i) + "\" }";
-        QmlComponent textinputComponent(&engine);
+        QDeclarativeComponent textinputComponent(&engine);
         textinputComponent.setData(componentStr.toLatin1(), QUrl());
-        QmlGraphicsTextInput *textinputObject = qobject_cast<QmlGraphicsTextInput*>(textinputComponent.create());
+        QDeclarativeTextInput *textinputObject = qobject_cast<QDeclarativeTextInput*>(textinputComponent.create());
 
         QVERIFY(textinputObject != 0);
         QCOMPARE(textinputObject->text(), standard.at(i));
@@ -130,9 +130,9 @@ void tst_qmlgraphicstextinput::width()
 {
     // uses Font metrics to find the width for standard
     {
-        QmlComponent textinputComponent(&engine);
+        QDeclarativeComponent textinputComponent(&engine);
         textinputComponent.setData("import Qt 4.6\nTextInput {  text: \"\" }", QUrl());
-        QmlGraphicsTextInput *textinputObject = qobject_cast<QmlGraphicsTextInput*>(textinputComponent.create());
+        QDeclarativeTextInput *textinputObject = qobject_cast<QDeclarativeTextInput*>(textinputComponent.create());
 
         QVERIFY(textinputObject != 0);
         QCOMPARE(textinputObject->width(), 1.);//1 for the cursor
@@ -145,9 +145,9 @@ void tst_qmlgraphicstextinput::width()
         qreal metricWidth = fm.width(standard.at(i));
 
         QString componentStr = "import Qt 4.6\nTextInput { text: \"" + standard.at(i) + "\" }";
-        QmlComponent textinputComponent(&engine);
+        QDeclarativeComponent textinputComponent(&engine);
         textinputComponent.setData(componentStr.toLatin1(), QUrl());
-        QmlGraphicsTextInput *textinputObject = qobject_cast<QmlGraphicsTextInput*>(textinputComponent.create());
+        QDeclarativeTextInput *textinputObject = qobject_cast<QDeclarativeTextInput*>(textinputComponent.create());
 
         QVERIFY(textinputObject != 0);
         QCOMPARE(textinputObject->width(), qreal(metricWidth) + 1.);//1 for the cursor
@@ -159,9 +159,9 @@ void tst_qmlgraphicstextinput::font()
     //test size, then bold, then italic, then family
     { 
         QString componentStr = "import Qt 4.6\nTextInput {  font.pointSize: 40; text: \"Hello World\" }";
-        QmlComponent textinputComponent(&engine);
+        QDeclarativeComponent textinputComponent(&engine);
         textinputComponent.setData(componentStr.toLatin1(), QUrl());
-        QmlGraphicsTextInput *textinputObject = qobject_cast<QmlGraphicsTextInput*>(textinputComponent.create());
+        QDeclarativeTextInput *textinputObject = qobject_cast<QDeclarativeTextInput*>(textinputComponent.create());
 
         QVERIFY(textinputObject != 0);
         QCOMPARE(textinputObject->font().pointSize(), 40);
@@ -171,9 +171,9 @@ void tst_qmlgraphicstextinput::font()
 
     { 
         QString componentStr = "import Qt 4.6\nTextInput {  font.bold: true; text: \"Hello World\" }";
-        QmlComponent textinputComponent(&engine);
+        QDeclarativeComponent textinputComponent(&engine);
         textinputComponent.setData(componentStr.toLatin1(), QUrl());
-        QmlGraphicsTextInput *textinputObject = qobject_cast<QmlGraphicsTextInput*>(textinputComponent.create());
+        QDeclarativeTextInput *textinputObject = qobject_cast<QDeclarativeTextInput*>(textinputComponent.create());
 
         QVERIFY(textinputObject != 0);
         QCOMPARE(textinputObject->font().bold(), true);
@@ -182,9 +182,9 @@ void tst_qmlgraphicstextinput::font()
 
     { 
         QString componentStr = "import Qt 4.6\nTextInput {  font.italic: true; text: \"Hello World\" }";
-        QmlComponent textinputComponent(&engine);
+        QDeclarativeComponent textinputComponent(&engine);
         textinputComponent.setData(componentStr.toLatin1(), QUrl());
-        QmlGraphicsTextInput *textinputObject = qobject_cast<QmlGraphicsTextInput*>(textinputComponent.create());
+        QDeclarativeTextInput *textinputObject = qobject_cast<QDeclarativeTextInput*>(textinputComponent.create());
 
         QVERIFY(textinputObject != 0);
         QCOMPARE(textinputObject->font().italic(), true);
@@ -193,9 +193,9 @@ void tst_qmlgraphicstextinput::font()
  
     { 
         QString componentStr = "import Qt 4.6\nTextInput {  font.family: \"Helvetica\"; text: \"Hello World\" }";
-        QmlComponent textinputComponent(&engine);
+        QDeclarativeComponent textinputComponent(&engine);
         textinputComponent.setData(componentStr.toLatin1(), QUrl());
-        QmlGraphicsTextInput *textinputObject = qobject_cast<QmlGraphicsTextInput*>(textinputComponent.create());
+        QDeclarativeTextInput *textinputObject = qobject_cast<QDeclarativeTextInput*>(textinputComponent.create());
 
         QVERIFY(textinputObject != 0);
         QCOMPARE(textinputObject->font().family(), QString("Helvetica"));
@@ -205,9 +205,9 @@ void tst_qmlgraphicstextinput::font()
 
     { 
         QString componentStr = "import Qt 4.6\nTextInput {  font.family: \"\"; text: \"Hello World\" }";
-        QmlComponent textinputComponent(&engine);
+        QDeclarativeComponent textinputComponent(&engine);
         textinputComponent.setData(componentStr.toLatin1(), QUrl());
-        QmlGraphicsTextInput *textinputObject = qobject_cast<QmlGraphicsTextInput*>(textinputComponent.create());
+        QDeclarativeTextInput *textinputObject = qobject_cast<QDeclarativeTextInput*>(textinputComponent.create());
 
         QVERIFY(textinputObject != 0);
         QCOMPARE(textinputObject->font().family(), QString(""));
@@ -220,9 +220,9 @@ void tst_qmlgraphicstextinput::color()
     for (int i = 0; i < colorStrings.size(); i++)
     { 
         QString componentStr = "import Qt 4.6\nTextInput {  color: \"" + colorStrings.at(i) + "\"; text: \"Hello World\" }";
-        QmlComponent textinputComponent(&engine);
+        QDeclarativeComponent textinputComponent(&engine);
         textinputComponent.setData(componentStr.toLatin1(), QUrl());
-        QmlGraphicsTextInput *textinputObject = qobject_cast<QmlGraphicsTextInput*>(textinputComponent.create());
+        QDeclarativeTextInput *textinputObject = qobject_cast<QDeclarativeTextInput*>(textinputComponent.create());
         QVERIFY(textinputObject != 0);
         QCOMPARE(textinputObject->color(), QColor(colorStrings.at(i)));
     }
@@ -231,9 +231,9 @@ void tst_qmlgraphicstextinput::color()
     for (int i = 0; i < colorStrings.size(); i++)
     {
         QString componentStr = "import Qt 4.6\nTextInput {  selectionColor: \"" + colorStrings.at(i) + "\"; text: \"Hello World\" }";
-        QmlComponent textinputComponent(&engine);
+        QDeclarativeComponent textinputComponent(&engine);
         textinputComponent.setData(componentStr.toLatin1(), QUrl());
-        QmlGraphicsTextInput *textinputObject = qobject_cast<QmlGraphicsTextInput*>(textinputComponent.create());
+        QDeclarativeTextInput *textinputObject = qobject_cast<QDeclarativeTextInput*>(textinputComponent.create());
         QVERIFY(textinputObject != 0);
         QCOMPARE(textinputObject->selectionColor(), QColor(colorStrings.at(i)));
     }
@@ -242,9 +242,9 @@ void tst_qmlgraphicstextinput::color()
     for (int i = 0; i < colorStrings.size(); i++)
     { 
         QString componentStr = "import Qt 4.6\nTextInput {  selectedTextColor: \"" + colorStrings.at(i) + "\"; text: \"Hello World\" }";
-        QmlComponent textinputComponent(&engine);
+        QDeclarativeComponent textinputComponent(&engine);
         textinputComponent.setData(componentStr.toLatin1(), QUrl());
-        QmlGraphicsTextInput *textinputObject = qobject_cast<QmlGraphicsTextInput*>(textinputComponent.create());
+        QDeclarativeTextInput *textinputObject = qobject_cast<QDeclarativeTextInput*>(textinputComponent.create());
         QVERIFY(textinputObject != 0);
         QCOMPARE(textinputObject->selectedTextColor(), QColor(colorStrings.at(i)));
     }
@@ -255,9 +255,9 @@ void tst_qmlgraphicstextinput::color()
         testColor.setAlpha(170);
 
         QString componentStr = "import Qt 4.6\nTextInput {  color: \"" + colorStr + "\"; text: \"Hello World\" }";
-        QmlComponent textinputComponent(&engine);
+        QDeclarativeComponent textinputComponent(&engine);
         textinputComponent.setData(componentStr.toLatin1(), QUrl());
-        QmlGraphicsTextInput *textinputObject = qobject_cast<QmlGraphicsTextInput*>(textinputComponent.create());
+        QDeclarativeTextInput *textinputObject = qobject_cast<QDeclarativeTextInput*>(textinputComponent.create());
 
         QVERIFY(textinputObject != 0);
         QCOMPARE(textinputObject->color(), testColor);
@@ -268,9 +268,9 @@ void tst_qmlgraphicstextinput::selection()
 {
     QString testStr = standard[0];
     QString componentStr = "import Qt 4.6\nTextInput {  text: \""+ testStr +"\"; }";
-    QmlComponent textinputComponent(&engine);
+    QDeclarativeComponent textinputComponent(&engine);
     textinputComponent.setData(componentStr.toLatin1(), QUrl());
-    QmlGraphicsTextInput *textinputObject = qobject_cast<QmlGraphicsTextInput*>(textinputComponent.create());
+    QDeclarativeTextInput *textinputObject = qobject_cast<QDeclarativeTextInput*>(textinputComponent.create());
     QVERIFY(textinputObject != 0);
 
 
@@ -348,11 +348,11 @@ void tst_qmlgraphicstextinput::selection()
 void tst_qmlgraphicstextinput::maxLength()
 {
     //QString componentStr = "import Qt 4.6\nTextInput {  maximumLength: 10; }";
-    QmlView *canvas = createView(SRCDIR "/data/maxLength.qml");
+    QDeclarativeView *canvas = createView(SRCDIR "/data/maxLength.qml");
     canvas->show();
     canvas->setFocus();
     QVERIFY(canvas->rootObject() != 0);
-    QmlGraphicsTextInput *textinputObject = qobject_cast<QmlGraphicsTextInput *>(canvas->rootObject());
+    QDeclarativeTextInput *textinputObject = qobject_cast<QDeclarativeTextInput *>(canvas->rootObject());
     QVERIFY(textinputObject != 0);
     QVERIFY(textinputObject->text().isEmpty());
     QVERIFY(textinputObject->maxLength() == 10);
@@ -376,11 +376,11 @@ void tst_qmlgraphicstextinput::masks()
 {
     //Not a comprehensive test of the possible masks, that's done elsewhere (QLineEdit)
     //QString componentStr = "import Qt 4.6\nTextInput {  inputMask: 'HHHHhhhh'; }";
-    QmlView *canvas = createView(SRCDIR "/data/masks.qml");
+    QDeclarativeView *canvas = createView(SRCDIR "/data/masks.qml");
     canvas->show();
     canvas->setFocus();
     QVERIFY(canvas->rootObject() != 0);
-    QmlGraphicsTextInput *textinputObject = qobject_cast<QmlGraphicsTextInput *>(canvas->rootObject());
+    QDeclarativeTextInput *textinputObject = qobject_cast<QDeclarativeTextInput *>(canvas->rootObject());
     QVERIFY(textinputObject != 0);
     QTRY_VERIFY(textinputObject->hasFocus() == true);
     QVERIFY(textinputObject->text().length() == 0);
@@ -400,13 +400,13 @@ void tst_qmlgraphicstextinput::validators()
     // so you may need to run their tests first. All validators are checked
     // here to ensure that their exposure to QML is working.
 
-    QmlView *canvas = createView(SRCDIR "/data/validators.qml");
+    QDeclarativeView *canvas = createView(SRCDIR "/data/validators.qml");
     canvas->show();
     canvas->setFocus();
 
     QVERIFY(canvas->rootObject() != 0);
 
-    QmlGraphicsTextInput *intInput = qobject_cast<QmlGraphicsTextInput *>(qvariant_cast<QObject *>(canvas->rootObject()->property("intInput")));
+    QDeclarativeTextInput *intInput = qobject_cast<QDeclarativeTextInput *>(qvariant_cast<QObject *>(canvas->rootObject()->property("intInput")));
     QVERIFY(intInput);
     intInput->setFocus(true);
     QTRY_VERIFY(intInput->hasFocus());
@@ -427,7 +427,7 @@ void tst_qmlgraphicstextinput::validators()
     QCOMPARE(intInput->text(), QLatin1String("11"));
     QCOMPARE(intInput->hasAcceptableInput(), true);
 
-    QmlGraphicsTextInput *dblInput = qobject_cast<QmlGraphicsTextInput *>(qvariant_cast<QObject *>(canvas->rootObject()->property("dblInput")));
+    QDeclarativeTextInput *dblInput = qobject_cast<QDeclarativeTextInput *>(qvariant_cast<QObject *>(canvas->rootObject()->property("dblInput")));
     QTRY_VERIFY(dblInput);
     dblInput->setFocus(true);
     QVERIFY(dblInput->hasFocus() == true);
@@ -456,7 +456,7 @@ void tst_qmlgraphicstextinput::validators()
     QCOMPARE(dblInput->text(), QLatin1String("12.11"));
     QCOMPARE(dblInput->hasAcceptableInput(), true);
 
-    QmlGraphicsTextInput *strInput = qobject_cast<QmlGraphicsTextInput *>(qvariant_cast<QObject *>(canvas->rootObject()->property("strInput")));
+    QDeclarativeTextInput *strInput = qobject_cast<QDeclarativeTextInput *>(qvariant_cast<QObject *>(canvas->rootObject()->property("strInput")));
     QTRY_VERIFY(strInput);
     strInput->setFocus(true);
     QVERIFY(strInput->hasFocus() == true);
@@ -489,12 +489,12 @@ void tst_qmlgraphicstextinput::validators()
 
 void tst_qmlgraphicstextinput::inputMethodHints()
 {
-    QmlView *canvas = createView(SRCDIR "/data/inputmethodhints.qml");
+    QDeclarativeView *canvas = createView(SRCDIR "/data/inputmethodhints.qml");
     canvas->show();
     canvas->setFocus();
 
     QVERIFY(canvas->rootObject() != 0);
-    QmlGraphicsTextInput *textinputObject = qobject_cast<QmlGraphicsTextInput *>(canvas->rootObject());
+    QDeclarativeTextInput *textinputObject = qobject_cast<QDeclarativeTextInput *>(canvas->rootObject());
     QVERIFY(textinputObject != 0);
     QVERIFY(textinputObject->inputMethodHints() & Qt::ImhNoPredictiveText);
     textinputObject->setInputMethodHints(Qt::ImhUppercaseOnly);
@@ -508,13 +508,13 @@ the extent of the text, then they should ignore the keys.
 */
 void tst_qmlgraphicstextinput::navigation()
 {
-    QmlView *canvas = createView(SRCDIR "/data/navigation.qml");
+    QDeclarativeView *canvas = createView(SRCDIR "/data/navigation.qml");
     canvas->show();
     canvas->setFocus();
 
     QVERIFY(canvas->rootObject() != 0);
 
-    QmlGraphicsTextInput *input = qobject_cast<QmlGraphicsTextInput *>(qvariant_cast<QObject *>(canvas->rootObject()->property("myInput")));
+    QDeclarativeTextInput *input = qobject_cast<QDeclarativeTextInput *>(qvariant_cast<QObject *>(canvas->rootObject()->property("myInput")));
 
     QVERIFY(input != 0);
     input->setCursorPosition(0);
@@ -540,15 +540,15 @@ void tst_qmlgraphicstextinput::navigation()
 
 void tst_qmlgraphicstextinput::cursorDelegate()
 {
-    QmlView* view = createView(SRCDIR "/data/cursorTest.qml");
+    QDeclarativeView* view = createView(SRCDIR "/data/cursorTest.qml");
     view->show();
     view->setFocus();
-    QmlGraphicsTextInput *textInputObject = view->rootObject()->findChild<QmlGraphicsTextInput*>("textInputObject");
+    QDeclarativeTextInput *textInputObject = view->rootObject()->findChild<QDeclarativeTextInput*>("textInputObject");
     QVERIFY(textInputObject != 0);
-    QVERIFY(textInputObject->findChild<QmlGraphicsItem*>("cursorInstance"));
+    QVERIFY(textInputObject->findChild<QDeclarativeItem*>("cursorInstance"));
     //Test Delegate gets created
     textInputObject->setFocus(true);
-    QmlGraphicsItem* delegateObject = textInputObject->findChild<QmlGraphicsItem*>("cursorInstance");
+    QDeclarativeItem* delegateObject = textInputObject->findChild<QDeclarativeItem*>("cursorInstance");
     QVERIFY(delegateObject);
     //Test Delegate gets moved
     for(int i=0; i<= textInputObject->text().length(); i++){
@@ -562,18 +562,18 @@ void tst_qmlgraphicstextinput::cursorDelegate()
     QCOMPARE(textInputObject->cursorRect().y(), qRound(delegateObject->y()));
     //Test Delegate gets deleted
     textInputObject->setCursorDelegate(0);
-    QVERIFY(!textInputObject->findChild<QmlGraphicsItem*>("cursorInstance"));
+    QVERIFY(!textInputObject->findChild<QDeclarativeItem*>("cursorInstance"));
 }
 
 void tst_qmlgraphicstextinput::readOnly()
 {
-    QmlView *canvas = createView(SRCDIR "/data/readOnly.qml");
+    QDeclarativeView *canvas = createView(SRCDIR "/data/readOnly.qml");
     canvas->show();
     canvas->setFocus();
 
     QVERIFY(canvas->rootObject() != 0);
 
-    QmlGraphicsTextInput *input = qobject_cast<QmlGraphicsTextInput *>(qvariant_cast<QObject *>(canvas->rootObject()->property("myInput")));
+    QDeclarativeTextInput *input = qobject_cast<QDeclarativeTextInput *>(qvariant_cast<QObject *>(canvas->rootObject()->property("myInput")));
 
     QVERIFY(input != 0);
     QTRY_VERIFY(input->hasFocus() == true);
@@ -587,7 +587,7 @@ void tst_qmlgraphicstextinput::readOnly()
     QCOMPARE(input->text(), initial);
 }
 
-void tst_qmlgraphicstextinput::simulateKey(QmlView *view, int key)
+void tst_qmlgraphicstextinput::simulateKey(QDeclarativeView *view, int key)
 {
     QKeyEvent press(QKeyEvent::KeyPress, key, 0);
     QKeyEvent release(QKeyEvent::KeyRelease, key, 0);
@@ -596,9 +596,9 @@ void tst_qmlgraphicstextinput::simulateKey(QmlView *view, int key)
     QApplication::sendEvent(view, &release);
 }
 
-QmlView *tst_qmlgraphicstextinput::createView(const QString &filename)
+QDeclarativeView *tst_qmlgraphicstextinput::createView(const QString &filename)
 {
-    QmlView *canvas = new QmlView(0);
+    QDeclarativeView *canvas = new QDeclarativeView(0);
 
     canvas->setSource(QUrl::fromLocalFile(filename));
 
@@ -637,7 +637,7 @@ void tst_qmlgraphicstextinput::sendRequestSoftwareInputPanelEvent()
             view.style()->styleHint(QStyle::SH_RequestSoftwareInputPanel));
     if ((behavior != QStyle::RSIP_OnMouseClick))
         QSKIP("This test need to have a style with RSIP_OnMouseClick", SkipSingle);
-    QmlGraphicsTextInput input;
+    QDeclarativeTextInput input;
     input.setText("Hello world");
     input.setPos(0, 0);
     scene.addItem(&input);
@@ -653,4 +653,4 @@ void tst_qmlgraphicstextinput::sendRequestSoftwareInputPanelEvent()
 
 QTEST_MAIN(tst_qmlgraphicstextinput)
 
-#include "tst_qmlgraphicstextinput.moc"
+#include "tst_qdeclarativetextinput.moc"
diff --git a/tests/auto/declarative/qmltimer/qmltimer.pro b/tests/auto/declarative/qdeclarativetimer/qdeclarativetimer.pro
index 2b244ed..b162739 100644
--- a/tests/auto/declarative/qmltimer/qmltimer.pro
+++ b/tests/auto/declarative/qdeclarativetimer/qdeclarativetimer.pro
@@ -2,6 +2,6 @@ load(qttest_p4)
 contains(QT_CONFIG,declarative): QT += declarative gui
 macx:CONFIG -= app_bundle
 
-SOURCES += tst_qmltimer.cpp
+SOURCES += tst_qdeclarativetimer.cpp
 
 DEFINES += SRCDIR=\\\"$$PWD\\\"
diff --git a/tests/auto/declarative/qmltimer/tst_qmltimer.cpp b/tests/auto/declarative/qdeclarativetimer/tst_qdeclarativetimer.cpp
index b8b5e62..62c9e91 100644
--- a/tests/auto/declarative/qmltimer/tst_qmltimer.cpp
+++ b/tests/auto/declarative/qdeclarativetimer/tst_qdeclarativetimer.cpp
@@ -39,9 +39,9 @@
 **
 ****************************************************************************/
 #include <qtest.h>
-#include <QtDeclarative/qmlengine.h>
-#include <QtDeclarative/qmlcomponent.h>
-#include <private/qmltimer_p.h>
+#include <QtDeclarative/qdeclarativeengine.h>
+#include <QtDeclarative/qdeclarativecomponent.h>
+#include <private/qdeclarativetimer_p.h>
 #include <QDebug>
 
 class tst_qmltimer : public QObject
@@ -90,10 +90,10 @@ tst_qmltimer::tst_qmltimer()
 
 void tst_qmltimer::notRepeating()
 {
-    QmlEngine engine;
-    QmlComponent component(&engine);
+    QDeclarativeEngine engine;
+    QDeclarativeComponent component(&engine);
     component.setData(QByteArray("import Qt 4.6\nTimer { interval: 100; running: true }"), QUrl::fromLocalFile(""));
-    QmlTimer *timer = qobject_cast<QmlTimer*>(component.create());
+    QDeclarativeTimer *timer = qobject_cast<QDeclarativeTimer*>(component.create());
     QVERIFY(timer != 0);
     QVERIFY(timer->isRunning());
     QVERIFY(!timer->isRepeating());
@@ -111,10 +111,10 @@ void tst_qmltimer::notRepeating()
 
 void tst_qmltimer::notRepeatingStart()
 {
-    QmlEngine engine;
-    QmlComponent component(&engine);
+    QDeclarativeEngine engine;
+    QDeclarativeComponent component(&engine);
     component.setData(QByteArray("import Qt 4.6\nTimer { interval: 100 }"), QUrl::fromLocalFile(""));
-    QmlTimer *timer = qobject_cast<QmlTimer*>(component.create());
+    QDeclarativeTimer *timer = qobject_cast<QDeclarativeTimer*>(component.create());
     QVERIFY(timer != 0);
     QVERIFY(!timer->isRunning());
 
@@ -136,10 +136,10 @@ void tst_qmltimer::notRepeatingStart()
 
 void tst_qmltimer::repeat()
 {
-    QmlEngine engine;
-    QmlComponent component(&engine);
+    QDeclarativeEngine engine;
+    QDeclarativeComponent component(&engine);
     component.setData(QByteArray("import Qt 4.6\nTimer { interval: 100; repeat: true; running: true }"), QUrl::fromLocalFile(""));
-    QmlTimer *timer = qobject_cast<QmlTimer*>(component.create());
+    QDeclarativeTimer *timer = qobject_cast<QDeclarativeTimer*>(component.create());
     QVERIFY(timer != 0);
 
     TimerHelper helper;
@@ -166,10 +166,10 @@ void tst_qmltimer::repeat()
 
 void tst_qmltimer::triggeredOnStart()
 {
-    QmlEngine engine;
-    QmlComponent component(&engine);
+    QDeclarativeEngine engine;
+    QDeclarativeComponent component(&engine);
     component.setData(QByteArray("import Qt 4.6\nTimer { interval: 100; running: true; triggeredOnStart: true }"), QUrl::fromLocalFile(""));
-    QmlTimer *timer = qobject_cast<QmlTimer*>(component.create());
+    QDeclarativeTimer *timer = qobject_cast<QDeclarativeTimer*>(component.create());
     QVERIFY(timer != 0);
     QVERIFY(timer->triggeredOnStart());
 
@@ -189,10 +189,10 @@ void tst_qmltimer::triggeredOnStart()
 
 void tst_qmltimer::triggeredOnStartRepeat()
 {
-    QmlEngine engine;
-    QmlComponent component(&engine);
+    QDeclarativeEngine engine;
+    QDeclarativeComponent component(&engine);
     component.setData(QByteArray("import Qt 4.6\nTimer { interval: 100; running: true; triggeredOnStart: true; repeat: true }"), QUrl::fromLocalFile(""));
-    QmlTimer *timer = qobject_cast<QmlTimer*>(component.create());
+    QDeclarativeTimer *timer = qobject_cast<QDeclarativeTimer*>(component.create());
     QVERIFY(timer != 0);
 
     TimerHelper helper;
@@ -212,8 +212,8 @@ void tst_qmltimer::triggeredOnStartRepeat()
 
 void tst_qmltimer::noTriggerIfNotRunning()
 {
-    QmlEngine engine;
-    QmlComponent component(&engine);
+    QDeclarativeEngine engine;
+    QDeclarativeComponent component(&engine);
     component.setData(QByteArray(
         "import Qt 4.6\n"
         "Item { property bool ok: true\n"
@@ -231,10 +231,10 @@ void tst_qmltimer::noTriggerIfNotRunning()
 
 void tst_qmltimer::changeDuration()
 {
-    QmlEngine engine;
-    QmlComponent component(&engine);
+    QDeclarativeEngine engine;
+    QDeclarativeComponent component(&engine);
     component.setData(QByteArray("import Qt 4.6\nTimer { interval: 200; repeat: true; running: true }"), QUrl::fromLocalFile(""));
-    QmlTimer *timer = qobject_cast<QmlTimer*>(component.create());
+    QDeclarativeTimer *timer = qobject_cast<QDeclarativeTimer*>(component.create());
     QVERIFY(timer != 0);
 
     TimerHelper helper;
@@ -255,10 +255,10 @@ void tst_qmltimer::changeDuration()
 
 void tst_qmltimer::restart()
 {
-    QmlEngine engine;
-    QmlComponent component(&engine);
+    QDeclarativeEngine engine;
+    QDeclarativeComponent component(&engine);
     component.setData(QByteArray("import Qt 4.6\nTimer { interval: 500; repeat: true; running: true }"), QUrl::fromLocalFile(""));
-    QmlTimer *timer = qobject_cast<QmlTimer*>(component.create());
+    QDeclarativeTimer *timer = qobject_cast<QDeclarativeTimer*>(component.create());
     QVERIFY(timer != 0);
 
     TimerHelper helper;
@@ -282,4 +282,4 @@ void tst_qmltimer::restart()
 
 QTEST_MAIN(tst_qmltimer)
 
-#include "tst_qmltimer.moc"
+#include "tst_qdeclarativetimer.moc"
diff --git a/tests/auto/declarative/qmlvaluetypes/data/autoBindingRemoval.2.qml b/tests/auto/declarative/qdeclarativevaluetypes/data/autoBindingRemoval.2.qml
index ce2e82d..ce2e82d 100644
--- a/tests/auto/declarative/qmlvaluetypes/data/autoBindingRemoval.2.qml
+++ b/tests/auto/declarative/qdeclarativevaluetypes/data/autoBindingRemoval.2.qml
diff --git a/tests/auto/declarative/qmlvaluetypes/data/autoBindingRemoval.3.qml b/tests/auto/declarative/qdeclarativevaluetypes/data/autoBindingRemoval.3.qml
index c82b533..c82b533 100644
--- a/tests/auto/declarative/qmlvaluetypes/data/autoBindingRemoval.3.qml
+++ b/tests/auto/declarative/qdeclarativevaluetypes/data/autoBindingRemoval.3.qml
diff --git a/tests/auto/declarative/qmlvaluetypes/data/autoBindingRemoval.qml b/tests/auto/declarative/qdeclarativevaluetypes/data/autoBindingRemoval.qml
index a8a72f5..a8a72f5 100644
--- a/tests/auto/declarative/qmlvaluetypes/data/autoBindingRemoval.qml
+++ b/tests/auto/declarative/qdeclarativevaluetypes/data/autoBindingRemoval.qml
diff --git a/tests/auto/declarative/qmlvaluetypes/data/bindingAssignment.qml b/tests/auto/declarative/qdeclarativevaluetypes/data/bindingAssignment.qml
index a652186..a652186 100644
--- a/tests/auto/declarative/qmlvaluetypes/data/bindingAssignment.qml
+++ b/tests/auto/declarative/qdeclarativevaluetypes/data/bindingAssignment.qml
diff --git a/tests/auto/declarative/qmlvaluetypes/data/bindingConflict.qml b/tests/auto/declarative/qdeclarativevaluetypes/data/bindingConflict.qml
index fd25c9f..fd25c9f 100644
--- a/tests/auto/declarative/qmlvaluetypes/data/bindingConflict.qml
+++ b/tests/auto/declarative/qdeclarativevaluetypes/data/bindingConflict.qml
diff --git a/tests/auto/declarative/qmlvaluetypes/data/bindingRead.qml b/tests/auto/declarative/qdeclarativevaluetypes/data/bindingRead.qml
index 538d776..538d776 100644
--- a/tests/auto/declarative/qmlvaluetypes/data/bindingRead.qml
+++ b/tests/auto/declarative/qdeclarativevaluetypes/data/bindingRead.qml
diff --git a/tests/auto/declarative/qmlvaluetypes/data/bindingVariantCopy.qml b/tests/auto/declarative/qdeclarativevaluetypes/data/bindingVariantCopy.qml
index 691a56c..691a56c 100644
--- a/tests/auto/declarative/qmlvaluetypes/data/bindingVariantCopy.qml
+++ b/tests/auto/declarative/qdeclarativevaluetypes/data/bindingVariantCopy.qml
diff --git a/tests/auto/declarative/qmlvaluetypes/data/deletedObject.js b/tests/auto/declarative/qdeclarativevaluetypes/data/deletedObject.js
index af298ff..af298ff 100644
--- a/tests/auto/declarative/qmlvaluetypes/data/deletedObject.js
+++ b/tests/auto/declarative/qdeclarativevaluetypes/data/deletedObject.js
diff --git a/tests/auto/declarative/qmlvaluetypes/data/deletedObject.qml b/tests/auto/declarative/qdeclarativevaluetypes/data/deletedObject.qml
index 05459f4..05459f4 100644
--- a/tests/auto/declarative/qmlvaluetypes/data/deletedObject.qml
+++ b/tests/auto/declarative/qdeclarativevaluetypes/data/deletedObject.qml
diff --git a/tests/auto/declarative/qmlvaluetypes/data/enums.1.qml b/tests/auto/declarative/qdeclarativevaluetypes/data/enums.1.qml
index 0eadd50..0eadd50 100644
--- a/tests/auto/declarative/qmlvaluetypes/data/enums.1.qml
+++ b/tests/auto/declarative/qdeclarativevaluetypes/data/enums.1.qml
diff --git a/tests/auto/declarative/qmlvaluetypes/data/enums.2.qml b/tests/auto/declarative/qdeclarativevaluetypes/data/enums.2.qml
index 81f1c92..81f1c92 100644
--- a/tests/auto/declarative/qmlvaluetypes/data/enums.2.qml
+++ b/tests/auto/declarative/qdeclarativevaluetypes/data/enums.2.qml
diff --git a/tests/auto/declarative/qmlvaluetypes/data/font_read.qml b/tests/auto/declarative/qdeclarativevaluetypes/data/font_read.qml
index e1d1ce0..e1d1ce0 100644
--- a/tests/auto/declarative/qmlvaluetypes/data/font_read.qml
+++ b/tests/auto/declarative/qdeclarativevaluetypes/data/font_read.qml
diff --git a/tests/auto/declarative/qmlvaluetypes/data/font_write.2.qml b/tests/auto/declarative/qdeclarativevaluetypes/data/font_write.2.qml
index b559389..b559389 100644
--- a/tests/auto/declarative/qmlvaluetypes/data/font_write.2.qml
+++ b/tests/auto/declarative/qdeclarativevaluetypes/data/font_write.2.qml
diff --git a/tests/auto/declarative/qmlvaluetypes/data/font_write.3.qml b/tests/auto/declarative/qdeclarativevaluetypes/data/font_write.3.qml
index 913ac50..913ac50 100644
--- a/tests/auto/declarative/qmlvaluetypes/data/font_write.3.qml
+++ b/tests/auto/declarative/qdeclarativevaluetypes/data/font_write.3.qml
diff --git a/tests/auto/declarative/qmlvaluetypes/data/font_write.qml b/tests/auto/declarative/qdeclarativevaluetypes/data/font_write.qml
index ff4d0a1..ff4d0a1 100644
--- a/tests/auto/declarative/qmlvaluetypes/data/font_write.qml
+++ b/tests/auto/declarative/qdeclarativevaluetypes/data/font_write.qml
diff --git a/tests/auto/declarative/qmlvaluetypes/data/point_read.qml b/tests/auto/declarative/qdeclarativevaluetypes/data/point_read.qml
index 3e67de6..3e67de6 100644
--- a/tests/auto/declarative/qmlvaluetypes/data/point_read.qml
+++ b/tests/auto/declarative/qdeclarativevaluetypes/data/point_read.qml
diff --git a/tests/auto/declarative/qmlvaluetypes/data/point_write.qml b/tests/auto/declarative/qdeclarativevaluetypes/data/point_write.qml
index 063525a..063525a 100644
--- a/tests/auto/declarative/qmlvaluetypes/data/point_write.qml
+++ b/tests/auto/declarative/qdeclarativevaluetypes/data/point_write.qml
diff --git a/tests/auto/declarative/qmlvaluetypes/data/pointf_read.qml b/tests/auto/declarative/qdeclarativevaluetypes/data/pointf_read.qml
index d845a5b..d845a5b 100644
--- a/tests/auto/declarative/qmlvaluetypes/data/pointf_read.qml
+++ b/tests/auto/declarative/qdeclarativevaluetypes/data/pointf_read.qml
diff --git a/tests/auto/declarative/qmlvaluetypes/data/pointf_write.qml b/tests/auto/declarative/qdeclarativevaluetypes/data/pointf_write.qml
index 9ee3fc1..9ee3fc1 100644
--- a/tests/auto/declarative/qmlvaluetypes/data/pointf_write.qml
+++ b/tests/auto/declarative/qdeclarativevaluetypes/data/pointf_write.qml
diff --git a/tests/auto/declarative/qmlvaluetypes/data/rect_read.qml b/tests/auto/declarative/qdeclarativevaluetypes/data/rect_read.qml
index 5364431..5364431 100644
--- a/tests/auto/declarative/qmlvaluetypes/data/rect_read.qml
+++ b/tests/auto/declarative/qdeclarativevaluetypes/data/rect_read.qml
diff --git a/tests/auto/declarative/qmlvaluetypes/data/rect_write.qml b/tests/auto/declarative/qdeclarativevaluetypes/data/rect_write.qml
index 8add453..8add453 100644
--- a/tests/auto/declarative/qmlvaluetypes/data/rect_write.qml
+++ b/tests/auto/declarative/qdeclarativevaluetypes/data/rect_write.qml
diff --git a/tests/auto/declarative/qmlvaluetypes/data/rectf_read.qml b/tests/auto/declarative/qdeclarativevaluetypes/data/rectf_read.qml
index aeb9f41..aeb9f41 100644
--- a/tests/auto/declarative/qmlvaluetypes/data/rectf_read.qml
+++ b/tests/auto/declarative/qdeclarativevaluetypes/data/rectf_read.qml
diff --git a/tests/auto/declarative/qmlvaluetypes/data/rectf_write.qml b/tests/auto/declarative/qdeclarativevaluetypes/data/rectf_write.qml
index 1e6ff4f..1e6ff4f 100644
--- a/tests/auto/declarative/qmlvaluetypes/data/rectf_write.qml
+++ b/tests/auto/declarative/qdeclarativevaluetypes/data/rectf_write.qml
diff --git a/tests/auto/declarative/qmlvaluetypes/data/scriptAccess.qml b/tests/auto/declarative/qdeclarativevaluetypes/data/scriptAccess.qml
index 96592eb..96592eb 100644
--- a/tests/auto/declarative/qmlvaluetypes/data/scriptAccess.qml
+++ b/tests/auto/declarative/qdeclarativevaluetypes/data/scriptAccess.qml
diff --git a/tests/auto/declarative/qmlvaluetypes/data/scriptVariantCopy.qml b/tests/auto/declarative/qdeclarativevaluetypes/data/scriptVariantCopy.qml
index 29157e8..29157e8 100644
--- a/tests/auto/declarative/qmlvaluetypes/data/scriptVariantCopy.qml
+++ b/tests/auto/declarative/qdeclarativevaluetypes/data/scriptVariantCopy.qml
diff --git a/tests/auto/declarative/qmlvaluetypes/data/size_read.qml b/tests/auto/declarative/qdeclarativevaluetypes/data/size_read.qml
index 86dba03..86dba03 100644
--- a/tests/auto/declarative/qmlvaluetypes/data/size_read.qml
+++ b/tests/auto/declarative/qdeclarativevaluetypes/data/size_read.qml
diff --git a/tests/auto/declarative/qmlvaluetypes/data/size_write.qml b/tests/auto/declarative/qdeclarativevaluetypes/data/size_write.qml
index 2f9d10e..2f9d10e 100644
--- a/tests/auto/declarative/qmlvaluetypes/data/size_write.qml
+++ b/tests/auto/declarative/qdeclarativevaluetypes/data/size_write.qml
diff --git a/tests/auto/declarative/qmlvaluetypes/data/sizef_read.qml b/tests/auto/declarative/qdeclarativevaluetypes/data/sizef_read.qml
index c6f34e4..c6f34e4 100644
--- a/tests/auto/declarative/qmlvaluetypes/data/sizef_read.qml
+++ b/tests/auto/declarative/qdeclarativevaluetypes/data/sizef_read.qml
diff --git a/tests/auto/declarative/qmlvaluetypes/data/sizef_write.qml b/tests/auto/declarative/qdeclarativevaluetypes/data/sizef_write.qml
index f16f0bd..f16f0bd 100644
--- a/tests/auto/declarative/qmlvaluetypes/data/sizef_write.qml
+++ b/tests/auto/declarative/qdeclarativevaluetypes/data/sizef_write.qml
diff --git a/tests/auto/declarative/qmlvaluetypes/data/staticAssignment.qml b/tests/auto/declarative/qdeclarativevaluetypes/data/staticAssignment.qml
index b687f89..b687f89 100644
--- a/tests/auto/declarative/qmlvaluetypes/data/staticAssignment.qml
+++ b/tests/auto/declarative/qdeclarativevaluetypes/data/staticAssignment.qml
diff --git a/tests/auto/declarative/qmlvaluetypes/data/valueInterceptors.qml b/tests/auto/declarative/qdeclarativevaluetypes/data/valueInterceptors.qml
index 026ae83..026ae83 100644
--- a/tests/auto/declarative/qmlvaluetypes/data/valueInterceptors.qml
+++ b/tests/auto/declarative/qdeclarativevaluetypes/data/valueInterceptors.qml
diff --git a/tests/auto/declarative/qmlvaluetypes/data/valueSources.qml b/tests/auto/declarative/qdeclarativevaluetypes/data/valueSources.qml
index d4d4391..d4d4391 100644
--- a/tests/auto/declarative/qmlvaluetypes/data/valueSources.qml
+++ b/tests/auto/declarative/qdeclarativevaluetypes/data/valueSources.qml
diff --git a/tests/auto/declarative/qmlvaluetypes/data/vector3d_read.qml b/tests/auto/declarative/qdeclarativevaluetypes/data/vector3d_read.qml
index abdf9f0..abdf9f0 100644
--- a/tests/auto/declarative/qmlvaluetypes/data/vector3d_read.qml
+++ b/tests/auto/declarative/qdeclarativevaluetypes/data/vector3d_read.qml
diff --git a/tests/auto/declarative/qmlvaluetypes/data/vector3d_write.qml b/tests/auto/declarative/qdeclarativevaluetypes/data/vector3d_write.qml
index 9c1bf76..9c1bf76 100644
--- a/tests/auto/declarative/qmlvaluetypes/data/vector3d_write.qml
+++ b/tests/auto/declarative/qdeclarativevaluetypes/data/vector3d_write.qml
diff --git a/tests/auto/declarative/qmlvaluetypes/qmlvaluetypes.pro b/tests/auto/declarative/qdeclarativevaluetypes/qdeclarativevaluetypes.pro
index 82d067e..028fc57 100644
--- a/tests/auto/declarative/qmlvaluetypes/qmlvaluetypes.pro
+++ b/tests/auto/declarative/qdeclarativevaluetypes/qdeclarativevaluetypes.pro
@@ -4,7 +4,7 @@ macx:CONFIG -= app_bundle
 
 HEADERS += testtypes.h
 
-SOURCES += tst_qmlvaluetypes.cpp \
+SOURCES += tst_qdeclarativevaluetypes.cpp \
            testtypes.cpp
 
 DEFINES += SRCDIR=\\\"$$PWD\\\"
diff --git a/tests/auto/declarative/qmlvaluetypes/testtypes.cpp b/tests/auto/declarative/qdeclarativevaluetypes/testtypes.cpp
index aa8bd6e..aa8bd6e 100644
--- a/tests/auto/declarative/qmlvaluetypes/testtypes.cpp
+++ b/tests/auto/declarative/qdeclarativevaluetypes/testtypes.cpp
diff --git a/tests/auto/declarative/qmlvaluetypes/testtypes.h b/tests/auto/declarative/qdeclarativevaluetypes/testtypes.h
index 5f9dde1..c4a9187 100644
--- a/tests/auto/declarative/qmlvaluetypes/testtypes.h
+++ b/tests/auto/declarative/qdeclarativevaluetypes/testtypes.h
@@ -50,8 +50,8 @@
 #include <QRectF>
 #include <QVector3D>
 #include <QFont>
-#include <qml.h>
-#include <QmlPropertyValueSource>
+#include <qdeclarative.h>
+#include <QDeclarativePropertyValueSource>
 
 class MyTypeObject : public QObject
 {
@@ -129,23 +129,23 @@ signals:
 };
 QML_DECLARE_TYPE(MyTypeObject);
 
-class MyConstantValueSource : public QObject, public QmlPropertyValueSource
+class MyConstantValueSource : public QObject, public QDeclarativePropertyValueSource
 {
     Q_OBJECT
 public:
-    virtual void setTarget(const QmlMetaProperty &p) { p.write(3345); }
+    virtual void setTarget(const QDeclarativeMetaProperty &p) { p.write(3345); }
 };
 QML_DECLARE_TYPE(MyConstantValueSource);
 
-class MyOffsetValueInterceptor : public QObject, public QmlPropertyValueInterceptor
+class MyOffsetValueInterceptor : public QObject, public QDeclarativePropertyValueInterceptor
 {
     Q_OBJECT
 public:
-    virtual void setTarget(const QmlMetaProperty &p) { prop = p; }
-    virtual void write(const QVariant &value) { prop.write(value.toInt() + 13, QmlMetaProperty::BypassInterceptor); }
+    virtual void setTarget(const QDeclarativeMetaProperty &p) { prop = p; }
+    virtual void write(const QVariant &value) { prop.write(value.toInt() + 13, QDeclarativeMetaProperty::BypassInterceptor); }
 
 private:
-    QmlMetaProperty prop;
+    QDeclarativeMetaProperty prop;
 };
 QML_DECLARE_TYPE(MyOffsetValueInterceptor);
 
diff --git a/tests/auto/declarative/qmlvaluetypes/tst_qmlvaluetypes.cpp b/tests/auto/declarative/qdeclarativevaluetypes/tst_qdeclarativevaluetypes.cpp
index f28dc51..e53ac91 100644
--- a/tests/auto/declarative/qmlvaluetypes/tst_qmlvaluetypes.cpp
+++ b/tests/auto/declarative/qdeclarativevaluetypes/tst_qdeclarativevaluetypes.cpp
@@ -40,10 +40,10 @@
 ****************************************************************************/
 
 #include <qtest.h>
-#include <QmlEngine>
-#include <QmlComponent>
+#include <QDeclarativeEngine>
+#include <QDeclarativeComponent>
 #include <QDebug>
-#include <private/qmlvaluetype_p.h>
+#include <private/qdeclarativevaluetype_p.h>
 #include "testtypes.h"
 
 class tst_qmlvaluetypes : public QObject
@@ -79,7 +79,7 @@ private slots:
     void enums();
 
 private:
-    QmlEngine engine;
+    QDeclarativeEngine engine;
 };
 
 void tst_qmlvaluetypes::initTestCase()
@@ -95,7 +95,7 @@ inline QUrl TEST_FILE(const QString &filename)
 void tst_qmlvaluetypes::point()
 {
     {
-        QmlComponent component(&engine, TEST_FILE("point_read.qml"));
+        QDeclarativeComponent component(&engine, TEST_FILE("point_read.qml"));
         MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create());
         QVERIFY(object != 0);
 
@@ -107,7 +107,7 @@ void tst_qmlvaluetypes::point()
     }
 
     {
-        QmlComponent component(&engine, TEST_FILE("point_write.qml"));
+        QDeclarativeComponent component(&engine, TEST_FILE("point_write.qml"));
         MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create());
         QVERIFY(object != 0);
 
@@ -120,7 +120,7 @@ void tst_qmlvaluetypes::point()
 void tst_qmlvaluetypes::pointf()
 {
     {
-        QmlComponent component(&engine, TEST_FILE("pointf_read.qml"));
+        QDeclarativeComponent component(&engine, TEST_FILE("pointf_read.qml"));
         MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create());
         QVERIFY(object != 0);
 
@@ -132,7 +132,7 @@ void tst_qmlvaluetypes::pointf()
     }
 
     {
-        QmlComponent component(&engine, TEST_FILE("pointf_write.qml"));
+        QDeclarativeComponent component(&engine, TEST_FILE("pointf_write.qml"));
         MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create());
         QVERIFY(object != 0);
 
@@ -145,7 +145,7 @@ void tst_qmlvaluetypes::pointf()
 void tst_qmlvaluetypes::size()
 {
     {
-        QmlComponent component(&engine, TEST_FILE("size_read.qml"));
+        QDeclarativeComponent component(&engine, TEST_FILE("size_read.qml"));
         MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create());
         QVERIFY(object != 0);
 
@@ -157,7 +157,7 @@ void tst_qmlvaluetypes::size()
     }
 
     {
-        QmlComponent component(&engine, TEST_FILE("size_write.qml"));
+        QDeclarativeComponent component(&engine, TEST_FILE("size_write.qml"));
         MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create());
         QVERIFY(object != 0);
 
@@ -170,7 +170,7 @@ void tst_qmlvaluetypes::size()
 void tst_qmlvaluetypes::sizef()
 {
     {
-        QmlComponent component(&engine, TEST_FILE("sizef_read.qml"));
+        QDeclarativeComponent component(&engine, TEST_FILE("sizef_read.qml"));
         MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create());
         QVERIFY(object != 0);
 
@@ -182,7 +182,7 @@ void tst_qmlvaluetypes::sizef()
     }
 
     {
-        QmlComponent component(&engine, TEST_FILE("sizef_write.qml"));
+        QDeclarativeComponent component(&engine, TEST_FILE("sizef_write.qml"));
         MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create());
         QVERIFY(object != 0);
 
@@ -195,7 +195,7 @@ void tst_qmlvaluetypes::sizef()
 void tst_qmlvaluetypes::rect()
 {
     {
-        QmlComponent component(&engine, TEST_FILE("rect_read.qml"));
+        QDeclarativeComponent component(&engine, TEST_FILE("rect_read.qml"));
         MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create());
         QVERIFY(object != 0);
 
@@ -209,7 +209,7 @@ void tst_qmlvaluetypes::rect()
     }
 
     {
-        QmlComponent component(&engine, TEST_FILE("rect_write.qml"));
+        QDeclarativeComponent component(&engine, TEST_FILE("rect_write.qml"));
         MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create());
         QVERIFY(object != 0);
 
@@ -222,7 +222,7 @@ void tst_qmlvaluetypes::rect()
 void tst_qmlvaluetypes::rectf()
 {
     {
-        QmlComponent component(&engine, TEST_FILE("rectf_read.qml"));
+        QDeclarativeComponent component(&engine, TEST_FILE("rectf_read.qml"));
         MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create());
         QVERIFY(object != 0);
 
@@ -236,7 +236,7 @@ void tst_qmlvaluetypes::rectf()
     }
 
     {
-        QmlComponent component(&engine, TEST_FILE("rectf_write.qml"));
+        QDeclarativeComponent component(&engine, TEST_FILE("rectf_write.qml"));
         MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create());
         QVERIFY(object != 0);
 
@@ -249,7 +249,7 @@ void tst_qmlvaluetypes::rectf()
 void tst_qmlvaluetypes::vector3d()
 {
     {
-        QmlComponent component(&engine, TEST_FILE("vector3d_read.qml"));
+        QDeclarativeComponent component(&engine, TEST_FILE("vector3d_read.qml"));
         MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create());
         QVERIFY(object != 0);
 
@@ -262,7 +262,7 @@ void tst_qmlvaluetypes::vector3d()
     }
 
     {
-        QmlComponent component(&engine, TEST_FILE("vector3d_write.qml"));
+        QDeclarativeComponent component(&engine, TEST_FILE("vector3d_write.qml"));
         MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create());
         QVERIFY(object != 0);
 
@@ -275,7 +275,7 @@ void tst_qmlvaluetypes::vector3d()
 void tst_qmlvaluetypes::font()
 {
     {
-        QmlComponent component(&engine, TEST_FILE("font_read.qml"));
+        QDeclarativeComponent component(&engine, TEST_FILE("font_read.qml"));
         MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create());
         QVERIFY(object != 0);
 
@@ -298,7 +298,7 @@ void tst_qmlvaluetypes::font()
     }
 
     {
-        QmlComponent component(&engine, TEST_FILE("font_write.qml"));
+        QDeclarativeComponent component(&engine, TEST_FILE("font_write.qml"));
         MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create());
         QVERIFY(object != 0);
 
@@ -322,7 +322,7 @@ void tst_qmlvaluetypes::font()
 
     // Test pixelSize
     {
-        QmlComponent component(&engine, TEST_FILE("font_write.2.qml"));
+        QDeclarativeComponent component(&engine, TEST_FILE("font_write.2.qml"));
         MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create());
         QVERIFY(object != 0);
 
@@ -333,7 +333,7 @@ void tst_qmlvaluetypes::font()
 
     // Test pixelSize and pointSize
     {
-        QmlComponent component(&engine, TEST_FILE("font_write.3.qml"));
+        QDeclarativeComponent component(&engine, TEST_FILE("font_write.3.qml"));
         QTest::ignoreMessage(QtWarningMsg, "Both point size and pixel size set. Using pixel size. ");
         MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create());
         QVERIFY(object != 0);
@@ -347,7 +347,7 @@ void tst_qmlvaluetypes::font()
 // Test bindings can write to value types
 void tst_qmlvaluetypes::bindingAssignment()
 {
-    QmlComponent component(&engine, TEST_FILE("bindingAssignment.qml"));
+    QDeclarativeComponent component(&engine, TEST_FILE("bindingAssignment.qml"));
     MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create());
     QVERIFY(object != 0);
 
@@ -363,7 +363,7 @@ void tst_qmlvaluetypes::bindingAssignment()
 // Test bindings can read from value types
 void tst_qmlvaluetypes::bindingRead()
 {
-    QmlComponent component(&engine, TEST_FILE("bindingRead.qml"));
+    QDeclarativeComponent component(&engine, TEST_FILE("bindingRead.qml"));
     MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create());
     QVERIFY(object != 0);
 
@@ -379,7 +379,7 @@ void tst_qmlvaluetypes::bindingRead()
 // Test static values can assign to value types
 void tst_qmlvaluetypes::staticAssignment()
 {
-    QmlComponent component(&engine, TEST_FILE("staticAssignment.qml"));
+    QDeclarativeComponent component(&engine, TEST_FILE("staticAssignment.qml"));
     MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create());
     QVERIFY(object != 0);
 
@@ -391,7 +391,7 @@ void tst_qmlvaluetypes::staticAssignment()
 // Test scripts can read/write value types
 void tst_qmlvaluetypes::scriptAccess()
 {
-    QmlComponent component(&engine, TEST_FILE("scriptAccess.qml"));
+    QDeclarativeComponent component(&engine, TEST_FILE("scriptAccess.qml"));
     MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create());
     QVERIFY(object != 0);
 
@@ -406,7 +406,7 @@ void tst_qmlvaluetypes::scriptAccess()
 void tst_qmlvaluetypes::autoBindingRemoval()
 {
     {
-        QmlComponent component(&engine, TEST_FILE("autoBindingRemoval.qml"));
+        QDeclarativeComponent component(&engine, TEST_FILE("autoBindingRemoval.qml"));
         MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create());
         QVERIFY(object != 0);
 
@@ -429,7 +429,7 @@ void tst_qmlvaluetypes::autoBindingRemoval()
     }
 
     {
-        QmlComponent component(&engine, TEST_FILE("autoBindingRemoval.2.qml"));
+        QDeclarativeComponent component(&engine, TEST_FILE("autoBindingRemoval.2.qml"));
         MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create());
         QVERIFY(object != 0);
 
@@ -451,7 +451,7 @@ void tst_qmlvaluetypes::autoBindingRemoval()
     }
 
     {
-        QmlComponent component(&engine, TEST_FILE("autoBindingRemoval.3.qml"));
+        QDeclarativeComponent component(&engine, TEST_FILE("autoBindingRemoval.3.qml"));
         MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create());
         QVERIFY(object != 0);
 
@@ -476,7 +476,7 @@ void tst_qmlvaluetypes::autoBindingRemoval()
 // Test that property value sources assign to value types
 void tst_qmlvaluetypes::valueSources()
 {
-    QmlComponent component(&engine, TEST_FILE("valueSources.qml"));
+    QDeclarativeComponent component(&engine, TEST_FILE("valueSources.qml"));
     MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create());
     QVERIFY(object != 0);
 
@@ -485,13 +485,13 @@ void tst_qmlvaluetypes::valueSources()
     delete object;
 }
 
-static void checkNoErrors(QmlComponent& component)
+static void checkNoErrors(QDeclarativeComponent& component)
 {
-    QList<QmlError> errors = component.errors();
+    QList<QDeclarativeError> errors = component.errors();
     if (errors.isEmpty())
         return;
     for (int ii = 0; ii < errors.count(); ++ii) {
-        const QmlError &error = errors.at(ii);
+        const QDeclarativeError &error = errors.at(ii);
         qWarning("%d:%d:%s",error.line(),error.column(),error.description().toUtf8().constData());
     }
 }
@@ -499,7 +499,7 @@ static void checkNoErrors(QmlComponent& component)
 // Test that property value interceptors can be applied to value types
 void tst_qmlvaluetypes::valueInterceptors()
 {
-    QmlComponent component(&engine, TEST_FILE("valueInterceptors.qml"));
+    QDeclarativeComponent component(&engine, TEST_FILE("valueInterceptors.qml"));
     MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create());
     checkNoErrors(component);
     QEXPECT_FAIL("", "QT-2920", Abort);
@@ -517,7 +517,7 @@ void tst_qmlvaluetypes::valueInterceptors()
 // Test that you can't assign a binding to the "root" value type, and a sub-property
 void tst_qmlvaluetypes::bindingConflict()
 {
-    QmlComponent component(&engine, TEST_FILE("bindingConflict.qml"));
+    QDeclarativeComponent component(&engine, TEST_FILE("bindingConflict.qml"));
     QCOMPARE(component.isError(), true);
 }
 
@@ -534,7 +534,7 @@ void tst_qmlvaluetypes::bindingConflict()
 // doesn't crash
 void tst_qmlvaluetypes::deletedObject()
 {
-    QmlComponent component(&engine, TEST_FILE("deletedObject.qml"));
+    QDeclarativeComponent component(&engine, TEST_FILE("deletedObject.qml"));
     QTest::ignoreMessage(QtDebugMsg, "Test: 2");
     MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create());
     QVERIFY(object != 0);
@@ -552,7 +552,7 @@ void tst_qmlvaluetypes::deletedObject()
 // Test that value types can be assigned to another value type property in a binding
 void tst_qmlvaluetypes::bindingVariantCopy()
 {
-    QmlComponent component(&engine, TEST_FILE("bindingVariantCopy.qml"));
+    QDeclarativeComponent component(&engine, TEST_FILE("bindingVariantCopy.qml"));
     MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create());
     QVERIFY(object != 0);
 
@@ -564,7 +564,7 @@ void tst_qmlvaluetypes::bindingVariantCopy()
 // Test that value types can be assigned to another value type property in script
 void tst_qmlvaluetypes::scriptVariantCopy()
 {
-    QmlComponent component(&engine, TEST_FILE("scriptVariantCopy.qml"));
+    QDeclarativeComponent component(&engine, TEST_FILE("scriptVariantCopy.qml"));
     MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create());
     QVERIFY(object != 0);
 
@@ -581,21 +581,21 @@ void tst_qmlvaluetypes::scriptVariantCopy()
 // Test that the value type classes can be used manually
 void tst_qmlvaluetypes::cppClasses()
 {
-    CPP_TEST(QmlPointValueType, QPoint(19, 33));
-    CPP_TEST(QmlPointFValueType, QPointF(33.6, -23));
-    CPP_TEST(QmlSizeValueType, QSize(-100, 18));
-    CPP_TEST(QmlSizeFValueType, QSizeF(-100.7, 18.2));
-    CPP_TEST(QmlRectValueType, QRect(13, 39, 10928, 88));
-    CPP_TEST(QmlRectFValueType, QRectF(88.2, -90.1, 103.2, 118));
-    CPP_TEST(QmlVector3DValueType, QVector3D(18.2, 19.7, 1002));
-    CPP_TEST(QmlFontValueType, QFont("Helvetica"));
+    CPP_TEST(QDeclarativePointValueType, QPoint(19, 33));
+    CPP_TEST(QDeclarativePointFValueType, QPointF(33.6, -23));
+    CPP_TEST(QDeclarativeSizeValueType, QSize(-100, 18));
+    CPP_TEST(QDeclarativeSizeFValueType, QSizeF(-100.7, 18.2));
+    CPP_TEST(QDeclarativeRectValueType, QRect(13, 39, 10928, 88));
+    CPP_TEST(QDeclarativeRectFValueType, QRectF(88.2, -90.1, 103.2, 118));
+    CPP_TEST(QDeclarativeVector3DValueType, QVector3D(18.2, 19.7, 1002));
+    CPP_TEST(QDeclarativeFontValueType, QFont("Helvetica"));
 
 }
 
 void tst_qmlvaluetypes::enums()
 {
     {
-    QmlComponent component(&engine, TEST_FILE("enums.1.qml"));
+    QDeclarativeComponent component(&engine, TEST_FILE("enums.1.qml"));
     MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create());
     QVERIFY(object != 0);
     QVERIFY(object->font().capitalization() == QFont::MixedCase);
@@ -603,7 +603,7 @@ void tst_qmlvaluetypes::enums()
     }
 
     {
-    QmlComponent component(&engine, TEST_FILE("enums.2.qml"));
+    QDeclarativeComponent component(&engine, TEST_FILE("enums.2.qml"));
     MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create());
     QVERIFY(object != 0);
     QVERIFY(object->font().capitalization() == QFont::MixedCase);
@@ -613,4 +613,4 @@ void tst_qmlvaluetypes::enums()
 
 QTEST_MAIN(tst_qmlvaluetypes)
 
-#include "tst_qmlvaluetypes.moc"
+#include "tst_qdeclarativevaluetypes.moc"
diff --git a/tests/auto/declarative/qmlgraphicswebview/data/basic.html b/tests/auto/declarative/qdeclarativewebview/data/basic.html
index 22e3e24..22e3e24 100644
--- a/tests/auto/declarative/qmlgraphicswebview/data/basic.html
+++ b/tests/auto/declarative/qdeclarativewebview/data/basic.html
diff --git a/tests/auto/declarative/qmlgraphicswebview/data/basic.ico b/tests/auto/declarative/qdeclarativewebview/data/basic.ico
index 8f3d05e..8f3d05e 100644
--- a/tests/auto/declarative/qmlgraphicswebview/data/basic.ico
+++ b/tests/auto/declarative/qdeclarativewebview/data/basic.ico
diff --git a/tests/auto/declarative/qmlgraphicswebview/data/basic.png b/tests/auto/declarative/qdeclarativewebview/data/basic.png
index 35717cc..35717cc 100644
--- a/tests/auto/declarative/qmlgraphicswebview/data/basic.png
+++ b/tests/auto/declarative/qdeclarativewebview/data/basic.png
diff --git a/tests/auto/declarative/qmlgraphicswebview/data/basic.qml b/tests/auto/declarative/qdeclarativewebview/data/basic.qml
index 5394837..5394837 100644
--- a/tests/auto/declarative/qmlgraphicswebview/data/basic.qml
+++ b/tests/auto/declarative/qdeclarativewebview/data/basic.qml
diff --git a/tests/auto/declarative/qmlgraphicswebview/data/elements.html b/tests/auto/declarative/qdeclarativewebview/data/elements.html
index 9236867..9236867 100644
--- a/tests/auto/declarative/qmlgraphicswebview/data/elements.html
+++ b/tests/auto/declarative/qdeclarativewebview/data/elements.html
diff --git a/tests/auto/declarative/qmlgraphicswebview/data/elements.qml b/tests/auto/declarative/qdeclarativewebview/data/elements.qml
index 7c030e6..7c030e6 100644
--- a/tests/auto/declarative/qmlgraphicswebview/data/elements.qml
+++ b/tests/auto/declarative/qdeclarativewebview/data/elements.qml
diff --git a/tests/auto/declarative/qmlgraphicswebview/data/forward.html b/tests/auto/declarative/qdeclarativewebview/data/forward.html
index 030446a..030446a 100644
--- a/tests/auto/declarative/qmlgraphicswebview/data/forward.html
+++ b/tests/auto/declarative/qdeclarativewebview/data/forward.html
diff --git a/tests/auto/declarative/qmlgraphicswebview/data/javaScript.html b/tests/auto/declarative/qdeclarativewebview/data/javaScript.html
index 35270bc..35270bc 100644
--- a/tests/auto/declarative/qmlgraphicswebview/data/javaScript.html
+++ b/tests/auto/declarative/qdeclarativewebview/data/javaScript.html
diff --git a/tests/auto/declarative/qmlgraphicswebview/data/javaScript.qml b/tests/auto/declarative/qdeclarativewebview/data/javaScript.qml
index 07eee88..07eee88 100644
--- a/tests/auto/declarative/qmlgraphicswebview/data/javaScript.qml
+++ b/tests/auto/declarative/qdeclarativewebview/data/javaScript.qml
diff --git a/tests/auto/declarative/qmlgraphicswebview/data/loadError.qml b/tests/auto/declarative/qdeclarativewebview/data/loadError.qml
index 1460f30..1460f30 100644
--- a/tests/auto/declarative/qmlgraphicswebview/data/loadError.qml
+++ b/tests/auto/declarative/qdeclarativewebview/data/loadError.qml
diff --git a/tests/auto/declarative/qmlgraphicswebview/data/newwindows.html b/tests/auto/declarative/qdeclarativewebview/data/newwindows.html
index dd541f9..dd541f9 100644
--- a/tests/auto/declarative/qmlgraphicswebview/data/newwindows.html
+++ b/tests/auto/declarative/qdeclarativewebview/data/newwindows.html
diff --git a/tests/auto/declarative/qmlgraphicswebview/data/newwindows.qml b/tests/auto/declarative/qdeclarativewebview/data/newwindows.qml
index 0bc8263..0bc8263 100644
--- a/tests/auto/declarative/qmlgraphicswebview/data/newwindows.qml
+++ b/tests/auto/declarative/qdeclarativewebview/data/newwindows.qml
diff --git a/tests/auto/declarative/qmlgraphicswebview/data/pixelCache.html b/tests/auto/declarative/qdeclarativewebview/data/pixelCache.html
index 9412674..9412674 100644
--- a/tests/auto/declarative/qmlgraphicswebview/data/pixelCache.html
+++ b/tests/auto/declarative/qdeclarativewebview/data/pixelCache.html
diff --git a/tests/auto/declarative/qmlgraphicswebview/data/pixelCache.qml b/tests/auto/declarative/qdeclarativewebview/data/pixelCache.qml
index 08e4d65..08e4d65 100644
--- a/tests/auto/declarative/qmlgraphicswebview/data/pixelCache.qml
+++ b/tests/auto/declarative/qdeclarativewebview/data/pixelCache.qml
diff --git a/tests/auto/declarative/qmlgraphicswebview/data/propertychanges.qml b/tests/auto/declarative/qdeclarativewebview/data/propertychanges.qml
index 3dd4e51..3dd4e51 100644
--- a/tests/auto/declarative/qmlgraphicswebview/data/propertychanges.qml
+++ b/tests/auto/declarative/qdeclarativewebview/data/propertychanges.qml
diff --git a/tests/auto/declarative/qmlgraphicswebview/data/sethtml.qml b/tests/auto/declarative/qdeclarativewebview/data/sethtml.qml
index 063b5a8..063b5a8 100644
--- a/tests/auto/declarative/qmlgraphicswebview/data/sethtml.qml
+++ b/tests/auto/declarative/qdeclarativewebview/data/sethtml.qml
diff --git a/tests/auto/declarative/qmlgraphicswebview/qmlgraphicswebview.pro b/tests/auto/declarative/qdeclarativewebview/qdeclarativewebview.pro
index a590616..6af0a60 100644
--- a/tests/auto/declarative/qmlgraphicswebview/qmlgraphicswebview.pro
+++ b/tests/auto/declarative/qdeclarativewebview/qdeclarativewebview.pro
@@ -3,7 +3,7 @@ contains(QT_CONFIG,declarative): QT += declarative
 contains(QT_CONFIG,webkit): QT += webkit
 macx:CONFIG -= app_bundle
 
-SOURCES += tst_qmlgraphicswebview.cpp testtypes.cpp
+SOURCES += tst_qdeclarativewebview.cpp testtypes.cpp
 HEADERS += testtypes.h
 
 # Define SRCDIR equal to test's source directory
diff --git a/tests/auto/declarative/qmlgraphicswebview/testtypes.cpp b/tests/auto/declarative/qdeclarativewebview/testtypes.cpp
index 676d19a..7efc214 100644
--- a/tests/auto/declarative/qmlgraphicswebview/testtypes.cpp
+++ b/tests/auto/declarative/qdeclarativewebview/testtypes.cpp
@@ -43,7 +43,7 @@
 void MyWebView::drawContents(QPainter *p, const QRect &r)
 {
     pp += r.width()*r.height();
-    QmlGraphicsWebView::drawContents(p,r);
+    QDeclarativeWebView::drawContents(p,r);
 }
 
 void registerTypes()
diff --git a/tests/auto/declarative/qmlgraphicswebview/testtypes.h b/tests/auto/declarative/qdeclarativewebview/testtypes.h
index fa9a301..8eb703f 100644
--- a/tests/auto/declarative/qmlgraphicswebview/testtypes.h
+++ b/tests/auto/declarative/qdeclarativewebview/testtypes.h
@@ -41,9 +41,9 @@
 #ifndef TESTTYPES_H
 #define TESTTYPES_H
 
-#include <private/qmlgraphicswebview_p.h>
+#include <private/qdeclarativewebview_p.h>
 
-class MyWebView : public QmlGraphicsWebView
+class MyWebView : public QDeclarativeWebView
 {
     Q_OBJECT
     Q_PROPERTY(int pixelsPainted READ pixelsPainted);
diff --git a/tests/auto/declarative/qmlgraphicswebview/tst_qmlgraphicswebview.cpp b/tests/auto/declarative/qdeclarativewebview/tst_qdeclarativewebview.cpp
index f4f8a33..aa5b8e3 100644
--- a/tests/auto/declarative/qmlgraphicswebview/tst_qmlgraphicswebview.cpp
+++ b/tests/auto/declarative/qdeclarativewebview/tst_qdeclarativewebview.cpp
@@ -41,11 +41,11 @@
 #include <qtest.h>
 #include <QtTest/QSignalSpy>
 #include "../../../shared/util.h"
-#include <QtDeclarative/qmlengine.h>
-#include <QtDeclarative/qmlcomponent.h>
-#include <private/qmlgraphicswebview_p.h>
-#include <private/qmlgraphicswebview_p_p.h>
-#include <private/qmlgraphicspositioners_p.h>
+#include <QtDeclarative/qdeclarativeengine.h>
+#include <QtDeclarative/qdeclarativecomponent.h>
+#include <private/qdeclarativewebview_p.h>
+#include <private/qdeclarativewebview_p_p.h>
+#include <private/qdeclarativepositioners_p.h>
 #include <QtWebKit/qwebpage.h>
 #include <QtWebKit/qwebframe.h>
 #include <QtCore/qdir.h>
@@ -77,8 +77,8 @@ private slots:
     void pressGrabTime();
 
 private:
-    void checkNoErrors(const QmlComponent& component);
-    QmlEngine engine;
+    void checkNoErrors(const QDeclarativeComponent& component);
+    QDeclarativeEngine engine;
     QString tmpDir() const
     {
         static QString tmpd = QDir::tempPath()+"/tst_qmlgraphicswebview-"
@@ -123,16 +123,16 @@ void tst_qmlgraphicswebview::cleanupTestCase()
     removeRecursive(tmpDir());
 }
 
-void tst_qmlgraphicswebview::checkNoErrors(const QmlComponent& component)
+void tst_qmlgraphicswebview::checkNoErrors(const QDeclarativeComponent& component)
 {
     // Wait until the component is ready
     QTRY_VERIFY(component.isReady());
 
 
     if (component.isError()) {
-        QList<QmlError> errors = component.errors();
+        QList<QDeclarativeError> errors = component.errors();
         for (int ii = 0; ii < errors.count(); ++ii) {
-            const QmlError &error = errors.at(ii);
+            const QDeclarativeError &error = errors.at(ii);
             QByteArray errorStr = QByteArray::number(error.line()) + ":" +
                                   QByteArray::number(error.column()) + ":" +
                                   error.description().toUtf8();
@@ -144,11 +144,11 @@ void tst_qmlgraphicswebview::checkNoErrors(const QmlComponent& component)
 
 void tst_qmlgraphicswebview::basicProperties()
 {
-    QmlComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/basic.qml"));
+    QDeclarativeComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/basic.qml"));
     checkNoErrors(component);
     QWebSettings::enablePersistentStorage(tmpDir());
 
-    QmlGraphicsWebView *wv = qobject_cast<QmlGraphicsWebView*>(component.create());
+    QDeclarativeWebView *wv = qobject_cast<QDeclarativeWebView*>(component.create());
     QVERIFY(wv != 0);
     QTRY_COMPARE(wv->progress(), 1.0);
     QCOMPARE(wv->title(),QString("Basic"));
@@ -161,7 +161,7 @@ void tst_qmlgraphicswebview::basicProperties()
     QCOMPARE(wv->preferredHeight(), 0);
     QCOMPARE(wv->zoomFactor(), 1.0);
     QCOMPARE(wv->url(), QUrl::fromLocalFile(SRCDIR "/data/basic.html"));
-    QCOMPARE(wv->status(), QmlGraphicsWebView::Ready);
+    QCOMPARE(wv->status(), QDeclarativeWebView::Ready);
     QVERIFY(wv->reloadAction());
     QVERIFY(wv->reloadAction()->isEnabled());
     QVERIFY(wv->backAction());
@@ -179,13 +179,13 @@ void tst_qmlgraphicswebview::basicProperties()
 
 void tst_qmlgraphicswebview::settings()
 {
-    QmlComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/basic.qml"));
+    QDeclarativeComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/basic.qml"));
     checkNoErrors(component);
-    QmlGraphicsWebView *wv = qobject_cast<QmlGraphicsWebView*>(component.create());
+    QDeclarativeWebView *wv = qobject_cast<QDeclarativeWebView*>(component.create());
     QVERIFY(wv != 0);
     QTRY_COMPARE(wv->progress(), 1.0);
 
-    QmlGraphicsWebSettings *s = wv->settingsObject();
+    QDeclarativeWebSettings *s = wv->settingsObject();
 
     // merely tests that setting gets stored (in QWebSettings)
     // behavioural tests are in WebKit.
@@ -244,11 +244,11 @@ void tst_qmlgraphicswebview::settings()
 
 void tst_qmlgraphicswebview::historyNav()
 {
-    QmlComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/basic.qml"));
+    QDeclarativeComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/basic.qml"));
     checkNoErrors(component);
     QWebSettings::enablePersistentStorage(tmpDir());
 
-    QmlGraphicsWebView *wv = qobject_cast<QmlGraphicsWebView*>(component.create());
+    QDeclarativeWebView *wv = qobject_cast<QDeclarativeWebView*>(component.create());
     QVERIFY(wv != 0);
     for (int i=1; i<=2; ++i) {
         QTRY_COMPARE(wv->progress(), 1.0);
@@ -261,7 +261,7 @@ void tst_qmlgraphicswebview::historyNav()
         QCOMPARE(wv->preferredWidth(), 0);
         QCOMPARE(wv->zoomFactor(), 1.0);
         QCOMPARE(wv->url(), QUrl::fromLocalFile(SRCDIR "/data/basic.html"));
-        QCOMPARE(wv->status(), QmlGraphicsWebView::Ready);
+        QCOMPARE(wv->status(), QDeclarativeWebView::Ready);
         QVERIFY(wv->reloadAction());
         QVERIFY(wv->reloadAction()->isEnabled());
         QVERIFY(wv->backAction());
@@ -279,7 +279,7 @@ void tst_qmlgraphicswebview::historyNav()
     QCOMPARE(wv->title(),QString("Forward"));
     QCOMPARE(strippedHtml(fileContents(SRCDIR "/data/forward.html")), strippedHtml(wv->html()));
     QCOMPARE(wv->url(), QUrl::fromLocalFile(SRCDIR "/data/forward.html"));
-    QCOMPARE(wv->status(), QmlGraphicsWebView::Ready);
+    QCOMPARE(wv->status(), QDeclarativeWebView::Ready);
     QCOMPARE(wv->statusText(),QString(""));
     QVERIFY(wv->reloadAction());
     QVERIFY(wv->reloadAction()->isEnabled());
@@ -296,7 +296,7 @@ void tst_qmlgraphicswebview::historyNav()
     QCOMPARE(wv->title(),QString("Basic"));
     QCOMPARE(strippedHtml(fileContents(SRCDIR "/data/basic.html")), strippedHtml(wv->html()));
     QCOMPARE(wv->url(), QUrl::fromLocalFile(SRCDIR "/data/basic.html"));
-    QCOMPARE(wv->status(), QmlGraphicsWebView::Ready);
+    QCOMPARE(wv->status(), QDeclarativeWebView::Ready);
     QVERIFY(wv->reloadAction());
     QVERIFY(wv->reloadAction()->isEnabled());
     QVERIFY(wv->backAction());
@@ -309,31 +309,31 @@ void tst_qmlgraphicswebview::historyNav()
 
 void tst_qmlgraphicswebview::multipleWindows()
 {
-    QmlComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/newwindows.qml"));
+    QDeclarativeComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/newwindows.qml"));
     checkNoErrors(component);
 
-    QmlGraphicsGrid *grid = qobject_cast<QmlGraphicsGrid*>(component.create());
+    QDeclarativeGrid *grid = qobject_cast<QDeclarativeGrid*>(component.create());
     QVERIFY(grid != 0);
     QTRY_COMPARE(grid->children().count(), 2+5); // Component, Loader, 5 WebViews
-    QmlGraphicsItem* popup = qobject_cast<QmlGraphicsItem*>(grid->children().at(3)); // first popup after Component, Loaded, original.
+    QDeclarativeItem* popup = qobject_cast<QDeclarativeItem*>(grid->children().at(3)); // first popup after Component, Loaded, original.
     QVERIFY(popup != 0);
     QTRY_COMPARE(popup->x(), 150.0);
 }
 
 void tst_qmlgraphicswebview::loadError()
 {
-    QmlComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/loadError.qml"));
+    QDeclarativeComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/loadError.qml"));
     checkNoErrors(component);
     QWebSettings::enablePersistentStorage(tmpDir());
 
-    QmlGraphicsWebView *wv = qobject_cast<QmlGraphicsWebView*>(component.create());
+    QDeclarativeWebView *wv = qobject_cast<QDeclarativeWebView*>(component.create());
     QVERIFY(wv != 0);
     for (int i=1; i<=2; ++i) {
         QTRY_COMPARE(wv->progress(), 1.0);
         QCOMPARE(wv->title(),QString(""));
         QCOMPARE(wv->statusText(),QString("")); // HTML 'status bar' text, not error message
         QCOMPARE(wv->url(), QUrl::fromLocalFile(SRCDIR "/data/does-not-exist.html")); // Unlike QWebPage, which loses url
-        QCOMPARE(wv->status(), QmlGraphicsWebView::Error);
+        QCOMPARE(wv->status(), QDeclarativeWebView::Error);
 
         wv->reloadAction()->trigger();
     }
@@ -341,9 +341,9 @@ void tst_qmlgraphicswebview::loadError()
 
 void tst_qmlgraphicswebview::setHtml()
 {
-    QmlComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/sethtml.qml"));
+    QDeclarativeComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/sethtml.qml"));
     checkNoErrors(component);
-    QmlGraphicsWebView *wv = qobject_cast<QmlGraphicsWebView*>(component.create());
+    QDeclarativeWebView *wv = qobject_cast<QDeclarativeWebView*>(component.create());
     QVERIFY(wv != 0);
     QCOMPARE(wv->html(),QString("<html><head></head><body><p>This is a <b>string</b> set on the WebView</p></body></html>"));
 
@@ -354,9 +354,9 @@ void tst_qmlgraphicswebview::setHtml()
 
 void tst_qmlgraphicswebview::elementAreaAt()
 {
-    QmlComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/elements.qml"));
+    QDeclarativeComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/elements.qml"));
     checkNoErrors(component);
-    QmlGraphicsWebView *wv = qobject_cast<QmlGraphicsWebView*>(component.create());
+    QDeclarativeWebView *wv = qobject_cast<QDeclarativeWebView*>(component.create());
     QVERIFY(wv != 0);
     QTRY_COMPARE(wv->progress(), 1.0);
 
@@ -369,9 +369,9 @@ void tst_qmlgraphicswebview::elementAreaAt()
 
 void tst_qmlgraphicswebview::javaScript()
 {
-    QmlComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/javaScript.qml"));
+    QDeclarativeComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/javaScript.qml"));
     checkNoErrors(component);
-    QmlGraphicsWebView *wv = qobject_cast<QmlGraphicsWebView*>(component.create());
+    QDeclarativeWebView *wv = qobject_cast<QDeclarativeWebView*>(component.create());
     QVERIFY(wv != 0);
     QTRY_COMPARE(wv->progress(), 1.0);
     QCOMPARE(wv->evaluateJavaScript("123").toInt(), 123);
@@ -381,7 +381,7 @@ void tst_qmlgraphicswebview::javaScript()
 
 void tst_qmlgraphicswebview::pixelCache()
 {
-    QmlComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/pixelCache.qml"));
+    QDeclarativeComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/pixelCache.qml"));
     checkNoErrors(component);
     MyWebView *wv = qobject_cast<MyWebView*>(component.create());
     QVERIFY(wv != 0);
@@ -408,19 +408,19 @@ void tst_qmlgraphicswebview::pixelCache()
 
 void tst_qmlgraphicswebview::newWindowParent()
 {
-    QmlComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/propertychanges.qml"));
+    QDeclarativeComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/propertychanges.qml"));
     checkNoErrors(component);
-    QmlGraphicsItem *rootItem = qobject_cast<QmlGraphicsItem*>(component.create());
-    QmlGraphicsWebView *wv = rootItem->findChild<QmlGraphicsWebView*>("webView");
+    QDeclarativeItem *rootItem = qobject_cast<QDeclarativeItem*>(component.create());
+    QDeclarativeWebView *wv = rootItem->findChild<QDeclarativeWebView*>("webView");
     QVERIFY(rootItem != 0);
     QVERIFY(wv != 0);
     QTRY_COMPARE(wv->progress(), 1.0);
 
-    QmlGraphicsItem* oldWindowParent = rootItem->findChild<QmlGraphicsItem*>("oldWindowParent");
+    QDeclarativeItem* oldWindowParent = rootItem->findChild<QDeclarativeItem*>("oldWindowParent");
     QCOMPARE(wv->newWindowParent(), oldWindowParent);
     QSignalSpy newWindowParentSpy(wv, SIGNAL(newWindowParentChanged()));
 
-    QmlGraphicsItem* newWindowParent = rootItem->findChild<QmlGraphicsItem*>("newWindowParent");
+    QDeclarativeItem* newWindowParent = rootItem->findChild<QDeclarativeItem*>("newWindowParent");
     wv->setNewWindowParent(newWindowParent);
     QVERIFY(oldWindowParent);
     QVERIFY(oldWindowParent->childItems().count() == 0);
@@ -436,15 +436,15 @@ void tst_qmlgraphicswebview::newWindowParent()
 
 void tst_qmlgraphicswebview::newWindowComponent()
 {
-    QmlComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/propertychanges.qml"));
+    QDeclarativeComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/propertychanges.qml"));
     checkNoErrors(component);
-    QmlGraphicsItem *rootItem = qobject_cast<QmlGraphicsItem*>(component.create());
-    QmlGraphicsWebView *wv = rootItem->findChild<QmlGraphicsWebView*>("webView");
+    QDeclarativeItem *rootItem = qobject_cast<QDeclarativeItem*>(component.create());
+    QDeclarativeWebView *wv = rootItem->findChild<QDeclarativeWebView*>("webView");
     QVERIFY(rootItem != 0);
     QVERIFY(wv != 0);
     QTRY_COMPARE(wv->progress(), 1.0);
 
-    QmlComponent substituteComponent(&engine);
+    QDeclarativeComponent substituteComponent(&engine);
     substituteComponent.setData("import Qt 4.6; WebView { objectName: 'newWebView'; url: 'basic.html'; }", QUrl::fromLocalFile(""));
     QSignalSpy newWindowComponentSpy(wv, SIGNAL(newWindowComponentChanged()));
 
@@ -461,10 +461,10 @@ void tst_qmlgraphicswebview::newWindowComponent()
 
 void tst_qmlgraphicswebview::renderingEnabled()
 {
-    QmlComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/propertychanges.qml"));
+    QDeclarativeComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/propertychanges.qml"));
     checkNoErrors(component);
-    QmlGraphicsItem *rootItem = qobject_cast<QmlGraphicsItem*>(component.create());
-    QmlGraphicsWebView *wv = rootItem->findChild<QmlGraphicsWebView*>("webView");
+    QDeclarativeItem *rootItem = qobject_cast<QDeclarativeItem*>(component.create());
+    QDeclarativeWebView *wv = rootItem->findChild<QDeclarativeWebView*>("webView");
     QVERIFY(rootItem != 0);
     QVERIFY(wv != 0);
     QTRY_COMPARE(wv->progress(), 1.0);
@@ -485,10 +485,10 @@ void tst_qmlgraphicswebview::renderingEnabled()
 
 void tst_qmlgraphicswebview::pressGrabTime()
 {
-    QmlComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/propertychanges.qml"));
+    QDeclarativeComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/propertychanges.qml"));
     checkNoErrors(component);
-    QmlGraphicsItem *rootItem = qobject_cast<QmlGraphicsItem*>(component.create());
-    QmlGraphicsWebView *wv = rootItem->findChild<QmlGraphicsWebView*>("webView");
+    QDeclarativeItem *rootItem = qobject_cast<QDeclarativeItem*>(component.create());
+    QDeclarativeWebView *wv = rootItem->findChild<QDeclarativeWebView*>("webView");
     QVERIFY(rootItem != 0);
     QVERIFY(wv != 0);
     QTRY_COMPARE(wv->progress(), 1.0);
@@ -508,4 +508,4 @@ void tst_qmlgraphicswebview::pressGrabTime()
 
 QTEST_MAIN(tst_qmlgraphicswebview)
 
-#include "tst_qmlgraphicswebview.moc"
+#include "tst_qdeclarativewebview.moc"
diff --git a/tests/auto/declarative/qmlxmlhttprequest/data/abort.expect b/tests/auto/declarative/qdeclarativexmlhttprequest/data/abort.expect
index f43e043..f43e043 100644
--- a/tests/auto/declarative/qmlxmlhttprequest/data/abort.expect
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/abort.expect
diff --git a/tests/auto/declarative/qmlxmlhttprequest/data/abort.qml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/abort.qml
index d7b9266..d7b9266 100644
--- a/tests/auto/declarative/qmlxmlhttprequest/data/abort.qml
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/abort.qml
diff --git a/tests/auto/declarative/qmlxmlhttprequest/data/abort.reply b/tests/auto/declarative/qdeclarativexmlhttprequest/data/abort.reply
index 7ae6951..7ae6951 100644
--- a/tests/auto/declarative/qmlxmlhttprequest/data/abort.reply
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/abort.reply
diff --git a/tests/auto/declarative/qmlxmlhttprequest/data/abort_opened.qml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/abort_opened.qml
index 72a45e7..72a45e7 100644
--- a/tests/auto/declarative/qmlxmlhttprequest/data/abort_opened.qml
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/abort_opened.qml
diff --git a/tests/auto/declarative/qmlxmlhttprequest/data/abort_unsent.qml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/abort_unsent.qml
index aa78cde..aa78cde 100644
--- a/tests/auto/declarative/qmlxmlhttprequest/data/abort_unsent.qml
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/abort_unsent.qml
diff --git a/tests/auto/declarative/qmlxmlhttprequest/data/attr.qml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/attr.qml
index 9049fc7..9049fc7 100644
--- a/tests/auto/declarative/qmlxmlhttprequest/data/attr.qml
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/attr.qml
diff --git a/tests/auto/declarative/qmlxmlhttprequest/data/attr.xml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/attr.xml
index 2aa64a3..2aa64a3 100644
--- a/tests/auto/declarative/qmlxmlhttprequest/data/attr.xml
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/attr.xml
diff --git a/tests/auto/declarative/qmlxmlhttprequest/data/callbackException.qml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/callbackException.qml
index 9255922..9255922 100644
--- a/tests/auto/declarative/qmlxmlhttprequest/data/callbackException.qml
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/callbackException.qml
diff --git a/tests/auto/declarative/qmlxmlhttprequest/data/cdata.qml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/cdata.qml
index b2d0209..b2d0209 100644
--- a/tests/auto/declarative/qmlxmlhttprequest/data/cdata.qml
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/cdata.qml
diff --git a/tests/auto/declarative/qmlxmlhttprequest/data/cdata.xml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/cdata.xml
index 061d37c..061d37c 100644
--- a/tests/auto/declarative/qmlxmlhttprequest/data/cdata.xml
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/cdata.xml
diff --git a/tests/auto/declarative/qmlxmlhttprequest/data/constructor.qml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/constructor.qml
index 93e44fd..93e44fd 100644
--- a/tests/auto/declarative/qmlxmlhttprequest/data/constructor.qml
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/constructor.qml
diff --git a/tests/auto/declarative/qmlxmlhttprequest/data/defaultState.qml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/defaultState.qml
index 4dcf6f9..4dcf6f9 100644
--- a/tests/auto/declarative/qmlxmlhttprequest/data/defaultState.qml
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/defaultState.qml
diff --git a/tests/auto/declarative/qmlxmlhttprequest/data/document.qml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/document.qml
index e372361..e372361 100644
--- a/tests/auto/declarative/qmlxmlhttprequest/data/document.qml
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/document.qml
diff --git a/tests/auto/declarative/qmlxmlhttprequest/data/document.xml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/document.xml
index fb693ea..fb693ea 100644
--- a/tests/auto/declarative/qmlxmlhttprequest/data/document.xml
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/document.xml
diff --git a/tests/auto/declarative/qmlxmlhttprequest/data/domExceptionCodes.qml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/domExceptionCodes.qml
index de5ee4f..de5ee4f 100644
--- a/tests/auto/declarative/qmlxmlhttprequest/data/domExceptionCodes.qml
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/domExceptionCodes.qml
diff --git a/tests/auto/declarative/qmlxmlhttprequest/data/element.qml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/element.qml
index 78c0374..78c0374 100644
--- a/tests/auto/declarative/qmlxmlhttprequest/data/element.qml
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/element.qml
diff --git a/tests/auto/declarative/qmlxmlhttprequest/data/element.xml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/element.xml
index 071ffae..071ffae 100644
--- a/tests/auto/declarative/qmlxmlhttprequest/data/element.xml
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/element.xml
diff --git a/tests/auto/declarative/qmlxmlhttprequest/data/getAllResponseHeaders.qml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/getAllResponseHeaders.qml
index 8d67fad..8d67fad 100644
--- a/tests/auto/declarative/qmlxmlhttprequest/data/getAllResponseHeaders.qml
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/getAllResponseHeaders.qml
diff --git a/tests/auto/declarative/qmlxmlhttprequest/data/getAllResponseHeaders_args.qml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/getAllResponseHeaders_args.qml
index 37124c7..37124c7 100644
--- a/tests/auto/declarative/qmlxmlhttprequest/data/getAllResponseHeaders_args.qml
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/getAllResponseHeaders_args.qml
diff --git a/tests/auto/declarative/qmlxmlhttprequest/data/getAllResponseHeaders_sent.qml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/getAllResponseHeaders_sent.qml
index 505e4b1..505e4b1 100644
--- a/tests/auto/declarative/qmlxmlhttprequest/data/getAllResponseHeaders_sent.qml
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/getAllResponseHeaders_sent.qml
diff --git a/tests/auto/declarative/qmlxmlhttprequest/data/getAllResponseHeaders_unsent.qml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/getAllResponseHeaders_unsent.qml
index 20fb040..20fb040 100644
--- a/tests/auto/declarative/qmlxmlhttprequest/data/getAllResponseHeaders_unsent.qml
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/getAllResponseHeaders_unsent.qml
diff --git a/tests/auto/declarative/qmlxmlhttprequest/data/getResponseHeader.expect b/tests/auto/declarative/qdeclarativexmlhttprequest/data/getResponseHeader.expect
index a740c79..a740c79 100644
--- a/tests/auto/declarative/qmlxmlhttprequest/data/getResponseHeader.expect
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/getResponseHeader.expect
diff --git a/tests/auto/declarative/qmlxmlhttprequest/data/getResponseHeader.qml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/getResponseHeader.qml
index 2f949e1..2f949e1 100644
--- a/tests/auto/declarative/qmlxmlhttprequest/data/getResponseHeader.qml
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/getResponseHeader.qml
diff --git a/tests/auto/declarative/qmlxmlhttprequest/data/getResponseHeader.reply b/tests/auto/declarative/qdeclarativexmlhttprequest/data/getResponseHeader.reply
index c4b4bb2..c4b4bb2 100644
--- a/tests/auto/declarative/qmlxmlhttprequest/data/getResponseHeader.reply
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/getResponseHeader.reply
diff --git a/tests/auto/declarative/qmlxmlhttprequest/data/getResponseHeader_args.qml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/getResponseHeader_args.qml
index d5aa4b1..d5aa4b1 100644
--- a/tests/auto/declarative/qmlxmlhttprequest/data/getResponseHeader_args.qml
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/getResponseHeader_args.qml
diff --git a/tests/auto/declarative/qmlxmlhttprequest/data/getResponseHeader_sent.qml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/getResponseHeader_sent.qml
index 7538ffd..7538ffd 100644
--- a/tests/auto/declarative/qmlxmlhttprequest/data/getResponseHeader_sent.qml
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/getResponseHeader_sent.qml
diff --git a/tests/auto/declarative/qmlxmlhttprequest/data/getResponseHeader_unsent.qml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/getResponseHeader_unsent.qml
index 3b55802..3b55802 100644
--- a/tests/auto/declarative/qmlxmlhttprequest/data/getResponseHeader_unsent.qml
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/getResponseHeader_unsent.qml
diff --git a/tests/auto/declarative/qmlxmlhttprequest/data/instanceStateValues.qml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/instanceStateValues.qml
index b8d01c4..b8d01c4 100644
--- a/tests/auto/declarative/qmlxmlhttprequest/data/instanceStateValues.qml
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/instanceStateValues.qml
diff --git a/tests/auto/declarative/qmlxmlhttprequest/data/invalidMethodUsage.qml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/invalidMethodUsage.qml
index b30989b..b30989b 100644
--- a/tests/auto/declarative/qmlxmlhttprequest/data/invalidMethodUsage.qml
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/invalidMethodUsage.qml
diff --git a/tests/auto/declarative/qmlxmlhttprequest/data/open.qml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/open.qml
index c06bae3..c06bae3 100644
--- a/tests/auto/declarative/qmlxmlhttprequest/data/open.qml
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/open.qml
diff --git a/tests/auto/declarative/qmlxmlhttprequest/data/open_arg_count.1.qml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/open_arg_count.1.qml
index b6d4c32..b6d4c32 100644
--- a/tests/auto/declarative/qmlxmlhttprequest/data/open_arg_count.1.qml
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/open_arg_count.1.qml
diff --git a/tests/auto/declarative/qmlxmlhttprequest/data/open_arg_count.2.qml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/open_arg_count.2.qml
index 8c86c20..8c86c20 100644
--- a/tests/auto/declarative/qmlxmlhttprequest/data/open_arg_count.2.qml
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/open_arg_count.2.qml
diff --git a/tests/auto/declarative/qmlxmlhttprequest/data/open_invalid_method.qml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/open_invalid_method.qml
index 69f79ae..69f79ae 100644
--- a/tests/auto/declarative/qmlxmlhttprequest/data/open_invalid_method.qml
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/open_invalid_method.qml
diff --git a/tests/auto/declarative/qmlxmlhttprequest/data/open_network.expect b/tests/auto/declarative/qdeclarativexmlhttprequest/data/open_network.expect
index a740c79..a740c79 100644
--- a/tests/auto/declarative/qmlxmlhttprequest/data/open_network.expect
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/open_network.expect
diff --git a/tests/auto/declarative/qmlxmlhttprequest/data/open_network.reply b/tests/auto/declarative/qdeclarativexmlhttprequest/data/open_network.reply
index 7ae6951..7ae6951 100644
--- a/tests/auto/declarative/qmlxmlhttprequest/data/open_network.reply
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/open_network.reply
diff --git a/tests/auto/declarative/qmlxmlhttprequest/data/open_network.wait b/tests/auto/declarative/qdeclarativexmlhttprequest/data/open_network.wait
index e69de29..e69de29 100644
--- a/tests/auto/declarative/qmlxmlhttprequest/data/open_network.wait
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/open_network.wait
diff --git a/tests/auto/declarative/qmlxmlhttprequest/data/open_sync.qml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/open_sync.qml
index 1477279..1477279 100644
--- a/tests/auto/declarative/qmlxmlhttprequest/data/open_sync.qml
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/open_sync.qml
diff --git a/tests/auto/declarative/qmlxmlhttprequest/data/open_user.qml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/open_user.qml
index 19e37fa..19e37fa 100644
--- a/tests/auto/declarative/qmlxmlhttprequest/data/open_user.qml
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/open_user.qml
diff --git a/tests/auto/declarative/qmlxmlhttprequest/data/open_username.qml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/open_username.qml
index 983ea14..983ea14 100644
--- a/tests/auto/declarative/qmlxmlhttprequest/data/open_username.qml
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/open_username.qml
diff --git a/tests/auto/declarative/qmlxmlhttprequest/data/redirectError.qml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/redirectError.qml
index 6b345cc..6b345cc 100644
--- a/tests/auto/declarative/qmlxmlhttprequest/data/redirectError.qml
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/redirectError.qml
diff --git a/tests/auto/declarative/qmlxmlhttprequest/data/redirectRecur.qml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/redirectRecur.qml
index c0321dc..c0321dc 100644
--- a/tests/auto/declarative/qmlxmlhttprequest/data/redirectRecur.qml
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/redirectRecur.qml
diff --git a/tests/auto/declarative/qmlxmlhttprequest/data/redirects.qml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/redirects.qml
index f6fabdb..f6fabdb 100644
--- a/tests/auto/declarative/qmlxmlhttprequest/data/redirects.qml
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/redirects.qml
diff --git a/tests/auto/declarative/qmlxmlhttprequest/data/redirecttarget.html b/tests/auto/declarative/qdeclarativexmlhttprequest/data/redirecttarget.html
index 95f35e0..95f35e0 100644
--- a/tests/auto/declarative/qmlxmlhttprequest/data/redirecttarget.html
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/redirecttarget.html
diff --git a/tests/auto/declarative/qmlxmlhttprequest/data/responseText.qml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/responseText.qml
index 4bb3a7a..4bb3a7a 100644
--- a/tests/auto/declarative/qmlxmlhttprequest/data/responseText.qml
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/responseText.qml
diff --git a/tests/auto/declarative/qmlxmlhttprequest/data/responseXML_invalid.qml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/responseXML_invalid.qml
index 63f288e..63f288e 100644
--- a/tests/auto/declarative/qmlxmlhttprequest/data/responseXML_invalid.qml
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/responseXML_invalid.qml
diff --git a/tests/auto/declarative/qmlxmlhttprequest/data/seconddocument.html b/tests/auto/declarative/qdeclarativexmlhttprequest/data/seconddocument.html
index a33f44b..a33f44b 100644
--- a/tests/auto/declarative/qmlxmlhttprequest/data/seconddocument.html
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/seconddocument.html
diff --git a/tests/auto/declarative/qmlxmlhttprequest/data/send_alreadySent.qml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/send_alreadySent.qml
index 0bad7df..0bad7df 100644
--- a/tests/auto/declarative/qmlxmlhttprequest/data/send_alreadySent.qml
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/send_alreadySent.qml
diff --git a/tests/auto/declarative/qmlxmlhttprequest/data/send_data.1.expect b/tests/auto/declarative/qdeclarativexmlhttprequest/data/send_data.1.expect
index 81dd4a0..81dd4a0 100644
--- a/tests/auto/declarative/qmlxmlhttprequest/data/send_data.1.expect
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/send_data.1.expect
diff --git a/tests/auto/declarative/qmlxmlhttprequest/data/send_data.1.qml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/send_data.1.qml
index 03543a9..03543a9 100644
--- a/tests/auto/declarative/qmlxmlhttprequest/data/send_data.1.qml
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/send_data.1.qml
diff --git a/tests/auto/declarative/qmlxmlhttprequest/data/send_data.2.qml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/send_data.2.qml
index 79a27b6..79a27b6 100644
--- a/tests/auto/declarative/qmlxmlhttprequest/data/send_data.2.qml
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/send_data.2.qml
diff --git a/tests/auto/declarative/qmlxmlhttprequest/data/send_data.3.qml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/send_data.3.qml
index e048769..e048769 100644
--- a/tests/auto/declarative/qmlxmlhttprequest/data/send_data.3.qml
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/send_data.3.qml
diff --git a/tests/auto/declarative/qmlxmlhttprequest/data/send_data.4.expect b/tests/auto/declarative/qdeclarativexmlhttprequest/data/send_data.4.expect
index 8fcf3ac..8fcf3ac 100644
--- a/tests/auto/declarative/qmlxmlhttprequest/data/send_data.4.expect
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/send_data.4.expect
diff --git a/tests/auto/declarative/qmlxmlhttprequest/data/send_data.4.qml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/send_data.4.qml
index 7ab0b27..7ab0b27 100644
--- a/tests/auto/declarative/qmlxmlhttprequest/data/send_data.4.qml
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/send_data.4.qml
diff --git a/tests/auto/declarative/qmlxmlhttprequest/data/send_data.5.qml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/send_data.5.qml
index 29bf2c2..29bf2c2 100644
--- a/tests/auto/declarative/qmlxmlhttprequest/data/send_data.5.qml
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/send_data.5.qml
diff --git a/tests/auto/declarative/qmlxmlhttprequest/data/send_data.6.expect b/tests/auto/declarative/qdeclarativexmlhttprequest/data/send_data.6.expect
index 97e6fac..97e6fac 100644
--- a/tests/auto/declarative/qmlxmlhttprequest/data/send_data.6.expect
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/send_data.6.expect
diff --git a/tests/auto/declarative/qmlxmlhttprequest/data/send_data.6.qml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/send_data.6.qml
index 135f45c..135f45c 100644
--- a/tests/auto/declarative/qmlxmlhttprequest/data/send_data.6.qml
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/send_data.6.qml
diff --git a/tests/auto/declarative/qmlxmlhttprequest/data/send_data.7.qml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/send_data.7.qml
index 4a09527..4a09527 100644
--- a/tests/auto/declarative/qmlxmlhttprequest/data/send_data.7.qml
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/send_data.7.qml
diff --git a/tests/auto/declarative/qmlxmlhttprequest/data/send_data.reply b/tests/auto/declarative/qdeclarativexmlhttprequest/data/send_data.reply
index 7ae6951..7ae6951 100644
--- a/tests/auto/declarative/qmlxmlhttprequest/data/send_data.reply
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/send_data.reply
diff --git a/tests/auto/declarative/qmlxmlhttprequest/data/send_ignoreData.qml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/send_ignoreData.qml
index dd5fa46..dd5fa46 100644
--- a/tests/auto/declarative/qmlxmlhttprequest/data/send_ignoreData.qml
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/send_ignoreData.qml
diff --git a/tests/auto/declarative/qmlxmlhttprequest/data/send_ignoreData.reply b/tests/auto/declarative/qdeclarativexmlhttprequest/data/send_ignoreData.reply
index 7ae6951..7ae6951 100644
--- a/tests/auto/declarative/qmlxmlhttprequest/data/send_ignoreData.reply
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/send_ignoreData.reply
diff --git a/tests/auto/declarative/qmlxmlhttprequest/data/send_ignoreData_GET.expect b/tests/auto/declarative/qdeclarativexmlhttprequest/data/send_ignoreData_GET.expect
index a740c79..a740c79 100644
--- a/tests/auto/declarative/qmlxmlhttprequest/data/send_ignoreData_GET.expect
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/send_ignoreData_GET.expect
diff --git a/tests/auto/declarative/qmlxmlhttprequest/data/send_ignoreData_PUT.expect b/tests/auto/declarative/qdeclarativexmlhttprequest/data/send_ignoreData_PUT.expect
index 991bd59..991bd59 100644
--- a/tests/auto/declarative/qmlxmlhttprequest/data/send_ignoreData_PUT.expect
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/send_ignoreData_PUT.expect
diff --git a/tests/auto/declarative/qmlxmlhttprequest/data/send_unsent.qml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/send_unsent.qml
index 7f51ecf..7f51ecf 100644
--- a/tests/auto/declarative/qmlxmlhttprequest/data/send_unsent.qml
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/send_unsent.qml
diff --git a/tests/auto/declarative/qmlxmlhttprequest/data/setRequestHeader.expect b/tests/auto/declarative/qdeclarativexmlhttprequest/data/setRequestHeader.expect
index 4600f2a..4600f2a 100644
--- a/tests/auto/declarative/qmlxmlhttprequest/data/setRequestHeader.expect
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/setRequestHeader.expect
diff --git a/tests/auto/declarative/qmlxmlhttprequest/data/setRequestHeader.qml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/setRequestHeader.qml
index b0723aa..b0723aa 100644
--- a/tests/auto/declarative/qmlxmlhttprequest/data/setRequestHeader.qml
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/setRequestHeader.qml
diff --git a/tests/auto/declarative/qmlxmlhttprequest/data/setRequestHeader.reply b/tests/auto/declarative/qdeclarativexmlhttprequest/data/setRequestHeader.reply
index 7ae6951..7ae6951 100644
--- a/tests/auto/declarative/qmlxmlhttprequest/data/setRequestHeader.reply
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/setRequestHeader.reply
diff --git a/tests/auto/declarative/qmlxmlhttprequest/data/setRequestHeader_args.qml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/setRequestHeader_args.qml
index 8305ae1..8305ae1 100644
--- a/tests/auto/declarative/qmlxmlhttprequest/data/setRequestHeader_args.qml
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/setRequestHeader_args.qml
diff --git a/tests/auto/declarative/qmlxmlhttprequest/data/setRequestHeader_illegalName.qml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/setRequestHeader_illegalName.qml
index bf31eca..bf31eca 100644
--- a/tests/auto/declarative/qmlxmlhttprequest/data/setRequestHeader_illegalName.qml
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/setRequestHeader_illegalName.qml
diff --git a/tests/auto/declarative/qmlxmlhttprequest/data/setRequestHeader_sent.qml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/setRequestHeader_sent.qml
index c2bbc6e..c2bbc6e 100644
--- a/tests/auto/declarative/qmlxmlhttprequest/data/setRequestHeader_sent.qml
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/setRequestHeader_sent.qml
diff --git a/tests/auto/declarative/qmlxmlhttprequest/data/setRequestHeader_unsent.qml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/setRequestHeader_unsent.qml
index 30bc93e..30bc93e 100644
--- a/tests/auto/declarative/qmlxmlhttprequest/data/setRequestHeader_unsent.qml
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/setRequestHeader_unsent.qml
diff --git a/tests/auto/declarative/qmlxmlhttprequest/data/staticStateValues.qml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/staticStateValues.qml
index ec1c5d8..ec1c5d8 100644
--- a/tests/auto/declarative/qmlxmlhttprequest/data/staticStateValues.qml
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/staticStateValues.qml
diff --git a/tests/auto/declarative/qmlxmlhttprequest/data/status.200.reply b/tests/auto/declarative/qdeclarativexmlhttprequest/data/status.200.reply
index 7ae6951..7ae6951 100644
--- a/tests/auto/declarative/qmlxmlhttprequest/data/status.200.reply
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/status.200.reply
diff --git a/tests/auto/declarative/qmlxmlhttprequest/data/status.404.reply b/tests/auto/declarative/qdeclarativexmlhttprequest/data/status.404.reply
index 2e29f56..2e29f56 100644
--- a/tests/auto/declarative/qmlxmlhttprequest/data/status.404.reply
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/status.404.reply
diff --git a/tests/auto/declarative/qmlxmlhttprequest/data/status.expect b/tests/auto/declarative/qdeclarativexmlhttprequest/data/status.expect
index a740c79..a740c79 100644
--- a/tests/auto/declarative/qmlxmlhttprequest/data/status.expect
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/status.expect
diff --git a/tests/auto/declarative/qmlxmlhttprequest/data/status.qml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/status.qml
index 04202c4..04202c4 100644
--- a/tests/auto/declarative/qmlxmlhttprequest/data/status.qml
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/status.qml
diff --git a/tests/auto/declarative/qmlxmlhttprequest/data/statusText.qml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/statusText.qml
index 8becc3b..8becc3b 100644
--- a/tests/auto/declarative/qmlxmlhttprequest/data/statusText.qml
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/statusText.qml
diff --git a/tests/auto/declarative/qmlxmlhttprequest/data/testdocument.html b/tests/auto/declarative/qdeclarativexmlhttprequest/data/testdocument.html
index 8fe0f4b..8fe0f4b 100644
--- a/tests/auto/declarative/qmlxmlhttprequest/data/testdocument.html
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/testdocument.html
diff --git a/tests/auto/declarative/qmlxmlhttprequest/data/text.qml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/text.qml
index 4615a07..4615a07 100644
--- a/tests/auto/declarative/qmlxmlhttprequest/data/text.qml
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/text.qml
diff --git a/tests/auto/declarative/qmlxmlhttprequest/data/text.xml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/text.xml
index e741688..e741688 100644
--- a/tests/auto/declarative/qmlxmlhttprequest/data/text.xml
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/text.xml
diff --git a/tests/auto/declarative/qmlxmlhttprequest/qmlxmlhttprequest.pro b/tests/auto/declarative/qdeclarativexmlhttprequest/qdeclarativexmlhttprequest.pro
index ed87b2a..7bc92af 100644
--- a/tests/auto/declarative/qmlxmlhttprequest/qmlxmlhttprequest.pro
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/qdeclarativexmlhttprequest.pro
@@ -5,7 +5,7 @@ macx:CONFIG -= app_bundle
 INCLUDEPATH += ../shared/
 HEADERS += ../shared/testhttpserver.h
 
-SOURCES += tst_qmlxmlhttprequest.cpp \
+SOURCES += tst_qdeclarativexmlhttprequest.cpp \
            ../shared/testhttpserver.cpp
 
 
diff --git a/tests/auto/declarative/qmlxmlhttprequest/tst_qmlxmlhttprequest.cpp b/tests/auto/declarative/qdeclarativexmlhttprequest/tst_qdeclarativexmlhttprequest.cpp
index e675566..c4ae90a 100644
--- a/tests/auto/declarative/qmlxmlhttprequest/tst_qmlxmlhttprequest.cpp
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/tst_qdeclarativexmlhttprequest.cpp
@@ -40,8 +40,8 @@
 ****************************************************************************/
 
 #include <qtest.h>
-#include <QmlEngine>
-#include <QmlComponent>
+#include <QDeclarativeEngine>
+#include <QDeclarativeComponent>
 #include <QDebug>
 #include <QNetworkCookieJar>
 #include "testhttpserver.h"
@@ -114,7 +114,7 @@ private slots:
     // void readyState()
 
 private:
-    QmlEngine engine;
+    QDeclarativeEngine engine;
 };
 
 inline QUrl TEST_FILE(const QString &filename)
@@ -125,7 +125,7 @@ inline QUrl TEST_FILE(const QString &filename)
 // Test that the dom exception codes are correct
 void tst_qmlxmlhttprequest::domExceptionCodes()
 {
-    QmlComponent component(&engine, TEST_FILE("domExceptionCodes.qml"));
+    QDeclarativeComponent component(&engine, TEST_FILE("domExceptionCodes.qml"));
     QObject *object = component.create();
     QVERIFY(object != 0);
 
@@ -180,7 +180,7 @@ void tst_qmlxmlhttprequest::callbackException()
     QString expect = TEST_FILE("callbackException.qml").toString() + ":"+QString::number(line)+": Error: Exception from Callback";
     QTest::ignoreMessage(QtWarningMsg, expect.toLatin1());
 
-    QmlComponent component(&engine, TEST_FILE("callbackException.qml"));
+    QDeclarativeComponent component(&engine, TEST_FILE("callbackException.qml"));
     QObject *object = component.beginCreate(engine.rootContext());
     QVERIFY(object != 0);
     object->setProperty("url", "testdocument.html");
@@ -196,7 +196,7 @@ void tst_qmlxmlhttprequest::callbackException()
 // ### WebKit does not do this, but it seems to fit the standard and QML better
 void tst_qmlxmlhttprequest::staticStateValues()
 {
-    QmlComponent component(&engine, TEST_FILE("staticStateValues.qml"));
+    QDeclarativeComponent component(&engine, TEST_FILE("staticStateValues.qml"));
     QObject *object = component.create();
     QVERIFY(object != 0);
 
@@ -212,7 +212,7 @@ void tst_qmlxmlhttprequest::staticStateValues()
 // Test that the state value properties on instances have the correct values.
 void tst_qmlxmlhttprequest::instanceStateValues()
 {
-    QmlComponent component(&engine, TEST_FILE("instanceStateValues.qml"));
+    QDeclarativeComponent component(&engine, TEST_FILE("instanceStateValues.qml"));
     QObject *object = component.create();
     QVERIFY(object != 0);
 
@@ -228,7 +228,7 @@ void tst_qmlxmlhttprequest::instanceStateValues()
 // Test calling constructor 
 void tst_qmlxmlhttprequest::constructor()
 {
-    QmlComponent component(&engine, TEST_FILE("constructor.qml"));
+    QDeclarativeComponent component(&engine, TEST_FILE("constructor.qml"));
     QObject *object = component.create();
     QVERIFY(object != 0);
 
@@ -241,7 +241,7 @@ void tst_qmlxmlhttprequest::constructor()
 // Test that all the properties are set correctly before any request is sent
 void tst_qmlxmlhttprequest::defaultState()
 {
-    QmlComponent component(&engine, TEST_FILE("defaultState.qml"));
+    QDeclarativeComponent component(&engine, TEST_FILE("defaultState.qml"));
     QObject *object = component.create();
     QVERIFY(object != 0);
 
@@ -259,7 +259,7 @@ void tst_qmlxmlhttprequest::open()
 {
     // Relative url
     {
-        QmlComponent component(&engine, TEST_FILE("open.qml"));
+        QDeclarativeComponent component(&engine, TEST_FILE("open.qml"));
         QObject *object = component.beginCreate(engine.rootContext());
         QVERIFY(object != 0);
         object->setProperty("url", "testdocument.html");
@@ -279,7 +279,7 @@ void tst_qmlxmlhttprequest::open()
 
     // Absolute url
     {
-        QmlComponent component(&engine, TEST_FILE("open.qml"));
+        QDeclarativeComponent component(&engine, TEST_FILE("open.qml"));
         QObject *object = component.beginCreate(engine.rootContext());
         QVERIFY(object != 0);
         object->setProperty("url", TEST_FILE("testdocument.html").toString());
@@ -305,7 +305,7 @@ void tst_qmlxmlhttprequest::open()
                             TEST_FILE("open_network.reply"), 
                             TEST_FILE("testdocument.html")));
 
-        QmlComponent component(&engine, TEST_FILE("open.qml"));
+        QDeclarativeComponent component(&engine, TEST_FILE("open.qml"));
         QObject *object = component.beginCreate(engine.rootContext());
         QVERIFY(object != 0);
         object->setProperty("url", "http://127.0.0.1:14445/testdocument.html");
@@ -331,7 +331,7 @@ void tst_qmlxmlhttprequest::open()
                             TEST_FILE("open_network.reply"), 
                             TEST_FILE("testdocument.html")));
 
-        QmlComponent component(&engine, TEST_FILE("open_user.qml"));
+        QDeclarativeComponent component(&engine, TEST_FILE("open_user.qml"));
         QObject *object = component.beginCreate(engine.rootContext());
         QVERIFY(object != 0);
         object->setProperty("url", "http://127.0.0.1:14445/testdocument.html");
@@ -355,7 +355,7 @@ void tst_qmlxmlhttprequest::open()
 // Test that calling XMLHttpRequest.open() with an invalid method raises an exception
 void tst_qmlxmlhttprequest::open_invalid_method()
 {
-    QmlComponent component(&engine, TEST_FILE("open_invalid_method.qml"));
+    QDeclarativeComponent component(&engine, TEST_FILE("open_invalid_method.qml"));
     QObject *object = component.create();
     QVERIFY(object != 0);
 
@@ -367,7 +367,7 @@ void tst_qmlxmlhttprequest::open_invalid_method()
 // Test that calling XMLHttpRequest.open() with sync raises an exception
 void tst_qmlxmlhttprequest::open_sync()
 {
-    QmlComponent component(&engine, TEST_FILE("open_sync.qml"));
+    QDeclarativeComponent component(&engine, TEST_FILE("open_sync.qml"));
     QObject *object = component.create();
     QVERIFY(object != 0);
 
@@ -380,7 +380,7 @@ void tst_qmlxmlhttprequest::open_sync()
 void tst_qmlxmlhttprequest::open_arg_count()
 {
     {
-        QmlComponent component(&engine, TEST_FILE("open_arg_count.1.qml"));
+        QDeclarativeComponent component(&engine, TEST_FILE("open_arg_count.1.qml"));
         QObject *object = component.create();
         QVERIFY(object != 0);
 
@@ -390,7 +390,7 @@ void tst_qmlxmlhttprequest::open_arg_count()
     }
 
     {
-        QmlComponent component(&engine, TEST_FILE("open_arg_count.2.qml"));
+        QDeclarativeComponent component(&engine, TEST_FILE("open_arg_count.2.qml"));
         QObject *object = component.create();
         QVERIFY(object != 0);
 
@@ -409,7 +409,7 @@ void tst_qmlxmlhttprequest::setRequestHeader()
                         TEST_FILE("setRequestHeader.reply"), 
                         TEST_FILE("testdocument.html")));
 
-    QmlComponent component(&engine, TEST_FILE("setRequestHeader.qml"));
+    QDeclarativeComponent component(&engine, TEST_FILE("setRequestHeader.qml"));
     QObject *object = component.beginCreate(engine.rootContext());
     QVERIFY(object != 0);
     object->setProperty("url", "http://127.0.0.1:14445/testdocument.html");
@@ -423,7 +423,7 @@ void tst_qmlxmlhttprequest::setRequestHeader()
 // Test setting headers before open() throws exception
 void tst_qmlxmlhttprequest::setRequestHeader_unsent()
 {
-    QmlComponent component(&engine, TEST_FILE("setRequestHeader_unsent.qml"));
+    QDeclarativeComponent component(&engine, TEST_FILE("setRequestHeader_unsent.qml"));
     QObject *object = component.create();
     QVERIFY(object != 0);
 
@@ -471,7 +471,7 @@ void tst_qmlxmlhttprequest::setRequestHeader_illegalName()
                         TEST_FILE("open_network.reply"), 
                         TEST_FILE("testdocument.html")));
 
-    QmlComponent component(&engine, TEST_FILE("setRequestHeader_illegalName.qml"));
+    QDeclarativeComponent component(&engine, TEST_FILE("setRequestHeader_illegalName.qml"));
     QObject *object = component.beginCreate(engine.rootContext());
     QVERIFY(object != 0);
     object->setProperty("url", "http://127.0.0.1:14445/testdocument.html");
@@ -499,7 +499,7 @@ void tst_qmlxmlhttprequest::setRequestHeader_sent()
                         TEST_FILE("open_network.reply"), 
                         TEST_FILE("testdocument.html")));
 
-    QmlComponent component(&engine, TEST_FILE("setRequestHeader_sent.qml"));
+    QDeclarativeComponent component(&engine, TEST_FILE("setRequestHeader_sent.qml"));
     QObject *object = component.beginCreate(engine.rootContext());
     QVERIFY(object != 0);
     object->setProperty("url", "http://127.0.0.1:14445/testdocument.html");
@@ -515,7 +515,7 @@ void tst_qmlxmlhttprequest::setRequestHeader_sent()
 // Invalid arg count throws exception
 void tst_qmlxmlhttprequest::setRequestHeader_args()
 {
-    QmlComponent component(&engine, TEST_FILE("setRequestHeader_args.qml"));
+    QDeclarativeComponent component(&engine, TEST_FILE("setRequestHeader_args.qml"));
     QObject *object = component.create();
     QVERIFY(object != 0);
 
@@ -527,7 +527,7 @@ void tst_qmlxmlhttprequest::setRequestHeader_args()
 // Test that calling send() in UNSENT state throws an exception
 void tst_qmlxmlhttprequest::send_unsent()
 {
-    QmlComponent component(&engine, TEST_FILE("send_unsent.qml"));
+    QDeclarativeComponent component(&engine, TEST_FILE("send_unsent.qml"));
     QObject *object = component.create();
     QVERIFY(object != 0);
 
@@ -539,7 +539,7 @@ void tst_qmlxmlhttprequest::send_unsent()
 // Test attempting to resend a sent request throws an exception
 void tst_qmlxmlhttprequest::send_alreadySent()
 {
-    QmlComponent component(&engine, TEST_FILE("send_alreadySent.qml"));
+    QDeclarativeComponent component(&engine, TEST_FILE("send_alreadySent.qml"));
     QObject *object = component.create();
     QVERIFY(object != 0);
 
@@ -559,7 +559,7 @@ void tst_qmlxmlhttprequest::send_ignoreData()
                             TEST_FILE("send_ignoreData.reply"), 
                             TEST_FILE("testdocument.html")));
 
-        QmlComponent component(&engine, TEST_FILE("send_ignoreData.qml"));
+        QDeclarativeComponent component(&engine, TEST_FILE("send_ignoreData.qml"));
         QObject *object = component.beginCreate(engine.rootContext());
         QVERIFY(object != 0);
         object->setProperty("reqType", "GET");
@@ -578,7 +578,7 @@ void tst_qmlxmlhttprequest::send_ignoreData()
                             TEST_FILE("send_ignoreData.reply"), 
                             TEST_FILE("testdocument.html")));
 
-        QmlComponent component(&engine, TEST_FILE("send_ignoreData.qml"));
+        QDeclarativeComponent component(&engine, TEST_FILE("send_ignoreData.qml"));
         QObject *object = component.beginCreate(engine.rootContext());
         QVERIFY(object != 0);
         object->setProperty("reqType", "HEAD");
@@ -602,7 +602,7 @@ void tst_qmlxmlhttprequest::send_withdata()
                             TEST_FILE("send_data.reply"), 
                             TEST_FILE("testdocument.html")));
 
-        QmlComponent component(&engine, TEST_FILE("send_data.1.qml"));
+        QDeclarativeComponent component(&engine, TEST_FILE("send_data.1.qml"));
         QObject *object = component.beginCreate(engine.rootContext());
         QVERIFY(object != 0);
         object->setProperty("url", "http://127.0.0.1:14445/testdocument.html");
@@ -621,7 +621,7 @@ void tst_qmlxmlhttprequest::send_withdata()
                             TEST_FILE("send_data.reply"), 
                             TEST_FILE("testdocument.html")));
 
-        QmlComponent component(&engine, TEST_FILE("send_data.2.qml"));
+        QDeclarativeComponent component(&engine, TEST_FILE("send_data.2.qml"));
         QObject *object = component.beginCreate(engine.rootContext());
         QVERIFY(object != 0);
         object->setProperty("url", "http://127.0.0.1:14445/testdocument.html");
@@ -640,7 +640,7 @@ void tst_qmlxmlhttprequest::send_withdata()
                             TEST_FILE("send_data.reply"), 
                             TEST_FILE("testdocument.html")));
 
-        QmlComponent component(&engine, TEST_FILE("send_data.3.qml"));
+        QDeclarativeComponent component(&engine, TEST_FILE("send_data.3.qml"));
         QObject *object = component.beginCreate(engine.rootContext());
         QVERIFY(object != 0);
         object->setProperty("url", "http://127.0.0.1:14445/testdocument.html");
@@ -659,7 +659,7 @@ void tst_qmlxmlhttprequest::send_withdata()
                             TEST_FILE("send_data.reply"), 
                             TEST_FILE("testdocument.html")));
 
-        QmlComponent component(&engine, TEST_FILE("send_data.4.qml"));
+        QDeclarativeComponent component(&engine, TEST_FILE("send_data.4.qml"));
         QObject *object = component.beginCreate(engine.rootContext());
         QVERIFY(object != 0);
         object->setProperty("url", "http://127.0.0.1:14445/testdocument.html");
@@ -678,7 +678,7 @@ void tst_qmlxmlhttprequest::send_withdata()
                             TEST_FILE("send_data.reply"), 
                             TEST_FILE("testdocument.html")));
 
-        QmlComponent component(&engine, TEST_FILE("send_data.5.qml"));
+        QDeclarativeComponent component(&engine, TEST_FILE("send_data.5.qml"));
         QObject *object = component.beginCreate(engine.rootContext());
         QVERIFY(object != 0);
         object->setProperty("url", "http://127.0.0.1:14445/testdocument.html");
@@ -697,7 +697,7 @@ void tst_qmlxmlhttprequest::send_withdata()
                             TEST_FILE("send_data.reply"), 
                             TEST_FILE("testdocument.html")));
 
-        QmlComponent component(&engine, TEST_FILE("send_data.6.qml"));
+        QDeclarativeComponent component(&engine, TEST_FILE("send_data.6.qml"));
         QObject *object = component.beginCreate(engine.rootContext());
         QVERIFY(object != 0);
         object->setProperty("url", "http://127.0.0.1:14445/testdocument.html");
@@ -716,7 +716,7 @@ void tst_qmlxmlhttprequest::send_withdata()
                             TEST_FILE("send_data.reply"), 
                             TEST_FILE("testdocument.html")));
 
-        QmlComponent component(&engine, TEST_FILE("send_data.7.qml"));
+        QDeclarativeComponent component(&engine, TEST_FILE("send_data.7.qml"));
         QObject *object = component.beginCreate(engine.rootContext());
         QVERIFY(object != 0);
         object->setProperty("url", "http://127.0.0.1:14445/testdocument.html");
@@ -731,7 +731,7 @@ void tst_qmlxmlhttprequest::send_withdata()
 // Test abort() has no effect in unsent state
 void tst_qmlxmlhttprequest::abort_unsent()
 {
-    QmlComponent component(&engine, TEST_FILE("abort_unsent.qml"));
+    QDeclarativeComponent component(&engine, TEST_FILE("abort_unsent.qml"));
     QObject *object = component.beginCreate(engine.rootContext());
     QVERIFY(object != 0);
     object->setProperty("url", "testdocument.html");
@@ -752,7 +752,7 @@ void tst_qmlxmlhttprequest::abort_unsent()
 // Test abort() cancels an open (but unsent) request
 void tst_qmlxmlhttprequest::abort_opened()
 {
-    QmlComponent component(&engine, TEST_FILE("abort_opened.qml"));
+    QDeclarativeComponent component(&engine, TEST_FILE("abort_opened.qml"));
     QObject *object = component.beginCreate(engine.rootContext());
     QVERIFY(object != 0);
     object->setProperty("url", "testdocument.html");
@@ -779,7 +779,7 @@ void tst_qmlxmlhttprequest::abort()
                         TEST_FILE("abort.reply"), 
                         TEST_FILE("testdocument.html")));
 
-    QmlComponent component(&engine, TEST_FILE("abort.qml"));
+    QDeclarativeComponent component(&engine, TEST_FILE("abort.qml"));
     QObject *object = component.beginCreate(engine.rootContext());
     QVERIFY(object != 0);
     object->setProperty("urlDummy", "http://127.0.0.1:14449/testdocument.html");
@@ -797,7 +797,7 @@ void tst_qmlxmlhttprequest::abort()
 
 void tst_qmlxmlhttprequest::getResponseHeader()
 {
-    QmlEngine engine; // Avoid cookie contamination
+    QDeclarativeEngine engine; // Avoid cookie contamination
 
     TestHTTPServer server(SERVER_PORT);
     QVERIFY(server.isValid());
@@ -806,7 +806,7 @@ void tst_qmlxmlhttprequest::getResponseHeader()
                         TEST_FILE("testdocument.html")));
 
 
-    QmlComponent component(&engine, TEST_FILE("getResponseHeader.qml"));
+    QDeclarativeComponent component(&engine, TEST_FILE("getResponseHeader.qml"));
     QObject *object = component.beginCreate(engine.rootContext());
     QVERIFY(object != 0);
     object->setProperty("url", "http://127.0.0.1:14445/testdocument.html");
@@ -837,7 +837,7 @@ void tst_qmlxmlhttprequest::getResponseHeader()
 // Test getResponseHeader throws an exception in an invalid state
 void tst_qmlxmlhttprequest::getResponseHeader_unsent()
 {
-    QmlComponent component(&engine, TEST_FILE("getResponseHeader_unsent.qml"));
+    QDeclarativeComponent component(&engine, TEST_FILE("getResponseHeader_unsent.qml"));
     QObject *object = component.create();
     QVERIFY(object != 0);
 
@@ -849,7 +849,7 @@ void tst_qmlxmlhttprequest::getResponseHeader_unsent()
 // Test getResponseHeader throws an exception in an invalid state
 void tst_qmlxmlhttprequest::getResponseHeader_sent()
 {
-    QmlComponent component(&engine, TEST_FILE("getResponseHeader_sent.qml"));
+    QDeclarativeComponent component(&engine, TEST_FILE("getResponseHeader_sent.qml"));
     QObject *object = component.create();
     QVERIFY(object != 0);
 
@@ -861,7 +861,7 @@ void tst_qmlxmlhttprequest::getResponseHeader_sent()
 // Invalid arg count throws exception
 void tst_qmlxmlhttprequest::getResponseHeader_args()
 {
-    QmlComponent component(&engine, TEST_FILE("getResponseHeader_args.qml"));
+    QDeclarativeComponent component(&engine, TEST_FILE("getResponseHeader_args.qml"));
     QObject *object = component.create();
     QVERIFY(object != 0);
 
@@ -872,7 +872,7 @@ void tst_qmlxmlhttprequest::getResponseHeader_args()
 
 void tst_qmlxmlhttprequest::getAllResponseHeaders()
 {
-    QmlEngine engine; // Avoid cookie contamination
+    QDeclarativeEngine engine; // Avoid cookie contamination
 
     TestHTTPServer server(SERVER_PORT);
     QVERIFY(server.isValid());
@@ -880,7 +880,7 @@ void tst_qmlxmlhttprequest::getAllResponseHeaders()
                         TEST_FILE("getResponseHeader.reply"), 
                         TEST_FILE("testdocument.html")));
 
-    QmlComponent component(&engine, TEST_FILE("getAllResponseHeaders.qml"));
+    QDeclarativeComponent component(&engine, TEST_FILE("getAllResponseHeaders.qml"));
     QObject *object = component.beginCreate(engine.rootContext());
     QVERIFY(object != 0);
     object->setProperty("url", "http://127.0.0.1:14445/testdocument.html");
@@ -905,7 +905,7 @@ void tst_qmlxmlhttprequest::getAllResponseHeaders()
 // Test getAllResponseHeaders throws an exception in an invalid state
 void tst_qmlxmlhttprequest::getAllResponseHeaders_unsent()
 {
-    QmlComponent component(&engine, TEST_FILE("getAllResponseHeaders_unsent.qml"));
+    QDeclarativeComponent component(&engine, TEST_FILE("getAllResponseHeaders_unsent.qml"));
     QObject *object = component.create();
     QVERIFY(object != 0);
 
@@ -917,7 +917,7 @@ void tst_qmlxmlhttprequest::getAllResponseHeaders_unsent()
 // Test getAllResponseHeaders throws an exception in an invalid state
 void tst_qmlxmlhttprequest::getAllResponseHeaders_sent()
 {
-    QmlComponent component(&engine, TEST_FILE("getAllResponseHeaders_sent.qml"));
+    QDeclarativeComponent component(&engine, TEST_FILE("getAllResponseHeaders_sent.qml"));
     QObject *object = component.create();
     QVERIFY(object != 0);
 
@@ -929,7 +929,7 @@ void tst_qmlxmlhttprequest::getAllResponseHeaders_sent()
 // Invalid arg count throws exception
 void tst_qmlxmlhttprequest::getAllResponseHeaders_args()
 {
-    QmlComponent component(&engine, TEST_FILE("getAllResponseHeaders_args.qml"));
+    QDeclarativeComponent component(&engine, TEST_FILE("getAllResponseHeaders_args.qml"));
     QObject *object = component.create();
     QVERIFY(object != 0);
 
@@ -947,7 +947,7 @@ void tst_qmlxmlhttprequest::status()
                             TEST_FILE("status.200.reply"), 
                             TEST_FILE("testdocument.html")));
 
-        QmlComponent component(&engine, TEST_FILE("status.qml"));
+        QDeclarativeComponent component(&engine, TEST_FILE("status.qml"));
         QObject *object = component.beginCreate(engine.rootContext());
         QVERIFY(object != 0);
         object->setProperty("url", "http://127.0.0.1:14445/testdocument.html");
@@ -974,7 +974,7 @@ void tst_qmlxmlhttprequest::status()
                             TEST_FILE("status.404.reply"), 
                             TEST_FILE("testdocument.html")));
 
-        QmlComponent component(&engine, TEST_FILE("status.qml"));
+        QDeclarativeComponent component(&engine, TEST_FILE("status.qml"));
         QObject *object = component.beginCreate(engine.rootContext());
         QVERIFY(object != 0);
         object->setProperty("url", "http://127.0.0.1:14445/testdocument.html");
@@ -1004,7 +1004,7 @@ void tst_qmlxmlhttprequest::statusText()
                             TEST_FILE("status.200.reply"), 
                             TEST_FILE("testdocument.html")));
 
-        QmlComponent component(&engine, TEST_FILE("statusText.qml"));
+        QDeclarativeComponent component(&engine, TEST_FILE("statusText.qml"));
         QObject *object = component.beginCreate(engine.rootContext());
         QVERIFY(object != 0);
         object->setProperty("url", "http://127.0.0.1:14445/testdocument.html");
@@ -1031,7 +1031,7 @@ void tst_qmlxmlhttprequest::statusText()
                             TEST_FILE("status.404.reply"), 
                             TEST_FILE("testdocument.html")));
 
-        QmlComponent component(&engine, TEST_FILE("statusText.qml"));
+        QDeclarativeComponent component(&engine, TEST_FILE("statusText.qml"));
         QObject *object = component.beginCreate(engine.rootContext());
         QVERIFY(object != 0);
         object->setProperty("url", "http://127.0.0.1:14445/testdocument.html");
@@ -1061,7 +1061,7 @@ void tst_qmlxmlhttprequest::responseText()
                             TEST_FILE("status.200.reply"), 
                             TEST_FILE("testdocument.html")));
 
-        QmlComponent component(&engine, TEST_FILE("responseText.qml"));
+        QDeclarativeComponent component(&engine, TEST_FILE("responseText.qml"));
         QObject *object = component.beginCreate(engine.rootContext());
         QVERIFY(object != 0);
         object->setProperty("url", "http://127.0.0.1:14445/testdocument.html");
@@ -1088,7 +1088,7 @@ void tst_qmlxmlhttprequest::responseText()
                             TEST_FILE("status.200.reply"), 
                             QUrl()));
 
-        QmlComponent component(&engine, TEST_FILE("responseText.qml"));
+        QDeclarativeComponent component(&engine, TEST_FILE("responseText.qml"));
         QObject *object = component.beginCreate(engine.rootContext());
         QVERIFY(object != 0);
         object->setProperty("url", "http://127.0.0.1:14445/testdocument.html");
@@ -1115,7 +1115,7 @@ void tst_qmlxmlhttprequest::responseText()
                             TEST_FILE("status.404.reply"), 
                             TEST_FILE("testdocument.html")));
 
-        QmlComponent component(&engine, TEST_FILE("responseText.qml"));
+        QDeclarativeComponent component(&engine, TEST_FILE("responseText.qml"));
         QObject *object = component.beginCreate(engine.rootContext());
         QVERIFY(object != 0);
         object->setProperty("url", "http://127.0.0.1:14445/testdocument.html");
@@ -1140,7 +1140,7 @@ void tst_qmlxmlhttprequest::responseText()
 // throws an exception
 void tst_qmlxmlhttprequest::invalidMethodUsage()
 {
-    QmlComponent component(&engine, TEST_FILE("invalidMethodUsage.qml"));
+    QDeclarativeComponent component(&engine, TEST_FILE("invalidMethodUsage.qml"));
     QObject *object = component.create();
     QVERIFY(object != 0);
 
@@ -1170,7 +1170,7 @@ void tst_qmlxmlhttprequest::redirects()
         server.addRedirect("redirect.html", "http://127.0.0.1:14445/redirecttarget.html");
         server.serveDirectory("data");
 
-        QmlComponent component(&engine, TEST_FILE("redirects.qml"));
+        QDeclarativeComponent component(&engine, TEST_FILE("redirects.qml"));
         QObject *object = component.beginCreate(engine.rootContext());
         QVERIFY(object != 0);
         object->setProperty("url", "http://127.0.0.1:14445/redirect.html");
@@ -1189,7 +1189,7 @@ void tst_qmlxmlhttprequest::redirects()
         server.addRedirect("redirect.html", "http://127.0.0.1:14445/redirectmissing.html");
         server.serveDirectory("data");
 
-        QmlComponent component(&engine, TEST_FILE("redirectError.qml"));
+        QDeclarativeComponent component(&engine, TEST_FILE("redirectError.qml"));
         QObject *object = component.beginCreate(engine.rootContext());
         QVERIFY(object != 0);
         object->setProperty("url", "http://127.0.0.1:14445/redirect.html");
@@ -1208,7 +1208,7 @@ void tst_qmlxmlhttprequest::redirects()
         server.addRedirect("redirect.html", "http://127.0.0.1:14445/redirect.html");
         server.serveDirectory("data");
 
-        QmlComponent component(&engine, TEST_FILE("redirectRecur.qml"));
+        QDeclarativeComponent component(&engine, TEST_FILE("redirectRecur.qml"));
         QObject *object = component.beginCreate(engine.rootContext());
         QVERIFY(object != 0);
         object->setProperty("url", "http://127.0.0.1:14445/redirect.html");
@@ -1229,7 +1229,7 @@ void tst_qmlxmlhttprequest::redirects()
 
 void tst_qmlxmlhttprequest::responseXML_invalid()
 {
-    QmlComponent component(&engine, TEST_FILE("responseXML_invalid.qml"));
+    QDeclarativeComponent component(&engine, TEST_FILE("responseXML_invalid.qml"));
     QObject *object = component.create();
     QVERIFY(object != 0);
 
@@ -1243,7 +1243,7 @@ void tst_qmlxmlhttprequest::responseXML_invalid()
 // Test the Document DOM element
 void tst_qmlxmlhttprequest::document()
 {
-    QmlComponent component(&engine, TEST_FILE("document.qml"));
+    QDeclarativeComponent component(&engine, TEST_FILE("document.qml"));
     QObject *object = component.create();
     QVERIFY(object != 0);
 
@@ -1257,7 +1257,7 @@ void tst_qmlxmlhttprequest::document()
 // Test the Element DOM element
 void tst_qmlxmlhttprequest::element()
 {
-    QmlComponent component(&engine, TEST_FILE("element.qml"));
+    QDeclarativeComponent component(&engine, TEST_FILE("element.qml"));
     QObject *object = component.create();
     QVERIFY(object != 0);
 
@@ -1271,7 +1271,7 @@ void tst_qmlxmlhttprequest::element()
 // Test the Attr DOM element
 void tst_qmlxmlhttprequest::attr()
 {
-    QmlComponent component(&engine, TEST_FILE("attr.qml"));
+    QDeclarativeComponent component(&engine, TEST_FILE("attr.qml"));
     QObject *object = component.create();
     QVERIFY(object != 0);
 
@@ -1285,7 +1285,7 @@ void tst_qmlxmlhttprequest::attr()
 // Test the Text DOM element
 void tst_qmlxmlhttprequest::text()
 {
-    QmlComponent component(&engine, TEST_FILE("text.qml"));
+    QDeclarativeComponent component(&engine, TEST_FILE("text.qml"));
     QObject *object = component.create();
     QVERIFY(object != 0);
 
@@ -1299,7 +1299,7 @@ void tst_qmlxmlhttprequest::text()
 // Test the CDataSection DOM element
 void tst_qmlxmlhttprequest::cdata()
 {
-    QmlComponent component(&engine, TEST_FILE("cdata.qml"));
+    QDeclarativeComponent component(&engine, TEST_FILE("cdata.qml"));
     QObject *object = component.create();
     QVERIFY(object != 0);
 
@@ -1312,4 +1312,4 @@ void tst_qmlxmlhttprequest::cdata()
 
 QTEST_MAIN(tst_qmlxmlhttprequest)
 
-#include "tst_qmlxmlhttprequest.moc"
+#include "tst_qdeclarativexmlhttprequest.moc"
diff --git a/tests/auto/declarative/qmlxmllistmodel/data/model.qml b/tests/auto/declarative/qdeclarativexmllistmodel/data/model.qml
index 2cbb027..2cbb027 100644
--- a/tests/auto/declarative/qmlxmllistmodel/data/model.qml
+++ b/tests/auto/declarative/qdeclarativexmllistmodel/data/model.qml
diff --git a/tests/auto/declarative/qmlxmllistmodel/data/model.xml b/tests/auto/declarative/qdeclarativexmllistmodel/data/model.xml
index 40cd6d0..40cd6d0 100644
--- a/tests/auto/declarative/qmlxmllistmodel/data/model.xml
+++ b/tests/auto/declarative/qdeclarativexmllistmodel/data/model.xml
diff --git a/tests/auto/declarative/qmlxmllistmodel/data/model2.qml b/tests/auto/declarative/qdeclarativexmllistmodel/data/model2.qml
index 140e0ad..140e0ad 100644
--- a/tests/auto/declarative/qmlxmllistmodel/data/model2.qml
+++ b/tests/auto/declarative/qdeclarativexmllistmodel/data/model2.qml
diff --git a/tests/auto/declarative/qmlxmllistmodel/data/recipes.qml b/tests/auto/declarative/qdeclarativexmllistmodel/data/recipes.qml
index 13dea91..13dea91 100644
--- a/tests/auto/declarative/qmlxmllistmodel/data/recipes.qml
+++ b/tests/auto/declarative/qdeclarativexmllistmodel/data/recipes.qml
diff --git a/tests/auto/declarative/qmlxmllistmodel/data/recipes.xml b/tests/auto/declarative/qdeclarativexmllistmodel/data/recipes.xml
index d71de60..d71de60 100644
--- a/tests/auto/declarative/qmlxmllistmodel/data/recipes.xml
+++ b/tests/auto/declarative/qdeclarativexmllistmodel/data/recipes.xml
diff --git a/tests/auto/declarative/qmlxmllistmodel/data/roleErrors.qml b/tests/auto/declarative/qdeclarativexmllistmodel/data/roleErrors.qml
index 26c533f..26c533f 100644
--- a/tests/auto/declarative/qmlxmllistmodel/data/roleErrors.qml
+++ b/tests/auto/declarative/qdeclarativexmllistmodel/data/roleErrors.qml
diff --git a/tests/auto/declarative/qmlxmllistmodel/data/roleKeys.qml b/tests/auto/declarative/qdeclarativexmllistmodel/data/roleKeys.qml
index b90e57e..b90e57e 100644
--- a/tests/auto/declarative/qmlxmllistmodel/data/roleKeys.qml
+++ b/tests/auto/declarative/qdeclarativexmllistmodel/data/roleKeys.qml
diff --git a/tests/auto/declarative/qmlxmllistmodel/data/unique.qml b/tests/auto/declarative/qdeclarativexmllistmodel/data/unique.qml
index ed0f293..ed0f293 100644
--- a/tests/auto/declarative/qmlxmllistmodel/data/unique.qml
+++ b/tests/auto/declarative/qdeclarativexmllistmodel/data/unique.qml
diff --git a/tests/auto/declarative/qmlxmllistmodel/qmlxmllistmodel.pro b/tests/auto/declarative/qdeclarativexmllistmodel/qdeclarativexmllistmodel.pro
index 8e58a32..88832dc 100644
--- a/tests/auto/declarative/qmlxmllistmodel/qmlxmllistmodel.pro
+++ b/tests/auto/declarative/qdeclarativexmllistmodel/qdeclarativexmllistmodel.pro
@@ -6,6 +6,6 @@ contains(QT_CONFIG,xmlpatterns) {
 }
 macx:CONFIG -= app_bundle
 
-SOURCES += tst_qmlxmllistmodel.cpp
+SOURCES += tst_qdeclarativexmllistmodel.cpp
 
 DEFINES += SRCDIR=\\\"$$PWD\\\"
diff --git a/tests/auto/declarative/qmlxmllistmodel/tst_qmlxmllistmodel.cpp b/tests/auto/declarative/qdeclarativexmllistmodel/tst_qdeclarativexmllistmodel.cpp
index 477b661..9ef1298 100644
--- a/tests/auto/declarative/qmlxmllistmodel/tst_qmlxmllistmodel.cpp
+++ b/tests/auto/declarative/qdeclarativexmllistmodel/tst_qdeclarativexmllistmodel.cpp
@@ -43,16 +43,16 @@
 #include <QtCore/qtimer.h>
 
 #ifdef QTEST_XMLPATTERNS
-#include <QtDeclarative/qmlengine.h>
-#include <QtDeclarative/qmlcomponent.h>
-#include <private/qmlxmllistmodel_p.h>
+#include <QtDeclarative/qdeclarativeengine.h>
+#include <QtDeclarative/qdeclarativecomponent.h>
+#include <private/qdeclarativexmllistmodel_p.h>
 #include "../../../shared/util.h"
 
-typedef QPair<int, int> QmlXmlListRange;
-typedef QList<QVariantList> QmlXmlModelData;
+typedef QPair<int, int> QDeclarativeXmlListRange;
+typedef QList<QVariantList> QDeclarativeXmlModelData;
 
-Q_DECLARE_METATYPE(QList<QmlXmlListRange>)
-Q_DECLARE_METATYPE(QmlXmlModelData)
+Q_DECLARE_METATYPE(QList<QDeclarativeXmlListRange>)
+Q_DECLARE_METATYPE(QDeclarativeXmlModelData)
 
 class tst_qmlxmllistmodel : public QObject
 
@@ -75,7 +75,7 @@ private slots:
     void keysChanged();
 
 private:
-    QString makeItemXmlAndData(const QString &data, QmlXmlModelData *modelData = 0) const
+    QString makeItemXmlAndData(const QString &data, QDeclarativeXmlModelData *modelData = 0) const
     {
         if (modelData)
             modelData->clear();
@@ -110,13 +110,13 @@ private:
         return decl + QLatin1String("<data>") + xml + QLatin1String("</data>");
     }
 
-    QmlEngine engine;
+    QDeclarativeEngine engine;
 };
 
 void tst_qmlxmllistmodel::buildModel()
 {
-    QmlComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/model.qml"));
-    QmlXmlListModel *listModel = qobject_cast<QmlXmlListModel*>(component.create());
+    QDeclarativeComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/model.qml"));
+    QDeclarativeXmlListModel *listModel = qobject_cast<QDeclarativeXmlListModel*>(component.create());
     QVERIFY(listModel != 0);
     QTRY_COMPARE(listModel->count(), 9);
 
@@ -134,8 +134,8 @@ void tst_qmlxmllistmodel::buildModel()
 
 void tst_qmlxmllistmodel::missingFields()
 {
-    QmlComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/model2.qml"));
-    QmlXmlListModel *listModel = qobject_cast<QmlXmlListModel*>(component.create());
+    QDeclarativeComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/model2.qml"));
+    QDeclarativeXmlListModel *listModel = qobject_cast<QDeclarativeXmlListModel*>(component.create());
     QVERIFY(listModel != 0);
     QTRY_COMPARE(listModel->count(), 9);
 
@@ -155,8 +155,8 @@ void tst_qmlxmllistmodel::missingFields()
 
 void tst_qmlxmllistmodel::cdata()
 {
-    QmlComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/recipes.qml"));
-    QmlXmlListModel *listModel = qobject_cast<QmlXmlListModel*>(component.create());
+    QDeclarativeComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/recipes.qml"));
+    QDeclarativeXmlListModel *listModel = qobject_cast<QDeclarativeXmlListModel*>(component.create());
     QVERIFY(listModel != 0);
     QTRY_COMPARE(listModel->count(), 5);
 
@@ -171,8 +171,8 @@ void tst_qmlxmllistmodel::cdata()
 
 void tst_qmlxmllistmodel::attributes()
 {
-    QmlComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/recipes.qml"));
-    QmlXmlListModel *listModel = qobject_cast<QmlXmlListModel*>(component.create());
+    QDeclarativeComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/recipes.qml"));
+    QDeclarativeXmlListModel *listModel = qobject_cast<QDeclarativeXmlListModel*>(component.create());
     QVERIFY(listModel != 0);
     QTRY_COMPARE(listModel->count(), 5);
 
@@ -187,8 +187,8 @@ void tst_qmlxmllistmodel::attributes()
 
 void tst_qmlxmllistmodel::roles()
 {
-    QmlComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/model.qml"));
-    QmlXmlListModel *listModel = qobject_cast<QmlXmlListModel*>(component.create());
+    QDeclarativeComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/model.qml"));
+    QDeclarativeXmlListModel *listModel = qobject_cast<QDeclarativeXmlListModel*>(component.create());
     QVERIFY(listModel != 0);
     QTRY_COMPARE(listModel->count(), 9);
 
@@ -204,10 +204,10 @@ void tst_qmlxmllistmodel::roles()
 
 void tst_qmlxmllistmodel::roleErrors()
 {
-    QmlComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/roleErrors.qml"));
+    QDeclarativeComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/roleErrors.qml"));
     QTest::ignoreMessage(QtWarningMsg, QString("QML XmlRole (" + QUrl::fromLocalFile(SRCDIR "/data/roleErrors.qml").toString() + ":6:5) An XmlRole query must not start with '/'").toUtf8().constData());
     //### make sure we receive all expected warning messages.
-    QmlXmlListModel *listModel = qobject_cast<QmlXmlListModel*>(component.create());
+    QDeclarativeXmlListModel *listModel = qobject_cast<QDeclarativeXmlListModel*>(component.create());
     QVERIFY(listModel != 0);
     QTRY_COMPARE(listModel->count(), 9);
 
@@ -229,9 +229,9 @@ void tst_qmlxmllistmodel::roleErrors()
 
 void tst_qmlxmllistmodel::uniqueRoleNames()
 {
-    QmlComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/unique.qml"));
+    QDeclarativeComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/unique.qml"));
     QTest::ignoreMessage(QtWarningMsg, QString("QML XmlRole (" + QUrl::fromLocalFile(SRCDIR "/data/unique.qml").toString() + ":7:5) \"name\" duplicates a previous role name and will be disabled.").toUtf8().constData());
-    QmlXmlListModel *listModel = qobject_cast<QmlXmlListModel*>(component.create());
+    QDeclarativeXmlListModel *listModel = qobject_cast<QDeclarativeXmlListModel*>(component.create());
     QVERIFY(listModel != 0);
     QTRY_COMPARE(listModel->count(), 9);
 
@@ -250,12 +250,12 @@ void tst_qmlxmllistmodel::useKeys()
     QFETCH(QString, oldXml);
     QFETCH(int, oldCount);
     QFETCH(QString, newXml);
-    QFETCH(QmlXmlModelData, newData);
-    QFETCH(QList<QmlXmlListRange>, insertRanges);
-    QFETCH(QList<QmlXmlListRange>, removeRanges);
+    QFETCH(QDeclarativeXmlModelData, newData);
+    QFETCH(QList<QDeclarativeXmlListRange>, insertRanges);
+    QFETCH(QList<QDeclarativeXmlListRange>, removeRanges);
 
-    QmlComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/roleKeys.qml"));
-    QmlXmlListModel *model = qobject_cast<QmlXmlListModel*>(component.create());
+    QDeclarativeComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/roleKeys.qml"));
+    QDeclarativeXmlListModel *model = qobject_cast<QDeclarativeXmlListModel*>(component.create());
     QVERIFY(model != 0);
     
     model->setXml(oldXml);
@@ -299,81 +299,81 @@ void tst_qmlxmllistmodel::useKeys_data()
     QTest::addColumn<QString>("oldXml");
     QTest::addColumn<int>("oldCount");
     QTest::addColumn<QString>("newXml");
-    QTest::addColumn<QmlXmlModelData>("newData");
-    QTest::addColumn<QList<QmlXmlListRange> >("insertRanges");
-    QTest::addColumn<QList<QmlXmlListRange> >("removeRanges");
+    QTest::addColumn<QDeclarativeXmlModelData>("newData");
+    QTest::addColumn<QList<QDeclarativeXmlListRange> >("insertRanges");
+    QTest::addColumn<QList<QDeclarativeXmlListRange> >("removeRanges");
 
-    QmlXmlModelData modelData;
+    QDeclarativeXmlModelData modelData;
 
     QTest::newRow("append 1")
         << makeItemXmlAndData("name=A,age=25,sport=Football") << 1
         << makeItemXmlAndData("name=A,age=25,sport=Football;name=B,age=35,sport=Athletics", &modelData)
         << modelData
-        << (QList<QmlXmlListRange>() << qMakePair(1, 1))
-        << QList<QmlXmlListRange>();
+        << (QList<QDeclarativeXmlListRange>() << qMakePair(1, 1))
+        << QList<QDeclarativeXmlListRange>();
 
     QTest::newRow("append multiple")
         << makeItemXmlAndData("name=A,age=25,sport=Football") << 1
         << makeItemXmlAndData("name=A,age=25,sport=Football;name=B,age=35,sport=Athletics;name=C,age=45,sport=Curling", &modelData)
         << modelData
-        << (QList<QmlXmlListRange>() << qMakePair(1, 2))
-        << QList<QmlXmlListRange>();
+        << (QList<QDeclarativeXmlListRange>() << qMakePair(1, 2))
+        << QList<QDeclarativeXmlListRange>();
 
     QTest::newRow("insert in different spots")
         << makeItemXmlAndData("name=B,age=35,sport=Athletics") << 1
         << makeItemXmlAndData("name=A,age=25,sport=Football;name=B,age=35,sport=Athletics;name=C,age=45,sport=Curling;name=D,age=55,sport=Golf", &modelData)
         << modelData
-        << (QList<QmlXmlListRange>() << qMakePair(0, 1) << qMakePair(2,2))
-        << QList<QmlXmlListRange>();
+        << (QList<QDeclarativeXmlListRange>() << qMakePair(0, 1) << qMakePair(2,2))
+        << QList<QDeclarativeXmlListRange>();
 
     QTest::newRow("insert in middle")
         << makeItemXmlAndData("name=A,age=25,sport=Football;name=D,age=55,sport=Golf") << 2
         << makeItemXmlAndData("name=A,age=25,sport=Football;name=B,age=35,sport=Athletics;name=C,age=45,sport=Curling;name=D,age=55,sport=Golf", &modelData)
         << modelData
-        << (QList<QmlXmlListRange>() << qMakePair(1, 2))
-        << QList<QmlXmlListRange>();
+        << (QList<QDeclarativeXmlListRange>() << qMakePair(1, 2))
+        << QList<QDeclarativeXmlListRange>();
 
     QTest::newRow("remove first")
         << makeItemXmlAndData("name=A,age=25,sport=Football;name=B,age=35,sport=Athletics") << 2
         << makeItemXmlAndData("name=B,age=35,sport=Athletics", &modelData)
         << modelData
-        << QList<QmlXmlListRange>()
-        << (QList<QmlXmlListRange>() << qMakePair(0, 1));
+        << QList<QDeclarativeXmlListRange>()
+        << (QList<QDeclarativeXmlListRange>() << qMakePair(0, 1));
 
     QTest::newRow("remove last")
         << makeItemXmlAndData("name=A,age=25,sport=Football;name=B,age=35,sport=Athletics") << 2
         << makeItemXmlAndData("name=A,age=25,sport=Football", &modelData)
         << modelData
-        << QList<QmlXmlListRange>()
-        << (QList<QmlXmlListRange>() << qMakePair(1, 1));
+        << QList<QDeclarativeXmlListRange>()
+        << (QList<QDeclarativeXmlListRange>() << qMakePair(1, 1));
 
     QTest::newRow("remove from multiple spots")
         << makeItemXmlAndData("name=A,age=25,sport=Football;name=B,age=35,sport=Athletics;name=C,age=45,sport=Curling;name=D,age=55,sport=Golf;name=E,age=65,sport=Fencing") << 5
         << makeItemXmlAndData("name=A,age=25,sport=Football;name=C,age=45,sport=Curling", &modelData)
         << modelData
-        << QList<QmlXmlListRange>()
-        << (QList<QmlXmlListRange>() << qMakePair(1, 1) << qMakePair(3,2));
+        << QList<QDeclarativeXmlListRange>()
+        << (QList<QDeclarativeXmlListRange>() << qMakePair(1, 1) << qMakePair(3,2));
 
     QTest::newRow("remove all")
         << makeItemXmlAndData("name=A,age=25,sport=Football;name=B,age=35,sport=Athletics;name=C,age=45,sport=Curling") << 3
         << makeItemXmlAndData("", &modelData)
         << modelData
-        << QList<QmlXmlListRange>()
-        << (QList<QmlXmlListRange>() << qMakePair(0, 3));
+        << QList<QDeclarativeXmlListRange>()
+        << (QList<QDeclarativeXmlListRange>() << qMakePair(0, 3));
 
     QTest::newRow("replace item")
         << makeItemXmlAndData("name=A,age=25,sport=Football") << 1
         << makeItemXmlAndData("name=ZZZ,age=25,sport=Football", &modelData)
         << modelData
-        << (QList<QmlXmlListRange>() << qMakePair(0, 1))
-        << (QList<QmlXmlListRange>() << qMakePair(0, 1));
+        << (QList<QDeclarativeXmlListRange>() << qMakePair(0, 1))
+        << (QList<QDeclarativeXmlListRange>() << qMakePair(0, 1));
 
     QTest::newRow("add and remove simultaneously")
         << makeItemXmlAndData("name=A,age=25,sport=Football;name=B,age=35,sport=Athletics;name=C,age=45,sport=Curling;name=D,age=55,sport=Golf") << 4
         << makeItemXmlAndData("name=B,age=35,sport=Athletics;name=E,age=65,sport=Fencing", &modelData)
         << modelData
-        << (QList<QmlXmlListRange>() << qMakePair(1, 1))
-        << (QList<QmlXmlListRange>() << qMakePair(0, 1) << qMakePair(2,2));
+        << (QList<QDeclarativeXmlListRange>() << qMakePair(1, 1))
+        << (QList<QDeclarativeXmlListRange>() << qMakePair(0, 1) << qMakePair(2,2));
 }
 
 void tst_qmlxmllistmodel::noKeysValueChanges()
@@ -382,8 +382,8 @@ void tst_qmlxmllistmodel::noKeysValueChanges()
     // If a 'sport' value is changed, the model should not be reloaded,
     // since 'sport' is not marked as a key.
 
-    QmlComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/roleKeys.qml"));
-    QmlXmlListModel *model = qobject_cast<QmlXmlListModel*>(component.create());
+    QDeclarativeComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/roleKeys.qml"));
+    QDeclarativeXmlListModel *model = qobject_cast<QDeclarativeXmlListModel*>(component.create());
     QVERIFY(model != 0);
     
     QString xml;
@@ -420,8 +420,8 @@ void tst_qmlxmllistmodel::keysChanged()
     // delete all its data and build a clean model (i.e. same behaviour as
     // if no keys are set).
 
-    QmlComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/roleKeys.qml"));
-    QmlXmlListModel *model = qobject_cast<QmlXmlListModel*>(component.create());
+    QDeclarativeComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/roleKeys.qml"));
+    QDeclarativeXmlListModel *model = qobject_cast<QDeclarativeXmlListModel*>(component.create());
     QVERIFY(model != 0);
 
     QString xml = makeItemXmlAndData("name=A,age=25,sport=Football;name=B,age=35,sport=Athletics");
@@ -450,7 +450,7 @@ void tst_qmlxmllistmodel::keysChanged()
 
 QTEST_MAIN(tst_qmlxmllistmodel)
 
-#include "tst_qmlxmllistmodel.moc"
+#include "tst_qdeclarativexmllistmodel.moc"
 
 #else
 QTEST_NOOP_MAIN
diff --git a/tests/auto/declarative/qmlerror/qmlerror.pro b/tests/auto/declarative/qmlerror/qmlerror.pro
deleted file mode 100644
index fa9b79e..0000000
--- a/tests/auto/declarative/qmlerror/qmlerror.pro
+++ /dev/null
@@ -1,6 +0,0 @@
-load(qttest_p4)
-contains(QT_CONFIG,declarative): QT += declarative
-SOURCES += tst_qmlerror.cpp
-macx:CONFIG -= app_bundle
-
-DEFINES += SRCDIR=\\\"$$PWD\\\"
diff --git a/tests/auto/declarative/qmlgraphicsanchors/qmlgraphicsanchors.pro b/tests/auto/declarative/qmlgraphicsanchors/qmlgraphicsanchors.pro
deleted file mode 100644
index 755de3f..0000000
--- a/tests/auto/declarative/qmlgraphicsanchors/qmlgraphicsanchors.pro
+++ /dev/null
@@ -1,6 +0,0 @@
-load(qttest_p4)
-contains(QT_CONFIG,declarative): QT += declarative
-SOURCES += tst_qmlgraphicsanchors.cpp
-macx:CONFIG -= app_bundle
-
-DEFINES += SRCDIR=\\\"$$PWD\\\"
diff --git a/tests/auto/declarative/qmlgraphicsflickable/qmlgraphicsflickable.pro b/tests/auto/declarative/qmlgraphicsflickable/qmlgraphicsflickable.pro
deleted file mode 100644
index 7c4c959..0000000
--- a/tests/auto/declarative/qmlgraphicsflickable/qmlgraphicsflickable.pro
+++ /dev/null
@@ -1,8 +0,0 @@
-load(qttest_p4)
-contains(QT_CONFIG,declarative): QT += declarative gui
-macx:CONFIG -= app_bundle
-
-SOURCES += tst_qmlgraphicsflickable.cpp
-
-# Define SRCDIR equal to test's source directory
-DEFINES += SRCDIR=\\\"$$PWD\\\"
diff --git a/tests/auto/declarative/qmlgraphicsflipable/qmlgraphicsflipable.pro b/tests/auto/declarative/qmlgraphicsflipable/qmlgraphicsflipable.pro
deleted file mode 100644
index b046086..0000000
--- a/tests/auto/declarative/qmlgraphicsflipable/qmlgraphicsflipable.pro
+++ /dev/null
@@ -1,8 +0,0 @@
-load(qttest_p4)
-contains(QT_CONFIG,declarative): QT += declarative gui
-macx:CONFIG -= app_bundle
-
-SOURCES += tst_qmlgraphicsflipable.cpp
-
-# Define SRCDIR equal to test's source directory
-DEFINES += SRCDIR=\\\"$$PWD\\\"
diff --git a/tests/auto/declarative/qmlgraphicsparticles/qmlgraphicsparticles.pro b/tests/auto/declarative/qmlgraphicsparticles/qmlgraphicsparticles.pro
deleted file mode 100644
index 94eeb4e..0000000
--- a/tests/auto/declarative/qmlgraphicsparticles/qmlgraphicsparticles.pro
+++ /dev/null
@@ -1,8 +0,0 @@
-load(qttest_p4)
-contains(QT_CONFIG,declarative): QT += declarative gui
-macx:CONFIG -= app_bundle
-
-SOURCES += tst_qmlgraphicsparticles.cpp
-
-# Define SRCDIR equal to test's source directory
-DEFINES += SRCDIR=\\\"$$PWD\\\"
diff --git a/tests/auto/declarative/qmlgraphicstextinput/qmlgraphicstextinput.pro b/tests/auto/declarative/qmlgraphicstextinput/qmlgraphicstextinput.pro
deleted file mode 100644
index fd75fec..0000000
--- a/tests/auto/declarative/qmlgraphicstextinput/qmlgraphicstextinput.pro
+++ /dev/null
@@ -1,8 +0,0 @@
-load(qttest_p4)
-contains(QT_CONFIG,declarative): QT += declarative gui
-macx:CONFIG -= app_bundle
-
-SOURCES += tst_qmlgraphicstextinput.cpp
-
-# Define SRCDIR equal to test's source directory
-DEFINES += SRCDIR=\\\"$$PWD\\\"
diff --git a/tests/auto/declarative/qmlmetatype/qmlmetatype.pro b/tests/auto/declarative/qmlmetatype/qmlmetatype.pro
deleted file mode 100644
index 3a9a400..0000000
--- a/tests/auto/declarative/qmlmetatype/qmlmetatype.pro
+++ /dev/null
@@ -1,6 +0,0 @@
-load(qttest_p4)
-contains(QT_CONFIG,declarative): QT += declarative
-SOURCES += tst_qmlmetatype.cpp
-macx:CONFIG -= app_bundle
-
-DEFINES += SRCDIR=\\\"$$PWD\\\"
diff --git a/tests/auto/declarative/qmlmoduleplugin/qmlmoduleplugin.pro b/tests/auto/declarative/qmlmoduleplugin/qmlmoduleplugin.pro
deleted file mode 100644
index c60743d..0000000
--- a/tests/auto/declarative/qmlmoduleplugin/qmlmoduleplugin.pro
+++ /dev/null
@@ -1,7 +0,0 @@
-QT = core
-TEMPLATE = subdirs
-SUBDIRS = plugin
-tst_qmlmoduleplugin_pro.depends += plugin
-SUBDIRS += tst_qmlmoduleplugin.pro
-
-
diff --git a/tests/auto/declarative/qmlspringfollow/qmlspringfollow.pro b/tests/auto/declarative/qmlspringfollow/qmlspringfollow.pro
deleted file mode 100644
index ffaa97f..0000000
--- a/tests/auto/declarative/qmlspringfollow/qmlspringfollow.pro
+++ /dev/null
@@ -1,8 +0,0 @@
-load(qttest_p4)
-contains(QT_CONFIG,declarative): QT += declarative gui
-macx:CONFIG -= app_bundle
-
-SOURCES += tst_qmlspringfollow.cpp
-
-# Define SRCDIR equal to test's source directory
-DEFINES += SRCDIR=\\\"$$PWD\\\"
diff --git a/tests/auto/declarative/qpacketprotocol/tst_qpacketprotocol.cpp b/tests/auto/declarative/qpacketprotocol/tst_qpacketprotocol.cpp
index 45947e3..2621d65 100644
--- a/tests/auto/declarative/qpacketprotocol/tst_qpacketprotocol.cpp
+++ b/tests/auto/declarative/qpacketprotocol/tst_qpacketprotocol.cpp
@@ -117,7 +117,7 @@ void tst_QPacketProtocol::setMaximumPacketSize()
         QByteArray b;
         b.fill('a', size + 1);
         out.send() << b.constData();
-        QVERIFY(QmlDebugTest::waitForSignal(&in, SIGNAL(invalidPacket())));
+        QVERIFY(QDeclarativeDebugTest::waitForSignal(&in, SIGNAL(invalidPacket())));
     }
 }
 
@@ -149,7 +149,7 @@ void tst_QPacketProtocol::send()
         out.send(packet);
     }
 
-    QVERIFY(QmlDebugTest::waitForSignal(&in, SIGNAL(readyRead())));
+    QVERIFY(QDeclarativeDebugTest::waitForSignal(&in, SIGNAL(readyRead())));
 
     QPacket p = in.read();
     p >> ba >> num;
@@ -178,7 +178,7 @@ void tst_QPacketProtocol::packetsAvailable()
     for (int i=0; i<packetCount; i++)
         out.send() << "Hello";
 
-    QVERIFY(QmlDebugTest::waitForSignal(&in, SIGNAL(readyRead())));
+    QVERIFY(QDeclarativeDebugTest::waitForSignal(&in, SIGNAL(readyRead())));
     QCOMPARE(in.packetsAvailable(), qint64(packetCount));
 }
 
@@ -198,7 +198,7 @@ void tst_QPacketProtocol::clear()
 
     out.send() << 123;
     out.send() << 456;
-    QVERIFY(QmlDebugTest::waitForSignal(&in, SIGNAL(readyRead())));
+    QVERIFY(QDeclarativeDebugTest::waitForSignal(&in, SIGNAL(readyRead())));
 
     in.clear();
     QVERIFY(in.read().isEmpty());
@@ -213,7 +213,7 @@ void tst_QPacketProtocol::read()
 
     out.send() << 123;
     out.send() << 456;
-    QVERIFY(QmlDebugTest::waitForSignal(&in, SIGNAL(readyRead())));
+    QVERIFY(QDeclarativeDebugTest::waitForSignal(&in, SIGNAL(readyRead())));
 
     int num;
 
@@ -253,7 +253,7 @@ void tst_QPacketProtocol::tst_QPacket_clear()
     QByteArray ba;
     int num;
     QPacketProtocol in(m_serverConn);
-    QVERIFY(QmlDebugTest::waitForSignal(&in, SIGNAL(readyRead())));
+    QVERIFY(QDeclarativeDebugTest::waitForSignal(&in, SIGNAL(readyRead())));
 
     QPacket p1 = in.read();
     p1 >> ba >> num;
diff --git a/tests/auto/declarative/shared/debugutil.cpp b/tests/auto/declarative/shared/debugutil.cpp
index 864bb63..c12df4f 100644
--- a/tests/auto/declarative/shared/debugutil.cpp
+++ b/tests/auto/declarative/shared/debugutil.cpp
@@ -42,14 +42,14 @@
 #include <QEventLoop>
 #include <QTimer>
 
-#include <private/qmldebugclient_p.h>
-#include <private/qmldebugservice_p.h>
+#include <private/qdeclarativedebugclient_p.h>
+#include <private/qdeclarativedebugservice_p.h>
 
 #include "debugutil_p.h"
 
 #include <iostream>
 
-bool QmlDebugTest::waitForSignal(QObject *receiver, const char *member, int timeout) {
+bool QDeclarativeDebugTest::waitForSignal(QObject *receiver, const char *member, int timeout) {
     QEventLoop loop;
     QTimer timer;
     QObject::connect(&timer, SIGNAL(timeout()), &loop, SLOT(quit()));
@@ -60,17 +60,17 @@ bool QmlDebugTest::waitForSignal(QObject *receiver, const char *member, int time
 }
 
 
-QmlDebugTestData::QmlDebugTestData(QEventLoop *el)
+QDeclarativeDebugTestData::QDeclarativeDebugTestData(QEventLoop *el)
     : exitCode(-1), loop(el)
 {
 }
 
-QmlDebugTestData::~QmlDebugTestData()
+QDeclarativeDebugTestData::~QDeclarativeDebugTestData()
 {
     qDeleteAll(items);
 }
 
-void QmlDebugTestData::testsFinished(int code)
+void QDeclarativeDebugTestData::testsFinished(int code)
 {
     exitCode = code;
     loop->quit();
@@ -78,32 +78,32 @@ void QmlDebugTestData::testsFinished(int code)
 
 
 
-QmlDebugTestService::QmlDebugTestService(const QString &s, QObject *parent)
-    : QmlDebugService(s, parent), enabled(false)
+QDeclarativeDebugTestService::QDeclarativeDebugTestService(const QString &s, QObject *parent)
+    : QDeclarativeDebugService(s, parent), enabled(false)
 {
 }
 
-void QmlDebugTestService::messageReceived(const QByteArray &ba)
+void QDeclarativeDebugTestService::messageReceived(const QByteArray &ba)
 {
     sendMessage(ba);
 }
 
-void QmlDebugTestService::enabledChanged(bool e)
+void QDeclarativeDebugTestService::enabledChanged(bool e)
 {
     enabled = e;
     emit enabledStateChanged();
 }
 
 
-QmlDebugTestClient::QmlDebugTestClient(const QString &s, QmlDebugConnection *c)
-    : QmlDebugClient(s, c)
+QDeclarativeDebugTestClient::QDeclarativeDebugTestClient(const QString &s, QDeclarativeDebugConnection *c)
+    : QDeclarativeDebugClient(s, c)
 {
 }
 
-QByteArray QmlDebugTestClient::waitForResponse()
+QByteArray QDeclarativeDebugTestClient::waitForResponse()
 {
     lastMsg.clear();
-    QmlDebugTest::waitForSignal(this, SIGNAL(serverMessage(QByteArray)));
+    QDeclarativeDebugTest::waitForSignal(this, SIGNAL(serverMessage(QByteArray)));
     if (lastMsg.isEmpty()) {
         qWarning() << "tst_QmlDebugClient: no response from server!";
         return QByteArray();
@@ -111,14 +111,14 @@ QByteArray QmlDebugTestClient::waitForResponse()
     return lastMsg;
 }
 
-void QmlDebugTestClient::messageReceived(const QByteArray &ba)
+void QDeclarativeDebugTestClient::messageReceived(const QByteArray &ba)
 {
     lastMsg = ba;
     emit serverMessage(ba);
 }
 
 
-tst_QmlDebug_Thread::tst_QmlDebug_Thread(QmlDebugTestData *data, QmlTestFactory *factory)
+tst_QmlDebug_Thread::tst_QmlDebug_Thread(QDeclarativeDebugTestData *data, QDeclarativeTestFactory *factory)
     : m_data(data), m_factory(factory)
 {
 }
@@ -127,7 +127,7 @@ void tst_QmlDebug_Thread::run()
 {
     bool ok = false;
 
-    QmlDebugConnection conn;
+    QDeclarativeDebugConnection conn;
     conn.connectToHost("127.0.0.1", 3768);
     ok = conn.waitForConnected();
     Q_ASSERT(ok);
@@ -146,25 +146,25 @@ void tst_QmlDebug_Thread::run()
     emit testsFinished(code);
 }
 
-int QmlDebugTest::runTests(QmlTestFactory *factory, const QList<QByteArray> &qml)
+int QDeclarativeDebugTest::runTests(QDeclarativeTestFactory *factory, const QList<QByteArray> &qml)
 {
     qputenv("QML_DEBUG_SERVER_PORT", "3768");
 
     QEventLoop loop;
-    QmlDebugTestData data(&loop);
+    QDeclarativeDebugTestData data(&loop);
 
     tst_QmlDebug_Thread thread(&data, factory);
     QObject::connect(&thread, SIGNAL(testsFinished(int)), &data, SLOT(testsFinished(int)));
     
-    QmlDebugService::notifyOnServerStart(&thread, "start");
+    QDeclarativeDebugService::notifyOnServerStart(&thread, "start");
 
-    QmlEngine engine;  // blocks until client connects
+    QDeclarativeEngine engine;  // blocks until client connects
 
     foreach (const QByteArray &code, qml) {
-        QmlComponent c(&engine);
+        QDeclarativeComponent c(&engine);
         c.setData(code, QUrl::fromLocalFile(""));
         Q_ASSERT(c.isReady());  // fails if bad syntax
-        data.items << qobject_cast<QmlGraphicsItem*>(c.create());
+        data.items << qobject_cast<QDeclarativeItem*>(c.create());
     }
 
     // start the test
diff --git a/tests/auto/declarative/shared/debugutil_p.h b/tests/auto/declarative/shared/debugutil_p.h
index 6815b3c..3aaa9db 100644
--- a/tests/auto/declarative/shared/debugutil_p.h
+++ b/tests/auto/declarative/shared/debugutil_p.h
@@ -45,37 +45,37 @@
 #include <QThread>
 #include <QTest>
 
-#include <QtDeclarative/qmlengine.h>
+#include <QtDeclarative/qdeclarativeengine.h>
 
-#include <private/qmldebugclient_p.h>
-#include <private/qmldebugservice_p.h>
-#include <private/qmlgraphicsitem_p.h>
+#include <private/qdeclarativedebugclient_p.h>
+#include <private/qdeclarativedebugservice_p.h>
+#include <private/qdeclarativeitem_p.h>
 
-class QmlTestFactory;
+class QDeclarativeTestFactory;
 
-class QmlDebugTest
+class QDeclarativeDebugTest
 {
 public:
     static bool waitForSignal(QObject *receiver, const char *member, int timeout = 5000);
 
-    static int runTests(QmlTestFactory *factory, const QList<QByteArray> &qml = QList<QByteArray>());
+    static int runTests(QDeclarativeTestFactory *factory, const QList<QByteArray> &qml = QList<QByteArray>());
 };
 
-class QmlDebugTestData : public QObject
+class QDeclarativeDebugTestData : public QObject
 {
     Q_OBJECT
 public:
-    QmlDebugTestData(QEventLoop *el);
+    QDeclarativeDebugTestData(QEventLoop *el);
 
-    ~QmlDebugTestData();
+    ~QDeclarativeDebugTestData();
 
-    QmlDebugConnection *conn;
-    QmlEngine *engine;
+    QDeclarativeDebugConnection *conn;
+    QDeclarativeEngine *engine;
 
     int exitCode;
     QEventLoop *loop;
 
-    QList<QmlGraphicsItem *> items;
+    QList<QDeclarativeItem *> items;
 
 signals:
     void engineCreated();
@@ -84,24 +84,24 @@ public slots:
     void testsFinished(int code);
 
 private:
-    friend class QmlDebugTest;
+    friend class QDeclarativeDebugTest;
 };
 
 
-class QmlTestFactory
+class QDeclarativeTestFactory
 {
 public:
-    QmlTestFactory() {}
-    virtual ~QmlTestFactory() {}
+    QDeclarativeTestFactory() {}
+    virtual ~QDeclarativeTestFactory() {}
 
-    virtual QObject *createTest(QmlDebugTestData *data) = 0;
+    virtual QObject *createTest(QDeclarativeDebugTestData *data) = 0;
 };
 
-class QmlDebugTestService : public QmlDebugService
+class QDeclarativeDebugTestService : public QDeclarativeDebugService
 {
     Q_OBJECT
 public:
-    QmlDebugTestService(const QString &s, QObject *parent = 0);
+    QDeclarativeDebugTestService(const QString &s, QObject *parent = 0);
     bool enabled;
 
 signals:
@@ -113,11 +113,11 @@ protected:
     virtual void enabledChanged(bool e);
 };
 
-class QmlDebugTestClient : public QmlDebugClient
+class QDeclarativeDebugTestClient : public QDeclarativeDebugClient
 {
     Q_OBJECT
 public:
-    QmlDebugTestClient(const QString &s, QmlDebugConnection *c);
+    QDeclarativeDebugTestClient(const QString &s, QDeclarativeDebugConnection *c);
 
     QByteArray waitForResponse();
 
@@ -135,7 +135,7 @@ class tst_QmlDebug_Thread : public QThread
 {
     Q_OBJECT
 public:
-    tst_QmlDebug_Thread(QmlDebugTestData *data, QmlTestFactory *factory);
+    tst_QmlDebug_Thread(QDeclarativeDebugTestData *data, QDeclarativeTestFactory *factory);
 
     void run();
 
@@ -143,8 +143,8 @@ signals:
     void testsFinished(int);
 
 private:
-    QmlDebugTestData *m_data;
-    QmlTestFactory *m_factory;
+    QDeclarativeDebugTestData *m_data;
+    QDeclarativeTestFactory *m_factory;
 };
 
 
diff --git a/tests/auto/declarative/sql/tst_sql.cpp b/tests/auto/declarative/sql/tst_sql.cpp
index 2384101..e8a5e0c 100644
--- a/tests/auto/declarative/sql/tst_sql.cpp
+++ b/tests/auto/declarative/sql/tst_sql.cpp
@@ -40,10 +40,10 @@
 ****************************************************************************/
 #include <qtest.h>
 #include "../../../shared/util.h"
-#include <QtDeclarative/qmlengine.h>
-#include <QtDeclarative/qmlcomponent.h>
-#include <private/qmlgraphicstext_p.h>
-#include <private/qmlengine_p.h>
+#include <QtDeclarative/qdeclarativeengine.h>
+#include <QtDeclarative/qdeclarativecomponent.h>
+#include <private/qdeclarativetext_p.h>
+#include <private/qdeclarativeengine_p.h>
 #include <QtCore/qcryptographichash.h>
 #include <QtWebKit/qwebpage.h>
 #include <QtWebKit/qwebframe.h>
@@ -62,7 +62,7 @@ public:
         qApp->setApplicationName("tst_sql");
         qApp->setOrganizationName("Nokia");
         qApp->setOrganizationDomain("nokia.com");
-        engine = new QmlEngine;
+        engine = new QDeclarativeEngine;
     }
 
     ~tst_sql()
@@ -85,7 +85,7 @@ private slots:
 
 private:
     QString dbDir() const;
-    QmlEngine *engine;
+    QDeclarativeEngine *engine;
 };
 
 class QWebPageWithJavaScriptConsoleMessages : public QWebPage {
@@ -200,9 +200,9 @@ void tst_sql::testQml()
         "Text { Script { source: \""+jsfile+"\" } text: test() }";
 
     engine->setOfflineStoragePath(dbDir());
-    QmlComponent component(engine);
+    QDeclarativeComponent component(engine);
     component.setData(qml.toUtf8(), QUrl::fromLocalFile(SRCDIR "/empty.qml")); // just a file for relative local imports
-    QmlGraphicsText *text = qobject_cast<QmlGraphicsText*>(component.create());
+    QDeclarativeText *text = qobject_cast<QDeclarativeText*>(component.create());
     QVERIFY(text != 0);
     QCOMPARE(text->text(),QString("passed"));
 }
@@ -221,7 +221,7 @@ void tst_sql::testQml_cleanopen()
     // making it more like the tests are running in new processes.
     testQml();
 
-    QmlEnginePrivate::getScriptEngine(engine)->collectGarbage(); // close databases
+    QDeclarativeEnginePrivate::getScriptEngine(engine)->collectGarbage(); // close databases
     foreach (QString dbname, QSqlDatabase::connectionNames()) {
         QSqlDatabase::removeDatabase(dbname);
     }
diff --git a/tests/auto/declarative/visual/qmlgraphicsborderimage/animated-smooth.qml b/tests/auto/declarative/visual/qdeclarativeborderimage/animated-smooth.qml
index 0ceaf49..0ceaf49 100644
--- a/tests/auto/declarative/visual/qmlgraphicsborderimage/animated-smooth.qml
+++ b/tests/auto/declarative/visual/qdeclarativeborderimage/animated-smooth.qml
diff --git a/tests/auto/declarative/visual/qmlgraphicsborderimage/animated.qml b/tests/auto/declarative/visual/qdeclarativeborderimage/animated.qml
index 29c02b3..29c02b3 100644
--- a/tests/auto/declarative/visual/qmlgraphicsborderimage/animated.qml
+++ b/tests/auto/declarative/visual/qdeclarativeborderimage/animated.qml
diff --git a/tests/auto/declarative/visual/qmlgraphicsborderimage/borders.qml b/tests/auto/declarative/visual/qdeclarativeborderimage/borders.qml
index 9879416..9879416 100644
--- a/tests/auto/declarative/visual/qmlgraphicsborderimage/borders.qml
+++ b/tests/auto/declarative/visual/qdeclarativeborderimage/borders.qml
diff --git a/tests/auto/declarative/visual/qmlgraphicsborderimage/content/MyBorderImage.qml b/tests/auto/declarative/visual/qdeclarativeborderimage/content/MyBorderImage.qml
index e268ce7..e268ce7 100644
--- a/tests/auto/declarative/visual/qmlgraphicsborderimage/content/MyBorderImage.qml
+++ b/tests/auto/declarative/visual/qdeclarativeborderimage/content/MyBorderImage.qml
diff --git a/tests/auto/declarative/visual/qmlgraphicsborderimage/content/bw.png b/tests/auto/declarative/visual/qdeclarativeborderimage/content/bw.png
index 486eaae..486eaae 100644
--- a/tests/auto/declarative/visual/qmlgraphicsborderimage/content/bw.png
+++ b/tests/auto/declarative/visual/qdeclarativeborderimage/content/bw.png
diff --git a/tests/auto/declarative/visual/qmlgraphicsborderimage/content/colors-round.sci b/tests/auto/declarative/visual/qdeclarativeborderimage/content/colors-round.sci
index 506f6f5..506f6f5 100644
--- a/tests/auto/declarative/visual/qmlgraphicsborderimage/content/colors-round.sci
+++ b/tests/auto/declarative/visual/qdeclarativeborderimage/content/colors-round.sci
diff --git a/tests/auto/declarative/visual/qmlgraphicsborderimage/content/colors-stretch.sci b/tests/auto/declarative/visual/qdeclarativeborderimage/content/colors-stretch.sci
index e4989a7..e4989a7 100644
--- a/tests/auto/declarative/visual/qmlgraphicsborderimage/content/colors-stretch.sci
+++ b/tests/auto/declarative/visual/qdeclarativeborderimage/content/colors-stretch.sci
diff --git a/tests/auto/declarative/qmlgraphicsborderimage/data/colors.png b/tests/auto/declarative/visual/qdeclarativeborderimage/content/colors.png
index dfb62f3..dfb62f3 100644
--- a/tests/auto/declarative/qmlgraphicsborderimage/data/colors.png
+++ b/tests/auto/declarative/visual/qdeclarativeborderimage/content/colors.png
diff --git a/tests/auto/declarative/visual/qmlgraphicsborderimage/data/animated-smooth.0.png b/tests/auto/declarative/visual/qdeclarativeborderimage/data/animated-smooth.0.png
index 9a6b079..9a6b079 100644
--- a/tests/auto/declarative/visual/qmlgraphicsborderimage/data/animated-smooth.0.png
+++ b/tests/auto/declarative/visual/qdeclarativeborderimage/data/animated-smooth.0.png
diff --git a/tests/auto/declarative/visual/qmlgraphicsborderimage/data/animated-smooth.1.png b/tests/auto/declarative/visual/qdeclarativeborderimage/data/animated-smooth.1.png
index 1f960e5..1f960e5 100644
--- a/tests/auto/declarative/visual/qmlgraphicsborderimage/data/animated-smooth.1.png
+++ b/tests/auto/declarative/visual/qdeclarativeborderimage/data/animated-smooth.1.png
diff --git a/tests/auto/declarative/visual/qmlgraphicsborderimage/data/animated-smooth.2.png b/tests/auto/declarative/visual/qdeclarativeborderimage/data/animated-smooth.2.png
index 85a2729..85a2729 100644
--- a/tests/auto/declarative/visual/qmlgraphicsborderimage/data/animated-smooth.2.png
+++ b/tests/auto/declarative/visual/qdeclarativeborderimage/data/animated-smooth.2.png
diff --git a/tests/auto/declarative/visual/qmlgraphicsborderimage/data/animated-smooth.3.png b/tests/auto/declarative/visual/qdeclarativeborderimage/data/animated-smooth.3.png
index de6ff7c..de6ff7c 100644
--- a/tests/auto/declarative/visual/qmlgraphicsborderimage/data/animated-smooth.3.png
+++ b/tests/auto/declarative/visual/qdeclarativeborderimage/data/animated-smooth.3.png
diff --git a/tests/auto/declarative/visual/qmlgraphicsborderimage/data/animated-smooth.4.png b/tests/auto/declarative/visual/qdeclarativeborderimage/data/animated-smooth.4.png
index fe7d3dd..fe7d3dd 100644
--- a/tests/auto/declarative/visual/qmlgraphicsborderimage/data/animated-smooth.4.png
+++ b/tests/auto/declarative/visual/qdeclarativeborderimage/data/animated-smooth.4.png
diff --git a/tests/auto/declarative/visual/qmlgraphicsborderimage/data/animated-smooth.5.png b/tests/auto/declarative/visual/qdeclarativeborderimage/data/animated-smooth.5.png
index e73bef5..e73bef5 100644
--- a/tests/auto/declarative/visual/qmlgraphicsborderimage/data/animated-smooth.5.png
+++ b/tests/auto/declarative/visual/qdeclarativeborderimage/data/animated-smooth.5.png
diff --git a/tests/auto/declarative/visual/qmlgraphicsborderimage/data/animated-smooth.6.png b/tests/auto/declarative/visual/qdeclarativeborderimage/data/animated-smooth.6.png
index 0c75422..0c75422 100644
--- a/tests/auto/declarative/visual/qmlgraphicsborderimage/data/animated-smooth.6.png
+++ b/tests/auto/declarative/visual/qdeclarativeborderimage/data/animated-smooth.6.png
diff --git a/tests/auto/declarative/visual/qmlgraphicsborderimage/data/animated-smooth.qml b/tests/auto/declarative/visual/qdeclarativeborderimage/data/animated-smooth.qml
index 043f5e2..043f5e2 100644
--- a/tests/auto/declarative/visual/qmlgraphicsborderimage/data/animated-smooth.qml
+++ b/tests/auto/declarative/visual/qdeclarativeborderimage/data/animated-smooth.qml
diff --git a/tests/auto/declarative/visual/qmlgraphicsborderimage/data/animated.0.png b/tests/auto/declarative/visual/qdeclarativeborderimage/data/animated.0.png
index 99228f9..99228f9 100644
--- a/tests/auto/declarative/visual/qmlgraphicsborderimage/data/animated.0.png
+++ b/tests/auto/declarative/visual/qdeclarativeborderimage/data/animated.0.png
diff --git a/tests/auto/declarative/visual/qmlgraphicsborderimage/data/animated.1.png b/tests/auto/declarative/visual/qdeclarativeborderimage/data/animated.1.png
index a2dcd00..a2dcd00 100644
--- a/tests/auto/declarative/visual/qmlgraphicsborderimage/data/animated.1.png
+++ b/tests/auto/declarative/visual/qdeclarativeborderimage/data/animated.1.png
diff --git a/tests/auto/declarative/visual/qmlgraphicsborderimage/data/animated.2.png b/tests/auto/declarative/visual/qdeclarativeborderimage/data/animated.2.png
index 8a80020..8a80020 100644
--- a/tests/auto/declarative/visual/qmlgraphicsborderimage/data/animated.2.png
+++ b/tests/auto/declarative/visual/qdeclarativeborderimage/data/animated.2.png
diff --git a/tests/auto/declarative/visual/qmlgraphicsborderimage/data/animated.3.png b/tests/auto/declarative/visual/qdeclarativeborderimage/data/animated.3.png
index 02b57ef..02b57ef 100644
--- a/tests/auto/declarative/visual/qmlgraphicsborderimage/data/animated.3.png
+++ b/tests/auto/declarative/visual/qdeclarativeborderimage/data/animated.3.png
diff --git a/tests/auto/declarative/visual/qmlgraphicsborderimage/data/animated.4.png b/tests/auto/declarative/visual/qdeclarativeborderimage/data/animated.4.png
index df0f6cc..df0f6cc 100644
--- a/tests/auto/declarative/visual/qmlgraphicsborderimage/data/animated.4.png
+++ b/tests/auto/declarative/visual/qdeclarativeborderimage/data/animated.4.png
diff --git a/tests/auto/declarative/visual/qmlgraphicsborderimage/data/animated.5.png b/tests/auto/declarative/visual/qdeclarativeborderimage/data/animated.5.png
index 0add64d..0add64d 100644
--- a/tests/auto/declarative/visual/qmlgraphicsborderimage/data/animated.5.png
+++ b/tests/auto/declarative/visual/qdeclarativeborderimage/data/animated.5.png
diff --git a/tests/auto/declarative/visual/qmlgraphicsborderimage/data/animated.6.png b/tests/auto/declarative/visual/qdeclarativeborderimage/data/animated.6.png
index 0886207..0886207 100644
--- a/tests/auto/declarative/visual/qmlgraphicsborderimage/data/animated.6.png
+++ b/tests/auto/declarative/visual/qdeclarativeborderimage/data/animated.6.png
diff --git a/tests/auto/declarative/visual/qmlgraphicsborderimage/data/animated.7.png b/tests/auto/declarative/visual/qdeclarativeborderimage/data/animated.7.png
index bc1a7b0..bc1a7b0 100644
--- a/tests/auto/declarative/visual/qmlgraphicsborderimage/data/animated.7.png
+++ b/tests/auto/declarative/visual/qdeclarativeborderimage/data/animated.7.png
diff --git a/tests/auto/declarative/visual/qmlgraphicsborderimage/data/animated.qml b/tests/auto/declarative/visual/qdeclarativeborderimage/data/animated.qml
index 29e591a..29e591a 100644
--- a/tests/auto/declarative/visual/qmlgraphicsborderimage/data/animated.qml
+++ b/tests/auto/declarative/visual/qdeclarativeborderimage/data/animated.qml
diff --git a/tests/auto/declarative/visual/qmlgraphicsborderimage/data/borders.0.png b/tests/auto/declarative/visual/qdeclarativeborderimage/data/borders.0.png
index 80cbd26..80cbd26 100644
--- a/tests/auto/declarative/visual/qmlgraphicsborderimage/data/borders.0.png
+++ b/tests/auto/declarative/visual/qdeclarativeborderimage/data/borders.0.png
diff --git a/tests/auto/declarative/visual/qmlgraphicsborderimage/data/borders.1.png b/tests/auto/declarative/visual/qdeclarativeborderimage/data/borders.1.png
index 80cbd26..80cbd26 100644
--- a/tests/auto/declarative/visual/qmlgraphicsborderimage/data/borders.1.png
+++ b/tests/auto/declarative/visual/qdeclarativeborderimage/data/borders.1.png
diff --git a/tests/auto/declarative/visual/qmlgraphicsborderimage/data/borders.2.png b/tests/auto/declarative/visual/qdeclarativeborderimage/data/borders.2.png
index 80cbd26..80cbd26 100644
--- a/tests/auto/declarative/visual/qmlgraphicsborderimage/data/borders.2.png
+++ b/tests/auto/declarative/visual/qdeclarativeborderimage/data/borders.2.png
diff --git a/tests/auto/declarative/visual/qmlgraphicsborderimage/data/borders.3.png b/tests/auto/declarative/visual/qdeclarativeborderimage/data/borders.3.png
index 80cbd26..80cbd26 100644
--- a/tests/auto/declarative/visual/qmlgraphicsborderimage/data/borders.3.png
+++ b/tests/auto/declarative/visual/qdeclarativeborderimage/data/borders.3.png
diff --git a/tests/auto/declarative/visual/qmlgraphicsborderimage/data/borders.4.png b/tests/auto/declarative/visual/qdeclarativeborderimage/data/borders.4.png
index 80cbd26..80cbd26 100644
--- a/tests/auto/declarative/visual/qmlgraphicsborderimage/data/borders.4.png
+++ b/tests/auto/declarative/visual/qdeclarativeborderimage/data/borders.4.png
diff --git a/tests/auto/declarative/visual/qmlgraphicsborderimage/data/borders.qml b/tests/auto/declarative/visual/qdeclarativeborderimage/data/borders.qml
index 16cd5e9..16cd5e9 100644
--- a/tests/auto/declarative/visual/qmlgraphicsborderimage/data/borders.qml
+++ b/tests/auto/declarative/visual/qdeclarativeborderimage/data/borders.qml
diff --git a/tests/auto/declarative/visual/qmleasefollow/data/easefollow.0.png b/tests/auto/declarative/visual/qdeclarativeeasefollow/data/easefollow.0.png
index 21b6afb..21b6afb 100644
--- a/tests/auto/declarative/visual/qmleasefollow/data/easefollow.0.png
+++ b/tests/auto/declarative/visual/qdeclarativeeasefollow/data/easefollow.0.png
diff --git a/tests/auto/declarative/visual/qmleasefollow/data/easefollow.1.png b/tests/auto/declarative/visual/qdeclarativeeasefollow/data/easefollow.1.png
index bb8a02b..bb8a02b 100644
--- a/tests/auto/declarative/visual/qmleasefollow/data/easefollow.1.png
+++ b/tests/auto/declarative/visual/qdeclarativeeasefollow/data/easefollow.1.png
diff --git a/tests/auto/declarative/visual/qmleasefollow/data/easefollow.2.png b/tests/auto/declarative/visual/qdeclarativeeasefollow/data/easefollow.2.png
index da60237..da60237 100644
--- a/tests/auto/declarative/visual/qmleasefollow/data/easefollow.2.png
+++ b/tests/auto/declarative/visual/qdeclarativeeasefollow/data/easefollow.2.png
diff --git a/tests/auto/declarative/visual/qmleasefollow/data/easefollow.3.png b/tests/auto/declarative/visual/qdeclarativeeasefollow/data/easefollow.3.png
index 3e943e8..3e943e8 100644
--- a/tests/auto/declarative/visual/qmleasefollow/data/easefollow.3.png
+++ b/tests/auto/declarative/visual/qdeclarativeeasefollow/data/easefollow.3.png
diff --git a/tests/auto/declarative/visual/qmleasefollow/data/easefollow.4.png b/tests/auto/declarative/visual/qdeclarativeeasefollow/data/easefollow.4.png
index 4fbaf26..4fbaf26 100644
--- a/tests/auto/declarative/visual/qmleasefollow/data/easefollow.4.png
+++ b/tests/auto/declarative/visual/qdeclarativeeasefollow/data/easefollow.4.png
diff --git a/tests/auto/declarative/visual/qmleasefollow/data/easefollow.5.png b/tests/auto/declarative/visual/qdeclarativeeasefollow/data/easefollow.5.png
index c10d196..c10d196 100644
--- a/tests/auto/declarative/visual/qmleasefollow/data/easefollow.5.png
+++ b/tests/auto/declarative/visual/qdeclarativeeasefollow/data/easefollow.5.png
diff --git a/tests/auto/declarative/visual/qmleasefollow/data/easefollow.6.png b/tests/auto/declarative/visual/qdeclarativeeasefollow/data/easefollow.6.png
index a672c06..a672c06 100644
--- a/tests/auto/declarative/visual/qmleasefollow/data/easefollow.6.png
+++ b/tests/auto/declarative/visual/qdeclarativeeasefollow/data/easefollow.6.png
diff --git a/tests/auto/declarative/visual/qmleasefollow/data/easefollow.qml b/tests/auto/declarative/visual/qdeclarativeeasefollow/data/easefollow.qml
index 029a2fc..029a2fc 100644
--- a/tests/auto/declarative/visual/qmleasefollow/data/easefollow.qml
+++ b/tests/auto/declarative/visual/qdeclarativeeasefollow/data/easefollow.qml
diff --git a/tests/auto/declarative/visual/qmleasefollow/easefollow.qml b/tests/auto/declarative/visual/qdeclarativeeasefollow/easefollow.qml
index bd3270f..bd3270f 100644
--- a/tests/auto/declarative/visual/qmleasefollow/easefollow.qml
+++ b/tests/auto/declarative/visual/qdeclarativeeasefollow/easefollow.qml
diff --git a/tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-horizontal.0.png b/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-horizontal.0.png
index 016902b..016902b 100644
--- a/tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-horizontal.0.png
+++ b/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-horizontal.0.png
diff --git a/tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-horizontal.1.png b/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-horizontal.1.png
index a654936..a654936 100644
--- a/tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-horizontal.1.png
+++ b/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-horizontal.1.png
diff --git a/tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-horizontal.2.png b/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-horizontal.2.png
index cfd5517..cfd5517 100644
--- a/tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-horizontal.2.png
+++ b/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-horizontal.2.png
diff --git a/tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-horizontal.3.png b/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-horizontal.3.png
index 016902b..016902b 100644
--- a/tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-horizontal.3.png
+++ b/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-horizontal.3.png
diff --git a/tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-horizontal.qml b/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-horizontal.qml
index 46086f9..46086f9 100644
--- a/tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-horizontal.qml
+++ b/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-horizontal.qml
diff --git a/tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-vertical.0.png b/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.0.png
index 18fef53..18fef53 100644
--- a/tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-vertical.0.png
+++ b/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.0.png
diff --git a/tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-vertical.1.png b/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.1.png
index 18fef53..18fef53 100644
--- a/tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-vertical.1.png
+++ b/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.1.png
diff --git a/tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-vertical.10.png b/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.10.png
index b352c68..b352c68 100644
--- a/tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-vertical.10.png
+++ b/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.10.png
diff --git a/tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-vertical.11.png b/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.11.png
index ce7ee68..ce7ee68 100644
--- a/tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-vertical.11.png
+++ b/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.11.png
diff --git a/tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-vertical.12.png b/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.12.png
index d8cdacf..d8cdacf 100644
--- a/tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-vertical.12.png
+++ b/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.12.png
diff --git a/tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-vertical.13.png b/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.13.png
index 0c2fa7b..0c2fa7b 100644
--- a/tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-vertical.13.png
+++ b/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.13.png
diff --git a/tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-vertical.14.png b/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.14.png
index e9b3028..e9b3028 100644
--- a/tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-vertical.14.png
+++ b/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.14.png
diff --git a/tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-vertical.15.png b/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.15.png
index 2186a8b..2186a8b 100644
--- a/tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-vertical.15.png
+++ b/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.15.png
diff --git a/tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-vertical.16.png b/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.16.png
index b4590af..b4590af 100644
--- a/tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-vertical.16.png
+++ b/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.16.png
diff --git a/tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-vertical.17.png b/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.17.png
index fe29f19..fe29f19 100644
--- a/tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-vertical.17.png
+++ b/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.17.png
diff --git a/tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-vertical.18.png b/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.18.png
index fe29f19..fe29f19 100644
--- a/tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-vertical.18.png
+++ b/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.18.png
diff --git a/tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-vertical.19.png b/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.19.png
index 4f8587f..4f8587f 100644
--- a/tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-vertical.19.png
+++ b/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.19.png
diff --git a/tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-vertical.2.png b/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.2.png
index 0a7cc03..0a7cc03 100644
--- a/tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-vertical.2.png
+++ b/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.2.png
diff --git a/tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-vertical.20.png b/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.20.png
index 4f8587f..4f8587f 100644
--- a/tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-vertical.20.png
+++ b/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.20.png
diff --git a/tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-vertical.21.png b/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.21.png
index c0b0bdf..c0b0bdf 100644
--- a/tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-vertical.21.png
+++ b/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.21.png
diff --git a/tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-vertical.22.png b/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.22.png
index 4168c3b..4168c3b 100644
--- a/tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-vertical.22.png
+++ b/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.22.png
diff --git a/tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-vertical.23.png b/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.23.png
index 18fef53..18fef53 100644
--- a/tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-vertical.23.png
+++ b/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.23.png
diff --git a/tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-vertical.24.png b/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.24.png
index e69de29..e69de29 100644
--- a/tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-vertical.24.png
+++ b/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.24.png
diff --git a/tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-vertical.3.png b/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.3.png
index fc6669d..fc6669d 100644
--- a/tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-vertical.3.png
+++ b/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.3.png
diff --git a/tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-vertical.4.png b/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.4.png
index c0b0bdf..c0b0bdf 100644
--- a/tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-vertical.4.png
+++ b/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.4.png
diff --git a/tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-vertical.5.png b/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.5.png
index 2ffa96e..2ffa96e 100644
--- a/tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-vertical.5.png
+++ b/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.5.png
diff --git a/tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-vertical.6.png b/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.6.png
index f550b89..f550b89 100644
--- a/tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-vertical.6.png
+++ b/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.6.png
diff --git a/tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-vertical.7.png b/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.7.png
index f550b89..f550b89 100644
--- a/tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-vertical.7.png
+++ b/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.7.png
diff --git a/tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-vertical.8.png b/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.8.png
index f550b89..f550b89 100644
--- a/tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-vertical.8.png
+++ b/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.8.png
diff --git a/tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-vertical.9.png b/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.9.png
index f550b89..f550b89 100644
--- a/tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-vertical.9.png
+++ b/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.9.png
diff --git a/tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-vertical.qml b/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.qml
index db70298..db70298 100644
--- a/tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-vertical.qml
+++ b/tests/auto/declarative/visual/qdeclarativeflickable/data/flickable-vertical.qml
diff --git a/tests/auto/declarative/visual/qmlgraphicsflickable/flickable-horizontal.qml b/tests/auto/declarative/visual/qdeclarativeflickable/flickable-horizontal.qml
index 1a7366d..1a7366d 100644
--- a/tests/auto/declarative/visual/qmlgraphicsflickable/flickable-horizontal.qml
+++ b/tests/auto/declarative/visual/qdeclarativeflickable/flickable-horizontal.qml
diff --git a/tests/auto/declarative/visual/qmlgraphicsflickable/flickable-vertical.qml b/tests/auto/declarative/visual/qdeclarativeflickable/flickable-vertical.qml
index 6204aa9..6204aa9 100644
--- a/tests/auto/declarative/visual/qmlgraphicsflickable/flickable-vertical.qml
+++ b/tests/auto/declarative/visual/qdeclarativeflickable/flickable-vertical.qml
diff --git a/tests/auto/declarative/visual/qmlgraphicsflipable/data/test-flipable.0.png b/tests/auto/declarative/visual/qdeclarativeflipable/data/test-flipable.0.png
index 53a8b42..53a8b42 100644
--- a/tests/auto/declarative/visual/qmlgraphicsflipable/data/test-flipable.0.png
+++ b/tests/auto/declarative/visual/qdeclarativeflipable/data/test-flipable.0.png
diff --git a/tests/auto/declarative/visual/qmlgraphicsflipable/data/test-flipable.1.png b/tests/auto/declarative/visual/qdeclarativeflipable/data/test-flipable.1.png
index b7efe8c..b7efe8c 100644
--- a/tests/auto/declarative/visual/qmlgraphicsflipable/data/test-flipable.1.png
+++ b/tests/auto/declarative/visual/qdeclarativeflipable/data/test-flipable.1.png
diff --git a/tests/auto/declarative/visual/qmlgraphicsflipable/data/test-flipable.2.png b/tests/auto/declarative/visual/qdeclarativeflipable/data/test-flipable.2.png
index aa6d147..aa6d147 100644
--- a/tests/auto/declarative/visual/qmlgraphicsflipable/data/test-flipable.2.png
+++ b/tests/auto/declarative/visual/qdeclarativeflipable/data/test-flipable.2.png
diff --git a/tests/auto/declarative/visual/qmlgraphicsflipable/data/test-flipable.3.png b/tests/auto/declarative/visual/qdeclarativeflipable/data/test-flipable.3.png
index 9d39713..9d39713 100644
--- a/tests/auto/declarative/visual/qmlgraphicsflipable/data/test-flipable.3.png
+++ b/tests/auto/declarative/visual/qdeclarativeflipable/data/test-flipable.3.png
diff --git a/tests/auto/declarative/visual/qmlgraphicsflipable/data/test-flipable.4.png b/tests/auto/declarative/visual/qdeclarativeflipable/data/test-flipable.4.png
index 98e8817..98e8817 100644
--- a/tests/auto/declarative/visual/qmlgraphicsflipable/data/test-flipable.4.png
+++ b/tests/auto/declarative/visual/qdeclarativeflipable/data/test-flipable.4.png
diff --git a/tests/auto/declarative/visual/qmlgraphicsflipable/data/test-flipable.5.png b/tests/auto/declarative/visual/qdeclarativeflipable/data/test-flipable.5.png
index a3f9d8f..a3f9d8f 100644
--- a/tests/auto/declarative/visual/qmlgraphicsflipable/data/test-flipable.5.png
+++ b/tests/auto/declarative/visual/qdeclarativeflipable/data/test-flipable.5.png
diff --git a/tests/auto/declarative/visual/qmlgraphicsflipable/data/test-flipable.qml b/tests/auto/declarative/visual/qdeclarativeflipable/data/test-flipable.qml
index 520d9a2..520d9a2 100644
--- a/tests/auto/declarative/visual/qmlgraphicsflipable/data/test-flipable.qml
+++ b/tests/auto/declarative/visual/qdeclarativeflipable/data/test-flipable.qml
diff --git a/tests/auto/declarative/visual/qmlgraphicsflipable/test-flipable.qml b/tests/auto/declarative/visual/qdeclarativeflipable/test-flipable.qml
index a27aa6e..a27aa6e 100644
--- a/tests/auto/declarative/visual/qmlgraphicsflipable/test-flipable.qml
+++ b/tests/auto/declarative/visual/qdeclarativeflipable/test-flipable.qml
diff --git a/tests/auto/declarative/visual/qmlgraphicsgridview/data/gridview.0.png b/tests/auto/declarative/visual/qdeclarativegridview/data/gridview.0.png
index 6c82777..6c82777 100644
--- a/tests/auto/declarative/visual/qmlgraphicsgridview/data/gridview.0.png
+++ b/tests/auto/declarative/visual/qdeclarativegridview/data/gridview.0.png
diff --git a/tests/auto/declarative/visual/qmlgraphicsgridview/data/gridview.1.png b/tests/auto/declarative/visual/qdeclarativegridview/data/gridview.1.png
index 07b1f7c..07b1f7c 100644
--- a/tests/auto/declarative/visual/qmlgraphicsgridview/data/gridview.1.png
+++ b/tests/auto/declarative/visual/qdeclarativegridview/data/gridview.1.png
diff --git a/tests/auto/declarative/visual/qmlgraphicsgridview/data/gridview.2.png b/tests/auto/declarative/visual/qdeclarativegridview/data/gridview.2.png
index f2f08c0..f2f08c0 100644
--- a/tests/auto/declarative/visual/qmlgraphicsgridview/data/gridview.2.png
+++ b/tests/auto/declarative/visual/qdeclarativegridview/data/gridview.2.png
diff --git a/tests/auto/declarative/visual/qmlgraphicsgridview/data/gridview.3.png b/tests/auto/declarative/visual/qdeclarativegridview/data/gridview.3.png
index 08649f9..08649f9 100644
--- a/tests/auto/declarative/visual/qmlgraphicsgridview/data/gridview.3.png
+++ b/tests/auto/declarative/visual/qdeclarativegridview/data/gridview.3.png
diff --git a/tests/auto/declarative/visual/qmlgraphicsgridview/data/gridview.4.png b/tests/auto/declarative/visual/qdeclarativegridview/data/gridview.4.png
index f9c2f17..f9c2f17 100644
--- a/tests/auto/declarative/visual/qmlgraphicsgridview/data/gridview.4.png
+++ b/tests/auto/declarative/visual/qdeclarativegridview/data/gridview.4.png
diff --git a/tests/auto/declarative/visual/qmlgraphicsgridview/data/gridview.5.png b/tests/auto/declarative/visual/qdeclarativegridview/data/gridview.5.png
index 52ec0bd..52ec0bd 100644
--- a/tests/auto/declarative/visual/qmlgraphicsgridview/data/gridview.5.png
+++ b/tests/auto/declarative/visual/qdeclarativegridview/data/gridview.5.png
diff --git a/tests/auto/declarative/visual/qmlgraphicsgridview/data/gridview.6.png b/tests/auto/declarative/visual/qdeclarativegridview/data/gridview.6.png
index 3fe25be..3fe25be 100644
--- a/tests/auto/declarative/visual/qmlgraphicsgridview/data/gridview.6.png
+++ b/tests/auto/declarative/visual/qdeclarativegridview/data/gridview.6.png
diff --git a/tests/auto/declarative/visual/qmlgraphicsgridview/data/gridview.7.png b/tests/auto/declarative/visual/qdeclarativegridview/data/gridview.7.png
index 4cc12a6..4cc12a6 100644
--- a/tests/auto/declarative/visual/qmlgraphicsgridview/data/gridview.7.png
+++ b/tests/auto/declarative/visual/qdeclarativegridview/data/gridview.7.png
diff --git a/tests/auto/declarative/visual/qmlgraphicsgridview/data/gridview.8.png b/tests/auto/declarative/visual/qdeclarativegridview/data/gridview.8.png
index 2267f23..2267f23 100644
--- a/tests/auto/declarative/visual/qmlgraphicsgridview/data/gridview.8.png
+++ b/tests/auto/declarative/visual/qdeclarativegridview/data/gridview.8.png
diff --git a/tests/auto/declarative/visual/qmlgraphicsgridview/data/gridview.9.png b/tests/auto/declarative/visual/qdeclarativegridview/data/gridview.9.png
index 6c82777..6c82777 100644
--- a/tests/auto/declarative/visual/qmlgraphicsgridview/data/gridview.9.png
+++ b/tests/auto/declarative/visual/qdeclarativegridview/data/gridview.9.png
diff --git a/tests/auto/declarative/visual/qmlgraphicsgridview/data/gridview.qml b/tests/auto/declarative/visual/qdeclarativegridview/data/gridview.qml
index c7ac52d..c7ac52d 100644
--- a/tests/auto/declarative/visual/qmlgraphicsgridview/data/gridview.qml
+++ b/tests/auto/declarative/visual/qdeclarativegridview/data/gridview.qml
diff --git a/tests/auto/declarative/visual/qmlgraphicsgridview/data/gridview2.0.png b/tests/auto/declarative/visual/qdeclarativegridview/data/gridview2.0.png
index 3021d58..3021d58 100644
--- a/tests/auto/declarative/visual/qmlgraphicsgridview/data/gridview2.0.png
+++ b/tests/auto/declarative/visual/qdeclarativegridview/data/gridview2.0.png
diff --git a/tests/auto/declarative/visual/qmlgraphicsgridview/data/gridview2.1.png b/tests/auto/declarative/visual/qdeclarativegridview/data/gridview2.1.png
index baeb1a6..baeb1a6 100644
--- a/tests/auto/declarative/visual/qmlgraphicsgridview/data/gridview2.1.png
+++ b/tests/auto/declarative/visual/qdeclarativegridview/data/gridview2.1.png
diff --git a/tests/auto/declarative/visual/qmlgraphicsgridview/data/gridview2.10.png b/tests/auto/declarative/visual/qdeclarativegridview/data/gridview2.10.png
index b0486e5..b0486e5 100644
--- a/tests/auto/declarative/visual/qmlgraphicsgridview/data/gridview2.10.png
+++ b/tests/auto/declarative/visual/qdeclarativegridview/data/gridview2.10.png
diff --git a/tests/auto/declarative/visual/qmlgraphicsgridview/data/gridview2.2.png b/tests/auto/declarative/visual/qdeclarativegridview/data/gridview2.2.png
index 2d0c731..2d0c731 100644
--- a/tests/auto/declarative/visual/qmlgraphicsgridview/data/gridview2.2.png
+++ b/tests/auto/declarative/visual/qdeclarativegridview/data/gridview2.2.png
diff --git a/tests/auto/declarative/visual/qmlgraphicsgridview/data/gridview2.3.png b/tests/auto/declarative/visual/qdeclarativegridview/data/gridview2.3.png
index af9ed05..af9ed05 100644
--- a/tests/auto/declarative/visual/qmlgraphicsgridview/data/gridview2.3.png
+++ b/tests/auto/declarative/visual/qdeclarativegridview/data/gridview2.3.png
diff --git a/tests/auto/declarative/visual/qmlgraphicsgridview/data/gridview2.4.png b/tests/auto/declarative/visual/qdeclarativegridview/data/gridview2.4.png
index 0b0945d..0b0945d 100644
--- a/tests/auto/declarative/visual/qmlgraphicsgridview/data/gridview2.4.png
+++ b/tests/auto/declarative/visual/qdeclarativegridview/data/gridview2.4.png
diff --git a/tests/auto/declarative/visual/qmlgraphicsgridview/data/gridview2.5.png b/tests/auto/declarative/visual/qdeclarativegridview/data/gridview2.5.png
index 618ae0c..618ae0c 100644
--- a/tests/auto/declarative/visual/qmlgraphicsgridview/data/gridview2.5.png
+++ b/tests/auto/declarative/visual/qdeclarativegridview/data/gridview2.5.png
diff --git a/tests/auto/declarative/visual/qmlgraphicsgridview/data/gridview2.6.png b/tests/auto/declarative/visual/qdeclarativegridview/data/gridview2.6.png
index fc31262..fc31262 100644
--- a/tests/auto/declarative/visual/qmlgraphicsgridview/data/gridview2.6.png
+++ b/tests/auto/declarative/visual/qdeclarativegridview/data/gridview2.6.png
diff --git a/tests/auto/declarative/visual/qmlgraphicsgridview/data/gridview2.7.png b/tests/auto/declarative/visual/qdeclarativegridview/data/gridview2.7.png
index 22291ac..22291ac 100644
--- a/tests/auto/declarative/visual/qmlgraphicsgridview/data/gridview2.7.png
+++ b/tests/auto/declarative/visual/qdeclarativegridview/data/gridview2.7.png
diff --git a/tests/auto/declarative/visual/qmlgraphicsgridview/data/gridview2.8.png b/tests/auto/declarative/visual/qdeclarativegridview/data/gridview2.8.png
index 3021d58..3021d58 100644
--- a/tests/auto/declarative/visual/qmlgraphicsgridview/data/gridview2.8.png
+++ b/tests/auto/declarative/visual/qdeclarativegridview/data/gridview2.8.png
diff --git a/tests/auto/declarative/visual/qmlgraphicsgridview/data/gridview2.9.png b/tests/auto/declarative/visual/qdeclarativegridview/data/gridview2.9.png
index 2f2f5b9..2f2f5b9 100644
--- a/tests/auto/declarative/visual/qmlgraphicsgridview/data/gridview2.9.png
+++ b/tests/auto/declarative/visual/qdeclarativegridview/data/gridview2.9.png
diff --git a/tests/auto/declarative/visual/qmlgraphicsgridview/data/gridview2.qml b/tests/auto/declarative/visual/qdeclarativegridview/data/gridview2.qml
index fb5f1fb..fb5f1fb 100644
--- a/tests/auto/declarative/visual/qmlgraphicsgridview/data/gridview2.qml
+++ b/tests/auto/declarative/visual/qdeclarativegridview/data/gridview2.qml
diff --git a/tests/auto/declarative/visual/qmlgraphicsgridview/gridview.qml b/tests/auto/declarative/visual/qdeclarativegridview/gridview.qml
index f8782a5..f8782a5 100644
--- a/tests/auto/declarative/visual/qmlgraphicsgridview/gridview.qml
+++ b/tests/auto/declarative/visual/qdeclarativegridview/gridview.qml
diff --git a/tests/auto/declarative/visual/qmlgraphicsgridview/gridview2.qml b/tests/auto/declarative/visual/qdeclarativegridview/gridview2.qml
index 81d06cf..81d06cf 100644
--- a/tests/auto/declarative/visual/qmlgraphicsgridview/gridview2.qml
+++ b/tests/auto/declarative/visual/qdeclarativegridview/gridview2.qml
diff --git a/tests/auto/declarative/visual/qmlmouseregion/data/drag.0.png b/tests/auto/declarative/visual/qdeclarativemouseregion/data/drag.0.png
index cf36d60..cf36d60 100644
--- a/tests/auto/declarative/visual/qmlmouseregion/data/drag.0.png
+++ b/tests/auto/declarative/visual/qdeclarativemouseregion/data/drag.0.png
diff --git a/tests/auto/declarative/visual/qmlmouseregion/data/drag.1.png b/tests/auto/declarative/visual/qdeclarativemouseregion/data/drag.1.png
index 6069df8..6069df8 100644
--- a/tests/auto/declarative/visual/qmlmouseregion/data/drag.1.png
+++ b/tests/auto/declarative/visual/qdeclarativemouseregion/data/drag.1.png
diff --git a/tests/auto/declarative/visual/qmlmouseregion/data/drag.2.png b/tests/auto/declarative/visual/qdeclarativemouseregion/data/drag.2.png
index b8bd5f3..b8bd5f3 100644
--- a/tests/auto/declarative/visual/qmlmouseregion/data/drag.2.png
+++ b/tests/auto/declarative/visual/qdeclarativemouseregion/data/drag.2.png
diff --git a/tests/auto/declarative/visual/qmlmouseregion/data/drag.3.png b/tests/auto/declarative/visual/qdeclarativemouseregion/data/drag.3.png
index cf36d60..cf36d60 100644
--- a/tests/auto/declarative/visual/qmlmouseregion/data/drag.3.png
+++ b/tests/auto/declarative/visual/qdeclarativemouseregion/data/drag.3.png
diff --git a/tests/auto/declarative/visual/qmlmouseregion/data/drag.4.png b/tests/auto/declarative/visual/qdeclarativemouseregion/data/drag.4.png
index 831d6b4..831d6b4 100644
--- a/tests/auto/declarative/visual/qmlmouseregion/data/drag.4.png
+++ b/tests/auto/declarative/visual/qdeclarativemouseregion/data/drag.4.png
diff --git a/tests/auto/declarative/visual/qmlmouseregion/data/drag.5.png b/tests/auto/declarative/visual/qdeclarativemouseregion/data/drag.5.png
index f7079dc..f7079dc 100644
--- a/tests/auto/declarative/visual/qmlmouseregion/data/drag.5.png
+++ b/tests/auto/declarative/visual/qdeclarativemouseregion/data/drag.5.png
diff --git a/tests/auto/declarative/visual/qmlmouseregion/data/drag.6.png b/tests/auto/declarative/visual/qdeclarativemouseregion/data/drag.6.png
index a5f4451..a5f4451 100644
--- a/tests/auto/declarative/visual/qmlmouseregion/data/drag.6.png
+++ b/tests/auto/declarative/visual/qdeclarativemouseregion/data/drag.6.png
diff --git a/tests/auto/declarative/visual/qmlmouseregion/data/drag.7.png b/tests/auto/declarative/visual/qdeclarativemouseregion/data/drag.7.png
index e1261d0..e1261d0 100644
--- a/tests/auto/declarative/visual/qmlmouseregion/data/drag.7.png
+++ b/tests/auto/declarative/visual/qdeclarativemouseregion/data/drag.7.png
diff --git a/tests/auto/declarative/visual/qmlmouseregion/data/drag.8.png b/tests/auto/declarative/visual/qdeclarativemouseregion/data/drag.8.png
index 653905e..653905e 100644
--- a/tests/auto/declarative/visual/qmlmouseregion/data/drag.8.png
+++ b/tests/auto/declarative/visual/qdeclarativemouseregion/data/drag.8.png
diff --git a/tests/auto/declarative/visual/qmlmouseregion/data/drag.qml b/tests/auto/declarative/visual/qdeclarativemouseregion/data/drag.qml
index 5a131e9..5a131e9 100644
--- a/tests/auto/declarative/visual/qmlmouseregion/data/drag.qml
+++ b/tests/auto/declarative/visual/qdeclarativemouseregion/data/drag.qml
diff --git a/tests/auto/declarative/visual/qmlmouseregion/data/mouseregion.0.png b/tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.0.png
index c249c21..c249c21 100644
--- a/tests/auto/declarative/visual/qmlmouseregion/data/mouseregion.0.png
+++ b/tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.0.png
diff --git a/tests/auto/declarative/visual/qmlmouseregion/data/mouseregion.1.png b/tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.1.png
index a96bf1b..a96bf1b 100644
--- a/tests/auto/declarative/visual/qmlmouseregion/data/mouseregion.1.png
+++ b/tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.1.png
diff --git a/tests/auto/declarative/visual/qmlmouseregion/data/mouseregion.10.png b/tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.10.png
index 7420ca7..7420ca7 100644
--- a/tests/auto/declarative/visual/qmlmouseregion/data/mouseregion.10.png
+++ b/tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.10.png
diff --git a/tests/auto/declarative/visual/qmlmouseregion/data/mouseregion.11.png b/tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.11.png
index 7420ca7..7420ca7 100644
--- a/tests/auto/declarative/visual/qmlmouseregion/data/mouseregion.11.png
+++ b/tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.11.png
diff --git a/tests/auto/declarative/visual/qmlmouseregion/data/mouseregion.12.png b/tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.12.png
index 7420ca7..7420ca7 100644
--- a/tests/auto/declarative/visual/qmlmouseregion/data/mouseregion.12.png
+++ b/tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.12.png
diff --git a/tests/auto/declarative/visual/qmlmouseregion/data/mouseregion.13.png b/tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.13.png
index 7420ca7..7420ca7 100644
--- a/tests/auto/declarative/visual/qmlmouseregion/data/mouseregion.13.png
+++ b/tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.13.png
diff --git a/tests/auto/declarative/visual/qmlmouseregion/data/mouseregion.14.png b/tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.14.png
index 7420ca7..7420ca7 100644
--- a/tests/auto/declarative/visual/qmlmouseregion/data/mouseregion.14.png
+++ b/tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.14.png
diff --git a/tests/auto/declarative/visual/qmlmouseregion/data/mouseregion.15.png b/tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.15.png
index e797cc9..e797cc9 100644
--- a/tests/auto/declarative/visual/qmlmouseregion/data/mouseregion.15.png
+++ b/tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.15.png
diff --git a/tests/auto/declarative/visual/qmlmouseregion/data/mouseregion.16.png b/tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.16.png
index 7951309..7951309 100644
--- a/tests/auto/declarative/visual/qmlmouseregion/data/mouseregion.16.png
+++ b/tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.16.png
diff --git a/tests/auto/declarative/visual/qmlmouseregion/data/mouseregion.17.png b/tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.17.png
index 7951309..7951309 100644
--- a/tests/auto/declarative/visual/qmlmouseregion/data/mouseregion.17.png
+++ b/tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.17.png
diff --git a/tests/auto/declarative/visual/qmlmouseregion/data/mouseregion.18.png b/tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.18.png
index 7951309..7951309 100644
--- a/tests/auto/declarative/visual/qmlmouseregion/data/mouseregion.18.png
+++ b/tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.18.png
diff --git a/tests/auto/declarative/visual/qmlmouseregion/data/mouseregion.19.png b/tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.19.png
index 7951309..7951309 100644
--- a/tests/auto/declarative/visual/qmlmouseregion/data/mouseregion.19.png
+++ b/tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.19.png
diff --git a/tests/auto/declarative/visual/qmlmouseregion/data/mouseregion.2.png b/tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.2.png
index a96bf1b..a96bf1b 100644
--- a/tests/auto/declarative/visual/qmlmouseregion/data/mouseregion.2.png
+++ b/tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.2.png
diff --git a/tests/auto/declarative/visual/qmlmouseregion/data/mouseregion.20.png b/tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.20.png
index 7951309..7951309 100644
--- a/tests/auto/declarative/visual/qmlmouseregion/data/mouseregion.20.png
+++ b/tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.20.png
diff --git a/tests/auto/declarative/visual/qmlmouseregion/data/mouseregion.21.png b/tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.21.png
index 7951309..7951309 100644
--- a/tests/auto/declarative/visual/qmlmouseregion/data/mouseregion.21.png
+++ b/tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.21.png
diff --git a/tests/auto/declarative/visual/qmlmouseregion/data/mouseregion.22.png b/tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.22.png
index 7951309..7951309 100644
--- a/tests/auto/declarative/visual/qmlmouseregion/data/mouseregion.22.png
+++ b/tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.22.png
diff --git a/tests/auto/declarative/visual/qmlmouseregion/data/mouseregion.3.png b/tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.3.png
index a96bf1b..a96bf1b 100644
--- a/tests/auto/declarative/visual/qmlmouseregion/data/mouseregion.3.png
+++ b/tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.3.png
diff --git a/tests/auto/declarative/visual/qmlmouseregion/data/mouseregion.4.png b/tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.4.png
index 1fe365a..1fe365a 100644
--- a/tests/auto/declarative/visual/qmlmouseregion/data/mouseregion.4.png
+++ b/tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.4.png
diff --git a/tests/auto/declarative/visual/qmlmouseregion/data/mouseregion.5.png b/tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.5.png
index 1fe365a..1fe365a 100644
--- a/tests/auto/declarative/visual/qmlmouseregion/data/mouseregion.5.png
+++ b/tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.5.png
diff --git a/tests/auto/declarative/visual/qmlmouseregion/data/mouseregion.6.png b/tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.6.png
index 1fe365a..1fe365a 100644
--- a/tests/auto/declarative/visual/qmlmouseregion/data/mouseregion.6.png
+++ b/tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.6.png
diff --git a/tests/auto/declarative/visual/qmlmouseregion/data/mouseregion.7.png b/tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.7.png
index 1fe365a..1fe365a 100644
--- a/tests/auto/declarative/visual/qmlmouseregion/data/mouseregion.7.png
+++ b/tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.7.png
diff --git a/tests/auto/declarative/visual/qmlmouseregion/data/mouseregion.8.png b/tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.8.png
index 7420ca7..7420ca7 100644
--- a/tests/auto/declarative/visual/qmlmouseregion/data/mouseregion.8.png
+++ b/tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.8.png
diff --git a/tests/auto/declarative/visual/qmlmouseregion/data/mouseregion.9.png b/tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.9.png
index 7420ca7..7420ca7 100644
--- a/tests/auto/declarative/visual/qmlmouseregion/data/mouseregion.9.png
+++ b/tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.9.png
diff --git a/tests/auto/declarative/visual/qmlmouseregion/data/mouseregion.qml b/tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.qml
index cc374fd..cc374fd 100644
--- a/tests/auto/declarative/visual/qmlmouseregion/data/mouseregion.qml
+++ b/tests/auto/declarative/visual/qdeclarativemouseregion/data/mouseregion.qml
diff --git a/tests/auto/declarative/visual/qmlmouseregion/drag.qml b/tests/auto/declarative/visual/qdeclarativemouseregion/drag.qml
index dbb2a24..dbb2a24 100644
--- a/tests/auto/declarative/visual/qmlmouseregion/drag.qml
+++ b/tests/auto/declarative/visual/qdeclarativemouseregion/drag.qml
diff --git a/tests/auto/declarative/visual/qmlmouseregion/mouseregion.qml b/tests/auto/declarative/visual/qdeclarativemouseregion/mouseregion.qml
index 3c722d0..3c722d0 100644
--- a/tests/auto/declarative/visual/qmlmouseregion/mouseregion.qml
+++ b/tests/auto/declarative/visual/qdeclarativemouseregion/mouseregion.qml
diff --git a/tests/auto/declarative/visual/qmlgraphicsparticles/data/particles.0.png b/tests/auto/declarative/visual/qdeclarativeparticles/data/particles.0.png
index 7321d95..7321d95 100644
--- a/tests/auto/declarative/visual/qmlgraphicsparticles/data/particles.0.png
+++ b/tests/auto/declarative/visual/qdeclarativeparticles/data/particles.0.png
diff --git a/tests/auto/declarative/visual/qmlgraphicsparticles/data/particles.1.png b/tests/auto/declarative/visual/qdeclarativeparticles/data/particles.1.png
index 49d2a5a..49d2a5a 100644
--- a/tests/auto/declarative/visual/qmlgraphicsparticles/data/particles.1.png
+++ b/tests/auto/declarative/visual/qdeclarativeparticles/data/particles.1.png
diff --git a/tests/auto/declarative/visual/qmlgraphicsparticles/data/particles.2.png b/tests/auto/declarative/visual/qdeclarativeparticles/data/particles.2.png
index 6fe14b7..6fe14b7 100644
--- a/tests/auto/declarative/visual/qmlgraphicsparticles/data/particles.2.png
+++ b/tests/auto/declarative/visual/qdeclarativeparticles/data/particles.2.png
diff --git a/tests/auto/declarative/visual/qmlgraphicsparticles/data/particles.qml b/tests/auto/declarative/visual/qdeclarativeparticles/data/particles.qml
index d766dc6..d766dc6 100644
--- a/tests/auto/declarative/visual/qmlgraphicsparticles/data/particles.qml
+++ b/tests/auto/declarative/visual/qdeclarativeparticles/data/particles.qml
diff --git a/tests/auto/declarative/visual/qmlgraphicsparticles/particles.qml b/tests/auto/declarative/visual/qdeclarativeparticles/particles.qml
index 2d481c9..2d481c9 100644
--- a/tests/auto/declarative/visual/qmlgraphicsparticles/particles.qml
+++ b/tests/auto/declarative/visual/qdeclarativeparticles/particles.qml
diff --git a/tests/auto/declarative/visual/qmlgraphicsparticles/star.png b/tests/auto/declarative/visual/qdeclarativeparticles/star.png
index defbde5..defbde5 100644
--- a/tests/auto/declarative/visual/qmlgraphicsparticles/star.png
+++ b/tests/auto/declarative/visual/qdeclarativeparticles/star.png
diff --git a/tests/auto/declarative/visual/qmlgraphicspathview/data/test-pathview-2.0.png b/tests/auto/declarative/visual/qdeclarativepathview/data/test-pathview-2.0.png
index 18c8a9e..18c8a9e 100644
--- a/tests/auto/declarative/visual/qmlgraphicspathview/data/test-pathview-2.0.png
+++ b/tests/auto/declarative/visual/qdeclarativepathview/data/test-pathview-2.0.png
diff --git a/tests/auto/declarative/visual/qmlgraphicspathview/data/test-pathview-2.1.png b/tests/auto/declarative/visual/qdeclarativepathview/data/test-pathview-2.1.png
index e86acb4..e86acb4 100644
--- a/tests/auto/declarative/visual/qmlgraphicspathview/data/test-pathview-2.1.png
+++ b/tests/auto/declarative/visual/qdeclarativepathview/data/test-pathview-2.1.png
diff --git a/tests/auto/declarative/visual/qmlgraphicspathview/data/test-pathview-2.2.png b/tests/auto/declarative/visual/qdeclarativepathview/data/test-pathview-2.2.png
index 17990b7..17990b7 100644
--- a/tests/auto/declarative/visual/qmlgraphicspathview/data/test-pathview-2.2.png
+++ b/tests/auto/declarative/visual/qdeclarativepathview/data/test-pathview-2.2.png
diff --git a/tests/auto/declarative/visual/qmlgraphicspathview/data/test-pathview-2.3.png b/tests/auto/declarative/visual/qdeclarativepathview/data/test-pathview-2.3.png
index 18c8a9e..18c8a9e 100644
--- a/tests/auto/declarative/visual/qmlgraphicspathview/data/test-pathview-2.3.png
+++ b/tests/auto/declarative/visual/qdeclarativepathview/data/test-pathview-2.3.png
diff --git a/tests/auto/declarative/visual/qmlgraphicspathview/data/test-pathview-2.4.png b/tests/auto/declarative/visual/qdeclarativepathview/data/test-pathview-2.4.png
index 18c8a9e..18c8a9e 100644
--- a/tests/auto/declarative/visual/qmlgraphicspathview/data/test-pathview-2.4.png
+++ b/tests/auto/declarative/visual/qdeclarativepathview/data/test-pathview-2.4.png
diff --git a/tests/auto/declarative/visual/qmlgraphicspathview/data/test-pathview-2.5.png b/tests/auto/declarative/visual/qdeclarativepathview/data/test-pathview-2.5.png
index 8636f8f..8636f8f 100644
--- a/tests/auto/declarative/visual/qmlgraphicspathview/data/test-pathview-2.5.png
+++ b/tests/auto/declarative/visual/qdeclarativepathview/data/test-pathview-2.5.png
diff --git a/tests/auto/declarative/visual/qmlgraphicspathview/data/test-pathview-2.6.png b/tests/auto/declarative/visual/qdeclarativepathview/data/test-pathview-2.6.png
index fa7c4b6..fa7c4b6 100644
--- a/tests/auto/declarative/visual/qmlgraphicspathview/data/test-pathview-2.6.png
+++ b/tests/auto/declarative/visual/qdeclarativepathview/data/test-pathview-2.6.png
diff --git a/tests/auto/declarative/visual/qmlgraphicspathview/data/test-pathview-2.qml b/tests/auto/declarative/visual/qdeclarativepathview/data/test-pathview-2.qml
index b8ff925..b8ff925 100644
--- a/tests/auto/declarative/visual/qmlgraphicspathview/data/test-pathview-2.qml
+++ b/tests/auto/declarative/visual/qdeclarativepathview/data/test-pathview-2.qml
diff --git a/tests/auto/declarative/visual/qmlgraphicspathview/data/test-pathview.0.png b/tests/auto/declarative/visual/qdeclarativepathview/data/test-pathview.0.png
index 442ba9f..442ba9f 100644
--- a/tests/auto/declarative/visual/qmlgraphicspathview/data/test-pathview.0.png
+++ b/tests/auto/declarative/visual/qdeclarativepathview/data/test-pathview.0.png
diff --git a/tests/auto/declarative/visual/qmlgraphicspathview/data/test-pathview.1.png b/tests/auto/declarative/visual/qdeclarativepathview/data/test-pathview.1.png
index a9ff20f..a9ff20f 100644
--- a/tests/auto/declarative/visual/qmlgraphicspathview/data/test-pathview.1.png
+++ b/tests/auto/declarative/visual/qdeclarativepathview/data/test-pathview.1.png
diff --git a/tests/auto/declarative/visual/qmlgraphicspathview/data/test-pathview.2.png b/tests/auto/declarative/visual/qdeclarativepathview/data/test-pathview.2.png
index 157bb99..157bb99 100644
--- a/tests/auto/declarative/visual/qmlgraphicspathview/data/test-pathview.2.png
+++ b/tests/auto/declarative/visual/qdeclarativepathview/data/test-pathview.2.png
diff --git a/tests/auto/declarative/visual/qmlgraphicspathview/data/test-pathview.3.png b/tests/auto/declarative/visual/qdeclarativepathview/data/test-pathview.3.png
index 8c49acb..8c49acb 100644
--- a/tests/auto/declarative/visual/qmlgraphicspathview/data/test-pathview.3.png
+++ b/tests/auto/declarative/visual/qdeclarativepathview/data/test-pathview.3.png
diff --git a/tests/auto/declarative/visual/qmlgraphicspathview/data/test-pathview.4.png b/tests/auto/declarative/visual/qdeclarativepathview/data/test-pathview.4.png
index eb2bf54..eb2bf54 100644
--- a/tests/auto/declarative/visual/qmlgraphicspathview/data/test-pathview.4.png
+++ b/tests/auto/declarative/visual/qdeclarativepathview/data/test-pathview.4.png
diff --git a/tests/auto/declarative/visual/qmlgraphicspathview/data/test-pathview.qml b/tests/auto/declarative/visual/qdeclarativepathview/data/test-pathview.qml
index 8cff5c6..8cff5c6 100644
--- a/tests/auto/declarative/visual/qmlgraphicspathview/data/test-pathview.qml
+++ b/tests/auto/declarative/visual/qdeclarativepathview/data/test-pathview.qml
diff --git a/tests/auto/declarative/visual/qmlgraphicspathview/test-pathview-2.qml b/tests/auto/declarative/visual/qdeclarativepathview/test-pathview-2.qml
index c6d71d5..c6d71d5 100644
--- a/tests/auto/declarative/visual/qmlgraphicspathview/test-pathview-2.qml
+++ b/tests/auto/declarative/visual/qdeclarativepathview/test-pathview-2.qml
diff --git a/tests/auto/declarative/visual/qmlgraphicspathview/test-pathview.qml b/tests/auto/declarative/visual/qdeclarativepathview/test-pathview.qml
index 0adfa02..0adfa02 100644
--- a/tests/auto/declarative/visual/qmlgraphicspathview/test-pathview.qml
+++ b/tests/auto/declarative/visual/qdeclarativepathview/test-pathview.qml
diff --git a/tests/auto/declarative/visual/qmlgraphicspositioners/data/dynamic.0.png b/tests/auto/declarative/visual/qdeclarativepositioners/data/dynamic.0.png
index f474afe..f474afe 100644
--- a/tests/auto/declarative/visual/qmlgraphicspositioners/data/dynamic.0.png
+++ b/tests/auto/declarative/visual/qdeclarativepositioners/data/dynamic.0.png
diff --git a/tests/auto/declarative/visual/qmlgraphicspositioners/data/dynamic.1.png b/tests/auto/declarative/visual/qdeclarativepositioners/data/dynamic.1.png
index 8b7ae74..8b7ae74 100644
--- a/tests/auto/declarative/visual/qmlgraphicspositioners/data/dynamic.1.png
+++ b/tests/auto/declarative/visual/qdeclarativepositioners/data/dynamic.1.png
diff --git a/tests/auto/declarative/visual/qmlgraphicspositioners/data/dynamic.2.png b/tests/auto/declarative/visual/qdeclarativepositioners/data/dynamic.2.png
index 9088bb4..9088bb4 100644
--- a/tests/auto/declarative/visual/qmlgraphicspositioners/data/dynamic.2.png
+++ b/tests/auto/declarative/visual/qdeclarativepositioners/data/dynamic.2.png
diff --git a/tests/auto/declarative/visual/qmlgraphicspositioners/data/dynamic.3.png b/tests/auto/declarative/visual/qdeclarativepositioners/data/dynamic.3.png
index 18cd429..18cd429 100644
--- a/tests/auto/declarative/visual/qmlgraphicspositioners/data/dynamic.3.png
+++ b/tests/auto/declarative/visual/qdeclarativepositioners/data/dynamic.3.png
diff --git a/tests/auto/declarative/visual/qmlgraphicspositioners/data/dynamic.4.png b/tests/auto/declarative/visual/qdeclarativepositioners/data/dynamic.4.png
index 739afc1..739afc1 100644
--- a/tests/auto/declarative/visual/qmlgraphicspositioners/data/dynamic.4.png
+++ b/tests/auto/declarative/visual/qdeclarativepositioners/data/dynamic.4.png
diff --git a/tests/auto/declarative/visual/qmlgraphicspositioners/data/dynamic.5.png b/tests/auto/declarative/visual/qdeclarativepositioners/data/dynamic.5.png
index 93f0682..93f0682 100644
--- a/tests/auto/declarative/visual/qmlgraphicspositioners/data/dynamic.5.png
+++ b/tests/auto/declarative/visual/qdeclarativepositioners/data/dynamic.5.png
diff --git a/tests/auto/declarative/visual/qmlgraphicspositioners/data/dynamic.qml b/tests/auto/declarative/visual/qdeclarativepositioners/data/dynamic.qml
index 7091bb3..7091bb3 100644
--- a/tests/auto/declarative/visual/qmlgraphicspositioners/data/dynamic.qml
+++ b/tests/auto/declarative/visual/qdeclarativepositioners/data/dynamic.qml
diff --git a/tests/auto/declarative/visual/qmlgraphicspositioners/data/repeater.0.png b/tests/auto/declarative/visual/qdeclarativepositioners/data/repeater.0.png
index f7018fd..f7018fd 100644
--- a/tests/auto/declarative/visual/qmlgraphicspositioners/data/repeater.0.png
+++ b/tests/auto/declarative/visual/qdeclarativepositioners/data/repeater.0.png
diff --git a/tests/auto/declarative/visual/qmlgraphicspositioners/data/repeater.qml b/tests/auto/declarative/visual/qdeclarativepositioners/data/repeater.qml
index 1eb115d..1eb115d 100644
--- a/tests/auto/declarative/visual/qmlgraphicspositioners/data/repeater.qml
+++ b/tests/auto/declarative/visual/qdeclarativepositioners/data/repeater.qml
diff --git a/tests/auto/declarative/visual/qmlgraphicspositioners/dynamic.qml b/tests/auto/declarative/visual/qdeclarativepositioners/dynamic.qml
index f45e9a4..f45e9a4 100644
--- a/tests/auto/declarative/visual/qmlgraphicspositioners/dynamic.qml
+++ b/tests/auto/declarative/visual/qdeclarativepositioners/dynamic.qml
diff --git a/tests/auto/declarative/visual/qmlgraphicspositioners/repeater.qml b/tests/auto/declarative/visual/qdeclarativepositioners/repeater.qml
index ff60365..ff60365 100644
--- a/tests/auto/declarative/visual/qmlgraphicspositioners/repeater.qml
+++ b/tests/auto/declarative/visual/qdeclarativepositioners/repeater.qml
diff --git a/tests/auto/declarative/visual/qmlspringfollow/clock.qml b/tests/auto/declarative/visual/qdeclarativespringfollow/clock.qml
index 04bbabc..04bbabc 100644
--- a/tests/auto/declarative/visual/qmlspringfollow/clock.qml
+++ b/tests/auto/declarative/visual/qdeclarativespringfollow/clock.qml
diff --git a/tests/auto/declarative/visual/qmlspringfollow/content/background.png b/tests/auto/declarative/visual/qdeclarativespringfollow/content/background.png
index a885950..a885950 100644
--- a/tests/auto/declarative/visual/qmlspringfollow/content/background.png
+++ b/tests/auto/declarative/visual/qdeclarativespringfollow/content/background.png
diff --git a/tests/auto/declarative/visual/qmlspringfollow/content/center.png b/tests/auto/declarative/visual/qdeclarativespringfollow/content/center.png
index 7fbd802..7fbd802 100755
--- a/tests/auto/declarative/visual/qmlspringfollow/content/center.png
+++ b/tests/auto/declarative/visual/qdeclarativespringfollow/content/center.png
diff --git a/tests/auto/declarative/visual/qmlspringfollow/content/clock.png b/tests/auto/declarative/visual/qdeclarativespringfollow/content/clock.png
index 462edac..462edac 100755
--- a/tests/auto/declarative/visual/qmlspringfollow/content/clock.png
+++ b/tests/auto/declarative/visual/qdeclarativespringfollow/content/clock.png
diff --git a/tests/auto/declarative/visual/qmlspringfollow/content/hour.png b/tests/auto/declarative/visual/qdeclarativespringfollow/content/hour.png
index f8061a1..f8061a1 100755
--- a/tests/auto/declarative/visual/qmlspringfollow/content/hour.png
+++ b/tests/auto/declarative/visual/qdeclarativespringfollow/content/hour.png
diff --git a/tests/auto/declarative/visual/qmlspringfollow/content/minute.png b/tests/auto/declarative/visual/qdeclarativespringfollow/content/minute.png
index 1297ec7..1297ec7 100755
--- a/tests/auto/declarative/visual/qmlspringfollow/content/minute.png
+++ b/tests/auto/declarative/visual/qdeclarativespringfollow/content/minute.png
diff --git a/tests/auto/declarative/visual/qmlspringfollow/content/second.png b/tests/auto/declarative/visual/qdeclarativespringfollow/content/second.png
index 4aa9fb5..4aa9fb5 100755
--- a/tests/auto/declarative/visual/qmlspringfollow/content/second.png
+++ b/tests/auto/declarative/visual/qdeclarativespringfollow/content/second.png
diff --git a/tests/auto/declarative/visual/qmlspringfollow/data/clock.0.png b/tests/auto/declarative/visual/qdeclarativespringfollow/data/clock.0.png
index baf1d45..baf1d45 100644
--- a/tests/auto/declarative/visual/qmlspringfollow/data/clock.0.png
+++ b/tests/auto/declarative/visual/qdeclarativespringfollow/data/clock.0.png
diff --git a/tests/auto/declarative/visual/qmlspringfollow/data/clock.1.png b/tests/auto/declarative/visual/qdeclarativespringfollow/data/clock.1.png
index 932f63f..932f63f 100644
--- a/tests/auto/declarative/visual/qmlspringfollow/data/clock.1.png
+++ b/tests/auto/declarative/visual/qdeclarativespringfollow/data/clock.1.png
diff --git a/tests/auto/declarative/visual/qmlspringfollow/data/clock.2.png b/tests/auto/declarative/visual/qdeclarativespringfollow/data/clock.2.png
index a5cb437..a5cb437 100644
--- a/tests/auto/declarative/visual/qmlspringfollow/data/clock.2.png
+++ b/tests/auto/declarative/visual/qdeclarativespringfollow/data/clock.2.png
diff --git a/tests/auto/declarative/visual/qmlspringfollow/data/clock.3.png b/tests/auto/declarative/visual/qdeclarativespringfollow/data/clock.3.png
index 62e895c..62e895c 100644
--- a/tests/auto/declarative/visual/qmlspringfollow/data/clock.3.png
+++ b/tests/auto/declarative/visual/qdeclarativespringfollow/data/clock.3.png
diff --git a/tests/auto/declarative/visual/qmlspringfollow/data/clock.qml b/tests/auto/declarative/visual/qdeclarativespringfollow/data/clock.qml
index ffc6a5e..ffc6a5e 100644
--- a/tests/auto/declarative/visual/qmlspringfollow/data/clock.qml
+++ b/tests/auto/declarative/visual/qdeclarativespringfollow/data/clock.qml
diff --git a/tests/auto/declarative/visual/qmlspringfollow/data/follow.0.png b/tests/auto/declarative/visual/qdeclarativespringfollow/data/follow.0.png
index 3f42e75..3f42e75 100644
--- a/tests/auto/declarative/visual/qmlspringfollow/data/follow.0.png
+++ b/tests/auto/declarative/visual/qdeclarativespringfollow/data/follow.0.png
diff --git a/tests/auto/declarative/visual/qmlspringfollow/data/follow.1.png b/tests/auto/declarative/visual/qdeclarativespringfollow/data/follow.1.png
index d661df6..d661df6 100644
--- a/tests/auto/declarative/visual/qmlspringfollow/data/follow.1.png
+++ b/tests/auto/declarative/visual/qdeclarativespringfollow/data/follow.1.png
diff --git a/tests/auto/declarative/visual/qmlspringfollow/data/follow.10.png b/tests/auto/declarative/visual/qdeclarativespringfollow/data/follow.10.png
index e8c96e1..e8c96e1 100644
--- a/tests/auto/declarative/visual/qmlspringfollow/data/follow.10.png
+++ b/tests/auto/declarative/visual/qdeclarativespringfollow/data/follow.10.png
diff --git a/tests/auto/declarative/visual/qmlspringfollow/data/follow.2.png b/tests/auto/declarative/visual/qdeclarativespringfollow/data/follow.2.png
index 35bfa43..35bfa43 100644
--- a/tests/auto/declarative/visual/qmlspringfollow/data/follow.2.png
+++ b/tests/auto/declarative/visual/qdeclarativespringfollow/data/follow.2.png
diff --git a/tests/auto/declarative/visual/qmlspringfollow/data/follow.3.png b/tests/auto/declarative/visual/qdeclarativespringfollow/data/follow.3.png
index 74141cf..74141cf 100644
--- a/tests/auto/declarative/visual/qmlspringfollow/data/follow.3.png
+++ b/tests/auto/declarative/visual/qdeclarativespringfollow/data/follow.3.png
diff --git a/tests/auto/declarative/visual/qmlspringfollow/data/follow.4.png b/tests/auto/declarative/visual/qdeclarativespringfollow/data/follow.4.png
index 9544054..9544054 100644
--- a/tests/auto/declarative/visual/qmlspringfollow/data/follow.4.png
+++ b/tests/auto/declarative/visual/qdeclarativespringfollow/data/follow.4.png
diff --git a/tests/auto/declarative/visual/qmlspringfollow/data/follow.5.png b/tests/auto/declarative/visual/qdeclarativespringfollow/data/follow.5.png
index 4b02c79..4b02c79 100644
--- a/tests/auto/declarative/visual/qmlspringfollow/data/follow.5.png
+++ b/tests/auto/declarative/visual/qdeclarativespringfollow/data/follow.5.png
diff --git a/tests/auto/declarative/visual/qmlspringfollow/data/follow.6.png b/tests/auto/declarative/visual/qdeclarativespringfollow/data/follow.6.png
index 8ea8345..8ea8345 100644
--- a/tests/auto/declarative/visual/qmlspringfollow/data/follow.6.png
+++ b/tests/auto/declarative/visual/qdeclarativespringfollow/data/follow.6.png
diff --git a/tests/auto/declarative/visual/qmlspringfollow/data/follow.7.png b/tests/auto/declarative/visual/qdeclarativespringfollow/data/follow.7.png
index 76a73e8..76a73e8 100644
--- a/tests/auto/declarative/visual/qmlspringfollow/data/follow.7.png
+++ b/tests/auto/declarative/visual/qdeclarativespringfollow/data/follow.7.png
diff --git a/tests/auto/declarative/visual/qmlspringfollow/data/follow.8.png b/tests/auto/declarative/visual/qdeclarativespringfollow/data/follow.8.png
index 8824940..8824940 100644
--- a/tests/auto/declarative/visual/qmlspringfollow/data/follow.8.png
+++ b/tests/auto/declarative/visual/qdeclarativespringfollow/data/follow.8.png
diff --git a/tests/auto/declarative/visual/qmlspringfollow/data/follow.9.png b/tests/auto/declarative/visual/qdeclarativespringfollow/data/follow.9.png
index f954cc5..f954cc5 100644
--- a/tests/auto/declarative/visual/qmlspringfollow/data/follow.9.png
+++ b/tests/auto/declarative/visual/qdeclarativespringfollow/data/follow.9.png
diff --git a/tests/auto/declarative/visual/qmlspringfollow/data/follow.qml b/tests/auto/declarative/visual/qdeclarativespringfollow/data/follow.qml
index fec5428..fec5428 100644
--- a/tests/auto/declarative/visual/qmlspringfollow/data/follow.qml
+++ b/tests/auto/declarative/visual/qdeclarativespringfollow/data/follow.qml
diff --git a/tests/auto/declarative/visual/qmlspringfollow/follow.qml b/tests/auto/declarative/visual/qdeclarativespringfollow/follow.qml
index 62503e4..62503e4 100644
--- a/tests/auto/declarative/visual/qmlspringfollow/follow.qml
+++ b/tests/auto/declarative/visual/qdeclarativespringfollow/follow.qml
diff --git a/tests/auto/declarative/visual/qmlgraphicstext/baseline/data/parentanchor.qml b/tests/auto/declarative/visual/qdeclarativetext/baseline/data-X11/parentanchor.qml
index 56d616e..56d616e 100644
--- a/tests/auto/declarative/visual/qmlgraphicstext/baseline/data/parentanchor.qml
+++ b/tests/auto/declarative/visual/qdeclarativetext/baseline/data-X11/parentanchor.qml
diff --git a/tests/auto/declarative/visual/qmlgraphicstext/baseline/data-X11/parentanchor.qml b/tests/auto/declarative/visual/qdeclarativetext/baseline/data/parentanchor.qml
index 56d616e..56d616e 100644
--- a/tests/auto/declarative/visual/qmlgraphicstext/baseline/data-X11/parentanchor.qml
+++ b/tests/auto/declarative/visual/qdeclarativetext/baseline/data/parentanchor.qml
diff --git a/tests/auto/declarative/visual/qmlgraphicstext/baseline/parentanchor.qml b/tests/auto/declarative/visual/qdeclarativetext/baseline/parentanchor.qml
index 80f0f03..80f0f03 100644
--- a/tests/auto/declarative/visual/qmlgraphicstext/baseline/parentanchor.qml
+++ b/tests/auto/declarative/visual/qdeclarativetext/baseline/parentanchor.qml
diff --git a/tests/auto/declarative/visual/qmlgraphicstext/elide/data-MAC/elide.0.png b/tests/auto/declarative/visual/qdeclarativetext/elide/data-MAC/elide.0.png
index eea3362..eea3362 100644
--- a/tests/auto/declarative/visual/qmlgraphicstext/elide/data-MAC/elide.0.png
+++ b/tests/auto/declarative/visual/qdeclarativetext/elide/data-MAC/elide.0.png
diff --git a/tests/auto/declarative/visual/qmlgraphicstext/elide/data-MAC/elide.qml b/tests/auto/declarative/visual/qdeclarativetext/elide/data-MAC/elide.qml
index 1ccede4..1ccede4 100644
--- a/tests/auto/declarative/visual/qmlgraphicstext/elide/data-MAC/elide.qml
+++ b/tests/auto/declarative/visual/qdeclarativetext/elide/data-MAC/elide.qml
diff --git a/tests/auto/declarative/visual/qmlgraphicstext/elide/data/elide2.0.png b/tests/auto/declarative/visual/qdeclarativetext/elide/data-MAC/elide2.0.png
index 3dfade5..3dfade5 100644
--- a/tests/auto/declarative/visual/qmlgraphicstext/elide/data/elide2.0.png
+++ b/tests/auto/declarative/visual/qdeclarativetext/elide/data-MAC/elide2.0.png
diff --git a/tests/auto/declarative/visual/qmlgraphicstext/elide/data/elide2.1.png b/tests/auto/declarative/visual/qdeclarativetext/elide/data-MAC/elide2.1.png
index 1ee2076..1ee2076 100644
--- a/tests/auto/declarative/visual/qmlgraphicstext/elide/data/elide2.1.png
+++ b/tests/auto/declarative/visual/qdeclarativetext/elide/data-MAC/elide2.1.png
diff --git a/tests/auto/declarative/visual/qmlgraphicstext/elide/data/elide2.2.png b/tests/auto/declarative/visual/qdeclarativetext/elide/data-MAC/elide2.2.png
index ae680be..ae680be 100644
--- a/tests/auto/declarative/visual/qmlgraphicstext/elide/data/elide2.2.png
+++ b/tests/auto/declarative/visual/qdeclarativetext/elide/data-MAC/elide2.2.png
diff --git a/tests/auto/declarative/visual/qmlgraphicstext/elide/data/elide2.3.png b/tests/auto/declarative/visual/qdeclarativetext/elide/data-MAC/elide2.3.png
index c2859be..c2859be 100644
--- a/tests/auto/declarative/visual/qmlgraphicstext/elide/data/elide2.3.png
+++ b/tests/auto/declarative/visual/qdeclarativetext/elide/data-MAC/elide2.3.png
diff --git a/tests/auto/declarative/visual/qmlgraphicstext/elide/data-MAC/elide2.qml b/tests/auto/declarative/visual/qdeclarativetext/elide/data-MAC/elide2.qml
index 07ad236..07ad236 100644
--- a/tests/auto/declarative/visual/qmlgraphicstext/elide/data-MAC/elide2.qml
+++ b/tests/auto/declarative/visual/qdeclarativetext/elide/data-MAC/elide2.qml
diff --git a/tests/auto/declarative/visual/qmlgraphicstext/elide/data-MAC/multilength.0.png b/tests/auto/declarative/visual/qdeclarativetext/elide/data-MAC/multilength.0.png
index 80549b4..80549b4 100644
--- a/tests/auto/declarative/visual/qmlgraphicstext/elide/data-MAC/multilength.0.png
+++ b/tests/auto/declarative/visual/qdeclarativetext/elide/data-MAC/multilength.0.png
diff --git a/tests/auto/declarative/visual/qmlgraphicstext/elide/data-MAC/multilength.qml b/tests/auto/declarative/visual/qdeclarativetext/elide/data-MAC/multilength.qml
index c2fd0d8..c2fd0d8 100644
--- a/tests/auto/declarative/visual/qmlgraphicstext/elide/data-MAC/multilength.qml
+++ b/tests/auto/declarative/visual/qdeclarativetext/elide/data-MAC/multilength.qml
diff --git a/tests/auto/declarative/visual/qmlgraphicstext/elide/data-X11/elide.0.png b/tests/auto/declarative/visual/qdeclarativetext/elide/data-X11/elide.0.png
index 5631a46..5631a46 100644
--- a/tests/auto/declarative/visual/qmlgraphicstext/elide/data-X11/elide.0.png
+++ b/tests/auto/declarative/visual/qdeclarativetext/elide/data-X11/elide.0.png
diff --git a/tests/auto/declarative/visual/qmlgraphicstext/elide/data-X11/elide.qml b/tests/auto/declarative/visual/qdeclarativetext/elide/data-X11/elide.qml
index cfd832e..cfd832e 100644
--- a/tests/auto/declarative/visual/qmlgraphicstext/elide/data-X11/elide.qml
+++ b/tests/auto/declarative/visual/qdeclarativetext/elide/data-X11/elide.qml
diff --git a/tests/auto/declarative/visual/qmlgraphicstext/elide/data-X11/multilength.0.png b/tests/auto/declarative/visual/qdeclarativetext/elide/data-X11/multilength.0.png
index 6e2b625..6e2b625 100644
--- a/tests/auto/declarative/visual/qmlgraphicstext/elide/data-X11/multilength.0.png
+++ b/tests/auto/declarative/visual/qdeclarativetext/elide/data-X11/multilength.0.png
diff --git a/tests/auto/declarative/visual/qmlgraphicstext/elide/data-X11/multilength.qml b/tests/auto/declarative/visual/qdeclarativetext/elide/data-X11/multilength.qml
index 0c06196..0c06196 100644
--- a/tests/auto/declarative/visual/qmlgraphicstext/elide/data-X11/multilength.qml
+++ b/tests/auto/declarative/visual/qdeclarativetext/elide/data-X11/multilength.qml
diff --git a/tests/auto/declarative/visual/qmlgraphicstext/elide/data/elide.0.png b/tests/auto/declarative/visual/qdeclarativetext/elide/data/elide.0.png
index 1a8c89b..1a8c89b 100644
--- a/tests/auto/declarative/visual/qmlgraphicstext/elide/data/elide.0.png
+++ b/tests/auto/declarative/visual/qdeclarativetext/elide/data/elide.0.png
diff --git a/tests/auto/declarative/visual/qmlgraphicstext/elide/data/elide.qml b/tests/auto/declarative/visual/qdeclarativetext/elide/data/elide.qml
index 59f17f7..59f17f7 100644
--- a/tests/auto/declarative/visual/qmlgraphicstext/elide/data/elide.qml
+++ b/tests/auto/declarative/visual/qdeclarativetext/elide/data/elide.qml
diff --git a/tests/auto/declarative/visual/qmlgraphicstext/elide/data-MAC/elide2.0.png b/tests/auto/declarative/visual/qdeclarativetext/elide/data/elide2.0.png
index 3dfade5..3dfade5 100644
--- a/tests/auto/declarative/visual/qmlgraphicstext/elide/data-MAC/elide2.0.png
+++ b/tests/auto/declarative/visual/qdeclarativetext/elide/data/elide2.0.png
diff --git a/tests/auto/declarative/visual/qmlgraphicstext/elide/data-MAC/elide2.1.png b/tests/auto/declarative/visual/qdeclarativetext/elide/data/elide2.1.png
index 1ee2076..1ee2076 100644
--- a/tests/auto/declarative/visual/qmlgraphicstext/elide/data-MAC/elide2.1.png
+++ b/tests/auto/declarative/visual/qdeclarativetext/elide/data/elide2.1.png
diff --git a/tests/auto/declarative/visual/qmlgraphicstext/elide/data-MAC/elide2.2.png b/tests/auto/declarative/visual/qdeclarativetext/elide/data/elide2.2.png
index ae680be..ae680be 100644
--- a/tests/auto/declarative/visual/qmlgraphicstext/elide/data-MAC/elide2.2.png
+++ b/tests/auto/declarative/visual/qdeclarativetext/elide/data/elide2.2.png
diff --git a/tests/auto/declarative/visual/qmlgraphicstext/elide/data-MAC/elide2.3.png b/tests/auto/declarative/visual/qdeclarativetext/elide/data/elide2.3.png
index c2859be..c2859be 100644
--- a/tests/auto/declarative/visual/qmlgraphicstext/elide/data-MAC/elide2.3.png
+++ b/tests/auto/declarative/visual/qdeclarativetext/elide/data/elide2.3.png
diff --git a/tests/auto/declarative/visual/qmlgraphicstext/elide/data/elide2.qml b/tests/auto/declarative/visual/qdeclarativetext/elide/data/elide2.qml
index c592f18..c592f18 100644
--- a/tests/auto/declarative/visual/qmlgraphicstext/elide/data/elide2.qml
+++ b/tests/auto/declarative/visual/qdeclarativetext/elide/data/elide2.qml
diff --git a/tests/auto/declarative/visual/qmlgraphicstext/elide/elide.qml b/tests/auto/declarative/visual/qdeclarativetext/elide/elide.qml
index fa6b5da..fa6b5da 100644
--- a/tests/auto/declarative/visual/qmlgraphicstext/elide/elide.qml
+++ b/tests/auto/declarative/visual/qdeclarativetext/elide/elide.qml
diff --git a/tests/auto/declarative/visual/qmlgraphicstext/elide/elide2.qml b/tests/auto/declarative/visual/qdeclarativetext/elide/elide2.qml
index c163e05..c163e05 100644
--- a/tests/auto/declarative/visual/qmlgraphicstext/elide/elide2.qml
+++ b/tests/auto/declarative/visual/qdeclarativetext/elide/elide2.qml
diff --git a/tests/auto/declarative/visual/qmlgraphicstext/elide/multilength.qml b/tests/auto/declarative/visual/qdeclarativetext/elide/multilength.qml
index ca41eab..ca41eab 100644
--- a/tests/auto/declarative/visual/qmlgraphicstext/elide/multilength.qml
+++ b/tests/auto/declarative/visual/qdeclarativetext/elide/multilength.qml
diff --git a/tests/auto/declarative/visual/qmlgraphicstext/font/data-MAC/plaintext.0.png b/tests/auto/declarative/visual/qdeclarativetext/font/data-MAC/plaintext.0.png
index 67b497f..67b497f 100644
--- a/tests/auto/declarative/visual/qmlgraphicstext/font/data-MAC/plaintext.0.png
+++ b/tests/auto/declarative/visual/qdeclarativetext/font/data-MAC/plaintext.0.png
diff --git a/tests/auto/declarative/visual/qmlgraphicstext/font/data-MAC/plaintext.qml b/tests/auto/declarative/visual/qdeclarativetext/font/data-MAC/plaintext.qml
index ab17eb1..ab17eb1 100644
--- a/tests/auto/declarative/visual/qmlgraphicstext/font/data-MAC/plaintext.qml
+++ b/tests/auto/declarative/visual/qdeclarativetext/font/data-MAC/plaintext.qml
diff --git a/tests/auto/declarative/visual/qmlgraphicstext/font/data-MAC/richtext.0.png b/tests/auto/declarative/visual/qdeclarativetext/font/data-MAC/richtext.0.png
index 6379942..6379942 100644
--- a/tests/auto/declarative/visual/qmlgraphicstext/font/data-MAC/richtext.0.png
+++ b/tests/auto/declarative/visual/qdeclarativetext/font/data-MAC/richtext.0.png
diff --git a/tests/auto/declarative/visual/qmlgraphicstext/font/data-MAC/richtext.qml b/tests/auto/declarative/visual/qdeclarativetext/font/data-MAC/richtext.qml
index 72499b9..72499b9 100644
--- a/tests/auto/declarative/visual/qmlgraphicstext/font/data-MAC/richtext.qml
+++ b/tests/auto/declarative/visual/qdeclarativetext/font/data-MAC/richtext.qml
diff --git a/tests/auto/declarative/visual/qmlgraphicstext/font/data/plaintext.0.png b/tests/auto/declarative/visual/qdeclarativetext/font/data/plaintext.0.png
index 50d56dc..50d56dc 100644
--- a/tests/auto/declarative/visual/qmlgraphicstext/font/data/plaintext.0.png
+++ b/tests/auto/declarative/visual/qdeclarativetext/font/data/plaintext.0.png
diff --git a/tests/auto/declarative/visual/qmlgraphicstext/font/data/plaintext.qml b/tests/auto/declarative/visual/qdeclarativetext/font/data/plaintext.qml
index f4cbcbd..f4cbcbd 100644
--- a/tests/auto/declarative/visual/qmlgraphicstext/font/data/plaintext.qml
+++ b/tests/auto/declarative/visual/qdeclarativetext/font/data/plaintext.qml
diff --git a/tests/auto/declarative/visual/qmlgraphicstext/font/data/richtext.0.png b/tests/auto/declarative/visual/qdeclarativetext/font/data/richtext.0.png
index 2910670..2910670 100644
--- a/tests/auto/declarative/visual/qmlgraphicstext/font/data/richtext.0.png
+++ b/tests/auto/declarative/visual/qdeclarativetext/font/data/richtext.0.png
diff --git a/tests/auto/declarative/visual/qmlgraphicstext/font/data/richtext.qml b/tests/auto/declarative/visual/qdeclarativetext/font/data/richtext.qml
index 9f396c2..9f396c2 100644
--- a/tests/auto/declarative/visual/qmlgraphicstext/font/data/richtext.qml
+++ b/tests/auto/declarative/visual/qdeclarativetext/font/data/richtext.qml
diff --git a/tests/auto/declarative/visual/qmlgraphicstext/font/plaintext.qml b/tests/auto/declarative/visual/qdeclarativetext/font/plaintext.qml
index a3aa929..a3aa929 100644
--- a/tests/auto/declarative/visual/qmlgraphicstext/font/plaintext.qml
+++ b/tests/auto/declarative/visual/qdeclarativetext/font/plaintext.qml
diff --git a/tests/auto/declarative/visual/qmlgraphicstext/font/richtext.qml b/tests/auto/declarative/visual/qdeclarativetext/font/richtext.qml
index 35aa232..35aa232 100644
--- a/tests/auto/declarative/visual/qmlgraphicstext/font/richtext.qml
+++ b/tests/auto/declarative/visual/qdeclarativetext/font/richtext.qml
diff --git a/tests/auto/declarative/visual/qmlgraphicstextedit/cursorDelegate.qml b/tests/auto/declarative/visual/qdeclarativetextedit/cursorDelegate.qml
index 176a5b8..176a5b8 100644
--- a/tests/auto/declarative/visual/qmlgraphicstextedit/cursorDelegate.qml
+++ b/tests/auto/declarative/visual/qdeclarativetextedit/cursorDelegate.qml
diff --git a/tests/auto/declarative/visual/qmlgraphicstextedit/data-MAC/cursorDelegate.0.png b/tests/auto/declarative/visual/qdeclarativetextedit/data-MAC/cursorDelegate.0.png
index 464a578..464a578 100644
--- a/tests/auto/declarative/visual/qmlgraphicstextedit/data-MAC/cursorDelegate.0.png
+++ b/tests/auto/declarative/visual/qdeclarativetextedit/data-MAC/cursorDelegate.0.png
diff --git a/tests/auto/declarative/visual/qmlgraphicstextedit/data-MAC/cursorDelegate.1.png b/tests/auto/declarative/visual/qdeclarativetextedit/data-MAC/cursorDelegate.1.png
index 9beb1ca..9beb1ca 100644
--- a/tests/auto/declarative/visual/qmlgraphicstextedit/data-MAC/cursorDelegate.1.png
+++ b/tests/auto/declarative/visual/qdeclarativetextedit/data-MAC/cursorDelegate.1.png
diff --git a/tests/auto/declarative/visual/qmlgraphicstextedit/data-MAC/cursorDelegate.2.png b/tests/auto/declarative/visual/qdeclarativetextedit/data-MAC/cursorDelegate.2.png
index 001be30..001be30 100644
--- a/tests/auto/declarative/visual/qmlgraphicstextedit/data-MAC/cursorDelegate.2.png
+++ b/tests/auto/declarative/visual/qdeclarativetextedit/data-MAC/cursorDelegate.2.png
diff --git a/tests/auto/declarative/visual/qmlgraphicstextedit/data-MAC/cursorDelegate.3.png b/tests/auto/declarative/visual/qdeclarativetextedit/data-MAC/cursorDelegate.3.png
index fc3e4b3..fc3e4b3 100644
--- a/tests/auto/declarative/visual/qmlgraphicstextedit/data-MAC/cursorDelegate.3.png
+++ b/tests/auto/declarative/visual/qdeclarativetextedit/data-MAC/cursorDelegate.3.png
diff --git a/tests/auto/declarative/visual/qmlgraphicstextedit/data-MAC/cursorDelegate.4.png b/tests/auto/declarative/visual/qdeclarativetextedit/data-MAC/cursorDelegate.4.png
index 24f43e6..24f43e6 100644
--- a/tests/auto/declarative/visual/qmlgraphicstextedit/data-MAC/cursorDelegate.4.png
+++ b/tests/auto/declarative/visual/qdeclarativetextedit/data-MAC/cursorDelegate.4.png
diff --git a/tests/auto/declarative/visual/qmlgraphicstextedit/data-MAC/cursorDelegate.5.png b/tests/auto/declarative/visual/qdeclarativetextedit/data-MAC/cursorDelegate.5.png
index 001223b..001223b 100644
--- a/tests/auto/declarative/visual/qmlgraphicstextedit/data-MAC/cursorDelegate.5.png
+++ b/tests/auto/declarative/visual/qdeclarativetextedit/data-MAC/cursorDelegate.5.png
diff --git a/tests/auto/declarative/visual/qmlgraphicstextedit/data-MAC/cursorDelegate.6.png b/tests/auto/declarative/visual/qdeclarativetextedit/data-MAC/cursorDelegate.6.png
index 7126e07..7126e07 100644
--- a/tests/auto/declarative/visual/qmlgraphicstextedit/data-MAC/cursorDelegate.6.png
+++ b/tests/auto/declarative/visual/qdeclarativetextedit/data-MAC/cursorDelegate.6.png
diff --git a/tests/auto/declarative/visual/qmlgraphicstextedit/data-MAC/cursorDelegate.7.png b/tests/auto/declarative/visual/qdeclarativetextedit/data-MAC/cursorDelegate.7.png
index f0bea88..f0bea88 100644
--- a/tests/auto/declarative/visual/qmlgraphicstextedit/data-MAC/cursorDelegate.7.png
+++ b/tests/auto/declarative/visual/qdeclarativetextedit/data-MAC/cursorDelegate.7.png
diff --git a/tests/auto/declarative/visual/qmlgraphicstextedit/data-MAC/cursorDelegate.8.png b/tests/auto/declarative/visual/qdeclarativetextedit/data-MAC/cursorDelegate.8.png
index 4381b8d..4381b8d 100644
--- a/tests/auto/declarative/visual/qmlgraphicstextedit/data-MAC/cursorDelegate.8.png
+++ b/tests/auto/declarative/visual/qdeclarativetextedit/data-MAC/cursorDelegate.8.png
diff --git a/tests/auto/declarative/visual/qmlgraphicstextedit/data-MAC/cursorDelegate.qml b/tests/auto/declarative/visual/qdeclarativetextedit/data-MAC/cursorDelegate.qml
index 8ee92d7..8ee92d7 100644
--- a/tests/auto/declarative/visual/qmlgraphicstextedit/data-MAC/cursorDelegate.qml
+++ b/tests/auto/declarative/visual/qdeclarativetextedit/data-MAC/cursorDelegate.qml
diff --git a/tests/auto/declarative/visual/qmlgraphicstextedit/data-MAC/qt-669.0.png b/tests/auto/declarative/visual/qdeclarativetextedit/data-MAC/qt-669.0.png
index cc1774f..cc1774f 100644
--- a/tests/auto/declarative/visual/qmlgraphicstextedit/data-MAC/qt-669.0.png
+++ b/tests/auto/declarative/visual/qdeclarativetextedit/data-MAC/qt-669.0.png
diff --git a/tests/auto/declarative/visual/qmlgraphicstextedit/data-MAC/qt-669.1.png b/tests/auto/declarative/visual/qdeclarativetextedit/data-MAC/qt-669.1.png
index 60eba16..60eba16 100644
--- a/tests/auto/declarative/visual/qmlgraphicstextedit/data-MAC/qt-669.1.png
+++ b/tests/auto/declarative/visual/qdeclarativetextedit/data-MAC/qt-669.1.png
diff --git a/tests/auto/declarative/visual/qmlgraphicstextedit/data-MAC/qt-669.2.png b/tests/auto/declarative/visual/qdeclarativetextedit/data-MAC/qt-669.2.png
index d4663f7..d4663f7 100644
--- a/tests/auto/declarative/visual/qmlgraphicstextedit/data-MAC/qt-669.2.png
+++ b/tests/auto/declarative/visual/qdeclarativetextedit/data-MAC/qt-669.2.png
diff --git a/tests/auto/declarative/visual/qmlgraphicstextedit/data-MAC/qt-669.3.png b/tests/auto/declarative/visual/qdeclarativetextedit/data-MAC/qt-669.3.png
index dc1bb52..dc1bb52 100644
--- a/tests/auto/declarative/visual/qmlgraphicstextedit/data-MAC/qt-669.3.png
+++ b/tests/auto/declarative/visual/qdeclarativetextedit/data-MAC/qt-669.3.png
diff --git a/tests/auto/declarative/visual/qmlgraphicstextedit/data-MAC/qt-669.qml b/tests/auto/declarative/visual/qdeclarativetextedit/data-MAC/qt-669.qml
index 84c16e1..84c16e1 100644
--- a/tests/auto/declarative/visual/qmlgraphicstextedit/data-MAC/qt-669.qml
+++ b/tests/auto/declarative/visual/qdeclarativetextedit/data-MAC/qt-669.qml
diff --git a/tests/auto/declarative/visual/qmlgraphicstextedit/data/wrap.0.png b/tests/auto/declarative/visual/qdeclarativetextedit/data-X11/wrap.0.png
index ec65f49..ec65f49 100644
--- a/tests/auto/declarative/visual/qmlgraphicstextedit/data/wrap.0.png
+++ b/tests/auto/declarative/visual/qdeclarativetextedit/data-X11/wrap.0.png
diff --git a/tests/auto/declarative/visual/qmlgraphicstextedit/data/wrap.1.png b/tests/auto/declarative/visual/qdeclarativetextedit/data-X11/wrap.1.png
index ec65f49..ec65f49 100644
--- a/tests/auto/declarative/visual/qmlgraphicstextedit/data/wrap.1.png
+++ b/tests/auto/declarative/visual/qdeclarativetextedit/data-X11/wrap.1.png
diff --git a/tests/auto/declarative/visual/qmlgraphicstextedit/data/wrap.2.png b/tests/auto/declarative/visual/qdeclarativetextedit/data-X11/wrap.2.png
index ec65f49..ec65f49 100644
--- a/tests/auto/declarative/visual/qmlgraphicstextedit/data/wrap.2.png
+++ b/tests/auto/declarative/visual/qdeclarativetextedit/data-X11/wrap.2.png
diff --git a/tests/auto/declarative/visual/qmlgraphicstextedit/data/wrap.3.png b/tests/auto/declarative/visual/qdeclarativetextedit/data-X11/wrap.3.png
index ec65f49..ec65f49 100644
--- a/tests/auto/declarative/visual/qmlgraphicstextedit/data/wrap.3.png
+++ b/tests/auto/declarative/visual/qdeclarativetextedit/data-X11/wrap.3.png
diff --git a/tests/auto/declarative/visual/qmlgraphicstextedit/data/wrap.4.png b/tests/auto/declarative/visual/qdeclarativetextedit/data-X11/wrap.4.png
index ec65f49..ec65f49 100644
--- a/tests/auto/declarative/visual/qmlgraphicstextedit/data/wrap.4.png
+++ b/tests/auto/declarative/visual/qdeclarativetextedit/data-X11/wrap.4.png
diff --git a/tests/auto/declarative/visual/qmlgraphicstextedit/data/wrap.5.png b/tests/auto/declarative/visual/qdeclarativetextedit/data-X11/wrap.5.png
index ec65f49..ec65f49 100644
--- a/tests/auto/declarative/visual/qmlgraphicstextedit/data/wrap.5.png
+++ b/tests/auto/declarative/visual/qdeclarativetextedit/data-X11/wrap.5.png
diff --git a/tests/auto/declarative/visual/qmlgraphicstextedit/data/wrap.6.png b/tests/auto/declarative/visual/qdeclarativetextedit/data-X11/wrap.6.png
index ec65f49..ec65f49 100644
--- a/tests/auto/declarative/visual/qmlgraphicstextedit/data/wrap.6.png
+++ b/tests/auto/declarative/visual/qdeclarativetextedit/data-X11/wrap.6.png
diff --git a/tests/auto/declarative/visual/qmlgraphicstextedit/data-X11/wrap.qml b/tests/auto/declarative/visual/qdeclarativetextedit/data-X11/wrap.qml
index 4ff00f4..4ff00f4 100644
--- a/tests/auto/declarative/visual/qmlgraphicstextedit/data-X11/wrap.qml
+++ b/tests/auto/declarative/visual/qdeclarativetextedit/data-X11/wrap.qml
diff --git a/tests/auto/declarative/visual/qmlgraphicstextedit/data/cursorDelegate.0.png b/tests/auto/declarative/visual/qdeclarativetextedit/data/cursorDelegate.0.png
index 555996a..555996a 100644
--- a/tests/auto/declarative/visual/qmlgraphicstextedit/data/cursorDelegate.0.png
+++ b/tests/auto/declarative/visual/qdeclarativetextedit/data/cursorDelegate.0.png
diff --git a/tests/auto/declarative/visual/qmlgraphicstextedit/data/cursorDelegate.1.png b/tests/auto/declarative/visual/qdeclarativetextedit/data/cursorDelegate.1.png
index b705bad..b705bad 100644
--- a/tests/auto/declarative/visual/qmlgraphicstextedit/data/cursorDelegate.1.png
+++ b/tests/auto/declarative/visual/qdeclarativetextedit/data/cursorDelegate.1.png
diff --git a/tests/auto/declarative/visual/qmlgraphicstextedit/data/cursorDelegate.2.png b/tests/auto/declarative/visual/qdeclarativetextedit/data/cursorDelegate.2.png
index 094cd2a..094cd2a 100644
--- a/tests/auto/declarative/visual/qmlgraphicstextedit/data/cursorDelegate.2.png
+++ b/tests/auto/declarative/visual/qdeclarativetextedit/data/cursorDelegate.2.png
diff --git a/tests/auto/declarative/visual/qmlgraphicstextedit/data/cursorDelegate.3.png b/tests/auto/declarative/visual/qdeclarativetextedit/data/cursorDelegate.3.png
index 9c519c7..9c519c7 100644
--- a/tests/auto/declarative/visual/qmlgraphicstextedit/data/cursorDelegate.3.png
+++ b/tests/auto/declarative/visual/qdeclarativetextedit/data/cursorDelegate.3.png
diff --git a/tests/auto/declarative/visual/qmlgraphicstextedit/data/cursorDelegate.4.png b/tests/auto/declarative/visual/qdeclarativetextedit/data/cursorDelegate.4.png
index 3ec77b5..3ec77b5 100644
--- a/tests/auto/declarative/visual/qmlgraphicstextedit/data/cursorDelegate.4.png
+++ b/tests/auto/declarative/visual/qdeclarativetextedit/data/cursorDelegate.4.png
diff --git a/tests/auto/declarative/visual/qmlgraphicstextedit/data/cursorDelegate.5.png b/tests/auto/declarative/visual/qdeclarativetextedit/data/cursorDelegate.5.png
index 579a66e..579a66e 100644
--- a/tests/auto/declarative/visual/qmlgraphicstextedit/data/cursorDelegate.5.png
+++ b/tests/auto/declarative/visual/qdeclarativetextedit/data/cursorDelegate.5.png
diff --git a/tests/auto/declarative/visual/qmlgraphicstextedit/data/cursorDelegate.6.png b/tests/auto/declarative/visual/qdeclarativetextedit/data/cursorDelegate.6.png
index 9e5ac90..9e5ac90 100644
--- a/tests/auto/declarative/visual/qmlgraphicstextedit/data/cursorDelegate.6.png
+++ b/tests/auto/declarative/visual/qdeclarativetextedit/data/cursorDelegate.6.png
diff --git a/tests/auto/declarative/visual/qmlgraphicstextedit/data/cursorDelegate.7.png b/tests/auto/declarative/visual/qdeclarativetextedit/data/cursorDelegate.7.png
index 9f3acfc..9f3acfc 100644
--- a/tests/auto/declarative/visual/qmlgraphicstextedit/data/cursorDelegate.7.png
+++ b/tests/auto/declarative/visual/qdeclarativetextedit/data/cursorDelegate.7.png
diff --git a/tests/auto/declarative/visual/qmlgraphicstextedit/data/cursorDelegate.8.png b/tests/auto/declarative/visual/qdeclarativetextedit/data/cursorDelegate.8.png
index f27518a..f27518a 100644
--- a/tests/auto/declarative/visual/qmlgraphicstextedit/data/cursorDelegate.8.png
+++ b/tests/auto/declarative/visual/qdeclarativetextedit/data/cursorDelegate.8.png
diff --git a/tests/auto/declarative/visual/qmlgraphicstextedit/data/cursorDelegate.qml b/tests/auto/declarative/visual/qdeclarativetextedit/data/cursorDelegate.qml
index 8578d48..8578d48 100644
--- a/tests/auto/declarative/visual/qmlgraphicstextedit/data/cursorDelegate.qml
+++ b/tests/auto/declarative/visual/qdeclarativetextedit/data/cursorDelegate.qml
diff --git a/tests/auto/declarative/visual/qmlgraphicstextedit/data/qt-669.0.png b/tests/auto/declarative/visual/qdeclarativetextedit/data/qt-669.0.png
index 95a835a..95a835a 100644
--- a/tests/auto/declarative/visual/qmlgraphicstextedit/data/qt-669.0.png
+++ b/tests/auto/declarative/visual/qdeclarativetextedit/data/qt-669.0.png
diff --git a/tests/auto/declarative/visual/qmlgraphicstextedit/data/qt-669.1.png b/tests/auto/declarative/visual/qdeclarativetextedit/data/qt-669.1.png
index 409192c..409192c 100644
--- a/tests/auto/declarative/visual/qmlgraphicstextedit/data/qt-669.1.png
+++ b/tests/auto/declarative/visual/qdeclarativetextedit/data/qt-669.1.png
diff --git a/tests/auto/declarative/visual/qmlgraphicstextedit/data/qt-669.2.png b/tests/auto/declarative/visual/qdeclarativetextedit/data/qt-669.2.png
index cd2f112..cd2f112 100644
--- a/tests/auto/declarative/visual/qmlgraphicstextedit/data/qt-669.2.png
+++ b/tests/auto/declarative/visual/qdeclarativetextedit/data/qt-669.2.png
diff --git a/tests/auto/declarative/visual/qmlgraphicstextedit/data/qt-669.3.png b/tests/auto/declarative/visual/qdeclarativetextedit/data/qt-669.3.png
index 7191c1e..7191c1e 100644
--- a/tests/auto/declarative/visual/qmlgraphicstextedit/data/qt-669.3.png
+++ b/tests/auto/declarative/visual/qdeclarativetextedit/data/qt-669.3.png
diff --git a/tests/auto/declarative/visual/qmlgraphicstextedit/data/qt-669.qml b/tests/auto/declarative/visual/qdeclarativetextedit/data/qt-669.qml
index 352c890..352c890 100644
--- a/tests/auto/declarative/visual/qmlgraphicstextedit/data/qt-669.qml
+++ b/tests/auto/declarative/visual/qdeclarativetextedit/data/qt-669.qml
diff --git a/tests/auto/declarative/visual/qmlgraphicstextedit/data-X11/wrap.0.png b/tests/auto/declarative/visual/qdeclarativetextedit/data/wrap.0.png
index ec65f49..ec65f49 100644
--- a/tests/auto/declarative/visual/qmlgraphicstextedit/data-X11/wrap.0.png
+++ b/tests/auto/declarative/visual/qdeclarativetextedit/data/wrap.0.png
diff --git a/tests/auto/declarative/visual/qmlgraphicstextedit/data-X11/wrap.1.png b/tests/auto/declarative/visual/qdeclarativetextedit/data/wrap.1.png
index ec65f49..ec65f49 100644
--- a/tests/auto/declarative/visual/qmlgraphicstextedit/data-X11/wrap.1.png
+++ b/tests/auto/declarative/visual/qdeclarativetextedit/data/wrap.1.png
diff --git a/tests/auto/declarative/visual/qmlgraphicstextedit/data-X11/wrap.2.png b/tests/auto/declarative/visual/qdeclarativetextedit/data/wrap.2.png
index ec65f49..ec65f49 100644
--- a/tests/auto/declarative/visual/qmlgraphicstextedit/data-X11/wrap.2.png
+++ b/tests/auto/declarative/visual/qdeclarativetextedit/data/wrap.2.png
diff --git a/tests/auto/declarative/visual/qmlgraphicstextedit/data-X11/wrap.3.png b/tests/auto/declarative/visual/qdeclarativetextedit/data/wrap.3.png
index ec65f49..ec65f49 100644
--- a/tests/auto/declarative/visual/qmlgraphicstextedit/data-X11/wrap.3.png
+++ b/tests/auto/declarative/visual/qdeclarativetextedit/data/wrap.3.png
diff --git a/tests/auto/declarative/visual/qmlgraphicstextedit/data-X11/wrap.4.png b/tests/auto/declarative/visual/qdeclarativetextedit/data/wrap.4.png
index ec65f49..ec65f49 100644
--- a/tests/auto/declarative/visual/qmlgraphicstextedit/data-X11/wrap.4.png
+++ b/tests/auto/declarative/visual/qdeclarativetextedit/data/wrap.4.png
diff --git a/tests/auto/declarative/visual/qmlgraphicstextedit/data-X11/wrap.5.png b/tests/auto/declarative/visual/qdeclarativetextedit/data/wrap.5.png
index ec65f49..ec65f49 100644
--- a/tests/auto/declarative/visual/qmlgraphicstextedit/data-X11/wrap.5.png
+++ b/tests/auto/declarative/visual/qdeclarativetextedit/data/wrap.5.png
diff --git a/tests/auto/declarative/visual/qmlgraphicstextedit/data-X11/wrap.6.png b/tests/auto/declarative/visual/qdeclarativetextedit/data/wrap.6.png
index ec65f49..ec65f49 100644
--- a/tests/auto/declarative/visual/qmlgraphicstextedit/data-X11/wrap.6.png
+++ b/tests/auto/declarative/visual/qdeclarativetextedit/data/wrap.6.png
diff --git a/tests/auto/declarative/visual/qmlgraphicstextedit/data/wrap.qml b/tests/auto/declarative/visual/qdeclarativetextedit/data/wrap.qml
index f96daa9..f96daa9 100644
--- a/tests/auto/declarative/visual/qmlgraphicstextedit/data/wrap.qml
+++ b/tests/auto/declarative/visual/qdeclarativetextedit/data/wrap.qml
diff --git a/tests/auto/declarative/visual/qmlgraphicstextedit/qt-669.qml b/tests/auto/declarative/visual/qdeclarativetextedit/qt-669.qml
index b01ddf8..b01ddf8 100644
--- a/tests/auto/declarative/visual/qmlgraphicstextedit/qt-669.qml
+++ b/tests/auto/declarative/visual/qdeclarativetextedit/qt-669.qml
diff --git a/tests/auto/declarative/visual/qmlgraphicstextedit/wrap.qml b/tests/auto/declarative/visual/qdeclarativetextedit/wrap.qml
index f9fe025..f9fe025 100644
--- a/tests/auto/declarative/visual/qmlgraphicstextedit/wrap.qml
+++ b/tests/auto/declarative/visual/qdeclarativetextedit/wrap.qml
diff --git a/tests/auto/declarative/visual/qmlgraphicstextinput/cursorDelegate.qml b/tests/auto/declarative/visual/qdeclarativetextinput/cursorDelegate.qml
index 6a4e7fa..6a4e7fa 100644
--- a/tests/auto/declarative/visual/qmlgraphicstextinput/cursorDelegate.qml
+++ b/tests/auto/declarative/visual/qdeclarativetextinput/cursorDelegate.qml
diff --git a/tests/auto/declarative/visual/qmlgraphicstextinput/data-MAC/cursorDelegate.0.png b/tests/auto/declarative/visual/qdeclarativetextinput/data-MAC/cursorDelegate.0.png
index 9d0bab2..9d0bab2 100644
--- a/tests/auto/declarative/visual/qmlgraphicstextinput/data-MAC/cursorDelegate.0.png
+++ b/tests/auto/declarative/visual/qdeclarativetextinput/data-MAC/cursorDelegate.0.png
diff --git a/tests/auto/declarative/visual/qmlgraphicstextinput/data-MAC/cursorDelegate.1.png b/tests/auto/declarative/visual/qdeclarativetextinput/data-MAC/cursorDelegate.1.png
index db66ff7..db66ff7 100644
--- a/tests/auto/declarative/visual/qmlgraphicstextinput/data-MAC/cursorDelegate.1.png
+++ b/tests/auto/declarative/visual/qdeclarativetextinput/data-MAC/cursorDelegate.1.png
diff --git a/tests/auto/declarative/visual/qmlgraphicstextinput/data-MAC/cursorDelegate.2.png b/tests/auto/declarative/visual/qdeclarativetextinput/data-MAC/cursorDelegate.2.png
index cbcca68..cbcca68 100644
--- a/tests/auto/declarative/visual/qmlgraphicstextinput/data-MAC/cursorDelegate.2.png
+++ b/tests/auto/declarative/visual/qdeclarativetextinput/data-MAC/cursorDelegate.2.png
diff --git a/tests/auto/declarative/visual/qmlgraphicstextinput/data-MAC/cursorDelegate.3.png b/tests/auto/declarative/visual/qdeclarativetextinput/data-MAC/cursorDelegate.3.png
index c22196b..c22196b 100644
--- a/tests/auto/declarative/visual/qmlgraphicstextinput/data-MAC/cursorDelegate.3.png
+++ b/tests/auto/declarative/visual/qdeclarativetextinput/data-MAC/cursorDelegate.3.png
diff --git a/tests/auto/declarative/visual/qmlgraphicstextinput/data-MAC/cursorDelegate.4.png b/tests/auto/declarative/visual/qdeclarativetextinput/data-MAC/cursorDelegate.4.png
index a1d051e..a1d051e 100644
--- a/tests/auto/declarative/visual/qmlgraphicstextinput/data-MAC/cursorDelegate.4.png
+++ b/tests/auto/declarative/visual/qdeclarativetextinput/data-MAC/cursorDelegate.4.png
diff --git a/tests/auto/declarative/visual/qmlgraphicstextinput/data-MAC/cursorDelegate.5.png b/tests/auto/declarative/visual/qdeclarativetextinput/data-MAC/cursorDelegate.5.png
index 9289dc0..9289dc0 100644
--- a/tests/auto/declarative/visual/qmlgraphicstextinput/data-MAC/cursorDelegate.5.png
+++ b/tests/auto/declarative/visual/qdeclarativetextinput/data-MAC/cursorDelegate.5.png
diff --git a/tests/auto/declarative/visual/qmlgraphicstextinput/data-MAC/cursorDelegate.6.png b/tests/auto/declarative/visual/qdeclarativetextinput/data-MAC/cursorDelegate.6.png
index 7331f89..7331f89 100644
--- a/tests/auto/declarative/visual/qmlgraphicstextinput/data-MAC/cursorDelegate.6.png
+++ b/tests/auto/declarative/visual/qdeclarativetextinput/data-MAC/cursorDelegate.6.png
diff --git a/tests/auto/declarative/visual/qmlgraphicstextinput/data-MAC/cursorDelegate.7.png b/tests/auto/declarative/visual/qdeclarativetextinput/data-MAC/cursorDelegate.7.png
index 968bdd2..968bdd2 100644
--- a/tests/auto/declarative/visual/qmlgraphicstextinput/data-MAC/cursorDelegate.7.png
+++ b/tests/auto/declarative/visual/qdeclarativetextinput/data-MAC/cursorDelegate.7.png
diff --git a/tests/auto/declarative/visual/qmlgraphicstextinput/data-MAC/cursorDelegate.8.png b/tests/auto/declarative/visual/qdeclarativetextinput/data-MAC/cursorDelegate.8.png
index 9a3436a..9a3436a 100644
--- a/tests/auto/declarative/visual/qmlgraphicstextinput/data-MAC/cursorDelegate.8.png
+++ b/tests/auto/declarative/visual/qdeclarativetextinput/data-MAC/cursorDelegate.8.png
diff --git a/tests/auto/declarative/visual/qmlgraphicstextinput/data-MAC/cursorDelegate.qml b/tests/auto/declarative/visual/qdeclarativetextinput/data-MAC/cursorDelegate.qml
index 3b664b6..3b664b6 100644
--- a/tests/auto/declarative/visual/qmlgraphicstextinput/data-MAC/cursorDelegate.qml
+++ b/tests/auto/declarative/visual/qdeclarativetextinput/data-MAC/cursorDelegate.qml
diff --git a/tests/auto/declarative/visual/qmlgraphicstextinput/data/echoMode.0.png b/tests/auto/declarative/visual/qdeclarativetextinput/data-X11/echoMode.0.png
index 2b45a06..2b45a06 100644
--- a/tests/auto/declarative/visual/qmlgraphicstextinput/data/echoMode.0.png
+++ b/tests/auto/declarative/visual/qdeclarativetextinput/data-X11/echoMode.0.png
diff --git a/tests/auto/declarative/visual/qmlgraphicstextinput/data/echoMode.1.png b/tests/auto/declarative/visual/qdeclarativetextinput/data-X11/echoMode.1.png
index 1f5bae0..1f5bae0 100644
--- a/tests/auto/declarative/visual/qmlgraphicstextinput/data/echoMode.1.png
+++ b/tests/auto/declarative/visual/qdeclarativetextinput/data-X11/echoMode.1.png
diff --git a/tests/auto/declarative/visual/qmlgraphicstextinput/data/echoMode.2.png b/tests/auto/declarative/visual/qdeclarativetextinput/data-X11/echoMode.2.png
index cb2b5a4..cb2b5a4 100644
--- a/tests/auto/declarative/visual/qmlgraphicstextinput/data/echoMode.2.png
+++ b/tests/auto/declarative/visual/qdeclarativetextinput/data-X11/echoMode.2.png
diff --git a/tests/auto/declarative/visual/qmlgraphicstextinput/data/echoMode.3.png b/tests/auto/declarative/visual/qdeclarativetextinput/data-X11/echoMode.3.png
index aa24805..aa24805 100644
--- a/tests/auto/declarative/visual/qmlgraphicstextinput/data/echoMode.3.png
+++ b/tests/auto/declarative/visual/qdeclarativetextinput/data-X11/echoMode.3.png
diff --git a/tests/auto/declarative/visual/qmlgraphicstextinput/data/echoMode.4.png b/tests/auto/declarative/visual/qdeclarativetextinput/data-X11/echoMode.4.png
index aa24805..aa24805 100644
--- a/tests/auto/declarative/visual/qmlgraphicstextinput/data/echoMode.4.png
+++ b/tests/auto/declarative/visual/qdeclarativetextinput/data-X11/echoMode.4.png
diff --git a/tests/auto/declarative/visual/qmlgraphicstextinput/data-X11/echoMode.qml b/tests/auto/declarative/visual/qdeclarativetextinput/data-X11/echoMode.qml
index dd7b291..dd7b291 100644
--- a/tests/auto/declarative/visual/qmlgraphicstextinput/data-X11/echoMode.qml
+++ b/tests/auto/declarative/visual/qdeclarativetextinput/data-X11/echoMode.qml
diff --git a/tests/auto/declarative/visual/qmlgraphicstextinput/data/hAlign.0.png b/tests/auto/declarative/visual/qdeclarativetextinput/data-X11/hAlign.0.png
index 87c2e07..87c2e07 100644
--- a/tests/auto/declarative/visual/qmlgraphicstextinput/data/hAlign.0.png
+++ b/tests/auto/declarative/visual/qdeclarativetextinput/data-X11/hAlign.0.png
diff --git a/tests/auto/declarative/visual/qmlgraphicstextinput/data/hAlign.qml b/tests/auto/declarative/visual/qdeclarativetextinput/data-X11/hAlign.qml
index e29ac56..e29ac56 100644
--- a/tests/auto/declarative/visual/qmlgraphicstextinput/data/hAlign.qml
+++ b/tests/auto/declarative/visual/qdeclarativetextinput/data-X11/hAlign.qml
diff --git a/tests/auto/declarative/visual/qmlgraphicstextinput/data/cursorDelegate.0.png b/tests/auto/declarative/visual/qdeclarativetextinput/data/cursorDelegate.0.png
index f04f65e..f04f65e 100644
--- a/tests/auto/declarative/visual/qmlgraphicstextinput/data/cursorDelegate.0.png
+++ b/tests/auto/declarative/visual/qdeclarativetextinput/data/cursorDelegate.0.png
diff --git a/tests/auto/declarative/visual/qmlgraphicstextinput/data/cursorDelegate.1.png b/tests/auto/declarative/visual/qdeclarativetextinput/data/cursorDelegate.1.png
index 46a703a..46a703a 100644
--- a/tests/auto/declarative/visual/qmlgraphicstextinput/data/cursorDelegate.1.png
+++ b/tests/auto/declarative/visual/qdeclarativetextinput/data/cursorDelegate.1.png
diff --git a/tests/auto/declarative/visual/qmlgraphicstextinput/data/cursorDelegate.2.png b/tests/auto/declarative/visual/qdeclarativetextinput/data/cursorDelegate.2.png
index e4a3877..e4a3877 100644
--- a/tests/auto/declarative/visual/qmlgraphicstextinput/data/cursorDelegate.2.png
+++ b/tests/auto/declarative/visual/qdeclarativetextinput/data/cursorDelegate.2.png
diff --git a/tests/auto/declarative/visual/qmlgraphicstextinput/data/cursorDelegate.3.png b/tests/auto/declarative/visual/qdeclarativetextinput/data/cursorDelegate.3.png
index 9ef842a..9ef842a 100644
--- a/tests/auto/declarative/visual/qmlgraphicstextinput/data/cursorDelegate.3.png
+++ b/tests/auto/declarative/visual/qdeclarativetextinput/data/cursorDelegate.3.png
diff --git a/tests/auto/declarative/visual/qmlgraphicstextinput/data/cursorDelegate.4.png b/tests/auto/declarative/visual/qdeclarativetextinput/data/cursorDelegate.4.png
index 706e2b3..706e2b3 100644
--- a/tests/auto/declarative/visual/qmlgraphicstextinput/data/cursorDelegate.4.png
+++ b/tests/auto/declarative/visual/qdeclarativetextinput/data/cursorDelegate.4.png
diff --git a/tests/auto/declarative/visual/qmlgraphicstextinput/data/cursorDelegate.5.png b/tests/auto/declarative/visual/qdeclarativetextinput/data/cursorDelegate.5.png
index bcc86cc..bcc86cc 100644
--- a/tests/auto/declarative/visual/qmlgraphicstextinput/data/cursorDelegate.5.png
+++ b/tests/auto/declarative/visual/qdeclarativetextinput/data/cursorDelegate.5.png
diff --git a/tests/auto/declarative/visual/qmlgraphicstextinput/data/cursorDelegate.6.png b/tests/auto/declarative/visual/qdeclarativetextinput/data/cursorDelegate.6.png
index 51ddd44..51ddd44 100644
--- a/tests/auto/declarative/visual/qmlgraphicstextinput/data/cursorDelegate.6.png
+++ b/tests/auto/declarative/visual/qdeclarativetextinput/data/cursorDelegate.6.png
diff --git a/tests/auto/declarative/visual/qmlgraphicstextinput/data/cursorDelegate.7.png b/tests/auto/declarative/visual/qdeclarativetextinput/data/cursorDelegate.7.png
index 0a2fdda..0a2fdda 100644
--- a/tests/auto/declarative/visual/qmlgraphicstextinput/data/cursorDelegate.7.png
+++ b/tests/auto/declarative/visual/qdeclarativetextinput/data/cursorDelegate.7.png
diff --git a/tests/auto/declarative/visual/qmlgraphicstextinput/data/cursorDelegate.8.png b/tests/auto/declarative/visual/qdeclarativetextinput/data/cursorDelegate.8.png
index 9c88bff..9c88bff 100644
--- a/tests/auto/declarative/visual/qmlgraphicstextinput/data/cursorDelegate.8.png
+++ b/tests/auto/declarative/visual/qdeclarativetextinput/data/cursorDelegate.8.png
diff --git a/tests/auto/declarative/visual/qmlgraphicstextinput/data/cursorDelegate.qml b/tests/auto/declarative/visual/qdeclarativetextinput/data/cursorDelegate.qml
index df2dd38..df2dd38 100644
--- a/tests/auto/declarative/visual/qmlgraphicstextinput/data/cursorDelegate.qml
+++ b/tests/auto/declarative/visual/qdeclarativetextinput/data/cursorDelegate.qml
diff --git a/tests/auto/declarative/visual/qmlgraphicstextinput/data-X11/echoMode.0.png b/tests/auto/declarative/visual/qdeclarativetextinput/data/echoMode.0.png
index 2b45a06..2b45a06 100644
--- a/tests/auto/declarative/visual/qmlgraphicstextinput/data-X11/echoMode.0.png
+++ b/tests/auto/declarative/visual/qdeclarativetextinput/data/echoMode.0.png
diff --git a/tests/auto/declarative/visual/qmlgraphicstextinput/data-X11/echoMode.1.png b/tests/auto/declarative/visual/qdeclarativetextinput/data/echoMode.1.png
index 1f5bae0..1f5bae0 100644
--- a/tests/auto/declarative/visual/qmlgraphicstextinput/data-X11/echoMode.1.png
+++ b/tests/auto/declarative/visual/qdeclarativetextinput/data/echoMode.1.png
diff --git a/tests/auto/declarative/visual/qmlgraphicstextinput/data-X11/echoMode.2.png b/tests/auto/declarative/visual/qdeclarativetextinput/data/echoMode.2.png
index cb2b5a4..cb2b5a4 100644
--- a/tests/auto/declarative/visual/qmlgraphicstextinput/data-X11/echoMode.2.png
+++ b/tests/auto/declarative/visual/qdeclarativetextinput/data/echoMode.2.png
diff --git a/tests/auto/declarative/visual/qmlgraphicstextinput/data-X11/echoMode.3.png b/tests/auto/declarative/visual/qdeclarativetextinput/data/echoMode.3.png
index aa24805..aa24805 100644
--- a/tests/auto/declarative/visual/qmlgraphicstextinput/data-X11/echoMode.3.png
+++ b/tests/auto/declarative/visual/qdeclarativetextinput/data/echoMode.3.png
diff --git a/tests/auto/declarative/visual/qmlgraphicstextinput/data-X11/echoMode.4.png b/tests/auto/declarative/visual/qdeclarativetextinput/data/echoMode.4.png
index aa24805..aa24805 100644
--- a/tests/auto/declarative/visual/qmlgraphicstextinput/data-X11/echoMode.4.png
+++ b/tests/auto/declarative/visual/qdeclarativetextinput/data/echoMode.4.png
diff --git a/tests/auto/declarative/visual/qmlgraphicstextinput/data/echoMode.qml b/tests/auto/declarative/visual/qdeclarativetextinput/data/echoMode.qml
index 873a86d..873a86d 100644
--- a/tests/auto/declarative/visual/qmlgraphicstextinput/data/echoMode.qml
+++ b/tests/auto/declarative/visual/qdeclarativetextinput/data/echoMode.qml
diff --git a/tests/auto/declarative/visual/qmlgraphicstextinput/data-X11/hAlign.0.png b/tests/auto/declarative/visual/qdeclarativetextinput/data/hAlign.0.png
index 87c2e07..87c2e07 100644
--- a/tests/auto/declarative/visual/qmlgraphicstextinput/data-X11/hAlign.0.png
+++ b/tests/auto/declarative/visual/qdeclarativetextinput/data/hAlign.0.png
diff --git a/tests/auto/declarative/visual/qmlgraphicstextinput/data-X11/hAlign.qml b/tests/auto/declarative/visual/qdeclarativetextinput/data/hAlign.qml
index e29ac56..e29ac56 100644
--- a/tests/auto/declarative/visual/qmlgraphicstextinput/data-X11/hAlign.qml
+++ b/tests/auto/declarative/visual/qdeclarativetextinput/data/hAlign.qml
diff --git a/tests/auto/declarative/visual/qmlgraphicstextinput/echoMode.qml b/tests/auto/declarative/visual/qdeclarativetextinput/echoMode.qml
index b0b50e4..b0b50e4 100644
--- a/tests/auto/declarative/visual/qmlgraphicstextinput/echoMode.qml
+++ b/tests/auto/declarative/visual/qdeclarativetextinput/echoMode.qml
diff --git a/tests/auto/declarative/visual/qmlgraphicstextinput/hAlign.qml b/tests/auto/declarative/visual/qdeclarativetextinput/hAlign.qml
index 2d65adf..2d65adf 100644
--- a/tests/auto/declarative/visual/qmlgraphicstextinput/hAlign.qml
+++ b/tests/auto/declarative/visual/qdeclarativetextinput/hAlign.qml
diff --git a/tests/auto/declarative/visual/tst_visual.cpp b/tests/auto/declarative/visual/tst_visual.cpp
index 8f41bef..cd88e87 100644
--- a/tests/auto/declarative/visual/tst_visual.cpp
+++ b/tests/auto/declarative/visual/tst_visual.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 #include <qtest.h>
-#include <QmlView>
+#include <QDeclarativeView>
 #include <QApplication>
 #include <QLibraryInfo>
 #include <QDir>
@@ -65,30 +65,30 @@ private slots:
     void visual();
 
 private:
-    QString qmlviewer;
+    QString qmlruntime;
 };
 
 
 tst_visual::tst_visual() 
 {
-    qmlviewer = viewer();
+    qmlruntime = viewer();
 }
 
 QString tst_visual::viewer()
 {
     QString binaries = QLibraryInfo::location(QLibraryInfo::BinariesPath);
 
-    QString qmlviewer;
+    QString qmlruntime;
 
 #if defined(Q_WS_MAC)
-    qmlviewer = QDir(binaries).absoluteFilePath("qmlviewer.app/Contents/MacOS/qmlviewer");
+    qmlruntime = QDir(binaries).absoluteFilePath("qml.app/Contents/MacOS/qml");
 #elif defined(Q_WS_WIN)
-    qmlviewer = QDir(binaries).absoluteFilePath("qmlviewer.exe");
+    qmlruntime = QDir(binaries).absoluteFilePath("qml.exe");
 #else
-    qmlviewer = QDir(binaries).absoluteFilePath("qmlviewer");
+    qmlruntime = QDir(binaries).absoluteFilePath("qml");
 #endif
 
-    return qmlviewer;
+    return qmlruntime;
 }
 
 void tst_visual::visual_data()
@@ -118,7 +118,7 @@ void tst_visual::visual()
               << "-scriptopts" << "play,testimages,testerror,exitoncomplete,exitonfailure" 
               << file;
     QProcess p;
-    p.start(qmlviewer, arguments);
+    p.start(qmlruntime, arguments);
     QVERIFY(p.waitForFinished());
     if (p.exitCode() != 0)
         qDebug() << p.readAllStandardError();
@@ -211,7 +211,7 @@ void action(Mode mode, const QString &file)
     QStringList arguments;
     switch (mode) {
         case Test:
-            // Don't run qmlviewer
+            // Don't run qml
             break;
         case Record:
             arguments << "-script" << testdata