Rename QDeclarative symbols to QQuick and QQml

Symbols beginning with QDeclarative are already exported by the quick1 module. Users can apply the bin/rename-qtdeclarative-symbols.sh script to modify client code using the previous names of the renamed symbols. Task-number: QTBUG-23737 Change-Id: Ifaa482663767634931e8711a8e9bf6e404859e66 Reviewed-by: Martin Jones <martin.jones@nokia.com>
author: Matthew Vogt <matthew.vogt@nokia.com> 2012-02-16 14:43:03 +1000
committer: Qt by Nokia <qt-info@nokia.com> 2012-02-24 04:51:31 +0100
commit: b855240b782395f94315f43ea3e7e182299fac48 (patch)
tree: bc594c04449be8cd14cd0ab0bb72dafc2be0ffb2 /src/quick
parent: 6a42a6e0a9a1abdda0d07a5a20b4ac7e45348684 (diff)
295 files changed, 4783 insertions, 4772 deletions
diff --git a/src/quick/designer/designersupport.cpp b/src/quick/designer/designersupport.cpp
index d500e0a1ee..d389190642 100644
--- a/src/quick/designer/designersupport.cpp
+++ b/src/quick/designer/designersupport.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
@@ -44,9 +44,9 @@
 
 #include <QtQuick/private/qquickshadereffectsource_p.h>
 #include <QtQuick/private/qquickrectangle_p.h>
-#include <private/qdeclarativeengine_p.h>
+#include <private/qqmlengine_p.h>
 #include <private/qquickview_p.h>
-#include <QtQuick/private/qdeclarativestategroup_p.h>
+#include <QtQuick/private/qquickstategroup_p.h>
 #include <QtGui/QImage>
 
 QT_BEGIN_NAMESPACE
@@ -309,7 +309,7 @@ QQuickItem *DesignerSupport::anchorCenterInTargetItem(QQuickItem *item)
 
 
 
-QPair<QString, QObject*> DesignerSupport::anchorLineTarget(QQuickItem *item, const QString &name, QDeclarativeContext *context)
+QPair<QString, QObject*> DesignerSupport::anchorLineTarget(QQuickItem *item, const QString &name, QQmlContext *context)
 {
     QObject *targetObject = 0;
     QString targetName;
@@ -319,7 +319,7 @@ QPair<QString, QObject*> DesignerSupport::anchorLineTarget(QQuickItem *item, con
     } else if (name == QLatin1String("anchors.centerIn")) {
         targetObject = anchors(item)->centerIn();
     } else {
-        QDeclarativeProperty metaProperty(item, name, context);
+        QQmlProperty metaProperty(item, name, context);
         if (!metaProperty.isValid())
             return QPair<QString, QObject*>();
 
@@ -360,7 +360,7 @@ void DesignerSupport::resetAnchor(QQuickItem *item, const QString &name)
 QList<QObject*> DesignerSupport::statesForItem(QQuickItem *item)
 {
     QList<QObject*> objectList;
-    QList<QDeclarativeState *> stateList = QQuickItemPrivate::get(item)->_states()->states();
+    QList<QQuickState *> stateList = QQuickItemPrivate::get(item)->_states()->states();
     qCopy(stateList.begin(), stateList.end(), objectList.begin());
 
     return objectList;
@@ -380,9 +380,9 @@ int DesignerSupport::borderWidth(QQuickItem *item)
     return 0;
 }
 
-void DesignerSupport::refreshExpressions(QDeclarativeContext *context)
+void DesignerSupport::refreshExpressions(QQmlContext *context)
 {
-    QDeclarativeContextPrivate::get(context)->data->refreshExpressions();
+    QQmlContextPrivate::get(context)->data->refreshExpressions();
 }
 
 void DesignerSupport::setRootItem(QQuickView *view, QQuickItem *item)
diff --git a/src/quick/designer/designersupport.h b/src/quick/designer/designersupport.h
index e80a537859..a31c8c3d46 100644
--- a/src/quick/designer/designersupport.h
+++ b/src/quick/designer/designersupport.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
@@ -67,7 +67,7 @@ class QQuickItem;
 class QQuickShaderEffectTexture;
 class QImage;
 class QTransform;
-class QDeclarativeContext;
+class QQmlContext;
 class QQuickView;
 
 
@@ -122,7 +122,7 @@ public:
     static bool hasAnchor(QQuickItem *item, const QString &name);
     static QQuickItem *anchorFillTargetItem(QQuickItem *item);
     static QQuickItem *anchorCenterInTargetItem(QQuickItem *item);
-    static QPair<QString, QObject*> anchorLineTarget(QQuickItem *item, const QString &name, QDeclarativeContext *context);
+    static QPair<QString, QObject*> anchorLineTarget(QQuickItem *item, const QString &name, QQmlContext *context);
     static void resetAnchor(QQuickItem *item, const QString &name);
 
 
@@ -132,7 +132,7 @@ public:
 
     static int borderWidth(QQuickItem *item);
 
-    static void refreshExpressions(QDeclarativeContext *context);
+    static void refreshExpressions(QQmlContext *context);
 
     static void setRootItem(QQuickView *view, QQuickItem *item);
 
diff --git a/src/quick/items/context2d/qquickcanvascontext.cpp b/src/quick/items/context2d/qquickcanvascontext.cpp
index 3e6e51c89d..bb1065bd6a 100644
--- a/src/quick/items/context2d/qquickcanvascontext.cpp
+++ b/src/quick/items/context2d/qquickcanvascontext.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
diff --git a/src/quick/items/context2d/qquickcanvascontext_p.h b/src/quick/items/context2d/qquickcanvascontext_p.h
index 6a2edef7a8..37b5fa33fa 100644
--- a/src/quick/items/context2d/qquickcanvascontext_p.h
+++ b/src/quick/items/context2d/qquickcanvascontext_p.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
diff --git a/src/quick/items/context2d/qquickcanvasitem.cpp b/src/quick/items/context2d/qquickcanvasitem.cpp
index 7031294ecc..550ab20403 100644
--- a/src/quick/items/context2d/qquickcanvasitem.cpp
+++ b/src/quick/items/context2d/qquickcanvasitem.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
@@ -45,10 +45,10 @@
 #include <private/qquickcanvascontext_p.h>
 #include <private/qquickcontext2d_p.h>
 #include <private/qquickcanvasitemnode_p.h>
-#include <QtQuick/private/qdeclarativepixmapcache_p.h>
+#include <QtQuick/private/qquickpixmapcache_p.h>
 
-#include <qdeclarativeinfo.h>
-#include <private/qdeclarativeengine_p.h>
+#include <qqmlinfo.h>
+#include <private/qqmlengine_p.h>
 #include <QtCore/QBuffer>
 
 QT_BEGIN_NAMESPACE
@@ -71,7 +71,7 @@ public:
     QQuickCanvasItem::RenderTarget renderTarget;
     QQuickCanvasItem::RenderStrategy renderStrategy;
     QString contextType;
-    QHash<QUrl, QDeclarativePixmap*> images;
+    QHash<QUrl, QQuickPixmap*> images;
     QUrl baseUrl;
     QMap<int, v8::Persistent<v8::Function> > animationCallbacks;
 };
@@ -254,13 +254,13 @@ void QQuickCanvasItem::setContextType(const QString &contextType)
     this property will contain the current drawing context, otherwise null.
 */
 
-QDeclarativeV8Handle QQuickCanvasItem::context() const
+QQmlV8Handle QQuickCanvasItem::context() const
 {
     Q_D(const QQuickCanvasItem);
     if (d->contextInitialized)
-        return QDeclarativeV8Handle::fromHandle(d->context->v8value());
+        return QQmlV8Handle::fromHandle(d->context->v8value());
 
-    return QDeclarativeV8Handle::fromHandle(v8::Null());
+    return QQmlV8Handle::fromHandle(v8::Null());
 }
 
 /*!
@@ -532,7 +532,7 @@ void QQuickCanvasItem::updatePolish()
 
         foreach (int key, animationCallbacks.keys()) {
             v8::HandleScope handle_scope;
-            v8::Handle<v8::Object> self = QDeclarativeEnginePrivate::getV8Engine(qmlEngine(this))->newQObject(this).As<v8::Object>();
+            v8::Handle<v8::Object> self = QQmlEnginePrivate::getV8Engine(qmlEngine(this))->newQObject(this).As<v8::Object>();
             v8::Handle<v8::Value> args[] = { v8::Uint32::New(QDateTime::currentDateTimeUtc().toTime_t()) };
             v8::Persistent<v8::Function> f = animationCallbacks.value(key);
             f->Call(self, 1, args);
@@ -591,7 +591,7 @@ QSGNode *QQuickCanvasItem::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData
     Canvas only supports a 2d context.
 */
 
-void QQuickCanvasItem::getContext(QDeclarativeV8Function *args)
+void QQuickCanvasItem::getContext(QQmlV8Function *args)
 {
     Q_D(QQuickCanvasItem);
 
@@ -633,7 +633,7 @@ void QQuickCanvasItem::getContext(QDeclarativeV8Function *args)
     scene.
 */
 
-void QQuickCanvasItem::requestAnimationFrame(QDeclarativeV8Function *args)
+void QQuickCanvasItem::requestAnimationFrame(QQmlV8Function *args)
 {
     if (args->Length() < 1 || !(*args)[0]->IsFunction()) {
         qmlInfo(this) << "requestAnimationFrame should be called with an animation callback function";
@@ -659,7 +659,7 @@ void QQuickCanvasItem::requestAnimationFrame(QDeclarativeV8Function *args)
     This function will cancel the animation callback referenced by \a handle.
 */
 
-void QQuickCanvasItem::cancelRequestAnimationFrame(QDeclarativeV8Function *args)
+void QQuickCanvasItem::cancelRequestAnimationFrame(QQmlV8Function *args)
 {
     if (args->Length() < 1 || !(*args)[0]->IsInt32()) {
         qmlInfo(this) << "cancelRequestAnimationFrame should be called with an animation callback id";
@@ -737,7 +737,7 @@ QImage QQuickCanvasItem::loadedImage(const QUrl& url)
     if (!d->images.contains(fullPathUrl)) {
         loadImage(url);
     }
-    QDeclarativePixmap* pix = d->images.value(fullPathUrl);
+    QQuickPixmap* pix = d->images.value(fullPathUrl);
     if (pix->isLoading() || pix->isError()) {
         return QImage();
     }
@@ -760,12 +760,12 @@ void QQuickCanvasItem::loadImage(const QUrl& url)
     Q_D(QQuickCanvasItem);
     QUrl fullPathUrl = d->baseUrl.resolved(url);
     if (!d->images.contains(fullPathUrl)) {
-        QDeclarativePixmap* pix = new QDeclarativePixmap();
+        QQuickPixmap* pix = new QQuickPixmap();
         d->images.insert(fullPathUrl, pix);
 
         pix->load(qmlEngine(this)
                 , fullPathUrl
-                , QDeclarativePixmap::Cache | QDeclarativePixmap::Asynchronous);
+                , QQuickPixmap::Cache | QQuickPixmap::Asynchronous);
         if (pix->isLoading())
             pix->connectFinished(this, SIGNAL(imageLoaded()));
     }
@@ -918,7 +918,7 @@ void QQuickCanvasItem::initializeContext(QQuickCanvasContext *context, const QVa
 
     d->context = context;
     d->context->init(this, args);
-    d->context->setV8Engine(QDeclarativeEnginePrivate::getV8Engine(qmlEngine(this)));
+    d->context->setV8Engine(QQmlEnginePrivate::getV8Engine(qmlEngine(this)));
     d->contextInitialized = true;
     connect(d->context, SIGNAL(textureChanged()), SLOT(update()));
     connect(d->context, SIGNAL(textureChanged()), SIGNAL(painted()));
diff --git a/src/quick/items/context2d/qquickcanvasitem_p.h b/src/quick/items/context2d/qquickcanvasitem_p.h
index 0dad629eea..9a57733d4c 100644
--- a/src/quick/items/context2d/qquickcanvasitem_p.h
+++ b/src/quick/items/context2d/qquickcanvasitem_p.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
@@ -60,7 +60,7 @@ class Q_QUICK_EXPORT QQuickCanvasItem : public QQuickItem
 
     Q_PROPERTY(bool available READ isAvailable NOTIFY availableChanged);
     Q_PROPERTY(QString contextType READ contextType WRITE setContextType NOTIFY contextTypeChanged)
-    Q_PROPERTY(QDeclarativeV8Handle context READ context NOTIFY contextChanged);
+    Q_PROPERTY(QQmlV8Handle context READ context NOTIFY contextChanged);
     Q_PROPERTY(QSizeF canvasSize READ canvasSize WRITE setCanvasSize NOTIFY canvasSizeChanged)
     Q_PROPERTY(QSize tileSize READ tileSize WRITE setTileSize NOTIFY tileSizeChanged)
     Q_PROPERTY(QRectF canvasWindow READ canvasWindow WRITE setCanvasWindow NOTIFY canvasWindowChanged)
@@ -87,7 +87,7 @@ public:
     QString contextType() const;
     void setContextType(const QString &contextType);
 
-    QDeclarativeV8Handle context() const;
+    QQmlV8Handle context() const;
 
     QSizeF canvasSize() const;
     void setCanvasSize(const QSizeF &);
@@ -108,10 +108,10 @@ public:
 
     QImage toImage(const QRectF& rect = QRectF()) const;
 
-    Q_INVOKABLE void getContext(QDeclarativeV8Function *args);
+    Q_INVOKABLE void getContext(QQmlV8Function *args);
 
-    Q_INVOKABLE void requestAnimationFrame(QDeclarativeV8Function *args);
-    Q_INVOKABLE void cancelRequestAnimationFrame(QDeclarativeV8Function *args);
+    Q_INVOKABLE void requestAnimationFrame(QQmlV8Function *args);
+    Q_INVOKABLE void cancelRequestAnimationFrame(QQmlV8Function *args);
 
     Q_INVOKABLE void requestPaint();
     Q_INVOKABLE void markDirty(const QRectF& dirtyRect = QRectF());
diff --git a/src/quick/items/context2d/qquickcanvasitemnode.cpp b/src/quick/items/context2d/qquickcanvasitemnode.cpp
index b9347dd33c..5a2dd80ff1 100644
--- a/src/quick/items/context2d/qquickcanvasitemnode.cpp
+++ b/src/quick/items/context2d/qquickcanvasitemnode.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
diff --git a/src/quick/items/context2d/qquickcanvasitemnode_p.h b/src/quick/items/context2d/qquickcanvasitemnode_p.h
index 77181c64e6..7eb7d2aec5 100644
--- a/src/quick/items/context2d/qquickcanvasitemnode_p.h
+++ b/src/quick/items/context2d/qquickcanvasitemnode_p.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
diff --git a/src/quick/items/context2d/qquickcontext2d.cpp b/src/quick/items/context2d/qquickcontext2d.cpp
index ba709b7f66..fc2ada2867 100644
--- a/src/quick/items/context2d/qquickcontext2d.cpp
+++ b/src/quick/items/context2d/qquickcontext2d.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
@@ -49,17 +49,17 @@
 
 #include <QtCore/qdebug.h>
 #include <QtQuick/private/qsgcontext_p.h>
-#include <private/qdeclarativesvgparser_p.h>
-#include <private/qdeclarativepath_p.h>
+#include <private/qquicksvgparser_p.h>
+#include <private/qquickpath_p.h>
 
 #include <private/qquickimage_p_p.h>
 
 #include <QtGui/qguiapplication.h>
-#include <qdeclarativeinfo.h>
+#include <qqmlinfo.h>
 #include <QtCore/qmath.h>
 #include <private/qv8engine_p.h>
 
-#include <qdeclarativeengine.h>
+#include <qqmlengine.h>
 #include <private/qv8domerrors_p.h>
 #include <QtCore/qnumeric.h>
 
@@ -1586,12 +1586,12 @@ static void ctx2d_path_set(v8::Local<v8::String>, v8::Local<v8::Value> value, co
 
     r->context->beginPath();
     if (value->IsObject()) {
-        QDeclarativePath* path = qobject_cast<QDeclarativePath*>(engine->toQObject(value));
+        QQuickPath* path = qobject_cast<QQuickPath*>(engine->toQObject(value));
         if (path)
             r->context->m_path = path->path();
     } else {
         QString path = engine->toString(value->ToString());
-        QDeclarativeSvgParser::parsePathDataFast(path, r->context->m_path);
+        QQuickSvgParser::parsePathDataFast(path, r->context->m_path);
     }
     r->context->m_v8path = value;
 }
diff --git a/src/quick/items/context2d/qquickcontext2d_p.h b/src/quick/items/context2d/qquickcontext2d_p.h
index 3cabb6b198..239a244739 100644
--- a/src/quick/items/context2d/qquickcontext2d_p.h
+++ b/src/quick/items/context2d/qquickcontext2d_p.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
@@ -43,8 +43,8 @@
 #define QQUICKCONTEXT2D_P_H
 
 #include <QtQuick/qtquickglobal.h>
-#include <QtDeclarative/qdeclarative.h>
-#include <QtDeclarative/qdeclarativecomponent.h>
+#include <QtQml/qqml.h>
+#include <QtQml/qqmlcomponent.h>
 #include <private/qquickcanvascontext_p.h>
 #include <private/qquickcanvasitem_p.h>
 #include <QtGui/qpainter.h>
@@ -67,7 +67,7 @@ QT_BEGIN_NAMESPACE
 
 class QQuickContext2DCommandBuffer;
 class QQuickContext2DTexture;
-class QDeclarativePixmap;
+class QQuickPixmap;
 class QSGTexture;
 
 class QLockedCommandBuffer {
diff --git a/src/quick/items/context2d/qquickcontext2dcommandbuffer.cpp b/src/quick/items/context2d/qquickcontext2dcommandbuffer.cpp
index 7342999864..591fc216a4 100644
--- a/src/quick/items/context2d/qquickcontext2dcommandbuffer.cpp
+++ b/src/quick/items/context2d/qquickcontext2dcommandbuffer.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
@@ -41,7 +41,7 @@
 
 #include "qquickcontext2dcommandbuffer_p.h"
 #include "qquickcanvasitem_p.h"
-#include <qdeclarative.h>
+#include <qqml.h>
 #include <QtCore/QMutex>
 
 #define HAS_SHADOW(offsetX, offsetY, blur, color) (color.isValid() && color.alpha() && (blur || offsetX || offsetY))
diff --git a/src/quick/items/context2d/qquickcontext2dcommandbuffer_p.h b/src/quick/items/context2d/qquickcontext2dcommandbuffer_p.h
index fc4c1a3a9c..f33c43a936 100644
--- a/src/quick/items/context2d/qquickcontext2dcommandbuffer_p.h
+++ b/src/quick/items/context2d/qquickcontext2dcommandbuffer_p.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
@@ -44,7 +44,7 @@
 
 #include <QtCore/qmutex.h>
 #include "qquickcontext2d_p.h"
-#include <QtQuick/private/qdeclarativepixmapcache_p.h>
+#include <QtQuick/private/qquickpixmapcache_p.h>
 
 
 QT_BEGIN_HEADER
diff --git a/src/quick/items/context2d/qquickcontext2dtexture.cpp b/src/quick/items/context2d/qquickcontext2dtexture.cpp
index 5d0c0ab63e..28460e2164 100644
--- a/src/quick/items/context2d/qquickcontext2dtexture.cpp
+++ b/src/quick/items/context2d/qquickcontext2dtexture.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
diff --git a/src/quick/items/context2d/qquickcontext2dtexture_p.h b/src/quick/items/context2d/qquickcontext2dtexture_p.h
index bd4d4ff72c..9e00ece16c 100644
--- a/src/quick/items/context2d/qquickcontext2dtexture_p.h
+++ b/src/quick/items/context2d/qquickcontext2dtexture_p.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
diff --git a/src/quick/items/context2d/qquickcontext2dtile.cpp b/src/quick/items/context2d/qquickcontext2dtile.cpp
index 284cdcef83..dd416e15af 100644
--- a/src/quick/items/context2d/qquickcontext2dtile.cpp
+++ b/src/quick/items/context2d/qquickcontext2dtile.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
diff --git a/src/quick/items/context2d/qquickcontext2dtile_p.h b/src/quick/items/context2d/qquickcontext2dtile_p.h
index e05030cb88..2e6d61c8f2 100644
--- a/src/quick/items/context2d/qquickcontext2dtile_p.h
+++ b/src/quick/items/context2d/qquickcontext2dtile_p.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
diff --git a/src/quick/items/items.pri b/src/quick/items/items.pri
index f02c769c3a..9a3b24c328 100644
--- a/src/quick/items/items.pri
+++ b/src/quick/items/items.pri
@@ -58,8 +58,8 @@ HEADERS += \
     $$PWD/qquickclipnode_p.h \
     $$PWD/qquickview.h \
     $$PWD/qquickview_p.h \
-    $$PWD/qquickanimation_p.h \
-    $$PWD/qquickanimation_p_p.h \
+    $$PWD/qquickitemanimation_p.h \
+    $$PWD/qquickitemanimation_p_p.h \
     $$PWD/qquickstateoperations_p.h \
     $$PWD/qquickimplicitsizeitem_p.h \
     $$PWD/qquickimplicitsizeitem_p_p.h \
@@ -111,7 +111,7 @@ SOURCES += \
     $$PWD/qquicktranslate.cpp \
     $$PWD/qquickclipnode.cpp \
     $$PWD/qquickview.cpp \
-    $$PWD/qquickanimation.cpp \
+    $$PWD/qquickitemanimation.cpp \
     $$PWD/qquickstateoperations.cpp \
     $$PWD/qquickimplicitsizeitem.cpp \
     $$PWD/qquickspriteengine.cpp \
diff --git a/src/quick/items/qquickaccessibleattached.cpp b/src/quick/items/qquickaccessibleattached.cpp
index b28c28ba29..177454eedc 100644
--- a/src/quick/items/qquickaccessibleattached.cpp
+++ b/src/quick/items/qquickaccessibleattached.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
diff --git a/src/quick/items/qquickaccessibleattached_p.h b/src/quick/items/qquickaccessibleattached_p.h
index 02b427337e..5eea44b6e4 100644
--- a/src/quick/items/qquickaccessibleattached_p.h
+++ b/src/quick/items/qquickaccessibleattached_p.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
diff --git a/src/quick/items/qquickanchors.cpp b/src/quick/items/qquickanchors.cpp
index 2df304e15d..b7071b9598 100644
--- a/src/quick/items/qquickanchors.cpp
+++ b/src/quick/items/qquickanchors.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
@@ -44,7 +44,7 @@
 #include "qquickitem.h"
 #include "qquickitem_p.h"
 
-#include <qdeclarativeinfo.h>
+#include <qqmlinfo.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/quick/items/qquickanchors_p.h b/src/quick/items/qquickanchors_p.h
index 52248db3b8..9076fbe697 100644
--- a/src/quick/items/qquickanchors_p.h
+++ b/src/quick/items/qquickanchors_p.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
@@ -42,7 +42,7 @@
 #ifndef QQUICKANCHORS_P_H
 #define QQUICKANCHORS_P_H
 
-#include <qdeclarative.h>
+#include <qqml.h>
 
 #include <QtCore/QObject>
 
diff --git a/src/quick/items/qquickanchors_p_p.h b/src/quick/items/qquickanchors_p_p.h
index b2b587932b..1814185980 100644
--- a/src/quick/items/qquickanchors_p_p.h
+++ b/src/quick/items/qquickanchors_p_p.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
diff --git a/src/quick/items/qquickanimatedimage.cpp b/src/quick/items/qquickanimatedimage.cpp
index 7bea56cc53..eef20db361 100644
--- a/src/quick/items/qquickanimatedimage.cpp
+++ b/src/quick/items/qquickanimatedimage.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
@@ -44,12 +44,12 @@
 
 #ifndef QT_NO_MOVIE
 
-#include <QtDeclarative/qdeclarativeinfo.h>
+#include <QtQml/qqmlinfo.h>
 #include <QtGui/qmovie.h>
 #include <QtNetwork/qnetworkrequest.h>
 #include <QtNetwork/qnetworkreply.h>
 
-#include <private/qdeclarativeengine_p.h>
+#include <private/qqmlengine_p.h>
 
 QT_BEGIN_NAMESPACE
 /*!
@@ -82,7 +82,7 @@ QT_BEGIN_NAMESPACE
     \bold Note: Unlike images, animated images are not cached or shared internally.
 
     \clearfloat
-    \snippet doc/src/snippets/declarative/animatedimage.qml document
+    \snippet doc/src/snippets/qml/animatedimage.qml document
 
     \sa BorderImage, Image
 */
@@ -95,7 +95,7 @@ QT_BEGIN_NAMESPACE
     AnimatedImage can handle any image format supported by Qt, loaded from any
     URL scheme supported by Qt.
 
-    \sa QDeclarativeImageProvider
+    \sa QQmlImageProvider
 */
 
 /*!
@@ -264,7 +264,7 @@ void QQuickAnimatedImage::load()
         if (d->progress != oldProgress)
             emit progressChanged(d->progress);
     } else {
-        QString lf = QDeclarativeEnginePrivate::urlToLocalFileOrQrc(d->url);
+        QString lf = QQmlEnginePrivate::urlToLocalFileOrQrc(d->url);
         if (!lf.isEmpty()) {
             //### should be unified with movieRequestFinished
             d->_movie = new QMovie(lf);
diff --git a/src/quick/items/qquickanimatedimage_p.h b/src/quick/items/qquickanimatedimage_p.h
index 3c1f77d674..86910199ac 100644
--- a/src/quick/items/qquickanimatedimage_p.h
+++ b/src/quick/items/qquickanimatedimage_p.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
diff --git a/src/quick/items/qquickanimatedimage_p_p.h b/src/quick/items/qquickanimatedimage_p_p.h
index b1288d78a1..95142f5f1f 100644
--- a/src/quick/items/qquickanimatedimage_p_p.h
+++ b/src/quick/items/qquickanimatedimage_p_p.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
diff --git a/src/quick/items/qquickborderimage.cpp b/src/quick/items/qquickborderimage.cpp
index 67b5cdf737..5beb345afc 100644
--- a/src/quick/items/qquickborderimage.cpp
+++ b/src/quick/items/qquickborderimage.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
@@ -43,10 +43,11 @@
 #include "qquickborderimage_p_p.h"
 #include "qquickninepatchnode_p.h"
 
-#include <QtDeclarative/qdeclarativeinfo.h>
+#include <QtQml/qqmlinfo.h>
 #include <QtCore/qfile.h>
 
-#include <private/qdeclarativeengine_p.h>
+#include <private/qqmlglobal_p.h>
+#include <private/qqmlengine_p.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -97,7 +98,7 @@ QT_BEGIN_NAMESPACE
     used to determine the parts of the image that will lie inside the unscaled corner
     areas and the parts that will be stretched horizontally and vertically.
 
-    \snippet doc/src/snippets/declarative/borderimage/normal-image.qml normal image
+    \snippet doc/src/snippets/qml/borderimage/normal-image.qml normal image
 
     \clearfloat
     \beginfloatleft
@@ -111,7 +112,7 @@ QT_BEGIN_NAMESPACE
     is set to \l{BorderImage::verticalTileMode}{BorderImage.Stretch}, the parts of image
     in regions 4 and 6 are stretched vertically.
 
-    \snippet doc/src/snippets/declarative/borderimage/borderimage-scaled.qml scaled border image
+    \snippet doc/src/snippets/qml/borderimage/borderimage-scaled.qml scaled border image
 
     \clearfloat
     \beginfloatleft
@@ -125,7 +126,7 @@ QT_BEGIN_NAMESPACE
     \l{BorderImage::verticalTileMode}{BorderImage.Repeat}, the parts of image in regions
     4 and 6 are tiled so that they fill the space at the left and right of the element.
 
-    \snippet doc/src/snippets/declarative/borderimage/borderimage-tiled.qml tiled border image
+    \snippet doc/src/snippets/qml/borderimage/borderimage-tiled.qml tiled border image
 
     \clearfloat
     In some situations, the width of regions 2 and 8 may not be an exact multiple of the width
@@ -256,7 +257,7 @@ QQuickBorderImage::~QQuickBorderImage()
 
     The URL may be absolute, or relative to the URL of the component.
 
-    \sa QDeclarativeImageProvider
+    \sa QQmlImageProvider
 */
 
 /*!
@@ -305,7 +306,7 @@ void QQuickBorderImage::load()
     } else {
         d->status = Loading;
         if (d->url.path().endsWith(QLatin1String("sci"))) {
-            QString lf = QDeclarativeEnginePrivate::urlToLocalFileOrQrc(d->url);
+            QString lf = QQmlEnginePrivate::urlToLocalFileOrQrc(d->url);
             if (!lf.isEmpty()) {
                 QFile file(lf);
                 file.open(QIODevice::ReadOnly);
@@ -317,11 +318,11 @@ void QQuickBorderImage::load()
             }
         } else {
 
-            QDeclarativePixmap::Options options;
+            QQuickPixmap::Options options;
             if (d->async)
-                options |= QDeclarativePixmap::Asynchronous;
+                options |= QQuickPixmap::Asynchronous;
             if (d->cache)
-                options |= QDeclarativePixmap::Cache;
+                options |= QQuickPixmap::Cache;
             d->pix.clear(this);
             d->pix.load(qmlEngine(this), d->url, options);
 
@@ -448,11 +449,11 @@ void QQuickBorderImage::setGridScaledImage(const QQuickGridScaledImage& sci)
 
         d->sciurl = d->url.resolved(QUrl(sci.pixmapUrl()));
 
-        QDeclarativePixmap::Options options;
+        QQuickPixmap::Options options;
         if (d->async)
-            options |= QDeclarativePixmap::Asynchronous;
+            options |= QQuickPixmap::Asynchronous;
         if (d->cache)
-            options |= QDeclarativePixmap::Cache;
+            options |= QQuickPixmap::Cache;
         d->pix.clear(this);
         d->pix.load(qmlEngine(this), d->sciurl, options);
 
diff --git a/src/quick/items/qquickborderimage_p.h b/src/quick/items/qquickborderimage_p.h
index 93dc452e87..80532b7082 100644
--- a/src/quick/items/qquickborderimage_p.h
+++ b/src/quick/items/qquickborderimage_p.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
diff --git a/src/quick/items/qquickborderimage_p_p.h b/src/quick/items/qquickborderimage_p_p.h
index b9b5723a06..07a62b4d29 100644
--- a/src/quick/items/qquickborderimage_p_p.h
+++ b/src/quick/items/qquickborderimage_p_p.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
@@ -56,6 +56,8 @@
 #include "qquickimagebase_p_p.h"
 #include "qquickscalegrid_p_p.h"
 
+#include <private/qqmlglobal_p.h>
+
 QT_BEGIN_NAMESPACE
 
 class QNetworkReply;
diff --git a/src/quick/items/qquickcanvas.cpp b/src/quick/items/qquickcanvas.cpp
index a9df484a98..1e1db18723 100644
--- a/src/quick/items/qquickcanvas.cpp
+++ b/src/quick/items/qquickcanvas.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
@@ -65,11 +65,11 @@
 #include <QtGui/qstylehints.h>
 #include <QtCore/qvarlengtharray.h>
 #include <QtCore/qabstractanimation.h>
-#include <QtDeclarative/qdeclarativeincubator.h>
+#include <QtQml/qqmlincubator.h>
 
-#include <QtQuick/private/qdeclarativepixmapcache_p.h>
+#include <QtQuick/private/qquickpixmapcache_p.h>
 
-#include <private/qdeclarativeprofilerservice_p.h>
+#include <private/qqmlprofilerservice_p.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -83,7 +83,7 @@ void QQuickCanvasPrivate::updateFocusItemTransform()
         qApp->inputMethod()->setInputItemTransform(QQuickItemPrivate::get(focus)->itemToCanvasTransform());
 }
 
-class QQuickCanvasIncubationController : public QObject, public QDeclarativeIncubationController
+class QQuickCanvasIncubationController : public QObject, public QQmlIncubationController
 {
 public:
     QQuickCanvasIncubationController(QQuickCanvasPrivate *canvas)
@@ -340,7 +340,7 @@ void QQuickCanvasPrivate::init(QQuickCanvas *c)
     engine->setCanvas(q);
 }
 
-QDeclarativeListProperty<QObject> QQuickCanvasPrivate::data()
+QQmlListProperty<QObject> QQuickCanvasPrivate::data()
 {
     initRootItem();
     return QQuickItemPrivate::get(rootItem)->data();
@@ -663,7 +663,7 @@ void QQuickCanvasPrivate::clearFocusInScope(QQuickItem *scope, QQuickItem *item,
 
 void QQuickCanvasPrivate::notifyFocusChangesRecur(QQuickItem **items, int remaining)
 {
-    QDeclarativeGuard<QQuickItem> item(*items);
+    QQmlGuard<QQuickItem> item(*items);
 
     if (remaining)
         notifyFocusChangesRecur(items + 1, remaining - 1);
@@ -761,7 +761,7 @@ void QQuickCanvas::releaseResources()
 {
     Q_D(QQuickCanvas);
     d->windowManager->releaseResources();
-    QDeclarativePixmap::purgeCache();
+    QQuickPixmap::purgeCache();
 }
 
 
@@ -2044,12 +2044,12 @@ QImage QQuickCanvas::grabFrameBuffer()
 /*!
     Returns an incubation controller that splices incubation between frames
     for this canvas. QQuickView automatically installs this controller for you,
-    otherwise you will need to install it yourself using \l{QDeclarativeEngine::setIncubationController}
+    otherwise you will need to install it yourself using \l{QQmlEngine::setIncubationController}
 
     The controller is owned by the canvas and will be destroyed when the canvas
     is deleted.
 */
-QDeclarativeIncubationController *QQuickCanvas::incubationController() const
+QQmlIncubationController *QQuickCanvas::incubationController() const
 {
     Q_D(const QQuickCanvas);
 
diff --git a/src/quick/items/qquickcanvas.h b/src/quick/items/qquickcanvas.h
index 3246d53a42..0b6b01b05a 100644
--- a/src/quick/items/qquickcanvas.h
+++ b/src/quick/items/qquickcanvas.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
@@ -58,13 +58,13 @@ class QSGTexture;
 class QInputMethodEvent;
 class QQuickCanvasPrivate;
 class QOpenGLFramebufferObject;
-class QDeclarativeIncubationController;
+class QQmlIncubationController;
 class QInputMethodEvent;
 
 class Q_QUICK_EXPORT QQuickCanvas : public QWindow
 {
     Q_OBJECT
-    Q_PRIVATE_PROPERTY(QQuickCanvas::d_func(), QDeclarativeListProperty<QObject> data READ data DESIGNABLE false)
+    Q_PRIVATE_PROPERTY(QQuickCanvas::d_func(), QQmlListProperty<QObject> data READ data DESIGNABLE false)
     Q_PROPERTY(QColor color READ clearColor WRITE setClearColor NOTIFY clearColorChanged)
     Q_CLASSINFO("DefaultProperty", "data")
     Q_DECLARE_PRIVATE(QQuickCanvas)
@@ -100,7 +100,7 @@ public:
     uint renderTargetId() const;
     QSize renderTargetSize() const;
 
-    QDeclarativeIncubationController *incubationController() const;
+    QQmlIncubationController *incubationController() const;
 
     virtual QAccessibleInterface *accessibleRoot() const;
 
diff --git a/src/quick/items/qquickcanvas_p.h b/src/quick/items/qquickcanvas_p.h
index d4d6a01f75..147526466e 100644
--- a/src/quick/items/qquickcanvas_p.h
+++ b/src/quick/items/qquickcanvas_p.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
@@ -55,7 +55,7 @@
 
 #include "qquickitem.h"
 #include "qquickcanvas.h"
-#include <private/qdeclarativeguard_p.h>
+#include <private/qqmlguard_p.h>
 
 #include <QtQuick/private/qsgcontext_p.h>
 #include <private/qquickdrag_p.h>
@@ -108,7 +108,7 @@ public:
 
     QQuickRootItem *rootItem;
     QSet<QQuickItem *> parentlessItems;
-    QDeclarativeListProperty<QObject> data();
+    QQmlListProperty<QObject> data();
 
     QQuickItem *activeFocusItem;
     QQuickItem *mouseGrabberItem;
diff --git a/src/quick/items/qquickclipnode.cpp b/src/quick/items/qquickclipnode.cpp
index 168e973927..f9894edb48 100644
--- a/src/quick/items/qquickclipnode.cpp
+++ b/src/quick/items/qquickclipnode.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
diff --git a/src/quick/items/qquickclipnode_p.h b/src/quick/items/qquickclipnode_p.h
index a48972532c..02902a758e 100644
--- a/src/quick/items/qquickclipnode_p.h
+++ b/src/quick/items/qquickclipnode_p.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
diff --git a/src/quick/items/qquickdrag.cpp b/src/quick/items/qquickdrag.cpp
index c44e1acd4b..f8c1281af5 100644
--- a/src/quick/items/qquickdrag.cpp
+++ b/src/quick/items/qquickdrag.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
@@ -45,7 +45,7 @@
 #include <QtQuick/private/qquickevents_p_p.h>
 #include <private/qquickitemchangelistener_p.h>
 #include <private/qv8engine_p.h>
-#include <QtDeclarative/qdeclarativeinfo.h>
+#include <QtQml/qqmlinfo.h>
 #include <QtGui/qevent.h>
 
 QT_BEGIN_NAMESPACE
@@ -76,8 +76,8 @@ public:
 
     QQuickDragGrabber dragGrabber;
 
-    QDeclarativeGuard<QObject> source;
-    QDeclarativeGuard<QObject> target;
+    QQmlGuard<QObject> source;
+    QQmlGuard<QObject> target;
     QQuickItem *attachedItem;
     QQuickDragMimeData *mimeData;
     Qt::DropAction proposedAction;
@@ -106,7 +106,7 @@ public:
     However, dragging is not limited to mouse drags, anything that can move an item
     can generate drag events, this can include touch events, animations and bindings.
 
-    \snippet doc/src/snippets/declarative/drag.qml 0
+    \snippet doc/src/snippets/qml/drag.qml 0
 
     A drag can be terminated either by canceling it with Drag.cancel() or setting
     Drag.active to false, or it can be terminated with a drop event by calling
@@ -377,7 +377,7 @@ void QQuickDragAttachedPrivate::start(Qt::DropActions supportedActions)
     property for the started sequence.
 */
 
-void QQuickDragAttached::start(QDeclarativeV8Function *args)
+void QQuickDragAttached::start(QQmlV8Function *args)
 {
     Q_D(QQuickDragAttached);
     if (d->inEvent) {
diff --git a/src/quick/items/qquickdrag_p.h b/src/quick/items/qquickdrag_p.h
index eca3927624..ac19c021e0 100644
--- a/src/quick/items/qquickdrag_p.h
+++ b/src/quick/items/qquickdrag_p.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
@@ -60,10 +60,10 @@ class QQuickDragPrivate;
 
 class QQuickDragGrabber
 {
-    class Item : public QDeclarativeGuard<QQuickItem>
+    class Item : public QQmlGuard<QQuickItem>
     {
     public:
-        Item(QQuickItem *item) : QDeclarativeGuard<QQuickItem>(item) {}
+        Item(QQuickItem *item) : QQmlGuard<QQuickItem>(item) {}
 
         QIntrusiveListNode node;
     protected:
@@ -142,7 +142,7 @@ private:
     friend class QQuickDragAttachedPrivate;
 };
 
-class QDeclarativeV8Function;
+class QQmlV8Function;
 
 class QQuickDragAttachedPrivate;
 class QQuickDragAttached : public QObject
@@ -183,7 +183,7 @@ public:
     Q_INVOKABLE int drop();
 
 public Q_SLOTS:
-    void start(QDeclarativeV8Function *);
+    void start(QQmlV8Function *);
     void cancel();
 
 Q_SIGNALS:
diff --git a/src/quick/items/qquickdroparea.cpp b/src/quick/items/qquickdroparea.cpp
index 0534fb5bb0..ed5fb23658 100644
--- a/src/quick/items/qquickdroparea.cpp
+++ b/src/quick/items/qquickdroparea.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
@@ -44,7 +44,7 @@
 #include "qquickitem_p.h"
 #include "qquickcanvas.h"
 
-#include <private/qdeclarativeengine_p.h>
+#include <private/qqmlengine_p.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -74,8 +74,8 @@ public:
     QRegExp keyRegExp;
     QPointF dragPosition;
     QQuickDropAreaDrag *drag;
-    QDeclarativeGuard<QObject> source;
-    QDeclarativeGuard<QMimeData> mimeData;
+    QQmlGuard<QObject> source;
+    QQmlGuard<QMimeData> mimeData;
 };
 
 QQuickDropAreaPrivate::QQuickDropAreaPrivate()
@@ -409,7 +409,7 @@ QStringList QQuickDropEvent::keys() const
     If an \a action is specified it will overwrite the value of the \l action property.
 */
 
-void QQuickDropEvent::accept(QDeclarativeV8Function *args)
+void QQuickDropEvent::accept(QQmlV8Function *args)
 {
     Qt::DropAction action = event->dropAction();
 
diff --git a/src/quick/items/qquickdroparea_p.h b/src/quick/items/qquickdroparea_p.h
index 6fdfc4b03b..e207787198 100644
--- a/src/quick/items/qquickdroparea_p.h
+++ b/src/quick/items/qquickdroparea_p.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
@@ -44,7 +44,7 @@
 
 #include "qquickitem.h"
 
-#include <private/qdeclarativeguard_p.h>
+#include <private/qqmlguard_p.h>
 #include <private/qv8engine_p.h>
 
 #include <QtGui/qevent.h>
@@ -82,7 +82,7 @@ public:
     bool accepted() const { return event->isAccepted(); }
     void setAccepted(bool accepted) { event->setAccepted(accepted); }
 
-    Q_INVOKABLE void accept(QDeclarativeV8Function *);
+    Q_INVOKABLE void accept(QQmlV8Function *);
 
 private:
     QQuickDropAreaPrivate *d;
diff --git a/src/quick/items/qquickevents.cpp b/src/quick/items/qquickevents.cpp
index 6e7769f1d3..597e64eb18 100644
--- a/src/quick/items/qquickevents.cpp
+++ b/src/quick/items/qquickevents.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
diff --git a/src/quick/items/qquickevents_p_p.h b/src/quick/items/qquickevents_p_p.h
index 1d13a19fed..e69d44303b 100644
--- a/src/quick/items/qquickevents_p_p.h
+++ b/src/quick/items/qquickevents_p_p.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
@@ -54,7 +54,7 @@
 //
 
 #include <QtQuick/qtquickglobal.h>
-#include <qdeclarative.h>
+#include <qqml.h>
 
 #include <QtCore/qobject.h>
 #include <QtGui/qvector2d.h>
diff --git a/src/quick/items/qquickflickable.cpp b/src/quick/items/qquickflickable.cpp
index 43aaf92b1a..ef67549780 100644
--- a/src/quick/items/qquickflickable.cpp
+++ b/src/quick/items/qquickflickable.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
@@ -45,7 +45,9 @@
 #include "qquickcanvas_p.h"
 #include "qquickevents_p_p.h"
 
-#include <QtDeclarative/qdeclarativeinfo.h>
+#include <private/qqmlglobal_p.h>
+
+#include <QtQml/qqmlinfo.h>
 #include <QtGui/qevent.h>
 #include <QtGui/qguiapplication.h>
 #include <QtGui/qstylehints.h>
@@ -204,7 +206,7 @@ QQuickFlickablePrivate::QQuickFlickablePrivate()
 void QQuickFlickablePrivate::init()
 {
     Q_Q(QQuickFlickable);
-    QDeclarative_setParent_noEvent(contentItem, q);
+    QQml_setParent_noEvent(contentItem, q);
     contentItem->setParentItem(q);
     FAST_CONNECT(&timeline, SIGNAL(completed()), q, SLOT(movementEnding()))
     q->setAcceptedMouseButtons(Qt::LeftButton);
@@ -277,7 +279,7 @@ void QQuickFlickablePrivate::flickY(qreal velocity)
 }
 
 void QQuickFlickablePrivate::flick(AxisData &data, qreal minExtent, qreal maxExtent, qreal,
-                                         QDeclarativeTimeLineCallback::Callback fixupCallback, qreal velocity)
+                                         QQuickTimeLineCallback::Callback fixupCallback, qreal velocity)
 {
     Q_Q(QQuickFlickable);
     qreal maxDistance = -1;
@@ -303,7 +305,7 @@ void QQuickFlickablePrivate::flick(AxisData &data, qreal minExtent, qreal maxExt
             timeline.accel(data.move, v, deceleration);
         else
             timeline.accel(data.move, v, deceleration, maxDistance);
-        timeline.callback(QDeclarativeTimeLineCallback(&data.move, fixupCallback, this));
+        timeline.callback(QQuickTimeLineCallback(&data.move, fixupCallback, this));
         if (!hData.flicking && q->xflick() && (&data == &hData)) {
             hData.flicking = true;
             emit q->flickingChanged();
@@ -507,7 +509,7 @@ is finished.
     The following example shows a small view onto a large image in which the
     user can drag or flick the image in order to view different parts of it.
 
-    \snippet doc/src/snippets/declarative/flickable.qml document
+    \snippet doc/src/snippets/qml/flickable.qml document
 
     \clearfloat
 
@@ -569,9 +571,9 @@ is finished.
 
     These properties are typically used to draw a scrollbar. For example:
 
-    \snippet doc/src/snippets/declarative/flickableScrollbar.qml 0
+    \snippet doc/src/snippets/qml/flickableScrollbar.qml 0
     \dots 8
-    \snippet doc/src/snippets/declarative/flickableScrollbar.qml 1
+    \snippet doc/src/snippets/qml/flickableScrollbar.qml 1
 
     \sa {declarative/ui-components/scrollbar}{scrollbar example}
 */
@@ -1302,7 +1304,7 @@ void QQuickFlickable::viewportMoved()
         qreal maxDistance = d->overShootDistance(height());
         d->timeline.reset(d->vData.move);
         d->timeline.accel(d->vData.move, -d->vData.smoothVelocity.value(), d->deceleration*QML_FLICK_OVERSHOOTFRICTION, maxDistance);
-        d->timeline.callback(QDeclarativeTimeLineCallback(&d->vData.move, d->fixupY_callback, d));
+        d->timeline.callback(QQuickTimeLineCallback(&d->vData.move, d->fixupY_callback, d));
     }
     if (!d->hData.inOvershoot && !d->hData.fixingUp && d->hData.flicking
             && (d->hData.move.value() > minXExtent() || d->hData.move.value() < maxXExtent())
@@ -1312,7 +1314,7 @@ void QQuickFlickable::viewportMoved()
         qreal maxDistance = d->overShootDistance(width());
         d->timeline.reset(d->hData.move);
         d->timeline.accel(d->hData.move, -d->hData.smoothVelocity.value(), d->deceleration*QML_FLICK_OVERSHOOTFRICTION, maxDistance);
-        d->timeline.callback(QDeclarativeTimeLineCallback(&d->hData.move, d->fixupX_callback, d));
+        d->timeline.callback(QQuickTimeLineCallback(&d->hData.move, d->fixupX_callback, d));
     }
 
     d->lastFlickablePosition = QPointF(d->hData.move.value(), d->vData.move.value());
@@ -1386,7 +1388,7 @@ void QQuickFlickable::cancelFlick()
     movementEnding();
 }
 
-void QQuickFlickablePrivate::data_append(QDeclarativeListProperty<QObject> *prop, QObject *o)
+void QQuickFlickablePrivate::data_append(QQmlListProperty<QObject> *prop, QObject *o)
 {
     QQuickItem *i = qobject_cast<QQuickItem *>(o);
     if (i) {
@@ -1396,33 +1398,33 @@ void QQuickFlickablePrivate::data_append(QDeclarativeListProperty<QObject> *prop
     }
 }
 
-int QQuickFlickablePrivate::data_count(QDeclarativeListProperty<QObject> *)
+int QQuickFlickablePrivate::data_count(QQmlListProperty<QObject> *)
 {
     // XXX todo
     return 0;
 }
 
-QObject *QQuickFlickablePrivate::data_at(QDeclarativeListProperty<QObject> *, int)
+QObject *QQuickFlickablePrivate::data_at(QQmlListProperty<QObject> *, int)
 {
     // XXX todo
     return 0;
 }
 
-void QQuickFlickablePrivate::data_clear(QDeclarativeListProperty<QObject> *)
+void QQuickFlickablePrivate::data_clear(QQmlListProperty<QObject> *)
 {
     // XXX todo
 }
 
-QDeclarativeListProperty<QObject> QQuickFlickable::flickableData()
+QQmlListProperty<QObject> QQuickFlickable::flickableData()
 {
     Q_D(QQuickFlickable);
-    return QDeclarativeListProperty<QObject>(this, (void *)d, QQuickFlickablePrivate::data_append,
+    return QQmlListProperty<QObject>(this, (void *)d, QQuickFlickablePrivate::data_append,
                                              QQuickFlickablePrivate::data_count,
                                              QQuickFlickablePrivate::data_at,
                                              QQuickFlickablePrivate::data_clear);
 }
 
-QDeclarativeListProperty<QQuickItem> QQuickFlickable::flickableChildren()
+QQmlListProperty<QQuickItem> QQuickFlickable::flickableChildren()
 {
     Q_D(QQuickFlickable);
     return QQuickItemPrivate::get(d->contentItem)->children();
@@ -1475,7 +1477,7 @@ void QQuickFlickable::setBoundsBehavior(BoundsBehavior b)
     The following snippet shows how these properties are used to display
     an image that is larger than the Flickable item itself:
 
-    \snippet doc/src/snippets/declarative/flickable.qml document
+    \snippet doc/src/snippets/qml/flickable.qml document
 
     In some cases, the the content dimensions can be automatically set
     using the \l {Item::childrenRect.width}{childrenRect.width}
diff --git a/src/quick/items/qquickflickable_p.h b/src/quick/items/qquickflickable_p.h
index 9d6ca94770..7a19b0c05a 100644
--- a/src/quick/items/qquickflickable_p.h
+++ b/src/quick/items/qquickflickable_p.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
@@ -97,8 +97,8 @@ class Q_QUICK_EXPORT QQuickFlickable : public QQuickItem
 
     Q_PROPERTY(bool pixelAligned READ pixelAligned WRITE setPixelAligned NOTIFY pixelAlignedChanged)
 
-    Q_PROPERTY(QDeclarativeListProperty<QObject> flickableData READ flickableData)
-    Q_PROPERTY(QDeclarativeListProperty<QQuickItem> flickableChildren READ flickableChildren)
+    Q_PROPERTY(QQmlListProperty<QObject> flickableData READ flickableData)
+    Q_PROPERTY(QQmlListProperty<QQuickItem> flickableChildren READ flickableChildren)
     Q_CLASSINFO("DefaultProperty", "flickableData")
 
     Q_ENUMS(FlickableDirection)
@@ -108,8 +108,8 @@ public:
     QQuickFlickable(QQuickItem *parent=0);
     ~QQuickFlickable();
 
-    QDeclarativeListProperty<QObject> flickableData();
-    QDeclarativeListProperty<QQuickItem> flickableChildren();
+    QQmlListProperty<QObject> flickableData();
+    QQmlListProperty<QQuickItem> flickableChildren();
 
     enum BoundsBehavior { StopAtBounds, DragOverBounds, DragAndOvershootBounds };
     BoundsBehavior boundsBehavior() const;
diff --git a/src/quick/items/qquickflickable_p_p.h b/src/quick/items/qquickflickable_p_p.h
index 7b16f1ac52..ac6f2fffed 100644
--- a/src/quick/items/qquickflickable_p_p.h
+++ b/src/quick/items/qquickflickable_p_p.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
@@ -57,12 +57,12 @@
 #include "qquickitem_p.h"
 #include "qquickitemchangelistener_p.h"
 
-#include <QtDeclarative/qdeclarative.h>
+#include <QtQml/qqml.h>
 #include <QtCore/qdatetime.h>
 #include "qplatformdefs.h"
 
-#include <private/qdeclarativetimeline_p_p.h>
-#include <private/qdeclarativeanimation_p_p.h>
+#include <private/qquicktimeline_p_p.h>
+#include <private/qquickanimation_p_p.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -80,13 +80,13 @@ public:
     QQuickFlickablePrivate();
     void init();
 
-    struct Velocity : public QDeclarativeTimeLineValue
+    struct Velocity : public QQuickTimeLineValue
     {
         Velocity(QQuickFlickablePrivate *p)
             : parent(p) {}
         virtual void setValue(qreal v) {
             if (v != value()) {
-                QDeclarativeTimeLineValue::setValue(v);
+                QQuickTimeLineValue::setValue(v);
                 parent->updateVelocity();
             }
         }
@@ -119,7 +119,7 @@ public:
         void addVelocitySample(qreal v, qreal maxVelocity);
         void updateVelocity();
 
-        QDeclarativeTimeLineValueProxy<QQuickFlickablePrivate> move;
+        QQuickTimeLineValueProxy<QQuickFlickablePrivate> move;
         qreal viewSize;
         qreal pressPos;
         qreal dragStartOffset;
@@ -148,7 +148,7 @@ public:
     void flickX(qreal velocity);
     void flickY(qreal velocity);
     virtual void flick(AxisData &data, qreal minExtent, qreal maxExtent, qreal vSize,
-                        QDeclarativeTimeLineCallback::Callback fixupCallback, qreal velocity);
+                        QQuickTimeLineCallback::Callback fixupCallback, qreal velocity);
 
     void fixupX();
     void fixupY();
@@ -176,7 +176,7 @@ public:
     AxisData hData;
     AxisData vData;
 
-    QDeclarativeTimeLine timeline;
+    QQuickTimeLine timeline;
     bool hMoved : 1;
     bool vMoved : 1;
     bool stealMouse : 1;
@@ -209,7 +209,7 @@ public:
 
     void updateVelocity();
     int vTime;
-    QDeclarativeTimeLine velocityTimeline;
+    QQuickTimeLine velocityTimeline;
     QQuickFlickableVisibleArea *visibleArea;
     QQuickFlickable::FlickableDirection flickableDirection;
     QQuickFlickable::BoundsBehavior boundsBehavior;
@@ -221,10 +221,10 @@ public:
     qint64 computeCurrentTime(QInputEvent *event);
 
     // flickableData property
-    static void data_append(QDeclarativeListProperty<QObject> *, QObject *);
-    static int data_count(QDeclarativeListProperty<QObject> *);
-    static QObject *data_at(QDeclarativeListProperty<QObject> *, int);
-    static void data_clear(QDeclarativeListProperty<QObject> *);
+    static void data_append(QQmlListProperty<QObject> *, QObject *);
+    static int data_count(QQmlListProperty<QObject> *);
+    static QObject *data_at(QQmlListProperty<QObject> *, int);
+    static void data_clear(QQmlListProperty<QObject> *);
 };
 
 class QQuickFlickableVisibleArea : public QObject
diff --git a/src/quick/items/qquickflipable.cpp b/src/quick/items/qquickflipable.cpp
index a29c6f0d83..f454ce54d5 100644
--- a/src/quick/items/qquickflipable.cpp
+++ b/src/quick/items/qquickflipable.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
@@ -42,9 +42,9 @@
 #include "qquickflipable_p.h"
 #include "qquickitem_p.h"
 
-#include <private/qdeclarativeguard_p.h>
+#include <private/qqmlguard_p.h>
 
-#include <QtDeclarative/qdeclarativeinfo.h>
+#include <QtQml/qqmlinfo.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -78,9 +78,9 @@ public:
     void setBackTransform();
 
     QQuickFlipable::Side current;
-    QDeclarativeGuard<QQuickLocalTransform> backTransform;
-    QDeclarativeGuard<QQuickItem> front;
-    QDeclarativeGuard<QQuickItem> back;
+    QQmlGuard<QQuickLocalTransform> backTransform;
+    QQmlGuard<QQuickItem> front;
+    QQmlGuard<QQuickItem> back;
 
     bool sideDirty;
     bool wantBackXFlipped;
@@ -113,7 +113,7 @@ public:
     degrees to produce the flipping effect. When \c flipped is false, the
     item reverts to the default state, in which the \c angle value is 0.
 
-    \snippet doc/src/snippets/declarative/flipable/flipable.qml 0
+    \snippet doc/src/snippets/qml/flipable/flipable.qml 0
 
     \image flipable.gif
 
diff --git a/src/quick/items/qquickflipable_p.h b/src/quick/items/qquickflipable_p.h
index cf17bce314..dd53ec3d49 100644
--- a/src/quick/items/qquickflipable_p.h
+++ b/src/quick/items/qquickflipable_p.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
diff --git a/src/quick/items/qquickfocusscope.cpp b/src/quick/items/qquickfocusscope.cpp
index b1d3516d3b..7ef2476b30 100644
--- a/src/quick/items/qquickfocusscope.cpp
+++ b/src/quick/items/qquickfocusscope.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
diff --git a/src/quick/items/qquickfocusscope_p.h b/src/quick/items/qquickfocusscope_p.h
index 889b45ca1c..6d43dbb619 100644
--- a/src/quick/items/qquickfocusscope_p.h
+++ b/src/quick/items/qquickfocusscope_p.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
diff --git a/src/quick/items/qquickgridview.cpp b/src/quick/items/qquickgridview.cpp
index d7f4b808f2..a57d0ee778 100644
--- a/src/quick/items/qquickgridview.cpp
+++ b/src/quick/items/qquickgridview.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
@@ -44,7 +44,7 @@
 #include "qquickflickable_p_p.h"
 #include "qquickitemview_p_p.h"
 
-#include <private/qdeclarativesmoothedanimation_p_p.h>
+#include <private/qquicksmoothedanimation_p_p.h>
 #include <private/qlistmodelinterface_p.h>
 
 #include <QtGui/qevent.h>
@@ -193,7 +193,7 @@ public:
 
     virtual void setPosition(qreal pos);
     virtual void layoutVisibleItems(int fromModelIndex = 0);
-    virtual bool applyInsertionChange(const QDeclarativeChangeSet::Insert &insert, ChangeResult *changeResult, QList<FxViewItem *> *addedItems, QList<MovedItem> *movingIntoView);
+    virtual bool applyInsertionChange(const QQuickChangeSet::Insert &insert, ChangeResult *changeResult, QList<FxViewItem *> *addedItems, QList<MovedItem> *movingIntoView);
     virtual void translateAndTransitionItemsAfter(int afterModelIndex, const ChangeResult &insertionResult, const ChangeResult &removalResult);
     virtual bool needsRefillForAddedOrRemovedIndex(int index) const;
 
@@ -211,7 +211,7 @@ public:
     virtual void fixupPosition();
     virtual void fixup(AxisData &data, qreal minExtent, qreal maxExtent);
     virtual void flick(QQuickItemViewPrivate::AxisData &data, qreal minExtent, qreal maxExtent, qreal vSize,
-                        QDeclarativeTimeLineCallback::Callback fixupCallback, qreal velocity);
+                        QQuickTimeLineCallback::Callback fixupCallback, qreal velocity);
 
     QQuickGridView::Flow flow;
     qreal cellWidth;
@@ -692,10 +692,10 @@ void QQuickGridViewPrivate::createHighlight()
             if (autoHighlight)
                 resetHighlightPosition();
             highlightXAnimator = new QSmoothedAnimation;
-            highlightXAnimator->target = QDeclarativeProperty(item, QLatin1String("x"));
+            highlightXAnimator->target = QQmlProperty(item, QLatin1String("x"));
             highlightXAnimator->userDuration = highlightMoveDuration;
             highlightYAnimator = new QSmoothedAnimation;
-            highlightYAnimator->target = QDeclarativeProperty(item, QLatin1String("y"));
+            highlightYAnimator->target = QQmlProperty(item, QLatin1String("y"));
             highlightYAnimator->userDuration = highlightMoveDuration;
 
             highlight = newHighlight;
@@ -960,7 +960,7 @@ void QQuickGridViewPrivate::fixup(AxisData &data, qreal minExtent, qreal maxExte
 }
 
 void QQuickGridViewPrivate::flick(AxisData &data, qreal minExtent, qreal maxExtent, qreal vSize,
-                                        QDeclarativeTimeLineCallback::Callback fixupCallback, qreal velocity)
+                                        QQuickTimeLineCallback::Callback fixupCallback, qreal velocity)
 {
     Q_Q(QQuickGridView);
     data.fixingUp = false;
@@ -1060,7 +1060,7 @@ void QQuickGridViewPrivate::flick(AxisData &data, qreal minExtent, qreal maxExte
         }
         timeline.reset(data.move);
         timeline.accel(data.move, v, accel, maxDistance + overshootDist);
-        timeline.callback(QDeclarativeTimeLineCallback(&data.move, fixupCallback, this));
+        timeline.callback(QQuickTimeLineCallback(&data.move, fixupCallback, this));
         if (!hData.flicking && q->xflick()) {
             hData.flicking = true;
             emit q->flickingChanged();
@@ -1103,7 +1103,7 @@ void QQuickGridViewPrivate::flick(AxisData &data, qreal minExtent, qreal maxExte
     The following example shows the definition of a simple list model defined
     in a file called \c ContactModel.qml:
 
-    \snippet doc/src/snippets/declarative/gridview/ContactModel.qml 0
+    \snippet doc/src/snippets/qml/gridview/ContactModel.qml 0
 
     \div {class="float-right"}
     \inlineimage gridview-simple.png
@@ -1117,9 +1117,9 @@ void QQuickGridViewPrivate::flick(AxisData &data, qreal minExtent, qreal maxExte
     (containing \l Image and \l Text elements) for its delegate.
 
     \clearfloat
-    \snippet doc/src/snippets/declarative/gridview/gridview.qml import
+    \snippet doc/src/snippets/qml/gridview/gridview.qml import
     \codeline
-    \snippet doc/src/snippets/declarative/gridview/gridview.qml classdocs simple
+    \snippet doc/src/snippets/qml/gridview/gridview.qml classdocs simple
 
     \div {class="float-right"}
     \inlineimage gridview-highlight.png
@@ -1132,7 +1132,7 @@ void QQuickGridViewPrivate::flick(AxisData &data, qreal minExtent, qreal maxExte
     into a separate \c contactDelegate component.
 
     \clearfloat
-    \snippet doc/src/snippets/declarative/gridview/gridview.qml classdocs advanced
+    \snippet doc/src/snippets/qml/gridview/gridview.qml classdocs advanced
 
     The currently selected item is highlighted with a blue \l Rectangle using the \l highlight property,
     and \c focus is set to \c true to enable keyboard navigation for the grid view.
@@ -1146,7 +1146,7 @@ void QQuickGridViewPrivate::flick(AxisData &data, qreal minExtent, qreal maxExte
     this attached property directly as \c GridView.isCurrentItem, while the child
     \c contactInfo object must refer to this property as \c wrapper.GridView.isCurrentItem.
 
-    \snippet doc/src/snippets/declarative/gridview/gridview.qml isCurrentItem
+    \snippet doc/src/snippets/qml/gridview/gridview.qml isCurrentItem
 
     \note Views do not set the \l{Item::}{clip} property automatically.
     If the view is not clipped by another item or the screen, it will be necessary
@@ -1190,7 +1190,7 @@ void QQuickGridView::setHighlightFollowsCurrentItem(bool autoHighlight)
 
     It is attached to each instance of the delegate.
 
-    \snippet doc/src/snippets/declarative/gridview/gridview.qml isCurrentItem
+    \snippet doc/src/snippets/qml/gridview/gridview.qml isCurrentItem
 */
 
 /*!
@@ -1202,7 +1202,7 @@ void QQuickGridView::setHighlightFollowsCurrentItem(bool autoHighlight)
     until an animation completes. The example delegate below ensures that the
     animation completes before the item is removed from the list.
 
-    \snippet doc/src/snippets/declarative/gridview/gridview.qml delayRemove
+    \snippet doc/src/snippets/qml/gridview/gridview.qml delayRemove
 
     If a \l remove transition has been specified, it will not be applied until
     delayRemove is returned to \c false.
@@ -1310,7 +1310,7 @@ void QQuickGridView::setHighlightFollowsCurrentItem(bool autoHighlight)
 
     Here is a highlight with its motion defined by a \l {SpringAnimation} item:
 
-    \snippet doc/src/snippets/declarative/gridview/gridview.qml highlightFollowsCurrentItem
+    \snippet doc/src/snippets/qml/gridview/gridview.qml highlightFollowsCurrentItem
 */
 
 
@@ -2051,7 +2051,7 @@ void QQuickGridView::moveCurrentIndexRight()
     }
 }
 
-bool QQuickGridViewPrivate::applyInsertionChange(const QDeclarativeChangeSet::Insert &change, ChangeResult *insertResult, QList<FxViewItem *> *addedItems, QList<MovedItem> *movingIntoView)
+bool QQuickGridViewPrivate::applyInsertionChange(const QQuickChangeSet::Insert &change, ChangeResult *insertResult, QList<FxViewItem *> *addedItems, QList<MovedItem> *movingIntoView)
 {
     Q_Q(QQuickGridView);
 
diff --git a/src/quick/items/qquickgridview_p.h b/src/quick/items/qquickgridview_p.h
index b8f44ed0e1..ac3c8f097d 100644
--- a/src/quick/items/qquickgridview_p.h
+++ b/src/quick/items/qquickgridview_p.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
@@ -44,7 +44,7 @@
 
 #include "qquickitemview_p.h"
 
-#include <private/qdeclarativeguard_p.h>
+#include <private/qqmlguard_p.h>
 
 QT_BEGIN_HEADER
 
@@ -131,7 +131,7 @@ Q_SIGNALS:
     void viewChanged();
 
 public:
-    QDeclarativeGuard<QQuickGridView> m_view;
+    QQmlGuard<QQuickGridView> m_view;
 };
 
 
diff --git a/src/quick/items/qquickimage.cpp b/src/quick/items/qquickimage.cpp
index a71c666977..a939365e98 100644
--- a/src/quick/items/qquickimage.cpp
+++ b/src/quick/items/qquickimage.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
@@ -120,7 +120,7 @@ QQuickImagePrivate::QQuickImagePrivate()
 
     The following example shows the simplest usage of the Image element.
 
-    \snippet doc/src/snippets/declarative/image.qml document
+    \snippet doc/src/snippets/qml/image.qml document
 
     \beginfloatleft
     \image declarative-qtlogo.png
@@ -147,7 +147,7 @@ QQuickImagePrivate::QQuickImagePrivate()
     size bounded via the \l sourceSize property. This is especially important for content
     that is loaded from external sources or provided by the user.
 
-    \sa {declarative/imageelements/image}{Image example}, QDeclarativeImageProvider
+    \sa {declarative/imageelements/image}{Image example}, QQmlImageProvider
 */
 
 QQuickImage::QQuickImage(QQuickItem *parent)
@@ -431,7 +431,7 @@ qreal QQuickImage::paintedHeight() const
 
     The URL may be absolute, or relative to the URL of the component.
 
-    \sa QDeclarativeImageProvider
+    \sa QQmlImageProvider
 */
 
 /*!
diff --git a/src/quick/items/qquickimage_p.h b/src/quick/items/qquickimage_p.h
index 35337dfd09..a9e37b47e1 100644
--- a/src/quick/items/qquickimage_p.h
+++ b/src/quick/items/qquickimage_p.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
diff --git a/src/quick/items/qquickimage_p_p.h b/src/quick/items/qquickimage_p_p.h
index 25e267ccff..6a0ba1535f 100644
--- a/src/quick/items/qquickimage_p_p.h
+++ b/src/quick/items/qquickimage_p_p.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
diff --git a/src/quick/items/qquickimagebase.cpp b/src/quick/items/qquickimagebase.cpp
index 8b127ba571..0bdfab67a9 100644
--- a/src/quick/items/qquickimagebase.cpp
+++ b/src/quick/items/qquickimagebase.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
@@ -42,7 +42,7 @@
 #include "qquickimagebase_p.h"
 #include "qquickimagebase_p_p.h"
 
-#include <QtDeclarative/qdeclarativeinfo.h>
+#include <QtQml/qqmlinfo.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -202,11 +202,11 @@ void QQuickImageBase::load()
         emit statusChanged(d->status);
         update();
     } else {
-        QDeclarativePixmap::Options options;
+        QQuickPixmap::Options options;
         if (d->async)
-            options |= QDeclarativePixmap::Asynchronous;
+            options |= QQuickPixmap::Asynchronous;
         if (d->cache)
-            options |= QDeclarativePixmap::Cache;
+            options |= QQuickPixmap::Cache;
         d->pix.clear(this);
         pixmapChange();
         d->pix.load(qmlEngine(this), d->url, d->explicitSourceSize ? sourceSize() : QSize(), options);
diff --git a/src/quick/items/qquickimagebase_p.h b/src/quick/items/qquickimagebase_p.h
index bbda9dba9a..dfff1e4b0e 100644
--- a/src/quick/items/qquickimagebase_p.h
+++ b/src/quick/items/qquickimagebase_p.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
diff --git a/src/quick/items/qquickimagebase_p_p.h b/src/quick/items/qquickimagebase_p_p.h
index dd9185676f..7c2fce1e79 100644
--- a/src/quick/items/qquickimagebase_p_p.h
+++ b/src/quick/items/qquickimagebase_p_p.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
@@ -56,7 +56,7 @@
 #include "qquickimplicitsizeitem_p_p.h"
 #include "qquickimagebase_p.h"
 
-#include <QtQuick/private/qdeclarativepixmapcache_p.h>
+#include <QtQuick/private/qquickpixmapcache_p.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -76,7 +76,7 @@ public:
     {
     }
 
-    QDeclarativePixmap pix;
+    QQuickPixmap pix;
     QQuickImageBase::Status status;
     QUrl url;
     qreal progress;
diff --git a/src/quick/items/qquickimplicitsizeitem.cpp b/src/quick/items/qquickimplicitsizeitem.cpp
index 040263e35a..427be42312 100644
--- a/src/quick/items/qquickimplicitsizeitem.cpp
+++ b/src/quick/items/qquickimplicitsizeitem.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
diff --git a/src/quick/items/qquickimplicitsizeitem_p.h b/src/quick/items/qquickimplicitsizeitem_p.h
index 5c4bac3585..a6d58325d8 100644
--- a/src/quick/items/qquickimplicitsizeitem_p.h
+++ b/src/quick/items/qquickimplicitsizeitem_p.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
diff --git a/src/quick/items/qquickimplicitsizeitem_p_p.h b/src/quick/items/qquickimplicitsizeitem_p_p.h
index 15ca8b3127..84e3027e64 100644
--- a/src/quick/items/qquickimplicitsizeitem_p_p.h
+++ b/src/quick/items/qquickimplicitsizeitem_p_p.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
diff --git a/src/quick/items/qquickitem.cpp b/src/quick/items/qquickitem.cpp
index 04f4c1f801..357c72cc71 100644
--- a/src/quick/items/qquickitem.cpp
+++ b/src/quick/items/qquickitem.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
@@ -42,15 +42,15 @@
 #include "qquickitem.h"
 
 #include "qquickcanvas.h"
-#include <QtDeclarative/qjsengine.h>
+#include <QtQml/qjsengine.h>
 #include "qquickcanvas_p.h"
 
 #include "qquickevents_p_p.h"
 #include "qquickscreen_p.h"
 
-#include <QtDeclarative/qdeclarativeengine.h>
-#include <QtDeclarative/qdeclarativecomponent.h>
-#include <QtDeclarative/qdeclarativeinfo.h>
+#include <QtQml/qqmlengine.h>
+#include <QtQml/qqmlcomponent.h>
+#include <QtQml/qqmlinfo.h>
 #include <QtGui/qpen.h>
 #include <QtGui/qcursor.h>
 #include <QtGui/qguiapplication.h>
@@ -59,13 +59,14 @@
 #include <QtCore/qcoreevent.h>
 #include <QtCore/qnumeric.h>
 
-#include <private/qdeclarativeengine_p.h>
-#include <QtQuick/private/qdeclarativestategroup_p.h>
-#include <private/qdeclarativeopenmetaobject_p.h>
-#include <QtQuick/private/qdeclarativestate_p.h>
+#include <private/qqmlglobal_p.h>
+#include <private/qqmlengine_p.h>
+#include <QtQuick/private/qquickstategroup_p.h>
+#include <private/qqmlopenmetaobject_p.h>
+#include <QtQuick/private/qquickstate_p.h>
 #include <private/qlistmodelinterface_p.h>
 #include <private/qquickitem_p.h>
-#include <private/qdeclarativeaccessors_p.h>
+#include <private/qqmlaccessors_p.h>
 #include <QtQuick/private/qquickaccessibleattached_p.h>
 
 #include <float.h>
@@ -74,7 +75,7 @@
 
 QT_BEGIN_NAMESPACE
 
-static void QQuickItem_parentNotifier(QObject *o, intptr_t, QDeclarativeNotifier **n)
+static void QQuickItem_parentNotifier(QObject *o, intptr_t, QQmlNotifier **n)
 {
     QQuickItemPrivate *d = QQuickItemPrivate::get(static_cast<QQuickItem *>(o));
     *n = &d->parentNotifier;
@@ -86,11 +87,11 @@ QML_PRIVATE_ACCESSOR(QQuickItem, qreal, y, y)
 QML_PRIVATE_ACCESSOR(QQuickItem, qreal, width, width)
 QML_PRIVATE_ACCESSOR(QQuickItem, qreal, height, height)
 
-static QDeclarativeAccessors QQuickItem_parent = { QQuickItem_parentRead, QQuickItem_parentNotifier };
-static QDeclarativeAccessors QQuickItem_x = { QQuickItem_xRead, 0 };
-static QDeclarativeAccessors QQuickItem_y = { QQuickItem_yRead, 0 };
-static QDeclarativeAccessors QQuickItem_width = { QQuickItem_widthRead, 0 };
-static QDeclarativeAccessors QQuickItem_height = { QQuickItem_heightRead, 0 };
+static QQmlAccessors QQuickItem_parent = { QQuickItem_parentRead, QQuickItem_parentNotifier };
+static QQmlAccessors QQuickItem_x = { QQuickItem_xRead, 0 };
+static QQmlAccessors QQuickItem_y = { QQuickItem_yRead, 0 };
+static QQmlAccessors QQuickItem_width = { QQuickItem_widthRead, 0 };
+static QQmlAccessors QQuickItem_height = { QQuickItem_heightRead, 0 };
 
 QML_DECLARE_PROPERTIES(QQuickItem) {
     { QML_PROPERTY_NAME(parent), 0, &QQuickItem_parent },
@@ -233,7 +234,7 @@ void QQuickItemPrivate::registerAccessorProperties()
     rotations you must specify the axis to rotate around in addition to the origin point.
 
     The following example shows various 3D-like rotations applied to an \l Image.
-    \snippet doc/src/snippets/declarative/rotation.qml 0
+    \snippet doc/src/snippets/qml/rotation.qml 0
 
     \image axisrotation.png
 
@@ -491,7 +492,7 @@ void QQuickItemKeyFilter::componentComplete()
 
     The following example provides key navigation for a 2x2 grid of items:
 
-    \snippet doc/src/snippets/declarative/keynavigation.qml 0
+    \snippet doc/src/snippets/qml/keynavigation.qml 0
 
     The top-left item initially receives focus by setting \l {Item::}{focus} to
     \c true. When an arrow key is pressed, the focus will move to the
@@ -912,13 +913,13 @@ bool QQuickKeysAttachedPrivate::isConnected(const char *signalName)
     be used to test for a certain key; in this case, the left cursor
     key:
 
-    \snippet doc/src/snippets/declarative/keys/keys-pressed.qml key item
+    \snippet doc/src/snippets/qml/keys/keys-pressed.qml key item
 
     Some keys may alternatively be handled via specific signal properties,
     for example \e onSelectPressed.  These handlers automatically set
     \e event.accepted to true.
 
-    \snippet doc/src/snippets/declarative/keys/keys-handler.qml key item
+    \snippet doc/src/snippets/qml/keys/keys-handler.qml key item
 
     See \l{Qt::Key}{Qt.Key} for the list of keyboard codes.
 
@@ -1460,7 +1461,7 @@ QQuickKeysAttached *QQuickKeysAttached::qmlAttachedProperties(QObject *obj)
     from left to right by default, they are now positioned from right to left instead, as demonstrated
     by the numbering and opacity of the items:
 
-    \snippet doc/src/snippets/declarative/layoutmirroring.qml 0
+    \snippet doc/src/snippets/qml/layoutmirroring.qml 0
 
     \image layoutmirroring.png
 
@@ -2351,7 +2352,7 @@ void QQuickItemPrivate::init(QQuickItem *parent)
     }
 }
 
-void QQuickItemPrivate::data_append(QDeclarativeListProperty<QObject> *prop, QObject *o)
+void QQuickItemPrivate::data_append(QQmlListProperty<QObject> *prop, QObject *o)
 {
     if (!o)
         return;
@@ -2410,14 +2411,14 @@ void QQuickItemPrivate::data_append(QDeclarativeListProperty<QObject> *prop, QOb
     specify it.
  */
 
-int QQuickItemPrivate::data_count(QDeclarativeListProperty<QObject> *prop)
+int QQuickItemPrivate::data_count(QQmlListProperty<QObject> *prop)
 {
     Q_UNUSED(prop);
     // XXX todo
     return 0;
 }
 
-QObject *QQuickItemPrivate::data_at(QDeclarativeListProperty<QObject> *prop, int i)
+QObject *QQuickItemPrivate::data_at(QQmlListProperty<QObject> *prop, int i)
 {
     Q_UNUSED(prop);
     Q_UNUSED(i);
@@ -2425,13 +2426,13 @@ QObject *QQuickItemPrivate::data_at(QDeclarativeListProperty<QObject> *prop, int
     return 0;
 }
 
-void QQuickItemPrivate::data_clear(QDeclarativeListProperty<QObject> *prop)
+void QQuickItemPrivate::data_clear(QQmlListProperty<QObject> *prop)
 {
     Q_UNUSED(prop);
     // XXX todo
 }
 
-QObject *QQuickItemPrivate::resources_at(QDeclarativeListProperty<QObject> *prop, int index)
+QObject *QQuickItemPrivate::resources_at(QQmlListProperty<QObject> *prop, int index)
 {
     const QObjectList children = prop->object->children();
     if (index < children.count())
@@ -2440,18 +2441,18 @@ QObject *QQuickItemPrivate::resources_at(QDeclarativeListProperty<QObject> *prop
         return 0;
 }
 
-void QQuickItemPrivate::resources_append(QDeclarativeListProperty<QObject> *prop, QObject *o)
+void QQuickItemPrivate::resources_append(QQmlListProperty<QObject> *prop, QObject *o)
 {
     // XXX todo - do we really want this behavior?
     o->setParent(prop->object);
 }
 
-int QQuickItemPrivate::resources_count(QDeclarativeListProperty<QObject> *prop)
+int QQuickItemPrivate::resources_count(QQmlListProperty<QObject> *prop)
 {
     return prop->object->children().count();
 }
 
-void QQuickItemPrivate::resources_clear(QDeclarativeListProperty<QObject> *prop)
+void QQuickItemPrivate::resources_clear(QQmlListProperty<QObject> *prop)
 {
     // XXX todo - do we really want this behavior?
     const QObjectList children = prop->object->children();
@@ -2459,7 +2460,7 @@ void QQuickItemPrivate::resources_clear(QDeclarativeListProperty<QObject> *prop)
         children.at(index)->setParent(0);
 }
 
-QQuickItem *QQuickItemPrivate::children_at(QDeclarativeListProperty<QQuickItem> *prop, int index)
+QQuickItem *QQuickItemPrivate::children_at(QQmlListProperty<QQuickItem> *prop, int index)
 {
     QQuickItemPrivate *p = QQuickItemPrivate::get(static_cast<QQuickItem *>(prop->object));
     if (index >= p->childItems.count() || index < 0)
@@ -2468,7 +2469,7 @@ QQuickItem *QQuickItemPrivate::children_at(QDeclarativeListProperty<QQuickItem>
         return p->childItems.at(index);
 }
 
-void QQuickItemPrivate::children_append(QDeclarativeListProperty<QQuickItem> *prop, QQuickItem *o)
+void QQuickItemPrivate::children_append(QQmlListProperty<QQuickItem> *prop, QQuickItem *o)
 {
     if (!o)
         return;
@@ -2480,13 +2481,13 @@ void QQuickItemPrivate::children_append(QDeclarativeListProperty<QQuickItem> *pr
     o->setParentItem(that);
 }
 
-int QQuickItemPrivate::children_count(QDeclarativeListProperty<QQuickItem> *prop)
+int QQuickItemPrivate::children_count(QQmlListProperty<QQuickItem> *prop)
 {
     QQuickItemPrivate *p = QQuickItemPrivate::get(static_cast<QQuickItem *>(prop->object));
     return p->childItems.count();
 }
 
-void QQuickItemPrivate::children_clear(QDeclarativeListProperty<QQuickItem> *prop)
+void QQuickItemPrivate::children_clear(QQmlListProperty<QQuickItem> *prop)
 {
     QQuickItem *that = static_cast<QQuickItem *>(prop->object);
     QQuickItemPrivate *p = QQuickItemPrivate::get(that);
@@ -2494,13 +2495,13 @@ void QQuickItemPrivate::children_clear(QDeclarativeListProperty<QQuickItem> *pro
         p->childItems.at(0)->setParentItem(0);
 }
 
-void QQuickItemPrivate::visibleChildren_append(QDeclarativeListProperty<QQuickItem>*, QQuickItem *self)
+void QQuickItemPrivate::visibleChildren_append(QQmlListProperty<QQuickItem>*, QQuickItem *self)
 {
     // do nothing
     qmlInfo(self) << "QQuickItem: visibleChildren property is readonly and cannot be assigned to.";
 }
 
-int QQuickItemPrivate::visibleChildren_count(QDeclarativeListProperty<QQuickItem> *prop)
+int QQuickItemPrivate::visibleChildren_count(QQmlListProperty<QQuickItem> *prop)
 {
     QQuickItemPrivate *p = QQuickItemPrivate::get(static_cast<QQuickItem *>(prop->object));
     int visibleCount = 0;
@@ -2512,7 +2513,7 @@ int QQuickItemPrivate::visibleChildren_count(QDeclarativeListProperty<QQuickItem
     return visibleCount;
 }
 
-QQuickItem *QQuickItemPrivate::visibleChildren_at(QDeclarativeListProperty<QQuickItem> *prop, int index)
+QQuickItem *QQuickItemPrivate::visibleChildren_at(QQmlListProperty<QQuickItem> *prop, int index)
 {
     QQuickItemPrivate *p = QQuickItemPrivate::get(static_cast<QQuickItem *>(prop->object));
     const int childCount = p->childItems.count();
@@ -2527,7 +2528,7 @@ QQuickItem *QQuickItemPrivate::visibleChildren_at(QDeclarativeListProperty<QQuic
     return 0;
 }
 
-int QQuickItemPrivate::transform_count(QDeclarativeListProperty<QQuickTransform> *prop)
+int QQuickItemPrivate::transform_count(QQmlListProperty<QQuickTransform> *prop)
 {
     QQuickItem *that = static_cast<QQuickItem *>(prop->object);
     QQuickItemPrivate *p = QQuickItemPrivate::get(that);
@@ -2573,7 +2574,7 @@ void QQuickTransform::prependToItem(QQuickItem *item)
     p->dirty(QQuickItemPrivate::Transform);
 }
 
-void QQuickItemPrivate::transform_append(QDeclarativeListProperty<QQuickTransform> *prop, QQuickTransform *transform)
+void QQuickItemPrivate::transform_append(QQmlListProperty<QQuickTransform> *prop, QQuickTransform *transform)
 {
     if (!transform)
         return;
@@ -2582,7 +2583,7 @@ void QQuickItemPrivate::transform_append(QDeclarativeListProperty<QQuickTransfor
     transform->appendToItem(that);
 }
 
-QQuickTransform *QQuickItemPrivate::transform_at(QDeclarativeListProperty<QQuickTransform> *prop, int idx)
+QQuickTransform *QQuickItemPrivate::transform_at(QQmlListProperty<QQuickTransform> *prop, int idx)
 {
     QQuickItem *that = static_cast<QQuickItem *>(prop->object);
     QQuickItemPrivate *p = QQuickItemPrivate::get(that);
@@ -2593,7 +2594,7 @@ QQuickTransform *QQuickItemPrivate::transform_at(QDeclarativeListProperty<QQuick
         return p->transforms.at(idx);
 }
 
-void QQuickItemPrivate::transform_clear(QDeclarativeListProperty<QQuickTransform> *prop)
+void QQuickItemPrivate::transform_clear(QQmlListProperty<QQuickTransform> *prop)
 {
     QQuickItem *that = static_cast<QQuickItem *>(prop->object);
     QQuickItemPrivate *p = QQuickItemPrivate::get(that);
@@ -2852,9 +2853,9 @@ void QQuickItemPrivate::siblingOrderChanged()
     }
 }
 
-QDeclarativeListProperty<QObject> QQuickItemPrivate::data()
+QQmlListProperty<QObject> QQuickItemPrivate::data()
 {
-    return QDeclarativeListProperty<QObject>(q_func(), 0, QQuickItemPrivate::data_append,
+    return QQmlListProperty<QObject>(q_func(), 0, QQuickItemPrivate::data_append,
                                              QQuickItemPrivate::data_count,
                                              QQuickItemPrivate::data_at,
                                              QQuickItemPrivate::data_clear);
@@ -3233,7 +3234,7 @@ void QQuickItem::polish()
     }
 }
 
-void QQuickItem::mapFromItem(QDeclarativeV8Function *args) const
+void QQuickItem::mapFromItem(QQmlV8Function *args) const
 {
     if (args->Length() != 0) {
         v8::Local<v8::Value> item = (*args)[0];
@@ -3276,7 +3277,7 @@ QTransform QQuickItem::itemTransform(QQuickItem *other, bool *ok) const
     return t;
 }
 
-void QQuickItem::mapToItem(QDeclarativeV8Function *args) const
+void QQuickItem::mapToItem(QQmlV8Function *args) const
 {
     if (args->Length() != 0) {
         v8::Local<v8::Value> item = (*args)[0];
@@ -3332,17 +3333,17 @@ QQuickItem *QQuickItem::childAt(qreal x, qreal y) const
     return 0;
 }
 
-QDeclarativeListProperty<QObject> QQuickItemPrivate::resources()
+QQmlListProperty<QObject> QQuickItemPrivate::resources()
 {
-    return QDeclarativeListProperty<QObject>(q_func(), 0, QQuickItemPrivate::resources_append,
+    return QQmlListProperty<QObject>(q_func(), 0, QQuickItemPrivate::resources_append,
                                              QQuickItemPrivate::resources_count,
                                              QQuickItemPrivate::resources_at,
                                              QQuickItemPrivate::resources_clear);
 }
 
-QDeclarativeListProperty<QQuickItem> QQuickItemPrivate::children()
+QQmlListProperty<QQuickItem> QQuickItemPrivate::children()
 {
-    return QDeclarativeListProperty<QQuickItem>(q_func(), 0, QQuickItemPrivate::children_append,
+    return QQmlListProperty<QQuickItem>(q_func(), 0, QQuickItemPrivate::children_append,
                                              QQuickItemPrivate::children_count,
                                              QQuickItemPrivate::children_at,
                                              QQuickItemPrivate::children_clear);
@@ -3355,20 +3356,20 @@ QDeclarativeListProperty<QQuickItem> QQuickItemPrivate::children()
   Note that a child's visibility may have changed explicitly, or because the visibility
   of this (it's parent) item or another grandparent changed.
 */
-QDeclarativeListProperty<QQuickItem> QQuickItemPrivate::visibleChildren()
+QQmlListProperty<QQuickItem> QQuickItemPrivate::visibleChildren()
 {
-    return QDeclarativeListProperty<QQuickItem>(q_func(), 0, QQuickItemPrivate::visibleChildren_append,
+    return QQmlListProperty<QQuickItem>(q_func(), 0, QQuickItemPrivate::visibleChildren_append,
                                              QQuickItemPrivate::visibleChildren_count,
                                              QQuickItemPrivate::visibleChildren_at);
 
 }
 
-QDeclarativeListProperty<QDeclarativeState> QQuickItemPrivate::states()
+QQmlListProperty<QQuickState> QQuickItemPrivate::states()
 {
     return _states()->statesProperty();
 }
 
-QDeclarativeListProperty<QDeclarativeTransition> QQuickItemPrivate::transitions()
+QQmlListProperty<QQuickTransition> QQuickItemPrivate::transitions()
 {
     return _states()->transitionsProperty();
 }
@@ -3398,9 +3399,9 @@ void QQuickItem::setState(const QString &state)
     d->setState(state);
 }
 
-QDeclarativeListProperty<QQuickTransform> QQuickItem::transform()
+QQmlListProperty<QQuickTransform> QQuickItem::transform()
 {
-    return QDeclarativeListProperty<QQuickTransform>(this, 0, QQuickItemPrivate::transform_append,
+    return QQmlListProperty<QQuickTransform>(this, 0, QQuickItemPrivate::transform_append,
                                                      QQuickItemPrivate::transform_count,
                                                      QQuickItemPrivate::transform_at,
                                                      QQuickItemPrivate::transform_clear);
@@ -3439,11 +3440,11 @@ void QQuickItem::componentComplete()
         d->extra->contents->complete();
 }
 
-QDeclarativeStateGroup *QQuickItemPrivate::_states()
+QQuickStateGroup *QQuickItemPrivate::_states()
 {
     Q_Q(QQuickItem);
     if (!_stateGroup) {
-        _stateGroup = new QDeclarativeStateGroup;
+        _stateGroup = new QQuickStateGroup;
         if (!componentComplete)
             _stateGroup->classBegin();
         FAST_CONNECT(_stateGroup, SIGNAL(stateChanged(QString)),
@@ -5566,7 +5567,7 @@ void QQuickItemLayer::deactivateEffect()
     \sa samplerName
  */
 
-void QQuickItemLayer::setEffect(QDeclarativeComponent *component)
+void QQuickItemLayer::setEffect(QQmlComponent *component)
 {
     if (component == m_effectComponent)
         return;
diff --git a/src/quick/items/qquickitem.h b/src/quick/items/qquickitem.h
index 7f98db9168..c44192bd3a 100644
--- a/src/quick/items/qquickitem.h
+++ b/src/quick/items/qquickitem.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
@@ -43,8 +43,8 @@
 #define QQUICKITEM_H
 
 #include <QtQuick/qtquickglobal.h>
-#include <QtDeclarative/qdeclarative.h>
-#include <QtDeclarative/qdeclarativecomponent.h>
+#include <QtQml/qqml.h>
+#include <QtQml/qqmlcomponent.h>
 
 #include <QtCore/QObject>
 #include <QtCore/QList>
@@ -81,10 +81,10 @@ private:
 };
 
 class QQuickItemLayer;
-class QDeclarativeV8Function;
-class QDeclarativeState;
+class QQmlV8Function;
+class QQuickState;
 class QQuickAnchorLine;
-class QDeclarativeTransition;
+class QQuickTransition;
 class QQuickKeyEvent;
 class QQuickAnchors;
 class QQuickItemPrivate;
@@ -95,15 +95,15 @@ class QSGNode;
 class QSGTransformNode;
 class QSGTextureProvider;
 
-class Q_QUICK_EXPORT QQuickItem : public QObject, public QDeclarativeParserStatus
+class Q_QUICK_EXPORT QQuickItem : public QObject, public QQmlParserStatus
 {
     Q_OBJECT
-    Q_INTERFACES(QDeclarativeParserStatus)
+    Q_INTERFACES(QQmlParserStatus)
 
     Q_PROPERTY(QQuickItem *parent READ parentItem WRITE setParentItem NOTIFY parentChanged DESIGNABLE false FINAL)
-    Q_PRIVATE_PROPERTY(QQuickItem::d_func(), QDeclarativeListProperty<QObject> data READ data DESIGNABLE false)
-    Q_PRIVATE_PROPERTY(QQuickItem::d_func(), QDeclarativeListProperty<QObject> resources READ resources DESIGNABLE false)
-    Q_PRIVATE_PROPERTY(QQuickItem::d_func(), QDeclarativeListProperty<QQuickItem> children READ children NOTIFY childrenChanged DESIGNABLE false)
+    Q_PRIVATE_PROPERTY(QQuickItem::d_func(), QQmlListProperty<QObject> data READ data DESIGNABLE false)
+    Q_PRIVATE_PROPERTY(QQuickItem::d_func(), QQmlListProperty<QObject> resources READ resources DESIGNABLE false)
+    Q_PRIVATE_PROPERTY(QQuickItem::d_func(), QQmlListProperty<QQuickItem> children READ children NOTIFY childrenChanged DESIGNABLE false)
 
     Q_PROPERTY(QPointF pos READ pos FINAL)
     Q_PROPERTY(qreal x READ x WRITE setX NOTIFY xChanged FINAL)
@@ -115,10 +115,10 @@ class Q_QUICK_EXPORT QQuickItem : public QObject, public QDeclarativeParserStatu
     Q_PROPERTY(qreal opacity READ opacity WRITE setOpacity NOTIFY opacityChanged FINAL)
     Q_PROPERTY(bool enabled READ isEnabled WRITE setEnabled NOTIFY enabledChanged)
     Q_PROPERTY(bool visible READ isVisible WRITE setVisible NOTIFY visibleChanged FINAL)
-    Q_PRIVATE_PROPERTY(QQuickItem::d_func(), QDeclarativeListProperty<QQuickItem> visibleChildren READ visibleChildren NOTIFY visibleChildrenChanged DESIGNABLE false)
+    Q_PRIVATE_PROPERTY(QQuickItem::d_func(), QQmlListProperty<QQuickItem> visibleChildren READ visibleChildren NOTIFY visibleChildrenChanged DESIGNABLE false)
 
-    Q_PRIVATE_PROPERTY(QQuickItem::d_func(), QDeclarativeListProperty<QDeclarativeState> states READ states DESIGNABLE false)
-    Q_PRIVATE_PROPERTY(QQuickItem::d_func(), QDeclarativeListProperty<QDeclarativeTransition> transitions READ transitions DESIGNABLE false)
+    Q_PRIVATE_PROPERTY(QQuickItem::d_func(), QQmlListProperty<QQuickState> states READ states DESIGNABLE false)
+    Q_PRIVATE_PROPERTY(QQuickItem::d_func(), QQmlListProperty<QQuickTransition> transitions READ transitions DESIGNABLE false)
     Q_PROPERTY(QString state READ state WRITE setState NOTIFY stateChanged)
     Q_PROPERTY(QRectF childrenRect READ childrenRect NOTIFY childrenRectChanged DESIGNABLE false FINAL)
     Q_PRIVATE_PROPERTY(QQuickItem::d_func(), QQuickAnchors * anchors READ anchors DESIGNABLE false CONSTANT FINAL)
@@ -140,7 +140,7 @@ class Q_QUICK_EXPORT QQuickItem : public QObject, public QDeclarativeParserStatu
     Q_PROPERTY(qreal scale READ scale WRITE setScale NOTIFY scaleChanged)
     Q_PROPERTY(TransformOrigin transformOrigin READ transformOrigin WRITE setTransformOrigin NOTIFY transformOriginChanged)
     Q_PROPERTY(QPointF transformOriginPoint READ transformOriginPoint)  // XXX todo - notify?
-    Q_PROPERTY(QDeclarativeListProperty<QQuickTransform> transform READ transform DESIGNABLE false FINAL)
+    Q_PROPERTY(QQmlListProperty<QQuickTransform> transform READ transform DESIGNABLE false FINAL)
 
     Q_PROPERTY(bool smooth READ smooth WRITE setSmooth NOTIFY smoothChanged)
     Q_PROPERTY(qreal implicitWidth READ implicitWidth WRITE setImplicitWidth NOTIFY implicitWidthChanged)
@@ -215,7 +215,7 @@ public:
     qreal baselineOffset() const;
     void setBaselineOffset(qreal);
 
-    QDeclarativeListProperty<QQuickTransform> transform();
+    QQmlListProperty<QQuickTransform> transform();
 
     qreal x() const;
     qreal y() const;
@@ -303,8 +303,8 @@ public:
 
     void polish();
 
-    Q_INVOKABLE void mapFromItem(QDeclarativeV8Function*) const;
-    Q_INVOKABLE void mapToItem(QDeclarativeV8Function*) const;
+    Q_INVOKABLE void mapFromItem(QQmlV8Function*) const;
+    Q_INVOKABLE void mapToItem(QQmlV8Function*) const;
     Q_INVOKABLE void forceActiveFocus();
     Q_INVOKABLE QQuickItem *childAt(qreal x, qreal y) const;
 
diff --git a/src/quick/items/qquickitem_p.h b/src/quick/items/qquickitem_p.h
index c2cc7d000b..8adb80e88b 100644
--- a/src/quick/items/qquickitem_p.h
+++ b/src/quick/items/qquickitem_p.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
@@ -65,14 +65,14 @@
 #include "qquickclipnode_p.h"
 
 #include <private/qpodvector_p.h>
-#include <QtQuick/private/qdeclarativestate_p.h>
-#include <private/qdeclarativenullablevalue_p_p.h>
-#include <private/qdeclarativenotifier_p.h>
-#include <private/qdeclarativeglobal_p.h>
+#include <QtQuick/private/qquickstate_p.h>
+#include <private/qqmlnullablevalue_p_p.h>
+#include <private/qqmlnotifier_p.h>
+#include <private/qqmlglobal_p.h>
 #include <private/qlazilyallocated_p.h>
 
-#include <qdeclarative.h>
-#include <qdeclarativecontext.h>
+#include <qqml.h>
+#include <qqmlcontext.h>
 
 #include <QtCore/qlist.h>
 #include <QtCore/qdebug.h>
@@ -149,7 +149,7 @@ class QQuickItemLayer : public QObject, public QQuickItemChangeListener
     Q_PROPERTY(QQuickShaderEffectSource::WrapMode wrapMode READ wrapMode WRITE setWrapMode NOTIFY wrapModeChanged)
     Q_PROPERTY(QQuickShaderEffectSource::Format format READ format WRITE setFormat NOTIFY formatChanged)
     Q_PROPERTY(QByteArray samplerName READ name WRITE setName NOTIFY nameChanged)
-    Q_PROPERTY(QDeclarativeComponent *effect READ effect WRITE setEffect NOTIFY effectChanged)
+    Q_PROPERTY(QQmlComponent *effect READ effect WRITE setEffect NOTIFY effectChanged)
 public:
     QQuickItemLayer(QQuickItem *item);
     ~QQuickItemLayer();
@@ -181,8 +181,8 @@ public:
     QByteArray name() const { return m_name; }
     void setName(const QByteArray &name);
 
-    QDeclarativeComponent *effect() const { return m_effectComponent; }
-    void setEffect(QDeclarativeComponent *effect);
+    QQmlComponent *effect() const { return m_effectComponent; }
+    void setEffect(QQmlComponent *effect);
 
     QQuickShaderEffectSource *effectSource() const { return m_effectSource; }
 
@@ -203,7 +203,7 @@ signals:
     void mipmapChanged(bool mipmap);
     void wrapModeChanged(QQuickShaderEffectSource::WrapMode mode);
     void nameChanged(const QByteArray &name);
-    void effectChanged(QDeclarativeComponent *component);
+    void effectChanged(QQmlComponent *component);
     void smoothChanged(bool smooth);
     void formatChanged(QQuickShaderEffectSource::Format format);
     void sourceRectChanged(const QRectF &sourceRect);
@@ -224,7 +224,7 @@ private:
     QSize m_size;
     QRectF m_sourceRect;
     QByteArray m_name;
-    QDeclarativeComponent *m_effectComponent;
+    QQmlComponent *m_effectComponent;
     QQuickItem *m_effect;
     QQuickShaderEffectSource *m_effectSource;
 };
@@ -243,13 +243,13 @@ public:
     ~QQuickItemPrivate();
     void init(QQuickItem *parent);
 
-    QDeclarativeListProperty<QObject> data();
-    QDeclarativeListProperty<QObject> resources();
-    QDeclarativeListProperty<QQuickItem> children();
-    QDeclarativeListProperty<QQuickItem> visibleChildren();
+    QQmlListProperty<QObject> data();
+    QQmlListProperty<QObject> resources();
+    QQmlListProperty<QQuickItem> children();
+    QQmlListProperty<QQuickItem> visibleChildren();
 
-    QDeclarativeListProperty<QDeclarativeState> states();
-    QDeclarativeListProperty<QDeclarativeTransition> transitions();
+    QQmlListProperty<QQuickState> states();
+    QQmlListProperty<QQuickTransition> transitions();
 
     QString state() const;
     void setState(const QString &);
@@ -265,33 +265,33 @@ public:
     QQuickItemLayer *layer() const;
 
     // data property
-    static void data_append(QDeclarativeListProperty<QObject> *, QObject *);
-    static int data_count(QDeclarativeListProperty<QObject> *);
-    static QObject *data_at(QDeclarativeListProperty<QObject> *, int);
-    static void data_clear(QDeclarativeListProperty<QObject> *);
+    static void data_append(QQmlListProperty<QObject> *, QObject *);
+    static int data_count(QQmlListProperty<QObject> *);
+    static QObject *data_at(QQmlListProperty<QObject> *, int);
+    static void data_clear(QQmlListProperty<QObject> *);
 
     // resources property
-    static QObject *resources_at(QDeclarativeListProperty<QObject> *, int);
-    static void resources_append(QDeclarativeListProperty<QObject> *, QObject *);
-    static int resources_count(QDeclarativeListProperty<QObject> *);
-    static void resources_clear(QDeclarativeListProperty<QObject> *);
+    static QObject *resources_at(QQmlListProperty<QObject> *, int);
+    static void resources_append(QQmlListProperty<QObject> *, QObject *);
+    static int resources_count(QQmlListProperty<QObject> *);
+    static void resources_clear(QQmlListProperty<QObject> *);
 
     // children property
-    static void children_append(QDeclarativeListProperty<QQuickItem> *, QQuickItem *);
-    static int children_count(QDeclarativeListProperty<QQuickItem> *);
-    static QQuickItem *children_at(QDeclarativeListProperty<QQuickItem> *, int);
-    static void children_clear(QDeclarativeListProperty<QQuickItem> *);
+    static void children_append(QQmlListProperty<QQuickItem> *, QQuickItem *);
+    static int children_count(QQmlListProperty<QQuickItem> *);
+    static QQuickItem *children_at(QQmlListProperty<QQuickItem> *, int);
+    static void children_clear(QQmlListProperty<QQuickItem> *);
 
     // visibleChildren property
-    static void visibleChildren_append(QDeclarativeListProperty<QQuickItem> *prop, QQuickItem *o);
-    static int visibleChildren_count(QDeclarativeListProperty<QQuickItem> *prop);
-    static QQuickItem *visibleChildren_at(QDeclarativeListProperty<QQuickItem> *prop, int index);
+    static void visibleChildren_append(QQmlListProperty<QQuickItem> *prop, QQuickItem *o);
+    static int visibleChildren_count(QQmlListProperty<QQuickItem> *prop);
+    static QQuickItem *visibleChildren_at(QQmlListProperty<QQuickItem> *prop, int index);
 
     // transform property
-    static int transform_count(QDeclarativeListProperty<QQuickTransform> *list);
-    static void transform_append(QDeclarativeListProperty<QQuickTransform> *list, QQuickTransform *);
-    static QQuickTransform *transform_at(QDeclarativeListProperty<QQuickTransform> *list, int);
-    static void transform_clear(QDeclarativeListProperty<QQuickTransform> *list);
+    static int transform_count(QQmlListProperty<QQuickTransform> *list);
+    static void transform_append(QQmlListProperty<QQuickTransform> *list, QQuickTransform *);
+    static QQuickTransform *transform_at(QQmlListProperty<QQuickTransform> *list, int);
+    static void transform_clear(QQmlListProperty<QQuickTransform> *list);
 
     enum ChangeType {
         Geometry = 0x01,
@@ -372,8 +372,8 @@ public:
     void updateOrAddGeometryChangeListener(QQuickItemChangeListener *listener, GeometryChangeTypes types);
     void updateOrRemoveGeometryChangeListener(QQuickItemChangeListener *listener, GeometryChangeTypes types);
 
-    QDeclarativeStateGroup *_states();
-    QDeclarativeStateGroup *_stateGroup;
+    QQuickStateGroup *_states();
+    QQuickStateGroup *_stateGroup;
 
     inline QQuickItem::TransformOrigin origin() const;
 
@@ -453,7 +453,7 @@ public:
     inline QSGContext *sceneGraphContext() const;
 
     QQuickItem *parentItem;
-    QDeclarativeNotifier parentNotifier;
+    QQmlNotifier parentNotifier;
 
     QList<QQuickItem *> childItems;
     mutable QList<QQuickItem *> *sortedChildItems;
@@ -723,7 +723,7 @@ class QQuickKeysAttached : public QObject, public QQuickItemKeyFilter
     Q_DECLARE_PRIVATE(QQuickKeysAttached)
 
     Q_PROPERTY(bool enabled READ enabled WRITE setEnabled NOTIFY enabledChanged)
-    Q_PROPERTY(QDeclarativeListProperty<QQuickItem> forwardTo READ forwardTo)
+    Q_PROPERTY(QQmlListProperty<QQuickItem> forwardTo READ forwardTo)
     Q_PROPERTY(Priority priority READ priority WRITE setPriority NOTIFY priorityChanged)
 
     Q_ENUMS(Priority)
@@ -745,9 +745,9 @@ public:
     Priority priority() const;
     void setPriority(Priority);
 
-    QDeclarativeListProperty<QQuickItem> forwardTo() {
+    QQmlListProperty<QQuickItem> forwardTo() {
         Q_D(QQuickKeysAttached);
-        return QDeclarativeListProperty<QQuickItem>(this, d->targets);
+        return QQmlListProperty<QQuickItem>(this, d->targets);
     }
 
     virtual void componentComplete();
diff --git a/src/quick/items/qquickanimation.cpp b/src/quick/items/qquickitemanimation.cpp
index 4880190697..1316a3d84a 100644
--- a/src/quick/items/qquickanimation.cpp
+++ b/src/quick/items/qquickitemanimation.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
@@ -39,14 +39,14 @@
 **
 ****************************************************************************/
 
-#include "qquickanimation_p.h"
-#include "qquickanimation_p_p.h"
+#include "qquickitemanimation_p.h"
+#include "qquickitemanimation_p_p.h"
 #include "qquickstateoperations_p.h"
 
-#include <private/qdeclarativeproperty_p.h>
-#include <private/qdeclarativepath_p.h>
+#include <private/qqmlproperty_p.h>
+#include <private/qquickpath_p.h>
 
-#include <QtDeclarative/qdeclarativeinfo.h>
+#include <QtQml/qqmlinfo.h>
 #include <QtCore/qmath.h>
 #include "private/qsequentialanimationgroupjob_p.h"
 #include "private/qparallelanimationgroupjob_p.h"
@@ -70,7 +70,7 @@ QT_BEGIN_NAMESPACE
     the transition, ensures the item animates smoothly as it moves to
     its new parent:
 
-    \snippet doc/src/snippets/declarative/parentanimation.qml 0
+    \snippet doc/src/snippets/qml/parentanimation.qml 0
 
     A ParentAnimation can contain any number of animations. These animations will
     be run in parallel; to run them sequentially, define them within a
@@ -93,7 +93,7 @@ QT_BEGIN_NAMESPACE
     \sa {QML Animation and Transitions}, {declarative/animation/basics}{Animation basics example}
 */
 QQuickParentAnimation::QQuickParentAnimation(QObject *parent)
-    : QDeclarativeAnimationGroup(*(new QQuickParentAnimationPrivate), parent)
+    : QQuickAnimationGroup(*(new QQuickParentAnimationPrivate), parent)
 {
 }
 
@@ -204,8 +204,8 @@ QPointF QQuickParentAnimationPrivate::computeTransformOrigin(QQuickItem::Transfo
     }
 }
 
-QAbstractAnimationJob* QQuickParentAnimation::transition(QDeclarativeStateActions &actions,
-                        QDeclarativeProperties &modified,
+QAbstractAnimationJob* QQuickParentAnimation::transition(QQuickStateActions &actions,
+                        QQmlProperties &modified,
                         TransitionDirection direction,
                         QObject *defaultTarget)
 {
@@ -216,14 +216,14 @@ QAbstractAnimationJob* QQuickParentAnimation::transition(QDeclarativeStateAction
         QQuickParentAnimationData() {}
         ~QQuickParentAnimationData() { qDeleteAll(pc); }
 
-        QDeclarativeStateActions actions;
+        QQuickStateActions actions;
         //### reverse should probably apply on a per-action basis
         bool reverse;
         QList<QQuickParentChange *> pc;
         virtual void doAction()
         {
             for (int ii = 0; ii < actions.count(); ++ii) {
-                const QDeclarativeAction &action = actions.at(ii);
+                const QQuickAction &action = actions.at(ii);
                 if (reverse)
                     action.event->reverse();
                 else
@@ -238,7 +238,7 @@ QAbstractAnimationJob* QQuickParentAnimation::transition(QDeclarativeStateAction
     bool hasExplicit = false;
     if (d->target && d->newParent) {
         data->reverse = false;
-        QDeclarativeAction myAction;
+        QQuickAction myAction;
         QQuickParentChange *pc = new QQuickParentChange;
         pc->setObject(d->target);
         pc->setParent(d->newParent);
@@ -248,7 +248,7 @@ QAbstractAnimationJob* QQuickParentAnimation::transition(QDeclarativeStateAction
         hasExplicit = true;
         if (d->via) {
             viaData->reverse = false;
-            QDeclarativeAction myVAction;
+            QQuickAction myVAction;
             QQuickParentChange *vpc = new QQuickParentChange;
             vpc->setObject(d->target);
             vpc->setParent(d->via);
@@ -262,12 +262,12 @@ QAbstractAnimationJob* QQuickParentAnimation::transition(QDeclarativeStateAction
 
     if (!hasExplicit)
     for (int i = 0; i < actions.size(); ++i) {
-        QDeclarativeAction &action = actions[i];
-        if (action.event && action.event->type() == QDeclarativeActionEvent::ParentChange
+        QQuickAction &action = actions[i];
+        if (action.event && action.event->type() == QQuickActionEvent::ParentChange
             && (!d->target || static_cast<QQuickParentChange*>(action.event)->object() == d->target)) {
 
             QQuickParentChange *pc = static_cast<QQuickParentChange*>(action.event);
-            QDeclarativeAction myAction = action;
+            QQuickAction myAction = action;
             data->reverse = action.reverseEvent;
 
             //### this logic differs from PropertyAnimation
@@ -287,18 +287,18 @@ QAbstractAnimationJob* QQuickParentAnimation::transition(QDeclarativeStateAction
 
             if (d->via) {
                 viaData->reverse = false;
-                QDeclarativeAction myAction;
+                QQuickAction myAction;
                 QQuickParentChange *vpc = new QQuickParentChange;
                 vpc->setObject(pc->object());
                 vpc->setParent(d->via);
                 myAction.event = vpc;
                 viaData->pc << vpc;
                 viaData->actions << myAction;
-                QDeclarativeAction dummyAction;
-                QDeclarativeAction &xAction = pc->xIsSet() && i < actions.size()-1 ? actions[++i] : dummyAction;
-                QDeclarativeAction &yAction = pc->yIsSet() && i < actions.size()-1 ? actions[++i] : dummyAction;
-                QDeclarativeAction &sAction = pc->scaleIsSet() && i < actions.size()-1 ? actions[++i] : dummyAction;
-                QDeclarativeAction &rAction = pc->rotationIsSet() && i < actions.size()-1 ? actions[++i] : dummyAction;
+                QQuickAction dummyAction;
+                QQuickAction &xAction = pc->xIsSet() && i < actions.size()-1 ? actions[++i] : dummyAction;
+                QQuickAction &yAction = pc->yIsSet() && i < actions.size()-1 ? actions[++i] : dummyAction;
+                QQuickAction &sAction = pc->scaleIsSet() && i < actions.size()-1 ? actions[++i] : dummyAction;
+                QQuickAction &rAction = pc->rotationIsSet() && i < actions.size()-1 ? actions[++i] : dummyAction;
                 QQuickItem *target = pc->object();
                 QQuickItem *targetParent = action.reverseEvent ? pc->originalParent() : pc->parent();
 
@@ -393,7 +393,7 @@ QAbstractAnimationJob* QQuickParentAnimation::transition(QDeclarativeStateAction
         }
 
         //TODO: simplify/clarify logic
-        bool forwards = direction == QDeclarativeAbstractAnimation::Forward;
+        bool forwards = direction == QQuickAbstractAnimation::Forward;
         if (forwards) {
             topLevelGroup->appendAnimation(d->via ? viaAction : targetAction);
             topLevelGroup->appendAnimation(ag);
@@ -424,7 +424,7 @@ QAbstractAnimationJob* QQuickParentAnimation::transition(QDeclarativeStateAction
 
     In the following snippet we animate the addition of a right anchor to a \l Rectangle:
 
-    \snippet doc/src/snippets/declarative/anchoranimation.qml 0
+    \snippet doc/src/snippets/qml/anchoranimation.qml 0
 
     For convenience, when an AnchorAnimation is used in a \l Transition, it will
     animate any AnchorChanges that have occurred during the state change.
@@ -439,7 +439,7 @@ QAbstractAnimationJob* QQuickParentAnimation::transition(QDeclarativeStateAction
     \sa {QML Animation and Transitions}, AnchorChanges
 */
 QQuickAnchorAnimation::QQuickAnchorAnimation(QObject *parent)
-: QDeclarativeAbstractAnimation(*(new QQuickAnchorAnimationPrivate), parent)
+: QQuickAbstractAnimation(*(new QQuickAnchorAnimationPrivate), parent)
 {
 }
 
@@ -454,10 +454,10 @@ QQuickAnchorAnimation::~QQuickAnchorAnimation()
     If no targets are specified all AnchorChanges will be
     animated by the AnchorAnimation.
 */
-QDeclarativeListProperty<QQuickItem> QQuickAnchorAnimation::targets()
+QQmlListProperty<QQuickItem> QQuickAnchorAnimation::targets()
 {
     Q_D(QQuickAnchorAnimation);
-    return QDeclarativeListProperty<QQuickItem>(this, d->targets);
+    return QQmlListProperty<QQuickItem>(this, d->targets);
 }
 
 /*!
@@ -520,15 +520,15 @@ void QQuickAnchorAnimation::setEasing(const QEasingCurve &e)
     emit easingChanged(e);
 }
 
-QAbstractAnimationJob* QQuickAnchorAnimation::transition(QDeclarativeStateActions &actions,
-                        QDeclarativeProperties &modified,
+QAbstractAnimationJob* QQuickAnchorAnimation::transition(QQuickStateActions &actions,
+                        QQmlProperties &modified,
                         TransitionDirection direction,
                         QObject *defaultTarget)
 {
     Q_UNUSED(modified);
     Q_UNUSED(defaultTarget);
     Q_D(QQuickAnchorAnimation);
-    QDeclarativeAnimationPropertyUpdater *data = new QDeclarativeAnimationPropertyUpdater;
+    QQuickAnimationPropertyUpdater *data = new QQuickAnimationPropertyUpdater;
     data->interpolatorType = QMetaType::QReal;
     data->interpolator = d->interpolator;
     data->reverse = direction == Backward ? true : false;
@@ -536,14 +536,14 @@ QAbstractAnimationJob* QQuickAnchorAnimation::transition(QDeclarativeStateAction
     data->fromDefined = false;
 
     for (int ii = 0; ii < actions.count(); ++ii) {
-        QDeclarativeAction &action = actions[ii];
-        if (action.event && action.event->type() == QDeclarativeActionEvent::AnchorChanges
+        QQuickAction &action = actions[ii];
+        if (action.event && action.event->type() == QQuickActionEvent::AnchorChanges
             && (d->targets.isEmpty() || d->targets.contains(static_cast<QQuickAnchorChanges*>(action.event)->object()))) {
             data->actions << static_cast<QQuickAnchorChanges*>(action.event)->additionalActions();
         }
     }
 
-    QDeclarativeBulkValueAnimator *animator = new QDeclarativeBulkValueAnimator;
+    QQuickBulkValueAnimator *animator = new QQuickBulkValueAnimator;
     if (data->actions.count()) {
         animator->setAnimValue(data);
         animator->setFromSourcedValue(&data->fromSourced);
@@ -580,7 +580,7 @@ QAbstractAnimationJob* QQuickAnchorAnimation::transition(QDeclarativeStateAction
     \sa {QML Animation and Transitions}, PathInterpolator
 */
 QQuickPathAnimation::QQuickPathAnimation(QObject *parent)
-: QDeclarativeAbstractAnimation(*(new QQuickPathAnimationPrivate), parent)
+: QQuickAbstractAnimation(*(new QQuickPathAnimationPrivate), parent)
 {
 }
 
@@ -655,13 +655,13 @@ void QQuickPathAnimation::setEasing(const QEasingCurve &e)
 
     For more information on defining a path see the \l Path documentation.
 */
-QDeclarativePath *QQuickPathAnimation::path() const
+QQuickPath *QQuickPathAnimation::path() const
 {
     Q_D(const QQuickPathAnimation);
     return d->path;
 }
 
-void QQuickPathAnimation::setPath(QDeclarativePath *path)
+void QQuickPathAnimation::setPath(QQuickPath *path)
 {
     Q_D(QQuickPathAnimation);
     if (d->path == path)
@@ -824,8 +824,8 @@ void QQuickPathAnimation::setEndRotation(qreal rotation)
     emit endRotationChanged(d->endRotation);
 }
 
-QAbstractAnimationJob* QQuickPathAnimation::transition(QDeclarativeStateActions &actions,
-                                           QDeclarativeProperties &modified,
+QAbstractAnimationJob* QQuickPathAnimation::transition(QQuickStateActions &actions,
+                                           QQmlProperties &modified,
                                            TransitionDirection direction,
                                            QObject *defaultTarget)
 {
@@ -866,7 +866,7 @@ QAbstractAnimationJob* QQuickPathAnimation::transition(QDeclarativeStateActions
     int origModifiedSize = modified.count();
 
     for (int i = 0; i < actions.count(); ++i) {
-        QDeclarativeAction &action = actions[i];
+        QQuickAction &action = actions[i];
         if (action.event)
             continue;
         if (action.specifiedObject == target && action.property.name() == QLatin1String("x")) {
@@ -894,7 +894,7 @@ QAbstractAnimationJob* QQuickPathAnimation::transition(QDeclarativeStateActions
             // treat interruptions specially, otherwise we end up with strange paths
             if ((data->reverse || prevData.reverse) && prevData.currentV > 0 && prevData.currentV < 1) {
                 if (!data->fromDefined && !data->toDefined && !prevData.painterPath.isEmpty()) {
-                    QPointF pathPos = QDeclarativePath::sequentialPointAt(prevData.painterPath, prevData.pathLength, prevData.attributePoints, prevData.prevBez, prevData.currentV);
+                    QPointF pathPos = QQuickPath::sequentialPointAt(prevData.painterPath, prevData.pathLength, prevData.attributePoints, prevData.prevBez, prevData.currentV);
                     if (!prevData.anchorPoint.isNull())
                         pathPos -= prevData.anchorPoint;
                     if (pathPos == data->target->pos()) {   //only treat as interruption if we interrupted ourself
diff --git a/src/quick/items/qquickanimation_p.h b/src/quick/items/qquickitemanimation_p.h
index 0823ba0cdd..a3a7e77871 100644
--- a/src/quick/items/qquickanimation_p.h
+++ b/src/quick/items/qquickitemanimation_p.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
@@ -39,19 +39,19 @@
 **
 ****************************************************************************/
 
-#ifndef QQUICKANIMATION_H
-#define QQUICKANIMATION_H
+#ifndef QQUICKITEMANIMATION_H
+#define QQUICKITEMANIMATION_H
 
 #include "qquickitem.h"
 
-#include <QtQuick/private/qdeclarativeanimation_p.h>
+#include <QtQuick/private/qquickanimation_p.h>
 
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
 class QQuickParentAnimationPrivate;
-class Q_QUICK_PRIVATE_EXPORT QQuickParentAnimation : public QDeclarativeAnimationGroup
+class Q_QUICK_PRIVATE_EXPORT QQuickParentAnimation : public QQuickAnimationGroup
 {
     Q_OBJECT
     Q_DECLARE_PRIVATE(QQuickParentAnimation)
@@ -79,18 +79,18 @@ Q_SIGNALS:
     void viaChanged();
 
 protected:
-    virtual QAbstractAnimationJob* transition(QDeclarativeStateActions &actions,
-                            QDeclarativeProperties &modified,
+    virtual QAbstractAnimationJob* transition(QQuickStateActions &actions,
+                            QQmlProperties &modified,
                             TransitionDirection direction,
                             QObject *defaultTarget = 0);
 };
 
 class QQuickAnchorAnimationPrivate;
-class Q_QUICK_PRIVATE_EXPORT QQuickAnchorAnimation : public QDeclarativeAbstractAnimation
+class Q_QUICK_PRIVATE_EXPORT QQuickAnchorAnimation : public QQuickAbstractAnimation
 {
     Q_OBJECT
     Q_DECLARE_PRIVATE(QQuickAnchorAnimation)
-    Q_PROPERTY(QDeclarativeListProperty<QQuickItem> targets READ targets)
+    Q_PROPERTY(QQmlListProperty<QQuickItem> targets READ targets)
     Q_PROPERTY(int duration READ duration WRITE setDuration NOTIFY durationChanged)
     Q_PROPERTY(QEasingCurve easing READ easing WRITE setEasing NOTIFY easingChanged)
 
@@ -98,7 +98,7 @@ public:
     QQuickAnchorAnimation(QObject *parent=0);
     virtual ~QQuickAnchorAnimation();
 
-    QDeclarativeListProperty<QQuickItem> targets();
+    QQmlListProperty<QQuickItem> targets();
 
     int duration() const;
     void setDuration(int);
@@ -111,23 +111,23 @@ Q_SIGNALS:
     void easingChanged(const QEasingCurve&);
 
 protected:
-    virtual QAbstractAnimationJob* transition(QDeclarativeStateActions &actions,
-                            QDeclarativeProperties &modified,
+    virtual QAbstractAnimationJob* transition(QQuickStateActions &actions,
+                            QQmlProperties &modified,
                             TransitionDirection direction,
                             QObject *defaultTarget = 0);
 };
 
 class QQuickItem;
-class QDeclarativePath;
+class QQuickPath;
 class QQuickPathAnimationPrivate;
-class Q_QUICK_PRIVATE_EXPORT QQuickPathAnimation : public QDeclarativeAbstractAnimation
+class Q_QUICK_PRIVATE_EXPORT QQuickPathAnimation : public QQuickAbstractAnimation
 {
     Q_OBJECT
     Q_DECLARE_PRIVATE(QQuickPathAnimation)
 
     Q_PROPERTY(int duration READ duration WRITE setDuration NOTIFY durationChanged)
     Q_PROPERTY(QEasingCurve easing READ easing WRITE setEasing NOTIFY easingChanged)
-    Q_PROPERTY(QDeclarativePath *path READ path WRITE setPath NOTIFY pathChanged)
+    Q_PROPERTY(QQuickPath *path READ path WRITE setPath NOTIFY pathChanged)
     Q_PROPERTY(QQuickItem *target READ target WRITE setTargetObject NOTIFY targetChanged)
     Q_PROPERTY(Orientation orientation READ orientation WRITE setOrientation NOTIFY orientationChanged)
     Q_PROPERTY(QPointF anchorPoint READ anchorPoint WRITE setAnchorPoint NOTIFY anchorPointChanged)
@@ -154,8 +154,8 @@ public:
     QEasingCurve easing() const;
     void setEasing(const QEasingCurve &);
 
-    QDeclarativePath *path() const;
-    void setPath(QDeclarativePath *);
+    QQuickPath *path() const;
+    void setPath(QQuickPath *);
 
     QQuickItem *target() const;
     void setTargetObject(QQuickItem *);
@@ -176,8 +176,8 @@ public:
     void setEndRotation(qreal);
 
 protected:
-    virtual QAbstractAnimationJob* transition(QDeclarativeStateActions &actions,
-                            QDeclarativeProperties &modified,
+    virtual QAbstractAnimationJob* transition(QQuickStateActions &actions,
+                            QQmlProperties &modified,
                             TransitionDirection direction,
                             QObject *defaultTarget = 0);
 Q_SIGNALS:
@@ -200,4 +200,4 @@ QML_DECLARE_TYPE(QQuickPathAnimation)
 
 QT_END_HEADER
 
-#endif // QQUICKANIMATION_H
+#endif // QQUICKITEMANIMATION_H
diff --git a/src/quick/items/qquickanimation_p_p.h b/src/quick/items/qquickitemanimation_p_p.h
index c34b5ab963..f61b255218 100644
--- a/src/quick/items/qquickanimation_p_p.h
+++ b/src/quick/items/qquickitemanimation_p_p.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
@@ -53,19 +53,19 @@
 // We mean it.
 //
 
-#include "qquickanimation_p.h"
+#include "qquickitemanimation_p.h"
 
-#include <private/qdeclarativepath_p.h>
-#include <private/qdeclarativeanimation_p_p.h>
+#include <private/qquickpath_p.h>
+#include <private/qquickanimation_p_p.h>
 
 QT_BEGIN_NAMESPACE
 
-class QQuickParentAnimationPrivate : public QDeclarativeAnimationGroupPrivate
+class QQuickParentAnimationPrivate : public QQuickAnimationGroupPrivate
 {
     Q_DECLARE_PUBLIC(QQuickParentAnimation)
 public:
  QQuickParentAnimationPrivate()
-    : QDeclarativeAnimationGroupPrivate(), target(0), newParent(0), via(0) {}
+    : QQuickAnimationGroupPrivate(), target(0), newParent(0), via(0) {}
 
     QQuickItem *target;
     QQuickItem *newParent;
@@ -74,7 +74,7 @@ public:
     QPointF computeTransformOrigin(QQuickItem::TransformOrigin origin, qreal width, qreal height) const;
 };
 
-class QQuickAnchorAnimationPrivate : public QDeclarativeAbstractAnimationPrivate
+class QQuickAnchorAnimationPrivate : public QQuickAbstractAnimationPrivate
 {
     Q_DECLARE_PUBLIC(QQuickAnchorAnimation)
 public:
@@ -86,7 +86,7 @@ public:
     QList<QQuickItem*> targets;
 };
 
-class QQuickPathAnimationUpdater : public QDeclarativeBulkValueUpdater
+class QQuickPathAnimationUpdater : public QQuickBulkValueUpdater
 {
 public:
     QQuickPathAnimationUpdater() : path(0), target(0), reverse(false),
@@ -97,12 +97,12 @@ public:
 
     void setValue(qreal v);
 
-    QDeclarativePath *path;
+    QQuickPath *path;
 
     QPainterPath painterPath;
-    QDeclarativeCachedBezier prevBez;
+    QQuickCachedBezier prevBez;
     qreal pathLength;
-    QList<QDeclarativePath::AttributePoint> attributePoints;
+    QList<QQuickPath::AttributePoint> attributePoints;
 
     QQuickItem *target;
     bool reverse;
@@ -112,18 +112,18 @@ public:
     qreal toX;
     qreal toY;
     qreal currentV;
-    QDeclarativeNullableValue<qreal> interruptStart;
+    QQmlNullableValue<qreal> interruptStart;
     //TODO: bundle below into common struct
     QQuickPathAnimation::Orientation orientation;
     QPointF anchorPoint;
     qreal entryInterval;
     qreal exitInterval;
-    QDeclarativeNullableValue<qreal> endRotation;
-    QDeclarativeNullableValue<qreal> startRotation;
+    QQmlNullableValue<qreal> endRotation;
+    QQmlNullableValue<qreal> startRotation;
 };
 
 class QQuickPathAnimationPrivate;
-class QQuickPathAnimationAnimator : public QDeclarativeBulkValueAnimator
+class QQuickPathAnimationAnimator : public QQuickBulkValueAnimator
 {
 public:
     QQuickPathAnimationAnimator(QQuickPathAnimationPrivate * = 0);
@@ -136,20 +136,20 @@ private:
     QQuickPathAnimationPrivate *animationTemplate;
 };
 
-class QQuickPathAnimationPrivate : public QDeclarativeAbstractAnimationPrivate
+class QQuickPathAnimationPrivate : public QQuickAbstractAnimationPrivate
 {
     Q_DECLARE_PUBLIC(QQuickPathAnimation)
 public:
     QQuickPathAnimationPrivate() : path(0), target(0),
         orientation(QQuickPathAnimation::Fixed), entryDuration(0), exitDuration(0), duration(250) {}
 
-    QDeclarativePath *path;
+    QQuickPath *path;
     QQuickItem *target;
     QQuickPathAnimation::Orientation orientation;
     QPointF anchorPoint;
     qreal entryDuration;
     qreal exitDuration;
-    QDeclarativeNullableValue<qreal> endRotation;
+    QQmlNullableValue<qreal> endRotation;
     int duration;
     QEasingCurve easingCurve;
     QHash<QQuickItem*, QQuickPathAnimationAnimator* > activeAnimations;
diff --git a/src/quick/items/qquickitemchangelistener_p.h b/src/quick/items/qquickitemchangelistener_p.h
index d59b5b8856..3a5c25f5f5 100644
--- a/src/quick/items/qquickitemchangelistener_p.h
+++ b/src/quick/items/qquickitemchangelistener_p.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
diff --git a/src/quick/items/qquickitemsmodule.cpp b/src/quick/items/qquickitemsmodule.cpp
index a4cfa26205..64b84d35dd 100644
--- a/src/quick/items/qquickitemsmodule.cpp
+++ b/src/quick/items/qquickitemsmodule.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
@@ -61,8 +61,8 @@
 #include "qquickvisualdatamodel_p.h"
 #include "qquickgridview_p.h"
 #include "qquickpathview_p.h"
-#include <private/qdeclarativepath_p.h>
-#include <private/qdeclarativepathinterpolator_p.h>
+#include <private/qquickpath_p.h>
+#include <private/qquickpathinterpolator_p.h>
 #include "qquickpositioners_p.h"
 #include "qquickrepeater_p.h"
 #include "qquickloader_p.h"
@@ -70,7 +70,7 @@
 #include "qquickflipable_p.h"
 #include "qquicktranslate_p.h"
 #include "qquickstateoperations_p.h"
-#include "qquickanimation_p.h"
+#include "qquickitemanimation_p.h"
 #include <private/qquickshadereffect_p.h>
 #include <QtQuick/private/qquickshadereffectsource_p.h>
 //#include <private/qquickpincharea_p.h>
@@ -81,21 +81,21 @@
 #include "qquickdrag_p.h"
 #include "qquickdroparea_p.h"
 #include "qquickmultipointtoucharea_p.h"
-#include <private/qdeclarativemetatype_p.h>
+#include <private/qqmlmetatype_p.h>
 #include <QtQuick/private/qquickaccessibleattached_p.h>
 
-static QDeclarativePrivate::AutoParentResult qquickitem_autoParent(QObject *obj, QObject *parent)
+static QQmlPrivate::AutoParentResult qquickitem_autoParent(QObject *obj, QObject *parent)
 {
     QQuickItem *item = qobject_cast<QQuickItem *>(obj);
     if (!item)
-        return QDeclarativePrivate::IncompatibleObject;
+        return QQmlPrivate::IncompatibleObject;
 
     QQuickItem *parentItem = qobject_cast<QQuickItem *>(parent);
     if (!parentItem)
-        return QDeclarativePrivate::IncompatibleParent;
+        return QQmlPrivate::IncompatibleParent;
 
     item->setParentItem(parentItem);
-    return QDeclarativePrivate::Parented;
+    return QQmlPrivate::Parented;
 }
 
 static bool compareQQuickAnchorLines(const void *p1, const void *p2)
@@ -107,8 +107,8 @@ static bool compareQQuickAnchorLines(const void *p1, const void *p2)
 
 static void qt_quickitems_defineModule(const char *uri, int major, int minor)
 {
-    QDeclarativePrivate::RegisterAutoParent autoparent = { 0, &qquickitem_autoParent };
-    QDeclarativePrivate::qmlregister(QDeclarativePrivate::AutoParentRegistration, &autoparent);
+    QQmlPrivate::RegisterAutoParent autoparent = { 0, &qquickitem_autoParent };
+    QQmlPrivate::qmlregister(QQmlPrivate::AutoParentRegistration, &autoparent);
     QQuickItemPrivate::registerAccessorProperties();
 
 #ifdef QT_NO_MOVIE
@@ -121,7 +121,7 @@ static void qt_quickitems_defineModule(const char *uri, int major, int minor)
     qmlRegisterType<QQuickFlickable>(uri,major,minor,"Flickable");
     qmlRegisterType<QQuickFlipable>(uri,major,minor,"Flipable");
     qmlRegisterType<QQuickFlow>(uri,major,minor,"Flow");
-//    qmlRegisterType<QDeclarativeFocusPanel>(uri,major,minor,"FocusPanel");
+//    qmlRegisterType<QQuickFocusPanel>(uri,major,minor,"FocusPanel");
     qmlRegisterType<QQuickFocusScope>(uri,major,minor,"FocusScope");
     qmlRegisterType<QQuickGradient>(uri,major,minor,"Gradient");
     qmlRegisterType<QQuickGradientStop>(uri,major,minor,"GradientStop");
@@ -132,15 +132,15 @@ static void qt_quickitems_defineModule(const char *uri, int major, int minor)
     qmlRegisterType<QQuickListView>(uri,major,minor,"ListView");
     qmlRegisterType<QQuickLoader>(uri,major,minor,"Loader");
     qmlRegisterType<QQuickMouseArea>(uri,major,minor,"MouseArea");
-    qmlRegisterType<QDeclarativePath>(uri,major,minor,"Path");
-    qmlRegisterType<QDeclarativePathAttribute>(uri,major,minor,"PathAttribute");
-    qmlRegisterType<QDeclarativePathCubic>(uri,major,minor,"PathCubic");
-    qmlRegisterType<QDeclarativePathLine>(uri,major,minor,"PathLine");
-    qmlRegisterType<QDeclarativePathPercent>(uri,major,minor,"PathPercent");
-    qmlRegisterType<QDeclarativePathQuad>(uri,major,minor,"PathQuad");
-    qmlRegisterType<QDeclarativePathCatmullRomCurve>("QtQuick",2,0,"PathCurve");
-    qmlRegisterType<QDeclarativePathArc>("QtQuick",2,0,"PathArc");
-    qmlRegisterType<QDeclarativePathSvg>("QtQuick",2,0,"PathSvg");
+    qmlRegisterType<QQuickPath>(uri,major,minor,"Path");
+    qmlRegisterType<QQuickPathAttribute>(uri,major,minor,"PathAttribute");
+    qmlRegisterType<QQuickPathCubic>(uri,major,minor,"PathCubic");
+    qmlRegisterType<QQuickPathLine>(uri,major,minor,"PathLine");
+    qmlRegisterType<QQuickPathPercent>(uri,major,minor,"PathPercent");
+    qmlRegisterType<QQuickPathQuad>(uri,major,minor,"PathQuad");
+    qmlRegisterType<QQuickPathCatmullRomCurve>("QtQuick",2,0,"PathCurve");
+    qmlRegisterType<QQuickPathArc>("QtQuick",2,0,"PathArc");
+    qmlRegisterType<QQuickPathSvg>("QtQuick",2,0,"PathSvg");
     qmlRegisterType<QQuickPathView>(uri,major,minor,"PathView");
     qmlRegisterUncreatableType<QQuickBasePositioner>(uri,major,minor,"Positioner",
                                                   QStringLiteral("Positioner is an abstract type that is only available as an attached property."));
@@ -168,8 +168,8 @@ static void qt_quickitems_defineModule(const char *uri, int major, int minor)
     qmlRegisterType<QQuickKeyEvent>();
     qmlRegisterType<QQuickMouseEvent>();
     qmlRegisterType<QQuickTransform>();
-    qmlRegisterType<QDeclarativePathElement>();
-    qmlRegisterType<QDeclarativeCurve>();
+    qmlRegisterType<QQuickPathElement>();
+    qmlRegisterType<QQuickCurve>();
     qmlRegisterType<QQuickScaleGrid>();
     qmlRegisterType<QQuickTextLine>();
 #ifndef QT_NO_VALIDATOR
@@ -179,7 +179,7 @@ static void qt_quickitems_defineModule(const char *uri, int major, int minor)
     qmlRegisterType<QQuickPen>();
     qmlRegisterType<QQuickFlickableVisibleArea>();
     qRegisterMetaType<QQuickAnchorLine>("QQuickAnchorLine");
-    QDeclarativeMetaType::setQQuickAnchorLineCompareFunction(compareQQuickAnchorLines);
+    QQmlMetaType::setQQuickAnchorLineCompareFunction(compareQQuickAnchorLines);
 
     qmlRegisterUncreatableType<QQuickKeyNavigationAttached>(uri,major,minor,"KeyNavigation",QQuickKeyNavigationAttached::tr("KeyNavigation is only available via attached properties"));
     qmlRegisterUncreatableType<QQuickKeysAttached>(uri,major,minor,"Keys",QQuickKeysAttached::tr("Keys is only available via attached properties"));
@@ -208,7 +208,7 @@ static void qt_quickitems_defineModule(const char *uri, int major, int minor)
     qmlRegisterType<QQuickAnchorAnimation>(uri, major, minor,"AnchorAnimation");
     qmlRegisterType<QQuickParentAnimation>(uri, major, minor,"ParentAnimation");
     qmlRegisterType<QQuickPathAnimation>("QtQuick",2,0,"PathAnimation");
-    qmlRegisterType<QDeclarativePathInterpolator>("QtQuick",2,0,"PathInterpolator");
+    qmlRegisterType<QQuickPathInterpolator>("QtQuick",2,0,"PathInterpolator");
 
     qmlRegisterType<QQuickDropArea>("QtQuick", 2, 0, "DropArea");
     qmlRegisterType<QQuickDropEvent>();
diff --git a/src/quick/items/qquickitemsmodule_p.h b/src/quick/items/qquickitemsmodule_p.h
index cc51771a0b..1d6844ca5e 100644
--- a/src/quick/items/qquickitemsmodule_p.h
+++ b/src/quick/items/qquickitemsmodule_p.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
@@ -42,7 +42,7 @@
 #ifndef QQUICKITEMSMODULE_P_H
 #define QQUICKITEMSMODULE_P_H
 
-#include <qdeclarative.h>
+#include <qqml.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/quick/items/qquickitemview.cpp b/src/quick/items/qquickitemview.cpp
index 533e1f6852..418b3196ed 100644
--- a/src/quick/items/qquickitemview.cpp
+++ b/src/quick/items/qquickitemview.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
@@ -40,7 +40,7 @@
 ****************************************************************************/
 
 #include "qquickitemview_p_p.h"
-#include <QtQuick/private/qdeclarativetransition_p.h>
+#include <QtQuick/private/qquicktransition_p.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -253,7 +253,7 @@ void FxViewItemTransitionManager::startTransition(FxViewItem *item, FxViewItemTr
 
     QQuickItemViewPrivate *vp = static_cast<QQuickItemViewPrivate*>(QObjectPrivate::get(item->itemView()));
 
-    QDeclarativeTransition *trans = 0;
+    QQuickTransition *trans = 0;
     switch (type) {
     case NoTransition:
         break;
@@ -312,16 +312,16 @@ void FxViewItemTransitionManager::startTransition(FxViewItem *item, FxViewItemTr
         emit attached->targetItemsChanged();
     }
 
-    QDeclarativeStateOperation::ActionList actions;
-    actions << QDeclarativeAction(item->item, QLatin1String("x"), QVariant(to.x()));
-    actions << QDeclarativeAction(item->item, QLatin1String("y"), QVariant(to.y()));
+    QQuickStateOperation::ActionList actions;
+    actions << QQuickAction(item->item, QLatin1String("x"), QVariant(to.x()));
+    actions << QQuickAction(item->item, QLatin1String("y"), QVariant(to.y()));
 
-    QDeclarativeTransitionManager::transition(actions, trans, item->item);
+    QQuickTransitionManager::transition(actions, trans, item->item);
 }
 
 void FxViewItemTransitionManager::finished()
 {
-    QDeclarativeTransitionManager::finished();
+    QQuickTransitionManager::finished();
 
     m_active = false;
 
@@ -346,14 +346,14 @@ bool QQuickItemViewChangeSet::hasPendingChanges() const
     return !pendingChanges.isEmpty();
 }
 
-void QQuickItemViewChangeSet::applyChanges(const QDeclarativeChangeSet &changeSet)
+void QQuickItemViewChangeSet::applyChanges(const QQuickChangeSet &changeSet)
 {
     pendingChanges.apply(changeSet);
 
     int moveId = -1;
     int moveOffset = 0;
 
-    foreach (const QDeclarativeChangeSet::Remove &r, changeSet.removes()) {
+    foreach (const QQuickChangeSet::Remove &r, changeSet.removes()) {
         itemCount -= r.count;
         if (moveId == -1 && newCurrentIndex >= r.index + r.count) {
             newCurrentIndex -= r.count;
@@ -372,7 +372,7 @@ void QQuickItemViewChangeSet::applyChanges(const QDeclarativeChangeSet &changeSe
             currentChanged = true;
         }
     }
-    foreach (const QDeclarativeChangeSet::Insert &i, changeSet.inserts()) {
+    foreach (const QQuickChangeSet::Insert &i, changeSet.inserts()) {
         if (moveId == -1) {
             if (itemCount && newCurrentIndex >= i.index) {
                 newCurrentIndex += i.count;
@@ -758,9 +758,9 @@ QQuickViewTransitionAttached::QQuickViewTransitionAttached(QObject *parent)
 
     \sa QtQuick2::ViewTransition::targetIndexes
 */
-QDeclarativeListProperty<QObject> QQuickViewTransitionAttached::targetItems()
+QQmlListProperty<QObject> QQuickViewTransitionAttached::targetItems()
 {
-    return QDeclarativeListProperty<QObject>(this, m_targetItems);
+    return QQmlListProperty<QObject>(this, m_targetItems);
 }
 
 QQuickViewTransitionAttached *QQuickViewTransitionAttached::qmlAttachedProperties(QObject *obj)
@@ -810,8 +810,8 @@ void QQuickItemView::setModel(const QVariant &model)
     if (d->modelVariant == model)
         return;
     if (d->model) {
-        disconnect(d->model, SIGNAL(modelUpdated(QDeclarativeChangeSet,bool)),
-                this, SLOT(modelUpdated(QDeclarativeChangeSet,bool)));
+        disconnect(d->model, SIGNAL(modelUpdated(QQuickChangeSet,bool)),
+                this, SLOT(modelUpdated(QQuickChangeSet,bool)));
         disconnect(d->model, SIGNAL(initItem(int,QQuickItem*)), this, SLOT(initItem(int,QQuickItem*)));
         disconnect(d->model, SIGNAL(createdItem(int,QQuickItem*)), this, SLOT(createdItem(int,QQuickItem*)));
         disconnect(d->model, SIGNAL(destroyingItem(QQuickItem*)), this, SLOT(destroyingItem(QQuickItem*)));
@@ -873,14 +873,14 @@ void QQuickItemView::setModel(const QVariant &model)
                 polish();
             }
         }
-        connect(d->model, SIGNAL(modelUpdated(QDeclarativeChangeSet,bool)),
-                this, SLOT(modelUpdated(QDeclarativeChangeSet,bool)));
+        connect(d->model, SIGNAL(modelUpdated(QQuickChangeSet,bool)),
+                this, SLOT(modelUpdated(QQuickChangeSet,bool)));
         emit countChanged();
     }
     emit modelChanged();
 }
 
-QDeclarativeComponent *QQuickItemView::delegate() const
+QQmlComponent *QQuickItemView::delegate() const
 {
     Q_D(const QQuickItemView);
     if (d->model) {
@@ -891,7 +891,7 @@ QDeclarativeComponent *QQuickItemView::delegate() const
     return 0;
 }
 
-void QQuickItemView::setDelegate(QDeclarativeComponent *delegate)
+void QQuickItemView::setDelegate(QQmlComponent *delegate)
 {
     Q_D(QQuickItemView);
     if (delegate == this->delegate())
@@ -1026,7 +1026,7 @@ Qt::LayoutDirection QQuickItemView::effectiveLayoutDirection() const
 }
 
 
-QDeclarativeComponent *QQuickItemView::header() const
+QQmlComponent *QQuickItemView::header() const
 {
     Q_D(const QQuickItemView);
     return d->headerComponent;
@@ -1039,7 +1039,7 @@ QQuickItem *QQuickItemView::headerItem() const
     return d->header ? d->header->item : 0;
 }
 
-void QQuickItemView::setHeader(QDeclarativeComponent *headerComponent)
+void QQuickItemView::setHeader(QQmlComponent *headerComponent)
 {
     Q_D(QQuickItemView);
     if (d->headerComponent != headerComponent) {
@@ -1062,7 +1062,7 @@ void QQuickItemView::setHeader(QDeclarativeComponent *headerComponent)
     }
 }
 
-QDeclarativeComponent *QQuickItemView::footer() const
+QQmlComponent *QQuickItemView::footer() const
 {
     Q_D(const QQuickItemView);
     return d->footerComponent;
@@ -1075,7 +1075,7 @@ QQuickItem *QQuickItemView::footerItem() const
     return d->footer ? d->footer->item : 0;
 }
 
-void QQuickItemView::setFooter(QDeclarativeComponent *footerComponent)
+void QQuickItemView::setFooter(QQmlComponent *footerComponent)
 {
     Q_D(QQuickItemView);
     if (d->footerComponent != footerComponent) {
@@ -1095,14 +1095,14 @@ void QQuickItemView::setFooter(QDeclarativeComponent *footerComponent)
     }
 }
 
-QDeclarativeComponent *QQuickItemView::highlight() const
+QQmlComponent *QQuickItemView::highlight() const
 {
     Q_D(const QQuickItemView);
     const_cast<QQuickItemViewPrivate*>(d)->applyPendingChanges();
     return d->highlightComponent;
 }
 
-void QQuickItemView::setHighlight(QDeclarativeComponent *highlightComponent)
+void QQuickItemView::setHighlight(QQmlComponent *highlightComponent)
 {
     Q_D(QQuickItemView);
     if (highlightComponent != d->highlightComponent) {
@@ -1225,13 +1225,13 @@ void QQuickItemView::setHighlightMoveDuration(int duration)
     }
 }
 
-QDeclarativeTransition *QQuickItemView::populateTransition() const
+QQuickTransition *QQuickItemView::populateTransition() const
 {
     Q_D(const QQuickItemView);
     return d->populateTransition;
 }
 
-void QQuickItemView::setPopulateTransition(QDeclarativeTransition *transition)
+void QQuickItemView::setPopulateTransition(QQuickTransition *transition)
 {
     Q_D(QQuickItemView);
     if (d->populateTransition != transition) {
@@ -1240,13 +1240,13 @@ void QQuickItemView::setPopulateTransition(QDeclarativeTransition *transition)
     }
 }
 
-QDeclarativeTransition *QQuickItemView::addTransition() const
+QQuickTransition *QQuickItemView::addTransition() const
 {
     Q_D(const QQuickItemView);
     return d->addTransition;
 }
 
-void QQuickItemView::setAddTransition(QDeclarativeTransition *transition)
+void QQuickItemView::setAddTransition(QQuickTransition *transition)
 {
     Q_D(QQuickItemView);
     if (d->addTransition != transition) {
@@ -1255,13 +1255,13 @@ void QQuickItemView::setAddTransition(QDeclarativeTransition *transition)
     }
 }
 
-QDeclarativeTransition *QQuickItemView::addDisplacedTransition() const
+QQuickTransition *QQuickItemView::addDisplacedTransition() const
 {
     Q_D(const QQuickItemView);
     return d->addDisplacedTransition;
 }
 
-void QQuickItemView::setAddDisplacedTransition(QDeclarativeTransition *transition)
+void QQuickItemView::setAddDisplacedTransition(QQuickTransition *transition)
 {
     Q_D(QQuickItemView);
     if (d->addDisplacedTransition != transition) {
@@ -1270,13 +1270,13 @@ void QQuickItemView::setAddDisplacedTransition(QDeclarativeTransition *transitio
     }
 }
 
-QDeclarativeTransition *QQuickItemView::moveTransition() const
+QQuickTransition *QQuickItemView::moveTransition() const
 {
     Q_D(const QQuickItemView);
     return d->moveTransition;
 }
 
-void QQuickItemView::setMoveTransition(QDeclarativeTransition *transition)
+void QQuickItemView::setMoveTransition(QQuickTransition *transition)
 {
     Q_D(QQuickItemView);
     if (d->moveTransition != transition) {
@@ -1285,13 +1285,13 @@ void QQuickItemView::setMoveTransition(QDeclarativeTransition *transition)
     }
 }
 
-QDeclarativeTransition *QQuickItemView::moveDisplacedTransition() const
+QQuickTransition *QQuickItemView::moveDisplacedTransition() const
 {
     Q_D(const QQuickItemView);
     return d->moveDisplacedTransition;
 }
 
-void QQuickItemView::setMoveDisplacedTransition(QDeclarativeTransition *transition)
+void QQuickItemView::setMoveDisplacedTransition(QQuickTransition *transition)
 {
     Q_D(QQuickItemView);
     if (d->moveDisplacedTransition != transition) {
@@ -1300,13 +1300,13 @@ void QQuickItemView::setMoveDisplacedTransition(QDeclarativeTransition *transiti
     }
 }
 
-QDeclarativeTransition *QQuickItemView::removeTransition() const
+QQuickTransition *QQuickItemView::removeTransition() const
 {
     Q_D(const QQuickItemView);
     return d->removeTransition;
 }
 
-void QQuickItemView::setRemoveTransition(QDeclarativeTransition *transition)
+void QQuickItemView::setRemoveTransition(QQuickTransition *transition)
 {
     Q_D(QQuickItemView);
     if (d->removeTransition != transition) {
@@ -1315,13 +1315,13 @@ void QQuickItemView::setRemoveTransition(QDeclarativeTransition *transition)
     }
 }
 
-QDeclarativeTransition *QQuickItemView::removeDisplacedTransition() const
+QQuickTransition *QQuickItemView::removeDisplacedTransition() const
 {
     Q_D(const QQuickItemView);
     return d->removeDisplacedTransition;
 }
 
-void QQuickItemView::setRemoveDisplacedTransition(QDeclarativeTransition *transition)
+void QQuickItemView::setRemoveDisplacedTransition(QQuickTransition *transition)
 {
     Q_D(QQuickItemView);
     if (d->removeDisplacedTransition != transition) {
@@ -1522,7 +1522,7 @@ void QQuickItemViewPrivate::transitionNextReposition(FxViewItem *item, FxViewIte
     }
 }
 
-int QQuickItemViewPrivate::findMoveKeyIndex(QDeclarativeChangeSet::MoveKey key, const QVector<QDeclarativeChangeSet::Remove> &changes) const
+int QQuickItemViewPrivate::findMoveKeyIndex(QQuickChangeSet::MoveKey key, const QVector<QQuickChangeSet::Remove> &changes) const
 {
     for (int i=0; i<changes.count(); i++) {
         for (int j=changes[i].index; j<changes[i].index + changes[i].count; j++) {
@@ -1621,7 +1621,7 @@ void QQuickItemView::destroyRemoved()
     polish();
 }
 
-void QQuickItemView::modelUpdated(const QDeclarativeChangeSet &changeSet, bool reset)
+void QQuickItemView::modelUpdated(const QQuickChangeSet &changeSet, bool reset)
 {
     Q_D(QQuickItemView);
     if (reset) {
@@ -2354,7 +2354,7 @@ bool QQuickItemViewPrivate::applyModelChanges(ChangeResult *totalInsertionResult
             || !currentChanges.pendingChanges.inserts().isEmpty();
 
     FxViewItem *prevFirstVisible = firstVisibleItem();
-    QDeclarativeNullableValue<qreal> prevViewPos;
+    QQmlNullableValue<qreal> prevViewPos;
     int prevFirstVisibleIndex = -1;
     if (prevFirstVisible) {
         prevViewPos = prevFirstVisible->position();
@@ -2365,8 +2365,8 @@ bool QQuickItemViewPrivate::applyModelChanges(ChangeResult *totalInsertionResult
     totalInsertionResult->visiblePos = prevViewPos;
     totalRemovalResult->visiblePos = prevViewPos;
 
-    const QVector<QDeclarativeChangeSet::Remove> &removals = currentChanges.pendingChanges.removes();
-    const QVector<QDeclarativeChangeSet::Insert> &insertions = currentChanges.pendingChanges.inserts();
+    const QVector<QQuickChangeSet::Remove> &removals = currentChanges.pendingChanges.removes();
+    const QVector<QQuickChangeSet::Insert> &insertions = currentChanges.pendingChanges.inserts();
     ChangeResult insertionResult(prevViewPos);
     ChangeResult removalResult(prevViewPos);
 
@@ -2385,7 +2385,7 @@ bool QQuickItemViewPrivate::applyModelChanges(ChangeResult *totalInsertionResult
         }
     }
     if (runDelayedRemoveTransition) {
-        QDeclarativeChangeSet::Remove removal;
+        QQuickChangeSet::Remove removal;
         for (QList<FxViewItem*>::Iterator it = visibleItems.begin(); it != visibleItems.end();) {
             FxViewItem *item = *it;
             if (item->index == -1 && !item->attached->delayRemove()) {
@@ -2453,7 +2453,7 @@ bool QQuickItemViewPrivate::applyModelChanges(ChangeResult *totalInsertionResult
 
     // Whatever removed/moved items remain are no longer visible items.
     prepareRemoveTransitions(&currentChanges.removedItems);
-    for (QHash<QDeclarativeChangeSet::MoveKey, FxViewItem *>::Iterator it = currentChanges.removedItems.begin();
+    for (QHash<QQuickChangeSet::MoveKey, FxViewItem *>::Iterator it = currentChanges.removedItems.begin();
          it != currentChanges.removedItems.end(); ++it) {
         releaseItem(it.value());
     }
@@ -2483,7 +2483,7 @@ bool QQuickItemViewPrivate::applyModelChanges(ChangeResult *totalInsertionResult
     return visibleAffected;
 }
 
-bool QQuickItemViewPrivate::applyRemovalChange(const QDeclarativeChangeSet::Remove &removal, ChangeResult *removeResult, int *removedCount)
+bool QQuickItemViewPrivate::applyRemovalChange(const QQuickChangeSet::Remove &removal, ChangeResult *removeResult, int *removedCount)
 {
     Q_Q(QQuickItemView);
     bool visibleAffected = false;
@@ -2533,7 +2533,7 @@ bool QQuickItemViewPrivate::applyRemovalChange(const QDeclarativeChangeSet::Remo
     return visibleAffected;
 }
 
-void QQuickItemViewPrivate::removeItem(FxViewItem *item, const QDeclarativeChangeSet::Remove &removal, ChangeResult *removeResult)
+void QQuickItemViewPrivate::removeItem(FxViewItem *item, const QQuickChangeSet::Remove &removal, ChangeResult *removeResult)
 {
     if (removeResult->visiblePos.isValid()) {
         if (item->position() < removeResult->visiblePos)
@@ -2546,7 +2546,7 @@ void QQuickItemViewPrivate::removeItem(FxViewItem *item, const QDeclarativeChang
         transitionNextReposition(item, FxViewItemTransitionManager::MoveTransition, true);
     } else {
         // track item so it is released later
-        currentChanges.removedItems.insertMulti(QDeclarativeChangeSet::MoveKey(), item);
+        currentChanges.removedItems.insertMulti(QQuickChangeSet::MoveKey(), item);
     }
     if (!removeResult->changedFirstItem && item == *visibleItems.constBegin())
         removeResult->changedFirstItem = true;
@@ -2558,7 +2558,7 @@ void QQuickItemViewPrivate::repositionFirstItem(FxViewItem *prevVisibleItemsFirs
                                                    ChangeResult *insertionResult,
                                                    ChangeResult *removalResult)
 {
-    const QDeclarativeNullableValue<qreal> prevViewPos = insertionResult->visiblePos;
+    const QQmlNullableValue<qreal> prevViewPos = insertionResult->visiblePos;
 
     // reposition visibleItems.first() correctly so that the content y doesn't jump
     if (visibleItems.count()) {
@@ -2629,13 +2629,13 @@ void QQuickItemViewPrivate::prepareVisibleItemTransitions()
     }
 }
 
-void QQuickItemViewPrivate::prepareRemoveTransitions(QHash<QDeclarativeChangeSet::MoveKey, FxViewItem *> *removedItems)
+void QQuickItemViewPrivate::prepareRemoveTransitions(QHash<QQuickChangeSet::MoveKey, FxViewItem *> *removedItems)
 {
     removeTransitionIndexes.clear();
     removeTransitionTargets.clear();
 
     if (canTransition(FxViewItemTransitionManager::RemoveTransition, true)) {
-        for (QHash<QDeclarativeChangeSet::MoveKey, FxViewItem *>::Iterator it = removedItems->begin();
+        for (QHash<QQuickChangeSet::MoveKey, FxViewItem *>::Iterator it = removedItems->begin();
              it != removedItems->end(); ) {
             bool isRemove = it.key().moveId < 0;
             if (isRemove) {
@@ -2710,7 +2710,7 @@ FxViewItem *QQuickItemViewPrivate::createItem(int modelIndex, bool asynchronous)
 
     if (QQuickItem *item = model->item(modelIndex, asynchronous)) {
         item->setParentItem(q->contentItem());
-        QDeclarative_setParent_noEvent(item, q->contentItem());
+        QQml_setParent_noEvent(item, q->contentItem());
         requestedIndex = -1;
         FxViewItem *viewItem = requestedItem;
         if (!viewItem)
@@ -2757,7 +2757,7 @@ void QQuickItemView::initItem(int index, QQuickItem *item)
         if (d->requestedAsync)
             item->setVisible(false);
         item->setParentItem(contentItem());
-        QDeclarative_setParent_noEvent(item, contentItem());
+        QQml_setParent_noEvent(item, contentItem());
         d->requestedItem = d->newViewItem(index, item);
     }
 }
@@ -2790,18 +2790,18 @@ QQuickItem *QQuickItemViewPrivate::createHighlightItem()
     return createComponentItem(highlightComponent, true, true);
 }
 
-QQuickItem *QQuickItemViewPrivate::createComponentItem(QDeclarativeComponent *component, bool receiveItemGeometryChanges, bool createDefault)
+QQuickItem *QQuickItemViewPrivate::createComponentItem(QQmlComponent *component, bool receiveItemGeometryChanges, bool createDefault)
 {
     Q_Q(QQuickItemView);
 
     QQuickItem *item = 0;
     if (component) {
-        QDeclarativeContext *creationContext = component->creationContext();
-        QDeclarativeContext *context = new QDeclarativeContext(
+        QQmlContext *creationContext = component->creationContext();
+        QQmlContext *context = new QQmlContext(
                 creationContext ? creationContext : qmlContext(q));
         QObject *nobj = component->create(context);
         if (nobj) {
-            QDeclarative_setParent_noEvent(context, nobj);
+            QQml_setParent_noEvent(context, nobj);
             item = qobject_cast<QQuickItem *>(nobj);
             if (!item)
                 delete nobj;
@@ -2812,7 +2812,7 @@ QQuickItem *QQuickItemViewPrivate::createComponentItem(QDeclarativeComponent *co
         item = new QQuickItem;
     }
     if (item) {
-        QDeclarative_setParent_noEvent(item, q->contentItem());
+        QQml_setParent_noEvent(item, q->contentItem());
         item->setParentItem(q->contentItem());
         if (receiveItemGeometryChanges) {
             QQuickItemPrivate *itemPrivate = QQuickItemPrivate::get(item);
diff --git a/src/quick/items/qquickitemview_p.h b/src/quick/items/qquickitemview_p.h
index 0d3cd1c3ce..01a6ee28ec 100644
--- a/src/quick/items/qquickitemview_p.h
+++ b/src/quick/items/qquickitemview_p.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
@@ -48,9 +48,9 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Declarative)
+QT_MODULE(Qml)
 
-class QDeclarativeChangeSet;
+class QQuickChangeSet;
 
 class QQuickItemViewPrivate;
 
@@ -59,7 +59,7 @@ class Q_AUTOTEST_EXPORT QQuickItemView : public QQuickFlickable
     Q_OBJECT
 
     Q_PROPERTY(QVariant model READ model WRITE setModel NOTIFY modelChanged)
-    Q_PROPERTY(QDeclarativeComponent *delegate READ delegate WRITE setDelegate NOTIFY delegateChanged)
+    Q_PROPERTY(QQmlComponent *delegate READ delegate WRITE setDelegate NOTIFY delegateChanged)
     Q_PROPERTY(int count READ count NOTIFY countChanged)
 
     Q_PROPERTY(int currentIndex READ currentIndex WRITE setCurrentIndex NOTIFY currentIndexChanged)
@@ -71,20 +71,20 @@ class Q_AUTOTEST_EXPORT QQuickItemView : public QQuickFlickable
     Q_PROPERTY(Qt::LayoutDirection layoutDirection READ layoutDirection WRITE setLayoutDirection NOTIFY layoutDirectionChanged)
     Q_PROPERTY(Qt::LayoutDirection effectiveLayoutDirection READ effectiveLayoutDirection NOTIFY effectiveLayoutDirectionChanged)
 
-    Q_PROPERTY(QDeclarativeComponent *header READ header WRITE setHeader NOTIFY headerChanged)
+    Q_PROPERTY(QQmlComponent *header READ header WRITE setHeader NOTIFY headerChanged)
     Q_PROPERTY(QQuickItem *headerItem READ headerItem NOTIFY headerItemChanged)
-    Q_PROPERTY(QDeclarativeComponent *footer READ footer WRITE setFooter NOTIFY footerChanged)
+    Q_PROPERTY(QQmlComponent *footer READ footer WRITE setFooter NOTIFY footerChanged)
     Q_PROPERTY(QQuickItem *footerItem READ footerItem NOTIFY footerItemChanged)
 
-    Q_PROPERTY(QDeclarativeTransition *populate READ populateTransition WRITE setPopulateTransition NOTIFY populateTransitionChanged)
-    Q_PROPERTY(QDeclarativeTransition *add READ addTransition WRITE setAddTransition NOTIFY addTransitionChanged)
-    Q_PROPERTY(QDeclarativeTransition *addDisplaced READ addDisplacedTransition WRITE setAddDisplacedTransition NOTIFY addDisplacedTransitionChanged)
-    Q_PROPERTY(QDeclarativeTransition *move READ moveTransition WRITE setMoveTransition NOTIFY moveTransitionChanged)
-    Q_PROPERTY(QDeclarativeTransition *moveDisplaced READ moveDisplacedTransition WRITE setMoveDisplacedTransition NOTIFY moveDisplacedTransitionChanged)
-    Q_PROPERTY(QDeclarativeTransition *remove READ removeTransition WRITE setRemoveTransition NOTIFY removeTransitionChanged)
-    Q_PROPERTY(QDeclarativeTransition *removeDisplaced READ removeDisplacedTransition WRITE setRemoveDisplacedTransition NOTIFY removeDisplacedTransitionChanged)
+    Q_PROPERTY(QQuickTransition *populate READ populateTransition WRITE setPopulateTransition NOTIFY populateTransitionChanged)
+    Q_PROPERTY(QQuickTransition *add READ addTransition WRITE setAddTransition NOTIFY addTransitionChanged)
+    Q_PROPERTY(QQuickTransition *addDisplaced READ addDisplacedTransition WRITE setAddDisplacedTransition NOTIFY addDisplacedTransitionChanged)
+    Q_PROPERTY(QQuickTransition *move READ moveTransition WRITE setMoveTransition NOTIFY moveTransitionChanged)
+    Q_PROPERTY(QQuickTransition *moveDisplaced READ moveDisplacedTransition WRITE setMoveDisplacedTransition NOTIFY moveDisplacedTransitionChanged)
+    Q_PROPERTY(QQuickTransition *remove READ removeTransition WRITE setRemoveTransition NOTIFY removeTransitionChanged)
+    Q_PROPERTY(QQuickTransition *removeDisplaced READ removeDisplacedTransition WRITE setRemoveDisplacedTransition NOTIFY removeDisplacedTransitionChanged)
 
-    Q_PROPERTY(QDeclarativeComponent *highlight READ highlight WRITE setHighlight NOTIFY highlightChanged)
+    Q_PROPERTY(QQmlComponent *highlight READ highlight WRITE setHighlight NOTIFY highlightChanged)
     Q_PROPERTY(QQuickItem *highlightItem READ highlightItem NOTIFY highlightItemChanged)
     Q_PROPERTY(bool highlightFollowsCurrentItem READ highlightFollowsCurrentItem WRITE setHighlightFollowsCurrentItem NOTIFY highlightFollowsCurrentItemChanged)
     Q_PROPERTY(HighlightRangeMode highlightRangeMode READ highlightRangeMode WRITE setHighlightRangeMode NOTIFY highlightRangeModeChanged)
@@ -102,8 +102,8 @@ public:
     QVariant model() const;
     void setModel(const QVariant &);
 
-    QDeclarativeComponent *delegate() const;
-    void setDelegate(QDeclarativeComponent *);
+    QQmlComponent *delegate() const;
+    void setDelegate(QQmlComponent *);
 
     int count() const;
 
@@ -122,37 +122,37 @@ public:
     void setLayoutDirection(Qt::LayoutDirection);
     Qt::LayoutDirection effectiveLayoutDirection() const;
 
-    QDeclarativeComponent *footer() const;
-    void setFooter(QDeclarativeComponent *);
+    QQmlComponent *footer() const;
+    void setFooter(QQmlComponent *);
     QQuickItem *footerItem() const;
 
-    QDeclarativeComponent *header() const;
-    void setHeader(QDeclarativeComponent *);
+    QQmlComponent *header() const;
+    void setHeader(QQmlComponent *);
     QQuickItem *headerItem() const;
 
-    QDeclarativeTransition *populateTransition() const;
-    void setPopulateTransition(QDeclarativeTransition *transition);
+    QQuickTransition *populateTransition() const;
+    void setPopulateTransition(QQuickTransition *transition);
 
-    QDeclarativeTransition *addTransition() const;
-    void setAddTransition(QDeclarativeTransition *transition);
+    QQuickTransition *addTransition() const;
+    void setAddTransition(QQuickTransition *transition);
 
-    QDeclarativeTransition *addDisplacedTransition() const;
-    void setAddDisplacedTransition(QDeclarativeTransition *transition);
+    QQuickTransition *addDisplacedTransition() const;
+    void setAddDisplacedTransition(QQuickTransition *transition);
 
-    QDeclarativeTransition *moveTransition() const;
-    void setMoveTransition(QDeclarativeTransition *transition);
+    QQuickTransition *moveTransition() const;
+    void setMoveTransition(QQuickTransition *transition);
 
-    QDeclarativeTransition *moveDisplacedTransition() const;
-    void setMoveDisplacedTransition(QDeclarativeTransition *transition);
+    QQuickTransition *moveDisplacedTransition() const;
+    void setMoveDisplacedTransition(QQuickTransition *transition);
 
-    QDeclarativeTransition *removeTransition() const;
-    void setRemoveTransition(QDeclarativeTransition *transition);
+    QQuickTransition *removeTransition() const;
+    void setRemoveTransition(QQuickTransition *transition);
 
-    QDeclarativeTransition *removeDisplacedTransition() const;
-    void setRemoveDisplacedTransition(QDeclarativeTransition *transition);
+    QQuickTransition *removeDisplacedTransition() const;
+    void setRemoveDisplacedTransition(QQuickTransition *transition);
 
-    QDeclarativeComponent *highlight() const;
-    void setHighlight(QDeclarativeComponent *);
+    QQmlComponent *highlight() const;
+    void setHighlight(QQmlComponent *);
 
     QQuickItem *highlightItem() const;
 
@@ -234,7 +234,7 @@ protected slots:
     void destroyRemoved();
     void createdItem(int index, QQuickItem *item);
     void initItem(int index, QQuickItem *item);
-    void modelUpdated(const QDeclarativeChangeSet &changeSet, bool reset);
+    void modelUpdated(const QQuickChangeSet &changeSet, bool reset);
     void destroyingItem(QQuickItem *item);
     void animStopped();
     void trackedPositionChanged();
@@ -333,7 +333,7 @@ class QQuickViewTransitionAttached : public QObject
     Q_PROPERTY(QPointF destination READ destination NOTIFY destinationChanged)
 
     Q_PROPERTY(QList<int> targetIndexes READ targetIndexes NOTIFY targetIndexesChanged)
-    Q_PROPERTY(QDeclarativeListProperty<QObject> targetItems READ targetItems NOTIFY targetItemsChanged)
+    Q_PROPERTY(QQmlListProperty<QObject> targetItems READ targetItems NOTIFY targetItemsChanged)
 
 public:
     QQuickViewTransitionAttached(QObject *parent);
@@ -343,7 +343,7 @@ public:
     QPointF destination() const { return m_destination; }
 
     QList<int> targetIndexes() const { return m_targetIndexes; }
-    QDeclarativeListProperty<QObject> targetItems();
+    QQmlListProperty<QObject> targetItems();
 
     static QQuickViewTransitionAttached *qmlAttachedProperties(QObject *);
 
diff --git a/src/quick/items/qquickitemview_p_p.h b/src/quick/items/qquickitemview_p_p.h
index 05927c0d68..a4892e8972 100644
--- a/src/quick/items/qquickitemview_p_p.h
+++ b/src/quick/items/qquickitemview_p_p.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
@@ -46,8 +46,8 @@
 #include "qquickflickable_p_p.h"
 #include "qquickvisualdatamodel_p.h"
 #include "qquickvisualitemmodel_p.h"
-#include <private/qdeclarativetransitionmanager_p_p.h>
-#include <private/qdeclarativechangeset_p.h>
+#include <private/qquicktransitionmanager_p_p.h>
+#include <private/qquickchangeset_p.h>
 
 
 QT_BEGIN_HEADER
@@ -58,7 +58,7 @@ QT_MODULE(Declarative)
 
 
 class FxViewItem;
-class FxViewItemTransitionManager : public QDeclarativeTransitionManager
+class FxViewItemTransitionManager : public QQuickTransitionManager
 {
 public:
     enum TransitionType {
@@ -142,12 +142,12 @@ public:
     void prepare(int currentIndex, int count);
     void reset();
 
-    void applyChanges(const QDeclarativeChangeSet &changeSet);
+    void applyChanges(const QQuickChangeSet &changeSet);
 
     int itemCount;
     int newCurrentIndex;
-    QDeclarativeChangeSet pendingChanges;
-    QHash<QDeclarativeChangeSet::MoveKey, FxViewItem *> removedItems;
+    QQuickChangeSet pendingChanges;
+    QHash<QQuickChangeSet::MoveKey, FxViewItem *> removedItems;
 
     bool active : 1;
     bool currentChanged : 1;
@@ -162,7 +162,7 @@ public:
     QQuickItemViewPrivate();
 
     struct ChangeResult {
-        QDeclarativeNullableValue<qreal> visiblePos;
+        QQmlNullableValue<qreal> visiblePos;
         bool changedFirstItem;
         qreal sizeChangesBeforeVisiblePos;
         qreal sizeChangesAfterVisiblePos;
@@ -174,7 +174,7 @@ public:
               sizeChangesBeforeVisiblePos(0), sizeChangesAfterVisiblePos(0),
               countChangeBeforeVisible(0), countChangeAfterVisibleItems(0) {}
 
-        ChangeResult(const QDeclarativeNullableValue<qreal> &p)
+        ChangeResult(const QQmlNullableValue<qreal> &p)
             : visiblePos(p), changedFirstItem(false),
               sizeChangesBeforeVisiblePos(0), sizeChangesAfterVisiblePos(0),
               countChangeBeforeVisible(0), countChangeAfterVisibleItems(0) {}
@@ -228,7 +228,7 @@ public:
     virtual void releaseItem(FxViewItem *item);
 
     QQuickItem *createHighlightItem();
-    QQuickItem *createComponentItem(QDeclarativeComponent *component, bool receiveItemGeometryChanges, bool createDefault = false);
+    QQuickItem *createComponentItem(QQmlComponent *component, bool receiveItemGeometryChanges, bool createDefault = false);
 
     void updateCurrent(int modelIndex);
     void updateTrackedItem();
@@ -238,19 +238,19 @@ public:
     void positionViewAtIndex(int index, int mode);
     void applyPendingChanges();
     bool applyModelChanges(ChangeResult *insertionResult, ChangeResult *removalResult);
-    bool applyRemovalChange(const QDeclarativeChangeSet::Remove &removal, ChangeResult *changeResult, int *removedCount);
-    void removeItem(FxViewItem *item, const QDeclarativeChangeSet::Remove &removal, ChangeResult *removeResult);
+    bool applyRemovalChange(const QQuickChangeSet::Remove &removal, ChangeResult *changeResult, int *removedCount);
+    void removeItem(FxViewItem *item, const QQuickChangeSet::Remove &removal, ChangeResult *removeResult);
     void repositionFirstItem(FxViewItem *prevVisibleItemsFirst, qreal prevVisibleItemsFirstPos,
             FxViewItem *prevFirstVisible, ChangeResult *insertionResult, ChangeResult *removalResult);
 
     void prepareVisibleItemTransitions();
-    void prepareRemoveTransitions(QHash<QDeclarativeChangeSet::MoveKey, FxViewItem *> *removedItems);
+    void prepareRemoveTransitions(QHash<QQuickChangeSet::MoveKey, FxViewItem *> *removedItems);
     bool prepareNonVisibleItemTransition(FxViewItem *item, const QRectF &viewBounds);
 
     bool canTransition(FxViewItemTransitionManager::TransitionType type, bool asTarget) const;
     bool hasItemTransitions() const;
     void transitionNextReposition(FxViewItem *item, FxViewItemTransitionManager::TransitionType type, bool isTarget);
-    int findMoveKeyIndex(QDeclarativeChangeSet::MoveKey key, const QVector<QDeclarativeChangeSet::Remove> &changes) const;
+    int findMoveKeyIndex(QQuickChangeSet::MoveKey key, const QVector<QQuickChangeSet::Remove> &changes) const;
 
     void checkVisible() const;
     void showVisibleItems() const;
@@ -262,7 +262,7 @@ public:
             hData.markExtentsDirty();
     }
 
-    QDeclarativeGuard<QQuickVisualModel> model;
+    QQmlGuard<QQuickVisualModel> model;
     QVariant modelVariant;
     int itemCount;
     int buffer;
@@ -282,25 +282,25 @@ public:
     QQuickItemViewChangeSet currentChanges;
 
     // XXX split into struct
-    QDeclarativeComponent *highlightComponent;
+    QQmlComponent *highlightComponent;
     FxViewItem *highlight;
     int highlightRange;     // enum value
     qreal highlightRangeStart;
     qreal highlightRangeEnd;
     int highlightMoveDuration;
 
-    QDeclarativeComponent *headerComponent;
+    QQmlComponent *headerComponent;
     FxViewItem *header;
-    QDeclarativeComponent *footerComponent;
+    QQmlComponent *footerComponent;
     FxViewItem *footer;
 
-    QDeclarativeTransition *populateTransition;
-    QDeclarativeTransition *addTransition;
-    QDeclarativeTransition *addDisplacedTransition;
-    QDeclarativeTransition *moveTransition;
-    QDeclarativeTransition *moveDisplacedTransition;
-    QDeclarativeTransition *removeTransition;
-    QDeclarativeTransition *removeDisplacedTransition;
+    QQuickTransition *populateTransition;
+    QQuickTransition *addTransition;
+    QQuickTransition *addDisplacedTransition;
+    QQuickTransition *moveTransition;
+    QQuickTransition *moveDisplacedTransition;
+    QQuickTransition *removeTransition;
+    QQuickTransition *removeDisplacedTransition;
 
     QList<int> addTransitionIndexes;
     QList<int> moveTransitionIndexes;
@@ -311,8 +311,8 @@ public:
 
     struct MovedItem {
         FxViewItem *item;
-        QDeclarativeChangeSet::MoveKey moveKey;
-        MovedItem(FxViewItem *i, QDeclarativeChangeSet::MoveKey k)
+        QQuickChangeSet::MoveKey moveKey;
+        MovedItem(FxViewItem *i, QQuickChangeSet::MoveKey k)
             : item(i), moveKey(k) {}
     };
     QList<FxViewItem *> releasePendingTransition;
@@ -372,7 +372,7 @@ protected:
     virtual void layoutVisibleItems(int fromModelIndex = 0) = 0;
     virtual void changedVisibleIndex(int newIndex) = 0;
 
-    virtual bool applyInsertionChange(const QDeclarativeChangeSet::Insert &insert, ChangeResult *changeResult,
+    virtual bool applyInsertionChange(const QQuickChangeSet::Insert &insert, ChangeResult *changeResult,
                 QList<FxViewItem *> *newItems, QList<MovedItem> *movingIntoView) = 0;
 
     virtual bool needsRefillForAddedOrRemovedIndex(int) const { return false; }
diff --git a/src/quick/items/qquicklistview.cpp b/src/quick/items/qquicklistview.cpp
index 906b9b3781..beb607dde5 100644
--- a/src/quick/items/qquicklistview.cpp
+++ b/src/quick/items/qquicklistview.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
@@ -43,14 +43,14 @@
 #include "qquickitemview_p_p.h"
 #include "qquickvisualitemmodel_p.h"
 
-#include <QtDeclarative/qdeclarativeexpression.h>
-#include <QtDeclarative/qdeclarativeengine.h>
-#include <QtDeclarative/qdeclarativeinfo.h>
+#include <QtQml/qqmlexpression.h>
+#include <QtQml/qqmlengine.h>
+#include <QtQml/qqmlinfo.h>
 #include <QtGui/qevent.h>
 #include <QtCore/qmath.h>
 #include <QtCore/qcoreapplication.h>
 
-#include <private/qdeclarativesmoothedanimation_p_p.h>
+#include <private/qquicksmoothedanimation_p_p.h>
 #include <private/qlistmodelinterface_p.h>
 #include "qplatformdefs.h"
 
@@ -106,7 +106,7 @@ public:
     virtual void setPosition(qreal pos);
     virtual void layoutVisibleItems(int fromModelIndex = 0);
 
-    virtual bool applyInsertionChange(const QDeclarativeChangeSet::Insert &insert, ChangeResult *changeResult, QList<FxViewItem *> *addedItems, QList<MovedItem> *movingIntoView);
+    virtual bool applyInsertionChange(const QQuickChangeSet::Insert &insert, ChangeResult *changeResult, QList<FxViewItem *> *addedItems, QList<MovedItem> *movingIntoView);
     virtual void translateAndTransitionItemsAfter(int afterIndex, const ChangeResult &insertionResult, const ChangeResult &removalResult);
 
     virtual void updateSections();
@@ -132,7 +132,7 @@ public:
     virtual void fixupPosition();
     virtual void fixup(AxisData &data, qreal minExtent, qreal maxExtent);
     virtual void flick(QQuickItemViewPrivate::AxisData &data, qreal minExtent, qreal maxExtent, qreal vSize,
-                        QDeclarativeTimeLineCallback::Callback fixupCallback, qreal velocity);
+                        QQuickTimeLineCallback::Callback fixupCallback, qreal velocity);
 
     QQuickListView::Orientation orient;
     qreal visiblePos;
@@ -205,7 +205,7 @@ void QQuickViewSection::setCriteria(QQuickViewSection::SectionCriteria criteria)
     }
 }
 
-void QQuickViewSection::setDelegate(QDeclarativeComponent *delegate)
+void QQuickViewSection::setDelegate(QQmlComponent *delegate)
 {
     if (delegate != m_delegate) {
         m_delegate = delegate;
@@ -833,7 +833,7 @@ void QQuickListViewPrivate::createHighlight()
             }
             const QLatin1String posProp(orient == QQuickListView::Vertical ? "y" : "x");
             highlightPosAnimator = new QSmoothedAnimation;
-            highlightPosAnimator->target = QDeclarativeProperty(item, posProp);
+            highlightPosAnimator->target = QQmlProperty(item, posProp);
             highlightPosAnimator->velocity = highlightMoveSpeed;
             highlightPosAnimator->userDuration = highlightMoveDuration;
 
@@ -841,7 +841,7 @@ void QQuickListViewPrivate::createHighlight()
             highlightSizeAnimator = new QSmoothedAnimation;
             highlightSizeAnimator->velocity = highlightResizeSpeed;
             highlightSizeAnimator->userDuration = highlightResizeDuration;
-            highlightSizeAnimator->target = QDeclarativeProperty(item, sizeProp);
+            highlightSizeAnimator->target = QQmlProperty(item, sizeProp);
 
             highlight = newHighlight;
             changed = true;
@@ -896,22 +896,22 @@ QQuickItem * QQuickListViewPrivate::getSectionItem(const QString &section)
         sectionItem = sectionCache[i];
         sectionCache[i] = 0;
         sectionItem->setVisible(true);
-        QDeclarativeContext *context = QDeclarativeEngine::contextForObject(sectionItem)->parentContext();
+        QQmlContext *context = QQmlEngine::contextForObject(sectionItem)->parentContext();
         context->setContextProperty(QLatin1String("section"), section);
     } else {
-        QDeclarativeContext *creationContext = sectionCriteria->delegate()->creationContext();
-        QDeclarativeContext *context = new QDeclarativeContext(
+        QQmlContext *creationContext = sectionCriteria->delegate()->creationContext();
+        QQmlContext *context = new QQmlContext(
                 creationContext ? creationContext : qmlContext(q));
         context->setContextProperty(QLatin1String("section"), section);
         QObject *nobj = sectionCriteria->delegate()->beginCreate(context);
         if (nobj) {
-            QDeclarative_setParent_noEvent(context, nobj);
+            QQml_setParent_noEvent(context, nobj);
             sectionItem = qobject_cast<QQuickItem *>(nobj);
             if (!sectionItem) {
                 delete nobj;
             } else {
                 sectionItem->setZ(2);
-                QDeclarative_setParent_noEvent(sectionItem, contentItem);
+                QQml_setParent_noEvent(sectionItem, contentItem);
                 sectionItem->setParentItem(contentItem);
             }
         } else {
@@ -949,7 +949,7 @@ void QQuickListViewPrivate::updateInlineSection(FxListItemSG *listItem)
             listItem->section = getSectionItem(listItem->attached->m_section);
             listItem->setPosition(pos);
         } else {
-            QDeclarativeContext *context = QDeclarativeEngine::contextForObject(listItem->section)->parentContext();
+            QQmlContext *context = QQmlEngine::contextForObject(listItem->section)->parentContext();
             context->setContextProperty(QLatin1String("section"), listItem->attached->m_section);
         }
     } else if (listItem->section) {
@@ -1002,7 +1002,7 @@ void QQuickListViewPrivate::updateStickySections()
         if (!currentSectionItem) {
             currentSectionItem = getSectionItem(currentSection);
         } else if (currentStickySection != currentSection) {
-            QDeclarativeContext *context = QDeclarativeEngine::contextForObject(currentSectionItem)->parentContext();
+            QQmlContext *context = QQmlEngine::contextForObject(currentSectionItem)->parentContext();
             context->setContextProperty(QLatin1String("section"), currentSection);
         }
         currentStickySection = currentSection;
@@ -1035,7 +1035,7 @@ void QQuickListViewPrivate::updateStickySections()
         if (!nextSectionItem) {
             nextSectionItem = getSectionItem(nextSection);
         } else if (nextStickySection != nextSection) {
-            QDeclarativeContext *context = QDeclarativeEngine::contextForObject(nextSectionItem)->parentContext();
+            QQmlContext *context = QQmlEngine::contextForObject(nextSectionItem)->parentContext();
             context->setContextProperty(QLatin1String("section"), nextSection);
         }
         nextStickySection = nextSection;
@@ -1414,7 +1414,7 @@ void QQuickListViewPrivate::fixup(AxisData &data, qreal minExtent, qreal maxExte
 }
 
 void QQuickListViewPrivate::flick(AxisData &data, qreal minExtent, qreal maxExtent, qreal vSize,
-                                        QDeclarativeTimeLineCallback::Callback fixupCallback, qreal velocity)
+                                        QQuickTimeLineCallback::Callback fixupCallback, qreal velocity)
 {
     Q_Q(QQuickListView);
 
@@ -1528,7 +1528,7 @@ void QQuickListViewPrivate::flick(AxisData &data, qreal minExtent, qreal maxExte
             }
             timeline.reset(data.move);
             timeline.accel(data.move, v, accel, maxDistance + overshootDist);
-            timeline.callback(QDeclarativeTimeLineCallback(&data.move, fixupCallback, this));
+            timeline.callback(QQuickTimeLineCallback(&data.move, fixupCallback, this));
             if (!hData.flicking && q->xflick()) {
                 hData.flicking = true;
                 emit q->flickingChanged();
@@ -1569,7 +1569,7 @@ void QQuickListViewPrivate::flick(AxisData &data, qreal minExtent, qreal maxExte
             }
             timeline.reset(data.move);
             timeline.accelDistance(data.move, v, -dist);
-            timeline.callback(QDeclarativeTimeLineCallback(&data.move, fixupCallback, this));
+            timeline.callback(QQuickTimeLineCallback(&data.move, fixupCallback, this));
         }
     } else {
         correctFlick = false;
@@ -1601,13 +1601,13 @@ void QQuickListViewPrivate::flick(AxisData &data, qreal minExtent, qreal maxExte
     The following example shows the definition of a simple list model defined
     in a file called \c ContactModel.qml:
 
-    \snippet doc/src/snippets/declarative/listview/ContactModel.qml 0
+    \snippet doc/src/snippets/qml/listview/ContactModel.qml 0
 
     Another component can display this model data in a ListView, like this:
 
-    \snippet doc/src/snippets/declarative/listview/listview.qml import
+    \snippet doc/src/snippets/qml/listview/listview.qml import
     \codeline
-    \snippet doc/src/snippets/declarative/listview/listview.qml classdocs simple
+    \snippet doc/src/snippets/qml/listview/listview.qml classdocs simple
 
     \image listview-simple.png
 
@@ -1618,7 +1618,7 @@ void QQuickListViewPrivate::flick(AxisData &data, qreal minExtent, qreal maxExte
     An improved list view is shown below. The delegate is visually improved and is moved
     into a separate \c contactDelegate component.
 
-    \snippet doc/src/snippets/declarative/listview/listview.qml classdocs advanced
+    \snippet doc/src/snippets/qml/listview/listview.qml classdocs advanced
     \image listview-highlight.png
 
     The currently selected item is highlighted with a blue \l Rectangle using the \l highlight property,
@@ -1633,7 +1633,7 @@ void QQuickListViewPrivate::flick(AxisData &data, qreal minExtent, qreal maxExte
     this attached property directly as \c ListView.isCurrentItem, while the child
     \c contactInfo object must refer to this property as \c wrapper.ListView.isCurrentItem.
 
-    \snippet doc/src/snippets/declarative/listview/listview.qml isCurrentItem
+    \snippet doc/src/snippets/qml/listview/listview.qml isCurrentItem
 
     \note Views do not enable \e clip automatically.  If the view
     is not clipped by another item or the screen, it will be necessary
@@ -1659,7 +1659,7 @@ QQuickListView::~QQuickListView()
 
     This property may be used to adjust the appearance of the current item, for example:
 
-    \snippet doc/src/snippets/declarative/listview/listview.qml isCurrentItem
+    \snippet doc/src/snippets/qml/listview/listview.qml isCurrentItem
 */
 
 /*!
@@ -1706,7 +1706,7 @@ QQuickListView::~QQuickListView()
     until an animation completes. The example delegate below ensures that the
     animation completes before the item is removed from the list.
 
-    \snippet doc/src/snippets/declarative/listview/listview.qml delayRemove
+    \snippet doc/src/snippets/qml/listview/listview.qml delayRemove
 
     If a \l remove transition has been specified, it will not be applied until
     delayRemove is returned to \c false.
@@ -1816,7 +1816,7 @@ QQuickListView::~QQuickListView()
 
     Here is a highlight with its motion defined by a \l {SpringAnimation} item:
 
-    \snippet doc/src/snippets/declarative/listview/listview.qml highlightFollowsCurrentItem
+    \snippet doc/src/snippets/qml/listview/listview.qml highlightFollowsCurrentItem
 
     Note that the highlight animation also affects the way that the view
     is scrolled.  This is because the view moves to maintain the
@@ -2662,7 +2662,7 @@ void QQuickListView::updateSections()
     }
 }
 
-bool QQuickListViewPrivate::applyInsertionChange(const QDeclarativeChangeSet::Insert &change, ChangeResult *insertResult, QList<FxViewItem *> *addedItems, QList<MovedItem> *movingIntoView)
+bool QQuickListViewPrivate::applyInsertionChange(const QQuickChangeSet::Insert &change, ChangeResult *insertResult, QList<FxViewItem *> *addedItems, QList<MovedItem> *movingIntoView)
 {
     int modelIndex = change.index;
     int count = change.count;
diff --git a/src/quick/items/qquicklistview_p.h b/src/quick/items/qquicklistview_p.h
index bffd935616..239647a954 100644
--- a/src/quick/items/qquicklistview_p.h
+++ b/src/quick/items/qquicklistview_p.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
@@ -44,7 +44,7 @@
 
 #include "qquickitemview_p.h"
 
-#include <private/qdeclarativeguard_p.h>
+#include <private/qqmlguard_p.h>
 
 QT_BEGIN_HEADER
 
@@ -57,7 +57,7 @@ class Q_AUTOTEST_EXPORT QQuickViewSection : public QObject
     Q_OBJECT
     Q_PROPERTY(QString property READ property WRITE setProperty NOTIFY propertyChanged)
     Q_PROPERTY(SectionCriteria criteria READ criteria WRITE setCriteria NOTIFY criteriaChanged)
-    Q_PROPERTY(QDeclarativeComponent *delegate READ delegate WRITE setDelegate NOTIFY delegateChanged)
+    Q_PROPERTY(QQmlComponent *delegate READ delegate WRITE setDelegate NOTIFY delegateChanged)
     Q_PROPERTY(int labelPositioning READ labelPositioning WRITE setLabelPositioning NOTIFY labelPositioningChanged)
     Q_ENUMS(SectionCriteria)
     Q_ENUMS(LabelPositioning)
@@ -71,8 +71,8 @@ public:
     SectionCriteria criteria() const { return m_criteria; }
     void setCriteria(SectionCriteria);
 
-    QDeclarativeComponent *delegate() const { return m_delegate; }
-    void setDelegate(QDeclarativeComponent *delegate);
+    QQmlComponent *delegate() const { return m_delegate; }
+    void setDelegate(QQmlComponent *delegate);
 
     QString sectionString(const QString &value);
 
@@ -89,7 +89,7 @@ Q_SIGNALS:
 private:
     QString m_property;
     SectionCriteria m_criteria;
-    QDeclarativeComponent *m_delegate;
+    QQmlComponent *m_delegate;
     int m_labelPositioning;
     QQuickListViewPrivate *m_view;
 };
@@ -197,7 +197,7 @@ Q_SIGNALS:
     void viewChanged();
 
 public:
-    QDeclarativeGuard<QQuickListView> m_view;
+    QQmlGuard<QQuickListView> m_view;
 };
 
 
diff --git a/src/quick/items/qquickloader.cpp b/src/quick/items/qquickloader.cpp
index 92724f4095..bbc51a4d26 100644
--- a/src/quick/items/qquickloader.cpp
+++ b/src/quick/items/qquickloader.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
@@ -41,12 +41,12 @@
 
 #include "qquickloader_p_p.h"
 
-#include <QtDeclarative/qdeclarativeinfo.h>
+#include <QtQml/qqmlinfo.h>
 
-#include <private/qdeclarativeengine_p.h>
-#include <private/qdeclarativeglobal_p.h>
+#include <private/qqmlengine_p.h>
+#include <private/qqmlglobal_p.h>
 
-#include <private/qdeclarativecomponent_p.h>
+#include <private/qqmlcomponent_p.h>
 
 #include <private/qv8_p.h>
 
@@ -133,7 +133,7 @@ void QQuickLoaderPrivate::initResize()
     Here is a Loader that loads "Page1.qml" as a component when the
     \l MouseArea is clicked:
 
-    \snippet doc/src/snippets/declarative/loader/simple.qml 0
+    \snippet doc/src/snippets/qml/loader/simple.qml 0
 
     The loaded item can be accessed using the \l item property.
 
@@ -165,8 +165,8 @@ void QQuickLoaderPrivate::initResize()
     \o sizeloader.qml
     \o sizeitem.qml
     \row
-    \o \snippet doc/src/snippets/declarative/loader/sizeloader.qml 0
-    \o \snippet doc/src/snippets/declarative/loader/sizeitem.qml 0
+    \o \snippet doc/src/snippets/qml/loader/sizeloader.qml 0
+    \o \snippet doc/src/snippets/qml/loader/sizeitem.qml 0
     \row
     \o The red rectangle will be sized to the size of the root item.
     \o The red rectangle will be 50x50, centered in the root item.
@@ -185,8 +185,8 @@ void QQuickLoaderPrivate::initResize()
     \o application.qml
     \o MyItem.qml
     \row
-    \o \snippet doc/src/snippets/declarative/loader/connections.qml 0
-    \o \snippet doc/src/snippets/declarative/loader/MyItem.qml 0
+    \o \snippet doc/src/snippets/qml/loader/connections.qml 0
+    \o \snippet doc/src/snippets/qml/loader/MyItem.qml 0
     \endtable
 
     Alternatively, since \c MyItem.qml is loaded within the scope of the
@@ -212,8 +212,8 @@ void QQuickLoaderPrivate::initResize()
     \o application.qml
     \o KeyReader.qml
     \row
-    \o \snippet doc/src/snippets/declarative/loader/focus.qml 0
-    \o \snippet doc/src/snippets/declarative/loader/KeyReader.qml 0
+    \o \snippet doc/src/snippets/qml/loader/focus.qml 0
+    \o \snippet doc/src/snippets/qml/loader/KeyReader.qml 0
     \endtable
 
     Once \c KeyReader.qml is loaded, it accepts key events and sets
@@ -344,7 +344,7 @@ void QQuickLoader::loadFromSource()
     }
 
     if (isComponentComplete()) {
-        d->component = new QDeclarativeComponent(qmlEngine(this), d->source, this);
+        d->component = new QQmlComponent(qmlEngine(this), d->source, this);
         d->load();
     }
 }
@@ -371,13 +371,13 @@ void QQuickLoader::loadFromSource()
     \sa source, progress
 */
 
-QDeclarativeComponent *QQuickLoader::sourceComponent() const
+QQmlComponent *QQuickLoader::sourceComponent() const
 {
     Q_D(const QQuickLoader);
     return d->component;
 }
 
-void QQuickLoader::setSourceComponent(QDeclarativeComponent *comp)
+void QQuickLoader::setSourceComponent(QQmlComponent *comp)
 {
     Q_D(QQuickLoader);
     if (comp == d->component)
@@ -476,7 +476,7 @@ void QQuickLoader::loadFromSourceComponent()
 
     \sa source, active
 */
-void QQuickLoader::setSource(QDeclarativeV8Function *args)
+void QQuickLoader::setSource(QQmlV8Function *args)
 {
     Q_ASSERT(args);
     Q_D(QQuickLoader);
@@ -516,7 +516,7 @@ void QQuickLoaderPrivate::load()
     if (!component->isLoading()) {
         _q_sourceLoaded();
     } else {
-        QObject::connect(component, SIGNAL(statusChanged(QDeclarativeComponent::Status)),
+        QObject::connect(component, SIGNAL(statusChanged(QQmlComponent::Status)),
                 q, SLOT(_q_sourceLoaded()));
         QObject::connect(component, SIGNAL(progressChanged(qreal)),
                 q, SIGNAL(progressChanged()));
@@ -541,15 +541,15 @@ void QQuickLoaderPrivate::setInitialState(QObject *obj)
 
     QQuickItem *item = qobject_cast<QQuickItem*>(obj);
     if (item) {
-        QDeclarative_setParent_noEvent(itemContext, obj);
-        QDeclarative_setParent_noEvent(item, q);
+        QQml_setParent_noEvent(itemContext, obj);
+        QQml_setParent_noEvent(item, q);
         item->setParentItem(q);
     }
 
     if (initialPropertyValues.IsEmpty())
         return;
 
-    QDeclarativeComponentPrivate *d = QDeclarativeComponentPrivate::get(component);
+    QQmlComponentPrivate *d = QQmlComponentPrivate::get(component);
     Q_ASSERT(d && d->engine);
     d->initializeObjectWithInitialProperties(qmlGlobalForIpv, initialPropertyValues, obj);
 }
@@ -559,13 +559,13 @@ void QQuickLoaderIncubator::statusChanged(Status status)
     loader->incubatorStateChanged(status);
 }
 
-void QQuickLoaderPrivate::incubatorStateChanged(QDeclarativeIncubator::Status status)
+void QQuickLoaderPrivate::incubatorStateChanged(QQmlIncubator::Status status)
 {
     Q_Q(QQuickLoader);
-    if (status == QDeclarativeIncubator::Loading || status == QDeclarativeIncubator::Null)
+    if (status == QQmlIncubator::Loading || status == QQmlIncubator::Null)
         return;
 
-    if (status == QDeclarativeIncubator::Ready) {
+    if (status == QQmlIncubator::Ready) {
         QObject *obj = incubator->object();
         item = qobject_cast<QQuickItem*>(obj);
         if (item) {
@@ -579,9 +579,9 @@ void QQuickLoaderPrivate::incubatorStateChanged(QDeclarativeIncubator::Status st
             emit q->itemChanged();
         }
         incubator->clear();
-    } else if (status == QDeclarativeIncubator::Error) {
+    } else if (status == QQmlIncubator::Error) {
         if (!incubator->errors().isEmpty())
-            QDeclarativeEnginePrivate::warning(qmlEngine(q), incubator->errors());
+            QQmlEnginePrivate::warning(qmlEngine(q), incubator->errors());
         delete itemContext;
         itemContext = 0;
         delete incubator->object();
@@ -603,7 +603,7 @@ void QQuickLoaderPrivate::_q_sourceLoaded()
     Q_Q(QQuickLoader);
     if (!component || !component->errors().isEmpty()) {
         if (component)
-            QDeclarativeEnginePrivate::warning(qmlEngine(q), component->errors());
+            QQmlEnginePrivate::warning(qmlEngine(q), component->errors());
         if (loadingFromSource)
             emit q->sourceChanged();
         else
@@ -614,17 +614,17 @@ void QQuickLoaderPrivate::_q_sourceLoaded()
         return;
     }
 
-    QDeclarativeContext *creationContext = component->creationContext();
+    QQmlContext *creationContext = component->creationContext();
     if (!creationContext) creationContext = qmlContext(q);
-    itemContext = new QDeclarativeContext(creationContext);
+    itemContext = new QQmlContext(creationContext);
     itemContext->setContextObject(q);
 
     delete incubator;
-    incubator = new QQuickLoaderIncubator(this, asynchronous ? QDeclarativeIncubator::Asynchronous : QDeclarativeIncubator::AsynchronousIfNested);
+    incubator = new QQuickLoaderIncubator(this, asynchronous ? QQmlIncubator::Asynchronous : QQmlIncubator::AsynchronousIfNested);
 
     component->create(*incubator, itemContext);
 
-    if (incubator && incubator->status() == QDeclarativeIncubator::Loading)
+    if (incubator && incubator->status() == QQmlIncubator::Loading)
         emit q->statusChanged();
 }
 
@@ -677,11 +677,11 @@ QQuickLoader::Status QQuickLoader::status() const
 
     if (d->component) {
         switch (d->component->status()) {
-        case QDeclarativeComponent::Loading:
+        case QQmlComponent::Loading:
             return Loading;
-        case QDeclarativeComponent::Error:
+        case QQmlComponent::Error:
             return Error;
-        case QDeclarativeComponent::Null:
+        case QQmlComponent::Null:
             return Null;
         default:
             break;
@@ -690,9 +690,9 @@ QQuickLoader::Status QQuickLoader::status() const
 
     if (d->incubator) {
         switch (d->incubator->status()) {
-        case QDeclarativeIncubator::Loading:
+        case QQmlIncubator::Loading:
             return Loading;
-        case QDeclarativeIncubator::Error:
+        case QQmlIncubator::Error:
             return Error;
         default:
             break;
@@ -711,7 +711,7 @@ void QQuickLoader::componentComplete()
     QQuickItem::componentComplete();
     if (active()) {
         if (d->loadingFromSource) {
-            d->component = new QDeclarativeComponent(qmlEngine(this), d->source, this);
+            d->component = new QQmlComponent(qmlEngine(this), d->source, this);
         }
         d->load();
     }
@@ -826,19 +826,19 @@ void QQuickLoader::geometryChanged(const QRectF &newGeometry, const QRectF &oldG
     QQuickItem::geometryChanged(newGeometry, oldGeometry);
 }
 
-QUrl QQuickLoaderPrivate::resolveSourceUrl(QDeclarativeV8Function *args)
+QUrl QQuickLoaderPrivate::resolveSourceUrl(QQmlV8Function *args)
 {
     QV8Engine *v8engine = args->engine();
     QString arg = v8engine->toString((*args)[0]->ToString());
     if (arg.isEmpty())
         return QUrl();
 
-    QDeclarativeContextData *context = args->context();
+    QQmlContextData *context = args->context();
     Q_ASSERT(context);
     return context->resolvedUrl(QUrl(arg));
 }
 
-v8::Handle<v8::Object> QQuickLoaderPrivate::extractInitialPropertyValues(QDeclarativeV8Function *args, QObject *loader, bool *error)
+v8::Handle<v8::Object> QQuickLoaderPrivate::extractInitialPropertyValues(QQmlV8Function *args, QObject *loader, bool *error)
 {
     v8::Local<v8::Object> valuemap;
     if (args->Length() >= 2) {
diff --git a/src/quick/items/qquickloader_p.h b/src/quick/items/qquickloader_p.h
index a6cc5a18d9..c5f544b0e8 100644
--- a/src/quick/items/qquickloader_p.h
+++ b/src/quick/items/qquickloader_p.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
@@ -56,7 +56,7 @@ class Q_AUTOTEST_EXPORT QQuickLoader : public QQuickImplicitSizeItem
 
     Q_PROPERTY(bool active READ active WRITE setActive NOTIFY activeChanged)
     Q_PROPERTY(QUrl source READ source WRITE setSource NOTIFY sourceChanged)
-    Q_PROPERTY(QDeclarativeComponent *sourceComponent READ sourceComponent WRITE setSourceComponent RESET resetSourceComponent NOTIFY sourceComponentChanged)
+    Q_PROPERTY(QQmlComponent *sourceComponent READ sourceComponent WRITE setSourceComponent RESET resetSourceComponent NOTIFY sourceComponentChanged)
     Q_PROPERTY(QQuickItem *item READ item NOTIFY itemChanged)
     Q_PROPERTY(Status status READ status NOTIFY statusChanged)
     Q_PROPERTY(qreal progress READ progress NOTIFY progressChanged)
@@ -69,13 +69,13 @@ public:
     bool active() const;
     void setActive(bool newVal);
 
-    Q_INVOKABLE void setSource(QDeclarativeV8Function *);
+    Q_INVOKABLE void setSource(QQmlV8Function *);
 
     QUrl source() const;
     void setSource(const QUrl &);
 
-    QDeclarativeComponent *sourceComponent() const;
-    void setSourceComponent(QDeclarativeComponent *);
+    QQmlComponent *sourceComponent() const;
+    void setSourceComponent(QQmlComponent *);
     void resetSourceComponent();
 
     enum Status { Null, Ready, Loading, Error };
diff --git a/src/quick/items/qquickloader_p_p.h b/src/quick/items/qquickloader_p_p.h
index 3ef0038493..1ad7756ed8 100644
--- a/src/quick/items/qquickloader_p_p.h
+++ b/src/quick/items/qquickloader_p_p.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
@@ -56,7 +56,7 @@
 #include "qquickloader_p.h"
 #include "qquickimplicitsizeitem_p_p.h"
 #include "qquickitemchangelistener_p.h"
-#include <qdeclarativeincubator.h>
+#include <qqmlincubator.h>
 
 #include <private/qv8_p.h>
 
@@ -64,10 +64,10 @@ QT_BEGIN_NAMESPACE
 
 
 class QQuickLoaderPrivate;
-class QQuickLoaderIncubator : public QDeclarativeIncubator
+class QQuickLoaderIncubator : public QQmlIncubator
 {
 public:
-    QQuickLoaderIncubator(QQuickLoaderPrivate *l, IncubationMode mode) : QDeclarativeIncubator(mode), loader(l) {}
+    QQuickLoaderIncubator(QQuickLoaderPrivate *l, IncubationMode mode) : QQmlIncubator(mode), loader(l) {}
 
 protected:
     virtual void statusChanged(Status);
@@ -77,7 +77,7 @@ private:
     QQuickLoaderPrivate *loader;
 };
 
-class QDeclarativeContext;
+class QQmlContext;
 class QQuickLoaderPrivate : public QQuickImplicitSizeItemPrivate, public QQuickItemChangeListener
 {
     Q_DECLARE_PUBLIC(QQuickLoader)
@@ -91,16 +91,16 @@ public:
     void initResize();
     void load();
 
-    void incubatorStateChanged(QDeclarativeIncubator::Status status);
+    void incubatorStateChanged(QQmlIncubator::Status status);
     void setInitialState(QObject *o);
     void disposeInitialPropertyValues();
-    QUrl resolveSourceUrl(QDeclarativeV8Function *args);
-    v8::Handle<v8::Object> extractInitialPropertyValues(QDeclarativeV8Function *args, QObject *loader, bool *error);
+    QUrl resolveSourceUrl(QQmlV8Function *args);
+    v8::Handle<v8::Object> extractInitialPropertyValues(QQmlV8Function *args, QObject *loader, bool *error);
 
     QUrl source;
     QQuickItem *item;
-    QDeclarativeComponent *component;
-    QDeclarativeContext *itemContext;
+    QQmlComponent *component;
+    QQmlContext *itemContext;
     QQuickLoaderIncubator *incubator;
     v8::Persistent<v8::Object> initialPropertyValues;
     v8::Persistent<v8::Object> qmlGlobalForIpv;
diff --git a/src/quick/items/qquickmousearea.cpp b/src/quick/items/qquickmousearea.cpp
index d0894e9590..ec2c980879 100644
--- a/src/quick/items/qquickmousearea.cpp
+++ b/src/quick/items/qquickmousearea.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
@@ -348,9 +348,9 @@ bool QQuickMouseAreaPrivate::propagateHelper(QQuickMouseEvent *ev, QQuickItem *i
     The following example uses a MouseArea in a \l Rectangle that changes
     the \l Rectangle color to red when clicked:
 
-    \snippet doc/src/snippets/declarative/mousearea/mousearea.qml import
+    \snippet doc/src/snippets/qml/mousearea/mousearea.qml import
     \codeline
-    \snippet doc/src/snippets/declarative/mousearea/mousearea.qml intro
+    \snippet doc/src/snippets/qml/mousearea/mousearea.qml intro
 
     \clearfloat
     Many MouseArea signals pass a \l{MouseEvent}{mouse} parameter that contains
@@ -360,7 +360,7 @@ bool QQuickMouseAreaPrivate::propagateHelper(QQuickMouseEvent *ev, QQuickItem *i
     Here is an extension of the previous example that produces a different
     color when the area is right clicked:
 
-    \snippet doc/src/snippets/declarative/mousearea/mousearea.qml intro-extended
+    \snippet doc/src/snippets/qml/mousearea/mousearea.qml intro-extended
 
   Behavioral Change in QtQuick 2.0
 
@@ -659,7 +659,7 @@ void QQuickMouseArea::setPropagateComposedEvents(bool prevent)
 
     The code below displays "right" when the right mouse buttons is pressed:
 
-    \snippet doc/src/snippets/declarative/mousearea/mousearea.qml mousebuttons
+    \snippet doc/src/snippets/qml/mousearea/mousearea.qml mousebuttons
 
     \sa acceptedButtons
 */
@@ -1148,7 +1148,7 @@ bool QQuickMouseArea::setPressed(bool p)
     The following example displays a \l Rectangle that can be dragged along the X-axis. The opacity
     of the rectangle is reduced when it is dragged to the right.
 
-    \snippet doc/src/snippets/declarative/mousearea/mousearea.qml drag
+    \snippet doc/src/snippets/qml/mousearea/mousearea.qml drag
 
     \note Items cannot be dragged if they are anchored for the requested
     \c drag.axis. For example, if \c anchors.left or \c anchors.right was set
@@ -1159,7 +1159,7 @@ bool QQuickMouseArea::setPressed(bool p)
     If \c drag.filterChildren is set to true, a drag can override descendant MouseAreas.  This
     enables a parent MouseArea to handle drags, for example, while descendants handle clicks:
 
-    \snippet doc/src/snippets/declarative/mousearea/mouseareadragfilter.qml dragfilter
+    \snippet doc/src/snippets/qml/mousearea/mouseareadragfilter.qml dragfilter
 
 */
 
diff --git a/src/quick/items/qquickmousearea_p.h b/src/quick/items/qquickmousearea_p.h
index 0723f8326f..93a0635eb5 100644
--- a/src/quick/items/qquickmousearea_p.h
+++ b/src/quick/items/qquickmousearea_p.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
@@ -132,7 +132,7 @@ class Q_QUICK_EXPORT QQuickMouseArea : public QQuickItem
     Q_PROPERTY(Qt::MouseButtons pressedButtons READ pressedButtons NOTIFY pressedChanged)
     Q_PROPERTY(Qt::MouseButtons acceptedButtons READ acceptedButtons WRITE setAcceptedButtons NOTIFY acceptedButtonsChanged)
     Q_PROPERTY(bool hoverEnabled READ hoverEnabled WRITE setHoverEnabled NOTIFY hoverEnabledChanged)
-    Q_PROPERTY(QQuickDrag *drag READ drag CONSTANT) //### add flicking to QQuickDrag or add a QDeclarativeFlick ???
+    Q_PROPERTY(QQuickDrag *drag READ drag CONSTANT) //### add flicking to QQuickDrag or add a QQuickFlick ???
     Q_PROPERTY(bool preventStealing READ preventStealing WRITE setPreventStealing NOTIFY preventStealingChanged)
     Q_PROPERTY(bool propagateComposedEvents READ propagateComposedEvents WRITE setPropagateComposedEvents NOTIFY propagateComposedEventsChanged)
 
diff --git a/src/quick/items/qquickmousearea_p_p.h b/src/quick/items/qquickmousearea_p_p.h
index 2060671698..bcdf033cba 100644
--- a/src/quick/items/qquickmousearea_p_p.h
+++ b/src/quick/items/qquickmousearea_p_p.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
@@ -99,7 +99,7 @@ public:
     QPointF startScene;
     QPointF targetStartPos;
     QPointF lastPos;
-    QDeclarativeNullableValue<QPointF> lastScenePos;
+    QQmlNullableValue<QPointF> lastScenePos;
     Qt::MouseButton lastButton;
     Qt::MouseButtons lastButtons;
     Qt::KeyboardModifiers lastModifiers;
diff --git a/src/quick/items/qquickmultipointtoucharea.cpp b/src/quick/items/qquickmultipointtoucharea.cpp
index c1c60c1756..7dd6ec0589 100644
--- a/src/quick/items/qquickmultipointtoucharea.cpp
+++ b/src/quick/items/qquickmultipointtoucharea.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
@@ -309,7 +309,7 @@ void QQuickTouchPoint::setSceneY(qreal sceneY)
 
     In the following example, we have two small rectangles that follow our touch points.
 
-    \snippet doc/src/snippets/declarative/multipointtoucharea/multipointtoucharea.qml 0
+    \snippet doc/src/snippets/qml/multipointtoucharea/multipointtoucharea.qml 0
 
     By default this property holds an empty list.
 
diff --git a/src/quick/items/qquickmultipointtoucharea_p.h b/src/quick/items/qquickmultipointtoucharea_p.h
index ccb086fd7e..3651278735 100644
--- a/src/quick/items/qquickmultipointtoucharea_p.h
+++ b/src/quick/items/qquickmultipointtoucharea_p.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
@@ -166,7 +166,7 @@ private:
 class QQuickGrabGestureEvent : public QObject
 {
     Q_OBJECT
-    Q_PROPERTY(QDeclarativeListProperty<QObject> touchPoints READ touchPoints)
+    Q_PROPERTY(QQmlListProperty<QObject> touchPoints READ touchPoints)
     Q_PROPERTY(qreal dragThreshold READ dragThreshold)
 public:
     QQuickGrabGestureEvent() : _grab(false), _dragThreshold(qApp->styleHints()->startDragDistance()) {}
@@ -174,8 +174,8 @@ public:
     Q_INVOKABLE void grab() { _grab = true; }
     bool wantsGrab() const { return _grab; }
 
-    QDeclarativeListProperty<QObject> touchPoints() {
-        return QDeclarativeListProperty<QObject>(this, _touchPoints);
+    QQmlListProperty<QObject> touchPoints() {
+        return QQmlListProperty<QObject>(this, _touchPoints);
     }
     qreal dragThreshold() const { return _dragThreshold; }
 
@@ -190,7 +190,7 @@ class Q_AUTOTEST_EXPORT QQuickMultiPointTouchArea : public QQuickItem
 {
     Q_OBJECT
 
-    Q_PROPERTY(QDeclarativeListProperty<QQuickTouchPoint> touchPoints READ touchPoints)
+    Q_PROPERTY(QQmlListProperty<QQuickTouchPoint> touchPoints READ touchPoints)
     Q_PROPERTY(int minimumTouchPoints READ minimumTouchPoints WRITE setMinimumTouchPoints NOTIFY minimumTouchPointsChanged)
     Q_PROPERTY(int maximumTouchPoints READ maximumTouchPoints WRITE setMaximumTouchPoints NOTIFY maximumTouchPointsChanged)
 
@@ -203,21 +203,21 @@ public:
     int maximumTouchPoints() const;
     void setMaximumTouchPoints(int num);
 
-    QDeclarativeListProperty<QQuickTouchPoint> touchPoints() {
-        return QDeclarativeListProperty<QQuickTouchPoint>(this, 0, QQuickMultiPointTouchArea::touchPoint_append, QQuickMultiPointTouchArea::touchPoint_count, QQuickMultiPointTouchArea::touchPoint_at, 0);
+    QQmlListProperty<QQuickTouchPoint> touchPoints() {
+        return QQmlListProperty<QQuickTouchPoint>(this, 0, QQuickMultiPointTouchArea::touchPoint_append, QQuickMultiPointTouchArea::touchPoint_count, QQuickMultiPointTouchArea::touchPoint_at, 0);
     }
 
-    static void touchPoint_append(QDeclarativeListProperty<QQuickTouchPoint> *list, QQuickTouchPoint* touch) {
+    static void touchPoint_append(QQmlListProperty<QQuickTouchPoint> *list, QQuickTouchPoint* touch) {
         QQuickMultiPointTouchArea *q = static_cast<QQuickMultiPointTouchArea*>(list->object);
         q->addTouchPrototype(touch);
     }
 
-    static int touchPoint_count(QDeclarativeListProperty<QQuickTouchPoint> *list) {
+    static int touchPoint_count(QQmlListProperty<QQuickTouchPoint> *list) {
         QQuickMultiPointTouchArea *q = static_cast<QQuickMultiPointTouchArea*>(list->object);
         return q->_touchPrototypes.count();
     }
 
-    static QQuickTouchPoint* touchPoint_at(QDeclarativeListProperty<QQuickTouchPoint> *list, int index) {
+    static QQuickTouchPoint* touchPoint_at(QQmlListProperty<QQuickTouchPoint> *list, int index) {
         QQuickMultiPointTouchArea *q = static_cast<QQuickMultiPointTouchArea*>(list->object);
         return q->_touchPrototypes[index];
     }
diff --git a/src/quick/items/qquickninepatchnode.cpp b/src/quick/items/qquickninepatchnode.cpp
index ff265b3a97..649fa527ee 100644
--- a/src/quick/items/qquickninepatchnode.cpp
+++ b/src/quick/items/qquickninepatchnode.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
diff --git a/src/quick/items/qquickninepatchnode_p.h b/src/quick/items/qquickninepatchnode_p.h
index 277b368de7..c2761f74e5 100644
--- a/src/quick/items/qquickninepatchnode_p.h
+++ b/src/quick/items/qquickninepatchnode_p.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
diff --git a/src/quick/items/qquickpainteditem.cpp b/src/quick/items/qquickpainteditem.cpp
index 02afc0c4f5..349f2ff3c1 100644
--- a/src/quick/items/qquickpainteditem.cpp
+++ b/src/quick/items/qquickpainteditem.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
diff --git a/src/quick/items/qquickpainteditem.h b/src/quick/items/qquickpainteditem.h
index 06768796ca..15afdf8339 100644
--- a/src/quick/items/qquickpainteditem.h
+++ b/src/quick/items/qquickpainteditem.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
diff --git a/src/quick/items/qquickpainteditem_p.h b/src/quick/items/qquickpainteditem_p.h
index 8c0a1475a7..d98216ffb0 100644
--- a/src/quick/items/qquickpainteditem_p.h
+++ b/src/quick/items/qquickpainteditem_p.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
diff --git a/src/quick/items/qquickpathview.cpp b/src/quick/items/qquickpathview.cpp
index afc336fa04..f8098c8f65 100644
--- a/src/quick/items/qquickpathview.cpp
+++ b/src/quick/items/qquickpathview.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
@@ -43,10 +43,11 @@
 #include "qquickpathview_p_p.h"
 #include "qquickcanvas.h"
 
-#include <QtQuick/private/qdeclarativestate_p.h>
-#include <private/qdeclarativeopenmetaobject_p.h>
+#include <QtQuick/private/qquickstate_p.h>
+#include <private/qqmlglobal_p.h>
+#include <private/qqmlopenmetaobject_p.h>
 #include <private/qlistmodelinterface_p.h>
-#include <private/qdeclarativechangeset_p.h>
+#include <private/qquickchangeset_p.h>
 
 #include <QtGui/qevent.h>
 #include <QtGui/qevent.h>
@@ -78,16 +79,16 @@ inline qreal qmlMod(qreal x, qreal y)
         return fmod(x, y);
 }
 
-static QDeclarativeOpenMetaObjectType *qPathViewAttachedType = 0;
+static QQmlOpenMetaObjectType *qPathViewAttachedType = 0;
 
 QQuickPathViewAttached::QQuickPathViewAttached(QObject *parent)
 : QObject(parent), m_percent(-1), m_view(0), m_onPath(false), m_isCurrent(false)
 {
     if (qPathViewAttachedType) {
-        m_metaobject = new QDeclarativeOpenMetaObject(this, qPathViewAttachedType);
+        m_metaobject = new QQmlOpenMetaObject(this, qPathViewAttachedType);
         m_metaobject->setCached(true);
     } else {
-        m_metaobject = new QDeclarativeOpenMetaObject(this);
+        m_metaobject = new QQmlOpenMetaObject(this);
     }
 }
 
@@ -126,7 +127,7 @@ QQuickItem *QQuickPathViewPrivate::getItem(int modelIndex, qreal z, bool onPath)
     inRequest = true;
     QQuickItem *item = model->item(modelIndex, false);
     if (item) {
-        QDeclarative_setParent_noEvent(item, q);
+        QQml_setParent_noEvent(item, q);
         item->setParentItem(q);
         requestedIndex = -1;
         qPathViewAttachedType = attType;
@@ -153,7 +154,7 @@ void QQuickPathView::createdItem(int index, QQuickItem *item)
             att->setOnPath(false);
         }
         item->setParentItem(this);
-        QDeclarative_setParent_noEvent(item, this);
+        QQml_setParent_noEvent(item, this);
         d->updateItem(item, index < d->firstIndex ? 0.0 : 1.0);
     } else {
         d->requestedIndex = -1;
@@ -200,12 +201,12 @@ QQuickPathViewAttached *QQuickPathViewPrivate::attached(QQuickItem *item)
     return static_cast<QQuickPathViewAttached *>(qmlAttachedPropertiesObject<QQuickPathView>(item, false));
 }
 
-QDeclarativeOpenMetaObjectType *QQuickPathViewPrivate::attachedType()
+QQmlOpenMetaObjectType *QQuickPathViewPrivate::attachedType()
 {
     Q_Q(QQuickPathView);
     if (!attType) {
         // pre-create one metatype to share with all attached objects
-        attType = new QDeclarativeOpenMetaObjectType(&QQuickPathViewAttached::staticMetaObject, qmlEngine(q));
+        attType = new QQmlOpenMetaObjectType(&QQuickPathViewAttached::staticMetaObject, qmlEngine(q));
         foreach (const QString &attr, path->attributes())
             attType->createProperty(attr.toUtf8());
     }
@@ -273,12 +274,12 @@ void QQuickPathViewPrivate::createHighlight()
 
     QQuickItem *item = 0;
     if (highlightComponent) {
-        QDeclarativeContext *creationContext = highlightComponent->creationContext();
-        QDeclarativeContext *highlightContext = new QDeclarativeContext(
+        QQmlContext *creationContext = highlightComponent->creationContext();
+        QQmlContext *highlightContext = new QQmlContext(
                 creationContext ? creationContext : qmlContext(q));
         QObject *nobj = highlightComponent->create(highlightContext);
         if (nobj) {
-            QDeclarative_setParent_noEvent(highlightContext, nobj);
+            QQml_setParent_noEvent(highlightContext, nobj);
             item = qobject_cast<QQuickItem *>(nobj);
             if (!item)
                 delete nobj;
@@ -289,7 +290,7 @@ void QQuickPathViewPrivate::createHighlight()
         item = new QQuickItem;
     }
     if (item) {
-        QDeclarative_setParent_noEvent(item, q);
+        QQml_setParent_noEvent(item, q);
         item->setParentItem(q);
         highlightItem = item;
         changed = true;
@@ -426,11 +427,11 @@ void QQuickPathViewPrivate::regenerate()
 
     For example, if there is a simple list model defined in a file \c ContactModel.qml like this:
 
-    \snippet doc/src/snippets/declarative/pathview/ContactModel.qml 0
+    \snippet doc/src/snippets/qml/pathview/ContactModel.qml 0
 
     This data can be represented as a PathView, like this:
 
-    \snippet doc/src/snippets/declarative/pathview/pathview.qml 0
+    \snippet doc/src/snippets/qml/pathview/pathview.qml 0
 
     \image pathview.gif
 
@@ -463,7 +464,7 @@ void QQuickPathViewPrivate::regenerate()
     this attached property directly as \c PathView.isCurrentItem, while the child
     \c nameText object must refer to this property as \c wrapper.PathView.isCurrentItem.
 
-    \snippet doc/src/snippets/declarative/pathview/pathview.qml 1
+    \snippet doc/src/snippets/qml/pathview/pathview.qml 1
 
     \bold Note that views do not enable \e clip automatically.  If the view
     is not clipped by another item or the screen, it will be necessary
@@ -525,7 +526,7 @@ QQuickPathView::~QQuickPathView()
 
     This property may be used to adjust the appearance of the current item.
 
-    \snippet doc/src/snippets/declarative/pathview/pathview.qml 1
+    \snippet doc/src/snippets/qml/pathview/pathview.qml 1
 */
 
 /*!
@@ -551,8 +552,8 @@ void QQuickPathView::setModel(const QVariant &model)
         return;
 
     if (d->model) {
-        disconnect(d->model, SIGNAL(modelUpdated(QDeclarativeChangeSet,bool)),
-                this, SLOT(modelUpdated(QDeclarativeChangeSet,bool)));
+        disconnect(d->model, SIGNAL(modelUpdated(QQuickChangeSet,bool)),
+                this, SLOT(modelUpdated(QQuickChangeSet,bool)));
         disconnect(d->model, SIGNAL(createdItem(int,QQuickItem*)), this, SLOT(createdItem(int,QQuickItem*)));
         disconnect(d->model, SIGNAL(initItem(int,QQuickItem*)), this, SLOT(initItem(int,QQuickItem*)));
         for (int i=0; i<d->items.count(); i++){
@@ -583,8 +584,8 @@ void QQuickPathView::setModel(const QVariant &model)
     }
     d->modelCount = 0;
     if (d->model) {
-        connect(d->model, SIGNAL(modelUpdated(QDeclarativeChangeSet,bool)),
-                this, SLOT(modelUpdated(QDeclarativeChangeSet,bool)));
+        connect(d->model, SIGNAL(modelUpdated(QQuickChangeSet,bool)),
+                this, SLOT(modelUpdated(QQuickChangeSet,bool)));
         connect(d->model, SIGNAL(createdItem(int,QQuickItem*)), this, SLOT(createdItem(int,QQuickItem*)));
         connect(d->model, SIGNAL(initItem(int,QQuickItem*)), this, SLOT(initItem(int,QQuickItem*)));
         d->modelCount = d->model->count();
@@ -617,13 +618,13 @@ int QQuickPathView::count() const
     This property holds the path used to lay out the items.
     For more information see the \l Path documentation.
 */
-QDeclarativePath *QQuickPathView::path() const
+QQuickPath *QQuickPathView::path() const
 {
     Q_D(const QQuickPathView);
     return d->path;
 }
 
-void QQuickPathView::setPath(QDeclarativePath *path)
+void QQuickPathView::setPath(QQuickPath *path)
 {
     Q_D(QQuickPathView);
     if (d->path == path)
@@ -786,13 +787,13 @@ void QQuickPathViewPrivate::setAdjustedOffset(qreal o)
     \sa highlightItem, highlightRangeMode
 */
 
-QDeclarativeComponent *QQuickPathView::highlight() const
+QQmlComponent *QQuickPathView::highlight() const
 {
     Q_D(const QQuickPathView);
     return d->highlightComponent;
 }
 
-void QQuickPathView::setHighlight(QDeclarativeComponent *highlight)
+void QQuickPathView::setHighlight(QQmlComponent *highlight)
 {
     Q_D(QQuickPathView);
     if (highlight != d->highlightComponent) {
@@ -1069,9 +1070,9 @@ bool QQuickPathView::isFlicking() const
     item in the delegate.
 
     Here is an example delegate:
-    \snippet doc/src/snippets/declarative/pathview/pathview.qml 1
+    \snippet doc/src/snippets/qml/pathview/pathview.qml 1
 */
-QDeclarativeComponent *QQuickPathView::delegate() const
+QQmlComponent *QQuickPathView::delegate() const
 {
     Q_D(const QQuickPathView);
      if (d->model) {
@@ -1082,7 +1083,7 @@ QDeclarativeComponent *QQuickPathView::delegate() const
     return 0;
 }
 
-void QQuickPathView::setDelegate(QDeclarativeComponent *delegate)
+void QQuickPathView::setDelegate(QQmlComponent *delegate)
 {
     Q_D(QQuickPathView);
     if (delegate == this->delegate())
@@ -1337,7 +1338,7 @@ void QQuickPathViewPrivate::handleMouseReleaseEvent(QMouseEvent *)
         offsetAdj = 0.0;
         moveOffset.setValue(offset);
         tl.accel(moveOffset, velocity, accel, dist);
-        tl.callback(QDeclarativeTimeLineCallback(&moveOffset, fixOffsetCallback, this));
+        tl.callback(QQuickTimeLineCallback(&moveOffset, fixOffsetCallback, this));
         if (!flicking) {
             flicking = true;
             emit q->flickingChanged();
@@ -1583,7 +1584,7 @@ void QQuickPathView::refill()
         d->releaseItem(d->itemCache.takeLast());
 }
 
-void QQuickPathView::modelUpdated(const QDeclarativeChangeSet &changeSet, bool reset)
+void QQuickPathView::modelUpdated(const QQuickChangeSet &changeSet, bool reset)
 {
     Q_D(QQuickPathView);
     if (!d->model || !d->model->isValid() || !d->path || !isComponentComplete())
@@ -1604,7 +1605,7 @@ void QQuickPathView::modelUpdated(const QDeclarativeChangeSet &changeSet, bool r
     int moveOffset;
     bool currentChanged = false;
     bool changedOffset = false;
-    foreach (const QDeclarativeChangeSet::Remove &r, changeSet.removes()) {
+    foreach (const QQuickChangeSet::Remove &r, changeSet.removes()) {
         if (moveId == -1 && d->currentIndex >= r.index + r.count) {
             d->currentIndex -= r.count;
             currentChanged = true;
@@ -1630,7 +1631,7 @@ void QQuickPathView::modelUpdated(const QDeclarativeChangeSet &changeSet, bool r
         }
         d->modelCount -= r.count;
     }
-    foreach (const QDeclarativeChangeSet::Insert &i, changeSet.inserts()) {
+    foreach (const QQuickChangeSet::Insert &i, changeSet.inserts()) {
         if (d->modelCount) {
             if (moveId == -1 && i.index <= d->currentIndex) {
                 d->currentIndex += i.count;
diff --git a/src/quick/items/qquickpathview_p.h b/src/quick/items/qquickpathview_p.h
index 77348302ea..8f1ecd6caf 100644
--- a/src/quick/items/qquickpathview_p.h
+++ b/src/quick/items/qquickpathview_p.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
@@ -44,13 +44,13 @@
 
 #include "qquickitem.h"
 
-#include <private/qdeclarativepath_p.h>
+#include <private/qquickpath_p.h>
 
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-class QDeclarativeChangeSet;
+class QQuickChangeSet;
 
 class QQuickPathViewPrivate;
 class QQuickPathViewAttached;
@@ -59,12 +59,12 @@ class Q_AUTOTEST_EXPORT QQuickPathView : public QQuickItem
     Q_OBJECT
 
     Q_PROPERTY(QVariant model READ model WRITE setModel NOTIFY modelChanged)
-    Q_PROPERTY(QDeclarativePath *path READ path WRITE setPath NOTIFY pathChanged)
+    Q_PROPERTY(QQuickPath *path READ path WRITE setPath NOTIFY pathChanged)
     Q_PROPERTY(int currentIndex READ currentIndex WRITE setCurrentIndex NOTIFY currentIndexChanged)
     Q_PROPERTY(QQuickItem *currentItem READ currentItem NOTIFY currentItemChanged)
     Q_PROPERTY(qreal offset READ offset WRITE setOffset NOTIFY offsetChanged)
 
-    Q_PROPERTY(QDeclarativeComponent *highlight READ highlight WRITE setHighlight NOTIFY highlightChanged)
+    Q_PROPERTY(QQmlComponent *highlight READ highlight WRITE setHighlight NOTIFY highlightChanged)
     Q_PROPERTY(QQuickItem *highlightItem READ highlightItem NOTIFY highlightItemChanged)
 
     Q_PROPERTY(qreal preferredHighlightBegin READ preferredHighlightBegin WRITE setPreferredHighlightBegin NOTIFY preferredHighlightBeginChanged)
@@ -80,7 +80,7 @@ class Q_AUTOTEST_EXPORT QQuickPathView : public QQuickItem
     Q_PROPERTY(bool flicking READ isFlicking NOTIFY flickingChanged)
 
     Q_PROPERTY(int count READ count NOTIFY countChanged)
-    Q_PROPERTY(QDeclarativeComponent *delegate READ delegate WRITE setDelegate NOTIFY delegateChanged)
+    Q_PROPERTY(QQmlComponent *delegate READ delegate WRITE setDelegate NOTIFY delegateChanged)
     Q_PROPERTY(int pathItemCount READ pathItemCount WRITE setPathItemCount NOTIFY pathItemCountChanged)
 
     Q_ENUMS(HighlightRangeMode)
@@ -92,8 +92,8 @@ public:
     QVariant model() const;
     void setModel(const QVariant &);
 
-    QDeclarativePath *path() const;
-    void setPath(QDeclarativePath *);
+    QQuickPath *path() const;
+    void setPath(QQuickPath *);
 
     int currentIndex() const;
     void setCurrentIndex(int idx);
@@ -103,8 +103,8 @@ public:
     qreal offset() const;
     void setOffset(qreal offset);
 
-    QDeclarativeComponent *highlight() const;
-    void setHighlight(QDeclarativeComponent *highlight);
+    QQmlComponent *highlight() const;
+    void setHighlight(QQmlComponent *highlight);
     QQuickItem *highlightItem();
 
     enum HighlightRangeMode { NoHighlightRange, ApplyRange, StrictlyEnforceRange };
@@ -134,8 +134,8 @@ public:
 
     int count() const;
 
-    QDeclarativeComponent *delegate() const;
-    void setDelegate(QDeclarativeComponent *);
+    QQmlComponent *delegate() const;
+    void setDelegate(QQmlComponent *);
 
     int pathItemCount() const;
     void setPathItemCount(int);
@@ -186,7 +186,7 @@ private Q_SLOTS:
     void refill();
     void ticked();
     void movementEnding();
-    void modelUpdated(const QDeclarativeChangeSet &changeSet, bool reset);
+    void modelUpdated(const QQuickChangeSet &changeSet, bool reset);
     void createdItem(int index, QQuickItem *item);
     void initItem(int index, QQuickItem *item);
     void destroyingItem(QQuickItem *item);
@@ -198,7 +198,7 @@ private:
     Q_DECLARE_PRIVATE(QQuickPathView)
 };
 
-class QDeclarativeOpenMetaObject;
+class QQmlOpenMetaObject;
 class QQuickPathViewAttached : public QObject
 {
     Q_OBJECT
@@ -241,7 +241,7 @@ private:
     friend class QQuickPathViewPrivate;
     friend class QQuickPathView;
     QQuickPathView *m_view;
-    QDeclarativeOpenMetaObject *m_metaobject;
+    QQmlOpenMetaObject *m_metaobject;
     bool m_onPath : 1;
     bool m_isCurrent : 1;
 };
diff --git a/src/quick/items/qquickpathview_p_p.h b/src/quick/items/qquickpathview_p_p.h
index b57aa13cbf..a80c01f320 100644
--- a/src/quick/items/qquickpathview_p_p.h
+++ b/src/quick/items/qquickpathview_p_p.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
@@ -57,17 +57,17 @@
 #include "qquickitem_p.h"
 #include "qquickvisualdatamodel_p.h"
 
-#include <QtDeclarative/qdeclarative.h>
+#include <QtQml/qqml.h>
 #include <QtCore/qdatetime.h>
 #include <QtCore/qcoreapplication.h>
 
-#include <private/qdeclarativeanimation_p_p.h>
-#include <private/qdeclarativeguard_p.h>
-#include <private/qdeclarativetimeline_p_p.h>
+#include <private/qquickanimation_p_p.h>
+#include <private/qqmlguard_p.h>
+#include <private/qquicktimeline_p_p.h>
 
 QT_BEGIN_NAMESPACE
 
-class QDeclarativeOpenMetaObjectType;
+class QQmlOpenMetaObjectType;
 class QQuickPathViewAttached;
 class QQuickPathViewPrivate : public QQuickItemPrivate, public QQuickItemChangeListener
 {
@@ -114,7 +114,7 @@ public:
     QQuickItem *getItem(int modelIndex, qreal z = 0, bool onPath=true);
     void releaseItem(QQuickItem *item);
     QQuickPathViewAttached *attached(QQuickItem *item);
-    QDeclarativeOpenMetaObjectType *attachedType();
+    QQmlOpenMetaObjectType *attachedType();
     void clear();
     void updateMappedRange();
     qreal positionOfIndex(qreal index) const;
@@ -143,9 +143,9 @@ public:
     void addVelocitySample(qreal v);
     qreal calcVelocity() const;
 
-    QDeclarativePath *path;
+    QQuickPath *path;
     int currentIndex;
-    QDeclarativeGuard<QQuickItem> currentItem;
+    QQmlGuard<QQuickItem> currentItem;
     qreal currentItemOffset;
     qreal startPc;
     QPointF startPoint;
@@ -169,24 +169,24 @@ public:
     QPointF lastPos;
     qreal dragMargin;
     qreal deceleration;
-    QDeclarativeTimeLine tl;
-    QDeclarativeTimeLineValueProxy<QQuickPathViewPrivate> moveOffset;
+    QQuickTimeLine tl;
+    QQuickTimeLineValueProxy<QQuickPathViewPrivate> moveOffset;
     int firstIndex;
     int pathItems;
     int requestedIndex;
     qreal requestedZ;
     QList<QQuickItem *> items;
     QList<QQuickItem *> itemCache;
-    QDeclarativeGuard<QQuickVisualModel> model;
+    QQmlGuard<QQuickVisualModel> model;
     QVariant modelVariant;
     enum MovementReason { Other, SetIndex, Mouse };
     MovementReason moveReason;
     enum MovementDirection { Shortest, Negative, Positive };
     MovementDirection moveDirection;
-    QDeclarativeOpenMetaObjectType *attType;
-    QDeclarativeComponent *highlightComponent;
+    QQmlOpenMetaObjectType *attType;
+    QQmlComponent *highlightComponent;
     QQuickItem *highlightItem;
-    QDeclarativeTimeLineValueProxy<QQuickPathViewPrivate> moveHighlight;
+    QQuickTimeLineValueProxy<QQuickPathViewPrivate> moveHighlight;
     qreal highlightPosition;
     qreal highlightRangeStart;
     qreal highlightRangeEnd;
diff --git a/src/quick/items/qquickpositioners.cpp b/src/quick/items/qquickpositioners.cpp
index 77d2a360b8..739f74d69a 100644
--- a/src/quick/items/qquickpositioners.cpp
+++ b/src/quick/items/qquickpositioners.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
@@ -42,15 +42,15 @@
 #include "qquickpositioners_p.h"
 #include "qquickpositioners_p_p.h"
 
-#include <QtDeclarative/qdeclarative.h>
-#include <QtDeclarative/qdeclarativeinfo.h>
+#include <QtQml/qqml.h>
+#include <QtQml/qqmlinfo.h>
 #include <QtCore/qmath.h>
 #include <QtCore/qcoreapplication.h>
 
-#include <QtQuick/private/qdeclarativestate_p.h>
-#include <QtQuick/private/qdeclarativestategroup_p.h>
-#include <private/qdeclarativestateoperations_p.h>
-#include <QtQuick/private/qdeclarativetransition_p.h>
+#include <QtQuick/private/qquickstate_p.h>
+#include <QtQuick/private/qquickstategroup_p.h>
+#include <private/qquickstatechangescript_p.h>
+#include <QtQuick/private/qquicktransition_p.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -137,13 +137,13 @@ void QQuickBasePositioner::setSpacing(qreal s)
     emit spacingChanged();
 }
 
-QDeclarativeTransition *QQuickBasePositioner::move() const
+QQuickTransition *QQuickBasePositioner::move() const
 {
     Q_D(const QQuickBasePositioner);
     return d->moveTransition;
 }
 
-void QQuickBasePositioner::setMove(QDeclarativeTransition *mt)
+void QQuickBasePositioner::setMove(QQuickTransition *mt)
 {
     Q_D(QQuickBasePositioner);
     if (mt == d->moveTransition)
@@ -152,13 +152,13 @@ void QQuickBasePositioner::setMove(QDeclarativeTransition *mt)
     emit moveChanged();
 }
 
-QDeclarativeTransition *QQuickBasePositioner::add() const
+QQuickTransition *QQuickBasePositioner::add() const
 {
     Q_D(const QQuickBasePositioner);
     return d->addTransition;
 }
 
-void QQuickBasePositioner::setAdd(QDeclarativeTransition *add)
+void QQuickBasePositioner::setAdd(QQuickTransition *add)
 {
     Q_D(QQuickBasePositioner);
     if (add == d->addTransition)
@@ -266,12 +266,12 @@ void QQuickBasePositioner::positionX(qreal x, const PositionedItem &target)
             if (!d->addTransition || !d->addTransition->enabled())
                 target.item->setX(x);
             else
-                d->addActions << QDeclarativeAction(target.item, QLatin1String("x"), QVariant(x));
+                d->addActions << QQuickAction(target.item, QLatin1String("x"), QVariant(x));
         } else if (x != target.item->x()) {
             if (!d->moveTransition || !d->moveTransition->enabled())
                 target.item->setX(x);
             else
-                d->moveActions << QDeclarativeAction(target.item, QLatin1String("x"), QVariant(x));
+                d->moveActions << QQuickAction(target.item, QLatin1String("x"), QVariant(x));
         }
     }
 }
@@ -284,12 +284,12 @@ void QQuickBasePositioner::positionY(qreal y, const PositionedItem &target)
             if (!d->addTransition || !d->addTransition->enabled())
                 target.item->setY(y);
             else
-                d->addActions << QDeclarativeAction(target.item, QLatin1String("y"), QVariant(y));
+                d->addActions << QQuickAction(target.item, QLatin1String("y"), QVariant(y));
         } else if (y != target.item->y()) {
             if (!d->moveTransition || !d->moveTransition->enabled())
                 target.item->setY(y);
             else
-                d->moveActions << QDeclarativeAction(target.item, QLatin1String("y"), QVariant(y));
+                d->moveActions << QQuickAction(target.item, QLatin1String("y"), QVariant(y));
         }
     }
 }
@@ -454,7 +454,7 @@ void QQuickPositionerAttached::setIsLastItem(bool isLastItem)
 
     Below is a Column that contains three rectangles of various sizes:
 
-    \snippet doc/src/snippets/declarative/column/vertical-positioner.qml document
+    \snippet doc/src/snippets/qml/column/vertical-positioner.qml document
 
     The Column automatically positions these items in a vertical formation, like this:
 
@@ -483,7 +483,7 @@ void QQuickPositionerAttached::setIsLastItem(bool isLastItem)
 
     For example, the Column below sets the \l move property to a specific \l Transition:
 
-    \snippet doc/src/snippets/declarative/column/column-transitions.qml document
+    \snippet doc/src/snippets/qml/column/column-transitions.qml document
 
     When the Space key is pressed, the \l {Item::visible}{visible} value of the green
     \l Rectangle is toggled. As it appears and disappears, the blue \l Rectangle moves within
@@ -491,7 +491,7 @@ void QQuickPositionerAttached::setIsLastItem(bool isLastItem)
 
     \image verticalpositioner_transition.gif
 
-    \sa Row, Grid, Flow, Positioner, {declarative/positioners}{Positioners example}
+    \sa Row, Grid, Flow, Positioner, {qml/positioners}{Positioners example}
 */
 /*!
     \qmlproperty Transition QtQuick2::Column::add
@@ -519,7 +519,7 @@ void QQuickPositionerAttached::setIsLastItem(bool isLastItem)
     addition or removal of other items in the positioner, or when items move due to
     a move operation in a related model, or when items resize themselves.
 
-    \sa add, {declarative/positioners}{Positioners example}
+    \sa add, {qml/positioners}{Positioners example}
 */
 /*!
   \qmlproperty real QtQuick2::Column::spacing
@@ -593,7 +593,7 @@ void QQuickColumn::reportConflictingAnchors()
 
     Below is a Row that contains three rectangles of various sizes:
 
-    \snippet doc/src/snippets/declarative/row/row.qml document
+    \snippet doc/src/snippets/qml/row/row.qml document
 
     The Row automatically positions these items in a horizontal formation, like this:
 
@@ -615,7 +615,7 @@ void QQuickColumn::reportConflictingAnchors()
     \l{Item Layouts}.
 
 
-    \sa Column, Grid, Flow, Positioner, {declarative/positioners}{Positioners example}
+    \sa Column, Grid, Flow, Positioner, {qml/positioners}{Positioners example}
 */
 /*!
     \qmlproperty Transition QtQuick2::Row::add
@@ -655,7 +655,7 @@ void QQuickColumn::reportConflictingAnchors()
     }
     \endqml
 
-    \sa add, {declarative/positioners}{Positioners example}
+    \sa add, {qml/positioners}{Positioners example}
 */
 /*!
   \qmlproperty real QtQuick2::Row::spacing
@@ -684,7 +684,7 @@ QQuickRow::QQuickRow(QQuickItem *parent)
     the right anchor remains to the right of the row.
     \endlist
 
-    \sa Grid::layoutDirection, Flow::layoutDirection, {declarative/righttoleft/layoutdirection}{Layout directions example}
+    \sa Grid::layoutDirection, Flow::layoutDirection, {qml/righttoleft/layoutdirection}{Layout directions example}
 */
 
 Qt::LayoutDirection QQuickRow::layoutDirection() const
@@ -813,7 +813,7 @@ void QQuickRow::reportConflictingAnchors()
 
     For example, below is a Grid that contains five rectangles of various sizes:
 
-    \snippet doc/src/snippets/declarative/grid/grid.qml document
+    \snippet doc/src/snippets/qml/grid/grid.qml document
 
     The Grid automatically positions the child items in a grid formation:
 
@@ -829,7 +829,7 @@ void QQuickRow::reportConflictingAnchors()
     \l{Item Layouts}.
 
 
-    \sa Flow, Row, Column, Positioner, {declarative/positioners}{Positioners example}
+    \sa Flow, Row, Column, Positioner, {qml/positioners}{Positioners example}
 */
 /*!
     \qmlproperty Transition QtQuick2::Grid::add
@@ -868,7 +868,7 @@ void QQuickRow::reportConflictingAnchors()
     }
     \endqml
 
-    \sa add, {declarative/positioners}{Positioners example}
+    \sa add, {qml/positioners}{Positioners example}
 */
 /*!
   \qmlproperty qreal QtQuick2::Grid::spacing
@@ -1023,7 +1023,7 @@ void QQuickGrid::setColumnSpacing(const qreal columnSpacing)
     \l Grid::flow property.
     \endlist
 
-    \sa Flow::layoutDirection, Row::layoutDirection, {declarative/righttoleft/layoutdirection}{Layout directions example}
+    \sa Flow::layoutDirection, Row::layoutDirection, {qml/righttoleft/layoutdirection}{Layout directions example}
 */
 Qt::LayoutDirection QQuickGrid::layoutDirection() const
 {
@@ -1228,7 +1228,7 @@ void QQuickGrid::reportConflictingAnchors()
 
     Below is a Flow that contains various \l Text items:
 
-    \snippet doc/src/snippets/declarative/flow.qml flow item
+    \snippet doc/src/snippets/qml/flow.qml flow item
 
     The Flow item automatically positions the child \l Text items side by
     side, wrapping as necessary:
@@ -1244,7 +1244,7 @@ void QQuickGrid::reportConflictingAnchors()
     For more information on using Flow and other related positioner-type elements, see
     \l{Item Layouts}.
 
-  \sa Column, Row, Grid, Positioner, {declarative/positioners}{Positioners example}
+  \sa Column, Row, Grid, Positioner, {qml/positioners}{Positioners example}
 */
 /*!
     \qmlproperty Transition QtQuick2::Flow::add
@@ -1284,7 +1284,7 @@ void QQuickGrid::reportConflictingAnchors()
     }
     \endqml
 
-    \sa add, {declarative/positioners}{Positioners example}
+    \sa add, {qml/positioners}{Positioners example}
 */
 /*!
   \qmlproperty real QtQuick2::Flow::spacing
@@ -1362,7 +1362,7 @@ void QQuickFlow::setFlow(Flow flow)
     \l Flow::flow property.
     \endlist
 
-    \sa Grid::layoutDirection, Row::layoutDirection, {declarative/righttoleft/layoutdirection}{Layout directions example}
+    \sa Grid::layoutDirection, Row::layoutDirection, {qml/righttoleft/layoutdirection}{Layout directions example}
 */
 
 Qt::LayoutDirection QQuickFlow::layoutDirection() const
diff --git a/src/quick/items/qquickpositioners_p.h b/src/quick/items/qquickpositioners_p.h
index a4f18cfc21..a2ad572c0e 100644
--- a/src/quick/items/qquickpositioners_p.h
+++ b/src/quick/items/qquickpositioners_p.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
@@ -44,7 +44,7 @@
 
 #include "qquickimplicitsizeitem_p.h"
 
-#include <QtQuick/private/qdeclarativestate_p.h>
+#include <QtQuick/private/qquickstate_p.h>
 #include <private/qpodvector_p.h>
 
 #include <QtCore/qobject.h>
@@ -92,8 +92,8 @@ class Q_QUICK_PRIVATE_EXPORT QQuickBasePositioner : public QQuickImplicitSizeIte
     Q_OBJECT
 
     Q_PROPERTY(qreal spacing READ spacing WRITE setSpacing NOTIFY spacingChanged)
-    Q_PROPERTY(QDeclarativeTransition *move READ move WRITE setMove NOTIFY moveChanged)
-    Q_PROPERTY(QDeclarativeTransition *add READ add WRITE setAdd NOTIFY addChanged)
+    Q_PROPERTY(QQuickTransition *move READ move WRITE setMove NOTIFY moveChanged)
+    Q_PROPERTY(QQuickTransition *add READ add WRITE setAdd NOTIFY addChanged)
 public:
     enum PositionerType { None = 0x0, Horizontal = 0x1, Vertical = 0x2, Both = 0x3 };
     QQuickBasePositioner(PositionerType, QQuickItem *parent);
@@ -102,11 +102,11 @@ public:
     qreal spacing() const;
     void setSpacing(qreal);
 
-    QDeclarativeTransition *move() const;
-    void setMove(QDeclarativeTransition *);
+    QQuickTransition *move() const;
+    void setMove(QQuickTransition *);
 
-    QDeclarativeTransition *add() const;
-    void setAdd(QDeclarativeTransition *);
+    QQuickTransition *add() const;
+    void setAdd(QQuickTransition *);
 
     static QQuickPositionerAttached *qmlAttachedProperties(QObject *obj);
 
diff --git a/src/quick/items/qquickpositioners_p_p.h b/src/quick/items/qquickpositioners_p_p.h
index d281f1a372..39ca806b5e 100644
--- a/src/quick/items/qquickpositioners_p_p.h
+++ b/src/quick/items/qquickpositioners_p_p.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
@@ -56,9 +56,9 @@
 #include "qquickpositioners_p.h"
 #include "qquickimplicitsizeitem_p_p.h"
 
-#include <QtQuick/private/qdeclarativestate_p.h>
-#include <private/qdeclarativetransitionmanager_p_p.h>
-#include <private/qdeclarativestateoperations_p.h>
+#include <QtQuick/private/qquickstate_p.h>
+#include <private/qquicktransitionmanager_p_p.h>
+#include <private/qquickstatechangescript_p.h>
 
 #include <QtCore/qobject.h>
 #include <QtCore/qstring.h>
@@ -87,12 +87,12 @@ public:
     qreal spacing;
 
     QQuickBasePositioner::PositionerType type;
-    QDeclarativeTransition *moveTransition;
-    QDeclarativeTransition *addTransition;
-    QDeclarativeStateOperation::ActionList addActions;
-    QDeclarativeStateOperation::ActionList moveActions;
-    QDeclarativeTransitionManager addTransitionManager;
-    QDeclarativeTransitionManager moveTransitionManager;
+    QQuickTransition *moveTransition;
+    QQuickTransition *addTransition;
+    QQuickStateOperation::ActionList addActions;
+    QQuickStateOperation::ActionList moveActions;
+    QQuickTransitionManager addTransitionManager;
+    QQuickTransitionManager moveTransitionManager;
 
     void watchChanges(QQuickItem *other);
     void unwatchChanges(QQuickItem* other);
diff --git a/src/quick/items/qquickrectangle.cpp b/src/quick/items/qquickrectangle.cpp
index e2dbf17a29..062df127b3 100644
--- a/src/quick/items/qquickrectangle.cpp
+++ b/src/quick/items/qquickrectangle.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
@@ -207,7 +207,7 @@ void QQuickGradientStop::updateGradient()
     with red, blending to yellow at one third of the height of the rectangle,
     and ending with green:
 
-    \snippet doc/src/snippets/declarative/gradient.qml code
+    \snippet doc/src/snippets/qml/gradient.qml code
 
     \clearfloat
     \section1 Performance and Limitations
@@ -248,9 +248,9 @@ QQuickGradient::~QQuickGradient()
     delete m_gradient;
 }
 
-QDeclarativeListProperty<QQuickGradientStop> QQuickGradient::stops()
+QQmlListProperty<QQuickGradientStop> QQuickGradient::stops()
 {
-    return QDeclarativeListProperty<QQuickGradientStop>(this, m_stops);
+    return QQmlListProperty<QQuickGradientStop>(this, m_stops);
 }
 
 const QGradient *QQuickGradient::gradient() const
@@ -309,7 +309,7 @@ int QQuickRectanglePrivate::doUpdateSlotIdx = -1;
     The following example shows the effects of some of the common properties on a
     Rectangle item, which in this case is used to create a square:
 
-    \snippet doc/src/snippets/declarative/rectangle/rectangle.qml document
+    \snippet doc/src/snippets/qml/rectangle/rectangle.qml document
 
     \clearfloat
     \section1 Performance
@@ -370,7 +370,7 @@ void QQuickRectangle::doUpdate()
     \inlineimage rect-border-width.png
     \enddiv
 
-    \snippet doc/src/snippets/declarative/rectangle/rect-border-width.qml 0
+    \snippet doc/src/snippets/qml/rectangle/rect-border-width.qml 0
 
     \clearfloat
     Here, the innermost rectangle's border is clipped on the bottom and right edges by its
@@ -394,7 +394,7 @@ QQuickPen *QQuickRectangle::border()
     \inlineimage declarative-rect_gradient.png
     \enddiv
 
-    \snippet doc/src/snippets/declarative/rectangle/rectangle-gradient.qml rectangles
+    \snippet doc/src/snippets/qml/rectangle/rectangle-gradient.qml rectangles
     \clearfloat
 
     If both a gradient and a color are specified, the gradient will be used.
@@ -463,7 +463,7 @@ void QQuickRectangle::setRadius(qreal radius)
     The following example shows rectangles with colors specified
     using hexadecimal and named color notation:
 
-    \snippet doc/src/snippets/declarative/rectangle/rectangle-colors.qml rectangles
+    \snippet doc/src/snippets/qml/rectangle/rectangle-colors.qml rectangles
 
     \clearfloat
     If both a gradient and a color are specified, the gradient will be used.
diff --git a/src/quick/items/qquickrectangle_p.h b/src/quick/items/qquickrectangle_p.h
index 621e9dd980..eec2b56fd3 100644
--- a/src/quick/items/qquickrectangle_p.h
+++ b/src/quick/items/qquickrectangle_p.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
@@ -111,14 +111,14 @@ class Q_AUTOTEST_EXPORT QQuickGradient : public QObject
 {
     Q_OBJECT
 
-    Q_PROPERTY(QDeclarativeListProperty<QQuickGradientStop> stops READ stops)
+    Q_PROPERTY(QQmlListProperty<QQuickGradientStop> stops READ stops)
     Q_CLASSINFO("DefaultProperty", "stops")
 
 public:
     QQuickGradient(QObject *parent=0);
     ~QQuickGradient();
 
-    QDeclarativeListProperty<QQuickGradientStop> stops();
+    QQmlListProperty<QQuickGradientStop> stops();
 
     const QGradient *gradient() const;
 
diff --git a/src/quick/items/qquickrectangle_p_p.h b/src/quick/items/qquickrectangle_p_p.h
index b2f53108a4..cb923ee563 100644
--- a/src/quick/items/qquickrectangle_p_p.h
+++ b/src/quick/items/qquickrectangle_p_p.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
diff --git a/src/quick/items/qquickrepeater.cpp b/src/quick/items/qquickrepeater.cpp
index 4dcbac772d..d26ebed85e 100644
--- a/src/quick/items/qquickrepeater.cpp
+++ b/src/quick/items/qquickrepeater.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
@@ -43,10 +43,10 @@
 #include "qquickrepeater_p_p.h"
 #include "qquickvisualdatamodel_p.h"
 
-#include <private/qdeclarativeglobal_p.h>
-#include <private/qdeclarativelistaccessor_p.h>
+#include <private/qqmlglobal_p.h>
+#include <private/qquicklistaccessor_p.h>
 #include <private/qlistmodelinterface_p.h>
-#include <private/qdeclarativechangeset_p.h>
+#include <private/qquickchangeset_p.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -79,9 +79,9 @@ QQuickRepeaterPrivate::~QQuickRepeaterPrivate()
     The following Repeater creates three instances of a \l Rectangle item within
     a \l Row:
 
-    \snippet doc/src/snippets/declarative/repeaters/repeater.qml import
+    \snippet doc/src/snippets/qml/repeaters/repeater.qml import
     \codeline
-    \snippet doc/src/snippets/declarative/repeaters/repeater.qml simple
+    \snippet doc/src/snippets/qml/repeaters/repeater.qml simple
 
     \image repeater-simple.png
 
@@ -96,7 +96,7 @@ QQuickRepeaterPrivate::~QQuickRepeaterPrivate()
     a Repeater to be used inside a layout. For example, the following Repeater's
     items are stacked between a red rectangle and a blue rectangle:
 
-    \snippet doc/src/snippets/declarative/repeaters/repeater.qml layout
+    \snippet doc/src/snippets/qml/repeaters/repeater.qml layout
 
     \image repeater.png
 
@@ -186,8 +186,8 @@ void QQuickRepeater::setModel(const QVariant &model)
 
     clear();
     if (d->model) {
-        disconnect(d->model, SIGNAL(modelUpdated(QDeclarativeChangeSet,bool)),
-                this, SLOT(modelUpdated(QDeclarativeChangeSet,bool)));
+        disconnect(d->model, SIGNAL(modelUpdated(QQuickChangeSet,bool)),
+                this, SLOT(modelUpdated(QQuickChangeSet,bool)));
         disconnect(d->model, SIGNAL(createdItem(int,QQuickItem*)), this, SLOT(createdItem(int,QQuickItem*)));
         disconnect(d->model, SIGNAL(initItem(int,QQuickItem*)), this, SLOT(initItem(int,QQuickItem*)));
 //        disconnect(d->model, SIGNAL(destroyingItem(QQuickItem*)), this, SLOT(destroyingItem(QQuickItem*)));
@@ -212,8 +212,8 @@ void QQuickRepeater::setModel(const QVariant &model)
             dataModel->setModel(model);
     }
     if (d->model) {
-        connect(d->model, SIGNAL(modelUpdated(QDeclarativeChangeSet,bool)),
-                this, SLOT(modelUpdated(QDeclarativeChangeSet,bool)));
+        connect(d->model, SIGNAL(modelUpdated(QQuickChangeSet,bool)),
+                this, SLOT(modelUpdated(QQuickChangeSet,bool)));
         connect(d->model, SIGNAL(createdItem(int,QQuickItem*)), this, SLOT(createdItem(int,QQuickItem*)));
         connect(d->model, SIGNAL(initItem(int,QQuickItem*)), this, SLOT(initItem(int,QQuickItem*)));
 //        connect(d->model, SIGNAL(destroyingItem(QQuickItem*)), this, SLOT(destroyingItem(QQuickItem*)));
@@ -235,7 +235,7 @@ void QQuickRepeater::setModel(const QVariant &model)
 
     \table
     \row
-    \o \snippet doc/src/snippets/declarative/repeaters/repeater.qml index
+    \o \snippet doc/src/snippets/qml/repeaters/repeater.qml index
     \o \image repeater-index.png
     \endtable
 
@@ -246,7 +246,7 @@ void QQuickRepeater::setModel(const QVariant &model)
 
     \table
     \row
-    \o \snippet doc/src/snippets/declarative/repeaters/repeater.qml modeldata
+    \o \snippet doc/src/snippets/qml/repeaters/repeater.qml modeldata
     \o \image repeater-modeldata.png
     \endtable
 
@@ -256,7 +256,7 @@ void QQuickRepeater::setModel(const QVariant &model)
 
     \sa {QML Data Models}
  */
-QDeclarativeComponent *QQuickRepeater::delegate() const
+QQmlComponent *QQuickRepeater::delegate() const
 {
     Q_D(const QQuickRepeater);
     if (d->model) {
@@ -267,7 +267,7 @@ QDeclarativeComponent *QQuickRepeater::delegate() const
     return 0;
 }
 
-void QQuickRepeater::setDelegate(QDeclarativeComponent *delegate)
+void QQuickRepeater::setDelegate(QQmlComponent *delegate)
 {
     Q_D(QQuickRepeater);
     if (QQuickVisualDataModel *dataModel = qobject_cast<QQuickVisualDataModel*>(d->model))
@@ -379,7 +379,7 @@ void QQuickRepeaterPrivate::createItems()
                 break;
             }
             deletables[ii] = item;
-            QDeclarative_setParent_noEvent(item, q->parentItem());
+            QQml_setParent_noEvent(item, q->parentItem());
             item->setParentItem(q->parentItem());
             if (ii > 0 && deletables.at(ii-1)) {
                 item->stackAfter(deletables.at(ii-1));
@@ -408,11 +408,11 @@ void QQuickRepeater::createdItem(int, QQuickItem *)
 
 void QQuickRepeater::initItem(int, QQuickItem *item)
 {
-    QDeclarative_setParent_noEvent(item, parentItem());
+    QQml_setParent_noEvent(item, parentItem());
     item->setParentItem(parentItem());
 }
 
-void QQuickRepeater::modelUpdated(const QDeclarativeChangeSet &changeSet, bool reset)
+void QQuickRepeater::modelUpdated(const QQuickChangeSet &changeSet, bool reset)
 {
     Q_D(QQuickRepeater);
 
@@ -426,7 +426,7 @@ void QQuickRepeater::modelUpdated(const QDeclarativeChangeSet &changeSet, bool r
 
     int difference = 0;
     QHash<int, QVector<QPointer<QQuickItem> > > moved;
-    foreach (const QDeclarativeChangeSet::Remove &remove, changeSet.removes()) {
+    foreach (const QQuickChangeSet::Remove &remove, changeSet.removes()) {
         int index = qMin(remove.index, d->deletables.count());
         int count = qMin(remove.index + remove.count, d->deletables.count()) - index;
         if (remove.isMove()) {
@@ -447,7 +447,7 @@ void QQuickRepeater::modelUpdated(const QDeclarativeChangeSet &changeSet, bool r
     }
 
     d->createFrom = -1;
-    foreach (const QDeclarativeChangeSet::Insert &insert, changeSet.inserts()) {
+    foreach (const QQuickChangeSet::Insert &insert, changeSet.inserts()) {
         int index = qMin(insert.index, d->deletables.count());
         if (insert.isMove()) {
             QVector<QPointer<QQuickItem> > items = moved.value(insert.moveId);
diff --git a/src/quick/items/qquickrepeater_p.h b/src/quick/items/qquickrepeater_p.h
index f23b1a3034..c67b065def 100644
--- a/src/quick/items/qquickrepeater_p.h
+++ b/src/quick/items/qquickrepeater_p.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
@@ -48,7 +48,7 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-class QDeclarativeChangeSet;
+class QQuickChangeSet;
 
 class QQuickRepeaterPrivate;
 class Q_AUTOTEST_EXPORT QQuickRepeater : public QQuickItem
@@ -56,7 +56,7 @@ class Q_AUTOTEST_EXPORT QQuickRepeater : public QQuickItem
     Q_OBJECT
 
     Q_PROPERTY(QVariant model READ model WRITE setModel NOTIFY modelChanged)
-    Q_PROPERTY(QDeclarativeComponent *delegate READ delegate WRITE setDelegate NOTIFY delegateChanged)
+    Q_PROPERTY(QQmlComponent *delegate READ delegate WRITE setDelegate NOTIFY delegateChanged)
     Q_PROPERTY(int count READ count NOTIFY countChanged)
     Q_CLASSINFO("DefaultProperty", "delegate")
 
@@ -67,8 +67,8 @@ public:
     QVariant model() const;
     void setModel(const QVariant &);
 
-    QDeclarativeComponent *delegate() const;
-    void setDelegate(QDeclarativeComponent *);
+    QQmlComponent *delegate() const;
+    void setDelegate(QQmlComponent *);
 
     int count() const;
 
@@ -93,7 +93,7 @@ protected:
 private Q_SLOTS:
     void createdItem(int index, QQuickItem *item);
     void initItem(int, QQuickItem *item);
-    void modelUpdated(const QDeclarativeChangeSet &changeSet, bool reset);
+    void modelUpdated(const QQuickChangeSet &changeSet, bool reset);
 
 private:
     Q_DISABLE_COPY(QQuickRepeater)
diff --git a/src/quick/items/qquickrepeater_p_p.h b/src/quick/items/qquickrepeater_p_p.h
index 761e00c7b0..88e0c94218 100644
--- a/src/quick/items/qquickrepeater_p_p.h
+++ b/src/quick/items/qquickrepeater_p_p.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
@@ -60,7 +60,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class QDeclarativeContext;
+class QQmlContext;
 class QQuickVisualModel;
 class QQuickRepeaterPrivate : public QQuickItemPrivate
 {
diff --git a/src/quick/items/qquickscalegrid.cpp b/src/quick/items/qquickscalegrid.cpp
index c9b1d3eba7..de10d8de47 100644
--- a/src/quick/items/qquickscalegrid.cpp
+++ b/src/quick/items/qquickscalegrid.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
@@ -41,7 +41,7 @@
 
 #include "qquickscalegrid_p_p.h"
 
-#include <QtDeclarative/qdeclarative.h>
+#include <QtQml/qqml.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/quick/items/qquickscalegrid_p_p.h b/src/quick/items/qquickscalegrid_p_p.h
index 9d02b6afb3..ae5627a48e 100644
--- a/src/quick/items/qquickscalegrid_p_p.h
+++ b/src/quick/items/qquickscalegrid_p_p.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
@@ -44,10 +44,10 @@
 
 #include "qquickborderimage_p.h"
 
-#include <QtDeclarative/qdeclarative.h>
+#include <QtQml/qqml.h>
 #include <QtCore/qobject.h>
 
-#include <QtQuick/private/qdeclarativepixmapcache_p.h>
+#include <QtQuick/private/qquickpixmapcache_p.h>
 #include <private/qtquickglobal_p.h>
 
 QT_BEGIN_HEADER
diff --git a/src/quick/items/qquickscreen.cpp b/src/quick/items/qquickscreen.cpp
index 3dfeb90ee0..a00df4600d 100644
--- a/src/quick/items/qquickscreen.cpp
+++ b/src/quick/items/qquickscreen.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
diff --git a/src/quick/items/qquickscreen_p.h b/src/quick/items/qquickscreen_p.h
index 7e2c389d6c..1a501f2f0f 100644
--- a/src/quick/items/qquickscreen_p.h
+++ b/src/quick/items/qquickscreen_p.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
@@ -42,10 +42,10 @@
 #ifndef QQUICKSCREEN_P_H
 #define QQUICKSCREEN_P_H
 
-#include <qdeclarative.h>
+#include <qqml.h>
 #include <QRect>
 #include <QSize>
-#include <private/qdeclarativeglobal_p.h>
+#include <private/qqmlglobal_p.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/quick/items/qquickshadereffect.cpp b/src/quick/items/qquickshadereffect.cpp
index d90d8761c8..3024c31d51 100644
--- a/src/quick/items/qquickshadereffect.cpp
+++ b/src/quick/items/qquickshadereffect.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
diff --git a/src/quick/items/qquickshadereffect_p.h b/src/quick/items/qquickshadereffect_p.h
index 2217cbc827..4475c22b28 100644
--- a/src/quick/items/qquickshadereffect_p.h
+++ b/src/quick/items/qquickshadereffect_p.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
diff --git a/src/quick/items/qquickshadereffectmesh.cpp b/src/quick/items/qquickshadereffectmesh.cpp
index 8a43fb55f0..eff5910a09 100644
--- a/src/quick/items/qquickshadereffectmesh.cpp
+++ b/src/quick/items/qquickshadereffectmesh.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
diff --git a/src/quick/items/qquickshadereffectmesh_p.h b/src/quick/items/qquickshadereffectmesh_p.h
index 2e57d7db4c..0d8f5a24d0 100644
--- a/src/quick/items/qquickshadereffectmesh_p.h
+++ b/src/quick/items/qquickshadereffectmesh_p.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include "qdeclarativeparserstatus.h"
+#include "qqmlparserstatus.h"
 
 #include <QtQuick/qtquickglobal.h>
 #include <QtGui/qcolor.h>
diff --git a/src/quick/items/qquickshadereffectnode.cpp b/src/quick/items/qquickshadereffectnode.cpp
index c809c70612..ae61ad940d 100644
--- a/src/quick/items/qquickshadereffectnode.cpp
+++ b/src/quick/items/qquickshadereffectnode.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
diff --git a/src/quick/items/qquickshadereffectnode_p.h b/src/quick/items/qquickshadereffectnode_p.h
index 295ac61d94..fc47f626e1 100644
--- a/src/quick/items/qquickshadereffectnode_p.h
+++ b/src/quick/items/qquickshadereffectnode_p.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
diff --git a/src/quick/items/qquickshadereffectsource.cpp b/src/quick/items/qquickshadereffectsource.cpp
index 54590292c5..708d75d137 100644
--- a/src/quick/items/qquickshadereffectsource.cpp
+++ b/src/quick/items/qquickshadereffectsource.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
diff --git a/src/quick/items/qquickshadereffectsource_p.h b/src/quick/items/qquickshadereffectsource_p.h
index 55d72c18d9..793e89cd69 100644
--- a/src/quick/items/qquickshadereffectsource_p.h
+++ b/src/quick/items/qquickshadereffectsource_p.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
diff --git a/src/quick/items/qquicksprite.cpp b/src/quick/items/qquicksprite.cpp
index 4de7880916..817a6b411a 100644
--- a/src/quick/items/qquicksprite.cpp
+++ b/src/quick/items/qquicksprite.cpp
@@ -40,7 +40,7 @@
 ****************************************************************************/
 
 #include "qquicksprite_p.h"
-#include <qdeclarative.h>
+#include <qqml.h>
 #include <QDebug>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/quick/items/qquicksprite_p.h b/src/quick/items/qquicksprite_p.h
index 4c5e5ff58e..7c5c20bb50 100644
--- a/src/quick/items/qquicksprite_p.h
+++ b/src/quick/items/qquicksprite_p.h
@@ -45,8 +45,8 @@
 #include <QObject>
 #include <QUrl>
 #include <QVariantMap>
-#include <QDeclarativeListProperty>
-#include <QtQuick/private/qdeclarativepixmapcache_p.h>
+#include <QQmlListProperty>
+#include <QtQuick/private/qquickpixmapcache_p.h>
 #include "qquickspriteengine_p.h"
 
 QT_BEGIN_HEADER
@@ -298,7 +298,7 @@ private:
     int m_frameDuration;
     int m_frameDurationVariation;
     bool m_frameSync;
-    QDeclarativePixmap m_pix;
+    QQuickPixmap m_pix;
 };
 
 QT_END_NAMESPACE
diff --git a/src/quick/items/qquickspriteengine.cpp b/src/quick/items/qquickspriteengine.cpp
index c19a5e65c9..5a78472b45 100644
--- a/src/quick/items/qquickspriteengine.cpp
+++ b/src/quick/items/qquickspriteengine.cpp
@@ -41,8 +41,8 @@
 
 #include "qquickspriteengine_p.h"
 #include "qquicksprite_p.h"
-#include <qdeclarativeinfo.h>
-#include <qdeclarative.h>
+#include <qqmlinfo.h>
+#include <qqml.h>
 #include <QDebug>
 #include <QPainter>
 #include <QSet>
@@ -307,27 +307,27 @@ void QQuickStochasticEngine::setGoal(int state, int sprite, bool jump)
     return;
 }
 
-QDeclarativePixmap::Status QQuickSpriteEngine::status()//Composed status of all Sprites
+QQuickPixmap::Status QQuickSpriteEngine::status()//Composed status of all Sprites
 {
     if (!m_startedImageAssembly)
-        return QDeclarativePixmap::Null;
+        return QQuickPixmap::Null;
     int null, loading, ready;
     null = loading = ready = 0;
     foreach (QQuickSprite* s, m_sprites) {
         switch (s->m_pix.status()) {
-            case QDeclarativePixmap::Null : null++; break;
-            case QDeclarativePixmap::Loading : loading++; break;
-            case QDeclarativePixmap::Error : return QDeclarativePixmap::Error;
-            case QDeclarativePixmap::Ready : ready++; break;
+            case QQuickPixmap::Null : null++; break;
+            case QQuickPixmap::Loading : loading++; break;
+            case QQuickPixmap::Error : return QQuickPixmap::Error;
+            case QQuickPixmap::Ready : ready++; break;
         }
     }
     if (null)
-        return QDeclarativePixmap::Null;
+        return QQuickPixmap::Null;
     if (loading)
-        return QDeclarativePixmap::Loading;
+        return QQuickPixmap::Loading;
     if (ready)
-        return QDeclarativePixmap::Ready;
-    return QDeclarativePixmap::Null;
+        return QQuickPixmap::Ready;
+    return QQuickPixmap::Null;
 }
 
 void QQuickSpriteEngine::startAssemblingImage()
@@ -348,13 +348,13 @@ void QQuickSpriteEngine::startAssemblingImage()
 
 QImage QQuickSpriteEngine::assembledImage()
 {
-    QDeclarativePixmap::Status stat = status();
-    if (stat == QDeclarativePixmap::Error)
+    QQuickPixmap::Status stat = status();
+    if (stat == QQuickPixmap::Error)
         foreach (QQuickSprite* s, m_sprites)
             if (s->m_pix.isError())
                 qmlInfo(s) << s->m_pix.error();
 
-    if (stat != QDeclarativePixmap::Ready)
+    if (stat != QQuickPixmap::Ready)
         return QImage();
 
     int h = 0;
diff --git a/src/quick/items/qquickspriteengine_p.h b/src/quick/items/qquickspriteengine_p.h
index 500d526da5..751b75f231 100644
--- a/src/quick/items/qquickspriteengine_p.h
+++ b/src/quick/items/qquickspriteengine_p.h
@@ -47,10 +47,10 @@
 #include <QTimer>
 #include <QTime>
 #include <QList>
-#include <QDeclarativeListProperty>
+#include <QQmlListProperty>
 #include <QImage>
 #include <QPair>
-#include <QtQuick/private/qdeclarativepixmapcache_p.h>
+#include <QtQuick/private/qquickpixmapcache_p.h>
 
 QT_BEGIN_HEADER
 
@@ -178,15 +178,15 @@ class Q_AUTOTEST_EXPORT QQuickStochasticEngine : public QObject
     Q_OBJECT
     //TODO: Optimize single state case?
     Q_PROPERTY(QString globalGoal READ globalGoal WRITE setGlobalGoal NOTIFY globalGoalChanged)
-    Q_PROPERTY(QDeclarativeListProperty<QQuickStochasticState> states READ states)
+    Q_PROPERTY(QQmlListProperty<QQuickStochasticState> states READ states)
 public:
     explicit QQuickStochasticEngine(QObject *parent = 0);
     QQuickStochasticEngine(QList<QQuickStochasticState*> states, QObject *parent=0);
     ~QQuickStochasticEngine();
 
-    QDeclarativeListProperty<QQuickStochasticState> states()
+    QQmlListProperty<QQuickStochasticState> states()
     {
-        return QDeclarativeListProperty<QQuickStochasticState>(this, m_states);
+        return QQmlListProperty<QQuickStochasticState>(this, m_states);
     }
 
     QString globalGoal() const
@@ -255,14 +255,14 @@ protected:
 class QQuickSpriteEngine : public QQuickStochasticEngine
 {
     Q_OBJECT
-    Q_PROPERTY(QDeclarativeListProperty<QQuickSprite> sprites READ sprites)
+    Q_PROPERTY(QQmlListProperty<QQuickSprite> sprites READ sprites)
 public:
     explicit QQuickSpriteEngine(QObject *parent = 0);
     QQuickSpriteEngine(QList<QQuickSprite*> sprites, QObject *parent=0);
     ~QQuickSpriteEngine();
-    QDeclarativeListProperty<QQuickSprite> sprites()
+    QQmlListProperty<QQuickSprite> sprites()
     {
-        return QDeclarativeListProperty<QQuickSprite>(this, m_sprites);
+        return QQmlListProperty<QQuickSprite>(this, m_sprites);
     }
 
     QQuickSprite* sprite(int sprite=0);
@@ -280,12 +280,12 @@ public:
     virtual void restart(int index=0);
     virtual void advance(int index=0);
 
-    //Similar API to QDeclarativePixmap for async loading convenience
-    bool isNull() { return status() == QDeclarativePixmap::Null; }
-    bool isReady() { return status() == QDeclarativePixmap::Ready; }
-    bool isLoading() { return status() == QDeclarativePixmap::Loading; }
-    bool isError() { return status() == QDeclarativePixmap::Error; }
-    QDeclarativePixmap::Status status();//Composed status of all Sprites
+    //Similar API to QQuickPixmap for async loading convenience
+    bool isNull() { return status() == QQuickPixmap::Null; }
+    bool isReady() { return status() == QQuickPixmap::Ready; }
+    bool isLoading() { return status() == QQuickPixmap::Loading; }
+    bool isError() { return status() == QQuickPixmap::Error; }
+    QQuickPixmap::Status status();//Composed status of all Sprites
     void startAssemblingImage();
     QImage assembledImage();
 
@@ -296,24 +296,24 @@ private:
 };
 
 //Common use is to have your own list property which is transparently an engine
-inline void spriteAppend(QDeclarativeListProperty<QQuickSprite> *p, QQuickSprite* s)
+inline void spriteAppend(QQmlListProperty<QQuickSprite> *p, QQuickSprite* s)
 {
     reinterpret_cast<QList<QQuickSprite *> *>(p->data)->append(s);
     p->object->metaObject()->invokeMethod(p->object, "createEngine");
 }
 
-inline QQuickSprite* spriteAt(QDeclarativeListProperty<QQuickSprite> *p, int idx)
+inline QQuickSprite* spriteAt(QQmlListProperty<QQuickSprite> *p, int idx)
 {
     return reinterpret_cast<QList<QQuickSprite *> *>(p->data)->at(idx);
 }
 
-inline void spriteClear(QDeclarativeListProperty<QQuickSprite> *p)
+inline void spriteClear(QQmlListProperty<QQuickSprite> *p)
 {
     reinterpret_cast<QList<QQuickSprite *> *>(p->data)->clear();
     p->object->metaObject()->invokeMethod(p->object, "createEngine");
 }
 
-inline int spriteCount(QDeclarativeListProperty<QQuickSprite> *p)
+inline int spriteCount(QQmlListProperty<QQuickSprite> *p)
 {
     return reinterpret_cast<QList<QQuickSprite *> *>(p->data)->count();
 }
diff --git a/src/quick/items/qquickspriteimage.cpp b/src/quick/items/qquickspriteimage.cpp
index 1b3b57710a..6edb3ad8c3 100644
--- a/src/quick/items/qquickspriteimage.cpp
+++ b/src/quick/items/qquickspriteimage.cpp
@@ -49,7 +49,7 @@
 #include <QtQuick/qsgtexturematerial.h>
 #include <QtQuick/qsgtexture.h>
 #include <QtQuick/qquickcanvas.h>
-#include <QtDeclarative/qdeclarativeinfo.h>
+#include <QtQml/qqmlinfo.h>
 #include <QFile>
 #include <cmath>
 #include <qmath.h>
@@ -294,9 +294,9 @@ void QQuickSpriteImage::setGoalSprite(const QString &sprite)
     }
 }
 
-QDeclarativeListProperty<QQuickSprite> QQuickSpriteImage::sprites()
+QQmlListProperty<QQuickSprite> QQuickSpriteImage::sprites()
 {
-    return QDeclarativeListProperty<QQuickSprite>(this, &m_sprites, spriteAppend, spriteCount, spriteAt, spriteClear);
+    return QQmlListProperty<QQuickSprite>(this, &m_sprites, spriteAppend, spriteCount, spriteAt, spriteClear);
 }
 
 void QQuickSpriteImage::createEngine()
@@ -327,11 +327,11 @@ QSGGeometryNode* QQuickSpriteImage::buildNode()
     if (!m_spriteEngine) {
         qmlInfo(this) << "No sprite engine...";
         return 0;
-    } else if (m_spriteEngine->status() == QDeclarativePixmap::Null) {
+    } else if (m_spriteEngine->status() == QQuickPixmap::Null) {
         m_spriteEngine->startAssemblingImage();
         update();//Schedule another update, where we will check again
         return 0;
-    } else if (m_spriteEngine->status() == QDeclarativePixmap::Loading) {
+    } else if (m_spriteEngine->status() == QQuickPixmap::Loading) {
         update();//Schedule another update, where we will check again
         return 0;
     }
diff --git a/src/quick/items/qquickspriteimage_p.h b/src/quick/items/qquickspriteimage_p.h
index 8017263bb1..1574afcb75 100644
--- a/src/quick/items/qquickspriteimage_p.h
+++ b/src/quick/items/qquickspriteimage_p.h
@@ -62,13 +62,13 @@ class Q_AUTOTEST_EXPORT QQuickSpriteImage : public QQuickItem
     Q_PROPERTY(QString goalSprite READ goalSprite WRITE setGoalSprite NOTIFY goalSpriteChanged)
     Q_PROPERTY(QString currentSprite READ currentSprite NOTIFY currentSpriteChanged)
     //###try to share similar spriteEngines for less overhead?
-    Q_PROPERTY(QDeclarativeListProperty<QQuickSprite> sprites READ sprites)
+    Q_PROPERTY(QQmlListProperty<QQuickSprite> sprites READ sprites)
     Q_CLASSINFO("DefaultProperty", "sprites")
 
 public:
     explicit QQuickSpriteImage(QQuickItem *parent = 0);
 
-    QDeclarativeListProperty<QQuickSprite> sprites();
+    QQmlListProperty<QQuickSprite> sprites();
 
     bool running() const
     {
diff --git a/src/quick/items/qquickstateoperations.cpp b/src/quick/items/qquickstateoperations.cpp
index c4dd0fd146..037a48ceed 100644
--- a/src/quick/items/qquickstateoperations.cpp
+++ b/src/quick/items/qquickstateoperations.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
@@ -42,14 +42,14 @@
 #include "qquickstateoperations_p.h"
 #include "qquickitem_p.h"
 
-#include <private/qdeclarativestate_p_p.h>
+#include <private/qquickstate_p_p.h>
 
-#include <QtDeclarative/qdeclarativeinfo.h>
+#include <QtQml/qqmlinfo.h>
 #include <QtCore/qmath.h>
 
 QT_BEGIN_NAMESPACE
 
-class QQuickParentChangePrivate : public QDeclarativeStateOperationPrivate
+class QQuickParentChangePrivate : public QQuickStateOperationPrivate
 {
     Q_DECLARE_PUBLIC(QQuickParentChange)
 public:
@@ -57,18 +57,18 @@ public:
         rewindParent(0), rewindStackBefore(0) {}
 
     QQuickItem *target;
-    QDeclarativeGuard<QQuickItem> parent;
-    QDeclarativeGuard<QQuickItem> origParent;
-    QDeclarativeGuard<QQuickItem> origStackBefore;
+    QQmlGuard<QQuickItem> parent;
+    QQmlGuard<QQuickItem> origParent;
+    QQmlGuard<QQuickItem> origStackBefore;
     QQuickItem *rewindParent;
     QQuickItem *rewindStackBefore;
 
-    QDeclarativeNullableValue<QDeclarativeScriptString> xString;
-    QDeclarativeNullableValue<QDeclarativeScriptString> yString;
-    QDeclarativeNullableValue<QDeclarativeScriptString> widthString;
-    QDeclarativeNullableValue<QDeclarativeScriptString> heightString;
-    QDeclarativeNullableValue<QDeclarativeScriptString> scaleString;
-    QDeclarativeNullableValue<QDeclarativeScriptString> rotationString;
+    QQmlNullableValue<QQmlScriptString> xString;
+    QQmlNullableValue<QQmlScriptString> yString;
+    QQmlNullableValue<QQmlScriptString> widthString;
+    QQmlNullableValue<QQmlScriptString> heightString;
+    QQmlNullableValue<QQmlScriptString> scaleString;
+    QQmlNullableValue<QQmlScriptString> rotationString;
 
     void doChange(QQuickItem *targetParent, QQuickItem *stackBefore = 0);
 };
@@ -148,7 +148,7 @@ void QQuickParentChangePrivate::doChange(QQuickItem *targetParent, QQuickItem *s
 }
 
 QQuickParentChange::QQuickParentChange(QObject *parent)
-    : QDeclarativeStateOperation(*(new QQuickParentChangePrivate), parent)
+    : QQuickStateOperation(*(new QQuickParentChangePrivate), parent)
 {
 }
 
@@ -156,13 +156,13 @@ QQuickParentChange::~QQuickParentChange()
 {
 }
 
-QDeclarativeScriptString QQuickParentChange::x() const
+QQmlScriptString QQuickParentChange::x() const
 {
     Q_D(const QQuickParentChange);
     return d->xString.value;
 }
 
-void QQuickParentChange::setX(QDeclarativeScriptString x)
+void QQuickParentChange::setX(QQmlScriptString x)
 {
     Q_D(QQuickParentChange);
     d->xString = x;
@@ -174,13 +174,13 @@ bool QQuickParentChange::xIsSet() const
     return d->xString.isValid();
 }
 
-QDeclarativeScriptString QQuickParentChange::y() const
+QQmlScriptString QQuickParentChange::y() const
 {
     Q_D(const QQuickParentChange);
     return d->yString.value;
 }
 
-void QQuickParentChange::setY(QDeclarativeScriptString y)
+void QQuickParentChange::setY(QQmlScriptString y)
 {
     Q_D(QQuickParentChange);
     d->yString = y;
@@ -192,13 +192,13 @@ bool QQuickParentChange::yIsSet() const
     return d->yString.isValid();
 }
 
-QDeclarativeScriptString QQuickParentChange::width() const
+QQmlScriptString QQuickParentChange::width() const
 {
     Q_D(const QQuickParentChange);
     return d->widthString.value;
 }
 
-void QQuickParentChange::setWidth(QDeclarativeScriptString width)
+void QQuickParentChange::setWidth(QQmlScriptString width)
 {
     Q_D(QQuickParentChange);
     d->widthString = width;
@@ -210,13 +210,13 @@ bool QQuickParentChange::widthIsSet() const
     return d->widthString.isValid();
 }
 
-QDeclarativeScriptString QQuickParentChange::height() const
+QQmlScriptString QQuickParentChange::height() const
 {
     Q_D(const QQuickParentChange);
     return d->heightString.value;
 }
 
-void QQuickParentChange::setHeight(QDeclarativeScriptString height)
+void QQuickParentChange::setHeight(QQmlScriptString height)
 {
     Q_D(QQuickParentChange);
     d->heightString = height;
@@ -228,13 +228,13 @@ bool QQuickParentChange::heightIsSet() const
     return d->heightString.isValid();
 }
 
-QDeclarativeScriptString QQuickParentChange::scale() const
+QQmlScriptString QQuickParentChange::scale() const
 {
     Q_D(const QQuickParentChange);
     return d->scaleString.value;
 }
 
-void QQuickParentChange::setScale(QDeclarativeScriptString scale)
+void QQuickParentChange::setScale(QQmlScriptString scale)
 {
     Q_D(QQuickParentChange);
     d->scaleString = scale;
@@ -246,13 +246,13 @@ bool QQuickParentChange::scaleIsSet() const
     return d->scaleString.isValid();
 }
 
-QDeclarativeScriptString QQuickParentChange::rotation() const
+QQmlScriptString QQuickParentChange::rotation() const
 {
     Q_D(const QQuickParentChange);
     return d->rotationString.value;
 }
 
-void QQuickParentChange::setRotation(QDeclarativeScriptString rotation)
+void QQuickParentChange::setRotation(QQmlScriptString rotation)
 {
     Q_D(QQuickParentChange);
     d->rotationString = rotation;
@@ -294,7 +294,7 @@ void QQuickParentChange::setParent(QQuickItem *parent)
     d->parent = parent;
 }
 
-QDeclarativeStateOperation::ActionList QQuickParentChange::actions()
+QQuickStateOperation::ActionList QQuickParentChange::actions()
 {
     Q_D(QQuickParentChange);
     if (!d->target || !d->parent)
@@ -302,7 +302,7 @@ QDeclarativeStateOperation::ActionList QQuickParentChange::actions()
 
     ActionList actions;
 
-    QDeclarativeAction a;
+    QQuickAction a;
     a.event = this;
     actions << a;
 
@@ -311,13 +311,13 @@ QDeclarativeStateOperation::ActionList QQuickParentChange::actions()
         QString script = d->xString.value.script();
         qreal x = script.toFloat(&ok);
         if (ok) {
-            QDeclarativeAction xa(d->target, QLatin1String("x"), x);
+            QQuickAction xa(d->target, QLatin1String("x"), x);
             actions << xa;
         } else {
-            QDeclarativeBinding *newBinding = new QDeclarativeBinding(script, d->target, qmlContext(this));
-            QDeclarativeProperty property(d->target, QLatin1String("x"));
+            QQmlBinding *newBinding = new QQmlBinding(script, d->target, qmlContext(this));
+            QQmlProperty property(d->target, QLatin1String("x"));
             newBinding->setTarget(property);
-            QDeclarativeAction xa;
+            QQuickAction xa;
             xa.property = property;
             xa.toBinding = newBinding;
             xa.fromValue = xa.property.read();
@@ -331,13 +331,13 @@ QDeclarativeStateOperation::ActionList QQuickParentChange::actions()
         QString script = d->yString.value.script();
         qreal y = script.toFloat(&ok);
         if (ok) {
-            QDeclarativeAction ya(d->target, QLatin1String("y"), y);
+            QQuickAction ya(d->target, QLatin1String("y"), y);
             actions << ya;
         } else {
-            QDeclarativeBinding *newBinding = new QDeclarativeBinding(script, d->target, qmlContext(this));
-            QDeclarativeProperty property(d->target, QLatin1String("y"));
+            QQmlBinding *newBinding = new QQmlBinding(script, d->target, qmlContext(this));
+            QQmlProperty property(d->target, QLatin1String("y"));
             newBinding->setTarget(property);
-            QDeclarativeAction ya;
+            QQuickAction ya;
             ya.property = property;
             ya.toBinding = newBinding;
             ya.fromValue = ya.property.read();
@@ -351,13 +351,13 @@ QDeclarativeStateOperation::ActionList QQuickParentChange::actions()
         QString script = d->scaleString.value.script();
         qreal scale = script.toFloat(&ok);
         if (ok) {
-            QDeclarativeAction sa(d->target, QLatin1String("scale"), scale);
+            QQuickAction sa(d->target, QLatin1String("scale"), scale);
             actions << sa;
         } else {
-            QDeclarativeBinding *newBinding = new QDeclarativeBinding(script, d->target, qmlContext(this));
-            QDeclarativeProperty property(d->target, QLatin1String("scale"));
+            QQmlBinding *newBinding = new QQmlBinding(script, d->target, qmlContext(this));
+            QQmlProperty property(d->target, QLatin1String("scale"));
             newBinding->setTarget(property);
-            QDeclarativeAction sa;
+            QQuickAction sa;
             sa.property = property;
             sa.toBinding = newBinding;
             sa.fromValue = sa.property.read();
@@ -371,13 +371,13 @@ QDeclarativeStateOperation::ActionList QQuickParentChange::actions()
         QString script = d->rotationString.value.script();
         qreal rotation = script.toFloat(&ok);
         if (ok) {
-            QDeclarativeAction ra(d->target, QLatin1String("rotation"), rotation);
+            QQuickAction ra(d->target, QLatin1String("rotation"), rotation);
             actions << ra;
         } else {
-            QDeclarativeBinding *newBinding = new QDeclarativeBinding(script, d->target, qmlContext(this));
-            QDeclarativeProperty property(d->target, QLatin1String("rotation"));
+            QQmlBinding *newBinding = new QQmlBinding(script, d->target, qmlContext(this));
+            QQmlProperty property(d->target, QLatin1String("rotation"));
             newBinding->setTarget(property);
-            QDeclarativeAction ra;
+            QQuickAction ra;
             ra.property = property;
             ra.toBinding = newBinding;
             ra.fromValue = ra.property.read();
@@ -391,13 +391,13 @@ QDeclarativeStateOperation::ActionList QQuickParentChange::actions()
         QString script = d->widthString.value.script();
         qreal width = script.toFloat(&ok);
         if (ok) {
-            QDeclarativeAction wa(d->target, QLatin1String("width"), width);
+            QQuickAction wa(d->target, QLatin1String("width"), width);
             actions << wa;
         } else {
-            QDeclarativeBinding *newBinding = new QDeclarativeBinding(script, d->target, qmlContext(this));
-            QDeclarativeProperty property(d->target, QLatin1String("width"));
+            QQmlBinding *newBinding = new QQmlBinding(script, d->target, qmlContext(this));
+            QQmlProperty property(d->target, QLatin1String("width"));
             newBinding->setTarget(property);
-            QDeclarativeAction wa;
+            QQuickAction wa;
             wa.property = property;
             wa.toBinding = newBinding;
             wa.fromValue = wa.property.read();
@@ -411,13 +411,13 @@ QDeclarativeStateOperation::ActionList QQuickParentChange::actions()
         QString script = d->heightString.value.script();
         qreal height = script.toFloat(&ok);
         if (ok) {
-            QDeclarativeAction ha(d->target, QLatin1String("height"), height);
+            QQuickAction ha(d->target, QLatin1String("height"), height);
             actions << ha;
         } else {
-            QDeclarativeBinding *newBinding = new QDeclarativeBinding(script, d->target, qmlContext(this));
-            QDeclarativeProperty property(d->target, QLatin1String("height"));
+            QQmlBinding *newBinding = new QQmlBinding(script, d->target, qmlContext(this));
+            QQmlProperty property(d->target, QLatin1String("height"));
             newBinding->setTarget(property);
-            QDeclarativeAction ha;
+            QQuickAction ha;
             ha.property = property;
             ha.toBinding = newBinding;
             ha.fromValue = ha.property.read();
@@ -437,7 +437,7 @@ void QQuickParentChange::saveOriginals()
     d->origStackBefore = d->rewindStackBefore;
 }
 
-/*void QQuickParentChange::copyOriginals(QDeclarativeActionEvent *other)
+/*void QQuickParentChange::copyOriginals(QQuickActionEvent *other)
 {
     Q_D(QQuickParentChange);
     QQuickParentChange *pc = static_cast<QQuickParentChange*>(other);
@@ -465,12 +465,12 @@ void QQuickParentChange::reverse(Reason)
     d->doChange(d->origParent, d->origStackBefore);
 }
 
-QDeclarativeActionEvent::EventType QQuickParentChange::type() const
+QQuickActionEvent::EventType QQuickParentChange::type() const
 {
     return ParentChange;
 }
 
-bool QQuickParentChange::override(QDeclarativeActionEvent*other)
+bool QQuickParentChange::override(QQuickActionEvent*other)
 {
     Q_D(QQuickParentChange);
     if (other->type() != ParentChange)
@@ -527,13 +527,13 @@ public:
     QQuickItem *fill;
     QQuickItem *centerIn;
 
-    QDeclarativeScriptString leftScript;
-    QDeclarativeScriptString rightScript;
-    QDeclarativeScriptString topScript;
-    QDeclarativeScriptString bottomScript;
-    QDeclarativeScriptString hCenterScript;
-    QDeclarativeScriptString vCenterScript;
-    QDeclarativeScriptString baselineScript;
+    QQmlScriptString leftScript;
+    QQmlScriptString rightScript;
+    QQmlScriptString topScript;
+    QQmlScriptString bottomScript;
+    QQmlScriptString hCenterScript;
+    QQmlScriptString vCenterScript;
+    QQmlScriptString baselineScript;
 
     /*qreal leftMargin;
     qreal rightMargin;
@@ -554,13 +554,13 @@ QQuickAnchorSet::~QQuickAnchorSet()
 {
 }
 
-QDeclarativeScriptString QQuickAnchorSet::top() const
+QQmlScriptString QQuickAnchorSet::top() const
 {
     Q_D(const QQuickAnchorSet);
     return d->topScript;
 }
 
-void QQuickAnchorSet::setTop(const QDeclarativeScriptString &edge)
+void QQuickAnchorSet::setTop(const QQmlScriptString &edge)
 {
     Q_D(QQuickAnchorSet);
     d->usedAnchors |= QQuickAnchors::TopAnchor;
@@ -576,13 +576,13 @@ void QQuickAnchorSet::resetTop()
     d->resetAnchors |= QQuickAnchors::TopAnchor;
 }
 
-QDeclarativeScriptString QQuickAnchorSet::bottom() const
+QQmlScriptString QQuickAnchorSet::bottom() const
 {
     Q_D(const QQuickAnchorSet);
     return d->bottomScript;
 }
 
-void QQuickAnchorSet::setBottom(const QDeclarativeScriptString &edge)
+void QQuickAnchorSet::setBottom(const QQmlScriptString &edge)
 {
     Q_D(QQuickAnchorSet);
     d->usedAnchors |= QQuickAnchors::BottomAnchor;
@@ -598,13 +598,13 @@ void QQuickAnchorSet::resetBottom()
     d->resetAnchors |= QQuickAnchors::BottomAnchor;
 }
 
-QDeclarativeScriptString QQuickAnchorSet::verticalCenter() const
+QQmlScriptString QQuickAnchorSet::verticalCenter() const
 {
     Q_D(const QQuickAnchorSet);
     return d->vCenterScript;
 }
 
-void QQuickAnchorSet::setVerticalCenter(const QDeclarativeScriptString &edge)
+void QQuickAnchorSet::setVerticalCenter(const QQmlScriptString &edge)
 {
     Q_D(QQuickAnchorSet);
     d->usedAnchors |= QQuickAnchors::VCenterAnchor;
@@ -620,13 +620,13 @@ void QQuickAnchorSet::resetVerticalCenter()
     d->resetAnchors |= QQuickAnchors::VCenterAnchor;
 }
 
-QDeclarativeScriptString QQuickAnchorSet::baseline() const
+QQmlScriptString QQuickAnchorSet::baseline() const
 {
     Q_D(const QQuickAnchorSet);
     return d->baselineScript;
 }
 
-void QQuickAnchorSet::setBaseline(const QDeclarativeScriptString &edge)
+void QQuickAnchorSet::setBaseline(const QQmlScriptString &edge)
 {
     Q_D(QQuickAnchorSet);
     d->usedAnchors |= QQuickAnchors::BaselineAnchor;
@@ -642,13 +642,13 @@ void QQuickAnchorSet::resetBaseline()
     d->resetAnchors |= QQuickAnchors::BaselineAnchor;
 }
 
-QDeclarativeScriptString QQuickAnchorSet::left() const
+QQmlScriptString QQuickAnchorSet::left() const
 {
     Q_D(const QQuickAnchorSet);
     return d->leftScript;
 }
 
-void QQuickAnchorSet::setLeft(const QDeclarativeScriptString &edge)
+void QQuickAnchorSet::setLeft(const QQmlScriptString &edge)
 {
     Q_D(QQuickAnchorSet);
     d->usedAnchors |= QQuickAnchors::LeftAnchor;
@@ -664,13 +664,13 @@ void QQuickAnchorSet::resetLeft()
     d->resetAnchors |= QQuickAnchors::LeftAnchor;
 }
 
-QDeclarativeScriptString QQuickAnchorSet::right() const
+QQmlScriptString QQuickAnchorSet::right() const
 {
     Q_D(const QQuickAnchorSet);
     return d->rightScript;
 }
 
-void QQuickAnchorSet::setRight(const QDeclarativeScriptString &edge)
+void QQuickAnchorSet::setRight(const QQmlScriptString &edge)
 {
     Q_D(QQuickAnchorSet);
     d->usedAnchors |= QQuickAnchors::RightAnchor;
@@ -686,13 +686,13 @@ void QQuickAnchorSet::resetRight()
     d->resetAnchors |= QQuickAnchors::RightAnchor;
 }
 
-QDeclarativeScriptString QQuickAnchorSet::horizontalCenter() const
+QQmlScriptString QQuickAnchorSet::horizontalCenter() const
 {
     Q_D(const QQuickAnchorSet);
     return d->hCenterScript;
 }
 
-void QQuickAnchorSet::setHorizontalCenter(const QDeclarativeScriptString &edge)
+void QQuickAnchorSet::setHorizontalCenter(const QQmlScriptString &edge)
 {
     Q_D(QQuickAnchorSet);
     d->usedAnchors |= QQuickAnchors::HCenterAnchor;
@@ -743,7 +743,7 @@ void QQuickAnchorSet::resetCenterIn()
 }
 
 
-class QQuickAnchorChangesPrivate : public QDeclarativeStateOperationPrivate
+class QQuickAnchorChangesPrivate : public QQuickStateOperationPrivate
 {
 public:
     QQuickAnchorChangesPrivate()
@@ -761,21 +761,21 @@ public:
     QQuickItem *target;
     QQuickAnchorSet *anchorSet;
 
-    QDeclarativeBinding *leftBinding;
-    QDeclarativeBinding *rightBinding;
-    QDeclarativeBinding *hCenterBinding;
-    QDeclarativeBinding *topBinding;
-    QDeclarativeBinding *bottomBinding;
-    QDeclarativeBinding *vCenterBinding;
-    QDeclarativeBinding *baselineBinding;
-
-    QDeclarativeAbstractBinding *origLeftBinding;
-    QDeclarativeAbstractBinding *origRightBinding;
-    QDeclarativeAbstractBinding *origHCenterBinding;
-    QDeclarativeAbstractBinding *origTopBinding;
-    QDeclarativeAbstractBinding *origBottomBinding;
-    QDeclarativeAbstractBinding *origVCenterBinding;
-    QDeclarativeAbstractBinding *origBaselineBinding;
+    QQmlBinding *leftBinding;
+    QQmlBinding *rightBinding;
+    QQmlBinding *hCenterBinding;
+    QQmlBinding *topBinding;
+    QQmlBinding *bottomBinding;
+    QQmlBinding *vCenterBinding;
+    QQmlBinding *baselineBinding;
+
+    QQmlAbstractBinding *origLeftBinding;
+    QQmlAbstractBinding *origRightBinding;
+    QQmlAbstractBinding *origHCenterBinding;
+    QQmlAbstractBinding *origTopBinding;
+    QQmlAbstractBinding *origBottomBinding;
+    QQmlAbstractBinding *origVCenterBinding;
+    QQmlAbstractBinding *origBaselineBinding;
 
     QQuickAnchorLine rewindLeft;
     QQuickAnchorLine rewindRight;
@@ -808,24 +808,24 @@ public:
     bool applyOrigVCenter;
     bool applyOrigBaseline;
 
-    QDeclarativeNullableValue<qreal> origWidth;
-    QDeclarativeNullableValue<qreal> origHeight;
+    QQmlNullableValue<qreal> origWidth;
+    QQmlNullableValue<qreal> origHeight;
     qreal origX;
     qreal origY;
 
-    QList<QDeclarativeAbstractBinding*> oldBindings;
+    QList<QQmlAbstractBinding*> oldBindings;
 
-    QDeclarativeProperty leftProp;
-    QDeclarativeProperty rightProp;
-    QDeclarativeProperty hCenterProp;
-    QDeclarativeProperty topProp;
-    QDeclarativeProperty bottomProp;
-    QDeclarativeProperty vCenterProp;
-    QDeclarativeProperty baselineProp;
+    QQmlProperty leftProp;
+    QQmlProperty rightProp;
+    QQmlProperty hCenterProp;
+    QQmlProperty topProp;
+    QQmlProperty bottomProp;
+    QQmlProperty vCenterProp;
+    QQmlProperty baselineProp;
 };
 
 QQuickAnchorChanges::QQuickAnchorChanges(QObject *parent)
- : QDeclarativeStateOperation(*(new QQuickAnchorChangesPrivate), parent)
+ : QQuickStateOperation(*(new QQuickAnchorChangesPrivate), parent)
 {
 }
 
@@ -839,44 +839,44 @@ QQuickAnchorChanges::ActionList QQuickAnchorChanges::actions()
     d->leftBinding = d->rightBinding = d->hCenterBinding = d->topBinding
                    = d->bottomBinding = d->vCenterBinding = d->baselineBinding = 0;
 
-    d->leftProp = QDeclarativeProperty(d->target, QLatin1String("anchors.left"));
-    d->rightProp = QDeclarativeProperty(d->target, QLatin1String("anchors.right"));
-    d->hCenterProp = QDeclarativeProperty(d->target, QLatin1String("anchors.horizontalCenter"));
-    d->topProp = QDeclarativeProperty(d->target, QLatin1String("anchors.top"));
-    d->bottomProp = QDeclarativeProperty(d->target, QLatin1String("anchors.bottom"));
-    d->vCenterProp = QDeclarativeProperty(d->target, QLatin1String("anchors.verticalCenter"));
-    d->baselineProp = QDeclarativeProperty(d->target, QLatin1String("anchors.baseline"));
+    d->leftProp = QQmlProperty(d->target, QLatin1String("anchors.left"));
+    d->rightProp = QQmlProperty(d->target, QLatin1String("anchors.right"));
+    d->hCenterProp = QQmlProperty(d->target, QLatin1String("anchors.horizontalCenter"));
+    d->topProp = QQmlProperty(d->target, QLatin1String("anchors.top"));
+    d->bottomProp = QQmlProperty(d->target, QLatin1String("anchors.bottom"));
+    d->vCenterProp = QQmlProperty(d->target, QLatin1String("anchors.verticalCenter"));
+    d->baselineProp = QQmlProperty(d->target, QLatin1String("anchors.baseline"));
 
     if (d->anchorSet->d_func()->usedAnchors & QQuickAnchors::LeftAnchor) {
-        d->leftBinding = new QDeclarativeBinding(d->anchorSet->d_func()->leftScript.script(), d->target, qmlContext(this));
+        d->leftBinding = new QQmlBinding(d->anchorSet->d_func()->leftScript.script(), d->target, qmlContext(this));
         d->leftBinding->setTarget(d->leftProp);
     }
     if (d->anchorSet->d_func()->usedAnchors & QQuickAnchors::RightAnchor) {
-        d->rightBinding = new QDeclarativeBinding(d->anchorSet->d_func()->rightScript.script(), d->target, qmlContext(this));
+        d->rightBinding = new QQmlBinding(d->anchorSet->d_func()->rightScript.script(), d->target, qmlContext(this));
         d->rightBinding->setTarget(d->rightProp);
     }
     if (d->anchorSet->d_func()->usedAnchors & QQuickAnchors::HCenterAnchor) {
-        d->hCenterBinding = new QDeclarativeBinding(d->anchorSet->d_func()->hCenterScript.script(), d->target, qmlContext(this));
+        d->hCenterBinding = new QQmlBinding(d->anchorSet->d_func()->hCenterScript.script(), d->target, qmlContext(this));
         d->hCenterBinding->setTarget(d->hCenterProp);
     }
     if (d->anchorSet->d_func()->usedAnchors & QQuickAnchors::TopAnchor) {
-        d->topBinding = new QDeclarativeBinding(d->anchorSet->d_func()->topScript.script(), d->target, qmlContext(this));
+        d->topBinding = new QQmlBinding(d->anchorSet->d_func()->topScript.script(), d->target, qmlContext(this));
         d->topBinding->setTarget(d->topProp);
     }
     if (d->anchorSet->d_func()->usedAnchors & QQuickAnchors::BottomAnchor) {
-        d->bottomBinding = new QDeclarativeBinding(d->anchorSet->d_func()->bottomScript.script(), d->target, qmlContext(this));
+        d->bottomBinding = new QQmlBinding(d->anchorSet->d_func()->bottomScript.script(), d->target, qmlContext(this));
         d->bottomBinding->setTarget(d->bottomProp);
     }
     if (d->anchorSet->d_func()->usedAnchors & QQuickAnchors::VCenterAnchor) {
-        d->vCenterBinding = new QDeclarativeBinding(d->anchorSet->d_func()->vCenterScript.script(), d->target, qmlContext(this));
+        d->vCenterBinding = new QQmlBinding(d->anchorSet->d_func()->vCenterScript.script(), d->target, qmlContext(this));
         d->vCenterBinding->setTarget(d->vCenterProp);
     }
     if (d->anchorSet->d_func()->usedAnchors & QQuickAnchors::BaselineAnchor) {
-        d->baselineBinding = new QDeclarativeBinding(d->anchorSet->d_func()->baselineScript.script(), d->target, qmlContext(this));
+        d->baselineBinding = new QQmlBinding(d->anchorSet->d_func()->baselineScript.script(), d->target, qmlContext(this));
         d->baselineBinding->setTarget(d->baselineProp);
     }
 
-    QDeclarativeAction a;
+    QQuickAction a;
     a.event = this;
     return ActionList() << a;
 }
@@ -910,43 +910,43 @@ void QQuickAnchorChanges::execute(Reason reason)
     if (d->applyOrigLeft) {
         if (!d->origLeftBinding)
             targetPrivate->anchors()->resetLeft();
-        QDeclarativePropertyPrivate::setBinding(d->leftProp, d->origLeftBinding);
+        QQmlPropertyPrivate::setBinding(d->leftProp, d->origLeftBinding);
     }
     if (d->applyOrigRight) {
         if (!d->origRightBinding)
             targetPrivate->anchors()->resetRight();
-        QDeclarativePropertyPrivate::setBinding(d->rightProp, d->origRightBinding);
+        QQmlPropertyPrivate::setBinding(d->rightProp, d->origRightBinding);
     }
     if (d->applyOrigHCenter) {
         if (!d->origHCenterBinding)
             targetPrivate->anchors()->resetHorizontalCenter();
-        QDeclarativePropertyPrivate::setBinding(d->hCenterProp, d->origHCenterBinding);
+        QQmlPropertyPrivate::setBinding(d->hCenterProp, d->origHCenterBinding);
     }
     if (d->applyOrigTop) {
         if (!d->origTopBinding)
             targetPrivate->anchors()->resetTop();
-        QDeclarativePropertyPrivate::setBinding(d->topProp, d->origTopBinding);
+        QQmlPropertyPrivate::setBinding(d->topProp, d->origTopBinding);
     }
     if (d->applyOrigBottom) {
         if (!d->origBottomBinding)
             targetPrivate->anchors()->resetBottom();
-        QDeclarativePropertyPrivate::setBinding(d->bottomProp, d->origBottomBinding);
+        QQmlPropertyPrivate::setBinding(d->bottomProp, d->origBottomBinding);
     }
     if (d->applyOrigVCenter) {
         if (!d->origVCenterBinding)
             targetPrivate->anchors()->resetVerticalCenter();
-        QDeclarativePropertyPrivate::setBinding(d->vCenterProp, d->origVCenterBinding);
+        QQmlPropertyPrivate::setBinding(d->vCenterProp, d->origVCenterBinding);
     }
     if (d->applyOrigBaseline) {
         if (!d->origBaselineBinding)
             targetPrivate->anchors()->resetBaseline();
-        QDeclarativePropertyPrivate::setBinding(d->baselineProp, d->origBaselineBinding);
+        QQmlPropertyPrivate::setBinding(d->baselineProp, d->origBaselineBinding);
     }
 
     //destroy old bindings
     if (reason == ActualChange) {
         for (int i = 0; i < d->oldBindings.size(); ++i) {
-            QDeclarativeAbstractBinding *binding = d->oldBindings.at(i);
+            QQmlAbstractBinding *binding = d->oldBindings.at(i);
             if (binding)
                 binding->destroy();
         }
@@ -956,48 +956,48 @@ void QQuickAnchorChanges::execute(Reason reason)
     //reset any anchors that have been specified as "undefined"
     if (d->anchorSet->d_func()->resetAnchors & QQuickAnchors::LeftAnchor) {
         targetPrivate->anchors()->resetLeft();
-        QDeclarativePropertyPrivate::setBinding(d->leftProp, 0);
+        QQmlPropertyPrivate::setBinding(d->leftProp, 0);
     }
     if (d->anchorSet->d_func()->resetAnchors & QQuickAnchors::RightAnchor) {
         targetPrivate->anchors()->resetRight();
-        QDeclarativePropertyPrivate::setBinding(d->rightProp, 0);
+        QQmlPropertyPrivate::setBinding(d->rightProp, 0);
     }
     if (d->anchorSet->d_func()->resetAnchors & QQuickAnchors::HCenterAnchor) {
         targetPrivate->anchors()->resetHorizontalCenter();
-        QDeclarativePropertyPrivate::setBinding(d->hCenterProp, 0);
+        QQmlPropertyPrivate::setBinding(d->hCenterProp, 0);
     }
     if (d->anchorSet->d_func()->resetAnchors & QQuickAnchors::TopAnchor) {
         targetPrivate->anchors()->resetTop();
-        QDeclarativePropertyPrivate::setBinding(d->topProp, 0);
+        QQmlPropertyPrivate::setBinding(d->topProp, 0);
     }
     if (d->anchorSet->d_func()->resetAnchors & QQuickAnchors::BottomAnchor) {
         targetPrivate->anchors()->resetBottom();
-        QDeclarativePropertyPrivate::setBinding(d->bottomProp, 0);
+        QQmlPropertyPrivate::setBinding(d->bottomProp, 0);
     }
     if (d->anchorSet->d_func()->resetAnchors & QQuickAnchors::VCenterAnchor) {
         targetPrivate->anchors()->resetVerticalCenter();
-        QDeclarativePropertyPrivate::setBinding(d->vCenterProp, 0);
+        QQmlPropertyPrivate::setBinding(d->vCenterProp, 0);
     }
     if (d->anchorSet->d_func()->resetAnchors & QQuickAnchors::BaselineAnchor) {
         targetPrivate->anchors()->resetBaseline();
-        QDeclarativePropertyPrivate::setBinding(d->baselineProp, 0);
+        QQmlPropertyPrivate::setBinding(d->baselineProp, 0);
     }
 
     //set any anchors that have been specified
     if (d->leftBinding)
-        QDeclarativePropertyPrivate::setBinding(d->leftBinding->property(), d->leftBinding);
+        QQmlPropertyPrivate::setBinding(d->leftBinding->property(), d->leftBinding);
     if (d->rightBinding)
-        QDeclarativePropertyPrivate::setBinding(d->rightBinding->property(), d->rightBinding);
+        QQmlPropertyPrivate::setBinding(d->rightBinding->property(), d->rightBinding);
     if (d->hCenterBinding)
-        QDeclarativePropertyPrivate::setBinding(d->hCenterBinding->property(), d->hCenterBinding);
+        QQmlPropertyPrivate::setBinding(d->hCenterBinding->property(), d->hCenterBinding);
     if (d->topBinding)
-        QDeclarativePropertyPrivate::setBinding(d->topBinding->property(), d->topBinding);
+        QQmlPropertyPrivate::setBinding(d->topBinding->property(), d->topBinding);
     if (d->bottomBinding)
-        QDeclarativePropertyPrivate::setBinding(d->bottomBinding->property(), d->bottomBinding);
+        QQmlPropertyPrivate::setBinding(d->bottomBinding->property(), d->bottomBinding);
     if (d->vCenterBinding)
-        QDeclarativePropertyPrivate::setBinding(d->vCenterBinding->property(), d->vCenterBinding);
+        QQmlPropertyPrivate::setBinding(d->vCenterBinding->property(), d->vCenterBinding);
     if (d->baselineBinding)
-        QDeclarativePropertyPrivate::setBinding(d->baselineBinding->property(), d->baselineBinding);
+        QQmlPropertyPrivate::setBinding(d->baselineBinding->property(), d->baselineBinding);
 }
 
 bool QQuickAnchorChanges::isReversable()
@@ -1015,49 +1015,49 @@ void QQuickAnchorChanges::reverse(Reason reason)
     //reset any anchors set by the state
     if (d->leftBinding) {
         targetPrivate->anchors()->resetLeft();
-        QDeclarativePropertyPrivate::setBinding(d->leftBinding->property(), 0);
+        QQmlPropertyPrivate::setBinding(d->leftBinding->property(), 0);
         if (reason == ActualChange) {
             d->leftBinding->destroy(); d->leftBinding = 0;
         }
     }
     if (d->rightBinding) {
         targetPrivate->anchors()->resetRight();
-        QDeclarativePropertyPrivate::setBinding(d->rightBinding->property(), 0);
+        QQmlPropertyPrivate::setBinding(d->rightBinding->property(), 0);
         if (reason == ActualChange) {
             d->rightBinding->destroy(); d->rightBinding = 0;
         }
     }
     if (d->hCenterBinding) {
         targetPrivate->anchors()->resetHorizontalCenter();
-        QDeclarativePropertyPrivate::setBinding(d->hCenterBinding->property(), 0);
+        QQmlPropertyPrivate::setBinding(d->hCenterBinding->property(), 0);
         if (reason == ActualChange) {
             d->hCenterBinding->destroy(); d->hCenterBinding = 0;
         }
     }
     if (d->topBinding) {
         targetPrivate->anchors()->resetTop();
-        QDeclarativePropertyPrivate::setBinding(d->topBinding->property(), 0);
+        QQmlPropertyPrivate::setBinding(d->topBinding->property(), 0);
         if (reason == ActualChange) {
             d->topBinding->destroy(); d->topBinding = 0;
         }
     }
     if (d->bottomBinding) {
         targetPrivate->anchors()->resetBottom();
-        QDeclarativePropertyPrivate::setBinding(d->bottomBinding->property(), 0);
+        QQmlPropertyPrivate::setBinding(d->bottomBinding->property(), 0);
         if (reason == ActualChange) {
             d->bottomBinding->destroy(); d->bottomBinding = 0;
         }
     }
     if (d->vCenterBinding) {
         targetPrivate->anchors()->resetVerticalCenter();
-        QDeclarativePropertyPrivate::setBinding(d->vCenterBinding->property(), 0);
+        QQmlPropertyPrivate::setBinding(d->vCenterBinding->property(), 0);
         if (reason == ActualChange) {
             d->vCenterBinding->destroy(); d->vCenterBinding = 0;
         }
     }
     if (d->baselineBinding) {
         targetPrivate->anchors()->resetBaseline();
-        QDeclarativePropertyPrivate::setBinding(d->baselineBinding->property(), 0);
+        QQmlPropertyPrivate::setBinding(d->baselineBinding->property(), 0);
         if (reason == ActualChange) {
             d->baselineBinding->destroy(); d->baselineBinding = 0;
         }
@@ -1065,19 +1065,19 @@ void QQuickAnchorChanges::reverse(Reason reason)
 
     //restore previous anchors
     if (d->origLeftBinding)
-        QDeclarativePropertyPrivate::setBinding(d->leftProp, d->origLeftBinding);
+        QQmlPropertyPrivate::setBinding(d->leftProp, d->origLeftBinding);
     if (d->origRightBinding)
-        QDeclarativePropertyPrivate::setBinding(d->rightProp, d->origRightBinding);
+        QQmlPropertyPrivate::setBinding(d->rightProp, d->origRightBinding);
     if (d->origHCenterBinding)
-        QDeclarativePropertyPrivate::setBinding(d->hCenterProp, d->origHCenterBinding);
+        QQmlPropertyPrivate::setBinding(d->hCenterProp, d->origHCenterBinding);
     if (d->origTopBinding)
-        QDeclarativePropertyPrivate::setBinding(d->topProp, d->origTopBinding);
+        QQmlPropertyPrivate::setBinding(d->topProp, d->origTopBinding);
     if (d->origBottomBinding)
-        QDeclarativePropertyPrivate::setBinding(d->bottomProp, d->origBottomBinding);
+        QQmlPropertyPrivate::setBinding(d->bottomProp, d->origBottomBinding);
     if (d->origVCenterBinding)
-        QDeclarativePropertyPrivate::setBinding(d->vCenterProp, d->origVCenterBinding);
+        QQmlPropertyPrivate::setBinding(d->vCenterProp, d->origVCenterBinding);
     if (d->origBaselineBinding)
-        QDeclarativePropertyPrivate::setBinding(d->baselineProp, d->origBaselineBinding);
+        QQmlPropertyPrivate::setBinding(d->baselineProp, d->origBaselineBinding);
 
     //restore any absolute geometry changed by the state's anchors
     QQuickAnchors::Anchors stateVAnchors = d->anchorSet->d_func()->usedAnchors & QQuickAnchors::Vertical_Mask;
@@ -1116,39 +1116,39 @@ void QQuickAnchorChanges::reverse(Reason reason)
         d->target->setY(d->origY);
 }
 
-QDeclarativeActionEvent::EventType QQuickAnchorChanges::type() const
+QQuickActionEvent::EventType QQuickAnchorChanges::type() const
 {
     return AnchorChanges;
 }
 
-QList<QDeclarativeAction> QQuickAnchorChanges::additionalActions()
+QList<QQuickAction> QQuickAnchorChanges::additionalActions()
 {
     Q_D(QQuickAnchorChanges);
-    QList<QDeclarativeAction> extra;
+    QList<QQuickAction> extra;
 
     QQuickAnchors::Anchors combined = d->anchorSet->d_func()->usedAnchors | d->anchorSet->d_func()->resetAnchors;
     bool hChange = combined & QQuickAnchors::Horizontal_Mask;
     bool vChange = combined & QQuickAnchors::Vertical_Mask;
 
     if (d->target) {
-        QDeclarativeAction a;
+        QQuickAction a;
         if (hChange && d->fromX != d->toX) {
-            a.property = QDeclarativeProperty(d->target, QLatin1String("x"));
+            a.property = QQmlProperty(d->target, QLatin1String("x"));
             a.toValue = d->toX;
             extra << a;
         }
         if (vChange && d->fromY != d->toY) {
-            a.property = QDeclarativeProperty(d->target, QLatin1String("y"));
+            a.property = QQmlProperty(d->target, QLatin1String("y"));
             a.toValue = d->toY;
             extra << a;
         }
         if (hChange && d->fromWidth != d->toWidth) {
-            a.property = QDeclarativeProperty(d->target, QLatin1String("width"));
+            a.property = QQmlProperty(d->target, QLatin1String("width"));
             a.toValue = d->toWidth;
             extra << a;
         }
         if (vChange && d->fromHeight != d->toHeight) {
-            a.property = QDeclarativeProperty(d->target, QLatin1String("height"));
+            a.property = QQmlProperty(d->target, QLatin1String("height"));
             a.toValue = d->toHeight;
             extra << a;
         }
@@ -1168,13 +1168,13 @@ void QQuickAnchorChanges::saveOriginals()
     if (!d->target)
         return;
 
-    d->origLeftBinding = QDeclarativePropertyPrivate::binding(d->leftProp);
-    d->origRightBinding = QDeclarativePropertyPrivate::binding(d->rightProp);
-    d->origHCenterBinding = QDeclarativePropertyPrivate::binding(d->hCenterProp);
-    d->origTopBinding = QDeclarativePropertyPrivate::binding(d->topProp);
-    d->origBottomBinding = QDeclarativePropertyPrivate::binding(d->bottomProp);
-    d->origVCenterBinding = QDeclarativePropertyPrivate::binding(d->vCenterProp);
-    d->origBaselineBinding = QDeclarativePropertyPrivate::binding(d->baselineProp);
+    d->origLeftBinding = QQmlPropertyPrivate::binding(d->leftProp);
+    d->origRightBinding = QQmlPropertyPrivate::binding(d->rightProp);
+    d->origHCenterBinding = QQmlPropertyPrivate::binding(d->hCenterProp);
+    d->origTopBinding = QQmlPropertyPrivate::binding(d->topProp);
+    d->origBottomBinding = QQmlPropertyPrivate::binding(d->bottomProp);
+    d->origVCenterBinding = QQmlPropertyPrivate::binding(d->vCenterProp);
+    d->origBaselineBinding = QQmlPropertyPrivate::binding(d->baselineProp);
 
     QQuickItemPrivate *targetPrivate = QQuickItemPrivate::get(d->target);
     if (targetPrivate->widthValid)
@@ -1190,7 +1190,7 @@ void QQuickAnchorChanges::saveOriginals()
     saveCurrentValues();
 }
 
-void QQuickAnchorChanges::copyOriginals(QDeclarativeActionEvent *other)
+void QQuickAnchorChanges::copyOriginals(QQuickActionEvent *other)
 {
     Q_D(QQuickAnchorChanges);
     QQuickAnchorChanges *ac = static_cast<QQuickAnchorChanges*>(other);
@@ -1248,39 +1248,39 @@ void QQuickAnchorChanges::clearBindings()
                                             d->anchorSet->d_func()->usedAnchors;
     if (d->applyOrigLeft || (combined & QQuickAnchors::LeftAnchor)) {
         targetPrivate->anchors()->resetLeft();
-        QDeclarativePropertyPrivate::setBinding(d->leftProp, 0);
+        QQmlPropertyPrivate::setBinding(d->leftProp, 0);
     }
     if (d->applyOrigRight || (combined & QQuickAnchors::RightAnchor)) {
         targetPrivate->anchors()->resetRight();
-        QDeclarativePropertyPrivate::setBinding(d->rightProp, 0);
+        QQmlPropertyPrivate::setBinding(d->rightProp, 0);
     }
     if (d->applyOrigHCenter || (combined & QQuickAnchors::HCenterAnchor)) {
         targetPrivate->anchors()->resetHorizontalCenter();
-        QDeclarativePropertyPrivate::setBinding(d->hCenterProp, 0);
+        QQmlPropertyPrivate::setBinding(d->hCenterProp, 0);
     }
     if (d->applyOrigTop || (combined & QQuickAnchors::TopAnchor)) {
         targetPrivate->anchors()->resetTop();
-        QDeclarativePropertyPrivate::setBinding(d->topProp, 0);
+        QQmlPropertyPrivate::setBinding(d->topProp, 0);
     }
     if (d->applyOrigBottom || (combined & QQuickAnchors::BottomAnchor)) {
         targetPrivate->anchors()->resetBottom();
-        QDeclarativePropertyPrivate::setBinding(d->bottomProp, 0);
+        QQmlPropertyPrivate::setBinding(d->bottomProp, 0);
     }
     if (d->applyOrigVCenter || (combined & QQuickAnchors::VCenterAnchor)) {
         targetPrivate->anchors()->resetVerticalCenter();
-        QDeclarativePropertyPrivate::setBinding(d->vCenterProp, 0);
+        QQmlPropertyPrivate::setBinding(d->vCenterProp, 0);
     }
     if (d->applyOrigBaseline || (combined & QQuickAnchors::BaselineAnchor)) {
         targetPrivate->anchors()->resetBaseline();
-        QDeclarativePropertyPrivate::setBinding(d->baselineProp, 0);
+        QQmlPropertyPrivate::setBinding(d->baselineProp, 0);
     }
 }
 
-bool QQuickAnchorChanges::override(QDeclarativeActionEvent*other)
+bool QQuickAnchorChanges::override(QQuickActionEvent*other)
 {
     if (other->type() != AnchorChanges)
         return false;
-    if (static_cast<QDeclarativeActionEvent*>(this) == other)
+    if (static_cast<QQuickActionEvent*>(this) == other)
         return true;
     if (static_cast<QQuickAnchorChanges*>(other)->object() == object())
         return true;
diff --git a/src/quick/items/qquickstateoperations_p.h b/src/quick/items/qquickstateoperations_p.h
index ff1671d53a..2523cc6d4f 100644
--- a/src/quick/items/qquickstateoperations_p.h
+++ b/src/quick/items/qquickstateoperations_p.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
@@ -45,28 +45,28 @@
 #include "qquickitem.h"
 #include "qquickanchors_p.h"
 
-#include <QtQuick/private/qdeclarativestate_p.h>
+#include <QtQuick/private/qquickstate_p.h>
 
-#include <QtDeclarative/qdeclarativescriptstring.h>
+#include <QtQml/qqmlscriptstring.h>
 
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
 class QQuickParentChangePrivate;
-class Q_AUTOTEST_EXPORT QQuickParentChange : public QDeclarativeStateOperation, public QDeclarativeActionEvent
+class Q_AUTOTEST_EXPORT QQuickParentChange : public QQuickStateOperation, public QQuickActionEvent
 {
     Q_OBJECT
     Q_DECLARE_PRIVATE(QQuickParentChange)
 
     Q_PROPERTY(QQuickItem *target READ object WRITE setObject)
     Q_PROPERTY(QQuickItem *parent READ parent WRITE setParent)
-    Q_PROPERTY(QDeclarativeScriptString x READ x WRITE setX)
-    Q_PROPERTY(QDeclarativeScriptString y READ y WRITE setY)
-    Q_PROPERTY(QDeclarativeScriptString width READ width WRITE setWidth)
-    Q_PROPERTY(QDeclarativeScriptString height READ height WRITE setHeight)
-    Q_PROPERTY(QDeclarativeScriptString scale READ scale WRITE setScale)
-    Q_PROPERTY(QDeclarativeScriptString rotation READ rotation WRITE setRotation)
+    Q_PROPERTY(QQmlScriptString x READ x WRITE setX)
+    Q_PROPERTY(QQmlScriptString y READ y WRITE setY)
+    Q_PROPERTY(QQmlScriptString width READ width WRITE setWidth)
+    Q_PROPERTY(QQmlScriptString height READ height WRITE setHeight)
+    Q_PROPERTY(QQmlScriptString scale READ scale WRITE setScale)
+    Q_PROPERTY(QQmlScriptString rotation READ rotation WRITE setRotation)
 public:
     QQuickParentChange(QObject *parent=0);
     ~QQuickParentChange();
@@ -79,39 +79,39 @@ public:
 
     QQuickItem *originalParent() const;
 
-    QDeclarativeScriptString x() const;
-    void setX(QDeclarativeScriptString x);
+    QQmlScriptString x() const;
+    void setX(QQmlScriptString x);
     bool xIsSet() const;
 
-    QDeclarativeScriptString y() const;
-    void setY(QDeclarativeScriptString y);
+    QQmlScriptString y() const;
+    void setY(QQmlScriptString y);
     bool yIsSet() const;
 
-    QDeclarativeScriptString width() const;
-    void setWidth(QDeclarativeScriptString width);
+    QQmlScriptString width() const;
+    void setWidth(QQmlScriptString width);
     bool widthIsSet() const;
 
-    QDeclarativeScriptString height() const;
-    void setHeight(QDeclarativeScriptString height);
+    QQmlScriptString height() const;
+    void setHeight(QQmlScriptString height);
     bool heightIsSet() const;
 
-    QDeclarativeScriptString scale() const;
-    void setScale(QDeclarativeScriptString scale);
+    QQmlScriptString scale() const;
+    void setScale(QQmlScriptString scale);
     bool scaleIsSet() const;
 
-    QDeclarativeScriptString rotation() const;
-    void setRotation(QDeclarativeScriptString rotation);
+    QQmlScriptString rotation() const;
+    void setRotation(QQmlScriptString rotation);
     bool rotationIsSet() const;
 
     virtual ActionList actions();
 
     virtual void saveOriginals();
-    //virtual void copyOriginals(QDeclarativeActionEvent*);
+    //virtual void copyOriginals(QQuickActionEvent*);
     virtual void execute(Reason reason = ActualChange);
     virtual bool isReversable();
     virtual void reverse(Reason reason = ActualChange);
     virtual EventType type() const;
-    virtual bool override(QDeclarativeActionEvent*other);
+    virtual bool override(QQuickActionEvent*other);
     virtual void rewind();
     virtual void saveCurrentValues();
 };
@@ -122,13 +122,13 @@ class Q_AUTOTEST_EXPORT QQuickAnchorSet : public QObject
 {
     Q_OBJECT
 
-    Q_PROPERTY(QDeclarativeScriptString left READ left WRITE setLeft RESET resetLeft)
-    Q_PROPERTY(QDeclarativeScriptString right READ right WRITE setRight RESET resetRight)
-    Q_PROPERTY(QDeclarativeScriptString horizontalCenter READ horizontalCenter WRITE setHorizontalCenter RESET resetHorizontalCenter)
-    Q_PROPERTY(QDeclarativeScriptString top READ top WRITE setTop RESET resetTop)
-    Q_PROPERTY(QDeclarativeScriptString bottom READ bottom WRITE setBottom RESET resetBottom)
-    Q_PROPERTY(QDeclarativeScriptString verticalCenter READ verticalCenter WRITE setVerticalCenter RESET resetVerticalCenter)
-    Q_PROPERTY(QDeclarativeScriptString baseline READ baseline WRITE setBaseline RESET resetBaseline)
+    Q_PROPERTY(QQmlScriptString left READ left WRITE setLeft RESET resetLeft)
+    Q_PROPERTY(QQmlScriptString right READ right WRITE setRight RESET resetRight)
+    Q_PROPERTY(QQmlScriptString horizontalCenter READ horizontalCenter WRITE setHorizontalCenter RESET resetHorizontalCenter)
+    Q_PROPERTY(QQmlScriptString top READ top WRITE setTop RESET resetTop)
+    Q_PROPERTY(QQmlScriptString bottom READ bottom WRITE setBottom RESET resetBottom)
+    Q_PROPERTY(QQmlScriptString verticalCenter READ verticalCenter WRITE setVerticalCenter RESET resetVerticalCenter)
+    Q_PROPERTY(QQmlScriptString baseline READ baseline WRITE setBaseline RESET resetBaseline)
     //Q_PROPERTY(QQuickItem *fill READ fill WRITE setFill RESET resetFill)
     //Q_PROPERTY(QQuickItem *centerIn READ centerIn WRITE setCenterIn RESET resetCenterIn)
 
@@ -145,32 +145,32 @@ public:
     QQuickAnchorSet(QObject *parent=0);
     virtual ~QQuickAnchorSet();
 
-    QDeclarativeScriptString left() const;
-    void setLeft(const QDeclarativeScriptString &edge);
+    QQmlScriptString left() const;
+    void setLeft(const QQmlScriptString &edge);
     void resetLeft();
 
-    QDeclarativeScriptString right() const;
-    void setRight(const QDeclarativeScriptString &edge);
+    QQmlScriptString right() const;
+    void setRight(const QQmlScriptString &edge);
     void resetRight();
 
-    QDeclarativeScriptString horizontalCenter() const;
-    void setHorizontalCenter(const QDeclarativeScriptString &edge);
+    QQmlScriptString horizontalCenter() const;
+    void setHorizontalCenter(const QQmlScriptString &edge);
     void resetHorizontalCenter();
 
-    QDeclarativeScriptString top() const;
-    void setTop(const QDeclarativeScriptString &edge);
+    QQmlScriptString top() const;
+    void setTop(const QQmlScriptString &edge);
     void resetTop();
 
-    QDeclarativeScriptString bottom() const;
-    void setBottom(const QDeclarativeScriptString &edge);
+    QQmlScriptString bottom() const;
+    void setBottom(const QQmlScriptString &edge);
     void resetBottom();
 
-    QDeclarativeScriptString verticalCenter() const;
-    void setVerticalCenter(const QDeclarativeScriptString &edge);
+    QQmlScriptString verticalCenter() const;
+    void setVerticalCenter(const QQmlScriptString &edge);
     void resetVerticalCenter();
 
-    QDeclarativeScriptString baseline() const;
-    void setBaseline(const QDeclarativeScriptString &edge);
+    QQmlScriptString baseline() const;
+    void setBaseline(const QQmlScriptString &edge);
     void resetBaseline();
 
     QQuickItem *fill() const;
@@ -224,7 +224,7 @@ private:
 };
 
 class QQuickAnchorChangesPrivate;
-class Q_AUTOTEST_EXPORT QQuickAnchorChanges : public QDeclarativeStateOperation, public QDeclarativeActionEvent
+class Q_AUTOTEST_EXPORT QQuickAnchorChanges : public QQuickStateOperation, public QQuickActionEvent
 {
     Q_OBJECT
     Q_DECLARE_PRIVATE(QQuickAnchorChanges)
@@ -247,16 +247,16 @@ public:
     virtual bool isReversable();
     virtual void reverse(Reason reason = ActualChange);
     virtual EventType type() const;
-    virtual bool override(QDeclarativeActionEvent*other);
+    virtual bool override(QQuickActionEvent*other);
     virtual bool changesBindings();
     virtual void saveOriginals();
     virtual bool needsCopy() { return true; }
-    virtual void copyOriginals(QDeclarativeActionEvent*);
+    virtual void copyOriginals(QQuickActionEvent*);
     virtual void clearBindings();
     virtual void rewind();
     virtual void saveCurrentValues();
 
-    QList<QDeclarativeAction> additionalActions();
+    QList<QQuickAction> additionalActions();
     virtual void saveTargetValues();
 };
 
diff --git a/src/quick/items/qquicktext.cpp b/src/quick/items/qquicktext.cpp
index 6f8aa383cd..7aa4276f8d 100644
--- a/src/quick/items/qquicktext.cpp
+++ b/src/quick/items/qquicktext.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
@@ -43,12 +43,13 @@
 #include "qquicktext_p_p.h"
 
 #include <QtQuick/private/qsgcontext_p.h>
+#include <private/qqmlglobal_p.h>
 #include <private/qsgadaptationlayer_p.h>
 #include "qquicktextnode_p.h"
 #include "qquickimage_p_p.h"
 #include <QtQuick/private/qsgtexture_p.h>
 
-#include <QtDeclarative/qdeclarativeinfo.h>
+#include <QtQml/qqmlinfo.h>
 #include <QtGui/qevent.h>
 #include <QtGui/qabstracttextdocumentlayout.h>
 #include <QtGui/qpainter.h>
@@ -59,8 +60,8 @@
 #include <QtGui/qinputmethod.h>
 
 #include <private/qtextengine_p.h>
-#include <private/qdeclarativestyledtext_p.h>
-#include <QtQuick/private/qdeclarativepixmapcache_p.h>
+#include <private/qquickstyledtext_p.h>
+#include <QtQuick/private/qquickpixmapcache_p.h>
 
 #include <qmath.h>
 #include <limits.h>
@@ -111,11 +112,11 @@ QQuickTextDocumentWithImageResources::~QQuickTextDocumentWithImageResources()
 
 QVariant QQuickTextDocumentWithImageResources::loadResource(int type, const QUrl &name)
 {
-    QDeclarativeContext *context = qmlContext(parent());
+    QQmlContext *context = qmlContext(parent());
     QUrl url = m_baseUrl.resolved(name);
 
     if (type == QTextDocument::ImageResource) {
-        QDeclarativePixmap *p = loadPixmap(context, url);
+        QQuickPixmap *p = loadPixmap(context, url);
         return p->image();
     }
 
@@ -152,10 +153,10 @@ QSizeF QQuickTextDocumentWithImageResources::intrinsicSize(
 
         QSizeF size(width, height);
         if (!hasWidth || !hasHeight) {
-            QDeclarativeContext *context = qmlContext(parent());
+            QQmlContext *context = qmlContext(parent());
             QUrl url = m_baseUrl.resolved(QUrl(imageFormat.name()));
 
-            QDeclarativePixmap *p = loadPixmap(context, url);
+            QQuickPixmap *p = loadPixmap(context, url);
             if (!p->isReady()) {
                 if (!hasWidth)
                     size.setWidth(16);
@@ -190,10 +191,10 @@ void QQuickTextDocumentWithImageResources::drawObject(
 
 QImage QQuickTextDocumentWithImageResources::image(const QTextImageFormat &format)
 {
-    QDeclarativeContext *context = qmlContext(parent());
+    QQmlContext *context = qmlContext(parent());
     QUrl url = m_baseUrl.resolved(QUrl(format.name()));
 
-    QDeclarativePixmap *p = loadPixmap(context, url);
+    QQuickPixmap *p = loadPixmap(context, url);
     return p->image();
 }
 
@@ -206,14 +207,14 @@ void QQuickTextDocumentWithImageResources::setBaseUrl(const QUrl &url, bool clea
     }
 }
 
-QDeclarativePixmap *QQuickTextDocumentWithImageResources::loadPixmap(
-        QDeclarativeContext *context, const QUrl &url)
+QQuickPixmap *QQuickTextDocumentWithImageResources::loadPixmap(
+        QQmlContext *context, const QUrl &url)
 {
 
-    QHash<QUrl, QDeclarativePixmap *>::Iterator iter = m_resources.find(url);
+    QHash<QUrl, QQuickPixmap *>::Iterator iter = m_resources.find(url);
 
     if (iter == m_resources.end()) {
-        QDeclarativePixmap *p = new QDeclarativePixmap(context->engine(), url);
+        QQuickPixmap *p = new QQuickPixmap(context->engine(), url);
         iter = m_resources.insert(url, p);
 
         if (p->isLoading()) {
@@ -222,7 +223,7 @@ QDeclarativePixmap *QQuickTextDocumentWithImageResources::loadPixmap(
         }
     }
 
-    QDeclarativePixmap *p = *iter;
+    QQuickPixmap *p = *iter;
     if (p->isError()) {
         if (!errors.contains(url)) {
             errors.insert(url);
@@ -234,7 +235,7 @@ QDeclarativePixmap *QQuickTextDocumentWithImageResources::loadPixmap(
 
 void QQuickTextDocumentWithImageResources::clearResources()
 {
-    foreach (QDeclarativePixmap *pixmap, m_resources)
+    foreach (QQuickPixmap *pixmap, m_resources)
         pixmap->clear(this);
     qDeleteAll(m_resources);
     m_resources.clear();
@@ -298,7 +299,7 @@ void QQuickTextPrivate::updateLayout()
     if (!richText) {
         if (textHasChanged) {
             if (styledText && !text.isEmpty()) {
-                QDeclarativeStyledText::parse(text, layout, imgTags, q->baseUrl(), qmlContext(q), !maximumLineCountValid);
+                QQuickStyledText::parse(text, layout, imgTags, q->baseUrl(), qmlContext(q), !maximumLineCountValid);
             } else {
                 layout.clearAdditionalFormats();
                 multilengthEos = text.indexOf(QLatin1Char('\x9c'));
@@ -341,7 +342,7 @@ void QQuickText::imageDownloadFinished()
 
     if (d->nbActiveDownloads == 0) {
         bool needToUpdateLayout = false;
-        foreach (QDeclarativeStyledTextImgTag *img, d->visibleImgTags) {
+        foreach (QQuickStyledTextImgTag *img, d->visibleImgTags) {
             if (!img->size.isValid()) {
                 img->size = img->pix->implicitSize();
                 needToUpdateLayout = true;
@@ -945,15 +946,15 @@ void QQuickTextPrivate::setLineGeometry(QTextLine &line, qreal lineWidth, qreal
     qreal textHeight = line.height();
     qreal totalLineHeight = textHeight;
 
-    QList<QDeclarativeStyledTextImgTag *> imagesInLine;
+    QList<QQuickStyledTextImgTag *> imagesInLine;
 
-    foreach (QDeclarativeStyledTextImgTag *image, imgTags) {
+    foreach (QQuickStyledTextImgTag *image, imgTags) {
         if (image->position >= line.textStart() &&
             image->position < line.textStart() + line.textLength()) {
 
             if (!image->pix) {
                 QUrl url = q->baseUrl().resolved(image->url);
-                image->pix = new QDeclarativePixmap(qmlEngine(q), url, image->size);
+                image->pix = new QQuickPixmap(qmlEngine(q), url, image->size);
                 if (image->pix->isLoading()) {
                     image->pix->connectFinished(q, SLOT(imageDownloadFinished()));
                     nbActiveDownloads++;
@@ -970,9 +971,9 @@ void QQuickTextPrivate::setLineGeometry(QTextLine &line, qreal lineWidth, qreal
             }
 
             qreal ih = qreal(image->size.height());
-            if (image->align == QDeclarativeStyledTextImgTag::Top)
+            if (image->align == QQuickStyledTextImgTag::Top)
                 image->pos.setY(0);
-            else if (image->align == QDeclarativeStyledTextImgTag::Middle)
+            else if (image->align == QQuickStyledTextImgTag::Middle)
                 image->pos.setY((textHeight / 2.0) - (ih / 2.0));
             else
                 image->pos.setY(textHeight - ih);
@@ -981,7 +982,7 @@ void QQuickTextPrivate::setLineGeometry(QTextLine &line, qreal lineWidth, qreal
         }
     }
 
-    foreach (QDeclarativeStyledTextImgTag *image, imagesInLine) {
+    foreach (QQuickStyledTextImgTag *image, imagesInLine) {
         totalLineHeight = qMax(totalLineHeight, textTop + image->pos.y() + image->size.height());
         image->pos.setX(line.cursorToX(image->position));
         image->pos.setY(image->pos.y() + height + textTop);
@@ -1117,7 +1118,7 @@ QQuickText::~QQuickText()
     The link must be in rich text or HTML format and the
     \a link string provides access to the particular link.
 
-    \snippet doc/src/snippets/declarative/text/onLinkActivated.qml 0
+    \snippet doc/src/snippets/qml/text/onLinkActivated.qml 0
 
     The example code will display the text
     "The main website is at \l{http://qt.nokia.com}{Nokia Qt DF}."
@@ -1841,7 +1842,7 @@ QUrl QQuickText::baseUrl() const
 {
     Q_D(const QQuickText);
     if (d->baseUrl.isEmpty()) {
-        if (QDeclarativeContext *context = qmlContext(this))
+        if (QQmlContext *context = qmlContext(this))
             const_cast<QQuickTextPrivate *>(d)->baseUrl = context->baseUrl();
     }
     return d->baseUrl;
@@ -1867,7 +1868,7 @@ void QQuickText::setBaseUrl(const QUrl &url)
 
 void QQuickText::resetBaseUrl()
 {
-    if (QDeclarativeContext *context = qmlContext(this))
+    if (QQmlContext *context = qmlContext(this))
         setBaseUrl(context->baseUrl());
     else
         setBaseUrl(QUrl());
@@ -2008,8 +2009,8 @@ QSGNode *QQuickText::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *data
             node->addTextLayout(QPoint(0, bounds.y()), d->elideLayout, color, d->style, styleColor, linkColor);
     }
 
-    foreach (QDeclarativeStyledTextImgTag *img, d->visibleImgTags) {
-        QDeclarativePixmap *pix = img->pix;
+    foreach (QQuickStyledTextImgTag *img, d->visibleImgTags) {
+        QQuickPixmap *pix = img->pix;
         if (pix && pix->isReady())
             node->addImage(QRectF(img->pos.x(), img->pos.y() + bounds.y(), pix->width(), pix->height()), pix->image());
     }
diff --git a/src/quick/items/qquicktext_p.h b/src/quick/items/qquicktext_p.h
index 37287b5445..d73c6e1a10 100644
--- a/src/quick/items/qquicktext_p.h
+++ b/src/quick/items/qquicktext_p.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
diff --git a/src/quick/items/qquicktext_p_p.h b/src/quick/items/qquicktext_p_p.h
index 555f41ff94..0f8c93a9e3 100644
--- a/src/quick/items/qquicktext_p_p.h
+++ b/src/quick/items/qquicktext_p_p.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
@@ -56,10 +56,10 @@
 #include "qquicktext_p.h"
 #include "qquickimplicitsizeitem_p_p.h"
 
-#include <QtDeclarative/qdeclarative.h>
+#include <QtQml/qqml.h>
 #include <QtGui/qabstracttextdocumentlayout.h>
 #include <QtGui/qtextlayout.h>
-#include <private/qdeclarativestyledtext_p.h>
+#include <private/qquickstyledtext_p.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -93,8 +93,8 @@ public:
     QUrl baseUrl;
     QFont font;
     QFont sourceFont;
-    QList<QDeclarativeStyledTextImgTag*> imgTags;
-    QList<QDeclarativeStyledTextImgTag*> visibleImgTags;
+    QList<QQuickStyledTextImgTag*> imgTags;
+    QList<QQuickStyledTextImgTag*> visibleImgTags;
 
     QTextLayout layout;
     QTextLayout *elideLayout;
@@ -165,7 +165,7 @@ public:
     }
 };
 
-class QDeclarativePixmap;
+class QQuickPixmap;
 class QQuickTextDocumentWithImageResources : public QTextDocument, public QTextObjectInterface
 {
     Q_OBJECT
@@ -194,13 +194,13 @@ Q_SIGNALS:
 protected:
     QVariant loadResource(int type, const QUrl &name);
 
-    QDeclarativePixmap *loadPixmap(QDeclarativeContext *context, const QUrl &name);
+    QQuickPixmap *loadPixmap(QQmlContext *context, const QUrl &name);
 
 private slots:
     void requestFinished();
 
 private:
-    QHash<QUrl, QDeclarativePixmap *> m_resources;
+    QHash<QUrl, QQuickPixmap *> m_resources;
     QUrl m_baseUrl;
 
     int outstanding;
diff --git a/src/quick/items/qquicktextedit.cpp b/src/quick/items/qquicktextedit.cpp
index 6f3c32db7d..6eed95767b 100644
--- a/src/quick/items/qquicktextedit.cpp
+++ b/src/quick/items/qquicktextedit.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
@@ -48,15 +48,15 @@
 #include "qquicktextnode_p.h"
 #include <QtQuick/qsgsimplerectnode.h>
 
-#include <QtDeclarative/qdeclarativeinfo.h>
+#include <QtQml/qqmlinfo.h>
 #include <QtGui/qguiapplication.h>
 #include <QtGui/qevent.h>
 #include <QtGui/qpainter.h>
 #include <QtGui/qtextobject.h>
 #include <QtCore/qmath.h>
 
-#include <private/qdeclarativeglobal_p.h>
-#include <private/qdeclarativeproperty_p.h>
+#include <private/qqmlglobal_p.h>
+#include <private/qqmlproperty_p.h>
 #include <private/qtextengine_p.h>
 #include <private/qsgadaptationlayer_p.h>
 
@@ -692,7 +692,7 @@ QUrl QQuickTextEdit::baseUrl() const
 {
     Q_D(const QQuickTextEdit);
     if (d->baseUrl.isEmpty()) {
-        if (QDeclarativeContext *context = qmlContext(this))
+        if (QQmlContext *context = qmlContext(this))
             const_cast<QQuickTextEditPrivate *>(d)->baseUrl = context->baseUrl();
     }
     return d->baseUrl;
@@ -711,7 +711,7 @@ void QQuickTextEdit::setBaseUrl(const QUrl &url)
 
 void QQuickTextEdit::resetBaseUrl()
 {
-    if (QDeclarativeContext *context = qmlContext(this))
+    if (QQmlContext *context = qmlContext(this))
         setBaseUrl(context->baseUrl());
     else
         setBaseUrl(QUrl());
@@ -919,16 +919,16 @@ void QQuickTextEdit::setCursorPosition(int pos)
     needed, and the x and y properties of delegate instance will be set so as
     to be one pixel before the top left of the current character.
 
-    Note that the root item of the delegate component must be a QDeclarativeItem or
-    QDeclarativeItem derived item.
+    Note that the root item of the delegate component must be a QQuickItem or
+    QQuickItem derived item.
 */
-QDeclarativeComponent* QQuickTextEdit::cursorDelegate() const
+QQmlComponent* QQuickTextEdit::cursorDelegate() const
 {
     Q_D(const QQuickTextEdit);
     return d->cursorComponent;
 }
 
-void QQuickTextEdit::setCursorDelegate(QDeclarativeComponent* c)
+void QQuickTextEdit::setCursorDelegate(QQmlComponent* c)
 {
     Q_D(QQuickTextEdit);
     if (d->cursorComponent) {
@@ -956,13 +956,13 @@ void QQuickTextEdit::loadCursorDelegate()
     Q_D(QQuickTextEdit);
     if (d->cursorComponent->isLoading() || !isComponentComplete())
         return;
-    QDeclarativeContext *creationContext = d->cursorComponent->creationContext();
+    QQmlContext *creationContext = d->cursorComponent->creationContext();
     QObject *object = d->cursorComponent->create(creationContext ? creationContext : qmlContext(this));
     d->cursor = qobject_cast<QQuickItem*>(object);
     if (d->cursor) {
         d->control->setCursorWidth(0);
         updateCursor();
-        QDeclarative_setParent_noEvent(d->cursor, this);
+        QQml_setParent_noEvent(d->cursor, this);
         d->cursor->setParentItem(this);
         d->cursor->setHeight(QFontMetrics(d->font).height());
         moveCursorDelegate();
diff --git a/src/quick/items/qquicktextedit_p.h b/src/quick/items/qquicktextedit_p.h
index 5f6317ab09..4dcb7f48d6 100644
--- a/src/quick/items/qquicktextedit_p.h
+++ b/src/quick/items/qquicktextedit_p.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
@@ -80,7 +80,7 @@ class Q_AUTOTEST_EXPORT QQuickTextEdit : public QQuickImplicitSizeItem
     Q_PROPERTY(bool cursorVisible READ isCursorVisible WRITE setCursorVisible NOTIFY cursorVisibleChanged)
     Q_PROPERTY(int cursorPosition READ cursorPosition WRITE setCursorPosition NOTIFY cursorPositionChanged)
     Q_PROPERTY(QRect cursorRectangle READ cursorRectangle NOTIFY cursorRectangleChanged)
-    Q_PROPERTY(QDeclarativeComponent* cursorDelegate READ cursorDelegate WRITE setCursorDelegate NOTIFY cursorDelegateChanged)
+    Q_PROPERTY(QQmlComponent* cursorDelegate READ cursorDelegate WRITE setCursorDelegate NOTIFY cursorDelegateChanged)
     Q_PROPERTY(int selectionStart READ selectionStart NOTIFY selectionStartChanged)
     Q_PROPERTY(int selectionEnd READ selectionEnd NOTIFY selectionEndChanged)
     Q_PROPERTY(QString selectedText READ selectedText NOTIFY selectionChanged)
@@ -172,8 +172,8 @@ public:
     int cursorPosition() const;
     void setCursorPosition(int pos);
 
-    QDeclarativeComponent* cursorDelegate() const;
-    void setCursorDelegate(QDeclarativeComponent*);
+    QQmlComponent* cursorDelegate() const;
+    void setCursorDelegate(QQmlComponent*);
 
     int selectionStart() const;
     int selectionEnd() const;
diff --git a/src/quick/items/qquicktextedit_p_p.h b/src/quick/items/qquicktextedit_p_p.h
index d69e24f6bc..3004d5b833 100644
--- a/src/quick/items/qquicktextedit_p_p.h
+++ b/src/quick/items/qquicktextedit_p_p.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
@@ -56,7 +56,7 @@
 #include "qquicktextedit_p.h"
 #include "qquickimplicitsizeitem_p_p.h"
 
-#include <QtDeclarative/qdeclarative.h>
+#include <QtQml/qqml.h>
 
 QT_BEGIN_NAMESPACE
 class QTextLayout;
@@ -121,7 +121,7 @@ public:
     qreal textMargin;
     int lastSelectionStart;
     int lastSelectionEnd;
-    QDeclarativeComponent* cursorComponent;
+    QQmlComponent* cursorComponent;
     QQuickItem* cursor;
     QQuickTextEdit::TextFormat format;
     QQuickTextDocumentWithImageResources *document;
diff --git a/src/quick/items/qquicktextinput.cpp b/src/quick/items/qquicktextinput.cpp
index 9b11e2e43a..ab5afa334d 100644
--- a/src/quick/items/qquicktextinput.cpp
+++ b/src/quick/items/qquicktextinput.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
@@ -43,9 +43,9 @@
 #include "qquicktextinput_p_p.h"
 #include "qquickcanvas.h"
 
-#include <private/qdeclarativeglobal_p.h>
+#include <private/qqmlglobal_p.h>
 
-#include <QtDeclarative/qdeclarativeinfo.h>
+#include <QtQml/qqmlinfo.h>
 #include <QtGui/qevent.h>
 #include <QTextBoundaryFinder>
 #include "qquicktextnode_p.h"
@@ -1215,16 +1215,16 @@ void QQuickTextInput::setInputMethodHints(Qt::InputMethodHints hints)
     needed, and the x property of delegate instance will be set so as
     to be one pixel before the top left of the current character.
 
-    Note that the root item of the delegate component must be a QDeclarativeItem or
-    QDeclarativeItem derived item.
+    Note that the root item of the delegate component must be a QQuickItem or
+    QQuickItem derived item.
 */
-QDeclarativeComponent* QQuickTextInput::cursorDelegate() const
+QQmlComponent* QQuickTextInput::cursorDelegate() const
 {
     Q_D(const QQuickTextInput);
     return d->cursorComponent;
 }
 
-void QQuickTextInput::setCursorDelegate(QDeclarativeComponent* c)
+void QQuickTextInput::setCursorDelegate(QQmlComponent* c)
 {
     Q_D(QQuickTextInput);
     if (d->cursorComponent == c)
@@ -1271,7 +1271,7 @@ void QQuickTextInput::createCursor()
 
     if (d->cursorItem)
         delete d->cursorItem;
-    QDeclarativeContext *creationContext = d->cursorComponent->creationContext();
+    QQmlContext *creationContext = d->cursorComponent->creationContext();
     QObject *object = d->cursorComponent->create(creationContext ? creationContext : qmlContext(this));
     d->cursorItem = qobject_cast<QQuickItem*>(object);
     if (!d->cursorItem) {
@@ -1282,7 +1282,7 @@ void QQuickTextInput::createCursor()
 
     QRectF r = cursorRectangle();
 
-    QDeclarative_setParent_noEvent(d->cursorItem, this);
+    QQml_setParent_noEvent(d->cursorItem, this);
     d->cursorItem->setParentItem(this);
     d->cursorItem->setPos(r.topLeft());
     d->cursorItem->setHeight(r.height());
@@ -1332,7 +1332,7 @@ QRectF QQuickTextInput::positionToRectangle(int pos) const
     \endlist
 */
 
-void QQuickTextInput::positionAt(QDeclarativeV8Function *args) const
+void QQuickTextInput::positionAt(QQmlV8Function *args) const
 {
     Q_D(const QQuickTextInput);
 
diff --git a/src/quick/items/qquicktextinput_p.h b/src/quick/items/qquicktextinput_p.h
index 0e60cf6ce4..8961dbc3e1 100644
--- a/src/quick/items/qquicktextinput_p.h
+++ b/src/quick/items/qquicktextinput_p.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
@@ -77,7 +77,7 @@ class Q_AUTOTEST_EXPORT QQuickTextInput : public QQuickImplicitSizeItem
     Q_PROPERTY(bool cursorVisible READ isCursorVisible WRITE setCursorVisible NOTIFY cursorVisibleChanged)
     Q_PROPERTY(int cursorPosition READ cursorPosition WRITE setCursorPosition NOTIFY cursorPositionChanged)
     Q_PROPERTY(QRect cursorRectangle READ cursorRectangle NOTIFY cursorRectangleChanged)
-    Q_PROPERTY(QDeclarativeComponent *cursorDelegate READ cursorDelegate WRITE setCursorDelegate NOTIFY cursorDelegateChanged)
+    Q_PROPERTY(QQmlComponent *cursorDelegate READ cursorDelegate WRITE setCursorDelegate NOTIFY cursorDelegateChanged)
     Q_PROPERTY(int selectionStart READ selectionStart NOTIFY selectionStartChanged)
     Q_PROPERTY(int selectionEnd READ selectionEnd NOTIFY selectionEndChanged)
     Q_PROPERTY(QString selectedText READ selectedText NOTIFY selectedTextChanged)
@@ -150,7 +150,7 @@ public:
 
 
     //Auxilliary functions needed to control the TextInput from QML
-    Q_INVOKABLE void positionAt(QDeclarativeV8Function *args) const;
+    Q_INVOKABLE void positionAt(QQmlV8Function *args) const;
     Q_INVOKABLE QRectF positionToRectangle(int pos) const;
     Q_INVOKABLE void moveCursorSelection(int pos);
     Q_INVOKABLE void moveCursorSelection(int pos, SelectionMode mode);
@@ -220,8 +220,8 @@ public:
 
     QString displayText() const;
 
-    QDeclarativeComponent* cursorDelegate() const;
-    void setCursorDelegate(QDeclarativeComponent*);
+    QQmlComponent* cursorDelegate() const;
+    void setCursorDelegate(QQmlComponent*);
 
     bool focusOnPress() const;
     void setFocusOnPress(bool);
diff --git a/src/quick/items/qquicktextinput_p_p.h b/src/quick/items/qquicktextinput_p_p.h
index e48b000e5c..2575694888 100644
--- a/src/quick/items/qquicktextinput_p_p.h
+++ b/src/quick/items/qquicktextinput_p_p.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
@@ -46,7 +46,7 @@
 #include "qquicktext_p.h"
 #include "qquickimplicitsizeitem_p_p.h"
 
-#include <QtDeclarative/qdeclarative.h>
+#include <QtQml/qqml.h>
 #include <QtCore/qelapsedtimer.h>
 #include <QtCore/qpointer.h>
 #include <QtCore/qbasictimer.h>
@@ -174,9 +174,9 @@ public:
     QPointF pressPos;
     QPointF tripleClickStartPoint;
 
-    QDeclarativeGuard<QDeclarativeComponent> cursorComponent;
+    QQmlGuard<QQmlComponent> cursorComponent;
 #ifndef QT_NO_VALIDATOR
-    QDeclarativeGuard<QValidator> m_validator;
+    QQmlGuard<QValidator> m_validator;
 #endif
 
     QTextLayout m_textLayout;
diff --git a/src/quick/items/qquicktextnode.cpp b/src/quick/items/qquicktextnode.cpp
index a3daead6cb..5be4963809 100644
--- a/src/quick/items/qquicktextnode.cpp
+++ b/src/quick/items/qquicktextnode.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
@@ -55,7 +55,7 @@
 #include <qrawfont.h>
 #include <qtexttable.h>
 #include <qtextlist.h>
-#include <private/qdeclarativestyledtext_p.h>
+#include <private/qquickstyledtext_p.h>
 #include <private/qquicktext_p_p.h>
 #include <private/qfont_p.h>
 #include <private/qfontengine_p.h>
diff --git a/src/quick/items/qquicktextnode_p.h b/src/quick/items/qquicktextnode_p.h
index 9c2217bfd0..2ecd20d933 100644
--- a/src/quick/items/qquicktextnode_p.h
+++ b/src/quick/items/qquicktextnode_p.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
diff --git a/src/quick/items/qquicktranslate.cpp b/src/quick/items/qquicktranslate.cpp
index a1a1f59173..6cfa7a0338 100644
--- a/src/quick/items/qquicktranslate.cpp
+++ b/src/quick/items/qquicktranslate.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
diff --git a/src/quick/items/qquicktranslate_p.h b/src/quick/items/qquicktranslate_p.h
index 82901d7c6a..d2d8c3abc5 100644
--- a/src/quick/items/qquicktranslate_p.h
+++ b/src/quick/items/qquicktranslate_p.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
diff --git a/src/quick/items/qquickview.cpp b/src/quick/items/qquickview.cpp
index 76d82a4713..7d1411aa6e 100644
--- a/src/quick/items/qquickview.cpp
+++ b/src/quick/items/qquickview.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
@@ -46,11 +46,11 @@
 #include "qquickitem_p.h"
 #include "qquickitemchangelistener_p.h"
 
-#include <private/qdeclarativeprofilerservice_p.h>
-#include <private/qdeclarativeinspectorservice_p.h>
+#include <private/qqmlprofilerservice_p.h>
+#include <private/qqmlinspectorservice_p.h>
 
-#include <QtDeclarative/qdeclarativeengine.h>
-#include <private/qdeclarativeengine_p.h>
+#include <QtQml/qqmlengine.h>
+#include <private/qqmlengine_p.h>
 #include <QtCore/qbasictimer.h>
 
 
@@ -62,8 +62,8 @@ void QQuickViewPrivate::init()
 
     engine.setIncubationController(q->incubationController());
 
-    if (QDeclarativeDebugService::isDebuggingEnabled())
-        QDeclarativeInspectorService::instance()->addView(q);
+    if (QQmlDebugService::isDebuggingEnabled())
+        QQmlInspectorService::instance()->addView(q);
 }
 
 QQuickViewPrivate::QQuickViewPrivate()
@@ -73,8 +73,8 @@ QQuickViewPrivate::QQuickViewPrivate()
 
 QQuickViewPrivate::~QQuickViewPrivate()
 {
-    if (QDeclarativeDebugService::isDebuggingEnabled())
-        QDeclarativeInspectorService::instance()->removeView(q_func());
+    if (QQmlDebugService::isDebuggingEnabled())
+        QQmlInspectorService::instance()->removeView(q_func());
 
     delete root;
 }
@@ -91,11 +91,11 @@ void QQuickViewPrivate::execute()
         component = 0;
     }
     if (!source.isEmpty()) {
-        component = new QDeclarativeComponent(&engine, source, q);
+        component = new QQmlComponent(&engine, source, q);
         if (!component->isLoading()) {
             q->continueExecute();
         } else {
-            QObject::connect(component, SIGNAL(statusChanged(QDeclarativeComponent::Status)),
+            QObject::connect(component, SIGNAL(statusChanged(QQmlComponent::Status)),
                              q, SLOT(continueExecute()));
         }
     }
@@ -120,7 +120,7 @@ void QQuickViewPrivate::itemGeometryChanged(QQuickItem *resizeItem, const QRectF
 
     This is a convenience subclass of QQuickCanvas which
     will automatically load and display a QML scene when given the URL of the main source file. Alternatively,
-    you can instantiate your own objects using QDeclarativeComponent and place them in a manually setup QQuickCanvas.
+    you can instantiate your own objects using QQmlComponent and place them in a manually setup QQuickCanvas.
 
     Typical usage:
 
@@ -216,23 +216,23 @@ QUrl QQuickView::source() const
 }
 
 /*!
-  Returns a pointer to the QDeclarativeEngine used for instantiating
+  Returns a pointer to the QQmlEngine used for instantiating
   QML Components.
  */
-QDeclarativeEngine* QQuickView::engine() const
+QQmlEngine* QQuickView::engine() const
 {
     Q_D(const QQuickView);
-    return const_cast<QDeclarativeEngine *>(&d->engine);
+    return const_cast<QQmlEngine *>(&d->engine);
 }
 
 /*!
   This function returns the root of the context hierarchy.  Each QML
-  component is instantiated in a QDeclarativeContext.  QDeclarativeContext's are
+  component is instantiated in a QQmlContext.  QQmlContext's are
   essential for passing data to QML components.  In QML, contexts are
   arranged hierarchically and this hierarchy is managed by the
-  QDeclarativeEngine.
+  QQmlEngine.
  */
-QDeclarativeContext* QQuickView::rootContext() const
+QQmlContext* QQuickView::rootContext() const
 {
     Q_D(const QQuickView);
     return d->engine.rootContext();
@@ -275,12 +275,12 @@ QQuickView::Status QQuickView::status() const
     Return the list of errors that occurred during the last compile or create
     operation.  When the status is not Error, an empty list is returned.
 */
-QList<QDeclarativeError> QQuickView::errors() const
+QList<QQmlError> QQuickView::errors() const
 {
     Q_D(const QQuickView);
     if (d->component)
         return d->component->errors();
-    return QList<QDeclarativeError>();
+    return QList<QQmlError>();
 }
 
 /*!
@@ -377,11 +377,11 @@ QQuickView::ResizeMode QQuickView::resizeMode() const
 void QQuickView::continueExecute()
 {
     Q_D(QQuickView);
-    disconnect(d->component, SIGNAL(statusChanged(QDeclarativeComponent::Status)), this, SLOT(continueExecute()));
+    disconnect(d->component, SIGNAL(statusChanged(QQmlComponent::Status)), this, SLOT(continueExecute()));
 
     if (d->component->isError()) {
-        QList<QDeclarativeError> errorList = d->component->errors();
-        foreach (const QDeclarativeError &error, errorList) {
+        QList<QQmlError> errorList = d->component->errors();
+        foreach (const QQmlError &error, errorList) {
             qWarning() << error;
         }
         emit statusChanged(status());
@@ -391,8 +391,8 @@ void QQuickView::continueExecute()
     QObject *obj = d->component->create();
 
     if (d->component->isError()) {
-        QList<QDeclarativeError> errorList = d->component->errors();
-        foreach (const QDeclarativeError &error, errorList) {
+        QList<QQmlError> errorList = d->component->errors();
+        foreach (const QQmlError &error, errorList) {
             qWarning() << error;
         }
         emit statusChanged(status());
@@ -422,7 +422,7 @@ void QQuickViewPrivate::setRootObject(QObject *obj)
                    << "loaded has 'import QtQuick 1.0' or 'import Qt 4.7', this error will occur." << endl
                    << endl
                    << "To load files with 'import QtQuick 1.0' or 'import Qt 4.7', use the" << endl
-                   << "QDeclarativeView class in the qtquick1 module." << endl;
+                   << "QQuickView class in the qtquick1 module." << endl;
         delete obj;
         root = 0;
     }
@@ -499,35 +499,35 @@ void QQuickView::resizeEvent(QResizeEvent *e)
 
 void QQuickView::keyPressEvent(QKeyEvent *e)
 {
-    QDeclarativeProfilerService::addEvent(QDeclarativeProfilerService::Key);
+    QQmlProfilerService::addEvent(QQmlProfilerService::Key);
 
     QQuickCanvas::keyPressEvent(e);
 }
 
 void QQuickView::keyReleaseEvent(QKeyEvent *e)
 {
-    QDeclarativeProfilerService::addEvent(QDeclarativeProfilerService::Key);
+    QQmlProfilerService::addEvent(QQmlProfilerService::Key);
 
     QQuickCanvas::keyReleaseEvent(e);
 }
 
 void QQuickView::mouseMoveEvent(QMouseEvent *e)
 {
-    QDeclarativeProfilerService::addEvent(QDeclarativeProfilerService::Mouse);
+    QQmlProfilerService::addEvent(QQmlProfilerService::Mouse);
 
     QQuickCanvas::mouseMoveEvent(e);
 }
 
 void QQuickView::mousePressEvent(QMouseEvent *e)
 {
-    QDeclarativeProfilerService::addEvent(QDeclarativeProfilerService::Mouse);
+    QQmlProfilerService::addEvent(QQmlProfilerService::Mouse);
 
     QQuickCanvas::mousePressEvent(e);
 }
 
 void QQuickView::mouseReleaseEvent(QMouseEvent *e)
 {
-    QDeclarativeProfilerService::addEvent(QDeclarativeProfilerService::Mouse);
+    QQmlProfilerService::addEvent(QQmlProfilerService::Mouse);
 
     QQuickCanvas::mouseReleaseEvent(e);
 }
diff --git a/src/quick/items/qquickview.h b/src/quick/items/qquickview.h
index 6f1b1f12cd..89cca506f7 100644
--- a/src/quick/items/qquickview.h
+++ b/src/quick/items/qquickview.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
@@ -44,15 +44,15 @@
 
 #include <QtQuick/qquickcanvas.h>
 #include <QtCore/qurl.h>
-#include <QtDeclarative/qdeclarativedebug.h>
+#include <QtQml/qqmldebug.h>
 
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-class QDeclarativeEngine;
-class QDeclarativeContext;
-class QDeclarativeError;
+class QQmlEngine;
+class QQmlContext;
+class QQmlError;
 class QQuickItem;
 
 class QQuickViewPrivate;
@@ -70,8 +70,8 @@ public:
 
     QUrl source() const;
 
-    QDeclarativeEngine* engine() const;
-    QDeclarativeContext* rootContext() const;
+    QQmlEngine* engine() const;
+    QQmlContext* rootContext() const;
 
     QQuickItem *rootObject() const;
 
@@ -82,7 +82,7 @@ public:
     enum Status { Null, Ready, Loading, Error };
     Status status() const;
 
-    QList<QDeclarativeError> errors() const;
+    QList<QQmlError> errors() const;
 
     QSize sizeHint() const;
     QSize initialSize() const;
diff --git a/src/quick/items/qquickview_p.h b/src/quick/items/qquickview_p.h
index 1dacf2f1ee..9b0e26e30d 100644
--- a/src/quick/items/qquickview_p.h
+++ b/src/quick/items/qquickview_p.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
@@ -48,7 +48,7 @@
 #include <QtCore/qelapsedtimer.h>
 #include <QtCore/qtimer.h>
 #include <QtCore/qpointer.h>
-#include <QtDeclarative/qdeclarativeengine.h>
+#include <QtQml/qqmlengine.h>
 #include "qquickcanvas_p.h"
 
 #include "qquickitemchangelistener_p.h"
@@ -57,10 +57,10 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-class QDeclarativeContext;
-class QDeclarativeError;
+class QQmlContext;
+class QQmlError;
 class QQuickItem;
-class QDeclarativeComponent;
+class QQmlComponent;
 
 class QQuickViewPrivate : public QQuickCanvasPrivate,
                        public QQuickItemChangeListener
@@ -87,8 +87,8 @@ public:
 
     QUrl source;
 
-    QDeclarativeEngine engine;
-    QDeclarativeComponent *component;
+    QQmlEngine engine;
+    QQmlComponent *component;
     QBasicTimer resizetimer;
 
     QQuickView::ResizeMode resizeMode;
diff --git a/src/quick/items/qquickvisualadaptormodel.cpp b/src/quick/items/qquickvisualadaptormodel.cpp
index f504478a3d..fb85810984 100644
--- a/src/quick/items/qquickvisualadaptormodel.cpp
+++ b/src/quick/items/qquickvisualadaptormodel.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
@@ -42,9 +42,9 @@
 #include "qquickvisualadaptormodel_p.h"
 #include "qquickvisualdatamodel_p_p.h"
 
-#include <private/qdeclarativeengine_p.h>
-#include <private/qdeclarativelistaccessor_p.h>
-#include <private/qdeclarativepropertycache_p.h>
+#include <private/qqmlengine_p.h>
+#include <private/qquicklistaccessor_p.h>
+#include <private/qqmlpropertycache_p.h>
 #include <private/qlistmodelinterface_p.h>
 #include <private/qmetaobjectbuilder_p.h>
 #include <private/qintrusivelist_p.h>
@@ -52,7 +52,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class VDMDelegateDataType : public QDeclarativeRefCount
+class VDMDelegateDataType : public QQmlRefCount
 {
 public:
     VDMDelegateDataType()
@@ -86,7 +86,7 @@ public:
     }
 
     QMetaObject *metaObject;
-    QDeclarativePropertyCache *propertyCache;
+    QQmlPropertyCache *propertyCache;
     int propertyOffset;
     int signalOffset;
     bool shared : 1;
@@ -166,10 +166,10 @@ public:
         return 0;
     }
 
-    QDeclarativeGuard<QDeclarativeEngine> m_engine;
-    QDeclarativeGuard<QListModelInterface> m_listModelInterface;
-    QDeclarativeGuard<QAbstractItemModel> m_abstractItemModel;
-    QDeclarativeListAccessor *m_listAccessor;
+    QQmlGuard<QQmlEngine> m_engine;
+    QQmlGuard<QListModelInterface> m_listModelInterface;
+    QQmlGuard<QAbstractItemModel> m_abstractItemModel;
+    QQuickListAccessor *m_listAccessor;
     VDMDelegateDataType *m_delegateDataType;
     CreateModelData createItem;
     StringValue stringValue;
@@ -650,7 +650,7 @@ public:
         for (int i = previousPropertyCount; i < metaObject->propertyCount() - objectPropertyOffset; ++i) {
             QMetaProperty property = metaObject->property(i + objectPropertyOffset);
             if (property.hasNotifySignal()) {
-                QDeclarativePropertyPrivate::connect(
+                QQmlPropertyPrivate::connect(
                         m_object, property.notifySignalIndex(), m_data, notifierId);
                 ++notifierId;
             }
@@ -658,7 +658,7 @@ public:
         return propertyIndex + m_type->propertyOffset - objectPropertyOffset;
     }
 
-    QDeclarativeGuard<QObject> m_object;
+    QQmlGuard<QObject> m_object;
 };
 
 class QQuickVDMObjectData : public QQuickVisualDataModelItem, public QQuickVisualAdaptorModelProxyInterface
@@ -712,7 +712,7 @@ void QQuickVisualAdaptorModelPrivate::createMetaObject()
     m_objectList = false;
     m_propertyData.clear();
 
-    QV8Engine *v8Engine  = QDeclarativeEnginePrivate::getV8Engine(m_engine);
+    QV8Engine *v8Engine  = QQmlEnginePrivate::getV8Engine(m_engine);
 
     v8::HandleScope handleScope;
     v8::Context::Scope contextScope(v8Engine->context());
@@ -722,8 +722,8 @@ void QQuickVisualAdaptorModelPrivate::createMetaObject()
             v8::String::New("index"), QQuickVisualDataModelItemMetaObject::get_index);
 
     if (m_listAccessor
-            && m_listAccessor->type() != QDeclarativeListAccessor::ListProperty
-            && m_listAccessor->type() != QDeclarativeListAccessor::Instance) {
+            && m_listAccessor->type() != QQuickListAccessor::ListProperty
+            && m_listAccessor->type() != QQuickListAccessor::Instance) {
         createItem = &QQuickVDMListAccessorData::create;
         stringValue = &QQuickVDMListAccessorData::stringValue;
         ft->PrototypeTemplate()->SetAccessor(
@@ -794,7 +794,7 @@ void QQuickVisualAdaptorModelPrivate::createMetaObject()
     }
     m_delegateDataType->metaObject = m_delegateDataType->builder.toMetaObject();
     if (!m_objectList) {
-        m_delegateDataType->propertyCache = new QDeclarativePropertyCache(
+        m_delegateDataType->propertyCache = new QQmlPropertyCache(
                 m_engine, m_delegateDataType->metaObject);
         m_constructor = qPersistentNew<v8::Function>(ft->GetFunction());
     }
@@ -828,7 +828,7 @@ QVariant QQuickVisualAdaptorModel::model() const
     return d->m_modelVariant;
 }
 
-void QQuickVisualAdaptorModel::setModel(const QVariant &model, QDeclarativeEngine *engine)
+void QQuickVisualAdaptorModel::setModel(const QVariant &model, QQmlEngine *engine)
 {
     Q_D(QQuickVisualAdaptorModel);
     delete d->m_listAccessor;
@@ -904,7 +904,7 @@ void QQuickVisualAdaptorModel::setModel(const QVariant &model, QDeclarativeEngin
         return;
     }
 
-    d->m_listAccessor = new QDeclarativeListAccessor;
+    d->m_listAccessor = new QQuickListAccessor;
     d->m_listAccessor->setList(model, d->m_engine);
     if ((d->m_count = d->m_listAccessor->count()))
         emit itemsInserted(0, d->m_count);
@@ -964,7 +964,7 @@ QQuickVisualDataModelItem *QQuickVisualAdaptorModel::createItem(QQuickVisualData
         d->m_cache.insert(item);
 
         if (d->m_delegateDataType && d->m_delegateDataType->propertyCache) {
-            QDeclarativeData *qmldata = QDeclarativeData::get(item, true);
+            QQmlData *qmldata = QQmlData::get(item, true);
             qmldata->propertyCache = d->m_delegateDataType->propertyCache;
             qmldata->propertyCache->addref();
         }
diff --git a/src/quick/items/qquickvisualadaptormodel_p.h b/src/quick/items/qquickvisualadaptormodel_p.h
index 9ae8325450..93de4b1126 100644
--- a/src/quick/items/qquickvisualadaptormodel_p.h
+++ b/src/quick/items/qquickvisualadaptormodel_p.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
@@ -49,7 +49,7 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-class QDeclarativeEngine;
+class QQmlEngine;
 
 class QQuickVisualDataModelItem;
 class QQuickVisualDataModelItemMetaType;
@@ -72,7 +72,7 @@ public:
     Flags flags() const;
 
     QVariant model() const;
-    void setModel(const QVariant &, QDeclarativeEngine *);
+    void setModel(const QVariant &, QQmlEngine *);
 
     QVariant rootIndex() const;
     void setRootIndex(const QVariant &root);
diff --git a/src/quick/items/qquickvisualdatamodel.cpp b/src/quick/items/qquickvisualdatamodel.cpp
index 4fdcc98602..07ad3660be 100644
--- a/src/quick/items/qquickvisualdatamodel.cpp
+++ b/src/quick/items/qquickvisualdatamodel.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
@@ -42,13 +42,13 @@
 #include "qquickvisualdatamodel_p_p.h"
 #include "qquickitem.h"
 
-#include <QtDeclarative/qdeclarativeinfo.h>
+#include <QtQml/qqmlinfo.h>
 
-#include <private/qdeclarativepackage_p.h>
+#include <private/qquickpackage_p.h>
 #include <private/qmetaobjectbuilder_p.h>
 #include <private/qquickvisualadaptormodel_p.h>
-#include <private/qdeclarativechangeset_p.h>
-#include <private/qdeclarativeengine_p.h>
+#include <private/qquickchangeset_p.h>
+#include <private/qqmlengine_p.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -93,10 +93,10 @@ QHash<QObject*, QQuickVisualDataModelAttached*> QQuickVisualDataModelAttached::a
 
     The example below illustrates using a VisualDataModel with a ListView.
 
-    \snippet doc/src/snippets/declarative/visualdatamodel.qml 0
+    \snippet doc/src/snippets/qml/visualdatamodel.qml 0
 */
 
-QQuickVisualDataModelPrivate::QQuickVisualDataModelPrivate(QDeclarativeContext *ctxt)
+QQuickVisualDataModelPrivate::QQuickVisualDataModelPrivate(QQmlContext *ctxt)
     : m_adaptorModel(0)
     , m_delegate(0)
     , m_cacheMetaType(0)
@@ -153,7 +153,7 @@ QQuickVisualDataModel::QQuickVisualDataModel()
     d->init();
 }
 
-QQuickVisualDataModel::QQuickVisualDataModel(QDeclarativeContext *ctxt, QObject *parent)
+QQuickVisualDataModel::QQuickVisualDataModel(QQmlContext *ctxt, QObject *parent)
 : QQuickVisualModel(*(new QQuickVisualDataModelPrivate(ctxt)), parent)
 {
     Q_D(QQuickVisualDataModel);
@@ -223,7 +223,7 @@ void QQuickVisualDataModel::componentComplete()
         d->m_context = qmlContext(this);
 
     d->m_cacheMetaType = new QQuickVisualDataModelItemMetaType(
-            QDeclarativeEnginePrivate::getV8Engine(d->m_context->engine()), this, groupNames);
+            QQmlEnginePrivate::getV8Engine(d->m_context->engine()), this, groupNames);
 
     d->m_compositor.setGroupCount(d->m_groupCount);
     d->m_compositor.setDefaultGroups(defaultGroups);
@@ -282,13 +282,13 @@ void QQuickVisualDataModel::setModel(const QVariant &model)
     The index is exposed as an accessible \c index property.  Properties of the
     model are also available depending upon the type of \l {qmlmodels}{Data Model}.
 */
-QDeclarativeComponent *QQuickVisualDataModel::delegate() const
+QQmlComponent *QQuickVisualDataModel::delegate() const
 {
     Q_D(const QQuickVisualDataModel);
     return d->m_delegate;
 }
 
-void QQuickVisualDataModel::setDelegate(QDeclarativeComponent *delegate)
+void QQuickVisualDataModel::setDelegate(QQmlComponent *delegate)
 {
     Q_D(QQuickVisualDataModel);
     if (d->m_transaction) {
@@ -329,10 +329,10 @@ void QQuickVisualDataModel::setDelegate(QDeclarativeComponent *delegate)
     the new directory's contents.
 
     \c main.cpp:
-    \snippet doc/src/snippets/declarative/visualdatamodel_rootindex/main.cpp 0
+    \snippet doc/src/snippets/qml/visualdatamodel_rootindex/main.cpp 0
 
     \c view.qml:
-    \snippet doc/src/snippets/declarative/visualdatamodel_rootindex/view.qml 0
+    \snippet doc/src/snippets/qml/visualdatamodel_rootindex/view.qml 0
 
     If the \l model is a QAbstractItemModel subclass, the delegate can also
     reference a \c hasModelChildren property (optionally qualified by a
@@ -406,7 +406,7 @@ void QQuickVisualDataModelPrivate::destroy(QObject *object)
 {
     QObjectPrivate *p = QObjectPrivate::get(object);
     Q_ASSERT(p->declarativeData);
-    QDeclarativeData *data = static_cast<QDeclarativeData*>(p->declarativeData);
+    QQmlData *data = static_cast<QQmlData*>(p->declarativeData);
     if (data->ownContext && data->context)
         data->context->clearContext();
     object->deleteLater();
@@ -451,7 +451,7 @@ QQuickVisualDataModel::ReleaseFlags QQuickVisualDataModel::release(QQuickItem *i
 }
 
 void QQuickVisualDataModelPrivate::group_append(
-        QDeclarativeListProperty<QQuickVisualDataGroup> *property, QQuickVisualDataGroup *group)
+        QQmlListProperty<QQuickVisualDataGroup> *property, QQuickVisualDataGroup *group)
 {
     QQuickVisualDataModelPrivate *d = static_cast<QQuickVisualDataModelPrivate *>(property->data);
     if (d->m_complete)
@@ -465,14 +465,14 @@ void QQuickVisualDataModelPrivate::group_append(
 }
 
 int QQuickVisualDataModelPrivate::group_count(
-        QDeclarativeListProperty<QQuickVisualDataGroup> *property)
+        QQmlListProperty<QQuickVisualDataGroup> *property)
 {
     QQuickVisualDataModelPrivate *d = static_cast<QQuickVisualDataModelPrivate *>(property->data);
     return d->m_groupCount - 1;
 }
 
 QQuickVisualDataGroup *QQuickVisualDataModelPrivate::group_at(
-        QDeclarativeListProperty<QQuickVisualDataGroup> *property, int index)
+        QQmlListProperty<QQuickVisualDataGroup> *property, int index)
 {
     QQuickVisualDataModelPrivate *d = static_cast<QQuickVisualDataModelPrivate *>(property->data);
     return index >= 0 && index < d->m_groupCount - 1
@@ -495,13 +495,13 @@ QQuickVisualDataGroup *QQuickVisualDataModelPrivate::group_at(
 
     The following example illustrates using groups to select items in a model.
 
-    \snippet doc/src/snippets/declarative/visualdatagroup.qml 0
+    \snippet doc/src/snippets/qml/visualdatagroup.qml 0
 */
 
-QDeclarativeListProperty<QQuickVisualDataGroup> QQuickVisualDataModel::groups()
+QQmlListProperty<QQuickVisualDataGroup> QQuickVisualDataModel::groups()
 {
     Q_D(QQuickVisualDataModel);
-    return QDeclarativeListProperty<QQuickVisualDataGroup>(
+    return QQmlListProperty<QQuickVisualDataGroup>(
             this,
             d,
             QQuickVisualDataModelPrivate::group_append,
@@ -587,7 +587,7 @@ void QQuickVisualDataModelPrivate::updateFilterGroup()
     if (!m_cacheMetaType)
         return;
 
-    QDeclarativeListCompositor::Group previousGroup = m_compositorGroup;
+    QQuickListCompositor::Group previousGroup = m_compositorGroup;
     m_compositorGroup = Compositor::Default;
     for (int i = 1; i < m_groupCount; ++i) {
         if (m_filterGroup == m_cacheMetaType->groupNames.at(i - 1)) {
@@ -598,11 +598,11 @@ void QQuickVisualDataModelPrivate::updateFilterGroup()
 
     QQuickVisualDataGroupPrivate::get(m_groups[m_compositorGroup])->emitters.insert(this);
     if (m_compositorGroup != previousGroup) {
-        QVector<QDeclarativeChangeSet::Remove> removes;
-        QVector<QDeclarativeChangeSet::Insert> inserts;
+        QVector<QQuickChangeSet::Remove> removes;
+        QVector<QQuickChangeSet::Insert> inserts;
         m_compositor.transition(previousGroup, m_compositorGroup, &removes, &inserts);
 
-        QDeclarativeChangeSet changeSet;
+        QQuickChangeSet changeSet;
         changeSet.apply(removes, inserts);
         emit q->modelUpdated(changeSet, false);
 
@@ -652,19 +652,19 @@ QObject *QQuickVisualDataModel::parts()
     return d->m_parts;
 }
 
-void QQuickVisualDataModelPrivate::emitCreatedPackage(QQuickVisualDataModelItem *cacheItem, QDeclarativePackage *package)
+void QQuickVisualDataModelPrivate::emitCreatedPackage(QQuickVisualDataModelItem *cacheItem, QQuickPackage *package)
 {
     for (int i = 1; i < m_groupCount; ++i)
         QQuickVisualDataGroupPrivate::get(m_groups[i])->createdPackage(cacheItem->index[i], package);
 }
 
-void QQuickVisualDataModelPrivate::emitInitPackage(QQuickVisualDataModelItem *cacheItem, QDeclarativePackage *package)
+void QQuickVisualDataModelPrivate::emitInitPackage(QQuickVisualDataModelItem *cacheItem, QQuickPackage *package)
 {
     for (int i = 1; i < m_groupCount; ++i)
         QQuickVisualDataGroupPrivate::get(m_groups[i])->initPackage(cacheItem->index[i], package);
 }
 
-void QQuickVisualDataModelPrivate::emitDestroyingPackage(QDeclarativePackage *package)
+void QQuickVisualDataModelPrivate::emitDestroyingPackage(QQuickPackage *package)
 {
     for (int i = 1; i < m_groupCount; ++i)
         QQuickVisualDataGroupPrivate::get(m_groups[i])->destroyingPackage(package);
@@ -687,23 +687,23 @@ void QQuickVisualDataModelPrivate::releaseIncubator(QVDMIncubationTask *incubati
     }
 }
 
-void QQuickVisualDataModelPrivate::incubatorStatusChanged(QVDMIncubationTask *incubationTask, QDeclarativeIncubator::Status status)
+void QQuickVisualDataModelPrivate::incubatorStatusChanged(QVDMIncubationTask *incubationTask, QQmlIncubator::Status status)
 {
     Q_Q(QQuickVisualDataModel);
-    if (status != QDeclarativeIncubator::Ready && status != QDeclarativeIncubator::Error)
+    if (status != QQmlIncubator::Ready && status != QQmlIncubator::Error)
         return;
 
     QQuickVisualDataModelItem *cacheItem = incubationTask->incubating;
     cacheItem->incubationTask = 0;
 
-    if (status == QDeclarativeIncubator::Ready) {
+    if (status == QQmlIncubator::Ready) {
         incubationTask->incubating = 0;
         releaseIncubator(incubationTask);
-        if (QDeclarativePackage *package = qobject_cast<QDeclarativePackage *>(cacheItem->object))
+        if (QQuickPackage *package = qobject_cast<QQuickPackage *>(cacheItem->object))
             emitCreatedPackage(cacheItem, package);
         else if (QQuickItem *item = qobject_cast<QQuickItem *>(cacheItem->object))
             emitCreatedItem(cacheItem, item);
-    } else if (status == QDeclarativeIncubator::Error) {
+    } else if (status == QQmlIncubator::Error) {
         delete incubationTask->incubatingContext;
         incubationTask->incubatingContext = 0;
         if (!cacheItem->isReferenced()) {
@@ -727,7 +727,7 @@ void QQuickVisualDataModelPrivate::setInitialState(QVDMIncubationTask *incubatio
 {
     QQuickVisualDataModelItem *cacheItem = incubationTask->incubating;
     cacheItem->object = o;
-    QDeclarative_setParent_noEvent(incubationTask->incubatingContext, cacheItem->object);
+    QQml_setParent_noEvent(incubationTask->incubatingContext, cacheItem->object);
     incubationTask->incubatingContext = 0;
 
     cacheItem->attached = QQuickVisualDataModelAttached::properties(cacheItem->object);
@@ -735,7 +735,7 @@ void QQuickVisualDataModelPrivate::setInitialState(QVDMIncubationTask *incubatio
     new QQuickVisualDataModelAttachedMetaObject(cacheItem->attached, m_cacheMetaType);
     cacheItem->attached->emitChanges();
 
-    if (QDeclarativePackage *package = qobject_cast<QDeclarativePackage *>(cacheItem->object))
+    if (QQuickPackage *package = qobject_cast<QQuickPackage *>(cacheItem->object))
         emitInitPackage(cacheItem, package);
     else if (QQuickItem *item = qobject_cast<QQuickItem *>(cacheItem->object))
         emitInitItem(cacheItem, item);
@@ -771,13 +771,13 @@ QObject *QQuickVisualDataModelPrivate::object(Compositor::Group group, int index
             cacheItem->incubationTask->forceCompletion();
         }
     } else if (!cacheItem->object) {
-        QVDMIncubationTask *incubator = new QVDMIncubationTask(this, asynchronous ? QDeclarativeIncubator::Asynchronous : QDeclarativeIncubator::AsynchronousIfNested);
+        QVDMIncubationTask *incubator = new QVDMIncubationTask(this, asynchronous ? QQmlIncubator::Asynchronous : QQmlIncubator::AsynchronousIfNested);
         cacheItem->incubationTask = incubator;
 
-        QDeclarativeContext *creationContext = m_delegate->creationContext();
-        QDeclarativeContext *rootContext = new QQuickVisualDataModelContext(
+        QQmlContext *creationContext = m_delegate->creationContext();
+        QQmlContext *rootContext = new QQuickVisualDataModelContext(
                 cacheItem, creationContext ? creationContext : m_context.data());
-        QDeclarativeContext *ctxt = rootContext;
+        QQmlContext *ctxt = rootContext;
         if (m_adaptorModel->flags() & QQuickVisualAdaptorModel::ProxiedObject) {
             if (QQuickVisualAdaptorModelProxyInterface *proxy = qobject_cast<QQuickVisualAdaptorModelProxyInterface *>(cacheItem)) {
                 ctxt->setContextObject(proxy->proxiedObject());
@@ -913,13 +913,13 @@ void QQuickVisualDataModelPrivate::itemsChanged(const QVector<Compositor::Change
     if (!m_delegate)
         return;
 
-    QVarLengthArray<QVector<QDeclarativeChangeSet::Change>, Compositor::MaximumGroupCount> translatedChanges(m_groupCount);
+    QVarLengthArray<QVector<QQuickChangeSet::Change>, Compositor::MaximumGroupCount> translatedChanges(m_groupCount);
 
     foreach (const Compositor::Change &change, changes) {
         for (int i = 1; i < m_groupCount; ++i) {
             if (change.inGroup(i)) {
                 translatedChanges[i].append(
-                        QDeclarativeChangeSet::Change(change.index[i], change.count));
+                        QQuickChangeSet::Change(change.index[i], change.count));
             }
         }
     }
@@ -941,7 +941,7 @@ void QQuickVisualDataModel::_q_itemsChanged(int index, int count)
 
 void QQuickVisualDataModelPrivate::itemsInserted(
         const QVector<Compositor::Insert> &inserts,
-        QVarLengthArray<QVector<QDeclarativeChangeSet::Insert>, Compositor::MaximumGroupCount> *translatedInserts,
+        QVarLengthArray<QVector<QQuickChangeSet::Insert>, Compositor::MaximumGroupCount> *translatedInserts,
         QHash<int, QList<QQuickVisualDataModelItem *> > *movedItems)
 {
     int cacheIndex = 0;
@@ -959,7 +959,7 @@ void QQuickVisualDataModelPrivate::itemsInserted(
         for (int i = 1; i < m_groupCount; ++i) {
             if (insert.inGroup(i)) {
                 (*translatedInserts)[i].append(
-                        QDeclarativeChangeSet::Insert(insert.index[i], insert.count, insert.moveId));
+                        QQuickChangeSet::Insert(insert.index[i], insert.count, insert.moveId));
                 inserted[i] += insert.count;
             }
         }
@@ -995,7 +995,7 @@ void QQuickVisualDataModelPrivate::itemsInserted(
 
 void QQuickVisualDataModelPrivate::itemsInserted(const QVector<Compositor::Insert> &inserts)
 {
-    QVarLengthArray<QVector<QDeclarativeChangeSet::Insert>, Compositor::MaximumGroupCount> translatedInserts(m_groupCount);
+    QVarLengthArray<QVector<QQuickChangeSet::Insert>, Compositor::MaximumGroupCount> translatedInserts(m_groupCount);
     itemsInserted(inserts, &translatedInserts);
     Q_ASSERT(m_cache.count() == m_compositor.count(Compositor::Cache));
     if (!m_delegate)
@@ -1019,7 +1019,7 @@ void QQuickVisualDataModel::_q_itemsInserted(int index, int count)
 
 void QQuickVisualDataModelPrivate::itemsRemoved(
         const QVector<Compositor::Remove> &removes,
-        QVarLengthArray<QVector<QDeclarativeChangeSet::Remove>, Compositor::MaximumGroupCount> *translatedRemoves,
+        QVarLengthArray<QVector<QQuickChangeSet::Remove>, Compositor::MaximumGroupCount> *translatedRemoves,
         QHash<int, QList<QQuickVisualDataModelItem *> > *movedItems)
 {
     int cacheIndex = 0;
@@ -1038,7 +1038,7 @@ void QQuickVisualDataModelPrivate::itemsRemoved(
         for (int i = 1; i < m_groupCount; ++i) {
             if (remove.inGroup(i)) {
                 (*translatedRemoves)[i].append(
-                        QDeclarativeChangeSet::Remove(remove.index[i], remove.count, remove.moveId));
+                        QQuickChangeSet::Remove(remove.index[i], remove.count, remove.moveId));
                 removed[i] += remove.count;
             }
         }
@@ -1056,7 +1056,7 @@ void QQuickVisualDataModelPrivate::itemsRemoved(
                 QQuickVisualDataModelItem *cacheItem = m_cache.at(cacheIndex);
                 if (remove.inGroup(Compositor::Persisted) && cacheItem->objectRef == 0 && cacheItem->object) {
                     destroy(cacheItem->object);
-                    if (QDeclarativePackage *package = qobject_cast<QDeclarativePackage *>(cacheItem->object))
+                    if (QQuickPackage *package = qobject_cast<QQuickPackage *>(cacheItem->object))
                         emitDestroyingPackage(package);
                     else if (QQuickItem *item = qobject_cast<QQuickItem *>(cacheItem->object))
                         emitDestroyingItem(item);
@@ -1093,7 +1093,7 @@ void QQuickVisualDataModelPrivate::itemsRemoved(
 
 void QQuickVisualDataModelPrivate::itemsRemoved(const QVector<Compositor::Remove> &removes)
 {
-    QVarLengthArray<QVector<QDeclarativeChangeSet::Remove>, Compositor::MaximumGroupCount> translatedRemoves(m_groupCount);
+    QVarLengthArray<QVector<QQuickChangeSet::Remove>, Compositor::MaximumGroupCount> translatedRemoves(m_groupCount);
     itemsRemoved(removes, &translatedRemoves);
     Q_ASSERT(m_cache.count() == m_compositor.count(Compositor::Cache));
     if (!m_delegate)
@@ -1121,10 +1121,10 @@ void QQuickVisualDataModelPrivate::itemsMoved(
 {
     QHash<int, QList<QQuickVisualDataModelItem *> > movedItems;
 
-    QVarLengthArray<QVector<QDeclarativeChangeSet::Remove>, Compositor::MaximumGroupCount> translatedRemoves(m_groupCount);
+    QVarLengthArray<QVector<QQuickChangeSet::Remove>, Compositor::MaximumGroupCount> translatedRemoves(m_groupCount);
     itemsRemoved(removes, &translatedRemoves, &movedItems);
 
-    QVarLengthArray<QVector<QDeclarativeChangeSet::Insert>, Compositor::MaximumGroupCount> translatedInserts(m_groupCount);
+    QVarLengthArray<QVector<QQuickChangeSet::Insert>, Compositor::MaximumGroupCount> translatedInserts(m_groupCount);
     itemsInserted(inserts, &translatedInserts, &movedItems);
     Q_ASSERT(m_cache.count() == m_compositor.count(Compositor::Cache));
     Q_ASSERT(movedItems.isEmpty());
@@ -1169,7 +1169,7 @@ QQuickVisualDataModelPrivate::buildChangeList(const QVector<T> &changes)
     return indexes;
 }
 
-void QQuickVisualDataModelPrivate::emitModelUpdated(const QDeclarativeChangeSet &changeSet, bool reset)
+void QQuickVisualDataModelPrivate::emitModelUpdated(const QQuickChangeSet &changeSet, bool reset)
 {
     Q_Q(QQuickVisualDataModel);
     emit q->modelUpdated(changeSet, reset);
@@ -1183,7 +1183,7 @@ void QQuickVisualDataModelPrivate::emitChanges()
         return;
 
     m_transaction = true;
-    QV8Engine *engine = QDeclarativeEnginePrivate::getV8Engine(m_context->engine());
+    QV8Engine *engine = QQmlEnginePrivate::getV8Engine(m_context->engine());
     for (int i = 1; i < m_groupCount; ++i)
         QQuickVisualDataGroupPrivate::get(m_groups[i])->emitChanges(engine);
     m_transaction = false;
@@ -1714,14 +1714,14 @@ void QQuickVisualDataGroupPrivate::setModel(QQuickVisualDataModel *m, Compositor
 void QQuickVisualDataGroupPrivate::emitChanges(QV8Engine *engine)
 {
     Q_Q(QQuickVisualDataGroup);
-    static int idx = signalIndex("changed(QDeclarativeV8Handle,QDeclarativeV8Handle)");
+    static int idx = signalIndex("changed(QQmlV8Handle,QQmlV8Handle)");
     if (isSignalConnected(idx) && !changeSet.isEmpty()) {
         v8::HandleScope handleScope;
         v8::Context::Scope contextScope(engine->context());
         v8::Local<v8::Array> removed  = QQuickVisualDataModelPrivate::buildChangeList(changeSet.removes());
         v8::Local<v8::Array> inserted = QQuickVisualDataModelPrivate::buildChangeList(changeSet.inserts());
         emit q->changed(
-                QDeclarativeV8Handle::fromHandle(removed), QDeclarativeV8Handle::fromHandle(inserted));
+                QQmlV8Handle::fromHandle(removed), QQmlV8Handle::fromHandle(inserted));
     }
     if (changeSet.difference() != 0)
         emit q->countChanged();
@@ -1734,19 +1734,19 @@ void QQuickVisualDataGroupPrivate::emitModelUpdated(bool reset)
     changeSet.clear();
 }
 
-void QQuickVisualDataGroupPrivate::createdPackage(int index, QDeclarativePackage *package)
+void QQuickVisualDataGroupPrivate::createdPackage(int index, QQuickPackage *package)
 {
     for (QQuickVisualDataGroupEmitterList::iterator it = emitters.begin(); it != emitters.end(); ++it)
         it->createdPackage(index, package);
 }
 
-void QQuickVisualDataGroupPrivate::initPackage(int index, QDeclarativePackage *package)
+void QQuickVisualDataGroupPrivate::initPackage(int index, QQuickPackage *package)
 {
     for (QQuickVisualDataGroupEmitterList::iterator it = emitters.begin(); it != emitters.end(); ++it)
         it->initPackage(index, package);
 }
 
-void QQuickVisualDataGroupPrivate::destroyingPackage(QDeclarativePackage *package)
+void QQuickVisualDataGroupPrivate::destroyingPackage(QQuickPackage *package)
 {
     for (QQuickVisualDataGroupEmitterList::iterator it = emitters.begin(); it != emitters.end(); ++it)
         it->destroyingPackage(package);
@@ -1867,16 +1867,16 @@ void QQuickVisualDataGroup::setDefaultInclude(bool include)
     \endlist
 */
 
-QDeclarativeV8Handle QQuickVisualDataGroup::get(int index)
+QQmlV8Handle QQuickVisualDataGroup::get(int index)
 {
     Q_D(QQuickVisualDataGroup);
     if (!d->model)
-        return QDeclarativeV8Handle::fromHandle(v8::Undefined());;
+        return QQmlV8Handle::fromHandle(v8::Undefined());;
 
     QQuickVisualDataModelPrivate *model = QQuickVisualDataModelPrivate::get(d->model);
     if (index < 0 || index >= model->m_compositor.count(d->group)) {
         qmlInfo(this) << tr("get: index out of range");
-        return QDeclarativeV8Handle::fromHandle(v8::Undefined());
+        return QQmlV8Handle::fromHandle(v8::Undefined());
     }
 
     Compositor::iterator it = model->m_compositor.find(d->group, index);
@@ -1902,7 +1902,7 @@ QDeclarativeV8Handle QQuickVisualDataGroup::get(int index)
         ++cacheItem->scriptRef;
     }
 
-    return QDeclarativeV8Handle::fromHandle(cacheItem->indexHandle);
+    return QQmlV8Handle::fromHandle(cacheItem->indexHandle);
 }
 
 bool QQuickVisualDataGroupPrivate::parseIndex(
@@ -1925,7 +1925,7 @@ bool QQuickVisualDataGroupPrivate::parseIndex(
     return false;
 }
 
-void QQuickVisualDataGroup::insert(QDeclarativeV8Function *args)
+void QQuickVisualDataGroup::insert(QQmlV8Function *args)
 {
     Q_D(QQuickVisualDataGroup);
     QQuickVisualDataModelPrivate *model = QQuickVisualDataModelPrivate::get(d->model);
@@ -1975,7 +1975,7 @@ void QQuickVisualDataGroup::insert(QDeclarativeV8Function *args)
     group remain instantiated when not referenced by any view.
 */
 
-void QQuickVisualDataGroup::create(QDeclarativeV8Function *args)
+void QQuickVisualDataGroup::create(QQmlV8Function *args)
 {
     Q_D(QQuickVisualDataGroup);
     if (!d->model)
@@ -2030,7 +2030,7 @@ void QQuickVisualDataGroup::create(QDeclarativeV8Function *args)
     model->emitChanges();
 }
 
-void QQuickVisualDataGroup::resolve(QDeclarativeV8Function *args)
+void QQuickVisualDataGroup::resolve(QQmlV8Function *args)
 {
     Q_D(QQuickVisualDataGroup);
     if (!d->model)
@@ -2130,7 +2130,7 @@ void QQuickVisualDataGroup::resolve(QDeclarativeV8Function *args)
     Removes \a count items starting at \a index from the group.
 */
 
-void QQuickVisualDataGroup::remove(QDeclarativeV8Function *args)
+void QQuickVisualDataGroup::remove(QQmlV8Function *args)
 {
     Q_D(QQuickVisualDataGroup);
     if (!d->model)
@@ -2169,7 +2169,7 @@ void QQuickVisualDataGroup::remove(QDeclarativeV8Function *args)
 }
 
 bool QQuickVisualDataGroupPrivate::parseGroupArgs(
-        QDeclarativeV8Function *args, Compositor::Group *group, int *index, int *count, int *groups) const
+        QQmlV8Function *args, Compositor::Group *group, int *index, int *count, int *groups) const
 {
     if (!model || !QQuickVisualDataModelPrivate::get(model)->m_cacheMetaType)
         return false;
@@ -2202,7 +2202,7 @@ bool QQuickVisualDataGroupPrivate::parseGroupArgs(
     Adds \a count items starting at \a index to \a groups.
 */
 
-void QQuickVisualDataGroup::addGroups(QDeclarativeV8Function *args)
+void QQuickVisualDataGroup::addGroups(QQmlV8Function *args)
 {
     Q_D(QQuickVisualDataGroup);
     Compositor::Group group = d->group;
@@ -2232,7 +2232,7 @@ void QQuickVisualDataGroup::addGroups(QDeclarativeV8Function *args)
     Removes \a count items starting at \a index from \a groups.
 */
 
-void QQuickVisualDataGroup::removeGroups(QDeclarativeV8Function *args)
+void QQuickVisualDataGroup::removeGroups(QQmlV8Function *args)
 {
     Q_D(QQuickVisualDataGroup);
     Compositor::Group group = d->group;
@@ -2262,7 +2262,7 @@ void QQuickVisualDataGroup::removeGroups(QDeclarativeV8Function *args)
     Sets the \a groups \a count items starting at \a index belong to.
 */
 
-void QQuickVisualDataGroup::setGroups(QDeclarativeV8Function *args)
+void QQuickVisualDataGroup::setGroups(QQmlV8Function *args)
 {
     Q_D(QQuickVisualDataGroup);
     Compositor::Group group = d->group;
@@ -2298,7 +2298,7 @@ void QQuickVisualDataGroup::setGroups(QDeclarativeV8Function *args)
     Moves \a count at \a from in a group \a to a new position.
 */
 
-void QQuickVisualDataGroup::move(QDeclarativeV8Function *args)
+void QQuickVisualDataGroup::move(QQmlV8Function *args)
 {
     Q_D(QQuickVisualDataGroup);
 
@@ -2424,7 +2424,7 @@ void QQuickVisualPartsModel::updateFilterGroup()
         m_filterGroup = model->m_filterGroup;
     }
 
-    QDeclarativeListCompositor::Group previousGroup = m_compositorGroup;
+    QQuickListCompositor::Group previousGroup = m_compositorGroup;
     m_compositorGroup = Compositor::Default;
     QQuickVisualDataGroupPrivate::get(model->m_groups[Compositor::Default])->emitters.insert(this);
     for (int i = 1; i < model->m_groupCount; ++i) {
@@ -2436,11 +2436,11 @@ void QQuickVisualPartsModel::updateFilterGroup()
 
     QQuickVisualDataGroupPrivate::get(model->m_groups[m_compositorGroup])->emitters.insert(this);
     if (m_compositorGroup != previousGroup) {
-        QVector<QDeclarativeChangeSet::Remove> removes;
-        QVector<QDeclarativeChangeSet::Insert> inserts;
+        QVector<QQuickChangeSet::Remove> removes;
+        QVector<QQuickChangeSet::Insert> inserts;
         model->m_compositor.transition(previousGroup, m_compositorGroup, &removes, &inserts);
 
-        QDeclarativeChangeSet changeSet;
+        QQuickChangeSet changeSet;
         changeSet.apply(removes, inserts);
         if (!changeSet.isEmpty())
             emit modelUpdated(changeSet, false);
@@ -2451,7 +2451,7 @@ void QQuickVisualPartsModel::updateFilterGroup()
 }
 
 void QQuickVisualPartsModel::updateFilterGroup(
-        Compositor::Group group, const QDeclarativeChangeSet &changeSet)
+        Compositor::Group group, const QQuickChangeSet &changeSet)
 {
     if (!m_inheritGroup)
         return;
@@ -2492,7 +2492,7 @@ QQuickItem *QQuickVisualPartsModel::item(int index, bool asynchronous)
 
     QObject *object = model->object(m_compositorGroup, index, asynchronous, true);
 
-    if (QDeclarativePackage *package = qobject_cast<QDeclarativePackage *>(object)) {
+    if (QQuickPackage *package = qobject_cast<QQuickPackage *>(object)) {
         QObject *part = package->part(m_part);
         if (!part)
             return 0;
@@ -2516,10 +2516,10 @@ QQuickVisualModel::ReleaseFlags QQuickVisualPartsModel::release(QQuickItem *item
 {
     QQuickVisualModel::ReleaseFlags flags = 0;
 
-    QHash<QObject *, QDeclarativePackage *>::iterator it = m_packaged.find(item);
+    QHash<QObject *, QQuickPackage *>::iterator it = m_packaged.find(item);
     if (it != m_packaged.end()) {
-        QDeclarativePackage *package = *it;
-        QDeclarative_setParent_noEvent(item, package);
+        QQuickPackage *package = *it;
+        QQml_setParent_noEvent(item, package);
         QQuickVisualDataModelPrivate *model = QQuickVisualDataModelPrivate::get(m_model);
         flags = model->release(package);
         m_packaged.erase(it);
@@ -2545,7 +2545,7 @@ void QQuickVisualPartsModel::setWatchedRoles(QList<QByteArray> roles)
 
 int QQuickVisualPartsModel::indexOf(QQuickItem *item, QObject *) const
 {
-    QHash<QObject *, QDeclarativePackage *>::const_iterator it = m_packaged.find(item);
+    QHash<QObject *, QQuickPackage *>::const_iterator it = m_packaged.find(item);
     if (it != m_packaged.end()) {
         if (QQuickVisualDataModelAttached *attached = QQuickVisualDataModelAttached::properties(*it))
             return attached->m_cacheItem->index[m_compositorGroup];
@@ -2553,29 +2553,29 @@ int QQuickVisualPartsModel::indexOf(QQuickItem *item, QObject *) const
     return -1;
 }
 
-void QQuickVisualPartsModel::createdPackage(int index, QDeclarativePackage *package)
+void QQuickVisualPartsModel::createdPackage(int index, QQuickPackage *package)
 {
     if (QQuickItem *item = qobject_cast<QQuickItem *>(package->part(m_part)))
         emit createdItem(index, item);
 }
 
-void QQuickVisualPartsModel::initPackage(int index, QDeclarativePackage *package)
+void QQuickVisualPartsModel::initPackage(int index, QQuickPackage *package)
 {
     if (QQuickItem *item = qobject_cast<QQuickItem *>(package->part(m_part)))
         emit initItem(index, item);
 }
 
-void QQuickVisualPartsModel::destroyingPackage(QDeclarativePackage *package)
+void QQuickVisualPartsModel::destroyingPackage(QQuickPackage *package)
 {
     if (QQuickItem *item = qobject_cast<QQuickItem *>(package->part(m_part))) {
         Q_ASSERT(!m_packaged.contains(item));
         emit destroyingItem(item);
         item->setParentItem(0);
-        QDeclarative_setParent_noEvent(item, package);
+        QQml_setParent_noEvent(item, package);
     }
 }
 
-void QQuickVisualPartsModel::emitModelUpdated(const QDeclarativeChangeSet &changeSet, bool reset)
+void QQuickVisualPartsModel::emitModelUpdated(const QQuickChangeSet &changeSet, bool reset)
 {
     emit modelUpdated(changeSet, reset);
     if (changeSet.difference() != 0)
diff --git a/src/quick/items/qquickvisualdatamodel_p.h b/src/quick/items/qquickvisualdatamodel_p.h
index 54cc16d660..ee90d528f4 100644
--- a/src/quick/items/qquickvisualdatamodel_p.h
+++ b/src/quick/items/qquickvisualdatamodel_p.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
@@ -42,7 +42,7 @@
 #ifndef QQUICKVISUALDATAMODEL_P_H
 #define QQUICKVISUALDATAMODEL_P_H
 
-#include <private/qdeclarativelistcompositor_p.h>
+#include <private/qquicklistcompositor_p.h>
 #include <private/qquickvisualitemmodel_p.h>
 
 #include <QtCore/qabstractitemmodel.h>
@@ -50,7 +50,7 @@
 
 
 #include <private/qv8engine_p.h>
-#include <private/qdeclarativeglobal_p.h>
+#include <private/qqmlglobal_p.h>
 
 QT_BEGIN_HEADER
 
@@ -58,33 +58,33 @@ Q_DECLARE_METATYPE(QModelIndex)
 
 QT_BEGIN_NAMESPACE
 
-class QDeclarativeChangeSet;
-class QDeclarativeComponent;
-class QDeclarativePackage;
-class QDeclarativeV8Function;
+class QQuickChangeSet;
+class QQmlComponent;
+class QQuickPackage;
+class QQmlV8Function;
 class QQuickVisualDataGroup;
 class QQuickVisualDataModelAttached;
 class QQuickVisualDataModelPrivate;
 
 
-class Q_QUICK_EXPORT QQuickVisualDataModel : public QQuickVisualModel, public QDeclarativeParserStatus
+class Q_QUICK_EXPORT QQuickVisualDataModel : public QQuickVisualModel, public QQmlParserStatus
 {
     Q_OBJECT
     Q_DECLARE_PRIVATE(QQuickVisualDataModel)
 
     Q_PROPERTY(QVariant model READ model WRITE setModel)
-    Q_PROPERTY(QDeclarativeComponent *delegate READ delegate WRITE setDelegate)
+    Q_PROPERTY(QQmlComponent *delegate READ delegate WRITE setDelegate)
     Q_PROPERTY(QString filterOnGroup READ filterGroup WRITE setFilterGroup NOTIFY filterGroupChanged RESET resetFilterGroup)
     Q_PROPERTY(QQuickVisualDataGroup *items READ items CONSTANT)
     Q_PROPERTY(QQuickVisualDataGroup *persistedItems READ persistedItems CONSTANT)
-    Q_PROPERTY(QDeclarativeListProperty<QQuickVisualDataGroup> groups READ groups CONSTANT)
+    Q_PROPERTY(QQmlListProperty<QQuickVisualDataGroup> groups READ groups CONSTANT)
     Q_PROPERTY(QObject *parts READ parts CONSTANT)
     Q_PROPERTY(QVariant rootIndex READ rootIndex WRITE setRootIndex NOTIFY rootIndexChanged)
     Q_CLASSINFO("DefaultProperty", "delegate")
-    Q_INTERFACES(QDeclarativeParserStatus)
+    Q_INTERFACES(QQmlParserStatus)
 public:
     QQuickVisualDataModel();
-    QQuickVisualDataModel(QDeclarativeContext *, QObject *parent=0);
+    QQuickVisualDataModel(QQmlContext *, QObject *parent=0);
     virtual ~QQuickVisualDataModel();
 
     void classBegin();
@@ -93,8 +93,8 @@ public:
     QVariant model() const;
     void setModel(const QVariant &);
 
-    QDeclarativeComponent *delegate() const;
-    void setDelegate(QDeclarativeComponent *);
+    QQmlComponent *delegate() const;
+    void setDelegate(QQmlComponent *);
 
     QVariant rootIndex() const;
     void setRootIndex(const QVariant &root);
@@ -117,7 +117,7 @@ public:
 
     QQuickVisualDataGroup *items();
     QQuickVisualDataGroup *persistedItems();
-    QDeclarativeListProperty<QQuickVisualDataGroup> groups();
+    QQmlListProperty<QQuickVisualDataGroup> groups();
     QObject *parts();
 
     bool event(QEvent *);
@@ -159,23 +159,23 @@ public:
     bool defaultInclude() const;
     void setDefaultInclude(bool include);
 
-    Q_INVOKABLE QDeclarativeV8Handle get(int index);
+    Q_INVOKABLE QQmlV8Handle get(int index);
 
 public Q_SLOTS:
-    void insert(QDeclarativeV8Function *);
-    void create(QDeclarativeV8Function *);
-    void resolve(QDeclarativeV8Function *);
-    void remove(QDeclarativeV8Function *);
-    void addGroups(QDeclarativeV8Function *);
-    void removeGroups(QDeclarativeV8Function *);
-    void setGroups(QDeclarativeV8Function *);
-    void move(QDeclarativeV8Function *);
+    void insert(QQmlV8Function *);
+    void create(QQmlV8Function *);
+    void resolve(QQmlV8Function *);
+    void remove(QQmlV8Function *);
+    void addGroups(QQmlV8Function *);
+    void removeGroups(QQmlV8Function *);
+    void setGroups(QQmlV8Function *);
+    void move(QQmlV8Function *);
 
 Q_SIGNALS:
     void countChanged();
     void nameChanged();
     void defaultIncludeChanged();
-    void changed(const QDeclarativeV8Handle &removed, const QDeclarativeV8Handle &inserted);
+    void changed(const QQmlV8Handle &removed, const QQmlV8Handle &inserted);
 private:
     Q_DECLARE_PRIVATE(QQuickVisualDataGroup)
 };
@@ -194,7 +194,7 @@ public:
         , m_previousGroups(0)
         , m_modelChanged(false)
     {
-        QDeclarative_setParent_noEvent(this, parent);
+        QQml_setParent_noEvent(this, parent);
     }
     ~QQuickVisualDataModelAttached() { attachedProperties.remove(parent()); }
 
@@ -229,7 +229,7 @@ Q_SIGNALS:
 public:
     QQuickVisualDataModelItem *m_cacheItem;
     int m_previousGroups;
-    int m_previousIndex[QDeclarativeListCompositor::MaximumGroupCount];
+    int m_previousIndex[QQuickListCompositor::MaximumGroupCount];
     bool m_modelChanged;
 
     static QHash<QObject*, QQuickVisualDataModelAttached*> attachedProperties;
diff --git a/src/quick/items/qquickvisualdatamodel_p_p.h b/src/quick/items/qquickvisualdatamodel_p_p.h
index 1fb23d78bb..c53ed5bdbb 100644
--- a/src/quick/items/qquickvisualdatamodel_p_p.h
+++ b/src/quick/items/qquickvisualdatamodel_p_p.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
@@ -44,10 +44,10 @@
 
 #include "qquickvisualdatamodel_p.h"
 
-#include <QtDeclarative/qdeclarativecontext.h>
-#include <QtDeclarative/qdeclarativeincubator.h>
+#include <QtQml/qqmlcontext.h>
+#include <QtQml/qqmlincubator.h>
 
-#include <private/qdeclarativeopenmetaobject_p.h>
+#include <private/qqmlopenmetaobject_p.h>
 
 //
 //  W A R N I N G
@@ -62,9 +62,9 @@
 
 QT_BEGIN_NAMESPACE
 
-typedef QDeclarativeListCompositor Compositor;
+typedef QQuickListCompositor Compositor;
 
-class QQuickVisualDataModelItemMetaType : public QDeclarativeRefCount
+class QQuickVisualDataModelItemMetaType : public QQmlRefCount
 {
 public:
     QQuickVisualDataModelItemMetaType(QV8Engine *engine, QQuickVisualDataModel *model, const QStringList &groupNames);
@@ -85,7 +85,7 @@ public:
             v8::Local<v8::String>, v8::Local<v8::Value> value, const v8::AccessorInfo &info);
     static v8::Handle<v8::Value> get_index(v8::Local<v8::String>, const v8::AccessorInfo &info);
 
-    QDeclarativeGuard<QQuickVisualDataModel> model;
+    QQmlGuard<QQuickVisualDataModel> model;
     const int groupCount;
     const int memberPropertyOffset;
     const int indexPropertyOffset;
@@ -136,8 +136,8 @@ Q_SIGNALS:
 
 public:
     QQuickVisualDataModelItemMetaType * const metaType;
-    QDeclarativeGuard<QQuickVisualAdaptorModel> model;
-    QDeclarativeGuard<QObject> object;
+    QQmlGuard<QQuickVisualAdaptorModel> model;
+    QQmlGuard<QObject> object;
     QQuickVisualDataModelAttached *attached;
     v8::Persistent<v8::Object> indexHandle;
     v8::Persistent<v8::Value> modelHandle;
@@ -145,17 +145,17 @@ public:
     int objectRef;
     int scriptRef;
     int groups;
-    int index[QDeclarativeListCompositor::MaximumGroupCount];
+    int index[QQuickListCompositor::MaximumGroupCount];
     QVDMIncubationTask *incubationTask;
 };
 
 
 class QQuickVisualDataModelPrivate;
-class QVDMIncubationTask : public QDeclarativeIncubator
+class QVDMIncubationTask : public QQmlIncubator
 {
 public:
     QVDMIncubationTask(QQuickVisualDataModelPrivate *l, IncubationMode mode)
-        : QDeclarativeIncubator(mode)
+        : QQmlIncubator(mode)
         , incubating(0)
         , incubatingContext(0)
         , vdm(l) {}
@@ -164,7 +164,7 @@ public:
     virtual void setInitialState(QObject *);
 
     QQuickVisualDataModelItem *incubating;
-    QDeclarativeContext *incubatingContext;
+    QQmlContext *incubatingContext;
 
 private:
     QQuickVisualDataModelPrivate *vdm;
@@ -174,10 +174,10 @@ private:
 class QQuickVisualDataGroupEmitter
 {
 public:
-    virtual void emitModelUpdated(const QDeclarativeChangeSet &changeSet, bool reset) = 0;
-    virtual void createdPackage(int, QDeclarativePackage *) {}
-    virtual void initPackage(int, QDeclarativePackage *) {}
-    virtual void destroyingPackage(QDeclarativePackage *) {}
+    virtual void emitModelUpdated(const QQuickChangeSet &changeSet, bool reset) = 0;
+    virtual void createdPackage(int, QQuickPackage *) {}
+    virtual void initPackage(int, QQuickPackage *) {}
+    virtual void destroyingPackage(QQuickPackage *) {}
 
     QIntrusiveListNode emitterNode;
 };
@@ -198,18 +198,18 @@ public:
     void emitChanges(QV8Engine *engine);
     void emitModelUpdated(bool reset);
 
-    void createdPackage(int index, QDeclarativePackage *package);
-    void initPackage(int index, QDeclarativePackage *package);
-    void destroyingPackage(QDeclarativePackage *package);
+    void createdPackage(int index, QQuickPackage *package);
+    void initPackage(int index, QQuickPackage *package);
+    void destroyingPackage(QQuickPackage *package);
 
     bool parseIndex(const v8::Local<v8::Value> &value, int *index, Compositor::Group *group) const;
     bool parseGroupArgs(
-            QDeclarativeV8Function *args, Compositor::Group *group, int *index, int *count, int *groups) const;
+            QQmlV8Function *args, Compositor::Group *group, int *index, int *count, int *groups) const;
 
     Compositor::Group group;
-    QDeclarativeGuard<QQuickVisualDataModel> model;
+    QQmlGuard<QQuickVisualDataModel> model;
     QQuickVisualDataGroupEmitterList emitters;
-    QDeclarativeChangeSet changeSet;
+    QQuickChangeSet changeSet;
     QString name;
     bool defaultInclude;
 };
@@ -220,7 +220,7 @@ class QQuickVisualDataModelPrivate : public QObjectPrivate, public QQuickVisualD
 {
     Q_DECLARE_PUBLIC(QQuickVisualDataModel)
 public:
-    QQuickVisualDataModelPrivate(QDeclarativeContext *);
+    QQuickVisualDataModelPrivate(QQmlContext *);
     ~QQuickVisualDataModelPrivate();
 
     static QQuickVisualDataModelPrivate *get(QQuickVisualDataModel *m) {
@@ -234,13 +234,13 @@ public:
     void destroy(QObject *object);
     QQuickVisualDataModel::ReleaseFlags release(QObject *object);
     QString stringValue(Compositor::Group group, int index, const QString &name);
-    void emitCreatedPackage(QQuickVisualDataModelItem *cacheItem, QDeclarativePackage *package);
-    void emitInitPackage(QQuickVisualDataModelItem *cacheItem, QDeclarativePackage *package);
+    void emitCreatedPackage(QQuickVisualDataModelItem *cacheItem, QQuickPackage *package);
+    void emitInitPackage(QQuickVisualDataModelItem *cacheItem, QQuickPackage *package);
     void emitCreatedItem(QQuickVisualDataModelItem *cacheItem, QQuickItem *item) {
         emit q_func()->createdItem(cacheItem->index[m_compositorGroup], item); }
     void emitInitItem(QQuickVisualDataModelItem *cacheItem, QQuickItem *item) {
         emit q_func()->initItem(cacheItem->index[m_compositorGroup], item); }
-    void emitDestroyingPackage(QDeclarativePackage *package);
+    void emitDestroyingPackage(QQuickPackage *package);
     void emitDestroyingItem(QQuickItem *item) { emit q_func()->destroyingItem(item); }
 
     void updateFilterGroup();
@@ -251,12 +251,12 @@ public:
 
     void itemsInserted(
             const QVector<Compositor::Insert> &inserts,
-            QVarLengthArray<QVector<QDeclarativeChangeSet::Insert>, Compositor::MaximumGroupCount> *translatedInserts,
+            QVarLengthArray<QVector<QQuickChangeSet::Insert>, Compositor::MaximumGroupCount> *translatedInserts,
             QHash<int, QList<QQuickVisualDataModelItem *> > *movedItems = 0);
     void itemsInserted(const QVector<Compositor::Insert> &inserts);
     void itemsRemoved(
             const QVector<Compositor::Remove> &removes,
-            QVarLengthArray<QVector<QDeclarativeChangeSet::Remove>, Compositor::MaximumGroupCount> *translatedRemoves,
+            QVarLengthArray<QVector<QQuickChangeSet::Remove>, Compositor::MaximumGroupCount> *translatedRemoves,
             QHash<int, QList<QQuickVisualDataModelItem *> > *movedItems = 0);
     void itemsRemoved(const QVector<Compositor::Remove> &removes);
     void itemsMoved(
@@ -264,29 +264,29 @@ public:
     void itemsChanged(const QVector<Compositor::Change> &changes);
     template <typename T> static v8::Local<v8::Array> buildChangeList(const QVector<T> &changes);
     void emitChanges();
-    void emitModelUpdated(const QDeclarativeChangeSet &changeSet, bool reset);
+    void emitModelUpdated(const QQuickChangeSet &changeSet, bool reset);
 
     bool insert(Compositor::insert_iterator &before, const v8::Local<v8::Object> &object, int groups);
 
-    static void group_append(QDeclarativeListProperty<QQuickVisualDataGroup> *property, QQuickVisualDataGroup *group);
-    static int group_count(QDeclarativeListProperty<QQuickVisualDataGroup> *property);
-    static QQuickVisualDataGroup *group_at(QDeclarativeListProperty<QQuickVisualDataGroup> *property, int index);
+    static void group_append(QQmlListProperty<QQuickVisualDataGroup> *property, QQuickVisualDataGroup *group);
+    static int group_count(QQmlListProperty<QQuickVisualDataGroup> *property);
+    static QQuickVisualDataGroup *group_at(QQmlListProperty<QQuickVisualDataGroup> *property, int index);
 
     void releaseIncubator(QVDMIncubationTask *incubationTask);
-    void incubatorStatusChanged(QVDMIncubationTask *incubationTask, QDeclarativeIncubator::Status status);
+    void incubatorStatusChanged(QVDMIncubationTask *incubationTask, QQmlIncubator::Status status);
     void setInitialState(QVDMIncubationTask *incubationTask, QObject *o);
 
     QQuickVisualAdaptorModel *m_adaptorModel;
-    QDeclarativeComponent *m_delegate;
+    QQmlComponent *m_delegate;
     QQuickVisualDataModelItemMetaType *m_cacheMetaType;
-    QDeclarativeGuard<QDeclarativeContext> m_context;
+    QQmlGuard<QQmlContext> m_context;
 
     QList<QQuickVisualDataModelItem *> m_cache;
     QQuickVisualDataModelParts *m_parts;
     QQuickVisualDataGroupEmitterList m_pendingParts;
 
-    QDeclarativeListCompositor m_compositor;
-    QDeclarativeListCompositor::Group m_compositorGroup;
+    QQuickListCompositor m_compositor;
+    QQuickListCompositor::Group m_compositorGroup;
     bool m_complete : 1;
     bool m_delegateValidated : 1;
     bool m_reset : 1;
@@ -321,7 +321,7 @@ public:
     void setFilterGroup(const QString &group);
     void resetFilterGroup();
     void updateFilterGroup();
-    void updateFilterGroup(Compositor::Group group, const QDeclarativeChangeSet &changeSet);
+    void updateFilterGroup(Compositor::Group group, const QQuickChangeSet &changeSet);
 
     int count() const;
     bool isValid() const;
@@ -332,18 +332,18 @@ public:
 
     int indexOf(QQuickItem *item, QObject *objectContext) const;
 
-    void emitModelUpdated(const QDeclarativeChangeSet &changeSet, bool reset);
+    void emitModelUpdated(const QQuickChangeSet &changeSet, bool reset);
 
-    void createdPackage(int index, QDeclarativePackage *package);
-    void initPackage(int index, QDeclarativePackage *package);
-    void destroyingPackage(QDeclarativePackage *package);
+    void createdPackage(int index, QQuickPackage *package);
+    void initPackage(int index, QQuickPackage *package);
+    void destroyingPackage(QQuickPackage *package);
 
 Q_SIGNALS:
     void filterGroupChanged();
 
 private:
     QQuickVisualDataModel *m_model;
-    QHash<QObject *, QDeclarativePackage *> m_packaged;
+    QHash<QObject *, QQuickPackage *> m_packaged;
     QString m_part;
     QString m_filterGroup;
     QList<QByteArray> m_watchedRoles;
@@ -353,11 +353,11 @@ private:
 
 class QMetaPropertyBuilder;
 
-class QQuickVisualDataModelPartsMetaObject : public QDeclarativeOpenMetaObject
+class QQuickVisualDataModelPartsMetaObject : public QQmlOpenMetaObject
 {
 public:
     QQuickVisualDataModelPartsMetaObject(QObject *parent)
-    : QDeclarativeOpenMetaObject(parent) {}
+    : QQmlOpenMetaObject(parent) {}
 
     virtual void propertyCreated(int, QMetaPropertyBuilder &);
     virtual QVariant initialValue(int);
@@ -387,15 +387,15 @@ private:
     QQuickVisualDataModelItemMetaType *metaType;
 };
 
-class QQuickVisualDataModelContext : public QDeclarativeContext
+class QQuickVisualDataModelContext : public QQmlContext
 {
     Q_OBJECT
 public:
     QQuickVisualDataModelContext(
             QQuickVisualDataModelItem *cacheItem,
-            QDeclarativeContext *parentContext,
+            QQmlContext *parentContext,
             QObject *parent = 0)
-        : QDeclarativeContext(parentContext, parent)
+        : QQmlContext(parentContext, parent)
         , cacheItem(cacheItem)
     {
         ++cacheItem->scriptRef;
diff --git a/src/quick/items/qquickvisualitemmodel.cpp b/src/quick/items/qquickvisualitemmodel.cpp
index 2a24e3946c..b1fce55d7d 100644
--- a/src/quick/items/qquickvisualitemmodel.cpp
+++ b/src/quick/items/qquickvisualitemmodel.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
@@ -43,11 +43,11 @@
 #include "qquickitem.h"
 
 #include <QtCore/qcoreapplication.h>
-#include <QtDeclarative/qdeclarativecontext.h>
-#include <QtDeclarative/qdeclarativeengine.h>
+#include <QtQml/qqmlcontext.h>
+#include <QtQml/qqmlengine.h>
 
-#include <private/qdeclarativechangeset_p.h>
-#include <private/qdeclarativeglobal_p.h>
+#include <private/qquickchangeset_p.h>
+#include <private/qqmlglobal_p.h>
 #include <private/qobject_p.h>
 
 #include <QtCore/qhash.h>
@@ -64,18 +64,18 @@ class QQuickVisualItemModelPrivate : public QObjectPrivate
 public:
     QQuickVisualItemModelPrivate() : QObjectPrivate() {}
 
-    static void children_append(QDeclarativeListProperty<QQuickItem> *prop, QQuickItem *item) {
-        QDeclarative_setParent_noEvent(item, prop->object);
+    static void children_append(QQmlListProperty<QQuickItem> *prop, QQuickItem *item) {
+        QQml_setParent_noEvent(item, prop->object);
         static_cast<QQuickVisualItemModelPrivate *>(prop->data)->children.append(Item(item));
         static_cast<QQuickVisualItemModelPrivate *>(prop->data)->itemAppended();
         static_cast<QQuickVisualItemModelPrivate *>(prop->data)->emitChildrenChanged();
     }
 
-    static int children_count(QDeclarativeListProperty<QQuickItem> *prop) {
+    static int children_count(QQmlListProperty<QQuickItem> *prop) {
         return static_cast<QQuickVisualItemModelPrivate *>(prop->data)->children.count();
     }
 
-    static QQuickItem *children_at(QDeclarativeListProperty<QQuickItem> *prop, int index) {
+    static QQuickItem *children_at(QQmlListProperty<QQuickItem> *prop, int index) {
         return static_cast<QQuickVisualItemModelPrivate *>(prop->data)->children.at(index).item;
     }
 
@@ -83,7 +83,7 @@ public:
         Q_Q(QQuickVisualItemModel);
         QQuickVisualItemModelAttached *attached = QQuickVisualItemModelAttached::properties(children.last().item);
         attached->setIndex(children.count()-1);
-        QDeclarativeChangeSet changeSet;
+        QQuickChangeSet changeSet;
         changeSet.insert(children.count() - 1, 1);
         emit q->modelUpdated(changeSet, false);
         emit q->countChanged();
@@ -165,10 +165,10 @@ QQuickVisualItemModel::QQuickVisualItemModel(QObject *parent)
     It is attached to each instance of the delegate.
 */
 
-QDeclarativeListProperty<QQuickItem> QQuickVisualItemModel::children()
+QQmlListProperty<QQuickItem> QQuickVisualItemModel::children()
 {
     Q_D(QQuickVisualItemModel);
-    return QDeclarativeListProperty<QQuickItem>(this, d, d->children_append,
+    return QQmlListProperty<QQuickItem>(this, d, d->children_append,
                                                       d->children_count, d->children_at);
 }
 
@@ -206,7 +206,7 @@ QQuickVisualModel::ReleaseFlags QQuickVisualItemModel::release(QQuickItem *item)
         if (d->children[idx].deref()) {
             // XXX todo - the original did item->scene()->removeItem().  Why?
             item->setParentItem(0);
-            QDeclarative_setParent_noEvent(item, this);
+            QQml_setParent_noEvent(item, this);
         }
     }
     return 0;
@@ -217,7 +217,7 @@ QString QQuickVisualItemModel::stringValue(int index, const QString &name)
     Q_D(QQuickVisualItemModel);
     if (index < 0 || index >= d->children.count())
         return QString();
-    return QDeclarativeEngine::contextForObject(d->children.at(index).item)->contextProperty(name).toString();
+    return QQmlEngine::contextForObject(d->children.at(index).item)->contextProperty(name).toString();
 }
 
 int QQuickVisualItemModel::indexOf(QQuickItem *item, QObject *) const
diff --git a/src/quick/items/qquickvisualitemmodel_p.h b/src/quick/items/qquickvisualitemmodel_p.h
index f1c9d066be..9f90a29125 100644
--- a/src/quick/items/qquickvisualitemmodel_p.h
+++ b/src/quick/items/qquickvisualitemmodel_p.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
@@ -43,7 +43,7 @@
 #define QQUICKVISUALITEMMODEL_P_H
 
 #include <QtQuick/qtquickglobal.h>
-#include <QtDeclarative/qdeclarative.h>
+#include <QtQml/qqml.h>
 #include <QtCore/qobject.h>
 
 QT_BEGIN_HEADER
@@ -51,7 +51,7 @@ QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE
 
 class QQuickItem;
-class QDeclarativeChangeSet;
+class QQuickChangeSet;
 
 class Q_QUICK_EXPORT QQuickVisualModel : public QObject
 {
@@ -76,7 +76,7 @@ public:
 
 Q_SIGNALS:
     void countChanged();
-    void modelUpdated(const QDeclarativeChangeSet &changeSet, bool reset);
+    void modelUpdated(const QQuickChangeSet &changeSet, bool reset);
     void createdItem(int index, QQuickItem *item);
     void initItem(int index, QQuickItem *item);
     void destroyingItem(QQuickItem *item);
@@ -96,7 +96,7 @@ class Q_QUICK_EXPORT QQuickVisualItemModel : public QQuickVisualModel
     Q_OBJECT
     Q_DECLARE_PRIVATE(QQuickVisualItemModel)
 
-    Q_PROPERTY(QDeclarativeListProperty<QQuickItem> children READ children NOTIFY childrenChanged DESIGNABLE false)
+    Q_PROPERTY(QQmlListProperty<QQuickItem> children READ children NOTIFY childrenChanged DESIGNABLE false)
     Q_CLASSINFO("DefaultProperty", "children")
 
 public:
@@ -112,7 +112,7 @@ public:
 
     virtual int indexOf(QQuickItem *item, QObject *objectContext) const;
 
-    QDeclarativeListProperty<QQuickItem> children();
+    QQmlListProperty<QQuickItem> children();
 
     static QQuickVisualItemModelAttached *qmlAttachedProperties(QObject *obj);
 
diff --git a/src/quick/items/qquickwindowmanager.cpp b/src/quick/items/qquickwindowmanager.cpp
index b999e6f85d..55f11bf4c0 100644
--- a/src/quick/items/qquickwindowmanager.cpp
+++ b/src/quick/items/qquickwindowmanager.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
@@ -51,7 +51,7 @@
 #include <QtGui/QPlatformIntegration>
 #include <QtGui/private/qguiapplication_p.h>
 
-#include <QtDeclarative/private/qdeclarativeglobal_p.h>
+#include <QtQml/private/qqmlglobal_p.h>
 
 #include <QtQuick/QQuickCanvas>
 #include <QtQuick/private/qquickcanvas_p.h>
diff --git a/src/quick/items/qquickwindowmanager_p.h b/src/quick/items/qquickwindowmanager_p.h
index 014b38132e..ed972b5c76 100644
--- a/src/quick/items/qquickwindowmanager_p.h
+++ b/src/quick/items/qquickwindowmanager_p.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
diff --git a/src/quick/items/qquickwindowmodule_p.h b/src/quick/items/qquickwindowmodule_p.h
index b02d29e776..e0da37d22c 100644
--- a/src/quick/items/qquickwindowmodule_p.h
+++ b/src/quick/items/qquickwindowmodule_p.h
@@ -42,7 +42,7 @@
 #ifndef QQUICKWINDOWMODULE_H
 #define QQUICKWINDOWMODULE_H
 
-#include <qdeclarative.h>
+#include <qqml.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/quick/items/syncexcludes b/src/quick/items/syncexcludes
index ab7a374a5b..19e41ce643 100644
--- a/src/quick/items/syncexcludes
+++ b/src/quick/items/syncexcludes
@@ -6,6 +6,6 @@ qdeclarativelayoutitem.cpp
 qdeclarativelayoutitem_p.h
 qdeclarativefocuspanel.cpp
 qdeclarativefocuspanel_p.h
-qdeclarativepath_p.h
-qdeclarativepath_p_p.h
+qquickpath_p.h
+qquickpath_p_p.h
 qdeclarativepath.cpp
diff --git a/src/quick/particles/qquickcumulativedirection.cpp b/src/quick/particles/qquickcumulativedirection.cpp
index 0a2ac92a64..4f4a2cc46e 100644
--- a/src/quick/particles/qquickcumulativedirection.cpp
+++ b/src/quick/particles/qquickcumulativedirection.cpp
@@ -54,9 +54,9 @@ QQuickCumulativeDirection::QQuickCumulativeDirection(QObject *parent):QQuickDire
 {
 }
 
-QDeclarativeListProperty<QQuickDirection> QQuickCumulativeDirection::directions()
+QQmlListProperty<QQuickDirection> QQuickCumulativeDirection::directions()
 {
-    return QDeclarativeListProperty<QQuickDirection>(this, m_directions);//TODO: Proper list property
+    return QQmlListProperty<QQuickDirection>(this, m_directions);//TODO: Proper list property
 }
 
 const QPointF QQuickCumulativeDirection::sample(const QPointF &from)
diff --git a/src/quick/particles/qquickcumulativedirection_p.h b/src/quick/particles/qquickcumulativedirection_p.h
index 2fbb41151e..38663572fb 100644
--- a/src/quick/particles/qquickcumulativedirection_p.h
+++ b/src/quick/particles/qquickcumulativedirection_p.h
@@ -42,7 +42,7 @@
 #ifndef QQuickCUMULATIVEDIRECTION_P_H
 #define QQuickCUMULATIVEDIRECTION_P_H
 #include "qquickdirection_p.h"
-#include <QDeclarativeListProperty>
+#include <QQmlListProperty>
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -50,11 +50,11 @@ QT_BEGIN_NAMESPACE
 class QQuickCumulativeDirection : public QQuickDirection
 {
     Q_OBJECT
-    Q_PROPERTY(QDeclarativeListProperty<QQuickDirection> directions READ directions)
+    Q_PROPERTY(QQmlListProperty<QQuickDirection> directions READ directions)
     Q_CLASSINFO("DefaultProperty", "directions")
 public:
     explicit QQuickCumulativeDirection(QObject *parent = 0);
-    QDeclarativeListProperty<QQuickDirection> directions();
+    QQmlListProperty<QQuickDirection> directions();
     const QPointF sample(const QPointF &from);
 private:
     QList<QQuickDirection*> m_directions;
diff --git a/src/quick/particles/qquickcustomaffector.cpp b/src/quick/particles/qquickcustomaffector.cpp
index d890400a92..7c991c7352 100644
--- a/src/quick/particles/qquickcustomaffector.cpp
+++ b/src/quick/particles/qquickcustomaffector.cpp
@@ -41,8 +41,8 @@
 
 #include "qquickcustomaffector_p.h"
 #include <private/qv8engine_p.h>
-#include <private/qdeclarativeengine_p.h>
-#include <QDeclarativeEngine>
+#include <private/qqmlengine_p.h>
+#include <QQmlEngine>
 #include <QDebug>
 QT_BEGIN_NAMESPACE
 
@@ -102,7 +102,7 @@ QQuickCustomAffector::QQuickCustomAffector(QQuickItem *parent) :
 
 bool QQuickCustomAffector::isAffectConnected()
 {
-    static int idx = QObjectPrivate::get(this)->signalIndex("affectParticles(QDeclarativeV8Handle,qreal)");
+    static int idx = QObjectPrivate::get(this)->signalIndex("affectParticles(QQmlV8Handle,qreal)");
     return QObjectPrivate::get(this)->isSignalConnected(idx);
 }
 
@@ -130,14 +130,14 @@ void QQuickCustomAffector::affectSystem(qreal dt)
         dt = 1.0;
 
     v8::HandleScope handle_scope;
-    v8::Context::Scope scope(QDeclarativeEnginePrivate::getV8Engine(qmlEngine(this))->context());
+    v8::Context::Scope scope(QQmlEnginePrivate::getV8Engine(qmlEngine(this))->context());
     v8::Handle<v8::Array> array = v8::Array::New(toAffect.size());
     for (int i=0; i<toAffect.size(); i++)
         array->Set(i, toAffect[i]->v8Value().toHandle());
 
     if (dt >= simulationCutoff || dt <= simulationDelta) {
         affectProperties(toAffect, dt);
-        emit affectParticles(QDeclarativeV8Handle::fromHandle(array), dt);
+        emit affectParticles(QQmlV8Handle::fromHandle(array), dt);
     } else {
         int realTime = m_system->timeInt;
         m_system->timeInt -= dt * 1000.0;
@@ -145,12 +145,12 @@ void QQuickCustomAffector::affectSystem(qreal dt)
             m_system->timeInt += simulationDelta * 1000.0;
             dt -= simulationDelta;
             affectProperties(toAffect, simulationDelta);
-            emit affectParticles(QDeclarativeV8Handle::fromHandle(array), simulationDelta);
+            emit affectParticles(QQmlV8Handle::fromHandle(array), simulationDelta);
         }
         m_system->timeInt = realTime;
         if (dt > 0.0) {
             affectProperties(toAffect, dt);
-            emit affectParticles(QDeclarativeV8Handle::fromHandle(array), dt);
+            emit affectParticles(QQmlV8Handle::fromHandle(array), dt);
         }
     }
 
diff --git a/src/quick/particles/qquickcustomaffector_p.h b/src/quick/particles/qquickcustomaffector_p.h
index c38f53cb01..e831dbce1d 100644
--- a/src/quick/particles/qquickcustomaffector_p.h
+++ b/src/quick/particles/qquickcustomaffector_p.h
@@ -101,7 +101,7 @@ public:
 
 
 signals:
-    void affectParticles(QDeclarativeV8Handle particles, qreal dt);
+    void affectParticles(QQmlV8Handle particles, qreal dt);
 
     void positionChanged(QQuickDirection * arg);
 
diff --git a/src/quick/particles/qquickcustomparticle.cpp b/src/quick/particles/qquickcustomparticle.cpp
index 347b749ca6..3647e5bfc5 100644
--- a/src/quick/particles/qquickcustomparticle.cpp
+++ b/src/quick/particles/qquickcustomparticle.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
diff --git a/src/quick/particles/qquickcustomparticle_p.h b/src/quick/particles/qquickcustomparticle_p.h
index c121141621..29f3d19657 100644
--- a/src/quick/particles/qquickcustomparticle_p.h
+++ b/src/quick/particles/qquickcustomparticle_p.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
diff --git a/src/quick/particles/qquickimageparticle.cpp b/src/quick/particles/qquickimageparticle.cpp
index 2936935f3f..bf576b0a54 100644
--- a/src/quick/particles/qquickimageparticle.cpp
+++ b/src/quick/particles/qquickimageparticle.cpp
@@ -53,8 +53,8 @@
 #include <QOpenGLFunctions>
 #include <QtQuick/qsgengine.h>
 #include <QtQuick/private/qsgtexture_p.h>
-#include <private/qdeclarativeglobal_p.h>
-#include <QtDeclarative/qdeclarativeinfo.h>
+#include <private/qqmlglobal_p.h>
+#include <QtQml/qqmlinfo.h>
 #include <cmath>
 
 QT_BEGIN_NAMESPACE
@@ -834,9 +834,9 @@ QQuickImageParticle::~QQuickImageParticle()
 {
 }
 
-QDeclarativeListProperty<QQuickSprite> QQuickImageParticle::sprites()
+QQmlListProperty<QQuickSprite> QQuickImageParticle::sprites()
 {
-    return QDeclarativeListProperty<QQuickSprite>(this, &m_sprites, spriteAppend, spriteCount, spriteAt, spriteClear);
+    return QQmlListProperty<QQuickSprite>(this, &m_sprites, spriteAppend, spriteCount, spriteAt, spriteClear);
 }
 
 void QQuickImageParticle::setImage(const QUrl &image)
diff --git a/src/quick/particles/qquickimageparticle_p.h b/src/quick/particles/qquickimageparticle_p.h
index a0f1595192..401f4609b0 100644
--- a/src/quick/particles/qquickimageparticle_p.h
+++ b/src/quick/particles/qquickimageparticle_p.h
@@ -43,8 +43,8 @@
 #define ULTRAPARTICLE_H
 #include "qquickparticlepainter_p.h"
 #include "qquickdirection_p.h"
-#include <private/qdeclarativepixmapcache_p.h>
-#include <QDeclarativeListProperty>
+#include <private/qquickpixmapcache_p.h>
+#include <QQmlListProperty>
 #include <QtQuick/qsgsimplematerial.h>
 #include <QtGui/qcolor.h>
 
@@ -150,7 +150,7 @@ class QQuickImageParticle : public QQuickParticlePainter
 {
     Q_OBJECT
     Q_PROPERTY(QUrl source READ image WRITE setImage NOTIFY imageChanged)
-    Q_PROPERTY(QDeclarativeListProperty<QQuickSprite> sprites READ sprites)
+    Q_PROPERTY(QQmlListProperty<QQuickSprite> sprites READ sprites)
     Q_PROPERTY(Status status READ status NOTIFY statusChanged)
     //### Is it worth having progress like Image has?
     //Q_PROPERTY(qreal progress READ progress NOTIFY progressChanged)
@@ -193,7 +193,7 @@ public:
 
     enum Status { Null, Ready, Loading, Error };
 
-    QDeclarativeListProperty<QQuickSprite> sprites();
+    QQmlListProperty<QQuickSprite> sprites();
     QQuickStochasticEngine* spriteEngine() {return m_spriteEngine;}
 
     enum EntryEffect {
@@ -357,7 +357,7 @@ private slots:
 private:
     struct ImageData {
         QUrl source;
-        QDeclarativePixmap pix;
+        QQuickPixmap pix;
     };
     ImageData *m_image;
     ImageData *m_colorTable;
diff --git a/src/quick/particles/qquickitemparticle.cpp b/src/quick/particles/qquickitemparticle.cpp
index db9e3d1519..571ca7f8a5 100644
--- a/src/quick/particles/qquickitemparticle.cpp
+++ b/src/quick/particles/qquickitemparticle.cpp
@@ -43,7 +43,7 @@
 #include <private/qquickvisualitemmodel_p.h>
 #include <QtQuick/qsgnode.h>
 #include <QTimer>
-#include <QDeclarativeComponent>
+#include <QQmlComponent>
 #include <QDebug>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/quick/particles/qquickitemparticle_p.h b/src/quick/particles/qquickitemparticle_p.h
index df104a5644..d02659889e 100644
--- a/src/quick/particles/qquickitemparticle_p.h
+++ b/src/quick/particles/qquickitemparticle_p.h
@@ -44,7 +44,7 @@
 #include "qquickparticlepainter_p.h"
 #include <QPointer>
 #include <QSet>
-#include <private/qdeclarativeanimation_p_p.h>
+#include <private/qquickanimation_p_p.h>
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -56,7 +56,7 @@ class QQuickItemParticle : public QQuickParticlePainter
 {
     Q_OBJECT
     Q_PROPERTY(bool fade READ fade WRITE setFade NOTIFY fadeChanged)
-    Q_PROPERTY(QDeclarativeComponent* delegate READ delegate WRITE setDelegate NOTIFY delegateChanged)
+    Q_PROPERTY(QQmlComponent* delegate READ delegate WRITE setDelegate NOTIFY delegateChanged)
 public:
     explicit QQuickItemParticle(QQuickItem *parent = 0);
     ~QQuickItemParticle();
@@ -66,7 +66,7 @@ public:
     virtual QSGNode *updatePaintNode(QSGNode *, UpdatePaintNodeData *);
 
     static QQuickItemParticleAttached *qmlAttachedProperties(QObject *object);
-    QDeclarativeComponent* delegate() const
+    QQmlComponent* delegate() const
     {
         return m_delegate;
     }
@@ -74,7 +74,7 @@ public:
 signals:
     void fadeChanged();
 
-    void delegateChanged(QDeclarativeComponent* arg);
+    void delegateChanged(QQmlComponent* arg);
 
 public slots:
     //TODO: Add a follow mode, where moving the delegate causes the logical particle to go with it?
@@ -84,7 +84,7 @@ public slots:
     void give(QQuickItem* item);//give from modelparticle
 
     void setFade(bool arg){if (arg == m_fade) return; m_fade = arg; emit fadeChanged();}
-    void setDelegate(QDeclarativeComponent* arg)
+    void setDelegate(QQmlComponent* arg)
     {
         if (m_delegate != arg) {
             m_delegate = arg;
@@ -108,7 +108,7 @@ private:
     QSet<QQuickItem*> m_stasis;
     qreal m_lastT;
     int m_activeCount;
-    QDeclarativeComponent* m_delegate;
+    QQmlComponent* m_delegate;
 
     typedef QTickAnimationProxy<QQuickItemParticle, &QQuickItemParticle::tick> Clock;
     Clock *clock;
diff --git a/src/quick/particles/qquickmaskextruder.cpp b/src/quick/particles/qquickmaskextruder.cpp
index 3ed2eb953c..5c27cc7678 100644
--- a/src/quick/particles/qquickmaskextruder.cpp
+++ b/src/quick/particles/qquickmaskextruder.cpp
@@ -40,8 +40,8 @@
 ****************************************************************************/
 
 #include "qquickmaskextruder_p.h"
-#include <QtDeclarative/qdeclarative.h>
-#include <QtDeclarative/qdeclarativeinfo.h>
+#include <QtQml/qqml.h>
+#include <QtQml/qqmlinfo.h>
 #include <QImage>
 #include <QDebug>
 QT_BEGIN_NAMESPACE
diff --git a/src/quick/particles/qquickmaskextruder_p.h b/src/quick/particles/qquickmaskextruder_p.h
index 0c9f10b1b2..94b30720c1 100644
--- a/src/quick/particles/qquickmaskextruder_p.h
+++ b/src/quick/particles/qquickmaskextruder_p.h
@@ -42,7 +42,7 @@
 #ifndef MASKEXTRUDER_H
 #define MASKEXTRUDER_H
 #include "qquickparticleextruder_p.h"
-#include <private/qdeclarativepixmapcache_p.h>
+#include <private/qquickpixmapcache_p.h>
 #include <QUrl>
 #include <QImage>
 
@@ -81,7 +81,7 @@ private:
     void ensureInitialized(const QRectF &r);
     int m_lastWidth;
     int m_lastHeight;
-    QDeclarativePixmap m_pix;
+    QQuickPixmap m_pix;
     QImage m_img;
     QList<QPointF> m_mask;//TODO: More memory efficient datastructures
     //Perhaps just the mask for the largest bounds is stored, and interpolate up
diff --git a/src/quick/particles/qquickparticleemitter.cpp b/src/quick/particles/qquickparticleemitter.cpp
index 88c062b1f5..1625f1498a 100644
--- a/src/quick/particles/qquickparticleemitter.cpp
+++ b/src/quick/particles/qquickparticleemitter.cpp
@@ -40,7 +40,7 @@
 ****************************************************************************/
 
 #include "qquickparticleemitter_p.h"
-#include <private/qdeclarativeengine_p.h>
+#include <private/qqmlengine_p.h>
 QT_BEGIN_NAMESPACE
 
 
@@ -253,7 +253,7 @@ QQuickParticleEmitter::~QQuickParticleEmitter()
 
 bool QQuickParticleEmitter::isEmitConnected()
 {
-    static int idx = QObjectPrivate::get(this)->signalIndex("emitParticles(QDeclarativeV8Handle)");
+    static int idx = QObjectPrivate::get(this)->signalIndex("emitParticles(QQmlV8Handle)");
     return QObjectPrivate::get(this)->isSignalConnected(idx);
 }
 
@@ -479,12 +479,12 @@ void QQuickParticleEmitter::emitWindow(int timeStamp)
 
     if (isEmitConnected()) {
         v8::HandleScope handle_scope;
-        v8::Context::Scope scope(QDeclarativeEnginePrivate::getV8Engine(qmlEngine(this))->context());
+        v8::Context::Scope scope(QQmlEnginePrivate::getV8Engine(qmlEngine(this))->context());
         v8::Handle<v8::Array> array = v8::Array::New(toEmit.size());
         for (int i=0; i<toEmit.size(); i++)
             array->Set(i, toEmit[i]->v8Value().toHandle());
 
-        emitParticles(QDeclarativeV8Handle::fromHandle(array));//A chance for arbitrary JS changes
+        emitParticles(QQmlV8Handle::fromHandle(array));//A chance for arbitrary JS changes
     }
     foreach (QQuickParticleData* d, toEmit)
             m_system->emitParticle(d);
diff --git a/src/quick/particles/qquickparticleemitter_p.h b/src/quick/particles/qquickparticleemitter_p.h
index 684a06be83..bb010a13e9 100644
--- a/src/quick/particles/qquickparticleemitter_p.h
+++ b/src/quick/particles/qquickparticleemitter_p.h
@@ -121,7 +121,7 @@ public:
     void setSpeedFromMovement(qreal s);
     virtual void componentComplete();
 signals:
-    void emitParticles(QDeclarativeV8Handle particles);
+    void emitParticles(QQmlV8Handle particles);
     void particlesPerSecondChanged(qreal);
     void particleDurationChanged(int);
     void enabledChanged(bool);
diff --git a/src/quick/particles/qquickparticlegroup.cpp b/src/quick/particles/qquickparticlegroup.cpp
index ae0876f549..c4b230f5e9 100644
--- a/src/quick/particles/qquickparticlegroup.cpp
+++ b/src/quick/particles/qquickparticlegroup.cpp
@@ -96,20 +96,20 @@ QQuickParticleGroup::QQuickParticleGroup(QObject* parent)
 
 }
 
-void delayedRedirect(QDeclarativeListProperty<QObject> *prop, QObject *value)
+void delayedRedirect(QQmlListProperty<QObject> *prop, QObject *value)
 {
     QQuickParticleGroup* pg = qobject_cast<QQuickParticleGroup*>(prop->object);
     if (pg)
         pg->delayRedirect(value);
 }
 
-QDeclarativeListProperty<QObject> QQuickParticleGroup::particleChildren()
+QQmlListProperty<QObject> QQuickParticleGroup::particleChildren()
 {
     QQuickParticleSystem* system = qobject_cast<QQuickParticleSystem*>(parent());
     if (system)
-        return QDeclarativeListProperty<QObject>(this, 0, &QQuickParticleSystem::statePropertyRedirect);
+        return QQmlListProperty<QObject>(this, 0, &QQuickParticleSystem::statePropertyRedirect);
     else
-        return QDeclarativeListProperty<QObject>(this, 0, &delayedRedirect);
+        return QQmlListProperty<QObject>(this, 0, &delayedRedirect);
 }
 
 void QQuickParticleGroup::setSystem(QQuickParticleSystem* arg)
diff --git a/src/quick/particles/qquickparticlegroup_p.h b/src/quick/particles/qquickparticlegroup_p.h
index f9703e8e03..774eb8df86 100644
--- a/src/quick/particles/qquickparticlegroup_p.h
+++ b/src/quick/particles/qquickparticlegroup_p.h
@@ -42,11 +42,11 @@
 #define QQuickPARTICLEGROUP
 #include <private/qquickspriteengine_p.h>
 #include "qquickparticlesystem_p.h"
-#include "qdeclarativeparserstatus.h"
+#include "qqmlparserstatus.h"
 
 QT_BEGIN_NAMESPACE
 
-class QQuickParticleGroup : public QQuickStochasticState, public QDeclarativeParserStatus
+class QQuickParticleGroup : public QQuickStochasticState, public QQmlParserStatus
 {
     Q_OBJECT
     //### Would setting limits per group be useful? Or clutter the API?
@@ -55,14 +55,14 @@ class QQuickParticleGroup : public QQuickStochasticState, public QDeclarativePar
     Q_PROPERTY(QQuickParticleSystem* system READ system WRITE setSystem NOTIFY systemChanged)
 
     //Intercept children requests and assign to the group & system
-    Q_PROPERTY(QDeclarativeListProperty<QObject> particleChildren READ particleChildren DESIGNABLE false)//### Hidden property for in-state system definitions - ought not to be used in actual "Sprite" states
+    Q_PROPERTY(QQmlListProperty<QObject> particleChildren READ particleChildren DESIGNABLE false)//### Hidden property for in-state system definitions - ought not to be used in actual "Sprite" states
     Q_CLASSINFO("DefaultProperty", "particleChildren")
-    Q_INTERFACES(QDeclarativeParserStatus)
+    Q_INTERFACES(QQmlParserStatus)
 
 public:
     explicit QQuickParticleGroup(QObject* parent = 0);
 
-    QDeclarativeListProperty<QObject> particleChildren();
+    QQmlListProperty<QObject> particleChildren();
 
     int maximumAlive() const
     {
diff --git a/src/quick/particles/qquickparticlesmodule_p.h b/src/quick/particles/qquickparticlesmodule_p.h
index 9ef9cd4711..6d16f00c15 100644
--- a/src/quick/particles/qquickparticlesmodule_p.h
+++ b/src/quick/particles/qquickparticlesmodule_p.h
@@ -42,7 +42,7 @@
 #ifndef QQuickPARTICLESMODULE_H
 #define QQuickPARTICLESMODULE_H
 
-#include <qdeclarative.h>
+#include <qqml.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/quick/particles/qquickparticlesystem.cpp b/src/quick/particles/qquickparticlesystem.cpp
index 2a79b8d90d..6dc6d21812 100644
--- a/src/quick/particles/qquickparticlesystem.cpp
+++ b/src/quick/particles/qquickparticlesystem.cpp
@@ -50,7 +50,8 @@
 #include "qquickparticlegroup_p.h"
 
 #include "qquicktrailemitter_p.h"//###For auto-follow on states, perhaps should be in emitter?
-#include <private/qdeclarativeengine_p.h>
+#include <private/qqmlengine_p.h>
+#include <private/qqmlglobal_p.h>
 #include <cmath>
 #include <QDebug>
 
@@ -524,10 +525,10 @@ void QQuickParticleData::clone(const QQuickParticleData& other)
     animationOwner = other.animationOwner;
 }
 
-QDeclarativeV8Handle QQuickParticleData::v8Value()
+QQmlV8Handle QQuickParticleData::v8Value()
 {
     if (!v8Datum)
-        v8Datum = new QQuickV8ParticleData(QDeclarativeEnginePrivate::getV8Engine(qmlEngine(system)), this);
+        v8Datum = new QQuickV8ParticleData(QQmlEnginePrivate::getV8Engine(qmlEngine(system)), this);
     return v8Datum->v8Value();
 }
 //sets the x accleration without affecting the instantaneous x velocity or position
@@ -782,7 +783,7 @@ void QQuickParticleSystem::setPaused(bool arg) {
     }
 }
 
-void QQuickParticleSystem::statePropertyRedirect(QDeclarativeListProperty<QObject> *prop, QObject *value)
+void QQuickParticleSystem::statePropertyRedirect(QQmlListProperty<QObject> *prop, QObject *value)
 {
     //Hooks up automatic state-associated stuff
     QQuickParticleSystem* sys = qobject_cast<QQuickParticleSystem*>(prop->object->parent());
diff --git a/src/quick/particles/qquickparticlesystem_p.h b/src/quick/particles/qquickparticlesystem_p.h
index 68b29b9bc0..387219f720 100644
--- a/src/quick/particles/qquickparticlesystem_p.h
+++ b/src/quick/particles/qquickparticlesystem_p.h
@@ -50,8 +50,8 @@
 #include <QSignalMapper>
 #include <private/qquicksprite_p.h>
 #include <QAbstractAnimation>
-#include <QtDeclarative/qdeclarative.h>
-#include <private/qv8engine_p.h> //For QDeclarativeV8Handle
+#include <QtQml/qqml.h>
+#include <private/qv8engine_p.h> //For QQmlV8Handle
 
 QT_BEGIN_HEADER
 
@@ -224,7 +224,7 @@ public:
     float lifeLeft();
     float curSize();
     void clone(const QQuickParticleData& other);//Not =, leaves meta-data like index
-    QDeclarativeV8Handle v8Value();
+    QQmlV8Handle v8Value();
     void extendLife(float time);
 private:
     QQuickV8ParticleData* v8Datum;
@@ -314,7 +314,7 @@ public:
     void registerParticleAffector(QQuickParticleAffector* a);
     void registerParticleGroup(QQuickParticleGroup* g);
 
-    static void statePropertyRedirect(QDeclarativeListProperty<QObject> *prop, QObject *value);
+    static void statePropertyRedirect(QQmlListProperty<QObject> *prop, QObject *value);
     static void stateRedirect(QQuickParticleGroup* group, QQuickParticleSystem* sys, QObject *value);
     bool isPaused() const
     {
diff --git a/src/quick/particles/qquickspritegoal_p.h b/src/quick/particles/qquickspritegoal_p.h
index 1986bc9431..44b022ffee 100644
--- a/src/quick/particles/qquickspritegoal_p.h
+++ b/src/quick/particles/qquickspritegoal_p.h
@@ -42,7 +42,7 @@
 #ifndef SPRITEGOALAFFECTOR_H
 #define SPRITEGOALAFFECTOR_H
 #include "qquickparticleaffector_p.h"
-#include <QtDeclarative/qdeclarativeinfo.h>
+#include <QtQml/qqmlinfo.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/quick/particles/qquicktrailemitter.cpp b/src/quick/particles/qquicktrailemitter.cpp
index f5bc78c9cb..e5317567fe 100644
--- a/src/quick/particles/qquicktrailemitter.cpp
+++ b/src/quick/particles/qquicktrailemitter.cpp
@@ -40,7 +40,7 @@
 ****************************************************************************/
 
 #include "qquicktrailemitter_p.h"
-#include <private/qdeclarativeengine_p.h>
+#include <private/qqmlengine_p.h>
 #include <cmath>
 QT_BEGIN_NAMESPACE
 
@@ -126,7 +126,7 @@ QQuickTrailEmitter::QQuickTrailEmitter(QQuickItem *parent) :
 
 bool QQuickTrailEmitter::isEmitFollowConnected()
 {
-    static int idx = QObjectPrivate::get(this)->signalIndex("emitFollowParticles(QDeclarativeV8Handle,QDeclarativeV8Handle)");
+    static int idx = QObjectPrivate::get(this)->signalIndex("emitFollowParticles(QQmlV8Handle,QQmlV8Handle)");
     return QObjectPrivate::get(this)->isSignalConnected(idx);
 }
 
@@ -265,15 +265,15 @@ void QQuickTrailEmitter::emitWindow(int timeStamp)
 
         if (isEmitConnected() || isEmitFollowConnected()) {
             v8::HandleScope handle_scope;
-            v8::Context::Scope scope(QDeclarativeEnginePrivate::getV8Engine(qmlEngine(this))->context());
+            v8::Context::Scope scope(QQmlEnginePrivate::getV8Engine(qmlEngine(this))->context());
             v8::Handle<v8::Array> array = v8::Array::New(toEmit.size());
             for (int i=0; i<toEmit.size(); i++)
                 array->Set(i, toEmit[i]->v8Value().toHandle());
 
             if (isEmitFollowConnected())
-                emitFollowParticles(QDeclarativeV8Handle::fromHandle(array), d->v8Value());//A chance for many arbitrary JS changes
+                emitFollowParticles(QQmlV8Handle::fromHandle(array), d->v8Value());//A chance for many arbitrary JS changes
             else if (isEmitConnected())
-                emitParticles(QDeclarativeV8Handle::fromHandle(array));//A chance for arbitrary JS changes
+                emitParticles(QQmlV8Handle::fromHandle(array));//A chance for arbitrary JS changes
         }
         foreach (QQuickParticleData* d, toEmit)
             m_system->emitParticle(d);
diff --git a/src/quick/particles/qquicktrailemitter_p.h b/src/quick/particles/qquicktrailemitter_p.h
index bae6464c37..f68dd05441 100644
--- a/src/quick/particles/qquicktrailemitter_p.h
+++ b/src/quick/particles/qquicktrailemitter_p.h
@@ -93,7 +93,7 @@ public:
     }
 
 signals:
-    void emitFollowParticles(QDeclarativeV8Handle particles, QDeclarativeV8Handle followed);
+    void emitFollowParticles(QQmlV8Handle particles, QQmlV8Handle followed);
 
     void particlesPerParticlePerSecondChanged(int arg);
 
diff --git a/src/quick/particles/qquickturbulence_p.h b/src/quick/particles/qquickturbulence_p.h
index cc0dfdc845..f453140cd2 100644
--- a/src/quick/particles/qquickturbulence_p.h
+++ b/src/quick/particles/qquickturbulence_p.h
@@ -42,7 +42,7 @@
 #ifndef TURBULENCEAFFECTOR_H
 #define TURBULENCEAFFECTOR_H
 #include "qquickparticleaffector_p.h"
-#include <QDeclarativeListProperty>
+#include <QQmlListProperty>
 
 QT_BEGIN_HEADER
 
diff --git a/src/quick/particles/qquickv8particledata.cpp b/src/quick/particles/qquickv8particledata.cpp
index 0a3e9f6e95..3a387d8f01 100644
--- a/src/quick/particles/qquickv8particledata.cpp
+++ b/src/quick/particles/qquickv8particledata.cpp
@@ -497,9 +497,9 @@ QQuickV8ParticleData::~QQuickV8ParticleData()
     qPersistentDispose(m_v8Value);
 }
 
-QDeclarativeV8Handle QQuickV8ParticleData::v8Value()
+QQmlV8Handle QQuickV8ParticleData::v8Value()
 {
-    return QDeclarativeV8Handle::fromHandle(m_v8Value);
+    return QQmlV8Handle::fromHandle(m_v8Value);
 }
 
 QT_END_NAMESPACE
diff --git a/src/quick/particles/qquickv8particledata_p.h b/src/quick/particles/qquickv8particledata_p.h
index 4afcd89cf9..9b4a4435cc 100644
--- a/src/quick/particles/qquickv8particledata_p.h
+++ b/src/quick/particles/qquickv8particledata_p.h
@@ -53,7 +53,7 @@ class QQuickV8ParticleData {
 public:
     QQuickV8ParticleData(QV8Engine*,QQuickParticleData*);
     ~QQuickV8ParticleData();
-    QDeclarativeV8Handle v8Value();
+    QQmlV8Handle v8Value();
 private:
     v8::Persistent<v8::Object> m_v8Value;
 };
diff --git a/src/quick/qtquick2.cpp b/src/quick/qtquick2.cpp
index f1417260b9..621c3ff18e 100644
--- a/src/quick/qtquick2.cpp
+++ b/src/quick/qtquick2.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
@@ -40,32 +40,32 @@
 ****************************************************************************/
 
 #include "qtquick2_p.h"
-#include <private/qdeclarativeengine_p.h>
-#include <private/qdeclarativeutilmodule_p.h>
-#include <private/qdeclarativevaluetype_p.h>
+#include <private/qqmlengine_p.h>
+#include <private/qquickutilmodule_p.h>
+#include <private/qqmlvaluetype_p.h>
 #include <private/qquickitemsmodule_p.h>
 #include <private/qquickparticlesmodule_p.h>
 #include <private/qquickwindowmodule_p.h>
 
-#include <private/qdeclarativeenginedebugservice_p.h>
-#include <private/qdeclarativedebugstatesdelegate_p.h>
-#include <private/qdeclarativebinding_p.h>
-#include <private/qdeclarativecontext_p.h>
-#include <QtQuick/private/qdeclarativepropertychanges_p.h>
-#include <QtQuick/private/qdeclarativestate_p.h>
-#include <qdeclarativeproperty.h>
+#include <private/qqmlenginedebugservice_p.h>
+#include <private/qqmldebugstatesdelegate_p.h>
+#include <private/qqmlbinding_p.h>
+#include <private/qqmlcontext_p.h>
+#include <QtQuick/private/qquickpropertychanges_p.h>
+#include <QtQuick/private/qquickstate_p.h>
+#include <qqmlproperty.h>
 #include <QtCore/QWeakPointer>
 
 QT_BEGIN_NAMESPACE
 
-class QDeclarativeQtQuick2DebugStatesDelegate : public QDeclarativeDebugStatesDelegate
+class QQmlQtQuick2DebugStatesDelegate : public QQmlDebugStatesDelegate
 {
 public:
-    QDeclarativeQtQuick2DebugStatesDelegate();
-    virtual ~QDeclarativeQtQuick2DebugStatesDelegate();
-    virtual void buildStatesList(QDeclarativeContext *ctxt, bool cleanList);
-    virtual void updateBinding(QDeclarativeContext *context,
-                               const QDeclarativeProperty &property,
+    QQmlQtQuick2DebugStatesDelegate();
+    virtual ~QQmlQtQuick2DebugStatesDelegate();
+    virtual void buildStatesList(QQmlContext *ctxt, bool cleanList);
+    virtual void updateBinding(QQmlContext *context,
+                               const QQmlProperty &property,
                                const QVariant &expression, bool isLiteralValue,
                                const QString &fileName, int line, int column,
                                bool *isBaseState);
@@ -79,37 +79,37 @@ public:
 private:
     void buildStatesList(QObject *obj);
 
-    QList<QWeakPointer<QDeclarativeState> > m_allStates;
+    QList<QWeakPointer<QQuickState> > m_allStates;
 };
 
-QDeclarativeQtQuick2DebugStatesDelegate::QDeclarativeQtQuick2DebugStatesDelegate()
+QQmlQtQuick2DebugStatesDelegate::QQmlQtQuick2DebugStatesDelegate()
 {
 }
 
-QDeclarativeQtQuick2DebugStatesDelegate::~QDeclarativeQtQuick2DebugStatesDelegate()
+QQmlQtQuick2DebugStatesDelegate::~QQmlQtQuick2DebugStatesDelegate()
 {
 }
 
-void QDeclarativeQtQuick2DebugStatesDelegate::buildStatesList(QDeclarativeContext *ctxt, bool cleanList)
+void QQmlQtQuick2DebugStatesDelegate::buildStatesList(QQmlContext *ctxt, bool cleanList)
 {
     if (cleanList)
         m_allStates.clear();
 
-    QDeclarativeContextPrivate *ctxtPriv = QDeclarativeContextPrivate::get(ctxt);
+    QQmlContextPrivate *ctxtPriv = QQmlContextPrivate::get(ctxt);
     for (int ii = 0; ii < ctxtPriv->instances.count(); ++ii) {
         buildStatesList(ctxtPriv->instances.at(ii));
     }
 
-    QDeclarativeContextData *child = QDeclarativeContextData::get(ctxt)->childContexts;
+    QQmlContextData *child = QQmlContextData::get(ctxt)->childContexts;
     while (child) {
-        buildStatesList(child->asQDeclarativeContext());
+        buildStatesList(child->asQQmlContext());
         child = child->nextChild;
     }
 }
 
-void QDeclarativeQtQuick2DebugStatesDelegate::buildStatesList(QObject *obj)
+void QQmlQtQuick2DebugStatesDelegate::buildStatesList(QObject *obj)
 {
-    if (QDeclarativeState *state = qobject_cast<QDeclarativeState *>(obj)) {
+    if (QQuickState *state = qobject_cast<QQuickState *>(obj)) {
         m_allStates.append(state);
     }
 
@@ -119,23 +119,23 @@ void QDeclarativeQtQuick2DebugStatesDelegate::buildStatesList(QObject *obj)
     }
 }
 
-void QDeclarativeQtQuick2DebugStatesDelegate::updateBinding(QDeclarativeContext *context,
-                                                            const QDeclarativeProperty &property,
+void QQmlQtQuick2DebugStatesDelegate::updateBinding(QQmlContext *context,
+                                                            const QQmlProperty &property,
                                                             const QVariant &expression, bool isLiteralValue,
                                                             const QString &fileName, int line, int column,
                                                             bool *inBaseState)
 {
     QObject *object = property.object();
     QString propertyName = property.name();
-    foreach (QWeakPointer<QDeclarativeState> statePointer, m_allStates) {
-        if (QDeclarativeState *state = statePointer.data()) {
+    foreach (QWeakPointer<QQuickState> statePointer, m_allStates) {
+        if (QQuickState *state = statePointer.data()) {
             // here we assume that the revert list on itself defines the base state
             if (state->isStateActive() && state->containsPropertyInRevertList(object, propertyName)) {
                 *inBaseState = false;
 
-                QDeclarativeBinding *newBinding = 0;
+                QQmlBinding *newBinding = 0;
                 if (!isLiteralValue) {
-                    newBinding = new QDeclarativeBinding(expression.toString(), object, context);
+                    newBinding = new QQmlBinding(expression.toString(), object, context);
                     newBinding->setTarget(property);
                     newBinding->setNotifyOnValueChanged(true);
                     newBinding->setSourceLocation(fileName, line, column);
@@ -150,12 +150,12 @@ void QDeclarativeQtQuick2DebugStatesDelegate::updateBinding(QDeclarativeContext
     }
 }
 
-bool QDeclarativeQtQuick2DebugStatesDelegate::setBindingForInvalidProperty(QObject *object,
+bool QQmlQtQuick2DebugStatesDelegate::setBindingForInvalidProperty(QObject *object,
                                                                            const QString &propertyName,
                                                                            const QVariant &expression,
                                                                            bool isLiteralValue)
 {
-    if (QDeclarativePropertyChanges *propertyChanges = qobject_cast<QDeclarativePropertyChanges *>(object)) {
+    if (QQuickPropertyChanges *propertyChanges = qobject_cast<QQuickPropertyChanges *>(object)) {
         if (isLiteralValue)
             propertyChanges->changeValue(propertyName, expression);
         else
@@ -166,26 +166,26 @@ bool QDeclarativeQtQuick2DebugStatesDelegate::setBindingForInvalidProperty(QObje
     }
 }
 
-void QDeclarativeQtQuick2DebugStatesDelegate::resetBindingForInvalidProperty(QObject *object, const QString &propertyName)
+void QQmlQtQuick2DebugStatesDelegate::resetBindingForInvalidProperty(QObject *object, const QString &propertyName)
 {
-    if (QDeclarativePropertyChanges *propertyChanges = qobject_cast<QDeclarativePropertyChanges *>(object)) {
+    if (QQuickPropertyChanges *propertyChanges = qobject_cast<QQuickPropertyChanges *>(object)) {
         propertyChanges->removeProperty(propertyName);
     }
 }
 
 
-void QDeclarativeQtQuick2Module::defineModule()
+void QQmlQtQuick2Module::defineModule()
 {
-    QDeclarativeUtilModule::defineModule();
-    QDeclarativeEnginePrivate::defineModule();
+    QQuickUtilModule::defineModule();
+    QQmlEnginePrivate::defineModule();
     QQuickItemsModule::defineModule();
     QQuickParticlesModule::defineModule();
     QQuickWindowModule::defineModule();
-    QDeclarativeValueTypeFactory::registerValueTypes();
+    QQmlValueTypeFactory::registerValueTypes();
 
-    if (QDeclarativeEngineDebugService::isDebuggingEnabled()) {
-        QDeclarativeEngineDebugService::instance()->setStatesDelegate(
-                    new QDeclarativeQtQuick2DebugStatesDelegate);
+    if (QQmlEngineDebugService::isDebuggingEnabled()) {
+        QQmlEngineDebugService::instance()->setStatesDelegate(
+                    new QQmlQtQuick2DebugStatesDelegate);
     }
 }
 
diff --git a/src/quick/qtquick2_p.h b/src/quick/qtquick2_p.h
index e242179dfa..4032991776 100644
--- a/src/quick/qtquick2_p.h
+++ b/src/quick/qtquick2_p.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
@@ -48,7 +48,7 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-class Q_QUICK_PRIVATE_EXPORT QDeclarativeQtQuick2Module
+class Q_QUICK_PRIVATE_EXPORT QQmlQtQuick2Module
 {
 public:
     static void defineModule();
diff --git a/src/quick/qtquickglobal.h b/src/quick/qtquickglobal.h
index b5eb962a2f..a1d8c714e8 100644
--- a/src/quick/qtquickglobal.h
+++ b/src/quick/qtquickglobal.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
diff --git a/src/quick/qtquickglobal_p.h b/src/quick/qtquickglobal_p.h
index 539040727c..34ceeedff9 100644
--- a/src/quick/qtquickglobal_p.h
+++ b/src/quick/qtquickglobal_p.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
diff --git a/src/quick/quick.pro b/src/quick/quick.pro
index b445e84248..0f0120ee79 100644
--- a/src/quick/quick.pro
+++ b/src/quick/quick.pro
@@ -6,13 +6,13 @@ CONFIG += module
 CONFIG += dll warn_on
 MODULE_PRI = ../../modules/qt_quick.pri
 
-QT = core-private gui gui-private network v8-private declarative declarative-private
+QT = core-private gui gui-private network v8-private qml qml-private
 
 DEFINES   += QT_BUILD_QUICK_LIB QT_NO_URL_CAST_FROM_STRING QT_NO_INTEGER_EVENT_COORDINATES
 win32-msvc*:DEFINES *= _CRT_SECURE_NO_WARNINGS
 solaris-cc*:QMAKE_CXXFLAGS_RELEASE -= -O2
 
-exists("qdeclarative_enable_gcov") {
+exists("qqml_enable_gcov") {
     QMAKE_CXXFLAGS = -fprofile-arcs -ftest-coverage -fno-elide-constructors
     LIBS += -lgcov
 }
@@ -36,12 +36,12 @@ mac {
     # FIXME: this is a workaround for broken qmake logic in qtAddModule()
     # This function refuses to use frameworks unless the framework exists on
     # the filesystem at the time qmake is run, resulting in a build failure
-    # if QtQuick is qmaked before QtDeclarative is built and frameworks are
+    # if QtQuick is qmaked before QtQml is built and frameworks are
     # in use. qtAddLibrary() contains correct logic to deal with this, so
     # we'll explicitly call that for now.
     load(qt)
-    LIBS -= -lQtDeclarative        # in non-framework builds, these should be re-added
-    LIBS -= -lQtDeclarative_debug  # within the qtAddLibrary if appropriate, so no
-    qtAddLibrary(QtDeclarative)    # harm done :)
+    LIBS -= -lQtQml        # in non-framework builds, these should be re-added
+    LIBS -= -lQtQml_debug  # within the qtAddLibrary if appropriate, so no
+    qtAddLibrary(QtQml)    # harm done :)
 }
 
diff --git a/src/quick/scenegraph/coreapi/qsgdefaultrenderer.cpp b/src/quick/scenegraph/coreapi/qsgdefaultrenderer.cpp
index bbea89b5ca..7a219585b0 100644
--- a/src/quick/scenegraph/coreapi/qsgdefaultrenderer.cpp
+++ b/src/quick/scenegraph/coreapi/qsgdefaultrenderer.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
diff --git a/src/quick/scenegraph/coreapi/qsgdefaultrenderer_p.h b/src/quick/scenegraph/coreapi/qsgdefaultrenderer_p.h
index 9ef7622a78..3896d03a80 100644
--- a/src/quick/scenegraph/coreapi/qsgdefaultrenderer_p.h
+++ b/src/quick/scenegraph/coreapi/qsgdefaultrenderer_p.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
diff --git a/src/quick/scenegraph/coreapi/qsggeometry_p.h b/src/quick/scenegraph/coreapi/qsggeometry_p.h
index 0b388ec587..63defa2374 100644
--- a/src/quick/scenegraph/coreapi/qsggeometry_p.h
+++ b/src/quick/scenegraph/coreapi/qsggeometry_p.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
diff --git a/src/quick/scenegraph/coreapi/qsgmaterial.cpp b/src/quick/scenegraph/coreapi/qsgmaterial.cpp
index 308a1fa572..9f0def4706 100644
--- a/src/quick/scenegraph/coreapi/qsgmaterial.cpp
+++ b/src/quick/scenegraph/coreapi/qsgmaterial.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
diff --git a/src/quick/scenegraph/coreapi/qsgmaterial.h b/src/quick/scenegraph/coreapi/qsgmaterial.h
index 0673aca814..450dd2866f 100644
--- a/src/quick/scenegraph/coreapi/qsgmaterial.h
+++ b/src/quick/scenegraph/coreapi/qsgmaterial.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
diff --git a/src/quick/scenegraph/coreapi/qsgnode.cpp b/src/quick/scenegraph/coreapi/qsgnode.cpp
index 88afac7ecc..b9eec27e82 100644
--- a/src/quick/scenegraph/coreapi/qsgnode.cpp
+++ b/src/quick/scenegraph/coreapi/qsgnode.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
diff --git a/src/quick/scenegraph/coreapi/qsgnode.h b/src/quick/scenegraph/coreapi/qsgnode.h
index b7e776dbe8..6ba110b91e 100644
--- a/src/quick/scenegraph/coreapi/qsgnode.h
+++ b/src/quick/scenegraph/coreapi/qsgnode.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
diff --git a/src/quick/scenegraph/coreapi/qsgnodeupdater.cpp b/src/quick/scenegraph/coreapi/qsgnodeupdater.cpp
index 2562e8d56c..78f007af80 100644
--- a/src/quick/scenegraph/coreapi/qsgnodeupdater.cpp
+++ b/src/quick/scenegraph/coreapi/qsgnodeupdater.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
diff --git a/src/quick/scenegraph/coreapi/qsgnodeupdater_p.h b/src/quick/scenegraph/coreapi/qsgnodeupdater_p.h
index 0ad9d76586..c1df82332e 100644
--- a/src/quick/scenegraph/coreapi/qsgnodeupdater_p.h
+++ b/src/quick/scenegraph/coreapi/qsgnodeupdater_p.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
diff --git a/src/quick/scenegraph/coreapi/qsgrenderer.cpp b/src/quick/scenegraph/coreapi/qsgrenderer.cpp
index 9737fbb294..30dd449b4b 100644
--- a/src/quick/scenegraph/coreapi/qsgrenderer.cpp
+++ b/src/quick/scenegraph/coreapi/qsgrenderer.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
diff --git a/src/quick/scenegraph/coreapi/qsgrenderer_p.h b/src/quick/scenegraph/coreapi/qsgrenderer_p.h
index 9b177abd6b..9d2402d727 100644
--- a/src/quick/scenegraph/coreapi/qsgrenderer_p.h
+++ b/src/quick/scenegraph/coreapi/qsgrenderer_p.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
diff --git a/src/quick/scenegraph/qsgadaptationlayer.cpp b/src/quick/scenegraph/qsgadaptationlayer.cpp
index 08e85ab8cb..dcb1e5b8be 100644
--- a/src/quick/scenegraph/qsgadaptationlayer.cpp
+++ b/src/quick/scenegraph/qsgadaptationlayer.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
diff --git a/src/quick/scenegraph/qsgadaptationlayer_p.h b/src/quick/scenegraph/qsgadaptationlayer_p.h
index 39566c96ac..47dfdb4d8c 100644
--- a/src/quick/scenegraph/qsgadaptationlayer_p.h
+++ b/src/quick/scenegraph/qsgadaptationlayer_p.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
diff --git a/src/quick/scenegraph/qsgcontext.cpp b/src/quick/scenegraph/qsgcontext.cpp
index 03afed293a..e38a4eef6a 100644
--- a/src/quick/scenegraph/qsgcontext.cpp
+++ b/src/quick/scenegraph/qsgcontext.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
@@ -50,13 +50,13 @@
 #include <QtQuick/private/qsgshareddistancefieldglyphcache_p.h>
 
 #include <QtQuick/private/qsgtexture_p.h>
-#include <QtQuick/private/qdeclarativepixmapcache_p.h>
+#include <QtQuick/private/qquickpixmapcache_p.h>
 
 #include <QGuiApplication>
 #include <QOpenGLContext>
 
-#include <QDeclarativeImageProvider>
-#include <private/qdeclarativeglobal_p.h>
+#include <QQmlImageProvider>
+#include <private/qqmlglobal_p.h>
 
 #include <QtQuick/private/qsgtexture_p.h>
 #include <QtGui/private/qguiapplication_p.h>
@@ -110,7 +110,7 @@ public:
     QOpenGLContext *gl;
 
     QHash<QSGMaterialType *, QSGMaterialShader *> materials;
-    QHash<QDeclarativeTextureFactory *, QSGTexture *> textures;
+    QHash<QQuickTextureFactory *, QSGTexture *> textures;
 
     QSGDistanceFieldGlyphCacheManager *distanceFieldCacheManager;
 
@@ -160,7 +160,7 @@ void QSGContext::invalidate()
 }
 
 
-QSGTexture *QSGContext::textureForFactory(QDeclarativeTextureFactory *factory, QQuickCanvas *canvas)
+QSGTexture *QSGContext::textureForFactory(QQuickTextureFactory *factory, QQuickCanvas *canvas)
 {
     Q_D(QSGContext);
     if (!factory)
@@ -168,7 +168,7 @@ QSGTexture *QSGContext::textureForFactory(QDeclarativeTextureFactory *factory, Q
 
     QSGTexture *texture = d->textures.value(factory);
     if (!texture) {
-        if (QDeclarativeDefaultTextureFactory *dtf = qobject_cast<QDeclarativeDefaultTextureFactory *>(factory))
+        if (QQuickDefaultTextureFactory *dtf = qobject_cast<QQuickDefaultTextureFactory *>(factory))
             texture = createTexture(dtf->image());
         else
             texture = factory->createTexture(canvas);
@@ -182,7 +182,7 @@ QSGTexture *QSGContext::textureForFactory(QDeclarativeTextureFactory *factory, Q
 void QSGContext::textureFactoryDestroyed(QObject *o)
 {
     Q_D(QSGContext);
-    QDeclarativeTextureFactory *f = static_cast<QDeclarativeTextureFactory *>(o);
+    QQuickTextureFactory *f = static_cast<QQuickTextureFactory *>(o);
 
     // This function will only be called on the scene graph thread, so it is
     // safe to directly delete the texture here.
diff --git a/src/quick/scenegraph/qsgcontext_p.h b/src/quick/scenegraph/qsgcontext_p.h
index 7fa3838db9..0f8b5ae1de 100644
--- a/src/quick/scenegraph/qsgcontext_p.h
+++ b/src/quick/scenegraph/qsgcontext_p.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
@@ -72,7 +72,7 @@ class QSGEngine;
 class QOpenGLContext;
 class QOpenGLFramebufferObject;
 
-class QDeclarativeTextureFactory;
+class QQuickTextureFactory;
 
 class Q_QUICK_EXPORT QSGContext : public QObject
 {
@@ -106,7 +106,7 @@ public:
 
     virtual QSurfaceFormat defaultSurfaceFormat() const;
 
-    QSGTexture *textureForFactory(QDeclarativeTextureFactory *factory, QQuickCanvas *canvas);
+    QSGTexture *textureForFactory(QQuickTextureFactory *factory, QQuickCanvas *canvas);
 
     static QSGContext *createDefaultContext();
 
@@ -121,7 +121,7 @@ public:
 
     virtual QAnimationDriver *createAnimationDriver(QObject *parent);
 
-    static QDeclarativeTextureFactory *createTextureFactoryFromImage(const QImage &image);
+    static QQuickTextureFactory *createTextureFactoryFromImage(const QImage &image);
 
 
 public slots:
diff --git a/src/quick/scenegraph/qsgcontextplugin.cpp b/src/quick/scenegraph/qsgcontextplugin.cpp
index 026afb2d56..d5f84553ba 100644
--- a/src/quick/scenegraph/qsgcontextplugin.cpp
+++ b/src/quick/scenegraph/qsgcontextplugin.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
@@ -136,7 +136,7 @@ QSGContext *QSGContext::createDefaultContext()
 
 
 /*!
-    \fn QDeclarativeTextureFactory *createTextureFactoryFromImage(const QImage &image)
+    \fn QQuickTextureFactory *createTextureFactoryFromImage(const QImage &image)
 
     Calls into the scene graph adaptation if available and creates a texture
     factory. The primary purpose of this function is to reimplement hardware
@@ -144,7 +144,7 @@ QSGContext *QSGContext::createDefaultContext()
     the image providers thread.
  */
 
-QDeclarativeTextureFactory *QSGContext::createTextureFactoryFromImage(const QImage &image)
+QQuickTextureFactory *QSGContext::createTextureFactoryFromImage(const QImage &image)
 {
     QSGAdaptionPluginData *plugin = contextFactory();
     if (plugin->factory)
diff --git a/src/quick/scenegraph/qsgcontextplugin_p.h b/src/quick/scenegraph/qsgcontextplugin_p.h
index 081e64ecdd..fa90873dc6 100644
--- a/src/quick/scenegraph/qsgcontextplugin_p.h
+++ b/src/quick/scenegraph/qsgcontextplugin_p.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
@@ -46,7 +46,7 @@
 #include <QtCore/qplugin.h>
 #include <QtCore/qfactoryinterface.h>
 
-#include <QDeclarativeImageProvider>
+#include <QQmlImageProvider>
 
 QT_BEGIN_HEADER
 
@@ -58,7 +58,7 @@ struct Q_QUICK_EXPORT QSGContextFactoryInterface : public QFactoryInterface
 {
     virtual QSGContext *create(const QString &key) const = 0;
 
-    virtual QDeclarativeTextureFactory *createTextureFactoryFromImage(const QImage &image) = 0;
+    virtual QQuickTextureFactory *createTextureFactoryFromImage(const QImage &image) = 0;
 };
 
 #define QSGContextFactoryInterface_iid \
@@ -76,7 +76,7 @@ public:
     virtual QStringList keys() const = 0;
     virtual QSGContext *create(const QString &key) const = 0;
 
-    virtual QDeclarativeTextureFactory *createTextureFactoryFromImage(const QImage &) { return 0; }
+    virtual QQuickTextureFactory *createTextureFactoryFromImage(const QImage &) { return 0; }
 };
 
 QT_END_NAMESPACE
diff --git a/src/quick/scenegraph/qsgdefaultdistancefieldglyphcache.cpp b/src/quick/scenegraph/qsgdefaultdistancefieldglyphcache.cpp
index ef5b24d1fd..73dcad6a47 100644
--- a/src/quick/scenegraph/qsgdefaultdistancefieldglyphcache.cpp
+++ b/src/quick/scenegraph/qsgdefaultdistancefieldglyphcache.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
diff --git a/src/quick/scenegraph/qsgdefaultdistancefieldglyphcache_p.h b/src/quick/scenegraph/qsgdefaultdistancefieldglyphcache_p.h
index 7fc2ee63d4..76e4a64e60 100644
--- a/src/quick/scenegraph/qsgdefaultdistancefieldglyphcache_p.h
+++ b/src/quick/scenegraph/qsgdefaultdistancefieldglyphcache_p.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
diff --git a/src/quick/scenegraph/qsgdefaultglyphnode.cpp b/src/quick/scenegraph/qsgdefaultglyphnode.cpp
index 70f561b61e..f84cd203fa 100644
--- a/src/quick/scenegraph/qsgdefaultglyphnode.cpp
+++ b/src/quick/scenegraph/qsgdefaultglyphnode.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
diff --git a/src/quick/scenegraph/qsgdefaultglyphnode_p.cpp b/src/quick/scenegraph/qsgdefaultglyphnode_p.cpp
index adc092b1c6..33f02a8ac0 100644
--- a/src/quick/scenegraph/qsgdefaultglyphnode_p.cpp
+++ b/src/quick/scenegraph/qsgdefaultglyphnode_p.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
diff --git a/src/quick/scenegraph/qsgdefaultglyphnode_p.h b/src/quick/scenegraph/qsgdefaultglyphnode_p.h
index b7c7e61014..66662d936a 100644
--- a/src/quick/scenegraph/qsgdefaultglyphnode_p.h
+++ b/src/quick/scenegraph/qsgdefaultglyphnode_p.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
diff --git a/src/quick/scenegraph/qsgdefaultglyphnode_p_p.h b/src/quick/scenegraph/qsgdefaultglyphnode_p_p.h
index 6b99ade8b0..d640d4cc2c 100644
--- a/src/quick/scenegraph/qsgdefaultglyphnode_p_p.h
+++ b/src/quick/scenegraph/qsgdefaultglyphnode_p_p.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
diff --git a/src/quick/scenegraph/qsgdefaultimagenode.cpp b/src/quick/scenegraph/qsgdefaultimagenode.cpp
index a6d6df8a00..e6855c4c78 100644
--- a/src/quick/scenegraph/qsgdefaultimagenode.cpp
+++ b/src/quick/scenegraph/qsgdefaultimagenode.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
diff --git a/src/quick/scenegraph/qsgdefaultimagenode_p.h b/src/quick/scenegraph/qsgdefaultimagenode_p.h
index 49c09dbfcd..9062aff2c2 100644
--- a/src/quick/scenegraph/qsgdefaultimagenode_p.h
+++ b/src/quick/scenegraph/qsgdefaultimagenode_p.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
diff --git a/src/quick/scenegraph/qsgdefaultrectanglenode.cpp b/src/quick/scenegraph/qsgdefaultrectanglenode.cpp
index cb385f6dd0..334bd4346f 100644
--- a/src/quick/scenegraph/qsgdefaultrectanglenode.cpp
+++ b/src/quick/scenegraph/qsgdefaultrectanglenode.cpp
@@ -4,7 +4,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
diff --git a/src/quick/scenegraph/qsgdefaultrectanglenode_p.h b/src/quick/scenegraph/qsgdefaultrectanglenode_p.h
index 49ca3771c1..2a0aa05b90 100644
--- a/src/quick/scenegraph/qsgdefaultrectanglenode_p.h
+++ b/src/quick/scenegraph/qsgdefaultrectanglenode_p.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
diff --git a/src/quick/scenegraph/qsgdistancefieldglyphnode.cpp b/src/quick/scenegraph/qsgdistancefieldglyphnode.cpp
index 7b30af85c3..79e5c3b0f4 100644
--- a/src/quick/scenegraph/qsgdistancefieldglyphnode.cpp
+++ b/src/quick/scenegraph/qsgdistancefieldglyphnode.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
diff --git a/src/quick/scenegraph/qsgdistancefieldglyphnode_p.cpp b/src/quick/scenegraph/qsgdistancefieldglyphnode_p.cpp
index e525d2a458..30b4a2f9b8 100644
--- a/src/quick/scenegraph/qsgdistancefieldglyphnode_p.cpp
+++ b/src/quick/scenegraph/qsgdistancefieldglyphnode_p.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
diff --git a/src/quick/scenegraph/qsgdistancefieldglyphnode_p.h b/src/quick/scenegraph/qsgdistancefieldglyphnode_p.h
index df5b8c6f6c..65ac2d499c 100644
--- a/src/quick/scenegraph/qsgdistancefieldglyphnode_p.h
+++ b/src/quick/scenegraph/qsgdistancefieldglyphnode_p.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
diff --git a/src/quick/scenegraph/qsgdistancefieldglyphnode_p_p.h b/src/quick/scenegraph/qsgdistancefieldglyphnode_p_p.h
index 0aee5bb340..c4af15a2af 100644
--- a/src/quick/scenegraph/qsgdistancefieldglyphnode_p_p.h
+++ b/src/quick/scenegraph/qsgdistancefieldglyphnode_p_p.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
diff --git a/src/quick/scenegraph/qsgflashnode.cpp b/src/quick/scenegraph/qsgflashnode.cpp
index 0988b23920..9359f5d9c5 100644
--- a/src/quick/scenegraph/qsgflashnode.cpp
+++ b/src/quick/scenegraph/qsgflashnode.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
diff --git a/src/quick/scenegraph/qsgflashnode_p.h b/src/quick/scenegraph/qsgflashnode_p.h
index 91614ceb0b..68ae6eecd1 100644
--- a/src/quick/scenegraph/qsgflashnode_p.h
+++ b/src/quick/scenegraph/qsgflashnode_p.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
diff --git a/src/quick/scenegraph/qsgpathsimplifier.cpp b/src/quick/scenegraph/qsgpathsimplifier.cpp
index 21e5d473f0..3adf8d71c7 100644
--- a/src/quick/scenegraph/qsgpathsimplifier.cpp
+++ b/src/quick/scenegraph/qsgpathsimplifier.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
diff --git a/src/quick/scenegraph/qsgpathsimplifier_p.h b/src/quick/scenegraph/qsgpathsimplifier_p.h
index e60dc4fe37..9e38c5ad00 100644
--- a/src/quick/scenegraph/qsgpathsimplifier_p.h
+++ b/src/quick/scenegraph/qsgpathsimplifier_p.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
diff --git a/src/quick/scenegraph/qsgshareddistancefieldglyphcache.cpp b/src/quick/scenegraph/qsgshareddistancefieldglyphcache.cpp
index e762898602..799d354400 100644
--- a/src/quick/scenegraph/qsgshareddistancefieldglyphcache.cpp
+++ b/src/quick/scenegraph/qsgshareddistancefieldglyphcache.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
diff --git a/src/quick/scenegraph/qsgshareddistancefieldglyphcache_p.h b/src/quick/scenegraph/qsgshareddistancefieldglyphcache_p.h
index cadf4bc55b..851f72d6a7 100644
--- a/src/quick/scenegraph/qsgshareddistancefieldglyphcache_p.h
+++ b/src/quick/scenegraph/qsgshareddistancefieldglyphcache_p.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
diff --git a/src/quick/scenegraph/util/qsgareaallocator.cpp b/src/quick/scenegraph/util/qsgareaallocator.cpp
index 635f38fa5e..415037a7b5 100644
--- a/src/quick/scenegraph/util/qsgareaallocator.cpp
+++ b/src/quick/scenegraph/util/qsgareaallocator.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
diff --git a/src/quick/scenegraph/util/qsgareaallocator_p.h b/src/quick/scenegraph/util/qsgareaallocator_p.h
index cab4824c56..998f7ef4d1 100644
--- a/src/quick/scenegraph/util/qsgareaallocator_p.h
+++ b/src/quick/scenegraph/util/qsgareaallocator_p.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
diff --git a/src/quick/scenegraph/util/qsgdistancefieldutil.cpp b/src/quick/scenegraph/util/qsgdistancefieldutil.cpp
index be4673bdca..caca610fe2 100644
--- a/src/quick/scenegraph/util/qsgdistancefieldutil.cpp
+++ b/src/quick/scenegraph/util/qsgdistancefieldutil.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
diff --git a/src/quick/scenegraph/util/qsgdistancefieldutil_p.h b/src/quick/scenegraph/util/qsgdistancefieldutil_p.h
index 23da1d121f..cf805e7ff6 100644
--- a/src/quick/scenegraph/util/qsgdistancefieldutil_p.h
+++ b/src/quick/scenegraph/util/qsgdistancefieldutil_p.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
diff --git a/src/quick/scenegraph/util/qsgengine.cpp b/src/quick/scenegraph/util/qsgengine.cpp
index c5840b2d2b..5d50002870 100644
--- a/src/quick/scenegraph/util/qsgengine.cpp
+++ b/src/quick/scenegraph/util/qsgengine.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
diff --git a/src/quick/scenegraph/util/qsgengine.h b/src/quick/scenegraph/util/qsgengine.h
index 70896d3ef2..f62bdb2ab3 100644
--- a/src/quick/scenegraph/util/qsgengine.h
+++ b/src/quick/scenegraph/util/qsgengine.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
diff --git a/src/quick/scenegraph/util/qsgflatcolormaterial.cpp b/src/quick/scenegraph/util/qsgflatcolormaterial.cpp
index c1d5b04cc1..50c8d1661e 100644
--- a/src/quick/scenegraph/util/qsgflatcolormaterial.cpp
+++ b/src/quick/scenegraph/util/qsgflatcolormaterial.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
diff --git a/src/quick/scenegraph/util/qsgflatcolormaterial.h b/src/quick/scenegraph/util/qsgflatcolormaterial.h
index 1313a89eef..f1020faa56 100644
--- a/src/quick/scenegraph/util/qsgflatcolormaterial.h
+++ b/src/quick/scenegraph/util/qsgflatcolormaterial.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
diff --git a/src/quick/scenegraph/util/qsgpainternode.cpp b/src/quick/scenegraph/util/qsgpainternode.cpp
index d4a810c30a..1ea64f6205 100644
--- a/src/quick/scenegraph/util/qsgpainternode.cpp
+++ b/src/quick/scenegraph/util/qsgpainternode.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
diff --git a/src/quick/scenegraph/util/qsgpainternode_p.h b/src/quick/scenegraph/util/qsgpainternode_p.h
index 0c603c43ca..24b4d26855 100644
--- a/src/quick/scenegraph/util/qsgpainternode_p.h
+++ b/src/quick/scenegraph/util/qsgpainternode_p.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
diff --git a/src/quick/scenegraph/util/qsgsimplematerial.h b/src/quick/scenegraph/util/qsgsimplematerial.h
index a3579326ee..5e58bd56ca 100644
--- a/src/quick/scenegraph/util/qsgsimplematerial.h
+++ b/src/quick/scenegraph/util/qsgsimplematerial.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
diff --git a/src/quick/scenegraph/util/qsgsimplerectnode.cpp b/src/quick/scenegraph/util/qsgsimplerectnode.cpp
index 4d4ae7c784..09a3b42e98 100644
--- a/src/quick/scenegraph/util/qsgsimplerectnode.cpp
+++ b/src/quick/scenegraph/util/qsgsimplerectnode.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
diff --git a/src/quick/scenegraph/util/qsgsimplerectnode.h b/src/quick/scenegraph/util/qsgsimplerectnode.h
index abe9973306..cab8a60ad2 100644
--- a/src/quick/scenegraph/util/qsgsimplerectnode.h
+++ b/src/quick/scenegraph/util/qsgsimplerectnode.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
diff --git a/src/quick/scenegraph/util/qsgsimpletexturenode.cpp b/src/quick/scenegraph/util/qsgsimpletexturenode.cpp
index 0a8edc999c..c347dffbed 100644
--- a/src/quick/scenegraph/util/qsgsimpletexturenode.cpp
+++ b/src/quick/scenegraph/util/qsgsimpletexturenode.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
diff --git a/src/quick/scenegraph/util/qsgsimpletexturenode.h b/src/quick/scenegraph/util/qsgsimpletexturenode.h
index 8416556d00..d4bdca21ca 100644
--- a/src/quick/scenegraph/util/qsgsimpletexturenode.h
+++ b/src/quick/scenegraph/util/qsgsimpletexturenode.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
diff --git a/src/quick/scenegraph/util/qsgtexture.cpp b/src/quick/scenegraph/util/qsgtexture.cpp
index 7ccedc4c48..5dd4dad6e4 100644
--- a/src/quick/scenegraph/util/qsgtexture.cpp
+++ b/src/quick/scenegraph/util/qsgtexture.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
@@ -45,7 +45,8 @@
 #include <qopenglfunctions.h>
 #include <QtQuick/private/qsgcontext_p.h>
 #include <qthread.h>
-#include <private/qdeclarativeprofilerservice_p.h>
+#include <private/qqmlprofilerservice_p.h>
+#include <private/qqmlglobal_p.h>
 
 #if !defined(QT_NO_DEBUG) && (defined(Q_OS_LINUX) || defined(Q_OS_MAC))
 #include <execinfo.h>
diff --git a/src/quick/scenegraph/util/qsgtexture.h b/src/quick/scenegraph/util/qsgtexture.h
index 2ff4b5daf8..0b4e6fede2 100644
--- a/src/quick/scenegraph/util/qsgtexture.h
+++ b/src/quick/scenegraph/util/qsgtexture.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
diff --git a/src/quick/scenegraph/util/qsgtexture_p.h b/src/quick/scenegraph/util/qsgtexture_p.h
index bbeeec4b74..3d80035c9a 100644
--- a/src/quick/scenegraph/util/qsgtexture_p.h
+++ b/src/quick/scenegraph/util/qsgtexture_p.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
diff --git a/src/quick/scenegraph/util/qsgtexturematerial.cpp b/src/quick/scenegraph/util/qsgtexturematerial.cpp
index c5e55a751c..96fc037bfe 100644
--- a/src/quick/scenegraph/util/qsgtexturematerial.cpp
+++ b/src/quick/scenegraph/util/qsgtexturematerial.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
diff --git a/src/quick/scenegraph/util/qsgtexturematerial.h b/src/quick/scenegraph/util/qsgtexturematerial.h
index 123fbaafed..bfc76422f1 100644
--- a/src/quick/scenegraph/util/qsgtexturematerial.h
+++ b/src/quick/scenegraph/util/qsgtexturematerial.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
diff --git a/src/quick/scenegraph/util/qsgtexturematerial_p.h b/src/quick/scenegraph/util/qsgtexturematerial_p.h
index 55d6ad0a78..0895dbd6c2 100644
--- a/src/quick/scenegraph/util/qsgtexturematerial_p.h
+++ b/src/quick/scenegraph/util/qsgtexturematerial_p.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
diff --git a/src/quick/scenegraph/util/qsgtextureprovider.cpp b/src/quick/scenegraph/util/qsgtextureprovider.cpp
index 0ec0c6f724..6d81e4eb79 100644
--- a/src/quick/scenegraph/util/qsgtextureprovider.cpp
+++ b/src/quick/scenegraph/util/qsgtextureprovider.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
diff --git a/src/quick/scenegraph/util/qsgtextureprovider.h b/src/quick/scenegraph/util/qsgtextureprovider.h
index 578b323c89..8dcc1f2678 100644
--- a/src/quick/scenegraph/util/qsgtextureprovider.h
+++ b/src/quick/scenegraph/util/qsgtextureprovider.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
diff --git a/src/quick/scenegraph/util/qsgvertexcolormaterial.cpp b/src/quick/scenegraph/util/qsgvertexcolormaterial.cpp
index 8c09780b15..545b5f201e 100644
--- a/src/quick/scenegraph/util/qsgvertexcolormaterial.cpp
+++ b/src/quick/scenegraph/util/qsgvertexcolormaterial.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
diff --git a/src/quick/scenegraph/util/qsgvertexcolormaterial.h b/src/quick/scenegraph/util/qsgvertexcolormaterial.h
index 3ba37eff4a..52808a50d9 100644
--- a/src/quick/scenegraph/util/qsgvertexcolormaterial.h
+++ b/src/quick/scenegraph/util/qsgvertexcolormaterial.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
diff --git a/src/quick/util/qdeclarativeutilmodule.cpp b/src/quick/util/qdeclarativeutilmodule.cpp
deleted file mode 100644
index 02e4e9cf52..0000000000
--- a/src/quick/util/qdeclarativeutilmodule.cpp
+++ /dev/null
@@ -1,103 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** GNU Lesser General Public License Usage
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this
-** file. Please review the following information to ensure the GNU Lesser
-** General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qdeclarativeutilmodule_p.h"
-#include "qdeclarativeanimation_p.h"
-#include "qdeclarativeanimation_p_p.h"
-#include "qdeclarativebehavior_p.h"
-#include "qdeclarativebind_p.h"
-#include "qdeclarativeconnections_p.h"
-#include "qdeclarativesmoothedanimation_p.h"
-#include "qdeclarativefontloader_p.h"
-#include "qdeclarativepackage_p.h"
-#include "qdeclarativepropertychanges_p.h"
-#include "qdeclarativespringanimation_p.h"
-#include "qdeclarativestategroup_p.h"
-#include "qdeclarativestateoperations_p.h"
-#include "qdeclarativestate_p.h"
-#include "qdeclarativestate_p_p.h"
-#include "qdeclarativesystempalette_p.h"
-#include "qdeclarativetimer_p.h"
-#include "qdeclarativetransition_p.h"
-#include <qdeclarativeinfo.h>
-#include <private/qdeclarativetypenotavailable_p.h>
-#include <private/qdeclarativeanimationcontroller_p.h>
-#include <QtCore/qcoreapplication.h>
-#include <QtGui/QInputMethod>
-
-void QDeclarativeUtilModule::defineModule()
-{
-    qmlRegisterUncreatableType<QInputMethod>("QtQuick",2,0,"InputPanel",
-                                             QInputMethod::tr("InputPanel is an abstract class")); // deprecated
-    qmlRegisterUncreatableType<QInputMethod>("QtQuick",2,0,"InputMethod",
-                                             QInputMethod::tr("InputMethod is an abstract class"));
-    qmlRegisterUncreatableType<QDeclarativeAbstractAnimation>("QtQuick",2,0,"Animation",QDeclarativeAbstractAnimation::tr("Animation is an abstract class"));
-
-    qmlRegisterType<QDeclarativeBehavior>("QtQuick",2,0,"Behavior");
-    qmlRegisterType<QDeclarativeBind>("QtQuick",2,0,"Binding");
-    qmlRegisterType<QDeclarativeColorAnimation>("QtQuick",2,0,"ColorAnimation");
-    qmlRegisterType<QDeclarativeConnections>("QtQuick",2,0,"Connections");
-    qmlRegisterType<QDeclarativeSmoothedAnimation>("QtQuick",2,0,"SmoothedAnimation");
-    qmlRegisterType<QDeclarativeFontLoader>("QtQuick",2,0,"FontLoader");
-    qmlRegisterType<QDeclarativeNumberAnimation>("QtQuick",2,0,"NumberAnimation");
-    qmlRegisterType<QDeclarativePackage>("QtQuick",2,0,"Package");
-    qmlRegisterType<QDeclarativeParallelAnimation>("QtQuick",2,0,"ParallelAnimation");
-    qmlRegisterType<QDeclarativePauseAnimation>("QtQuick",2,0,"PauseAnimation");
-    qmlRegisterType<QDeclarativePropertyAction>("QtQuick",2,0,"PropertyAction");
-    qmlRegisterType<QDeclarativePropertyAnimation>("QtQuick",2,0,"PropertyAnimation");
-    qmlRegisterType<QDeclarativeRotationAnimation>("QtQuick",2,0,"RotationAnimation");
-    qmlRegisterType<QDeclarativeScriptAction>("QtQuick",2,0,"ScriptAction");
-    qmlRegisterType<QDeclarativeSequentialAnimation>("QtQuick",2,0,"SequentialAnimation");
-    qmlRegisterType<QDeclarativeSpringAnimation>("QtQuick",2,0,"SpringAnimation");
-    qmlRegisterType<QDeclarativeAnimationController>("QtQuick",2,0,"AnimationController");
-    qmlRegisterType<QDeclarativeStateChangeScript>("QtQuick",2,0,"StateChangeScript");
-    qmlRegisterType<QDeclarativeStateGroup>("QtQuick",2,0,"StateGroup");
-    qmlRegisterType<QDeclarativeState>("QtQuick",2,0,"State");
-    qmlRegisterType<QDeclarativeSystemPalette>("QtQuick",2,0,"SystemPalette");
-    qmlRegisterType<QDeclarativeTimer>("QtQuick",2,0,"Timer");
-    qmlRegisterType<QDeclarativeTransition>("QtQuick",2,0,"Transition");
-    qmlRegisterType<QDeclarativeVector3dAnimation>("QtQuick",2,0,"Vector3dAnimation");
-
-    qmlRegisterType<QDeclarativeStateOperation>();
-
-    qmlRegisterCustomType<QDeclarativePropertyChanges>("QtQuick",2,0,"PropertyChanges", new QDeclarativePropertyChangesParser);
-    qmlRegisterCustomType<QDeclarativeConnections>("QtQuick",2,0,"Connections", new QDeclarativeConnectionsParser);
-}
diff --git a/src/quick/util/qdeclarativeanimation.cpp b/src/quick/util/qquickanimation.cpp
index b3b6d93115..51b598b28d 100644
--- a/src/quick/util/qdeclarativeanimation.cpp
+++ b/src/quick/util/qquickanimation.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
@@ -39,22 +39,22 @@
 **
 ****************************************************************************/
 
-#include "qdeclarativeanimation_p.h"
-#include "qdeclarativeanimation_p_p.h"
+#include "qquickanimation_p.h"
+#include "qquickanimation_p_p.h"
 
-#include <private/qdeclarativestateoperations_p.h>
-#include <private/qdeclarativecontext_p.h>
+#include <private/qquickstatechangescript_p.h>
+#include <private/qqmlcontext_p.h>
 
-#include <qdeclarativepropertyvaluesource.h>
-#include <qdeclarative.h>
-#include <qdeclarativeinfo.h>
-#include <qdeclarativeexpression.h>
-#include <private/qdeclarativestringconverters_p.h>
-#include <private/qdeclarativeglobal_p.h>
-#include <private/qdeclarativemetatype_p.h>
-#include <private/qdeclarativevaluetype_p.h>
-#include <private/qdeclarativeproperty_p.h>
-#include <private/qdeclarativeengine_p.h>
+#include <qqmlpropertyvaluesource.h>
+#include <qqml.h>
+#include <qqmlinfo.h>
+#include <qqmlexpression.h>
+#include <private/qqmlstringconverters_p.h>
+#include <private/qqmlglobal_p.h>
+#include <private/qqmlmetatype_p.h>
+#include <private/qqmlvaluetype_p.h>
+#include <private/qqmlproperty_p.h>
+#include <private/qqmlengine_p.h>
 
 #include <qvariant.h>
 #include <qcolor.h>
@@ -70,7 +70,7 @@
 QT_BEGIN_NAMESPACE
 
 /*!
-    \qmlclass Animation QDeclarativeAbstractAnimation
+    \qmlclass Animation QQuickAbstractAnimation
     \inqmlmodule QtQuick 2
     \ingroup qml-animation-transition
     \brief The Animation element is the base of all QML animations.
@@ -81,25 +81,25 @@ QT_BEGIN_NAMESPACE
     element directly will result in an error.
 */
 
-QDeclarativeAbstractAnimation::QDeclarativeAbstractAnimation(QObject *parent)
-: QObject(*(new QDeclarativeAbstractAnimationPrivate), parent)
+QQuickAbstractAnimation::QQuickAbstractAnimation(QObject *parent)
+: QObject(*(new QQuickAbstractAnimationPrivate), parent)
 {
 }
 
-QDeclarativeAbstractAnimation::~QDeclarativeAbstractAnimation()
+QQuickAbstractAnimation::~QQuickAbstractAnimation()
 {
-    Q_D(QDeclarativeAbstractAnimation);
+    Q_D(QQuickAbstractAnimation);
     delete d->animationInstance;
 }
 
-QDeclarativeAbstractAnimation::QDeclarativeAbstractAnimation(QDeclarativeAbstractAnimationPrivate &dd, QObject *parent)
+QQuickAbstractAnimation::QQuickAbstractAnimation(QQuickAbstractAnimationPrivate &dd, QObject *parent)
 : QObject(dd, parent)
 {
 }
 
-QAbstractAnimationJob* QDeclarativeAbstractAnimation::qtAnimation()
+QAbstractAnimationJob* QQuickAbstractAnimation::qtAnimation()
 {
-    Q_D(QDeclarativeAbstractAnimation);
+    Q_D(QQuickAbstractAnimation);
     return d->animationInstance;
 }
 
@@ -137,16 +137,16 @@ QAbstractAnimationJob* QDeclarativeAbstractAnimation::qtAnimation()
     By default, animations are not running. Though, when the animations are assigned to properties,
     as property value sources using the \e on syntax, they are set to running by default.
 */
-bool QDeclarativeAbstractAnimation::isRunning() const
+bool QQuickAbstractAnimation::isRunning() const
 {
-    Q_D(const QDeclarativeAbstractAnimation);
+    Q_D(const QQuickAbstractAnimation);
     return d->running;
 }
 
 // the behavior calls this function
-void QDeclarativeAbstractAnimation::notifyRunningChanged(bool running)
+void QQuickAbstractAnimation::notifyRunningChanged(bool running)
 {
-    Q_D(QDeclarativeAbstractAnimation);
+    Q_D(QQuickAbstractAnimation);
     if (d->disableUserControl && d->running != running) {
         d->running = running;
         emit runningChanged(running);
@@ -155,15 +155,15 @@ void QDeclarativeAbstractAnimation::notifyRunningChanged(bool running)
 
 //commence is called to start an animation when it is used as a
 //simple animation, and not as part of a transition
-void QDeclarativeAbstractAnimationPrivate::commence()
+void QQuickAbstractAnimationPrivate::commence()
 {
-    Q_Q(QDeclarativeAbstractAnimation);
+    Q_Q(QQuickAbstractAnimation);
 
-    QDeclarativeStateActions actions;
-    QDeclarativeProperties properties;
+    QQuickStateActions actions;
+    QQmlProperties properties;
 
     QAbstractAnimationJob *oldInstance = animationInstance;
-    animationInstance = q->transition(actions, properties, QDeclarativeAbstractAnimation::Forward);
+    animationInstance = q->transition(actions, properties, QQuickAbstractAnimation::Forward);
     if (oldInstance != animationInstance) {
         animationInstance->addAnimationChangeListener(this, QAbstractAnimationJob::Completion);
         if (oldInstance)
@@ -176,29 +176,29 @@ void QDeclarativeAbstractAnimationPrivate::commence()
     }
 }
 
-QDeclarativeProperty QDeclarativeAbstractAnimationPrivate::createProperty(QObject *obj, const QString &str, QObject *infoObj)
+QQmlProperty QQuickAbstractAnimationPrivate::createProperty(QObject *obj, const QString &str, QObject *infoObj)
 {
-    QDeclarativeProperty prop(obj, str, qmlContext(infoObj));
+    QQmlProperty prop(obj, str, qmlContext(infoObj));
     if (!prop.isValid()) {
-        qmlInfo(infoObj) << QDeclarativeAbstractAnimation::tr("Cannot animate non-existent property \"%1\"").arg(str);
-        return QDeclarativeProperty();
+        qmlInfo(infoObj) << QQuickAbstractAnimation::tr("Cannot animate non-existent property \"%1\"").arg(str);
+        return QQmlProperty();
     } else if (!prop.isWritable()) {
-        qmlInfo(infoObj) << QDeclarativeAbstractAnimation::tr("Cannot animate read-only property \"%1\"").arg(str);
-        return QDeclarativeProperty();
+        qmlInfo(infoObj) << QQuickAbstractAnimation::tr("Cannot animate read-only property \"%1\"").arg(str);
+        return QQmlProperty();
     }
     return prop;
 }
 
-void QDeclarativeAbstractAnimation::setRunning(bool r)
+void QQuickAbstractAnimation::setRunning(bool r)
 {
-    Q_D(QDeclarativeAbstractAnimation);
+    Q_D(QQuickAbstractAnimation);
     if (!d->componentComplete) {
         d->running = r;
         if (r == false)
             d->avoidPropertyValueSourceStart = true;
         else if (!d->registered) {
             d->registered = true;
-            QDeclarativeEnginePrivate *engPriv = QDeclarativeEnginePrivate::get(qmlEngine(this));
+            QQmlEnginePrivate *engPriv = QQmlEnginePrivate::get(qmlEngine(this));
             static int finalizedIdx = -1;
             if (finalizedIdx < 0)
                 finalizedIdx = metaObject()->indexOfSlot("componentFinalized()");
@@ -257,15 +257,15 @@ void QDeclarativeAbstractAnimation::setRunning(bool r)
 
     By default, animations are not paused.
 */
-bool QDeclarativeAbstractAnimation::isPaused() const
+bool QQuickAbstractAnimation::isPaused() const
 {
-    Q_D(const QDeclarativeAbstractAnimation);
+    Q_D(const QQuickAbstractAnimation);
     return d->paused;
 }
 
-void QDeclarativeAbstractAnimation::setPaused(bool p)
+void QQuickAbstractAnimation::setPaused(bool p)
 {
-    Q_D(QDeclarativeAbstractAnimation);
+    Q_D(QQuickAbstractAnimation);
     if (d->paused == p)
         return;
 
@@ -287,21 +287,21 @@ void QDeclarativeAbstractAnimation::setPaused(bool p)
     emit pausedChanged(d->paused);
 }
 
-void QDeclarativeAbstractAnimation::classBegin()
+void QQuickAbstractAnimation::classBegin()
 {
-    Q_D(QDeclarativeAbstractAnimation);
+    Q_D(QQuickAbstractAnimation);
     d->componentComplete = false;
 }
 
-void QDeclarativeAbstractAnimation::componentComplete()
+void QQuickAbstractAnimation::componentComplete()
 {
-    Q_D(QDeclarativeAbstractAnimation);
+    Q_D(QQuickAbstractAnimation);
     d->componentComplete = true;
 }
 
-void QDeclarativeAbstractAnimation::componentFinalized()
+void QQuickAbstractAnimation::componentFinalized()
 {
-    Q_D(QDeclarativeAbstractAnimation);
+    Q_D(QQuickAbstractAnimation);
     if (d->running) {
         d->running = false;
         setRunning(true);
@@ -328,15 +328,15 @@ void QDeclarativeAbstractAnimation::componentFinalized()
 
     \note alwaysRunToEnd has no effect on animations in a Transition.
 */
-bool QDeclarativeAbstractAnimation::alwaysRunToEnd() const
+bool QQuickAbstractAnimation::alwaysRunToEnd() const
 {
-    Q_D(const QDeclarativeAbstractAnimation);
+    Q_D(const QQuickAbstractAnimation);
     return d->alwaysRunToEnd;
 }
 
-void QDeclarativeAbstractAnimation::setAlwaysRunToEnd(bool f)
+void QQuickAbstractAnimation::setAlwaysRunToEnd(bool f)
 {
-    Q_D(QDeclarativeAbstractAnimation);
+    Q_D(QQuickAbstractAnimation);
     if (d->alwaysRunToEnd == f)
         return;
 
@@ -367,15 +367,15 @@ void QDeclarativeAbstractAnimation::setAlwaysRunToEnd(bool f)
     }
     \endcode
 */
-int QDeclarativeAbstractAnimation::loops() const
+int QQuickAbstractAnimation::loops() const
 {
-    Q_D(const QDeclarativeAbstractAnimation);
+    Q_D(const QQuickAbstractAnimation);
     return d->loopCount;
 }
 
-void QDeclarativeAbstractAnimation::setLoops(int loops)
+void QQuickAbstractAnimation::setLoops(int loops)
 {
-    Q_D(QDeclarativeAbstractAnimation);
+    Q_D(QQuickAbstractAnimation);
     if (loops < 0)
         loops = -1;
 
@@ -386,44 +386,44 @@ void QDeclarativeAbstractAnimation::setLoops(int loops)
     emit loopCountChanged(loops);
 }
 
-int QDeclarativeAbstractAnimation::duration() const
+int QQuickAbstractAnimation::duration() const
 {
-    Q_D(const QDeclarativeAbstractAnimation);
+    Q_D(const QQuickAbstractAnimation);
     return d->animationInstance ? d->animationInstance->duration() : 0;
 }
 
-int QDeclarativeAbstractAnimation::currentTime()
+int QQuickAbstractAnimation::currentTime()
 {
-    Q_D(QDeclarativeAbstractAnimation);
+    Q_D(QQuickAbstractAnimation);
     return d->animationInstance ? d->animationInstance->currentLoopTime() : 0;
 }
 
-void QDeclarativeAbstractAnimation::setCurrentTime(int time)
+void QQuickAbstractAnimation::setCurrentTime(int time)
 {
-    Q_D(QDeclarativeAbstractAnimation);
+    Q_D(QQuickAbstractAnimation);
     if (d->animationInstance)
         d->animationInstance->setCurrentTime(time);
     //TODO save value for start?
 }
 
-QDeclarativeAnimationGroup *QDeclarativeAbstractAnimation::group() const
+QQuickAnimationGroup *QQuickAbstractAnimation::group() const
 {
-    Q_D(const QDeclarativeAbstractAnimation);
+    Q_D(const QQuickAbstractAnimation);
     return d->group;
 }
 
-void QDeclarativeAbstractAnimation::setGroup(QDeclarativeAnimationGroup *g)
+void QQuickAbstractAnimation::setGroup(QQuickAnimationGroup *g)
 {
-    Q_D(QDeclarativeAbstractAnimation);
+    Q_D(QQuickAbstractAnimation);
     if (d->group == g)
         return;
     if (d->group)
-        static_cast<QDeclarativeAnimationGroupPrivate *>(d->group->d_func())->animations.removeAll(this);
+        static_cast<QQuickAnimationGroupPrivate *>(d->group->d_func())->animations.removeAll(this);
 
     d->group = g;
 
-    if (d->group && !static_cast<QDeclarativeAnimationGroupPrivate *>(d->group->d_func())->animations.contains(this))
-        static_cast<QDeclarativeAnimationGroupPrivate *>(d->group->d_func())->animations.append(this);
+    if (d->group && !static_cast<QQuickAnimationGroupPrivate *>(d->group->d_func())->animations.contains(this))
+        static_cast<QQuickAnimationGroupPrivate *>(d->group->d_func())->animations.append(this);
 
     //if (g) //if removed from a group, then the group should no longer be the parent
         setParent(g);
@@ -436,7 +436,7 @@ void QDeclarativeAbstractAnimation::setGroup(QDeclarativeAnimationGroup *g)
     If the animation is already running, calling this method has no effect.  The
     \c running property will be true following a call to \c start().
 */
-void QDeclarativeAbstractAnimation::start()
+void QQuickAbstractAnimation::start()
 {
     setRunning(true);
 }
@@ -448,7 +448,7 @@ void QDeclarativeAbstractAnimation::start()
     If the animation is already paused, calling this method has no effect.  The
     \c paused property will be true following a call to \c pause().
 */
-void QDeclarativeAbstractAnimation::pause()
+void QQuickAbstractAnimation::pause()
 {
     setPaused(true);
 }
@@ -460,7 +460,7 @@ void QDeclarativeAbstractAnimation::pause()
     If the animation is not paused, calling this method has no effect.  The
     \c paused property will be false following a call to \c resume().
 */
-void QDeclarativeAbstractAnimation::resume()
+void QQuickAbstractAnimation::resume()
 {
     setPaused(false);
 }
@@ -485,7 +485,7 @@ void QDeclarativeAbstractAnimation::resume()
     continue running until it completes and then stop.  The \c running property
     will still become false immediately.
 */
-void QDeclarativeAbstractAnimation::stop()
+void QQuickAbstractAnimation::stop()
 {
     setRunning(false);
 }
@@ -497,7 +497,7 @@ void QDeclarativeAbstractAnimation::stop()
     This is a convenience method, and is equivalent to calling \c stop() and
     then \c start().
 */
-void QDeclarativeAbstractAnimation::restart()
+void QQuickAbstractAnimation::restart()
 {
     stop();
     start();
@@ -521,17 +521,17 @@ void QDeclarativeAbstractAnimation::restart()
     a value of 50, while calling \c complete() will set the \c x property to
     100, exactly as though the animation had played the whole way through.
 */
-void QDeclarativeAbstractAnimation::complete()
+void QQuickAbstractAnimation::complete()
 {
-    Q_D(QDeclarativeAbstractAnimation);
+    Q_D(QQuickAbstractAnimation);
     if (isRunning() && d->animationInstance) {
          d->animationInstance->setCurrentTime(d->animationInstance->duration());
     }
 }
 
-void QDeclarativeAbstractAnimation::setTarget(const QDeclarativeProperty &p)
+void QQuickAbstractAnimation::setTarget(const QQmlProperty &p)
 {
-    Q_D(QDeclarativeAbstractAnimation);
+    Q_D(QQuickAbstractAnimation);
     d->defaultProperty = p;
 
     if (!d->avoidPropertyValueSourceStart)
@@ -543,9 +543,9 @@ void QDeclarativeAbstractAnimation::setTarget(const QDeclarativeProperty &p)
     so this function allows us to do the same thing as setTarget without
     that assumption
 */
-void QDeclarativeAbstractAnimation::setDefaultTarget(const QDeclarativeProperty &p)
+void QQuickAbstractAnimation::setDefaultTarget(const QQmlProperty &p)
 {
-    Q_D(QDeclarativeAbstractAnimation);
+    Q_D(QQuickAbstractAnimation);
     d->defaultProperty = p;
 }
 
@@ -554,34 +554,34 @@ void QDeclarativeAbstractAnimation::setDefaultTarget(const QDeclarativeProperty
     because something else (like a Behavior) already has control
     over the animation.
 */
-void QDeclarativeAbstractAnimation::setDisableUserControl()
+void QQuickAbstractAnimation::setDisableUserControl()
 {
-    Q_D(QDeclarativeAbstractAnimation);
+    Q_D(QQuickAbstractAnimation);
     d->disableUserControl = true;
 }
 
-void QDeclarativeAbstractAnimation::setEnableUserControl()
+void QQuickAbstractAnimation::setEnableUserControl()
 {
-    Q_D(QDeclarativeAbstractAnimation);
+    Q_D(QQuickAbstractAnimation);
     d->disableUserControl = false;
 
 }
 
-bool QDeclarativeAbstractAnimation::userControlDisabled() const
+bool QQuickAbstractAnimation::userControlDisabled() const
 {
-    Q_D(const QDeclarativeAbstractAnimation);
+    Q_D(const QQuickAbstractAnimation);
     return d->disableUserControl;
 }
 
-QAbstractAnimationJob* QDeclarativeAbstractAnimation::initInstance(QAbstractAnimationJob *animation)
+QAbstractAnimationJob* QQuickAbstractAnimation::initInstance(QAbstractAnimationJob *animation)
 {
-    Q_D(QDeclarativeAbstractAnimation);
+    Q_D(QQuickAbstractAnimation);
     animation->setLoopCount(d->loopCount);
     return animation;
 }
 
-QAbstractAnimationJob* QDeclarativeAbstractAnimation::transition(QDeclarativeStateActions &actions,
-                                      QDeclarativeProperties &modified,
+QAbstractAnimationJob* QQuickAbstractAnimation::transition(QQuickStateActions &actions,
+                                      QQmlProperties &modified,
                                       TransitionDirection direction,
                                       QObject *defaultTarget)
 {
@@ -592,9 +592,9 @@ QAbstractAnimationJob* QDeclarativeAbstractAnimation::transition(QDeclarativeSta
     return 0;
 }
 
-void QDeclarativeAbstractAnimationPrivate::animationFinished(QAbstractAnimationJob*)
+void QQuickAbstractAnimationPrivate::animationFinished(QAbstractAnimationJob*)
 {
-    Q_Q(QDeclarativeAbstractAnimation);
+    Q_Q(QQuickAbstractAnimation);
     q->setRunning(false);
     if (alwaysRunToEnd && loopCount != 1) {
         //restore the proper loopCount for the next run
@@ -603,7 +603,7 @@ void QDeclarativeAbstractAnimationPrivate::animationFinished(QAbstractAnimationJ
 }
 
 /*!
-    \qmlclass PauseAnimation QDeclarativePauseAnimation
+    \qmlclass PauseAnimation QQuickPauseAnimation
     \inqmlmodule QtQuick 2
     \ingroup qml-animation-transition
     \inherits Animation
@@ -621,14 +621,14 @@ void QDeclarativeAbstractAnimationPrivate::animationFinished(QAbstractAnimationJ
     }
     \endcode
 
-    \sa {QML Animation and Transitions}, {declarative/animation/basics}{Animation basics example}
+    \sa {QML Animation and Transitions}, {qml/animation/basics}{Animation basics example}
 */
-QDeclarativePauseAnimation::QDeclarativePauseAnimation(QObject *parent)
-: QDeclarativeAbstractAnimation(*(new QDeclarativePauseAnimationPrivate), parent)
+QQuickPauseAnimation::QQuickPauseAnimation(QObject *parent)
+: QQuickAbstractAnimation(*(new QQuickPauseAnimationPrivate), parent)
 {
 }
 
-QDeclarativePauseAnimation::~QDeclarativePauseAnimation()
+QQuickPauseAnimation::~QQuickPauseAnimation()
 {
 }
 
@@ -638,32 +638,32 @@ QDeclarativePauseAnimation::~QDeclarativePauseAnimation()
 
     The default value is 250.
 */
-int QDeclarativePauseAnimation::duration() const
+int QQuickPauseAnimation::duration() const
 {
-    Q_D(const QDeclarativePauseAnimation);
+    Q_D(const QQuickPauseAnimation);
     return d->duration;
 }
 
-void QDeclarativePauseAnimation::setDuration(int duration)
+void QQuickPauseAnimation::setDuration(int duration)
 {
     if (duration < 0) {
         qmlInfo(this) << tr("Cannot set a duration of < 0");
         return;
     }
 
-    Q_D(QDeclarativePauseAnimation);
+    Q_D(QQuickPauseAnimation);
     if (d->duration == duration)
         return;
     d->duration = duration;
     emit durationChanged(duration);
 }
 
-QAbstractAnimationJob* QDeclarativePauseAnimation::transition(QDeclarativeStateActions &actions,
-                                    QDeclarativeProperties &modified,
+QAbstractAnimationJob* QQuickPauseAnimation::transition(QQuickStateActions &actions,
+                                    QQmlProperties &modified,
                                     TransitionDirection direction,
                                     QObject *defaultTarget)
 {
-    Q_D(QDeclarativePauseAnimation);
+    Q_D(QQuickPauseAnimation);
     Q_UNUSED(actions);
     Q_UNUSED(modified);
     Q_UNUSED(direction);
@@ -673,7 +673,7 @@ QAbstractAnimationJob* QDeclarativePauseAnimation::transition(QDeclarativeStateA
 }
 
 /*!
-    \qmlclass ColorAnimation QDeclarativeColorAnimation
+    \qmlclass ColorAnimation QQuickColorAnimation
     \inqmlmodule QtQuick 2
   \ingroup qml-animation-transition
     \inherits PropertyAnimation
@@ -686,7 +686,7 @@ QAbstractAnimationJob* QDeclarativePauseAnimation::transition(QDeclarativeStateA
     as a property value source. It animates the \c color property's value from
     its current value to a value of "red", over 1000 milliseconds:
 
-    \snippet doc/src/snippets/declarative/coloranimation.qml 0
+    \snippet doc/src/snippets/qml/coloranimation.qml 0
 
     Like any other animation element, a ColorAnimation can be applied in a
     number of ways, including transitions, behaviors and property value
@@ -699,18 +699,18 @@ QAbstractAnimationJob* QDeclarativePauseAnimation::transition(QDeclarativeStateA
     \l{PropertyAnimation::}{properties} are explicitly set for the animation,
     then those are used instead.
 
-    \sa {QML Animation and Transitions}, {declarative/animation/basics}{Animation basics example}
+    \sa {QML Animation and Transitions}, {qml/animation/basics}{Animation basics example}
 */
-QDeclarativeColorAnimation::QDeclarativeColorAnimation(QObject *parent)
-: QDeclarativePropertyAnimation(parent)
+QQuickColorAnimation::QQuickColorAnimation(QObject *parent)
+: QQuickPropertyAnimation(parent)
 {
-    Q_D(QDeclarativePropertyAnimation);
+    Q_D(QQuickPropertyAnimation);
     d->interpolatorType = QMetaType::QColor;
     d->defaultToInterpolatorType = true;
     d->interpolator = QVariantAnimationPrivate::getInterpolator(d->interpolatorType);
 }
 
-QDeclarativeColorAnimation::~QDeclarativeColorAnimation()
+QQuickColorAnimation::~QQuickColorAnimation()
 {
 }
 
@@ -740,15 +740,15 @@ QDeclarativeColorAnimation::~QDeclarativeColorAnimation()
 
     \sa {QML Animation and Transitions}
 */
-QColor QDeclarativeColorAnimation::from() const
+QColor QQuickColorAnimation::from() const
 {
-    Q_D(const QDeclarativePropertyAnimation);
+    Q_D(const QQuickPropertyAnimation);
     return d->from.value<QColor>();
 }
 
-void QDeclarativeColorAnimation::setFrom(const QColor &f)
+void QQuickColorAnimation::setFrom(const QColor &f)
 {
-    QDeclarativePropertyAnimation::setFrom(f);
+    QQuickPropertyAnimation::setFrom(f);
 }
 
 /*!
@@ -763,15 +763,15 @@ void QDeclarativeColorAnimation::setFrom(const QColor &f)
 
     \sa {QML Animation and Transitions}
 */
-QColor QDeclarativeColorAnimation::to() const
+QColor QQuickColorAnimation::to() const
 {
-    Q_D(const QDeclarativePropertyAnimation);
+    Q_D(const QQuickPropertyAnimation);
     return d->to.value<QColor>();
 }
 
-void QDeclarativeColorAnimation::setTo(const QColor &t)
+void QQuickColorAnimation::setTo(const QColor &t)
 {
-    QDeclarativePropertyAnimation::setTo(t);
+    QQuickPropertyAnimation::setTo(t);
 }
 
 QActionAnimation::QActionAnimation()
@@ -817,7 +817,7 @@ void QActionAnimation::updateState(State newState, State oldState)
 }
 
 /*!
-    \qmlclass ScriptAction QDeclarativeScriptAction
+    \qmlclass ScriptAction QQuickScriptAction
     \inqmlmodule QtQuick 2
     \ingroup qml-animation-transition
     \inherits Animation
@@ -840,35 +840,35 @@ void QActionAnimation::updateState(State newState, State oldState)
     When used as part of a Transition, you can also target a specific
     StateChangeScript to run using the \c scriptName property.
 
-    \snippet doc/src/snippets/declarative/states/statechangescript.qml state and transition
+    \snippet doc/src/snippets/qml/states/statechangescript.qml state and transition
 
     \sa StateChangeScript
 */
-QDeclarativeScriptAction::QDeclarativeScriptAction(QObject *parent)
-    :QDeclarativeAbstractAnimation(*(new QDeclarativeScriptActionPrivate), parent)
+QQuickScriptAction::QQuickScriptAction(QObject *parent)
+    :QQuickAbstractAnimation(*(new QQuickScriptActionPrivate), parent)
 {
 }
 
-QDeclarativeScriptAction::~QDeclarativeScriptAction()
+QQuickScriptAction::~QQuickScriptAction()
 {
 }
 
-QDeclarativeScriptActionPrivate::QDeclarativeScriptActionPrivate()
-    : QDeclarativeAbstractAnimationPrivate(), hasRunScriptScript(false), reversing(false){}
+QQuickScriptActionPrivate::QQuickScriptActionPrivate()
+    : QQuickAbstractAnimationPrivate(), hasRunScriptScript(false), reversing(false){}
 
 /*!
     \qmlproperty script QtQuick2::ScriptAction::script
     This property holds the script to run.
 */
-QDeclarativeScriptString QDeclarativeScriptAction::script() const
+QQmlScriptString QQuickScriptAction::script() const
 {
-    Q_D(const QDeclarativeScriptAction);
+    Q_D(const QQuickScriptAction);
     return d->script;
 }
 
-void QDeclarativeScriptAction::setScript(const QDeclarativeScriptString &script)
+void QQuickScriptAction::setScript(const QQmlScriptString &script)
 {
-    Q_D(QDeclarativeScriptAction);
+    Q_D(QQuickScriptAction);
     d->script = script;
 }
 
@@ -882,56 +882,56 @@ void QDeclarativeScriptAction::setScript(const QDeclarativeScriptString &script)
     \note When using scriptName in a reversible transition, the script will only
     be run when the transition is being run forwards.
 */
-QString QDeclarativeScriptAction::stateChangeScriptName() const
+QString QQuickScriptAction::stateChangeScriptName() const
 {
-    Q_D(const QDeclarativeScriptAction);
+    Q_D(const QQuickScriptAction);
     return d->name;
 }
 
-void QDeclarativeScriptAction::setStateChangeScriptName(const QString &name)
+void QQuickScriptAction::setStateChangeScriptName(const QString &name)
 {
-    Q_D(QDeclarativeScriptAction);
+    Q_D(QQuickScriptAction);
     d->name = name;
 }
 
-QAbstractAnimationAction* QDeclarativeScriptActionPrivate::createAction()
+QAbstractAnimationAction* QQuickScriptActionPrivate::createAction()
 {
     return new Proxy(this);
 }
 
-void QDeclarativeScriptActionPrivate::execute()
+void QQuickScriptActionPrivate::execute()
 {
-    Q_Q(QDeclarativeScriptAction);
+    Q_Q(QQuickScriptAction);
     if (hasRunScriptScript && reversing)
         return;
 
-    QDeclarativeScriptString scriptStr = hasRunScriptScript ? runScriptScript : script;
+    QQmlScriptString scriptStr = hasRunScriptScript ? runScriptScript : script;
 
     if (!scriptStr.script().isEmpty()) {
-        QDeclarativeExpression expr(scriptStr);
+        QQmlExpression expr(scriptStr);
         expr.evaluate();
         if (expr.hasError())
             qmlInfo(q) << expr.error();
     }
 }
 
-QAbstractAnimationJob* QDeclarativeScriptAction::transition(QDeclarativeStateActions &actions,
-                                    QDeclarativeProperties &modified,
+QAbstractAnimationJob* QQuickScriptAction::transition(QQuickStateActions &actions,
+                                    QQmlProperties &modified,
                                     TransitionDirection direction,
                                     QObject *defaultTarget)
 {
-    Q_D(QDeclarativeScriptAction);
+    Q_D(QQuickScriptAction);
     Q_UNUSED(modified);
     Q_UNUSED(defaultTarget);
 
     d->hasRunScriptScript = false;
     d->reversing = (direction == Backward);
     for (int ii = 0; ii < actions.count(); ++ii) {
-        QDeclarativeAction &action = actions[ii];
+        QQuickAction &action = actions[ii];
 
-        if (action.event && action.event->type() == QDeclarativeActionEvent::Script
-            && static_cast<QDeclarativeStateChangeScript*>(action.event)->name() == d->name) {
-            d->runScriptScript = static_cast<QDeclarativeStateChangeScript*>(action.event)->script();
+        if (action.event && action.event->type() == QQuickActionEvent::Script
+            && static_cast<QQuickStateChangeScript*>(action.event)->name() == d->name) {
+            d->runScriptScript = static_cast<QQuickStateChangeScript*>(action.event)->script();
             d->hasRunScriptScript = true;
             action.actionDone = true;
             break;  //only match one (names should be unique)
@@ -941,7 +941,7 @@ QAbstractAnimationJob* QDeclarativeScriptAction::transition(QDeclarativeStateAct
 }
 
 /*!
-    \qmlclass PropertyAction QDeclarativePropertyAction
+    \qmlclass PropertyAction QQuickPropertyAction
     \inqmlmodule QtQuick 2
     \ingroup qml-animation-transition
     \inherits Animation
@@ -956,14 +956,14 @@ QAbstractAnimationJob* QDeclarativeScriptAction::transition(QDeclarativeStateAct
     \l {Image::}{smooth} property to \c true, animates the width of the image,
     then sets \l {Image::}{smooth} back to \c false:
 
-    \snippet doc/src/snippets/declarative/propertyaction.qml standalone
+    \snippet doc/src/snippets/qml/propertyaction.qml standalone
 
     PropertyAction is also useful for setting the exact point at which a property
     change should occur during a \l Transition. For example, if PropertyChanges
     was used in a \l State to rotate an item around a particular
     \l {Item::}{transformOrigin}, it might be implemented like this:
 
-    \snippet doc/src/snippets/declarative/propertyaction.qml transition
+    \snippet doc/src/snippets/qml/propertyaction.qml transition
 
     However, with this code, the \c transformOrigin is not set until \e after
     the animation, as a \l State is taken to define the values at the \e end of
@@ -971,48 +971,48 @@ QAbstractAnimationJob* QDeclarativeScriptAction::transition(QDeclarativeStateAct
     then jump to \c Item.BottomRight. To fix this, insert a PropertyAction
     before the RotationAnimation begins:
 
-    \snippet doc/src/snippets/declarative/propertyaction-sequential.qml sequential
+    \snippet doc/src/snippets/qml/propertyaction-sequential.qml sequential
 
     This immediately sets the \c transformOrigin property to the value defined
     in the end state of the \l Transition (i.e. the value defined in the
     PropertyAction object) so that the rotation animation begins with the
     correct transform origin.
 
-    \sa {QML Animation and Transitions}, QtDeclarative
+    \sa {QML Animation and Transitions}, QtQml
 */
-QDeclarativePropertyAction::QDeclarativePropertyAction(QObject *parent)
-: QDeclarativeAbstractAnimation(*(new QDeclarativePropertyActionPrivate), parent)
+QQuickPropertyAction::QQuickPropertyAction(QObject *parent)
+: QQuickAbstractAnimation(*(new QQuickPropertyActionPrivate), parent)
 {
 }
 
-QDeclarativePropertyAction::~QDeclarativePropertyAction()
+QQuickPropertyAction::~QQuickPropertyAction()
 {
 }
 
-QObject *QDeclarativePropertyAction::target() const
+QObject *QQuickPropertyAction::target() const
 {
-    Q_D(const QDeclarativePropertyAction);
+    Q_D(const QQuickPropertyAction);
     return d->target;
 }
 
-void QDeclarativePropertyAction::setTargetObject(QObject *o)
+void QQuickPropertyAction::setTargetObject(QObject *o)
 {
-    Q_D(QDeclarativePropertyAction);
+    Q_D(QQuickPropertyAction);
     if (d->target == o)
         return;
     d->target = o;
     emit targetChanged();
 }
 
-QString QDeclarativePropertyAction::property() const
+QString QQuickPropertyAction::property() const
 {
-    Q_D(const QDeclarativePropertyAction);
+    Q_D(const QQuickPropertyAction);
     return d->propertyName;
 }
 
-void QDeclarativePropertyAction::setProperty(const QString &n)
+void QQuickPropertyAction::setProperty(const QString &n)
 {
-    Q_D(QDeclarativePropertyAction);
+    Q_D(QQuickPropertyAction);
     if (d->propertyName == n)
         return;
     d->propertyName = n;
@@ -1034,25 +1034,25 @@ void QDeclarativePropertyAction::setProperty(const QString &n)
 
     \sa exclude
 */
-QString QDeclarativePropertyAction::properties() const
+QString QQuickPropertyAction::properties() const
 {
-    Q_D(const QDeclarativePropertyAction);
+    Q_D(const QQuickPropertyAction);
     return d->properties;
 }
 
-void QDeclarativePropertyAction::setProperties(const QString &p)
+void QQuickPropertyAction::setProperties(const QString &p)
 {
-    Q_D(QDeclarativePropertyAction);
+    Q_D(QQuickPropertyAction);
     if (d->properties == p)
         return;
     d->properties = p;
     emit propertiesChanged(p);
 }
 
-QDeclarativeListProperty<QObject> QDeclarativePropertyAction::targets()
+QQmlListProperty<QObject> QQuickPropertyAction::targets()
 {
-    Q_D(QDeclarativePropertyAction);
-    return QDeclarativeListProperty<QObject>(this, d->targets);
+    Q_D(QQuickPropertyAction);
+    return QQmlListProperty<QObject>(this, d->targets);
 }
 
 /*!
@@ -1061,10 +1061,10 @@ QDeclarativeListProperty<QObject> QDeclarativePropertyAction::targets()
 
     \sa targets
 */
-QDeclarativeListProperty<QObject> QDeclarativePropertyAction::exclude()
+QQmlListProperty<QObject> QQuickPropertyAction::exclude()
 {
-    Q_D(QDeclarativePropertyAction);
-    return QDeclarativeListProperty<QObject>(this, d->exclude);
+    Q_D(QQuickPropertyAction);
+    return QQmlListProperty<QObject>(this, d->exclude);
 }
 
 /*!
@@ -1076,37 +1076,37 @@ QDeclarativeListProperty<QObject> QDeclarativePropertyAction::exclude()
     \l Transition, or the value of the property change that triggered the
     \l Behavior.
 */
-QVariant QDeclarativePropertyAction::value() const
+QVariant QQuickPropertyAction::value() const
 {
-    Q_D(const QDeclarativePropertyAction);
+    Q_D(const QQuickPropertyAction);
     return d->value;
 }
 
-void QDeclarativePropertyAction::setValue(const QVariant &v)
+void QQuickPropertyAction::setValue(const QVariant &v)
 {
-    Q_D(QDeclarativePropertyAction);
+    Q_D(QQuickPropertyAction);
     if (d->value.isNull || d->value != v) {
         d->value = v;
         emit valueChanged(v);
     }
 }
 
-QAbstractAnimationJob* QDeclarativePropertyAction::transition(QDeclarativeStateActions &actions,
-                                      QDeclarativeProperties &modified,
+QAbstractAnimationJob* QQuickPropertyAction::transition(QQuickStateActions &actions,
+                                      QQmlProperties &modified,
                                       TransitionDirection direction,
                                       QObject *defaultTarget)
 {
-    Q_D(QDeclarativePropertyAction);
+    Q_D(QQuickPropertyAction);
     Q_UNUSED(direction);
 
-    struct QDeclarativeSetPropertyAnimationAction : public QAbstractAnimationAction
+    struct QQuickSetPropertyAnimationAction : public QAbstractAnimationAction
     {
-        QDeclarativeStateActions actions;
+        QQuickStateActions actions;
         virtual void doAction()
         {
             for (int ii = 0; ii < actions.count(); ++ii) {
-                const QDeclarativeAction &action = actions.at(ii);
-                QDeclarativePropertyPrivate::write(action.property, action.toValue, QDeclarativePropertyPrivate::BypassInterceptor | QDeclarativePropertyPrivate::DontRemoveBinding);
+                const QQuickAction &action = actions.at(ii);
+                QQmlPropertyPrivate::write(action.property, action.toValue, QQmlPropertyPrivate::BypassInterceptor | QQmlPropertyPrivate::DontRemoveBinding);
             }
         }
     };
@@ -1131,22 +1131,22 @@ QAbstractAnimationJob* QDeclarativePropertyAction::transition(QDeclarativeStateA
     if (defaultTarget && targets.isEmpty())
         targets << defaultTarget;
 
-    QDeclarativeSetPropertyAnimationAction *data = new QDeclarativeSetPropertyAnimationAction;
+    QQuickSetPropertyAnimationAction *data = new QQuickSetPropertyAnimationAction;
 
     bool hasExplicit = false;
     //an explicit animation has been specified
     if (d->value.isValid()) {
         for (int i = 0; i < props.count(); ++i) {
             for (int j = 0; j < targets.count(); ++j) {
-                QDeclarativeAction myAction;
+                QQuickAction myAction;
                 myAction.property = d->createProperty(targets.at(j), props.at(i), this);
                 if (myAction.property.isValid()) {
                     myAction.toValue = d->value;
-                    QDeclarativePropertyAnimationPrivate::convertVariant(myAction.toValue, myAction.property.propertyType());
+                    QQuickPropertyAnimationPrivate::convertVariant(myAction.toValue, myAction.property.propertyType());
                     data->actions << myAction;
                     hasExplicit = true;
                     for (int ii = 0; ii < actions.count(); ++ii) {
-                        QDeclarativeAction &action = actions[ii];
+                        QQuickAction &action = actions[ii];
                         if (action.property.object() == myAction.property.object() &&
                             myAction.property.name() == action.property.name()) {
                             modified << action.property;
@@ -1160,7 +1160,7 @@ QAbstractAnimationJob* QDeclarativePropertyAction::transition(QDeclarativeStateA
 
     if (!hasExplicit)
     for (int ii = 0; ii < actions.count(); ++ii) {
-        QDeclarativeAction &action = actions[ii];
+        QQuickAction &action = actions[ii];
 
         QObject *obj = action.property.object();
         QString propertyName = action.property.name();
@@ -1171,11 +1171,11 @@ QAbstractAnimationJob* QDeclarativePropertyAction::transition(QDeclarativeStateA
         if ((targets.isEmpty() || targets.contains(obj) || (!same && targets.contains(sObj))) &&
            (!d->exclude.contains(obj)) && (same || (!d->exclude.contains(sObj))) &&
            (props.contains(propertyName) || (!same && props.contains(sPropertyName)))) {
-            QDeclarativeAction myAction = action;
+            QQuickAction myAction = action;
 
             if (d->value.isValid())
                 myAction.toValue = d->value;
-            QDeclarativePropertyAnimationPrivate::convertVariant(myAction.toValue, myAction.property.propertyType());
+            QQuickPropertyAnimationPrivate::convertVariant(myAction.toValue, myAction.property.propertyType());
 
             modified << action.property;
             data->actions << myAction;
@@ -1193,7 +1193,7 @@ QAbstractAnimationJob* QDeclarativePropertyAction::transition(QDeclarativeStateA
 }
 
 /*!
-    \qmlclass NumberAnimation QDeclarativeNumberAnimation
+    \qmlclass NumberAnimation QQuickNumberAnimation
     \inqmlmodule QtQuick 2
   \ingroup qml-animation-transition
     \inherits PropertyAnimation
@@ -1206,7 +1206,7 @@ QAbstractAnimationJob* QDeclarativePropertyAction::transition(QDeclarativeStateA
     as a property value source. It animates the \c x value from its current
     value to a value of 50, over 1000 milliseconds:
 
-    \snippet doc/src/snippets/declarative/numberanimation.qml 0
+    \snippet doc/src/snippets/qml/numberanimation.qml 0
 
     Like any other animation element, a NumberAnimation can be applied in a
     number of ways, including transitions, behaviors and property value
@@ -1217,27 +1217,27 @@ QAbstractAnimationJob* QDeclarativePropertyAction::transition(QDeclarativeStateA
     changes in the number value that it is tracking. If this is the case, use
     SmoothedAnimation instead.
 
-    \sa {QML Animation and Transitions}, {declarative/animation/basics}{Animation basics example}
+    \sa {QML Animation and Transitions}, {qml/animation/basics}{Animation basics example}
 */
-QDeclarativeNumberAnimation::QDeclarativeNumberAnimation(QObject *parent)
-: QDeclarativePropertyAnimation(parent)
+QQuickNumberAnimation::QQuickNumberAnimation(QObject *parent)
+: QQuickPropertyAnimation(parent)
 {
     init();
 }
 
-QDeclarativeNumberAnimation::QDeclarativeNumberAnimation(QDeclarativePropertyAnimationPrivate &dd, QObject *parent)
-: QDeclarativePropertyAnimation(dd, parent)
+QQuickNumberAnimation::QQuickNumberAnimation(QQuickPropertyAnimationPrivate &dd, QObject *parent)
+: QQuickPropertyAnimation(dd, parent)
 {
     init();
 }
 
-QDeclarativeNumberAnimation::~QDeclarativeNumberAnimation()
+QQuickNumberAnimation::~QQuickNumberAnimation()
 {
 }
 
-void QDeclarativeNumberAnimation::init()
+void QQuickNumberAnimation::init()
 {
-    Q_D(QDeclarativePropertyAnimation);
+    Q_D(QQuickPropertyAnimation);
     d->interpolatorType = QMetaType::QReal;
     d->interpolator = QVariantAnimationPrivate::getInterpolator(d->interpolatorType);
 }
@@ -1269,15 +1269,15 @@ void QDeclarativeNumberAnimation::init()
     \sa {QML Animation and Transitions}
 */
 
-qreal QDeclarativeNumberAnimation::from() const
+qreal QQuickNumberAnimation::from() const
 {
-    Q_D(const QDeclarativePropertyAnimation);
+    Q_D(const QQuickPropertyAnimation);
     return d->from.toReal();
 }
 
-void QDeclarativeNumberAnimation::setFrom(qreal f)
+void QQuickNumberAnimation::setFrom(qreal f)
 {
-    QDeclarativePropertyAnimation::setFrom(f);
+    QQuickPropertyAnimation::setFrom(f);
 }
 
 /*!
@@ -1291,21 +1291,21 @@ void QDeclarativeNumberAnimation::setFrom(qreal f)
 
     \sa {QML Animation and Transitions}
 */
-qreal QDeclarativeNumberAnimation::to() const
+qreal QQuickNumberAnimation::to() const
 {
-    Q_D(const QDeclarativePropertyAnimation);
+    Q_D(const QQuickPropertyAnimation);
     return d->to.toReal();
 }
 
-void QDeclarativeNumberAnimation::setTo(qreal t)
+void QQuickNumberAnimation::setTo(qreal t)
 {
-    QDeclarativePropertyAnimation::setTo(t);
+    QQuickPropertyAnimation::setTo(t);
 }
 
 
 
 /*!
-    \qmlclass Vector3dAnimation QDeclarativeVector3dAnimation
+    \qmlclass Vector3dAnimation QQuickVector3dAnimation
     \inqmlmodule QtQuick 2
     \ingroup qml-animation-transition
     \inherits PropertyAnimation
@@ -1319,18 +1319,18 @@ void QDeclarativeNumberAnimation::setTo(qreal t)
     sources. The \l {QML Animation and Transitions} documentation shows a
     variety of methods for creating animations.
 
-    \sa {QML Animation and Transitions}, {declarative/animation/basics}{Animation basics example}
+    \sa {QML Animation and Transitions}, {qml/animation/basics}{Animation basics example}
 */
-QDeclarativeVector3dAnimation::QDeclarativeVector3dAnimation(QObject *parent)
-: QDeclarativePropertyAnimation(parent)
+QQuickVector3dAnimation::QQuickVector3dAnimation(QObject *parent)
+: QQuickPropertyAnimation(parent)
 {
-    Q_D(QDeclarativePropertyAnimation);
+    Q_D(QQuickPropertyAnimation);
     d->interpolatorType = QMetaType::QVector3D;
     d->defaultToInterpolatorType = true;
     d->interpolator = QVariantAnimationPrivate::getInterpolator(d->interpolatorType);
 }
 
-QDeclarativeVector3dAnimation::~QDeclarativeVector3dAnimation()
+QQuickVector3dAnimation::~QQuickVector3dAnimation()
 {
 }
 
@@ -1345,15 +1345,15 @@ QDeclarativeVector3dAnimation::~QDeclarativeVector3dAnimation()
 
     \sa {QML Animation and Transitions}
 */
-QVector3D QDeclarativeVector3dAnimation::from() const
+QVector3D QQuickVector3dAnimation::from() const
 {
-    Q_D(const QDeclarativePropertyAnimation);
+    Q_D(const QQuickPropertyAnimation);
     return d->from.value<QVector3D>();
 }
 
-void QDeclarativeVector3dAnimation::setFrom(QVector3D f)
+void QQuickVector3dAnimation::setFrom(QVector3D f)
 {
-    QDeclarativePropertyAnimation::setFrom(f);
+    QQuickPropertyAnimation::setFrom(f);
 }
 
 /*!
@@ -1367,21 +1367,21 @@ void QDeclarativeVector3dAnimation::setFrom(QVector3D f)
 
     \sa {QML Animation and Transitions}
 */
-QVector3D QDeclarativeVector3dAnimation::to() const
+QVector3D QQuickVector3dAnimation::to() const
 {
-    Q_D(const QDeclarativePropertyAnimation);
+    Q_D(const QQuickPropertyAnimation);
     return d->to.value<QVector3D>();
 }
 
-void QDeclarativeVector3dAnimation::setTo(QVector3D t)
+void QQuickVector3dAnimation::setTo(QVector3D t)
 {
-    QDeclarativePropertyAnimation::setTo(t);
+    QQuickPropertyAnimation::setTo(t);
 }
 
 
 
 /*!
-    \qmlclass RotationAnimation QDeclarativeRotationAnimation
+    \qmlclass RotationAnimation QQuickRotationAnimation
     \inqmlmodule QtQuick 2
     \ingroup qml-animation-transition
     \inherits PropertyAnimation
@@ -1399,7 +1399,7 @@ void QDeclarativeVector3dAnimation::setTo(QVector3D t)
     In the following example we use RotationAnimation to animate the rotation
     between states via the shortest path:
 
-    \snippet doc/src/snippets/declarative/rotationanimation.qml 0
+    \snippet doc/src/snippets/qml/rotationanimation.qml 0
 
     Notice the RotationAnimation did not need to set a \l target
     value. As a convenience, when used in a transition, RotationAnimation will rotate all
@@ -1418,7 +1418,7 @@ void QDeclarativeVector3dAnimation::setTo(QVector3D t)
     sources. The \l {QML Animation and Transitions} documentation shows a
     variety of methods for creating animations.
 
-    \sa {QML Animation and Transitions}, {declarative/animation/basics}{Animation basics example}
+    \sa {QML Animation and Transitions}, {qml/animation/basics}{Animation basics example}
 */
 QVariant _q_interpolateShortestRotation(qreal &f, qreal &t, qreal progress)
 {
@@ -1457,16 +1457,16 @@ QVariant _q_interpolateCounterclockwiseRotation(qreal &f, qreal &t, qreal progre
     return QVariant(f + (newt - f) * progress);
 }
 
-QDeclarativeRotationAnimation::QDeclarativeRotationAnimation(QObject *parent)
-: QDeclarativePropertyAnimation(*(new QDeclarativeRotationAnimationPrivate), parent)
+QQuickRotationAnimation::QQuickRotationAnimation(QObject *parent)
+: QQuickPropertyAnimation(*(new QQuickRotationAnimationPrivate), parent)
 {
-    Q_D(QDeclarativeRotationAnimation);
+    Q_D(QQuickRotationAnimation);
     d->interpolatorType = QMetaType::QReal;
     d->interpolator = QVariantAnimationPrivate::getInterpolator(d->interpolatorType);
     d->defaultProperties = QLatin1String("rotation,angle");
 }
 
-QDeclarativeRotationAnimation::~QDeclarativeRotationAnimation()
+QQuickRotationAnimation::~QQuickRotationAnimation()
 {
 }
 
@@ -1496,15 +1496,15 @@ QDeclarativeRotationAnimation::~QDeclarativeRotationAnimation()
 
     \sa {QML Animation and Transitions}
 */
-qreal QDeclarativeRotationAnimation::from() const
+qreal QQuickRotationAnimation::from() const
 {
-    Q_D(const QDeclarativeRotationAnimation);
+    Q_D(const QQuickRotationAnimation);
     return d->from.toReal();
 }
 
-void QDeclarativeRotationAnimation::setFrom(qreal f)
+void QQuickRotationAnimation::setFrom(qreal f)
 {
-    QDeclarativePropertyAnimation::setFrom(f);
+    QQuickPropertyAnimation::setFrom(f);
 }
 
 /*!
@@ -1518,15 +1518,15 @@ void QDeclarativeRotationAnimation::setFrom(qreal f)
 
     \sa {QML Animation and Transitions}
 */
-qreal QDeclarativeRotationAnimation::to() const
+qreal QQuickRotationAnimation::to() const
 {
-    Q_D(const QDeclarativeRotationAnimation);
+    Q_D(const QQuickRotationAnimation);
     return d->to.toReal();
 }
 
-void QDeclarativeRotationAnimation::setTo(qreal t)
+void QQuickRotationAnimation::setTo(qreal t)
 {
-    QDeclarativePropertyAnimation::setTo(t);
+    QQuickPropertyAnimation::setTo(t);
 }
 
 /*!
@@ -1544,15 +1544,15 @@ void QDeclarativeRotationAnimation::setTo(qreal t)
            A rotation from 10 to 350 will rotate 20 degrees counterclockwise.
     \endlist
 */
-QDeclarativeRotationAnimation::RotationDirection QDeclarativeRotationAnimation::direction() const
+QQuickRotationAnimation::RotationDirection QQuickRotationAnimation::direction() const
 {
-    Q_D(const QDeclarativeRotationAnimation);
+    Q_D(const QQuickRotationAnimation);
     return d->direction;
 }
 
-void QDeclarativeRotationAnimation::setDirection(QDeclarativeRotationAnimation::RotationDirection direction)
+void QQuickRotationAnimation::setDirection(QQuickRotationAnimation::RotationDirection direction)
 {
-    Q_D(QDeclarativeRotationAnimation);
+    Q_D(QQuickRotationAnimation);
     if (d->direction == direction)
         return;
 
@@ -1576,50 +1576,50 @@ void QDeclarativeRotationAnimation::setDirection(QDeclarativeRotationAnimation::
 
 
 
-QDeclarativeAnimationGroup::QDeclarativeAnimationGroup(QObject *parent)
-: QDeclarativeAbstractAnimation(*(new QDeclarativeAnimationGroupPrivate), parent)
+QQuickAnimationGroup::QQuickAnimationGroup(QObject *parent)
+: QQuickAbstractAnimation(*(new QQuickAnimationGroupPrivate), parent)
 {
 }
 
-QDeclarativeAnimationGroup::QDeclarativeAnimationGroup(QDeclarativeAnimationGroupPrivate &dd, QObject *parent)
-    : QDeclarativeAbstractAnimation(dd, parent)
+QQuickAnimationGroup::QQuickAnimationGroup(QQuickAnimationGroupPrivate &dd, QObject *parent)
+    : QQuickAbstractAnimation(dd, parent)
 {
 }
 
-void QDeclarativeAnimationGroupPrivate::append_animation(QDeclarativeListProperty<QDeclarativeAbstractAnimation> *list, QDeclarativeAbstractAnimation *a)
+void QQuickAnimationGroupPrivate::append_animation(QQmlListProperty<QQuickAbstractAnimation> *list, QQuickAbstractAnimation *a)
 {
-    QDeclarativeAnimationGroup *q = qobject_cast<QDeclarativeAnimationGroup *>(list->object);
+    QQuickAnimationGroup *q = qobject_cast<QQuickAnimationGroup *>(list->object);
     if (q) {
         a->setGroup(q);
     }
 }
 
-void QDeclarativeAnimationGroupPrivate::clear_animation(QDeclarativeListProperty<QDeclarativeAbstractAnimation> *list)
+void QQuickAnimationGroupPrivate::clear_animation(QQmlListProperty<QQuickAbstractAnimation> *list)
 {
-    QDeclarativeAnimationGroup *q = qobject_cast<QDeclarativeAnimationGroup *>(list->object);
+    QQuickAnimationGroup *q = qobject_cast<QQuickAnimationGroup *>(list->object);
     if (q) {
         while (q->d_func()->animations.count()) {
-            QDeclarativeAbstractAnimation *firstAnim = q->d_func()->animations.at(0);
+            QQuickAbstractAnimation *firstAnim = q->d_func()->animations.at(0);
             firstAnim->setGroup(0);
         }
     }
 }
 
-QDeclarativeAnimationGroup::~QDeclarativeAnimationGroup()
+QQuickAnimationGroup::~QQuickAnimationGroup()
 {
 }
 
-QDeclarativeListProperty<QDeclarativeAbstractAnimation> QDeclarativeAnimationGroup::animations()
+QQmlListProperty<QQuickAbstractAnimation> QQuickAnimationGroup::animations()
 {
-    Q_D(QDeclarativeAnimationGroup);
-    QDeclarativeListProperty<QDeclarativeAbstractAnimation> list(this, d->animations);
-    list.append = &QDeclarativeAnimationGroupPrivate::append_animation;
-    list.clear = &QDeclarativeAnimationGroupPrivate::clear_animation;
+    Q_D(QQuickAnimationGroup);
+    QQmlListProperty<QQuickAbstractAnimation> list(this, d->animations);
+    list.append = &QQuickAnimationGroupPrivate::append_animation;
+    list.clear = &QQuickAnimationGroupPrivate::clear_animation;
     return list;
 }
 
 /*!
-    \qmlclass SequentialAnimation QDeclarativeSequentialAnimation
+    \qmlclass SequentialAnimation QQuickSequentialAnimation
     \inqmlmodule QtQuick 2
   \ingroup qml-animation-transition
     \inherits Animation
@@ -1633,7 +1633,7 @@ QDeclarativeListProperty<QDeclarativeAbstractAnimation> QDeclarativeAnimationGro
     The following example runs two number animations in a sequence.  The \l Rectangle
     animates to a \c x position of 50, then to a \c y position of 50.
 
-    \snippet doc/src/snippets/declarative/sequentialanimation.qml 0
+    \snippet doc/src/snippets/qml/sequentialanimation.qml 0
 
     Animations defined within a \l Transition are automatically run in parallel,
     so SequentialAnimation can be used to enclose the animations in a \l Transition
@@ -1648,24 +1648,24 @@ QDeclarativeListProperty<QDeclarativeAbstractAnimation> QDeclarativeAnimationGro
     ParallelAnimation, it cannot be individually started and stopped; the
     SequentialAnimation or ParallelAnimation must be started and stopped as a group.
 
-    \sa ParallelAnimation, {QML Animation and Transitions}, {declarative/animation/basics}{Animation basics example}
+    \sa ParallelAnimation, {QML Animation and Transitions}, {qml/animation/basics}{Animation basics example}
 */
 
-QDeclarativeSequentialAnimation::QDeclarativeSequentialAnimation(QObject *parent) :
-    QDeclarativeAnimationGroup(parent)
+QQuickSequentialAnimation::QQuickSequentialAnimation(QObject *parent) :
+    QQuickAnimationGroup(parent)
 {
 }
 
-QDeclarativeSequentialAnimation::~QDeclarativeSequentialAnimation()
+QQuickSequentialAnimation::~QQuickSequentialAnimation()
 {
 }
 
-QAbstractAnimationJob* QDeclarativeSequentialAnimation::transition(QDeclarativeStateActions &actions,
-                                    QDeclarativeProperties &modified,
+QAbstractAnimationJob* QQuickSequentialAnimation::transition(QQuickStateActions &actions,
+                                    QQmlProperties &modified,
                                     TransitionDirection direction,
                                     QObject *defaultTarget)
 {
-    Q_D(QDeclarativeAnimationGroup);
+    Q_D(QQuickAnimationGroup);
 
     QSequentialAnimationGroupJob *ag = new QSequentialAnimationGroupJob;
 
@@ -1691,7 +1691,7 @@ QAbstractAnimationJob* QDeclarativeSequentialAnimation::transition(QDeclarativeS
 
 
 /*!
-    \qmlclass ParallelAnimation QDeclarativeParallelAnimation
+    \qmlclass ParallelAnimation QQuickParallelAnimation
     \inqmlmodule QtQuick 2
   \ingroup qml-animation-transition
     \inherits Animation
@@ -1705,7 +1705,7 @@ QAbstractAnimationJob* QDeclarativeSequentialAnimation::transition(QDeclarativeS
     The following animation runs two number animations in parallel. The \l Rectangle
     moves to (50,50) by animating its \c x and \c y properties at the same time.
 
-    \snippet doc/src/snippets/declarative/parallelanimation.qml 0
+    \snippet doc/src/snippets/qml/parallelanimation.qml 0
 
     Like any other animation element, a ParallelAnimation can be applied in a
     number of ways, including transitions, behaviors and property value
@@ -1716,23 +1716,23 @@ QAbstractAnimationJob* QDeclarativeSequentialAnimation::transition(QDeclarativeS
     ParallelAnimation, it cannot be individually started and stopped; the
     SequentialAnimation or ParallelAnimation must be started and stopped as a group.
 
-    \sa SequentialAnimation, {QML Animation and Transitions}, {declarative/animation/basics}{Animation basics example}
+    \sa SequentialAnimation, {QML Animation and Transitions}, {qml/animation/basics}{Animation basics example}
 */
-QDeclarativeParallelAnimation::QDeclarativeParallelAnimation(QObject *parent) :
-    QDeclarativeAnimationGroup(parent)
+QQuickParallelAnimation::QQuickParallelAnimation(QObject *parent) :
+    QQuickAnimationGroup(parent)
 {
 }
 
-QDeclarativeParallelAnimation::~QDeclarativeParallelAnimation()
+QQuickParallelAnimation::~QQuickParallelAnimation()
 {
 }
 
-QAbstractAnimationJob* QDeclarativeParallelAnimation::transition(QDeclarativeStateActions &actions,
-                                      QDeclarativeProperties &modified,
+QAbstractAnimationJob* QQuickParallelAnimation::transition(QQuickStateActions &actions,
+                                      QQmlProperties &modified,
                                       TransitionDirection direction,
                                       QObject *defaultTarget)
 {
-    Q_D(QDeclarativeAnimationGroup);
+    Q_D(QQuickAnimationGroup);
     QParallelAnimationGroupJob *ag = new QParallelAnimationGroupJob;
 
     bool valid = d->defaultProperty.isValid();
@@ -1747,7 +1747,7 @@ QAbstractAnimationJob* QDeclarativeParallelAnimation::transition(QDeclarativeSta
 }
 
 //convert a variant from string type to another animatable type
-void QDeclarativePropertyAnimationPrivate::convertVariant(QVariant &variant, int type)
+void QQuickPropertyAnimationPrivate::convertVariant(QVariant &variant, int type)
 {
     if (variant.userType() != QVariant::String) {
         variant.convert((QVariant::Type)type);
@@ -1756,42 +1756,42 @@ void QDeclarativePropertyAnimationPrivate::convertVariant(QVariant &variant, int
 
     switch (type) {
     case QVariant::Rect: {
-        variant.setValue(QDeclarativeStringConverters::rectFFromString(variant.toString()).toRect());
+        variant.setValue(QQmlStringConverters::rectFFromString(variant.toString()).toRect());
         break;
     }
     case QVariant::RectF: {
-        variant.setValue(QDeclarativeStringConverters::rectFFromString(variant.toString()));
+        variant.setValue(QQmlStringConverters::rectFFromString(variant.toString()));
         break;
     }
     case QVariant::Point: {
-        variant.setValue(QDeclarativeStringConverters::pointFFromString(variant.toString()).toPoint());
+        variant.setValue(QQmlStringConverters::pointFFromString(variant.toString()).toPoint());
         break;
     }
     case QVariant::PointF: {
-        variant.setValue(QDeclarativeStringConverters::pointFFromString(variant.toString()));
+        variant.setValue(QQmlStringConverters::pointFFromString(variant.toString()));
         break;
     }
     case QVariant::Size: {
-        variant.setValue(QDeclarativeStringConverters::sizeFFromString(variant.toString()).toSize());
+        variant.setValue(QQmlStringConverters::sizeFFromString(variant.toString()).toSize());
         break;
     }
     case QVariant::SizeF: {
-        variant.setValue(QDeclarativeStringConverters::sizeFFromString(variant.toString()));
+        variant.setValue(QQmlStringConverters::sizeFFromString(variant.toString()));
         break;
     }
     case QVariant::Color: {
-        variant.setValue(QDeclarativeStringConverters::colorFromString(variant.toString()));
+        variant.setValue(QQmlStringConverters::colorFromString(variant.toString()));
         break;
     }
     case QVariant::Vector3D: {
-        variant.setValue(QDeclarativeStringConverters::vector3DFromString(variant.toString()));
+        variant.setValue(QQmlStringConverters::vector3DFromString(variant.toString()));
         break;
     }
     default:
-        if (QDeclarativeValueTypeFactory::isValueType((uint)type)) {
+        if (QQmlValueTypeFactory::isValueType((uint)type)) {
             variant.convert((QVariant::Type)type);
         } else {
-            QDeclarativeMetaType::StringConverter converter = QDeclarativeMetaType::customStringConverter(type);
+            QQmlMetaType::StringConverter converter = QQmlMetaType::customStringConverter(type);
             if (converter)
                 variant = converter(variant.toString());
         }
@@ -1799,24 +1799,24 @@ void QDeclarativePropertyAnimationPrivate::convertVariant(QVariant &variant, int
     }
 }
 
-QDeclarativeBulkValueAnimator::QDeclarativeBulkValueAnimator()
+QQuickBulkValueAnimator::QQuickBulkValueAnimator()
     : QAbstractAnimationJob(), animValue(0), fromSourced(0), m_duration(250)
 {
 }
 
-QDeclarativeBulkValueAnimator::~QDeclarativeBulkValueAnimator()
+QQuickBulkValueAnimator::~QQuickBulkValueAnimator()
 {
     delete animValue;
 }
 
-void QDeclarativeBulkValueAnimator::setAnimValue(QDeclarativeBulkValueUpdater *value)
+void QQuickBulkValueAnimator::setAnimValue(QQuickBulkValueUpdater *value)
 {
     if (isRunning())
         stop();
     animValue = value;
 }
 
-void QDeclarativeBulkValueAnimator::updateCurrentTime(int currentTime)
+void QQuickBulkValueAnimator::updateCurrentTime(int currentTime)
 {
     if (isStopped())
         return;
@@ -1827,7 +1827,7 @@ void QDeclarativeBulkValueAnimator::updateCurrentTime(int currentTime)
         animValue->setValue(progress);
 }
 
-void QDeclarativeBulkValueAnimator::topLevelAnimationLoopChanged()
+void QQuickBulkValueAnimator::topLevelAnimationLoopChanged()
 {
     //check for new from every top-level loop (when the top level animation is started and all subsequent loops)
     if (fromSourced)
@@ -1835,7 +1835,7 @@ void QDeclarativeBulkValueAnimator::topLevelAnimationLoopChanged()
 }
 
 /*!
-    \qmlclass PropertyAnimation QDeclarativePropertyAnimation
+    \qmlclass PropertyAnimation QQuickPropertyAnimation
     \inqmlmodule QtQuick 2
   \ingroup qml-animation-transition
     \inherits Animation
@@ -1851,21 +1851,21 @@ void QDeclarativeBulkValueAnimator::topLevelAnimationLoopChanged()
     For example, to animate any objects that have changed their \c x or \c y properties
     as a result of a state change, using an \c InOutQuad easing curve:
 
-    \snippet doc/src/snippets/declarative/propertyanimation.qml transition
+    \snippet doc/src/snippets/qml/propertyanimation.qml transition
 
 
     \o In a \l Behavior
 
     For example, to animate all changes to a rectangle's \c x property:
 
-    \snippet doc/src/snippets/declarative/propertyanimation.qml behavior
+    \snippet doc/src/snippets/qml/propertyanimation.qml behavior
 
 
     \o As a property value source
 
     For example, to repeatedly animate the rectangle's \c x property:
 
-    \snippet doc/src/snippets/declarative/propertyanimation.qml propertyvaluesource
+    \snippet doc/src/snippets/qml/propertyanimation.qml propertyvaluesource
 
 
     \o In a signal handler
@@ -1882,7 +1882,7 @@ void QDeclarativeBulkValueAnimator::topLevelAnimationLoopChanged()
 
     For example, to animate \c rect's \c width property over 500ms, from its current width to 30:
 
-    \snippet doc/src/snippets/declarative/propertyanimation.qml standalone
+    \snippet doc/src/snippets/qml/propertyanimation.qml standalone
 
     \endlist
 
@@ -1893,20 +1893,20 @@ void QDeclarativeBulkValueAnimator::topLevelAnimationLoopChanged()
     Note that PropertyAnimation inherits the abstract \l Animation element.
     This includes additional properties and methods for controlling the animation.
 
-    \sa {QML Animation and Transitions}, {declarative/animation/basics}{Animation basics example}
+    \sa {QML Animation and Transitions}, {qml/animation/basics}{Animation basics example}
 */
 
-QDeclarativePropertyAnimation::QDeclarativePropertyAnimation(QObject *parent)
-: QDeclarativeAbstractAnimation(*(new QDeclarativePropertyAnimationPrivate), parent)
+QQuickPropertyAnimation::QQuickPropertyAnimation(QObject *parent)
+: QQuickAbstractAnimation(*(new QQuickPropertyAnimationPrivate), parent)
 {
 }
 
-QDeclarativePropertyAnimation::QDeclarativePropertyAnimation(QDeclarativePropertyAnimationPrivate &dd, QObject *parent)
-: QDeclarativeAbstractAnimation(dd, parent)
+QQuickPropertyAnimation::QQuickPropertyAnimation(QQuickPropertyAnimationPrivate &dd, QObject *parent)
+: QQuickAbstractAnimation(dd, parent)
 {
 }
 
-QDeclarativePropertyAnimation::~QDeclarativePropertyAnimation()
+QQuickPropertyAnimation::~QQuickPropertyAnimation()
 {
 }
 
@@ -1916,20 +1916,20 @@ QDeclarativePropertyAnimation::~QDeclarativePropertyAnimation()
 
     The default value is 250.
 */
-int QDeclarativePropertyAnimation::duration() const
+int QQuickPropertyAnimation::duration() const
 {
-    Q_D(const QDeclarativePropertyAnimation);
+    Q_D(const QQuickPropertyAnimation);
     return d->duration;
 }
 
-void QDeclarativePropertyAnimation::setDuration(int duration)
+void QQuickPropertyAnimation::setDuration(int duration)
 {
     if (duration < 0) {
         qmlInfo(this) << tr("Cannot set a duration of < 0");
         return;
     }
 
-    Q_D(QDeclarativePropertyAnimation);
+    Q_D(QQuickPropertyAnimation);
     if (d->duration == duration)
         return;
     d->duration = duration;
@@ -1947,15 +1947,15 @@ void QDeclarativePropertyAnimation::setDuration(int duration)
 
     \sa {QML Animation and Transitions}
 */
-QVariant QDeclarativePropertyAnimation::from() const
+QVariant QQuickPropertyAnimation::from() const
 {
-    Q_D(const QDeclarativePropertyAnimation);
+    Q_D(const QQuickPropertyAnimation);
     return d->from;
 }
 
-void QDeclarativePropertyAnimation::setFrom(const QVariant &f)
+void QQuickPropertyAnimation::setFrom(const QVariant &f)
 {
-    Q_D(QDeclarativePropertyAnimation);
+    Q_D(QQuickPropertyAnimation);
     if (d->fromIsDefined && f == d->from)
         return;
     d->from = f;
@@ -1974,15 +1974,15 @@ void QDeclarativePropertyAnimation::setFrom(const QVariant &f)
 
     \sa {QML Animation and Transitions}
 */
-QVariant QDeclarativePropertyAnimation::to() const
+QVariant QQuickPropertyAnimation::to() const
 {
-    Q_D(const QDeclarativePropertyAnimation);
+    Q_D(const QQuickPropertyAnimation);
     return d->to;
 }
 
-void QDeclarativePropertyAnimation::setTo(const QVariant &t)
+void QQuickPropertyAnimation::setTo(const QVariant &t)
 {
-    Q_D(QDeclarativePropertyAnimation);
+    Q_D(QQuickPropertyAnimation);
     if (d->toIsDefined && t == d->to)
         return;
     d->to = t;
@@ -2195,18 +2195,18 @@ void QDeclarativePropertyAnimation::setTo(const QVariant &t)
     groups of three points defining a curve from 0,0 to 1,1 - control1, control2,
     end point: [cx1, cy1, cx2, cy2, endx, endy, ...].  The last point must be 1,1.
 
-    See the \l {declarative/animation/easing}{easing} example for a demonstration of
+    See the \l {qml/animation/easing}{easing} example for a demonstration of
     the different easing settings.
 */
-QEasingCurve QDeclarativePropertyAnimation::easing() const
+QEasingCurve QQuickPropertyAnimation::easing() const
 {
-    Q_D(const QDeclarativePropertyAnimation);
+    Q_D(const QQuickPropertyAnimation);
     return d->easing;
 }
 
-void QDeclarativePropertyAnimation::setEasing(const QEasingCurve &e)
+void QQuickPropertyAnimation::setEasing(const QEasingCurve &e)
 {
-    Q_D(QDeclarativePropertyAnimation);
+    Q_D(QQuickPropertyAnimation);
     if (d->easing == e)
         return;
 
@@ -2214,45 +2214,45 @@ void QDeclarativePropertyAnimation::setEasing(const QEasingCurve &e)
     emit easingChanged(e);
 }
 
-QObject *QDeclarativePropertyAnimation::target() const
+QObject *QQuickPropertyAnimation::target() const
 {
-    Q_D(const QDeclarativePropertyAnimation);
+    Q_D(const QQuickPropertyAnimation);
     return d->target;
 }
 
-void QDeclarativePropertyAnimation::setTargetObject(QObject *o)
+void QQuickPropertyAnimation::setTargetObject(QObject *o)
 {
-    Q_D(QDeclarativePropertyAnimation);
+    Q_D(QQuickPropertyAnimation);
     if (d->target == o)
         return;
     d->target = o;
     emit targetChanged();
 }
 
-QString QDeclarativePropertyAnimation::property() const
+QString QQuickPropertyAnimation::property() const
 {
-    Q_D(const QDeclarativePropertyAnimation);
+    Q_D(const QQuickPropertyAnimation);
     return d->propertyName;
 }
 
-void QDeclarativePropertyAnimation::setProperty(const QString &n)
+void QQuickPropertyAnimation::setProperty(const QString &n)
 {
-    Q_D(QDeclarativePropertyAnimation);
+    Q_D(QQuickPropertyAnimation);
     if (d->propertyName == n)
         return;
     d->propertyName = n;
     emit propertyChanged();
 }
 
-QString QDeclarativePropertyAnimation::properties() const
+QString QQuickPropertyAnimation::properties() const
 {
-    Q_D(const QDeclarativePropertyAnimation);
+    Q_D(const QQuickPropertyAnimation);
     return d->properties;
 }
 
-void QDeclarativePropertyAnimation::setProperties(const QString &prop)
+void QQuickPropertyAnimation::setProperties(const QString &prop)
 {
-    Q_D(QDeclarativePropertyAnimation);
+    Q_D(QQuickPropertyAnimation);
     if (d->properties == prop)
         return;
 
@@ -2350,10 +2350,10 @@ void QDeclarativePropertyAnimation::setProperties(const QString &prop)
 
     \sa exclude, {QML Animation and Transitions}
 */
-QDeclarativeListProperty<QObject> QDeclarativePropertyAnimation::targets()
+QQmlListProperty<QObject> QQuickPropertyAnimation::targets()
 {
-    Q_D(QDeclarativePropertyAnimation);
-    return QDeclarativeListProperty<QObject>(this, d->targets);
+    Q_D(QQuickPropertyAnimation);
+    return QQmlListProperty<QObject>(this, d->targets);
 }
 
 /*!
@@ -2361,28 +2361,28 @@ QDeclarativeListProperty<QObject> QDeclarativePropertyAnimation::targets()
     This property holds the items not to be affected by this animation.
     \sa PropertyAnimation::targets
 */
-QDeclarativeListProperty<QObject> QDeclarativePropertyAnimation::exclude()
+QQmlListProperty<QObject> QQuickPropertyAnimation::exclude()
 {
-    Q_D(QDeclarativePropertyAnimation);
-    return QDeclarativeListProperty<QObject>(this, d->exclude);
+    Q_D(QQuickPropertyAnimation);
+    return QQmlListProperty<QObject>(this, d->exclude);
 }
 
-void QDeclarativeAnimationPropertyUpdater::setValue(qreal v)
+void QQuickAnimationPropertyUpdater::setValue(qreal v)
 {
     bool deleted = false;
     wasDeleted = &deleted;
     if (reverse)
         v = 1 - v;
     for (int ii = 0; ii < actions.count(); ++ii) {
-        QDeclarativeAction &action = actions[ii];
+        QQuickAction &action = actions[ii];
 
         if (v == 1.) {
-            QDeclarativePropertyPrivate::write(action.property, action.toValue, QDeclarativePropertyPrivate::BypassInterceptor | QDeclarativePropertyPrivate::DontRemoveBinding);
+            QQmlPropertyPrivate::write(action.property, action.toValue, QQmlPropertyPrivate::BypassInterceptor | QQmlPropertyPrivate::DontRemoveBinding);
         } else {
             if (!fromSourced && !fromDefined) {
                 action.fromValue = action.property.read();
                 if (interpolatorType) {
-                    QDeclarativePropertyAnimationPrivate::convertVariant(action.fromValue, interpolatorType);
+                    QQuickPropertyAnimationPrivate::convertVariant(action.fromValue, interpolatorType);
                 }
             }
             if (!interpolatorType) {
@@ -2393,7 +2393,7 @@ void QDeclarativeAnimationPropertyUpdater::setValue(qreal v)
                 }
             }
             if (interpolator)
-                QDeclarativePropertyPrivate::write(action.property, interpolator(action.fromValue.constData(), action.toValue.constData(), v), QDeclarativePropertyPrivate::BypassInterceptor | QDeclarativePropertyPrivate::DontRemoveBinding);
+                QQmlPropertyPrivate::write(action.property, interpolator(action.fromValue.constData(), action.toValue.constData(), v), QQmlPropertyPrivate::BypassInterceptor | QQmlPropertyPrivate::DontRemoveBinding);
         }
         if (deleted)
             return;
@@ -2402,12 +2402,12 @@ void QDeclarativeAnimationPropertyUpdater::setValue(qreal v)
     fromSourced = true;
 }
 
-QDeclarativeStateActions QDeclarativePropertyAnimation::createTransitionActions(QDeclarativeStateActions &actions,
-                                                                                QDeclarativeProperties &modified,
+QQuickStateActions QQuickPropertyAnimation::createTransitionActions(QQuickStateActions &actions,
+                                                                                QQmlProperties &modified,
                                                                                 QObject *defaultTarget)
 {
-    Q_D(QDeclarativePropertyAnimation);
-    QDeclarativeStateActions newActions;
+    Q_D(QQuickPropertyAnimation);
+    QQuickStateActions newActions;
 
     QStringList props = d->properties.isEmpty() ? QStringList() : d->properties.split(QLatin1Char(','));
     for (int ii = 0; ii < props.count(); ++ii)
@@ -2439,7 +2439,7 @@ QDeclarativeStateActions QDeclarativePropertyAnimation::createTransitionActions(
     if (d->toIsDefined) {
         for (int i = 0; i < props.count(); ++i) {
             for (int j = 0; j < targets.count(); ++j) {
-                QDeclarativeAction myAction;
+                QQuickAction myAction;
                 myAction.property = d->createProperty(targets.at(j), props.at(i), this);
                 if (myAction.property.isValid()) {
                     if (d->fromIsDefined) {
@@ -2451,7 +2451,7 @@ QDeclarativeStateActions QDeclarativePropertyAnimation::createTransitionActions(
                     newActions << myAction;
                     hasExplicit = true;
                     for (int ii = 0; ii < actions.count(); ++ii) {
-                        QDeclarativeAction &action = actions[ii];
+                        QQuickAction &action = actions[ii];
                         if (action.property.object() == myAction.property.object() &&
                             myAction.property.name() == action.property.name()) {
                             modified << action.property;
@@ -2465,7 +2465,7 @@ QDeclarativeStateActions QDeclarativePropertyAnimation::createTransitionActions(
 
     if (!hasExplicit)
     for (int ii = 0; ii < actions.count(); ++ii) {
-        QDeclarativeAction &action = actions[ii];
+        QQuickAction &action = actions[ii];
 
         QObject *obj = action.property.object();
         QString propertyName = action.property.name();
@@ -2477,7 +2477,7 @@ QDeclarativeStateActions QDeclarativePropertyAnimation::createTransitionActions(
            (!d->exclude.contains(obj)) && (same || (!d->exclude.contains(sObj))) &&
            (props.contains(propertyName) || (!same && props.contains(sPropertyName))
                || (useType && action.property.propertyType() == d->interpolatorType))) {
-            QDeclarativeAction myAction = action;
+            QQuickAction myAction = action;
 
             if (d->fromIsDefined)
                 myAction.fromValue = d->from;
@@ -2498,21 +2498,21 @@ QDeclarativeStateActions QDeclarativePropertyAnimation::createTransitionActions(
     return newActions;
 }
 
-QAbstractAnimationJob* QDeclarativePropertyAnimation::transition(QDeclarativeStateActions &actions,
-                                                                     QDeclarativeProperties &modified,
+QAbstractAnimationJob* QQuickPropertyAnimation::transition(QQuickStateActions &actions,
+                                                                     QQmlProperties &modified,
                                                                      TransitionDirection direction,
                                                                      QObject *defaultTarget)
 {
-    Q_D(QDeclarativePropertyAnimation);
+    Q_D(QQuickPropertyAnimation);
 
-    QDeclarativeStateActions dataActions = createTransitionActions(actions, modified, defaultTarget);
+    QQuickStateActions dataActions = createTransitionActions(actions, modified, defaultTarget);
 
-    QDeclarativeBulkValueAnimator *animator = new QDeclarativeBulkValueAnimator;
+    QQuickBulkValueAnimator *animator = new QQuickBulkValueAnimator;
     animator->setDuration(d->duration);
     animator->setEasingCurve(d->easing);
 
     if (!dataActions.isEmpty()) {
-        QDeclarativeAnimationPropertyUpdater *data = new QDeclarativeAnimationPropertyUpdater;
+        QQuickAnimationPropertyUpdater *data = new QQuickAnimationPropertyUpdater;
         data->interpolatorType = d->interpolatorType;
         data->interpolator = d->interpolator;
         data->reverse = direction == Backward ? true : false;
diff --git a/src/quick/util/qdeclarativeanimation_p.h b/src/quick/util/qquickanimation_p.h
index ec6a42861d..980a2f5171 100644
--- a/src/quick/util/qdeclarativeanimation_p.h
+++ b/src/quick/util/qquickanimation_p.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
@@ -39,15 +39,15 @@
 **
 ****************************************************************************/
 
-#ifndef QDECLARATIVEANIMATION_H
-#define QDECLARATIVEANIMATION_H
+#ifndef QQUICKANIMATION_H
+#define QQUICKANIMATION_H
 
-#include "qdeclarativestate_p.h"
+#include "qquickstate_p.h"
 #include <QtGui/qvector3d.h>
 
-#include <qdeclarativepropertyvaluesource.h>
-#include <qdeclarative.h>
-#include <qdeclarativescriptstring.h>
+#include <qqmlpropertyvaluesource.h>
+#include <qqml.h>
+#include <qqmlscriptstring.h>
 
 #include <QtCore/qvariant.h>
 #include <QtCore/qeasingcurve.h>
@@ -58,15 +58,15 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-class QDeclarativeAbstractAnimationPrivate;
-class QDeclarativeAnimationGroup;
-class Q_QUICK_PRIVATE_EXPORT QDeclarativeAbstractAnimation : public QObject, public QDeclarativePropertyValueSource, public QDeclarativeParserStatus
+class QQuickAbstractAnimationPrivate;
+class QQuickAnimationGroup;
+class Q_QUICK_PRIVATE_EXPORT QQuickAbstractAnimation : public QObject, public QQmlPropertyValueSource, public QQmlParserStatus
 {
     Q_OBJECT
-    Q_DECLARE_PRIVATE(QDeclarativeAbstractAnimation)
+    Q_DECLARE_PRIVATE(QQuickAbstractAnimation)
 
-    Q_INTERFACES(QDeclarativeParserStatus)
-    Q_INTERFACES(QDeclarativePropertyValueSource)
+    Q_INTERFACES(QQmlParserStatus)
+    Q_INTERFACES(QQmlPropertyValueSource)
     Q_ENUMS(Loops)
     Q_PROPERTY(bool running READ isRunning WRITE setRunning NOTIFY runningChanged)
     Q_PROPERTY(bool paused READ isPaused WRITE setPaused NOTIFY pausedChanged)
@@ -75,8 +75,8 @@ class Q_QUICK_PRIVATE_EXPORT QDeclarativeAbstractAnimation : public QObject, pub
     Q_CLASSINFO("DefaultMethod", "start()")
 
 public:
-    QDeclarativeAbstractAnimation(QObject *parent=0);
-    virtual ~QDeclarativeAbstractAnimation();
+    QQuickAbstractAnimation(QObject *parent=0);
+    virtual ~QQuickAbstractAnimation();
 
     enum Loops { Infinite = -2 };
 
@@ -94,10 +94,10 @@ public:
     int currentTime();
     void setCurrentTime(int);
 
-    QDeclarativeAnimationGroup *group() const;
-    void setGroup(QDeclarativeAnimationGroup *);
+    QQuickAnimationGroup *group() const;
+    void setGroup(QQuickAnimationGroup *);
 
-    void setDefaultTarget(const QDeclarativeProperty &);
+    void setDefaultTarget(const QQmlProperty &);
     void setDisableUserControl();
     void setEnableUserControl();
     bool userControlDisabled() const;
@@ -121,13 +121,13 @@ public Q_SLOTS:
     void complete();
 
 protected:
-    QDeclarativeAbstractAnimation(QDeclarativeAbstractAnimationPrivate &dd, QObject *parent);
+    QQuickAbstractAnimation(QQuickAbstractAnimationPrivate &dd, QObject *parent);
     QAbstractAnimationJob* initInstance(QAbstractAnimationJob *animation);
 
 public:
     enum TransitionDirection { Forward, Backward };
-    virtual QAbstractAnimationJob* transition(QDeclarativeStateActions &actions,
-                            QDeclarativeProperties &modified,
+    virtual QAbstractAnimationJob* transition(QQuickStateActions &actions,
+                            QQmlProperties &modified,
                             TransitionDirection direction,
                             QObject *defaultTarget = 0);
     QAbstractAnimationJob* qtAnimation();
@@ -135,23 +135,23 @@ public:
 private Q_SLOTS:
     void componentFinalized();
 private:
-    virtual void setTarget(const QDeclarativeProperty &);
+    virtual void setTarget(const QQmlProperty &);
     void notifyRunningChanged(bool running);
-    friend class QDeclarativeBehavior;
-    friend class QDeclarativeBehaviorPrivate;
+    friend class QQuickBehavior;
+    friend class QQuickBehaviorPrivate;
 };
 
-class QDeclarativePauseAnimationPrivate;
-class Q_QUICK_PRIVATE_EXPORT QDeclarativePauseAnimation : public QDeclarativeAbstractAnimation
+class QQuickPauseAnimationPrivate;
+class Q_QUICK_PRIVATE_EXPORT QQuickPauseAnimation : public QQuickAbstractAnimation
 {
     Q_OBJECT
-    Q_DECLARE_PRIVATE(QDeclarativePauseAnimation)
+    Q_DECLARE_PRIVATE(QQuickPauseAnimation)
 
     Q_PROPERTY(int duration READ duration WRITE setDuration NOTIFY durationChanged)
 
 public:
-    QDeclarativePauseAnimation(QObject *parent=0);
-    virtual ~QDeclarativePauseAnimation();
+    QQuickPauseAnimation(QObject *parent=0);
+    virtual ~QQuickPauseAnimation();
 
     int duration() const;
     void setDuration(int);
@@ -160,54 +160,54 @@ Q_SIGNALS:
     void durationChanged(int);
 
 protected:
-    QAbstractAnimationJob* transition(QDeclarativeStateActions &actions,
-                                          QDeclarativeProperties &modified,
+    QAbstractAnimationJob* transition(QQuickStateActions &actions,
+                                          QQmlProperties &modified,
                                           TransitionDirection direction,
                                           QObject *defaultTarget = 0);
 };
 
-class QDeclarativeScriptActionPrivate;
-class Q_QUICK_PRIVATE_EXPORT QDeclarativeScriptAction : public QDeclarativeAbstractAnimation
+class QQuickScriptActionPrivate;
+class Q_QUICK_PRIVATE_EXPORT QQuickScriptAction : public QQuickAbstractAnimation
 {
     Q_OBJECT
-    Q_DECLARE_PRIVATE(QDeclarativeScriptAction)
+    Q_DECLARE_PRIVATE(QQuickScriptAction)
 
-    Q_PROPERTY(QDeclarativeScriptString script READ script WRITE setScript)
+    Q_PROPERTY(QQmlScriptString script READ script WRITE setScript)
     Q_PROPERTY(QString scriptName READ stateChangeScriptName WRITE setStateChangeScriptName)
 
 public:
-    QDeclarativeScriptAction(QObject *parent=0);
-    virtual ~QDeclarativeScriptAction();
+    QQuickScriptAction(QObject *parent=0);
+    virtual ~QQuickScriptAction();
 
-    QDeclarativeScriptString script() const;
-    void setScript(const QDeclarativeScriptString &);
+    QQmlScriptString script() const;
+    void setScript(const QQmlScriptString &);
 
     QString stateChangeScriptName() const;
     void setStateChangeScriptName(const QString &);
 
 protected:
-    virtual QAbstractAnimationJob* transition(QDeclarativeStateActions &actions,
-                            QDeclarativeProperties &modified,
+    virtual QAbstractAnimationJob* transition(QQuickStateActions &actions,
+                            QQmlProperties &modified,
                             TransitionDirection direction,
                             QObject *defaultTarget = 0);
 };
 
-class QDeclarativePropertyActionPrivate;
-class Q_QUICK_PRIVATE_EXPORT QDeclarativePropertyAction : public QDeclarativeAbstractAnimation
+class QQuickPropertyActionPrivate;
+class Q_QUICK_PRIVATE_EXPORT QQuickPropertyAction : public QQuickAbstractAnimation
 {
     Q_OBJECT
-    Q_DECLARE_PRIVATE(QDeclarativePropertyAction)
+    Q_DECLARE_PRIVATE(QQuickPropertyAction)
 
     Q_PROPERTY(QObject *target READ target WRITE setTargetObject NOTIFY targetChanged)
     Q_PROPERTY(QString property READ property WRITE setProperty NOTIFY propertyChanged)
     Q_PROPERTY(QString properties READ properties WRITE setProperties NOTIFY propertiesChanged)
-    Q_PROPERTY(QDeclarativeListProperty<QObject> targets READ targets)
-    Q_PROPERTY(QDeclarativeListProperty<QObject> exclude READ exclude)
+    Q_PROPERTY(QQmlListProperty<QObject> targets READ targets)
+    Q_PROPERTY(QQmlListProperty<QObject> exclude READ exclude)
     Q_PROPERTY(QVariant value READ value WRITE setValue NOTIFY valueChanged)
 
 public:
-    QDeclarativePropertyAction(QObject *parent=0);
-    virtual ~QDeclarativePropertyAction();
+    QQuickPropertyAction(QObject *parent=0);
+    virtual ~QQuickPropertyAction();
 
     QObject *target() const;
     void setTargetObject(QObject *);
@@ -218,8 +218,8 @@ public:
     QString properties() const;
     void setProperties(const QString &);
 
-    QDeclarativeListProperty<QObject> targets();
-    QDeclarativeListProperty<QObject> exclude();
+    QQmlListProperty<QObject> targets();
+    QQmlListProperty<QObject> exclude();
 
     QVariant value() const;
     void setValue(const QVariant &);
@@ -231,17 +231,17 @@ Q_SIGNALS:
     void propertyChanged();
 
 protected:
-    virtual QAbstractAnimationJob* transition(QDeclarativeStateActions &actions,
-                            QDeclarativeProperties &modified,
+    virtual QAbstractAnimationJob* transition(QQuickStateActions &actions,
+                            QQmlProperties &modified,
                             TransitionDirection direction,
                             QObject *defaultTarget = 0);
 };
 
-class QDeclarativePropertyAnimationPrivate;
-class Q_QUICK_PRIVATE_EXPORT QDeclarativePropertyAnimation : public QDeclarativeAbstractAnimation
+class QQuickPropertyAnimationPrivate;
+class Q_QUICK_PRIVATE_EXPORT QQuickPropertyAnimation : public QQuickAbstractAnimation
 {
     Q_OBJECT
-    Q_DECLARE_PRIVATE(QDeclarativePropertyAnimation)
+    Q_DECLARE_PRIVATE(QQuickPropertyAnimation)
 
     Q_PROPERTY(int duration READ duration WRITE setDuration NOTIFY durationChanged)
     Q_PROPERTY(QVariant from READ from WRITE setFrom NOTIFY fromChanged)
@@ -250,12 +250,12 @@ class Q_QUICK_PRIVATE_EXPORT QDeclarativePropertyAnimation : public QDeclarative
     Q_PROPERTY(QObject *target READ target WRITE setTargetObject NOTIFY targetChanged)
     Q_PROPERTY(QString property READ property WRITE setProperty NOTIFY propertyChanged)
     Q_PROPERTY(QString properties READ properties WRITE setProperties NOTIFY propertiesChanged)
-    Q_PROPERTY(QDeclarativeListProperty<QObject> targets READ targets)
-    Q_PROPERTY(QDeclarativeListProperty<QObject> exclude READ exclude)
+    Q_PROPERTY(QQmlListProperty<QObject> targets READ targets)
+    Q_PROPERTY(QQmlListProperty<QObject> exclude READ exclude)
 
 public:
-    QDeclarativePropertyAnimation(QObject *parent=0);
-    virtual ~QDeclarativePropertyAnimation();
+    QQuickPropertyAnimation(QObject *parent=0);
+    virtual ~QQuickPropertyAnimation();
 
     virtual int duration() const;
     virtual void setDuration(int);
@@ -278,17 +278,17 @@ public:
     QString properties() const;
     void setProperties(const QString &);
 
-    QDeclarativeListProperty<QObject> targets();
-    QDeclarativeListProperty<QObject> exclude();
+    QQmlListProperty<QObject> targets();
+    QQmlListProperty<QObject> exclude();
 
 protected:
-    QDeclarativeStateActions createTransitionActions(QDeclarativeStateActions &actions,
-                                                     QDeclarativeProperties &modified,
+    QQuickStateActions createTransitionActions(QQuickStateActions &actions,
+                                                     QQmlProperties &modified,
                                                      QObject *defaultTarget = 0);
 
-    QDeclarativePropertyAnimation(QDeclarativePropertyAnimationPrivate &dd, QObject *parent);
-    virtual QAbstractAnimationJob* transition(QDeclarativeStateActions &actions,
-                            QDeclarativeProperties &modified,
+    QQuickPropertyAnimation(QQuickPropertyAnimationPrivate &dd, QObject *parent);
+    virtual QAbstractAnimationJob* transition(QQuickStateActions &actions,
+                            QQmlProperties &modified,
                             TransitionDirection direction,
                             QObject *defaultTarget = 0);
 Q_SIGNALS:
@@ -301,16 +301,16 @@ Q_SIGNALS:
     void propertyChanged();
 };
 
-class Q_QUICK_PRIVATE_EXPORT QDeclarativeColorAnimation : public QDeclarativePropertyAnimation
+class Q_QUICK_PRIVATE_EXPORT QQuickColorAnimation : public QQuickPropertyAnimation
 {
     Q_OBJECT
-    Q_DECLARE_PRIVATE(QDeclarativePropertyAnimation)
+    Q_DECLARE_PRIVATE(QQuickPropertyAnimation)
     Q_PROPERTY(QColor from READ from WRITE setFrom)
     Q_PROPERTY(QColor to READ to WRITE setTo)
 
 public:
-    QDeclarativeColorAnimation(QObject *parent=0);
-    virtual ~QDeclarativeColorAnimation();
+    QQuickColorAnimation(QObject *parent=0);
+    virtual ~QQuickColorAnimation();
 
     QColor from() const;
     void setFrom(const QColor &);
@@ -319,17 +319,17 @@ public:
     void setTo(const QColor &);
 };
 
-class Q_QUICK_PRIVATE_EXPORT QDeclarativeNumberAnimation : public QDeclarativePropertyAnimation
+class Q_QUICK_PRIVATE_EXPORT QQuickNumberAnimation : public QQuickPropertyAnimation
 {
     Q_OBJECT
-    Q_DECLARE_PRIVATE(QDeclarativePropertyAnimation)
+    Q_DECLARE_PRIVATE(QQuickPropertyAnimation)
 
     Q_PROPERTY(qreal from READ from WRITE setFrom)
     Q_PROPERTY(qreal to READ to WRITE setTo)
 
 public:
-    QDeclarativeNumberAnimation(QObject *parent=0);
-    virtual ~QDeclarativeNumberAnimation();
+    QQuickNumberAnimation(QObject *parent=0);
+    virtual ~QQuickNumberAnimation();
 
     qreal from() const;
     void setFrom(qreal);
@@ -338,23 +338,23 @@ public:
     void setTo(qreal);
 
 protected:
-    QDeclarativeNumberAnimation(QDeclarativePropertyAnimationPrivate &dd, QObject *parent);
+    QQuickNumberAnimation(QQuickPropertyAnimationPrivate &dd, QObject *parent);
 
 private:
     void init();
 };
 
-class Q_QUICK_PRIVATE_EXPORT QDeclarativeVector3dAnimation : public QDeclarativePropertyAnimation
+class Q_QUICK_PRIVATE_EXPORT QQuickVector3dAnimation : public QQuickPropertyAnimation
 {
     Q_OBJECT
-    Q_DECLARE_PRIVATE(QDeclarativePropertyAnimation)
+    Q_DECLARE_PRIVATE(QQuickPropertyAnimation)
 
     Q_PROPERTY(QVector3D from READ from WRITE setFrom)
     Q_PROPERTY(QVector3D to READ to WRITE setTo)
 
 public:
-    QDeclarativeVector3dAnimation(QObject *parent=0);
-    virtual ~QDeclarativeVector3dAnimation();
+    QQuickVector3dAnimation(QObject *parent=0);
+    virtual ~QQuickVector3dAnimation();
 
     QVector3D from() const;
     void setFrom(QVector3D);
@@ -363,11 +363,11 @@ public:
     void setTo(QVector3D);
 };
 
-class QDeclarativeRotationAnimationPrivate;
-class Q_QUICK_PRIVATE_EXPORT QDeclarativeRotationAnimation : public QDeclarativePropertyAnimation
+class QQuickRotationAnimationPrivate;
+class Q_QUICK_PRIVATE_EXPORT QQuickRotationAnimation : public QQuickPropertyAnimation
 {
     Q_OBJECT
-    Q_DECLARE_PRIVATE(QDeclarativeRotationAnimation)
+    Q_DECLARE_PRIVATE(QQuickRotationAnimation)
     Q_ENUMS(RotationDirection)
 
     Q_PROPERTY(qreal from READ from WRITE setFrom)
@@ -375,8 +375,8 @@ class Q_QUICK_PRIVATE_EXPORT QDeclarativeRotationAnimation : public QDeclarative
     Q_PROPERTY(RotationDirection direction READ direction WRITE setDirection NOTIFY directionChanged)
 
 public:
-    QDeclarativeRotationAnimation(QObject *parent=0);
-    virtual ~QDeclarativeRotationAnimation();
+    QQuickRotationAnimation(QObject *parent=0);
+    virtual ~QQuickRotationAnimation();
 
     qreal from() const;
     void setFrom(qreal);
@@ -392,54 +392,54 @@ Q_SIGNALS:
     void directionChanged();
 };
 
-class QDeclarativeAnimationGroupPrivate;
-class Q_QUICK_PRIVATE_EXPORT QDeclarativeAnimationGroup : public QDeclarativeAbstractAnimation
+class QQuickAnimationGroupPrivate;
+class Q_QUICK_PRIVATE_EXPORT QQuickAnimationGroup : public QQuickAbstractAnimation
 {
     Q_OBJECT
-    Q_DECLARE_PRIVATE(QDeclarativeAnimationGroup)
+    Q_DECLARE_PRIVATE(QQuickAnimationGroup)
 
     Q_CLASSINFO("DefaultProperty", "animations")
-    Q_PROPERTY(QDeclarativeListProperty<QDeclarativeAbstractAnimation> animations READ animations)
+    Q_PROPERTY(QQmlListProperty<QQuickAbstractAnimation> animations READ animations)
 
 public:
-    QDeclarativeAnimationGroup(QObject *parent);
-    virtual ~QDeclarativeAnimationGroup();
+    QQuickAnimationGroup(QObject *parent);
+    virtual ~QQuickAnimationGroup();
 
-    QDeclarativeListProperty<QDeclarativeAbstractAnimation> animations();
-    friend class QDeclarativeAbstractAnimation;
+    QQmlListProperty<QQuickAbstractAnimation> animations();
+    friend class QQuickAbstractAnimation;
 
 protected:
-    QDeclarativeAnimationGroup(QDeclarativeAnimationGroupPrivate &dd, QObject *parent);
+    QQuickAnimationGroup(QQuickAnimationGroupPrivate &dd, QObject *parent);
 };
 
-class QDeclarativeSequentialAnimation : public QDeclarativeAnimationGroup
+class QQuickSequentialAnimation : public QQuickAnimationGroup
 {
     Q_OBJECT
-    Q_DECLARE_PRIVATE(QDeclarativeAnimationGroup)
+    Q_DECLARE_PRIVATE(QQuickAnimationGroup)
 
 public:
-    QDeclarativeSequentialAnimation(QObject *parent=0);
-    virtual ~QDeclarativeSequentialAnimation();
+    QQuickSequentialAnimation(QObject *parent=0);
+    virtual ~QQuickSequentialAnimation();
 
 protected:
-    virtual QAbstractAnimationJob* transition(QDeclarativeStateActions &actions,
-                            QDeclarativeProperties &modified,
+    virtual QAbstractAnimationJob* transition(QQuickStateActions &actions,
+                            QQmlProperties &modified,
                             TransitionDirection direction,
                             QObject *defaultTarget = 0);
 };
 
-class Q_QUICK_PRIVATE_EXPORT QDeclarativeParallelAnimation : public QDeclarativeAnimationGroup
+class Q_QUICK_PRIVATE_EXPORT QQuickParallelAnimation : public QQuickAnimationGroup
 {
     Q_OBJECT
-    Q_DECLARE_PRIVATE(QDeclarativeAnimationGroup)
+    Q_DECLARE_PRIVATE(QQuickAnimationGroup)
 
 public:
-    QDeclarativeParallelAnimation(QObject *parent=0);
-    virtual ~QDeclarativeParallelAnimation();
+    QQuickParallelAnimation(QObject *parent=0);
+    virtual ~QQuickParallelAnimation();
 
 protected:
-    virtual QAbstractAnimationJob* transition(QDeclarativeStateActions &actions,
-                            QDeclarativeProperties &modified,
+    virtual QAbstractAnimationJob* transition(QQuickStateActions &actions,
+                            QQmlProperties &modified,
                             TransitionDirection direction,
                             QObject *defaultTarget = 0);
 };
@@ -447,18 +447,18 @@ protected:
 
 QT_END_NAMESPACE
 
-QML_DECLARE_TYPE(QDeclarativeAbstractAnimation)
-QML_DECLARE_TYPE(QDeclarativePauseAnimation)
-QML_DECLARE_TYPE(QDeclarativeScriptAction)
-QML_DECLARE_TYPE(QDeclarativePropertyAction)
-QML_DECLARE_TYPE(QDeclarativePropertyAnimation)
-QML_DECLARE_TYPE(QDeclarativeColorAnimation)
-QML_DECLARE_TYPE(QDeclarativeNumberAnimation)
-QML_DECLARE_TYPE(QDeclarativeSequentialAnimation)
-QML_DECLARE_TYPE(QDeclarativeParallelAnimation)
-QML_DECLARE_TYPE(QDeclarativeVector3dAnimation)
-QML_DECLARE_TYPE(QDeclarativeRotationAnimation)
+QML_DECLARE_TYPE(QQuickAbstractAnimation)
+QML_DECLARE_TYPE(QQuickPauseAnimation)
+QML_DECLARE_TYPE(QQuickScriptAction)
+QML_DECLARE_TYPE(QQuickPropertyAction)
+QML_DECLARE_TYPE(QQuickPropertyAnimation)
+QML_DECLARE_TYPE(QQuickColorAnimation)
+QML_DECLARE_TYPE(QQuickNumberAnimation)
+QML_DECLARE_TYPE(QQuickSequentialAnimation)
+QML_DECLARE_TYPE(QQuickParallelAnimation)
+QML_DECLARE_TYPE(QQuickVector3dAnimation)
+QML_DECLARE_TYPE(QQuickRotationAnimation)
 
 QT_END_HEADER
 
-#endif // QDECLARATIVEANIMATION_H
+#endif // QQUICKANIMATION_H
diff --git a/src/quick/util/qdeclarativeanimation_p_p.h b/src/quick/util/qquickanimation_p_p.h
index a6b47cbc17..e32453aef3 100644
--- a/src/quick/util/qdeclarativeanimation_p_p.h
+++ b/src/quick/util/qquickanimation_p_p.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#ifndef QDECLARATIVEANIMATION2_P_H
-#define QDECLARATIVEANIMATION2_P_H
+#ifndef QQUICKANIMATION2_P_H
+#define QQUICKANIMATION2_P_H
 
 //
 //  W A R N I N G
@@ -53,12 +53,12 @@
 // We mean it.
 //
 
-#include "qdeclarativeanimation_p.h"
+#include "qquickanimation_p.h"
 
-#include <private/qdeclarativenullablevalue_p_p.h>
+#include <private/qqmlnullablevalue_p_p.h>
 
-#include <qdeclarative.h>
-#include <qdeclarativecontext.h>
+#include <qqml.h>
+#include <qqmlcontext.h>
 
 #include <private/qvariantanimation_p.h>
 #include "private/qpauseanimationjob_p.h"
@@ -83,7 +83,7 @@ public:
 
 //templated animation action
 //allows us to specify an action that calls a function of a class.
-//(so that class doesn't have to inherit QDeclarativeAbstractAnimationAction)
+//(so that class doesn't have to inherit QQuickAbstractAnimationAction)
 template<class T, void (T::*method)()>
 class QAnimationActionProxy : public QAbstractAnimationAction
 {
@@ -116,23 +116,23 @@ private:
     QAbstractAnimationAction *animAction;
 };
 
-class QDeclarativeBulkValueUpdater
+class QQuickBulkValueUpdater
 {
 public:
-    virtual ~QDeclarativeBulkValueUpdater() {}
+    virtual ~QQuickBulkValueUpdater() {}
     virtual void setValue(qreal value) = 0;
 };
 
-//animates QDeclarativeBulkValueUpdater (assumes start and end values will be reals or compatible)
-class Q_AUTOTEST_EXPORT QDeclarativeBulkValueAnimator : public QAbstractAnimationJob
+//animates QQuickBulkValueUpdater (assumes start and end values will be reals or compatible)
+class Q_AUTOTEST_EXPORT QQuickBulkValueAnimator : public QAbstractAnimationJob
 {
-    Q_DISABLE_COPY(QDeclarativeBulkValueAnimator)
+    Q_DISABLE_COPY(QQuickBulkValueAnimator)
 public:
-    QDeclarativeBulkValueAnimator();
-    ~QDeclarativeBulkValueAnimator();
+    QQuickBulkValueAnimator();
+    ~QQuickBulkValueAnimator();
 
-    void setAnimValue(QDeclarativeBulkValueUpdater *value);
-    QDeclarativeBulkValueUpdater *getAnimValue() const { return animValue; }
+    void setAnimValue(QQuickBulkValueUpdater *value);
+    QQuickBulkValueUpdater *getAnimValue() const { return animValue; }
 
     void setFromSourcedValue(bool *value) { fromSourced = value; }
 
@@ -147,7 +147,7 @@ protected:
     void topLevelAnimationLoopChanged();
 
 private:
-    QDeclarativeBulkValueUpdater *animValue;
+    QQuickBulkValueUpdater *animValue;
     bool *fromSourced;
     int m_duration;
     QEasingCurve easing;
@@ -168,11 +168,11 @@ private:
     T *m_instance;
 };
 
-class QDeclarativeAbstractAnimationPrivate : public QObjectPrivate, public QAnimationJobChangeListener
+class QQuickAbstractAnimationPrivate : public QObjectPrivate, public QAnimationJobChangeListener
 {
-    Q_DECLARE_PUBLIC(QDeclarativeAbstractAnimation)
+    Q_DECLARE_PUBLIC(QQuickAbstractAnimation)
 public:
-    QDeclarativeAbstractAnimationPrivate()
+    QQuickAbstractAnimationPrivate()
     : running(false), paused(false), alwaysRunToEnd(false),
       /*connectedTimeLine(false), */componentComplete(true),
       avoidPropertyValueSourceStart(false), disableUserControl(false),
@@ -192,48 +192,48 @@ public:
     void commence();
     virtual void animationFinished(QAbstractAnimationJob *);
 
-    QDeclarativeProperty defaultProperty;
+    QQmlProperty defaultProperty;
 
-    QDeclarativeAnimationGroup *group;
+    QQuickAnimationGroup *group;
     QAbstractAnimationJob* animationInstance;
 
-    static QDeclarativeProperty createProperty(QObject *obj, const QString &str, QObject *infoObj);
+    static QQmlProperty createProperty(QObject *obj, const QString &str, QObject *infoObj);
 };
 
-class QDeclarativePauseAnimationPrivate : public QDeclarativeAbstractAnimationPrivate
+class QQuickPauseAnimationPrivate : public QQuickAbstractAnimationPrivate
 {
-    Q_DECLARE_PUBLIC(QDeclarativePauseAnimation)
+    Q_DECLARE_PUBLIC(QQuickPauseAnimation)
 public:
-    QDeclarativePauseAnimationPrivate()
-        : QDeclarativeAbstractAnimationPrivate(), duration(250) {}
+    QQuickPauseAnimationPrivate()
+        : QQuickAbstractAnimationPrivate(), duration(250) {}
 
     int duration;
 };
 
-class QDeclarativeScriptActionPrivate : public QDeclarativeAbstractAnimationPrivate
+class QQuickScriptActionPrivate : public QQuickAbstractAnimationPrivate
 {
-    Q_DECLARE_PUBLIC(QDeclarativeScriptAction)
+    Q_DECLARE_PUBLIC(QQuickScriptAction)
 public:
-    QDeclarativeScriptActionPrivate();
+    QQuickScriptActionPrivate();
 
-    QDeclarativeScriptString script;
+    QQmlScriptString script;
     QString name;
-    QDeclarativeScriptString runScriptScript;
+    QQmlScriptString runScriptScript;
     bool hasRunScriptScript;
     bool reversing;
 
     void execute();
     QAbstractAnimationAction* createAction();
-    typedef QAnimationActionProxy<QDeclarativeScriptActionPrivate,
-                                 &QDeclarativeScriptActionPrivate::execute> Proxy;
+    typedef QAnimationActionProxy<QQuickScriptActionPrivate,
+                                 &QQuickScriptActionPrivate::execute> Proxy;
 };
 
-class QDeclarativePropertyActionPrivate : public QDeclarativeAbstractAnimationPrivate
+class QQuickPropertyActionPrivate : public QQuickAbstractAnimationPrivate
 {
-    Q_DECLARE_PUBLIC(QDeclarativePropertyAction)
+    Q_DECLARE_PUBLIC(QQuickPropertyAction)
 public:
-    QDeclarativePropertyActionPrivate()
-    : QDeclarativeAbstractAnimationPrivate(), target(0) {}
+    QQuickPropertyActionPrivate()
+    : QQuickAbstractAnimationPrivate(), target(0) {}
 
     QObject *target;
     QString propertyName;
@@ -241,27 +241,27 @@ public:
     QList<QObject *> targets;
     QList<QObject *> exclude;
 
-    QDeclarativeNullableValue<QVariant> value;
+    QQmlNullableValue<QVariant> value;
 };
 
-class QDeclarativeAnimationGroupPrivate : public QDeclarativeAbstractAnimationPrivate
+class QQuickAnimationGroupPrivate : public QQuickAbstractAnimationPrivate
 {
-    Q_DECLARE_PUBLIC(QDeclarativeAnimationGroup)
+    Q_DECLARE_PUBLIC(QQuickAnimationGroup)
 public:
-    QDeclarativeAnimationGroupPrivate()
-    : QDeclarativeAbstractAnimationPrivate() {}
+    QQuickAnimationGroupPrivate()
+    : QQuickAbstractAnimationPrivate() {}
 
-    static void append_animation(QDeclarativeListProperty<QDeclarativeAbstractAnimation> *list, QDeclarativeAbstractAnimation *role);
-    static void clear_animation(QDeclarativeListProperty<QDeclarativeAbstractAnimation> *list);
-    QList<QDeclarativeAbstractAnimation *> animations;
+    static void append_animation(QQmlListProperty<QQuickAbstractAnimation> *list, QQuickAbstractAnimation *role);
+    static void clear_animation(QQmlListProperty<QQuickAbstractAnimation> *list);
+    QList<QQuickAbstractAnimation *> animations;
 };
 
-class QDeclarativePropertyAnimationPrivate : public QDeclarativeAbstractAnimationPrivate
+class QQuickPropertyAnimationPrivate : public QQuickAbstractAnimationPrivate
 {
-    Q_DECLARE_PUBLIC(QDeclarativePropertyAnimation)
+    Q_DECLARE_PUBLIC(QQuickPropertyAnimation)
 public:
-    QDeclarativePropertyAnimationPrivate()
-    : QDeclarativeAbstractAnimationPrivate(), target(0), fromSourced(false), fromIsDefined(false), toIsDefined(false),
+    QQuickPropertyAnimationPrivate()
+    : QQuickAbstractAnimationPrivate(), target(0), fromSourced(false), fromIsDefined(false), toIsDefined(false),
       defaultToInterpolatorType(0), interpolatorType(0), interpolator(0), duration(250), actions(0) {}
 
     QVariant from;
@@ -283,31 +283,31 @@ public:
     int duration;
     QEasingCurve easing;
 
-    // for animations that don't use the QDeclarativeBulkValueAnimator
-    QDeclarativeStateActions *actions;
+    // for animations that don't use the QQuickBulkValueAnimator
+    QQuickStateActions *actions;
 
     static QVariant interpolateVariant(const QVariant &from, const QVariant &to, qreal progress);
     static void convertVariant(QVariant &variant, int type);
 };
 
-class QDeclarativeRotationAnimationPrivate : public QDeclarativePropertyAnimationPrivate
+class QQuickRotationAnimationPrivate : public QQuickPropertyAnimationPrivate
 {
-    Q_DECLARE_PUBLIC(QDeclarativeRotationAnimation)
+    Q_DECLARE_PUBLIC(QQuickRotationAnimation)
 public:
-    QDeclarativeRotationAnimationPrivate() : direction(QDeclarativeRotationAnimation::Numerical) {}
+    QQuickRotationAnimationPrivate() : direction(QQuickRotationAnimation::Numerical) {}
 
-    QDeclarativeRotationAnimation::RotationDirection direction;
+    QQuickRotationAnimation::RotationDirection direction;
 };
 
-class Q_AUTOTEST_EXPORT QDeclarativeAnimationPropertyUpdater : public QDeclarativeBulkValueUpdater
+class Q_AUTOTEST_EXPORT QQuickAnimationPropertyUpdater : public QQuickBulkValueUpdater
 {
 public:
-    QDeclarativeAnimationPropertyUpdater() : prevInterpolatorType(0), wasDeleted(0) {}
-    ~QDeclarativeAnimationPropertyUpdater() { if (wasDeleted) *wasDeleted = true; }
+    QQuickAnimationPropertyUpdater() : prevInterpolatorType(0), wasDeleted(0) {}
+    ~QQuickAnimationPropertyUpdater() { if (wasDeleted) *wasDeleted = true; }
 
     void setValue(qreal v);
 
-    QDeclarativeStateActions actions;
+    QQuickStateActions actions;
     int interpolatorType;       //for Number/ColorAnimation
     QVariantAnimation::Interpolator interpolator;
     int prevInterpolatorType;   //for generic
@@ -319,4 +319,4 @@ public:
 
 QT_END_NAMESPACE
 
-#endif // QDECLARATIVEANIMATION2_P_H
+#endif // QQUICKANIMATION2_P_H
diff --git a/src/quick/util/qdeclarativeanimationcontroller.cpp b/src/quick/util/qquickanimationcontroller.cpp
index 3901a65cb6..a3e343f26d 100644
--- a/src/quick/util/qdeclarativeanimationcontroller.cpp
+++ b/src/quick/util/qquickanimationcontroller.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
@@ -39,29 +39,29 @@
 **
 ****************************************************************************/
 
-#include "qdeclarativeanimationcontroller_p.h"
-#include <QtDeclarative/qdeclarativeinfo.h>
-#include <private/qdeclarativeengine_p.h>
+#include "qquickanimationcontroller_p.h"
+#include <QtQml/qqmlinfo.h>
+#include <private/qqmlengine_p.h>
 
 QT_BEGIN_NAMESPACE
 
 
-class QDeclarativeAnimationControllerPrivate : public QObjectPrivate
+class QQuickAnimationControllerPrivate : public QObjectPrivate
 {
-    Q_DECLARE_PUBLIC(QDeclarativeAnimationController)
+    Q_DECLARE_PUBLIC(QQuickAnimationController)
 public:
-    QDeclarativeAnimationControllerPrivate()
+    QQuickAnimationControllerPrivate()
         : progress(0.0), animation(0), animationInstance(0), finalized(false) {}
 
     qreal progress;
-    QDeclarativeAbstractAnimation *animation;
+    QQuickAbstractAnimation *animation;
     QAbstractAnimationJob *animationInstance;
     bool finalized:1;
 
 };
 
 /*!
-    \qmlclass AnimationController QDeclarativeAnimationController
+    \qmlclass AnimationController QQuickAnimationController
     \inqmlmodule QtQuick 2
     \ingroup qml-animation-transition
     \brief The AnimationController element allows you to control animations manually.
@@ -71,14 +71,14 @@ public:
 */
 
 
-QDeclarativeAnimationController::QDeclarativeAnimationController(QObject *parent)
-: QObject(*(new QDeclarativeAnimationControllerPrivate), parent)
+QQuickAnimationController::QQuickAnimationController(QObject *parent)
+: QObject(*(new QQuickAnimationControllerPrivate), parent)
 {
 }
 
-QDeclarativeAnimationController::~QDeclarativeAnimationController()
+QQuickAnimationController::~QQuickAnimationController()
 {
-    Q_D(QDeclarativeAnimationController);
+    Q_D(QQuickAnimationController);
     delete d->animationInstance;
 }
 
@@ -89,15 +89,15 @@ QDeclarativeAnimationController::~QDeclarativeAnimationController()
     The valid \c progress value is 0.0 to 1.0, setting values less than 0 will be converted to 0,
     setting values great than 1 will be converted to 1.
 */
-qreal QDeclarativeAnimationController::progress() const
+qreal QQuickAnimationController::progress() const
 {
-    Q_D(const QDeclarativeAnimationController);
+    Q_D(const QQuickAnimationController);
     return d->progress;
 }
 
-void QDeclarativeAnimationController::setProgress(qreal progress)
+void QQuickAnimationController::setProgress(qreal progress)
 {
-    Q_D(QDeclarativeAnimationController);
+    Q_D(QQuickAnimationController);
     progress = qBound(qreal(0), progress, qreal(1));
 
     if (progress != d->progress) {
@@ -117,27 +117,27 @@ void QDeclarativeAnimationController::setProgress(qreal progress)
          \c running and \c paused properties set to true. It can not be manually
          started or stopped (much like an animation in a Behavior can not be manually started or stopped).
 */
-QDeclarativeAbstractAnimation *QDeclarativeAnimationController::animation() const
+QQuickAbstractAnimation *QQuickAnimationController::animation() const
 {
-    Q_D(const QDeclarativeAnimationController);
+    Q_D(const QQuickAnimationController);
     return d->animation;
 }
 
-void QDeclarativeAnimationController::classBegin()
+void QQuickAnimationController::classBegin()
 {
-    QDeclarativeEnginePrivate *engPriv = QDeclarativeEnginePrivate::get(qmlEngine(this));
+    QQmlEnginePrivate *engPriv = QQmlEnginePrivate::get(qmlEngine(this));
     engPriv->registerFinalizeCallback(this, this->metaObject()->indexOfSlot("componentFinalized()"));
 }
 
 
-void QDeclarativeAnimationController::setAnimation(QDeclarativeAbstractAnimation *animation)
+void QQuickAnimationController::setAnimation(QQuickAbstractAnimation *animation)
 {
-    Q_D(QDeclarativeAnimationController);
+    Q_D(QQuickAnimationController);
 
     if (animation != d->animation) {
         if (animation) {
             if (animation->userControlDisabled()) {
-                qmlInfo(this) << "QDeclarativeAnimationController::setAnimation: the animation is controlled by others, can't be used in AnimationController.";
+                qmlInfo(this) << "QQuickAnimationController::setAnimation: the animation is controlled by others, can't be used in AnimationController.";
                 return;
             }
             animation->setDisableUserControl();
@@ -158,19 +158,19 @@ void QDeclarativeAnimationController::setAnimation(QDeclarativeAbstractAnimation
 
     If the animation properties changed, calling this method to reload the animation definations.
 */
-void QDeclarativeAnimationController::reload()
+void QQuickAnimationController::reload()
 {
-    Q_D(QDeclarativeAnimationController);
+    Q_D(QQuickAnimationController);
     if (!d->finalized)
         return;
 
     if (!d->animation) {
         d->animationInstance = 0;
     } else {
-        QDeclarativeStateActions actions;
-        QDeclarativeProperties properties;
+        QQuickStateActions actions;
+        QQmlProperties properties;
         QAbstractAnimationJob *oldInstance = d->animationInstance;
-        d->animationInstance = d->animation->transition(actions, properties, QDeclarativeAbstractAnimation::Forward);
+        d->animationInstance = d->animation->transition(actions, properties, QQuickAbstractAnimation::Forward);
         if (oldInstance && oldInstance != d->animationInstance)
             delete oldInstance;
         d->animationInstance->setLoopCount(1);
@@ -180,20 +180,20 @@ void QDeclarativeAnimationController::reload()
     }
 }
 
-void QDeclarativeAnimationController::updateProgress()
+void QQuickAnimationController::updateProgress()
 {
-    Q_D(QDeclarativeAnimationController);
+    Q_D(QQuickAnimationController);
     if (!d->animationInstance)
         return;
 
     d->animationInstance->start();
-    QDeclarativeAnimationTimer::unregisterAnimation(d->animationInstance);
+    QQmlAnimationTimer::unregisterAnimation(d->animationInstance);
     d->animationInstance->setCurrentTime(d->progress * d->animationInstance->duration());
 }
 
-void QDeclarativeAnimationController::componentFinalized()
+void QQuickAnimationController::componentFinalized()
 {
-    Q_D(QDeclarativeAnimationController);
+    Q_D(QQuickAnimationController);
     d->finalized = true;
     reload();
 }
diff --git a/src/quick/util/qdeclarativeanimationcontroller_p.h b/src/quick/util/qquickanimationcontroller_p.h
index 4a064f6808..24b0b4e2f8 100644
--- a/src/quick/util/qdeclarativeanimationcontroller_p.h
+++ b/src/quick/util/qquickanimationcontroller_p.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
@@ -39,11 +39,11 @@
 **
 ****************************************************************************/
 
-#ifndef QDECLARATIVEANIMATIONCONTROLLER_H
-#define QDECLARATIVEANIMATIONCONTROLLER_H
+#ifndef QQUICKANIMATIONCONTROLLER_H
+#define QQUICKANIMATIONCONTROLLER_H
 
-#include <qdeclarative.h>
-#include "qdeclarativeanimation_p.h"
+#include <qqml.h>
+#include "qquickanimation_p.h"
 
 QT_BEGIN_HEADER
 
@@ -51,27 +51,27 @@ QT_BEGIN_NAMESPACE
 
 QT_MODULE(Declarative)
 
-class QDeclarativeAnimationControllerPrivate;
-class Q_AUTOTEST_EXPORT QDeclarativeAnimationController : public QObject, public QDeclarativeParserStatus
+class QQuickAnimationControllerPrivate;
+class Q_AUTOTEST_EXPORT QQuickAnimationController : public QObject, public QQmlParserStatus
 {
     Q_OBJECT
-    Q_INTERFACES(QDeclarativeParserStatus)
+    Q_INTERFACES(QQmlParserStatus)
 
-    Q_DECLARE_PRIVATE(QDeclarativeAnimationController)
+    Q_DECLARE_PRIVATE(QQuickAnimationController)
     Q_CLASSINFO("DefaultProperty", "animation")
 
     Q_PROPERTY(qreal progress READ progress WRITE setProgress NOTIFY progressChanged)
-    Q_PROPERTY(QDeclarativeAbstractAnimation *animation READ animation WRITE setAnimation NOTIFY animationChanged)
+    Q_PROPERTY(QQuickAbstractAnimation *animation READ animation WRITE setAnimation NOTIFY animationChanged)
 
 public:
-    QDeclarativeAnimationController(QObject *parent=0);
-    ~QDeclarativeAnimationController();
+    QQuickAnimationController(QObject *parent=0);
+    ~QQuickAnimationController();
 
     qreal progress() const;
     void setProgress(qreal progress);
 
-    QDeclarativeAbstractAnimation *animation() const;
-    void setAnimation(QDeclarativeAbstractAnimation *animation);
+    QQuickAbstractAnimation *animation() const;
+    void setAnimation(QQuickAbstractAnimation *animation);
 
     void classBegin();
     void componentComplete() {}
@@ -87,8 +87,8 @@ private Q_SLOTS:
 
 QT_END_NAMESPACE
 
-QML_DECLARE_TYPE(QDeclarativeAnimationController)
+QML_DECLARE_TYPE(QQuickAnimationController)
 
 QT_END_HEADER
 
-#endif // QDECLARATIVEANIMATIONCONTROLLER_H
+#endif // QQUICKANIMATIONCONTROLLER_H
diff --git a/src/quick/util/qdeclarativebehavior.cpp b/src/quick/util/qquickbehavior.cpp
index 6cf372ece9..78d83371d3 100644
--- a/src/quick/util/qdeclarativebehavior.cpp
+++ b/src/quick/util/qquickbehavior.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
@@ -39,33 +39,33 @@
 **
 ****************************************************************************/
 
-#include "qdeclarativebehavior_p.h"
+#include "qquickbehavior_p.h"
 
-#include "qdeclarativeanimation_p.h"
-#include <qdeclarativecontext.h>
-#include <qdeclarativeinfo.h>
-#include <private/qdeclarativeproperty_p.h>
-#include <private/qdeclarativeguard_p.h>
-#include <private/qdeclarativeengine_p.h>
+#include "qquickanimation_p.h"
+#include <qqmlcontext.h>
+#include <qqmlinfo.h>
+#include <private/qqmlproperty_p.h>
+#include <private/qqmlguard_p.h>
+#include <private/qqmlengine_p.h>
 #include <private/qabstractanimationjob_p.h>
-#include <private/qdeclarativetransition_p.h>
+#include <private/qquicktransition_p.h>
 
 #include <private/qobject_p.h>
 
 QT_BEGIN_NAMESPACE
 
-class QDeclarativeBehaviorPrivate : public QObjectPrivate, public QAnimationJobChangeListener
+class QQuickBehaviorPrivate : public QObjectPrivate, public QAnimationJobChangeListener
 {
-    Q_DECLARE_PUBLIC(QDeclarativeBehavior)
+    Q_DECLARE_PUBLIC(QQuickBehavior)
 public:
-    QDeclarativeBehaviorPrivate() : animation(0), animationInstance(0), enabled(true), finalized(false)
+    QQuickBehaviorPrivate() : animation(0), animationInstance(0), enabled(true), finalized(false)
       , blockRunningChanged(false) {}
 
     virtual void animationStateChanged(QAbstractAnimationJob *, QAbstractAnimationJob::State newState, QAbstractAnimationJob::State oldState);
 
-    QDeclarativeProperty property;
+    QQmlProperty property;
     QVariant targetValue;
-    QDeclarativeGuard<QDeclarativeAbstractAnimation> animation;
+    QQmlGuard<QQuickAbstractAnimation> animation;
     QAbstractAnimationJob *animationInstance;
     bool enabled;
     bool finalized;
@@ -73,7 +73,7 @@ public:
 };
 
 /*!
-    \qmlclass Behavior QDeclarativeBehavior
+    \qmlclass Behavior QQuickBehavior
     \inqmlmodule QtQuick 2
     \ingroup qml-animation-transition
     \brief The Behavior element allows you to specify a default animation for a property change.
@@ -85,7 +85,7 @@ public:
     whenever the \l Rectangle's \c width value changes. When the MouseArea
     is clicked, the \c width is changed, triggering the behavior's animation:
 
-    \snippet doc/src/snippets/declarative/behavior.qml 0
+    \snippet doc/src/snippets/qml/behavior.qml 0
 
     Note that a property cannot have more than one assigned Behavior. To provide
     multiple animations within a Behavior, use ParallelAnimation or
@@ -96,18 +96,18 @@ public:
     state change. For general advice on using Behaviors to animate state changes, see
     \l{Using QML Behaviors with States}.
 
-    \sa {QML Animation and Transitions}, {declarative/animation/behaviors}{Behavior example}, QtDeclarative
+    \sa {QML Animation and Transitions}, {declarative/animation/behaviors}{Behavior example}, QtQml
 */
 
 
-QDeclarativeBehavior::QDeclarativeBehavior(QObject *parent)
-    : QObject(*(new QDeclarativeBehaviorPrivate), parent)
+QQuickBehavior::QQuickBehavior(QObject *parent)
+    : QObject(*(new QQuickBehaviorPrivate), parent)
 {
 }
 
-QDeclarativeBehavior::~QDeclarativeBehavior()
+QQuickBehavior::~QQuickBehavior()
 {
-    Q_D(QDeclarativeBehavior);
+    Q_D(QQuickBehavior);
     delete d->animationInstance;
 }
 
@@ -118,15 +118,15 @@ QDeclarativeBehavior::~QDeclarativeBehavior()
     This property holds the animation to run when the behavior is triggered.
 */
 
-QDeclarativeAbstractAnimation *QDeclarativeBehavior::animation()
+QQuickAbstractAnimation *QQuickBehavior::animation()
 {
-    Q_D(QDeclarativeBehavior);
+    Q_D(QQuickBehavior);
     return d->animation;
 }
 
-void QDeclarativeBehavior::setAnimation(QDeclarativeAbstractAnimation *animation)
+void QQuickBehavior::setAnimation(QQuickAbstractAnimation *animation)
 {
-    Q_D(QDeclarativeBehavior);
+    Q_D(QQuickBehavior);
     if (d->animation) {
         qmlInfo(this) << tr("Cannot change the animation assigned to a Behavior.");
         return;
@@ -140,7 +140,7 @@ void QDeclarativeBehavior::setAnimation(QDeclarativeAbstractAnimation *animation
 }
 
 
-void QDeclarativeBehaviorPrivate::animationStateChanged(QAbstractAnimationJob *, QAbstractAnimationJob::State newState,QAbstractAnimationJob::State)
+void QQuickBehaviorPrivate::animationStateChanged(QAbstractAnimationJob *, QAbstractAnimationJob::State newState,QAbstractAnimationJob::State)
 {
     if (!blockRunningChanged)
         animation->notifyRunningChanged(newState == QAbstractAnimationJob::Running);
@@ -155,29 +155,29 @@ void QDeclarativeBehaviorPrivate::animationStateChanged(QAbstractAnimationJob *,
     By default a Behavior is enabled.
 */
 
-bool QDeclarativeBehavior::enabled() const
+bool QQuickBehavior::enabled() const
 {
-    Q_D(const QDeclarativeBehavior);
+    Q_D(const QQuickBehavior);
     return d->enabled;
 }
 
-void QDeclarativeBehavior::setEnabled(bool enabled)
+void QQuickBehavior::setEnabled(bool enabled)
 {
-    Q_D(QDeclarativeBehavior);
+    Q_D(QQuickBehavior);
     if (d->enabled == enabled)
         return;
     d->enabled = enabled;
     emit enabledChanged();
 }
 
-void QDeclarativeBehavior::write(const QVariant &value)
+void QQuickBehavior::write(const QVariant &value)
 {
-    Q_D(QDeclarativeBehavior);
+    Q_D(QQuickBehavior);
     bool bypass = !d->enabled || !d->finalized;
     if (!bypass)
         qmlExecuteDeferred(this);
     if (!d->animation || bypass) {
-        QDeclarativePropertyPrivate::write(d->property, value, QDeclarativePropertyPrivate::BypassInterceptor | QDeclarativePropertyPrivate::DontRemoveBinding);
+        QQmlPropertyPrivate::write(d->property, value, QQmlPropertyPrivate::BypassInterceptor | QQmlPropertyPrivate::DontRemoveBinding);
         d->targetValue = value;
         return;
     }
@@ -194,16 +194,16 @@ void QDeclarativeBehavior::write(const QVariant &value)
         d->animationInstance->stop();
     }
 
-    QDeclarativeStateOperation::ActionList actions;
-    QDeclarativeAction action;
+    QQuickStateOperation::ActionList actions;
+    QQuickAction action;
     action.property = d->property;
     action.fromValue = currentValue;
     action.toValue = value;
     actions << action;
 
-    QList<QDeclarativeProperty> after;
+    QList<QQmlProperty> after;
     QAbstractAnimationJob *prev = d->animationInstance;
-    d->animationInstance = d->animation->transition(actions, after, QDeclarativeAbstractAnimation::Forward);
+    d->animationInstance = d->animation->transition(actions, after, QQuickAbstractAnimation::Forward);
     if (d->animationInstance != prev) {
         d->animationInstance->addAnimationChangeListener(d, QAbstractAnimationJob::StateChange);
         if (prev)
@@ -212,26 +212,26 @@ void QDeclarativeBehavior::write(const QVariant &value)
     d->animationInstance->start();
     d->blockRunningChanged = false;
     if (!after.contains(d->property))
-        QDeclarativePropertyPrivate::write(d->property, value, QDeclarativePropertyPrivate::BypassInterceptor | QDeclarativePropertyPrivate::DontRemoveBinding);
+        QQmlPropertyPrivate::write(d->property, value, QQmlPropertyPrivate::BypassInterceptor | QQmlPropertyPrivate::DontRemoveBinding);
 }
 
-void QDeclarativeBehavior::setTarget(const QDeclarativeProperty &property)
+void QQuickBehavior::setTarget(const QQmlProperty &property)
 {
-    Q_D(QDeclarativeBehavior);
+    Q_D(QQuickBehavior);
     d->property = property;
     if (d->animation)
         d->animation->setDefaultTarget(property);
 
-    QDeclarativeEnginePrivate *engPriv = QDeclarativeEnginePrivate::get(qmlEngine(this));
+    QQmlEnginePrivate *engPriv = QQmlEnginePrivate::get(qmlEngine(this));
     static int finalizedIdx = -1;
     if (finalizedIdx < 0)
         finalizedIdx = metaObject()->indexOfSlot("componentFinalized()");
     engPriv->registerFinalizeCallback(this, finalizedIdx);
 }
 
-void QDeclarativeBehavior::componentFinalized()
+void QQuickBehavior::componentFinalized()
 {
-    Q_D(QDeclarativeBehavior);
+    Q_D(QQuickBehavior);
     d->finalized = true;
 }
 
diff --git a/src/quick/util/qdeclarativebehavior_p.h b/src/quick/util/qquickbehavior_p.h
index c95304dce7..1c258767d3 100644
--- a/src/quick/util/qdeclarativebehavior_p.h
+++ b/src/quick/util/qquickbehavior_p.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
@@ -39,40 +39,40 @@
 **
 ****************************************************************************/
 
-#ifndef QDECLARATIVEBEHAVIOR_H
-#define QDECLARATIVEBEHAVIOR_H
+#ifndef QQUICKBEHAVIOR_H
+#define QQUICKBEHAVIOR_H
 
 #include <private/qtquickglobal_p.h>
 
-#include <private/qdeclarativepropertyvalueinterceptor_p.h>
-#include <qdeclarative.h>
+#include <private/qqmlpropertyvalueinterceptor_p.h>
+#include <qqml.h>
 
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-class QDeclarativeAbstractAnimation;
-class QDeclarativeBehaviorPrivate;
-class Q_QUICK_PRIVATE_EXPORT QDeclarativeBehavior : public QObject, public QDeclarativePropertyValueInterceptor
+class QQuickAbstractAnimation;
+class QQuickBehaviorPrivate;
+class Q_QUICK_PRIVATE_EXPORT QQuickBehavior : public QObject, public QQmlPropertyValueInterceptor
 {
     Q_OBJECT
-    Q_DECLARE_PRIVATE(QDeclarativeBehavior)
+    Q_DECLARE_PRIVATE(QQuickBehavior)
 
-    Q_INTERFACES(QDeclarativePropertyValueInterceptor)
+    Q_INTERFACES(QQmlPropertyValueInterceptor)
     Q_CLASSINFO("DefaultProperty", "animation")
-    Q_PROPERTY(QDeclarativeAbstractAnimation *animation READ animation WRITE setAnimation)
+    Q_PROPERTY(QQuickAbstractAnimation *animation READ animation WRITE setAnimation)
     Q_PROPERTY(bool enabled READ enabled WRITE setEnabled NOTIFY enabledChanged)
     Q_CLASSINFO("DeferredPropertyNames", "animation")
 
 public:
-    QDeclarativeBehavior(QObject *parent=0);
-    ~QDeclarativeBehavior();
+    QQuickBehavior(QObject *parent=0);
+    ~QQuickBehavior();
 
-    virtual void setTarget(const QDeclarativeProperty &);
+    virtual void setTarget(const QQmlProperty &);
     virtual void write(const QVariant &value);
 
-    QDeclarativeAbstractAnimation *animation();
-    void setAnimation(QDeclarativeAbstractAnimation *);
+    QQuickAbstractAnimation *animation();
+    void setAnimation(QQuickAbstractAnimation *);
 
     bool enabled() const;
     void setEnabled(bool enabled);
@@ -86,8 +86,8 @@ private Q_SLOTS:
 
 QT_END_NAMESPACE
 
-QML_DECLARE_TYPE(QDeclarativeBehavior)
+QML_DECLARE_TYPE(QQuickBehavior)
 
 QT_END_HEADER
 
-#endif // QDECLARATIVEBEHAVIOR_H
+#endif // QQUICKBEHAVIOR_H
diff --git a/src/quick/util/qdeclarativebind.cpp b/src/quick/util/qquickbind.cpp
index 05d3b1e6b0..a3fba06359 100644
--- a/src/quick/util/qdeclarativebind.cpp
+++ b/src/quick/util/qquickbind.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
@@ -39,17 +39,17 @@
 **
 ****************************************************************************/
 
-#include "qdeclarativebind_p.h"
+#include "qquickbind_p.h"
 
-#include <private/qdeclarativenullablevalue_p_p.h>
-#include <private/qdeclarativeproperty_p.h>
-#include <private/qdeclarativebinding_p.h>
-#include <private/qdeclarativeguard_p.h>
+#include <private/qqmlnullablevalue_p_p.h>
+#include <private/qqmlproperty_p.h>
+#include <private/qqmlbinding_p.h>
+#include <private/qqmlguard_p.h>
 
-#include <qdeclarativeengine.h>
-#include <qdeclarativecontext.h>
-#include <qdeclarativeproperty.h>
-#include <qdeclarativeinfo.h>
+#include <qqmlengine.h>
+#include <qqmlcontext.h>
+#include <qqmlproperty.h>
+#include <qqmlinfo.h>
 
 #include <QtCore/qfile.h>
 #include <QtCore/qdebug.h>
@@ -58,24 +58,24 @@
 
 QT_BEGIN_NAMESPACE
 
-class QDeclarativeBindPrivate : public QObjectPrivate
+class QQuickBindPrivate : public QObjectPrivate
 {
 public:
-    QDeclarativeBindPrivate() : componentComplete(true), obj(0), prevBind(0) {}
-    ~QDeclarativeBindPrivate() { if (prevBind) prevBind->destroy(); }
+    QQuickBindPrivate() : componentComplete(true), obj(0), prevBind(0) {}
+    ~QQuickBindPrivate() { if (prevBind) prevBind->destroy(); }
 
-    QDeclarativeNullableValue<bool> when;
+    QQmlNullableValue<bool> when;
     bool componentComplete;
-    QDeclarativeGuard<QObject> obj;
+    QQmlGuard<QObject> obj;
     QString propName;
-    QDeclarativeNullableValue<QVariant> value;
-    QDeclarativeProperty prop;
-    QDeclarativeAbstractBinding *prevBind;
+    QQmlNullableValue<QVariant> value;
+    QQmlProperty prop;
+    QQmlAbstractBinding *prevBind;
 };
 
 
 /*!
-    \qmlclass Binding QDeclarativeBind
+    \qmlclass Binding QQuickBind
     \inqmlmodule QtQuick 2
     \ingroup qml-working-with-data
     \brief The Binding element allows arbitrary property bindings to be created.
@@ -138,14 +138,14 @@ public:
     If the binding target or binding property is changed, the bound value is
     immediately pushed onto the new target.
 
-    \sa QtDeclarative
+    \sa QtQml
 */
-QDeclarativeBind::QDeclarativeBind(QObject *parent)
-    : QObject(*(new QDeclarativeBindPrivate), parent)
+QQuickBind::QQuickBind(QObject *parent)
+    : QObject(*(new QQuickBindPrivate), parent)
 {
 }
 
-QDeclarativeBind::~QDeclarativeBind()
+QQuickBind::~QQuickBind()
 {
 }
 
@@ -165,15 +165,15 @@ QDeclarativeBind::~QDeclarativeBind()
     When the binding becomes inactive again, any direct bindings that were previously
     set on the property will be restored.
 */
-bool QDeclarativeBind::when() const
+bool QQuickBind::when() const
 {
-    Q_D(const QDeclarativeBind);
+    Q_D(const QQuickBind);
     return d->when;
 }
 
-void QDeclarativeBind::setWhen(bool v)
+void QQuickBind::setWhen(bool v)
 {
-    Q_D(QDeclarativeBind);
+    Q_D(QQuickBind);
     if (!d->when.isNull && d->when == v)
         return;
 
@@ -186,15 +186,15 @@ void QDeclarativeBind::setWhen(bool v)
 
     The object to be updated.
 */
-QObject *QDeclarativeBind::object()
+QObject *QQuickBind::object()
 {
-    Q_D(const QDeclarativeBind);
+    Q_D(const QQuickBind);
     return d->obj;
 }
 
-void QDeclarativeBind::setObject(QObject *obj)
+void QQuickBind::setObject(QObject *obj)
 {
-    Q_D(QDeclarativeBind);
+    Q_D(QQuickBind);
     if (d->obj && d->when.isValid() && d->when) {
         /* if we switch the object at runtime, we need to restore the
            previous binding on the old object before continuing */
@@ -204,7 +204,7 @@ void QDeclarativeBind::setObject(QObject *obj)
     }
     d->obj = obj;
     if (d->componentComplete)
-        d->prop = QDeclarativeProperty(d->obj, d->propName);
+        d->prop = QQmlProperty(d->obj, d->propName);
     eval();
 }
 
@@ -213,15 +213,15 @@ void QDeclarativeBind::setObject(QObject *obj)
 
     The property to be updated.
 */
-QString QDeclarativeBind::property() const
+QString QQuickBind::property() const
 {
-    Q_D(const QDeclarativeBind);
+    Q_D(const QQuickBind);
     return d->propName;
 }
 
-void QDeclarativeBind::setProperty(const QString &p)
+void QQuickBind::setProperty(const QString &p)
 {
-    Q_D(QDeclarativeBind);
+    Q_D(QQuickBind);
     if (!d->propName.isEmpty() && d->when.isValid() && d->when) {
         /* if we switch the property name at runtime, we need to restore the
            previous binding on the old object before continuing */
@@ -231,7 +231,7 @@ void QDeclarativeBind::setProperty(const QString &p)
     }
     d->propName = p;
     if (d->componentComplete)
-        d->prop = QDeclarativeProperty(d->obj, d->propName);
+        d->prop = QQmlProperty(d->obj, d->propName);
     eval();
 }
 
@@ -241,43 +241,43 @@ void QDeclarativeBind::setProperty(const QString &p)
     The value to be set on the target object and property.  This can be a
     constant (which isn't very useful), or a bound expression.
 */
-QVariant QDeclarativeBind::value() const
+QVariant QQuickBind::value() const
 {
-    Q_D(const QDeclarativeBind);
+    Q_D(const QQuickBind);
     return d->value.value;
 }
 
-void QDeclarativeBind::setValue(const QVariant &v)
+void QQuickBind::setValue(const QVariant &v)
 {
-    Q_D(QDeclarativeBind);
+    Q_D(QQuickBind);
     d->value = v;
     eval();
 }
 
-void QDeclarativeBind::setTarget(const QDeclarativeProperty &p)
+void QQuickBind::setTarget(const QQmlProperty &p)
 {
-    Q_D(QDeclarativeBind);
+    Q_D(QQuickBind);
     d->prop = p;
 }
 
-void QDeclarativeBind::classBegin()
+void QQuickBind::classBegin()
 {
-    Q_D(QDeclarativeBind);
+    Q_D(QQuickBind);
     d->componentComplete = false;
 }
 
-void QDeclarativeBind::componentComplete()
+void QQuickBind::componentComplete()
 {
-    Q_D(QDeclarativeBind);
+    Q_D(QQuickBind);
     d->componentComplete = true;
     if (!d->prop.isValid())
-        d->prop = QDeclarativeProperty(d->obj, d->propName);
+        d->prop = QQmlProperty(d->obj, d->propName);
     eval();
 }
 
-void QDeclarativeBind::eval()
+void QQuickBind::eval()
 {
-    Q_D(QDeclarativeBind);
+    Q_D(QQuickBind);
     if (!d->prop.isValid() || d->value.isNull || !d->componentComplete)
         return;
 
@@ -285,9 +285,9 @@ void QDeclarativeBind::eval()
         if (!d->when) {
             //restore any previous binding
             if (d->prevBind) {
-                QDeclarativeAbstractBinding *tmp = d->prevBind;
+                QQmlAbstractBinding *tmp = d->prevBind;
                 d->prevBind = 0;
-                tmp = QDeclarativePropertyPrivate::setBinding(d->prop, tmp);
+                tmp = QQmlPropertyPrivate::setBinding(d->prop, tmp);
                 if (tmp) //should this ever be true?
                     tmp->destroy();
             }
@@ -295,8 +295,8 @@ void QDeclarativeBind::eval()
         }
 
         //save any set binding for restoration
-        QDeclarativeAbstractBinding *tmp;
-        tmp = QDeclarativePropertyPrivate::setBinding(d->prop, 0);
+        QQmlAbstractBinding *tmp;
+        tmp = QQmlPropertyPrivate::setBinding(d->prop, 0);
         if (tmp && d->prevBind)
             d->prevBind->destroy();
         else if (!d->prevBind)
diff --git a/src/quick/util/qdeclarativebind_p.h b/src/quick/util/qquickbind_p.h
index a06ca222d1..5236fac171 100644
--- a/src/quick/util/qdeclarativebind_p.h
+++ b/src/quick/util/qquickbind_p.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
@@ -39,10 +39,10 @@
 **
 ****************************************************************************/
 
-#ifndef QDECLARATIVEBIND_H
-#define QDECLARATIVEBIND_H
+#ifndef QQUICKBIND_H
+#define QQUICKBIND_H
 
-#include <qdeclarative.h>
+#include <qqml.h>
 
 #include <QtCore/qobject.h>
 
@@ -50,21 +50,21 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-class QDeclarativeBindPrivate;
-class Q_AUTOTEST_EXPORT QDeclarativeBind : public QObject, public QDeclarativePropertyValueSource, public QDeclarativeParserStatus
+class QQuickBindPrivate;
+class Q_AUTOTEST_EXPORT QQuickBind : public QObject, public QQmlPropertyValueSource, public QQmlParserStatus
 {
     Q_OBJECT
-    Q_DECLARE_PRIVATE(QDeclarativeBind)
-    Q_INTERFACES(QDeclarativeParserStatus)
-    Q_INTERFACES(QDeclarativePropertyValueSource)
+    Q_DECLARE_PRIVATE(QQuickBind)
+    Q_INTERFACES(QQmlParserStatus)
+    Q_INTERFACES(QQmlPropertyValueSource)
     Q_PROPERTY(QObject *target READ object WRITE setObject)
     Q_PROPERTY(QString property READ property WRITE setProperty)
     Q_PROPERTY(QVariant value READ value WRITE setValue)
     Q_PROPERTY(bool when READ when WRITE setWhen)
 
 public:
-    QDeclarativeBind(QObject *parent=0);
-    ~QDeclarativeBind();
+    QQuickBind(QObject *parent=0);
+    ~QQuickBind();
 
     bool when() const;
     void setWhen(bool);
@@ -79,7 +79,7 @@ public:
     void setValue(const QVariant &);
 
 protected:
-    virtual void setTarget(const QDeclarativeProperty &);
+    virtual void setTarget(const QQmlProperty &);
     virtual void classBegin();
     virtual void componentComplete();
 
@@ -89,7 +89,7 @@ private:
 
 QT_END_NAMESPACE
 
-QML_DECLARE_TYPE(QDeclarativeBind)
+QML_DECLARE_TYPE(QQuickBind)
 
 QT_END_HEADER
 
diff --git a/src/quick/util/qdeclarativechangeset.cpp b/src/quick/util/qquickchangeset.cpp
index 74328a603e..b6b5adb60c 100644
--- a/src/quick/util/qdeclarativechangeset.cpp
+++ b/src/quick/util/qquickchangeset.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
@@ -39,17 +39,17 @@
 **
 ****************************************************************************/
 
-#include "qdeclarativechangeset_p.h"
+#include "qquickchangeset_p.h"
 
 QT_BEGIN_NAMESPACE
 
-QDeclarativeChangeSet::QDeclarativeChangeSet()
+QQuickChangeSet::QQuickChangeSet()
     : m_moveCounter(0)
     , m_difference(0)
 {
 }
 
-QDeclarativeChangeSet::QDeclarativeChangeSet(const QDeclarativeChangeSet &changeSet)
+QQuickChangeSet::QQuickChangeSet(const QQuickChangeSet &changeSet)
     : m_removes(changeSet.m_removes)
     , m_inserts(changeSet.m_inserts)
     , m_changes(changeSet.m_changes)
@@ -58,11 +58,11 @@ QDeclarativeChangeSet::QDeclarativeChangeSet(const QDeclarativeChangeSet &change
 {
 }
 
-QDeclarativeChangeSet::~QDeclarativeChangeSet()
+QQuickChangeSet::~QQuickChangeSet()
 {
 }
 
-QDeclarativeChangeSet &QDeclarativeChangeSet::operator =(const QDeclarativeChangeSet &changeSet)
+QQuickChangeSet &QQuickChangeSet::operator =(const QQuickChangeSet &changeSet)
 {
     m_removes = changeSet.m_removes;
     m_inserts = changeSet.m_inserts;
@@ -72,52 +72,52 @@ QDeclarativeChangeSet &QDeclarativeChangeSet::operator =(const QDeclarativeChang
     return *this;
 }
 
-void QDeclarativeChangeSet::insert(int index, int count)
+void QQuickChangeSet::insert(int index, int count)
 {
     applyInsertions(QVector<Insert>() << Insert(index, count));
 }
 
-void QDeclarativeChangeSet::remove(int index, int count)
+void QQuickChangeSet::remove(int index, int count)
 {
     QVector<Insert> i;
     applyRemovals(QVector<Remove>() << Remove(index, count), i);
 }
 
-void QDeclarativeChangeSet::move(int from, int to, int count)
+void QQuickChangeSet::move(int from, int to, int count)
 {
     apply(QVector<Remove>() << Remove(from, count, -2), QVector<Insert>() << Insert(to, count, -2));
 }
 
-void QDeclarativeChangeSet::change(int index, int count)
+void QQuickChangeSet::change(int index, int count)
 {
     applyChanges(QVector<Change>() << Change(index, count));
 }
 
-void QDeclarativeChangeSet::apply(const QDeclarativeChangeSet &changeSet)
+void QQuickChangeSet::apply(const QQuickChangeSet &changeSet)
 {
     apply(changeSet.m_removes, changeSet.m_inserts, changeSet.m_changes);
 }
 
-void QDeclarativeChangeSet::apply(const QVector<Remove> &removals)
+void QQuickChangeSet::apply(const QVector<Remove> &removals)
 {
     QVector<Remove> r = removals;
     QVector<Insert> i;
     applyRemovals(r, i);
 }
 
-void QDeclarativeChangeSet::apply(const QVector<Insert> &insertions)
+void QQuickChangeSet::apply(const QVector<Insert> &insertions)
 {
     QVector<Insert> i = insertions;
     applyInsertions(i);
 }
 
-void QDeclarativeChangeSet::apply(const QVector<Change> &changes)
+void QQuickChangeSet::apply(const QVector<Change> &changes)
 {
     QVector<Change> c = changes;
     applyChanges(c);
 }
 
-void QDeclarativeChangeSet::apply(const QVector<Remove> &removals, const QVector<Insert> &insertions, const QVector<Change> &changes)
+void QQuickChangeSet::apply(const QVector<Remove> &removals, const QVector<Insert> &insertions, const QVector<Change> &changes)
 {
     QVector<Remove> r = removals;
     QVector<Insert> i = insertions;
@@ -127,7 +127,7 @@ void QDeclarativeChangeSet::apply(const QVector<Remove> &removals, const QVector
     applyChanges(c);
 }
 
-void QDeclarativeChangeSet::applyRemovals(QVector<Remove> &removals, QVector<Insert> &insertions)
+void QQuickChangeSet::applyRemovals(QVector<Remove> &removals, QVector<Insert> &insertions)
 {
     int removeCount = 0;
     int insertCount = 0;
@@ -336,7 +336,7 @@ void QDeclarativeChangeSet::applyRemovals(QVector<Remove> &removals, QVector<Ins
     m_difference -= removeCount;
 }
 
-void QDeclarativeChangeSet::applyInsertions(QVector<Insert> &insertions)
+void QQuickChangeSet::applyInsertions(QVector<Insert> &insertions)
 {
     int insertCount = 0;
     QVector<Insert>::iterator insert = m_inserts.begin();
@@ -403,7 +403,7 @@ void QDeclarativeChangeSet::applyInsertions(QVector<Insert> &insertions)
     m_difference += insertCount;
 }
 
-void QDeclarativeChangeSet::applyChanges(QVector<Change> &changes)
+void QQuickChangeSet::applyChanges(QVector<Change> &changes)
 {
     QVector<Insert>::iterator insert = m_inserts.begin();
     QVector<Change>::iterator change = m_changes.begin();
@@ -451,26 +451,26 @@ void QDeclarativeChangeSet::applyChanges(QVector<Change> &changes)
     }
 }
 
-QDebug operator <<(QDebug debug, const QDeclarativeChangeSet &set)
+QDebug operator <<(QDebug debug, const QQuickChangeSet &set)
 {
-    debug.nospace() << "QDeclarativeChangeSet(";
-    foreach (const QDeclarativeChangeSet::Remove &remove, set.removes()) debug << remove;
-    foreach (const QDeclarativeChangeSet::Insert &insert, set.inserts()) debug << insert;
-    foreach (const QDeclarativeChangeSet::Change &change, set.changes()) debug << change;
+    debug.nospace() << "QQuickChangeSet(";
+    foreach (const QQuickChangeSet::Remove &remove, set.removes()) debug << remove;
+    foreach (const QQuickChangeSet::Insert &insert, set.inserts()) debug << insert;
+    foreach (const QQuickChangeSet::Change &change, set.changes()) debug << change;
     return debug.nospace() << ")";
 }
 
-QDebug operator <<(QDebug debug, const QDeclarativeChangeSet::Remove &remove)
+QDebug operator <<(QDebug debug, const QQuickChangeSet::Remove &remove)
 {
     return (debug.nospace() << "Remove(" << remove.index << "," << remove.count << "," << remove.moveId << ")").space();
 }
 
-QDebug operator <<(QDebug debug, const QDeclarativeChangeSet::Insert &insert)
+QDebug operator <<(QDebug debug, const QQuickChangeSet::Insert &insert)
 {
     return (debug.nospace() << "Insert(" << insert.index << "," << insert.count << "," << insert.moveId << ")").space();
 }
 
-QDebug operator <<(QDebug debug, const QDeclarativeChangeSet::Change &change)
+QDebug operator <<(QDebug debug, const QQuickChangeSet::Change &change)
 {
     return (debug.nospace() << "Change(" << change.index << "," << change.count << ")").space();
 }
diff --git a/src/quick/util/qdeclarativechangeset_p.h b/src/quick/util/qquickchangeset_p.h
index 6e26337149..64179666c7 100644
--- a/src/quick/util/qdeclarativechangeset_p.h
+++ b/src/quick/util/qquickchangeset_p.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#ifndef QDECLARATIVECHANGESET_P_H
-#define QDECLARATIVECHANGESET_P_H
+#ifndef QQUICKCHANGESET_P_H
+#define QQUICKCHANGESET_P_H
 
 //
 //  W A R N I N G
@@ -58,7 +58,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class Q_AUTOTEST_EXPORT QDeclarativeChangeSet
+class Q_AUTOTEST_EXPORT QQuickChangeSet
 {
 public:
     struct MoveKey
@@ -102,11 +102,11 @@ public:
         Remove(int index, int count, int moveId) : Change(index, count, moveId) {}
     };
 
-    QDeclarativeChangeSet();
-    QDeclarativeChangeSet(const QDeclarativeChangeSet &changeSet);
-    ~QDeclarativeChangeSet();
+    QQuickChangeSet();
+    QQuickChangeSet(const QQuickChangeSet &changeSet);
+    ~QQuickChangeSet();
 
-    QDeclarativeChangeSet &operator =(const QDeclarativeChangeSet &changeSet);
+    QQuickChangeSet &operator =(const QQuickChangeSet &changeSet);
 
     const QVector<Remove> &removes() const { return m_removes; }
     const QVector<Insert> &inserts() const { return m_inserts; }
@@ -117,7 +117,7 @@ public:
     void move(int from, int to, int count);
     void change(int index, int count);
 
-    void apply(const QDeclarativeChangeSet &changeSet);
+    void apply(const QQuickChangeSet &changeSet);
     void apply(const QVector<Remove> &removals);
     void apply(const QVector<Insert> &insertions);
     void apply(const QVector<Change> &changes);
@@ -152,14 +152,14 @@ private:
     int m_difference;
 };
 
-inline uint qHash(const QDeclarativeChangeSet::MoveKey &key) { return qHash(qMakePair(key.moveId, key.offset)); }
-inline bool operator ==(const QDeclarativeChangeSet::MoveKey &l, const QDeclarativeChangeSet::MoveKey &r) {
+inline uint qHash(const QQuickChangeSet::MoveKey &key) { return qHash(qMakePair(key.moveId, key.offset)); }
+inline bool operator ==(const QQuickChangeSet::MoveKey &l, const QQuickChangeSet::MoveKey &r) {
     return l.moveId == r.moveId && l.offset == r.offset; }
 
-Q_AUTOTEST_EXPORT QDebug operator <<(QDebug debug, const QDeclarativeChangeSet &change);
-Q_AUTOTEST_EXPORT QDebug operator <<(QDebug debug, const QDeclarativeChangeSet::Remove &remove);
-Q_AUTOTEST_EXPORT QDebug operator <<(QDebug debug, const QDeclarativeChangeSet::Insert &insert);
-Q_AUTOTEST_EXPORT QDebug operator <<(QDebug debug, const QDeclarativeChangeSet::Change &change);
+Q_AUTOTEST_EXPORT QDebug operator <<(QDebug debug, const QQuickChangeSet &change);
+Q_AUTOTEST_EXPORT QDebug operator <<(QDebug debug, const QQuickChangeSet::Remove &remove);
+Q_AUTOTEST_EXPORT QDebug operator <<(QDebug debug, const QQuickChangeSet::Insert &insert);
+Q_AUTOTEST_EXPORT QDebug operator <<(QDebug debug, const QQuickChangeSet::Change &change);
 
 QT_END_NAMESPACE
 
diff --git a/src/quick/util/qdeclarativeconnections.cpp b/src/quick/util/qquickconnections.cpp
index c98c87abfa..6e176fde3d 100644
--- a/src/quick/util/qdeclarativeconnections.cpp
+++ b/src/quick/util/qquickconnections.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
@@ -39,14 +39,14 @@
 **
 ****************************************************************************/
 
-#include "qdeclarativeconnections_p.h"
+#include "qquickconnections_p.h"
 
-#include <private/qdeclarativeexpression_p.h>
-#include <private/qdeclarativeproperty_p.h>
-#include <private/qdeclarativeboundsignal_p.h>
-#include <qdeclarativecontext.h>
-#include <private/qdeclarativecontext_p.h>
-#include <qdeclarativeinfo.h>
+#include <private/qqmlexpression_p.h>
+#include <private/qqmlproperty_p.h>
+#include <private/qqmlboundsignal_p.h>
+#include <qqmlcontext.h>
+#include <private/qqmlcontext_p.h>
+#include <qqmlinfo.h>
 
 #include <QtCore/qdebug.h>
 #include <QtCore/qstringlist.h>
@@ -55,12 +55,12 @@
 
 QT_BEGIN_NAMESPACE
 
-class QDeclarativeConnectionsPrivate : public QObjectPrivate
+class QQuickConnectionsPrivate : public QObjectPrivate
 {
 public:
-    QDeclarativeConnectionsPrivate() : target(0), targetSet(false), ignoreUnknownSignals(false), componentcomplete(true) {}
+    QQuickConnectionsPrivate() : target(0), targetSet(false), ignoreUnknownSignals(false), componentcomplete(true) {}
 
-    QList<QDeclarativeBoundSignal*> boundsignals;
+    QList<QQmlBoundSignal*> boundsignals;
     QObject *target;
 
     bool targetSet;
@@ -71,7 +71,7 @@ public:
 };
 
 /*!
-    \qmlclass Connections QDeclarativeConnections
+    \qmlclass Connections QQuickConnections
     \inqmlmodule QtQuick 2
     \ingroup qml-utility-elements
     \brief A Connections element describes generalized connections to signals.
@@ -125,14 +125,14 @@ public:
     }
     \endqml
 
-    \sa QtDeclarative
+    \sa QtQml
 */
-QDeclarativeConnections::QDeclarativeConnections(QObject *parent) :
-    QObject(*(new QDeclarativeConnectionsPrivate), parent)
+QQuickConnections::QQuickConnections(QObject *parent) :
+    QObject(*(new QQuickConnectionsPrivate), parent)
 {
 }
 
-QDeclarativeConnections::~QDeclarativeConnections()
+QQuickConnections::~QQuickConnections()
 {
 }
 
@@ -145,19 +145,19 @@ QDeclarativeConnections::~QDeclarativeConnections()
     If set to null, no connection is made and any signal handlers are ignored
     until the target is not null.
 */
-QObject *QDeclarativeConnections::target() const
+QObject *QQuickConnections::target() const
 {
-    Q_D(const QDeclarativeConnections);
+    Q_D(const QQuickConnections);
     return d->targetSet ? d->target : parent();
 }
 
-void QDeclarativeConnections::setTarget(QObject *obj)
+void QQuickConnections::setTarget(QObject *obj)
 {
-    Q_D(QDeclarativeConnections);
+    Q_D(QQuickConnections);
     d->targetSet = true; // even if setting to 0, it is *set*
     if (d->target == obj)
         return;
-    foreach (QDeclarativeBoundSignal *s, d->boundsignals) {
+    foreach (QQmlBoundSignal *s, d->boundsignals) {
         // It is possible that target is being changed due to one of our signal
         // handlers -> use deleteLater().
         if (s->isEvaluating())
@@ -180,22 +180,22 @@ void QDeclarativeConnections::setTarget(QObject *obj)
     This is useful if you intend to connect to different types of objects, handling
     a different set of signals for each object.
 */
-bool QDeclarativeConnections::ignoreUnknownSignals() const
+bool QQuickConnections::ignoreUnknownSignals() const
 {
-    Q_D(const QDeclarativeConnections);
+    Q_D(const QQuickConnections);
     return d->ignoreUnknownSignals;
 }
 
-void QDeclarativeConnections::setIgnoreUnknownSignals(bool ignore)
+void QQuickConnections::setIgnoreUnknownSignals(bool ignore)
 {
-    Q_D(QDeclarativeConnections);
+    Q_D(QQuickConnections);
     d->ignoreUnknownSignals = ignore;
 }
 
 
 
 QByteArray
-QDeclarativeConnectionsParser::compile(const QList<QDeclarativeCustomParserProperty> &props)
+QQmlConnectionsParser::compile(const QList<QQmlCustomParserProperty> &props)
 {
     QByteArray rv;
     QDataStream ds(&rv, QIODevice::WriteOnly);
@@ -207,7 +207,7 @@ QDeclarativeConnectionsParser::compile(const QList<QDeclarativeCustomParserPrope
         int propColumn = props.at(ii).location().column;
 
         if (!propName.startsWith(QLatin1String("on")) || !propName.at(2).isUpper()) {
-            error(props.at(ii), QDeclarativeConnections::tr("Cannot assign to non-existent property \"%1\"").arg(propName));
+            error(props.at(ii), QQuickConnections::tr("Cannot assign to non-existent property \"%1\"").arg(propName));
             return QByteArray();
         }
 
@@ -216,21 +216,21 @@ QDeclarativeConnectionsParser::compile(const QList<QDeclarativeCustomParserPrope
         for (int i = 0; i < values.count(); ++i) {
             const QVariant &value = values.at(i);
 
-            if (value.userType() == qMetaTypeId<QDeclarativeCustomParserNode>()) {
-                error(props.at(ii), QDeclarativeConnections::tr("Connections: nested objects not allowed"));
+            if (value.userType() == qMetaTypeId<QQmlCustomParserNode>()) {
+                error(props.at(ii), QQuickConnections::tr("Connections: nested objects not allowed"));
                 return QByteArray();
-            } else if (value.userType() == qMetaTypeId<QDeclarativeCustomParserProperty>()) {
-                error(props.at(ii), QDeclarativeConnections::tr("Connections: syntax error"));
+            } else if (value.userType() == qMetaTypeId<QQmlCustomParserProperty>()) {
+                error(props.at(ii), QQuickConnections::tr("Connections: syntax error"));
                 return QByteArray();
             } else {
-                QDeclarativeScript::Variant v = qvariant_cast<QDeclarativeScript::Variant>(value);
+                QQmlScript::Variant v = qvariant_cast<QQmlScript::Variant>(value);
                 if (v.isScript()) {
                     ds << propName;
                     ds << rewriteSignalHandler(v, propName);
                     ds << propLine;
                     ds << propColumn;
                 } else {
-                    error(props.at(ii), QDeclarativeConnections::tr("Connections: script expected"));
+                    error(props.at(ii), QQuickConnections::tr("Connections: script expected"));
                     return QByteArray();
                 }
             }
@@ -240,18 +240,18 @@ QDeclarativeConnectionsParser::compile(const QList<QDeclarativeCustomParserPrope
     return rv;
 }
 
-void QDeclarativeConnectionsParser::setCustomData(QObject *object,
+void QQmlConnectionsParser::setCustomData(QObject *object,
                                             const QByteArray &data)
 {
-    QDeclarativeConnectionsPrivate *p =
-        static_cast<QDeclarativeConnectionsPrivate *>(QObjectPrivate::get(object));
+    QQuickConnectionsPrivate *p =
+        static_cast<QQuickConnectionsPrivate *>(QObjectPrivate::get(object));
     p->data = data;
 }
 
 
-void QDeclarativeConnections::connectSignals()
+void QQuickConnections::connectSignals()
 {
-    Q_D(QDeclarativeConnections);
+    Q_D(QQuickConnections);
     if (!d->componentcomplete || (d->targetSet && !target()))
         return;
 
@@ -266,22 +266,22 @@ void QDeclarativeConnections::connectSignals()
         int column;
         ds >> column;
 
-        QDeclarativeProperty prop(target(), propName);
-        if (prop.isValid() && (prop.type() & QDeclarativeProperty::SignalProperty)) {
-            QDeclarativeBoundSignal *signal =
-                new QDeclarativeBoundSignal(target(), prop.method(), this);
+        QQmlProperty prop(target(), propName);
+        if (prop.isValid() && (prop.type() & QQmlProperty::SignalProperty)) {
+            QQmlBoundSignal *signal =
+                new QQmlBoundSignal(target(), prop.method(), this);
 
             QString location;
-            QDeclarativeContextData *ctxtdata = 0;
-            QDeclarativeData *ddata = QDeclarativeData::get(this);
+            QQmlContextData *ctxtdata = 0;
+            QQmlData *ddata = QQmlData::get(this);
             if (ddata) {
                 ctxtdata = ddata->outerContext;
                 if (ctxtdata && !ctxtdata->url.isEmpty())
                     location = ddata->outerContext->urlString;
             }
 
-            QDeclarativeExpression *expression = ctxtdata ?
-                QDeclarativeExpressionPrivate::create(ctxtdata, 0, script, true, location, line, column) : 0;
+            QQmlExpression *expression = ctxtdata ?
+                QQmlExpressionPrivate::create(ctxtdata, 0, script, true, location, line, column) : 0;
             signal->setExpression(expression);
             d->boundsignals += signal;
         } else {
@@ -291,15 +291,15 @@ void QDeclarativeConnections::connectSignals()
     }
 }
 
-void QDeclarativeConnections::classBegin()
+void QQuickConnections::classBegin()
 {
-    Q_D(QDeclarativeConnections);
+    Q_D(QQuickConnections);
     d->componentcomplete=false;
 }
 
-void QDeclarativeConnections::componentComplete()
+void QQuickConnections::componentComplete()
 {
-    Q_D(QDeclarativeConnections);
+    Q_D(QQuickConnections);
     d->componentcomplete=true;
     connectSignals();
 }
diff --git a/src/quick/util/qdeclarativeconnections_p.h b/src/quick/util/qquickconnections_p.h
index fcfbcaf5d2..8184697e88 100644
--- a/src/quick/util/qdeclarativeconnections_p.h
+++ b/src/quick/util/qquickconnections_p.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
@@ -39,11 +39,11 @@
 **
 ****************************************************************************/
 
-#ifndef QDECLARATIVECONNECTIONS_H
-#define QDECLARATIVECONNECTIONS_H
+#ifndef QQUICKCONNECTIONS_H
+#define QQUICKCONNECTIONS_H
 
-#include <qdeclarative.h>
-#include <private/qdeclarativecustomparser_p.h>
+#include <qqml.h>
+#include <private/qqmlcustomparser_p.h>
 
 #include <QtCore/qobject.h>
 #include <QtCore/qstring.h>
@@ -52,21 +52,21 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-class QDeclarativeBoundSignal;
-class QDeclarativeContext;
-class QDeclarativeConnectionsPrivate;
-class Q_AUTOTEST_EXPORT QDeclarativeConnections : public QObject, public QDeclarativeParserStatus
+class QQmlBoundSignal;
+class QQmlContext;
+class QQuickConnectionsPrivate;
+class Q_AUTOTEST_EXPORT QQuickConnections : public QObject, public QQmlParserStatus
 {
     Q_OBJECT
-    Q_DECLARE_PRIVATE(QDeclarativeConnections)
+    Q_DECLARE_PRIVATE(QQuickConnections)
 
-    Q_INTERFACES(QDeclarativeParserStatus)
+    Q_INTERFACES(QQmlParserStatus)
     Q_PROPERTY(QObject *target READ target WRITE setTarget NOTIFY targetChanged)
     Q_PROPERTY(bool ignoreUnknownSignals READ ignoreUnknownSignals WRITE setIgnoreUnknownSignals)
 
 public:
-    QDeclarativeConnections(QObject *parent=0);
-    ~QDeclarativeConnections();
+    QQuickConnections(QObject *parent=0);
+    ~QQuickConnections();
 
     QObject *target() const;
     void setTarget(QObject *);
@@ -83,17 +83,17 @@ private:
     void componentComplete();
 };
 
-class QDeclarativeConnectionsParser : public QDeclarativeCustomParser
+class QQmlConnectionsParser : public QQmlCustomParser
 {
 public:
-    virtual QByteArray compile(const QList<QDeclarativeCustomParserProperty> &);
+    virtual QByteArray compile(const QList<QQmlCustomParserProperty> &);
     virtual void setCustomData(QObject *, const QByteArray &);
 };
 
 
 QT_END_NAMESPACE
 
-QML_DECLARE_TYPE(QDeclarativeConnections)
+QML_DECLARE_TYPE(QQuickConnections)
 
 QT_END_HEADER
 
diff --git a/src/quick/util/qdeclarativefontloader.cpp b/src/quick/util/qquickfontloader.cpp
index 441ecf60dd..438d00bd1b 100644
--- a/src/quick/util/qdeclarativefontloader.cpp
+++ b/src/quick/util/qquickfontloader.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
@@ -39,10 +39,10 @@
 **
 ****************************************************************************/
 
-#include "qdeclarativefontloader_p.h"
+#include "qquickfontloader_p.h"
 
-#include <qdeclarativecontext.h>
-#include <qdeclarativeengine.h>
+#include <qqmlcontext.h>
+#include <qqmlengine.h>
 
 #include <QStringList>
 #include <QUrl>
@@ -52,24 +52,24 @@
 #include <QFontDatabase>
 
 #include <private/qobject_p.h>
-#include <private/qdeclarativeengine_p.h>
-#include <qdeclarativeinfo.h>
+#include <private/qqmlengine_p.h>
+#include <qqmlinfo.h>
 
 QT_BEGIN_NAMESPACE
 
 #define FONTLOADER_MAXIMUM_REDIRECT_RECURSION 16
 
-class QDeclarativeFontObject : public QObject
+class QQuickFontObject : public QObject
 {
 Q_OBJECT
 
 public:
-    explicit QDeclarativeFontObject(int _id = -1);
+    explicit QQuickFontObject(int _id = -1);
 
     void download(const QUrl &url, QNetworkAccessManager *manager);
 
 Q_SIGNALS:
-    void fontDownloaded(const QString&, QDeclarativeFontLoader::Status);
+    void fontDownloaded(const QString&, QQuickFontLoader::Status);
 
 private Q_SLOTS:
     void replyFinished();
@@ -81,14 +81,14 @@ private:
     QNetworkReply *reply;
     int redirectCount;
 
-    Q_DISABLE_COPY(QDeclarativeFontObject)
+    Q_DISABLE_COPY(QQuickFontObject)
 };
 
-QDeclarativeFontObject::QDeclarativeFontObject(int _id)
+QQuickFontObject::QQuickFontObject(int _id)
     : QObject(0), id(_id), reply(0), redirectCount(0) {}
 
 
-void QDeclarativeFontObject::download(const QUrl &url, QNetworkAccessManager *manager)
+void QQuickFontObject::download(const QUrl &url, QNetworkAccessManager *manager)
 {
     QNetworkRequest req(url);
     req.setAttribute(QNetworkRequest::HttpPipeliningAllowedAttribute, true);
@@ -96,7 +96,7 @@ void QDeclarativeFontObject::download(const QUrl &url, QNetworkAccessManager *ma
     QObject::connect(reply, SIGNAL(finished()), this, SLOT(replyFinished()));
 }
 
-void QDeclarativeFontObject::replyFinished()
+void QQuickFontObject::replyFinished()
 {
     if (reply) {
         redirectCount++;
@@ -116,11 +116,11 @@ void QDeclarativeFontObject::replyFinished()
         if (!reply->error()) {
             id = QFontDatabase::addApplicationFontFromData(reply->readAll());
             if (id != -1)
-                emit fontDownloaded(QFontDatabase::applicationFontFamilies(id).at(0), QDeclarativeFontLoader::Ready);
+                emit fontDownloaded(QFontDatabase::applicationFontFamilies(id).at(0), QQuickFontLoader::Ready);
             else
-                emit fontDownloaded(QString(), QDeclarativeFontLoader::Error);
+                emit fontDownloaded(QString(), QQuickFontLoader::Error);
         } else {
-            emit fontDownloaded(QString(), QDeclarativeFontLoader::Error);
+            emit fontDownloaded(QString(), QQuickFontLoader::Error);
         }
         reply->deleteLater();
         reply = 0;
@@ -128,23 +128,23 @@ void QDeclarativeFontObject::replyFinished()
 }
 
 
-class QDeclarativeFontLoaderPrivate : public QObjectPrivate
+class QQuickFontLoaderPrivate : public QObjectPrivate
 {
-    Q_DECLARE_PUBLIC(QDeclarativeFontLoader)
+    Q_DECLARE_PUBLIC(QQuickFontLoader)
 
 public:
-    QDeclarativeFontLoaderPrivate() : status(QDeclarativeFontLoader::Null) {}
+    QQuickFontLoaderPrivate() : status(QQuickFontLoader::Null) {}
 
     QUrl url;
     QString name;
-    QDeclarativeFontLoader::Status status;
-    static QHash<QUrl, QDeclarativeFontObject*> fonts;
+    QQuickFontLoader::Status status;
+    static QHash<QUrl, QQuickFontObject*> fonts;
 };
 
-QHash<QUrl, QDeclarativeFontObject*> QDeclarativeFontLoaderPrivate::fonts;
+QHash<QUrl, QQuickFontObject*> QQuickFontLoaderPrivate::fonts;
 
 /*!
-    \qmlclass FontLoader QDeclarativeFontLoader
+    \qmlclass FontLoader QQuickFontLoader
     \inqmlmodule QtQuick 2
   \ingroup qml-utility-elements
     \brief The FontLoader element allows fonts to be loaded by name or URL.
@@ -169,12 +169,12 @@ QHash<QUrl, QDeclarativeFontObject*> QDeclarativeFontLoaderPrivate::fonts;
 
     \sa {declarative/text/fonts}{Fonts example}
 */
-QDeclarativeFontLoader::QDeclarativeFontLoader(QObject *parent)
-    : QObject(*(new QDeclarativeFontLoaderPrivate), parent)
+QQuickFontLoader::QQuickFontLoader(QObject *parent)
+    : QObject(*(new QQuickFontLoaderPrivate), parent)
 {
 }
 
-QDeclarativeFontLoader::~QDeclarativeFontLoader()
+QQuickFontLoader::~QQuickFontLoader()
 {
 }
 
@@ -182,27 +182,27 @@ QDeclarativeFontLoader::~QDeclarativeFontLoader()
     \qmlproperty url QtQuick2::FontLoader::source
     The url of the font to load.
 */
-QUrl QDeclarativeFontLoader::source() const
+QUrl QQuickFontLoader::source() const
 {
-    Q_D(const QDeclarativeFontLoader);
+    Q_D(const QQuickFontLoader);
     return d->url;
 }
 
-void QDeclarativeFontLoader::setSource(const QUrl &url)
+void QQuickFontLoader::setSource(const QUrl &url)
 {
-    Q_D(QDeclarativeFontLoader);
+    Q_D(QQuickFontLoader);
     if (url == d->url)
         return;
     d->url = url;
     emit sourceChanged();
 
-    QString localFile = QDeclarativeEnginePrivate::urlToLocalFileOrQrc(d->url);
+    QString localFile = QQmlEnginePrivate::urlToLocalFileOrQrc(d->url);
     if (!localFile.isEmpty()) {
         if (!d->fonts.contains(d->url)) {
             int id = QFontDatabase::addApplicationFont(localFile);
             if (id != -1) {
                 updateFontInfo(QFontDatabase::applicationFontFamilies(id).at(0), Ready);
-                QDeclarativeFontObject *fo = new QDeclarativeFontObject(id);
+                QQuickFontObject *fo = new QQuickFontObject(id);
                 d->fonts[d->url] = fo;
             } else {
                 updateFontInfo(QString(), Error);
@@ -212,20 +212,20 @@ void QDeclarativeFontLoader::setSource(const QUrl &url)
         }
     } else {
         if (!d->fonts.contains(d->url)) {
-            QDeclarativeFontObject *fo = new QDeclarativeFontObject;
+            QQuickFontObject *fo = new QQuickFontObject;
             d->fonts[d->url] = fo;
             fo->download(d->url, qmlEngine(this)->networkAccessManager());
             d->status = Loading;
             emit statusChanged();
-            QObject::connect(fo, SIGNAL(fontDownloaded(QString,QDeclarativeFontLoader::Status)),
-                this, SLOT(updateFontInfo(QString,QDeclarativeFontLoader::Status)));
+            QObject::connect(fo, SIGNAL(fontDownloaded(QString,QQuickFontLoader::Status)),
+                this, SLOT(updateFontInfo(QString,QQuickFontLoader::Status)));
         } else {
-            QDeclarativeFontObject *fo = d->fonts[d->url];
+            QQuickFontObject *fo = d->fonts[d->url];
             if (fo->id == -1) {
                 d->status = Loading;
                 emit statusChanged();
-                QObject::connect(fo, SIGNAL(fontDownloaded(QString,QDeclarativeFontLoader::Status)),
-                    this, SLOT(updateFontInfo(QString,QDeclarativeFontLoader::Status)));
+                QObject::connect(fo, SIGNAL(fontDownloaded(QString,QQuickFontLoader::Status)),
+                    this, SLOT(updateFontInfo(QString,QQuickFontLoader::Status)));
             }
             else
                 updateFontInfo(QFontDatabase::applicationFontFamilies(fo->id).at(0), Ready);
@@ -233,9 +233,9 @@ void QDeclarativeFontLoader::setSource(const QUrl &url)
     }
 }
 
-void QDeclarativeFontLoader::updateFontInfo(const QString& name, QDeclarativeFontLoader::Status status)
+void QQuickFontLoader::updateFontInfo(const QString& name, QQuickFontLoader::Status status)
 {
-    Q_D(QDeclarativeFontLoader);
+    Q_D(QQuickFontLoader);
 
     if (name != d->name) {
         d->name = name;
@@ -273,15 +273,15 @@ void QDeclarativeFontLoader::updateFontInfo(const QString& name, QDeclarativeFon
     }
     \endqml
 */
-QString QDeclarativeFontLoader::name() const
+QString QQuickFontLoader::name() const
 {
-    Q_D(const QDeclarativeFontLoader);
+    Q_D(const QQuickFontLoader);
     return d->name;
 }
 
-void QDeclarativeFontLoader::setName(const QString &name)
+void QQuickFontLoader::setName(const QString &name)
 {
-    Q_D(QDeclarativeFontLoader);
+    Q_D(QQuickFontLoader);
     if (d->name == name)
         return;
     d->name = name;
@@ -324,12 +324,12 @@ void QDeclarativeFontLoader::setName(const QString &name)
     \endqml
     \endlist
 */
-QDeclarativeFontLoader::Status QDeclarativeFontLoader::status() const
+QQuickFontLoader::Status QQuickFontLoader::status() const
 {
-    Q_D(const QDeclarativeFontLoader);
+    Q_D(const QQuickFontLoader);
     return d->status;
 }
 
 QT_END_NAMESPACE
 
-#include <qdeclarativefontloader.moc>
+#include <qquickfontloader.moc>
diff --git a/src/quick/util/qdeclarativefontloader_p.h b/src/quick/util/qquickfontloader_p.h
index 3cd75e1a46..191388df95 100644
--- a/src/quick/util/qdeclarativefontloader_p.h
+++ b/src/quick/util/qquickfontloader_p.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
@@ -39,10 +39,10 @@
 **
 ****************************************************************************/
 
-#ifndef QDECLARATIVEFONTLOADER_H
-#define QDECLARATIVEFONTLOADER_H
+#ifndef QQUICKFONTLOADER_H
+#define QQUICKFONTLOADER_H
 
-#include <qdeclarative.h>
+#include <qqml.h>
 
 #include <QtCore/qobject.h>
 #include <QtCore/qurl.h>
@@ -51,11 +51,11 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-class QDeclarativeFontLoaderPrivate;
-class Q_AUTOTEST_EXPORT QDeclarativeFontLoader : public QObject
+class QQuickFontLoaderPrivate;
+class Q_AUTOTEST_EXPORT QQuickFontLoader : public QObject
 {
     Q_OBJECT
-    Q_DECLARE_PRIVATE(QDeclarativeFontLoader)
+    Q_DECLARE_PRIVATE(QQuickFontLoader)
     Q_ENUMS(Status)
 
     Q_PROPERTY(QUrl source READ source WRITE setSource NOTIFY sourceChanged)
@@ -65,8 +65,8 @@ class Q_AUTOTEST_EXPORT QDeclarativeFontLoader : public QObject
 public:
     enum Status { Null = 0, Ready, Loading, Error };
 
-    QDeclarativeFontLoader(QObject *parent = 0);
-    ~QDeclarativeFontLoader();
+    QQuickFontLoader(QObject *parent = 0);
+    ~QQuickFontLoader();
 
     QUrl source() const;
     void setSource(const QUrl &url);
@@ -77,7 +77,7 @@ public:
     Status status() const;
 
 private Q_SLOTS:
-    void updateFontInfo(const QString&, QDeclarativeFontLoader::Status);
+    void updateFontInfo(const QString&, QQuickFontLoader::Status);
 
 Q_SIGNALS:
     void sourceChanged();
@@ -87,9 +87,9 @@ Q_SIGNALS:
 
 QT_END_NAMESPACE
 
-QML_DECLARE_TYPE(QDeclarativeFontLoader)
+QML_DECLARE_TYPE(QQuickFontLoader)
 
 QT_END_HEADER
 
-#endif // QDECLARATIVEFONTLOADER_H
+#endif // QQUICKFONTLOADER_H
 
diff --git a/src/quick/util/qdeclarativelistaccessor.cpp b/src/quick/util/qquicklistaccessor.cpp
index ae60640328..532882a2f9 100644
--- a/src/quick/util/qdeclarativelistaccessor.cpp
+++ b/src/quick/util/qquicklistaccessor.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
@@ -39,37 +39,37 @@
 **
 ****************************************************************************/
 
-#include "qdeclarativelistaccessor_p.h"
+#include "qquicklistaccessor_p.h"
 
-#include <private/qdeclarativemetatype_p.h>
+#include <private/qqmlmetatype_p.h>
 
 #include <QtCore/qstringlist.h>
 #include <QtCore/qdebug.h>
 
 // ### Remove me
-#include <private/qdeclarativeengine_p.h>
+#include <private/qqmlengine_p.h>
 
 QT_BEGIN_NAMESPACE
 
-QDeclarativeListAccessor::QDeclarativeListAccessor()
+QQuickListAccessor::QQuickListAccessor()
 : m_type(Invalid)
 {
 }
 
-QDeclarativeListAccessor::~QDeclarativeListAccessor()
+QQuickListAccessor::~QQuickListAccessor()
 {
 }
 
-QVariant QDeclarativeListAccessor::list() const
+QVariant QQuickListAccessor::list() const
 {
     return d;
 }
 
-void QDeclarativeListAccessor::setList(const QVariant &v, QDeclarativeEngine *engine)
+void QQuickListAccessor::setList(const QVariant &v, QQmlEngine *engine)
 {
     d = v;
 
-    QDeclarativeEnginePrivate *enginePrivate = engine?QDeclarativeEnginePrivate::get(engine):0;
+    QQmlEnginePrivate *enginePrivate = engine?QQmlEnginePrivate::get(engine):0;
 
     if (!d.isValid()) {
         m_type = Invalid;
@@ -79,19 +79,19 @@ void QDeclarativeListAccessor::setList(const QVariant &v, QDeclarativeEngine *en
         m_type = VariantList;
     } else if (d.canConvert(QVariant::Int)) {
         m_type = Integer;
-    } else if ((!enginePrivate && QDeclarativeMetaType::isQObject(d.userType())) ||
+    } else if ((!enginePrivate && QQmlMetaType::isQObject(d.userType())) ||
                (enginePrivate && enginePrivate->isQObject(d.userType()))) {
-        QObject *data = enginePrivate?enginePrivate->toQObject(v):QDeclarativeMetaType::toQObject(v);
+        QObject *data = enginePrivate?enginePrivate->toQObject(v):QQmlMetaType::toQObject(v);
         d = QVariant::fromValue(data);
         m_type = Instance;
-    } else if (d.userType() == qMetaTypeId<QDeclarativeListReference>()) {
+    } else if (d.userType() == qMetaTypeId<QQmlListReference>()) {
         m_type = ListProperty;
     } else {
         m_type = Instance;
     }
 }
 
-int QDeclarativeListAccessor::count() const
+int QQuickListAccessor::count() const
 {
     switch(m_type) {
     case StringList:
@@ -99,7 +99,7 @@ int QDeclarativeListAccessor::count() const
     case VariantList:
         return qvariant_cast<QVariantList>(d).count();
     case ListProperty:
-        return ((QDeclarativeListReference *)d.constData())->count();
+        return ((QQmlListReference *)d.constData())->count();
     case Instance:
         return 1;
     case Integer:
@@ -110,7 +110,7 @@ int QDeclarativeListAccessor::count() const
     }
 }
 
-QVariant QDeclarativeListAccessor::at(int idx) const
+QVariant QQuickListAccessor::at(int idx) const
 {
     Q_ASSERT(idx >= 0 && idx < count());
     switch(m_type) {
@@ -119,7 +119,7 @@ QVariant QDeclarativeListAccessor::at(int idx) const
     case VariantList:
         return qvariant_cast<QVariantList>(d).at(idx);
     case ListProperty:
-        return QVariant::fromValue(((QDeclarativeListReference *)d.constData())->at(idx));
+        return QVariant::fromValue(((QQmlListReference *)d.constData())->at(idx));
     case Instance:
         return d;
     case Integer:
@@ -130,7 +130,7 @@ QVariant QDeclarativeListAccessor::at(int idx) const
     }
 }
 
-bool QDeclarativeListAccessor::isValid() const
+bool QQuickListAccessor::isValid() const
 {
     return m_type != Invalid;
 }
diff --git a/src/quick/util/qdeclarativelistaccessor_p.h b/src/quick/util/qquicklistaccessor_p.h
index 6fc589dec4..2b54c686bf 100644
--- a/src/quick/util/qdeclarativelistaccessor_p.h
+++ b/src/quick/util/qquicklistaccessor_p.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#ifndef QDECLARATIVELISTACCESSOR_H
-#define QDECLARATIVELISTACCESSOR_H
+#ifndef QQUICKLISTACCESSOR_H
+#define QQUICKLISTACCESSOR_H
 
 #include <QtCore/QVariant>
 
@@ -48,15 +48,15 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-class QDeclarativeEngine;
-class Q_AUTOTEST_EXPORT QDeclarativeListAccessor
+class QQmlEngine;
+class Q_AUTOTEST_EXPORT QQuickListAccessor
 {
 public:
-    QDeclarativeListAccessor();
-    ~QDeclarativeListAccessor();
+    QQuickListAccessor();
+    ~QQuickListAccessor();
 
     QVariant list() const;
-    void setList(const QVariant &, QDeclarativeEngine * = 0);
+    void setList(const QVariant &, QQmlEngine * = 0);
 
     bool isValid() const;
 
@@ -75,4 +75,4 @@ QT_END_NAMESPACE
 
 QT_END_HEADER
 
-#endif // QDECLARATIVELISTACCESSOR_H
+#endif // QQUICKLISTACCESSOR_H
diff --git a/src/quick/util/qdeclarativelistcompositor.cpp b/src/quick/util/qquicklistcompositor.cpp
index 6011d6bc5d..d60fe5fb79 100644
--- a/src/quick/util/qdeclarativelistcompositor.cpp
+++ b/src/quick/util/qquicklistcompositor.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
@@ -39,27 +39,27 @@
 **
 ****************************************************************************/
 
-#include "qdeclarativelistcompositor_p.h"
+#include "qquicklistcompositor_p.h"
 
 #include <QtCore/qvarlengtharray.h>
 
-//#define QT_DECLARATIVE_VERIFY_MINIMAL
-//#define QT_DECLARATIVE_VERIFY_INTEGRITY
+//#define QT_QML_VERIFY_MINIMAL
+//#define QT_QML_VERIFY_INTEGRITY
 
 QT_BEGIN_NAMESPACE
 
-#ifdef QT_DECLARATIVE_VERIFY_MINIMAL
-#define QT_DECLARATIVE_VERIFY_INTEGRITY
+#ifdef QT_QML_VERIFY_MINIMAL
+#define QT_QML_VERIFY_INTEGRITY
 static bool qt_verifyMinimal(
-        const QDeclarativeListCompositor::iterator &begin,
-        const QDeclarativeListCompositor::iterator &end)
+        const QQuickListCompositor::iterator &begin,
+        const QQuickListCompositor::iterator &end)
 {
     bool minimal = true;
     int index = 0;
 
-    for (const QDeclarativeListCompositor::Range *range = begin->next; range != *end; range = range->next, ++index) {
+    for (const QQuickListCompositor::Range *range = begin->next; range != *end; range = range->next, ++index) {
         if (range->previous->list == range->list
-                && range->previous->flags == (range->flags & ~QDeclarativeListCompositor::AppendFlag)
+                && range->previous->flags == (range->flags & ~QQuickListCompositor::AppendFlag)
                 && range->previous->end() == range->index) {
             qWarning() << index << "Consecutive ranges";
             qWarning() << *range->previous;
@@ -73,22 +73,22 @@ static bool qt_verifyMinimal(
 
 #endif
 
-#ifdef QT_DECLARATIVE_VERIFY_INTEGRITY
-static bool qt_printInfo(const QDeclarativeListCompositor &compositor)
+#ifdef QT_QML_VERIFY_INTEGRITY
+static bool qt_printInfo(const QQuickListCompositor &compositor)
 {
     qWarning() << compositor;
     return true;
 }
 
 static bool qt_verifyIntegrity(
-        const QDeclarativeListCompositor::iterator &begin,
-        const QDeclarativeListCompositor::iterator &end,
-        const QDeclarativeListCompositor::iterator &cachedIt)
+        const QQuickListCompositor::iterator &begin,
+        const QQuickListCompositor::iterator &end,
+        const QQuickListCompositor::iterator &cachedIt)
 {
     bool valid = true;
 
     int index = 0;
-    QDeclarativeListCompositor::iterator it;
+    QQuickListCompositor::iterator it;
     for (it = begin; *it != *end; *it = it->next) {
         if (it->count == 0 && !it->append()) {
             qWarning() << index << "Empty non-append range";
@@ -98,7 +98,7 @@ static bool qt_verifyIntegrity(
             qWarning() << index << "Negative count";
             valid = false;
         }
-        if (it->list && it->flags != QDeclarativeListCompositor::CacheFlag && it->index < 0) {
+        if (it->list && it->flags != QQuickListCompositor::CacheFlag && it->index < 0) {
             qWarning() << index <<"Negative index";
             valid = false;
         }
@@ -118,7 +118,7 @@ static bool qt_verifyIntegrity(
                 if (groupIndex != cachedIt.index[i]) {
                     qWarning() << index
                             << "invalid cached index"
-                            << QDeclarativeListCompositor::Group(i)
+                            << QQuickListCompositor::Group(i)
                             << "Expected:"
                             << groupIndex
                             << "Actual"
@@ -142,21 +142,21 @@ static bool qt_verifyIntegrity(
 }
 #endif
 
-#if defined(QT_DECLARATIVE_VERIFY_MINIMAL)
-#   define QT_DECLARATIVE_VERIFY_LISTCOMPOSITOR Q_ASSERT(!(!(qt_verifyIntegrity(iterator(m_ranges.next, 0, Default, m_groupCount), m_end, m_cacheIt) \
+#if defined(QT_QML_VERIFY_MINIMAL)
+#   define QT_QML_VERIFY_LISTCOMPOSITOR Q_ASSERT(!(!(qt_verifyIntegrity(iterator(m_ranges.next, 0, Default, m_groupCount), m_end, m_cacheIt) \
             && qt_verifyMinimal(iterator(m_ranges.next, 0, Default, m_groupCount), m_end)) \
             && qt_printInfo(*this)));
-#elif defined(QT_DECLARATIVE_VERIFY_INTEGRITY)
-#   define QT_DECLARATIVE_VERIFY_LISTCOMPOSITOR Q_ASSERT(!(!qt_verifyIntegrity(iterator(m_ranges.next, 0, Default, m_groupCount), m_end, m_cacheIt) \
+#elif defined(QT_QML_VERIFY_INTEGRITY)
+#   define QT_QML_VERIFY_LISTCOMPOSITOR Q_ASSERT(!(!qt_verifyIntegrity(iterator(m_ranges.next, 0, Default, m_groupCount), m_end, m_cacheIt) \
             && qt_printInfo(*this)));
 #else
-#   define QT_DECLARATIVE_VERIFY_LISTCOMPOSITOR
+#   define QT_QML_VERIFY_LISTCOMPOSITOR
 #endif
 
-//#define QT_DECLARATIVE_TRACE_LISTCOMPOSITOR(args) qDebug() << m_end.index[1] << m_end.index[0] << Q_FUNC_INFO args;
-#define QT_DECLARATIVE_TRACE_LISTCOMPOSITOR(args)
+//#define QT_QML_TRACE_LISTCOMPOSITOR(args) qDebug() << m_end.index[1] << m_end.index[0] << Q_FUNC_INFO args;
+#define QT_QML_TRACE_LISTCOMPOSITOR(args)
 
-QDeclarativeListCompositor::iterator &QDeclarativeListCompositor::iterator::operator +=(int difference)
+QQuickListCompositor::iterator &QQuickListCompositor::iterator::operator +=(int difference)
 {
     Q_ASSERT(difference >= 0);
     while (!(range->flags & groupFlag)) {
@@ -176,7 +176,7 @@ QDeclarativeListCompositor::iterator &QDeclarativeListCompositor::iterator::oper
     return *this;
 }
 
-QDeclarativeListCompositor::iterator &QDeclarativeListCompositor::iterator::operator -=(int difference)
+QQuickListCompositor::iterator &QQuickListCompositor::iterator::operator -=(int difference)
 {
     Q_ASSERT(difference >= 0);
     while (!(range->flags & groupFlag)) {
@@ -196,7 +196,7 @@ QDeclarativeListCompositor::iterator &QDeclarativeListCompositor::iterator::oper
     return *this;
 }
 
-QDeclarativeListCompositor::insert_iterator &QDeclarativeListCompositor::insert_iterator::operator +=(int difference)
+QQuickListCompositor::insert_iterator &QQuickListCompositor::insert_iterator::operator +=(int difference)
 {
     Q_ASSERT(difference >= 0);
     while (!(range->flags & groupFlag)) {
@@ -219,7 +219,7 @@ QDeclarativeListCompositor::insert_iterator &QDeclarativeListCompositor::insert_
     return *this;
 }
 
-QDeclarativeListCompositor::insert_iterator &QDeclarativeListCompositor::insert_iterator::operator -=(int difference)
+QQuickListCompositor::insert_iterator &QQuickListCompositor::insert_iterator::operator -=(int difference)
 {
     Q_ASSERT(difference >= 0);
     while (!(range->flags & groupFlag) && range->previous->flags) {
@@ -248,7 +248,7 @@ QDeclarativeListCompositor::insert_iterator &QDeclarativeListCompositor::insert_
     return *this;
 }
 
-QDeclarativeListCompositor::QDeclarativeListCompositor()
+QQuickListCompositor::QQuickListCompositor()
     : m_end(m_ranges.next, 0, Default, 2)
     , m_cacheIt(m_end)
     , m_groupCount(2)
@@ -257,7 +257,7 @@ QDeclarativeListCompositor::QDeclarativeListCompositor()
 {
 }
 
-QDeclarativeListCompositor::~QDeclarativeListCompositor()
+QQuickListCompositor::~QQuickListCompositor()
 {
     for (Range *next, *range = m_ranges.next; range != &m_ranges; range = next) {
         next = range->next;
@@ -265,13 +265,13 @@ QDeclarativeListCompositor::~QDeclarativeListCompositor()
     }
 }
 
-inline QDeclarativeListCompositor::Range *QDeclarativeListCompositor::insert(
+inline QQuickListCompositor::Range *QQuickListCompositor::insert(
         Range *before, void *list, int index, int count, uint flags)
 {
     return new Range(before, list, index, count, flags);
 }
 
-inline QDeclarativeListCompositor::Range *QDeclarativeListCompositor::erase(
+inline QQuickListCompositor::Range *QQuickListCompositor::erase(
         Range *range)
 {
     Range *next = range->next;
@@ -281,21 +281,21 @@ inline QDeclarativeListCompositor::Range *QDeclarativeListCompositor::erase(
     return next;
 }
 
-void QDeclarativeListCompositor::setGroupCount(int count)
+void QQuickListCompositor::setGroupCount(int count)
 {
     m_groupCount = count;
     m_end = iterator(&m_ranges, 0, Default, m_groupCount);
     m_cacheIt = m_end;
 }
 
-int QDeclarativeListCompositor::count(Group group) const
+int QQuickListCompositor::count(Group group) const
 {
     return m_end.index[group];
 }
 
-QDeclarativeListCompositor::iterator QDeclarativeListCompositor::find(Group group, int index)
+QQuickListCompositor::iterator QQuickListCompositor::find(Group group, int index)
 {
-    QT_DECLARATIVE_TRACE_LISTCOMPOSITOR(<< group << index)
+    QT_QML_TRACE_LISTCOMPOSITOR(<< group << index)
     Q_ASSERT(index >=0 && index < count(group));
     if (m_cacheIt == m_end) {
         m_cacheIt = iterator(m_ranges.next, 0, group, m_groupCount);
@@ -314,18 +314,18 @@ QDeclarativeListCompositor::iterator QDeclarativeListCompositor::find(Group grou
     }
     Q_ASSERT(m_cacheIt.index[group] == index);
     Q_ASSERT(m_cacheIt->inGroup(group));
-    QT_DECLARATIVE_VERIFY_LISTCOMPOSITOR
+    QT_QML_VERIFY_LISTCOMPOSITOR
     return m_cacheIt;
 }
 
-QDeclarativeListCompositor::iterator QDeclarativeListCompositor::find(Group group, int index) const
+QQuickListCompositor::iterator QQuickListCompositor::find(Group group, int index) const
 {
-    return const_cast<QDeclarativeListCompositor *>(this)->find(group, index);
+    return const_cast<QQuickListCompositor *>(this)->find(group, index);
 }
 
-QDeclarativeListCompositor::insert_iterator QDeclarativeListCompositor::findInsertPosition(Group group, int index)
+QQuickListCompositor::insert_iterator QQuickListCompositor::findInsertPosition(Group group, int index)
 {
-    QT_DECLARATIVE_TRACE_LISTCOMPOSITOR(<< group << index)
+    QT_QML_TRACE_LISTCOMPOSITOR(<< group << index)
     Q_ASSERT(index >=0 && index <= count(group));
     insert_iterator it;
     if (m_cacheIt == m_end) {
@@ -348,32 +348,32 @@ QDeclarativeListCompositor::insert_iterator QDeclarativeListCompositor::findInse
     return it;
 }
 
-QDeclarativeListCompositor::iterator QDeclarativeListCompositor::begin(Group group)
+QQuickListCompositor::iterator QQuickListCompositor::begin(Group group)
 {
-    QT_DECLARATIVE_TRACE_LISTCOMPOSITOR(<< group)
+    QT_QML_TRACE_LISTCOMPOSITOR(<< group)
     m_cacheIt = iterator(m_ranges.next, 0, group, m_groupCount);
     m_cacheIt += 0;
     return m_cacheIt;
 }
 
-void QDeclarativeListCompositor::append(
+void QQuickListCompositor::append(
         void *list, int index, int count, uint flags, QVector<Insert> *inserts)
 {
-    QT_DECLARATIVE_TRACE_LISTCOMPOSITOR(<< list << index << count << flags)
+    QT_QML_TRACE_LISTCOMPOSITOR(<< list << index << count << flags)
     insert(m_end, list, index, count, flags, inserts);
 }
 
-void QDeclarativeListCompositor::insert(
+void QQuickListCompositor::insert(
         Group group, int before, void *list, int index, int count, uint flags, QVector<Insert> *inserts)
 {
-    QT_DECLARATIVE_TRACE_LISTCOMPOSITOR(<< group << before << list << index << count << flags)
+    QT_QML_TRACE_LISTCOMPOSITOR(<< group << before << list << index << count << flags)
     insert(findInsertPosition(group, before), list, index, count, flags, inserts);
 }
 
-QDeclarativeListCompositor::iterator QDeclarativeListCompositor::insert(
+QQuickListCompositor::iterator QQuickListCompositor::insert(
         iterator before, void *list, int index, int count, uint flags, QVector<Insert> *inserts)
 {
-    QT_DECLARATIVE_TRACE_LISTCOMPOSITOR(<< before << list << index << count << flags)
+    QT_QML_TRACE_LISTCOMPOSITOR(<< before << list << index << count << flags)
     if (inserts) {
         inserts->append(Insert(before, count, flags & GroupMask));
     }
@@ -407,21 +407,21 @@ QDeclarativeListCompositor::iterator QDeclarativeListCompositor::insert(
 
     m_end.incrementIndexes(count, flags);
     m_cacheIt = before;
-    QT_DECLARATIVE_VERIFY_LISTCOMPOSITOR
+    QT_QML_VERIFY_LISTCOMPOSITOR
     return before;
 }
 
-void QDeclarativeListCompositor::setFlags(
+void QQuickListCompositor::setFlags(
         Group fromGroup, int from, int count, Group group, int flags, QVector<Insert> *inserts)
 {
-    QT_DECLARATIVE_TRACE_LISTCOMPOSITOR(<< group << index << count << flags)
+    QT_QML_TRACE_LISTCOMPOSITOR(<< group << index << count << flags)
     setFlags(find(fromGroup, from), count, group, flags, inserts);
 }
 
-void QDeclarativeListCompositor::setFlags(
+void QQuickListCompositor::setFlags(
         iterator from, int count, Group group, uint flags, QVector<Insert> *inserts)
 {
-    QT_DECLARATIVE_TRACE_LISTCOMPOSITOR(<< from << count << flags)
+    QT_QML_TRACE_LISTCOMPOSITOR(<< from << count << flags)
     if (!flags || !count)
         return;
 
@@ -490,20 +490,20 @@ void QDeclarativeListCompositor::setFlags(
         *from = erase(*from)->previous;
     }
     m_cacheIt = from;
-    QT_DECLARATIVE_VERIFY_LISTCOMPOSITOR
+    QT_QML_VERIFY_LISTCOMPOSITOR
 }
 
-void QDeclarativeListCompositor::clearFlags(
+void QQuickListCompositor::clearFlags(
         Group fromGroup, int from, int count, Group group, uint flags, QVector<Remove> *removes)
 {
-    QT_DECLARATIVE_TRACE_LISTCOMPOSITOR(<< group << index << count << flags)
+    QT_QML_TRACE_LISTCOMPOSITOR(<< group << index << count << flags)
     clearFlags(find(fromGroup, from), count, group, flags, removes);
 }
 
-void QDeclarativeListCompositor::clearFlags(
+void QQuickListCompositor::clearFlags(
         iterator from, int count, Group group, uint flags, QVector<Remove> *removes)
 {
-    QT_DECLARATIVE_TRACE_LISTCOMPOSITOR(<< from << count << flags)
+    QT_QML_TRACE_LISTCOMPOSITOR(<< from << count << flags)
     if (!flags || !count)
         return;
 
@@ -577,12 +577,12 @@ void QDeclarativeListCompositor::clearFlags(
         *from = erase(*from)->previous;
     }
     m_cacheIt = from;
-    QT_DECLARATIVE_VERIFY_LISTCOMPOSITOR
+    QT_QML_VERIFY_LISTCOMPOSITOR
 }
 
-void QDeclarativeListCompositor::removeList(void *list, QVector<Remove> *removes, bool destroyed)
+void QQuickListCompositor::removeList(void *list, QVector<Remove> *removes, bool destroyed)
 {
-    QT_DECLARATIVE_TRACE_LISTCOMPOSITOR(<< list << destroyed)
+    QT_QML_TRACE_LISTCOMPOSITOR(<< list << destroyed)
     for (iterator it(m_ranges.next, 0, Default, m_groupCount); *it != &m_ranges; *it = it->next) {
         if (it->list == list) {
             const int flags = it->flags & (GroupMask | CacheFlag);
@@ -603,10 +603,10 @@ void QDeclarativeListCompositor::removeList(void *list, QVector<Remove> *removes
         }
     }
     m_cacheIt = m_end;
-    QT_DECLARATIVE_VERIFY_LISTCOMPOSITOR
+    QT_QML_VERIFY_LISTCOMPOSITOR
 }
 
-bool QDeclarativeListCompositor::verifyMoveTo(
+bool QQuickListCompositor::verifyMoveTo(
         Group fromGroup, int from, Group toGroup, int to, int count, Group group) const
 {
     if (group != toGroup) {
@@ -631,7 +631,7 @@ bool QDeclarativeListCompositor::verifyMoveTo(
     return to >= 0 && to + count <= m_end.index[toGroup];
 }
 
-void QDeclarativeListCompositor::move(
+void QQuickListCompositor::move(
         Group fromGroup,
         int from,
         Group toGroup,
@@ -641,7 +641,7 @@ void QDeclarativeListCompositor::move(
         QVector<Remove> *removes,
         QVector<Insert> *inserts)
 {
-    QT_DECLARATIVE_TRACE_LISTCOMPOSITOR(<< fromGroup << from << toGroup << to << count)
+    QT_QML_TRACE_LISTCOMPOSITOR(<< fromGroup << from << toGroup << to << count)
     Q_ASSERT(count != 0);
     Q_ASSERT(from >=0 && from + count <= m_end.index[toGroup]);
     Q_ASSERT(verifyMoveTo(fromGroup, from, toGroup, to, count, group));
@@ -774,24 +774,24 @@ void QDeclarativeListCompositor::move(
     }
 
     m_cacheIt = toIt;
-    QT_DECLARATIVE_VERIFY_LISTCOMPOSITOR
+    QT_QML_VERIFY_LISTCOMPOSITOR
 }
 
-void QDeclarativeListCompositor::clear()
+void QQuickListCompositor::clear()
 {
-    QT_DECLARATIVE_TRACE_LISTCOMPOSITOR( )
+    QT_QML_TRACE_LISTCOMPOSITOR( )
     for (Range *range = m_ranges.next; range != &m_ranges; range = erase(range)) {}
     m_end = iterator(m_ranges.next, 0, Default, m_groupCount);
     m_cacheIt = m_end;
 }
 
-void QDeclarativeListCompositor::listItemsInserted(
+void QQuickListCompositor::listItemsInserted(
         QVector<Insert> *translatedInsertions,
         void *list,
-        const QVector<QDeclarativeChangeSet::Insert> &insertions,
+        const QVector<QQuickChangeSet::Insert> &insertions,
         const QVector<MovedFlags> *movedFlags)
 {
-    QT_DECLARATIVE_TRACE_LISTCOMPOSITOR(<< list << insertions)
+    QT_QML_TRACE_LISTCOMPOSITOR(<< list << insertions)
     for (iterator it(m_ranges.next, 0, Default, m_groupCount); *it != &m_ranges; *it = it->next) {
         if (it->list != list || it->flags == CacheFlag) {
             it.incrementIndexes(it->count);
@@ -801,7 +801,7 @@ void QDeclarativeListCompositor::listItemsInserted(
             it.incrementIndexes(it->count);
             continue;
         }
-        foreach (const QDeclarativeChangeSet::Insert &insertion, insertions) {
+        foreach (const QQuickChangeSet::Insert &insertion, insertions) {
             int offset = insertion.index - it->index;
             if ((offset > 0 && offset < it->count)
                     || (offset == 0 && it->prepend())
@@ -862,29 +862,29 @@ void QDeclarativeListCompositor::listItemsInserted(
         it.incrementIndexes(it->count);
     }
     m_cacheIt = m_end;
-    QT_DECLARATIVE_VERIFY_LISTCOMPOSITOR
+    QT_QML_VERIFY_LISTCOMPOSITOR
 }
 
-void QDeclarativeListCompositor::listItemsInserted(
+void QQuickListCompositor::listItemsInserted(
         void *list, int index, int count, QVector<Insert> *translatedInsertions)
 {
-    QT_DECLARATIVE_TRACE_LISTCOMPOSITOR(<< list << index << count)
+    QT_QML_TRACE_LISTCOMPOSITOR(<< list << index << count)
     Q_ASSERT(count > 0);
 
-    QVector<QDeclarativeChangeSet::Insert> insertions;
-    insertions.append(QDeclarativeChangeSet::Insert(index, count));
+    QVector<QQuickChangeSet::Insert> insertions;
+    insertions.append(QQuickChangeSet::Insert(index, count));
 
     listItemsInserted(translatedInsertions, list, insertions);
 }
 
-void QDeclarativeListCompositor::listItemsRemoved(
+void QQuickListCompositor::listItemsRemoved(
         QVector<Remove> *translatedRemovals,
         void *list,
-        QVector<QDeclarativeChangeSet::Remove> *removals,
-        QVector<QDeclarativeChangeSet::Insert> *insertions,
+        QVector<QQuickChangeSet::Remove> *removals,
+        QVector<QQuickChangeSet::Insert> *insertions,
         QVector<MovedFlags> *movedFlags, int moveId)
 {
-    QT_DECLARATIVE_TRACE_LISTCOMPOSITOR(<< list << *removals)
+    QT_QML_TRACE_LISTCOMPOSITOR(<< list << *removals)
 
     for (iterator it(m_ranges.next, 0, Default, m_groupCount); *it != &m_ranges; *it = it->next) {
         if (it->list != list || it->flags == CacheFlag) {
@@ -892,7 +892,7 @@ void QDeclarativeListCompositor::listItemsRemoved(
             continue;
         }
         bool removed = false;
-        for (QVector<QDeclarativeChangeSet::Remove>::iterator removal = removals->begin();
+        for (QVector<QQuickChangeSet::Remove>::iterator removal = removals->begin();
                 !removed && removal != removals->end();
                 ++removal) {
             int relativeIndex = removal->index - it->index;
@@ -908,7 +908,7 @@ void QDeclarativeListCompositor::listItemsRemoved(
                         translatedRemoval.index[i] += offset;
                 }
                 if (removal->isMove()) {
-                    QVector<QDeclarativeChangeSet::Insert>::iterator insertion = insertions->begin();
+                    QVector<QQuickChangeSet::Insert>::iterator insertion = insertions->begin();
                     for (; insertion != insertions->end() && insertion->moveId != removal->moveId;
                             ++insertion) {}
                     Q_ASSERT(insertion != insertions->end());
@@ -916,11 +916,11 @@ void QDeclarativeListCompositor::listItemsRemoved(
 
                     if (relativeIndex < 0) {
                         int splitMoveId = ++moveId;
-                        removal = removals->insert(removal, QDeclarativeChangeSet::Remove(
+                        removal = removals->insert(removal, QQuickChangeSet::Remove(
                                 removal->index, -relativeIndex, splitMoveId));
                         ++removal;
                         removal->count -= -relativeIndex;
-                        insertion = insertions->insert(insertion, QDeclarativeChangeSet::Insert(
+                        insertion = insertions->insert(insertion, QQuickChangeSet::Insert(
                                 insertion->index, -relativeIndex, splitMoveId));
                         ++insertion;
                         insertion->index += -relativeIndex;
@@ -933,10 +933,10 @@ void QDeclarativeListCompositor::listItemsRemoved(
                         movedFlags->append(MovedFlags(moveId, it->flags & ~AppendFlag));
 
                         if (removeCount < removal->count) {
-                            removal = removals->insert(removal, QDeclarativeChangeSet::Remove(
+                            removal = removals->insert(removal, QQuickChangeSet::Remove(
                                     removal->index, removeCount, translatedRemoval.moveId));
                             ++removal;
-                            insertion = insertions->insert(insertion, QDeclarativeChangeSet::Insert(
+                            insertion = insertions->insert(insertion, QQuickChangeSet::Insert(
                                     insertion->index, removeCount, translatedRemoval.moveId));
                             ++insertion;
 
@@ -1013,21 +1013,21 @@ void QDeclarativeListCompositor::listItemsRemoved(
         }
     }
     m_cacheIt = m_end;
-    QT_DECLARATIVE_VERIFY_LISTCOMPOSITOR
+    QT_QML_VERIFY_LISTCOMPOSITOR
 }
 
-void QDeclarativeListCompositor::listItemsRemoved(
+void QQuickListCompositor::listItemsRemoved(
         void *list, int index, int count, QVector<Remove> *translatedRemovals)
 {
-    QT_DECLARATIVE_TRACE_LISTCOMPOSITOR(<< list << index << count)
+    QT_QML_TRACE_LISTCOMPOSITOR(<< list << index << count)
     Q_ASSERT(count >= 0);
 
-    QVector<QDeclarativeChangeSet::Remove> removals;
-    removals.append(QDeclarativeChangeSet::Remove(index, count));
+    QVector<QQuickChangeSet::Remove> removals;
+    removals.append(QQuickChangeSet::Remove(index, count));
     listItemsRemoved(translatedRemovals, list, &removals, 0, 0, 0);
 }
 
-void QDeclarativeListCompositor::listItemsMoved(
+void QQuickListCompositor::listItemsMoved(
         void *list,
         int from,
         int to,
@@ -1035,25 +1035,25 @@ void QDeclarativeListCompositor::listItemsMoved(
         QVector<Remove> *translatedRemovals,
         QVector<Insert> *translatedInsertions)
 {
-    QT_DECLARATIVE_TRACE_LISTCOMPOSITOR(<< list << from << to << count)
+    QT_QML_TRACE_LISTCOMPOSITOR(<< list << from << to << count)
     Q_ASSERT(count >= 0);
 
-    QVector<QDeclarativeChangeSet::Remove> removals;
-    QVector<QDeclarativeChangeSet::Insert> insertions;
+    QVector<QQuickChangeSet::Remove> removals;
+    QVector<QQuickChangeSet::Insert> insertions;
     QVector<MovedFlags> movedFlags;
-    removals.append(QDeclarativeChangeSet::Remove(from, count, 0));
-    insertions.append(QDeclarativeChangeSet::Insert(to, count, 0));
+    removals.append(QQuickChangeSet::Remove(from, count, 0));
+    insertions.append(QQuickChangeSet::Insert(to, count, 0));
 
     listItemsRemoved(translatedRemovals, list, &removals, &insertions, &movedFlags, 0);
     listItemsInserted(translatedInsertions, list, insertions, &movedFlags);
 }
 
-void QDeclarativeListCompositor::listItemsChanged(
+void QQuickListCompositor::listItemsChanged(
         QVector<Change> *translatedChanges,
         void *list,
-        const QVector<QDeclarativeChangeSet::Change> &changes)
+        const QVector<QQuickChangeSet::Change> &changes)
 {
-    QT_DECLARATIVE_TRACE_LISTCOMPOSITOR(<< list << changes)
+    QT_QML_TRACE_LISTCOMPOSITOR(<< list << changes)
     for (iterator it(m_ranges.next, 0, Default, m_groupCount); *it != &m_ranges; *it = it->next) {
         if (it->list != list || it->flags == CacheFlag) {
             it.incrementIndexes(it->count);
@@ -1061,7 +1061,7 @@ void QDeclarativeListCompositor::listItemsChanged(
         } else if (!it->inGroup()) {
             continue;
         }
-        foreach (const QDeclarativeChangeSet::Change &change, changes) {
+        foreach (const QQuickChangeSet::Change &change, changes) {
             const int offset = change.index - it->index;
             if (offset + change.count > 0 && offset < it->count) {
                 const int changeOffset = qMax(0, offset);
@@ -1079,60 +1079,60 @@ void QDeclarativeListCompositor::listItemsChanged(
     }
 }
 
-void QDeclarativeListCompositor::listItemsChanged(
+void QQuickListCompositor::listItemsChanged(
         void *list, int index, int count, QVector<Change> *translatedChanges)
 {
-    QT_DECLARATIVE_TRACE_LISTCOMPOSITOR(<< list << index << count)
+    QT_QML_TRACE_LISTCOMPOSITOR(<< list << index << count)
     Q_ASSERT(count >= 0);
-    QVector<QDeclarativeChangeSet::Change> changes;
-    changes.append(QDeclarativeChangeSet::Change(index, count));
+    QVector<QQuickChangeSet::Change> changes;
+    changes.append(QQuickChangeSet::Change(index, count));
     listItemsChanged(translatedChanges, list, changes);
 }
 
-void QDeclarativeListCompositor::listChanged(
+void QQuickListCompositor::listChanged(
         void *list,
-        const QDeclarativeChangeSet &changeSet,
+        const QQuickChangeSet &changeSet,
         QVector<Remove> *translatedRemovals,
         QVector<Insert> *translatedInsertions,
         QVector<Change> *translatedChanges)
 {
-    QVector<QDeclarativeChangeSet::Remove> removals = changeSet.removes();
-    QVector<QDeclarativeChangeSet::Insert> insertions = changeSet.inserts();
+    QVector<QQuickChangeSet::Remove> removals = changeSet.removes();
+    QVector<QQuickChangeSet::Insert> insertions = changeSet.inserts();
     QVector<MovedFlags> movedFlags;
     listItemsRemoved(translatedRemovals, list, &removals, &insertions, &movedFlags, changeSet.moveCounter());
     listItemsInserted(translatedInsertions, list, insertions, &movedFlags);
     listItemsChanged(translatedChanges, list, changeSet.changes());
 }
 
-void QDeclarativeListCompositor::transition(
+void QQuickListCompositor::transition(
         Group from,
         Group to,
-        QVector<QDeclarativeChangeSet::Remove> *removes,
-        QVector<QDeclarativeChangeSet::Insert> *inserts)
+        QVector<QQuickChangeSet::Remove> *removes,
+        QVector<QQuickChangeSet::Insert> *inserts)
 {
     int removeCount = 0;
     for (iterator it(m_ranges.next, 0, Default, m_groupCount); *it != &m_ranges; *it = it->next) {
         if (it == from && it != to) {
-            removes->append(QDeclarativeChangeSet::Remove(it.index[from]- removeCount, it->count));
+            removes->append(QQuickChangeSet::Remove(it.index[from]- removeCount, it->count));
             removeCount += it->count;
         } else if (it != from && it == to) {
-            inserts->append(QDeclarativeChangeSet::Insert(it.index[to], it->count));
+            inserts->append(QQuickChangeSet::Insert(it.index[to], it->count));
         }
         it.incrementIndexes(it->count);
     }
 }
 
-QDebug operator <<(QDebug debug, const QDeclarativeListCompositor::Group &group)
+QDebug operator <<(QDebug debug, const QQuickListCompositor::Group &group)
 {
     switch (group) {
-    case QDeclarativeListCompositor::Cache:   return debug << "Cache";
-    case QDeclarativeListCompositor::Default: return debug << "Default";
+    case QQuickListCompositor::Cache:   return debug << "Cache";
+    case QQuickListCompositor::Default: return debug << "Default";
     default: return (debug.nospace() << "Group" << int(group)).space();
     }
 
 }
 
-QDebug operator <<(QDebug debug, const QDeclarativeListCompositor::Range &range)
+QDebug operator <<(QDebug debug, const QQuickListCompositor::Range &range)
 {
     (debug.nospace()
             << "Range("
@@ -1142,11 +1142,11 @@ QDebug operator <<(QDebug debug, const QDeclarativeListCompositor::Range &range)
             << (range.isUnresolved() ? "U" : "0")
             << (range.append() ? "A" : "0")
             << (range.prepend() ? "P" : "0");
-    for (int i = QDeclarativeListCompositor::MaximumGroupCount - 1; i >= 2; --i)
+    for (int i = QQuickListCompositor::MaximumGroupCount - 1; i >= 2; --i)
         debug << (range.inGroup(i) ? "1" : "0");
     return (debug
-            << (range.inGroup(QDeclarativeListCompositor::Default) ? "D" : "0")
-            << (range.inGroup(QDeclarativeListCompositor::Cache) ? "C" : "0"));
+            << (range.inGroup(QQuickListCompositor::Default) ? "D" : "0")
+            << (range.inGroup(QQuickListCompositor::Cache) ? "C" : "0"));
 }
 
 static void qt_print_indexes(QDebug &debug, int count, const int *indexes)
@@ -1155,50 +1155,50 @@ static void qt_print_indexes(QDebug &debug, int count, const int *indexes)
         debug << indexes[i];
 }
 
-QDebug operator <<(QDebug debug, const QDeclarativeListCompositor::iterator &it)
+QDebug operator <<(QDebug debug, const QQuickListCompositor::iterator &it)
 {
     (debug.nospace() << "iterator(" << it.group).space() << "offset:" << it.offset;
     qt_print_indexes(debug, it.groupCount, it.index);
     return ((debug << **it).nospace() << ")").space();
 }
 
-static QDebug qt_print_change(QDebug debug, const char *name, const QDeclarativeListCompositor::Change &change)
+static QDebug qt_print_change(QDebug debug, const char *name, const QQuickListCompositor::Change &change)
 {
     debug.nospace() << name << "(" << change.moveId << " " << change.count << " ";
-    for (int i = QDeclarativeListCompositor::MaximumGroupCount - 1; i >= 2; --i)
+    for (int i = QQuickListCompositor::MaximumGroupCount - 1; i >= 2; --i)
         debug << (change.inGroup(i) ? "1" : "0");
-    debug << (change.inGroup(QDeclarativeListCompositor::Default) ? "D" : "0")
-            << (change.inGroup(QDeclarativeListCompositor::Cache) ? "C" : "0");
-    int i = QDeclarativeListCompositor::MaximumGroupCount - 1;
+    debug << (change.inGroup(QQuickListCompositor::Default) ? "D" : "0")
+            << (change.inGroup(QQuickListCompositor::Cache) ? "C" : "0");
+    int i = QQuickListCompositor::MaximumGroupCount - 1;
     for (; i >= 0 && !change.inGroup(i); --i) {}
     for (; i >= 0; --i)
         debug << " " << change.index[i];
     return (debug << ")").maybeSpace();
 }
 
-QDebug operator <<(QDebug debug, const QDeclarativeListCompositor::Change &change)
+QDebug operator <<(QDebug debug, const QQuickListCompositor::Change &change)
 {
     return qt_print_change(debug, "Change", change);
 }
 
-QDebug operator <<(QDebug debug, const QDeclarativeListCompositor::Remove &remove)
+QDebug operator <<(QDebug debug, const QQuickListCompositor::Remove &remove)
 {
     return qt_print_change(debug, "Remove", remove);
 }
 
-QDebug operator <<(QDebug debug, const QDeclarativeListCompositor::Insert &insert)
+QDebug operator <<(QDebug debug, const QQuickListCompositor::Insert &insert)
 {
     return qt_print_change(debug, "Insert", insert);
 }
 
-QDebug operator <<(QDebug debug, const QDeclarativeListCompositor &list)
+QDebug operator <<(QDebug debug, const QQuickListCompositor &list)
 {
-    int indexes[QDeclarativeListCompositor::MaximumGroupCount];
-    for (int i = 0; i < QDeclarativeListCompositor::MaximumGroupCount; ++i)
+    int indexes[QQuickListCompositor::MaximumGroupCount];
+    for (int i = 0; i < QQuickListCompositor::MaximumGroupCount; ++i)
         indexes[i] = 0;
-    debug.nospace() << "QDeclarativeListCompositor(";
+    debug.nospace() << "QQuickListCompositor(";
     qt_print_indexes(debug, list.m_groupCount, list.m_end.index);
-    for (QDeclarativeListCompositor::Range *range = list.m_ranges.next; range != &list.m_ranges; range = range->next) {
+    for (QQuickListCompositor::Range *range = list.m_ranges.next; range != &list.m_ranges; range = range->next) {
         (debug << "\n").space();
         qt_print_indexes(debug, list.m_groupCount, indexes);
         debug << " " << *range;
diff --git a/src/quick/util/qdeclarativelistcompositor_p.h b/src/quick/util/qquicklistcompositor_p.h
index 4bee0dab69..b12ee8025f 100644
--- a/src/quick/util/qdeclarativelistcompositor_p.h
+++ b/src/quick/util/qquicklistcompositor_p.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#ifndef QDECLARATIVELISTCOMPOSITOR_P_H
-#define QDECLARATIVELISTCOMPOSITOR_P_H
+#ifndef QQUICKLISTCOMPOSITOR_P_H
+#define QQUICKLISTCOMPOSITOR_P_H
 
 //
 //  W A R N I N G
@@ -56,13 +56,13 @@
 #include <QtCore/qglobal.h>
 #include <QtCore/qvector.h>
 
-#include <private/qdeclarativechangeset_p.h>
+#include <private/qquickchangeset_p.h>
 
 #include <QtCore/qdebug.h>
 
 QT_BEGIN_NAMESPACE
 
-class Q_AUTOTEST_EXPORT QDeclarativeListCompositor
+class Q_AUTOTEST_EXPORT QQuickListCompositor
 {
 public:
     enum { MinimumGroupCount = 3, MaximumGroupCount = 11 };
@@ -209,8 +209,8 @@ public:
             : Change(it, count, flags, moveId) {}
     };
 
-    QDeclarativeListCompositor();
-    ~QDeclarativeListCompositor();
+    QQuickListCompositor();
+    ~QQuickListCompositor();
 
     int defaultGroups() const { return m_defaultFlags & ~PrependFlag; }
     void setDefaultGroups(int groups) { m_defaultFlags = groups | PrependFlag; }
@@ -266,7 +266,7 @@ public:
     void listItemsChanged(void *list, int index, int count, QVector<Change> *changes);
     void listChanged(
             void *list,
-            const QDeclarativeChangeSet &changeSet,
+            const QQuickChangeSet &changeSet,
             QVector<Remove> *removals,
             QVector<Insert> *inserts,
             QVector<Change> *changes);
@@ -274,8 +274,8 @@ public:
     void transition(
             Group from,
             Group to,
-            QVector<QDeclarativeChangeSet::Remove> *removes,
-            QVector<QDeclarativeChangeSet::Insert> *inserts);
+            QVector<QQuickChangeSet::Remove> *removes,
+            QVector<QQuickChangeSet::Insert> *inserts);
 
 private:
     Range m_ranges;
@@ -300,26 +300,26 @@ private:
     void listItemsRemoved(
             QVector<Remove> *translatedRemovals,
             void *list,
-            QVector<QDeclarativeChangeSet::Remove> *removals,
-            QVector<QDeclarativeChangeSet::Insert> *insertions = 0,
+            QVector<QQuickChangeSet::Remove> *removals,
+            QVector<QQuickChangeSet::Insert> *insertions = 0,
             QVector<MovedFlags> *movedFlags = 0,
             int moveId = 0);
     void listItemsInserted(
             QVector<Insert> *translatedInsertions,
             void *list,
-            const QVector<QDeclarativeChangeSet::Insert> &insertions,
+            const QVector<QQuickChangeSet::Insert> &insertions,
             const QVector<MovedFlags> *movedFlags = 0);
     void listItemsChanged(
             QVector<Change> *translatedChanges,
             void *list,
-            const QVector<QDeclarativeChangeSet::Change> &changes);
+            const QVector<QQuickChangeSet::Change> &changes);
 
-    friend Q_AUTOTEST_EXPORT QDebug operator <<(QDebug debug, const QDeclarativeListCompositor &list);
+    friend Q_AUTOTEST_EXPORT QDebug operator <<(QDebug debug, const QQuickListCompositor &list);
 };
 
-inline QDeclarativeListCompositor::iterator::iterator()
+inline QQuickListCompositor::iterator::iterator()
     : range(0), offset(0), group(Default), groupCount(0) {}
-inline QDeclarativeListCompositor::iterator::iterator(const iterator &it)
+inline QQuickListCompositor::iterator::iterator(const iterator &it)
     : range(it.range)
     , offset(it.offset)
     , group(it.group)
@@ -330,7 +330,7 @@ inline QDeclarativeListCompositor::iterator::iterator(const iterator &it)
         index[i] = it.index[i];
 }
 
-inline QDeclarativeListCompositor::iterator::iterator(
+inline QQuickListCompositor::iterator::iterator(
         Range *range, int offset, Group group, int groupCount)
     : range(range)
     , offset(offset)
@@ -342,7 +342,7 @@ inline QDeclarativeListCompositor::iterator::iterator(
         index[i] = 0;
 }
 
-inline void QDeclarativeListCompositor::iterator::incrementIndexes(int difference, uint flags)
+inline void QQuickListCompositor::iterator::incrementIndexes(int difference, uint flags)
 {
     for (int i = 0; i < groupCount; ++i) {
         if (flags & (1 << i))
@@ -350,7 +350,7 @@ inline void QDeclarativeListCompositor::iterator::incrementIndexes(int differenc
     }
 }
 
-inline void QDeclarativeListCompositor::iterator::decrementIndexes(int difference, uint flags)
+inline void QQuickListCompositor::iterator::decrementIndexes(int difference, uint flags)
 {
     for (int i = 0; i < groupCount; ++i) {
         if (flags & (1 << i))
@@ -358,24 +358,24 @@ inline void QDeclarativeListCompositor::iterator::decrementIndexes(int differenc
     }
 }
 
-inline QDeclarativeListCompositor::insert_iterator::insert_iterator(
+inline QQuickListCompositor::insert_iterator::insert_iterator(
         Range *range, int offset, Group group, int groupCount)
     : iterator(range, offset, group, groupCount) {}
 
-inline QDeclarativeListCompositor::Change::Change(iterator it, int count, uint flags, int moveId)
+inline QQuickListCompositor::Change::Change(iterator it, int count, uint flags, int moveId)
     : count(count), flags(flags), moveId(moveId)
 {
     for (int i = 0; i < MaximumGroupCount; ++i)
         index[i] = it.index[i];
 }
 
-Q_AUTOTEST_EXPORT QDebug operator <<(QDebug debug, const QDeclarativeListCompositor::Group &group);
-Q_AUTOTEST_EXPORT QDebug operator <<(QDebug debug, const QDeclarativeListCompositor::Range &range);
-Q_AUTOTEST_EXPORT QDebug operator <<(QDebug debug, const QDeclarativeListCompositor::iterator &it);
-Q_AUTOTEST_EXPORT QDebug operator <<(QDebug debug, const QDeclarativeListCompositor::Change &change);
-Q_AUTOTEST_EXPORT QDebug operator <<(QDebug debug, const QDeclarativeListCompositor::Remove &remove);
-Q_AUTOTEST_EXPORT QDebug operator <<(QDebug debug, const QDeclarativeListCompositor::Insert &insert);
-Q_AUTOTEST_EXPORT QDebug operator <<(QDebug debug, const QDeclarativeListCompositor &list);
+Q_AUTOTEST_EXPORT QDebug operator <<(QDebug debug, const QQuickListCompositor::Group &group);
+Q_AUTOTEST_EXPORT QDebug operator <<(QDebug debug, const QQuickListCompositor::Range &range);
+Q_AUTOTEST_EXPORT QDebug operator <<(QDebug debug, const QQuickListCompositor::iterator &it);
+Q_AUTOTEST_EXPORT QDebug operator <<(QDebug debug, const QQuickListCompositor::Change &change);
+Q_AUTOTEST_EXPORT QDebug operator <<(QDebug debug, const QQuickListCompositor::Remove &remove);
+Q_AUTOTEST_EXPORT QDebug operator <<(QDebug debug, const QQuickListCompositor::Insert &insert);
+Q_AUTOTEST_EXPORT QDebug operator <<(QDebug debug, const QQuickListCompositor &list);
 
 QT_END_NAMESPACE
 
diff --git a/src/quick/util/qdeclarativepackage.cpp b/src/quick/util/qquickpackage.cpp
index c6504ffea4..1939de62e1 100644
--- a/src/quick/util/qdeclarativepackage.cpp
+++ b/src/quick/util/qquickpackage.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
@@ -39,15 +39,15 @@
 **
 ****************************************************************************/
 
-#include "qdeclarativepackage_p.h"
+#include "qquickpackage_p.h"
 
 #include <private/qobject_p.h>
-#include <private/qdeclarativeguard_p.h>
+#include <private/qqmlguard_p.h>
 
 QT_BEGIN_NAMESPACE
 
 /*!
-    \qmlclass Package QDeclarativePackage
+    \qmlclass Package QQuickPackage
     \inqmlmodule QtQuick 2
     \ingroup qml-working-with-data
     \brief Package provides a collection of named items.
@@ -72,7 +72,7 @@ QT_BEGIN_NAMESPACE
 
     \snippet examples/declarative/modelviews/package/view.qml 0
 
-    \sa {declarative/modelviews/package}{Package example}, {declarative/photoviewer}{Photo Viewer example}, QtDeclarative
+    \sa {declarative/modelviews/package}{Package example}, {declarative/photoviewer}{Photo Viewer example}, QtQml
 */
 
 /*!
@@ -81,14 +81,14 @@ QT_BEGIN_NAMESPACE
 */
 
 
-class QDeclarativePackagePrivate : public QObjectPrivate
+class QQuickPackagePrivate : public QObjectPrivate
 {
 public:
-    QDeclarativePackagePrivate() {}
+    QQuickPackagePrivate() {}
 
-    struct DataGuard : public QDeclarativeGuard<QObject>
+    struct DataGuard : public QQmlGuard<QObject>
     {
-        DataGuard(QObject *obj, QList<DataGuard> *l) : list(l) { (QDeclarativeGuard<QObject>&)*this = obj; }
+        DataGuard(QObject *obj, QList<DataGuard> *l) : list(l) { (QQmlGuard<QObject>&)*this = obj; }
         QList<DataGuard> *list;
         void objectDestroyed(QObject *) {
             // we assume priv will always be destroyed after objectDestroyed calls
@@ -97,91 +97,91 @@ public:
     };
 
     QList<DataGuard> dataList;
-    static void data_append(QDeclarativeListProperty<QObject> *prop, QObject *o) {
+    static void data_append(QQmlListProperty<QObject> *prop, QObject *o) {
         QList<DataGuard> *list = static_cast<QList<DataGuard> *>(prop->data);
         list->append(DataGuard(o, list));
     }
-    static void data_clear(QDeclarativeListProperty<QObject> *prop) {
+    static void data_clear(QQmlListProperty<QObject> *prop) {
         QList<DataGuard> *list = static_cast<QList<DataGuard> *>(prop->data);
         list->clear();
     }
-    static QObject *data_at(QDeclarativeListProperty<QObject> *prop, int index) {
+    static QObject *data_at(QQmlListProperty<QObject> *prop, int index) {
         QList<DataGuard> *list = static_cast<QList<DataGuard> *>(prop->data);
         return list->at(index);
     }
-    static int data_count(QDeclarativeListProperty<QObject> *prop) {
+    static int data_count(QQmlListProperty<QObject> *prop) {
         QList<DataGuard> *list = static_cast<QList<DataGuard> *>(prop->data);
         return list->count();
     }
 };
 
-QHash<QObject *, QDeclarativePackageAttached *> QDeclarativePackageAttached::attached;
+QHash<QObject *, QQuickPackageAttached *> QQuickPackageAttached::attached;
 
-QDeclarativePackageAttached::QDeclarativePackageAttached(QObject *parent)
+QQuickPackageAttached::QQuickPackageAttached(QObject *parent)
 : QObject(parent)
 {
     attached.insert(parent, this);
 }
 
-QDeclarativePackageAttached::~QDeclarativePackageAttached()
+QQuickPackageAttached::~QQuickPackageAttached()
 {
     attached.remove(parent());
 }
 
-QString QDeclarativePackageAttached::name() const 
+QString QQuickPackageAttached::name() const 
 { 
     return _name; 
 }
 
-void QDeclarativePackageAttached::setName(const QString &n) 
+void QQuickPackageAttached::setName(const QString &n) 
 { 
     _name = n; 
 }
 
-QDeclarativePackage::QDeclarativePackage(QObject *parent)
-    : QObject(*(new QDeclarativePackagePrivate), parent)
+QQuickPackage::QQuickPackage(QObject *parent)
+    : QObject(*(new QQuickPackagePrivate), parent)
 {
 }
 
-QDeclarativePackage::~QDeclarativePackage()
+QQuickPackage::~QQuickPackage()
 {
-    Q_D(QDeclarativePackage);
+    Q_D(QQuickPackage);
     for (int ii = 0; ii < d->dataList.count(); ++ii) {
         QObject *obj = d->dataList.at(ii);
         obj->setParent(this);
     }
 }
 
-QDeclarativeListProperty<QObject> QDeclarativePackage::data()
+QQmlListProperty<QObject> QQuickPackage::data()
 {
-    Q_D(QDeclarativePackage);
-    return QDeclarativeListProperty<QObject>(this, &d->dataList, QDeclarativePackagePrivate::data_append, 
-                                                        QDeclarativePackagePrivate::data_count, 
-                                                        QDeclarativePackagePrivate::data_at, 
-                                                        QDeclarativePackagePrivate::data_clear);
+    Q_D(QQuickPackage);
+    return QQmlListProperty<QObject>(this, &d->dataList, QQuickPackagePrivate::data_append, 
+                                                        QQuickPackagePrivate::data_count, 
+                                                        QQuickPackagePrivate::data_at, 
+                                                        QQuickPackagePrivate::data_clear);
 }
 
-bool QDeclarativePackage::hasPart(const QString &name)
+bool QQuickPackage::hasPart(const QString &name)
 {
-    Q_D(QDeclarativePackage);
+    Q_D(QQuickPackage);
     for (int ii = 0; ii < d->dataList.count(); ++ii) {
         QObject *obj = d->dataList.at(ii);
-        QDeclarativePackageAttached *a = QDeclarativePackageAttached::attached.value(obj);
+        QQuickPackageAttached *a = QQuickPackageAttached::attached.value(obj);
         if (a && a->name() == name)
             return true;
     }
     return false;
 }
 
-QObject *QDeclarativePackage::part(const QString &name)
+QObject *QQuickPackage::part(const QString &name)
 {
-    Q_D(QDeclarativePackage);
+    Q_D(QQuickPackage);
     if (name.isEmpty() && !d->dataList.isEmpty())
         return d->dataList.at(0);
 
     for (int ii = 0; ii < d->dataList.count(); ++ii) {
         QObject *obj = d->dataList.at(ii);
-        QDeclarativePackageAttached *a = QDeclarativePackageAttached::attached.value(obj);
+        QQuickPackageAttached *a = QQuickPackageAttached::attached.value(obj);
         if (a && a->name() == name)
             return obj;
     }
@@ -192,9 +192,9 @@ QObject *QDeclarativePackage::part(const QString &name)
     return 0;
 }
 
-QDeclarativePackageAttached *QDeclarativePackage::qmlAttachedProperties(QObject *o)
+QQuickPackageAttached *QQuickPackage::qmlAttachedProperties(QObject *o)
 {
-    return new QDeclarativePackageAttached(o);
+    return new QQuickPackageAttached(o);
 }
 
 
diff --git a/src/quick/util/qdeclarativepackage_p.h b/src/quick/util/qquickpackage_p.h
index ad164bc329..9f16521763 100644
--- a/src/quick/util/qdeclarativepackage_p.h
+++ b/src/quick/util/qquickpackage_p.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
@@ -39,58 +39,58 @@
 **
 ****************************************************************************/
 
-#ifndef QDECLARATIVEPACKAGE_H
-#define QDECLARATIVEPACKAGE_H
+#ifndef QQUICKPACKAGE_H
+#define QQUICKPACKAGE_H
 
-#include <qdeclarative.h>
+#include <qqml.h>
 
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-class QDeclarativePackagePrivate;
-class QDeclarativePackageAttached;
-class Q_AUTOTEST_EXPORT QDeclarativePackage : public QObject
+class QQuickPackagePrivate;
+class QQuickPackageAttached;
+class Q_AUTOTEST_EXPORT QQuickPackage : public QObject
 {
     Q_OBJECT
-    Q_DECLARE_PRIVATE(QDeclarativePackage)
+    Q_DECLARE_PRIVATE(QQuickPackage)
 
     Q_CLASSINFO("DefaultProperty", "data")
-    Q_PROPERTY(QDeclarativeListProperty<QObject> data READ data)
+    Q_PROPERTY(QQmlListProperty<QObject> data READ data)
 
 public:
-    QDeclarativePackage(QObject *parent=0);
-    virtual ~QDeclarativePackage();
+    QQuickPackage(QObject *parent=0);
+    virtual ~QQuickPackage();
 
-    QDeclarativeListProperty<QObject> data();
+    QQmlListProperty<QObject> data();
 
     QObject *part(const QString & = QString());
     bool hasPart(const QString &);
 
-    static QDeclarativePackageAttached *qmlAttachedProperties(QObject *);
+    static QQuickPackageAttached *qmlAttachedProperties(QObject *);
 };
 
-class QDeclarativePackageAttached : public QObject
+class QQuickPackageAttached : public QObject
 {
 Q_OBJECT
 Q_PROPERTY(QString name READ name WRITE setName)
 public:
-    QDeclarativePackageAttached(QObject *parent);
-    virtual ~QDeclarativePackageAttached();
+    QQuickPackageAttached(QObject *parent);
+    virtual ~QQuickPackageAttached();
 
     QString name() const;
     void setName(const QString &n);
 
-    static QHash<QObject *, QDeclarativePackageAttached *> attached;
+    static QHash<QObject *, QQuickPackageAttached *> attached;
 private:
     QString _name;
 };
 
 QT_END_NAMESPACE
 
-QML_DECLARE_TYPE(QDeclarativePackage)
-QML_DECLARE_TYPEINFO(QDeclarativePackage, QML_HAS_ATTACHED_PROPERTIES)
+QML_DECLARE_TYPE(QQuickPackage)
+QML_DECLARE_TYPEINFO(QQuickPackage, QML_HAS_ATTACHED_PROPERTIES)
 
 QT_END_HEADER
 
-#endif // QDECLARATIVEPACKAGE_H
+#endif // QQUICKPACKAGE_H
diff --git a/src/quick/util/qdeclarativepath.cpp b/src/quick/util/qquickpath.cpp
index 2ee534880c..b6a01bfe3e 100644
--- a/src/quick/util/qdeclarativepath.cpp
+++ b/src/quick/util/qquickpath.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
@@ -39,9 +39,9 @@
 **
 ****************************************************************************/
 
-#include "qdeclarativepath_p.h"
-#include "qdeclarativepath_p_p.h"
-#include "qdeclarativesvgparser_p.h"
+#include "qquickpath_p.h"
+#include "qquickpath_p_p.h"
+#include "qquicksvgparser_p.h"
 
 #include <QSet>
 #include <QTime>
@@ -53,7 +53,7 @@
 QT_BEGIN_NAMESPACE
 
 /*!
-    \qmlclass PathElement QDeclarativePathElement
+    \qmlclass PathElement QQuickPathElement
     \inqmlmodule QtQuick 2
     \ingroup qml-view-elements
     \brief PathElement is the base path type.
@@ -65,7 +65,7 @@ QT_BEGIN_NAMESPACE
 */
 
 /*!
-    \qmlclass Path QDeclarativePath
+    \qmlclass Path QQuickPath
     \inqmlmodule QtQuick 2
     \ingroup qml-view-elements
     \brief A Path object defines a path for use by \l PathView.
@@ -81,12 +81,12 @@ QT_BEGIN_NAMESPACE
 
     \sa PathView, PathAttribute, PathPercent, PathLine, PathQuad, PathCubic, PathArc, PathCurve, PathSvg
 */
-QDeclarativePath::QDeclarativePath(QObject *parent)
- : QObject(*(new QDeclarativePathPrivate), parent)
+QQuickPath::QQuickPath(QObject *parent)
+ : QObject(*(new QQuickPathPrivate), parent)
 {
 }
 
-QDeclarativePath::~QDeclarativePath()
+QQuickPath::~QQuickPath()
 {
 }
 
@@ -95,15 +95,15 @@ QDeclarativePath::~QDeclarativePath()
     \qmlproperty real QtQuick2::Path::startY
     These properties hold the starting position of the path.
 */
-qreal QDeclarativePath::startX() const
+qreal QQuickPath::startX() const
 {
-    Q_D(const QDeclarativePath);
+    Q_D(const QQuickPath);
     return d->startX.isNull ? 0 : d->startX.value;
 }
 
-void QDeclarativePath::setStartX(qreal x)
+void QQuickPath::setStartX(qreal x)
 {
-    Q_D(QDeclarativePath);
+    Q_D(QQuickPath);
     if (d->startX.isValid() && qFuzzyCompare(x, d->startX))
         return;
     d->startX = x;
@@ -111,21 +111,21 @@ void QDeclarativePath::setStartX(qreal x)
     processPath();
 }
 
-bool QDeclarativePath::hasStartX() const
+bool QQuickPath::hasStartX() const
 {
-    Q_D(const QDeclarativePath);
+    Q_D(const QQuickPath);
     return d->startX.isValid();
 }
 
-qreal QDeclarativePath::startY() const
+qreal QQuickPath::startY() const
 {
-    Q_D(const QDeclarativePath);
+    Q_D(const QQuickPath);
     return d->startY.isNull ? 0 : d->startY.value;
 }
 
-void QDeclarativePath::setStartY(qreal y)
+void QQuickPath::setStartY(qreal y)
 {
-    Q_D(QDeclarativePath);
+    Q_D(QQuickPath);
     if (d->startY.isValid() && qFuzzyCompare(y, d->startY))
         return;
     d->startY = y;
@@ -133,9 +133,9 @@ void QDeclarativePath::setStartY(qreal y)
     processPath();
 }
 
-bool QDeclarativePath::hasStartY() const
+bool QQuickPath::hasStartY() const
 {
-    Q_D(const QDeclarativePath);
+    Q_D(const QQuickPath);
     return d->startY.isValid();
 }
 
@@ -143,17 +143,17 @@ bool QDeclarativePath::hasStartY() const
     \qmlproperty bool QtQuick2::Path::closed
     This property holds whether the start and end of the path are identical.
 */
-bool QDeclarativePath::isClosed() const
+bool QQuickPath::isClosed() const
 {
-    Q_D(const QDeclarativePath);
+    Q_D(const QQuickPath);
     return d->closed;
 }
 
-bool QDeclarativePath::hasEnd() const
+bool QQuickPath::hasEnd() const
 {
-    Q_D(const QDeclarativePath);
+    Q_D(const QQuickPath);
     for (int i = d->_pathElements.count() - 1; i > -1; --i) {
-        if (QDeclarativeCurve *curve = qobject_cast<QDeclarativeCurve *>(d->_pathElements.at(i))) {
+        if (QQuickCurve *curve = qobject_cast<QQuickCurve *>(d->_pathElements.at(i))) {
             if ((!curve->hasX() && !curve->hasRelativeX()) || (!curve->hasY() && !curve->hasRelativeY()))
                 return false;
             else
@@ -181,22 +181,22 @@ bool QDeclarativePath::hasEnd() const
         \i \l PathPercent - a way to spread out items along various segments of the path.
     \endlist
 
-    \snippet doc/src/snippets/declarative/pathview/pathattributes.qml 2
+    \snippet doc/src/snippets/qml/pathview/pathattributes.qml 2
 */
 
-QDeclarativeListProperty<QDeclarativePathElement> QDeclarativePath::pathElements()
+QQmlListProperty<QQuickPathElement> QQuickPath::pathElements()
 {
-    Q_D(QDeclarativePath);
-    return QDeclarativeListProperty<QDeclarativePathElement>(this, d->_pathElements);
+    Q_D(QQuickPath);
+    return QQmlListProperty<QQuickPathElement>(this, d->_pathElements);
 }
 
-void QDeclarativePath::interpolate(int idx, const QString &name, qreal value)
+void QQuickPath::interpolate(int idx, const QString &name, qreal value)
 {
-    Q_D(QDeclarativePath);
+    Q_D(QQuickPath);
     interpolate(d->_attributePoints, idx, name, value);
 }
 
-void QDeclarativePath::interpolate(QList<AttributePoint> &attributePoints, int idx, const QString &name, qreal value)
+void QQuickPath::interpolate(QList<AttributePoint> &attributePoints, int idx, const QString &name, qreal value)
 {
     if (!idx)
         return;
@@ -226,9 +226,9 @@ void QDeclarativePath::interpolate(QList<AttributePoint> &attributePoints, int i
     }
 }
 
-void QDeclarativePath::endpoint(const QString &name)
+void QQuickPath::endpoint(const QString &name)
 {
-    Q_D(QDeclarativePath);
+    Q_D(QQuickPath);
     const AttributePoint &first = d->_attributePoints.first();
     qreal val = first.values.value(name);
     for (int ii = d->_attributePoints.count() - 1; ii >= 0; ii--) {
@@ -243,7 +243,7 @@ void QDeclarativePath::endpoint(const QString &name)
     }
 }
 
-void QDeclarativePath::endpoint(QList<AttributePoint> &attributePoints, const QString &name)
+void QQuickPath::endpoint(QList<AttributePoint> &attributePoints, const QString &name)
 {
     const AttributePoint &first = attributePoints.first();
     qreal val = first.values.value(name);
@@ -261,9 +261,9 @@ void QDeclarativePath::endpoint(QList<AttributePoint> &attributePoints, const QS
 
 static QString percentString(QLatin1String("_qfx_percent"));
 
-void QDeclarativePath::processPath()
+void QQuickPath::processPath()
 {
-    Q_D(QDeclarativePath);
+    Q_D(QQuickPath);
 
     if (!d->componentComplete)
         return;
@@ -276,9 +276,9 @@ void QDeclarativePath::processPath()
     emit changed();
 }
 
-QPainterPath QDeclarativePath::createPath(const QPointF &startPoint, const QPointF &endPoint, const QStringList &attributes, qreal &pathLength, QList<AttributePoint> &attributePoints, bool *closed)
+QPainterPath QQuickPath::createPath(const QPointF &startPoint, const QPointF &endPoint, const QStringList &attributes, qreal &pathLength, QList<AttributePoint> &attributePoints, bool *closed)
 {
-    Q_D(QDeclarativePath);
+    Q_D(QQuickPath);
 
     pathLength = 0;
     attributePoints.clear();
@@ -299,9 +299,9 @@ QPainterPath QDeclarativePath::createPath(const QPointF &startPoint, const QPoin
 
     bool usesPercent = false;
     int index = 0;
-    foreach (QDeclarativePathElement *pathElement, d->_pathElements) {
-        if (QDeclarativeCurve *curve = qobject_cast<QDeclarativeCurve *>(pathElement)) {
-            QDeclarativePathData data;
+    foreach (QQuickPathElement *pathElement, d->_pathElements) {
+        if (QQuickCurve *curve = qobject_cast<QQuickCurve *>(pathElement)) {
+            QQuickPathData data;
             data.index = index;
             data.endPoint = endPoint;
             data.curves = d->_pathCurves;
@@ -310,11 +310,11 @@ QPainterPath QDeclarativePath::createPath(const QPointF &startPoint, const QPoin
             p.origpercent = path.length();
             attributePoints << p;
             ++index;
-        } else if (QDeclarativePathAttribute *attribute = qobject_cast<QDeclarativePathAttribute *>(pathElement)) {
+        } else if (QQuickPathAttribute *attribute = qobject_cast<QQuickPathAttribute *>(pathElement)) {
             AttributePoint &point = attributePoints.last();
             point.values[attribute->name()] = attribute->value();
             interpolate(attributePoints, attributePoints.count() - 1, attribute->name(), attribute->value());
-        } else if (QDeclarativePathPercent *percent = qobject_cast<QDeclarativePathPercent *>(pathElement)) {
+        } else if (QQuickPathPercent *percent = qobject_cast<QQuickPathPercent *>(pathElement)) {
             AttributePoint &point = attributePoints.last();
             point.values[percentString] = percent->value();
             interpolate(attributePoints, attributePoints.count() - 1, percentString, percent->value());
@@ -340,7 +340,7 @@ QPainterPath QDeclarativePath::createPath(const QPointF &startPoint, const QPoin
     qreal prevorigpercent = 0;
     for (int ii = 0; ii < attributePoints.count(); ++ii) {
         const AttributePoint &point = attributePoints.at(ii);
-        if (point.values.contains(percentString)) { //special string for QDeclarativePathPercent
+        if (point.values.contains(percentString)) { //special string for QQuickPathPercent
             if ( ii > 0) {
                 qreal scale = (attributePoints[ii].origpercent/length - prevorigpercent) /
                             (point.values.value(percentString)-prevpercent);
@@ -365,51 +365,51 @@ QPainterPath QDeclarativePath::createPath(const QPointF &startPoint, const QPoin
     return path;
 }
 
-void QDeclarativePath::classBegin()
+void QQuickPath::classBegin()
 {
-    Q_D(QDeclarativePath);
+    Q_D(QQuickPath);
     d->componentComplete = false;
 }
 
-void QDeclarativePath::componentComplete()
+void QQuickPath::componentComplete()
 {
-    Q_D(QDeclarativePath);
+    Q_D(QQuickPath);
     QSet<QString> attrs;
     d->componentComplete = true;
 
     // First gather up all the attributes
-    foreach (QDeclarativePathElement *pathElement, d->_pathElements) {
-        if (QDeclarativeCurve *curve =
-            qobject_cast<QDeclarativeCurve *>(pathElement))
+    foreach (QQuickPathElement *pathElement, d->_pathElements) {
+        if (QQuickCurve *curve =
+            qobject_cast<QQuickCurve *>(pathElement))
             d->_pathCurves.append(curve);
-        else if (QDeclarativePathAttribute *attribute =
-                 qobject_cast<QDeclarativePathAttribute *>(pathElement))
+        else if (QQuickPathAttribute *attribute =
+                 qobject_cast<QQuickPathAttribute *>(pathElement))
             attrs.insert(attribute->name());
     }
     d->_attributes = attrs.toList();
 
     processPath();
 
-    foreach (QDeclarativePathElement *pathElement, d->_pathElements)
+    foreach (QQuickPathElement *pathElement, d->_pathElements)
         connect(pathElement, SIGNAL(changed()), this, SLOT(processPath()));
 }
 
-QPainterPath QDeclarativePath::path() const
+QPainterPath QQuickPath::path() const
 {
-    Q_D(const QDeclarativePath);
+    Q_D(const QQuickPath);
     return d->_path;
 }
 
-QStringList QDeclarativePath::attributes() const
+QStringList QQuickPath::attributes() const
 {
-    Q_D(const QDeclarativePath);
+    Q_D(const QQuickPath);
     if (!d->componentComplete) {
         QSet<QString> attrs;
 
         // First gather up all the attributes
-        foreach (QDeclarativePathElement *pathElement, d->_pathElements) {
-            if (QDeclarativePathAttribute *attribute =
-                qobject_cast<QDeclarativePathAttribute *>(pathElement))
+        foreach (QQuickPathElement *pathElement, d->_pathElements) {
+            if (QQuickPathAttribute *attribute =
+                qobject_cast<QQuickPathAttribute *>(pathElement))
                 attrs.insert(attribute->name());
         }
         return attrs.toList();
@@ -461,9 +461,9 @@ static inline qreal slopeAt(qreal t, qreal a, qreal b, qreal c, qreal d)
     return 3*t*t*(d - 3*c + 3*b - a) + 6*t*(c - 2*b + a) + 3*(b - a);
 }
 
-void QDeclarativePath::createPointCache() const
+void QQuickPath::createPointCache() const
 {
-    Q_D(const QDeclarativePath);
+    Q_D(const QQuickPath);
     qreal pathLength = d->pathLength;
     if (pathLength <= 0 || qIsNaN(pathLength))
         return;
@@ -513,19 +513,19 @@ void QDeclarativePath::createPointCache() const
     }
 }
 
-void QDeclarativePath::invalidateSequentialHistory() const
+void QQuickPath::invalidateSequentialHistory() const
 {
-    Q_D(const QDeclarativePath);
+    Q_D(const QQuickPath);
     d->prevBez.isValid = false;
 }
 
-QPointF QDeclarativePath::sequentialPointAt(qreal p, qreal *angle) const
+QPointF QQuickPath::sequentialPointAt(qreal p, qreal *angle) const
 {
-    Q_D(const QDeclarativePath);
+    Q_D(const QQuickPath);
     return sequentialPointAt(d->_path, d->pathLength, d->_attributePoints, d->prevBez, p, angle);
 }
 
-QPointF QDeclarativePath::sequentialPointAt(const QPainterPath &path, const qreal &pathLength, const QList<AttributePoint> &attributePoints, QDeclarativeCachedBezier &prevBez, qreal p, qreal *angle)
+QPointF QQuickPath::sequentialPointAt(const QPainterPath &path, const qreal &pathLength, const QList<AttributePoint> &attributePoints, QQuickCachedBezier &prevBez, qreal p, qreal *angle)
 {
     if (!prevBez.isValid)
         return p > .5 ? backwardsPointAt(path, pathLength, attributePoints, prevBez, p, angle) :
@@ -535,7 +535,7 @@ QPointF QDeclarativePath::sequentialPointAt(const QPainterPath &path, const qrea
                            forwardsPointAt(path, pathLength, attributePoints, prevBez, p, angle);
 }
 
-QPointF QDeclarativePath::forwardsPointAt(const QPainterPath &path, const qreal &pathLength, const QList<AttributePoint> &attributePoints, QDeclarativeCachedBezier &prevBez, qreal p, qreal *angle)
+QPointF QQuickPath::forwardsPointAt(const QPainterPath &path, const qreal &pathLength, const QList<AttributePoint> &attributePoints, QQuickCachedBezier &prevBez, qreal p, qreal *angle)
 {
     if (pathLength <= 0 || qIsNaN(pathLength))
         return path.pointAtPercent(0);  //expensive?
@@ -591,7 +591,7 @@ QPointF QDeclarativePath::forwardsPointAt(const QPainterPath &path, const qreal
 }
 
 //ideally this should be merged with forwardsPointAt
-QPointF QDeclarativePath::backwardsPointAt(const QPainterPath &path, const qreal &pathLength, const QList<AttributePoint> &attributePoints, QDeclarativeCachedBezier &prevBez, qreal p, qreal *angle)
+QPointF QQuickPath::backwardsPointAt(const QPainterPath &path, const qreal &pathLength, const QList<AttributePoint> &attributePoints, QQuickCachedBezier &prevBez, qreal p, qreal *angle)
 {
     if (pathLength <= 0 || qIsNaN(pathLength))
         return path.pointAtPercent(0);
@@ -646,9 +646,9 @@ QPointF QDeclarativePath::backwardsPointAt(const QPainterPath &path, const qreal
     return QPointF(0,0);
 }
 
-QPointF QDeclarativePath::pointAt(qreal p) const
+QPointF QQuickPath::pointAt(qreal p) const
 {
-    Q_D(const QDeclarativePath);
+    Q_D(const QQuickPath);
     if (d->_pointCache.isEmpty()) {
         createPointCache();
         if (d->_pointCache.isEmpty())
@@ -681,9 +681,9 @@ QPointF QDeclarativePath::pointAt(qreal p) const
     return pos;
 }
 
-qreal QDeclarativePath::attributeAt(const QString &name, qreal percent) const
+qreal QQuickPath::attributeAt(const QString &name, qreal percent) const
 {
-    Q_D(const QDeclarativePath);
+    Q_D(const QQuickPath);
     if (percent < 0 || percent > 1)
         return 0;
 
@@ -709,12 +709,12 @@ qreal QDeclarativePath::attributeAt(const QString &name, qreal percent) const
 
 /****************************************************************************/
 
-qreal QDeclarativeCurve::x() const
+qreal QQuickCurve::x() const
 {
     return _x.isNull ? 0 : _x.value;
 }
 
-void QDeclarativeCurve::setX(qreal x)
+void QQuickCurve::setX(qreal x)
 {
     if (_x.isNull || _x != x) {
         _x = x;
@@ -723,17 +723,17 @@ void QDeclarativeCurve::setX(qreal x)
     }
 }
 
-bool QDeclarativeCurve::hasX()
+bool QQuickCurve::hasX()
 {
     return _x.isValid();
 }
 
-qreal QDeclarativeCurve::y() const
+qreal QQuickCurve::y() const
 {
     return _y.isNull ? 0 : _y.value;
 }
 
-void QDeclarativeCurve::setY(qreal y)
+void QQuickCurve::setY(qreal y)
 {
     if (_y.isNull || _y != y) {
         _y = y;
@@ -742,17 +742,17 @@ void QDeclarativeCurve::setY(qreal y)
     }
 }
 
-bool QDeclarativeCurve::hasY()
+bool QQuickCurve::hasY()
 {
     return _y.isValid();
 }
 
-qreal QDeclarativeCurve::relativeX() const
+qreal QQuickCurve::relativeX() const
 {
     return _relativeX;
 }
 
-void QDeclarativeCurve::setRelativeX(qreal x)
+void QQuickCurve::setRelativeX(qreal x)
 {
     if (_relativeX.isNull || _relativeX != x) {
         _relativeX = x;
@@ -761,17 +761,17 @@ void QDeclarativeCurve::setRelativeX(qreal x)
     }
 }
 
-bool QDeclarativeCurve::hasRelativeX()
+bool QQuickCurve::hasRelativeX()
 {
     return _relativeX.isValid();
 }
 
-qreal QDeclarativeCurve::relativeY() const
+qreal QQuickCurve::relativeY() const
 {
     return _relativeY;
 }
 
-void QDeclarativeCurve::setRelativeY(qreal y)
+void QQuickCurve::setRelativeY(qreal y)
 {
     if (_relativeY.isNull || _relativeY != y) {
         _relativeY = y;
@@ -780,7 +780,7 @@ void QDeclarativeCurve::setRelativeY(qreal y)
     }
 }
 
-bool QDeclarativeCurve::hasRelativeY()
+bool QQuickCurve::hasRelativeY()
 {
     return _relativeY.isValid();
 }
@@ -788,7 +788,7 @@ bool QDeclarativeCurve::hasRelativeY()
 /****************************************************************************/
 
 /*!
-    \qmlclass PathAttribute QDeclarativePathAttribute
+    \qmlclass PathAttribute QQuickPathAttribute
     \inqmlmodule QtQuick 2
     \ingroup qml-view-elements
     \brief The PathAttribute allows setting an attribute at a given position in a Path.
@@ -810,7 +810,7 @@ bool QDeclarativeCurve::hasRelativeY()
     \row
     \o \image declarative-pathattribute.png
     \o
-    \snippet doc/src/snippets/declarative/pathview/pathattributes.qml 0
+    \snippet doc/src/snippets/qml/pathview/pathattributes.qml 0
     (see the PathView documentation for the specification of ContactModel.qml
      used for ContactModel above.)
     \endtable
@@ -835,12 +835,12 @@ bool QDeclarativeCurve::hasRelativeY()
     the name of the attribute to change.
 */
 
-QString QDeclarativePathAttribute::name() const
+QString QQuickPathAttribute::name() const
 {
     return _name;
 }
 
-void QDeclarativePathAttribute::setName(const QString &name)
+void QQuickPathAttribute::setName(const QString &name)
 {
     if (_name == name)
         return;
@@ -887,12 +887,12 @@ void QDeclarativePathAttribute::setName(const QString &name)
 /*!
     the new value of the attribute.
 */
-qreal QDeclarativePathAttribute::value() const
+qreal QQuickPathAttribute::value() const
 {
     return _value;
 }
 
-void QDeclarativePathAttribute::setValue(qreal value)
+void QQuickPathAttribute::setValue(qreal value)
 {
     if (_value != value) {
         _value = value;
@@ -904,7 +904,7 @@ void QDeclarativePathAttribute::setValue(qreal value)
 /****************************************************************************/
 
 /*!
-    \qmlclass PathLine QDeclarativePathLine
+    \qmlclass PathLine QQuickPathLine
     \inqmlmodule QtQuick 2
     \ingroup qml-view-elements
     \brief The PathLine defines a straight line.
@@ -946,15 +946,15 @@ void QDeclarativePathAttribute::setValue(qreal value)
     \sa x, y
 */
 
-inline QPointF positionForCurve(const QDeclarativePathData &data, const QPointF &prevPoint)
+inline QPointF positionForCurve(const QQuickPathData &data, const QPointF &prevPoint)
 {
-    QDeclarativeCurve *curve = data.curves.at(data.index);
+    QQuickCurve *curve = data.curves.at(data.index);
     bool isEnd = data.index == data.curves.size() - 1;
     return QPointF(curve->hasRelativeX() ? prevPoint.x() + curve->relativeX() : !isEnd || curve->hasX() ? curve->x() : data.endPoint.x(),
                    curve->hasRelativeY() ? prevPoint.y() + curve->relativeY() : !isEnd || curve->hasY() ? curve->y() : data.endPoint.y());
 }
 
-void QDeclarativePathLine::addToPath(QPainterPath &path, const QDeclarativePathData &data)
+void QQuickPathLine::addToPath(QPainterPath &path, const QQuickPathData &data)
 {
     path.lineTo(positionForCurve(data, path.currentPosition()));
 }
@@ -962,7 +962,7 @@ void QDeclarativePathLine::addToPath(QPainterPath &path, const QDeclarativePathD
 /****************************************************************************/
 
 /*!
-    \qmlclass PathQuad QDeclarativePathQuad
+    \qmlclass PathQuad QQuickPathQuad
     \inqmlmodule QtQuick 2
     \ingroup qml-view-elements
     \brief The PathQuad defines a quadratic Bezier curve with a control point.
@@ -1017,12 +1017,12 @@ void QDeclarativePathLine::addToPath(QPainterPath &path, const QDeclarativePathD
 /*!
     the x position of the control point.
 */
-qreal QDeclarativePathQuad::controlX() const
+qreal QQuickPathQuad::controlX() const
 {
     return _controlX;
 }
 
-void QDeclarativePathQuad::setControlX(qreal x)
+void QQuickPathQuad::setControlX(qreal x)
 {
     if (_controlX != x) {
         _controlX = x;
@@ -1035,12 +1035,12 @@ void QDeclarativePathQuad::setControlX(qreal x)
 /*!
     the y position of the control point.
 */
-qreal QDeclarativePathQuad::controlY() const
+qreal QQuickPathQuad::controlY() const
 {
     return _controlY;
 }
 
-void QDeclarativePathQuad::setControlY(qreal y)
+void QQuickPathQuad::setControlY(qreal y)
 {
     if (_controlY != y) {
         _controlY = y;
@@ -1064,12 +1064,12 @@ void QDeclarativePathQuad::setControlY(qreal y)
     \sa controlX, controlY
 */
 
-qreal QDeclarativePathQuad::relativeControlX() const
+qreal QQuickPathQuad::relativeControlX() const
 {
     return _relativeControlX;
 }
 
-void QDeclarativePathQuad::setRelativeControlX(qreal x)
+void QQuickPathQuad::setRelativeControlX(qreal x)
 {
     if (_relativeControlX.isNull || _relativeControlX != x) {
         _relativeControlX = x;
@@ -1078,17 +1078,17 @@ void QDeclarativePathQuad::setRelativeControlX(qreal x)
     }
 }
 
-bool QDeclarativePathQuad::hasRelativeControlX()
+bool QQuickPathQuad::hasRelativeControlX()
 {
     return _relativeControlX.isValid();
 }
 
-qreal QDeclarativePathQuad::relativeControlY() const
+qreal QQuickPathQuad::relativeControlY() const
 {
     return _relativeControlY;
 }
 
-void QDeclarativePathQuad::setRelativeControlY(qreal y)
+void QQuickPathQuad::setRelativeControlY(qreal y)
 {
     if (_relativeControlY.isNull || _relativeControlY != y) {
         _relativeControlY = y;
@@ -1097,12 +1097,12 @@ void QDeclarativePathQuad::setRelativeControlY(qreal y)
     }
 }
 
-bool QDeclarativePathQuad::hasRelativeControlY()
+bool QQuickPathQuad::hasRelativeControlY()
 {
     return _relativeControlY.isValid();
 }
 
-void QDeclarativePathQuad::addToPath(QPainterPath &path, const QDeclarativePathData &data)
+void QQuickPathQuad::addToPath(QPainterPath &path, const QQuickPathData &data)
 {
     const QPointF &prevPoint = path.currentPosition();
     QPointF controlPoint(hasRelativeControlX() ? prevPoint.x() + relativeControlX() : controlX(),
@@ -1113,7 +1113,7 @@ void QDeclarativePathQuad::addToPath(QPainterPath &path, const QDeclarativePathD
 /****************************************************************************/
 
 /*!
-   \qmlclass PathCubic QDeclarativePathCubic
+   \qmlclass PathCubic QQuickPathCubic
     \inqmlmodule QtQuick 2
     \ingroup qml-view-elements
    \brief The PathCubic defines a cubic Bezier curve with two control points.
@@ -1168,12 +1168,12 @@ void QDeclarativePathQuad::addToPath(QPainterPath &path, const QDeclarativePathD
 
     Defines the position of the first control point.
 */
-qreal QDeclarativePathCubic::control1X() const
+qreal QQuickPathCubic::control1X() const
 {
     return _control1X;
 }
 
-void QDeclarativePathCubic::setControl1X(qreal x)
+void QQuickPathCubic::setControl1X(qreal x)
 {
     if (_control1X != x) {
         _control1X = x;
@@ -1182,12 +1182,12 @@ void QDeclarativePathCubic::setControl1X(qreal x)
     }
 }
 
-qreal QDeclarativePathCubic::control1Y() const
+qreal QQuickPathCubic::control1Y() const
 {
     return _control1Y;
 }
 
-void QDeclarativePathCubic::setControl1Y(qreal y)
+void QQuickPathCubic::setControl1Y(qreal y)
 {
     if (_control1Y != y) {
         _control1Y = y;
@@ -1202,12 +1202,12 @@ void QDeclarativePathCubic::setControl1Y(qreal y)
 
     Defines the position of the second control point.
 */
-qreal QDeclarativePathCubic::control2X() const
+qreal QQuickPathCubic::control2X() const
 {
     return _control2X;
 }
 
-void QDeclarativePathCubic::setControl2X(qreal x)
+void QQuickPathCubic::setControl2X(qreal x)
 {
     if (_control2X != x) {
         _control2X = x;
@@ -1216,12 +1216,12 @@ void QDeclarativePathCubic::setControl2X(qreal x)
     }
 }
 
-qreal QDeclarativePathCubic::control2Y() const
+qreal QQuickPathCubic::control2Y() const
 {
     return _control2Y;
 }
 
-void QDeclarativePathCubic::setControl2Y(qreal y)
+void QQuickPathCubic::setControl2Y(qreal y)
 {
     if (_control2Y != y) {
         _control2Y = y;
@@ -1247,12 +1247,12 @@ void QDeclarativePathCubic::setControl2Y(qreal y)
     \sa control1X, control1Y, control2X, control2Y
 */
 
-qreal QDeclarativePathCubic::relativeControl1X() const
+qreal QQuickPathCubic::relativeControl1X() const
 {
     return _relativeControl1X;
 }
 
-void QDeclarativePathCubic::setRelativeControl1X(qreal x)
+void QQuickPathCubic::setRelativeControl1X(qreal x)
 {
     if (_relativeControl1X.isNull || _relativeControl1X != x) {
         _relativeControl1X = x;
@@ -1261,17 +1261,17 @@ void QDeclarativePathCubic::setRelativeControl1X(qreal x)
     }
 }
 
-bool QDeclarativePathCubic::hasRelativeControl1X()
+bool QQuickPathCubic::hasRelativeControl1X()
 {
     return _relativeControl1X.isValid();
 }
 
-qreal QDeclarativePathCubic::relativeControl1Y() const
+qreal QQuickPathCubic::relativeControl1Y() const
 {
     return _relativeControl1Y;
 }
 
-void QDeclarativePathCubic::setRelativeControl1Y(qreal y)
+void QQuickPathCubic::setRelativeControl1Y(qreal y)
 {
     if (_relativeControl1Y.isNull || _relativeControl1Y != y) {
         _relativeControl1Y = y;
@@ -1280,17 +1280,17 @@ void QDeclarativePathCubic::setRelativeControl1Y(qreal y)
     }
 }
 
-bool QDeclarativePathCubic::hasRelativeControl1Y()
+bool QQuickPathCubic::hasRelativeControl1Y()
 {
     return _relativeControl1Y.isValid();
 }
 
-qreal QDeclarativePathCubic::relativeControl2X() const
+qreal QQuickPathCubic::relativeControl2X() const
 {
     return _relativeControl2X;
 }
 
-void QDeclarativePathCubic::setRelativeControl2X(qreal x)
+void QQuickPathCubic::setRelativeControl2X(qreal x)
 {
     if (_relativeControl2X.isNull || _relativeControl2X != x) {
         _relativeControl2X = x;
@@ -1299,17 +1299,17 @@ void QDeclarativePathCubic::setRelativeControl2X(qreal x)
     }
 }
 
-bool QDeclarativePathCubic::hasRelativeControl2X()
+bool QQuickPathCubic::hasRelativeControl2X()
 {
     return _relativeControl2X.isValid();
 }
 
-qreal QDeclarativePathCubic::relativeControl2Y() const
+qreal QQuickPathCubic::relativeControl2Y() const
 {
     return _relativeControl2Y;
 }
 
-void QDeclarativePathCubic::setRelativeControl2Y(qreal y)
+void QQuickPathCubic::setRelativeControl2Y(qreal y)
 {
     if (_relativeControl2Y.isNull || _relativeControl2Y != y) {
         _relativeControl2Y = y;
@@ -1318,12 +1318,12 @@ void QDeclarativePathCubic::setRelativeControl2Y(qreal y)
     }
 }
 
-bool QDeclarativePathCubic::hasRelativeControl2Y()
+bool QQuickPathCubic::hasRelativeControl2Y()
 {
     return _relativeControl2Y.isValid();
 }
 
-void QDeclarativePathCubic::addToPath(QPainterPath &path, const QDeclarativePathData &data)
+void QQuickPathCubic::addToPath(QPainterPath &path, const QQuickPathData &data)
 {
     const QPointF &prevPoint = path.currentPosition();
     QPointF controlPoint1(hasRelativeControl1X() ? prevPoint.x() + relativeControl1X() : control1X(),
@@ -1336,7 +1336,7 @@ void QDeclarativePathCubic::addToPath(QPainterPath &path, const QDeclarativePath
 /****************************************************************************/
 
 /*!
-    \qmlclass PathCurve QDeclarativePathCurve
+    \qmlclass PathCurve QQuickPathCurve
     \inqmlmodule QtQuick 2
     \ingroup qml-view-elements
     \brief The PathCurve defines a point on a Catmull-Rom curve.
@@ -1344,7 +1344,7 @@ void QDeclarativePathCubic::addToPath(QPainterPath &path, const QDeclarativePath
     PathCurve provides an easy way to specify a curve passing directly through a set of points.
     Typically multiple PathCurves are used in a series, as the following example demonstrates:
 
-    \snippet doc/src/snippets/declarative/path/basiccurve.qml 0
+    \snippet doc/src/snippets/qml/path/basiccurve.qml 0
 
     This example produces the following path (with the starting point and PathCurve points
     highlighted in red):
@@ -1388,7 +1388,7 @@ inline QPointF previousPathPosition(const QPainterPath &path)
     return index > -1 ? QPointF(path.elementAt(index)) : path.pointAtPercent(0);
 }
 
-void QDeclarativePathCatmullRomCurve::addToPath(QPainterPath &path, const QDeclarativePathData &data)
+void QQuickPathCatmullRomCurve::addToPath(QPainterPath &path, const QQuickPathData &data)
 {
     //here we convert catmull-rom spline to bezier for use in QPainterPath.
     //basic conversion algorithm:
@@ -1400,18 +1400,18 @@ void QDeclarativePathCatmullRomCurve::addToPath(QPainterPath &path, const QDecla
 
     //get previous points
     int index = data.index - 1;
-    QDeclarativeCurve *curve = index == -1 ? 0 : data.curves.at(index);
-    if (qobject_cast<QDeclarativePathCatmullRomCurve*>(curve)) {
+    QQuickCurve *curve = index == -1 ? 0 : data.curves.at(index);
+    if (qobject_cast<QQuickPathCatmullRomCurve*>(curve)) {
         prev = path.currentPosition();
         prevFar = previousPathPosition(path);
     } else {
         prev = path.currentPosition();
         bool prevFarSet = false;
         if (index == -1 && data.curves.count() > 1) {
-            if (qobject_cast<QDeclarativePathCatmullRomCurve*>(data.curves.at(data.curves.count()-1))) {
+            if (qobject_cast<QQuickPathCatmullRomCurve*>(data.curves.at(data.curves.count()-1))) {
                 //TODO: profile and optimize
                 QPointF pos = prev;
-                QDeclarativePathData loopData;
+                QQuickPathData loopData;
                 loopData.endPoint = data.endPoint;
                 loopData.curves = data.curves;
                 for (int i = data.index; i < data.curves.count(); ++i) {
@@ -1436,14 +1436,14 @@ void QDeclarativePathCatmullRomCurve::addToPath(QPainterPath &path, const QDecla
 
     //get next point
     index = data.index + 1;
-    if (index < data.curves.count() && qobject_cast<QDeclarativePathCatmullRomCurve*>(data.curves.at(index))) {
-        QDeclarativePathData nextData;
+    if (index < data.curves.count() && qobject_cast<QQuickPathCatmullRomCurve*>(data.curves.at(index))) {
+        QQuickPathData nextData;
         nextData.index = index;
         nextData.endPoint = data.endPoint;
         nextData.curves = data.curves;
         next = positionForCurve(nextData, point);
     } else {
-        if (point == QPointF(path.elementAt(0)) && qobject_cast<QDeclarativePathCatmullRomCurve*>(data.curves.at(0))) {
+        if (point == QPointF(path.elementAt(0)) && qobject_cast<QQuickPathCatmullRomCurve*>(data.curves.at(0))) {
             //this is a closed path starting and ending with catmull-rom segments.
             //we try to smooth the join point
             next = QPointF(path.elementAt(3));  //the first catmull-rom point
@@ -1481,7 +1481,7 @@ void QDeclarativePathCatmullRomCurve::addToPath(QPainterPath &path, const QDecla
 /****************************************************************************/
 
 /*!
-    \qmlclass PathArc QDeclarativePathArc
+    \qmlclass PathArc QQuickPathArc
     \inqmlmodule QtQuick 2
     \ingroup qml-view-elements
     \brief The PathArc defines an arc with the given radius.
@@ -1493,7 +1493,7 @@ void QDeclarativePathCatmullRomCurve::addToPath(QPainterPath &path, const QDecla
     \table
     \row
     \o \image declarative-patharc.png
-    \o \snippet doc/src/snippets/declarative/path/basicarc.qml 0
+    \o \snippet doc/src/snippets/qml/path/basicarc.qml 0
     \endtable
 
     Note that a single PathArc cannot be used to specify a circle. Instead, you can
@@ -1537,16 +1537,16 @@ void QDeclarativePathCatmullRomCurve::addToPath(QPainterPath &path, const QDecla
     \table
     \row
     \o \image declarative-arcradius.png
-    \o \snippet doc/src/snippets/declarative/path/arcradius.qml 0
+    \o \snippet doc/src/snippets/qml/path/arcradius.qml 0
     \endtable
 */
 
-qreal QDeclarativePathArc::radiusX() const
+qreal QQuickPathArc::radiusX() const
 {
     return _radiusX;
 }
 
-void QDeclarativePathArc::setRadiusX(qreal radius)
+void QQuickPathArc::setRadiusX(qreal radius)
 {
     if (_radiusX == radius)
         return;
@@ -1555,12 +1555,12 @@ void QDeclarativePathArc::setRadiusX(qreal radius)
     emit radiusXChanged();
 }
 
-qreal QDeclarativePathArc::radiusY() const
+qreal QQuickPathArc::radiusY() const
 {
     return _radiusY;
 }
 
-void QDeclarativePathArc::setRadiusY(qreal radius)
+void QQuickPathArc::setRadiusY(qreal radius)
 {
     if (_radiusY == radius)
         return;
@@ -1582,18 +1582,18 @@ void QDeclarativePathArc::setRadiusY(qreal radius)
     \table
     \row
     \o \image declarative-largearc.png
-    \o \snippet doc/src/snippets/declarative/path/largearc.qml 0
+    \o \snippet doc/src/snippets/qml/path/largearc.qml 0
     \endtable
 
     The default value is false.
 */
 
-bool QDeclarativePathArc::useLargeArc() const
+bool QQuickPathArc::useLargeArc() const
 {
     return _useLargeArc;
 }
 
-void QDeclarativePathArc::setUseLargeArc(bool largeArc)
+void QQuickPathArc::setUseLargeArc(bool largeArc)
 {
     if (_useLargeArc == largeArc)
         return;
@@ -1613,18 +1613,18 @@ void QDeclarativePathArc::setUseLargeArc(bool largeArc)
     \table
     \row
     \o \image declarative-arcdirection.png
-    \o \snippet doc/src/snippets/declarative/path/arcdirection.qml 0
+    \o \snippet doc/src/snippets/qml/path/arcdirection.qml 0
     \endtable
 
     \sa useLargeArc
 */
 
-QDeclarativePathArc::ArcDirection QDeclarativePathArc::direction() const
+QQuickPathArc::ArcDirection QQuickPathArc::direction() const
 {
     return _direction;
 }
 
-void QDeclarativePathArc::setDirection(ArcDirection direction)
+void QQuickPathArc::setDirection(ArcDirection direction)
 {
     if (_direction == direction)
         return;
@@ -1633,11 +1633,11 @@ void QDeclarativePathArc::setDirection(ArcDirection direction)
     emit directionChanged();
 }
 
-void QDeclarativePathArc::addToPath(QPainterPath &path, const QDeclarativePathData &data)
+void QQuickPathArc::addToPath(QPainterPath &path, const QQuickPathData &data)
 {
     const QPointF &startPoint = path.currentPosition();
     const QPointF &endPoint = positionForCurve(data, startPoint);
-    QDeclarativeSvgParser::pathArc(path,
+    QQuickSvgParser::pathArc(path,
             _radiusX,
             _radiusY,
             0,  //xAxisRotation
@@ -1651,7 +1651,7 @@ void QDeclarativePathArc::addToPath(QPainterPath &path, const QDeclarativePathDa
 /****************************************************************************/
 
 /*!
-    \qmlclass PathSvg QDeclarativePathSvg
+    \qmlclass PathSvg QQuickPathSvg
     \inqmlmodule QtQuick 2
     \ingroup qml-view-elements
     \brief The PathSvg defines a path using an SVG path data string.
@@ -1681,12 +1681,12 @@ void QDeclarativePathArc::addToPath(QPainterPath &path, const QDeclarativePathDa
     for more details on this format.
 */
 
-QString QDeclarativePathSvg::path() const
+QString QQuickPathSvg::path() const
 {
     return _path;
 }
 
-void QDeclarativePathSvg::setPath(const QString &path)
+void QQuickPathSvg::setPath(const QString &path)
 {
     if (_path == path)
         return;
@@ -1695,15 +1695,15 @@ void QDeclarativePathSvg::setPath(const QString &path)
     emit pathChanged();
 }
 
-void QDeclarativePathSvg::addToPath(QPainterPath &path, const QDeclarativePathData &)
+void QQuickPathSvg::addToPath(QPainterPath &path, const QQuickPathData &)
 {
-    QDeclarativeSvgParser::parsePathDataFast(_path, path);
+    QQuickSvgParser::parsePathDataFast(_path, path);
 }
 
 /****************************************************************************/
 
 /*!
-    \qmlclass PathPercent QDeclarativePathPercent
+    \qmlclass PathPercent QQuickPathPercent
     \inqmlmodule QtQuick 2
     \ingroup qml-view-elements
     \brief The PathPercent manipulates the way a path is interpreted.
@@ -1782,12 +1782,12 @@ void QDeclarativePathSvg::addToPath(QPainterPath &path, const QDeclarativePathDa
     \endqml
 */
 
-qreal QDeclarativePathPercent::value() const
+qreal QQuickPathPercent::value() const
 {
     return _value;
 }
 
-void QDeclarativePathPercent::setValue(qreal value)
+void QQuickPathPercent::setValue(qreal value)
 {
     if (_value != value) {
         _value = value;
diff --git a/src/quick/util/qdeclarativepath_p.h b/src/quick/util/qquickpath_p.h
index 7dc2c47990..3ffcf3eaa6 100644
--- a/src/quick/util/qdeclarativepath_p.h
+++ b/src/quick/util/qquickpath_p.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
@@ -39,12 +39,12 @@
 **
 ****************************************************************************/
 
-#ifndef QDECLARATIVEPATH_H
-#define QDECLARATIVEPATH_H
+#ifndef QQUICKPATH_H
+#define QQUICKPATH_H
 
-#include <qdeclarative.h>
+#include <qqml.h>
 
-#include <private/qdeclarativenullablevalue_p_p.h>
+#include <private/qqmlnullablevalue_p_p.h>
 #include <private/qbezier_p.h>
 
 #include <QtCore/QObject>
@@ -54,31 +54,31 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-class QDeclarativeCurve;
-struct QDeclarativePathData
+class QQuickCurve;
+struct QQuickPathData
 {
     int index;
     QPointF endPoint;
-    QList<QDeclarativeCurve*> curves;
+    QList<QQuickCurve*> curves;
 };
 
-class Q_AUTOTEST_EXPORT QDeclarativePathElement : public QObject
+class Q_AUTOTEST_EXPORT QQuickPathElement : public QObject
 {
     Q_OBJECT
 public:
-    QDeclarativePathElement(QObject *parent=0) : QObject(parent) {}
+    QQuickPathElement(QObject *parent=0) : QObject(parent) {}
 Q_SIGNALS:
     void changed();
 };
 
-class Q_AUTOTEST_EXPORT QDeclarativePathAttribute : public QDeclarativePathElement
+class Q_AUTOTEST_EXPORT QQuickPathAttribute : public QQuickPathElement
 {
     Q_OBJECT
 
     Q_PROPERTY(QString name READ name WRITE setName NOTIFY nameChanged)
     Q_PROPERTY(qreal value READ value WRITE setValue NOTIFY valueChanged)
 public:
-    QDeclarativePathAttribute(QObject *parent=0) : QDeclarativePathElement(parent), _value(0) {}
+    QQuickPathAttribute(QObject *parent=0) : QQuickPathElement(parent), _value(0) {}
 
 
     QString name() const;
@@ -96,7 +96,7 @@ private:
     qreal _value;
 };
 
-class Q_AUTOTEST_EXPORT QDeclarativeCurve : public QDeclarativePathElement
+class Q_AUTOTEST_EXPORT QQuickCurve : public QQuickPathElement
 {
     Q_OBJECT
 
@@ -105,7 +105,7 @@ class Q_AUTOTEST_EXPORT QDeclarativeCurve : public QDeclarativePathElement
     Q_PROPERTY(qreal relativeX READ relativeX WRITE setRelativeX NOTIFY relativeXChanged)
     Q_PROPERTY(qreal relativeY READ relativeY WRITE setRelativeY NOTIFY relativeYChanged)
 public:
-    QDeclarativeCurve(QObject *parent=0) : QDeclarativePathElement(parent) {}
+    QQuickCurve(QObject *parent=0) : QQuickPathElement(parent) {}
 
     qreal x() const;
     void setX(qreal x);
@@ -123,7 +123,7 @@ public:
     void setRelativeY(qreal y);
     bool hasRelativeY();
 
-    virtual void addToPath(QPainterPath &, const QDeclarativePathData &) {}
+    virtual void addToPath(QPainterPath &, const QQuickPathData &) {}
 
 Q_SIGNALS:
     void xChanged();
@@ -132,22 +132,22 @@ Q_SIGNALS:
     void relativeYChanged();
 
 private:
-    QDeclarativeNullableValue<qreal> _x;
-    QDeclarativeNullableValue<qreal> _y;
-    QDeclarativeNullableValue<qreal> _relativeX;
-    QDeclarativeNullableValue<qreal> _relativeY;
+    QQmlNullableValue<qreal> _x;
+    QQmlNullableValue<qreal> _y;
+    QQmlNullableValue<qreal> _relativeX;
+    QQmlNullableValue<qreal> _relativeY;
 };
 
-class Q_AUTOTEST_EXPORT QDeclarativePathLine : public QDeclarativeCurve
+class Q_AUTOTEST_EXPORT QQuickPathLine : public QQuickCurve
 {
     Q_OBJECT
 public:
-    QDeclarativePathLine(QObject *parent=0) : QDeclarativeCurve(parent) {}
+    QQuickPathLine(QObject *parent=0) : QQuickCurve(parent) {}
 
-    void addToPath(QPainterPath &path, const QDeclarativePathData &);
+    void addToPath(QPainterPath &path, const QQuickPathData &);
 };
 
-class Q_AUTOTEST_EXPORT QDeclarativePathQuad : public QDeclarativeCurve
+class Q_AUTOTEST_EXPORT QQuickPathQuad : public QQuickCurve
 {
     Q_OBJECT
 
@@ -156,7 +156,7 @@ class Q_AUTOTEST_EXPORT QDeclarativePathQuad : public QDeclarativeCurve
     Q_PROPERTY(qreal relativeControlX READ relativeControlX WRITE setRelativeControlX NOTIFY relativeControlXChanged)
     Q_PROPERTY(qreal relativeControlY READ relativeControlY WRITE setRelativeControlY NOTIFY relativeControlYChanged)
 public:
-    QDeclarativePathQuad(QObject *parent=0) : QDeclarativeCurve(parent), _controlX(0), _controlY(0) {}
+    QQuickPathQuad(QObject *parent=0) : QQuickCurve(parent), _controlX(0), _controlY(0) {}
 
     qreal controlX() const;
     void setControlX(qreal x);
@@ -172,7 +172,7 @@ public:
     void setRelativeControlY(qreal y);
     bool hasRelativeControlY();
 
-    void addToPath(QPainterPath &path, const QDeclarativePathData &);
+    void addToPath(QPainterPath &path, const QQuickPathData &);
 
 Q_SIGNALS:
     void controlXChanged();
@@ -183,11 +183,11 @@ Q_SIGNALS:
 private:
     qreal _controlX;
     qreal _controlY;
-    QDeclarativeNullableValue<qreal> _relativeControlX;
-    QDeclarativeNullableValue<qreal> _relativeControlY;
+    QQmlNullableValue<qreal> _relativeControlX;
+    QQmlNullableValue<qreal> _relativeControlY;
 };
 
-class Q_AUTOTEST_EXPORT QDeclarativePathCubic : public QDeclarativeCurve
+class Q_AUTOTEST_EXPORT QQuickPathCubic : public QQuickCurve
 {
     Q_OBJECT
 
@@ -200,7 +200,7 @@ class Q_AUTOTEST_EXPORT QDeclarativePathCubic : public QDeclarativeCurve
     Q_PROPERTY(qreal relativeControl2X READ relativeControl2X WRITE setRelativeControl2X NOTIFY relativeControl2XChanged)
     Q_PROPERTY(qreal relativeControl2Y READ relativeControl2Y WRITE setRelativeControl2Y NOTIFY relativeControl2YChanged)
 public:
-    QDeclarativePathCubic(QObject *parent=0) : QDeclarativeCurve(parent), _control1X(0), _control1Y(0), _control2X(0), _control2Y(0) {}
+    QQuickPathCubic(QObject *parent=0) : QQuickCurve(parent), _control1X(0), _control1Y(0), _control2X(0), _control2Y(0) {}
 
     qreal control1X() const;
     void setControl1X(qreal x);
@@ -230,7 +230,7 @@ public:
     void setRelativeControl2Y(qreal y);
     bool hasRelativeControl2Y();
 
-    void addToPath(QPainterPath &path, const QDeclarativePathData &);
+    void addToPath(QPainterPath &path, const QQuickPathData &);
 
 Q_SIGNALS:
     void control1XChanged();
@@ -247,22 +247,22 @@ private:
     qreal _control1Y;
     qreal _control2X;
     qreal _control2Y;
-    QDeclarativeNullableValue<qreal> _relativeControl1X;
-    QDeclarativeNullableValue<qreal> _relativeControl1Y;
-    QDeclarativeNullableValue<qreal> _relativeControl2X;
-    QDeclarativeNullableValue<qreal> _relativeControl2Y;
+    QQmlNullableValue<qreal> _relativeControl1X;
+    QQmlNullableValue<qreal> _relativeControl1Y;
+    QQmlNullableValue<qreal> _relativeControl2X;
+    QQmlNullableValue<qreal> _relativeControl2Y;
 };
 
-class Q_AUTOTEST_EXPORT QDeclarativePathCatmullRomCurve : public QDeclarativeCurve
+class Q_AUTOTEST_EXPORT QQuickPathCatmullRomCurve : public QQuickCurve
 {
     Q_OBJECT
 public:
-    QDeclarativePathCatmullRomCurve(QObject *parent=0) : QDeclarativeCurve(parent) {}
+    QQuickPathCatmullRomCurve(QObject *parent=0) : QQuickCurve(parent) {}
 
-    void addToPath(QPainterPath &path, const QDeclarativePathData &);
+    void addToPath(QPainterPath &path, const QQuickPathData &);
 };
 
-class Q_AUTOTEST_EXPORT QDeclarativePathArc : public QDeclarativeCurve
+class Q_AUTOTEST_EXPORT QQuickPathArc : public QQuickCurve
 {
     Q_OBJECT
     Q_PROPERTY(qreal radiusX READ radiusX WRITE setRadiusX NOTIFY radiusXChanged)
@@ -271,8 +271,8 @@ class Q_AUTOTEST_EXPORT QDeclarativePathArc : public QDeclarativeCurve
     Q_PROPERTY(ArcDirection direction READ direction WRITE setDirection NOTIFY directionChanged)
 
 public:
-    QDeclarativePathArc(QObject *parent=0)
-        : QDeclarativeCurve(parent), _radiusX(0), _radiusY(0), _useLargeArc(false), _direction(Clockwise) {}
+    QQuickPathArc(QObject *parent=0)
+        : QQuickCurve(parent), _radiusX(0), _radiusY(0), _useLargeArc(false), _direction(Clockwise) {}
 
     enum ArcDirection { Clockwise, Counterclockwise };
     Q_ENUMS(ArcDirection)
@@ -289,7 +289,7 @@ public:
     ArcDirection direction() const;
     void setDirection(ArcDirection direction);
 
-    void addToPath(QPainterPath &path, const QDeclarativePathData &);
+    void addToPath(QPainterPath &path, const QQuickPathData &);
 
 Q_SIGNALS:
     void radiusXChanged();
@@ -304,17 +304,17 @@ private:
     ArcDirection _direction;
 };
 
-class Q_AUTOTEST_EXPORT QDeclarativePathSvg : public QDeclarativeCurve
+class Q_AUTOTEST_EXPORT QQuickPathSvg : public QQuickCurve
 {
     Q_OBJECT
     Q_PROPERTY(QString path READ path WRITE setPath NOTIFY pathChanged)
 public:
-    QDeclarativePathSvg(QObject *parent=0) : QDeclarativeCurve(parent) {}
+    QQuickPathSvg(QObject *parent=0) : QQuickCurve(parent) {}
 
     QString path() const;
     void setPath(const QString &path);
 
-    void addToPath(QPainterPath &path, const QDeclarativePathData &);
+    void addToPath(QPainterPath &path, const QQuickPathData &);
 
 Q_SIGNALS:
     void pathChanged();
@@ -323,12 +323,12 @@ private:
     QString _path;
 };
 
-class Q_AUTOTEST_EXPORT QDeclarativePathPercent : public QDeclarativePathElement
+class Q_AUTOTEST_EXPORT QQuickPathPercent : public QQuickPathElement
 {
     Q_OBJECT
     Q_PROPERTY(qreal value READ value WRITE setValue NOTIFY valueChanged)
 public:
-    QDeclarativePathPercent(QObject *parent=0) : QDeclarativePathElement(parent) {}
+    QQuickPathPercent(QObject *parent=0) : QQuickPathElement(parent) {}
 
     qreal value() const;
     void setValue(qreal value);
@@ -340,9 +340,9 @@ private:
     qreal _value;
 };
 
-struct QDeclarativeCachedBezier
+struct QQuickCachedBezier
 {
-    QDeclarativeCachedBezier() : isValid(false) {}
+    QQuickCachedBezier() : isValid(false) {}
     QBezier bezier;
     int element;
     qreal bezLength;
@@ -351,23 +351,23 @@ struct QDeclarativeCachedBezier
     bool isValid;
 };
 
-class QDeclarativePathPrivate;
-class Q_AUTOTEST_EXPORT QDeclarativePath : public QObject, public QDeclarativeParserStatus
+class QQuickPathPrivate;
+class Q_AUTOTEST_EXPORT QQuickPath : public QObject, public QQmlParserStatus
 {
     Q_OBJECT
 
-    Q_INTERFACES(QDeclarativeParserStatus)
-    Q_PROPERTY(QDeclarativeListProperty<QDeclarativePathElement> pathElements READ pathElements)
+    Q_INTERFACES(QQmlParserStatus)
+    Q_PROPERTY(QQmlListProperty<QQuickPathElement> pathElements READ pathElements)
     Q_PROPERTY(qreal startX READ startX WRITE setStartX NOTIFY startXChanged)
     Q_PROPERTY(qreal startY READ startY WRITE setStartY NOTIFY startYChanged)
     Q_PROPERTY(bool closed READ isClosed NOTIFY changed)
     Q_CLASSINFO("DefaultProperty", "pathElements")
-    Q_INTERFACES(QDeclarativeParserStatus)
+    Q_INTERFACES(QQmlParserStatus)
 public:
-    QDeclarativePath(QObject *parent=0);
-    ~QDeclarativePath();
+    QQuickPath(QObject *parent=0);
+    ~QQuickPath();
 
-    QDeclarativeListProperty<QDeclarativePathElement> pathElements();
+    QQmlListProperty<QQuickPathElement> pathElements();
 
     qreal startX() const;
     void setStartX(qreal x);
@@ -419,33 +419,33 @@ private:
 
     static void interpolate(QList<AttributePoint> &points, int idx, const QString &name, qreal value);
     static void endpoint(QList<AttributePoint> &attributePoints, const QString &name);
-    static QPointF forwardsPointAt(const QPainterPath &path, const qreal &pathLength, const QList<AttributePoint> &attributePoints, QDeclarativeCachedBezier &prevBez, qreal p, qreal *angle = 0);
-    static QPointF backwardsPointAt(const QPainterPath &path, const qreal &pathLength, const QList<AttributePoint> &attributePoints, QDeclarativeCachedBezier &prevBez, qreal p, qreal *angle = 0);
+    static QPointF forwardsPointAt(const QPainterPath &path, const qreal &pathLength, const QList<AttributePoint> &attributePoints, QQuickCachedBezier &prevBez, qreal p, qreal *angle = 0);
+    static QPointF backwardsPointAt(const QPainterPath &path, const qreal &pathLength, const QList<AttributePoint> &attributePoints, QQuickCachedBezier &prevBez, qreal p, qreal *angle = 0);
 
 private:
-    Q_DISABLE_COPY(QDeclarativePath)
-    Q_DECLARE_PRIVATE(QDeclarativePath)
+    Q_DISABLE_COPY(QQuickPath)
+    Q_DECLARE_PRIVATE(QQuickPath)
     friend class QQuickPathAnimationUpdater;
 
 public:
     QPainterPath createPath(const QPointF &startPoint, const QPointF &endPoint, const QStringList &attributes, qreal &pathLength, QList<AttributePoint> &attributePoints, bool *closed = 0);
-    static QPointF sequentialPointAt(const QPainterPath &path, const qreal &pathLength, const QList<AttributePoint> &attributePoints, QDeclarativeCachedBezier &prevBez, qreal p, qreal *angle = 0);
+    static QPointF sequentialPointAt(const QPainterPath &path, const qreal &pathLength, const QList<AttributePoint> &attributePoints, QQuickCachedBezier &prevBez, qreal p, qreal *angle = 0);
 };
 
 QT_END_NAMESPACE
 
-QML_DECLARE_TYPE(QDeclarativePathElement)
-QML_DECLARE_TYPE(QDeclarativePathAttribute)
-QML_DECLARE_TYPE(QDeclarativeCurve)
-QML_DECLARE_TYPE(QDeclarativePathLine)
-QML_DECLARE_TYPE(QDeclarativePathQuad)
-QML_DECLARE_TYPE(QDeclarativePathCubic)
-QML_DECLARE_TYPE(QDeclarativePathCatmullRomCurve)
-QML_DECLARE_TYPE(QDeclarativePathArc)
-QML_DECLARE_TYPE(QDeclarativePathSvg)
-QML_DECLARE_TYPE(QDeclarativePathPercent)
-QML_DECLARE_TYPE(QDeclarativePath)
+QML_DECLARE_TYPE(QQuickPathElement)
+QML_DECLARE_TYPE(QQuickPathAttribute)
+QML_DECLARE_TYPE(QQuickCurve)
+QML_DECLARE_TYPE(QQuickPathLine)
+QML_DECLARE_TYPE(QQuickPathQuad)
+QML_DECLARE_TYPE(QQuickPathCubic)
+QML_DECLARE_TYPE(QQuickPathCatmullRomCurve)
+QML_DECLARE_TYPE(QQuickPathArc)
+QML_DECLARE_TYPE(QQuickPathSvg)
+QML_DECLARE_TYPE(QQuickPathPercent)
+QML_DECLARE_TYPE(QQuickPath)
 
 QT_END_HEADER
 
-#endif // QDECLARATIVEPATH_H
+#endif // QQUICKPATH_H
diff --git a/src/quick/util/qdeclarativepath_p_p.h b/src/quick/util/qquickpath_p_p.h
index f02ab79e19..a7be68c964 100644
--- a/src/quick/util/qdeclarativepath_p_p.h
+++ b/src/quick/util/qquickpath_p_p.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#ifndef QDECLARATIVEPATH_P_H
-#define QDECLARATIVEPATH_P_H
+#ifndef QQUICKPATH_P_H
+#define QQUICKPATH_P_H
 
 //
 //  W A R N I N G
@@ -53,31 +53,31 @@
 // We mean it.
 //
 
-#include "qdeclarativepath_p.h"
+#include "qquickpath_p.h"
 
-#include <qdeclarative.h>
+#include <qqml.h>
 #include <QtCore/QStringList>
 
 #include <private/qobject_p.h>
 
 QT_BEGIN_NAMESPACE
 
-class QDeclarativePathPrivate : public QObjectPrivate
+class QQuickPathPrivate : public QObjectPrivate
 {
-    Q_DECLARE_PUBLIC(QDeclarativePath)
+    Q_DECLARE_PUBLIC(QQuickPath)
 
 public:
-    QDeclarativePathPrivate() : pathLength(0), closed(false), componentComplete(true) { }
+    QQuickPathPrivate() : pathLength(0), closed(false), componentComplete(true) { }
 
     QPainterPath _path;
-    QList<QDeclarativePathElement*> _pathElements;
+    QList<QQuickPathElement*> _pathElements;
     mutable QVector<QPointF> _pointCache;
-    QList<QDeclarativePath::AttributePoint> _attributePoints;
+    QList<QQuickPath::AttributePoint> _attributePoints;
     QStringList _attributes;
-    QList<QDeclarativeCurve*> _pathCurves;
-    mutable QDeclarativeCachedBezier prevBez;
-    QDeclarativeNullableValue<qreal> startX;
-    QDeclarativeNullableValue<qreal> startY;
+    QList<QQuickCurve*> _pathCurves;
+    mutable QQuickCachedBezier prevBez;
+    QQmlNullableValue<qreal> startX;
+    QQmlNullableValue<qreal> startY;
     qreal pathLength;
     bool closed;
     bool componentComplete;
diff --git a/src/quick/util/qdeclarativepathinterpolator.cpp b/src/quick/util/qquickpathinterpolator.cpp
index 7550d54159..2b5fb62872 100644
--- a/src/quick/util/qdeclarativepathinterpolator.cpp
+++ b/src/quick/util/qquickpathinterpolator.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
@@ -39,9 +39,9 @@
 **
 ****************************************************************************/
 
-#include "qdeclarativepathinterpolator_p.h"
+#include "qquickpathinterpolator_p.h"
 
-#include "qdeclarativepath_p.h"
+#include "qquickpath_p.h"
 
 QT_BEGIN_NAMESPACE
 
@@ -55,10 +55,10 @@ QT_BEGIN_NAMESPACE
 
     In the following example, we animate a green rectangle along a bezier path.
 
-    \snippet doc/src/snippets/declarative/pathinterpolator.qml 0
+    \snippet doc/src/snippets/qml/pathinterpolator.qml 0
 */
 
-QDeclarativePathInterpolator::QDeclarativePathInterpolator(QObject *parent) :
+QQuickPathInterpolator::QQuickPathInterpolator(QObject *parent) :
     QObject(parent), _path(0), _x(0), _y(0), _angle(0), _progress(0)
 {
 }
@@ -69,12 +69,12 @@ QDeclarativePathInterpolator::QDeclarativePathInterpolator(QObject *parent) :
 
     For more information on defining a path see the \l Path documentation.
 */
-QDeclarativePath *QDeclarativePathInterpolator::path() const
+QQuickPath *QQuickPathInterpolator::path() const
 {
     return _path;
 }
 
-void QDeclarativePathInterpolator::setPath(QDeclarativePath *path)
+void QQuickPathInterpolator::setPath(QQuickPath *path)
 {
     if (_path == path)
         return;
@@ -95,12 +95,12 @@ void QDeclarativePathInterpolator::setPath(QDeclarativePath *path)
 
     Progress ranges from 0.0 to 1.0.
 */
-qreal QDeclarativePathInterpolator::progress() const
+qreal QQuickPathInterpolator::progress() const
 {
     return _progress;
 }
 
-void QDeclarativePathInterpolator::setProgress(qreal progress)
+void QQuickPathInterpolator::setProgress(qreal progress)
 {
     if (progress == _progress)
         return;
@@ -115,12 +115,12 @@ void QDeclarativePathInterpolator::setProgress(qreal progress)
 
     These properties hold the position of the path at \l progress.
 */
-qreal QDeclarativePathInterpolator::x() const
+qreal QQuickPathInterpolator::x() const
 {
     return _x;
 }
 
-qreal QDeclarativePathInterpolator::y() const
+qreal QQuickPathInterpolator::y() const
 {
     return _y;
 }
@@ -132,12 +132,12 @@ qreal QDeclarativePathInterpolator::y() const
 
     Angles are reported clockwise, with zero degrees at the 3 o'clock position.
 */
-qreal QDeclarativePathInterpolator::angle() const
+qreal QQuickPathInterpolator::angle() const
 {
     return _angle;
 }
 
-void QDeclarativePathInterpolator::_q_pathUpdated()
+void QQuickPathInterpolator::_q_pathUpdated()
 {
     if (! _path)
         return;
diff --git a/src/quick/util/qdeclarativepathinterpolator_p.h b/src/quick/util/qquickpathinterpolator_p.h
index 24b58e6a3c..b018ce337a 100644
--- a/src/quick/util/qdeclarativepathinterpolator_p.h
+++ b/src/quick/util/qquickpathinterpolator_p.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
@@ -39,30 +39,30 @@
 **
 ****************************************************************************/
 
-#ifndef QDECLARATIVEPATHINTERPOLATOR_P_H
-#define QDECLARATIVEPATHINTERPOLATOR_P_H
+#ifndef QQUICKPATHINTERPOLATOR_P_H
+#define QQUICKPATHINTERPOLATOR_P_H
 
-#include <qdeclarative.h>
+#include <qqml.h>
 #include <QObject>
 
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-class QDeclarativePath;
-class Q_AUTOTEST_EXPORT QDeclarativePathInterpolator : public QObject
+class QQuickPath;
+class Q_AUTOTEST_EXPORT QQuickPathInterpolator : public QObject
 {
     Q_OBJECT
-    Q_PROPERTY(QDeclarativePath *path READ path WRITE setPath NOTIFY pathChanged)
+    Q_PROPERTY(QQuickPath *path READ path WRITE setPath NOTIFY pathChanged)
     Q_PROPERTY(qreal progress READ progress WRITE setProgress NOTIFY progressChanged)
     Q_PROPERTY(qreal x READ x NOTIFY xChanged)
     Q_PROPERTY(qreal y READ y NOTIFY yChanged)
     Q_PROPERTY(qreal angle READ angle NOTIFY angleChanged)
 public:
-    explicit QDeclarativePathInterpolator(QObject *parent = 0);
+    explicit QQuickPathInterpolator(QObject *parent = 0);
 
-    QDeclarativePath *path() const;
-    void setPath(QDeclarativePath *path);
+    QQuickPath *path() const;
+    void setPath(QQuickPath *path);
 
     qreal progress() const;
     void setProgress(qreal progress);
@@ -82,7 +82,7 @@ private Q_SLOTS:
     void _q_pathUpdated();
 
 private:
-    QDeclarativePath *_path;
+    QQuickPath *_path;
     qreal _x;
     qreal _y;
     qreal _angle;
@@ -91,8 +91,8 @@ private:
 
 QT_END_NAMESPACE
 
-QML_DECLARE_TYPE(QDeclarativePathInterpolator)
+QML_DECLARE_TYPE(QQuickPathInterpolator)
 
 QT_END_HEADER
 
-#endif // QDECLARATIVEPATHINTERPOLATOR_P_H
+#endif // QQUICKPATHINTERPOLATOR_P_H
diff --git a/src/quick/util/qdeclarativepixmapcache.cpp b/src/quick/util/qquickpixmapcache.cpp
index 95cbd361b8..85e155f081 100644
--- a/src/quick/util/qdeclarativepixmapcache.cpp
+++ b/src/quick/util/qquickpixmapcache.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
@@ -39,13 +39,13 @@
 **
 ****************************************************************************/
 
-#include "qdeclarativepixmapcache_p.h"
-#include <qdeclarativenetworkaccessmanagerfactory.h>
-#include <qdeclarativeimageprovider.h>
+#include "qquickpixmapcache_p.h"
+#include <qqmlnetworkaccessmanagerfactory.h>
+#include <qqmlimageprovider.h>
 
-#include <qdeclarativeengine.h>
-#include <private/qdeclarativeglobal_p.h>
-#include <private/qdeclarativeengine_p.h>
+#include <qqmlengine.h>
+#include <private/qqmlglobal_p.h>
+#include <private/qqmlengine_p.h>
 
 #include <QtQuick/private/qsgtexture_p.h>
 #include <QtQuick/private/qsgcontext_p.h>
@@ -76,26 +76,26 @@ QT_BEGIN_NAMESPACE
 // The cache limit describes the maximum "junk" in the cache.
 static int cache_limit = 2048 * 1024; // 2048 KB cache limit for embedded in qpixmapcache.cpp
 
-QSGTexture *QDeclarativeDefaultTextureFactory::createTexture(QQuickCanvas *) const
+QSGTexture *QQuickDefaultTextureFactory::createTexture(QQuickCanvas *) const
 {
     QSGPlainTexture *t = new QSGPlainTexture();
     t->setImage(im);
     return t;
 }
 
-class QDeclarativePixmapReader;
-class QDeclarativePixmapData;
-class QDeclarativePixmapReply : public QObject
+class QQuickPixmapReader;
+class QQuickPixmapData;
+class QQuickPixmapReply : public QObject
 {
     Q_OBJECT
 public:
     enum ReadError { NoError, Loading, Decoding };
 
-    QDeclarativePixmapReply(QDeclarativePixmapData *);
-    ~QDeclarativePixmapReply();
+    QQuickPixmapReply(QQuickPixmapData *);
+    ~QQuickPixmapReply();
 
-    QDeclarativePixmapData *data;
-    QDeclarativeEngine *engineForReader; // always access reader inside readerMutex
+    QQuickPixmapData *data;
+    QQmlEngine *engineForReader; // always access reader inside readerMutex
     QSize requestSize;
     QUrl url;
 
@@ -104,16 +104,16 @@ public:
 
     class Event : public QEvent {
     public:
-        Event(ReadError, const QString &, const QSize &, QDeclarativeTextureFactory *factory, const QImage &image);
+        Event(ReadError, const QString &, const QSize &, QQuickTextureFactory *factory, const QImage &image);
 
         ReadError error;
         QString errorString;
         QSize implicitSize;
         QImage image;
-        QDeclarativeTextureFactory *textureFactory;
+        QQuickTextureFactory *textureFactory;
     };
     void postReply(ReadError, const QString &, const QSize &, const QImage &image);
-    void postReply(ReadError, const QString &, const QSize &, QDeclarativeTextureFactory *factory, const QImage &image);
+    void postReply(ReadError, const QString &, const QSize &, QQuickTextureFactory *factory, const QImage &image);
 
 
 Q_SIGNALS:
@@ -124,118 +124,118 @@ protected:
     bool event(QEvent *event);
 
 private:
-    Q_DISABLE_COPY(QDeclarativePixmapReply)
+    Q_DISABLE_COPY(QQuickPixmapReply)
 
 public:
     static int finishedIndex;
     static int downloadProgressIndex;
 };
 
-class QDeclarativePixmapReaderThreadObject : public QObject {
+class QQuickPixmapReaderThreadObject : public QObject {
     Q_OBJECT
 public:
-    QDeclarativePixmapReaderThreadObject(QDeclarativePixmapReader *);
+    QQuickPixmapReaderThreadObject(QQuickPixmapReader *);
     void processJobs();
     virtual bool event(QEvent *e);
 private slots:
     void networkRequestDone();
 private:
-    QDeclarativePixmapReader *reader;
+    QQuickPixmapReader *reader;
 };
 
-class QDeclarativePixmapData;
-class QDeclarativePixmapReader : public QThread
+class QQuickPixmapData;
+class QQuickPixmapReader : public QThread
 {
     Q_OBJECT
 public:
-    QDeclarativePixmapReader(QDeclarativeEngine *eng);
-    ~QDeclarativePixmapReader();
+    QQuickPixmapReader(QQmlEngine *eng);
+    ~QQuickPixmapReader();
 
-    QDeclarativePixmapReply *getImage(QDeclarativePixmapData *);
-    void cancel(QDeclarativePixmapReply *rep);
+    QQuickPixmapReply *getImage(QQuickPixmapData *);
+    void cancel(QQuickPixmapReply *rep);
 
-    static QDeclarativePixmapReader *instance(QDeclarativeEngine *engine);
-    static QDeclarativePixmapReader *existingInstance(QDeclarativeEngine *engine);
+    static QQuickPixmapReader *instance(QQmlEngine *engine);
+    static QQuickPixmapReader *existingInstance(QQmlEngine *engine);
 
 protected:
     void run();
 
 private:
-    friend class QDeclarativePixmapReaderThreadObject;
+    friend class QQuickPixmapReaderThreadObject;
     void processJobs();
-    void processJob(QDeclarativePixmapReply *, const QUrl &, const QSize &);
+    void processJob(QQuickPixmapReply *, const QUrl &, const QSize &);
     void networkRequestDone(QNetworkReply *);
 
-    QList<QDeclarativePixmapReply*> jobs;
-    QList<QDeclarativePixmapReply*> cancelled;
-    QDeclarativeEngine *engine;
+    QList<QQuickPixmapReply*> jobs;
+    QList<QQuickPixmapReply*> cancelled;
+    QQmlEngine *engine;
     QObject *eventLoopQuitHack;
 
     QMutex mutex;
-    QDeclarativePixmapReaderThreadObject *threadObject;
+    QQuickPixmapReaderThreadObject *threadObject;
     QWaitCondition waitCondition;
 
     QNetworkAccessManager *networkAccessManager();
     QNetworkAccessManager *accessManager;
 
-    QHash<QNetworkReply*,QDeclarativePixmapReply*> replies;
+    QHash<QNetworkReply*,QQuickPixmapReply*> replies;
 
     static int replyDownloadProgress;
     static int replyFinished;
     static int downloadProgress;
     static int threadNetworkRequestDone;
-    static QHash<QDeclarativeEngine *,QDeclarativePixmapReader*> readers;
+    static QHash<QQmlEngine *,QQuickPixmapReader*> readers;
 public:
     static QMutex readerMutex;
 };
 
-class QDeclarativePixmapData
+class QQuickPixmapData
 {
 public:
-    QDeclarativePixmapData(QDeclarativePixmap *pixmap, const QUrl &u, const QSize &s, const QString &e)
-    : refCount(1), inCache(false), pixmapStatus(QDeclarativePixmap::Error), 
+    QQuickPixmapData(QQuickPixmap *pixmap, const QUrl &u, const QSize &s, const QString &e)
+    : refCount(1), inCache(false), pixmapStatus(QQuickPixmap::Error), 
       url(u), errorString(e), requestSize(s), textureFactory(0), reply(0), prevUnreferenced(0),
       prevUnreferencedPtr(0), nextUnreferenced(0)
     {
         declarativePixmaps.insert(pixmap);
     }
 
-    QDeclarativePixmapData(QDeclarativePixmap *pixmap, const QUrl &u, const QSize &r)
-    : refCount(1), inCache(false), pixmapStatus(QDeclarativePixmap::Loading), 
+    QQuickPixmapData(QQuickPixmap *pixmap, const QUrl &u, const QSize &r)
+    : refCount(1), inCache(false), pixmapStatus(QQuickPixmap::Loading), 
       url(u), requestSize(r), textureFactory(0), reply(0), prevUnreferenced(0), prevUnreferencedPtr(0),
       nextUnreferenced(0)
     {
         declarativePixmaps.insert(pixmap);
     }
 
-    QDeclarativePixmapData(QDeclarativePixmap *pixmap, const QUrl &u, const QImage &p, const QSize &s, const QSize &r)
-    : refCount(1), inCache(false), privatePixmap(false), pixmapStatus(QDeclarativePixmap::Ready),
-      url(u), image(p), implicitSize(s), requestSize(r), textureFactory(new QDeclarativeDefaultTextureFactory(p)), reply(0), prevUnreferenced(0),
+    QQuickPixmapData(QQuickPixmap *pixmap, const QUrl &u, const QImage &p, const QSize &s, const QSize &r)
+    : refCount(1), inCache(false), privatePixmap(false), pixmapStatus(QQuickPixmap::Ready),
+      url(u), image(p), implicitSize(s), requestSize(r), textureFactory(new QQuickDefaultTextureFactory(p)), reply(0), prevUnreferenced(0),
       prevUnreferencedPtr(0), nextUnreferenced(0)
     {
         declarativePixmaps.insert(pixmap);
     }
 
-    QDeclarativePixmapData(QDeclarativePixmap *pixmap, const QUrl &u, QDeclarativeTextureFactory *factory, const QImage &p, const QSize &s, const QSize &r)
-    : refCount(1), inCache(false), privatePixmap(false), pixmapStatus(QDeclarativePixmap::Ready),
+    QQuickPixmapData(QQuickPixmap *pixmap, const QUrl &u, QQuickTextureFactory *factory, const QImage &p, const QSize &s, const QSize &r)
+    : refCount(1), inCache(false), privatePixmap(false), pixmapStatus(QQuickPixmap::Ready),
       url(u), image(p), implicitSize(s), requestSize(r), textureFactory(factory), reply(0), prevUnreferenced(0),
       prevUnreferencedPtr(0), nextUnreferenced(0)
     {
         declarativePixmaps.insert(pixmap);
     }
 
-    QDeclarativePixmapData(QDeclarativePixmap *pixmap, const QImage &p)
-    : refCount(1), inCache(false), privatePixmap(true), pixmapStatus(QDeclarativePixmap::Ready),
-      image(p), implicitSize(p.size()), requestSize(p.size()), textureFactory(new QDeclarativeDefaultTextureFactory(p)), reply(0), prevUnreferenced(0),
+    QQuickPixmapData(QQuickPixmap *pixmap, const QImage &p)
+    : refCount(1), inCache(false), privatePixmap(true), pixmapStatus(QQuickPixmap::Ready),
+      image(p), implicitSize(p.size()), requestSize(p.size()), textureFactory(new QQuickDefaultTextureFactory(p)), reply(0), prevUnreferenced(0),
       prevUnreferencedPtr(0), nextUnreferenced(0)
     {
         declarativePixmaps.insert(pixmap);
     }
 
-    ~QDeclarativePixmapData()
+    ~QQuickPixmapData()
     {
         while (!declarativePixmaps.isEmpty()) {
-            QDeclarativePixmap *referencer = declarativePixmaps.first();
+            QQuickPixmap *referencer = declarativePixmaps.first();
             declarativePixmaps.remove(referencer);
             referencer->d = 0;
         }
@@ -253,61 +253,61 @@ public:
     bool inCache:1;
     bool privatePixmap:1;
     
-    QDeclarativePixmap::Status pixmapStatus;
+    QQuickPixmap::Status pixmapStatus;
     QUrl url;
     QString errorString;
     QImage image;
     QSize implicitSize;
     QSize requestSize;
 
-    QDeclarativeTextureFactory *textureFactory;
+    QQuickTextureFactory *textureFactory;
 
-    QIntrusiveList<QDeclarativePixmap, &QDeclarativePixmap::dataListNode> declarativePixmaps;
-    QDeclarativePixmapReply *reply;
+    QIntrusiveList<QQuickPixmap, &QQuickPixmap::dataListNode> declarativePixmaps;
+    QQuickPixmapReply *reply;
 
-    QDeclarativePixmapData *prevUnreferenced;
-    QDeclarativePixmapData**prevUnreferencedPtr;
-    QDeclarativePixmapData *nextUnreferenced;
+    QQuickPixmapData *prevUnreferenced;
+    QQuickPixmapData**prevUnreferencedPtr;
+    QQuickPixmapData *nextUnreferenced;
 };
 
-int QDeclarativePixmapReply::finishedIndex = -1;
-int QDeclarativePixmapReply::downloadProgressIndex = -1;
+int QQuickPixmapReply::finishedIndex = -1;
+int QQuickPixmapReply::downloadProgressIndex = -1;
 
 // XXX
-QHash<QDeclarativeEngine *,QDeclarativePixmapReader*> QDeclarativePixmapReader::readers;
-QMutex QDeclarativePixmapReader::readerMutex;
+QHash<QQmlEngine *,QQuickPixmapReader*> QQuickPixmapReader::readers;
+QMutex QQuickPixmapReader::readerMutex;
 
-int QDeclarativePixmapReader::replyDownloadProgress = -1;
-int QDeclarativePixmapReader::replyFinished = -1;
-int QDeclarativePixmapReader::downloadProgress = -1;
-int QDeclarativePixmapReader::threadNetworkRequestDone = -1;
+int QQuickPixmapReader::replyDownloadProgress = -1;
+int QQuickPixmapReader::replyFinished = -1;
+int QQuickPixmapReader::downloadProgress = -1;
+int QQuickPixmapReader::threadNetworkRequestDone = -1;
 
 
-void QDeclarativePixmapReply::postReply(ReadError error, const QString &errorString,
+void QQuickPixmapReply::postReply(ReadError error, const QString &errorString,
                                         const QSize &implicitSize, const QImage &image)
 {
     loading = false;
-    QCoreApplication::postEvent(this, new Event(error, errorString, implicitSize, new QDeclarativeDefaultTextureFactory(image), image));
+    QCoreApplication::postEvent(this, new Event(error, errorString, implicitSize, new QQuickDefaultTextureFactory(image), image));
 }
 
-void QDeclarativePixmapReply::postReply(ReadError error, const QString &errorString,
-                                        const QSize &implicitSize, QDeclarativeTextureFactory *factory,
+void QQuickPixmapReply::postReply(ReadError error, const QString &errorString,
+                                        const QSize &implicitSize, QQuickTextureFactory *factory,
                                         const QImage &image)
 {
     loading = false;
     QCoreApplication::postEvent(this, new Event(error, errorString, implicitSize, factory, image));
 }
 
-QDeclarativePixmapReply::Event::Event(ReadError e, const QString &s, const QSize &iSize, QDeclarativeTextureFactory *factory, const QImage &i)
+QQuickPixmapReply::Event::Event(ReadError e, const QString &s, const QSize &iSize, QQuickTextureFactory *factory, const QImage &i)
     : QEvent(QEvent::User), error(e), errorString(s), implicitSize(iSize), image(i), textureFactory(factory)
 {
 }
 
-QNetworkAccessManager *QDeclarativePixmapReader::networkAccessManager()
+QNetworkAccessManager *QQuickPixmapReader::networkAccessManager()
 {
     if (!accessManager) {
         Q_ASSERT(threadObject);
-        accessManager = QDeclarativeEnginePrivate::get(engine)->createNetworkAccessManager(threadObject);
+        accessManager = QQmlEnginePrivate::get(engine)->createNetworkAccessManager(threadObject);
     }
     return accessManager;
 }
@@ -350,13 +350,13 @@ static bool readImage(const QUrl& url, QIODevice *dev, QImage *image, QString *e
         return true;
     } else {
         if (errorString)
-            *errorString = QDeclarativePixmap::tr("Error decoding: %1: %2").arg(url.toString())
+            *errorString = QQuickPixmap::tr("Error decoding: %1: %2").arg(url.toString())
                                 .arg(imgio.errorString());
         return false;
     }
 }
 
-QDeclarativePixmapReader::QDeclarativePixmapReader(QDeclarativeEngine *eng)
+QQuickPixmapReader::QQuickPixmapReader(QQmlEngine *eng)
 : QThread(eng), engine(eng), threadObject(0), accessManager(0)
 {
     eventLoopQuitHack = new QObject;
@@ -365,7 +365,7 @@ QDeclarativePixmapReader::QDeclarativePixmapReader(QDeclarativeEngine *eng)
     start(QThread::LowestPriority);
 }
 
-QDeclarativePixmapReader::~QDeclarativePixmapReader()
+QQuickPixmapReader::~QQuickPixmapReader()
 {
     readerMutex.lock();
     readers.remove(engine);
@@ -373,12 +373,12 @@ QDeclarativePixmapReader::~QDeclarativePixmapReader()
 
     mutex.lock();
     // manually cancel all outstanding jobs.
-    foreach (QDeclarativePixmapReply *reply, jobs) {
+    foreach (QQuickPixmapReply *reply, jobs) {
         delete reply;
     }
     jobs.clear();
-    QList<QDeclarativePixmapReply*> activeJobs = replies.values();
-    foreach (QDeclarativePixmapReply *reply, activeJobs) {
+    QList<QQuickPixmapReply*> activeJobs = replies.values();
+    foreach (QQuickPixmapReply *reply, activeJobs) {
         if (reply->loading) {
             cancelled.append(reply);
             reply->data = 0;
@@ -391,9 +391,9 @@ QDeclarativePixmapReader::~QDeclarativePixmapReader()
     wait();
 }
 
-void QDeclarativePixmapReader::networkRequestDone(QNetworkReply *reply)
+void QQuickPixmapReader::networkRequestDone(QNetworkReply *reply)
 {
-    QDeclarativePixmapReply *job = replies.take(reply);
+    QQuickPixmapReply *job = replies.take(reply);
 
     if (job) {
         job->redirectCount++;
@@ -416,23 +416,23 @@ void QDeclarativePixmapReader::networkRequestDone(QNetworkReply *reply)
         }
 
         QImage image;
-        QDeclarativePixmapReply::ReadError error = QDeclarativePixmapReply::NoError;
+        QQuickPixmapReply::ReadError error = QQuickPixmapReply::NoError;
         QString errorString;
         QSize readSize;
         if (reply->error()) {
-            error = QDeclarativePixmapReply::Loading;
+            error = QQuickPixmapReply::Loading;
             errorString = reply->errorString();
         } else {
             QByteArray all = reply->readAll();
             QBuffer buff(&all);
             buff.open(QIODevice::ReadOnly);
             if (!readImage(reply->url(), &buff, &image, &errorString, &readSize, job->requestSize))
-                error = QDeclarativePixmapReply::Decoding;
+                error = QQuickPixmapReply::Decoding;
        }
-        // send completion event to the QDeclarativePixmapReply
+        // send completion event to the QQuickPixmapReply
         mutex.lock();
         if (!cancelled.contains(job)) {
-            QDeclarativeTextureFactory *factory = QSGContext::createTextureFactoryFromImage(image);
+            QQuickTextureFactory *factory = QSGContext::createTextureFactoryFromImage(image);
             if (factory)
                 job->postReply(error, errorString, readSize, factory, image);
             else
@@ -446,17 +446,17 @@ void QDeclarativePixmapReader::networkRequestDone(QNetworkReply *reply)
     threadObject->processJobs();
 }
 
-QDeclarativePixmapReaderThreadObject::QDeclarativePixmapReaderThreadObject(QDeclarativePixmapReader *i)
+QQuickPixmapReaderThreadObject::QQuickPixmapReaderThreadObject(QQuickPixmapReader *i)
 : reader(i)
 {
 }
 
-void QDeclarativePixmapReaderThreadObject::processJobs() 
+void QQuickPixmapReaderThreadObject::processJobs() 
 { 
     QCoreApplication::postEvent(this, new QEvent(QEvent::User)); 
 }
 
-bool QDeclarativePixmapReaderThreadObject::event(QEvent *e) 
+bool QQuickPixmapReaderThreadObject::event(QEvent *e) 
 {
     if (e->type() == QEvent::User) { 
         reader->processJobs(); 
@@ -466,13 +466,13 @@ bool QDeclarativePixmapReaderThreadObject::event(QEvent *e)
     }
 }
 
-void QDeclarativePixmapReaderThreadObject::networkRequestDone()
+void QQuickPixmapReaderThreadObject::networkRequestDone()
 {
     QNetworkReply *reply = static_cast<QNetworkReply *>(sender());
     reader->networkRequestDone(reply);
 }
 
-void QDeclarativePixmapReader::processJobs()
+void QQuickPixmapReader::processJobs()
 {
     QMutexLocker locker(&mutex);
 
@@ -483,7 +483,7 @@ void QDeclarativePixmapReader::processJobs()
         // Clean cancelled jobs
         if (cancelled.count()) {
             for (int i = 0; i < cancelled.count(); ++i) {
-                QDeclarativePixmapReply *job = cancelled.at(i);
+                QQuickPixmapReply *job = cancelled.at(i);
                 QNetworkReply *reply = replies.key(job, 0);
                 if (reply && reply->isRunning()) {
                     // cancel any jobs already started
@@ -497,7 +497,7 @@ void QDeclarativePixmapReader::processJobs()
         }
 
         if (!jobs.isEmpty() && replies.count() < IMAGEREQUEST_MAX_REQUEST_COUNT) {
-            QDeclarativePixmapReply *runningJob = jobs.takeLast();
+            QQuickPixmapReply *runningJob = jobs.takeLast();
             runningJob->loading = true;
 
             QUrl url = runningJob->url;
@@ -509,34 +509,34 @@ void QDeclarativePixmapReader::processJobs()
     }
 }
 
-void QDeclarativePixmapReader::processJob(QDeclarativePixmapReply *runningJob, const QUrl &url, 
+void QQuickPixmapReader::processJob(QQuickPixmapReply *runningJob, const QUrl &url, 
                                           const QSize &requestSize)
 {
     // fetch
     if (url.scheme() == QLatin1String("image")) {
         // Use QmlImageProvider
         QSize readSize;
-        QDeclarativeEnginePrivate *ep = QDeclarativeEnginePrivate::get(engine);
-        QDeclarativeImageProvider::ImageType imageType = ep->getImageProviderType(url);
-        if (imageType == QDeclarativeImageProvider::Invalid) {
-            QDeclarativePixmapReply::ReadError errorCode = QDeclarativePixmapReply::Loading;
-            QString errorStr = QDeclarativePixmap::tr("Invalid image provider: %1").arg(url.toString());
+        QQmlEnginePrivate *ep = QQmlEnginePrivate::get(engine);
+        QQmlImageProvider::ImageType imageType = ep->getImageProviderType(url);
+        if (imageType == QQmlImageProvider::Invalid) {
+            QQuickPixmapReply::ReadError errorCode = QQuickPixmapReply::Loading;
+            QString errorStr = QQuickPixmap::tr("Invalid image provider: %1").arg(url.toString());
             QImage image;
             mutex.lock();
             if (!cancelled.contains(runningJob))
                 runningJob->postReply(errorCode, errorStr, readSize, image);
             mutex.unlock();
-        } else if (imageType == QDeclarativeImageProvider::Image) {
+        } else if (imageType == QQmlImageProvider::Image) {
             QImage image = ep->getImageFromProvider(url, &readSize, requestSize);
-            QDeclarativePixmapReply::ReadError errorCode = QDeclarativePixmapReply::NoError;
+            QQuickPixmapReply::ReadError errorCode = QQuickPixmapReply::NoError;
             QString errorStr;
             if (image.isNull()) {
-                errorCode = QDeclarativePixmapReply::Loading;
-                errorStr = QDeclarativePixmap::tr("Failed to get image from provider: %1").arg(url.toString());
+                errorCode = QQuickPixmapReply::Loading;
+                errorStr = QQuickPixmap::tr("Failed to get image from provider: %1").arg(url.toString());
             }
             mutex.lock();
             if (!cancelled.contains(runningJob)) {
-                QDeclarativeTextureFactory *factory = QSGContext::createTextureFactoryFromImage(image);
+                QQuickTextureFactory *factory = QSGContext::createTextureFactoryFromImage(image);
                 if (factory)
                     runningJob->postReply(errorCode, errorStr, readSize, factory, image);
                 else
@@ -545,12 +545,12 @@ void QDeclarativePixmapReader::processJob(QDeclarativePixmapReply *runningJob, c
 
             mutex.unlock();
         } else {
-            QDeclarativeTextureFactory *t = ep->getTextureFromProvider(url, &readSize, requestSize);
-            QDeclarativePixmapReply::ReadError errorCode = QDeclarativePixmapReply::NoError;
+            QQuickTextureFactory *t = ep->getTextureFromProvider(url, &readSize, requestSize);
+            QQuickPixmapReply::ReadError errorCode = QQuickPixmapReply::NoError;
             QString errorStr;
             if (!t) {
-                errorCode = QDeclarativePixmapReply::Loading;
-                errorStr = QDeclarativePixmap::tr("Failed to get texture from provider: %1").arg(url.toString());
+                errorCode = QQuickPixmapReply::Loading;
+                errorStr = QQuickPixmap::tr("Failed to get texture from provider: %1").arg(url.toString());
             }
             mutex.lock();
             if (!cancelled.contains(runningJob))
@@ -560,24 +560,24 @@ void QDeclarativePixmapReader::processJob(QDeclarativePixmapReply *runningJob, c
         }
 
     } else {
-        QString lf = QDeclarativeEnginePrivate::urlToLocalFileOrQrc(url);
+        QString lf = QQmlEnginePrivate::urlToLocalFileOrQrc(url);
         if (!lf.isEmpty()) {
             // Image is local - load/decode immediately
             QImage image;
-            QDeclarativePixmapReply::ReadError errorCode = QDeclarativePixmapReply::NoError;
+            QQuickPixmapReply::ReadError errorCode = QQuickPixmapReply::NoError;
             QString errorStr;
             QFile f(lf);
             QSize readSize;
             if (f.open(QIODevice::ReadOnly)) {
                 if (!readImage(url, &f, &image, &errorStr, &readSize, requestSize))
-                    errorCode = QDeclarativePixmapReply::Loading;
+                    errorCode = QQuickPixmapReply::Loading;
             } else {
-                errorStr = QDeclarativePixmap::tr("Cannot open: %1").arg(url.toString());
-                errorCode = QDeclarativePixmapReply::Loading;
+                errorStr = QQuickPixmap::tr("Cannot open: %1").arg(url.toString());
+                errorCode = QQuickPixmapReply::Loading;
             }
             mutex.lock();
             if (!cancelled.contains(runningJob)) {
-                QDeclarativeTextureFactory *factory = QSGContext::createTextureFactoryFromImage(image);
+                QQuickTextureFactory *factory = QSGContext::createTextureFactoryFromImage(image);
                 if (factory)
                     runningJob->postReply(errorCode, errorStr, readSize, factory, image);
                 else
@@ -598,28 +598,28 @@ void QDeclarativePixmapReader::processJob(QDeclarativePixmapReply *runningJob, c
     }
 }
 
-QDeclarativePixmapReader *QDeclarativePixmapReader::instance(QDeclarativeEngine *engine)
+QQuickPixmapReader *QQuickPixmapReader::instance(QQmlEngine *engine)
 {
     // XXX NOTE: must be called within readerMutex locking.
-    QDeclarativePixmapReader *reader = readers.value(engine);
+    QQuickPixmapReader *reader = readers.value(engine);
     if (!reader) {
-        reader = new QDeclarativePixmapReader(engine);
+        reader = new QQuickPixmapReader(engine);
         readers.insert(engine, reader);
     }
 
     return reader;
 }
 
-QDeclarativePixmapReader *QDeclarativePixmapReader::existingInstance(QDeclarativeEngine *engine)
+QQuickPixmapReader *QQuickPixmapReader::existingInstance(QQmlEngine *engine)
 {
     // XXX NOTE: must be called within readerMutex locking.
     return readers.value(engine, 0);
 }
 
-QDeclarativePixmapReply *QDeclarativePixmapReader::getImage(QDeclarativePixmapData *data)
+QQuickPixmapReply *QQuickPixmapReader::getImage(QQuickPixmapData *data)
 {
     mutex.lock();
-    QDeclarativePixmapReply *reply = new QDeclarativePixmapReply(data);
+    QQuickPixmapReply *reply = new QQuickPixmapReply(data);
     reply->engineForReader = engine;
     jobs.append(reply);
     // XXX 
@@ -628,7 +628,7 @@ QDeclarativePixmapReply *QDeclarativePixmapReader::getImage(QDeclarativePixmapDa
     return reply;
 }
 
-void QDeclarativePixmapReader::cancel(QDeclarativePixmapReply *reply)
+void QQuickPixmapReader::cancel(QQuickPixmapReply *reply)
 {
     mutex.lock();
     if (reply->loading) {
@@ -643,12 +643,12 @@ void QDeclarativePixmapReader::cancel(QDeclarativePixmapReply *reply)
     mutex.unlock();
 }
 
-void QDeclarativePixmapReader::run()
+void QQuickPixmapReader::run()
 {
     if (replyDownloadProgress == -1) {
         const QMetaObject *nr = &QNetworkReply::staticMetaObject;
-        const QMetaObject *pr = &QDeclarativePixmapReply::staticMetaObject;
-        const QMetaObject *ir = &QDeclarativePixmapReaderThreadObject::staticMetaObject;
+        const QMetaObject *pr = &QQuickPixmapReply::staticMetaObject;
+        const QMetaObject *ir = &QQuickPixmapReaderThreadObject::staticMetaObject;
         replyDownloadProgress = nr->indexOfSignal("downloadProgress(qint64,qint64)");
         replyFinished = nr->indexOfSignal("finished()");
         downloadProgress = pr->indexOfSignal("downloadProgress(qint64,qint64)");
@@ -656,7 +656,7 @@ void QDeclarativePixmapReader::run()
     }
 
     mutex.lock();
-    threadObject = new QDeclarativePixmapReaderThreadObject(this);
+    threadObject = new QQuickPixmapReaderThreadObject(this);
     mutex.unlock();
 
     processJobs();
@@ -666,34 +666,34 @@ void QDeclarativePixmapReader::run()
     threadObject = 0;
 }
 
-class QDeclarativePixmapKey
+class QQuickPixmapKey
 {
 public:
     const QUrl *url;
     const QSize *size;
 };
 
-inline bool operator==(const QDeclarativePixmapKey &lhs, const QDeclarativePixmapKey &rhs)
+inline bool operator==(const QQuickPixmapKey &lhs, const QQuickPixmapKey &rhs)
 {
     return *lhs.size == *rhs.size && *lhs.url == *rhs.url;
 }
 
-inline uint qHash(const QDeclarativePixmapKey &key)
+inline uint qHash(const QQuickPixmapKey &key)
 {
     return qHash(*key.url) ^ key.size->width() ^ key.size->height();
 }
 
 class QSGContext;
 
-class QDeclarativePixmapStore : public QObject
+class QQuickPixmapStore : public QObject
 {
     Q_OBJECT
 public:
-    QDeclarativePixmapStore();
-    ~QDeclarativePixmapStore();
+    QQuickPixmapStore();
+    ~QQuickPixmapStore();
 
-    void unreferencePixmap(QDeclarativePixmapData *);
-    void referencePixmap(QDeclarativePixmapData *);
+    void unreferencePixmap(QQuickPixmapData *);
+    void referencePixmap(QQuickPixmapData *);
 
     void purgeCache();
 
@@ -701,32 +701,32 @@ protected:
     virtual void timerEvent(QTimerEvent *);
 
 public:
-    QHash<QDeclarativePixmapKey, QDeclarativePixmapData *> m_cache;
+    QHash<QQuickPixmapKey, QQuickPixmapData *> m_cache;
 
 private:
     void shrinkCache(int remove);
 
-    QDeclarativePixmapData *m_unreferencedPixmaps;
-    QDeclarativePixmapData *m_lastUnreferencedPixmap;
+    QQuickPixmapData *m_unreferencedPixmaps;
+    QQuickPixmapData *m_lastUnreferencedPixmap;
 
     int m_unreferencedCost;
     int m_timerId;
     bool m_destroying;
 };
-Q_GLOBAL_STATIC(QDeclarativePixmapStore, pixmapStore);
+Q_GLOBAL_STATIC(QQuickPixmapStore, pixmapStore);
 
 
-QDeclarativePixmapStore::QDeclarativePixmapStore()
+QQuickPixmapStore::QQuickPixmapStore()
     : m_unreferencedPixmaps(0), m_lastUnreferencedPixmap(0), m_unreferencedCost(0), m_timerId(-1), m_destroying(false)
 {
 }
 
-QDeclarativePixmapStore::~QDeclarativePixmapStore()
+QQuickPixmapStore::~QQuickPixmapStore()
 {
     m_destroying = true;
 
     int leakedPixmaps = 0;
-    QList<QDeclarativePixmapData*> cachedData = m_cache.values();
+    QList<QQuickPixmapData*> cachedData = m_cache.values();
 
     // Prevent unreferencePixmap() from assuming it needs to kick
     // off the cache expiry timer, as we're shrinking the cache
@@ -734,7 +734,7 @@ QDeclarativePixmapStore::~QDeclarativePixmapStore()
     m_timerId = -2;
 
     // unreference all (leaked) pixmaps
-    foreach (QDeclarativePixmapData* pixmap, cachedData) {
+    foreach (QQuickPixmapData* pixmap, cachedData) {
         int currRefCount = pixmap->refCount;
         if (currRefCount) {
             leakedPixmaps++;
@@ -754,7 +754,7 @@ QDeclarativePixmapStore::~QDeclarativePixmapStore()
         qDebug("Number of leaked pixmaps: %i", leakedPixmaps);
 }
 
-void QDeclarativePixmapStore::unreferencePixmap(QDeclarativePixmapData *data)
+void QQuickPixmapStore::unreferencePixmap(QQuickPixmapData *data)
 {
     Q_ASSERT(data->prevUnreferenced == 0);
     Q_ASSERT(data->prevUnreferencedPtr == 0);
@@ -780,7 +780,7 @@ void QDeclarativePixmapStore::unreferencePixmap(QDeclarativePixmapData *data)
         m_timerId = startTimer(CACHE_EXPIRE_TIME * 1000);
 }
 
-void QDeclarativePixmapStore::referencePixmap(QDeclarativePixmapData *data)
+void QQuickPixmapStore::referencePixmap(QQuickPixmapData *data)
 {
     Q_ASSERT(data->prevUnreferencedPtr);
 
@@ -799,10 +799,10 @@ void QDeclarativePixmapStore::referencePixmap(QDeclarativePixmapData *data)
     m_unreferencedCost -= data->cost();
 }
 
-void QDeclarativePixmapStore::shrinkCache(int remove)
+void QQuickPixmapStore::shrinkCache(int remove)
 {
     while ((remove > 0 || m_unreferencedCost > cache_limit) && m_lastUnreferencedPixmap) {
-        QDeclarativePixmapData *data = m_lastUnreferencedPixmap;
+        QQuickPixmapData *data = m_lastUnreferencedPixmap;
         Q_ASSERT(data->nextUnreferenced == 0);
 
         *data->prevUnreferencedPtr = 0;
@@ -817,7 +817,7 @@ void QDeclarativePixmapStore::shrinkCache(int remove)
     }
 }
 
-void QDeclarativePixmapStore::timerEvent(QTimerEvent *)
+void QQuickPixmapStore::timerEvent(QTimerEvent *)
 {
     int removalCost = m_unreferencedCost / CACHE_REMOVAL_FRACTION;
 
@@ -829,38 +829,38 @@ void QDeclarativePixmapStore::timerEvent(QTimerEvent *)
     }
 }
 
-void QDeclarativePixmapStore::purgeCache()
+void QQuickPixmapStore::purgeCache()
 {
     shrinkCache(m_unreferencedCost);
 }
 
-void QDeclarativePixmap::purgeCache()
+void QQuickPixmap::purgeCache()
 {
     pixmapStore()->purgeCache();
 }
 
-QDeclarativePixmapReply::QDeclarativePixmapReply(QDeclarativePixmapData *d)
+QQuickPixmapReply::QQuickPixmapReply(QQuickPixmapData *d)
 : data(d), engineForReader(0), requestSize(d->requestSize), url(d->url), loading(false), redirectCount(0)
 {
     if (finishedIndex == -1) {
-        finishedIndex = QDeclarativePixmapReply::staticMetaObject.indexOfSignal("finished()");
-        downloadProgressIndex = QDeclarativePixmapReply::staticMetaObject.indexOfSignal("downloadProgress(qint64,qint64)");
+        finishedIndex = QQuickPixmapReply::staticMetaObject.indexOfSignal("finished()");
+        downloadProgressIndex = QQuickPixmapReply::staticMetaObject.indexOfSignal("downloadProgress(qint64,qint64)");
     }
 }
 
-QDeclarativePixmapReply::~QDeclarativePixmapReply()
+QQuickPixmapReply::~QQuickPixmapReply()
 {
 }
 
-bool QDeclarativePixmapReply::event(QEvent *event)
+bool QQuickPixmapReply::event(QEvent *event)
 {
     if (event->type() == QEvent::User) {
 
         if (data) {
             Event *de = static_cast<Event *>(event);
-            data->pixmapStatus = (de->error == NoError) ? QDeclarativePixmap::Ready : QDeclarativePixmap::Error;
+            data->pixmapStatus = (de->error == NoError) ? QQuickPixmap::Ready : QQuickPixmap::Error;
 
-            if (data->pixmapStatus == QDeclarativePixmap::Ready) {
+            if (data->pixmapStatus == QQuickPixmap::Ready) {
                 if (de->textureFactory) {
                     data->textureFactory = de->textureFactory;
                 }
@@ -882,37 +882,37 @@ bool QDeclarativePixmapReply::event(QEvent *event)
     }
 }
 
-int QDeclarativePixmapData::cost() const
+int QQuickPixmapData::cost() const
 {
     if (textureFactory)
         return textureFactory->textureByteCount();
     return image.byteCount();
 }
 
-void QDeclarativePixmapData::addref()
+void QQuickPixmapData::addref()
 {
     ++refCount;
     if (prevUnreferencedPtr) 
         pixmapStore()->referencePixmap(this);
 }
 
-void QDeclarativePixmapData::release()
+void QQuickPixmapData::release()
 {
     Q_ASSERT(refCount > 0);
     --refCount;
     if (refCount == 0) {
         if (reply) {
-            QDeclarativePixmapReply *cancelReply = reply;
+            QQuickPixmapReply *cancelReply = reply;
             reply->data = 0;
             reply = 0;
-            QDeclarativePixmapReader::readerMutex.lock();
-            QDeclarativePixmapReader *reader = QDeclarativePixmapReader::existingInstance(cancelReply->engineForReader);
+            QQuickPixmapReader::readerMutex.lock();
+            QQuickPixmapReader *reader = QQuickPixmapReader::existingInstance(cancelReply->engineForReader);
             if (reader)
                 reader->cancel(cancelReply);
-            QDeclarativePixmapReader::readerMutex.unlock();
+            QQuickPixmapReader::readerMutex.unlock();
         }
 
-        if (pixmapStatus == QDeclarativePixmap::Ready) {
+        if (pixmapStatus == QQuickPixmap::Ready) {
             pixmapStore()->unreferencePixmap(this);
         } else {
             removeFromCache();
@@ -921,68 +921,68 @@ void QDeclarativePixmapData::release()
     }
 }
 
-void QDeclarativePixmapData::addToCache()
+void QQuickPixmapData::addToCache()
 {
     if (!inCache) {
-        QDeclarativePixmapKey key = { &url, &requestSize };
+        QQuickPixmapKey key = { &url, &requestSize };
         pixmapStore()->m_cache.insert(key, this);
         inCache = true;
     }
 }
 
-void QDeclarativePixmapData::removeFromCache()
+void QQuickPixmapData::removeFromCache()
 {
     if (inCache) {
-        QDeclarativePixmapKey key = { &url, &requestSize };
+        QQuickPixmapKey key = { &url, &requestSize };
         pixmapStore()->m_cache.remove(key);
         inCache = false;
     }
 }
 
-static QDeclarativePixmapData* createPixmapDataSync(QDeclarativePixmap *declarativePixmap, QDeclarativeEngine *engine, const QUrl &url, const QSize &requestSize, bool *ok)
+static QQuickPixmapData* createPixmapDataSync(QQuickPixmap *declarativePixmap, QQmlEngine *engine, const QUrl &url, const QSize &requestSize, bool *ok)
 {
     if (url.scheme() == QLatin1String("image")) {
         QSize readSize;
-        QDeclarativeEnginePrivate *ep = QDeclarativeEnginePrivate::get(engine);
-        QDeclarativeImageProvider::ImageType imageType = ep->getImageProviderType(url);
+        QQmlEnginePrivate *ep = QQmlEnginePrivate::get(engine);
+        QQmlImageProvider::ImageType imageType = ep->getImageProviderType(url);
 
         switch (imageType) {
-            case QDeclarativeImageProvider::Invalid:
-                return new QDeclarativePixmapData(declarativePixmap, url, requestSize,
-                    QDeclarativePixmap::tr("Invalid image provider: %1").arg(url.toString()));
-            case QDeclarativeImageProvider::Texture:
+            case QQmlImageProvider::Invalid:
+                return new QQuickPixmapData(declarativePixmap, url, requestSize,
+                    QQuickPixmap::tr("Invalid image provider: %1").arg(url.toString()));
+            case QQmlImageProvider::Texture:
             {
-                QDeclarativeTextureFactory *texture = ep->getTextureFromProvider(url, &readSize, requestSize);
+                QQuickTextureFactory *texture = ep->getTextureFromProvider(url, &readSize, requestSize);
                 if (texture) {
                     *ok = true;
-                    return new QDeclarativePixmapData(declarativePixmap, url, texture, QImage(), readSize, requestSize);
+                    return new QQuickPixmapData(declarativePixmap, url, texture, QImage(), readSize, requestSize);
                 }
             }
 
-            case QDeclarativeImageProvider::Image:
+            case QQmlImageProvider::Image:
             {
                 QImage image = ep->getImageFromProvider(url, &readSize, requestSize);
                 if (!image.isNull()) {
                     *ok = true;
-                    return new QDeclarativePixmapData(declarativePixmap, url, image, readSize, requestSize);
+                    return new QQuickPixmapData(declarativePixmap, url, image, readSize, requestSize);
                 }
             }
-            case QDeclarativeImageProvider::Pixmap:
+            case QQmlImageProvider::Pixmap:
             {
                 QPixmap pixmap = ep->getPixmapFromProvider(url, &readSize, requestSize);
                 if (!pixmap.isNull()) {
                     *ok = true;
-                    return new QDeclarativePixmapData(declarativePixmap, url, pixmap.toImage(), readSize, requestSize);
+                    return new QQuickPixmapData(declarativePixmap, url, pixmap.toImage(), readSize, requestSize);
                 }
             }
         }
 
         // provider has bad image type, or provider returned null image
-        return new QDeclarativePixmapData(declarativePixmap, url, requestSize,
-            QDeclarativePixmap::tr("Failed to get image from provider: %1").arg(url.toString()));
+        return new QQuickPixmapData(declarativePixmap, url, requestSize,
+            QQuickPixmap::tr("Failed to get image from provider: %1").arg(url.toString()));
     }
 
-    QString localFile = QDeclarativeEnginePrivate::urlToLocalFileOrQrc(url);
+    QString localFile = QQmlEnginePrivate::urlToLocalFileOrQrc(url);
     if (localFile.isEmpty()) 
         return 0;
 
@@ -995,42 +995,42 @@ static QDeclarativePixmapData* createPixmapDataSync(QDeclarativePixmap *declarat
 
         if (readImage(url, &f, &image, &errorString, &readSize, requestSize)) {
             *ok = true;
-            return new QDeclarativePixmapData(declarativePixmap, url, image, readSize, requestSize);
+            return new QQuickPixmapData(declarativePixmap, url, image, readSize, requestSize);
         }
-        errorString = QDeclarativePixmap::tr("Invalid image data: %1").arg(url.toString());
+        errorString = QQuickPixmap::tr("Invalid image data: %1").arg(url.toString());
 
     } else {
-        errorString = QDeclarativePixmap::tr("Cannot open: %1").arg(url.toString());
+        errorString = QQuickPixmap::tr("Cannot open: %1").arg(url.toString());
     }
-    return new QDeclarativePixmapData(declarativePixmap, url, requestSize, errorString);
+    return new QQuickPixmapData(declarativePixmap, url, requestSize, errorString);
 }
 
 
-struct QDeclarativePixmapNull {
+struct QQuickPixmapNull {
     QUrl url;
     QImage image;
     QSize size;
 };
-Q_GLOBAL_STATIC(QDeclarativePixmapNull, nullPixmap);
+Q_GLOBAL_STATIC(QQuickPixmapNull, nullPixmap);
 
-QDeclarativePixmap::QDeclarativePixmap()
+QQuickPixmap::QQuickPixmap()
 : d(0)
 {
 }
 
-QDeclarativePixmap::QDeclarativePixmap(QDeclarativeEngine *engine, const QUrl &url)
+QQuickPixmap::QQuickPixmap(QQmlEngine *engine, const QUrl &url)
 : d(0)
 {
     load(engine, url);
 }
 
-QDeclarativePixmap::QDeclarativePixmap(QDeclarativeEngine *engine, const QUrl &url, const QSize &size)
+QQuickPixmap::QQuickPixmap(QQmlEngine *engine, const QUrl &url, const QSize &size)
 : d(0)
 {
     load(engine, url, size);
 }
 
-QDeclarativePixmap::~QDeclarativePixmap()
+QQuickPixmap::~QQuickPixmap()
 {
     if (d) {
         d->declarativePixmaps.remove(this);
@@ -1039,27 +1039,27 @@ QDeclarativePixmap::~QDeclarativePixmap()
     }
 }
 
-bool QDeclarativePixmap::isNull() const
+bool QQuickPixmap::isNull() const
 {
     return d == 0;
 }
 
-bool QDeclarativePixmap::isReady() const
+bool QQuickPixmap::isReady() const
 {
     return status() == Ready;
 }
 
-bool QDeclarativePixmap::isError() const
+bool QQuickPixmap::isError() const
 {
     return status() == Error;
 }
 
-bool QDeclarativePixmap::isLoading() const
+bool QQuickPixmap::isLoading() const
 {
     return status() == Loading;
 }
 
-QString QDeclarativePixmap::error() const
+QString QQuickPixmap::error() const
 {
     if (d)
         return d->errorString;
@@ -1067,7 +1067,7 @@ QString QDeclarativePixmap::error() const
         return QString();
 }
 
-QDeclarativePixmap::Status QDeclarativePixmap::status() const
+QQuickPixmap::Status QQuickPixmap::status() const
 {
     if (d)
         return d->pixmapStatus;
@@ -1075,7 +1075,7 @@ QDeclarativePixmap::Status QDeclarativePixmap::status() const
         return Null;
 }
 
-const QUrl &QDeclarativePixmap::url() const
+const QUrl &QQuickPixmap::url() const
 {
     if (d)
         return d->url;
@@ -1083,7 +1083,7 @@ const QUrl &QDeclarativePixmap::url() const
         return nullPixmap()->url;
 }
 
-const QSize &QDeclarativePixmap::implicitSize() const
+const QSize &QQuickPixmap::implicitSize() const
 {
     if (d) 
         return d->implicitSize;
@@ -1091,7 +1091,7 @@ const QSize &QDeclarativePixmap::implicitSize() const
         return nullPixmap()->size;
 }
 
-const QSize &QDeclarativePixmap::requestSize() const
+const QSize &QQuickPixmap::requestSize() const
 {
     if (d)
         return d->requestSize;
@@ -1099,7 +1099,7 @@ const QSize &QDeclarativePixmap::requestSize() const
         return nullPixmap()->size;
 }
 
-QDeclarativeTextureFactory *QDeclarativePixmap::textureFactory() const
+QQuickTextureFactory *QQuickPixmap::textureFactory() const
 {
     if (d)
         return d->textureFactory;
@@ -1107,7 +1107,7 @@ QDeclarativeTextureFactory *QDeclarativePixmap::textureFactory() const
     return 0;
 }
 
-const QImage &QDeclarativePixmap::image() const
+const QImage &QQuickPixmap::image() const
 {
     if (d) 
         return d->image;
@@ -1115,15 +1115,15 @@ const QImage &QDeclarativePixmap::image() const
         return nullPixmap()->image;
 }
 
-void QDeclarativePixmap::setImage(const QImage &p)
+void QQuickPixmap::setImage(const QImage &p)
 {
     clear();
 
     if (!p.isNull())
-        d = new QDeclarativePixmapData(this, p);
+        d = new QQuickPixmapData(this, p);
 }
 
-int QDeclarativePixmap::width() const
+int QQuickPixmap::width() const
 {
     if (d) 
         return d->textureFactory ? d->textureFactory->textureSize().width() : d->image.width();
@@ -1131,7 +1131,7 @@ int QDeclarativePixmap::width() const
         return 0;
 }
 
-int QDeclarativePixmap::height() const
+int QQuickPixmap::height() const
 {
     if (d) 
         return d->textureFactory ? d->textureFactory->textureSize().height() : d->image.height();
@@ -1139,7 +1139,7 @@ int QDeclarativePixmap::height() const
         return 0;
 }
 
-QRect QDeclarativePixmap::rect() const
+QRect QQuickPixmap::rect() const
 {
     if (d)
         return d->textureFactory ? QRect(QPoint(), d->textureFactory->textureSize()) : d->image.rect();
@@ -1147,22 +1147,22 @@ QRect QDeclarativePixmap::rect() const
         return QRect();
 }
 
-void QDeclarativePixmap::load(QDeclarativeEngine *engine, const QUrl &url)
+void QQuickPixmap::load(QQmlEngine *engine, const QUrl &url)
 {
-    load(engine, url, QSize(), QDeclarativePixmap::Cache);
+    load(engine, url, QSize(), QQuickPixmap::Cache);
 }
 
-void QDeclarativePixmap::load(QDeclarativeEngine *engine, const QUrl &url, QDeclarativePixmap::Options options)
+void QQuickPixmap::load(QQmlEngine *engine, const QUrl &url, QQuickPixmap::Options options)
 {
     load(engine, url, QSize(), options);
 }
 
-void QDeclarativePixmap::load(QDeclarativeEngine *engine, const QUrl &url, const QSize &size)
+void QQuickPixmap::load(QQmlEngine *engine, const QUrl &url, const QSize &size)
 {
-    load(engine, url, size, QDeclarativePixmap::Cache);
+    load(engine, url, size, QQuickPixmap::Cache);
 }
 
-void QDeclarativePixmap::load(QDeclarativeEngine *engine, const QUrl &url, const QSize &requestSize, QDeclarativePixmap::Options options)
+void QQuickPixmap::load(QQmlEngine *engine, const QUrl &url, const QSize &requestSize, QQuickPixmap::Options options)
 {
     if (d) {
         d->declarativePixmaps.remove(this);
@@ -1170,25 +1170,25 @@ void QDeclarativePixmap::load(QDeclarativeEngine *engine, const QUrl &url, const
         d = 0;
     }
 
-    QDeclarativePixmapKey key = { &url, &requestSize };
-    QDeclarativePixmapStore *store = pixmapStore();
+    QQuickPixmapKey key = { &url, &requestSize };
+    QQuickPixmapStore *store = pixmapStore();
 
-    QHash<QDeclarativePixmapKey, QDeclarativePixmapData *>::Iterator iter = store->m_cache.find(key);
+    QHash<QQuickPixmapKey, QQuickPixmapData *>::Iterator iter = store->m_cache.find(key);
 
     if (iter == store->m_cache.end()) {
-        if (options & QDeclarativePixmap::Asynchronous) {
+        if (options & QQuickPixmap::Asynchronous) {
             // pixmaps can only be loaded synchronously
             if (url.scheme() == QLatin1String("image") 
-                    && QDeclarativeEnginePrivate::get(engine)->getImageProviderType(url) == QDeclarativeImageProvider::Pixmap) {
-                options &= ~QDeclarativePixmap::Asynchronous;
+                    && QQmlEnginePrivate::get(engine)->getImageProviderType(url) == QQmlImageProvider::Pixmap) {
+                options &= ~QQuickPixmap::Asynchronous;
             }
         }
 
-        if (!(options & QDeclarativePixmap::Asynchronous)) {
+        if (!(options & QQuickPixmap::Asynchronous)) {
             bool ok = false;
             d = createPixmapDataSync(this, engine, url, requestSize, &ok);
             if (ok) {
-                if (options & QDeclarativePixmap::Cache)
+                if (options & QQuickPixmap::Cache)
                     d->addToCache();
                 return;
             }
@@ -1199,13 +1199,13 @@ void QDeclarativePixmap::load(QDeclarativeEngine *engine, const QUrl &url, const
         if (!engine)
             return;
 
-        d = new QDeclarativePixmapData(this, url, requestSize);
-        if (options & QDeclarativePixmap::Cache)
+        d = new QQuickPixmapData(this, url, requestSize);
+        if (options & QQuickPixmap::Cache)
             d->addToCache();
 
-        QDeclarativePixmapReader::readerMutex.lock();
-        d->reply = QDeclarativePixmapReader::instance(engine)->getImage(d);
-        QDeclarativePixmapReader::readerMutex.unlock();
+        QQuickPixmapReader::readerMutex.lock();
+        d->reply = QQuickPixmapReader::instance(engine)->getImage(d);
+        QQuickPixmapReader::readerMutex.unlock();
     } else {
         d = *iter;
         d->addref();
@@ -1213,7 +1213,7 @@ void QDeclarativePixmap::load(QDeclarativeEngine *engine, const QUrl &url, const
     }
 }
 
-void QDeclarativePixmap::clear()
+void QQuickPixmap::clear()
 {
     if (d) {
         d->declarativePixmaps.remove(this);
@@ -1222,7 +1222,7 @@ void QDeclarativePixmap::clear()
     }
 }
 
-void QDeclarativePixmap::clear(QObject *obj)
+void QQuickPixmap::clear(QObject *obj)
 {
     if (d) {
         if (d->reply) 
@@ -1233,46 +1233,46 @@ void QDeclarativePixmap::clear(QObject *obj)
     }
 }
 
-bool QDeclarativePixmap::connectFinished(QObject *object, const char *method)
+bool QQuickPixmap::connectFinished(QObject *object, const char *method)
 {
     if (!d || !d->reply) {
-        qWarning("QDeclarativePixmap: connectFinished() called when not loading.");
+        qWarning("QQuickPixmap: connectFinished() called when not loading.");
         return false;
     }
 
     return QObject::connect(d->reply, SIGNAL(finished()), object, method);
 }
 
-bool QDeclarativePixmap::connectFinished(QObject *object, int method)
+bool QQuickPixmap::connectFinished(QObject *object, int method)
 {
     if (!d || !d->reply) {
-        qWarning("QDeclarativePixmap: connectFinished() called when not loading.");
+        qWarning("QQuickPixmap: connectFinished() called when not loading.");
         return false;
     }
 
-    return QMetaObject::connect(d->reply, QDeclarativePixmapReply::finishedIndex, object, method);
+    return QMetaObject::connect(d->reply, QQuickPixmapReply::finishedIndex, object, method);
 }
 
-bool QDeclarativePixmap::connectDownloadProgress(QObject *object, const char *method)
+bool QQuickPixmap::connectDownloadProgress(QObject *object, const char *method)
 {
     if (!d || !d->reply) {
-        qWarning("QDeclarativePixmap: connectDownloadProgress() called when not loading.");
+        qWarning("QQuickPixmap: connectDownloadProgress() called when not loading.");
         return false;
     }
 
     return QObject::connect(d->reply, SIGNAL(downloadProgress(qint64,qint64)), object, method);
 }
 
-bool QDeclarativePixmap::connectDownloadProgress(QObject *object, int method)
+bool QQuickPixmap::connectDownloadProgress(QObject *object, int method)
 {
     if (!d || !d->reply) {
-        qWarning("QDeclarativePixmap: connectDownloadProgress() called when not loading.");
+        qWarning("QQuickPixmap: connectDownloadProgress() called when not loading.");
         return false;
     }
 
-    return QMetaObject::connect(d->reply, QDeclarativePixmapReply::downloadProgressIndex, object, method);
+    return QMetaObject::connect(d->reply, QQuickPixmapReply::downloadProgressIndex, object, method);
 }
 
 QT_END_NAMESPACE
 
-#include <qdeclarativepixmapcache.moc>
+#include <qquickpixmapcache.moc>
diff --git a/src/quick/util/qdeclarativepixmapcache_p.h b/src/quick/util/qquickpixmapcache_p.h
index 69cd84c465..0b4c2fb473 100644
--- a/src/quick/util/qdeclarativepixmapcache_p.h
+++ b/src/quick/util/qquickpixmapcache_p.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#ifndef QDECLARATIVEPIXMAPCACHE_H
-#define QDECLARATIVEPIXMAPCACHE_H
+#ifndef QQUICKPIXMAPCACHE_H
+#define QQUICKPIXMAPCACHE_H
 
 #include <QtCore/qcoreapplication.h>
 #include <QtCore/qstring.h>
@@ -49,21 +49,21 @@
 #include <QtQuick/qtquickglobal.h>
 
 #include <private/qintrusivelist_p.h>
-#include <qdeclarativeimageprovider.h>
+#include <qqmlimageprovider.h>
 
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-class QDeclarativeEngine;
-class QDeclarativePixmapData;
-class QDeclarativeTextureFactory;
+class QQmlEngine;
+class QQuickPixmapData;
+class QQuickTextureFactory;
 
-class QDeclarativeDefaultTextureFactory : public QDeclarativeTextureFactory
+class QQuickDefaultTextureFactory : public QQuickTextureFactory
 {
     Q_OBJECT
 public:
-    QDeclarativeDefaultTextureFactory(const QImage &i)
+    QQuickDefaultTextureFactory(const QImage &i)
         : im(i)
     {
     }
@@ -77,14 +77,14 @@ private:
     QImage im;
 };
 
-class Q_QUICK_EXPORT QDeclarativePixmap
+class Q_QUICK_EXPORT QQuickPixmap
 {
-    Q_DECLARE_TR_FUNCTIONS(QDeclarativePixmap)
+    Q_DECLARE_TR_FUNCTIONS(QQuickPixmap)
 public:
-    QDeclarativePixmap();
-    QDeclarativePixmap(QDeclarativeEngine *, const QUrl &);
-    QDeclarativePixmap(QDeclarativeEngine *, const QUrl &, const QSize &);
-    ~QDeclarativePixmap();
+    QQuickPixmap();
+    QQuickPixmap(QQmlEngine *, const QUrl &);
+    QQuickPixmap(QQmlEngine *, const QUrl &, const QSize &);
+    ~QQuickPixmap();
 
     enum Status { Null, Ready, Error, Loading };
 
@@ -107,16 +107,16 @@ public:
     const QImage &image() const;
     void setImage(const QImage &);
 
-    QDeclarativeTextureFactory *textureFactory() const;
+    QQuickTextureFactory *textureFactory() const;
 
     QRect rect() const;
     int width() const;
     int height() const;
 
-    void load(QDeclarativeEngine *, const QUrl &);
-    void load(QDeclarativeEngine *, const QUrl &, QDeclarativePixmap::Options options);
-    void load(QDeclarativeEngine *, const QUrl &, const QSize &);
-    void load(QDeclarativeEngine *, const QUrl &, const QSize &, QDeclarativePixmap::Options options);
+    void load(QQmlEngine *, const QUrl &);
+    void load(QQmlEngine *, const QUrl &, QQuickPixmap::Options options);
+    void load(QQmlEngine *, const QUrl &, const QSize &);
+    void load(QQmlEngine *, const QUrl &, const QSize &, QQuickPixmap::Options options);
 
     void clear();
     void clear(QObject *);
@@ -129,16 +129,16 @@ public:
     static void purgeCache();
 
 private:
-    Q_DISABLE_COPY(QDeclarativePixmap)
-    QDeclarativePixmapData *d;
+    Q_DISABLE_COPY(QQuickPixmap)
+    QQuickPixmapData *d;
     QIntrusiveListNode dataListNode;
-    friend class QDeclarativePixmapData;
+    friend class QQuickPixmapData;
 };
 
-Q_DECLARE_OPERATORS_FOR_FLAGS(QDeclarativePixmap::Options)
+Q_DECLARE_OPERATORS_FOR_FLAGS(QQuickPixmap::Options)
 
 QT_END_NAMESPACE
 
 QT_END_HEADER
 
-#endif // QDECLARATIVEPIXMAPCACHE_H
+#endif // QQUICKPIXMAPCACHE_H
diff --git a/src/quick/util/qdeclarativepropertychanges.cpp b/src/quick/util/qquickpropertychanges.cpp
index 350c84e737..83ddb2530e 100644
--- a/src/quick/util/qdeclarativepropertychanges.cpp
+++ b/src/quick/util/qquickpropertychanges.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
@@ -39,22 +39,22 @@
 **
 ****************************************************************************/
 
-#include "qdeclarativepropertychanges_p.h"
+#include "qquickpropertychanges_p.h"
 
-#include <private/qdeclarativeopenmetaobject_p.h>
-#include <private/qdeclarativerewrite_p.h>
-#include <private/qdeclarativeengine_p.h>
+#include <private/qqmlopenmetaobject_p.h>
+#include <private/qqmlrewrite_p.h>
+#include <private/qqmlengine_p.h>
 
-#include <qdeclarativeinfo.h>
-#include <private/qdeclarativecustomparser_p.h>
-#include <private/qdeclarativescript_p.h>
-#include <qdeclarativeexpression.h>
-#include <private/qdeclarativebinding_p.h>
-#include <qdeclarativecontext.h>
-#include <private/qdeclarativeguard_p.h>
-#include <private/qdeclarativeproperty_p.h>
-#include <private/qdeclarativecontext_p.h>
-#include <private/qdeclarativestate_p_p.h>
+#include <qqmlinfo.h>
+#include <private/qqmlcustomparser_p.h>
+#include <private/qqmlscript_p.h>
+#include <qqmlexpression.h>
+#include <private/qqmlbinding_p.h>
+#include <qqmlcontext.h>
+#include <private/qqmlguard_p.h>
+#include <private/qqmlproperty_p.h>
+#include <private/qqmlcontext_p.h>
+#include <private/qquickstate_p_p.h>
 
 #include <QtCore/qdebug.h>
 
@@ -63,7 +63,7 @@
 QT_BEGIN_NAMESPACE
 
 /*!
-    \qmlclass PropertyChanges QDeclarativePropertyChanges
+    \qmlclass PropertyChanges QQuickPropertyChanges
     \inqmlmodule QtQuick 2
     \ingroup qml-state-elements
     \brief The PropertyChanges element describes new property bindings or values for a state.
@@ -76,9 +76,9 @@ QT_BEGIN_NAMESPACE
     properties are to be modified, and define the new property values or
     bindings. For example:
     
-    \snippet doc/src/snippets/declarative/propertychanges.qml import 
+    \snippet doc/src/snippets/qml/propertychanges.qml import 
     \codeline
-    \snippet doc/src/snippets/declarative/propertychanges.qml 0
+    \snippet doc/src/snippets/qml/propertychanges.qml 0
 
     When the mouse is pressed, the \l Rectangle changes to the \e resized
     state. In this state, the PropertyChanges object sets the rectangle's 
@@ -112,7 +112,7 @@ QT_BEGIN_NAMESPACE
     state, its \c width property is reset, giving the text its natural width
     and displaying the whole string on a single line.
 
-    \snippet doc/src/snippets/declarative/propertychanges.qml reset
+    \snippet doc/src/snippets/qml/propertychanges.qml reset
 
 
     \section2 Immediate property changes in transitions
@@ -127,7 +127,7 @@ QT_BEGIN_NAMESPACE
 
     See the PropertyAction documentation for more details.
 
-    \sa {declarative/animation/states}{states example}, {qmlstate}{States}, QtDeclarative
+    \sa {declarative/animation/states}{states example}, {qmlstate}{States}, QtQml
 */
 
 /*!
@@ -135,32 +135,32 @@ QT_BEGIN_NAMESPACE
     This property holds the object which contains the properties to be changed.
 */
 
-class QDeclarativeReplaceSignalHandler : public QDeclarativeActionEvent
+class QQuickReplaceSignalHandler : public QQuickActionEvent
 {
 public:
-    QDeclarativeReplaceSignalHandler() : expression(0), reverseExpression(0),
+    QQuickReplaceSignalHandler() : expression(0), reverseExpression(0),
                                 rewindExpression(0), ownedExpression(0) {}
-    ~QDeclarativeReplaceSignalHandler() {
+    ~QQuickReplaceSignalHandler() {
         delete ownedExpression;
     }
 
     virtual EventType type() const { return SignalHandler; }
 
-    QDeclarativeProperty property;
-    QDeclarativeExpression *expression;
-    QDeclarativeExpression *reverseExpression;
-    QDeclarativeExpression *rewindExpression;
-    QDeclarativeGuard<QDeclarativeExpression> ownedExpression;
+    QQmlProperty property;
+    QQmlExpression *expression;
+    QQmlExpression *reverseExpression;
+    QQmlExpression *rewindExpression;
+    QQmlGuard<QQmlExpression> ownedExpression;
 
     virtual void execute(Reason) {
-        ownedExpression = QDeclarativePropertyPrivate::setSignalExpression(property, expression);
+        ownedExpression = QQmlPropertyPrivate::setSignalExpression(property, expression);
         if (ownedExpression == expression)
             ownedExpression = 0;
     }
 
     virtual bool isReversable() { return true; }
     virtual void reverse(Reason) {
-        ownedExpression = QDeclarativePropertyPrivate::setSignalExpression(property, reverseExpression);
+        ownedExpression = QQmlPropertyPrivate::setSignalExpression(property, reverseExpression);
         if (ownedExpression == reverseExpression)
             ownedExpression = 0;
     }
@@ -171,9 +171,9 @@ public:
     }
 
     virtual bool needsCopy() { return true; }
-    virtual void copyOriginals(QDeclarativeActionEvent *other)
+    virtual void copyOriginals(QQuickActionEvent *other)
     {
-        QDeclarativeReplaceSignalHandler *rsh = static_cast<QDeclarativeReplaceSignalHandler*>(other);
+        QQuickReplaceSignalHandler *rsh = static_cast<QQuickReplaceSignalHandler*>(other);
         saveCurrentValues();
         if (rsh == this)
             return;
@@ -185,34 +185,34 @@ public:
     }
 
     virtual void rewind() {
-        ownedExpression = QDeclarativePropertyPrivate::setSignalExpression(property, rewindExpression);
+        ownedExpression = QQmlPropertyPrivate::setSignalExpression(property, rewindExpression);
         if (ownedExpression == rewindExpression)
             ownedExpression = 0;
     }
     virtual void saveCurrentValues() { 
-        rewindExpression = QDeclarativePropertyPrivate::signalExpression(property);
+        rewindExpression = QQmlPropertyPrivate::signalExpression(property);
     }
 
-    virtual bool override(QDeclarativeActionEvent*other) {
+    virtual bool override(QQuickActionEvent*other) {
         if (other == this)
             return true;
         if (other->type() != type())
             return false;
-        if (static_cast<QDeclarativeReplaceSignalHandler*>(other)->property == property)
+        if (static_cast<QQuickReplaceSignalHandler*>(other)->property == property)
             return true;
         return false;
     }
 };
 
 
-class QDeclarativePropertyChangesPrivate : public QDeclarativeStateOperationPrivate
+class QQuickPropertyChangesPrivate : public QQuickStateOperationPrivate
 {
-    Q_DECLARE_PUBLIC(QDeclarativePropertyChanges)
+    Q_DECLARE_PUBLIC(QQuickPropertyChanges)
 public:
-    QDeclarativePropertyChangesPrivate() : decoded(true), restore(true),
+    QQuickPropertyChangesPrivate() : decoded(true), restore(true),
                                 isExplicit(false) {}
 
-    QDeclarativeGuard<QObject> object;
+    QQmlGuard<QObject> object;
     QByteArray data;
 
     bool decoded : 1;
@@ -224,25 +224,25 @@ public:
     class ExpressionChange {
     public:
         ExpressionChange(const QString &_name,
-                         QDeclarativeBinding::Identifier _id,
-                         QDeclarativeExpression *_expr)
+                         QQmlBinding::Identifier _id,
+                         QQmlExpression *_expr)
             : name(_name), id(_id), expression(_expr) {}
         QString name;
-        QDeclarativeBinding::Identifier id;
-        QDeclarativeExpression *expression;
+        QQmlBinding::Identifier id;
+        QQmlExpression *expression;
     };
 
     QList<QPair<QString, QVariant> > properties;
     QList<ExpressionChange> expressions;
-    QList<QDeclarativeReplaceSignalHandler*> signalReplacements;
+    QList<QQuickReplaceSignalHandler*> signalReplacements;
 
-    QDeclarativeProperty property(const QString &);
+    QQmlProperty property(const QString &);
 };
 
 void
-QDeclarativePropertyChangesParser::compileList(QList<QPair<QString, QVariant> > &list,
+QQuickPropertyChangesParser::compileList(QList<QPair<QString, QVariant> > &list,
                                      const QString &pre,
-                                     const QDeclarativeCustomParserProperty &prop)
+                                     const QQmlCustomParserProperty &prop)
 {
     QString propName = pre + prop.name();
 
@@ -250,14 +250,14 @@ QDeclarativePropertyChangesParser::compileList(QList<QPair<QString, QVariant> >
     for (int ii = 0; ii < values.count(); ++ii) {
         const QVariant &value = values.at(ii);
 
-        if (value.userType() == qMetaTypeId<QDeclarativeCustomParserNode>()) {
-            error(qvariant_cast<QDeclarativeCustomParserNode>(value),
-                  QDeclarativePropertyChanges::tr("PropertyChanges does not support creating state-specific objects."));
+        if (value.userType() == qMetaTypeId<QQmlCustomParserNode>()) {
+            error(qvariant_cast<QQmlCustomParserNode>(value),
+                  QQuickPropertyChanges::tr("PropertyChanges does not support creating state-specific objects."));
             continue;
-        } else if(value.userType() == qMetaTypeId<QDeclarativeCustomParserProperty>()) {
+        } else if(value.userType() == qMetaTypeId<QQmlCustomParserProperty>()) {
 
-            QDeclarativeCustomParserProperty prop =
-                qvariant_cast<QDeclarativeCustomParserProperty>(value);
+            QQmlCustomParserProperty prop =
+                qvariant_cast<QQmlCustomParserProperty>(value);
             QString pre = propName + QLatin1Char('.');
             compileList(list, pre, prop);
 
@@ -268,7 +268,7 @@ QDeclarativePropertyChangesParser::compileList(QList<QPair<QString, QVariant> >
 }
 
 QByteArray
-QDeclarativePropertyChangesParser::compile(const QList<QDeclarativeCustomParserProperty> &props)
+QQuickPropertyChangesParser::compile(const QList<QQmlCustomParserProperty> &props)
 {
     QList<QPair<QString, QVariant> > data;
     for(int ii = 0; ii < props.count(); ++ii)
@@ -279,22 +279,22 @@ QDeclarativePropertyChangesParser::compile(const QList<QDeclarativeCustomParserP
 
     ds << data.count();
     for(int ii = 0; ii < data.count(); ++ii) {
-        QDeclarativeScript::Variant v = qvariant_cast<QDeclarativeScript::Variant>(data.at(ii).second);
+        QQmlScript::Variant v = qvariant_cast<QQmlScript::Variant>(data.at(ii).second);
         QVariant var;
         bool isScript = v.isScript();
-        QDeclarativeBinding::Identifier id = 0;
+        QQmlBinding::Identifier id = 0;
         switch(v.type()) {
-        case QDeclarativeScript::Variant::Boolean:
+        case QQmlScript::Variant::Boolean:
             var = QVariant(v.asBoolean());
             break;
-        case QDeclarativeScript::Variant::Number:
+        case QQmlScript::Variant::Number:
             var = QVariant(v.asNumber());
             break;
-        case QDeclarativeScript::Variant::String:
+        case QQmlScript::Variant::String:
             var = QVariant(v.asString());
             break;
-        case QDeclarativeScript::Variant::Invalid:
-        case QDeclarativeScript::Variant::Script:
+        case QQmlScript::Variant::Invalid:
+        case QQmlScript::Variant::Script:
             var = QVariant(v.asScript());
             {
                 // Pre-rewrite the expression
@@ -311,9 +311,9 @@ QDeclarativePropertyChangesParser::compile(const QList<QDeclarativeCustomParserP
     return rv;
 }
 
-void QDeclarativePropertyChangesPrivate::decode()
+void QQuickPropertyChangesPrivate::decode()
 {
-    Q_Q(QDeclarativePropertyChanges);
+    Q_Q(QQuickPropertyChanges);
     if (decoded)
         return;
 
@@ -325,26 +325,26 @@ void QDeclarativePropertyChangesPrivate::decode()
         QString name;
         bool isScript;
         QVariant data;
-        QDeclarativeBinding::Identifier id = QDeclarativeBinding::Invalid;
+        QQmlBinding::Identifier id = QQmlBinding::Invalid;
         ds >> name;
         ds >> isScript;
         ds >> data;
         if (isScript)
             ds >> id;
 
-        QDeclarativeProperty prop = property(name);      //### better way to check for signal property?
-        if (prop.type() & QDeclarativeProperty::SignalProperty) {
-            QDeclarativeExpression *expression = new QDeclarativeExpression(qmlContext(q), object, data.toString());
-            QDeclarativeData *ddata = QDeclarativeData::get(q);
+        QQmlProperty prop = property(name);      //### better way to check for signal property?
+        if (prop.type() & QQmlProperty::SignalProperty) {
+            QQmlExpression *expression = new QQmlExpression(qmlContext(q), object, data.toString());
+            QQmlData *ddata = QQmlData::get(q);
             if (ddata && ddata->outerContext && !ddata->outerContext->url.isEmpty())
                 expression->setSourceLocation(ddata->outerContext->url.toString(), ddata->lineNumber, ddata->columnNumber);
-            QDeclarativeReplaceSignalHandler *handler = new QDeclarativeReplaceSignalHandler;
+            QQuickReplaceSignalHandler *handler = new QQuickReplaceSignalHandler;
             handler->property = prop;
             handler->expression = expression;
             signalReplacements << handler;
         } else if (isScript) {
-            QDeclarativeExpression *expression = new QDeclarativeExpression(qmlContext(q), object, data.toString());
-            QDeclarativeData *ddata = QDeclarativeData::get(q);
+            QQmlExpression *expression = new QQmlExpression(qmlContext(q), object, data.toString());
+            QQmlData *ddata = QQmlData::get(q);
             if (ddata && ddata->outerContext && !ddata->outerContext->url.isEmpty())
                 expression->setSourceLocation(ddata->outerContext->url.toString(), ddata->lineNumber, ddata->columnNumber);
             expressions << ExpressionChange(name, id, expression);
@@ -357,38 +357,38 @@ void QDeclarativePropertyChangesPrivate::decode()
     data.clear();
 }
 
-void QDeclarativePropertyChangesParser::setCustomData(QObject *object,
+void QQuickPropertyChangesParser::setCustomData(QObject *object,
                                             const QByteArray &data)
 {
-    QDeclarativePropertyChangesPrivate *p =
-        static_cast<QDeclarativePropertyChangesPrivate *>(QObjectPrivate::get(object));
+    QQuickPropertyChangesPrivate *p =
+        static_cast<QQuickPropertyChangesPrivate *>(QObjectPrivate::get(object));
     p->data = data;
     p->decoded = false;
 }
 
-QDeclarativePropertyChanges::QDeclarativePropertyChanges()
-: QDeclarativeStateOperation(*(new QDeclarativePropertyChangesPrivate))
+QQuickPropertyChanges::QQuickPropertyChanges()
+: QQuickStateOperation(*(new QQuickPropertyChangesPrivate))
 {
 }
 
-QDeclarativePropertyChanges::~QDeclarativePropertyChanges()
+QQuickPropertyChanges::~QQuickPropertyChanges()
 {
-    Q_D(QDeclarativePropertyChanges);
+    Q_D(QQuickPropertyChanges);
     for(int ii = 0; ii < d->expressions.count(); ++ii)
         delete d->expressions.at(ii).expression;
     for(int ii = 0; ii < d->signalReplacements.count(); ++ii)
         delete d->signalReplacements.at(ii);
 }
 
-QObject *QDeclarativePropertyChanges::object() const
+QObject *QQuickPropertyChanges::object() const
 {
-    Q_D(const QDeclarativePropertyChanges);
+    Q_D(const QQuickPropertyChanges);
     return d->object;
 }
 
-void QDeclarativePropertyChanges::setObject(QObject *o)
+void QQuickPropertyChanges::setObject(QObject *o)
 {
-    Q_D(QDeclarativePropertyChanges);
+    Q_D(QQuickPropertyChanges);
     d->object = o;
 }
 
@@ -401,36 +401,36 @@ void QDeclarativePropertyChanges::setObject(QObject *o)
     The default value is \c true. Setting this value to \c false creates a
     temporary state that has permanent effects on property values.
 */
-bool QDeclarativePropertyChanges::restoreEntryValues() const
+bool QQuickPropertyChanges::restoreEntryValues() const
 {
-    Q_D(const QDeclarativePropertyChanges);
+    Q_D(const QQuickPropertyChanges);
     return d->restore;
 }
 
-void QDeclarativePropertyChanges::setRestoreEntryValues(bool v)
+void QQuickPropertyChanges::setRestoreEntryValues(bool v)
 {
-    Q_D(QDeclarativePropertyChanges);
+    Q_D(QQuickPropertyChanges);
     d->restore = v;
 }
 
-QDeclarativeProperty
-QDeclarativePropertyChangesPrivate::property(const QString &property)
+QQmlProperty
+QQuickPropertyChangesPrivate::property(const QString &property)
 {
-    Q_Q(QDeclarativePropertyChanges);
-    QDeclarativeProperty prop(object, property, qmlContext(q));
+    Q_Q(QQuickPropertyChanges);
+    QQmlProperty prop(object, property, qmlContext(q));
     if (!prop.isValid()) {
-        qmlInfo(q) << QDeclarativePropertyChanges::tr("Cannot assign to non-existent property \"%1\"").arg(property);
-        return QDeclarativeProperty();
-    } else if (!(prop.type() & QDeclarativeProperty::SignalProperty) && !prop.isWritable()) {
-        qmlInfo(q) << QDeclarativePropertyChanges::tr("Cannot assign to read-only property \"%1\"").arg(property);
-        return QDeclarativeProperty();
+        qmlInfo(q) << QQuickPropertyChanges::tr("Cannot assign to non-existent property \"%1\"").arg(property);
+        return QQmlProperty();
+    } else if (!(prop.type() & QQmlProperty::SignalProperty) && !prop.isWritable()) {
+        qmlInfo(q) << QQuickPropertyChanges::tr("Cannot assign to read-only property \"%1\"").arg(property);
+        return QQmlProperty();
     }
     return prop;
 }
 
-QDeclarativePropertyChanges::ActionList QDeclarativePropertyChanges::actions()
+QQuickPropertyChanges::ActionList QQuickPropertyChanges::actions()
 {
-    Q_D(QDeclarativePropertyChanges);
+    Q_D(QQuickPropertyChanges);
 
     d->decode();
 
@@ -438,7 +438,7 @@ QDeclarativePropertyChanges::ActionList QDeclarativePropertyChanges::actions()
 
     for (int ii = 0; ii < d->properties.count(); ++ii) {
 
-        QDeclarativeAction a(d->object, d->properties.at(ii).first,
+        QQuickAction a(d->object, d->properties.at(ii).first,
                  qmlContext(this), d->properties.at(ii).second);
 
         if (a.property.isValid()) {
@@ -449,10 +449,10 @@ QDeclarativePropertyChanges::ActionList QDeclarativePropertyChanges::actions()
 
     for (int ii = 0; ii < d->signalReplacements.count(); ++ii) {
 
-        QDeclarativeReplaceSignalHandler *handler = d->signalReplacements.at(ii);
+        QQuickReplaceSignalHandler *handler = d->signalReplacements.at(ii);
 
         if (handler->property.isValid()) {
-            QDeclarativeAction a;
+            QQuickAction a;
             a.event = handler;
             list << a;
         }
@@ -461,10 +461,10 @@ QDeclarativePropertyChanges::ActionList QDeclarativePropertyChanges::actions()
     for (int ii = 0; ii < d->expressions.count(); ++ii) {
 
         const QString &property = d->expressions.at(ii).name;
-        QDeclarativeProperty prop = d->property(property);
+        QQmlProperty prop = d->property(property);
 
         if (prop.isValid()) {
-            QDeclarativeAction a;
+            QQuickAction a;
             a.restore = restoreEntryValues();
             a.property = prop;
             a.fromValue = a.property.read();
@@ -474,12 +474,12 @@ QDeclarativePropertyChanges::ActionList QDeclarativePropertyChanges::actions()
             if (d->isExplicit) {
                 a.toValue = d->expressions.at(ii).expression->evaluate();
             } else {
-                QDeclarativeExpression *e = d->expressions.at(ii).expression;
+                QQmlExpression *e = d->expressions.at(ii).expression;
 
-                QDeclarativeBinding::Identifier id = d->expressions.at(ii).id;
-                QDeclarativeBinding *newBinding = id != QDeclarativeBinding::Invalid ? QDeclarativeBinding::createBinding(id, object(), qmlContext(this), e->sourceFile(), e->lineNumber()) : 0;
+                QQmlBinding::Identifier id = d->expressions.at(ii).id;
+                QQmlBinding *newBinding = id != QQmlBinding::Invalid ? QQmlBinding::createBinding(id, object(), qmlContext(this), e->sourceFile(), e->lineNumber()) : 0;
                 if (!newBinding) {
-                    newBinding = new QDeclarativeBinding(e->expression(), object(), qmlContext(this));
+                    newBinding = new QQmlBinding(e->expression(), object(), qmlContext(this));
                     newBinding->setSourceLocation(e->sourceFile(), e->lineNumber(), e->columnNumber());
                 }
                 newBinding->setTarget(prop);
@@ -513,21 +513,21 @@ QDeclarativePropertyChanges::ActionList QDeclarativePropertyChanges::actions()
 
     By default, explicit is false.
 */
-bool QDeclarativePropertyChanges::isExplicit() const
+bool QQuickPropertyChanges::isExplicit() const
 {
-    Q_D(const QDeclarativePropertyChanges);
+    Q_D(const QQuickPropertyChanges);
     return d->isExplicit;
 }
 
-void QDeclarativePropertyChanges::setIsExplicit(bool e)
+void QQuickPropertyChanges::setIsExplicit(bool e)
 {
-    Q_D(QDeclarativePropertyChanges);
+    Q_D(QQuickPropertyChanges);
     d->isExplicit = e;
 }
 
-bool QDeclarativePropertyChanges::containsValue(const QString &name) const
+bool QQuickPropertyChanges::containsValue(const QString &name) const
 {
-    Q_D(const QDeclarativePropertyChanges);
+    Q_D(const QQuickPropertyChanges);
     typedef QPair<QString, QVariant> PropertyEntry;
 
     QListIterator<PropertyEntry> propertyIterator(d->properties);
@@ -541,10 +541,10 @@ bool QDeclarativePropertyChanges::containsValue(const QString &name) const
     return false;
 }
 
-bool QDeclarativePropertyChanges::containsExpression(const QString &name) const
+bool QQuickPropertyChanges::containsExpression(const QString &name) const
 {
-    Q_D(const QDeclarativePropertyChanges);
-    typedef QDeclarativePropertyChangesPrivate::ExpressionChange ExpressionEntry;
+    Q_D(const QQuickPropertyChanges);
+    typedef QQuickPropertyChangesPrivate::ExpressionChange ExpressionEntry;
 
     QListIterator<ExpressionEntry> expressionIterator(d->expressions);
     while (expressionIterator.hasNext()) {
@@ -557,16 +557,16 @@ bool QDeclarativePropertyChanges::containsExpression(const QString &name) const
     return false;
 }
 
-bool QDeclarativePropertyChanges::containsProperty(const QString &name) const
+bool QQuickPropertyChanges::containsProperty(const QString &name) const
 {
     return containsValue(name) || containsExpression(name);
 }
 
-void QDeclarativePropertyChanges::changeValue(const QString &name, const QVariant &value)
+void QQuickPropertyChanges::changeValue(const QString &name, const QVariant &value)
 {
-    Q_D(QDeclarativePropertyChanges);
+    Q_D(QQuickPropertyChanges);
     typedef QPair<QString, QVariant> PropertyEntry;
-    typedef QDeclarativePropertyChangesPrivate::ExpressionChange ExpressionEntry;
+    typedef QQuickPropertyChangesPrivate::ExpressionChange ExpressionEntry;
 
     QMutableListIterator<ExpressionEntry> expressionIterator(d->expressions);
     while (expressionIterator.hasNext()) {
@@ -574,9 +574,9 @@ void QDeclarativePropertyChanges::changeValue(const QString &name, const QVarian
         if (entry.name == name) {
             expressionIterator.remove();
             if (state() && state()->isStateActive()) {
-                QDeclarativeAbstractBinding *oldBinding = QDeclarativePropertyPrivate::binding(d->property(name));
+                QQmlAbstractBinding *oldBinding = QQmlPropertyPrivate::binding(d->property(name));
                 if (oldBinding) {
-                    QDeclarativePropertyPrivate::setBinding(d->property(name), 0);
+                    QQmlPropertyPrivate::setBinding(d->property(name), 0);
                     oldBinding->destroy();
                 }
                 d->property(name).write(value);
@@ -598,7 +598,7 @@ void QDeclarativePropertyChanges::changeValue(const QString &name, const QVarian
         }
     }
 
-    QDeclarativeAction action;
+    QQuickAction action;
     action.restore = restoreEntryValues();
     action.property = d->property(name);
     action.fromValue = action.property.read();
@@ -609,18 +609,18 @@ void QDeclarativePropertyChanges::changeValue(const QString &name, const QVarian
     propertyIterator.insert(PropertyEntry(name, value));
     if (state() && state()->isStateActive()) {
         state()->addEntryToRevertList(action);
-        QDeclarativeAbstractBinding *oldBinding = QDeclarativePropertyPrivate::binding(action.property);
+        QQmlAbstractBinding *oldBinding = QQmlPropertyPrivate::binding(action.property);
         if (oldBinding)
-            oldBinding->setEnabled(false, QDeclarativePropertyPrivate::DontRemoveBinding | QDeclarativePropertyPrivate::BypassInterceptor);
+            oldBinding->setEnabled(false, QQmlPropertyPrivate::DontRemoveBinding | QQmlPropertyPrivate::BypassInterceptor);
         d->property(name).write(value);
     }
 }
 
-void QDeclarativePropertyChanges::changeExpression(const QString &name, const QString &expression)
+void QQuickPropertyChanges::changeExpression(const QString &name, const QString &expression)
 {
-    Q_D(QDeclarativePropertyChanges);
+    Q_D(QQuickPropertyChanges);
     typedef QPair<QString, QVariant> PropertyEntry;
-    typedef QDeclarativePropertyChangesPrivate::ExpressionChange ExpressionEntry;
+    typedef QQuickPropertyChangesPrivate::ExpressionChange ExpressionEntry;
 
     bool hadValue = false;
 
@@ -640,36 +640,36 @@ void QDeclarativePropertyChanges::changeExpression(const QString &name, const QS
         if (entry.name == name) {
             entry.expression->setExpression(expression);
             if (state() && state()->isStateActive()) {
-                QDeclarativeAbstractBinding *oldBinding = QDeclarativePropertyPrivate::binding(d->property(name));
+                QQmlAbstractBinding *oldBinding = QQmlPropertyPrivate::binding(d->property(name));
                 if (oldBinding) {
-                       QDeclarativePropertyPrivate::setBinding(d->property(name), 0);
+                       QQmlPropertyPrivate::setBinding(d->property(name), 0);
                        oldBinding->destroy();
                 }
 
-                QDeclarativeBinding *newBinding = new QDeclarativeBinding(expression, object(), qmlContext(this));
+                QQmlBinding *newBinding = new QQmlBinding(expression, object(), qmlContext(this));
                 newBinding->setTarget(d->property(name));
-                QDeclarativePropertyPrivate::setBinding(d->property(name), newBinding, QDeclarativePropertyPrivate::DontRemoveBinding | QDeclarativePropertyPrivate::BypassInterceptor);
+                QQmlPropertyPrivate::setBinding(d->property(name), newBinding, QQmlPropertyPrivate::DontRemoveBinding | QQmlPropertyPrivate::BypassInterceptor);
             }
             return;
         }
     }
 
-    QDeclarativeExpression *newExpression = new QDeclarativeExpression(qmlContext(this), d->object, expression);
-    expressionIterator.insert(ExpressionEntry(name, QDeclarativeBinding::Invalid, newExpression));
+    QQmlExpression *newExpression = new QQmlExpression(qmlContext(this), d->object, expression);
+    expressionIterator.insert(ExpressionEntry(name, QQmlBinding::Invalid, newExpression));
 
     if (state() && state()->isStateActive()) {
         if (hadValue) {
-            QDeclarativeAbstractBinding *oldBinding = QDeclarativePropertyPrivate::binding(d->property(name));
+            QQmlAbstractBinding *oldBinding = QQmlPropertyPrivate::binding(d->property(name));
             if (oldBinding) {
-                oldBinding->setEnabled(false, QDeclarativePropertyPrivate::DontRemoveBinding | QDeclarativePropertyPrivate::BypassInterceptor);
+                oldBinding->setEnabled(false, QQmlPropertyPrivate::DontRemoveBinding | QQmlPropertyPrivate::BypassInterceptor);
                 state()->changeBindingInRevertList(object(), name, oldBinding);
             }
 
-            QDeclarativeBinding *newBinding = new QDeclarativeBinding(expression, object(), qmlContext(this));
+            QQmlBinding *newBinding = new QQmlBinding(expression, object(), qmlContext(this));
             newBinding->setTarget(d->property(name));
-            QDeclarativePropertyPrivate::setBinding(d->property(name), newBinding, QDeclarativePropertyPrivate::DontRemoveBinding | QDeclarativePropertyPrivate::BypassInterceptor);
+            QQmlPropertyPrivate::setBinding(d->property(name), newBinding, QQmlPropertyPrivate::DontRemoveBinding | QQmlPropertyPrivate::BypassInterceptor);
         } else {
-            QDeclarativeAction action;
+            QQuickAction action;
             action.restore = restoreEntryValues();
             action.property = d->property(name);
             action.fromValue = action.property.read();
@@ -680,28 +680,28 @@ void QDeclarativePropertyChanges::changeExpression(const QString &name, const QS
             if (d->isExplicit) {
                 action.toValue = newExpression->evaluate();
             } else {
-                QDeclarativeBinding *newBinding = new QDeclarativeBinding(newExpression->expression(), object(), qmlContext(this));
+                QQmlBinding *newBinding = new QQmlBinding(newExpression->expression(), object(), qmlContext(this));
                 newBinding->setTarget(d->property(name));
                 action.toBinding = newBinding;
                 action.deletableToBinding = true;
 
                 state()->addEntryToRevertList(action);
-                QDeclarativeAbstractBinding *oldBinding = QDeclarativePropertyPrivate::binding(action.property);
+                QQmlAbstractBinding *oldBinding = QQmlPropertyPrivate::binding(action.property);
                 if (oldBinding)
-                    oldBinding->setEnabled(false, QDeclarativePropertyPrivate::DontRemoveBinding | QDeclarativePropertyPrivate::BypassInterceptor);
+                    oldBinding->setEnabled(false, QQmlPropertyPrivate::DontRemoveBinding | QQmlPropertyPrivate::BypassInterceptor);
 
-                QDeclarativePropertyPrivate::setBinding(action.property, newBinding, QDeclarativePropertyPrivate::DontRemoveBinding | QDeclarativePropertyPrivate::BypassInterceptor);
+                QQmlPropertyPrivate::setBinding(action.property, newBinding, QQmlPropertyPrivate::DontRemoveBinding | QQmlPropertyPrivate::BypassInterceptor);
             }
         }
     }
     // what about the signal handler?
 }
 
-QVariant QDeclarativePropertyChanges::property(const QString &name) const
+QVariant QQuickPropertyChanges::property(const QString &name) const
 {
-    Q_D(const QDeclarativePropertyChanges);
+    Q_D(const QQuickPropertyChanges);
     typedef QPair<QString, QVariant> PropertyEntry;
-    typedef QDeclarativePropertyChangesPrivate::ExpressionChange ExpressionEntry;
+    typedef QQuickPropertyChangesPrivate::ExpressionChange ExpressionEntry;
 
     QListIterator<PropertyEntry> propertyIterator(d->properties);
     while (propertyIterator.hasNext()) {
@@ -722,11 +722,11 @@ QVariant QDeclarativePropertyChanges::property(const QString &name) const
     return QVariant();
 }
 
-void QDeclarativePropertyChanges::removeProperty(const QString &name)
+void QQuickPropertyChanges::removeProperty(const QString &name)
 {
-    Q_D(QDeclarativePropertyChanges);
+    Q_D(QQuickPropertyChanges);
     typedef QPair<QString, QVariant> PropertyEntry;
-    typedef QDeclarativePropertyChangesPrivate::ExpressionChange ExpressionEntry;
+    typedef QQuickPropertyChangesPrivate::ExpressionChange ExpressionEntry;
 
     QMutableListIterator<ExpressionEntry> expressionIterator(d->expressions);
     while (expressionIterator.hasNext()) {
@@ -749,9 +749,9 @@ void QDeclarativePropertyChanges::removeProperty(const QString &name)
     }
 }
 
-QVariant QDeclarativePropertyChanges::value(const QString &name) const
+QVariant QQuickPropertyChanges::value(const QString &name) const
 {
-    Q_D(const QDeclarativePropertyChanges);
+    Q_D(const QQuickPropertyChanges);
     typedef QPair<QString, QVariant> PropertyEntry;
 
     QListIterator<PropertyEntry> propertyIterator(d->properties);
@@ -765,10 +765,10 @@ QVariant QDeclarativePropertyChanges::value(const QString &name) const
     return QVariant();
 }
 
-QString QDeclarativePropertyChanges::expression(const QString &name) const
+QString QQuickPropertyChanges::expression(const QString &name) const
 {
-    Q_D(const QDeclarativePropertyChanges);
-    typedef QDeclarativePropertyChangesPrivate::ExpressionChange ExpressionEntry;
+    Q_D(const QQuickPropertyChanges);
+    typedef QQuickPropertyChangesPrivate::ExpressionChange ExpressionEntry;
 
     QListIterator<ExpressionEntry> expressionIterator(d->expressions);
     while (expressionIterator.hasNext()) {
@@ -781,13 +781,13 @@ QString QDeclarativePropertyChanges::expression(const QString &name) const
     return QString();
 }
 
-void QDeclarativePropertyChanges::detachFromState()
+void QQuickPropertyChanges::detachFromState()
 {
     if (state())
         state()->removeAllEntriesFromRevertList(object());
 }
 
-void QDeclarativePropertyChanges::attachToState()
+void QQuickPropertyChanges::attachToState()
 {
     if (state())
         state()->addEntriesToRevertList(actions());
diff --git a/src/quick/util/qdeclarativepropertychanges_p.h b/src/quick/util/qquickpropertychanges_p.h
index 2d5838ddf4..313a781302 100644
--- a/src/quick/util/qdeclarativepropertychanges_p.h
+++ b/src/quick/util/qquickpropertychanges_p.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
@@ -39,28 +39,28 @@
 **
 ****************************************************************************/
 
-#ifndef QDECLARATIVEPROPERTYCHANGES_H
-#define QDECLARATIVEPROPERTYCHANGES_H
+#ifndef QQUICKPROPERTYCHANGES_H
+#define QQUICKPROPERTYCHANGES_H
 
-#include "qdeclarativestateoperations_p.h"
-#include <private/qdeclarativecustomparser_p.h>
+#include "qquickstatechangescript_p.h"
+#include <private/qqmlcustomparser_p.h>
 
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-class QDeclarativePropertyChangesPrivate;
-class Q_QUICK_PRIVATE_EXPORT QDeclarativePropertyChanges : public QDeclarativeStateOperation
+class QQuickPropertyChangesPrivate;
+class Q_QUICK_PRIVATE_EXPORT QQuickPropertyChanges : public QQuickStateOperation
 {
     Q_OBJECT
-    Q_DECLARE_PRIVATE(QDeclarativePropertyChanges)
+    Q_DECLARE_PRIVATE(QQuickPropertyChanges)
 
     Q_PROPERTY(QObject *target READ object WRITE setObject)
     Q_PROPERTY(bool restoreEntryValues READ restoreEntryValues WRITE setRestoreEntryValues)
     Q_PROPERTY(bool explicit READ isExplicit WRITE setIsExplicit)
 public:
-    QDeclarativePropertyChanges();
-    ~QDeclarativePropertyChanges();
+    QQuickPropertyChanges();
+    ~QQuickPropertyChanges();
 
     QObject *object() const;
     void setObject(QObject *);
@@ -88,23 +88,23 @@ public:
     QVariant property(const QString &name) const;
 };
 
-class QDeclarativePropertyChangesParser : public QDeclarativeCustomParser
+class QQuickPropertyChangesParser : public QQmlCustomParser
 {
 public:
-    QDeclarativePropertyChangesParser()
-    : QDeclarativeCustomParser(AcceptsAttachedProperties) {}
+    QQuickPropertyChangesParser()
+    : QQmlCustomParser(AcceptsAttachedProperties) {}
 
-    void compileList(QList<QPair<QString, QVariant> > &list, const QString &pre, const QDeclarativeCustomParserProperty &prop);
+    void compileList(QList<QPair<QString, QVariant> > &list, const QString &pre, const QQmlCustomParserProperty &prop);
 
-    virtual QByteArray compile(const QList<QDeclarativeCustomParserProperty> &);
+    virtual QByteArray compile(const QList<QQmlCustomParserProperty> &);
     virtual void setCustomData(QObject *, const QByteArray &);
 };
 
 
 QT_END_NAMESPACE
 
-QML_DECLARE_TYPE(QDeclarativePropertyChanges)
+QML_DECLARE_TYPE(QQuickPropertyChanges)
 
 QT_END_HEADER
 
-#endif // QDECLARATIVEPROPERTYCHANGES_H
+#endif // QQUICKPROPERTYCHANGES_H
diff --git a/src/quick/util/qdeclarativesmoothedanimation.cpp b/src/quick/util/qquicksmoothedanimation.cpp
index 4f2ed7dbe3..024728f1f5 100644
--- a/src/quick/util/qdeclarativesmoothedanimation.cpp
+++ b/src/quick/util/qquicksmoothedanimation.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
@@ -39,15 +39,15 @@
 **
 ****************************************************************************/
 
-#include "qdeclarativesmoothedanimation_p.h"
-#include "qdeclarativesmoothedanimation_p_p.h"
+#include "qquicksmoothedanimation_p.h"
+#include "qquicksmoothedanimation_p_p.h"
 
-#include "qdeclarativeanimation_p_p.h"
+#include "qquickanimation_p_p.h"
 
-#include <qdeclarativeproperty.h>
-#include <private/qdeclarativeproperty_p.h>
+#include <qqmlproperty.h>
+#include <private/qqmlproperty_p.h>
 
-#include <private/qdeclarativeglobal_p.h>
+#include <private/qqmlglobal_p.h>
 
 #include <QtCore/qdebug.h>
 
@@ -74,9 +74,9 @@ void QSmoothedAnimationTimer::stopAnimation()
     m_animation->stop();
 }
 
-QSmoothedAnimation::QSmoothedAnimation(QDeclarativeSmoothedAnimationPrivate *priv)
+QSmoothedAnimation::QSmoothedAnimation(QQuickSmoothedAnimationPrivate *priv)
     : QAbstractAnimationJob(), to(0), velocity(200), userDuration(-1), maximumEasingTime(-1),
-      reversingMode(QDeclarativeSmoothedAnimation::Eased), initialVelocity(0),
+      reversingMode(QQuickSmoothedAnimation::Eased), initialVelocity(0),
       trackVelocity(0), initialValue(0), invert(false), finalDuration(-1), lastTime(0),
       useDelta(false), delayedStopTimer(new QSmoothedAnimationTimer(this)), animationTemplate(priv)
 {
@@ -89,13 +89,13 @@ QSmoothedAnimation::~QSmoothedAnimation()
     delete delayedStopTimer;
     if (animationTemplate) {
         if (target.object()) {
-            QHash<QDeclarativeProperty, QSmoothedAnimation* >::iterator it =
+            QHash<QQmlProperty, QSmoothedAnimation* >::iterator it =
                     animationTemplate->activeAnimations.find(target);
             if (it != animationTemplate->activeAnimations.end() && it.value() == this)
                 animationTemplate->activeAnimations.erase(it);
         } else {
             //target is no longer valid, need to search linearly
-            QHash<QDeclarativeProperty, QSmoothedAnimation* >::iterator it;
+            QHash<QQmlProperty, QSmoothedAnimation* >::iterator it;
             for (it = animationTemplate->activeAnimations.begin(); it != animationTemplate->activeAnimations.end(); ++it) {
                 if (it.value() == this) {
                     animationTemplate->activeAnimations.erase(it);
@@ -242,15 +242,15 @@ qreal QSmoothedAnimation::easeFollow(qreal time_seconds)
 
 void QSmoothedAnimation::updateCurrentTime(int t)
 {
-    qreal time_seconds = useDelta ? qreal(QDeclarativeAnimationTimer::instance()->currentDelta()) / 1000. : qreal(t - lastTime) / 1000.;
+    qreal time_seconds = useDelta ? qreal(QQmlAnimationTimer::instance()->currentDelta()) / 1000. : qreal(t - lastTime) / 1000.;
     if (useDelta)
         useDelta = false;
 
     qreal value = easeFollow(time_seconds);
     value *= (invert? -1.0: 1.0);
-    QDeclarativePropertyPrivate::write(target, initialValue + value,
-                                       QDeclarativePropertyPrivate::BypassInterceptor
-                                       | QDeclarativePropertyPrivate::DontRemoveBinding);
+    QQmlPropertyPrivate::write(target, initialValue + value,
+                                       QQmlPropertyPrivate::BypassInterceptor
+                                       | QQmlPropertyPrivate::DontRemoveBinding);
 }
 
 void QSmoothedAnimation::init()
@@ -277,17 +277,17 @@ void QSmoothedAnimation::init()
     if (hasReversed) {
         switch (reversingMode) {
             default:
-            case QDeclarativeSmoothedAnimation::Eased:
+            case QQuickSmoothedAnimation::Eased:
                 initialVelocity = -trackVelocity;
                 break;
-            case QDeclarativeSmoothedAnimation::Sync:
-                QDeclarativePropertyPrivate::write(target, to,
-                                                   QDeclarativePropertyPrivate::BypassInterceptor
-                                                   | QDeclarativePropertyPrivate::DontRemoveBinding);
+            case QQuickSmoothedAnimation::Sync:
+                QQmlPropertyPrivate::write(target, to,
+                                                   QQmlPropertyPrivate::BypassInterceptor
+                                                   | QQmlPropertyPrivate::DontRemoveBinding);
                 trackVelocity = 0;
                 stop();
                 return;
-            case QDeclarativeSmoothedAnimation::Immediate:
+            case QQuickSmoothedAnimation::Immediate:
                 initialVelocity = 0;
                 break;
         }
@@ -298,16 +298,16 @@ void QSmoothedAnimation::init()
     invert = (to < initialValue);
 
     if (!recalc()) {
-        QDeclarativePropertyPrivate::write(target, to,
-                                           QDeclarativePropertyPrivate::BypassInterceptor
-                                           | QDeclarativePropertyPrivate::DontRemoveBinding);
+        QQmlPropertyPrivate::write(target, to,
+                                           QQmlPropertyPrivate::BypassInterceptor
+                                           | QQmlPropertyPrivate::DontRemoveBinding);
         stop();
         return;
     }
 }
 
 /*!
-    \qmlclass SmoothedAnimation QDeclarativeSmoothedAnimation
+    \qmlclass SmoothedAnimation QQuickSmoothedAnimation
     \inqmlmodule QtQuick 2
     \ingroup qml-animation-transition
     \inherits NumberAnimation
@@ -324,7 +324,7 @@ void QSmoothedAnimation::init()
     bound to those of the red rectangle. Whenever these values change, the
     green rectangle smoothly animates to its new position:
 
-    \snippet doc/src/snippets/declarative/smoothedanimation.qml 0
+    \snippet doc/src/snippets/qml/smoothedanimation.qml 0
 
     A SmoothedAnimation can be configured by setting the \l velocity at which the
     animation should occur, or the \l duration that the animation should take.
@@ -353,32 +353,32 @@ void QSmoothedAnimation::init()
     \sa SpringAnimation, NumberAnimation, {QML Animation and Transitions}, {declarative/animation/basics}{Animation basics example}
 */
 
-QDeclarativeSmoothedAnimation::QDeclarativeSmoothedAnimation(QObject *parent)
-: QDeclarativeNumberAnimation(*(new QDeclarativeSmoothedAnimationPrivate), parent)
+QQuickSmoothedAnimation::QQuickSmoothedAnimation(QObject *parent)
+: QQuickNumberAnimation(*(new QQuickSmoothedAnimationPrivate), parent)
 {
 }
 
-QDeclarativeSmoothedAnimation::~QDeclarativeSmoothedAnimation()
+QQuickSmoothedAnimation::~QQuickSmoothedAnimation()
 {
 
 }
 
-QDeclarativeSmoothedAnimationPrivate::QDeclarativeSmoothedAnimationPrivate()
+QQuickSmoothedAnimationPrivate::QQuickSmoothedAnimationPrivate()
     : anim(0)
 {
     anim = new QSmoothedAnimation;
 }
 
-QDeclarativeSmoothedAnimationPrivate::~QDeclarativeSmoothedAnimationPrivate()
+QQuickSmoothedAnimationPrivate::~QQuickSmoothedAnimationPrivate()
 {
     delete anim;
-    QHash<QDeclarativeProperty, QSmoothedAnimation* >::iterator it;
+    QHash<QQmlProperty, QSmoothedAnimation* >::iterator it;
     for (it = activeAnimations.begin(); it != activeAnimations.end(); ++it) {
         it.value()->clearTemplate();
     }
 }
 
-void QDeclarativeSmoothedAnimationPrivate::updateRunningAnimations()
+void QQuickSmoothedAnimationPrivate::updateRunningAnimations()
 {
     foreach(QSmoothedAnimation* ease, activeAnimations.values()){
         ease->maximumEasingTime = anim->maximumEasingTime;
@@ -389,15 +389,15 @@ void QDeclarativeSmoothedAnimationPrivate::updateRunningAnimations()
     }
 }
 
-QAbstractAnimationJob* QDeclarativeSmoothedAnimation::transition(QDeclarativeStateActions &actions,
-                                               QDeclarativeProperties &modified,
+QAbstractAnimationJob* QQuickSmoothedAnimation::transition(QQuickStateActions &actions,
+                                               QQmlProperties &modified,
                                                TransitionDirection direction,
                                                QObject *defaultTarget)
 {
     Q_UNUSED(direction);
-    Q_D(QDeclarativeSmoothedAnimation);
+    Q_D(QQuickSmoothedAnimation);
 
-    QDeclarativeStateActions dataActions = QDeclarativePropertyAnimation::createTransitionActions(actions, modified, defaultTarget);
+    QQuickStateActions dataActions = QQuickPropertyAnimation::createTransitionActions(actions, modified, defaultTarget);
 
     QParallelAnimationGroupJob *wrapperGroup = new QParallelAnimationGroupJob();
 
@@ -455,15 +455,15 @@ QAbstractAnimationJob* QDeclarativeSmoothedAnimation::transition(QDeclarativeSta
     \o SmoothedAnimation.Sync - the property is immediately set to the target value
     \endlist
 */
-QDeclarativeSmoothedAnimation::ReversingMode QDeclarativeSmoothedAnimation::reversingMode() const
+QQuickSmoothedAnimation::ReversingMode QQuickSmoothedAnimation::reversingMode() const
 {
-    Q_D(const QDeclarativeSmoothedAnimation);
-    return (QDeclarativeSmoothedAnimation::ReversingMode) d->anim->reversingMode;
+    Q_D(const QQuickSmoothedAnimation);
+    return (QQuickSmoothedAnimation::ReversingMode) d->anim->reversingMode;
 }
 
-void QDeclarativeSmoothedAnimation::setReversingMode(ReversingMode m)
+void QQuickSmoothedAnimation::setReversingMode(ReversingMode m)
 {
-    Q_D(QDeclarativeSmoothedAnimation);
+    Q_D(QQuickSmoothedAnimation);
     if (d->anim->reversingMode == m)
         return;
 
@@ -482,26 +482,26 @@ void QDeclarativeSmoothedAnimation::setReversingMode(ReversingMode m)
     If the velocity value and the duration value are both enabled, then the animation will
     use whichever gives the shorter duration.
 */
-int QDeclarativeSmoothedAnimation::duration() const
+int QQuickSmoothedAnimation::duration() const
 {
-    Q_D(const QDeclarativeSmoothedAnimation);
+    Q_D(const QQuickSmoothedAnimation);
     return d->anim->userDuration;
 }
 
-void QDeclarativeSmoothedAnimation::setDuration(int duration)
+void QQuickSmoothedAnimation::setDuration(int duration)
 {
-    Q_D(QDeclarativeSmoothedAnimation);
+    Q_D(QQuickSmoothedAnimation);
     if (duration != -1)
-        QDeclarativeNumberAnimation::setDuration(duration);
+        QQuickNumberAnimation::setDuration(duration);
     if(duration == d->anim->userDuration)
         return;
     d->anim->userDuration = duration;
     d->updateRunningAnimations();
 }
 
-qreal QDeclarativeSmoothedAnimation::velocity() const
+qreal QQuickSmoothedAnimation::velocity() const
 {
-    Q_D(const QDeclarativeSmoothedAnimation);
+    Q_D(const QQuickSmoothedAnimation);
     return d->anim->velocity;
 }
 
@@ -517,9 +517,9 @@ qreal QDeclarativeSmoothedAnimation::velocity() const
     If the velocity value and the duration value are both enabled, then the animation will
     use whichever gives the shorter duration.
 */
-void QDeclarativeSmoothedAnimation::setVelocity(qreal v)
+void QQuickSmoothedAnimation::setVelocity(qreal v)
 {
-    Q_D(QDeclarativeSmoothedAnimation);
+    Q_D(QQuickSmoothedAnimation);
     if (d->anim->velocity == v)
         return;
 
@@ -538,15 +538,15 @@ void QDeclarativeSmoothedAnimation::setVelocity(qreal v)
 
     The default value is -1.
 */
-int QDeclarativeSmoothedAnimation::maximumEasingTime() const
+int QQuickSmoothedAnimation::maximumEasingTime() const
 {
-    Q_D(const QDeclarativeSmoothedAnimation);
+    Q_D(const QQuickSmoothedAnimation);
     return d->anim->maximumEasingTime;
 }
 
-void QDeclarativeSmoothedAnimation::setMaximumEasingTime(int v)
+void QQuickSmoothedAnimation::setMaximumEasingTime(int v)
 {
-    Q_D(QDeclarativeSmoothedAnimation);
+    Q_D(QQuickSmoothedAnimation);
     if(v == d->anim->maximumEasingTime)
         return;
     d->anim->maximumEasingTime = v;
diff --git a/src/quick/util/qdeclarativesmoothedanimation_p.h b/src/quick/util/qquicksmoothedanimation_p.h
index 9a0bc22216..8825a04a0e 100644
--- a/src/quick/util/qdeclarativesmoothedanimation_p.h
+++ b/src/quick/util/qquicksmoothedanimation_p.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
@@ -39,11 +39,11 @@
 **
 ****************************************************************************/
 
-#ifndef QDECLARATIVESMOOTHEDANIMATION_H
-#define QDECLARATIVESMOOTHEDANIMATION_H
+#ifndef QQUICKSMOOTHEDANIMATION_H
+#define QQUICKSMOOTHEDANIMATION_H
 
-#include <qdeclarative.h>
-#include "qdeclarativeanimation_p.h"
+#include <qqml.h>
+#include "qquickanimation_p.h"
 
 #include <QtCore/qobject.h>
 
@@ -51,12 +51,12 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-class QDeclarativeProperty;
-class QDeclarativeSmoothedAnimationPrivate;
-class Q_QUICK_PRIVATE_EXPORT QDeclarativeSmoothedAnimation : public QDeclarativeNumberAnimation
+class QQmlProperty;
+class QQuickSmoothedAnimationPrivate;
+class Q_QUICK_PRIVATE_EXPORT QQuickSmoothedAnimation : public QQuickNumberAnimation
 {
     Q_OBJECT
-    Q_DECLARE_PRIVATE(QDeclarativeSmoothedAnimation)
+    Q_DECLARE_PRIVATE(QQuickSmoothedAnimation)
     Q_ENUMS(ReversingMode)
 
     Q_PROPERTY(qreal velocity READ velocity WRITE setVelocity NOTIFY velocityChanged)
@@ -66,8 +66,8 @@ class Q_QUICK_PRIVATE_EXPORT QDeclarativeSmoothedAnimation : public QDeclarative
 public:
     enum ReversingMode { Eased, Immediate, Sync };
 
-    QDeclarativeSmoothedAnimation(QObject *parent = 0);
-    ~QDeclarativeSmoothedAnimation();
+    QQuickSmoothedAnimation(QObject *parent = 0);
+    ~QQuickSmoothedAnimation();
 
     ReversingMode reversingMode() const;
     void setReversingMode(ReversingMode);
@@ -81,8 +81,8 @@ public:
     int maximumEasingTime() const;
     void setMaximumEasingTime(int);
 
-    virtual QAbstractAnimationJob* transition(QDeclarativeStateActions &actions,
-                            QDeclarativeProperties &modified,
+    virtual QAbstractAnimationJob* transition(QQuickStateActions &actions,
+                            QQmlProperties &modified,
                             TransitionDirection direction,
                             QObject *defaultTarget = 0);
 Q_SIGNALS:
@@ -93,8 +93,8 @@ Q_SIGNALS:
 
 QT_END_NAMESPACE
 
-QML_DECLARE_TYPE(QDeclarativeSmoothedAnimation)
+QML_DECLARE_TYPE(QQuickSmoothedAnimation)
 
 QT_END_HEADER
 
-#endif // QDECLARATIVESMOOTHEDANIMATION_H
+#endif // QQUICKSMOOTHEDANIMATION_H
diff --git a/src/quick/util/qdeclarativesmoothedanimation_p_p.h b/src/quick/util/qquicksmoothedanimation_p_p.h
index 9afb6506a7..8112aa2885 100644
--- a/src/quick/util/qdeclarativesmoothedanimation_p_p.h
+++ b/src/quick/util/qquicksmoothedanimation_p_p.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#ifndef QDECLARATIVESMOOTHEDANIMATION2_P_H
-#define QDECLARATIVESMOOTHEDANIMATION2_P_H
+#ifndef QQUICKSMOOTHEDANIMATION2_P_H
+#define QQUICKSMOOTHEDANIMATION2_P_H
 
 //
 //  W A R N I N G
@@ -53,10 +53,10 @@
 // We mean it.
 //
 
-#include "qdeclarativesmoothedanimation_p.h"
-#include "qdeclarativeanimation_p.h"
+#include "qquicksmoothedanimation_p.h"
+#include "qquickanimation_p.h"
 
-#include "qdeclarativeanimation_p_p.h"
+#include "qquickanimation_p_p.h"
 
 #include "private/qparallelanimationgroupjob_p.h"
 
@@ -77,12 +77,12 @@ private:
     QSmoothedAnimation *m_animation;
 };
 
-class QDeclarativeSmoothedAnimationPrivate;
+class QQuickSmoothedAnimationPrivate;
 class Q_AUTOTEST_EXPORT QSmoothedAnimation : public QAbstractAnimationJob
 {
     Q_DISABLE_COPY(QSmoothedAnimation)
 public:
-    QSmoothedAnimation(QDeclarativeSmoothedAnimationPrivate * = 0);
+    QSmoothedAnimation(QQuickSmoothedAnimationPrivate * = 0);
 
     ~QSmoothedAnimation();
     qreal to;
@@ -90,12 +90,12 @@ public:
     int userDuration;
 
     int maximumEasingTime;
-    QDeclarativeSmoothedAnimation::ReversingMode reversingMode;
+    QQuickSmoothedAnimation::ReversingMode reversingMode;
 
     qreal initialVelocity;
     qreal trackVelocity;
 
-    QDeclarativeProperty target;
+    QQmlProperty target;
 
     int duration() const;
     void restart();
@@ -134,21 +134,21 @@ private:
     bool recalc();
     void delayedStop();
     QSmoothedAnimationTimer *delayedStopTimer;
-    QDeclarativeSmoothedAnimationPrivate *animationTemplate;
+    QQuickSmoothedAnimationPrivate *animationTemplate;
 };
 
-class QDeclarativeSmoothedAnimationPrivate : public QDeclarativePropertyAnimationPrivate
+class QQuickSmoothedAnimationPrivate : public QQuickPropertyAnimationPrivate
 {
-    Q_DECLARE_PUBLIC(QDeclarativeSmoothedAnimation)
+    Q_DECLARE_PUBLIC(QQuickSmoothedAnimation)
 public:
-    QDeclarativeSmoothedAnimationPrivate();
-    ~QDeclarativeSmoothedAnimationPrivate();
+    QQuickSmoothedAnimationPrivate();
+    ~QQuickSmoothedAnimationPrivate();
     void updateRunningAnimations();
 
     QSmoothedAnimation *anim;
-    QHash<QDeclarativeProperty, QSmoothedAnimation*> activeAnimations;
+    QHash<QQmlProperty, QSmoothedAnimation*> activeAnimations;
 };
 
 QT_END_NAMESPACE
 
-#endif // QDECLARATIVESMOOTHEDANIMATION2_P_H
+#endif // QQUICKSMOOTHEDANIMATION2_P_H
diff --git a/src/quick/util/qdeclarativespringanimation.cpp b/src/quick/util/qquickspringanimation.cpp
index 3cc5f4dbc3..84de994452 100644
--- a/src/quick/util/qdeclarativespringanimation.cpp
+++ b/src/quick/util/qquickspringanimation.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
@@ -39,10 +39,10 @@
 **
 ****************************************************************************/
 
-#include "qdeclarativespringanimation_p.h"
+#include "qquickspringanimation_p.h"
 
-#include "qdeclarativeanimation_p_p.h"
-#include <private/qdeclarativeproperty_p.h>
+#include "qquickanimation_p_p.h"
+#include <private/qqmlproperty_p.h>
 #include "private/qparallelanimationgroupjob_p.h"
 
 #include <QtCore/qdebug.h>
@@ -56,12 +56,12 @@
 
 QT_BEGIN_NAMESPACE
 
-class QDeclarativeSpringAnimationPrivate;
+class QQuickSpringAnimationPrivate;
 class Q_AUTOTEST_EXPORT QSpringAnimation : public QAbstractAnimationJob
 {
     Q_DISABLE_COPY(QSpringAnimation)
 public:
-    QSpringAnimation(QDeclarativeSpringAnimationPrivate * = 0);
+    QSpringAnimation(QQuickSpringAnimationPrivate * = 0);
 
     ~QSpringAnimation();
     int duration() const;
@@ -81,7 +81,7 @@ public:
         Spring
     };
     Mode mode;
-    QDeclarativeProperty target;
+    QQmlProperty target;
 
     qreal velocityms;
     qreal maxVelocity;
@@ -94,7 +94,7 @@ public:
     bool useMass : 1;
     bool haveModulus : 1;
     bool useDelta : 1;
-    typedef QHash<QDeclarativeProperty, QSpringAnimation*> ActiveAnimationHash;
+    typedef QHash<QQmlProperty, QSpringAnimation*> ActiveAnimationHash;
 
     void clearTemplate() { animationTemplate = 0; }
 
@@ -103,15 +103,15 @@ protected:
     virtual void updateState(QAbstractAnimationJob::State, QAbstractAnimationJob::State);
 
 private:
-    QDeclarativeSpringAnimationPrivate *animationTemplate;
+    QQuickSpringAnimationPrivate *animationTemplate;
 };
 
-class QDeclarativeSpringAnimationPrivate : public QDeclarativePropertyAnimationPrivate
+class QQuickSpringAnimationPrivate : public QQuickPropertyAnimationPrivate
 {
-    Q_DECLARE_PUBLIC(QDeclarativeSpringAnimation)
+    Q_DECLARE_PUBLIC(QQuickSpringAnimation)
 public:
-    QDeclarativeSpringAnimationPrivate()
-    : QDeclarativePropertyAnimationPrivate()
+    QQuickSpringAnimationPrivate()
+    : QQuickPropertyAnimationPrivate()
     , velocityms(0)
     , maxVelocity(0)
     , mass(1.0)
@@ -141,7 +141,7 @@ public:
     QElapsedTimer elapsed;
 };
 
-QSpringAnimation::QSpringAnimation(QDeclarativeSpringAnimationPrivate *priv)
+QSpringAnimation::QSpringAnimation(QQuickSpringAnimationPrivate *priv)
     : QAbstractAnimationJob()
     , currentValue(0)
     , to(0)
@@ -216,7 +216,7 @@ void QSpringAnimation::updateCurrentTime(int time)
         return;
     }
 
-    int elapsed = useDelta ? QDeclarativeAnimationTimer::instance()->currentDelta() : time - lastTime;
+    int elapsed = useDelta ? QQmlAnimationTimer::instance()->currentDelta() : time - lastTime;
     if (useDelta) {
         startTime = time - elapsed;
         useDelta = false;
@@ -303,9 +303,9 @@ void QSpringAnimation::updateCurrentTime(int time)
 
     qreal old_to = to;
 
-    QDeclarativePropertyPrivate::write(target, currentValue,
-                                       QDeclarativePropertyPrivate::BypassInterceptor |
-                                       QDeclarativePropertyPrivate::DontRemoveBinding);
+    QQmlPropertyPrivate::write(target, currentValue,
+                                       QQmlPropertyPrivate::BypassInterceptor |
+                                       QQmlPropertyPrivate::DontRemoveBinding);
 
     if (stopped && old_to == to) { // do not stop if we got restarted
         stopTime = animationTemplate->elapsed.elapsed();
@@ -319,7 +319,7 @@ void QSpringAnimation::updateState(QAbstractAnimationJob::State newState, QAbstr
         init();
 }
 
-void QDeclarativeSpringAnimationPrivate::updateMode()
+void QQuickSpringAnimationPrivate::updateMode()
 {
     if (spring == 0. && maxVelocity == 0.)
         mode = QSpringAnimation::Track;
@@ -340,7 +340,7 @@ void QDeclarativeSpringAnimationPrivate::updateMode()
 }
 
 /*!
-    \qmlclass SpringAnimation QDeclarativeSpringAnimation
+    \qmlclass SpringAnimation QQuickSpringAnimation
     \inqmlmodule QtQuick 2
     \ingroup qml-animation-transition
     \inherits NumberAnimation
@@ -357,7 +357,7 @@ void QDeclarativeSpringAnimationPrivate::updateMode()
     on the \c x and \c y values indicates that whenever these values are
     changed, a SpringAnimation should be applied.
 
-    \snippet doc/src/snippets/declarative/springanimation.qml 0
+    \snippet doc/src/snippets/qml/springanimation.qml 0
 
     Like any other animation element, a SpringAnimation can be applied in a
     number of ways, including transitions, behaviors and property value
@@ -367,14 +367,14 @@ void QDeclarativeSpringAnimationPrivate::updateMode()
     \sa SmoothedAnimation, {QML Animation and Transitions}, {declarative/animation/basics}{Animation basics example}, {declarative/toys/clocks}{Clocks example}
 */
 
-QDeclarativeSpringAnimation::QDeclarativeSpringAnimation(QObject *parent)
-: QDeclarativeNumberAnimation(*(new QDeclarativeSpringAnimationPrivate),parent)
+QQuickSpringAnimation::QQuickSpringAnimation(QObject *parent)
+: QQuickNumberAnimation(*(new QQuickSpringAnimationPrivate),parent)
 {
 }
 
-QDeclarativeSpringAnimation::~QDeclarativeSpringAnimation()
+QQuickSpringAnimation::~QQuickSpringAnimation()
 {
-    Q_D(QDeclarativeSpringAnimation);
+    Q_D(QQuickSpringAnimation);
     QSpringAnimation::ActiveAnimationHash::iterator it;
     for (it = d->activeAnimations.begin(); it != d->activeAnimations.end(); ++it) {
         it.value()->clearTemplate();
@@ -389,15 +389,15 @@ QDeclarativeSpringAnimation::~QDeclarativeSpringAnimation()
     The default value is 0 (no maximum velocity).
 */
 
-qreal QDeclarativeSpringAnimation::velocity() const
+qreal QQuickSpringAnimation::velocity() const
 {
-    Q_D(const QDeclarativeSpringAnimation);
+    Q_D(const QQuickSpringAnimation);
     return d->maxVelocity;
 }
 
-void QDeclarativeSpringAnimation::setVelocity(qreal velocity)
+void QQuickSpringAnimation::setVelocity(qreal velocity)
 {
-    Q_D(QDeclarativeSpringAnimation);
+    Q_D(QQuickSpringAnimation);
     d->maxVelocity = velocity;
     d->velocityms = velocity / 1000.0;
     d->updateMode();
@@ -414,15 +414,15 @@ void QDeclarativeSpringAnimation::setVelocity(qreal velocity)
     When this property is set and the \l velocity value is greater than 0,
     the \l velocity limits the maximum speed.
 */
-qreal QDeclarativeSpringAnimation::spring() const
+qreal QQuickSpringAnimation::spring() const
 {
-    Q_D(const QDeclarativeSpringAnimation);
+    Q_D(const QQuickSpringAnimation);
     return d->spring;
 }
 
-void QDeclarativeSpringAnimation::setSpring(qreal spring)
+void QQuickSpringAnimation::setSpring(qreal spring)
 {
-    Q_D(QDeclarativeSpringAnimation);
+    Q_D(QQuickSpringAnimation);
     d->spring = spring;
     d->updateMode();
 }
@@ -437,15 +437,15 @@ void QDeclarativeSpringAnimation::setSpring(qreal spring)
     The useful value range is 0 - 1.0. The lower the value, the faster it
     comes to rest.
 */
-qreal QDeclarativeSpringAnimation::damping() const
+qreal QQuickSpringAnimation::damping() const
 {
-    Q_D(const QDeclarativeSpringAnimation);
+    Q_D(const QQuickSpringAnimation);
     return d->damping;
 }
 
-void QDeclarativeSpringAnimation::setDamping(qreal damping)
+void QQuickSpringAnimation::setDamping(qreal damping)
 {
-    Q_D(QDeclarativeSpringAnimation);
+    Q_D(QQuickSpringAnimation);
     if (damping > 1.)
         damping = 1.;
 
@@ -463,15 +463,15 @@ void QDeclarativeSpringAnimation::setDamping(qreal damping)
 
     The default is 0.01. Tuning this value can provide small performance improvements.
 */
-qreal QDeclarativeSpringAnimation::epsilon() const
+qreal QQuickSpringAnimation::epsilon() const
 {
-    Q_D(const QDeclarativeSpringAnimation);
+    Q_D(const QQuickSpringAnimation);
     return d->epsilon;
 }
 
-void QDeclarativeSpringAnimation::setEpsilon(qreal epsilon)
+void QQuickSpringAnimation::setEpsilon(qreal epsilon)
 {
-    Q_D(QDeclarativeSpringAnimation);
+    Q_D(QQuickSpringAnimation);
     d->epsilon = epsilon;
 }
 
@@ -482,15 +482,15 @@ void QDeclarativeSpringAnimation::setEpsilon(qreal epsilon)
     Setting a \a modulus forces the target value to "wrap around" at the modulus.
     For example, setting the modulus to 360 will cause a value of 370 to wrap around to 10.
 */
-qreal QDeclarativeSpringAnimation::modulus() const
+qreal QQuickSpringAnimation::modulus() const
 {
-    Q_D(const QDeclarativeSpringAnimation);
+    Q_D(const QQuickSpringAnimation);
     return d->modulus;
 }
 
-void QDeclarativeSpringAnimation::setModulus(qreal modulus)
+void QQuickSpringAnimation::setModulus(qreal modulus)
 {
-    Q_D(QDeclarativeSpringAnimation);
+    Q_D(QQuickSpringAnimation);
     if (d->modulus != modulus) {
         d->haveModulus = modulus != 0.0;
         d->modulus = modulus;
@@ -508,15 +508,15 @@ void QDeclarativeSpringAnimation::setModulus(qreal modulus)
     A greater mass causes slower movement and a greater spring-like
     motion when an item comes to rest.
 */
-qreal QDeclarativeSpringAnimation::mass() const
+qreal QQuickSpringAnimation::mass() const
 {
-    Q_D(const QDeclarativeSpringAnimation);
+    Q_D(const QQuickSpringAnimation);
     return d->mass;
 }
 
-void QDeclarativeSpringAnimation::setMass(qreal mass)
+void QQuickSpringAnimation::setMass(qreal mass)
 {
-    Q_D(QDeclarativeSpringAnimation);
+    Q_D(QQuickSpringAnimation);
     if (d->mass != mass && mass > 0.0) {
         d->useMass = mass != 1.0;
         d->mass = mass;
@@ -524,23 +524,23 @@ void QDeclarativeSpringAnimation::setMass(qreal mass)
     }
 }
 
-QAbstractAnimationJob* QDeclarativeSpringAnimation::transition(QDeclarativeStateActions &actions,
-                                                                   QDeclarativeProperties &modified,
+QAbstractAnimationJob* QQuickSpringAnimation::transition(QQuickStateActions &actions,
+                                                                   QQmlProperties &modified,
                                                                    TransitionDirection direction,
                                                                    QObject *defaultTarget)
 {
-    Q_D(QDeclarativeSpringAnimation);
+    Q_D(QQuickSpringAnimation);
     Q_UNUSED(direction);
 
     QParallelAnimationGroupJob *wrapperGroup = new QParallelAnimationGroupJob();
 
-    QDeclarativeStateActions dataActions = QDeclarativeNumberAnimation::createTransitionActions(actions, modified, defaultTarget);
+    QQuickStateActions dataActions = QQuickNumberAnimation::createTransitionActions(actions, modified, defaultTarget);
     if (!dataActions.isEmpty()) {
         QSet<QAbstractAnimationJob*> anims;
         for (int i = 0; i < dataActions.size(); ++i) {
             QSpringAnimation *animation;
             bool needsRestart = false;
-            const QDeclarativeProperty &property = dataActions.at(i).property;
+            const QQmlProperty &property = dataActions.at(i).property;
             if (d->activeAnimations.contains(property)) {
                 animation = d->activeAnimations[property];
                 needsRestart = true;
diff --git a/src/quick/util/qdeclarativespringanimation_p.h b/src/quick/util/qquickspringanimation_p.h
index 2f28700208..03c586e687 100644
--- a/src/quick/util/qdeclarativespringanimation_p.h
+++ b/src/quick/util/qquickspringanimation_p.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
@@ -39,11 +39,11 @@
 **
 ****************************************************************************/
 
-#ifndef QDECLARATIVESPRINGANIMATION_H
-#define QDECLARATIVESPRINGANIMATION_H
+#ifndef QQUICKSPRINGANIMATION_H
+#define QQUICKSPRINGANIMATION_H
 
-#include <qdeclarative.h>
-#include "qdeclarativeanimation_p.h"
+#include <qqml.h>
+#include "qquickanimation_p.h"
 
 #include <QtCore/qobject.h>
 
@@ -51,12 +51,12 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-class QDeclarativeSpringAnimationPrivate;
-class Q_QUICK_PRIVATE_EXPORT QDeclarativeSpringAnimation : public QDeclarativeNumberAnimation
+class QQuickSpringAnimationPrivate;
+class Q_QUICK_PRIVATE_EXPORT QQuickSpringAnimation : public QQuickNumberAnimation
 {
     Q_OBJECT
-    Q_DECLARE_PRIVATE(QDeclarativeSpringAnimation)
-    Q_INTERFACES(QDeclarativePropertyValueSource)
+    Q_DECLARE_PRIVATE(QQuickSpringAnimation)
+    Q_INTERFACES(QQmlPropertyValueSource)
 
     Q_PROPERTY(qreal velocity READ velocity WRITE setVelocity)
     Q_PROPERTY(qreal spring READ spring WRITE setSpring)
@@ -66,8 +66,8 @@ class Q_QUICK_PRIVATE_EXPORT QDeclarativeSpringAnimation : public QDeclarativeNu
     Q_PROPERTY(qreal mass READ mass WRITE setMass NOTIFY massChanged)
 
 public:
-    QDeclarativeSpringAnimation(QObject *parent=0);
-    ~QDeclarativeSpringAnimation();
+    QQuickSpringAnimation(QObject *parent=0);
+    ~QQuickSpringAnimation();
 
     qreal velocity() const;
     void setVelocity(qreal velocity);
@@ -87,8 +87,8 @@ public:
     qreal modulus() const;
     void setModulus(qreal modulus);
 
-    virtual QAbstractAnimationJob* transition(QDeclarativeStateActions &actions,
-                            QDeclarativeProperties &modified,
+    virtual QAbstractAnimationJob* transition(QQuickStateActions &actions,
+                            QQmlProperties &modified,
                             TransitionDirection direction,
                             QObject *defaultTarget = 0);
 
@@ -100,8 +100,8 @@ Q_SIGNALS:
 
 QT_END_NAMESPACE
 
-QML_DECLARE_TYPE(QDeclarativeSpringAnimation)
+QML_DECLARE_TYPE(QQuickSpringAnimation)
 
 QT_END_HEADER
 
-#endif // QDECLARATIVESPRINGANIMATION_H
+#endif // QQUICKSPRINGANIMATION_H
diff --git a/src/quick/util/qdeclarativestate.cpp b/src/quick/util/qquickstate.cpp
index f0795e92bc..53906a5651 100644
--- a/src/quick/util/qdeclarativestate.cpp
+++ b/src/quick/util/qquickstate.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
@@ -39,13 +39,13 @@
 **
 ****************************************************************************/
 
-#include "qdeclarativestate_p_p.h"
-#include "qdeclarativestate_p.h"
+#include "qquickstate_p_p.h"
+#include "qquickstate_p.h"
 
-#include "qdeclarativestategroup_p.h"
-#include "qdeclarativestateoperations_p.h"
+#include "qquickstategroup_p.h"
+#include "qquickstatechangescript_p.h"
 
-#include <private/qdeclarativeglobal_p.h>
+#include <private/qqmlglobal_p.h>
 
 #include <QtCore/qdebug.h>
 
@@ -53,13 +53,13 @@ QT_BEGIN_NAMESPACE
 
 DEFINE_BOOL_CONFIG_OPTION(stateChangeDebug, STATECHANGE_DEBUG);
 
-QDeclarativeAction::QDeclarativeAction()
+QQuickAction::QQuickAction()
 : restore(true), actionDone(false), reverseEvent(false), deletableToBinding(false), fromBinding(0), event(0),
   specifiedObject(0)
 {
 }
 
-QDeclarativeAction::QDeclarativeAction(QObject *target, const QString &propertyName,
+QQuickAction::QQuickAction(QObject *target, const QString &propertyName,
                const QVariant &value)
 : restore(true), actionDone(false), reverseEvent(false), deletableToBinding(false), 
   property(target, propertyName, qmlEngine(target)), toValue(value),
@@ -70,8 +70,8 @@ QDeclarativeAction::QDeclarativeAction(QObject *target, const QString &propertyN
         fromValue = property.read();
 }
 
-QDeclarativeAction::QDeclarativeAction(QObject *target, const QString &propertyName,
-               QDeclarativeContext *context, const QVariant &value)
+QQuickAction::QQuickAction(QObject *target, const QString &propertyName,
+               QQmlContext *context, const QVariant &value)
 : restore(true), actionDone(false), reverseEvent(false), deletableToBinding(false),
   property(target, propertyName, context), toValue(value),
   fromBinding(0), event(0),
@@ -82,45 +82,45 @@ QDeclarativeAction::QDeclarativeAction(QObject *target, const QString &propertyN
 }
 
 
-QDeclarativeActionEvent::~QDeclarativeActionEvent()
+QQuickActionEvent::~QQuickActionEvent()
 {
 }
 
-void QDeclarativeActionEvent::execute(Reason)
+void QQuickActionEvent::execute(Reason)
 {
 }
 
-bool QDeclarativeActionEvent::isReversable()
+bool QQuickActionEvent::isReversable()
 {
     return false;
 }
 
-void QDeclarativeActionEvent::reverse(Reason)
+void QQuickActionEvent::reverse(Reason)
 {
 }
 
-bool QDeclarativeActionEvent::changesBindings()
+bool QQuickActionEvent::changesBindings()
 {
     return false;
 }
 
-void QDeclarativeActionEvent::clearBindings()
+void QQuickActionEvent::clearBindings()
 {
 }
 
-bool QDeclarativeActionEvent::override(QDeclarativeActionEvent *other)
+bool QQuickActionEvent::override(QQuickActionEvent *other)
 {
     Q_UNUSED(other);
     return false;
 }
 
-QDeclarativeStateOperation::QDeclarativeStateOperation(QObjectPrivate &dd, QObject *parent)
+QQuickStateOperation::QQuickStateOperation(QObjectPrivate &dd, QObject *parent)
     : QObject(dd, parent)
 {
 }
 
 /*!
-    \qmlclass State QDeclarativeState
+    \qmlclass State QQuickState
     \inqmlmodule QtQuick 2
     \ingroup qml-state-elements
     \brief The State element defines configurations of objects and properties.
@@ -139,7 +139,7 @@ QDeclarativeStateOperation::QDeclarativeStateOperation(QObjectPrivate &dd, QObje
     between the default state and the "clicked" state, thus toggling the color of the
     rectangle between black and red.
 
-    \snippet doc/src/snippets/declarative/state.qml 0
+    \snippet doc/src/snippets/qml/state.qml 0
 
     Notice the default state is referred to using an empty string ("").
 
@@ -150,18 +150,18 @@ QDeclarativeStateOperation::QDeclarativeStateOperation(QObjectPrivate &dd, QObje
     not allowed.
 
     \sa {declarative/animation/states}{states example}, {qmlstates}{States},
-    {QML Animation and Transitions}{Transitions}, QtDeclarative
+    {QML Animation and Transitions}{Transitions}, QtQml
 */
-QDeclarativeState::QDeclarativeState(QObject *parent)
-: QObject(*(new QDeclarativeStatePrivate), parent)
+QQuickState::QQuickState(QObject *parent)
+: QObject(*(new QQuickStatePrivate), parent)
 {
-    Q_D(QDeclarativeState);
+    Q_D(QQuickState);
     d->transitionManager.setState(this);
 }
 
-QDeclarativeState::~QDeclarativeState()
+QQuickState::~QQuickState()
 {
-    Q_D(QDeclarativeState);
+    Q_D(QQuickState);
     if (d->group)
         d->group->removeState(this);
 }
@@ -172,28 +172,28 @@ QDeclarativeState::~QDeclarativeState()
 
     Each state should have a unique name within its item.
 */
-QString QDeclarativeState::name() const
+QString QQuickState::name() const
 {
-    Q_D(const QDeclarativeState);
+    Q_D(const QQuickState);
     return d->name;
 }
 
-void QDeclarativeState::setName(const QString &n)
+void QQuickState::setName(const QString &n)
 {
-    Q_D(QDeclarativeState);
+    Q_D(QQuickState);
     d->name = n;
     d->named = true;
 }
 
-bool QDeclarativeState::isNamed() const
+bool QQuickState::isNamed() const
 {
-    Q_D(const QDeclarativeState);
+    Q_D(const QQuickState);
     return d->named;
 }
 
-bool QDeclarativeState::isWhenKnown() const
+bool QQuickState::isWhenKnown() const
 {
-    Q_D(const QDeclarativeState);
+    Q_D(const QQuickState);
     return d->when != 0;
 }
 
@@ -205,7 +205,7 @@ bool QDeclarativeState::isWhenKnown() const
     be applied. For example, the following \l Rectangle changes in and out of the "hidden"
     state when the \l MouseArea is pressed:
 
-    \snippet doc/src/snippets/declarative/state-when.qml 0
+    \snippet doc/src/snippets/qml/state-when.qml 0
 
     If multiple states in a group have \c when clauses that evaluate to \c true
     at the same time, the first matching state will be applied. For example, in
@@ -221,15 +221,15 @@ bool QDeclarativeState::isWhenKnown() const
     }
     \endqml
 */
-QDeclarativeBinding *QDeclarativeState::when() const
+QQmlBinding *QQuickState::when() const
 {
-    Q_D(const QDeclarativeState);
+    Q_D(const QQuickState);
     return d->when;
 }
 
-void QDeclarativeState::setWhen(QDeclarativeBinding *when)
+void QQuickState::setWhen(QQmlBinding *when)
 {
-    Q_D(QDeclarativeState);
+    Q_D(QQuickState);
     d->when = when;
     if (d->group)
         d->group->updateAutoState();
@@ -244,15 +244,15 @@ void QDeclarativeState::setWhen(QDeclarativeBinding *when)
     The state being extended is treated as the base state in regards to
     the changes specified by the extending state.
 */
-QString QDeclarativeState::extends() const
+QString QQuickState::extends() const
 {
-    Q_D(const QDeclarativeState);
+    Q_D(const QQuickState);
     return d->extends;
 }
 
-void QDeclarativeState::setExtends(const QString &extends)
+void QQuickState::setExtends(const QString &extends)
 {
-    Q_D(QDeclarativeState);
+    Q_D(QQuickState);
     d->extends = extends;
 }
 
@@ -265,41 +265,41 @@ void QDeclarativeState::setExtends(const QString &extends)
     extends another state, then the changes are applied against the state being
     extended.
 */
-QDeclarativeListProperty<QDeclarativeStateOperation> QDeclarativeState::changes()
+QQmlListProperty<QQuickStateOperation> QQuickState::changes()
 {
-    Q_D(QDeclarativeState);
-    return QDeclarativeListProperty<QDeclarativeStateOperation>(this, &d->operations, QDeclarativeStatePrivate::operations_append,
-                                              QDeclarativeStatePrivate::operations_count, QDeclarativeStatePrivate::operations_at,
-                                              QDeclarativeStatePrivate::operations_clear);
+    Q_D(QQuickState);
+    return QQmlListProperty<QQuickStateOperation>(this, &d->operations, QQuickStatePrivate::operations_append,
+                                              QQuickStatePrivate::operations_count, QQuickStatePrivate::operations_at,
+                                              QQuickStatePrivate::operations_clear);
 }
 
-int QDeclarativeState::operationCount() const
+int QQuickState::operationCount() const
 {
-    Q_D(const QDeclarativeState);
+    Q_D(const QQuickState);
     return d->operations.count();
 }
 
-QDeclarativeStateOperation *QDeclarativeState::operationAt(int index) const
+QQuickStateOperation *QQuickState::operationAt(int index) const
 {
-    Q_D(const QDeclarativeState);
+    Q_D(const QQuickState);
     return d->operations.at(index);
 }
 
-QDeclarativeState &QDeclarativeState::operator<<(QDeclarativeStateOperation *op)
+QQuickState &QQuickState::operator<<(QQuickStateOperation *op)
 {
-    Q_D(QDeclarativeState);
-    d->operations.append(QDeclarativeStatePrivate::OperationGuard(op, &d->operations));
+    Q_D(QQuickState);
+    d->operations.append(QQuickStatePrivate::OperationGuard(op, &d->operations));
     return *this;
 }
 
-void QDeclarativeStatePrivate::complete()
+void QQuickStatePrivate::complete()
 {
-    Q_Q(QDeclarativeState);
+    Q_Q(QQuickState);
 
     for (int ii = 0; ii < reverting.count(); ++ii) {
         for (int jj = 0; jj < revertList.count(); ++jj) {
-            const QDeclarativeRevertAction &revert = reverting.at(ii);
-            const QDeclarativeSimpleAction &simple = revertList.at(jj);
+            const QQuickRevertAction &revert = reverting.at(ii);
+            const QQuickSimpleAction &simple = revertList.at(jj);
             if ((revert.event && simple.event() == revert.event) ||
                 simple.property() == revert.property) {
                 revertList.removeAt(jj);
@@ -316,10 +316,10 @@ void QDeclarativeStatePrivate::complete()
 
 // Generate a list of actions for this state.  This includes coelescing state
 // actions that this state "extends"
-QDeclarativeStateOperation::ActionList
-QDeclarativeStatePrivate::generateActionList() const
+QQuickStateOperation::ActionList
+QQuickStatePrivate::generateActionList() const
 {
-    QDeclarativeStateOperation::ActionList applyList;
+    QQuickStateOperation::ActionList applyList;
     if (inState)
         return applyList;
 
@@ -327,57 +327,57 @@ QDeclarativeStatePrivate::generateActionList() const
     inState = true;
 
     if (!extends.isEmpty()) {
-        QList<QDeclarativeState *> states = group ? group->states() : QList<QDeclarativeState *>();
+        QList<QQuickState *> states = group ? group->states() : QList<QQuickState *>();
         for (int ii = 0; ii < states.count(); ++ii)
             if (states.at(ii)->name() == extends) {
                 qmlExecuteDeferred(states.at(ii));
-                applyList = static_cast<QDeclarativeStatePrivate*>(states.at(ii)->d_func())->generateActionList();
+                applyList = static_cast<QQuickStatePrivate*>(states.at(ii)->d_func())->generateActionList();
             }
     }
 
-    foreach(QDeclarativeStateOperation *op, operations)
+    foreach(QQuickStateOperation *op, operations)
         applyList << op->actions();
 
     inState = false;
     return applyList;
 }
 
-QDeclarativeStateGroup *QDeclarativeState::stateGroup() const
+QQuickStateGroup *QQuickState::stateGroup() const
 {
-    Q_D(const QDeclarativeState);
+    Q_D(const QQuickState);
     return d->group;
 }
 
-void QDeclarativeState::setStateGroup(QDeclarativeStateGroup *group)
+void QQuickState::setStateGroup(QQuickStateGroup *group)
 {
-    Q_D(QDeclarativeState);
+    Q_D(QQuickState);
     d->group = group;
 }
 
-void QDeclarativeState::cancel()
+void QQuickState::cancel()
 {
-    Q_D(QDeclarativeState);
+    Q_D(QQuickState);
     d->transitionManager.cancel();
 }
 
-void QDeclarativeAction::deleteFromBinding()
+void QQuickAction::deleteFromBinding()
 {
     if (fromBinding) {
-        QDeclarativePropertyPrivate::setBinding(property, 0);
+        QQmlPropertyPrivate::setBinding(property, 0);
         fromBinding->destroy();
         fromBinding = 0;
     }
 }
 
-bool QDeclarativeState::containsPropertyInRevertList(QObject *target, const QString &name) const
+bool QQuickState::containsPropertyInRevertList(QObject *target, const QString &name) const
 {
-    Q_D(const QDeclarativeState);
+    Q_D(const QQuickState);
 
     if (isStateActive()) {
-        QListIterator<QDeclarativeSimpleAction> revertListIterator(d->revertList);
+        QListIterator<QQuickSimpleAction> revertListIterator(d->revertList);
 
         while (revertListIterator.hasNext()) {
-            const QDeclarativeSimpleAction &simpleAction = revertListIterator.next();
+            const QQuickSimpleAction &simpleAction = revertListIterator.next();
             if (simpleAction.specifiedObject() == target && simpleAction.specifiedProperty() == name)
                 return true;
         }
@@ -386,15 +386,15 @@ bool QDeclarativeState::containsPropertyInRevertList(QObject *target, const QStr
     return false;
 }
 
-bool QDeclarativeState::changeValueInRevertList(QObject *target, const QString &name, const QVariant &revertValue)
+bool QQuickState::changeValueInRevertList(QObject *target, const QString &name, const QVariant &revertValue)
 {
-    Q_D(QDeclarativeState);
+    Q_D(QQuickState);
 
     if (isStateActive()) {
-        QMutableListIterator<QDeclarativeSimpleAction> revertListIterator(d->revertList);
+        QMutableListIterator<QQuickSimpleAction> revertListIterator(d->revertList);
 
         while (revertListIterator.hasNext()) {
-            QDeclarativeSimpleAction &simpleAction = revertListIterator.next();
+            QQuickSimpleAction &simpleAction = revertListIterator.next();
             if (simpleAction.specifiedObject() == target && simpleAction.specifiedProperty() == name) {
                     simpleAction.setValue(revertValue);
                     return true;
@@ -405,15 +405,15 @@ bool QDeclarativeState::changeValueInRevertList(QObject *target, const QString &
     return false;
 }
 
-bool QDeclarativeState::changeBindingInRevertList(QObject *target, const QString &name, QDeclarativeAbstractBinding *binding)
+bool QQuickState::changeBindingInRevertList(QObject *target, const QString &name, QQmlAbstractBinding *binding)
 {
-    Q_D(QDeclarativeState);
+    Q_D(QQuickState);
 
     if (isStateActive()) {
-        QMutableListIterator<QDeclarativeSimpleAction> revertListIterator(d->revertList);
+        QMutableListIterator<QQuickSimpleAction> revertListIterator(d->revertList);
 
         while (revertListIterator.hasNext()) {
-            QDeclarativeSimpleAction &simpleAction = revertListIterator.next();
+            QQuickSimpleAction &simpleAction = revertListIterator.next();
             if (simpleAction.specifiedObject() == target && simpleAction.specifiedProperty() == name) {
                 if (simpleAction.binding())
                     simpleAction.binding()->destroy();
@@ -427,25 +427,25 @@ bool QDeclarativeState::changeBindingInRevertList(QObject *target, const QString
     return false;
 }
 
-bool QDeclarativeState::removeEntryFromRevertList(QObject *target, const QString &name)
+bool QQuickState::removeEntryFromRevertList(QObject *target, const QString &name)
 {
-    Q_D(QDeclarativeState);
+    Q_D(QQuickState);
 
     if (isStateActive()) {
-        QMutableListIterator<QDeclarativeSimpleAction> revertListIterator(d->revertList);
+        QMutableListIterator<QQuickSimpleAction> revertListIterator(d->revertList);
 
         while (revertListIterator.hasNext()) {
-            QDeclarativeSimpleAction &simpleAction = revertListIterator.next();
+            QQuickSimpleAction &simpleAction = revertListIterator.next();
             if (simpleAction.property().object() == target && simpleAction.property().name() == name) {
-                QDeclarativeAbstractBinding *oldBinding = QDeclarativePropertyPrivate::binding(simpleAction.property());
+                QQmlAbstractBinding *oldBinding = QQmlPropertyPrivate::binding(simpleAction.property());
                 if (oldBinding) {
-                    QDeclarativePropertyPrivate::setBinding(simpleAction.property(), 0);
+                    QQmlPropertyPrivate::setBinding(simpleAction.property(), 0);
                     oldBinding->destroy();
                 }
 
                 simpleAction.property().write(simpleAction.value());
                 if (simpleAction.binding())
-                    QDeclarativePropertyPrivate::setBinding(simpleAction.property(), simpleAction.binding());
+                    QQmlPropertyPrivate::setBinding(simpleAction.property(), simpleAction.binding());
 
                 revertListIterator.remove();
                 return true;
@@ -456,34 +456,34 @@ bool QDeclarativeState::removeEntryFromRevertList(QObject *target, const QString
     return false;
 }
 
-void QDeclarativeState::addEntryToRevertList(const QDeclarativeAction &action)
+void QQuickState::addEntryToRevertList(const QQuickAction &action)
 {
-    Q_D(QDeclarativeState);
+    Q_D(QQuickState);
 
-    QDeclarativeSimpleAction simpleAction(action);
+    QQuickSimpleAction simpleAction(action);
 
     d->revertList.append(simpleAction);
 }
 
-void QDeclarativeState::removeAllEntriesFromRevertList(QObject *target)
+void QQuickState::removeAllEntriesFromRevertList(QObject *target)
 {
-     Q_D(QDeclarativeState);
+     Q_D(QQuickState);
 
      if (isStateActive()) {
-         QMutableListIterator<QDeclarativeSimpleAction> revertListIterator(d->revertList);
+         QMutableListIterator<QQuickSimpleAction> revertListIterator(d->revertList);
 
          while (revertListIterator.hasNext()) {
-             QDeclarativeSimpleAction &simpleAction = revertListIterator.next();
+             QQuickSimpleAction &simpleAction = revertListIterator.next();
              if (simpleAction.property().object() == target) {
-                 QDeclarativeAbstractBinding *oldBinding = QDeclarativePropertyPrivate::binding(simpleAction.property());
+                 QQmlAbstractBinding *oldBinding = QQmlPropertyPrivate::binding(simpleAction.property());
                  if (oldBinding) {
-                     QDeclarativePropertyPrivate::setBinding(simpleAction.property(), 0);
+                     QQmlPropertyPrivate::setBinding(simpleAction.property(), 0);
                      oldBinding->destroy();
                  }
 
                  simpleAction.property().write(simpleAction.value());
                  if (simpleAction.binding())
-                     QDeclarativePropertyPrivate::setBinding(simpleAction.property(), simpleAction.binding());
+                     QQmlPropertyPrivate::setBinding(simpleAction.property(), simpleAction.binding());
 
                  revertListIterator.remove();
              }
@@ -491,22 +491,22 @@ void QDeclarativeState::removeAllEntriesFromRevertList(QObject *target)
      }
 }
 
-void QDeclarativeState::addEntriesToRevertList(const QList<QDeclarativeAction> &actionList)
+void QQuickState::addEntriesToRevertList(const QList<QQuickAction> &actionList)
 {
-    Q_D(QDeclarativeState);
+    Q_D(QQuickState);
     if (isStateActive()) {
-        QList<QDeclarativeSimpleAction> simpleActionList;
+        QList<QQuickSimpleAction> simpleActionList;
 
-        QListIterator<QDeclarativeAction> actionListIterator(actionList);
+        QListIterator<QQuickAction> actionListIterator(actionList);
         while(actionListIterator.hasNext()) {
-            const QDeclarativeAction &action = actionListIterator.next();
-            QDeclarativeSimpleAction simpleAction(action);
+            const QQuickAction &action = actionListIterator.next();
+            QQuickSimpleAction simpleAction(action);
             action.property.write(action.toValue);
             if (!action.toBinding.isNull()) {
-                QDeclarativeAbstractBinding *oldBinding = QDeclarativePropertyPrivate::binding(simpleAction.property());
+                QQmlAbstractBinding *oldBinding = QQmlPropertyPrivate::binding(simpleAction.property());
                 if (oldBinding)
-                    QDeclarativePropertyPrivate::setBinding(simpleAction.property(), 0);
-                QDeclarativePropertyPrivate::setBinding(simpleAction.property(), action.toBinding.data(), QDeclarativePropertyPrivate::DontRemoveBinding);
+                    QQmlPropertyPrivate::setBinding(simpleAction.property(), 0);
+                QQmlPropertyPrivate::setBinding(simpleAction.property(), action.toBinding.data(), QQmlPropertyPrivate::DontRemoveBinding);
             }
 
             simpleActionList.append(simpleAction);
@@ -516,15 +516,15 @@ void QDeclarativeState::addEntriesToRevertList(const QList<QDeclarativeAction> &
     }
 }
 
-QVariant QDeclarativeState::valueInRevertList(QObject *target, const QString &name) const
+QVariant QQuickState::valueInRevertList(QObject *target, const QString &name) const
 {
-    Q_D(const QDeclarativeState);
+    Q_D(const QQuickState);
 
     if (isStateActive()) {
-        QListIterator<QDeclarativeSimpleAction> revertListIterator(d->revertList);
+        QListIterator<QQuickSimpleAction> revertListIterator(d->revertList);
 
         while (revertListIterator.hasNext()) {
-            const QDeclarativeSimpleAction &simpleAction = revertListIterator.next();
+            const QQuickSimpleAction &simpleAction = revertListIterator.next();
             if (simpleAction.specifiedObject() == target && simpleAction.specifiedProperty() == name)
                 return simpleAction.value();
         }
@@ -533,15 +533,15 @@ QVariant QDeclarativeState::valueInRevertList(QObject *target, const QString &na
     return QVariant();
 }
 
-QDeclarativeAbstractBinding *QDeclarativeState::bindingInRevertList(QObject *target, const QString &name) const
+QQmlAbstractBinding *QQuickState::bindingInRevertList(QObject *target, const QString &name) const
 {
-    Q_D(const QDeclarativeState);
+    Q_D(const QQuickState);
 
     if (isStateActive()) {
-        QListIterator<QDeclarativeSimpleAction> revertListIterator(d->revertList);
+        QListIterator<QQuickSimpleAction> revertListIterator(d->revertList);
 
         while (revertListIterator.hasNext()) {
-            const QDeclarativeSimpleAction &simpleAction = revertListIterator.next();
+            const QQuickSimpleAction &simpleAction = revertListIterator.next();
             if (simpleAction.specifiedObject() == target && simpleAction.specifiedProperty() == name)
                 return simpleAction.binding();
         }
@@ -550,14 +550,14 @@ QDeclarativeAbstractBinding *QDeclarativeState::bindingInRevertList(QObject *tar
     return 0;
 }
 
-bool QDeclarativeState::isStateActive() const
+bool QQuickState::isStateActive() const
 {
     return stateGroup() && stateGroup()->state() == name();
 }
 
-void QDeclarativeState::apply(QDeclarativeTransition *trans, QDeclarativeState *revert)
+void QQuickState::apply(QQuickTransition *trans, QQuickState *revert)
 {
-    Q_D(QDeclarativeState);
+    Q_D(QQuickState);
 
     qmlExecuteDeferred(this);
 
@@ -568,27 +568,27 @@ void QDeclarativeState::apply(QDeclarativeTransition *trans, QDeclarativeState *
     d->reverting.clear();
 
     if (revert) {
-        QDeclarativeStatePrivate *revertPrivate =
-            static_cast<QDeclarativeStatePrivate*>(revert->d_func());
+        QQuickStatePrivate *revertPrivate =
+            static_cast<QQuickStatePrivate*>(revert->d_func());
         d->revertList = revertPrivate->revertList;
         revertPrivate->revertList.clear();
     }
 
     // List of actions caused by this state
-    QDeclarativeStateOperation::ActionList applyList = d->generateActionList();
+    QQuickStateOperation::ActionList applyList = d->generateActionList();
 
     // List of actions that need to be reverted to roll back (just) this state
-    QDeclarativeStatePrivate::SimpleActionList additionalReverts;
+    QQuickStatePrivate::SimpleActionList additionalReverts;
     // First add the reverse of all the applyList actions
     for (int ii = 0; ii < applyList.count(); ++ii) {
-        QDeclarativeAction &action = applyList[ii];
+        QQuickAction &action = applyList[ii];
 
         if (action.event) {
             if (!action.event->isReversable())
                 continue;
             bool found = false;
             for (int jj = 0; jj < d->revertList.count(); ++jj) {
-                QDeclarativeActionEvent *event = d->revertList.at(jj).event();
+                QQuickActionEvent *event = d->revertList.at(jj).event();
                 if (event && event->type() == action.event->type()) {
                     if (action.event->override(event)) {
                         found = true;
@@ -596,7 +596,7 @@ void QDeclarativeState::apply(QDeclarativeTransition *trans, QDeclarativeState *
                         if (action.event != d->revertList.at(jj).event() && action.event->needsCopy()) {
                             action.event->copyOriginals(d->revertList.at(jj).event());
 
-                            QDeclarativeSimpleAction r(action);
+                            QQuickSimpleAction r(action);
                             additionalReverts << r;
                             d->revertList.removeAt(jj);
                             --jj;
@@ -611,12 +611,12 @@ void QDeclarativeState::apply(QDeclarativeTransition *trans, QDeclarativeState *
                 action.event->saveOriginals();
                 // Only need to revert the applyList action if the previous
                 // state doesn't have a higher priority revert already
-                QDeclarativeSimpleAction r(action);
+                QQuickSimpleAction r(action);
                 additionalReverts << r;
             }
         } else {
             bool found = false;
-            action.fromBinding = QDeclarativePropertyPrivate::binding(action.property);
+            action.fromBinding = QQmlPropertyPrivate::binding(action.property);
 
             for (int jj = 0; jj < d->revertList.count(); ++jj) {
                 if (d->revertList.at(jj).property() == action.property) {
@@ -634,7 +634,7 @@ void QDeclarativeState::apply(QDeclarativeTransition *trans, QDeclarativeState *
                 } else {
                     // Only need to revert the applyList action if the previous
                     // state doesn't have a higher priority revert already
-                    QDeclarativeSimpleAction r(action);
+                    QQuickSimpleAction r(action);
                     additionalReverts << r;
                 }
             }
@@ -646,11 +646,11 @@ void QDeclarativeState::apply(QDeclarativeTransition *trans, QDeclarativeState *
     for (int ii = 0; ii < d->revertList.count(); ++ii) {
         bool found = false;
         if (d->revertList.at(ii).event()) {
-            QDeclarativeActionEvent *event = d->revertList.at(ii).event();
+            QQuickActionEvent *event = d->revertList.at(ii).event();
             if (!event->isReversable())
                 continue;
             for (int jj = 0; !found && jj < applyList.count(); ++jj) {
-                const QDeclarativeAction &action = applyList.at(jj);
+                const QQuickAction &action = applyList.at(jj);
                 if (action.event && action.event->type() == event->type()) {
                     if (action.event->override(event))
                         found = true;
@@ -658,23 +658,23 @@ void QDeclarativeState::apply(QDeclarativeTransition *trans, QDeclarativeState *
             }
         } else {
             for (int jj = 0; !found && jj < applyList.count(); ++jj) {
-                const QDeclarativeAction &action = applyList.at(jj);
+                const QQuickAction &action = applyList.at(jj);
                 if (action.property == d->revertList.at(ii).property())
                     found = true;
             }
         }
         if (!found) {
             QVariant cur = d->revertList.at(ii).property().read();
-            QDeclarativeAbstractBinding *delBinding = 
-                QDeclarativePropertyPrivate::setBinding(d->revertList.at(ii).property(), 0);
+            QQmlAbstractBinding *delBinding = 
+                QQmlPropertyPrivate::setBinding(d->revertList.at(ii).property(), 0);
             if (delBinding)
                 delBinding->destroy();
 
-            QDeclarativeAction a;
+            QQuickAction a;
             a.property = d->revertList.at(ii).property();
             a.fromValue = cur;
             a.toValue = d->revertList.at(ii).value();
-            a.toBinding = QDeclarativeAbstractBinding::getPointer(d->revertList.at(ii).binding());
+            a.toBinding = QQmlAbstractBinding::getPointer(d->revertList.at(ii).binding());
             a.specifiedObject = d->revertList.at(ii).specifiedObject();
             a.specifiedProperty = d->revertList.at(ii).specifiedProperty();
             a.event = d->revertList.at(ii).event();
@@ -695,11 +695,11 @@ void QDeclarativeState::apply(QDeclarativeTransition *trans, QDeclarativeState *
 #ifndef QT_NO_DEBUG_STREAM
     // Output for debugging
     if (stateChangeDebug()) {
-        foreach(const QDeclarativeAction &action, applyList) {
+        foreach(const QQuickAction &action, applyList) {
             if (action.event)
-                qWarning() << "    QDeclarativeAction event:" << action.event->type();
+                qWarning() << "    QQuickAction event:" << action.event->type();
             else
-                qWarning() << "    QDeclarativeAction:" << action.property.object()
+                qWarning() << "    QQuickAction:" << action.property.object()
                            << action.property.name() << "From:" << action.fromValue 
                            << "To:" << action.toValue;
         }
@@ -709,20 +709,20 @@ void QDeclarativeState::apply(QDeclarativeTransition *trans, QDeclarativeState *
     d->transitionManager.transition(applyList, trans);
 }
 
-QDeclarativeStateOperation::ActionList QDeclarativeStateOperation::actions()
+QQuickStateOperation::ActionList QQuickStateOperation::actions()
 {
     return ActionList();
 }
 
-QDeclarativeState *QDeclarativeStateOperation::state() const
+QQuickState *QQuickStateOperation::state() const
 {
-    Q_D(const QDeclarativeStateOperation);
+    Q_D(const QQuickStateOperation);
     return d->m_state;
 }
 
-void QDeclarativeStateOperation::setState(QDeclarativeState *state)
+void QQuickStateOperation::setState(QQuickState *state)
 {
-    Q_D(QDeclarativeStateOperation);
+    Q_D(QQuickStateOperation);
     d->m_state = state;
 }
 
diff --git a/src/quick/util/qdeclarativestate_p.h b/src/quick/util/qquickstate_p.h
index 5c2606e7cd..7dfc1daa44 100644
--- a/src/quick/util/qdeclarativestate_p.h
+++ b/src/quick/util/qquickstate_p.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
@@ -39,11 +39,11 @@
 **
 ****************************************************************************/
 
-#ifndef QDECLARATIVESTATE_H
-#define QDECLARATIVESTATE_H
+#ifndef QQUICKSTATE_H
+#define QQUICKSTATE_H
 
-#include <qdeclarative.h>
-#include <qdeclarativeproperty.h>
+#include <qqml.h>
+#include <qqmlproperty.h>
 #include <QtCore/qobject.h>
 #include <QtCore/qsharedpointer.h>
 #include <private/qtquickglobal_p.h>
@@ -52,30 +52,30 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-class QDeclarativeActionEvent;
-class QDeclarativeAbstractBinding;
-class QDeclarativeBinding;
-class QDeclarativeExpression;
-class Q_QUICK_PRIVATE_EXPORT QDeclarativeAction
+class QQuickActionEvent;
+class QQmlAbstractBinding;
+class QQmlBinding;
+class QQmlExpression;
+class Q_QUICK_PRIVATE_EXPORT QQuickAction
 {
 public:
-    QDeclarativeAction();
-    QDeclarativeAction(QObject *, const QString &, const QVariant &);
-    QDeclarativeAction(QObject *, const QString &,
-                       QDeclarativeContext *, const QVariant &);
+    QQuickAction();
+    QQuickAction(QObject *, const QString &, const QVariant &);
+    QQuickAction(QObject *, const QString &,
+                       QQmlContext *, const QVariant &);
 
     bool restore:1;
     bool actionDone:1;
     bool reverseEvent:1;
     bool deletableToBinding:1;
 
-    QDeclarativeProperty property;
+    QQmlProperty property;
     QVariant fromValue;
     QVariant toValue;
 
-    QDeclarativeAbstractBinding *fromBinding;
-    QWeakPointer<QDeclarativeAbstractBinding> toBinding;
-    QDeclarativeActionEvent *event;
+    QQmlAbstractBinding *fromBinding;
+    QWeakPointer<QQmlAbstractBinding> toBinding;
+    QQuickActionEvent *event;
 
     //strictly for matching
     QObject *specifiedObject;
@@ -84,10 +84,10 @@ public:
     void deleteFromBinding();
 };
 
-class Q_AUTOTEST_EXPORT QDeclarativeActionEvent
+class Q_AUTOTEST_EXPORT QQuickActionEvent
 {
 public:
-    virtual ~QDeclarativeActionEvent();
+    virtual ~QQuickActionEvent();
 
     enum EventType { Script, SignalHandler, ParentChange, AnchorChanges };
     enum Reason { ActualChange, FastForward };
@@ -99,7 +99,7 @@ public:
     virtual void reverse(Reason reason = ActualChange);
     virtual void saveOriginals() {}
     virtual bool needsCopy() { return false; }
-    virtual void copyOriginals(QDeclarativeActionEvent *) {}
+    virtual void copyOriginals(QQuickActionEvent *) {}
 
     virtual bool isRewindable() { return isReversable(); }
     virtual void rewind() {}
@@ -108,87 +108,87 @@ public:
 
     virtual bool changesBindings();
     virtual void clearBindings();
-    virtual bool override(QDeclarativeActionEvent*other);
+    virtual bool override(QQuickActionEvent*other);
 };
 
-//### rename to QDeclarativeStateChange?
-class QDeclarativeStateGroup;
-class QDeclarativeState;
-class QDeclarativeStateOperationPrivate;
-class Q_QUICK_EXPORT QDeclarativeStateOperation : public QObject
+//### rename to QQuickStateChange?
+class QQuickStateGroup;
+class QQuickState;
+class QQuickStateOperationPrivate;
+class Q_QUICK_EXPORT QQuickStateOperation : public QObject
 {
     Q_OBJECT
 public:
-    QDeclarativeStateOperation(QObject *parent = 0)
+    QQuickStateOperation(QObject *parent = 0)
         : QObject(parent) {}
-    typedef QList<QDeclarativeAction> ActionList;
+    typedef QList<QQuickAction> ActionList;
 
     virtual ActionList actions();
 
-    QDeclarativeState *state() const;
-    void setState(QDeclarativeState *state);
+    QQuickState *state() const;
+    void setState(QQuickState *state);
 
 protected:
-    QDeclarativeStateOperation(QObjectPrivate &dd, QObject *parent = 0);
+    QQuickStateOperation(QObjectPrivate &dd, QObject *parent = 0);
 
 private:
-    Q_DECLARE_PRIVATE(QDeclarativeStateOperation)
-    Q_DISABLE_COPY(QDeclarativeStateOperation)
+    Q_DECLARE_PRIVATE(QQuickStateOperation)
+    Q_DISABLE_COPY(QQuickStateOperation)
 };
 
-typedef QDeclarativeStateOperation::ActionList QDeclarativeStateActions;
+typedef QQuickStateOperation::ActionList QQuickStateActions;
 
-class QDeclarativeTransition;
-class QDeclarativeStatePrivate;
-class Q_QUICK_EXPORT QDeclarativeState : public QObject
+class QQuickTransition;
+class QQuickStatePrivate;
+class Q_QUICK_EXPORT QQuickState : public QObject
 {
     Q_OBJECT
 
     Q_PROPERTY(QString name READ name WRITE setName)
-    Q_PROPERTY(QDeclarativeBinding *when READ when WRITE setWhen)
+    Q_PROPERTY(QQmlBinding *when READ when WRITE setWhen)
     Q_PROPERTY(QString extend READ extends WRITE setExtends)
-    Q_PROPERTY(QDeclarativeListProperty<QDeclarativeStateOperation> changes READ changes)
+    Q_PROPERTY(QQmlListProperty<QQuickStateOperation> changes READ changes)
     Q_CLASSINFO("DefaultProperty", "changes")
     Q_CLASSINFO("DeferredPropertyNames", "changes")
 
 public:
-    QDeclarativeState(QObject *parent=0);
-    virtual ~QDeclarativeState();
+    QQuickState(QObject *parent=0);
+    virtual ~QQuickState();
 
     QString name() const;
     void setName(const QString &);
     bool isNamed() const;
 
-    /*'when' is a QDeclarativeBinding to limit state changes oscillation
+    /*'when' is a QQmlBinding to limit state changes oscillation
      due to the unpredictable order of evaluation of bound expressions*/
     bool isWhenKnown() const;
-    QDeclarativeBinding *when() const;
-    void setWhen(QDeclarativeBinding *);
+    QQmlBinding *when() const;
+    void setWhen(QQmlBinding *);
 
     QString extends() const;
     void setExtends(const QString &);
 
-    QDeclarativeListProperty<QDeclarativeStateOperation> changes();
+    QQmlListProperty<QQuickStateOperation> changes();
     int operationCount() const;
-    QDeclarativeStateOperation *operationAt(int) const;
+    QQuickStateOperation *operationAt(int) const;
 
-    QDeclarativeState &operator<<(QDeclarativeStateOperation *);
+    QQuickState &operator<<(QQuickStateOperation *);
 
-    void apply(QDeclarativeTransition *, QDeclarativeState *revert);
+    void apply(QQuickTransition *, QQuickState *revert);
     void cancel();
 
-    QDeclarativeStateGroup *stateGroup() const;
-    void setStateGroup(QDeclarativeStateGroup *);
+    QQuickStateGroup *stateGroup() const;
+    void setStateGroup(QQuickStateGroup *);
 
     bool containsPropertyInRevertList(QObject *target, const QString &name) const;
     bool changeValueInRevertList(QObject *target, const QString &name, const QVariant &revertValue);
-    bool changeBindingInRevertList(QObject *target, const QString &name, QDeclarativeAbstractBinding *binding);
+    bool changeBindingInRevertList(QObject *target, const QString &name, QQmlAbstractBinding *binding);
     bool removeEntryFromRevertList(QObject *target, const QString &name);
-    void addEntryToRevertList(const QDeclarativeAction &action);
+    void addEntryToRevertList(const QQuickAction &action);
     void removeAllEntriesFromRevertList(QObject *target);
-    void addEntriesToRevertList(const QList<QDeclarativeAction> &actions);
+    void addEntriesToRevertList(const QList<QQuickAction> &actions);
     QVariant valueInRevertList(QObject *target, const QString &name) const;
-    QDeclarativeAbstractBinding *bindingInRevertList(QObject *target, const QString &name) const;
+    QQmlAbstractBinding *bindingInRevertList(QObject *target, const QString &name) const;
 
     bool isStateActive() const;
 
@@ -196,15 +196,15 @@ Q_SIGNALS:
     void completed();
 
 private:
-    Q_DECLARE_PRIVATE(QDeclarativeState)
-    Q_DISABLE_COPY(QDeclarativeState)
+    Q_DECLARE_PRIVATE(QQuickState)
+    Q_DISABLE_COPY(QQuickState)
 };
 
 QT_END_NAMESPACE
 
-QML_DECLARE_TYPE(QDeclarativeStateOperation)
-QML_DECLARE_TYPE(QDeclarativeState)
+QML_DECLARE_TYPE(QQuickStateOperation)
+QML_DECLARE_TYPE(QQuickState)
 
 QT_END_HEADER
 
-#endif // QDECLARATIVESTATE_H
+#endif // QQUICKSTATE_H
diff --git a/src/quick/util/qdeclarativestate_p_p.h b/src/quick/util/qquickstate_p_p.h
index 4cf2bf4561..e1cd85a00c 100644
--- a/src/quick/util/qdeclarativestate_p_p.h
+++ b/src/quick/util/qquickstate_p_p.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#ifndef QDECLARATIVESTATE_P_H
-#define QDECLARATIVESTATE_P_H
+#ifndef QQUICKSTATE_P_H
+#define QQUICKSTATE_P_H
 
 //
 //  W A R N I N G
@@ -53,24 +53,24 @@
 // We mean it.
 //
 
-#include "qdeclarativestate_p.h"
+#include "qquickstate_p.h"
 
-#include "qdeclarativetransitionmanager_p_p.h"
+#include "qquicktransitionmanager_p_p.h"
 
-#include <private/qdeclarativeproperty_p.h>
-#include <private/qdeclarativeguard_p.h>
+#include <private/qqmlproperty_p.h>
+#include <private/qqmlguard_p.h>
 
-#include <private/qdeclarativebinding_p.h>
+#include <private/qqmlbinding_p.h>
 
 #include <private/qobject_p.h>
 
 QT_BEGIN_NAMESPACE
 
-class QDeclarativeSimpleAction
+class QQuickSimpleAction
 {
 public:
     enum State { StartState, EndState };
-    QDeclarativeSimpleAction(const QDeclarativeAction &a, State state = StartState)
+    QQuickSimpleAction(const QQuickAction &a, State state = StartState)
     {
         m_property = a.property;
         m_specifiedObject = a.specifiedObject;
@@ -78,8 +78,8 @@ public:
         m_event = a.event;
         if (state == StartState) {
             m_value = a.fromValue;
-            if (QDeclarativePropertyPrivate::binding(m_property)) {
-                m_binding = QDeclarativeAbstractBinding::getPointer(QDeclarativePropertyPrivate::binding(m_property));
+            if (QQmlPropertyPrivate::binding(m_property)) {
+                m_binding = QQmlAbstractBinding::getPointer(QQmlPropertyPrivate::binding(m_property));
             }
             m_reverseEvent = true;
         } else {
@@ -89,14 +89,14 @@ public:
         }
     }
 
-    ~QDeclarativeSimpleAction()
+    ~QQuickSimpleAction()
     {
     }
 
-    QDeclarativeSimpleAction(const QDeclarativeSimpleAction &other)
+    QQuickSimpleAction(const QQuickSimpleAction &other)
         :  m_property(other.m_property),
         m_value(other.m_value),
-        m_binding(QDeclarativeAbstractBinding::getPointer(other.binding())),
+        m_binding(QQmlAbstractBinding::getPointer(other.binding())),
         m_specifiedObject(other.m_specifiedObject),
         m_specifiedProperty(other.m_specifiedProperty),
         m_event(other.m_event),
@@ -104,11 +104,11 @@ public:
     {
     }
 
-    QDeclarativeSimpleAction &operator =(const QDeclarativeSimpleAction &other)
+    QQuickSimpleAction &operator =(const QQuickSimpleAction &other)
     {
         m_property = other.m_property;
         m_value = other.m_value;
-        m_binding = QDeclarativeAbstractBinding::getPointer(other.binding());
+        m_binding = QQmlAbstractBinding::getPointer(other.binding());
         m_specifiedObject = other.m_specifiedObject;
         m_specifiedProperty = other.m_specifiedProperty;
         m_event = other.m_event;
@@ -117,12 +117,12 @@ public:
         return *this;
     }
 
-    void setProperty(const QDeclarativeProperty &property)
+    void setProperty(const QQmlProperty &property)
     {
         m_property = property;
     }
 
-    const QDeclarativeProperty &property() const
+    const QQmlProperty &property() const
     {
         return m_property;
     }
@@ -137,12 +137,12 @@ public:
         return m_value;
     }
 
-    void setBinding(QDeclarativeAbstractBinding *binding)
+    void setBinding(QQmlAbstractBinding *binding)
     {
-        m_binding = QDeclarativeAbstractBinding::getPointer(binding);
+        m_binding = QQmlAbstractBinding::getPointer(binding);
     }
 
-    QDeclarativeAbstractBinding *binding() const
+    QQmlAbstractBinding *binding() const
     {
         return m_binding.data();
     }
@@ -157,7 +157,7 @@ public:
         return m_specifiedProperty;
     }
 
-    QDeclarativeActionEvent *event() const
+    QQuickActionEvent *event() const
     {
         return m_event;
     }
@@ -168,97 +168,97 @@ public:
     }
 
 private:
-    QDeclarativeProperty m_property;
+    QQmlProperty m_property;
     QVariant m_value;
-    QDeclarativeAbstractBinding::Pointer m_binding;
+    QQmlAbstractBinding::Pointer m_binding;
     QObject *m_specifiedObject;
     QString m_specifiedProperty;
-    QDeclarativeActionEvent *m_event;
+    QQuickActionEvent *m_event;
     bool m_reverseEvent;
 };
 
-class QDeclarativeRevertAction
+class QQuickRevertAction
 {
 public:
-    QDeclarativeRevertAction() : event(0) {}
-    QDeclarativeRevertAction(const QDeclarativeProperty &prop) : property(prop), event(0) {}
-    QDeclarativeRevertAction(QDeclarativeActionEvent *e) : event(e) {}
-    QDeclarativeProperty property;
-    QDeclarativeActionEvent *event;
+    QQuickRevertAction() : event(0) {}
+    QQuickRevertAction(const QQmlProperty &prop) : property(prop), event(0) {}
+    QQuickRevertAction(QQuickActionEvent *e) : event(e) {}
+    QQmlProperty property;
+    QQuickActionEvent *event;
 };
 
-class QDeclarativeStateOperationPrivate : public QObjectPrivate
+class QQuickStateOperationPrivate : public QObjectPrivate
 {
-    Q_DECLARE_PUBLIC(QDeclarativeStateOperation)
+    Q_DECLARE_PUBLIC(QQuickStateOperation)
 
 public:
 
-    QDeclarativeStateOperationPrivate()
+    QQuickStateOperationPrivate()
     : m_state(0) {}
 
-    QDeclarativeState *m_state;
+    QQuickState *m_state;
 };
 
-class QDeclarativeStatePrivate : public QObjectPrivate
+class QQuickStatePrivate : public QObjectPrivate
 {
-    Q_DECLARE_PUBLIC(QDeclarativeState)
+    Q_DECLARE_PUBLIC(QQuickState)
 
 public:
-    QDeclarativeStatePrivate()
+    QQuickStatePrivate()
     : when(0), named(false), inState(false), group(0) {}
 
-    typedef QList<QDeclarativeSimpleAction> SimpleActionList;
+    typedef QList<QQuickSimpleAction> SimpleActionList;
 
     QString name;
-    QDeclarativeBinding *when;
+    QQmlBinding *when;
     bool named;
 
-    struct OperationGuard : public QDeclarativeGuard<QDeclarativeStateOperation>
+    struct OperationGuard : public QQmlGuard<QQuickStateOperation>
     {
         OperationGuard(QObject *obj, QList<OperationGuard> *l) : list(l) { 
-            setObject(static_cast<QDeclarativeStateOperation *>(obj));
+            setObject(static_cast<QQuickStateOperation *>(obj));
         }
         QList<OperationGuard> *list;
-        void objectDestroyed(QDeclarativeStateOperation *) {
+        void objectDestroyed(QQuickStateOperation *) {
             // we assume priv will always be destroyed after objectDestroyed calls
             list->removeOne(*this);
         }
     };
     QList<OperationGuard> operations;
 
-    static void operations_append(QDeclarativeListProperty<QDeclarativeStateOperation> *prop, QDeclarativeStateOperation *op) {
+    static void operations_append(QQmlListProperty<QQuickStateOperation> *prop, QQuickStateOperation *op) {
         QList<OperationGuard> *list = static_cast<QList<OperationGuard> *>(prop->data);
-        op->setState(qobject_cast<QDeclarativeState*>(prop->object));
+        op->setState(qobject_cast<QQuickState*>(prop->object));
         list->append(OperationGuard(op, list));
     }
-    static void operations_clear(QDeclarativeListProperty<QDeclarativeStateOperation> *prop) {
+    static void operations_clear(QQmlListProperty<QQuickStateOperation> *prop) {
         QList<OperationGuard> *list = static_cast<QList<OperationGuard> *>(prop->data);
         QMutableListIterator<OperationGuard> listIterator(*list);
         while(listIterator.hasNext())
             listIterator.next()->setState(0);
         list->clear();
     }
-    static int operations_count(QDeclarativeListProperty<QDeclarativeStateOperation> *prop) {
+    static int operations_count(QQmlListProperty<QQuickStateOperation> *prop) {
         QList<OperationGuard> *list = static_cast<QList<OperationGuard> *>(prop->data);
         return list->count();
     }
-    static QDeclarativeStateOperation *operations_at(QDeclarativeListProperty<QDeclarativeStateOperation> *prop, int index) {
+    static QQuickStateOperation *operations_at(QQmlListProperty<QQuickStateOperation> *prop, int index) {
         QList<OperationGuard> *list = static_cast<QList<OperationGuard> *>(prop->data);
         return list->at(index);
     }
 
-    QDeclarativeTransitionManager transitionManager;
+    QQuickTransitionManager transitionManager;
 
     SimpleActionList revertList;
-    QList<QDeclarativeRevertAction> reverting;
+    QList<QQuickRevertAction> reverting;
     QString extends;
     mutable bool inState;
-    QDeclarativeStateGroup *group;
+    QQuickStateGroup *group;
 
-    QDeclarativeStateOperation::ActionList generateActionList() const;
+    QQuickStateOperation::ActionList generateActionList() const;
     void complete();
 };
 
 QT_END_NAMESPACE
 
-#endif // QDECLARATIVESTATE_P_H
+#endif // QQUICKSTATE_P_H
diff --git a/src/quick/util/qdeclarativestateoperations.cpp b/src/quick/util/qquickstatechangescript.cpp
index 3ecf4973d5..4dedbcc920 100644
--- a/src/quick/util/qdeclarativestateoperations.cpp
+++ b/src/quick/util/qquickstatechangescript.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
@@ -39,17 +39,17 @@
 **
 ****************************************************************************/
 
-#include "qdeclarativestateoperations_p.h"
+#include "qquickstatechangescript_p.h"
 
-#include <qdeclarative.h>
-#include <qdeclarativecontext.h>
-#include <qdeclarativeexpression.h>
-#include <qdeclarativeinfo.h>
-#include <private/qdeclarativeguard_p.h>
-#include <private/qdeclarativecontext_p.h>
-#include <private/qdeclarativeproperty_p.h>
-#include <private/qdeclarativebinding_p.h>
-#include "qdeclarativestate_p_p.h"
+#include <qqml.h>
+#include <qqmlcontext.h>
+#include <qqmlexpression.h>
+#include <qqmlinfo.h>
+#include <private/qqmlguard_p.h>
+#include <private/qqmlcontext_p.h>
+#include <private/qqmlproperty_p.h>
+#include <private/qqmlbinding_p.h>
+#include "qquickstate_p_p.h"
 
 #include <QtCore/qdebug.h>
 #include <QtCore/qmath.h>
@@ -58,17 +58,17 @@
 
 QT_BEGIN_NAMESPACE
 
-class QDeclarativeStateChangeScriptPrivate : public QDeclarativeStateOperationPrivate
+class QQuickStateChangeScriptPrivate : public QQuickStateOperationPrivate
 {
 public:
-    QDeclarativeStateChangeScriptPrivate() {}
+    QQuickStateChangeScriptPrivate() {}
 
-    QDeclarativeScriptString script;
+    QQmlScriptString script;
     QString name;
 };
 
 /*!
-    \qmlclass StateChangeScript QDeclarativeStateChangeScript
+    \qmlclass StateChangeScript QQuickStateChangeScript
     \inqmlmodule QtQuick 2
     \ingroup qml-state-elements
     \brief The StateChangeScript element allows you to run a script in a state.
@@ -82,12 +82,12 @@ public:
     \sa ScriptAction
 */
 
-QDeclarativeStateChangeScript::QDeclarativeStateChangeScript(QObject *parent)
-: QDeclarativeStateOperation(*(new QDeclarativeStateChangeScriptPrivate), parent)
+QQuickStateChangeScript::QQuickStateChangeScript(QObject *parent)
+: QQuickStateOperation(*(new QQuickStateChangeScriptPrivate), parent)
 {
 }
 
-QDeclarativeStateChangeScript::~QDeclarativeStateChangeScript()
+QQuickStateChangeScript::~QQuickStateChangeScript()
 {
 }
 
@@ -95,15 +95,15 @@ QDeclarativeStateChangeScript::~QDeclarativeStateChangeScript()
     \qmlproperty script QtQuick2::StateChangeScript::script
     This property holds the script to run when the state is current.
 */
-QDeclarativeScriptString QDeclarativeStateChangeScript::script() const
+QQmlScriptString QQuickStateChangeScript::script() const
 {
-    Q_D(const QDeclarativeStateChangeScript);
+    Q_D(const QQuickStateChangeScript);
     return d->script;
 }
 
-void QDeclarativeStateChangeScript::setScript(const QDeclarativeScriptString &s)
+void QQuickStateChangeScript::setScript(const QQmlScriptString &s)
 {
-    Q_D(QDeclarativeStateChangeScript);
+    Q_D(QQuickStateChangeScript);
     d->script = s;
 }
 
@@ -114,44 +114,45 @@ void QDeclarativeStateChangeScript::setScript(const QDeclarativeScriptString &s)
 
     \sa ScriptAction::scriptName
 */
-QString QDeclarativeStateChangeScript::name() const
+QString QQuickStateChangeScript::name() const
 {
-    Q_D(const QDeclarativeStateChangeScript);
+    Q_D(const QQuickStateChangeScript);
     return d->name;
 }
 
-void QDeclarativeStateChangeScript::setName(const QString &n)
+void QQuickStateChangeScript::setName(const QString &n)
 {
-    Q_D(QDeclarativeStateChangeScript);
+    Q_D(QQuickStateChangeScript);
     d->name = n;
 }
 
-void QDeclarativeStateChangeScript::execute(Reason)
+void QQuickStateChangeScript::execute(Reason)
 {
-    Q_D(QDeclarativeStateChangeScript);
+    Q_D(QQuickStateChangeScript);
     if (!d->script.script().isEmpty()) {
-        QDeclarativeExpression expr(d->script);
+        QQmlExpression expr(d->script);
         expr.evaluate();
         if (expr.hasError())
             qmlInfo(this, expr.error());
     }
 }
 
-QDeclarativeStateChangeScript::ActionList QDeclarativeStateChangeScript::actions()
+QQuickStateChangeScript::ActionList QQuickStateChangeScript::actions()
 {
     ActionList rv;
-    QDeclarativeAction a;
+    QQuickAction a;
     a.event = this;
     rv << a;
     return rv;
 }
 
-QDeclarativeActionEvent::EventType QDeclarativeStateChangeScript::type() const
+QQuickActionEvent::EventType QQuickStateChangeScript::type() const
 {
     return Script;
 }
 
-#include <moc_qdeclarativestateoperations_p.cpp>
+
+#include <moc_qquickstatechangescript_p.cpp>
 
 QT_END_NAMESPACE
 
diff --git a/src/quick/util/qdeclarativestateoperations_p.h b/src/quick/util/qquickstatechangescript_p.h
index a64a7e2972..444657d245 100644
--- a/src/quick/util/qdeclarativestateoperations_p.h
+++ b/src/quick/util/qquickstatechangescript_p.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
@@ -39,35 +39,35 @@
 **
 ****************************************************************************/
 
-#ifndef QDECLARATIVESTATEOPERATIONS_H
-#define QDECLARATIVESTATEOPERATIONS_H
+#ifndef QQUICKSTATEOPERATIONS_H
+#define QQUICKSTATEOPERATIONS_H
 
-#include "qdeclarativestate_p.h"
-#include <qdeclarativescriptstring.h>
+#include "qquickstate_p.h"
+#include <qqmlscriptstring.h>
 
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-class QDeclarativeStateChangeScriptPrivate;
-class Q_AUTOTEST_EXPORT QDeclarativeStateChangeScript : public QDeclarativeStateOperation, public QDeclarativeActionEvent
+class QQuickStateChangeScriptPrivate;
+class Q_AUTOTEST_EXPORT QQuickStateChangeScript : public QQuickStateOperation, public QQuickActionEvent
 {
     Q_OBJECT
-    Q_DECLARE_PRIVATE(QDeclarativeStateChangeScript)
+    Q_DECLARE_PRIVATE(QQuickStateChangeScript)
 
-    Q_PROPERTY(QDeclarativeScriptString script READ script WRITE setScript)
+    Q_PROPERTY(QQmlScriptString script READ script WRITE setScript)
     Q_PROPERTY(QString name READ name WRITE setName)
 
 public:
-    QDeclarativeStateChangeScript(QObject *parent=0);
-    ~QDeclarativeStateChangeScript();
+    QQuickStateChangeScript(QObject *parent=0);
+    ~QQuickStateChangeScript();
 
     virtual ActionList actions();
 
     virtual EventType type() const;
 
-    QDeclarativeScriptString script() const;
-    void setScript(const QDeclarativeScriptString &);
+    QQmlScriptString script() const;
+    void setScript(const QQmlScriptString &);
 
     QString name() const;
     void setName(const QString &);
@@ -78,8 +78,8 @@ public:
 
 QT_END_NAMESPACE
 
-QML_DECLARE_TYPE(QDeclarativeStateChangeScript)
+QML_DECLARE_TYPE(QQuickStateChangeScript)
 
 QT_END_HEADER
 
-#endif // QDECLARATIVESTATEOPERATIONS_H
+#endif // QQUICKSTATEOPERATIONS_H
diff --git a/src/quick/util/qdeclarativestategroup.cpp b/src/quick/util/qquickstategroup.cpp
index 1ed3ffc582..3a3192716e 100644
--- a/src/quick/util/qdeclarativestategroup.cpp
+++ b/src/quick/util/qquickstategroup.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
@@ -39,60 +39,60 @@
 **
 ****************************************************************************/
 
-#include "qdeclarativestategroup_p.h"
+#include "qquickstategroup_p.h"
 
-#include "qdeclarativetransition_p.h"
+#include "qquicktransition_p.h"
 
-#include <private/qdeclarativebinding_p.h>
-#include <private/qdeclarativeglobal_p.h>
+#include <private/qqmlbinding_p.h>
+#include <private/qqmlglobal_p.h>
 
 #include <QtCore/qstringbuilder.h>
 #include <QtCore/qstringlist.h>
 #include <QtCore/qdebug.h>
 
 #include <private/qobject_p.h>
-#include <qdeclarativeinfo.h>
+#include <qqmlinfo.h>
 
 QT_BEGIN_NAMESPACE
 
 DEFINE_BOOL_CONFIG_OPTION(stateChangeDebug, STATECHANGE_DEBUG);
 
-class QDeclarativeStateGroupPrivate : public QObjectPrivate
+class QQuickStateGroupPrivate : public QObjectPrivate
 {
-    Q_DECLARE_PUBLIC(QDeclarativeStateGroup)
+    Q_DECLARE_PUBLIC(QQuickStateGroup)
 public:
-    QDeclarativeStateGroupPrivate()
+    QQuickStateGroupPrivate()
     : nullState(0), componentComplete(true),
       ignoreTrans(false), applyingState(false), unnamedCount(0) {}
 
     QString currentState;
-    QDeclarativeState *nullState;
+    QQuickState *nullState;
 
-    static void append_state(QDeclarativeListProperty<QDeclarativeState> *list, QDeclarativeState *state);
-    static int count_state(QDeclarativeListProperty<QDeclarativeState> *list);
-    static QDeclarativeState *at_state(QDeclarativeListProperty<QDeclarativeState> *list, int index);
-    static void clear_states(QDeclarativeListProperty<QDeclarativeState> *list);
+    static void append_state(QQmlListProperty<QQuickState> *list, QQuickState *state);
+    static int count_state(QQmlListProperty<QQuickState> *list);
+    static QQuickState *at_state(QQmlListProperty<QQuickState> *list, int index);
+    static void clear_states(QQmlListProperty<QQuickState> *list);
 
-    static void append_transition(QDeclarativeListProperty<QDeclarativeTransition> *list, QDeclarativeTransition *state);
-    static int count_transitions(QDeclarativeListProperty<QDeclarativeTransition> *list);
-    static QDeclarativeTransition *at_transition(QDeclarativeListProperty<QDeclarativeTransition> *list, int index);
-    static void clear_transitions(QDeclarativeListProperty<QDeclarativeTransition> *list);
+    static void append_transition(QQmlListProperty<QQuickTransition> *list, QQuickTransition *state);
+    static int count_transitions(QQmlListProperty<QQuickTransition> *list);
+    static QQuickTransition *at_transition(QQmlListProperty<QQuickTransition> *list, int index);
+    static void clear_transitions(QQmlListProperty<QQuickTransition> *list);
 
-    QList<QDeclarativeState *> states;
-    QList<QDeclarativeTransition *> transitions;
+    QList<QQuickState *> states;
+    QList<QQuickTransition *> transitions;
 
     bool componentComplete;
     bool ignoreTrans;
     bool applyingState;
     int unnamedCount;
 
-    QDeclarativeTransition *findTransition(const QString &from, const QString &to);
+    QQuickTransition *findTransition(const QString &from, const QString &to);
     void setCurrentStateInternal(const QString &state, bool = false);
     bool updateAutoState();
 };
 
 /*!
-   \qmlclass StateGroup QDeclarativeStateGroup
+   \qmlclass StateGroup QQuickStateGroup
     \inqmlmodule QtQuick 2
    \ingroup qml-state-elements
    \brief The StateGroup element provides state support for non-Item elements.
@@ -118,24 +118,24 @@ public:
    }
    \endqml
 
-   \sa {qmlstate}{States} {QML Animation and Transitions}{Transitions}, {QtDeclarative}
+   \sa {qmlstate}{States} {QML Animation and Transitions}{Transitions}, {QtQml}
 */
 
-QDeclarativeStateGroup::QDeclarativeStateGroup(QObject *parent)
-    : QObject(*(new QDeclarativeStateGroupPrivate), parent)
+QQuickStateGroup::QQuickStateGroup(QObject *parent)
+    : QObject(*(new QQuickStateGroupPrivate), parent)
 {
 }
 
-QDeclarativeStateGroup::~QDeclarativeStateGroup()
+QQuickStateGroup::~QQuickStateGroup()
 {
-    Q_D(const QDeclarativeStateGroup);
+    Q_D(const QQuickStateGroup);
     for (int i = 0; i < d->states.count(); ++i)
         d->states.at(i)->setStateGroup(0);
 }
 
-QList<QDeclarativeState *> QDeclarativeStateGroup::states() const
+QList<QQuickState *> QQuickStateGroup::states() const
 {
-    Q_D(const QDeclarativeStateGroup);
+    Q_D(const QQuickStateGroup);
     return d->states;
 }
 
@@ -159,18 +159,18 @@ QList<QDeclarativeState *> QDeclarativeStateGroup::states() const
 
   \sa {qmlstate}{States}
 */
-QDeclarativeListProperty<QDeclarativeState> QDeclarativeStateGroup::statesProperty()
+QQmlListProperty<QQuickState> QQuickStateGroup::statesProperty()
 {
-    Q_D(QDeclarativeStateGroup);
-    return QDeclarativeListProperty<QDeclarativeState>(this, &d->states, &QDeclarativeStateGroupPrivate::append_state,
-                                                       &QDeclarativeStateGroupPrivate::count_state,
-                                                       &QDeclarativeStateGroupPrivate::at_state,
-                                                       &QDeclarativeStateGroupPrivate::clear_states);
+    Q_D(QQuickStateGroup);
+    return QQmlListProperty<QQuickState>(this, &d->states, &QQuickStateGroupPrivate::append_state,
+                                                       &QQuickStateGroupPrivate::count_state,
+                                                       &QQuickStateGroupPrivate::at_state,
+                                                       &QQuickStateGroupPrivate::clear_states);
 }
 
-void QDeclarativeStateGroupPrivate::append_state(QDeclarativeListProperty<QDeclarativeState> *list, QDeclarativeState *state)
+void QQuickStateGroupPrivate::append_state(QQmlListProperty<QQuickState> *list, QQuickState *state)
 {
-    QDeclarativeStateGroup *_this = static_cast<QDeclarativeStateGroup *>(list->object);
+    QQuickStateGroup *_this = static_cast<QQuickStateGroup *>(list->object);
     if (state) {
         _this->d_func()->states.append(state);
         state->setStateGroup(_this);
@@ -178,21 +178,21 @@ void QDeclarativeStateGroupPrivate::append_state(QDeclarativeListProperty<QDecla
 
 }
 
-int QDeclarativeStateGroupPrivate::count_state(QDeclarativeListProperty<QDeclarativeState> *list)
+int QQuickStateGroupPrivate::count_state(QQmlListProperty<QQuickState> *list)
 {
-    QDeclarativeStateGroup *_this = static_cast<QDeclarativeStateGroup *>(list->object);
+    QQuickStateGroup *_this = static_cast<QQuickStateGroup *>(list->object);
     return _this->d_func()->states.count();
 }
 
-QDeclarativeState *QDeclarativeStateGroupPrivate::at_state(QDeclarativeListProperty<QDeclarativeState> *list, int index)
+QQuickState *QQuickStateGroupPrivate::at_state(QQmlListProperty<QQuickState> *list, int index)
 {
-    QDeclarativeStateGroup *_this = static_cast<QDeclarativeStateGroup *>(list->object);
+    QQuickStateGroup *_this = static_cast<QQuickStateGroup *>(list->object);
     return _this->d_func()->states.at(index);
 }
 
-void QDeclarativeStateGroupPrivate::clear_states(QDeclarativeListProperty<QDeclarativeState> *list)
+void QQuickStateGroupPrivate::clear_states(QQmlListProperty<QQuickState> *list)
 {
-    QDeclarativeStateGroup *_this = static_cast<QDeclarativeStateGroup *>(list->object);
+    QQuickStateGroup *_this = static_cast<QQuickStateGroup *>(list->object);
     _this->d_func()->setCurrentStateInternal(QString(), true);
     for (int i = 0; i < _this->d_func()->states.count(); ++i) {
         _this->d_func()->states.at(i)->setStateGroup(0);
@@ -220,37 +220,37 @@ void QDeclarativeStateGroupPrivate::clear_states(QDeclarativeListProperty<QDecla
 
   \sa {QML Animation and Transitions}{Transitions}
 */
-QDeclarativeListProperty<QDeclarativeTransition> QDeclarativeStateGroup::transitionsProperty()
+QQmlListProperty<QQuickTransition> QQuickStateGroup::transitionsProperty()
 {
-    Q_D(QDeclarativeStateGroup);
-    return QDeclarativeListProperty<QDeclarativeTransition>(this, &d->transitions, &QDeclarativeStateGroupPrivate::append_transition,
-                                                       &QDeclarativeStateGroupPrivate::count_transitions,
-                                                       &QDeclarativeStateGroupPrivate::at_transition,
-                                                       &QDeclarativeStateGroupPrivate::clear_transitions);
+    Q_D(QQuickStateGroup);
+    return QQmlListProperty<QQuickTransition>(this, &d->transitions, &QQuickStateGroupPrivate::append_transition,
+                                                       &QQuickStateGroupPrivate::count_transitions,
+                                                       &QQuickStateGroupPrivate::at_transition,
+                                                       &QQuickStateGroupPrivate::clear_transitions);
 }
 
-void QDeclarativeStateGroupPrivate::append_transition(QDeclarativeListProperty<QDeclarativeTransition> *list, QDeclarativeTransition *trans)
+void QQuickStateGroupPrivate::append_transition(QQmlListProperty<QQuickTransition> *list, QQuickTransition *trans)
 {
-    QDeclarativeStateGroup *_this = static_cast<QDeclarativeStateGroup *>(list->object);
+    QQuickStateGroup *_this = static_cast<QQuickStateGroup *>(list->object);
     if (trans)
         _this->d_func()->transitions.append(trans);
 }
 
-int QDeclarativeStateGroupPrivate::count_transitions(QDeclarativeListProperty<QDeclarativeTransition> *list)
+int QQuickStateGroupPrivate::count_transitions(QQmlListProperty<QQuickTransition> *list)
 {
-    QDeclarativeStateGroup *_this = static_cast<QDeclarativeStateGroup *>(list->object);
+    QQuickStateGroup *_this = static_cast<QQuickStateGroup *>(list->object);
     return _this->d_func()->transitions.count();
 }
 
-QDeclarativeTransition *QDeclarativeStateGroupPrivate::at_transition(QDeclarativeListProperty<QDeclarativeTransition> *list, int index)
+QQuickTransition *QQuickStateGroupPrivate::at_transition(QQmlListProperty<QQuickTransition> *list, int index)
 {
-    QDeclarativeStateGroup *_this = static_cast<QDeclarativeStateGroup *>(list->object);
+    QQuickStateGroup *_this = static_cast<QQuickStateGroup *>(list->object);
     return _this->d_func()->transitions.at(index);
 }
 
-void QDeclarativeStateGroupPrivate::clear_transitions(QDeclarativeListProperty<QDeclarativeTransition> *list)
+void QQuickStateGroupPrivate::clear_transitions(QQmlListProperty<QQuickTransition> *list)
 {
-    QDeclarativeStateGroup *_this = static_cast<QDeclarativeStateGroup *>(list->object);
+    QQuickStateGroup *_this = static_cast<QQuickStateGroup *>(list->object);
     _this->d_func()->transitions.clear();
 }
 
@@ -277,34 +277,34 @@ void QDeclarativeStateGroupPrivate::clear_transitions(QDeclarativeListProperty<Q
 
   \sa {qmlstates}{States}
 */
-QString QDeclarativeStateGroup::state() const
+QString QQuickStateGroup::state() const
 {
-    Q_D(const QDeclarativeStateGroup);
+    Q_D(const QQuickStateGroup);
     return d->currentState;
 }
 
-void QDeclarativeStateGroup::setState(const QString &state)
+void QQuickStateGroup::setState(const QString &state)
 {
-    Q_D(QDeclarativeStateGroup);
+    Q_D(QQuickStateGroup);
     if (d->currentState == state)
         return;
 
     d->setCurrentStateInternal(state);
 }
 
-void QDeclarativeStateGroup::classBegin()
+void QQuickStateGroup::classBegin()
 {
-    Q_D(QDeclarativeStateGroup);
+    Q_D(QQuickStateGroup);
     d->componentComplete = false;
 }
 
-void QDeclarativeStateGroup::componentComplete()
+void QQuickStateGroup::componentComplete()
 {
-    Q_D(QDeclarativeStateGroup);
+    Q_D(QQuickStateGroup);
     d->componentComplete = true;
 
     for (int ii = 0; ii < d->states.count(); ++ii) {
-        QDeclarativeState *state = d->states.at(ii);
+        QQuickState *state = d->states.at(ii);
         if (!state->isNamed())
             state->setName(QLatin1String("anonymousState") % QString::number(++d->unnamedCount));
     }
@@ -321,21 +321,21 @@ void QDeclarativeStateGroup::componentComplete()
 /*!
     Returns true if the state was changed, otherwise false.
 */
-bool QDeclarativeStateGroup::updateAutoState()
+bool QQuickStateGroup::updateAutoState()
 {
-    Q_D(QDeclarativeStateGroup);
+    Q_D(QQuickStateGroup);
     return d->updateAutoState();
 }
 
-bool QDeclarativeStateGroupPrivate::updateAutoState()
+bool QQuickStateGroupPrivate::updateAutoState()
 {
-    Q_Q(QDeclarativeStateGroup);
+    Q_Q(QQuickStateGroup);
     if (!componentComplete)
         return false;
 
     bool revert = false;
     for (int ii = 0; ii < states.count(); ++ii) {
-        QDeclarativeState *state = states.at(ii);
+        QQuickState *state = states.at(ii);
         if (state->isWhenKnown()) {
             if (state->isNamed()) {
                 if (state->when() && state->when()->evaluate().toBool()) {
@@ -363,15 +363,15 @@ bool QDeclarativeStateGroupPrivate::updateAutoState()
     }
 }
 
-QDeclarativeTransition *QDeclarativeStateGroupPrivate::findTransition(const QString &from, const QString &to)
+QQuickTransition *QQuickStateGroupPrivate::findTransition(const QString &from, const QString &to)
 {
-    QDeclarativeTransition *highest = 0;
+    QQuickTransition *highest = 0;
     int score = 0;
     bool reversed = false;
     bool done = false;
 
     for (int ii = 0; !done && ii < transitions.count(); ++ii) {
-        QDeclarativeTransition *t = transitions.at(ii);
+        QQuickTransition *t = transitions.at(ii);
         if (!t->enabled())
             continue;
         for (int ii = 0; ii < 2; ++ii)
@@ -428,10 +428,10 @@ QDeclarativeTransition *QDeclarativeStateGroupPrivate::findTransition(const QStr
     return highest;
 }
 
-void QDeclarativeStateGroupPrivate::setCurrentStateInternal(const QString &state, 
+void QQuickStateGroupPrivate::setCurrentStateInternal(const QString &state, 
                                                    bool ignoreTrans)
 {
-    Q_Q(QDeclarativeStateGroup);
+    Q_Q(QQuickStateGroup);
     if (!componentComplete) {
         currentState = state;
         return;
@@ -444,7 +444,7 @@ void QDeclarativeStateGroupPrivate::setCurrentStateInternal(const QString &state
 
     applyingState = true;
 
-    QDeclarativeTransition *transition = ignoreTrans ? 0 : findTransition(currentState, state);
+    QQuickTransition *transition = ignoreTrans ? 0 : findTransition(currentState, state);
     if (stateChangeDebug()) {
         qWarning() << this << "Changing state.  From" << currentState << ". To" << state;
         if (transition)
@@ -452,7 +452,7 @@ void QDeclarativeStateGroupPrivate::setCurrentStateInternal(const QString &state
                        << transition->toState();
     }
 
-    QDeclarativeState *oldState = 0;
+    QQuickState *oldState = 0;
     if (!currentState.isEmpty()) {
         for (int ii = 0; ii < states.count(); ++ii) {
             if (states.at(ii)->name() == currentState) {
@@ -465,7 +465,7 @@ void QDeclarativeStateGroupPrivate::setCurrentStateInternal(const QString &state
     currentState = state;
     emit q->stateChanged(currentState);
 
-    QDeclarativeState *newState = 0;
+    QQuickState *newState = 0;
     for (int ii = 0; ii < states.count(); ++ii) {
         if (states.at(ii)->name() == currentState) {
             newState = states.at(ii);
@@ -475,8 +475,8 @@ void QDeclarativeStateGroupPrivate::setCurrentStateInternal(const QString &state
 
     if (oldState == 0 || newState == 0) {
         if (!nullState) {
-            nullState = new QDeclarativeState;
-            QDeclarative_setParent_noEvent(nullState, q);
+            nullState = new QQuickState;
+            QQml_setParent_noEvent(nullState, q);
             nullState->setStateGroup(q);
         }
         if (!oldState) oldState = nullState;
@@ -487,11 +487,11 @@ void QDeclarativeStateGroupPrivate::setCurrentStateInternal(const QString &state
     applyingState = false;  //### consider removing this (don't allow state changes in transition)
 }
 
-QDeclarativeState *QDeclarativeStateGroup::findState(const QString &name) const
+QQuickState *QQuickStateGroup::findState(const QString &name) const
 {
-    Q_D(const QDeclarativeStateGroup);
+    Q_D(const QQuickStateGroup);
     for (int i = 0; i < d->states.count(); ++i) {
-        QDeclarativeState *state = d->states.at(i);
+        QQuickState *state = d->states.at(i);
         if (state->name() == name)
             return state;
     }
@@ -499,15 +499,15 @@ QDeclarativeState *QDeclarativeStateGroup::findState(const QString &name) const
     return 0;
 }
 
-void QDeclarativeStateGroup::removeState(QDeclarativeState *state)
+void QQuickStateGroup::removeState(QQuickState *state)
 {
-    Q_D(QDeclarativeStateGroup);
+    Q_D(QQuickStateGroup);
     d->states.removeOne(state);
 }
 
-void QDeclarativeStateGroup::stateAboutToComplete()
+void QQuickStateGroup::stateAboutToComplete()
 {
-    Q_D(QDeclarativeStateGroup);
+    Q_D(QQuickStateGroup);
     d->applyingState = false;
 }
 
diff --git a/src/quick/util/qdeclarativestategroup_p.h b/src/quick/util/qquickstategroup_p.h
index d0dc599a63..07e3c0505a 100644
--- a/src/quick/util/qdeclarativestategroup_p.h
+++ b/src/quick/util/qquickstategroup_p.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
@@ -39,40 +39,40 @@
 **
 ****************************************************************************/
 
-#ifndef QDECLARATIVESTATEGROUP_H
-#define QDECLARATIVESTATEGROUP_H
+#ifndef QQUICKSTATEGROUP_H
+#define QQUICKSTATEGROUP_H
 
-#include "qdeclarativestate_p.h"
+#include "qquickstate_p.h"
 
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-class QDeclarativeStateGroupPrivate;
-class Q_QUICK_EXPORT QDeclarativeStateGroup : public QObject, public QDeclarativeParserStatus
+class QQuickStateGroupPrivate;
+class Q_QUICK_EXPORT QQuickStateGroup : public QObject, public QQmlParserStatus
 {
     Q_OBJECT
-    Q_INTERFACES(QDeclarativeParserStatus)
-    Q_DECLARE_PRIVATE(QDeclarativeStateGroup)
+    Q_INTERFACES(QQmlParserStatus)
+    Q_DECLARE_PRIVATE(QQuickStateGroup)
 
     Q_PROPERTY(QString state READ state WRITE setState NOTIFY stateChanged)
-    Q_PROPERTY(QDeclarativeListProperty<QDeclarativeState> states READ statesProperty DESIGNABLE false)
-    Q_PROPERTY(QDeclarativeListProperty<QDeclarativeTransition> transitions READ transitionsProperty DESIGNABLE false)
+    Q_PROPERTY(QQmlListProperty<QQuickState> states READ statesProperty DESIGNABLE false)
+    Q_PROPERTY(QQmlListProperty<QQuickTransition> transitions READ transitionsProperty DESIGNABLE false)
 
 public:
-    QDeclarativeStateGroup(QObject * = 0);
-    virtual ~QDeclarativeStateGroup();
+    QQuickStateGroup(QObject * = 0);
+    virtual ~QQuickStateGroup();
 
     QString state() const;
     void setState(const QString &);
 
-    QDeclarativeListProperty<QDeclarativeState> statesProperty();
-    QList<QDeclarativeState *> states() const;
+    QQmlListProperty<QQuickState> statesProperty();
+    QList<QQuickState *> states() const;
 
-    QDeclarativeListProperty<QDeclarativeTransition> transitionsProperty();
+    QQmlListProperty<QQuickTransition> transitionsProperty();
 
-    QDeclarativeState *findState(const QString &name) const;
-    void removeState(QDeclarativeState *state);
+    QQuickState *findState(const QString &name) const;
+    void removeState(QQuickState *state);
 
     virtual void classBegin();
     virtual void componentComplete();
@@ -80,16 +80,16 @@ Q_SIGNALS:
     void stateChanged(const QString &);
 
 private:
-    friend class QDeclarativeState;
-    friend class QDeclarativeStatePrivate;
+    friend class QQuickState;
+    friend class QQuickStatePrivate;
     bool updateAutoState();
     void stateAboutToComplete();
 };
 
 QT_END_NAMESPACE
 
-QML_DECLARE_TYPE(QDeclarativeStateGroup)
+QML_DECLARE_TYPE(QQuickStateGroup)
 
 QT_END_HEADER
 
-#endif // QDECLARATIVESTATEGROUP_H
+#endif // QQUICKSTATEGROUP_H
diff --git a/src/quick/util/qdeclarativestyledtext.cpp b/src/quick/util/qquickstyledtext.cpp
index 164e33cec1..87d447169c 100644
--- a/src/quick/util/qdeclarativestyledtext.cpp
+++ b/src/quick/util/qquickstyledtext.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
@@ -45,11 +45,11 @@
 #include <QTextLayout>
 #include <QDebug>
 #include <qmath.h>
-#include "qdeclarativestyledtext_p.h"
-#include <QDeclarativeContext>
+#include "qquickstyledtext_p.h"
+#include <QQmlContext>
 
 /*
-    QDeclarativeStyledText supports few tags:
+    QQuickStyledText supports few tags:
 
     <b></b> - bold
     <strong></strong> - bold
@@ -69,7 +69,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class QDeclarativeStyledTextPrivate
+class QQuickStyledTextPrivate
 {
 public:
     enum ListType { Ordered, Unordered };
@@ -81,10 +81,10 @@ public:
         ListFormat format;
     };
 
-    QDeclarativeStyledTextPrivate(const QString &t, QTextLayout &l,
-                                  QList<QDeclarativeStyledTextImgTag*> &imgTags,
+    QQuickStyledTextPrivate(const QString &t, QTextLayout &l,
+                                  QList<QQuickStyledTextImgTag*> &imgTags,
                                   const QUrl &baseUrl,
-                                  QDeclarativeContext *context,
+                                  QQmlContext *context,
                                   bool preloadImages)
         : text(t), layout(l), imgTags(&imgTags), baseFont(layout.font()), baseUrl(baseUrl), hasNewLine(false), nbImages(0), updateImagePositions(false)
         , preFormat(false), prependSpace(false), hasSpace(true), preloadImages(preloadImages), context(context)
@@ -115,7 +115,7 @@ public:
 
     QString text;
     QTextLayout &layout;
-    QList<QDeclarativeStyledTextImgTag*> *imgTags;
+    QList<QQuickStyledTextImgTag*> *imgTags;
     QFont baseFont;
     QStack<List> listStack;
     QUrl baseUrl;
@@ -126,7 +126,7 @@ public:
     bool prependSpace;
     bool hasSpace;
     bool preloadImages;
-    QDeclarativeContext *context;
+    QQmlContext *context;
 
     static const QChar lessThan;
     static const QChar greaterThan;
@@ -143,46 +143,46 @@ public:
     static const int tabsize = 6;
 };
 
-const QChar QDeclarativeStyledTextPrivate::lessThan(QLatin1Char('<'));
-const QChar QDeclarativeStyledTextPrivate::greaterThan(QLatin1Char('>'));
-const QChar QDeclarativeStyledTextPrivate::equals(QLatin1Char('='));
-const QChar QDeclarativeStyledTextPrivate::singleQuote(QLatin1Char('\''));
-const QChar QDeclarativeStyledTextPrivate::doubleQuote(QLatin1Char('\"'));
-const QChar QDeclarativeStyledTextPrivate::slash(QLatin1Char('/'));
-const QChar QDeclarativeStyledTextPrivate::ampersand(QLatin1Char('&'));
-const QChar QDeclarativeStyledTextPrivate::bullet(0x2022);
-const QChar QDeclarativeStyledTextPrivate::disc(0x25e6);
-const QChar QDeclarativeStyledTextPrivate::square(0x25a1);
-const QChar QDeclarativeStyledTextPrivate::lineFeed(QLatin1Char('\n'));
-const QChar QDeclarativeStyledTextPrivate::space(QLatin1Char(' '));
-
-QDeclarativeStyledText::QDeclarativeStyledText(const QString &string, QTextLayout &layout,
-                                               QList<QDeclarativeStyledTextImgTag*> &imgTags,
+const QChar QQuickStyledTextPrivate::lessThan(QLatin1Char('<'));
+const QChar QQuickStyledTextPrivate::greaterThan(QLatin1Char('>'));
+const QChar QQuickStyledTextPrivate::equals(QLatin1Char('='));
+const QChar QQuickStyledTextPrivate::singleQuote(QLatin1Char('\''));
+const QChar QQuickStyledTextPrivate::doubleQuote(QLatin1Char('\"'));
+const QChar QQuickStyledTextPrivate::slash(QLatin1Char('/'));
+const QChar QQuickStyledTextPrivate::ampersand(QLatin1Char('&'));
+const QChar QQuickStyledTextPrivate::bullet(0x2022);
+const QChar QQuickStyledTextPrivate::disc(0x25e6);
+const QChar QQuickStyledTextPrivate::square(0x25a1);
+const QChar QQuickStyledTextPrivate::lineFeed(QLatin1Char('\n'));
+const QChar QQuickStyledTextPrivate::space(QLatin1Char(' '));
+
+QQuickStyledText::QQuickStyledText(const QString &string, QTextLayout &layout,
+                                               QList<QQuickStyledTextImgTag*> &imgTags,
                                                const QUrl &baseUrl,
-                                               QDeclarativeContext *context,
+                                               QQmlContext *context,
                                                bool preloadImages)
-    : d(new QDeclarativeStyledTextPrivate(string, layout, imgTags, baseUrl, context, preloadImages))
+    : d(new QQuickStyledTextPrivate(string, layout, imgTags, baseUrl, context, preloadImages))
 {
 }
 
-QDeclarativeStyledText::~QDeclarativeStyledText()
+QQuickStyledText::~QQuickStyledText()
 {
     delete d;
 }
 
-void QDeclarativeStyledText::parse(const QString &string, QTextLayout &layout,
-                                   QList<QDeclarativeStyledTextImgTag*> &imgTags,
+void QQuickStyledText::parse(const QString &string, QTextLayout &layout,
+                                   QList<QQuickStyledTextImgTag*> &imgTags,
                                    const QUrl &baseUrl,
-                                   QDeclarativeContext *context,
+                                   QQmlContext *context,
                                    bool preloadImages)
 {
     if (string.isEmpty())
         return;
-    QDeclarativeStyledText styledText(string, layout, imgTags, baseUrl, context, preloadImages);
+    QQuickStyledText styledText(string, layout, imgTags, baseUrl, context, preloadImages);
     styledText.d->parse();
 }
 
-void QDeclarativeStyledTextPrivate::parse()
+void QQuickStyledTextPrivate::parse()
 {
     QList<QTextLayout::FormatRange> ranges;
     QStack<QTextCharFormat> formatStack;
@@ -288,7 +288,7 @@ void QDeclarativeStyledTextPrivate::parse()
     layout.setAdditionalFormats(ranges);
 }
 
-void QDeclarativeStyledTextPrivate::appendText(const QString &textIn, int start, int length, QString &textOut)
+void QQuickStyledTextPrivate::appendText(const QString &textIn, int start, int length, QString &textOut)
 {
     if (prependSpace)
         textOut.append(space);
@@ -298,7 +298,7 @@ void QDeclarativeStyledTextPrivate::appendText(const QString &textIn, int start,
     hasNewLine = false;
 }
 
-bool QDeclarativeStyledTextPrivate::parseTag(const QChar *&ch, const QString &textIn, QString &textOut, QTextCharFormat &format)
+bool QQuickStyledTextPrivate::parseTag(const QChar *&ch, const QString &textIn, QString &textOut, QTextCharFormat &format)
 {
     skipSpace(ch);
 
@@ -438,7 +438,7 @@ bool QDeclarativeStyledTextPrivate::parseTag(const QChar *&ch, const QString &te
     return false;
 }
 
-bool QDeclarativeStyledTextPrivate::parseCloseTag(const QChar *&ch, const QString &textIn, QString &textOut)
+bool QQuickStyledTextPrivate::parseCloseTag(const QChar *&ch, const QString &textIn, QString &textOut)
 {
     skipSpace(ch);
 
@@ -516,7 +516,7 @@ bool QDeclarativeStyledTextPrivate::parseCloseTag(const QChar *&ch, const QStrin
     return false;
 }
 
-void QDeclarativeStyledTextPrivate::parseEntity(const QChar *&ch, const QString &textIn, QString &textOut)
+void QQuickStyledTextPrivate::parseEntity(const QChar *&ch, const QString &textIn, QString &textOut)
 {
     int entityStart = ch - textIn.constData();
     int entityLength = 0;
@@ -536,7 +536,7 @@ void QDeclarativeStyledTextPrivate::parseEntity(const QChar *&ch, const QString
     }
 }
 
-bool QDeclarativeStyledTextPrivate::parseFontAttributes(const QChar *&ch, const QString &textIn, QTextCharFormat &format)
+bool QQuickStyledTextPrivate::parseFontAttributes(const QChar *&ch, const QString &textIn, QTextCharFormat &format)
 {
     bool valid = false;
     QPair<QStringRef,QStringRef> attr;
@@ -560,7 +560,7 @@ bool QDeclarativeStyledTextPrivate::parseFontAttributes(const QChar *&ch, const
     return valid;
 }
 
-bool QDeclarativeStyledTextPrivate::parseOrderedListAttributes(const QChar *&ch, const QString &textIn)
+bool QQuickStyledTextPrivate::parseOrderedListAttributes(const QChar *&ch, const QString &textIn)
 {
     bool valid = false;
 
@@ -589,7 +589,7 @@ bool QDeclarativeStyledTextPrivate::parseOrderedListAttributes(const QChar *&ch,
     return valid;
 }
 
-bool QDeclarativeStyledTextPrivate::parseUnorderedListAttributes(const QChar *&ch, const QString &textIn)
+bool QQuickStyledTextPrivate::parseUnorderedListAttributes(const QChar *&ch, const QString &textIn)
 {
     bool valid = false;
 
@@ -614,7 +614,7 @@ bool QDeclarativeStyledTextPrivate::parseUnorderedListAttributes(const QChar *&c
     return valid;
 }
 
-bool QDeclarativeStyledTextPrivate::parseAnchorAttributes(const QChar *&ch, const QString &textIn, QTextCharFormat &format)
+bool QQuickStyledTextPrivate::parseAnchorAttributes(const QChar *&ch, const QString &textIn, QTextCharFormat &format)
 {
     bool valid = false;
 
@@ -632,12 +632,12 @@ bool QDeclarativeStyledTextPrivate::parseAnchorAttributes(const QChar *&ch, cons
     return valid;
 }
 
-void QDeclarativeStyledTextPrivate::parseImageAttributes(const QChar *&ch, const QString &textIn, QString &textOut)
+void QQuickStyledTextPrivate::parseImageAttributes(const QChar *&ch, const QString &textIn, QString &textOut)
 {
     qreal imgWidth = 0.0;
 
     if (!updateImagePositions) {
-        QDeclarativeStyledTextImgTag *image = new QDeclarativeStyledTextImgTag;
+        QQuickStyledTextImgTag *image = new QQuickStyledTextImgTag;
         image->position = textOut.length() + 1;
 
         QPair<QStringRef,QStringRef> attr;
@@ -651,9 +651,9 @@ void QDeclarativeStyledTextPrivate::parseImageAttributes(const QChar *&ch, const
                 image->size.setHeight(attr.second.toString().toInt());
             } else if (attr.first == QLatin1String("align")) {
                 if (attr.second.toString() == QLatin1String("top")) {
-                    image->align = QDeclarativeStyledTextImgTag::Top;
+                    image->align = QQuickStyledTextImgTag::Top;
                 } else if (attr.second.toString() == QLatin1String("middle")) {
-                    image->align = QDeclarativeStyledTextImgTag::Middle;
+                    image->align = QQuickStyledTextImgTag::Middle;
                 }
             }
         } while (!ch->isNull() && !attr.first.isEmpty());
@@ -664,7 +664,7 @@ void QDeclarativeStyledTextPrivate::parseImageAttributes(const QChar *&ch, const
             // to avoid a relayout later on.
             QUrl url = baseUrl.resolved(image->url);
             if (url.isLocalFile()) {
-                QDeclarativePixmap *pix = new QDeclarativePixmap(context->engine(), url, image->size);
+                QQuickPixmap *pix = new QQuickPixmap(context->engine(), url, image->size);
                 if (pix && pix->isReady()) {
                     image->size = pix->implicitSize();
                     image->pix = pix;
@@ -678,7 +678,7 @@ void QDeclarativeStyledTextPrivate::parseImageAttributes(const QChar *&ch, const
     } else {
         // if we already have a list of img tags for this text
         // we only want to update the positions of these tags.
-        QDeclarativeStyledTextImgTag *image = imgTags->value(nbImages);
+        QQuickStyledTextImgTag *image = imgTags->value(nbImages);
         image->position = textOut.length() + 1;
         imgWidth = image->size.width();
         QPair<QStringRef,QStringRef> attr;
@@ -695,7 +695,7 @@ void QDeclarativeStyledTextPrivate::parseImageAttributes(const QChar *&ch, const
     textOut += QLatin1Char(' ');
 }
 
-QPair<QStringRef,QStringRef> QDeclarativeStyledTextPrivate::parseAttribute(const QChar *&ch, const QString &textIn)
+QPair<QStringRef,QStringRef> QQuickStyledTextPrivate::parseAttribute(const QChar *&ch, const QString &textIn)
 {
     skipSpace(ch);
 
@@ -728,7 +728,7 @@ QPair<QStringRef,QStringRef> QDeclarativeStyledTextPrivate::parseAttribute(const
     return QPair<QStringRef,QStringRef>();
 }
 
-QStringRef QDeclarativeStyledTextPrivate::parseValue(const QChar *&ch, const QString &textIn)
+QStringRef QQuickStyledTextPrivate::parseValue(const QChar *&ch, const QString &textIn)
 {
     int valStart = ch - textIn.constData();
     int valLength = 0;
@@ -743,7 +743,7 @@ QStringRef QDeclarativeStyledTextPrivate::parseValue(const QChar *&ch, const QSt
     return QStringRef(&textIn, valStart, valLength);
 }
 
-QString QDeclarativeStyledTextPrivate::toAlpha(int value, bool upper)
+QString QQuickStyledTextPrivate::toAlpha(int value, bool upper)
 {
     const char baseChar = upper ? 'A' : 'a';
 
@@ -757,7 +757,7 @@ QString QDeclarativeStyledTextPrivate::toAlpha(int value, bool upper)
     return result;
 }
 
-QString QDeclarativeStyledTextPrivate::toRoman(int value, bool upper)
+QString QQuickStyledTextPrivate::toRoman(int value, bool upper)
 {
     QString result = QLatin1String("?");
     // works for up to 4999 items
diff --git a/src/quick/util/qdeclarativestyledtext_p.h b/src/quick/util/qquickstyledtext_p.h
index aa6ae3f869..bfc7ffe7ed 100644
--- a/src/quick/util/qdeclarativestyledtext_p.h
+++ b/src/quick/util/qquickstyledtext_p.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
@@ -39,30 +39,30 @@
 **
 ****************************************************************************/
 
-#ifndef QDECLARATIVESTYLEDTEXT_H
-#define QDECLARATIVESTYLEDTEXT_H
+#ifndef QQUICKSTYLEDTEXT_H
+#define QQUICKSTYLEDTEXT_H
 
 #include <QSize>
 #include <QPointF>
 #include <QList>
 #include <QUrl>
-#include <QtQuick/private/qdeclarativepixmapcache_p.h>
+#include <QtQuick/private/qquickpixmapcache_p.h>
 
 QT_BEGIN_NAMESPACE
 
-class QDeclarativeStyledTextImgTag;
-class QDeclarativeStyledTextPrivate;
+class QQuickStyledTextImgTag;
+class QQuickStyledTextPrivate;
 class QString;
-class QDeclarativeContext;
+class QQmlContext;
 
-class Q_AUTOTEST_EXPORT QDeclarativeStyledTextImgTag
+class Q_AUTOTEST_EXPORT QQuickStyledTextImgTag
 {
 public:
-    QDeclarativeStyledTextImgTag()
-        : position(0), align(QDeclarativeStyledTextImgTag::Bottom), pix(0)
+    QQuickStyledTextImgTag()
+        : position(0), align(QQuickStyledTextImgTag::Bottom), pix(0)
     { }
 
-    ~QDeclarativeStyledTextImgTag() { delete pix; }
+    ~QQuickStyledTextImgTag() { delete pix; }
 
     enum Align {
         Bottom,
@@ -75,27 +75,27 @@ public:
     QSize size;
     int position;
     Align align;
-    QDeclarativePixmap *pix;
+    QQuickPixmap *pix;
 };
 
-class Q_AUTOTEST_EXPORT QDeclarativeStyledText
+class Q_AUTOTEST_EXPORT QQuickStyledText
 {
 public:
     static void parse(const QString &string, QTextLayout &layout,
-                      QList<QDeclarativeStyledTextImgTag*> &imgTags,
+                      QList<QQuickStyledTextImgTag*> &imgTags,
                       const QUrl &baseUrl,
-                      QDeclarativeContext *context,
+                      QQmlContext *context,
                       bool preloadImages);
 
 private:
-    QDeclarativeStyledText(const QString &string, QTextLayout &layout,
-                           QList<QDeclarativeStyledTextImgTag*> &imgTags,
+    QQuickStyledText(const QString &string, QTextLayout &layout,
+                           QList<QQuickStyledTextImgTag*> &imgTags,
                            const QUrl &baseUrl,
-                           QDeclarativeContext *context,
+                           QQmlContext *context,
                            bool preloadImages);
-    ~QDeclarativeStyledText();
+    ~QQuickStyledText();
 
-    QDeclarativeStyledTextPrivate *d;
+    QQuickStyledTextPrivate *d;
 };
 
 QT_END_NAMESPACE
diff --git a/src/quick/util/qdeclarativesvgparser.cpp b/src/quick/util/qquicksvgparser.cpp
index 41f12150d6..6a1b743160 100644
--- a/src/quick/util/qdeclarativesvgparser.cpp
+++ b/src/quick/util/qquicksvgparser.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include "qdeclarativesvgparser_p.h"
+#include "qquicksvgparser_p.h"
 
 #include <QtCore/qmath.h>
 #include <QtCore/qvarlengtharray.h>
@@ -196,7 +196,7 @@ static void pathArcSegment(QPainterPath &path,
                  a00 * x3 + a01 * y3, a10 * x3 + a11 * y3);
 }
 
-void QDeclarativeSvgParser::pathArc(QPainterPath &path,
+void QQuickSvgParser::pathArc(QPainterPath &path,
                     qreal               rx,
                     qreal               ry,
                     qreal               x_axis_rotation,
@@ -277,7 +277,7 @@ void QDeclarativeSvgParser::pathArc(QPainterPath &path,
 }
 
 
-bool QDeclarativeSvgParser::parsePathDataFast(const QString &dataStr, QPainterPath &path)
+bool QQuickSvgParser::parsePathDataFast(const QString &dataStr, QPainterPath &path)
 {
     qreal x0 = 0, y0 = 0;              // starting point
     qreal x = 0, y = 0;                // current point
diff --git a/src/quick/util/qdeclarativesvgparser_p.h b/src/quick/util/qquicksvgparser_p.h
index d1ecf2574c..ed8234dc0f 100644
--- a/src/quick/util/qdeclarativesvgparser_p.h
+++ b/src/quick/util/qquicksvgparser_p.h
@@ -39,15 +39,15 @@
 **
 ****************************************************************************/
 
-#ifndef QDECLARATIVESVGPARSER_P_H
-#define QDECLARATIVESVGPARSER_P_H
+#ifndef QQUICKSVGPARSER_P_H
+#define QQUICKSVGPARSER_P_H
 
 #include <QtCore/qstring.h>
 #include <QtGui/qpainterpath.h>
 
 QT_BEGIN_NAMESPACE
 
-namespace QDeclarativeSvgParser
+namespace QQuickSvgParser
 {
     bool parsePathDataFast(const QString &dataStr, QPainterPath &path);
     void pathArc(QPainterPath &path, qreal rx, qreal ry, qreal x_axis_rotation,
@@ -57,4 +57,4 @@ namespace QDeclarativeSvgParser
 
 QT_END_NAMESPACE
 
-#endif // QDECLARATIVESVGPARSER_P_H
+#endif // QQUICKSVGPARSER_P_H
diff --git a/src/quick/util/qdeclarativesystempalette.cpp b/src/quick/util/qquicksystempalette.cpp
index ab090e718e..735d18abf5 100644
--- a/src/quick/util/qdeclarativesystempalette.cpp
+++ b/src/quick/util/qquicksystempalette.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include "qdeclarativesystempalette_p.h"
+#include "qquicksystempalette_p.h"
 
 #include <QGuiApplication>
 
@@ -47,7 +47,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class QDeclarativeSystemPalettePrivate : public QObjectPrivate
+class QQuickSystemPalettePrivate : public QObjectPrivate
 {
 public:
     QPalette palette;
@@ -57,7 +57,7 @@ public:
 
 
 /*!
-    \qmlclass SystemPalette QDeclarativeSystemPalette
+    \qmlclass SystemPalette QQuickSystemPalette
     \inqmlmodule QtQuick 2
     \ingroup qml-utility-elements
     \brief The SystemPalette element provides access to the Qt palettes.
@@ -76,20 +76,20 @@ public:
     group and uses this to color the window and text items
     appropriately:
 
-    \snippet doc/src/snippets/declarative/systempalette.qml 0
+    \snippet doc/src/snippets/qml/systempalette.qml 0
 
     \sa QPalette
 */
-QDeclarativeSystemPalette::QDeclarativeSystemPalette(QObject *parent)
-    : QObject(*(new QDeclarativeSystemPalettePrivate), parent)
+QQuickSystemPalette::QQuickSystemPalette(QObject *parent)
+    : QObject(*(new QQuickSystemPalettePrivate), parent)
 {
-    Q_D(QDeclarativeSystemPalette);
+    Q_D(QQuickSystemPalette);
     d->palette = QGuiApplication::palette();
     d->group = QPalette::Active;
     qApp->installEventFilter(this);
 }
 
-QDeclarativeSystemPalette::~QDeclarativeSystemPalette()
+QQuickSystemPalette::~QQuickSystemPalette()
 {
 }
 
@@ -99,9 +99,9 @@ QDeclarativeSystemPalette::~QDeclarativeSystemPalette()
 
     \sa QPalette::ColorRole
 */
-QColor QDeclarativeSystemPalette::window() const
+QColor QQuickSystemPalette::window() const
 {
-    Q_D(const QDeclarativeSystemPalette);
+    Q_D(const QQuickSystemPalette);
     return d->palette.color(d->group, QPalette::Window);
 }
 
@@ -111,9 +111,9 @@ QColor QDeclarativeSystemPalette::window() const
 
     \sa QPalette::ColorRole
 */
-QColor QDeclarativeSystemPalette::windowText() const
+QColor QQuickSystemPalette::windowText() const
 {
-    Q_D(const QDeclarativeSystemPalette);
+    Q_D(const QQuickSystemPalette);
     return d->palette.color(d->group, QPalette::WindowText);
 }
 
@@ -123,9 +123,9 @@ QColor QDeclarativeSystemPalette::windowText() const
 
     \sa QPalette::ColorRole
 */
-QColor QDeclarativeSystemPalette::base() const
+QColor QQuickSystemPalette::base() const
 {
-    Q_D(const QDeclarativeSystemPalette);
+    Q_D(const QQuickSystemPalette);
     return d->palette.color(d->group, QPalette::Base);
 }
 
@@ -135,9 +135,9 @@ QColor QDeclarativeSystemPalette::base() const
 
     \sa QPalette::ColorRole
 */
-QColor QDeclarativeSystemPalette::text() const
+QColor QQuickSystemPalette::text() const
 {
-    Q_D(const QDeclarativeSystemPalette);
+    Q_D(const QQuickSystemPalette);
     return d->palette.color(d->group, QPalette::Text);
 }
 
@@ -147,9 +147,9 @@ QColor QDeclarativeSystemPalette::text() const
 
     \sa QPalette::ColorRole
 */
-QColor QDeclarativeSystemPalette::alternateBase() const
+QColor QQuickSystemPalette::alternateBase() const
 {
-    Q_D(const QDeclarativeSystemPalette);
+    Q_D(const QQuickSystemPalette);
     return d->palette.color(d->group, QPalette::AlternateBase);
 }
 
@@ -159,9 +159,9 @@ QColor QDeclarativeSystemPalette::alternateBase() const
 
     \sa QPalette::ColorRole
 */
-QColor QDeclarativeSystemPalette::button() const
+QColor QQuickSystemPalette::button() const
 {
-    Q_D(const QDeclarativeSystemPalette);
+    Q_D(const QQuickSystemPalette);
     return d->palette.color(d->group, QPalette::Button);
 }
 
@@ -171,9 +171,9 @@ QColor QDeclarativeSystemPalette::button() const
 
     \sa QPalette::ColorRole
 */
-QColor QDeclarativeSystemPalette::buttonText() const
+QColor QQuickSystemPalette::buttonText() const
 {
-    Q_D(const QDeclarativeSystemPalette);
+    Q_D(const QQuickSystemPalette);
     return d->palette.color(d->group, QPalette::ButtonText);
 }
 
@@ -183,9 +183,9 @@ QColor QDeclarativeSystemPalette::buttonText() const
 
     \sa QPalette::ColorRole
 */
-QColor QDeclarativeSystemPalette::light() const
+QColor QQuickSystemPalette::light() const
 {
-    Q_D(const QDeclarativeSystemPalette);
+    Q_D(const QQuickSystemPalette);
     return d->palette.color(d->group, QPalette::Light);
 }
 
@@ -195,9 +195,9 @@ QColor QDeclarativeSystemPalette::light() const
 
     \sa QPalette::ColorRole
 */
-QColor QDeclarativeSystemPalette::midlight() const
+QColor QQuickSystemPalette::midlight() const
 {
-    Q_D(const QDeclarativeSystemPalette);
+    Q_D(const QQuickSystemPalette);
     return d->palette.color(d->group, QPalette::Midlight);
 }
 
@@ -207,9 +207,9 @@ QColor QDeclarativeSystemPalette::midlight() const
 
     \sa QPalette::ColorRole
 */
-QColor QDeclarativeSystemPalette::dark() const
+QColor QQuickSystemPalette::dark() const
 {
-    Q_D(const QDeclarativeSystemPalette);
+    Q_D(const QQuickSystemPalette);
     return d->palette.color(d->group, QPalette::Dark);
 }
 
@@ -219,9 +219,9 @@ QColor QDeclarativeSystemPalette::dark() const
 
     \sa QPalette::ColorRole
 */
-QColor QDeclarativeSystemPalette::mid() const
+QColor QQuickSystemPalette::mid() const
 {
-    Q_D(const QDeclarativeSystemPalette);
+    Q_D(const QQuickSystemPalette);
     return d->palette.color(d->group, QPalette::Mid);
 }
 
@@ -231,9 +231,9 @@ QColor QDeclarativeSystemPalette::mid() const
 
     \sa QPalette::ColorRole
 */
-QColor QDeclarativeSystemPalette::shadow() const
+QColor QQuickSystemPalette::shadow() const
 {
-    Q_D(const QDeclarativeSystemPalette);
+    Q_D(const QQuickSystemPalette);
     return d->palette.color(d->group, QPalette::Shadow);
 }
 
@@ -243,9 +243,9 @@ QColor QDeclarativeSystemPalette::shadow() const
 
     \sa QPalette::ColorRole
 */
-QColor QDeclarativeSystemPalette::highlight() const
+QColor QQuickSystemPalette::highlight() const
 {
-    Q_D(const QDeclarativeSystemPalette);
+    Q_D(const QQuickSystemPalette);
     return d->palette.color(d->group, QPalette::Highlight);
 }
 
@@ -255,9 +255,9 @@ QColor QDeclarativeSystemPalette::highlight() const
 
     \sa QPalette::ColorRole
 */
-QColor QDeclarativeSystemPalette::highlightedText() const
+QColor QQuickSystemPalette::highlightedText() const
 {
-    Q_D(const QDeclarativeSystemPalette);
+    Q_D(const QQuickSystemPalette);
     return d->palette.color(d->group, QPalette::HighlightedText);
 }
 
@@ -274,20 +274,20 @@ QColor QDeclarativeSystemPalette::highlightedText() const
 
     \sa QPalette::ColorGroup
 */
-QDeclarativeSystemPalette::ColorGroup QDeclarativeSystemPalette::colorGroup() const
+QQuickSystemPalette::ColorGroup QQuickSystemPalette::colorGroup() const
 {
-    Q_D(const QDeclarativeSystemPalette);
-    return (QDeclarativeSystemPalette::ColorGroup)d->group;
+    Q_D(const QQuickSystemPalette);
+    return (QQuickSystemPalette::ColorGroup)d->group;
 }
 
-void QDeclarativeSystemPalette::setColorGroup(QDeclarativeSystemPalette::ColorGroup colorGroup)
+void QQuickSystemPalette::setColorGroup(QQuickSystemPalette::ColorGroup colorGroup)
 {
-    Q_D(QDeclarativeSystemPalette);
+    Q_D(QQuickSystemPalette);
     d->group = (QPalette::ColorGroup)colorGroup;
     emit paletteChanged();
 }
 
-bool QDeclarativeSystemPalette::eventFilter(QObject *watched, QEvent *event)
+bool QQuickSystemPalette::eventFilter(QObject *watched, QEvent *event)
 {
     if (watched == qApp) {
         if (event->type() == QEvent::ApplicationPaletteChange) {
@@ -298,9 +298,9 @@ bool QDeclarativeSystemPalette::eventFilter(QObject *watched, QEvent *event)
     return QObject::eventFilter(watched, event);
 }
 
-bool QDeclarativeSystemPalette::event(QEvent *event)
+bool QQuickSystemPalette::event(QEvent *event)
 {
-    Q_D(QDeclarativeSystemPalette);
+    Q_D(QQuickSystemPalette);
     if (event->type() == QEvent::ApplicationPaletteChange) {
         d->palette = QGuiApplication::palette();
         emit paletteChanged();
diff --git a/src/quick/util/qdeclarativesystempalette_p.h b/src/quick/util/qquicksystempalette_p.h
index 84813e3030..e7b8f8a418 100644
--- a/src/quick/util/qdeclarativesystempalette_p.h
+++ b/src/quick/util/qquicksystempalette_p.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
@@ -39,10 +39,10 @@
 **
 ****************************************************************************/
 
-#ifndef QDECLARATIVESYSTEMPALETTE_H
-#define QDECLARATIVESYSTEMPALETTE_H
+#ifndef QQUICKSYSTEMPALETTE_H
+#define QQUICKSYSTEMPALETTE_H
 
-#include <qdeclarative.h>
+#include <qqml.h>
 
 #include <QtCore/qobject.h>
 #include <QPalette>
@@ -51,14 +51,14 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-class QDeclarativeSystemPalettePrivate;
-class Q_AUTOTEST_EXPORT QDeclarativeSystemPalette : public QObject
+class QQuickSystemPalettePrivate;
+class Q_AUTOTEST_EXPORT QQuickSystemPalette : public QObject
 {
     Q_OBJECT
     Q_ENUMS(ColorGroup)
-    Q_DECLARE_PRIVATE(QDeclarativeSystemPalette)
+    Q_DECLARE_PRIVATE(QQuickSystemPalette)
 
-    Q_PROPERTY(QDeclarativeSystemPalette::ColorGroup colorGroup READ colorGroup WRITE setColorGroup NOTIFY paletteChanged)
+    Q_PROPERTY(QQuickSystemPalette::ColorGroup colorGroup READ colorGroup WRITE setColorGroup NOTIFY paletteChanged)
     Q_PROPERTY(QColor window READ window NOTIFY paletteChanged)
     Q_PROPERTY(QColor windowText READ windowText NOTIFY paletteChanged)
     Q_PROPERTY(QColor base READ base NOTIFY paletteChanged)
@@ -75,8 +75,8 @@ class Q_AUTOTEST_EXPORT QDeclarativeSystemPalette : public QObject
     Q_PROPERTY(QColor highlightedText READ highlightedText NOTIFY paletteChanged)
 
 public:
-    QDeclarativeSystemPalette(QObject *parent=0);
-    ~QDeclarativeSystemPalette();
+    QQuickSystemPalette(QObject *parent=0);
+    ~QQuickSystemPalette();
 
     enum ColorGroup { Active = QPalette::Active, Inactive = QPalette::Inactive, Disabled = QPalette::Disabled };
 
@@ -99,8 +99,8 @@ public:
     QColor highlight() const;
     QColor highlightedText() const;
 
-    QDeclarativeSystemPalette::ColorGroup colorGroup() const;
-    void setColorGroup(QDeclarativeSystemPalette::ColorGroup);
+    QQuickSystemPalette::ColorGroup colorGroup() const;
+    void setColorGroup(QQuickSystemPalette::ColorGroup);
 
 Q_SIGNALS:
     void paletteChanged();
@@ -113,8 +113,8 @@ private:
 
 QT_END_NAMESPACE
 
-QML_DECLARE_TYPE(QDeclarativeSystemPalette)
+QML_DECLARE_TYPE(QQuickSystemPalette)
 
 QT_END_HEADER
 
-#endif // QDECLARATIVESYSTEMPALETTE_H
+#endif // QQUICKSYSTEMPALETTE_H
diff --git a/src/quick/util/qdeclarativetimeline.cpp b/src/quick/util/qquicktimeline.cpp
index a33fdd5104..3e8b36714a 100644
--- a/src/quick/util/qdeclarativetimeline.cpp
+++ b/src/quick/util/qquicktimeline.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include "qdeclarativetimeline_p_p.h"
+#include "qquicktimeline_p_p.h"
 
 #include <QDebug>
 #include <QMutex>
@@ -53,19 +53,19 @@
 QT_BEGIN_NAMESPACE
 
 struct Update {
-    Update(QDeclarativeTimeLineValue *_g, qreal _v)
+    Update(QQuickTimeLineValue *_g, qreal _v)
         : g(_g), v(_v) {}
-    Update(const QDeclarativeTimeLineCallback &_e)
+    Update(const QQuickTimeLineCallback &_e)
         : g(0), v(0), e(_e) {}
 
-    QDeclarativeTimeLineValue *g;
+    QQuickTimeLineValue *g;
     qreal v;
-    QDeclarativeTimeLineCallback e;
+    QQuickTimeLineCallback e;
 };
 
-struct QDeclarativeTimeLinePrivate
+struct QQuickTimeLinePrivate
 {
-    QDeclarativeTimeLinePrivate(QDeclarativeTimeLine *);
+    QQuickTimeLinePrivate(QQuickTimeLine *);
 
     struct Op {
         enum Type {
@@ -79,7 +79,7 @@ struct QDeclarativeTimeLinePrivate
         };
         Op() {}
         Op(Type t, int l, qreal v, qreal v2, int o, 
-           const QDeclarativeTimeLineCallback &ev = QDeclarativeTimeLineCallback(), const QEasingCurve &es = QEasingCurve())
+           const QQuickTimeLineCallback &ev = QQuickTimeLineCallback(), const QEasingCurve &es = QEasingCurve())
             : type(t), length(l), value(v), value2(v2), order(o), event(ev),
               easing(es) {}
         Op(const Op &o)
@@ -98,7 +98,7 @@ struct QDeclarativeTimeLinePrivate
         qreal value2;
 
         int order;
-        QDeclarativeTimeLineCallback event;
+        QQuickTimeLineCallback event;
         QEasingCurve easing;
     };
     struct TimeLine
@@ -112,11 +112,11 @@ struct QDeclarativeTimeLinePrivate
 
     int length;
     int syncPoint;
-    typedef QHash<QDeclarativeTimeLineObject *, TimeLine> Ops;
+    typedef QHash<QQuickTimeLineObject *, TimeLine> Ops;
     Ops ops;
-    QDeclarativeTimeLine *q;
+    QQuickTimeLine *q;
 
-    void add(QDeclarativeTimeLineObject &, const Op &);
+    void add(QQuickTimeLineObject &, const Op &);
     qreal value(const Op &op, int time, qreal base, bool *) const;
 
     int advance(int);
@@ -126,20 +126,20 @@ struct QDeclarativeTimeLinePrivate
 
     int order;
 
-    QDeclarativeTimeLine::SyncMode syncMode;
+    QQuickTimeLine::SyncMode syncMode;
     int syncAdj;
     QList<QPair<int, Update> > *updateQueue;
 };
 
-QDeclarativeTimeLinePrivate::QDeclarativeTimeLinePrivate(QDeclarativeTimeLine *parent)
-: length(0), syncPoint(0), q(parent), clockRunning(false), prevTime(0), order(0), syncMode(QDeclarativeTimeLine::LocalSync), syncAdj(0), updateQueue(0)
+QQuickTimeLinePrivate::QQuickTimeLinePrivate(QQuickTimeLine *parent)
+: length(0), syncPoint(0), q(parent), clockRunning(false), prevTime(0), order(0), syncMode(QQuickTimeLine::LocalSync), syncAdj(0), updateQueue(0)
 {
 }
 
-void QDeclarativeTimeLinePrivate::add(QDeclarativeTimeLineObject &g, const Op &o)
+void QQuickTimeLinePrivate::add(QQuickTimeLineObject &g, const Op &o)
 {
     if (g._t && g._t != q) {
-        qWarning() << "QDeclarativeTimeLine: Cannot modify a QDeclarativeTimeLineValue owned by"
+        qWarning() << "QQuickTimeLine: Cannot modify a QQuickTimeLineValue owned by"
                    << "another timeline.";
         return;
     }
@@ -169,14 +169,14 @@ void QDeclarativeTimeLinePrivate::add(QDeclarativeTimeLineObject &g, const Op &o
         prevTime = 0;
         clockRunning = true;
 
-        if (syncMode == QDeclarativeTimeLine::LocalSync)  {
+        if (syncMode == QQuickTimeLine::LocalSync)  {
             syncAdj = -1;
         } else {
             syncAdj = 0;
         }
         q->start();
 /*        q->tick(0);
-        if (syncMode == QDeclarativeTimeLine::LocalSync)  {
+        if (syncMode == QQuickTimeLine::LocalSync)  {
             syncAdj = -1;
         } else {
             syncAdj = 0;
@@ -185,7 +185,7 @@ void QDeclarativeTimeLinePrivate::add(QDeclarativeTimeLineObject &g, const Op &o
     }
 }
 
-qreal QDeclarativeTimeLinePrivate::value(const Op &op, int time, qreal base, bool *changed) const
+qreal QQuickTimeLinePrivate::value(const Op &op, int time, qreal base, bool *changed) const
 {
     Q_ASSERT(time >= 0);
     Q_ASSERT(time <= op.length);
@@ -254,27 +254,27 @@ qreal QDeclarativeTimeLinePrivate::value(const Op &op, int time, qreal base, boo
 
 /*!
     \internal
-    \class QDeclarativeTimeLine
-    \brief The QDeclarativeTimeLine class provides a timeline for controlling animations.
+    \class QQuickTimeLine
+    \brief The QQuickTimeLine class provides a timeline for controlling animations.
 
-    QDeclarativeTimeLine is similar to QTimeLine except:
+    QQuickTimeLine is similar to QTimeLine except:
     \list
-    \i It updates QDeclarativeTimeLineValue instances directly, rather than maintaining a single
+    \i It updates QQuickTimeLineValue instances directly, rather than maintaining a single
     current value.
 
     For example, the following animates a simple value over 200 milliseconds:
     \code
-    QDeclarativeTimeLineValue v(<starting value>);
-    QDeclarativeTimeLine tl;
+    QQuickTimeLineValue v(<starting value>);
+    QQuickTimeLine tl;
     tl.move(v, 100., 200);
     tl.start()
     \endcode
 
     If your program needs to know when values are changed, it can either
-    connect to the QDeclarativeTimeLine's updated() signal, or inherit from QDeclarativeTimeLineValue
-    and reimplement the QDeclarativeTimeLineValue::setValue() method.
+    connect to the QQuickTimeLine's updated() signal, or inherit from QQuickTimeLineValue
+    and reimplement the QQuickTimeLineValue::setValue() method.
 
-    \i Supports multiple QDeclarativeTimeLineValue, arbitrary start and end values and allows
+    \i Supports multiple QQuickTimeLineValue, arbitrary start and end values and allows
     animations to be strung together for more complex effects.
 
     For example, the following animation moves the x and y coordinates of
@@ -283,10 +283,10 @@ qreal QDeclarativeTimeLinePrivate::value(const Op &op, int time, qreal base, boo
     milliseconds:
 
     \code
-    QDeclarativeTimeLineValue x(<starting value>);
-    QDeclarativeTimeLineValue y(<starting value>);
+    QQuickTimeLineValue x(<starting value>);
+    QQuickTimeLineValue y(<starting value>);
 
-    QDeclarativeTimeLine tl;
+    QQuickTimeLine tl;
     tl.start();
 
     tl.move(x, 100., 50);
@@ -294,12 +294,12 @@ qreal QDeclarativeTimeLinePrivate::value(const Op &op, int time, qreal base, boo
     tl.move(y, 200., 50);
     \endcode
 
-    \i All QDeclarativeTimeLine instances share a single, synchronized clock.
+    \i All QQuickTimeLine instances share a single, synchronized clock.
 
     Actions scheduled within the same event loop tick are scheduled
     synchronously against each other, regardless of the wall time between the
     scheduling.  Synchronized scheduling applies both to within the same
-    QDeclarativeTimeLine and across separate QDeclarativeTimeLine's within the same process.
+    QQuickTimeLine and across separate QQuickTimeLine's within the same process.
 
     \endlist
 
@@ -308,21 +308,21 @@ qreal QDeclarativeTimeLinePrivate::value(const Op &op, int time, qreal base, boo
 
 
 /*!
-    Construct a new QDeclarativeTimeLine with the specified \a parent.
+    Construct a new QQuickTimeLine with the specified \a parent.
 */
-QDeclarativeTimeLine::QDeclarativeTimeLine(QObject *parent)
+QQuickTimeLine::QQuickTimeLine(QObject *parent)
     : QObject(parent)
 {
-    d = new QDeclarativeTimeLinePrivate(this);
+    d = new QQuickTimeLinePrivate(this);
 }
 
 /*!
     Destroys the time line.  Any inprogress animations are canceled, but not
     completed.
 */
-QDeclarativeTimeLine::~QDeclarativeTimeLine()
+QQuickTimeLine::~QQuickTimeLine()
 {
-    for (QDeclarativeTimeLinePrivate::Ops::Iterator iter = d->ops.begin();
+    for (QQuickTimeLinePrivate::Ops::Iterator iter = d->ops.begin();
             iter != d->ops.end();
             ++iter)
         iter.key()->_t = 0;
@@ -331,13 +331,13 @@ QDeclarativeTimeLine::~QDeclarativeTimeLine()
 }
 
 /*!
-    \enum QDeclarativeTimeLine::SyncMode
+    \enum QQuickTimeLine::SyncMode
  */
 
 /*!
     Return the timeline's synchronization mode.
  */
-QDeclarativeTimeLine::SyncMode QDeclarativeTimeLine::syncMode() const
+QQuickTimeLine::SyncMode QQuickTimeLine::syncMode() const
 {
     return d->syncMode;
 }
@@ -345,7 +345,7 @@ QDeclarativeTimeLine::SyncMode QDeclarativeTimeLine::syncMode() const
 /*!
     Set the timeline's synchronization mode to \a syncMode.
  */
-void QDeclarativeTimeLine::setSyncMode(SyncMode syncMode)
+void QQuickTimeLine::setSyncMode(SyncMode syncMode)
 {
     d->syncMode = syncMode;
 }
@@ -353,38 +353,38 @@ void QDeclarativeTimeLine::setSyncMode(SyncMode syncMode)
 /*!
     Pause \a obj for \a time milliseconds.
 */
-void QDeclarativeTimeLine::pause(QDeclarativeTimeLineObject &obj, int time)
+void QQuickTimeLine::pause(QQuickTimeLineObject &obj, int time)
 {
     if (time <= 0) return;
-    QDeclarativeTimeLinePrivate::Op op(QDeclarativeTimeLinePrivate::Op::Pause, time, 0., 0., d->order++);
+    QQuickTimeLinePrivate::Op op(QQuickTimeLinePrivate::Op::Pause, time, 0., 0., d->order++);
     d->add(obj, op);
 }
 
 /*!
     Execute the \a event.
  */
-void QDeclarativeTimeLine::callback(const QDeclarativeTimeLineCallback &callback)
+void QQuickTimeLine::callback(const QQuickTimeLineCallback &callback)
 {
-    QDeclarativeTimeLinePrivate::Op op(QDeclarativeTimeLinePrivate::Op::Execute, 0, 0, 0., d->order++, callback);
+    QQuickTimeLinePrivate::Op op(QQuickTimeLinePrivate::Op::Execute, 0, 0, 0., d->order++, callback);
     d->add(*callback.callbackObject(), op);
 }
 
 /*!
     Set the \a value of \a timeLineValue.
 */
-void QDeclarativeTimeLine::set(QDeclarativeTimeLineValue &timeLineValue, qreal value)
+void QQuickTimeLine::set(QQuickTimeLineValue &timeLineValue, qreal value)
 {
-    QDeclarativeTimeLinePrivate::Op op(QDeclarativeTimeLinePrivate::Op::Set, 0, value, 0., d->order++);
+    QQuickTimeLinePrivate::Op op(QQuickTimeLinePrivate::Op::Set, 0, value, 0., d->order++);
     d->add(timeLineValue, op);
 }
 
 /*!
     Decelerate \a timeLineValue from the starting \a velocity to zero at the
     given \a acceleration rate.  Although the \a acceleration is technically
-    a deceleration, it should always be positive.  The QDeclarativeTimeLine will ensure
+    a deceleration, it should always be positive.  The QQuickTimeLine will ensure
     that the deceleration is in the opposite direction to the initial velocity.
 */
-int QDeclarativeTimeLine::accel(QDeclarativeTimeLineValue &timeLineValue, qreal velocity, qreal acceleration)
+int QQuickTimeLine::accel(QQuickTimeLineValue &timeLineValue, qreal velocity, qreal acceleration)
 {
     if (acceleration == 0.0f)
         return -1;
@@ -394,7 +394,7 @@ int QDeclarativeTimeLine::accel(QDeclarativeTimeLineValue &timeLineValue, qreal
 
     int time = static_cast<int>(-1000 * velocity / acceleration);
 
-    QDeclarativeTimeLinePrivate::Op op(QDeclarativeTimeLinePrivate::Op::Accel, time, velocity, acceleration, d->order++);
+    QQuickTimeLinePrivate::Op op(QQuickTimeLinePrivate::Op::Accel, time, velocity, acceleration, d->order++);
     d->add(timeLineValue, op);
 
     return time;
@@ -406,11 +406,11 @@ int QDeclarativeTimeLine::accel(QDeclarativeTimeLineValue &timeLineValue, qreal
     Decelerate \a timeLineValue from the starting \a velocity to zero at the
     given \a acceleration rate over a maximum distance of maxDistance.
 
-    If necessary, QDeclarativeTimeLine will reduce the acceleration to ensure that the
+    If necessary, QQuickTimeLine will reduce the acceleration to ensure that the
     entire operation does not require a move of more than \a maxDistance.
     \a maxDistance should always be positive.
 */
-int QDeclarativeTimeLine::accel(QDeclarativeTimeLineValue &timeLineValue, qreal velocity, qreal acceleration, qreal maxDistance)
+int QQuickTimeLine::accel(QQuickTimeLineValue &timeLineValue, qreal velocity, qreal acceleration, qreal maxDistance)
 {
     if (maxDistance == 0.0f || acceleration == 0.0f)
         return -1;
@@ -426,7 +426,7 @@ int QDeclarativeTimeLine::accel(QDeclarativeTimeLineValue &timeLineValue, qreal
 
     int time = static_cast<int>(-1000 * velocity / acceleration);
 
-    QDeclarativeTimeLinePrivate::Op op(QDeclarativeTimeLinePrivate::Op::Accel, time, velocity, acceleration, d->order++);
+    QQuickTimeLinePrivate::Op op(QQuickTimeLinePrivate::Op::Accel, time, velocity, acceleration, d->order++);
     d->add(timeLineValue, op);
 
     return time;
@@ -434,12 +434,12 @@ int QDeclarativeTimeLine::accel(QDeclarativeTimeLineValue &timeLineValue, qreal
 
 /*!
     Decelerate \a timeLineValue from the starting \a velocity to zero over the given
-    \a distance.  This is like accel(), but the QDeclarativeTimeLine calculates the exact
+    \a distance.  This is like accel(), but the QQuickTimeLine calculates the exact
     deceleration to use.
 
     \a distance should be positive.
 */
-int QDeclarativeTimeLine::accelDistance(QDeclarativeTimeLineValue &timeLineValue, qreal velocity, qreal distance)
+int QQuickTimeLine::accelDistance(QQuickTimeLineValue &timeLineValue, qreal velocity, qreal distance)
 {
     if (distance == 0.0f || velocity == 0.0f)
         return -1;
@@ -448,7 +448,7 @@ int QDeclarativeTimeLine::accelDistance(QDeclarativeTimeLineValue &timeLineValue
 
     int time = static_cast<int>(1000 * (2.0f * distance) / velocity);
 
-    QDeclarativeTimeLinePrivate::Op op(QDeclarativeTimeLinePrivate::Op::AccelDistance, time, velocity, distance, d->order++);
+    QQuickTimeLinePrivate::Op op(QQuickTimeLinePrivate::Op::AccelDistance, time, velocity, distance, d->order++);
     d->add(timeLineValue, op);
 
     return time;
@@ -458,10 +458,10 @@ int QDeclarativeTimeLine::accelDistance(QDeclarativeTimeLineValue &timeLineValue
     Linearly change the \a timeLineValue from its current value to the given
     \a destination value over \a time milliseconds.
 */
-void QDeclarativeTimeLine::move(QDeclarativeTimeLineValue &timeLineValue, qreal destination, int time)
+void QQuickTimeLine::move(QQuickTimeLineValue &timeLineValue, qreal destination, int time)
 {
     if (time <= 0) return;
-    QDeclarativeTimeLinePrivate::Op op(QDeclarativeTimeLinePrivate::Op::Move, time, destination, 0.0f, d->order++);
+    QQuickTimeLinePrivate::Op op(QQuickTimeLinePrivate::Op::Move, time, destination, 0.0f, d->order++);
     d->add(timeLineValue, op);
 }
 
@@ -469,10 +469,10 @@ void QDeclarativeTimeLine::move(QDeclarativeTimeLineValue &timeLineValue, qreal
     Change the \a timeLineValue from its current value to the given \a destination
     value over \a time milliseconds using the \a easing curve.
  */
-void QDeclarativeTimeLine::move(QDeclarativeTimeLineValue &timeLineValue, qreal destination, const QEasingCurve &easing, int time)
+void QQuickTimeLine::move(QQuickTimeLineValue &timeLineValue, qreal destination, const QEasingCurve &easing, int time)
 {
     if (time <= 0) return;
-    QDeclarativeTimeLinePrivate::Op op(QDeclarativeTimeLinePrivate::Op::Move, time, destination, 0.0f, d->order++, QDeclarativeTimeLineCallback(), easing);
+    QQuickTimeLinePrivate::Op op(QQuickTimeLinePrivate::Op::Move, time, destination, 0.0f, d->order++, QQuickTimeLineCallback(), easing);
     d->add(timeLineValue, op);
 }
 
@@ -480,10 +480,10 @@ void QDeclarativeTimeLine::move(QDeclarativeTimeLineValue &timeLineValue, qreal
     Linearly change the \a timeLineValue from its current value by the \a change amount
     over \a time milliseconds.
 */
-void QDeclarativeTimeLine::moveBy(QDeclarativeTimeLineValue &timeLineValue, qreal change, int time)
+void QQuickTimeLine::moveBy(QQuickTimeLineValue &timeLineValue, qreal change, int time)
 {
     if (time <= 0) return;
-    QDeclarativeTimeLinePrivate::Op op(QDeclarativeTimeLinePrivate::Op::MoveBy, time, change, 0.0f, d->order++);
+    QQuickTimeLinePrivate::Op op(QQuickTimeLinePrivate::Op::MoveBy, time, change, 0.0f, d->order++);
     d->add(timeLineValue, op);
 }
 
@@ -491,29 +491,29 @@ void QDeclarativeTimeLine::moveBy(QDeclarativeTimeLineValue &timeLineValue, qrea
     Change the \a timeLineValue from its current value by the \a change amount over
     \a time milliseconds using the \a easing curve.
  */
-void QDeclarativeTimeLine::moveBy(QDeclarativeTimeLineValue &timeLineValue, qreal change, const QEasingCurve &easing, int time)
+void QQuickTimeLine::moveBy(QQuickTimeLineValue &timeLineValue, qreal change, const QEasingCurve &easing, int time)
 {
     if (time <= 0) return;
-    QDeclarativeTimeLinePrivate::Op op(QDeclarativeTimeLinePrivate::Op::MoveBy, time, change, 0.0f, d->order++, QDeclarativeTimeLineCallback(), easing);
+    QQuickTimeLinePrivate::Op op(QQuickTimeLinePrivate::Op::MoveBy, time, change, 0.0f, d->order++, QQuickTimeLineCallback(), easing);
     d->add(timeLineValue, op);
 }
 
 /*!
     Cancel (but don't complete) all scheduled actions for \a timeLineValue.
 */
-void QDeclarativeTimeLine::reset(QDeclarativeTimeLineValue &timeLineValue)
+void QQuickTimeLine::reset(QQuickTimeLineValue &timeLineValue)
 {
     if (!timeLineValue._t)
         return;
     if (timeLineValue._t != this) {
-        qWarning() << "QDeclarativeTimeLine: Cannot reset a QDeclarativeTimeLineValue owned by another timeline.";
+        qWarning() << "QQuickTimeLine: Cannot reset a QQuickTimeLineValue owned by another timeline.";
         return;
     }
     remove(&timeLineValue);
     timeLineValue._t = 0;
 }
 
-int QDeclarativeTimeLine::duration() const
+int QQuickTimeLine::duration() const
 {
     return -1;
 }
@@ -526,12 +526,12 @@ int QDeclarativeTimeLine::duration() const
     all the currently scheduled actions on \a syncTo are complete.  In
     pseudo-code this is equivalent to:
     \code
-    QDeclarativeTimeLine::pause(timeLineValue, min(0, length_of(syncTo) - length_of(timeLineValue)))
+    QQuickTimeLine::pause(timeLineValue, min(0, length_of(syncTo) - length_of(timeLineValue)))
     \endcode
 */
-void QDeclarativeTimeLine::sync(QDeclarativeTimeLineValue &timeLineValue, QDeclarativeTimeLineValue &syncTo)
+void QQuickTimeLine::sync(QQuickTimeLineValue &timeLineValue, QQuickTimeLineValue &syncTo)
 {
-    QDeclarativeTimeLinePrivate::Ops::Iterator iter = d->ops.find(&syncTo);
+    QQuickTimeLinePrivate::Ops::Iterator iter = d->ops.find(&syncTo);
     if (iter == d->ops.end())
         return;
     int length = iter->length;
@@ -551,12 +551,12 @@ void QDeclarativeTimeLine::sync(QDeclarativeTimeLineValue &timeLineValue, QDecla
 
     In pseudo-code, this is equivalent to:
     \code
-    QDeclarativeTimeLine::pause(timeLineValue, length_of(timeline) - length_of(timeLineValue))
+    QQuickTimeLine::pause(timeLineValue, length_of(timeline) - length_of(timeLineValue))
     \endcode
 */
-void QDeclarativeTimeLine::sync(QDeclarativeTimeLineValue &timeLineValue)
+void QQuickTimeLine::sync(QQuickTimeLineValue &timeLineValue)
 {
-    QDeclarativeTimeLinePrivate::Ops::Iterator iter = d->ops.find(&timeLineValue);
+    QQuickTimeLinePrivate::Ops::Iterator iter = d->ops.find(&timeLineValue);
     if (iter == d->ops.end()) {
         pause(timeLineValue, d->length);
     } else {
@@ -573,7 +573,7 @@ void QDeclarativeTimeLine::sync(QDeclarativeTimeLineValue &timeLineValue)
     value1->setValue(0.);
     value2->setValue(0.);
     value3->setValue(0.);
-    QDeclarativeTimeLine tl;
+    QQuickTimeLine tl;
     ...
     tl.move(value1, 10, 200);
     tl.move(value2, 10, 100);
@@ -592,9 +592,9 @@ void QDeclarativeTimeLine::sync(QDeclarativeTimeLineValue &timeLineValue)
     \endtable
 */
 
-/*void QDeclarativeTimeLine::sync()
+/*void QQuickTimeLine::sync()
 {
-    for (QDeclarativeTimeLinePrivate::Ops::Iterator iter = d->ops.begin();
+    for (QQuickTimeLinePrivate::Ops::Iterator iter = d->ops.begin();
             iter != d->ops.end();
             ++iter)
         pause(*iter.key(), d->length - iter->length);
@@ -606,7 +606,7 @@ void QDeclarativeTimeLine::sync(QDeclarativeTimeLineValue &timeLineValue)
 
     Temporary hack.
  */
-void QDeclarativeTimeLine::setSyncPoint(int sp)
+void QQuickTimeLine::setSyncPoint(int sp)
 {
     d->syncPoint = sp;
 }
@@ -616,16 +616,16 @@ void QDeclarativeTimeLine::setSyncPoint(int sp)
  
     Temporary hack.
  */
-int QDeclarativeTimeLine::syncPoint() const
+int QQuickTimeLine::syncPoint() const
 {
     return d->syncPoint;
 }
 
 /*!
     Returns true if the timeline is active.  An active timeline is one where
-    QDeclarativeTimeLineValue actions are still pending.
+    QQuickTimeLineValue actions are still pending.
 */
-bool QDeclarativeTimeLine::isActive() const
+bool QQuickTimeLine::isActive() const
 {
     return !d->ops.isEmpty();
 }
@@ -633,8 +633,8 @@ bool QDeclarativeTimeLine::isActive() const
 /*!
     Completes the timeline.  All queued actions are played to completion, and then discarded.  For example,
     \code
-    QDeclarativeTimeLineValue v(0.);
-    QDeclarativeTimeLine tl;
+    QQuickTimeLineValue v(0.);
+    QQuickTimeLine tl;
     tl.move(v, 100., 1000.);
     // 500 ms passes
     // v.value() == 50.
@@ -642,16 +642,16 @@ bool QDeclarativeTimeLine::isActive() const
     // v.value() == 100.
     \endcode
 */
-void QDeclarativeTimeLine::complete()
+void QQuickTimeLine::complete()
 {
     d->advance(d->length);
 }
 
 /*!
-    Resets the timeline.  All queued actions are discarded and QDeclarativeTimeLineValue's retain their current value. For example,
+    Resets the timeline.  All queued actions are discarded and QQuickTimeLineValue's retain their current value. For example,
     \code
-    QDeclarativeTimeLineValue v(0.);
-    QDeclarativeTimeLine tl;
+    QQuickTimeLineValue v(0.);
+    QQuickTimeLine tl;
     tl.move(v, 100., 1000.);
     // 500 ms passes
     // v.value() == 50.
@@ -659,9 +659,9 @@ void QDeclarativeTimeLine::complete()
     // v.value() == 50.
     \endcode
 */
-void QDeclarativeTimeLine::clear()
+void QQuickTimeLine::clear()
 {
-    for (QDeclarativeTimeLinePrivate::Ops::ConstIterator iter = d->ops.begin(); iter != d->ops.end(); ++iter)
+    for (QQuickTimeLinePrivate::Ops::ConstIterator iter = d->ops.begin(); iter != d->ops.end(); ++iter)
         iter.key()->_t = 0;
     d->ops.clear();
     d->length = 0;
@@ -669,19 +669,19 @@ void QDeclarativeTimeLine::clear()
     //XXX need stop here?
 }
 
-int QDeclarativeTimeLine::time() const
+int QQuickTimeLine::time() const
 {
     return d->prevTime;
 }
 
 /*!
-    \fn void QDeclarativeTimeLine::updated()
+    \fn void QQuickTimeLine::updated()
 
-    Emitted each time the timeline modifies QDeclarativeTimeLineValues.  Even if multiple
-    QDeclarativeTimeLineValues are changed, this signal is only emitted once for each clock tick.
+    Emitted each time the timeline modifies QQuickTimeLineValues.  Even if multiple
+    QQuickTimeLineValues are changed, this signal is only emitted once for each clock tick.
 */
 
-void QDeclarativeTimeLine::updateCurrentTime(int v)
+void QQuickTimeLine::updateCurrentTime(int v)
 {
     if (d->syncAdj == -1)
         d->syncAdj = v;
@@ -723,7 +723,7 @@ bool operator<(const QPair<int, Update> &lhs,
     return lhs.first < rhs.first;
 }
 
-int QDeclarativeTimeLinePrivate::advance(int t)
+int QQuickTimeLinePrivate::advance(int t)
 {
     int pauseTime = -1;
 
@@ -750,7 +750,7 @@ int QDeclarativeTimeLinePrivate::advance(int t)
         QList<QPair<int, Update> > updates;
 
         for (Ops::Iterator iter = ops.begin(); iter != ops.end(); ) {
-            QDeclarativeTimeLineValue *v = static_cast<QDeclarativeTimeLineValue *>(iter.key());
+            QQuickTimeLineValue *v = static_cast<QQuickTimeLineValue *>(iter.key());
             TimeLine &tl = *iter;
             Q_ASSERT(!tl.ops.isEmpty());
 
@@ -823,9 +823,9 @@ int QDeclarativeTimeLinePrivate::advance(int t)
     return pauseTime;
 }
 
-void QDeclarativeTimeLine::remove(QDeclarativeTimeLineObject *v)
+void QQuickTimeLine::remove(QQuickTimeLineObject *v)
 {
-    QDeclarativeTimeLinePrivate::Ops::Iterator iter = d->ops.find(v);
+    QQuickTimeLinePrivate::Ops::Iterator iter = d->ops.find(v);
     Q_ASSERT(iter != d->ops.end());
 
     int len = iter->length;
@@ -833,7 +833,7 @@ void QDeclarativeTimeLine::remove(QDeclarativeTimeLineObject *v)
     if (len == d->length) {
         // We need to recalculate the length
         d->length = 0;
-        for (QDeclarativeTimeLinePrivate::Ops::Iterator iter = d->ops.begin();
+        for (QQuickTimeLinePrivate::Ops::Iterator iter = d->ops.begin();
                 iter != d->ops.end();
                 ++iter) {
 
@@ -850,7 +850,7 @@ void QDeclarativeTimeLine::remove(QDeclarativeTimeLineObject *v)
         d->prevTime = 0;
         d->clockRunning = true;
 
-        if (d->syncMode == QDeclarativeTimeLine::LocalSync) {
+        if (d->syncMode == QQuickTimeLine::LocalSync) {
             d->syncAdj = -1;
         } else {
             d->syncAdj = 0;
@@ -873,42 +873,42 @@ void QDeclarativeTimeLine::remove(QDeclarativeTimeLineObject *v)
 
 /*!
     \internal
-    \class QDeclarativeTimeLineValue
-    \brief The QDeclarativeTimeLineValue class provides a value that can be modified by QDeclarativeTimeLine.
+    \class QQuickTimeLineValue
+    \brief The QQuickTimeLineValue class provides a value that can be modified by QQuickTimeLine.
 */
 
 /*!
-    \fn QDeclarativeTimeLineValue::QDeclarativeTimeLineValue(qreal value = 0)
+    \fn QQuickTimeLineValue::QQuickTimeLineValue(qreal value = 0)
 
-    Construct a new QDeclarativeTimeLineValue with an initial \a value.
+    Construct a new QQuickTimeLineValue with an initial \a value.
 */
 
 /*!
-    \fn qreal QDeclarativeTimeLineValue::value() const
+    \fn qreal QQuickTimeLineValue::value() const
 
     Return the current value.
 */
 
 /*!
-    \fn void QDeclarativeTimeLineValue::setValue(qreal value)
+    \fn void QQuickTimeLineValue::setValue(qreal value)
 
     Set the current \a value.
 */
 
 /*!
-    \fn QDeclarativeTimeLine *QDeclarativeTimeLineValue::timeLine() const
+    \fn QQuickTimeLine *QQuickTimeLineValue::timeLine() const
 
-    If a QDeclarativeTimeLine is operating on this value, return a pointer to it,
+    If a QQuickTimeLine is operating on this value, return a pointer to it,
     otherwise return null.
 */
 
 
-QDeclarativeTimeLineObject::QDeclarativeTimeLineObject()
+QQuickTimeLineObject::QQuickTimeLineObject()
 : _t(0)
 {
 }
 
-QDeclarativeTimeLineObject::~QDeclarativeTimeLineObject()
+QQuickTimeLineObject::~QQuickTimeLineObject()
 {
     if (_t) {
         _t->remove(this);
@@ -916,22 +916,22 @@ QDeclarativeTimeLineObject::~QDeclarativeTimeLineObject()
     }
 }
 
-QDeclarativeTimeLineCallback::QDeclarativeTimeLineCallback()
+QQuickTimeLineCallback::QQuickTimeLineCallback()
 : d0(0), d1(0), d2(0)
 {
 }
 
-QDeclarativeTimeLineCallback::QDeclarativeTimeLineCallback(QDeclarativeTimeLineObject *b, Callback f, void *d)
+QQuickTimeLineCallback::QQuickTimeLineCallback(QQuickTimeLineObject *b, Callback f, void *d)
 : d0(f), d1(d), d2(b)
 {
 }
 
-QDeclarativeTimeLineCallback::QDeclarativeTimeLineCallback(const QDeclarativeTimeLineCallback &o)
+QQuickTimeLineCallback::QQuickTimeLineCallback(const QQuickTimeLineCallback &o)
 : d0(o.d0), d1(o.d1), d2(o.d2)
 {
 }
 
-QDeclarativeTimeLineCallback &QDeclarativeTimeLineCallback::operator=(const QDeclarativeTimeLineCallback &o)
+QQuickTimeLineCallback &QQuickTimeLineCallback::operator=(const QQuickTimeLineCallback &o)
 {
     d0 = o.d0;
     d1 = o.d1;
@@ -939,7 +939,7 @@ QDeclarativeTimeLineCallback &QDeclarativeTimeLineCallback::operator=(const QDec
     return *this;
 }
 
-QDeclarativeTimeLineObject *QDeclarativeTimeLineCallback::callbackObject() const
+QQuickTimeLineObject *QQuickTimeLineCallback::callbackObject() const
 {
     return d2;
 }
diff --git a/src/quick/util/qdeclarativetimeline_p_p.h b/src/quick/util/qquicktimeline_p_p.h
index 421e2e5976..88ee3dafd2 100644
--- a/src/quick/util/qdeclarativetimeline_p_p.h
+++ b/src/quick/util/qquicktimeline_p_p.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#ifndef QDECLARATIVETIMELINE_H
-#define QDECLARATIVETIMELINE_H
+#ifndef QQUICKTIMELINE_H
+#define QQUICKTIMELINE_H
 
 //
 //  W A R N I N G
@@ -59,42 +59,42 @@
 QT_BEGIN_NAMESPACE
 
 class QEasingCurve;
-class QDeclarativeTimeLineValue;
-class QDeclarativeTimeLineCallback;
-struct QDeclarativeTimeLinePrivate;
-class QDeclarativeTimeLineObject;
-class Q_AUTOTEST_EXPORT QDeclarativeTimeLine : public QObject, QAbstractAnimationJob
+class QQuickTimeLineValue;
+class QQuickTimeLineCallback;
+struct QQuickTimeLinePrivate;
+class QQuickTimeLineObject;
+class Q_AUTOTEST_EXPORT QQuickTimeLine : public QObject, QAbstractAnimationJob
 {
 Q_OBJECT
 public:
-    QDeclarativeTimeLine(QObject *parent = 0);
-    ~QDeclarativeTimeLine();
+    QQuickTimeLine(QObject *parent = 0);
+    ~QQuickTimeLine();
 
     enum SyncMode { LocalSync, GlobalSync };
     SyncMode syncMode() const;
     void setSyncMode(SyncMode);
 
-    void pause(QDeclarativeTimeLineObject &, int);
-    void callback(const QDeclarativeTimeLineCallback &);
-    void set(QDeclarativeTimeLineValue &, qreal);
+    void pause(QQuickTimeLineObject &, int);
+    void callback(const QQuickTimeLineCallback &);
+    void set(QQuickTimeLineValue &, qreal);
 
-    int accel(QDeclarativeTimeLineValue &, qreal velocity, qreal accel);
-    int accel(QDeclarativeTimeLineValue &, qreal velocity, qreal accel, qreal maxDistance);
-    int accelDistance(QDeclarativeTimeLineValue &, qreal velocity, qreal distance);
+    int accel(QQuickTimeLineValue &, qreal velocity, qreal accel);
+    int accel(QQuickTimeLineValue &, qreal velocity, qreal accel, qreal maxDistance);
+    int accelDistance(QQuickTimeLineValue &, qreal velocity, qreal distance);
 
-    void move(QDeclarativeTimeLineValue &, qreal destination, int time = 500);
-    void move(QDeclarativeTimeLineValue &, qreal destination, const QEasingCurve &, int time = 500);
-    void moveBy(QDeclarativeTimeLineValue &, qreal change, int time = 500);
-    void moveBy(QDeclarativeTimeLineValue &, qreal change, const QEasingCurve &, int time = 500);
+    void move(QQuickTimeLineValue &, qreal destination, int time = 500);
+    void move(QQuickTimeLineValue &, qreal destination, const QEasingCurve &, int time = 500);
+    void moveBy(QQuickTimeLineValue &, qreal change, int time = 500);
+    void moveBy(QQuickTimeLineValue &, qreal change, const QEasingCurve &, int time = 500);
 
     void sync();
     void setSyncPoint(int);
     int syncPoint() const;
 
-    void sync(QDeclarativeTimeLineValue &);
-    void sync(QDeclarativeTimeLineValue &, QDeclarativeTimeLineValue &);
+    void sync(QQuickTimeLineValue &);
+    void sync(QQuickTimeLineValue &, QQuickTimeLineValue &);
 
-    void reset(QDeclarativeTimeLineValue &);
+    void reset(QQuickTimeLineValue &);
 
     void complete();
     void clear();
@@ -111,80 +111,80 @@ protected:
     virtual void updateCurrentTime(int);
 
 private:
-    void remove(QDeclarativeTimeLineObject *);
-    friend class QDeclarativeTimeLineObject;
-    friend struct QDeclarativeTimeLinePrivate;
-    QDeclarativeTimeLinePrivate *d;
+    void remove(QQuickTimeLineObject *);
+    friend class QQuickTimeLineObject;
+    friend struct QQuickTimeLinePrivate;
+    QQuickTimeLinePrivate *d;
 };
 
-class Q_AUTOTEST_EXPORT QDeclarativeTimeLineObject
+class Q_AUTOTEST_EXPORT QQuickTimeLineObject
 {
 public:
-    QDeclarativeTimeLineObject();
-    virtual ~QDeclarativeTimeLineObject();
+    QQuickTimeLineObject();
+    virtual ~QQuickTimeLineObject();
 
 protected:
-    friend class QDeclarativeTimeLine;
-    friend struct QDeclarativeTimeLinePrivate;
-    QDeclarativeTimeLine *_t;
+    friend class QQuickTimeLine;
+    friend struct QQuickTimeLinePrivate;
+    QQuickTimeLine *_t;
 };
 
-class Q_AUTOTEST_EXPORT QDeclarativeTimeLineValue : public QDeclarativeTimeLineObject
+class Q_AUTOTEST_EXPORT QQuickTimeLineValue : public QQuickTimeLineObject
 {
 public:
-    QDeclarativeTimeLineValue(qreal v = 0.) : _v(v) {}
+    QQuickTimeLineValue(qreal v = 0.) : _v(v) {}
 
     virtual qreal value() const { return _v; }
     virtual void setValue(qreal v) { _v = v; }
 
-    QDeclarativeTimeLine *timeLine() const { return _t; }
+    QQuickTimeLine *timeLine() const { return _t; }
 
     operator qreal() const { return _v; }
-    QDeclarativeTimeLineValue &operator=(qreal v) { setValue(v); return *this; }
+    QQuickTimeLineValue &operator=(qreal v) { setValue(v); return *this; }
 private:
-    friend class QDeclarativeTimeLine;
-    friend struct QDeclarativeTimeLinePrivate;
+    friend class QQuickTimeLine;
+    friend struct QQuickTimeLinePrivate;
     qreal _v;
 };
 
-class Q_AUTOTEST_EXPORT QDeclarativeTimeLineCallback
+class Q_AUTOTEST_EXPORT QQuickTimeLineCallback
 {
 public:
     typedef void (*Callback)(void *);
 
-    QDeclarativeTimeLineCallback();
-    QDeclarativeTimeLineCallback(QDeclarativeTimeLineObject *b, Callback, void * = 0);
-    QDeclarativeTimeLineCallback(const QDeclarativeTimeLineCallback &o);
+    QQuickTimeLineCallback();
+    QQuickTimeLineCallback(QQuickTimeLineObject *b, Callback, void * = 0);
+    QQuickTimeLineCallback(const QQuickTimeLineCallback &o);
 
-    QDeclarativeTimeLineCallback &operator=(const QDeclarativeTimeLineCallback &o);
-    QDeclarativeTimeLineObject *callbackObject() const;
+    QQuickTimeLineCallback &operator=(const QQuickTimeLineCallback &o);
+    QQuickTimeLineObject *callbackObject() const;
 
 private:
-    friend struct QDeclarativeTimeLinePrivate;
+    friend struct QQuickTimeLinePrivate;
     Callback d0;
     void *d1;
-    QDeclarativeTimeLineObject *d2;
+    QQuickTimeLineObject *d2;
 };
 
 template<class T>
-class QDeclarativeTimeLineValueProxy : public QDeclarativeTimeLineValue
+class QQuickTimeLineValueProxy : public QQuickTimeLineValue
 {
 public:
-    QDeclarativeTimeLineValueProxy(T *cls, void (T::*func)(qreal), qreal v = 0.)
-    : QDeclarativeTimeLineValue(v), _class(cls), _setFunctionReal(func), _setFunctionInt(0)
+    QQuickTimeLineValueProxy(T *cls, void (T::*func)(qreal), qreal v = 0.)
+    : QQuickTimeLineValue(v), _class(cls), _setFunctionReal(func), _setFunctionInt(0)
     {
         Q_ASSERT(_class);
     }
 
-    QDeclarativeTimeLineValueProxy(T *cls, void (T::*func)(int), qreal v = 0.)
-    : QDeclarativeTimeLineValue(v), _class(cls), _setFunctionReal(0), _setFunctionInt(func)
+    QQuickTimeLineValueProxy(T *cls, void (T::*func)(int), qreal v = 0.)
+    : QQuickTimeLineValue(v), _class(cls), _setFunctionReal(0), _setFunctionInt(func)
     {
         Q_ASSERT(_class);
     }
 
     virtual void setValue(qreal v)
     {
-        QDeclarativeTimeLineValue::setValue(v);
+        QQuickTimeLineValue::setValue(v);
         if (_setFunctionReal) (_class->*_setFunctionReal)(v);
         else if (_setFunctionInt) (_class->*_setFunctionInt)((int)v);
     }
diff --git a/src/quick/util/qdeclarativetimer.cpp b/src/quick/util/qquicktimer.cpp
index 3c57f22c58..151f1f8b48 100644
--- a/src/quick/util/qdeclarativetimer.cpp
+++ b/src/quick/util/qquicktimer.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include "qdeclarativetimer_p.h"
+#include "qquicktimer_p.h"
 
 #include <QtCore/qcoreapplication.h>
 #include "private/qpauseanimationjob_p.h"
@@ -51,16 +51,16 @@ QT_BEGIN_NAMESPACE
 
 
 
-class QDeclarativeTimerPrivate : public QObjectPrivate, public QAnimationJobChangeListener
+class QQuickTimerPrivate : public QObjectPrivate, public QAnimationJobChangeListener
 {
-    Q_DECLARE_PUBLIC(QDeclarativeTimer)
+    Q_DECLARE_PUBLIC(QQuickTimer)
 public:
-    QDeclarativeTimerPrivate()
+    QQuickTimerPrivate()
         : interval(1000), running(false), repeating(false), triggeredOnStart(false)
         , classBegun(false), componentComplete(false), firstTick(true) {}
 
     virtual void animationFinished(QAbstractAnimationJob *);
-    virtual void animationCurrentLoopChanged(QAbstractAnimationJob *)  { Q_Q(QDeclarativeTimer); q->ticked(); }
+    virtual void animationCurrentLoopChanged(QAbstractAnimationJob *)  { Q_Q(QQuickTimer); q->ticked(); }
 
     int interval;
     QPauseAnimationJob pause;
@@ -73,7 +73,7 @@ public:
 };
 
 /*!
-    \qmlclass Timer QDeclarativeTimer
+    \qmlclass Timer QQuickTimer
     \inqmlmodule QtQuick 2
     \ingroup qml-utility-elements
     \brief The Timer item triggers a handler at a specified interval.
@@ -111,10 +111,10 @@ public:
     \sa {declarative/toys/clocks}{Clocks example}
 */
 
-QDeclarativeTimer::QDeclarativeTimer(QObject *parent)
-    : QObject(*(new QDeclarativeTimerPrivate), parent)
+QQuickTimer::QQuickTimer(QObject *parent)
+    : QObject(*(new QQuickTimerPrivate), parent)
 {
-    Q_D(QDeclarativeTimer);
+    Q_D(QQuickTimer);
     d->pause.addAnimationChangeListener(d, QAbstractAnimationJob::Completion | QAbstractAnimationJob::CurrentLoop);
     d->pause.setLoopCount(1);
     d->pause.setDuration(d->interval);
@@ -127,9 +127,9 @@ QDeclarativeTimer::QDeclarativeTimer(QObject *parent)
 
     The default interval is 1000 milliseconds.
 */
-void QDeclarativeTimer::setInterval(int interval)
+void QQuickTimer::setInterval(int interval)
 {
-    Q_D(QDeclarativeTimer);
+    Q_D(QQuickTimer);
     if (interval != d->interval) {
         d->interval = interval;
         update();
@@ -137,9 +137,9 @@ void QDeclarativeTimer::setInterval(int interval)
     }
 }
 
-int QDeclarativeTimer::interval() const
+int QQuickTimer::interval() const
 {
-    Q_D(const QDeclarativeTimer);
+    Q_D(const QQuickTimer);
     return d->interval;
 }
 
@@ -154,15 +154,15 @@ int QDeclarativeTimer::interval() const
 
     \sa repeat
 */
-bool QDeclarativeTimer::isRunning() const
+bool QQuickTimer::isRunning() const
 {
-    Q_D(const QDeclarativeTimer);
+    Q_D(const QQuickTimer);
     return d->running;
 }
 
-void QDeclarativeTimer::setRunning(bool running)
+void QQuickTimer::setRunning(bool running)
 {
-    Q_D(QDeclarativeTimer);
+    Q_D(QQuickTimer);
     if (d->running != running) {
         d->running = running;
         d->firstTick = true;
@@ -182,15 +182,15 @@ void QDeclarativeTimer::setRunning(bool running)
 
     \sa running
 */
-bool QDeclarativeTimer::isRepeating() const
+bool QQuickTimer::isRepeating() const
 {
-    Q_D(const QDeclarativeTimer);
+    Q_D(const QQuickTimer);
     return d->repeating;
 }
 
-void QDeclarativeTimer::setRepeating(bool repeating)
+void QQuickTimer::setRepeating(bool repeating)
 {
-    Q_D(QDeclarativeTimer);
+    Q_D(QQuickTimer);
     if (repeating != d->repeating) {
         d->repeating = repeating;
         update();
@@ -215,15 +215,15 @@ void QDeclarativeTimer::setRepeating(bool repeating)
 
     \sa running
 */
-bool QDeclarativeTimer::triggeredOnStart() const
+bool QQuickTimer::triggeredOnStart() const
 {
-    Q_D(const QDeclarativeTimer);
+    Q_D(const QQuickTimer);
     return d->triggeredOnStart;
 }
 
-void QDeclarativeTimer::setTriggeredOnStart(bool triggeredOnStart)
+void QQuickTimer::setTriggeredOnStart(bool triggeredOnStart)
 {
-    Q_D(QDeclarativeTimer);
+    Q_D(QQuickTimer);
     if (d->triggeredOnStart != triggeredOnStart) {
         d->triggeredOnStart = triggeredOnStart;
         update();
@@ -238,7 +238,7 @@ void QDeclarativeTimer::setTriggeredOnStart(bool triggeredOnStart)
     If the timer is already running, calling this method has no effect.  The
     \c running property will be true following a call to \c start().
 */
-void QDeclarativeTimer::start()
+void QQuickTimer::start()
 {
     setRunning(true);
 }
@@ -250,7 +250,7 @@ void QDeclarativeTimer::start()
     If the timer is not running, calling this method has no effect.  The
     \c running property will be false following a call to \c stop().
 */
-void QDeclarativeTimer::stop()
+void QQuickTimer::stop()
 {
     setRunning(false);
 }
@@ -263,15 +263,15 @@ void QDeclarativeTimer::stop()
     stopped, reset to initial state and started.  The \c running property
     will be true following a call to \c restart().
 */
-void QDeclarativeTimer::restart()
+void QQuickTimer::restart()
 {
     setRunning(false);
     setRunning(true);
 }
 
-void QDeclarativeTimer::update()
+void QQuickTimer::update()
 {
-    Q_D(QDeclarativeTimer);
+    Q_D(QQuickTimer);
     if (d->classBegun && !d->componentComplete)
         return;
     d->pause.stop();
@@ -287,15 +287,15 @@ void QDeclarativeTimer::update()
     }
 }
 
-void QDeclarativeTimer::classBegin()
+void QQuickTimer::classBegin()
 {
-    Q_D(QDeclarativeTimer);
+    Q_D(QQuickTimer);
     d->classBegun = true;
 }
 
-void QDeclarativeTimer::componentComplete()
+void QQuickTimer::componentComplete()
 {
-    Q_D(QDeclarativeTimer);
+    Q_D(QQuickTimer);
     d->componentComplete = true;
     update();
 }
@@ -305,17 +305,17 @@ void QDeclarativeTimer::componentComplete()
 
     This handler is called when the Timer is triggered.
 */
-void QDeclarativeTimer::ticked()
+void QQuickTimer::ticked()
 {
-    Q_D(QDeclarativeTimer);
+    Q_D(QQuickTimer);
     if (d->running && (d->pause.currentTime() > 0 || (d->triggeredOnStart && d->firstTick)))
         emit triggered();
     d->firstTick = false;
 }
 
-void QDeclarativeTimerPrivate::animationFinished(QAbstractAnimationJob *)
+void QQuickTimerPrivate::animationFinished(QAbstractAnimationJob *)
 {
-    Q_Q(QDeclarativeTimer);
+    Q_Q(QQuickTimer);
     if (repeating || !running)
         return;
     running = false;
diff --git a/src/quick/util/qdeclarativetimer_p.h b/src/quick/util/qquicktimer_p.h
index e400b3dda3..b0354e4874 100644
--- a/src/quick/util/qdeclarativetimer_p.h
+++ b/src/quick/util/qquicktimer_p.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
@@ -39,10 +39,10 @@
 **
 ****************************************************************************/
 
-#ifndef QDECLARATIVETIMER_H
-#define QDECLARATIVETIMER_H
+#ifndef QQUICKTIMER_H
+#define QQUICKTIMER_H
 
-#include <qdeclarative.h>
+#include <qqml.h>
 
 #include <QtCore/qobject.h>
 
@@ -52,12 +52,12 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-class QDeclarativeTimerPrivate;
-class Q_QUICK_PRIVATE_EXPORT QDeclarativeTimer : public QObject, public QDeclarativeParserStatus
+class QQuickTimerPrivate;
+class Q_QUICK_PRIVATE_EXPORT QQuickTimer : public QObject, public QQmlParserStatus
 {
     Q_OBJECT
-    Q_DECLARE_PRIVATE(QDeclarativeTimer)
-    Q_INTERFACES(QDeclarativeParserStatus)
+    Q_DECLARE_PRIVATE(QQuickTimer)
+    Q_INTERFACES(QQmlParserStatus)
     Q_PROPERTY(int interval READ interval WRITE setInterval NOTIFY intervalChanged)
     Q_PROPERTY(bool running READ isRunning WRITE setRunning NOTIFY runningChanged)
     Q_PROPERTY(bool repeat READ isRepeating WRITE setRepeating NOTIFY repeatChanged)
@@ -65,7 +65,7 @@ class Q_QUICK_PRIVATE_EXPORT QDeclarativeTimer : public QObject, public QDeclara
     Q_PROPERTY(QObject *parent READ parent CONSTANT)
 
 public:
-    QDeclarativeTimer(QObject *parent=0);
+    QQuickTimer(QObject *parent=0);
 
     void setInterval(int interval);
     int interval() const;
@@ -104,7 +104,7 @@ private Q_SLOTS:
 
 QT_END_NAMESPACE
 
-QML_DECLARE_TYPE(QDeclarativeTimer)
+QML_DECLARE_TYPE(QQuickTimer)
 
 QT_END_HEADER
 
diff --git a/src/quick/util/qdeclarativetransition.cpp b/src/quick/util/qquicktransition.cpp
index 96e870df82..5d9a2880d2 100644
--- a/src/quick/util/qdeclarativetransition.cpp
+++ b/src/quick/util/qquicktransition.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
@@ -39,21 +39,21 @@
 **
 ****************************************************************************/
 
-#include "qdeclarativetransition_p.h"
+#include "qquicktransition_p.h"
 
-#include "qdeclarativestate_p.h"
-#include "qdeclarativestate_p_p.h"
-#include "qdeclarativestateoperations_p.h"
-#include "qdeclarativeanimation_p.h"
-#include "qdeclarativeanimation_p_p.h"
-#include "qdeclarativetransitionmanager_p_p.h"
+#include "qquickstate_p.h"
+#include "qquickstate_p_p.h"
+#include "qquickstatechangescript_p.h"
+#include "qquickanimation_p.h"
+#include "qquickanimation_p_p.h"
+#include "qquicktransitionmanager_p_p.h"
 
 #include "private/qparallelanimationgroupjob_p.h"
 
 QT_BEGIN_NAMESPACE
 
 /*!
-    \qmlclass Transition QDeclarativeTransition
+    \qmlclass Transition QQuickTransition
     \inqmlmodule QtQuick 2
     \ingroup qml-animation-transition
     \brief The Transition element defines animated transitions that occur on state changes.
@@ -66,7 +66,7 @@ QT_BEGIN_NAMESPACE
     changes between the default and the "moved" state, any changes
     to the \c x and \c y properties should be animated, using an \c Easing.InOutQuad.
 
-    \snippet doc/src/snippets/declarative/transition.qml 0
+    \snippet doc/src/snippets/qml/transition.qml 0
 
     Notice the example does not require \l{PropertyAnimation::}{to} and
     \l{PropertyAnimation::}{from} values for the NumberAnimation. As a convenience,
@@ -83,7 +83,7 @@ QT_BEGIN_NAMESPACE
 
     To define multiple transitions, specify \l Item::transitions as a list:
 
-    \snippet doc/src/snippets/declarative/transitions-list.qml list of transitions
+    \snippet doc/src/snippets/qml/transitions-list.qml list of transitions
 
     If multiple Transitions are specified, only a single (best-matching) Transition will be applied for any particular
     state change. In the example above, when changing to \c state1, the first transition will be used, rather
@@ -93,32 +93,32 @@ QT_BEGIN_NAMESPACE
     \l Behavior, the Transition animation overrides the \l Behavior for that
     state change.
 
-    \sa {QML Animation and Transitions}, {declarative/animation/states}{states example}, {qmlstates}{States}, {QtDeclarative}
+    \sa {QML Animation and Transitions}, {declarative/animation/states}{states example}, {qmlstates}{States}, {QtQml}
 */
 
-QDeclarativeTransitionInstance::QDeclarativeTransitionInstance()
+QQuickTransitionInstance::QQuickTransitionInstance()
     : m_anim(0)
 {
 }
 
-QDeclarativeTransitionInstance::~QDeclarativeTransitionInstance()
+QQuickTransitionInstance::~QQuickTransitionInstance()
 {
     delete m_anim;
 }
 
-void QDeclarativeTransitionInstance::start()
+void QQuickTransitionInstance::start()
 {
     if (m_anim)
         m_anim->start();
 }
 
-void QDeclarativeTransitionInstance::stop()
+void QQuickTransitionInstance::stop()
 {
     if (m_anim)
         m_anim->stop();
 }
 
-bool QDeclarativeTransitionInstance::isRunning() const
+bool QQuickTransitionInstance::isRunning() const
 {
     return m_anim && m_anim->state() == QAbstractAnimationJob::Running;
 }
@@ -130,17 +130,17 @@ class ParallelAnimationWrapper : public QParallelAnimationGroupJob
 {
 public:
     ParallelAnimationWrapper() : QParallelAnimationGroupJob() {}
-    QDeclarativeTransitionManager *manager;
+    QQuickTransitionManager *manager;
 
 protected:
     virtual void updateState(QAbstractAnimationJob::State newState, QAbstractAnimationJob::State oldState);
 };
 
-class QDeclarativeTransitionPrivate : public QObjectPrivate
+class QQuickTransitionPrivate : public QObjectPrivate
 {
-    Q_DECLARE_PUBLIC(QDeclarativeTransition)
+    Q_DECLARE_PUBLIC(QQuickTransition)
 public:
-    QDeclarativeTransitionPrivate()
+    QQuickTransitionPrivate()
     : fromState(QLatin1String("*")), toState(QLatin1String("*")),
         reversed(false), reversible(false), enabled(true)
     {
@@ -152,37 +152,37 @@ public:
     bool reversible;
     bool enabled;
 
-    static void append_animation(QDeclarativeListProperty<QDeclarativeAbstractAnimation> *list, QDeclarativeAbstractAnimation *a);
-    static int animation_count(QDeclarativeListProperty<QDeclarativeAbstractAnimation> *list);
-    static QDeclarativeAbstractAnimation* animation_at(QDeclarativeListProperty<QDeclarativeAbstractAnimation> *list, int pos);
-    static void clear_animations(QDeclarativeListProperty<QDeclarativeAbstractAnimation> *list);
-    QList<QDeclarativeAbstractAnimation *> animations;
+    static void append_animation(QQmlListProperty<QQuickAbstractAnimation> *list, QQuickAbstractAnimation *a);
+    static int animation_count(QQmlListProperty<QQuickAbstractAnimation> *list);
+    static QQuickAbstractAnimation* animation_at(QQmlListProperty<QQuickAbstractAnimation> *list, int pos);
+    static void clear_animations(QQmlListProperty<QQuickAbstractAnimation> *list);
+    QList<QQuickAbstractAnimation *> animations;
 };
 
-void QDeclarativeTransitionPrivate::append_animation(QDeclarativeListProperty<QDeclarativeAbstractAnimation> *list, QDeclarativeAbstractAnimation *a)
+void QQuickTransitionPrivate::append_animation(QQmlListProperty<QQuickAbstractAnimation> *list, QQuickAbstractAnimation *a)
 {
-    QDeclarativeTransition *q = static_cast<QDeclarativeTransition *>(list->object);
+    QQuickTransition *q = static_cast<QQuickTransition *>(list->object);
     q->d_func()->animations.append(a);
     a->setDisableUserControl();
 }
 
-int QDeclarativeTransitionPrivate::animation_count(QDeclarativeListProperty<QDeclarativeAbstractAnimation> *list)
+int QQuickTransitionPrivate::animation_count(QQmlListProperty<QQuickAbstractAnimation> *list)
 {
-    QDeclarativeTransition *q = static_cast<QDeclarativeTransition *>(list->object);
+    QQuickTransition *q = static_cast<QQuickTransition *>(list->object);
     return q->d_func()->animations.count();
 }
 
-QDeclarativeAbstractAnimation* QDeclarativeTransitionPrivate::animation_at(QDeclarativeListProperty<QDeclarativeAbstractAnimation> *list, int pos)
+QQuickAbstractAnimation* QQuickTransitionPrivate::animation_at(QQmlListProperty<QQuickAbstractAnimation> *list, int pos)
 {
-    QDeclarativeTransition *q = static_cast<QDeclarativeTransition *>(list->object);
+    QQuickTransition *q = static_cast<QQuickTransition *>(list->object);
     return q->d_func()->animations.at(pos);
 }
 
-void QDeclarativeTransitionPrivate::clear_animations(QDeclarativeListProperty<QDeclarativeAbstractAnimation> *list)
+void QQuickTransitionPrivate::clear_animations(QQmlListProperty<QQuickAbstractAnimation> *list)
 {
-    QDeclarativeTransition *q = static_cast<QDeclarativeTransition *>(list->object);
+    QQuickTransition *q = static_cast<QQuickTransition *>(list->object);
     while (q->d_func()->animations.count()) {
-        QDeclarativeAbstractAnimation *firstAnim = q->d_func()->animations.at(0);
+        QQuickAbstractAnimation *firstAnim = q->d_func()->animations.at(0);
         q->d_func()->animations.removeAll(firstAnim);
     }
 }
@@ -199,34 +199,34 @@ void ParallelAnimationWrapper::updateState(QAbstractAnimationJob::State newState
 }
 
 
-QDeclarativeTransition::QDeclarativeTransition(QObject *parent)
-    : QObject(*(new QDeclarativeTransitionPrivate), parent)
+QQuickTransition::QQuickTransition(QObject *parent)
+    : QObject(*(new QQuickTransitionPrivate), parent)
 {
 }
 
-QDeclarativeTransition::~QDeclarativeTransition()
+QQuickTransition::~QQuickTransition()
 {
 }
 
-void QDeclarativeTransition::setReversed(bool r)
+void QQuickTransition::setReversed(bool r)
 {
-    Q_D(QDeclarativeTransition);
+    Q_D(QQuickTransition);
     d->reversed = r;
 }
 
-QDeclarativeTransitionInstance *QDeclarativeTransition::prepare(QDeclarativeStateOperation::ActionList &actions,
-                            QList<QDeclarativeProperty> &after,
-                            QDeclarativeTransitionManager *manager,
+QQuickTransitionInstance *QQuickTransition::prepare(QQuickStateOperation::ActionList &actions,
+                            QList<QQmlProperty> &after,
+                            QQuickTransitionManager *manager,
                             QObject *defaultTarget)
 {
-    Q_D(QDeclarativeTransition);
+    Q_D(QQuickTransition);
 
     qmlExecuteDeferred(this);
 
     ParallelAnimationWrapper *group = new ParallelAnimationWrapper();
     group->manager = manager;
 
-    QDeclarativeAbstractAnimation::TransitionDirection direction = d->reversed ? QDeclarativeAbstractAnimation::Backward : QDeclarativeAbstractAnimation::Forward;
+    QQuickAbstractAnimation::TransitionDirection direction = d->reversed ? QQuickAbstractAnimation::Backward : QQuickAbstractAnimation::Forward;
     int start = d->reversed ? d->animations.count() - 1 : 0;
     int end = d->reversed ? -1 : d->animations.count();
 
@@ -240,7 +240,7 @@ QDeclarativeTransitionInstance *QDeclarativeTransition::prepare(QDeclarativeStat
 
     group->setDirection(d->reversed ? QAbstractAnimationJob::Backward : QAbstractAnimationJob::Forward);
 
-    QDeclarativeTransitionInstance *wrapper = new QDeclarativeTransitionInstance;
+    QQuickTransitionInstance *wrapper = new QQuickTransitionInstance;
     wrapper->m_anim = group;
     return wrapper;
 }
@@ -257,11 +257,11 @@ QDeclarativeTransitionInstance *QDeclarativeTransition::prepare(QDeclarativeStat
     properties, so the animation is always applied when changing between
     the two states (i.e. when the mouse is pressed and released).
 
-    \snippet doc/src/snippets/declarative/transition-from-to.qml 0
+    \snippet doc/src/snippets/qml/transition-from-to.qml 0
 
     If the transition was changed to this:
 
-    \snippet doc/src/snippets/declarative/transition-from-to-modified.qml modified transition
+    \snippet doc/src/snippets/qml/transition-from-to-modified.qml modified transition
 
     The animation would only be applied when changing from the default state to
     the "brighter" state (i.e. when the mouse is pressed, but not on release).
@@ -270,15 +270,15 @@ QDeclarativeTransitionInstance *QDeclarativeTransition::prepare(QDeclarativeStat
 
     \sa reversible
 */
-QString QDeclarativeTransition::fromState() const
+QString QQuickTransition::fromState() const
 {
-    Q_D(const QDeclarativeTransition);
+    Q_D(const QQuickTransition);
     return d->fromState;
 }
 
-void QDeclarativeTransition::setFromState(const QString &f)
+void QQuickTransition::setFromState(const QString &f)
 {
-    Q_D(QDeclarativeTransition);
+    Q_D(QQuickTransition);
     if (f == d->fromState)
         return;
 
@@ -304,21 +304,21 @@ void QDeclarativeTransition::setFromState(const QString &f)
     transition applies a sequential animation when the mouse is pressed,
     and reverses the sequence of the animation when the mouse is released:
 
-    \snippet doc/src/snippets/declarative/transition-reversible.qml 0
+    \snippet doc/src/snippets/qml/transition-reversible.qml 0
 
     If the transition did not set the \c to and \c reversible values, then
     on the mouse release, the transition would play the PropertyAnimation
     before the ColorAnimation instead of reversing the sequence.
 */
-bool QDeclarativeTransition::reversible() const
+bool QQuickTransition::reversible() const
 {
-    Q_D(const QDeclarativeTransition);
+    Q_D(const QQuickTransition);
     return d->reversible;
 }
 
-void QDeclarativeTransition::setReversible(bool r)
+void QQuickTransition::setReversible(bool r)
 {
-    Q_D(QDeclarativeTransition);
+    Q_D(QQuickTransition);
     if (r == d->reversible)
         return;
 
@@ -326,15 +326,15 @@ void QDeclarativeTransition::setReversible(bool r)
     emit reversibleChanged();
 }
 
-QString QDeclarativeTransition::toState() const
+QString QQuickTransition::toState() const
 {
-    Q_D(const QDeclarativeTransition);
+    Q_D(const QQuickTransition);
     return d->toState;
 }
 
-void QDeclarativeTransition::setToState(const QString &t)
+void QQuickTransition::setToState(const QString &t)
 {
-    Q_D(QDeclarativeTransition);
+    Q_D(QQuickTransition);
     if (t == d->toState)
         return;
 
@@ -370,15 +370,15 @@ void QDeclarativeTransition::setToState(const QString &t)
     \endqml
 */
 
-bool QDeclarativeTransition::enabled() const
+bool QQuickTransition::enabled() const
 {
-    Q_D(const QDeclarativeTransition);
+    Q_D(const QQuickTransition);
     return d->enabled;
 }
 
-void QDeclarativeTransition::setEnabled(bool enabled)
+void QQuickTransition::setEnabled(bool enabled)
 {
-    Q_D(QDeclarativeTransition);
+    Q_D(QQuickTransition);
     if (d->enabled == enabled)
         return;
     d->enabled = enabled;
@@ -396,17 +396,17 @@ void QDeclarativeTransition::setEnabled(bool enabled)
     The top-level animations are run in parallel. To run them sequentially,
     define them within a SequentialAnimation:
 
-    \snippet doc/src/snippets/declarative/transition-reversible.qml sequential animations
+    \snippet doc/src/snippets/qml/transition-reversible.qml sequential animations
 */
-QDeclarativeListProperty<QDeclarativeAbstractAnimation> QDeclarativeTransition::animations()
+QQmlListProperty<QQuickAbstractAnimation> QQuickTransition::animations()
 {
-    Q_D(QDeclarativeTransition);
-    return QDeclarativeListProperty<QDeclarativeAbstractAnimation>(this, &d->animations, QDeclarativeTransitionPrivate::append_animation,
-                                                                   QDeclarativeTransitionPrivate::animation_count,
-                                                                   QDeclarativeTransitionPrivate::animation_at,
-                                                                   QDeclarativeTransitionPrivate::clear_animations);
+    Q_D(QQuickTransition);
+    return QQmlListProperty<QQuickAbstractAnimation>(this, &d->animations, QQuickTransitionPrivate::append_animation,
+                                                                   QQuickTransitionPrivate::animation_count,
+                                                                   QQuickTransitionPrivate::animation_at,
+                                                                   QQuickTransitionPrivate::clear_animations);
 }
 
 QT_END_NAMESPACE
 
-//#include <qdeclarativetransition.moc>
+//#include <qquicktransition.moc>
diff --git a/src/quick/util/qdeclarativetransition_p.h b/src/quick/util/qquicktransition_p.h
index 839a626014..ebd82fde2c 100644
--- a/src/quick/util/qdeclarativetransition_p.h
+++ b/src/quick/util/qquicktransition_p.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
@@ -39,11 +39,11 @@
 **
 ****************************************************************************/
 
-#ifndef QDECLARATIVETRANSITION_H
-#define QDECLARATIVETRANSITION_H
+#ifndef QQUICKTRANSITION_H
+#define QQUICKTRANSITION_H
 
-#include "qdeclarativestate_p.h"
-#include <qdeclarative.h>
+#include "qquickstate_p.h"
+#include <qqml.h>
 
 #include <QtCore/qobject.h>
 
@@ -51,17 +51,17 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-class QDeclarativeAbstractAnimation;
-class QDeclarativeTransitionPrivate;
-class QDeclarativeTransitionManager;
-class QDeclarativeTransition;
+class QQuickAbstractAnimation;
+class QQuickTransitionPrivate;
+class QQuickTransitionManager;
+class QQuickTransition;
 class QAbstractAnimationJob;
 
-class Q_QUICK_EXPORT QDeclarativeTransitionInstance
+class Q_QUICK_EXPORT QQuickTransitionInstance
 {
 public:
-    QDeclarativeTransitionInstance();
-    ~QDeclarativeTransitionInstance();
+    QQuickTransitionInstance();
+    ~QQuickTransitionInstance();
 
     void start();
     void stop();
@@ -70,25 +70,25 @@ public:
 
 private:
     QAbstractAnimationJob *m_anim;
-    friend class QDeclarativeTransition;
+    friend class QQuickTransition;
 };
 
-class Q_QUICK_EXPORT QDeclarativeTransition : public QObject
+class Q_QUICK_EXPORT QQuickTransition : public QObject
 {
     Q_OBJECT
-    Q_DECLARE_PRIVATE(QDeclarativeTransition)
+    Q_DECLARE_PRIVATE(QQuickTransition)
 
     Q_PROPERTY(QString from READ fromState WRITE setFromState NOTIFY fromChanged)
     Q_PROPERTY(QString to READ toState WRITE setToState NOTIFY toChanged)
     Q_PROPERTY(bool reversible READ reversible WRITE setReversible NOTIFY reversibleChanged)
-    Q_PROPERTY(QDeclarativeListProperty<QDeclarativeAbstractAnimation> animations READ animations)
+    Q_PROPERTY(QQmlListProperty<QQuickAbstractAnimation> animations READ animations)
     Q_PROPERTY(bool enabled READ enabled WRITE setEnabled NOTIFY enabledChanged)
     Q_CLASSINFO("DefaultProperty", "animations")
     Q_CLASSINFO("DeferredPropertyNames", "animations")
 
 public:
-    QDeclarativeTransition(QObject *parent=0);
-    ~QDeclarativeTransition();
+    QQuickTransition(QObject *parent=0);
+    ~QQuickTransition();
 
     QString fromState() const;
     void setFromState(const QString &);
@@ -102,11 +102,11 @@ public:
     bool enabled() const;
     void setEnabled(bool enabled);
 
-    QDeclarativeListProperty<QDeclarativeAbstractAnimation> animations();
+    QQmlListProperty<QQuickAbstractAnimation> animations();
 
-    QDeclarativeTransitionInstance *prepare(QDeclarativeStateOperation::ActionList &actions,
-                 QList<QDeclarativeProperty> &after,
-                 QDeclarativeTransitionManager *end,
+    QQuickTransitionInstance *prepare(QQuickStateOperation::ActionList &actions,
+                 QList<QQmlProperty> &after,
+                 QQuickTransitionManager *end,
                  QObject *defaultTarget);
 
     void setReversed(bool r);
@@ -120,8 +120,8 @@ Q_SIGNALS:
 
 QT_END_NAMESPACE
 
-QML_DECLARE_TYPE(QDeclarativeTransition)
+QML_DECLARE_TYPE(QQuickTransition)
 
 QT_END_HEADER
 
-#endif // QDECLARATIVETRANSITION_H
+#endif // QQUICKTRANSITION_H
diff --git a/src/quick/util/qdeclarativetransitionmanager.cpp b/src/quick/util/qquicktransitionmanager.cpp
index ebe7805c62..910043e251 100644
--- a/src/quick/util/qdeclarativetransitionmanager.cpp
+++ b/src/quick/util/qquicktransitionmanager.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
@@ -39,14 +39,14 @@
 **
 ****************************************************************************/
 
-#include "qdeclarativetransitionmanager_p_p.h"
+#include "qquicktransitionmanager_p_p.h"
 
-#include "qdeclarativetransition_p.h"
-#include "qdeclarativestate_p_p.h"
+#include "qquicktransition_p.h"
+#include "qquickstate_p_p.h"
 
-#include <private/qdeclarativebinding_p.h>
-#include <private/qdeclarativeglobal_p.h>
-#include <private/qdeclarativeproperty_p.h>
+#include <private/qqmlbinding_p.h>
+#include <private/qqmlglobal_p.h>
+#include <private/qqmlproperty_p.h>
 
 #include <QtCore/qdebug.h>
 
@@ -54,63 +54,63 @@ QT_BEGIN_NAMESPACE
 
 DEFINE_BOOL_CONFIG_OPTION(stateChangeDebug, STATECHANGE_DEBUG);
 
-class QDeclarativeTransitionManagerPrivate
+class QQuickTransitionManagerPrivate
 {
 public:
-    QDeclarativeTransitionManagerPrivate()
+    QQuickTransitionManagerPrivate()
         : state(0), transitionInstance(0) {}
 
     void applyBindings();
-    typedef QList<QDeclarativeSimpleAction> SimpleActionList;
-    QDeclarativeState *state;
-    QDeclarativeTransitionInstance *transitionInstance;
-    QDeclarativeStateOperation::ActionList bindingsList;
+    typedef QList<QQuickSimpleAction> SimpleActionList;
+    QQuickState *state;
+    QQuickTransitionInstance *transitionInstance;
+    QQuickStateOperation::ActionList bindingsList;
     SimpleActionList completeList;
 };
 
-QDeclarativeTransitionManager::QDeclarativeTransitionManager()
-: d(new QDeclarativeTransitionManagerPrivate)
+QQuickTransitionManager::QQuickTransitionManager()
+: d(new QQuickTransitionManagerPrivate)
 {
 }
 
-void QDeclarativeTransitionManager::setState(QDeclarativeState *s)
+void QQuickTransitionManager::setState(QQuickState *s)
 {
     d->state = s;
 }
 
-QDeclarativeTransitionManager::~QDeclarativeTransitionManager()
+QQuickTransitionManager::~QQuickTransitionManager()
 {
     delete d->transitionInstance;
     delete d; d = 0;
 }
 
-bool QDeclarativeTransitionManager::isRunning() const
+bool QQuickTransitionManager::isRunning() const
 {
     return d->transitionInstance && d->transitionInstance->isRunning();
 }
 
-void QDeclarativeTransitionManager::complete() 
+void QQuickTransitionManager::complete() 
 {
     d->applyBindings();
 
     for (int ii = 0; ii < d->completeList.count(); ++ii) {
-        const QDeclarativeProperty &prop = d->completeList.at(ii).property();
+        const QQmlProperty &prop = d->completeList.at(ii).property();
         prop.write(d->completeList.at(ii).value());
     }
 
     d->completeList.clear();
 
     if (d->state) 
-        static_cast<QDeclarativeStatePrivate*>(QObjectPrivate::get(d->state))->complete();
+        static_cast<QQuickStatePrivate*>(QObjectPrivate::get(d->state))->complete();
 
     finished();
 }
 
-void QDeclarativeTransitionManagerPrivate::applyBindings()
+void QQuickTransitionManagerPrivate::applyBindings()
 {
-    foreach(const QDeclarativeAction &action, bindingsList) {
+    foreach(const QQuickAction &action, bindingsList) {
         if (!action.toBinding.isNull()) {
-            QDeclarativePropertyPrivate::setBinding(action.property, action.toBinding.data());
+            QQmlPropertyPrivate::setBinding(action.property, action.toBinding.data());
         } else if (action.event) {
             if (action.reverseEvent)
                 action.event->reverse();
@@ -123,23 +123,23 @@ void QDeclarativeTransitionManagerPrivate::applyBindings()
     bindingsList.clear();
 }
 
-void QDeclarativeTransitionManager::finished()
+void QQuickTransitionManager::finished()
 {
 }
 
-void QDeclarativeTransitionManager::transition(const QList<QDeclarativeAction> &list,
-                                      QDeclarativeTransition *transition,
+void QQuickTransitionManager::transition(const QList<QQuickAction> &list,
+                                      QQuickTransition *transition,
                                       QObject *defaultTarget)
 {
     cancel();
 
-    QDeclarativeStateOperation::ActionList applyList = list;
+    QQuickStateOperation::ActionList applyList = list;
     // Determine which actions are binding changes and disable any current bindings
-    foreach(const QDeclarativeAction &action, applyList) {
+    foreach(const QQuickAction &action, applyList) {
         if (action.toBinding)
             d->bindingsList << action;
         if (action.fromBinding)
-            QDeclarativePropertyPrivate::setBinding(action.property, 0); // Disable current binding
+            QQmlPropertyPrivate::setBinding(action.property, 0); // Disable current binding
         if (action.event && action.event->changesBindings()) {  //### assume isReversable()?
             d->bindingsList << action;
             action.event->clearBindings();
@@ -162,34 +162,34 @@ void QDeclarativeTransitionManager::transition(const QList<QDeclarativeAction> &
 
         // Apply all the property and binding changes
         for (int ii = 0; ii < applyList.size(); ++ii) {
-            const QDeclarativeAction &action = applyList.at(ii);
+            const QQuickAction &action = applyList.at(ii);
             if (!action.toBinding.isNull()) {
-                QDeclarativePropertyPrivate::setBinding(action.property, action.toBinding.data(), QDeclarativePropertyPrivate::BypassInterceptor | QDeclarativePropertyPrivate::DontRemoveBinding);
+                QQmlPropertyPrivate::setBinding(action.property, action.toBinding.data(), QQmlPropertyPrivate::BypassInterceptor | QQmlPropertyPrivate::DontRemoveBinding);
             } else if (!action.event) {
-                QDeclarativePropertyPrivate::write(action.property, action.toValue, QDeclarativePropertyPrivate::BypassInterceptor | QDeclarativePropertyPrivate::DontRemoveBinding);
+                QQmlPropertyPrivate::write(action.property, action.toValue, QQmlPropertyPrivate::BypassInterceptor | QQmlPropertyPrivate::DontRemoveBinding);
             } else if (action.event->isReversable()) {
                 if (action.reverseEvent)
-                    action.event->reverse(QDeclarativeActionEvent::FastForward);
+                    action.event->reverse(QQuickActionEvent::FastForward);
                 else
-                    action.event->execute(QDeclarativeActionEvent::FastForward);
+                    action.event->execute(QQuickActionEvent::FastForward);
             }
         }
 
         // Read all the end values for binding changes
         for (int ii = 0; ii < applyList.size(); ++ii) {
-            QDeclarativeAction *action = &applyList[ii];
+            QQuickAction *action = &applyList[ii];
             if (action->event) {
                 action->event->saveTargetValues();
                 continue;
             }
-            const QDeclarativeProperty &prop = action->property;
+            const QQmlProperty &prop = action->property;
             if (!action->toBinding.isNull() || !action->toValue.isValid()) {
                 action->toValue = prop.read();
             }
         }
 
         // Revert back to the original values
-        foreach(const QDeclarativeAction &action, applyList) {
+        foreach(const QQuickAction &action, applyList) {
             if (action.event) {
                 if (action.event->isReversable()) {
                     action.event->clearBindings();
@@ -200,15 +200,15 @@ void QDeclarativeTransitionManager::transition(const QList<QDeclarativeAction> &
             }
 
             if (action.toBinding)
-                QDeclarativePropertyPrivate::setBinding(action.property, 0); // Make sure this is disabled during the transition
+                QQmlPropertyPrivate::setBinding(action.property, 0); // Make sure this is disabled during the transition
 
-            QDeclarativePropertyPrivate::write(action.property, action.fromValue, QDeclarativePropertyPrivate::BypassInterceptor | QDeclarativePropertyPrivate::DontRemoveBinding);
+            QQmlPropertyPrivate::write(action.property, action.fromValue, QQmlPropertyPrivate::BypassInterceptor | QQmlPropertyPrivate::DontRemoveBinding);
         }
     }
 
     if (transition) {
-        QList<QDeclarativeProperty> touched;
-        QDeclarativeTransitionInstance *oldInstance = d->transitionInstance;
+        QList<QQmlProperty> touched;
+        QQuickTransitionInstance *oldInstance = d->transitionInstance;
         d->transitionInstance = transition->prepare(applyList, touched, this, defaultTarget);
         d->transitionInstance->start();
         if (oldInstance && oldInstance != d->transitionInstance)
@@ -216,7 +216,7 @@ void QDeclarativeTransitionManager::transition(const QList<QDeclarativeAction> &
 
         // Modify the action list to remove actions handled in the transition
         for (int ii = 0; ii < applyList.count(); ++ii) {
-            const QDeclarativeAction &action = applyList.at(ii);
+            const QQuickAction &action = applyList.at(ii);
 
             if (action.event) {
 
@@ -230,7 +230,7 @@ void QDeclarativeTransitionManager::transition(const QList<QDeclarativeAction> &
                 if (touched.contains(action.property)) {
                     if (action.toValue != action.fromValue) 
                         d->completeList << 
-                            QDeclarativeSimpleAction(action, QDeclarativeSimpleAction::EndState);
+                            QQuickSimpleAction(action, QQuickSimpleAction::EndState);
 
                     applyList.removeAt(ii);
                     --ii;
@@ -244,7 +244,7 @@ void QDeclarativeTransitionManager::transition(const QList<QDeclarativeAction> &
     // be applied immediately.  We skip applying bindings, as they are all
     // applied at the end in applyBindings() to avoid any nastiness mid 
     // transition
-    foreach(const QDeclarativeAction &action, applyList) {
+    foreach(const QQuickAction &action, applyList) {
         if (action.event && !action.event->changesBindings()) {
             if (action.event->isReversable() && action.reverseEvent)
                 action.event->reverse();
@@ -256,7 +256,7 @@ void QDeclarativeTransitionManager::transition(const QList<QDeclarativeAction> &
     }
 #ifndef QT_NO_DEBUG_STREAM
     if (stateChangeDebug()) {
-        foreach(const QDeclarativeAction &action, applyList) {
+        foreach(const QQuickAction &action, applyList) {
             if (action.event)
                 qWarning() << "    No transition for event:" << action.event->type();
             else
@@ -270,15 +270,15 @@ void QDeclarativeTransitionManager::transition(const QList<QDeclarativeAction> &
         complete();
 }
 
-void QDeclarativeTransitionManager::cancel()
+void QQuickTransitionManager::cancel()
 {
     if (d->transitionInstance && d->transitionInstance->isRunning())
         d->transitionInstance->stop();
 
     for(int i = 0; i < d->bindingsList.count(); ++i) {
-        QDeclarativeAction action = d->bindingsList[i];
+        QQuickAction action = d->bindingsList[i];
         if (!action.toBinding.isNull() && action.deletableToBinding) {
-            QDeclarativePropertyPrivate::setBinding(action.property, 0);
+            QQmlPropertyPrivate::setBinding(action.property, 0);
             action.toBinding.data()->destroy();
             action.toBinding.clear();
             action.deletableToBinding = false;
diff --git a/src/quick/util/qdeclarativetransitionmanager_p_p.h b/src/quick/util/qquicktransitionmanager_p_p.h
index d548c05f3a..4270ed61a8 100644
--- a/src/quick/util/qdeclarativetransitionmanager_p_p.h
+++ b/src/quick/util/qquicktransitionmanager_p_p.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#ifndef QDECLARATIVETRANSITIONMANAGER_P_H
-#define QDECLARATIVETRANSITIONMANAGER_P_H
+#ifndef QQUICKTRANSITIONMANAGER_P_H
+#define QQUICKTRANSITIONMANAGER_P_H
 
 //
 //  W A R N I N G
@@ -53,22 +53,22 @@
 // We mean it.
 //
 
-#include "qdeclarativestateoperations_p.h"
-#include "qdeclarativeanimation_p.h"
+#include "qquickstatechangescript_p.h"
+#include "qquickanimation_p.h"
 
 QT_BEGIN_NAMESPACE
 
-class QDeclarativeStatePrivate;
-class QDeclarativeTransitionManagerPrivate;
-class Q_AUTOTEST_EXPORT QDeclarativeTransitionManager 
+class QQuickStatePrivate;
+class QQuickTransitionManagerPrivate;
+class Q_AUTOTEST_EXPORT QQuickTransitionManager 
 {
 public:
-    QDeclarativeTransitionManager();
-    ~QDeclarativeTransitionManager();
+    QQuickTransitionManager();
+    ~QQuickTransitionManager();
 
     bool isRunning() const;
 
-    void transition(const QList<QDeclarativeAction> &, QDeclarativeTransition *transition, QObject *defaultTarget = 0);
+    void transition(const QList<QQuickAction> &, QQuickTransition *transition, QObject *defaultTarget = 0);
 
     void cancel();
 
@@ -76,16 +76,16 @@ protected:
     virtual void finished();
 
 private:
-    Q_DISABLE_COPY(QDeclarativeTransitionManager)
-    QDeclarativeTransitionManagerPrivate *d;
+    Q_DISABLE_COPY(QQuickTransitionManager)
+    QQuickTransitionManagerPrivate *d;
 
     void complete();
-    void setState(QDeclarativeState *);
+    void setState(QQuickState *);
 
-    friend class QDeclarativeState;
+    friend class QQuickState;
     friend class ParallelAnimationWrapper;
 };
 
 QT_END_NAMESPACE
 
-#endif // QDECLARATIVETRANSITIONMANAGER_P_H
+#endif // QQUICKTRANSITIONMANAGER_P_H
diff --git a/src/quick/util/qquickutilmodule.cpp b/src/quick/util/qquickutilmodule.cpp
new file mode 100644
index 0000000000..4abbfe591d
--- /dev/null
+++ b/src/quick/util/qquickutilmodule.cpp
@@ -0,0 +1,103 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
+**
+** This file is part of the QtQml module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this
+** file. Please review the following information to ensure the GNU Lesser
+** General Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU General
+** Public License version 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of this
+** file. Please review the following information to ensure the GNU General
+** Public License version 3.0 requirements will be met:
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qquickutilmodule_p.h"
+#include "qquickanimation_p.h"
+#include "qquickanimation_p_p.h"
+#include "qquickbehavior_p.h"
+#include "qquickbind_p.h"
+#include "qquickconnections_p.h"
+#include "qquicksmoothedanimation_p.h"
+#include "qquickfontloader_p.h"
+#include "qquickpackage_p.h"
+#include "qquickpropertychanges_p.h"
+#include "qquickspringanimation_p.h"
+#include "qquickstategroup_p.h"
+#include "qquickstatechangescript_p.h"
+#include "qquickstate_p.h"
+#include "qquickstate_p_p.h"
+#include "qquicksystempalette_p.h"
+#include "qquicktimer_p.h"
+#include "qquicktransition_p.h"
+#include <qqmlinfo.h>
+#include <private/qqmltypenotavailable_p.h>
+#include <private/qquickanimationcontroller_p.h>
+#include <QtCore/qcoreapplication.h>
+#include <QtGui/QInputMethod>
+
+void QQuickUtilModule::defineModule()
+{
+    qmlRegisterUncreatableType<QInputMethod>("QtQuick",2,0,"InputPanel",
+                                             QInputMethod::tr("InputPanel is an abstract class")); // deprecated
+    qmlRegisterUncreatableType<QInputMethod>("QtQuick",2,0,"InputMethod",
+                                             QInputMethod::tr("InputMethod is an abstract class"));
+    qmlRegisterUncreatableType<QQuickAbstractAnimation>("QtQuick",2,0,"Animation",QQuickAbstractAnimation::tr("Animation is an abstract class"));
+
+    qmlRegisterType<QQuickBehavior>("QtQuick",2,0,"Behavior");
+    qmlRegisterType<QQuickBind>("QtQuick",2,0,"Binding");
+    qmlRegisterType<QQuickColorAnimation>("QtQuick",2,0,"ColorAnimation");
+    qmlRegisterType<QQuickConnections>("QtQuick",2,0,"Connections");
+    qmlRegisterType<QQuickSmoothedAnimation>("QtQuick",2,0,"SmoothedAnimation");
+    qmlRegisterType<QQuickFontLoader>("QtQuick",2,0,"FontLoader");
+    qmlRegisterType<QQuickNumberAnimation>("QtQuick",2,0,"NumberAnimation");
+    qmlRegisterType<QQuickPackage>("QtQuick",2,0,"Package");
+    qmlRegisterType<QQuickParallelAnimation>("QtQuick",2,0,"ParallelAnimation");
+    qmlRegisterType<QQuickPauseAnimation>("QtQuick",2,0,"PauseAnimation");
+    qmlRegisterType<QQuickPropertyAction>("QtQuick",2,0,"PropertyAction");
+    qmlRegisterType<QQuickPropertyAnimation>("QtQuick",2,0,"PropertyAnimation");
+    qmlRegisterType<QQuickRotationAnimation>("QtQuick",2,0,"RotationAnimation");
+    qmlRegisterType<QQuickScriptAction>("QtQuick",2,0,"ScriptAction");
+    qmlRegisterType<QQuickSequentialAnimation>("QtQuick",2,0,"SequentialAnimation");
+    qmlRegisterType<QQuickSpringAnimation>("QtQuick",2,0,"SpringAnimation");
+    qmlRegisterType<QQuickAnimationController>("QtQuick",2,0,"AnimationController");
+    qmlRegisterType<QQuickStateChangeScript>("QtQuick",2,0,"StateChangeScript");
+    qmlRegisterType<QQuickStateGroup>("QtQuick",2,0,"StateGroup");
+    qmlRegisterType<QQuickState>("QtQuick",2,0,"State");
+    qmlRegisterType<QQuickSystemPalette>("QtQuick",2,0,"SystemPalette");
+    qmlRegisterType<QQuickTimer>("QtQuick",2,0,"Timer");
+    qmlRegisterType<QQuickTransition>("QtQuick",2,0,"Transition");
+    qmlRegisterType<QQuickVector3dAnimation>("QtQuick",2,0,"Vector3dAnimation");
+
+    qmlRegisterType<QQuickStateOperation>();
+
+    qmlRegisterCustomType<QQuickPropertyChanges>("QtQuick",2,0,"PropertyChanges", new QQuickPropertyChangesParser);
+    qmlRegisterCustomType<QQuickConnections>("QtQuick",2,0,"Connections", new QQmlConnectionsParser);
+}
diff --git a/src/quick/util/qdeclarativeutilmodule_p.h b/src/quick/util/qquickutilmodule_p.h
index 9d20077554..dc0254370e 100644
--- a/src/quick/util/qdeclarativeutilmodule_p.h
+++ b/src/quick/util/qquickutilmodule_p.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
@@ -39,16 +39,16 @@
 **
 ****************************************************************************/
 
-#ifndef QDECLARATIVEUTILMODULE_H
-#define QDECLARATIVEUTILMODULE_H
+#ifndef QQUICKUTILMODULE_H
+#define QQUICKUTILMODULE_H
 
-#include <qdeclarative.h>
+#include <qqml.h>
 
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-class QDeclarativeUtilModule
+class QQuickUtilModule
 {
 public:
     static void defineModule();
@@ -58,4 +58,4 @@ QT_END_NAMESPACE
 
 QT_END_HEADER
 
-#endif // QDECLARATIVEUTILMODULE_H
+#endif // QQUICKUTILMODULE_H
diff --git a/src/quick/util/util.pri b/src/quick/util/util.pri
index d933459596..c3cec91404 100644
--- a/src/quick/util/util.pri
+++ b/src/quick/util/util.pri
@@ -1,61 +1,61 @@
 SOURCES += \
-    $$PWD/qdeclarativeutilmodule.cpp\
-    $$PWD/qdeclarativeconnections.cpp \
-    $$PWD/qdeclarativepackage.cpp \
-    $$PWD/qdeclarativeanimation.cpp \
-    $$PWD/qdeclarativesystempalette.cpp \
-    $$PWD/qdeclarativespringanimation.cpp \
-    $$PWD/qdeclarativesmoothedanimation.cpp \
-    $$PWD/qdeclarativeanimationcontroller.cpp \
-    $$PWD/qdeclarativestate.cpp\
-    $$PWD/qdeclarativetransitionmanager.cpp \
-    $$PWD/qdeclarativestateoperations.cpp \
-    $$PWD/qdeclarativepropertychanges.cpp \
-    $$PWD/qdeclarativestategroup.cpp \
-    $$PWD/qdeclarativetransition.cpp \
-    $$PWD/qdeclarativelistaccessor.cpp \
-    $$PWD/qdeclarativetimeline.cpp \
-    $$PWD/qdeclarativetimer.cpp \
-    $$PWD/qdeclarativebind.cpp \
-    $$PWD/qdeclarativepixmapcache.cpp \
-    $$PWD/qdeclarativebehavior.cpp \
-    $$PWD/qdeclarativefontloader.cpp \
-    $$PWD/qdeclarativestyledtext.cpp \
-    $$PWD/qdeclarativepath.cpp \
-    $$PWD/qdeclarativechangeset.cpp \
-    $$PWD/qdeclarativelistcompositor.cpp \
-    $$PWD/qdeclarativepathinterpolator.cpp \
-    $$PWD/qdeclarativesvgparser.cpp
+    $$PWD/qquickutilmodule.cpp\
+    $$PWD/qquickconnections.cpp \
+    $$PWD/qquickpackage.cpp \
+    $$PWD/qquickanimation.cpp \
+    $$PWD/qquicksystempalette.cpp \
+    $$PWD/qquickspringanimation.cpp \
+    $$PWD/qquicksmoothedanimation.cpp \
+    $$PWD/qquickanimationcontroller.cpp \
+    $$PWD/qquickstate.cpp\
+    $$PWD/qquicktransitionmanager.cpp \
+    $$PWD/qquickstatechangescript.cpp \
+    $$PWD/qquickpropertychanges.cpp \
+    $$PWD/qquickstategroup.cpp \
+    $$PWD/qquicktransition.cpp \
+    $$PWD/qquicklistaccessor.cpp \
+    $$PWD/qquicktimeline.cpp \
+    $$PWD/qquicktimer.cpp \
+    $$PWD/qquickbind.cpp \
+    $$PWD/qquickpixmapcache.cpp \
+    $$PWD/qquickbehavior.cpp \
+    $$PWD/qquickfontloader.cpp \
+    $$PWD/qquickstyledtext.cpp \
+    $$PWD/qquickpath.cpp \
+    $$PWD/qquickchangeset.cpp \
+    $$PWD/qquicklistcompositor.cpp \
+    $$PWD/qquickpathinterpolator.cpp \
+    $$PWD/qquicksvgparser.cpp
 
 HEADERS += \
-    $$PWD/qdeclarativeutilmodule_p.h\
-    $$PWD/qdeclarativeconnections_p.h \
-    $$PWD/qdeclarativepackage_p.h \
-    $$PWD/qdeclarativeanimation_p.h \
-    $$PWD/qdeclarativeanimation_p_p.h \
-    $$PWD/qdeclarativesystempalette_p.h \
-    $$PWD/qdeclarativespringanimation_p.h \
-    $$PWD/qdeclarativeanimationcontroller_p.h \
-    $$PWD/qdeclarativesmoothedanimation_p.h \
-    $$PWD/qdeclarativesmoothedanimation_p_p.h \
-    $$PWD/qdeclarativestate_p.h\
-    $$PWD/qdeclarativestateoperations_p.h \
-    $$PWD/qdeclarativepropertychanges_p.h \
-    $$PWD/qdeclarativestate_p_p.h\
-    $$PWD/qdeclarativetransitionmanager_p_p.h \
-    $$PWD/qdeclarativestategroup_p.h \
-    $$PWD/qdeclarativetransition_p.h \
-    $$PWD/qdeclarativelistaccessor_p.h \
-    $$PWD/qdeclarativetimeline_p_p.h \
-    $$PWD/qdeclarativetimer_p.h \
-    $$PWD/qdeclarativebind_p.h \
-    $$PWD/qdeclarativepixmapcache_p.h \
-    $$PWD/qdeclarativebehavior_p.h \
-    $$PWD/qdeclarativefontloader_p.h \
-    $$PWD/qdeclarativestyledtext_p.h \
-    $$PWD/qdeclarativepath_p.h \
-    $$PWD/qdeclarativepath_p_p.h \
-    $$PWD/qdeclarativechangeset_p.h \
-    $$PWD/qdeclarativelistcompositor_p.h \
-    $$PWD/qdeclarativepathinterpolator_p.h \
-    $$PWD/qdeclarativesvgparser_p.h
-\ No newline at end of file
+    $$PWD/qquickutilmodule_p.h\
+    $$PWD/qquickconnections_p.h \
+    $$PWD/qquickpackage_p.h \
+    $$PWD/qquickanimation_p.h \
+    $$PWD/qquickanimation_p_p.h \
+    $$PWD/qquicksystempalette_p.h \
+    $$PWD/qquickspringanimation_p.h \
+    $$PWD/qquickanimationcontroller_p.h \
+    $$PWD/qquicksmoothedanimation_p.h \
+    $$PWD/qquicksmoothedanimation_p_p.h \
+    $$PWD/qquickstate_p.h\
+    $$PWD/qquickstatechangescript_p.h \
+    $$PWD/qquickpropertychanges_p.h \
+    $$PWD/qquickstate_p_p.h\
+    $$PWD/qquicktransitionmanager_p_p.h \
+    $$PWD/qquickstategroup_p.h \
+    $$PWD/qquicktransition_p.h \
+    $$PWD/qquicklistaccessor_p.h \
+    $$PWD/qquicktimeline_p_p.h \
+    $$PWD/qquicktimer_p.h \
+    $$PWD/qquickbind_p.h \
+    $$PWD/qquickpixmapcache_p.h \
+    $$PWD/qquickbehavior_p.h \
+    $$PWD/qquickfontloader_p.h \
+    $$PWD/qquickstyledtext_p.h \
+    $$PWD/qquickpath_p.h \
+    $$PWD/qquickpath_p_p.h \
+    $$PWD/qquickchangeset_p.h \
+    $$PWD/qquicklistcompositor_p.h \
+    $$PWD/qquickpathinterpolator_p.h \
+    $$PWD/qquicksvgparser_p.h
author	Matthew Vogt <matthew.vogt@nokia.com>	2012-02-16 14:43:03 +1000
committer	Qt by Nokia <qt-info@nokia.com>	2012-02-24 04:51:31 +0100
commit	b855240b782395f94315f43ea3e7e182299fac48 (patch)
tree	bc594c04449be8cd14cd0ab0bb72dafc2be0ffb2 /src/quick
parent	6a42a6e0a9a1abdda0d07a5a20b4ac7e45348684 (diff)