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>

60 files changed, 3108 insertions, 3107 deletions

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