Rename Qt Quick-specific classes to QQuick*

The QSG (SceneGraph) prefix is too generic for
Qt Quick(2)-specific classes.

All the classes and files in the declarative/items
directory have been renamed.

In particular, for classes that are currently public,
the renaming is as follows:

QSGView --> QQuickView
QSGCanvas --> QQuickCanvas
QSGItem --> QQuickItem
QSGPaintedItem --> QQuickPaintedItem

The header files have been renamed accordingly
(e.g. qsgview.h --> qquickview.h).

Change-Id: Iac937fff81db20bb639486a793c3aeb5230b038c
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>

202 files changed, 8370 insertions, 8372 deletions

diff --git a/src/declarative/designer/designersupport.cpp b/src/declarative/designer/designersupport.cpp
index d582ed1fe0..9c565c138c 100644
--- a/src/declarative/designer/designersupport.cpp
+++ b/src/declarative/designer/designersupport.cpp
@@ -40,12 +40,12 @@
 ****************************************************************************/
 
 #include "designersupport.h"
-#include <private/qsgitem_p.h>
+#include <private/qquickitem_p.h>
 
-#include <private/qsgshadereffectsource_p.h>
-#include <private/qsgrectangle_p.h>
+#include <private/qquickshadereffectsource_p.h>
+#include <private/qquickrectangle_p.h>
 #include <private/qdeclarativeengine_p.h>
-#include <private/qsgview_p.h>
+#include <private/qquickview_p.h>
 #include <private/qdeclarativestategroup_p.h>
 #include <QtGui/QImage>
 
@@ -57,31 +57,31 @@ DesignerSupport::DesignerSupport()
 
 DesignerSupport::~DesignerSupport()
 {
-    QHash<QSGItem*, QSGShaderEffectTexture*>::iterator iterator;
+    QHash<QQuickItem*, QQuickShaderEffectTexture*>::iterator iterator;
 
     for (iterator = m_itemTextureHash.begin(); iterator != m_itemTextureHash.end(); ++iterator) {
-        QSGShaderEffectTexture *texture = iterator.value();
-        QSGItem *item = iterator.key();
-        QSGItemPrivate::get(item)->derefFromEffectItem(true);
+        QQuickShaderEffectTexture *texture = iterator.value();
+        QQuickItem *item = iterator.key();
+        QQuickItemPrivate::get(item)->derefFromEffectItem(true);
         delete texture;
     }
 }
 
-void DesignerSupport::refFromEffectItem(QSGItem *referencedItem, bool hide)
+void DesignerSupport::refFromEffectItem(QQuickItem *referencedItem, bool hide)
 {
     if (referencedItem == 0)
         return;
 
-    QSGItemPrivate::get(referencedItem)->refFromEffectItem(hide);
-    QSGCanvasPrivate::get(referencedItem->canvas())->updateDirtyNode(referencedItem);
+    QQuickItemPrivate::get(referencedItem)->refFromEffectItem(hide);
+    QQuickCanvasPrivate::get(referencedItem->canvas())->updateDirtyNode(referencedItem);
 
-    Q_ASSERT(QSGItemPrivate::get(referencedItem)->rootNode);
+    Q_ASSERT(QQuickItemPrivate::get(referencedItem)->rootNode);
 
     if (!m_itemTextureHash.contains(referencedItem)) {
-        QSGShaderEffectTexture *texture = new QSGShaderEffectTexture(referencedItem);
+        QQuickShaderEffectTexture *texture = new QQuickShaderEffectTexture(referencedItem);
 
         texture->setLive(true);
-        texture->setItem(QSGItemPrivate::get(referencedItem)->rootNode);
+        texture->setItem(QQuickItemPrivate::get(referencedItem)->rootNode);
         texture->setRect(referencedItem->boundingRect());
         texture->setSize(referencedItem->boundingRect().size().toSize());
         texture->setRecursive(true);
@@ -96,23 +96,23 @@ void DesignerSupport::refFromEffectItem(QSGItem *referencedItem, bool hide)
     }
 }
 
-void DesignerSupport::derefFromEffectItem(QSGItem *referencedItem, bool unhide)
+void DesignerSupport::derefFromEffectItem(QQuickItem *referencedItem, bool unhide)
 {
     if (referencedItem == 0)
         return;
 
     delete m_itemTextureHash.take(referencedItem);
-    QSGItemPrivate::get(referencedItem)->derefFromEffectItem(unhide);
+    QQuickItemPrivate::get(referencedItem)->derefFromEffectItem(unhide);
 }
 
-QImage DesignerSupport::renderImageForItem(QSGItem *referencedItem, const QRectF &boundingRect, const QSize &imageSize)
+QImage DesignerSupport::renderImageForItem(QQuickItem *referencedItem, const QRectF &boundingRect, const QSize &imageSize)
 {
     if (referencedItem == 0 || referencedItem->parentItem() == 0) {
         qDebug() << __FILE__ << __LINE__ << "Warning: Item can be rendered.";
         return QImage();
     }
 
-    QSGShaderEffectTexture *renderTexture = m_itemTextureHash.value(referencedItem);
+    QQuickShaderEffectTexture *renderTexture = m_itemTextureHash.value(referencedItem);
 
     Q_ASSERT(renderTexture);
     if (renderTexture == 0)
@@ -130,54 +130,54 @@ QImage DesignerSupport::renderImageForItem(QSGItem *referencedItem, const QRectF
     return renderImage;
 }
 
-bool DesignerSupport::isDirty(QSGItem *referencedItem, DirtyType dirtyType)
+bool DesignerSupport::isDirty(QQuickItem *referencedItem, DirtyType dirtyType)
 {
     if (referencedItem == 0)
         return false;
 
-    return QSGItemPrivate::get(referencedItem)->dirtyAttributes & dirtyType;
+    return QQuickItemPrivate::get(referencedItem)->dirtyAttributes & dirtyType;
 }
 
-void DesignerSupport::resetDirty(QSGItem *referencedItem)
+void DesignerSupport::resetDirty(QQuickItem *referencedItem)
 {
     if (referencedItem == 0)
         return;
 
-    QSGItemPrivate::get(referencedItem)->dirtyAttributes = 0x0;
-    QSGItemPrivate::get(referencedItem)->removeFromDirtyList();
+    QQuickItemPrivate::get(referencedItem)->dirtyAttributes = 0x0;
+    QQuickItemPrivate::get(referencedItem)->removeFromDirtyList();
 }
 
-QTransform DesignerSupport::canvasTransform(QSGItem *referencedItem)
+QTransform DesignerSupport::canvasTransform(QQuickItem *referencedItem)
 {
     if (referencedItem == 0)
         return QTransform();
 
-    return QSGItemPrivate::get(referencedItem)->itemToCanvasTransform();
+    return QQuickItemPrivate::get(referencedItem)->itemToCanvasTransform();
 }
 
-QTransform DesignerSupport::parentTransform(QSGItem *referencedItem)
+QTransform DesignerSupport::parentTransform(QQuickItem *referencedItem)
 {
     if (referencedItem == 0)
         return QTransform();
 
     QTransform parentTransform;
 
-    QSGItemPrivate::get(referencedItem)->itemToParentTransform(parentTransform);
+    QQuickItemPrivate::get(referencedItem)->itemToParentTransform(parentTransform);
 
     return parentTransform;
 }
 
-QString propertyNameForAnchorLine(const QSGAnchorLine::AnchorLine &anchorLine)
+QString propertyNameForAnchorLine(const QQuickAnchorLine::AnchorLine &anchorLine)
 {
     switch (anchorLine) {
-        case QSGAnchorLine::Left: return QLatin1String("left");
-        case QSGAnchorLine::Right: return QLatin1String("right");
-        case QSGAnchorLine::Top: return QLatin1String("top");
-        case QSGAnchorLine::Bottom: return QLatin1String("bottom");
-        case QSGAnchorLine::HCenter: return QLatin1String("horizontalCenter");
-        case QSGAnchorLine::VCenter: return QLatin1String("verticalCenter");
-        case QSGAnchorLine::Baseline: return QLatin1String("baseline");
-        case QSGAnchorLine::Invalid:
+        case QQuickAnchorLine::Left: return QLatin1String("left");
+        case QQuickAnchorLine::Right: return QLatin1String("right");
+        case QQuickAnchorLine::Top: return QLatin1String("top");
+        case QQuickAnchorLine::Bottom: return QLatin1String("bottom");
+        case QQuickAnchorLine::HCenter: return QLatin1String("horizontalCenter");
+        case QQuickAnchorLine::VCenter: return QLatin1String("verticalCenter");
+        case QQuickAnchorLine::Baseline: return QLatin1String("baseline");
+        case QQuickAnchorLine::Invalid:
         default: return QString();
     }
 }
@@ -197,11 +197,11 @@ bool isValidAnchorName(const QString &name)
     return anchorNameList.contains(name);
 }
 
-bool DesignerSupport::isAnchoredTo(QSGItem *fromItem, QSGItem *toItem)
+bool DesignerSupport::isAnchoredTo(QQuickItem *fromItem, QQuickItem *toItem)
 {
-    Q_ASSERT(dynamic_cast<QSGItemPrivate*>(QSGItemPrivate::get(fromItem)));
-    QSGItemPrivate *fromItemPrivate = static_cast<QSGItemPrivate*>(QSGItemPrivate::get(fromItem));
-    QSGAnchors *anchors = fromItemPrivate->anchors();
+    Q_ASSERT(dynamic_cast<QQuickItemPrivate*>(QQuickItemPrivate::get(fromItem)));
+    QQuickItemPrivate *fromItemPrivate = static_cast<QQuickItemPrivate*>(QQuickItemPrivate::get(fromItem));
+    QQuickAnchors *anchors = fromItemPrivate->anchors();
     return anchors->fill() == toItem
             || anchors->centerIn() == toItem
             || anchors->bottom().item == toItem
@@ -213,9 +213,9 @@ bool DesignerSupport::isAnchoredTo(QSGItem *fromItem, QSGItem *toItem)
             || anchors->baseline().item == toItem;
 }
 
-bool DesignerSupport::areChildrenAnchoredTo(QSGItem *fromItem, QSGItem *toItem)
+bool DesignerSupport::areChildrenAnchoredTo(QQuickItem *fromItem, QQuickItem *toItem)
 {
-    foreach (QSGItem *childItem, fromItem->childItems()) {
+    foreach (QQuickItem *childItem, fromItem->childItems()) {
         if (childItem) {
             if (isAnchoredTo(childItem, toItem))
                 return true;
@@ -228,41 +228,41 @@ bool DesignerSupport::areChildrenAnchoredTo(QSGItem *fromItem, QSGItem *toItem)
     return false;
 }
 
-QSGAnchors *anchors(QSGItem *item)
+QQuickAnchors *anchors(QQuickItem *item)
 {
-    QSGItemPrivate *itemPrivate = static_cast<QSGItemPrivate*>(QSGItemPrivate::get(item));
+    QQuickItemPrivate *itemPrivate = static_cast<QQuickItemPrivate*>(QQuickItemPrivate::get(item));
     return itemPrivate->anchors();
 }
 
-QSGAnchors::Anchor anchorLineFlagForName(const QString &name)
+QQuickAnchors::Anchor anchorLineFlagForName(const QString &name)
 {
     if (name == QLatin1String("anchors.top"))
-        return QSGAnchors::TopAnchor;
+        return QQuickAnchors::TopAnchor;
 
     if (name == QLatin1String("anchors.left"))
-        return QSGAnchors::LeftAnchor;
+        return QQuickAnchors::LeftAnchor;
 
     if (name == QLatin1String("anchors.bottom"))
-         return QSGAnchors::BottomAnchor;
+         return QQuickAnchors::BottomAnchor;
 
     if (name == QLatin1String("anchors.right"))
-        return QSGAnchors::RightAnchor;
+        return QQuickAnchors::RightAnchor;
 
     if (name == QLatin1String("anchors.horizontalCenter"))
-        return QSGAnchors::HCenterAnchor;
+        return QQuickAnchors::HCenterAnchor;
 
     if (name == QLatin1String("anchors.verticalCenter"))
-         return QSGAnchors::VCenterAnchor;
+         return QQuickAnchors::VCenterAnchor;
 
     if (name == QLatin1String("anchors.baseline"))
-         return QSGAnchors::BaselineAnchor;
+         return QQuickAnchors::BaselineAnchor;
 
 
     Q_ASSERT_X(false, Q_FUNC_INFO, "wrong anchor name - this should never happen");
-    return QSGAnchors::LeftAnchor;
+    return QQuickAnchors::LeftAnchor;
 }
 
-bool DesignerSupport::hasAnchor(QSGItem *item, const QString &name)
+bool DesignerSupport::hasAnchor(QQuickItem *item, const QString &name)
 {
     if (!isValidAnchorName(name))
         return false;
@@ -297,19 +297,19 @@ bool DesignerSupport::hasAnchor(QSGItem *item, const QString &name)
     return anchors(item)->usedAnchors().testFlag(anchorLineFlagForName(name));
 }
 
-QSGItem *DesignerSupport::anchorFillTargetItem(QSGItem *item)
+QQuickItem *DesignerSupport::anchorFillTargetItem(QQuickItem *item)
 {
     return anchors(item)->fill();
 }
 
-QSGItem *DesignerSupport::anchorCenterInTargetItem(QSGItem *item)
+QQuickItem *DesignerSupport::anchorCenterInTargetItem(QQuickItem *item)
 {
     return anchors(item)->centerIn();
 }
 
 
 
-QPair<QString, QObject*> DesignerSupport::anchorLineTarget(QSGItem *item, const QString &name, QDeclarativeContext *context)
+QPair<QString, QObject*> DesignerSupport::anchorLineTarget(QQuickItem *item, const QString &name, QDeclarativeContext *context)
 {
     QObject *targetObject = 0;
     QString targetName;
@@ -323,8 +323,8 @@ QPair<QString, QObject*> DesignerSupport::anchorLineTarget(QSGItem *item, const
         if (!metaProperty.isValid())
             return QPair<QString, QObject*>();
 
-        QSGAnchorLine anchorLine = metaProperty.read().value<QSGAnchorLine>();
-        if (anchorLine.anchorLine != QSGAnchorLine::Invalid) {
+        QQuickAnchorLine anchorLine = metaProperty.read().value<QQuickAnchorLine>();
+        if (anchorLine.anchorLine != QQuickAnchorLine::Invalid) {
             targetObject = anchorLine.item;
             targetName = propertyNameForAnchorLine(anchorLine.anchorLine);
         }
@@ -334,7 +334,7 @@ QPair<QString, QObject*> DesignerSupport::anchorLineTarget(QSGItem *item, const
     return QPair<QString, QObject*>(targetName, targetObject);
 }
 
-void DesignerSupport::resetAnchor(QSGItem *item, const QString &name)
+void DesignerSupport::resetAnchor(QQuickItem *item, const QString &name)
 {
     if (name == QLatin1String("anchors.fill")) {
         anchors(item)->resetFill();
@@ -357,23 +357,23 @@ void DesignerSupport::resetAnchor(QSGItem *item, const QString &name)
     }
 }
 
-QList<QObject*> DesignerSupport::statesForItem(QSGItem *item)
+QList<QObject*> DesignerSupport::statesForItem(QQuickItem *item)
 {
     QList<QObject*> objectList;
-    QList<QDeclarativeState *> stateList = QSGItemPrivate::get(item)->_states()->states();
+    QList<QDeclarativeState *> stateList = QQuickItemPrivate::get(item)->_states()->states();
     qCopy(stateList.begin(), stateList.end(), objectList.begin());
 
     return objectList;
 }
 
-bool DesignerSupport::isComponentComplete(QSGItem *item)
+bool DesignerSupport::isComponentComplete(QQuickItem *item)
 {
-    return static_cast<QSGItemPrivate*>(QSGItemPrivate::get(item))->componentComplete;
+    return static_cast<QQuickItemPrivate*>(QQuickItemPrivate::get(item))->componentComplete;
 }
 
-int DesignerSupport::borderWidth(QSGItem *item)
+int DesignerSupport::borderWidth(QQuickItem *item)
 {
-    QSGRectangle *rectangle = qobject_cast<QSGRectangle*>(item);
+    QQuickRectangle *rectangle = qobject_cast<QQuickRectangle*>(item);
     if (rectangle)
         return rectangle->border()->width();
 
@@ -385,24 +385,24 @@ void DesignerSupport::refreshExpressions(QDeclarativeContext *context)
     QDeclarativeContextPrivate::get(context)->data->refreshExpressions();
 }
 
-void DesignerSupport::setRootItem(QSGView *view, QSGItem *item)
+void DesignerSupport::setRootItem(QQuickView *view, QQuickItem *item)
 {
-    QSGViewPrivate::get(view)->setRootObject(item);
+    QQuickViewPrivate::get(view)->setRootObject(item);
 }
 
-bool DesignerSupport::isValidWidth(QSGItem *item)
+bool DesignerSupport::isValidWidth(QQuickItem *item)
 {
-    return QSGItemPrivate::get(item)->heightValid;
+    return QQuickItemPrivate::get(item)->heightValid;
 }
 
-bool DesignerSupport::isValidHeight(QSGItem *item)
+bool DesignerSupport::isValidHeight(QQuickItem *item)
 {
-    return QSGItemPrivate::get(item)->widthValid;
+    return QQuickItemPrivate::get(item)->widthValid;
 }
 
-void DesignerSupport::updateDirtyNode(QSGItem *item)
+void DesignerSupport::updateDirtyNode(QQuickItem *item)
 {
-    QSGCanvasPrivate::get(item->canvas())->updateDirtyNode(item);
+    QQuickCanvasPrivate::get(item->canvas())->updateDirtyNode(item);
 }
 
 QT_END_NAMESPACE
diff --git a/src/declarative/designer/designersupport.h b/src/declarative/designer/designersupport.h
index b52a4a23d3..8b9df689d0 100644
--- a/src/declarative/designer/designersupport.h
+++ b/src/declarative/designer/designersupport.h
@@ -62,12 +62,12 @@ QT_BEGIN_NAMESPACE
 
 QT_MODULE(Declarative)
 
-class QSGItem;
-class QSGShaderEffectTexture;
+class QQuickItem;
+class QQuickShaderEffectTexture;
 class QImage;
 class QTransform;
 class QDeclarativeContext;
-class QSGView;
+class QQuickView;
 
 
 class Q_DECLARATIVE_EXPORT DesignerSupport
@@ -105,43 +105,43 @@ public:
     DesignerSupport();
     ~DesignerSupport();
 
-    void refFromEffectItem(QSGItem *referencedItem, bool hide = true);
-    void derefFromEffectItem(QSGItem *referencedItem, bool unhide = true);
+    void refFromEffectItem(QQuickItem *referencedItem, bool hide = true);
+    void derefFromEffectItem(QQuickItem *referencedItem, bool unhide = true);
 
-    QImage renderImageForItem(QSGItem *referencedItem, const QRectF &boundingRect, const QSize &imageSize);
+    QImage renderImageForItem(QQuickItem *referencedItem, const QRectF &boundingRect, const QSize &imageSize);
 
-    static bool isDirty(QSGItem *referencedItem, DirtyType dirtyType);
-    static void resetDirty(QSGItem *referencedItem);
+    static bool isDirty(QQuickItem *referencedItem, DirtyType dirtyType);
+    static void resetDirty(QQuickItem *referencedItem);
 
-    static QTransform canvasTransform(QSGItem *referencedItem);
-    static QTransform parentTransform(QSGItem *referencedItem);
+    static QTransform canvasTransform(QQuickItem *referencedItem);
+    static QTransform parentTransform(QQuickItem *referencedItem);
 
-    static bool isAnchoredTo(QSGItem *fromItem, QSGItem *toItem);
-    static bool areChildrenAnchoredTo(QSGItem *fromItem, QSGItem *toItem);
-    static bool hasAnchor(QSGItem *item, const QString &name);
-    static QSGItem *anchorFillTargetItem(QSGItem *item);
-    static QSGItem *anchorCenterInTargetItem(QSGItem *item);
-    static QPair<QString, QObject*> anchorLineTarget(QSGItem *item, const QString &name, QDeclarativeContext *context);
-    static void resetAnchor(QSGItem *item, const QString &name);
+    static bool isAnchoredTo(QQuickItem *fromItem, QQuickItem *toItem);
+    static bool areChildrenAnchoredTo(QQuickItem *fromItem, QQuickItem *toItem);
+    static bool hasAnchor(QQuickItem *item, const QString &name);
+    static QQuickItem *anchorFillTargetItem(QQuickItem *item);
+    static QQuickItem *anchorCenterInTargetItem(QQuickItem *item);
+    static QPair<QString, QObject*> anchorLineTarget(QQuickItem *item, const QString &name, QDeclarativeContext *context);
+    static void resetAnchor(QQuickItem *item, const QString &name);
 
 
-    static QList<QObject*> statesForItem(QSGItem *item);
+    static QList<QObject*> statesForItem(QQuickItem *item);
 
-    static bool isComponentComplete(QSGItem *item);
+    static bool isComponentComplete(QQuickItem *item);
 
-    static int borderWidth(QSGItem *item);
+    static int borderWidth(QQuickItem *item);
 
     static void refreshExpressions(QDeclarativeContext *context);
 
-    static void setRootItem(QSGView *view, QSGItem *item);
+    static void setRootItem(QQuickView *view, QQuickItem *item);
 
-    static bool isValidWidth(QSGItem *item);
-    static bool isValidHeight(QSGItem *item);
+    static bool isValidWidth(QQuickItem *item);
+    static bool isValidHeight(QQuickItem *item);
 
-    static void updateDirtyNode(QSGItem *item);
+    static void updateDirtyNode(QQuickItem *item);
 
 private:
-    QHash<QSGItem*, QSGShaderEffectTexture*> m_itemTextureHash;
+    QHash<QQuickItem*, QQuickShaderEffectTexture*> m_itemTextureHash;
 };
 
 QT_END_NAMESPACE
diff --git a/src/declarative/items/context2d/context2d.pri b/src/declarative/items/context2d/context2d.pri
index 31ed75d82a..60b3e4b0c1 100644
--- a/src/declarative/items/context2d/context2d.pri
+++ b/src/declarative/items/context2d/context2d.pri
@@ -1,16 +1,16 @@
 SOURCES += \
-    $$PWD/qsgcanvasitem.cpp \
-    $$PWD/qsgcontext2d.cpp \
-    $$PWD/qsgcontext2dnode.cpp \
-    $$PWD/qsgcontext2dtile.cpp \
-    $$PWD/qsgcontext2dtexture.cpp \
-    $$PWD/qsgcontext2dcommandbuffer.cpp \
+    $$PWD/qquickcanvasitem.cpp \
+    $$PWD/qquickcontext2d.cpp \
+    $$PWD/qquickcontext2dnode.cpp \
+    $$PWD/qquickcontext2dtile.cpp \
+    $$PWD/qquickcontext2dtexture.cpp \
+    $$PWD/qquickcontext2dcommandbuffer.cpp \
 
 HEADERS += \
-    $$PWD/qsgcanvasitem_p.h \
-    $$PWD/qsgcontext2d_p.h \
-    $$PWD/qsgcontext2dnode_p.h \
-    $$PWD/qsgcontext2dtile_p.h \
-    $$PWD/qsgcontext2dtexture_p.h \
-    $$PWD/qsgcontext2dcommandbuffer_p.h \
+    $$PWD/qquickcanvasitem_p.h \
+    $$PWD/qquickcontext2d_p.h \
+    $$PWD/qquickcontext2dnode_p.h \
+    $$PWD/qquickcontext2dtile_p.h \
+    $$PWD/qquickcontext2dtexture_p.h \
+    $$PWD/qquickcontext2dcommandbuffer_p.h \
 
diff --git a/src/declarative/items/context2d/qsgcanvasitem.cpp b/src/declarative/items/context2d/qquickcanvasitem.cpp
index b3b4eab30d..86db5e616c 100644
--- a/src/declarative/items/context2d/qsgcanvasitem.cpp
+++ b/src/declarative/items/context2d/qquickcanvasitem.cpp
@@ -40,11 +40,11 @@
 ****************************************************************************/
 
 #include <private/qsgadaptationlayer_p.h>
-#include "qsgcanvasitem_p.h"
-#include <private/qsgitem_p.h>
-#include "qsgcontext2d_p.h"
-#include "qsgcontext2dnode_p.h"
-#include "qsgcontext2dtexture_p.h"
+#include "qquickcanvasitem_p.h"
+#include <private/qquickitem_p.h>
+#include "qquickcontext2d_p.h"
+#include "qquickcontext2dnode_p.h"
+#include "qquickcontext2dtexture_p.h"
 #include <private/qdeclarativepixmapcache_p.h>
 
 #include <qdeclarativeinfo.h>
@@ -53,13 +53,13 @@
 
 QT_BEGIN_NAMESPACE
 
-class QSGCanvasItemPrivate : public QSGItemPrivate
+class QQuickCanvasItemPrivate : public QQuickItemPrivate
 {
 public:
-    QSGCanvasItemPrivate();
-    ~QSGCanvasItemPrivate();
-    QSGContext2D* context;
-    QSGContext2DTexture* texture;
+    QQuickCanvasItemPrivate();
+    ~QQuickCanvasItemPrivate();
+    QQuickContext2D* context;
+    QQuickContext2DTexture* texture;
     QSizeF canvasSize;
     QSize tileSize;
     QRectF canvasWindow;
@@ -69,13 +69,13 @@ public:
     uint hasTileSize :1;
     uint hasCanvasWindow :1;
     uint componentCompleted :1;
-    QSGCanvasItem::RenderTarget renderTarget;
+    QQuickCanvasItem::RenderTarget renderTarget;
     QHash<QUrl, QDeclarativePixmap*> images;
     QUrl baseUrl;
 };
 
-QSGCanvasItemPrivate::QSGCanvasItemPrivate()
-    : QSGItemPrivate()
+QQuickCanvasItemPrivate::QQuickCanvasItemPrivate()
+    : QQuickItemPrivate()
     , context(0)
     , texture(0)
     , canvasSize(1, 1)
@@ -85,17 +85,17 @@ QSGCanvasItemPrivate::QSGCanvasItemPrivate()
     , hasTileSize(false)
     , hasCanvasWindow(false)
     , componentCompleted(false)
-    , renderTarget(QSGCanvasItem::FramebufferObject)
+    , renderTarget(QQuickCanvasItem::FramebufferObject)
 {
 }
 
-QSGCanvasItemPrivate::~QSGCanvasItemPrivate()
+QQuickCanvasItemPrivate::~QQuickCanvasItemPrivate()
 {
     qDeleteAll(images);
 }
 
 /*!
-    \qmlclass Canvas QSGCanvasItem
+    \qmlclass Canvas QQuickCanvasItem
     \inqmlmodule QtQuick 2
     \since QtQuick 2.0
     \brief The Canvas item provides HTML5 like canvas element which enables you to
@@ -175,15 +175,15 @@ QSGCanvasItemPrivate::~QSGCanvasItemPrivate()
     \sa QtQuick2::Context2D
 */
 
-QSGCanvasItem::QSGCanvasItem(QSGItem *parent)
-    : QSGItem(*(new QSGCanvasItemPrivate), parent)
+QQuickCanvasItem::QQuickCanvasItem(QQuickItem *parent)
+    : QQuickItem(*(new QQuickCanvasItemPrivate), parent)
 {
     setFlag(ItemHasContents);
 }
 
-QSGCanvasItem::~QSGCanvasItem()
+QQuickCanvasItem::~QQuickCanvasItem()
 {
-    Q_D(QSGCanvasItem);
+    Q_D(QQuickCanvasItem);
     delete d->context;
 }
 
@@ -198,15 +198,15 @@ QSGCanvasItem::~QSGCanvasItem()
      the Canvas render engine.
     \sa QtQuick2::Canvas::tileSize QtQuick2::Canvas::canvasWindow
 */
-QSizeF QSGCanvasItem::canvasSize() const
+QSizeF QQuickCanvasItem::canvasSize() const
 {
-    Q_D(const QSGCanvasItem);
+    Q_D(const QQuickCanvasItem);
     return d->canvasSize;
 }
 
-void QSGCanvasItem::setCanvasSize(const QSizeF & size)
+void QQuickCanvasItem::setCanvasSize(const QSizeF & size)
 {
-    Q_D(QSGCanvasItem);
+    Q_D(QQuickCanvasItem);
     if (d->canvasSize != size) {
         d->hasCanvasSize = true;
         d->canvasSize = size;
@@ -231,15 +231,15 @@ void QSGCanvasItem::setCanvasSize(const QSizeF & size)
      By default, the tile size is the same with the canvas size.
      \sa QtQuick2::Canvas::canvaasSize QtQuick2::Canvas::canvasWindow
 */
-QSize QSGCanvasItem::tileSize() const
+QSize QQuickCanvasItem::tileSize() const
 {
-    Q_D(const QSGCanvasItem);
+    Q_D(const QQuickCanvasItem);
     return d->tileSize;
 }
 
-void QSGCanvasItem::setTileSize(const QSize & size)
+void QQuickCanvasItem::setTileSize(const QSize & size)
 {
-    Q_D(QSGCanvasItem);
+    Q_D(QQuickCanvasItem);
     if (d->tileSize != size) {
         d->hasTileSize = true;
         d->tileSize = size;
@@ -262,15 +262,15 @@ void QSGCanvasItem::setTileSize(const QSize & size)
      and/or position.
     \sa QtQuick2::Canvas::canvasSize QtQuick2::Canvas::tileSize
 */
-QRectF QSGCanvasItem::canvasWindow() const
+QRectF QQuickCanvasItem::canvasWindow() const
 {
-    Q_D(const QSGCanvasItem);
+    Q_D(const QQuickCanvasItem);
     return d->canvasWindow;
 }
 
-void QSGCanvasItem::setCanvasWindow(const QRectF& rect)
+void QQuickCanvasItem::setCanvasWindow(const QRectF& rect)
 {
-    Q_D(QSGCanvasItem);
+    Q_D(QQuickCanvasItem);
     if (d->canvasWindow != rect) {
         d->canvasWindow = rect;
 
@@ -282,9 +282,9 @@ void QSGCanvasItem::setCanvasWindow(const QRectF& rect)
 }
 
 
-QSGContext2D* QSGCanvasItem::context() const
+QQuickContext2D* QQuickCanvasItem::context() const
 {
-    Q_D(const QSGCanvasItem);
+    Q_D(const QQuickCanvasItem);
     return d->context;
 }
 /*!
@@ -302,9 +302,9 @@ QSGContext2D* QSGCanvasItem::context() const
      The default value is false.
     \sa QtQuick2::Canvas::renderTarget
 */
-bool QSGCanvasItem::renderInThread() const
+bool QQuickCanvasItem::renderInThread() const
 {
-    Q_D(const QSGCanvasItem);
+    Q_D(const QQuickCanvasItem);
     return d->renderInThread;
 }
 /*!
@@ -325,15 +325,15 @@ bool QSGCanvasItem::renderInThread() const
      The default render target is \c Canvas.Image.
     \sa QtQuick2::Canvas::renderInThread
 */
-QSGCanvasItem::RenderTarget QSGCanvasItem::renderTarget() const
+QQuickCanvasItem::RenderTarget QQuickCanvasItem::renderTarget() const
 {
-    Q_D(const QSGCanvasItem);
+    Q_D(const QQuickCanvasItem);
     return d->renderTarget;
 }
 
-void QSGCanvasItem::setRenderTarget(RenderTarget target)
+void QQuickCanvasItem::setRenderTarget(RenderTarget target)
 {
-    Q_D(QSGCanvasItem);
+    Q_D(QQuickCanvasItem);
     if (d->renderTarget != target) {
         d->renderTarget = target;
 
@@ -343,11 +343,11 @@ void QSGCanvasItem::setRenderTarget(RenderTarget target)
     }
 }
 
-void QSGCanvasItem::_doPainting(const QRectF& region)
+void QQuickCanvasItem::_doPainting(const QRectF& region)
 {
-    Q_D(QSGCanvasItem);
+    Q_D(QQuickCanvasItem);
     emit paint(QDeclarativeV8Handle::fromHandle(d->context->v8value())
-             , QSGContext2DTexture::tiledRect(region, d->tileSize));
+             , QQuickContext2DTexture::tiledRect(region, d->tileSize));
     if (d->texture)
         d->texture->wake();
 }
@@ -362,9 +362,9 @@ void QSGCanvasItem::_doPainting(const QRectF& region)
 
      The default renderInThread value is false.
 */
-void QSGCanvasItem::setRenderInThread(bool renderInThread)
+void QQuickCanvasItem::setRenderInThread(bool renderInThread)
 {
-    Q_D(QSGCanvasItem);
+    Q_D(QQuickCanvasItem);
     if (d->renderInThread != renderInThread) {
         d->renderInThread = renderInThread;
 
@@ -381,11 +381,11 @@ void QSGCanvasItem::setRenderInThread(bool renderInThread)
     }
 }
 
-void QSGCanvasItem::geometryChanged(const QRectF &newGeometry,
+void QQuickCanvasItem::geometryChanged(const QRectF &newGeometry,
                              const QRectF &oldGeometry)
 {
-    Q_D(QSGCanvasItem);
-    QSGItem::geometryChanged(newGeometry, oldGeometry);
+    Q_D(QQuickCanvasItem);
+    QQuickItem::geometryChanged(newGeometry, oldGeometry);
 
     const qreal w = newGeometry.width();
     const qreal h = newGeometry.height();
@@ -409,10 +409,10 @@ void QSGCanvasItem::geometryChanged(const QRectF &newGeometry,
     update();
 }
 
-void QSGCanvasItem::componentComplete()
+void QQuickCanvasItem::componentComplete()
 {
-    Q_D(QSGCanvasItem);
-    QSGItem::componentComplete();
+    Q_D(QQuickCanvasItem);
+    QQuickItem::componentComplete();
 
     if (!d->context)
         createContext();
@@ -425,10 +425,10 @@ void QSGCanvasItem::componentComplete()
     d->componentCompleted = true;
 }
 
-void QSGCanvasItem::updatePolish()
+void QQuickCanvasItem::updatePolish()
 {
-    Q_D(QSGCanvasItem);
-    QSGItem::updatePolish();
+    Q_D(QQuickCanvasItem);
+    QQuickItem::updatePolish();
     if (d->texture) {
         if (!d->renderInThread && d->dirtyRect.isValid())
             _doPainting(d->dirtyRect);
@@ -442,12 +442,12 @@ void QSGCanvasItem::updatePolish()
     }
 }
 
-QSGNode *QSGCanvasItem::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *)
+QSGNode *QQuickCanvasItem::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *)
 {
-    Q_D(QSGCanvasItem);
-    QSGContext2DNode *node = static_cast<QSGContext2DNode *>(oldNode);
+    Q_D(QQuickCanvasItem);
+    QQuickContext2DNode *node = static_cast<QQuickContext2DNode *>(oldNode);
     if (!node)
-        node = new QSGContext2DNode(this);
+        node = new QQuickContext2DNode(this);
 
     node->setTexture(d->texture);
     node->setSize(d->canvasWindow.size());
@@ -455,9 +455,9 @@ QSGNode *QSGCanvasItem::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *)
     return node;
 }
 
-void QSGCanvasItem::createTexture()
+void QQuickCanvasItem::createTexture()
 {
-    Q_D(QSGCanvasItem);
+    Q_D(QQuickCanvasItem);
 
     if (!d->texture
       || d->texture->threadRendering() != d->renderInThread
@@ -467,10 +467,10 @@ void QSGCanvasItem::createTexture()
             d->texture = 0;
         }
 
-        if (d->renderTarget == QSGCanvasItem::Image) {
-            d->texture = new QSGContext2DImageTexture(d->renderInThread);
-        } else if (d->renderTarget == QSGCanvasItem::FramebufferObject) {
-            d->texture = new QSGContext2DFBOTexture();
+        if (d->renderTarget == QQuickCanvasItem::Image) {
+            d->texture = new QQuickContext2DImageTexture(d->renderInThread);
+        } else if (d->renderTarget == QQuickCanvasItem::FramebufferObject) {
+            d->texture = new QQuickContext2DFBOTexture();
         }
 
         if (d->renderInThread && !d->texture->supportThreadRendering()) {
@@ -486,13 +486,13 @@ void QSGCanvasItem::createTexture()
     }
 }
 
-void QSGCanvasItem::createContext()
+void QQuickCanvasItem::createContext()
 {
-    Q_D(QSGCanvasItem);
+    Q_D(QQuickCanvasItem);
 
     delete d->context;
 
-    d->context = new QSGContext2D(this);
+    d->context = new QQuickContext2D(this);
 
     QV8Engine *e = QDeclarativeEnginePrivate::getV8Engine(qmlEngine(this));
     d->context->setV8Engine(e);
@@ -505,9 +505,9 @@ void QSGCanvasItem::createContext()
   parameter isn't provided or is "2d", then the QtQuick2::Context2D object is
   returned, otherwise returns an invalid value.
   */
-QDeclarativeV8Handle QSGCanvasItem::getContext(const QString &contextId)
+QDeclarativeV8Handle QQuickCanvasItem::getContext(const QString &contextId)
 {
-    Q_D(QSGCanvasItem);
+    Q_D(QQuickCanvasItem);
 
     if (contextId.toLower() != QLatin1String("2d"))
         return QDeclarativeV8Handle::fromHandle(v8::Undefined());
@@ -527,9 +527,9 @@ QDeclarativeV8Handle QSGCanvasItem::getContext(const QString &contextId)
 
   \sa QtQuick2::Canvas::paint QtQuick2::Canvas::requestPaint
   */
-void QSGCanvasItem::markDirty(const QRectF& region)
+void QQuickCanvasItem::markDirty(const QRectF& region)
 {
-    Q_D(QSGCanvasItem);
+    Q_D(QQuickCanvasItem);
     d->dirtyRect |= region;
     if (d->componentCompleted)
         polish();
@@ -549,16 +549,16 @@ void QSGCanvasItem::markDirty(const QRectF& region)
 
    \sa canvasWindow canvasSize toDataURL
   */
-bool QSGCanvasItem::save(const QString &filename) const
+bool QQuickCanvasItem::save(const QString &filename) const
 {
-    Q_D(const QSGCanvasItem);
+    Q_D(const QQuickCanvasItem);
     QUrl url = d->baseUrl.resolved(QUrl::fromLocalFile(filename));
     return toImage().save(url.toLocalFile());
 }
 
-QImage QSGCanvasItem::loadedImage(const QUrl& url)
+QImage QQuickCanvasItem::loadedImage(const QUrl& url)
 {
-    Q_D(QSGCanvasItem);
+    Q_D(QQuickCanvasItem);
     QUrl fullPathUrl = d->baseUrl.resolved(url);
     if (!d->images.contains(fullPathUrl)) {
         loadImage(url);
@@ -580,9 +580,9 @@ QImage QSGCanvasItem::loadedImage(const QUrl& url)
   \sa QtQuick2::Canvas::unloadImage QtQuick2::Canvas::imageLoaded QtQuick2::Canvas::isImageLoaded
   \sa QtQuick2::Context2D::createImageData QtQuick2::Context2D::drawImage
   */
-void QSGCanvasItem::loadImage(const QUrl& url)
+void QQuickCanvasItem::loadImage(const QUrl& url)
 {
-    Q_D(QSGCanvasItem);
+    Q_D(QQuickCanvasItem);
     QUrl fullPathUrl = d->baseUrl.resolved(url);
     if (!d->images.contains(fullPathUrl)) {
         QDeclarativePixmap* pix = new QDeclarativePixmap();
@@ -604,9 +604,9 @@ void QSGCanvasItem::loadImage(const QUrl& url)
   \sa QtQuick2::Canvas::loadImage QtQuick2::Canvas::imageLoaded QtQuick2::Canvas::isImageLoaded
   \sa QtQuick2::Context2D::createImageData QtQuick2::Context2D::drawImage
   */
-void QSGCanvasItem::unloadImage(const QUrl& url)
+void QQuickCanvasItem::unloadImage(const QUrl& url)
 {
-    Q_D(QSGCanvasItem);
+    Q_D(QQuickCanvasItem);
     QUrl removeThis = d->baseUrl.resolved(url);
     if (d->images.contains(removeThis)) {
         delete d->images.value(removeThis);
@@ -620,9 +620,9 @@ void QSGCanvasItem::unloadImage(const QUrl& url)
 
   \sa QtQuick2::Canvas::loadImage
   */
-bool QSGCanvasItem::isImageError(const QUrl& url) const
+bool QQuickCanvasItem::isImageError(const QUrl& url) const
 {
-    Q_D(const QSGCanvasItem);
+    Q_D(const QQuickCanvasItem);
     QUrl fullPathUrl = d->baseUrl.resolved(url);
     return d->images.contains(fullPathUrl)
         && d->images.value(fullPathUrl)->isError();
@@ -634,9 +634,9 @@ bool QSGCanvasItem::isImageError(const QUrl& url) const
 
   \sa QtQuick2::Canvas::loadImage
   */
-bool QSGCanvasItem::isImageLoading(const QUrl& url) const
+bool QQuickCanvasItem::isImageLoading(const QUrl& url) const
 {
-    Q_D(const QSGCanvasItem);
+    Q_D(const QQuickCanvasItem);
     QUrl fullPathUrl = d->baseUrl.resolved(url);
     return d->images.contains(fullPathUrl)
         && d->images.value(fullPathUrl)->isLoading();
@@ -647,17 +647,17 @@ bool QSGCanvasItem::isImageLoading(const QUrl& url) const
 
   \sa QtQuick2::Canvas::loadImage
   */
-bool QSGCanvasItem::isImageLoaded(const QUrl& url) const
+bool QQuickCanvasItem::isImageLoaded(const QUrl& url) const
 {
-    Q_D(const QSGCanvasItem);
+    Q_D(const QQuickCanvasItem);
     QUrl fullPathUrl = d->baseUrl.resolved(url);
     return d->images.contains(fullPathUrl)
         && d->images.value(fullPathUrl)->isReady();
 }
 
-QImage QSGCanvasItem::toImage(const QRectF& region) const
+QImage QQuickCanvasItem::toImage(const QRectF& region) const
 {
-    Q_D(const QSGCanvasItem);
+    Q_D(const QQuickCanvasItem);
     if (d->texture) {
         if (region.isEmpty())
             return d->texture->toImage(canvasWindow());
@@ -676,7 +676,7 @@ QImage QSGCanvasItem::toImage(const QRectF& region) const
 
    \sa QtQuick2::Canvas::save
   */
-QString QSGCanvasItem::toDataURL(const QString& mimeType) const
+QString QQuickCanvasItem::toDataURL(const QString& mimeType) const
 {
     QImage image = toImage();
 
diff --git a/src/declarative/items/context2d/qsgcanvasitem_p.h b/src/declarative/items/context2d/qquickcanvasitem_p.h
index 131a3f5fff..e0261192ed 100644
--- a/src/declarative/items/context2d/qsgcanvasitem_p.h
+++ b/src/declarative/items/context2d/qquickcanvasitem_p.h
@@ -39,10 +39,10 @@
 **
 ****************************************************************************/
 
-#ifndef QSGCANVASITEM_P_H
-#define QSGCANVASITEM_P_H
+#ifndef QQUICKCANVASITEM_P_H
+#define QQUICKCANVASITEM_P_H
 
-#include <qsgitem.h>
+#include <qquickitem.h>
 #include <private/qv8engine_p.h>
 
 QT_BEGIN_HEADER
@@ -50,9 +50,9 @@ QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE
 
 QT_MODULE(Declarative)
-class QSGContext2D;
-class QSGCanvasItemPrivate;
-class Q_DECLARATIVE_EXPORT QSGCanvasItem : public QSGItem
+class QQuickContext2D;
+class QQuickCanvasItemPrivate;
+class Q_DECLARATIVE_EXPORT QQuickCanvasItem : public QQuickItem
 {
     Q_OBJECT
     Q_ENUMS(RenderTarget)
@@ -80,8 +80,8 @@ public:
         Convolute
     };
 
-    QSGCanvasItem(QSGItem *parent = 0);
-    ~QSGCanvasItem();
+    QQuickCanvasItem(QQuickItem *parent = 0);
+    ~QQuickCanvasItem();
 
     QSizeF canvasSize() const;
     void setCanvasSize(const QSizeF &);
@@ -98,7 +98,7 @@ public:
     RenderTarget renderTarget() const;
     void setRenderTarget(RenderTarget target);
 
-    QSGContext2D* context() const;
+    QQuickContext2D* context() const;
     QImage toImage(const QRectF& region = QRectF()) const;
 
     QImage loadedImage(const QUrl& url);
@@ -135,14 +135,14 @@ protected:
 private:
     void createContext();
     void createTexture();
-    Q_DECLARE_PRIVATE(QSGCanvasItem)
-    friend class QSGContext2D;
-    friend class QSGContext2DTexture;
+    Q_DECLARE_PRIVATE(QQuickCanvasItem)
+    friend class QQuickContext2D;
+    friend class QQuickContext2DTexture;
 };
 QT_END_NAMESPACE
 
-QML_DECLARE_TYPE(QSGCanvasItem)
+QML_DECLARE_TYPE(QQuickCanvasItem)
 
 QT_END_HEADER
 
-#endif //QSGCANVASITEM_P_H
+#endif //QQUICKCANVASITEM_P_H
diff --git a/src/declarative/items/context2d/qsgcontext2d.cpp b/src/declarative/items/context2d/qquickcontext2d.cpp
index 5944a02658..0c0865b3b3 100644
--- a/src/declarative/items/context2d/qsgcontext2d.cpp
+++ b/src/declarative/items/context2d/qquickcontext2d.cpp
@@ -39,11 +39,11 @@
 **
 ****************************************************************************/
 
-#include "qsgcontext2d_p.h"
-#include "qsgcontext2dcommandbuffer_p.h"
-#include "qsgcanvasitem_p.h"
-#include <private/qsgitem_p.h>
-#include <private/qsgshadereffectsource_p.h>
+#include "qquickcontext2d_p.h"
+#include "qquickcontext2dcommandbuffer_p.h"
+#include "qquickcanvasitem_p.h"
+#include <private/qquickitem_p.h>
+#include <private/qquickshadereffectsource_p.h>
 #include <QtGui/qopenglframebufferobject.h>
 
 #include <QtCore/qdebug.h>
@@ -51,7 +51,7 @@
 #include <private/qdeclarativesvgparser_p.h>
 #include <private/qdeclarativepath_p.h>
 
-#include <private/qsgimage_p_p.h>
+#include <private/qquickimage_p_p.h>
 
 #include <QtGui/qguiapplication.h>
 #include <qdeclarativeinfo.h>
@@ -64,7 +64,7 @@
 
 QT_BEGIN_NAMESPACE
 /*!
-    \qmlclass Context2D QSGContext2D
+    \qmlclass Context2D QQuickContext2D
     \inqmlmodule QtQuick 2
     \since QtQuick 2.0
     \brief The Context2D API allows you to draw 2d graphic shapes on the \c Canvas item.
@@ -200,11 +200,11 @@ QFont qt_font_from_string(const QString& fontString) {
 
 
 
-class QSGContext2DEngineData : public QV8Engine::Deletable
+class QQuickContext2DEngineData : public QV8Engine::Deletable
 {
 public:
-    QSGContext2DEngineData(QV8Engine *engine);
-    ~QSGContext2DEngineData();
+    QQuickContext2DEngineData(QV8Engine *engine);
+    ~QQuickContext2DEngineData();
 
     v8::Persistent<v8::Function> constructorContext;
     v8::Persistent<v8::Function> constructorGradient;
@@ -213,14 +213,14 @@ public:
     v8::Persistent<v8::Function> constructorImageData;
 };
 
-V8_DEFINE_EXTENSION(QSGContext2DEngineData, engineData)
+V8_DEFINE_EXTENSION(QQuickContext2DEngineData, engineData)
 
 class QV8Context2DResource : public QV8ObjectResource
 {
     V8_RESOURCE_TYPE(Context2DType)
 public:
     QV8Context2DResource(QV8Engine *e) : QV8ObjectResource(e) {}
-    QSGContext2D* context;
+    QQuickContext2D* context;
 };
 
 class QV8Context2DStyleResource : public QV8ObjectResource
@@ -408,7 +408,7 @@ static QString qt_composite_mode_to_string(QPainter::CompositionMode op)
 
 static v8::Local<v8::Object> qt_create_image_data(qreal w, qreal h, QV8Engine* engine, const QImage& image)
 {
-    QSGContext2DEngineData *ed = engineData(engine);
+    QQuickContext2DEngineData *ed = engineData(engine);
     v8::Local<v8::Object> imageData = ed->constructorImageData->NewInstance();
     QV8Context2DPixelArrayResource *r = new QV8Context2DPixelArrayResource(engine);
     if (image.isNull()) {
@@ -1049,7 +1049,7 @@ static v8::Handle<v8::Value> ctx2d_createLinearGradient(const v8::Arguments &arg
     QV8Engine *engine = V8ENGINE();
 
     if (args.Length() == 4) {
-        QSGContext2DEngineData *ed = engineData(engine);
+        QQuickContext2DEngineData *ed = engineData(engine);
         v8::Local<v8::Object> gradient = ed->constructorGradient->NewInstance();
         QV8Context2DStyleResource *r = new QV8Context2DStyleResource(engine);
         qreal x0 = args[0]->NumberValue();
@@ -1093,7 +1093,7 @@ static v8::Handle<v8::Value> ctx2d_createRadialGradient(const v8::Arguments &arg
     QV8Engine *engine = V8ENGINE();
 
     if (args.Length() == 6) {
-        QSGContext2DEngineData *ed = engineData(engine);
+        QQuickContext2DEngineData *ed = engineData(engine);
         v8::Local<v8::Object> gradient = ed->constructorGradient->NewInstance();
         QV8Context2DStyleResource *r = new QV8Context2DStyleResource(engine);
 
@@ -1146,7 +1146,7 @@ static v8::Handle<v8::Value> ctx2d_createConicalGradient(const v8::Arguments &ar
     QV8Engine *engine = V8ENGINE();
 
     if (args.Length() == 6) {
-        QSGContext2DEngineData *ed = engineData(engine);
+        QQuickContext2DEngineData *ed = engineData(engine);
         v8::Local<v8::Object> gradient = ed->constructorGradient->NewInstance();
         QV8Context2DStyleResource *r = new QV8Context2DStyleResource(engine);
 
@@ -1218,7 +1218,7 @@ static v8::Handle<v8::Value> ctx2d_createPattern(const v8::Arguments &args)
     QV8Engine *engine = V8ENGINE();
 
     if (args.Length() == 2) {
-        QSGContext2DEngineData *ed = engineData(engine);
+        QQuickContext2DEngineData *ed = engineData(engine);
         QV8Context2DStyleResource *styleResouce = new QV8Context2DStyleResource(engine);
 
         QColor color = engine->toVariant(args[0], qMetaTypeId<QColor>()).value<QColor>();
@@ -2171,15 +2171,15 @@ v8::Handle<v8::Value> ctx2d_textAlign(v8::Local<v8::String>, const v8::AccessorI
     CHECK_CONTEXT(r)
     QV8Engine *engine = V8ENGINE_ACCESSOR();
     switch (r->context->state.textAlign) {
-    case QSGContext2D::Start:
+    case QQuickContext2D::Start:
         return engine->toString(QLatin1String("start"));
-   case QSGContext2D::End:
+   case QQuickContext2D::End:
         return engine->toString(QLatin1String("end"));
-   case QSGContext2D::Left:
+   case QQuickContext2D::Left:
         return engine->toString(QLatin1String("left"));
-   case QSGContext2D::Right:
+   case QQuickContext2D::Right:
         return engine->toString(QLatin1String("right"));
-   case QSGContext2D::Center:
+   case QQuickContext2D::Center:
         return engine->toString(QLatin1String("center"));
     default:
         break;
@@ -2195,17 +2195,17 @@ static void ctx2d_textAlign_set(v8::Local<v8::String>, v8::Local<v8::Value> valu
 
     QString textAlign = engine->toString(value);
 
-    QSGContext2D::TextAlignType ta;
+    QQuickContext2D::TextAlignType ta;
     if (textAlign == QLatin1String("start"))
-        ta = QSGContext2D::Start;
+        ta = QQuickContext2D::Start;
     else if (textAlign == QLatin1String("end"))
-        ta = QSGContext2D::End;
+        ta = QQuickContext2D::End;
     else if (textAlign == QLatin1String("left"))
-        ta = QSGContext2D::Left;
+        ta = QQuickContext2D::Left;
     else if (textAlign == QLatin1String("right"))
-        ta = QSGContext2D::Right;
+        ta = QQuickContext2D::Right;
     else if (textAlign == QLatin1String("center"))
-        ta = QSGContext2D::Center;
+        ta = QQuickContext2D::Center;
     else
         return;
 
@@ -2236,15 +2236,15 @@ v8::Handle<v8::Value> ctx2d_textBaseline(v8::Local<v8::String>, const v8::Access
 
     QV8Engine *engine = V8ENGINE_ACCESSOR();
     switch (r->context->state.textBaseline) {
-    case QSGContext2D::Alphabetic:
+    case QQuickContext2D::Alphabetic:
         return engine->toString(QLatin1String("alphabetic"));
-    case QSGContext2D::Hanging:
+    case QQuickContext2D::Hanging:
         return engine->toString(QLatin1String("hanging"));
-    case QSGContext2D::Top:
+    case QQuickContext2D::Top:
         return engine->toString(QLatin1String("top"));
-    case QSGContext2D::Bottom:
+    case QQuickContext2D::Bottom:
         return engine->toString(QLatin1String("bottom"));
-    case QSGContext2D::Middle:
+    case QQuickContext2D::Middle:
         return engine->toString(QLatin1String("middle"));
     default:
         break;
@@ -2259,17 +2259,17 @@ static void ctx2d_textBaseline_set(v8::Local<v8::String>, v8::Local<v8::Value> v
     QV8Engine *engine = V8ENGINE_ACCESSOR();
     QString textBaseline = engine->toString(value);
 
-    QSGContext2D::TextBaseLineType tb;
+    QQuickContext2D::TextBaseLineType tb;
     if (textBaseline == QLatin1String("alphabetic"))
-        tb = QSGContext2D::Alphabetic;
+        tb = QQuickContext2D::Alphabetic;
     else if (textBaseline == QLatin1String("hanging"))
-        tb = QSGContext2D::Hanging;
+        tb = QQuickContext2D::Hanging;
     else if (textBaseline == QLatin1String("top"))
-        tb = QSGContext2D::Top;
+        tb = QQuickContext2D::Top;
     else if (textBaseline == QLatin1String("bottom"))
-        tb = QSGContext2D::Bottom;
+        tb = QQuickContext2D::Bottom;
     else if (textBaseline == QLatin1String("middle"))
-        tb = QSGContext2D::Middle;
+        tb = QQuickContext2D::Middle;
     else
         return;
 
@@ -2443,8 +2443,8 @@ static v8::Handle<v8::Value> ctx2d_drawImage(const v8::Arguments &args)
 
         image = r->context->createImage(url);
     } else if (args[0]->IsObject()) {
-        QSGImage *imageItem = qobject_cast<QSGImage*>(engine->toQObject(args[0]->ToObject()));
-        QSGCanvasItem *canvas = qobject_cast<QSGCanvasItem*>(engine->toQObject(args[0]->ToObject()));
+        QQuickImage *imageItem = qobject_cast<QQuickImage*>(engine->toQObject(args[0]->ToObject()));
+        QQuickCanvasItem *canvas = qobject_cast<QQuickCanvasItem*>(engine->toQObject(args[0]->ToObject()));
 
         QV8Context2DPixelArrayResource *pix = v8_resource_cast<QV8Context2DPixelArrayResource>(args[0]->ToObject()->GetInternalField(0)->ToObject());
         if (pix) {
@@ -2627,12 +2627,12 @@ static v8::Handle<v8::Value> ctx2d_imageData_filter(const v8::Arguments &args)
     if (args.Length() >= 1) {
         int filterFlag = args[0]->IntegerValue();
         switch (filterFlag) {
-        case QSGCanvasItem::Mono :
+        case QQuickCanvasItem::Mono :
         {
             r->image = r->image.convertToFormat(QImage::Format_Mono).convertToFormat(QImage::Format_ARGB32_Premultiplied);
         }
             break;
-        case QSGCanvasItem::GrayScale :
+        case QQuickCanvasItem::GrayScale :
         {
             for (int y = 0; y < r->image.height(); ++y) {
               QRgb *row = (QRgb*)r->image.scanLine(y);
@@ -2643,7 +2643,7 @@ static v8::Handle<v8::Value> ctx2d_imageData_filter(const v8::Arguments &args)
             }
         }
             break;
-        case QSGCanvasItem::Threshold :
+        case QQuickCanvasItem::Threshold :
         {
             qreal threshold = 0.5;
             if (args.Length() > 1)
@@ -2659,7 +2659,7 @@ static v8::Handle<v8::Value> ctx2d_imageData_filter(const v8::Arguments &args)
             }
         }
             break;
-        case QSGCanvasItem::Brightness :
+        case QQuickCanvasItem::Brightness :
         {
             int adjustment = 1;
             if (args.Length() > 1)
@@ -2675,12 +2675,12 @@ static v8::Handle<v8::Value> ctx2d_imageData_filter(const v8::Arguments &args)
             }
         }
             break;
-        case QSGCanvasItem::Invert :
+        case QQuickCanvasItem::Invert :
         {
             r->image.invertPixels();
         }
             break;
-        case QSGCanvasItem::Blur :
+        case QQuickCanvasItem::Blur :
         {
             int radius = 3;
             bool quality = false;
@@ -2693,7 +2693,7 @@ static v8::Handle<v8::Value> ctx2d_imageData_filter(const v8::Arguments &args)
             qt_image_boxblur(r->image, radius, quality);
         }
             break;
-        case QSGCanvasItem::Opaque :
+        case QQuickCanvasItem::Opaque :
         {
             for (int y = 0; y < r->image.height(); ++y) {
               QRgb *row = (QRgb*)r->image.scanLine(y);
@@ -2703,7 +2703,7 @@ static v8::Handle<v8::Value> ctx2d_imageData_filter(const v8::Arguments &args)
             }
         }
             break;
-        case QSGCanvasItem::Convolute :
+        case QQuickCanvasItem::Convolute :
         {
             if (args.Length() > 1 && args[1]->IsArray()) {
                 v8::Local<v8::Array> array = v8::Local<v8::Array>::Cast(args[1]);
@@ -3014,13 +3014,13 @@ static v8::Handle<v8::Value> ctx2d_gradient_addColorStop(const v8::Arguments &ar
 }
 
 
-void QSGContext2D::beginPath()
+void QQuickContext2D::beginPath()
 {
     m_path = QPainterPath();
     m_path.setFillRule(state.fillRule);
 }
 
-void QSGContext2D::closePath()
+void QQuickContext2D::closePath()
 {
     if (m_path.isEmpty())
         return;
@@ -3032,25 +3032,25 @@ void QSGContext2D::closePath()
     //should be the first point of the previous subpath
 }
 
-void QSGContext2D::moveTo( qreal x, qreal y)
+void QQuickContext2D::moveTo( qreal x, qreal y)
 {
     //FIXME: moveTo should not close the previous subpath
     m_path.moveTo(state.matrix.map(QPointF(x, y)));
 }
 
-void QSGContext2D::lineTo( qreal x, qreal y)
+void QQuickContext2D::lineTo( qreal x, qreal y)
 {
     m_path.lineTo(state.matrix.map(QPointF(x, y)));
 }
 
-void QSGContext2D::quadraticCurveTo(qreal cpx, qreal cpy,
+void QQuickContext2D::quadraticCurveTo(qreal cpx, qreal cpy,
                                            qreal x, qreal y)
 {
     m_path.quadTo(state.matrix.map(QPointF(cpx, cpy)),
                       state.matrix.map(QPointF(x, y)));
 }
 
-void QSGContext2D::bezierCurveTo(qreal cp1x, qreal cp1y,
+void QQuickContext2D::bezierCurveTo(qreal cp1x, qreal cp1y,
                                         qreal cp2x, qreal cp2y,
                                         qreal x, qreal y)
 {
@@ -3059,7 +3059,7 @@ void QSGContext2D::bezierCurveTo(qreal cp1x, qreal cp1y,
                        state.matrix.map(QPointF(x, y)));
 }
 
-void QSGContext2D::addArcTo(const QPointF& p1, const QPointF& p2, float radius)
+void QQuickContext2D::addArcTo(const QPointF& p1, const QPointF& p2, float radius)
 {
     QPointF p0(m_path.currentPosition());
 
@@ -3117,7 +3117,7 @@ void QSGContext2D::addArcTo(const QPointF& p1, const QPointF& p2, float radius)
     arc(p.x(), p.y(), radius, sa, ea, anticlockwise, false);
 }
 
-void QSGContext2D::arcTo(qreal x1, qreal y1,
+void QQuickContext2D::arcTo(qreal x1, qreal y1,
                                 qreal x2, qreal y2,
                                 qreal radius)
 {
@@ -3133,13 +3133,13 @@ void QSGContext2D::arcTo(qreal x1, qreal y1,
     }
 }
 
-void QSGContext2D::rect(qreal x, qreal y,
+void QQuickContext2D::rect(qreal x, qreal y,
                                qreal w, qreal h)
 {
     m_path.addPolygon(state.matrix.map(QRectF(x, y, w, h)));
 }
 
-void QSGContext2D::roundedRect(qreal x, qreal y,
+void QQuickContext2D::roundedRect(qreal x, qreal y,
                                qreal w, qreal h,
                                qreal xr, qreal yr)
 {
@@ -3148,7 +3148,7 @@ void QSGContext2D::roundedRect(qreal x, qreal y,
     m_path.addPath(state.matrix.map(path));
 }
 
-void QSGContext2D::ellipse(qreal x, qreal y,
+void QQuickContext2D::ellipse(qreal x, qreal y,
                            qreal w, qreal h)
 {
     QPainterPath path;
@@ -3156,14 +3156,14 @@ void QSGContext2D::ellipse(qreal x, qreal y,
     m_path.addPath(state.matrix.map(path));
 }
 
-void QSGContext2D::text(const QString& str, qreal x, qreal y)
+void QQuickContext2D::text(const QString& str, qreal x, qreal y)
 {
     QPainterPath path;
     path.addText(x, y, state.font, str);
     m_path.addPath(state.matrix.map(path));
 }
 
-void QSGContext2D::arc(qreal xc,
+void QQuickContext2D::arc(qreal xc,
                        qreal yc,
                        qreal radius,
                        qreal sar,
@@ -3229,38 +3229,38 @@ void QSGContext2D::arc(qreal xc,
     m_path.arcTo(xs, ys, width, height, sa, span);
 }
 
-int baseLineOffset(QSGContext2D::TextBaseLineType value, const QFontMetrics &metrics)
+int baseLineOffset(QQuickContext2D::TextBaseLineType value, const QFontMetrics &metrics)
 {
     int offset = 0;
     switch (value) {
-    case QSGContext2D::Top:
+    case QQuickContext2D::Top:
         break;
-    case QSGContext2D::Alphabetic:
-    case QSGContext2D::Middle:
-    case QSGContext2D::Hanging:
+    case QQuickContext2D::Alphabetic:
+    case QQuickContext2D::Middle:
+    case QQuickContext2D::Hanging:
         offset = metrics.ascent();
         break;
-    case QSGContext2D::Bottom:
+    case QQuickContext2D::Bottom:
         offset = metrics.height();
        break;
     }
     return offset;
 }
 
-static int textAlignOffset(QSGContext2D::TextAlignType value, const QFontMetrics &metrics, const QString &text)
+static int textAlignOffset(QQuickContext2D::TextAlignType value, const QFontMetrics &metrics, const QString &text)
 {
     int offset = 0;
-    if (value == QSGContext2D::Start)
-        value = QGuiApplication::layoutDirection() == Qt::LeftToRight ? QSGContext2D::Left : QSGContext2D::Right;
-    else if (value == QSGContext2D::End)
-        value = QGuiApplication::layoutDirection() == Qt::LeftToRight ? QSGContext2D::Right: QSGContext2D::Left;
+    if (value == QQuickContext2D::Start)
+        value = QGuiApplication::layoutDirection() == Qt::LeftToRight ? QQuickContext2D::Left : QQuickContext2D::Right;
+    else if (value == QQuickContext2D::End)
+        value = QGuiApplication::layoutDirection() == Qt::LeftToRight ? QQuickContext2D::Right: QQuickContext2D::Left;
     switch (value) {
-    case QSGContext2D::Center:
+    case QQuickContext2D::Center:
         offset = metrics.width(text)/2;
         break;
-    case QSGContext2D::Right:
+    case QQuickContext2D::Right:
         offset = metrics.width(text);
-    case QSGContext2D::Left:
+    case QQuickContext2D::Left:
     default:
         break;
     }
@@ -3268,16 +3268,16 @@ static int textAlignOffset(QSGContext2D::TextAlignType value, const QFontMetrics
 }
 
 
-QImage QSGContext2D::createImage(const QUrl& url)
+QImage QQuickContext2D::createImage(const QUrl& url)
 {
     return m_canvas->loadedImage(url);
 }
 
-QPainterPath QSGContext2D::createTextGlyphs(qreal x, qreal y, const QString& text)
+QPainterPath QQuickContext2D::createTextGlyphs(qreal x, qreal y, const QString& text)
 {
     const QFontMetrics metrics(state.font);
-    int yoffset = baseLineOffset(static_cast<QSGContext2D::TextBaseLineType>(state.textBaseline), metrics);
-    int xoffset = textAlignOffset(static_cast<QSGContext2D::TextAlignType>(state.textAlign), metrics, text);
+    int yoffset = baseLineOffset(static_cast<QQuickContext2D::TextBaseLineType>(state.textBaseline), metrics);
+    int xoffset = textAlignOffset(static_cast<QQuickContext2D::TextAlignType>(state.textAlign), metrics, text);
 
     QPainterPath textPath;
 
@@ -3287,29 +3287,29 @@ QPainterPath QSGContext2D::createTextGlyphs(qreal x, qreal y, const QString& tex
 }
 
 
-bool QSGContext2D::isPointInPath(qreal x, qreal y) const
+bool QQuickContext2D::isPointInPath(qreal x, qreal y) const
 {
     return m_path.contains(QPointF(x, y));
 }
 
-QSGContext2D::QSGContext2D(QSGCanvasItem* item)
+QQuickContext2D::QQuickContext2D(QQuickCanvasItem* item)
     : m_canvas(item)
-    , m_buffer(new QSGContext2DCommandBuffer)
+    , m_buffer(new QQuickContext2DCommandBuffer)
     , m_v8engine(0)
 {
     reset();
 }
 
-QSGContext2D::~QSGContext2D()
+QQuickContext2D::~QQuickContext2D()
 {
 }
 
-v8::Handle<v8::Object> QSGContext2D::v8value() const
+v8::Handle<v8::Object> QQuickContext2D::v8value() const
 {
     return m_v8value;
 }
 
-QSGContext2DEngineData::QSGContext2DEngineData(QV8Engine *engine)
+QQuickContext2DEngineData::QQuickContext2DEngineData(QV8Engine *engine)
 {
     v8::HandleScope handle_scope;
     v8::Context::Scope scope(engine->context());
@@ -3405,7 +3405,7 @@ QSGContext2DEngineData::QSGContext2DEngineData(QV8Engine *engine)
     constructorImageData = qPersistentNew(ftImageData->GetFunction());
 }
 
-QSGContext2DEngineData::~QSGContext2DEngineData()
+QQuickContext2DEngineData::~QQuickContext2DEngineData()
 {
     qPersistentDispose(constructorContext);
     qPersistentDispose(constructorGradient);
@@ -3414,12 +3414,12 @@ QSGContext2DEngineData::~QSGContext2DEngineData()
     qPersistentDispose(constructorPixelArray);
 }
 
-void QSGContext2D::popState()
+void QQuickContext2D::popState()
 {
     if (m_stateStack.isEmpty())
         return;
 
-    QSGContext2D::State newState = m_stateStack.pop();
+    QQuickContext2D::State newState = m_stateStack.pop();
 
     if (state.matrix != newState.matrix)
         buffer()->updateMatrix(newState.matrix);
@@ -3465,14 +3465,14 @@ void QSGContext2D::popState()
         buffer()->setShadowOffsetY(newState.shadowOffsetY);
     state = newState;
 }
-void QSGContext2D::pushState()
+void QQuickContext2D::pushState()
 {
     m_stateStack.push(state);
 }
 
-void QSGContext2D::reset()
+void QQuickContext2D::reset()
 {
-    QSGContext2D::State newState;
+    QQuickContext2D::State newState;
     newState.matrix = QTransform();
 
     QPainterPath defaultClipPath;
@@ -3501,8 +3501,8 @@ void QSGContext2D::reset()
     newState.shadowColor = qRgba(0, 0, 0, 0);
     newState.globalCompositeOperation = QPainter::CompositionMode_SourceOver;
     newState.font = QFont(QLatin1String("sans-serif"), 10);
-    newState.textAlign = QSGContext2D::Start;
-    newState.textBaseline = QSGContext2D::Alphabetic;
+    newState.textAlign = QQuickContext2D::Start;
+    newState.textBaseline = QQuickContext2D::Alphabetic;
 
     m_stateStack.clear();
     m_stateStack.push(newState);
@@ -3510,7 +3510,7 @@ void QSGContext2D::reset()
     m_buffer->clearRect(0, 0, m_canvas->width(), m_canvas->height());
 }
 
-void QSGContext2D::setV8Engine(QV8Engine *engine)
+void QQuickContext2D::setV8Engine(QV8Engine *engine)
 {
     v8::HandleScope handle_scope;
     v8::Context::Scope scope(engine->context());
@@ -3523,7 +3523,7 @@ void QSGContext2D::setV8Engine(QV8Engine *engine)
         if (m_v8engine == 0)
             return;
 
-        QSGContext2DEngineData *ed = engineData(engine);
+        QQuickContext2DEngineData *ed = engineData(engine);
         m_v8value = qPersistentNew(ed->constructorContext->NewInstance());
         QV8Context2DResource *r = new QV8Context2DResource(engine);
         r->context = this;
diff --git a/src/declarative/items/context2d/qsgcontext2d_p.h b/src/declarative/items/context2d/qquickcontext2d_p.h
index 10c1e331f9..3c5e89c335 100644
--- a/src/declarative/items/context2d/qsgcontext2d_p.h
+++ b/src/declarative/items/context2d/qquickcontext2d_p.h
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#ifndef QSGCONTEXT2D_P_H
-#define QSGCONTEXT2D_P_H
+#ifndef QQUICKCONTEXT2D_P_H
+#define QQUICKCONTEXT2D_P_H
 
 #include <QtDeclarative/qdeclarative.h>
 #include <QtDeclarative/qdeclarativecomponent.h>
@@ -53,9 +53,9 @@
 
 
 
-#define QSGCONTEXT2D_DEBUG //enable this for just DEBUG purpose!
+#define QQUICKCONTEXT2D_DEBUG //enable this for just DEBUG purpose!
 
-#ifdef QSGCONTEXT2D_DEBUG
+#ifdef QQUICKCONTEXT2D_DEBUG
 #include <QElapsedTimer>
 #endif
 
@@ -65,11 +65,11 @@ QT_BEGIN_NAMESPACE
 
 QT_MODULE(Declarative)
 
-class QSGCanvasItem;
-class QSGContext2DCommandBuffer;
+class QQuickCanvasItem;
+class QQuickContext2DCommandBuffer;
 class QDeclarativePixmap;
 
-class Q_DECLARATIVE_EXPORT QSGContext2D
+class Q_DECLARATIVE_EXPORT QQuickContext2D
 {
 public:
     enum TextBaseLineType { Alphabetic=0, Top, Middle, Bottom, Hanging};
@@ -127,15 +127,15 @@ public:
         QColor shadowColor;
         QPainter::CompositionMode globalCompositeOperation;
         QFont font;
-        QSGContext2D::TextAlignType textAlign;
-        QSGContext2D::TextBaseLineType textBaseline;
+        QQuickContext2D::TextAlignType textAlign;
+        QQuickContext2D::TextBaseLineType textBaseline;
     };
 
-    QSGContext2D(QSGCanvasItem* item);
-    ~QSGContext2D();
+    QQuickContext2D(QQuickCanvasItem* item);
+    ~QQuickContext2D();
 
-    inline QSGCanvasItem*  canvas() const {return m_canvas;}
-    inline QSGContext2DCommandBuffer* buffer() const {return m_buffer;}
+    inline QQuickCanvasItem*  canvas() const {return m_canvas;}
+    inline QQuickContext2DCommandBuffer* buffer() const {return m_buffer;}
 
     v8::Handle<v8::Object> v8value() const;
     void setV8Engine(QV8Engine *eng);
@@ -167,9 +167,9 @@ public:
     QImage createImage(const QUrl& url);
 
     State state;
-    QStack<QSGContext2D::State> m_stateStack;
-    QSGCanvasItem* m_canvas;
-    QSGContext2DCommandBuffer* m_buffer;
+    QStack<QQuickContext2D::State> m_stateStack;
+    QQuickCanvasItem* m_canvas;
+    QQuickContext2DCommandBuffer* m_buffer;
     QPainterPath m_path;
     v8::Local<v8::Value> m_fillStyle;
     v8::Local<v8::Value> m_strokeStyle;
@@ -180,8 +180,8 @@ public:
 
 
 QT_END_NAMESPACE
-QML_DECLARE_TYPE(QSGContext2D)
+QML_DECLARE_TYPE(QQuickContext2D)
 
 QT_END_HEADER
 
-#endif // QSGCONTEXT2D_P_H
+#endif // QQUICKCONTEXT2D_P_H
diff --git a/src/declarative/items/context2d/qsgcontext2dcommandbuffer.cpp b/src/declarative/items/context2d/qquickcontext2dcommandbuffer.cpp
index 29ed5fbc12..e91a21c8b0 100644
--- a/src/declarative/items/context2d/qsgcontext2dcommandbuffer.cpp
+++ b/src/declarative/items/context2d/qquickcontext2dcommandbuffer.cpp
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#include "qsgcontext2dcommandbuffer_p.h"
-#include "qsgcanvasitem_p.h"
+#include "qquickcontext2dcommandbuffer_p.h"
+#include "qquickcanvasitem_p.h"
 #include <qdeclarative.h>
 #include <QtCore/QMutex>
 
@@ -197,7 +197,7 @@ static inline void drawRepeatPattern(QPainter* p, const QImage& image, const QRe
     }
 }
 
-QPen QSGContext2DCommandBuffer::makePen(QSGContext2D::State state)
+QPen QQuickContext2DCommandBuffer::makePen(QQuickContext2D::State state)
 {
     QPen pen;
     pen.setWidthF(state.lineWidth);
@@ -208,7 +208,7 @@ QPen QSGContext2DCommandBuffer::makePen(QSGContext2D::State state)
     return pen;
 }
 
-void QSGContext2DCommandBuffer::setPainterState(QPainter* p, QSGContext2D::State state, const QPen& pen)
+void QQuickContext2DCommandBuffer::setPainterState(QPainter* p, QQuickContext2D::State state, const QPen& pen)
 {
    p->setTransform(state.matrix * p->transform());
 
@@ -229,7 +229,7 @@ void QSGContext2DCommandBuffer::setPainterState(QPainter* p, QSGContext2D::State
        p->setCompositionMode(state.globalCompositeOperation);
 }
 
-QSGContext2D::State QSGContext2DCommandBuffer::replay(QPainter* p, QSGContext2D::State state)
+QQuickContext2D::State QQuickContext2DCommandBuffer::replay(QPainter* p, QQuickContext2D::State state)
 {
     if (!p)
         return state;
@@ -242,15 +242,15 @@ QSGContext2D::State QSGContext2DCommandBuffer::replay(QPainter* p, QSGContext2D:
     setPainterState(p, state, pen);
 
     while (hasNext()) {
-        QSGContext2D::PaintCommand cmd = takeNextCommand();
+        QQuickContext2D::PaintCommand cmd = takeNextCommand();
         switch (cmd) {
-        case QSGContext2D::UpdateMatrix:
+        case QQuickContext2D::UpdateMatrix:
         {
             state.matrix = takeMatrix();
             p->setTransform(state.matrix * originMatrix);
             break;
         }
-        case QSGContext2D::ClearRect:
+        case QQuickContext2D::ClearRect:
         {
             QPainter::CompositionMode  cm = p->compositionMode();
             qreal alpha = p->opacity();
@@ -261,7 +261,7 @@ QSGContext2D::State QSGContext2DCommandBuffer::replay(QPainter* p, QSGContext2D:
             p->setOpacity(alpha);
             break;
         }
-        case QSGContext2D::FillRect:
+        case QQuickContext2D::FillRect:
         {
             QRectF r = takeRect();
             if (HAS_SHADOW(state.shadowOffsetX, state.shadowOffsetY, state.shadowBlur, state.shadowColor))
@@ -270,27 +270,27 @@ QSGContext2D::State QSGContext2DCommandBuffer::replay(QPainter* p, QSGContext2D:
                 p->fillRect(r, p->brush());
             break;
         }
-        case QSGContext2D::ShadowColor:
+        case QQuickContext2D::ShadowColor:
         {
             state.shadowColor = takeColor();
             break;
         }
-        case QSGContext2D::ShadowBlur:
+        case QQuickContext2D::ShadowBlur:
         {
             state.shadowBlur = takeShadowBlur();
             break;
         }
-        case QSGContext2D::ShadowOffsetX:
+        case QQuickContext2D::ShadowOffsetX:
         {
             state.shadowOffsetX = takeShadowOffsetX();
             break;
         }
-        case QSGContext2D::ShadowOffsetY:
+        case QQuickContext2D::ShadowOffsetY:
         {
             state.shadowOffsetY = takeShadowOffsetY();
             break;
         }
-        case QSGContext2D::FillStyle:
+        case QQuickContext2D::FillStyle:
         {
             state.fillStyle = takeFillStyle();
             state.fillPatternRepeatX = takeBool();
@@ -298,7 +298,7 @@ QSGContext2D::State QSGContext2DCommandBuffer::replay(QPainter* p, QSGContext2D:
             p->setBrush(state.fillStyle);
             break;
         }
-        case QSGContext2D::StrokeStyle:
+        case QQuickContext2D::StrokeStyle:
         {
             state.strokeStyle = takeStrokeStyle();
             state.strokePatternRepeatX = takeBool();
@@ -307,38 +307,38 @@ QSGContext2D::State QSGContext2DCommandBuffer::replay(QPainter* p, QSGContext2D:
             p->setPen(pen);
             break;
         }
-        case QSGContext2D::LineWidth:
+        case QQuickContext2D::LineWidth:
         {
             state.lineWidth = takeLineWidth();
             pen.setWidth(state.lineWidth);
             p->setPen(pen);
             break;
         }
-        case QSGContext2D::LineCap:
+        case QQuickContext2D::LineCap:
         {
             state.lineCap = takeLineCap();
             pen.setCapStyle(state.lineCap);
             p->setPen(pen);
             break;
         }
-        case QSGContext2D::LineJoin:
+        case QQuickContext2D::LineJoin:
         {
             state.lineJoin = takeLineJoin();
             pen.setJoinStyle(state.lineJoin);
             p->setPen(pen);
             break;
         }
-        case QSGContext2D::MiterLimit:
+        case QQuickContext2D::MiterLimit:
         {
             state.miterLimit = takeMiterLimit();
             pen.setMiterLimit(state.miterLimit);
             p->setPen(pen);
             break;
         }
-        case QSGContext2D::TextAlign:
-        case QSGContext2D::TextBaseline:
+        case QQuickContext2D::TextAlign:
+        case QQuickContext2D::TextBaseline:
             break;
-        case QSGContext2D::Fill:
+        case QQuickContext2D::Fill:
         {
             QPainterPath path = takePath();
             path.closeSubpath();
@@ -348,7 +348,7 @@ QSGContext2D::State QSGContext2DCommandBuffer::replay(QPainter* p, QSGContext2D:
                 p->fillPath(path, p->brush());
             break;
         }
-        case QSGContext2D::Stroke:
+        case QQuickContext2D::Stroke:
         {
             if (HAS_SHADOW(state.shadowOffsetX, state.shadowOffsetY, state.shadowBlur, state.shadowColor))
                 strokeShadowPath(p,takePath(), state.shadowOffsetX, state.shadowOffsetY, state.shadowBlur, state.shadowColor);
@@ -356,26 +356,26 @@ QSGContext2D::State QSGContext2DCommandBuffer::replay(QPainter* p, QSGContext2D:
                 p->strokePath(takePath(), p->pen());
             break;
         }
-        case QSGContext2D::Clip:
+        case QQuickContext2D::Clip:
         {
             state.clipPath = takePath();
             p->setClipping(true);
             p->setClipPath(state.clipPath);
             break;
         }
-        case QSGContext2D::GlobalAlpha:
+        case QQuickContext2D::GlobalAlpha:
         {
             state.globalAlpha = takeGlobalAlpha();
             p->setOpacity(state.globalAlpha);
             break;
         }
-        case QSGContext2D::GlobalCompositeOperation:
+        case QQuickContext2D::GlobalCompositeOperation:
         {
             state.globalCompositeOperation = takeGlobalCompositeOperation();
             p->setCompositionMode(state.globalCompositeOperation);
             break;
         }
-        case QSGContext2D::DrawImage:
+        case QQuickContext2D::DrawImage:
         {
             qreal sx = takeReal();
             qreal sy = takeReal();
@@ -407,7 +407,7 @@ QSGContext2D::State QSGContext2DCommandBuffer::replay(QPainter* p, QSGContext2D:
             }
             break;
         }
-        case QSGContext2D::GetImageData:
+        case QQuickContext2D::GetImageData:
         {
             //TODO:
             break;
@@ -421,7 +421,7 @@ QSGContext2D::State QSGContext2DCommandBuffer::replay(QPainter* p, QSGContext2D:
     return state;
 }
 
-QSGContext2DCommandBuffer::QSGContext2DCommandBuffer()
+QQuickContext2DCommandBuffer::QQuickContext2DCommandBuffer()
     : cmdIdx(0)
     , intIdx(0)
     , boolIdx(0)
@@ -435,11 +435,11 @@ QSGContext2DCommandBuffer::QSGContext2DCommandBuffer()
 }
 
 
-QSGContext2DCommandBuffer::~QSGContext2DCommandBuffer()
+QQuickContext2DCommandBuffer::~QQuickContext2DCommandBuffer()
 {
 }
 
-void QSGContext2DCommandBuffer::clear()
+void QQuickContext2DCommandBuffer::clear()
 {
     commands.clear();
     ints.clear();
@@ -453,7 +453,7 @@ void QSGContext2DCommandBuffer::clear()
     reset();
 }
 
-void QSGContext2DCommandBuffer::reset()
+void QQuickContext2DCommandBuffer::reset()
 {
     cmdIdx = 0;
     intIdx = 0;
diff --git a/src/declarative/items/context2d/qsgcontext2dcommandbuffer_p.h b/src/declarative/items/context2d/qquickcontext2dcommandbuffer_p.h
index cab82e2f67..46964d3411 100644
--- a/src/declarative/items/context2d/qsgcontext2dcommandbuffer_p.h
+++ b/src/declarative/items/context2d/qquickcontext2dcommandbuffer_p.h
@@ -39,10 +39,10 @@
 **
 ****************************************************************************/
 
-#ifndef QSGCONTEXT2DCOMMANDBUFFER_P_H
-#define QSGCONTEXT2DCOMMANDBUFFER_P_H
+#ifndef QQUICKCONTEXT2DCOMMANDBUFFER_P_H
+#define QQUICKCONTEXT2DCOMMANDBUFFER_P_H
 
-#include "qsgcontext2d_p.h"
+#include "qquickcontext2d_p.h"
 #include <private/qdeclarativepixmapcache_p.h>
 
 
@@ -52,20 +52,20 @@ QT_BEGIN_NAMESPACE
 
 QT_MODULE(Declarative)
 
-class QSGCanvasItem;
+class QQuickCanvasItem;
 class QMutex;
 
-class QSGContext2DCommandBuffer
+class QQuickContext2DCommandBuffer
 {
 public:
-    QSGContext2DCommandBuffer();
-    ~QSGContext2DCommandBuffer();
+    QQuickContext2DCommandBuffer();
+    ~QQuickContext2DCommandBuffer();
     void reset();
     void clear();
     inline int size() {return commands.size();}
     inline bool isEmpty() const {return commands.isEmpty(); }
     inline bool hasNext() const {return cmdIdx < commands.size(); }
-    inline QSGContext2D::PaintCommand takeNextCommand() { return commands[cmdIdx++]; }
+    inline QQuickContext2D::PaintCommand takeNextCommand() { return commands[cmdIdx++]; }
 
     inline qreal takeGlobalAlpha() { return takeReal(); }
     inline QPainter::CompositionMode takeGlobalCompositeOperation(){ return static_cast<QPainter::CompositionMode>(takeInt()); }
@@ -79,26 +79,26 @@ public:
 
     inline void setGlobalAlpha( qreal alpha)
     {
-        commands << QSGContext2D::GlobalAlpha;
+        commands << QQuickContext2D::GlobalAlpha;
         reals << alpha;
     }
 
     inline void setGlobalCompositeOperation(QPainter::CompositionMode cm)
     {
-        commands << QSGContext2D::GlobalCompositeOperation;
+        commands << QQuickContext2D::GlobalCompositeOperation;
         ints << cm;
     }
 
     inline void setStrokeStyle(const QBrush &style, bool repeatX = false, bool repeatY = false)
     {
-        commands << QSGContext2D::StrokeStyle;
+        commands << QQuickContext2D::StrokeStyle;
         brushes << style;
         bools << repeatX << repeatY;
     }
 
     inline void drawImage(const QImage& image, qreal sx, qreal sy, qreal sw, qreal sh, qreal dx, qreal dy, qreal dw, qreal dh)
     {
-        commands << QSGContext2D::DrawImage;
+        commands << QQuickContext2D::DrawImage;
         images << image;
         reals << sx << sy << sw << sh << dx << dy << dw << dh;
     }
@@ -111,19 +111,19 @@ public:
 
     inline void updateMatrix(const QTransform& matrix)
     {
-        commands << QSGContext2D::UpdateMatrix;
+        commands << QQuickContext2D::UpdateMatrix;
         matrixes << matrix;
     }
 
     inline void clearRect(qreal x, qreal y, qreal w, qreal h)
     {
-        commands << QSGContext2D::ClearRect;
+        commands << QQuickContext2D::ClearRect;
         reals << x << y << w << h;
     }
 
     inline void fillRect(qreal x, qreal y, qreal w, qreal h)
     {
-        commands << QSGContext2D::FillRect;
+        commands << QQuickContext2D::FillRect;
         reals << x << y << w << h;
     }
 
@@ -132,27 +132,27 @@ public:
         QPainterPath p;
         p.addRect(x, y, w, h);
 
-        commands << QSGContext2D::Stroke;
+        commands << QQuickContext2D::Stroke;
         pathes << p;
     }
 
 
     inline void fill(const QPainterPath& path)
     {
-        commands << QSGContext2D::Fill;
+        commands << QQuickContext2D::Fill;
         pathes << path;
 
     }
 
     inline void stroke(const QPainterPath& path)
     {
-        commands << QSGContext2D::Stroke;
+        commands << QQuickContext2D::Stroke;
         pathes << path;
     }
 
     inline void clip(const QPainterPath& path)
     {
-        commands << QSGContext2D::Clip;
+        commands << QQuickContext2D::Clip;
         pathes << path;
     }
 
@@ -160,7 +160,7 @@ public:
 
     inline void setFillStyle(const QBrush &style, bool repeatX = false, bool repeatY = false)
     {
-        commands << QSGContext2D::FillStyle;
+        commands << QQuickContext2D::FillStyle;
         brushes << style;
         bools << repeatX << repeatY;
     }
@@ -168,49 +168,49 @@ public:
 
     inline void setLineWidth( qreal w)
     {
-        commands << QSGContext2D::LineWidth;
+        commands << QQuickContext2D::LineWidth;
         reals << w;
     }
 
     inline void setLineCap(Qt::PenCapStyle  cap)
     {
-        commands << QSGContext2D::LineCap;
+        commands << QQuickContext2D::LineCap;
         ints << cap;
     }
 
     inline void setLineJoin(Qt::PenJoinStyle join)
     {
-        commands << QSGContext2D::LineJoin;
+        commands << QQuickContext2D::LineJoin;
         ints << join;
     }
 
     inline void setMiterLimit( qreal limit)
     {
-        commands << QSGContext2D::MiterLimit;
+        commands << QQuickContext2D::MiterLimit;
         reals << limit;
     }
 
     inline void setShadowOffsetX( qreal x)
     {
-        commands << QSGContext2D::ShadowOffsetX;
+        commands << QQuickContext2D::ShadowOffsetX;
         reals << x;
     }
 
     inline void setShadowOffsetY( qreal y)
     {
-        commands << QSGContext2D::ShadowOffsetY;
+        commands << QQuickContext2D::ShadowOffsetY;
         reals << y;
     }
 
     inline void setShadowBlur( qreal b)
     {
-        commands << QSGContext2D::ShadowBlur;
+        commands << QQuickContext2D::ShadowBlur;
         reals << b;
     }
 
     inline void setShadowColor(const QColor &color)
     {
-        commands << QSGContext2D::ShadowColor;
+        commands << QQuickContext2D::ShadowColor;
         colors << color;
     }
 
@@ -236,10 +236,10 @@ public:
     inline QColor takeColor() { return colors[colorIdx++]; }
     inline QBrush takeBrush() { return brushes[brushIdx++]; }
 
-    QSGContext2D::State replay(QPainter* painter, QSGContext2D::State state);
+    QQuickContext2D::State replay(QPainter* painter, QQuickContext2D::State state);
 private:
-    QPen makePen(QSGContext2D::State state);
-    void setPainterState(QPainter* painter, QSGContext2D::State state, const QPen& pen);
+    QPen makePen(QQuickContext2D::State state);
+    void setPainterState(QPainter* painter, QQuickContext2D::State state, const QPen& pen);
     int cmdIdx;
     int intIdx;
     int boolIdx;
@@ -249,7 +249,7 @@ private:
     int brushIdx;
     int pathIdx;
     int imageIdx;
-    QVector<QSGContext2D::PaintCommand> commands;
+    QVector<QQuickContext2D::PaintCommand> commands;
 
     QVector<int> ints;
     QVector<bool> bools;
@@ -265,4 +265,4 @@ QT_END_HEADER
 
 QT_END_NAMESPACE
 
-#endif // QSGCONTEXT2DCOMMANDBUFFER_P_H
+#endif // QQUICKCONTEXT2DCOMMANDBUFFER_P_H
diff --git a/src/declarative/items/context2d/qsgcontext2dnode.cpp b/src/declarative/items/context2d/qquickcontext2dnode.cpp
index 87de8cf157..76b50d9747 100644
--- a/src/declarative/items/context2d/qsgcontext2dnode.cpp
+++ b/src/declarative/items/context2d/qquickcontext2dnode.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include "qsgcontext2dnode_p.h"
+#include "qquickcontext2dnode_p.h"
 
 #include <private/qsgcontext_p.h>
 #include <QtCore/qmath.h>
@@ -47,7 +47,7 @@
 QT_BEGIN_NAMESPACE
 
 
-QSGContext2DNode::QSGContext2DNode(QSGCanvasItem* item)
+QQuickContext2DNode::QQuickContext2DNode(QQuickCanvasItem* item)
     : QSGGeometryNode()
     , m_item(item)
     , m_geometry(QSGGeometry::defaultAttributes_TexturedPoint2D(), 4)
@@ -62,12 +62,12 @@ QSGContext2DNode::QSGContext2DNode(QSGCanvasItem* item)
     setFlag(UsePreprocess, true);
 }
 
-QSGContext2DNode::~QSGContext2DNode()
+QQuickContext2DNode::~QQuickContext2DNode()
 {
     delete m_texture;
 }
 
-void QSGContext2DNode::setSize(const QSizeF& size)
+void QQuickContext2DNode::setSize(const QSizeF& size)
 {
     if (m_size != size) {
         m_dirtyGeometry = true;
@@ -75,7 +75,7 @@ void QSGContext2DNode::setSize(const QSizeF& size)
     }
 }
 
-void QSGContext2DNode::preprocess()
+void QQuickContext2DNode::preprocess()
 {
     bool doDirty = false;
     QSGDynamicTexture *t = qobject_cast<QSGDynamicTexture *>(m_material.texture());
@@ -87,7 +87,7 @@ void QSGContext2DNode::preprocess()
         markDirty(DirtyMaterial);
     }
 }
-void QSGContext2DNode::setTexture(QSGContext2DTexture* texture)
+void QQuickContext2DNode::setTexture(QQuickContext2DTexture* texture)
 {
     if (texture != m_texture) {
         m_dirtyTexture = true;
@@ -95,7 +95,7 @@ void QSGContext2DNode::setTexture(QSGContext2DTexture* texture)
     }
 }
 
-void QSGContext2DNode::update()
+void QQuickContext2DNode::update()
 {
     if (m_dirtyGeometry)
         updateGeometry();
@@ -106,14 +106,14 @@ void QSGContext2DNode::update()
     m_dirtyTexture = false;
 }
 
-void QSGContext2DNode::updateTexture()
+void QQuickContext2DNode::updateTexture()
 {
     m_material.setTexture(m_texture);
     m_materialO.setTexture(m_texture);
     markDirty(DirtyMaterial);
 }
 
-void QSGContext2DNode::updateGeometry()
+void QQuickContext2DNode::updateGeometry()
 {
     QRectF source = m_texture->textureSubRect();
     QSGGeometry::updateTexturedRectGeometry(&m_geometry,
diff --git a/src/declarative/items/context2d/qsgcontext2dnode_p.h b/src/declarative/items/context2d/qquickcontext2dnode_p.h
index 88c3619095..7403acaf07 100644
--- a/src/declarative/items/context2d/qsgcontext2dnode_p.h
+++ b/src/declarative/items/context2d/qquickcontext2dnode_p.h
@@ -39,15 +39,15 @@
 **
 ****************************************************************************/
 
-#ifndef QSGCONTEXT2DNODE_P_H
-#define QSGCONTEXT2DNODE_P_H
+#ifndef QQUICKCONTEXT2DNODE_P_H
+#define QQUICKCONTEXT2DNODE_P_H
 
 #include <qsgnode.h>
 #include <qsgtexturematerial.h>
 
-#include "qsgcanvasitem_p.h"
-#include "qsgcontext2dtexture_p.h"
-#include "qsgcontext2d_p.h"
+#include "qquickcanvasitem_p.h"
+#include "qquickcontext2dtexture_p.h"
+#include "qquickcontext2d_p.h"
 
 QT_BEGIN_HEADER
 
@@ -55,12 +55,12 @@ QT_BEGIN_NAMESPACE
 
 QT_MODULE(Declarative)
 
-class QSGContext2DNode : public QSGGeometryNode
+class QQuickContext2DNode : public QSGGeometryNode
 {
 public:
-    QSGContext2DNode(QSGCanvasItem* item);
-    virtual ~QSGContext2DNode();
-    void setTexture(QSGContext2DTexture* texture);
+    QQuickContext2DNode(QQuickCanvasItem* item);
+    virtual ~QQuickContext2DNode();
+    void setTexture(QQuickContext2DTexture* texture);
     void update();
     void preprocess();
     void setSize(const QSizeF& size);
@@ -68,11 +68,11 @@ private:
     void updateTexture();
     void updateGeometry();
 
-    QSGCanvasItem* m_item;
+    QQuickCanvasItem* m_item;
     QSGOpaqueTextureMaterial m_material;
     QSGTextureMaterial m_materialO;
     QSGGeometry m_geometry;
-    QSGContext2DTexture* m_texture;
+    QQuickContext2DTexture* m_texture;
     QSizeF m_size;
 
     bool m_dirtyGeometry;
@@ -83,4 +83,4 @@ QT_END_HEADER
 
 QT_END_NAMESPACE
 
-#endif // QSGCONTEXT2DNODE_P_H
+#endif // QQUICKCONTEXT2DNODE_P_H
diff --git a/src/declarative/items/context2d/qsgcontext2dtexture.cpp b/src/declarative/items/context2d/qquickcontext2dtexture.cpp
index 721f847978..9518f91d45 100644
--- a/src/declarative/items/context2d/qsgcontext2dtexture.cpp
+++ b/src/declarative/items/context2d/qquickcontext2dtexture.cpp
@@ -39,12 +39,12 @@
 **
 ****************************************************************************/
 
-#include "qsgcontext2dtexture_p.h"
-#include "qsgcontext2dtile_p.h"
-#include "qsgcanvasitem_p.h"
-#include <private/qsgitem_p.h>
+#include "qquickcontext2dtexture_p.h"
+#include "qquickcontext2dtile_p.h"
+#include "qquickcanvasitem_p.h"
+#include <private/qquickitem_p.h>
 #include <private/qsgtexture_p.h>
-#include "qsgcontext2dcommandbuffer_p.h"
+#include "qquickcontext2dcommandbuffer_p.h"
 #include <QOpenGLPaintDevice>
 
 #include <QOpenGLFramebufferObject>
@@ -69,7 +69,7 @@ static inline int qt_next_power_of_two(int v)
 Q_GLOBAL_STATIC(QThread, globalCanvasThreadRenderInstance)
 
 
-QSGContext2DTexture::QSGContext2DTexture()
+QQuickContext2DTexture::QQuickContext2DTexture()
     : QSGDynamicTexture()
     , m_context(0)
     , m_canvasSize(QSize(1, 1))
@@ -85,17 +85,17 @@ QSGContext2DTexture::QSGContext2DTexture()
 {
 }
 
-QSGContext2DTexture::~QSGContext2DTexture()
+QQuickContext2DTexture::~QQuickContext2DTexture()
 {
    clearTiles();
 }
 
-QSize QSGContext2DTexture::textureSize() const
+QSize QQuickContext2DTexture::textureSize() const
 {
     return m_canvasWindow.size();
 }
 
-void QSGContext2DTexture::markDirtyTexture()
+void QQuickContext2DTexture::markDirtyTexture()
 {
     lock();
     m_dirtyTexture = true;
@@ -103,7 +103,7 @@ void QSGContext2DTexture::markDirtyTexture()
     emit textureChanged();
 }
 
-bool QSGContext2DTexture::setCanvasSize(const QSize &size)
+bool QQuickContext2DTexture::setCanvasSize(const QSize &size)
 {
     if (m_canvasSize != size) {
         m_canvasSize = size;
@@ -113,7 +113,7 @@ bool QSGContext2DTexture::setCanvasSize(const QSize &size)
     return false;
 }
 
-bool QSGContext2DTexture::setTileSize(const QSize &size)
+bool QQuickContext2DTexture::setTileSize(const QSize &size)
 {
     if (m_tileSize != size) {
         m_tileSize = size;
@@ -123,12 +123,12 @@ bool QSGContext2DTexture::setTileSize(const QSize &size)
     return false;
 }
 
-void QSGContext2DTexture::setSmooth(bool smooth)
+void QQuickContext2DTexture::setSmooth(bool smooth)
 {
     m_smooth = smooth;
 }
 
-void QSGContext2DTexture::setItem(QSGCanvasItem* item)
+void QQuickContext2DTexture::setItem(QQuickCanvasItem* item)
 {
     if (!item) {
         lock();
@@ -146,7 +146,7 @@ void QSGContext2DTexture::setItem(QSGCanvasItem* item)
     }
 }
 
-bool QSGContext2DTexture::setCanvasWindow(const QRect& r)
+bool QQuickContext2DTexture::setCanvasWindow(const QRect& r)
 {
     if (m_canvasWindow != r) {
         m_canvasWindow = r;
@@ -155,11 +155,11 @@ bool QSGContext2DTexture::setCanvasWindow(const QRect& r)
     return false;
 }
 
-bool QSGContext2DTexture::setDirtyRect(const QRect &r)
+bool QQuickContext2DTexture::setDirtyRect(const QRect &r)
 {
     bool doDirty = false;
     if (m_tiledCanvas) {
-        foreach (QSGContext2DTile* t, m_tiles) {
+        foreach (QQuickContext2DTile* t, m_tiles) {
             bool dirty = t->rect().intersected(r).isValid();
             t->markDirty(dirty);
             if (dirty)
@@ -171,7 +171,7 @@ bool QSGContext2DTexture::setDirtyRect(const QRect &r)
     return doDirty;
 }
 
-void QSGContext2DTexture::canvasChanged(const QSize& canvasSize, const QSize& tileSize, const QRect& canvasWindow, const QRect& dirtyRect, bool smooth)
+void QQuickContext2DTexture::canvasChanged(const QSize& canvasSize, const QSize& tileSize, const QRect& canvasWindow, const QRect& dirtyRect, bool smooth)
 {
     lock();
 
@@ -209,9 +209,9 @@ void QSGContext2DTexture::canvasChanged(const QSize& canvasSize, const QSize& ti
     unlock();
 }
 
-void QSGContext2DTexture::paintWithoutTiles()
+void QQuickContext2DTexture::paintWithoutTiles()
 {
-    QSGContext2DCommandBuffer* ccb = m_context->buffer();
+    QQuickContext2DCommandBuffer* ccb = m_context->buffer();
 
     if (ccb->isEmpty() && m_threadRendering && !m_doGrabImage) {
         lock();
@@ -246,7 +246,7 @@ void QSGContext2DTexture::paintWithoutTiles()
     endPainting();
 }
 
-bool QSGContext2DTexture::canvasDestroyed()
+bool QQuickContext2DTexture::canvasDestroyed()
 {
     bool noCanvas = false;
     lock();
@@ -255,7 +255,7 @@ bool QSGContext2DTexture::canvasDestroyed()
     return noCanvas;
 }
 
-void QSGContext2DTexture::paint()
+void QQuickContext2DTexture::paint()
 {
     if (canvasDestroyed())
         return;
@@ -263,8 +263,8 @@ void QSGContext2DTexture::paint()
     if (!m_tiledCanvas) {
         paintWithoutTiles();
     } else {
-        QSGContext2D::State oldState = m_state;
-        QSGContext2DCommandBuffer* ccb = m_context->buffer();
+        QQuickContext2D::State oldState = m_state;
+        QQuickContext2DCommandBuffer* ccb = m_context->buffer();
 
         lock();
         QRect tiledRegion = createTiles(m_canvasWindow.intersected(QRect(QPoint(0, 0), m_canvasSize)));
@@ -275,7 +275,7 @@ void QSGContext2DTexture::paint()
                 QRect dirtyRect;
 
                 lock();
-                foreach (QSGContext2DTile* tile, m_tiles) {
+                foreach (QQuickContext2DTile* tile, m_tiles) {
                     if (tile->dirty()) {
                         if (dirtyRect.isEmpty())
                             dirtyRect = tile->rect();
@@ -295,7 +295,7 @@ void QSGContext2DTexture::paint()
             }
 
             if (beginPainting()) {
-                foreach (QSGContext2DTile* tile, m_tiles) {
+                foreach (QQuickContext2DTile* tile, m_tiles) {
                     bool dirtyTile = false, dirtyCanvas = false, smooth = false;
 
                     lock();
@@ -328,7 +328,7 @@ void QSGContext2DTexture::paint()
     }
 }
 
-QRect QSGContext2DTexture::tiledRect(const QRectF& window, const QSize& tileSize)
+QRect QQuickContext2DTexture::tiledRect(const QRectF& window, const QSize& tileSize)
 {
     if (window.isEmpty())
         return QRect();
@@ -344,9 +344,9 @@ QRect QSGContext2DTexture::tiledRect(const QRectF& window, const QSize& tileSize
     return QRect(h1 * tw, v1 * th, htiles * tw, vtiles * th);
 }
 
-QRect QSGContext2DTexture::createTiles(const QRect& window)
+QRect QQuickContext2DTexture::createTiles(const QRect& window)
 {
-    QList<QSGContext2DTile*> oldTiles = m_tiles;
+    QList<QQuickContext2DTile*> oldTiles = m_tiles;
     m_tiles.clear();
 
     if (window.isEmpty()) {
@@ -370,7 +370,7 @@ QRect QSGContext2DTexture::createTiles(const QRect& window)
             int ht = xx + h1;
             int vt = yy + v1;
 
-            QSGContext2DTile* tile = 0;
+            QQuickContext2DTile* tile = 0;
 
             QPoint pos(ht * tw, vt * th);
             QRect rect(pos, m_tileSize);
@@ -396,14 +396,14 @@ QRect QSGContext2DTexture::createTiles(const QRect& window)
     return r;
 }
 
-void QSGContext2DTexture::clearTiles()
+void QQuickContext2DTexture::clearTiles()
 {
     qDeleteAll(m_tiles);
     m_tiles.clear();
 }
 
-QSGContext2DFBOTexture::QSGContext2DFBOTexture()
-    : QSGContext2DTexture()
+QQuickContext2DFBOTexture::QQuickContext2DFBOTexture()
+    : QQuickContext2DTexture()
     , m_fbo(0)
     , m_multisampledFbo(0)
     , m_paint_device(0)
@@ -411,14 +411,14 @@ QSGContext2DFBOTexture::QSGContext2DFBOTexture()
     m_threadRendering = false;
 }
 
-QSGContext2DFBOTexture::~QSGContext2DFBOTexture()
+QQuickContext2DFBOTexture::~QQuickContext2DFBOTexture()
 {
     delete m_fbo;
     delete m_multisampledFbo;
     delete m_paint_device;
 }
 
-bool QSGContext2DFBOTexture::setCanvasSize(const QSize &size)
+bool QQuickContext2DFBOTexture::setCanvasSize(const QSize &size)
 {
     QSize s = QSize(qMax(QT_MINIMUM_FBO_SIZE, qt_next_power_of_two(size.width()))
                   , qMax(QT_MINIMUM_FBO_SIZE, qt_next_power_of_two(size.height())));
@@ -431,7 +431,7 @@ bool QSGContext2DFBOTexture::setCanvasSize(const QSize &size)
     return false;
 }
 
-bool QSGContext2DFBOTexture::setTileSize(const QSize &size)
+bool QQuickContext2DFBOTexture::setTileSize(const QSize &size)
 {
     QSize s = QSize(qMax(QT_MINIMUM_FBO_SIZE, qt_next_power_of_two(size.width()))
                   , qMax(QT_MINIMUM_FBO_SIZE, qt_next_power_of_two(size.height())));
@@ -443,7 +443,7 @@ bool QSGContext2DFBOTexture::setTileSize(const QSize &size)
     return false;
 }
 
-bool QSGContext2DFBOTexture::setCanvasWindow(const QRect& canvasWindow)
+bool QQuickContext2DFBOTexture::setCanvasWindow(const QRect& canvasWindow)
 {
     QSize s = QSize(qMax(QT_MINIMUM_FBO_SIZE, qt_next_power_of_two(canvasWindow.size().width()))
                   , qMax(QT_MINIMUM_FBO_SIZE, qt_next_power_of_two(canvasWindow.size().height())));
@@ -461,13 +461,13 @@ bool QSGContext2DFBOTexture::setCanvasWindow(const QRect& canvasWindow)
     return doChanged;
 }
 
-void QSGContext2DFBOTexture::bind()
+void QQuickContext2DFBOTexture::bind()
 {
     glBindTexture(GL_TEXTURE_2D, textureId());
     updateBindOptions();
 }
 
-QRectF QSGContext2DFBOTexture::textureSubRect() const
+QRectF QQuickContext2DFBOTexture::textureSubRect() const
 {
     return QRectF(0
                 , 0
@@ -476,13 +476,13 @@ QRectF QSGContext2DFBOTexture::textureSubRect() const
 }
 
 
-int QSGContext2DFBOTexture::textureId() const
+int QQuickContext2DFBOTexture::textureId() const
 {
     return m_fbo? m_fbo->texture() : 0;
 }
 
 
-bool QSGContext2DFBOTexture::updateTexture()
+bool QQuickContext2DFBOTexture::updateTexture()
 {
     if (!m_context->buffer()->isEmpty()) {
         paint();
@@ -500,19 +500,19 @@ bool QSGContext2DFBOTexture::updateTexture()
     return textureUpdated;
 }
 
-QSGContext2DTile* QSGContext2DFBOTexture::createTile() const
+QQuickContext2DTile* QQuickContext2DFBOTexture::createTile() const
 {
-    return new QSGContext2DFBOTile();
+    return new QQuickContext2DFBOTile();
 }
 
-void QSGContext2DFBOTexture::grabImage()
+void QQuickContext2DFBOTexture::grabImage()
 {
     if (m_fbo) {
         m_grabedImage = m_fbo->toImage();
     }
 }
 
-bool QSGContext2DFBOTexture::doMultisampling() const
+bool QQuickContext2DFBOTexture::doMultisampling() const
 {
     static bool extensionsChecked = false;
     static bool multisamplingSupported = false;
@@ -527,7 +527,7 @@ bool QSGContext2DFBOTexture::doMultisampling() const
     return multisamplingSupported  && m_smooth;
 }
 
-QImage QSGContext2DFBOTexture::toImage(const QRectF& region)
+QImage QQuickContext2DFBOTexture::toImage(const QRectF& region)
 {
 #define QML_CONTEXT2D_WAIT_MAX 5000
 
@@ -550,9 +550,9 @@ QImage QSGContext2DFBOTexture::toImage(const QRectF& region)
     return grabbed;
 }
 
-void QSGContext2DFBOTexture::compositeTile(QSGContext2DTile* tile)
+void QQuickContext2DFBOTexture::compositeTile(QQuickContext2DTile* tile)
 {
-    QSGContext2DFBOTile* t = static_cast<QSGContext2DFBOTile*>(tile);
+    QQuickContext2DFBOTile* t = static_cast<QQuickContext2DFBOTile*>(tile);
     QRect target = t->rect().intersect(m_canvasWindow);
     if (target.isValid()) {
         QRect source = target;
@@ -563,13 +563,13 @@ void QSGContext2DFBOTexture::compositeTile(QSGContext2DTile* tile)
         QOpenGLFramebufferObject::blitFramebuffer(m_fbo, target, t->fbo(), source);
     }
 }
-QSGCanvasItem::RenderTarget QSGContext2DFBOTexture::renderTarget() const
+QQuickCanvasItem::RenderTarget QQuickContext2DFBOTexture::renderTarget() const
 {
-    return QSGCanvasItem::FramebufferObject;
+    return QQuickCanvasItem::FramebufferObject;
 }
-QPaintDevice* QSGContext2DFBOTexture::beginPainting()
+QPaintDevice* QQuickContext2DFBOTexture::beginPainting()
 {
-    QSGContext2DTexture::beginPainting();
+    QQuickContext2DTexture::beginPainting();
 
     if (m_canvasWindow.size().isEmpty() && !m_threadRendering) {
         delete m_fbo;
@@ -615,9 +615,9 @@ QPaintDevice* QSGContext2DFBOTexture::beginPainting()
     return m_paint_device;
 }
 
-void QSGContext2DFBOTexture::endPainting()
+void QQuickContext2DFBOTexture::endPainting()
 {
-    QSGContext2DTexture::endPainting();
+    QQuickContext2DTexture::endPainting();
     if (m_multisampledFbo) {
         QOpenGLFramebufferObject::blitFramebuffer(m_fbo, m_multisampledFbo);
         m_multisampledFbo->release();
@@ -634,8 +634,8 @@ void qt_quit_context2d_render_thread()
     }
 }
 
-QSGContext2DImageTexture::QSGContext2DImageTexture(bool threadRendering)
-    : QSGContext2DTexture()
+QQuickContext2DImageTexture::QQuickContext2DImageTexture(bool threadRendering)
+    : QQuickContext2DTexture()
     , m_texture(new QSGPlainTexture())
 {
     m_texture->setOwnsTexture(true);
@@ -654,55 +654,55 @@ QSGContext2DImageTexture::QSGContext2DImageTexture(bool threadRendering)
     }
 }
 
-QSGContext2DImageTexture::~QSGContext2DImageTexture()
+QQuickContext2DImageTexture::~QQuickContext2DImageTexture()
 {
     delete m_texture;
 }
 
-int QSGContext2DImageTexture::textureId() const
+int QQuickContext2DImageTexture::textureId() const
 {
     return m_texture->textureId();
 }
 
-void QSGContext2DImageTexture::lock()
+void QQuickContext2DImageTexture::lock()
 {
     if (m_threadRendering)
         m_mutex.lock();
 }
-void QSGContext2DImageTexture::unlock()
+void QQuickContext2DImageTexture::unlock()
 {
     if (m_threadRendering)
         m_mutex.unlock();
 }
 
-void QSGContext2DImageTexture::wait()
+void QQuickContext2DImageTexture::wait()
 {
     if (m_threadRendering)
         m_waitCondition.wait(&m_mutex);
 }
 
-void QSGContext2DImageTexture::wake()
+void QQuickContext2DImageTexture::wake()
 {
     if (m_threadRendering)
         m_waitCondition.wakeOne();
 }
 
-bool QSGContext2DImageTexture::supportDirectRendering() const
+bool QQuickContext2DImageTexture::supportDirectRendering() const
 {
     return !m_threadRendering;
 }
 
-QSGCanvasItem::RenderTarget QSGContext2DImageTexture::renderTarget() const
+QQuickCanvasItem::RenderTarget QQuickContext2DImageTexture::renderTarget() const
 {
-    return QSGCanvasItem::Image;
+    return QQuickCanvasItem::Image;
 }
 
-void QSGContext2DImageTexture::bind()
+void QQuickContext2DImageTexture::bind()
 {
     m_texture->bind();
 }
 
-bool QSGContext2DImageTexture::updateTexture()
+bool QQuickContext2DImageTexture::updateTexture()
 {
     lock();
     bool textureUpdated = m_dirtyTexture;
@@ -714,12 +714,12 @@ bool QSGContext2DImageTexture::updateTexture()
     return textureUpdated;
 }
 
-QSGContext2DTile* QSGContext2DImageTexture::createTile() const
+QQuickContext2DTile* QQuickContext2DImageTexture::createTile() const
 {
-    return new QSGContext2DImageTile();
+    return new QQuickContext2DImageTile();
 }
 
-void QSGContext2DImageTexture::grabImage(const QRect& r)
+void QQuickContext2DImageTexture::grabImage(const QRect& r)
 {
     m_doGrabImage = true;
     paint();
@@ -727,7 +727,7 @@ void QSGContext2DImageTexture::grabImage(const QRect& r)
     m_grabedImage = m_image.copy(r);
 }
 
-QImage QSGContext2DImageTexture::toImage(const QRectF& region)
+QImage QQuickContext2DImageTexture::toImage(const QRectF& region)
 {
     QRect r = region.isValid() ? region.toRect() : QRect(QPoint(0, 0), m_canvasWindow.size());
     if (threadRendering()) {
@@ -741,9 +741,9 @@ QImage QSGContext2DImageTexture::toImage(const QRectF& region)
     return image;
 }
 
-QPaintDevice* QSGContext2DImageTexture::beginPainting()
+QPaintDevice* QQuickContext2DImageTexture::beginPainting()
 {
-     QSGContext2DTexture::beginPainting();
+     QQuickContext2DTexture::beginPainting();
 
     if (m_canvasWindow.size().isEmpty())
         return 0;
@@ -757,10 +757,10 @@ QPaintDevice* QSGContext2DImageTexture::beginPainting()
     return &m_image;
 }
 
-void QSGContext2DImageTexture::compositeTile(QSGContext2DTile* tile)
+void QQuickContext2DImageTexture::compositeTile(QQuickContext2DTile* tile)
 {
     Q_ASSERT(!tile->dirty());
-    QSGContext2DImageTile* t = static_cast<QSGContext2DImageTile*>(tile);
+    QQuickContext2DImageTile* t = static_cast<QQuickContext2DImageTile*>(tile);
     QRect target = t->rect().intersect(m_canvasWindow);
     if (target.isValid()) {
         QRect source = target;
diff --git a/src/declarative/items/context2d/qsgcontext2dtexture_p.h b/src/declarative/items/context2d/qquickcontext2dtexture_p.h
index dbc383d7fc..ed45a09f7c 100644
--- a/src/declarative/items/context2d/qsgcontext2dtexture_p.h
+++ b/src/declarative/items/context2d/qquickcontext2dtexture_p.h
@@ -39,12 +39,12 @@
 **
 ****************************************************************************/
 
-#ifndef QSGCONTEXT2DTEXTURE_P_H
-#define QSGCONTEXT2DTEXTURE_P_H
+#ifndef QQUICKCONTEXT2DTEXTURE_P_H
+#define QQUICKCONTEXT2DTEXTURE_P_H
 
 #include <qsgtexture.h>
-#include "qsgcanvasitem_p.h"
-#include "qsgcontext2d_p.h"
+#include "qquickcanvasitem_p.h"
+#include "qquickcontext2d_p.h"
 
 #include <QOpenGLContext>
 #include <QOpenGLFramebufferObject>
@@ -59,15 +59,15 @@ QT_BEGIN_NAMESPACE
 
 QT_MODULE(Declarative)
 
-class QSGContext2DTile;
-class QSGContext2DCommandBuffer;
+class QQuickContext2DTile;
+class QQuickContext2DCommandBuffer;
 
-class QSGContext2DTexture : public QSGDynamicTexture
+class QQuickContext2DTexture : public QSGDynamicTexture
 {
     Q_OBJECT
 public:
-    QSGContext2DTexture();
-    ~QSGContext2DTexture();
+    QQuickContext2DTexture();
+    ~QQuickContext2DTexture();
 
     virtual bool hasAlphaChannel() const {return true;}
     virtual bool hasMipmaps() const {return false;}
@@ -79,7 +79,7 @@ public:
     bool threadRendering() const {return m_threadRendering;}
     virtual bool supportThreadRendering() const = 0;
     virtual bool supportDirectRendering() const = 0;
-    virtual QSGCanvasItem::RenderTarget renderTarget() const = 0;
+    virtual QQuickCanvasItem::RenderTarget renderTarget() const = 0;
     virtual QImage toImage(const QRectF& region = QRectF()) = 0;
     static QRect tiledRect(const QRectF& window, const QSize& tileSize);
 
@@ -95,25 +95,25 @@ Q_SIGNALS:
 
 public Q_SLOTS:
     void markDirtyTexture();
-    void setItem(QSGCanvasItem* item);
+    void setItem(QQuickCanvasItem* item);
     void paint();
 
 protected:
     void paintWithoutTiles();
     virtual QPaintDevice* beginPainting() {m_painting = true; return 0; }
     virtual void endPainting() {m_painting = false;}
-    virtual QSGContext2DTile* createTile() const = 0;
-    virtual void compositeTile(QSGContext2DTile* tile) = 0;
+    virtual QQuickContext2DTile* createTile() const = 0;
+    virtual void compositeTile(QQuickContext2DTile* tile) = 0;
 
     void clearTiles();
     QRect createTiles(const QRect& window);
 
-    QList<QSGContext2DTile*> m_tiles;
-    QSGContext2D* m_context;
+    QList<QQuickContext2DTile*> m_tiles;
+    QQuickContext2D* m_context;
 
-    QSGContext2D::State m_state;
+    QQuickContext2D::State m_state;
 
-    QSGCanvasItem* m_item;
+    QQuickCanvasItem* m_item;
     QSize m_canvasSize;
     QSize m_tileSize;
     QRect m_canvasWindow;
@@ -127,24 +127,24 @@ protected:
     uint m_painting : 1;
 };
 
-class QSGContext2DFBOTexture : public QSGContext2DTexture
+class QQuickContext2DFBOTexture : public QQuickContext2DTexture
 {
     Q_OBJECT
 
 public:
-    QSGContext2DFBOTexture();
-    ~QSGContext2DFBOTexture();
+    QQuickContext2DFBOTexture();
+    ~QQuickContext2DFBOTexture();
     virtual int textureId() const;
     virtual bool updateTexture();
-    virtual QSGContext2DTile* createTile() const;
+    virtual QQuickContext2DTile* createTile() const;
     virtual QImage toImage(const QRectF& region = QRectF());
     virtual QPaintDevice* beginPainting();
     virtual void endPainting();
     QRectF textureSubRect() const;
     virtual bool supportThreadRendering() const {return false;}
     virtual bool supportDirectRendering() const {return false;}
-    virtual QSGCanvasItem::RenderTarget renderTarget() const;
-    virtual void compositeTile(QSGContext2DTile* tile);
+    virtual QQuickCanvasItem::RenderTarget renderTarget() const;
+    virtual void compositeTile(QQuickContext2DTile* tile);
     virtual void bind();
     virtual bool setCanvasSize(const QSize &size);
     virtual bool setTileSize(const QSize &size);
@@ -164,28 +164,28 @@ private:
 };
 
 class QSGPlainTexture;
-class QSGContext2DImageTexture : public QSGContext2DTexture
+class QQuickContext2DImageTexture : public QQuickContext2DTexture
 {
     Q_OBJECT
 
 public:
-    QSGContext2DImageTexture(bool threadRendering = true);
-    ~QSGContext2DImageTexture();
+    QQuickContext2DImageTexture(bool threadRendering = true);
+    ~QQuickContext2DImageTexture();
     virtual int textureId() const;
     virtual void bind();
     virtual bool supportThreadRendering() const {return true;}
     virtual bool supportDirectRendering() const;
-    virtual QSGCanvasItem::RenderTarget renderTarget() const;
+    virtual QQuickCanvasItem::RenderTarget renderTarget() const;
     virtual void lock();
     virtual void unlock();
     virtual void wait();
     virtual void wake();
 
     virtual bool updateTexture();
-    virtual QSGContext2DTile* createTile() const;
+    virtual QQuickContext2DTile* createTile() const;
     virtual QImage toImage(const QRectF& region = QRectF());
     virtual QPaintDevice* beginPainting();
-    virtual void compositeTile(QSGContext2DTile* tile);
+    virtual void compositeTile(QQuickContext2DTile* tile);
 
 private Q_SLOTS:
     void grabImage(const QRect& r);
@@ -202,4 +202,4 @@ QT_END_HEADER
 
 QT_END_NAMESPACE
 
-#endif // QSGCONTEXT2DTEXTURE_P_H
+#endif // QQUICKCONTEXT2DTEXTURE_P_H
diff --git a/src/declarative/items/context2d/qsgcontext2dtile.cpp b/src/declarative/items/context2d/qquickcontext2dtile.cpp
index 8c8ef836b0..6217c66094 100644
--- a/src/declarative/items/context2d/qsgcontext2dtile.cpp
+++ b/src/declarative/items/context2d/qquickcontext2dtile.cpp
@@ -39,26 +39,26 @@
 **
 ****************************************************************************/
 
-#include "qsgcontext2dtile_p.h"
+#include "qquickcontext2dtile_p.h"
 
 #include <QOpenGLFramebufferObject>
 #include <QOpenGLFramebufferObjectFormat>
 #include <QOpenGLPaintDevice>
 
-QSGContext2DTile::QSGContext2DTile()
+QQuickContext2DTile::QQuickContext2DTile()
     : m_dirty(true)
     , m_rect(QRect(0, 0, 1, 1))
     , m_device(0)
 {
 }
 
-QSGContext2DTile::~QSGContext2DTile()
+QQuickContext2DTile::~QQuickContext2DTile()
 {
     if (m_painter.isActive())
         m_painter.end();
 }
 
-QPainter* QSGContext2DTile::createPainter(bool smooth)
+QPainter* QQuickContext2DTile::createPainter(bool smooth)
 {
     if (m_painter.isActive())
         m_painter.end();
@@ -69,7 +69,7 @@ QPainter* QSGContext2DTile::createPainter(bool smooth)
         m_painter.resetTransform();
         m_painter.setCompositionMode(QPainter::CompositionMode_Source);
 
-#ifdef QSGCONTEXT2D_DEBUG
+#ifdef QQUICKCONTEXT2D_DEBUG
         int v = 100;
         int gray = (m_rect.x() / m_rect.width() + m_rect.y() / m_rect.height()) % 2;
         if (gray)
@@ -93,19 +93,19 @@ QPainter* QSGContext2DTile::createPainter(bool smooth)
     return 0;
 }
 
-QSGContext2DFBOTile::QSGContext2DFBOTile()
-    : QSGContext2DTile()
+QQuickContext2DFBOTile::QQuickContext2DFBOTile()
+    : QQuickContext2DTile()
     , m_fbo(0)
 {
 }
 
 
-QSGContext2DFBOTile::~QSGContext2DFBOTile()
+QQuickContext2DFBOTile::~QQuickContext2DFBOTile()
 {
     delete m_fbo;
 }
 
-void QSGContext2DFBOTile::aboutToDraw()
+void QQuickContext2DFBOTile::aboutToDraw()
 {
     m_fbo->bind();
     if (!m_device) {
@@ -117,12 +117,12 @@ void QSGContext2DFBOTile::aboutToDraw()
     }
 }
 
-void QSGContext2DFBOTile::drawFinished()
+void QQuickContext2DFBOTile::drawFinished()
 {
     m_fbo->release();
 }
 
-void QSGContext2DFBOTile::setRect(const QRect& r)
+void QQuickContext2DFBOTile::setRect(const QRect& r)
 {
     if (m_rect == r)
         return;
@@ -143,16 +143,16 @@ void QSGContext2DFBOTile::setRect(const QRect& r)
 }
 
 
-QSGContext2DImageTile::QSGContext2DImageTile()
-    : QSGContext2DTile()
+QQuickContext2DImageTile::QQuickContext2DImageTile()
+    : QQuickContext2DTile()
 {
 }
 
-QSGContext2DImageTile::~QSGContext2DImageTile()
+QQuickContext2DImageTile::~QQuickContext2DImageTile()
 {
 }
 
-void QSGContext2DImageTile::setRect(const QRect& r)
+void QQuickContext2DImageTile::setRect(const QRect& r)
 {
     if (m_rect == r)
         return;
@@ -162,4 +162,4 @@ void QSGContext2DImageTile::setRect(const QRect& r)
         m_image = QImage(r.size(), QImage::Format_ARGB32_Premultiplied);
     }
     m_device = &m_image;
-}
\ No newline at end of file
+}
diff --git a/src/declarative/items/context2d/qsgcontext2dtile_p.h b/src/declarative/items/context2d/qquickcontext2dtile_p.h
index 57b68ef67d..92c59efbcf 100644
--- a/src/declarative/items/context2d/qsgcontext2dtile_p.h
+++ b/src/declarative/items/context2d/qquickcontext2dtile_p.h
@@ -39,10 +39,10 @@
 **
 ****************************************************************************/
 
-#ifndef QSGCONTEXT2DTILE_P_H
-#define QSGCONTEXT2DTILE_P_H
+#ifndef QQUICKCONTEXT2DTILE_P_H
+#define QQUICKCONTEXT2DTILE_P_H
 
-#include "qsgcontext2d_p.h"
+#include "qquickcontext2d_p.h"
 #include <QOpenGLFramebufferObject>
 
 QT_BEGIN_HEADER
@@ -51,14 +51,14 @@ QT_BEGIN_NAMESPACE
 
 QT_MODULE(Declarative)
 
-class QSGContext2DTexture;
-class QSGContext2DCommandBuffer;
+class QQuickContext2DTexture;
+class QQuickContext2DCommandBuffer;
 
-class QSGContext2DTile
+class QQuickContext2DTile
 {
 public:
-    QSGContext2DTile();
-    ~QSGContext2DTile();
+    QQuickContext2DTile();
+    ~QQuickContext2DTile();
 
     bool dirty() const {return m_dirty;}
     void markDirty(bool dirty) {m_dirty = dirty;}
@@ -78,11 +78,11 @@ protected:
 };
 
 
-class QSGContext2DFBOTile : public QSGContext2DTile
+class QQuickContext2DFBOTile : public QQuickContext2DTile
 {
 public:
-    QSGContext2DFBOTile();
-    ~QSGContext2DFBOTile();
+    QQuickContext2DFBOTile();
+    ~QQuickContext2DFBOTile();
     virtual void setRect(const QRect& r);
     QOpenGLFramebufferObject* fbo() const {return m_fbo;}
     void drawFinished();
@@ -95,11 +95,11 @@ private:
     QOpenGLFramebufferObject *m_fbo;
 };
 
-class QSGContext2DImageTile : public QSGContext2DTile
+class QQuickContext2DImageTile : public QQuickContext2DTile
 {
 public:
-    QSGContext2DImageTile();
-    ~QSGContext2DImageTile();
+    QQuickContext2DImageTile();
+    ~QQuickContext2DImageTile();
     void setRect(const QRect& r);
     const QImage& image() const {return m_image;}
 private:
@@ -109,4 +109,4 @@ QT_END_HEADER
 
 QT_END_NAMESPACE
 
-#endif // QSGCONTEXT2DTILE_P_H
+#endif // QQUICKCONTEXT2DTILE_P_H
diff --git a/src/declarative/items/items.pri b/src/declarative/items/items.pri
index 025f67ab90..c3d6a2ab73 100644
--- a/src/declarative/items/items.pri
+++ b/src/declarative/items/items.pri
@@ -1,127 +1,127 @@
 HEADERS += \
-    $$PWD/qsgevents_p_p.h \
-    $$PWD/qsgitemchangelistener_p.h \
-    $$PWD/qsganchors_p.h \
-    $$PWD/qsganchors_p_p.h \
-    $$PWD/qsgitem.h \
-    $$PWD/qsgitem_p.h \
-    $$PWD/qsgrectangle_p.h \
-    $$PWD/qsgrectangle_p_p.h \
-    $$PWD/qsgcanvas.h \
-    $$PWD/qsgcanvas_p.h \
-    $$PWD/qsgfocusscope_p.h \
-    $$PWD/qsgitemsmodule_p.h \
-    $$PWD/qsgpainteditem.h \
-    $$PWD/qsgpainteditem_p.h \
-    $$PWD/qsgtext_p.h \
-    $$PWD/qsgtext_p_p.h \
-    $$PWD/qsgtextnode_p.h \
-    $$PWD/qsgtextinput_p.h \
-    $$PWD/qsgtextinput_p_p.h \
-    $$PWD/qsgtextedit_p.h \
-    $$PWD/qsgtextedit_p_p.h \
-    $$PWD/qsgimagebase_p.h \
-    $$PWD/qsgimagebase_p_p.h \
-    $$PWD/qsgimage_p.h \
-    $$PWD/qsgimage_p_p.h \
-    $$PWD/qsgborderimage_p.h \
-    $$PWD/qsgborderimage_p_p.h \
-    $$PWD/qsgninepatchnode_p.h \
-    $$PWD/qsgscalegrid_p_p.h \
-    $$PWD/qsgmousearea_p.h \
-    $$PWD/qsgmousearea_p_p.h \
-    $$PWD/qsgpincharea_p.h \
-    $$PWD/qsgpincharea_p_p.h \
-    $$PWD/qsgflickable_p.h \
-    $$PWD/qsgflickable_p_p.h \
-    $$PWD/qsglistview_p.h \
-    $$PWD/qsgvisualadaptormodel_p.h \
-    $$PWD/qsgvisualdatamodel_p.h \
-    $$PWD/qsgvisualitemmodel_p.h \
-    $$PWD/qsgrepeater_p.h \
-    $$PWD/qsgrepeater_p_p.h \
-    $$PWD/qsggridview_p.h \
-    $$PWD/qsgpathview_p.h \
-    $$PWD/qsgpathview_p_p.h \
-    $$PWD/qsgpositioners_p.h \
-    $$PWD/qsgpositioners_p_p.h \
-    $$PWD/qsgloader_p.h \
-    $$PWD/qsgloader_p_p.h \
-    $$PWD/qsganimatedimage_p.h \
-    $$PWD/qsganimatedimage_p_p.h \
-    $$PWD/qsgflipable_p.h \
-    $$PWD/qsgtranslate_p.h \
-    $$PWD/qsgclipnode_p.h \
-    $$PWD/qsgview.h \
-    $$PWD/qsgview_p.h \
-    $$PWD/qsganimation_p.h \
-    $$PWD/qsganimation_p_p.h \
-    $$PWD/qsgstateoperations_p.h \
-    $$PWD/qsgimplicitsizeitem_p.h \
-    $$PWD/qsgimplicitsizeitem_p_p.h \
-    $$PWD/qsgspriteengine_p.h \
-    $$PWD/qsgsprite_p.h \
-    $$PWD/qsgspriteimage_p.h \
-    $$PWD/qsgdrag_p.h \
-    $$PWD/qsgdroparea_p.h \
-    $$PWD/qsgitemview_p.h \
-    $$PWD/qsgitemview_p_p.h
+    $$PWD/qquickevents_p_p.h \
+    $$PWD/qquickitemchangelistener_p.h \
+    $$PWD/qquickanchors_p.h \
+    $$PWD/qquickanchors_p_p.h \
+    $$PWD/qquickitem.h \
+    $$PWD/qquickitem_p.h \
+    $$PWD/qquickrectangle_p.h \
+    $$PWD/qquickrectangle_p_p.h \
+    $$PWD/qquickcanvas.h \
+    $$PWD/qquickcanvas_p.h \
+    $$PWD/qquickfocusscope_p.h \
+    $$PWD/qquickitemsmodule_p.h \
+    $$PWD/qquickpainteditem.h \
+    $$PWD/qquickpainteditem_p.h \
+    $$PWD/qquicktext_p.h \
+    $$PWD/qquicktext_p_p.h \
+    $$PWD/qquicktextnode_p.h \
+    $$PWD/qquicktextinput_p.h \
+    $$PWD/qquicktextinput_p_p.h \
+    $$PWD/qquicktextedit_p.h \
+    $$PWD/qquicktextedit_p_p.h \
+    $$PWD/qquickimagebase_p.h \
+    $$PWD/qquickimagebase_p_p.h \
+    $$PWD/qquickimage_p.h \
+    $$PWD/qquickimage_p_p.h \
+    $$PWD/qquickborderimage_p.h \
+    $$PWD/qquickborderimage_p_p.h \
+    $$PWD/qquickninepatchnode_p.h \
+    $$PWD/qquickscalegrid_p_p.h \
+    $$PWD/qquickmousearea_p.h \
+    $$PWD/qquickmousearea_p_p.h \
+    $$PWD/qquickpincharea_p.h \
+    $$PWD/qquickpincharea_p_p.h \
+    $$PWD/qquickflickable_p.h \
+    $$PWD/qquickflickable_p_p.h \
+    $$PWD/qquicklistview_p.h \
+    $$PWD/qquickvisualadaptormodel_p.h \
+    $$PWD/qquickvisualdatamodel_p.h \
+    $$PWD/qquickvisualitemmodel_p.h \
+    $$PWD/qquickrepeater_p.h \
+    $$PWD/qquickrepeater_p_p.h \
+    $$PWD/qquickgridview_p.h \
+    $$PWD/qquickpathview_p.h \
+    $$PWD/qquickpathview_p_p.h \
+    $$PWD/qquickpositioners_p.h \
+    $$PWD/qquickpositioners_p_p.h \
+    $$PWD/qquickloader_p.h \
+    $$PWD/qquickloader_p_p.h \
+    $$PWD/qquickanimatedimage_p.h \
+    $$PWD/qquickanimatedimage_p_p.h \
+    $$PWD/qquickflipable_p.h \
+    $$PWD/qquicktranslate_p.h \
+    $$PWD/qquickclipnode_p.h \
+    $$PWD/qquickview.h \
+    $$PWD/qquickview_p.h \
+    $$PWD/qquickanimation_p.h \
+    $$PWD/qquickanimation_p_p.h \
+    $$PWD/qquickstateoperations_p.h \
+    $$PWD/qquickimplicitsizeitem_p.h \
+    $$PWD/qquickimplicitsizeitem_p_p.h \
+    $$PWD/qquickspriteengine_p.h \
+    $$PWD/qquicksprite_p.h \
+    $$PWD/qquickspriteimage_p.h \
+    $$PWD/qquickdrag_p.h \
+    $$PWD/qquickdroparea_p.h \
+    $$PWD/qquickitemview_p.h \
+    $$PWD/qquickitemview_p_p.h
 
 SOURCES += \
-    $$PWD/qsgevents.cpp \
-    $$PWD/qsganchors.cpp \
-    $$PWD/qsgitem.cpp \
-    $$PWD/qsgrectangle.cpp \
-    $$PWD/qsgcanvas.cpp \
-    $$PWD/qsgfocusscope.cpp \
-    $$PWD/qsgitemsmodule.cpp \
-    $$PWD/qsgpainteditem.cpp \
-    $$PWD/qsgtext.cpp \
-    $$PWD/qsgtextnode.cpp \
-    $$PWD/qsgtextinput.cpp \
-    $$PWD/qsgtextedit.cpp \
-    $$PWD/qsgimagebase.cpp \
-    $$PWD/qsgimage.cpp \
-    $$PWD/qsgborderimage.cpp \
-    $$PWD/qsgninepatchnode.cpp \
-    $$PWD/qsgscalegrid.cpp \
-    $$PWD/qsgmousearea.cpp \
-    $$PWD/qsgpincharea.cpp \
-    $$PWD/qsgflickable.cpp \
-    $$PWD/qsglistview.cpp \
-    $$PWD/qsgvisualadaptormodel.cpp \
-    $$PWD/qsgvisualdatamodel.cpp \
-    $$PWD/qsgvisualitemmodel.cpp \
-    $$PWD/qsgrepeater.cpp \
-    $$PWD/qsggridview.cpp \
-    $$PWD/qsgpathview.cpp \
-    $$PWD/qsgpositioners.cpp \
-    $$PWD/qsgloader.cpp \
-    $$PWD/qsganimatedimage.cpp \
-    $$PWD/qsgflipable.cpp \
-    $$PWD/qsgtranslate.cpp \
-    $$PWD/qsgclipnode.cpp \
-    $$PWD/qsgview.cpp \
-    $$PWD/qsganimation.cpp \
-    $$PWD/qsgstateoperations.cpp \
-    $$PWD/qsgimplicitsizeitem.cpp \
-    $$PWD/qsgspriteengine.cpp \
-    $$PWD/qsgsprite.cpp \
-    $$PWD/qsgspriteimage.cpp \
-    $$PWD/qsgdrag.cpp \
-    $$PWD/qsgdroparea.cpp \
-    $$PWD/qsgitemview.cpp
+    $$PWD/qquickevents.cpp \
+    $$PWD/qquickanchors.cpp \
+    $$PWD/qquickitem.cpp \
+    $$PWD/qquickrectangle.cpp \
+    $$PWD/qquickcanvas.cpp \
+    $$PWD/qquickfocusscope.cpp \
+    $$PWD/qquickitemsmodule.cpp \
+    $$PWD/qquickpainteditem.cpp \
+    $$PWD/qquicktext.cpp \
+    $$PWD/qquicktextnode.cpp \
+    $$PWD/qquicktextinput.cpp \
+    $$PWD/qquicktextedit.cpp \
+    $$PWD/qquickimagebase.cpp \
+    $$PWD/qquickimage.cpp \
+    $$PWD/qquickborderimage.cpp \
+    $$PWD/qquickninepatchnode.cpp \
+    $$PWD/qquickscalegrid.cpp \
+    $$PWD/qquickmousearea.cpp \
+    $$PWD/qquickpincharea.cpp \
+    $$PWD/qquickflickable.cpp \
+    $$PWD/qquicklistview.cpp \
+    $$PWD/qquickvisualadaptormodel.cpp \
+    $$PWD/qquickvisualdatamodel.cpp \
+    $$PWD/qquickvisualitemmodel.cpp \
+    $$PWD/qquickrepeater.cpp \
+    $$PWD/qquickgridview.cpp \
+    $$PWD/qquickpathview.cpp \
+    $$PWD/qquickpositioners.cpp \
+    $$PWD/qquickloader.cpp \
+    $$PWD/qquickanimatedimage.cpp \
+    $$PWD/qquickflipable.cpp \
+    $$PWD/qquicktranslate.cpp \
+    $$PWD/qquickclipnode.cpp \
+    $$PWD/qquickview.cpp \
+    $$PWD/qquickanimation.cpp \
+    $$PWD/qquickstateoperations.cpp \
+    $$PWD/qquickimplicitsizeitem.cpp \
+    $$PWD/qquickspriteengine.cpp \
+    $$PWD/qquicksprite.cpp \
+    $$PWD/qquickspriteimage.cpp \
+    $$PWD/qquickdrag.cpp \
+    $$PWD/qquickdroparea.cpp \
+    $$PWD/qquickitemview.cpp
 
 SOURCES += \
-    $$PWD/qsgshadereffect.cpp \
-    $$PWD/qsgshadereffectmesh.cpp \
-    $$PWD/qsgshadereffectnode.cpp \
-    $$PWD/qsgshadereffectsource.cpp \
+    $$PWD/qquickshadereffect.cpp \
+    $$PWD/qquickshadereffectmesh.cpp \
+    $$PWD/qquickshadereffectnode.cpp \
+    $$PWD/qquickshadereffectsource.cpp \
 
 HEADERS += \
-    $$PWD/qsgshadereffect_p.h \
-    $$PWD/qsgshadereffectmesh_p.h \
-    $$PWD/qsgshadereffectnode_p.h \
-    $$PWD/qsgshadereffectsource_p.h \
+    $$PWD/qquickshadereffect_p.h \
+    $$PWD/qquickshadereffectmesh_p.h \
+    $$PWD/qquickshadereffectnode_p.h \
+    $$PWD/qquickshadereffectsource_p.h \
 
 include(context2d/context2d.pri)
diff --git a/src/declarative/items/qsganchors.cpp b/src/declarative/items/qquickanchors.cpp
index 67ca0317c4..678347cc73 100644
--- a/src/declarative/items/qsganchors.cpp
+++ b/src/declarative/items/qquickanchors.cpp
@@ -39,10 +39,10 @@
 **
 ****************************************************************************/
 
-#include "qsganchors_p_p.h"
+#include "qquickanchors_p_p.h"
 
-#include "qsgitem.h"
-#include "qsgitem_p.h"
+#include "qquickitem.h"
+#include "qquickitem_p.h"
 
 #include <qdeclarativeinfo.h>
 
@@ -51,7 +51,7 @@ QT_BEGIN_NAMESPACE
 //TODO: should we cache relationships, so we don't have to check each time (parent-child or sibling)?
 //TODO: support non-parent, non-sibling (need to find lowest common ancestor)
 
-static qreal hcenter(QSGItem *item)
+static qreal hcenter(QQuickItem *item)
 {
     qreal width = item->width();
     int iw = width;
@@ -61,7 +61,7 @@ static qreal hcenter(QSGItem *item)
         return width / 2;
 }
 
-static qreal vcenter(QSGItem *item)
+static qreal vcenter(QQuickItem *item)
 {
     qreal height = item->height();
     int ih = height;
@@ -73,29 +73,29 @@ static qreal vcenter(QSGItem *item)
 
 //### const item?
 //local position
-static qreal position(QSGItem *item, QSGAnchorLine::AnchorLine anchorLine)
+static qreal position(QQuickItem *item, QQuickAnchorLine::AnchorLine anchorLine)
 {
     qreal ret = 0.0;
     switch (anchorLine) {
-    case QSGAnchorLine::Left:
+    case QQuickAnchorLine::Left:
         ret = item->x();
         break;
-    case QSGAnchorLine::Right:
+    case QQuickAnchorLine::Right:
         ret = item->x() + item->width();
         break;
-    case QSGAnchorLine::Top:
+    case QQuickAnchorLine::Top:
         ret = item->y();
         break;
-    case QSGAnchorLine::Bottom:
+    case QQuickAnchorLine::Bottom:
         ret = item->y() + item->height();
         break;
-    case QSGAnchorLine::HCenter:
+    case QQuickAnchorLine::HCenter:
         ret = item->x() + hcenter(item);
         break;
-    case QSGAnchorLine::VCenter:
+    case QQuickAnchorLine::VCenter:
         ret = item->y() + vcenter(item);
         break;
-    case QSGAnchorLine::Baseline:
+    case QQuickAnchorLine::Baseline:
         ret = item->y() + item->baselineOffset();
         break;
     default:
@@ -106,29 +106,29 @@ static qreal position(QSGItem *item, QSGAnchorLine::AnchorLine anchorLine)
 }
 
 //position when origin is 0,0
-static qreal adjustedPosition(QSGItem *item, QSGAnchorLine::AnchorLine anchorLine)
+static qreal adjustedPosition(QQuickItem *item, QQuickAnchorLine::AnchorLine anchorLine)
 {
     qreal ret = 0.0;
     switch (anchorLine) {
-    case QSGAnchorLine::Left:
+    case QQuickAnchorLine::Left:
         ret = 0.0;
         break;
-    case QSGAnchorLine::Right:
+    case QQuickAnchorLine::Right:
         ret = item->width();
         break;
-    case QSGAnchorLine::Top:
+    case QQuickAnchorLine::Top:
         ret = 0.0;
         break;
-    case QSGAnchorLine::Bottom:
+    case QQuickAnchorLine::Bottom:
         ret = item->height();
         break;
-    case QSGAnchorLine::HCenter:
+    case QQuickAnchorLine::HCenter:
         ret = hcenter(item);
         break;
-    case QSGAnchorLine::VCenter:
+    case QQuickAnchorLine::VCenter:
         ret = vcenter(item);
         break;
-    case QSGAnchorLine::Baseline:
+    case QQuickAnchorLine::Baseline:
         ret = item->baselineOffset();
         break;
     default:
@@ -138,14 +138,14 @@ static qreal adjustedPosition(QSGItem *item, QSGAnchorLine::AnchorLine anchorLin
     return ret;
 }
 
-QSGAnchors::QSGAnchors(QSGItem *item, QObject *parent)
-: QObject(*new QSGAnchorsPrivate(item), parent)
+QQuickAnchors::QQuickAnchors(QQuickItem *item, QObject *parent)
+: QObject(*new QQuickAnchorsPrivate(item), parent)
 {
 }
 
-QSGAnchors::~QSGAnchors()
+QQuickAnchors::~QQuickAnchors()
 {
-    Q_D(QSGAnchors);
+    Q_D(QQuickAnchors);
     d->remDepend(d->fill);
     d->remDepend(d->centerIn);
     d->remDepend(d->left.item);
@@ -157,9 +157,9 @@ QSGAnchors::~QSGAnchors()
     d->remDepend(d->baseline.item);
 }
 
-void QSGAnchorsPrivate::fillChanged()
+void QQuickAnchorsPrivate::fillChanged()
 {
-    Q_Q(QSGAnchors);
+    Q_Q(QQuickAnchors);
     if (!fill || !isItemComplete())
         return;
 
@@ -178,14 +178,14 @@ void QSGAnchorsPrivate::fillChanged()
         --updatingFill;
     } else {
         // ### Make this certain :)
-        qmlInfo(item) << QSGAnchors::tr("Possible anchor loop detected on fill.");
+        qmlInfo(item) << QQuickAnchors::tr("Possible anchor loop detected on fill.");
     }
 
 }
 
-void QSGAnchorsPrivate::centerInChanged()
+void QQuickAnchorsPrivate::centerInChanged()
 {
-    Q_Q(QSGAnchors);
+    Q_Q(QQuickAnchors);
     if (!centerIn || fill || !isItemComplete())
         return;
 
@@ -207,11 +207,11 @@ void QSGAnchorsPrivate::centerInChanged()
         --updatingCenterIn;
     } else {
         // ### Make this certain :)
-        qmlInfo(item) << QSGAnchors::tr("Possible anchor loop detected on centerIn.");
+        qmlInfo(item) << QQuickAnchors::tr("Possible anchor loop detected on centerIn.");
     }
 }
 
-void QSGAnchorsPrivate::clearItem(QSGItem *item)
+void QQuickAnchorsPrivate::clearItem(QQuickItem *item)
 {
     if (!item)
         return;
@@ -221,118 +221,118 @@ void QSGAnchorsPrivate::clearItem(QSGItem *item)
         centerIn = 0;
     if (left.item == item) {
         left.item = 0;
-        usedAnchors &= ~QSGAnchors::LeftAnchor;
+        usedAnchors &= ~QQuickAnchors::LeftAnchor;
     }
     if (right.item == item) {
         right.item = 0;
-        usedAnchors &= ~QSGAnchors::RightAnchor;
+        usedAnchors &= ~QQuickAnchors::RightAnchor;
     }
     if (top.item == item) {
         top.item = 0;
-        usedAnchors &= ~QSGAnchors::TopAnchor;
+        usedAnchors &= ~QQuickAnchors::TopAnchor;
     }
     if (bottom.item == item) {
         bottom.item = 0;
-        usedAnchors &= ~QSGAnchors::BottomAnchor;
+        usedAnchors &= ~QQuickAnchors::BottomAnchor;
     }
     if (vCenter.item == item) {
         vCenter.item = 0;
-        usedAnchors &= ~QSGAnchors::VCenterAnchor;
+        usedAnchors &= ~QQuickAnchors::VCenterAnchor;
     }
     if (hCenter.item == item) {
         hCenter.item = 0;
-        usedAnchors &= ~QSGAnchors::HCenterAnchor;
+        usedAnchors &= ~QQuickAnchors::HCenterAnchor;
     }
     if (baseline.item == item) {
         baseline.item = 0;
-        usedAnchors &= ~QSGAnchors::BaselineAnchor;
+        usedAnchors &= ~QQuickAnchors::BaselineAnchor;
     }
 }
 
-void QSGAnchorsPrivate::addDepend(QSGItem *item)
+void QQuickAnchorsPrivate::addDepend(QQuickItem *item)
 {
     if (!item)
         return;
 
-    QSGItemPrivate *p = QSGItemPrivate::get(item);
-    p->addItemChangeListener(this, QSGItemPrivate::Geometry);
+    QQuickItemPrivate *p = QQuickItemPrivate::get(item);
+    p->addItemChangeListener(this, QQuickItemPrivate::Geometry);
 }
 
-void QSGAnchorsPrivate::remDepend(QSGItem *item)
+void QQuickAnchorsPrivate::remDepend(QQuickItem *item)
 {
     if (!item)
         return;
 
-    QSGItemPrivate *p = QSGItemPrivate::get(item);
-    p->removeItemChangeListener(this, QSGItemPrivate::Geometry);
+    QQuickItemPrivate *p = QQuickItemPrivate::get(item);
+    p->removeItemChangeListener(this, QQuickItemPrivate::Geometry);
 }
 
-bool QSGAnchors::mirrored()
+bool QQuickAnchors::mirrored()
 {
-    Q_D(QSGAnchors);
-    return QSGItemPrivate::get(d->item)->effectiveLayoutMirror;
+    Q_D(QQuickAnchors);
+    return QQuickItemPrivate::get(d->item)->effectiveLayoutMirror;
 }
 
-bool QSGAnchorsPrivate::isItemComplete() const
+bool QQuickAnchorsPrivate::isItemComplete() const
 {
     return componentComplete;
 }
 
-void QSGAnchors::classBegin()
+void QQuickAnchors::classBegin()
 {
-    Q_D(QSGAnchors);
+    Q_D(QQuickAnchors);
     d->componentComplete = false;
 }
 
-void QSGAnchors::componentComplete()
+void QQuickAnchors::componentComplete()
 {
-    Q_D(QSGAnchors);
+    Q_D(QQuickAnchors);
     d->componentComplete = true;
 }
 
-void QSGAnchorsPrivate::setItemHeight(qreal v)
+void QQuickAnchorsPrivate::setItemHeight(qreal v)
 {
     updatingMe = true;
     item->setHeight(v);
     updatingMe = false;
 }
 
-void QSGAnchorsPrivate::setItemWidth(qreal v)
+void QQuickAnchorsPrivate::setItemWidth(qreal v)
 {
     updatingMe = true;
     item->setWidth(v);
     updatingMe = false;
 }
 
-void QSGAnchorsPrivate::setItemX(qreal v)
+void QQuickAnchorsPrivate::setItemX(qreal v)
 {
     updatingMe = true;
     item->setX(v);
     updatingMe = false;
 }
 
-void QSGAnchorsPrivate::setItemY(qreal v)
+void QQuickAnchorsPrivate::setItemY(qreal v)
 {
     updatingMe = true;
     item->setY(v);
     updatingMe = false;
 }
 
-void QSGAnchorsPrivate::setItemPos(const QPointF &v)
+void QQuickAnchorsPrivate::setItemPos(const QPointF &v)
 {
     updatingMe = true;
     item->setPos(v);
     updatingMe = false;
 }
 
-void QSGAnchorsPrivate::setItemSize(const QSizeF &v)
+void QQuickAnchorsPrivate::setItemSize(const QSizeF &v)
 {
     updatingMe = true;
     item->setSize(v);
     updatingMe = false;
 }
 
-void QSGAnchorsPrivate::updateMe()
+void QQuickAnchorsPrivate::updateMe()
 {
     if (updatingMe) {
         updatingMe = false;
@@ -345,7 +345,7 @@ void QSGAnchorsPrivate::updateMe()
     updateVerticalAnchors();
 }
 
-void QSGAnchorsPrivate::updateOnComplete()
+void QQuickAnchorsPrivate::updateOnComplete()
 {
     fillChanged();
     centerInChanged();
@@ -353,7 +353,7 @@ void QSGAnchorsPrivate::updateOnComplete()
     updateVerticalAnchors();
 }
 
-void QSGAnchorsPrivate::itemGeometryChanged(QSGItem *, const QRectF &newG, const QRectF &oldG)
+void QQuickAnchorsPrivate::itemGeometryChanged(QQuickItem *, const QRectF &newG, const QRectF &oldG)
 {
     fillChanged();
     centerInChanged();
@@ -363,15 +363,15 @@ void QSGAnchorsPrivate::itemGeometryChanged(QSGItem *, const QRectF &newG, const
         updateVerticalAnchors();
 }
 
-QSGItem *QSGAnchors::fill() const
+QQuickItem *QQuickAnchors::fill() const
 {
-    Q_D(const QSGAnchors);
+    Q_D(const QQuickAnchors);
     return d->fill;
 }
 
-void QSGAnchors::setFill(QSGItem *f)
+void QQuickAnchors::setFill(QQuickItem *f)
 {
-    Q_D(QSGAnchors);
+    Q_D(QQuickAnchors);
     if (d->fill == f)
         return;
 
@@ -392,20 +392,20 @@ void QSGAnchors::setFill(QSGItem *f)
     d->fillChanged();
 }
 
-void QSGAnchors::resetFill()
+void QQuickAnchors::resetFill()
 {
     setFill(0);
 }
 
-QSGItem *QSGAnchors::centerIn() const
+QQuickItem *QQuickAnchors::centerIn() const
 {
-    Q_D(const QSGAnchors);
+    Q_D(const QQuickAnchors);
     return d->centerIn;
 }
 
-void QSGAnchors::setCenterIn(QSGItem* c)
+void QQuickAnchors::setCenterIn(QQuickItem* c)
 {
-    Q_D(QSGAnchors);
+    Q_D(QQuickAnchors);
     if (d->centerIn == c)
         return;
 
@@ -427,16 +427,16 @@ void QSGAnchors::setCenterIn(QSGItem* c)
     d->centerInChanged();
 }
 
-void QSGAnchors::resetCenterIn()
+void QQuickAnchors::resetCenterIn()
 {
     setCenterIn(0);
 }
 
-bool QSGAnchorsPrivate::calcStretch(const QSGAnchorLine &edge1,
-                                    const QSGAnchorLine &edge2,
+bool QQuickAnchorsPrivate::calcStretch(const QQuickAnchorLine &edge1,
+                                    const QQuickAnchorLine &edge2,
                                     qreal offset1,
                                     qreal offset2,
-                                    QSGAnchorLine::AnchorLine line,
+                                    QQuickAnchorLine::AnchorLine line,
                                     qreal &stretch)
 {
     bool edge1IsParent = (edge1.item == item->parentItem());
@@ -461,21 +461,21 @@ bool QSGAnchorsPrivate::calcStretch(const QSGAnchorLine &edge1,
     return invalid;
 }
 
-void QSGAnchorsPrivate::updateVerticalAnchors()
+void QQuickAnchorsPrivate::updateVerticalAnchors()
 {
     if (fill || centerIn || !isItemComplete())
         return;
 
     if (updatingVerticalAnchor < 2) {
         ++updatingVerticalAnchor;
-        if (usedAnchors & QSGAnchors::TopAnchor) {
+        if (usedAnchors & QQuickAnchors::TopAnchor) {
             //Handle stretching
             bool invalid = true;
             qreal height = 0.0;
-            if (usedAnchors & QSGAnchors::BottomAnchor) {
-                invalid = calcStretch(top, bottom, topMargin, -bottomMargin, QSGAnchorLine::Top, height);
-            } else if (usedAnchors & QSGAnchors::VCenterAnchor) {
-                invalid = calcStretch(top, vCenter, topMargin, vCenterOffset, QSGAnchorLine::Top, height);
+            if (usedAnchors & QQuickAnchors::BottomAnchor) {
+                invalid = calcStretch(top, bottom, topMargin, -bottomMargin, QQuickAnchorLine::Top, height);
+            } else if (usedAnchors & QQuickAnchors::VCenterAnchor) {
+                invalid = calcStretch(top, vCenter, topMargin, vCenterOffset, QQuickAnchorLine::Top, height);
                 height *= 2;
             }
             if (!invalid)
@@ -487,12 +487,12 @@ void QSGAnchorsPrivate::updateVerticalAnchors()
             } else if (top.item->parentItem() == item->parentItem()) {
                 setItemY(position(top.item, top.anchorLine) + topMargin);
             }
-        } else if (usedAnchors & QSGAnchors::BottomAnchor) {
+        } else if (usedAnchors & QQuickAnchors::BottomAnchor) {
             //Handle stretching (top + bottom case is handled above)
-            if (usedAnchors & QSGAnchors::VCenterAnchor) {
+            if (usedAnchors & QQuickAnchors::VCenterAnchor) {
                 qreal height = 0.0;
                 bool invalid = calcStretch(vCenter, bottom, vCenterOffset, -bottomMargin,
-                                              QSGAnchorLine::Top, height);
+                                              QQuickAnchorLine::Top, height);
                 if (!invalid)
                     setItemHeight(height*2);
             }
@@ -503,7 +503,7 @@ void QSGAnchorsPrivate::updateVerticalAnchors()
             } else if (bottom.item->parentItem() == item->parentItem()) {
                 setItemY(position(bottom.item, bottom.anchorLine) - item->height() - bottomMargin);
             }
-        } else if (usedAnchors & QSGAnchors::VCenterAnchor) {
+        } else if (usedAnchors & QQuickAnchors::VCenterAnchor) {
             //(stetching handled above)
 
             //Handle vCenter
@@ -513,7 +513,7 @@ void QSGAnchorsPrivate::updateVerticalAnchors()
             } else if (vCenter.item->parentItem() == item->parentItem()) {
                 setItemY(position(vCenter.item, vCenter.anchorLine) - vcenter(item) + vCenterOffset);
             }
-        } else if (usedAnchors & QSGAnchors::BaselineAnchor) {
+        } else if (usedAnchors & QQuickAnchors::BaselineAnchor) {
             //Handle baseline
             if (baseline.item == item->parentItem()) {
                 setItemY(adjustedPosition(baseline.item, baseline.anchorLine) - item->baselineOffset() + baselineOffset);
@@ -524,35 +524,35 @@ void QSGAnchorsPrivate::updateVerticalAnchors()
         --updatingVerticalAnchor;
     } else {
         // ### Make this certain :)
-        qmlInfo(item) << QSGAnchors::tr("Possible anchor loop detected on vertical anchor.");
+        qmlInfo(item) << QQuickAnchors::tr("Possible anchor loop detected on vertical anchor.");
     }
 }
 
-inline QSGAnchorLine::AnchorLine reverseAnchorLine(QSGAnchorLine::AnchorLine anchorLine)
+inline QQuickAnchorLine::AnchorLine reverseAnchorLine(QQuickAnchorLine::AnchorLine anchorLine)
 {
-    if (anchorLine == QSGAnchorLine::Left) {
-        return QSGAnchorLine::Right;
-    } else if (anchorLine == QSGAnchorLine::Right) {
-        return QSGAnchorLine::Left;
+    if (anchorLine == QQuickAnchorLine::Left) {
+        return QQuickAnchorLine::Right;
+    } else if (anchorLine == QQuickAnchorLine::Right) {
+        return QQuickAnchorLine::Left;
     } else {
         return anchorLine;
     }
 }
 
-void QSGAnchorsPrivate::updateHorizontalAnchors()
+void QQuickAnchorsPrivate::updateHorizontalAnchors()
 {
-    Q_Q(QSGAnchors);
+    Q_Q(QQuickAnchors);
     if (fill || centerIn || !isItemComplete())
         return;
 
     if (updatingHorizontalAnchor < 3) {
         ++updatingHorizontalAnchor;
         qreal effectiveRightMargin, effectiveLeftMargin, effectiveHorizontalCenterOffset;
-        QSGAnchorLine effectiveLeft, effectiveRight, effectiveHorizontalCenter;
-        QSGAnchors::Anchor effectiveLeftAnchor, effectiveRightAnchor;
+        QQuickAnchorLine effectiveLeft, effectiveRight, effectiveHorizontalCenter;
+        QQuickAnchors::Anchor effectiveLeftAnchor, effectiveRightAnchor;
         if (q->mirrored()) {
-            effectiveLeftAnchor = QSGAnchors::RightAnchor;
-            effectiveRightAnchor = QSGAnchors::LeftAnchor;
+            effectiveLeftAnchor = QQuickAnchors::RightAnchor;
+            effectiveRightAnchor = QQuickAnchors::LeftAnchor;
             effectiveLeft.item = right.item;
             effectiveLeft.anchorLine = reverseAnchorLine(right.anchorLine);
             effectiveRight.item = left.item;
@@ -563,8 +563,8 @@ void QSGAnchorsPrivate::updateHorizontalAnchors()
             effectiveRightMargin = leftMargin;
             effectiveHorizontalCenterOffset = -hCenterOffset;
         } else {
-            effectiveLeftAnchor = QSGAnchors::LeftAnchor;
-            effectiveRightAnchor = QSGAnchors::RightAnchor;
+            effectiveLeftAnchor = QQuickAnchors::LeftAnchor;
+            effectiveRightAnchor = QQuickAnchors::RightAnchor;
             effectiveLeft = left;
             effectiveRight = right;
             effectiveHorizontalCenter = hCenter;
@@ -578,9 +578,9 @@ void QSGAnchorsPrivate::updateHorizontalAnchors()
             bool invalid = true;
             qreal width = 0.0;
             if (usedAnchors & effectiveRightAnchor) {
-                invalid = calcStretch(effectiveLeft, effectiveRight, effectiveLeftMargin, -effectiveRightMargin, QSGAnchorLine::Left, width);
-            } else if (usedAnchors & QSGAnchors::HCenterAnchor) {
-                invalid = calcStretch(effectiveLeft, effectiveHorizontalCenter, effectiveLeftMargin, effectiveHorizontalCenterOffset, QSGAnchorLine::Left, width);
+                invalid = calcStretch(effectiveLeft, effectiveRight, effectiveLeftMargin, -effectiveRightMargin, QQuickAnchorLine::Left, width);
+            } else if (usedAnchors & QQuickAnchors::HCenterAnchor) {
+                invalid = calcStretch(effectiveLeft, effectiveHorizontalCenter, effectiveLeftMargin, effectiveHorizontalCenterOffset, QQuickAnchorLine::Left, width);
                 width *= 2;
             }
             if (!invalid)
@@ -594,10 +594,10 @@ void QSGAnchorsPrivate::updateHorizontalAnchors()
             }
         } else if (usedAnchors & effectiveRightAnchor) {
             //Handle stretching (left + right case is handled in updateLeftAnchor)
-            if (usedAnchors & QSGAnchors::HCenterAnchor) {
+            if (usedAnchors & QQuickAnchors::HCenterAnchor) {
                 qreal width = 0.0;
                 bool invalid = calcStretch(effectiveHorizontalCenter, effectiveRight, effectiveHorizontalCenterOffset, -effectiveRightMargin,
-                                              QSGAnchorLine::Left, width);
+                                              QQuickAnchorLine::Left, width);
                 if (!invalid)
                     setItemWidth(width*2);
             }
@@ -608,7 +608,7 @@ void QSGAnchorsPrivate::updateHorizontalAnchors()
             } else if (effectiveRight.item->parentItem() == item->parentItem()) {
                 setItemX(position(effectiveRight.item, effectiveRight.anchorLine) - item->width() - effectiveRightMargin);
             }
-        } else if (usedAnchors & QSGAnchors::HCenterAnchor) {
+        } else if (usedAnchors & QQuickAnchors::HCenterAnchor) {
             //Handle hCenter
             if (effectiveHorizontalCenter.item == item->parentItem()) {
                 setItemX(adjustedPosition(effectiveHorizontalCenter.item, effectiveHorizontalCenter.anchorLine) - hcenter(item) + effectiveHorizontalCenterOffset);
@@ -619,19 +619,19 @@ void QSGAnchorsPrivate::updateHorizontalAnchors()
         --updatingHorizontalAnchor;
     } else {
         // ### Make this certain :)
-        qmlInfo(item) << QSGAnchors::tr("Possible anchor loop detected on horizontal anchor.");
+        qmlInfo(item) << QQuickAnchors::tr("Possible anchor loop detected on horizontal anchor.");
     }
 }
 
-QSGAnchorLine QSGAnchors::top() const
+QQuickAnchorLine QQuickAnchors::top() const
 {
-    Q_D(const QSGAnchors);
+    Q_D(const QQuickAnchors);
     return d->top;
 }
 
-void QSGAnchors::setTop(const QSGAnchorLine &edge)
+void QQuickAnchors::setTop(const QQuickAnchorLine &edge)
 {
-    Q_D(QSGAnchors);
+    Q_D(QQuickAnchors);
     if (!d->checkVAnchorValid(edge) || d->top == edge)
         return;
 
@@ -649,25 +649,25 @@ void QSGAnchors::setTop(const QSGAnchorLine &edge)
     d->updateVerticalAnchors();
 }
 
-void QSGAnchors::resetTop()
+void QQuickAnchors::resetTop()
 {
-    Q_D(QSGAnchors);
+    Q_D(QQuickAnchors);
     d->usedAnchors &= ~TopAnchor;
     d->remDepend(d->top.item);
-    d->top = QSGAnchorLine();
+    d->top = QQuickAnchorLine();
     emit topChanged();
     d->updateVerticalAnchors();
 }
 
-QSGAnchorLine QSGAnchors::bottom() const
+QQuickAnchorLine QQuickAnchors::bottom() const
 {
-    Q_D(const QSGAnchors);
+    Q_D(const QQuickAnchors);
     return d->bottom;
 }
 
-void QSGAnchors::setBottom(const QSGAnchorLine &edge)
+void QQuickAnchors::setBottom(const QQuickAnchorLine &edge)
 {
-    Q_D(QSGAnchors);
+    Q_D(QQuickAnchors);
     if (!d->checkVAnchorValid(edge) || d->bottom == edge)
         return;
 
@@ -685,25 +685,25 @@ void QSGAnchors::setBottom(const QSGAnchorLine &edge)
     d->updateVerticalAnchors();
 }
 
-void QSGAnchors::resetBottom()
+void QQuickAnchors::resetBottom()
 {
-    Q_D(QSGAnchors);
+    Q_D(QQuickAnchors);
     d->usedAnchors &= ~BottomAnchor;
     d->remDepend(d->bottom.item);
-    d->bottom = QSGAnchorLine();
+    d->bottom = QQuickAnchorLine();
     emit bottomChanged();
     d->updateVerticalAnchors();
 }
 
-QSGAnchorLine QSGAnchors::verticalCenter() const
+QQuickAnchorLine QQuickAnchors::verticalCenter() const
 {
-    Q_D(const QSGAnchors);
+    Q_D(const QQuickAnchors);
     return d->vCenter;
 }
 
-void QSGAnchors::setVerticalCenter(const QSGAnchorLine &edge)
+void QQuickAnchors::setVerticalCenter(const QQuickAnchorLine &edge)
 {
-    Q_D(QSGAnchors);
+    Q_D(QQuickAnchors);
     if (!d->checkVAnchorValid(edge) || d->vCenter == edge)
         return;
 
@@ -721,25 +721,25 @@ void QSGAnchors::setVerticalCenter(const QSGAnchorLine &edge)
     d->updateVerticalAnchors();
 }
 
-void QSGAnchors::resetVerticalCenter()
+void QQuickAnchors::resetVerticalCenter()
 {
-    Q_D(QSGAnchors);
+    Q_D(QQuickAnchors);
     d->usedAnchors &= ~VCenterAnchor;
     d->remDepend(d->vCenter.item);
-    d->vCenter = QSGAnchorLine();
+    d->vCenter = QQuickAnchorLine();
     emit verticalCenterChanged();
     d->updateVerticalAnchors();
 }
 
-QSGAnchorLine QSGAnchors::baseline() const
+QQuickAnchorLine QQuickAnchors::baseline() const
 {
-    Q_D(const QSGAnchors);
+    Q_D(const QQuickAnchors);
     return d->baseline;
 }
 
-void QSGAnchors::setBaseline(const QSGAnchorLine &edge)
+void QQuickAnchors::setBaseline(const QQuickAnchorLine &edge)
 {
-    Q_D(QSGAnchors);
+    Q_D(QQuickAnchors);
     if (!d->checkVAnchorValid(edge) || d->baseline == edge)
         return;
 
@@ -757,25 +757,25 @@ void QSGAnchors::setBaseline(const QSGAnchorLine &edge)
     d->updateVerticalAnchors();
 }
 
-void QSGAnchors::resetBaseline()
+void QQuickAnchors::resetBaseline()
 {
-    Q_D(QSGAnchors);
+    Q_D(QQuickAnchors);
     d->usedAnchors &= ~BaselineAnchor;
     d->remDepend(d->baseline.item);
-    d->baseline = QSGAnchorLine();
+    d->baseline = QQuickAnchorLine();
     emit baselineChanged();
     d->updateVerticalAnchors();
 }
 
-QSGAnchorLine QSGAnchors::left() const
+QQuickAnchorLine QQuickAnchors::left() const
 {
-    Q_D(const QSGAnchors);
+    Q_D(const QQuickAnchors);
     return d->left;
 }
 
-void QSGAnchors::setLeft(const QSGAnchorLine &edge)
+void QQuickAnchors::setLeft(const QQuickAnchorLine &edge)
 {
-    Q_D(QSGAnchors);
+    Q_D(QQuickAnchors);
     if (!d->checkHAnchorValid(edge) || d->left == edge)
         return;
 
@@ -793,25 +793,25 @@ void QSGAnchors::setLeft(const QSGAnchorLine &edge)
     d->updateHorizontalAnchors();
 }
 
-void QSGAnchors::resetLeft()
+void QQuickAnchors::resetLeft()
 {
-    Q_D(QSGAnchors);
+    Q_D(QQuickAnchors);
     d->usedAnchors &= ~LeftAnchor;
     d->remDepend(d->left.item);
-    d->left = QSGAnchorLine();
+    d->left = QQuickAnchorLine();
     emit leftChanged();
     d->updateHorizontalAnchors();
 }
 
-QSGAnchorLine QSGAnchors::right() const
+QQuickAnchorLine QQuickAnchors::right() const
 {
-    Q_D(const QSGAnchors);
+    Q_D(const QQuickAnchors);
     return d->right;
 }
 
-void QSGAnchors::setRight(const QSGAnchorLine &edge)
+void QQuickAnchors::setRight(const QQuickAnchorLine &edge)
 {
-    Q_D(QSGAnchors);
+    Q_D(QQuickAnchors);
     if (!d->checkHAnchorValid(edge) || d->right == edge)
         return;
 
@@ -829,25 +829,25 @@ void QSGAnchors::setRight(const QSGAnchorLine &edge)
     d->updateHorizontalAnchors();
 }
 
-void QSGAnchors::resetRight()
+void QQuickAnchors::resetRight()
 {
-    Q_D(QSGAnchors);
+    Q_D(QQuickAnchors);
     d->usedAnchors &= ~RightAnchor;
     d->remDepend(d->right.item);
-    d->right = QSGAnchorLine();
+    d->right = QQuickAnchorLine();
     emit rightChanged();
     d->updateHorizontalAnchors();
 }
 
-QSGAnchorLine QSGAnchors::horizontalCenter() const
+QQuickAnchorLine QQuickAnchors::horizontalCenter() const
 {
-    Q_D(const QSGAnchors);
+    Q_D(const QQuickAnchors);
     return d->hCenter;
 }
 
-void QSGAnchors::setHorizontalCenter(const QSGAnchorLine &edge)
+void QQuickAnchors::setHorizontalCenter(const QQuickAnchorLine &edge)
 {
-    Q_D(QSGAnchors);
+    Q_D(QQuickAnchors);
     if (!d->checkHAnchorValid(edge) || d->hCenter == edge)
         return;
 
@@ -865,25 +865,25 @@ void QSGAnchors::setHorizontalCenter(const QSGAnchorLine &edge)
     d->updateHorizontalAnchors();
 }
 
-void QSGAnchors::resetHorizontalCenter()
+void QQuickAnchors::resetHorizontalCenter()
 {
-    Q_D(QSGAnchors);
+    Q_D(QQuickAnchors);
     d->usedAnchors &= ~HCenterAnchor;
     d->remDepend(d->hCenter.item);
-    d->hCenter = QSGAnchorLine();
+    d->hCenter = QQuickAnchorLine();
     emit horizontalCenterChanged();
     d->updateHorizontalAnchors();
 }
 
-qreal QSGAnchors::leftMargin() const
+qreal QQuickAnchors::leftMargin() const
 {
-    Q_D(const QSGAnchors);
+    Q_D(const QQuickAnchors);
     return d->leftMargin;
 }
 
-void QSGAnchors::setLeftMargin(qreal offset)
+void QQuickAnchors::setLeftMargin(qreal offset)
 {
-    Q_D(QSGAnchors);
+    Q_D(QQuickAnchors);
     if (d->leftMargin == offset)
         return;
     d->leftMargin = offset;
@@ -894,15 +894,15 @@ void QSGAnchors::setLeftMargin(qreal offset)
     emit leftMarginChanged();
 }
 
-qreal QSGAnchors::rightMargin() const
+qreal QQuickAnchors::rightMargin() const
 {
-    Q_D(const QSGAnchors);
+    Q_D(const QQuickAnchors);
     return d->rightMargin;
 }
 
-void QSGAnchors::setRightMargin(qreal offset)
+void QQuickAnchors::setRightMargin(qreal offset)
 {
-    Q_D(QSGAnchors);
+    Q_D(QQuickAnchors);
     if (d->rightMargin == offset)
         return;
     d->rightMargin = offset;
@@ -913,15 +913,15 @@ void QSGAnchors::setRightMargin(qreal offset)
     emit rightMarginChanged();
 }
 
-qreal QSGAnchors::margins() const
+qreal QQuickAnchors::margins() const
 {
-    Q_D(const QSGAnchors);
+    Q_D(const QQuickAnchors);
     return d->margins;
 }
 
-void QSGAnchors::setMargins(qreal offset)
+void QQuickAnchors::setMargins(qreal offset)
 {
-    Q_D(QSGAnchors);
+    Q_D(QQuickAnchors);
     if (d->margins == offset)
         return;
     //###Is it significantly faster to set them directly so we can call fillChanged only once?
@@ -938,15 +938,15 @@ void QSGAnchors::setMargins(qreal offset)
 
 }
 
-qreal QSGAnchors::horizontalCenterOffset() const
+qreal QQuickAnchors::horizontalCenterOffset() const
 {
-    Q_D(const QSGAnchors);
+    Q_D(const QQuickAnchors);
     return d->hCenterOffset;
 }
 
-void QSGAnchors::setHorizontalCenterOffset(qreal offset)
+void QQuickAnchors::setHorizontalCenterOffset(qreal offset)
 {
-    Q_D(QSGAnchors);
+    Q_D(QQuickAnchors);
     if (d->hCenterOffset == offset)
         return;
     d->hCenterOffset = offset;
@@ -957,15 +957,15 @@ void QSGAnchors::setHorizontalCenterOffset(qreal offset)
     emit horizontalCenterOffsetChanged();
 }
 
-qreal QSGAnchors::topMargin() const
+qreal QQuickAnchors::topMargin() const
 {
-    Q_D(const QSGAnchors);
+    Q_D(const QQuickAnchors);
     return d->topMargin;
 }
 
-void QSGAnchors::setTopMargin(qreal offset)
+void QQuickAnchors::setTopMargin(qreal offset)
 {
-    Q_D(QSGAnchors);
+    Q_D(QQuickAnchors);
     if (d->topMargin == offset)
         return;
     d->topMargin = offset;
@@ -976,15 +976,15 @@ void QSGAnchors::setTopMargin(qreal offset)
     emit topMarginChanged();
 }
 
-qreal QSGAnchors::bottomMargin() const
+qreal QQuickAnchors::bottomMargin() const
 {
-    Q_D(const QSGAnchors);
+    Q_D(const QQuickAnchors);
     return d->bottomMargin;
 }
 
-void QSGAnchors::setBottomMargin(qreal offset)
+void QQuickAnchors::setBottomMargin(qreal offset)
 {
-    Q_D(QSGAnchors);
+    Q_D(QQuickAnchors);
     if (d->bottomMargin == offset)
         return;
     d->bottomMargin = offset;
@@ -995,15 +995,15 @@ void QSGAnchors::setBottomMargin(qreal offset)
     emit bottomMarginChanged();
 }
 
-qreal QSGAnchors::verticalCenterOffset() const
+qreal QQuickAnchors::verticalCenterOffset() const
 {
-    Q_D(const QSGAnchors);
+    Q_D(const QQuickAnchors);
     return d->vCenterOffset;
 }
 
-void QSGAnchors::setVerticalCenterOffset(qreal offset)
+void QQuickAnchors::setVerticalCenterOffset(qreal offset)
 {
-    Q_D(QSGAnchors);
+    Q_D(QQuickAnchors);
     if (d->vCenterOffset == offset)
         return;
     d->vCenterOffset = offset;
@@ -1014,15 +1014,15 @@ void QSGAnchors::setVerticalCenterOffset(qreal offset)
     emit verticalCenterOffsetChanged();
 }
 
-qreal QSGAnchors::baselineOffset() const
+qreal QQuickAnchors::baselineOffset() const
 {
-    Q_D(const QSGAnchors);
+    Q_D(const QQuickAnchors);
     return d->baselineOffset;
 }
 
-void QSGAnchors::setBaselineOffset(qreal offset)
+void QQuickAnchors::setBaselineOffset(qreal offset)
 {
-    Q_D(QSGAnchors);
+    Q_D(QQuickAnchors);
     if (d->baselineOffset == offset)
         return;
     d->baselineOffset = offset;
@@ -1030,74 +1030,74 @@ void QSGAnchors::setBaselineOffset(qreal offset)
     emit baselineOffsetChanged();
 }
 
-QSGAnchors::Anchors QSGAnchors::usedAnchors() const
+QQuickAnchors::Anchors QQuickAnchors::usedAnchors() const
 {
-    Q_D(const QSGAnchors);
+    Q_D(const QQuickAnchors);
     return d->usedAnchors;
 }
 
-bool QSGAnchorsPrivate::checkHValid() const
+bool QQuickAnchorsPrivate::checkHValid() const
 {
-    if (usedAnchors & QSGAnchors::LeftAnchor &&
-        usedAnchors & QSGAnchors::RightAnchor &&
-        usedAnchors & QSGAnchors::HCenterAnchor) {
-        qmlInfo(item) << QSGAnchors::tr("Cannot specify left, right, and hcenter anchors.");
+    if (usedAnchors & QQuickAnchors::LeftAnchor &&
+        usedAnchors & QQuickAnchors::RightAnchor &&
+        usedAnchors & QQuickAnchors::HCenterAnchor) {
+        qmlInfo(item) << QQuickAnchors::tr("Cannot specify left, right, and hcenter anchors.");
         return false;
     }
 
     return true;
 }
 
-bool QSGAnchorsPrivate::checkHAnchorValid(QSGAnchorLine anchor) const
+bool QQuickAnchorsPrivate::checkHAnchorValid(QQuickAnchorLine anchor) const
 {
     if (!anchor.item) {
-        qmlInfo(item) << QSGAnchors::tr("Cannot anchor to a null item.");
+        qmlInfo(item) << QQuickAnchors::tr("Cannot anchor to a null item.");
         return false;
-    } else if (anchor.anchorLine & QSGAnchorLine::Vertical_Mask) {
-        qmlInfo(item) << QSGAnchors::tr("Cannot anchor a horizontal edge to a vertical edge.");
+    } else if (anchor.anchorLine & QQuickAnchorLine::Vertical_Mask) {
+        qmlInfo(item) << QQuickAnchors::tr("Cannot anchor a horizontal edge to a vertical edge.");
         return false;
     } else if (anchor.item != item->parentItem() && anchor.item->parentItem() != item->parentItem()){
-        qmlInfo(item) << QSGAnchors::tr("Cannot anchor to an item that isn't a parent or sibling.");
+        qmlInfo(item) << QQuickAnchors::tr("Cannot anchor to an item that isn't a parent or sibling.");
         return false;
     } else if (anchor.item == item) {
-        qmlInfo(item) << QSGAnchors::tr("Cannot anchor item to self.");
+        qmlInfo(item) << QQuickAnchors::tr("Cannot anchor item to self.");
         return false;
     }
 
     return true;
 }
 
-bool QSGAnchorsPrivate::checkVValid() const
+bool QQuickAnchorsPrivate::checkVValid() const
 {
-    if (usedAnchors & QSGAnchors::TopAnchor &&
-        usedAnchors & QSGAnchors::BottomAnchor &&
-        usedAnchors & QSGAnchors::VCenterAnchor) {
-        qmlInfo(item) << QSGAnchors::tr("Cannot specify top, bottom, and vcenter anchors.");
+    if (usedAnchors & QQuickAnchors::TopAnchor &&
+        usedAnchors & QQuickAnchors::BottomAnchor &&
+        usedAnchors & QQuickAnchors::VCenterAnchor) {
+        qmlInfo(item) << QQuickAnchors::tr("Cannot specify top, bottom, and vcenter anchors.");
         return false;
-    } else if (usedAnchors & QSGAnchors::BaselineAnchor &&
-               (usedAnchors & QSGAnchors::TopAnchor ||
-                usedAnchors & QSGAnchors::BottomAnchor ||
-                usedAnchors & QSGAnchors::VCenterAnchor)) {
-        qmlInfo(item) << QSGAnchors::tr("Baseline anchor cannot be used in conjunction with top, bottom, or vcenter anchors.");
+    } else if (usedAnchors & QQuickAnchors::BaselineAnchor &&
+               (usedAnchors & QQuickAnchors::TopAnchor ||
+                usedAnchors & QQuickAnchors::BottomAnchor ||
+                usedAnchors & QQuickAnchors::VCenterAnchor)) {
+        qmlInfo(item) << QQuickAnchors::tr("Baseline anchor cannot be used in conjunction with top, bottom, or vcenter anchors.");
         return false;
     }
 
     return true;
 }
 
-bool QSGAnchorsPrivate::checkVAnchorValid(QSGAnchorLine anchor) const
+bool QQuickAnchorsPrivate::checkVAnchorValid(QQuickAnchorLine anchor) const
 {
     if (!anchor.item) {
-        qmlInfo(item) << QSGAnchors::tr("Cannot anchor to a null item.");
+        qmlInfo(item) << QQuickAnchors::tr("Cannot anchor to a null item.");
         return false;
-    } else if (anchor.anchorLine & QSGAnchorLine::Horizontal_Mask) {
-        qmlInfo(item) << QSGAnchors::tr("Cannot anchor a vertical edge to a horizontal edge.");
+    } else if (anchor.anchorLine & QQuickAnchorLine::Horizontal_Mask) {
+        qmlInfo(item) << QQuickAnchors::tr("Cannot anchor a vertical edge to a horizontal edge.");
         return false;
     } else if (anchor.item != item->parentItem() && anchor.item->parentItem() != item->parentItem()){
-        qmlInfo(item) << QSGAnchors::tr("Cannot anchor to an item that isn't a parent or sibling.");
+        qmlInfo(item) << QQuickAnchors::tr("Cannot anchor to an item that isn't a parent or sibling.");
         return false;
     } else if (anchor.item == item){
-        qmlInfo(item) << QSGAnchors::tr("Cannot anchor item to self.");
+        qmlInfo(item) << QQuickAnchors::tr("Cannot anchor item to self.");
         return false;
     }
 
@@ -1106,5 +1106,5 @@ bool QSGAnchorsPrivate::checkVAnchorValid(QSGAnchorLine anchor) const
 
 QT_END_NAMESPACE
 
-#include <moc_qsganchors_p.cpp>
+#include <moc_qquickanchors_p.cpp>
 
diff --git a/src/declarative/items/qsganchors_p.h b/src/declarative/items/qquickanchors_p.h
index a80c279d90..5c66c2e17d 100644
--- a/src/declarative/items/qsganchors_p.h
+++ b/src/declarative/items/qquickanchors_p.h
@@ -40,8 +40,8 @@
 **
 ****************************************************************************/
 
-#ifndef QSGANCHORS_P_H
-#define QSGANCHORS_P_H
+#ifndef QQUICKANCHORS_P_H
+#define QQUICKANCHORS_P_H
 
 #include <qdeclarative.h>
 
@@ -55,20 +55,20 @@ QT_BEGIN_NAMESPACE
 
 QT_MODULE(Declarative)
 
-class QSGItem;
-class QSGAnchorsPrivate;
-class QSGAnchorLine;
-class Q_DECLARATIVE_PRIVATE_EXPORT QSGAnchors : public QObject
+class QQuickItem;
+class QQuickAnchorsPrivate;
+class QQuickAnchorLine;
+class Q_DECLARATIVE_PRIVATE_EXPORT QQuickAnchors : public QObject
 {
     Q_OBJECT
 
-    Q_PROPERTY(QSGAnchorLine left READ left WRITE setLeft RESET resetLeft NOTIFY leftChanged)
-    Q_PROPERTY(QSGAnchorLine right READ right WRITE setRight RESET resetRight NOTIFY rightChanged)
-    Q_PROPERTY(QSGAnchorLine horizontalCenter READ horizontalCenter WRITE setHorizontalCenter RESET resetHorizontalCenter NOTIFY horizontalCenterChanged)
-    Q_PROPERTY(QSGAnchorLine top READ top WRITE setTop RESET resetTop NOTIFY topChanged)
-    Q_PROPERTY(QSGAnchorLine bottom READ bottom WRITE setBottom RESET resetBottom NOTIFY bottomChanged)
-    Q_PROPERTY(QSGAnchorLine verticalCenter READ verticalCenter WRITE setVerticalCenter RESET resetVerticalCenter NOTIFY verticalCenterChanged)
-    Q_PROPERTY(QSGAnchorLine baseline READ baseline WRITE setBaseline RESET resetBaseline NOTIFY baselineChanged)
+    Q_PROPERTY(QQuickAnchorLine left READ left WRITE setLeft RESET resetLeft NOTIFY leftChanged)
+    Q_PROPERTY(QQuickAnchorLine right READ right WRITE setRight RESET resetRight NOTIFY rightChanged)
+    Q_PROPERTY(QQuickAnchorLine horizontalCenter READ horizontalCenter WRITE setHorizontalCenter RESET resetHorizontalCenter NOTIFY horizontalCenterChanged)
+    Q_PROPERTY(QQuickAnchorLine top READ top WRITE setTop RESET resetTop NOTIFY topChanged)
+    Q_PROPERTY(QQuickAnchorLine bottom READ bottom WRITE setBottom RESET resetBottom NOTIFY bottomChanged)
+    Q_PROPERTY(QQuickAnchorLine verticalCenter READ verticalCenter WRITE setVerticalCenter RESET resetVerticalCenter NOTIFY verticalCenterChanged)
+    Q_PROPERTY(QQuickAnchorLine baseline READ baseline WRITE setBaseline RESET resetBaseline NOTIFY baselineChanged)
     Q_PROPERTY(qreal margins READ margins WRITE setMargins NOTIFY marginsChanged)
     Q_PROPERTY(qreal leftMargin READ leftMargin WRITE setLeftMargin NOTIFY leftMarginChanged)
     Q_PROPERTY(qreal rightMargin READ rightMargin WRITE setRightMargin NOTIFY rightMarginChanged)
@@ -77,13 +77,13 @@ class Q_DECLARATIVE_PRIVATE_EXPORT QSGAnchors : public QObject
     Q_PROPERTY(qreal bottomMargin READ bottomMargin WRITE setBottomMargin NOTIFY bottomMarginChanged)
     Q_PROPERTY(qreal verticalCenterOffset READ verticalCenterOffset WRITE setVerticalCenterOffset NOTIFY verticalCenterOffsetChanged)
     Q_PROPERTY(qreal baselineOffset READ baselineOffset WRITE setBaselineOffset NOTIFY baselineOffsetChanged)
-    Q_PROPERTY(QSGItem *fill READ fill WRITE setFill RESET resetFill NOTIFY fillChanged)
-    Q_PROPERTY(QSGItem *centerIn READ centerIn WRITE setCenterIn RESET resetCenterIn NOTIFY centerInChanged)
+    Q_PROPERTY(QQuickItem *fill READ fill WRITE setFill RESET resetFill NOTIFY fillChanged)
+    Q_PROPERTY(QQuickItem *centerIn READ centerIn WRITE setCenterIn RESET resetCenterIn NOTIFY centerInChanged)
     Q_PROPERTY(bool mirrored READ mirrored NOTIFY mirroredChanged)
 
 public:
-    QSGAnchors(QSGItem *item, QObject *parent=0);
-    virtual ~QSGAnchors();
+    QQuickAnchors(QQuickItem *item, QObject *parent=0);
+    virtual ~QQuickAnchors();
 
     enum Anchor {
         LeftAnchor = 0x01,
@@ -98,32 +98,32 @@ public:
     };
     Q_DECLARE_FLAGS(Anchors, Anchor)
 
-    QSGAnchorLine left() const;
-    void setLeft(const QSGAnchorLine &edge);
+    QQuickAnchorLine left() const;
+    void setLeft(const QQuickAnchorLine &edge);
     void resetLeft();
 
-    QSGAnchorLine right() const;
-    void setRight(const QSGAnchorLine &edge);
+    QQuickAnchorLine right() const;
+    void setRight(const QQuickAnchorLine &edge);
     void resetRight();
 
-    QSGAnchorLine horizontalCenter() const;
-    void setHorizontalCenter(const QSGAnchorLine &edge);
+    QQuickAnchorLine horizontalCenter() const;
+    void setHorizontalCenter(const QQuickAnchorLine &edge);
     void resetHorizontalCenter();
 
-    QSGAnchorLine top() const;
-    void setTop(const QSGAnchorLine &edge);
+    QQuickAnchorLine top() const;
+    void setTop(const QQuickAnchorLine &edge);
     void resetTop();
 
-    QSGAnchorLine bottom() const;
-    void setBottom(const QSGAnchorLine &edge);
+    QQuickAnchorLine bottom() const;
+    void setBottom(const QQuickAnchorLine &edge);
     void resetBottom();
 
-    QSGAnchorLine verticalCenter() const;
-    void setVerticalCenter(const QSGAnchorLine &edge);
+    QQuickAnchorLine verticalCenter() const;
+    void setVerticalCenter(const QQuickAnchorLine &edge);
     void resetVerticalCenter();
 
-    QSGAnchorLine baseline() const;
-    void setBaseline(const QSGAnchorLine &edge);
+    QQuickAnchorLine baseline() const;
+    void setBaseline(const QQuickAnchorLine &edge);
     void resetBaseline();
 
     qreal leftMargin() const;
@@ -150,12 +150,12 @@ public:
     qreal baselineOffset() const;
     void setBaselineOffset(qreal);
 
-    QSGItem *fill() const;
-    void setFill(QSGItem *);
+    QQuickItem *fill() const;
+    void setFill(QQuickItem *);
     void resetFill();
 
-    QSGItem *centerIn() const;
-    void setCenterIn(QSGItem *);
+    QQuickItem *centerIn() const;
+    void setCenterIn(QQuickItem *);
     void resetCenterIn();
 
     Anchors usedAnchors() const;
@@ -186,16 +186,16 @@ Q_SIGNALS:
     void mirroredChanged();
 
 private:
-    friend class QSGItemPrivate;
-    Q_DISABLE_COPY(QSGAnchors)
-    Q_DECLARE_PRIVATE(QSGAnchors)
+    friend class QQuickItemPrivate;
+    Q_DISABLE_COPY(QQuickAnchors)
+    Q_DECLARE_PRIVATE(QQuickAnchors)
 };
-Q_DECLARE_OPERATORS_FOR_FLAGS(QSGAnchors::Anchors)
+Q_DECLARE_OPERATORS_FOR_FLAGS(QQuickAnchors::Anchors)
 
 QT_END_NAMESPACE
 
-QML_DECLARE_TYPE(QSGAnchors)
+QML_DECLARE_TYPE(QQuickAnchors)
 
 QT_END_HEADER
 
-#endif // QSGANCHORS_P_H
+#endif // QQUICKANCHORS_P_H
diff --git a/src/declarative/items/qsganchors_p_p.h b/src/declarative/items/qquickanchors_p_p.h
index 0417761314..eae7981617 100644
--- a/src/declarative/items/qsganchors_p_p.h
+++ b/src/declarative/items/qquickanchors_p_p.h
@@ -40,8 +40,8 @@
 **
 ****************************************************************************/
 
-#ifndef QSGANCHORS_P_P_H
-#define QSGANCHORS_P_P_H
+#ifndef QQUICKANCHORS_P_P_H
+#define QQUICKANCHORS_P_P_H
 
 //
 //  W A R N I N G
@@ -54,16 +54,16 @@
 // We mean it.
 //
 
-#include "qsganchors_p.h"
-#include "qsgitemchangelistener_p.h"
+#include "qquickanchors_p.h"
+#include "qquickitemchangelistener_p.h"
 #include <private/qobject_p.h>
 
 QT_BEGIN_NAMESPACE
 
-class QSGAnchorLine
+class QQuickAnchorLine
 {
 public:
-    QSGAnchorLine() : item(0), anchorLine(Invalid) {}
+    QQuickAnchorLine() : item(0), anchorLine(Invalid) {}
 
     enum AnchorLine {
         Invalid = 0x0,
@@ -78,20 +78,20 @@ public:
         Vertical_Mask = Top | Bottom | VCenter | Baseline
     };
 
-    QSGItem *item;
+    QQuickItem *item;
     AnchorLine anchorLine;
 };
 
-inline bool operator==(const QSGAnchorLine& a, const QSGAnchorLine& b)
+inline bool operator==(const QQuickAnchorLine& a, const QQuickAnchorLine& b)
 {
     return a.item == b.item && a.anchorLine == b.anchorLine;
 }
 
-class QSGAnchorsPrivate : public QObjectPrivate, public QSGItemChangeListener
+class QQuickAnchorsPrivate : public QObjectPrivate, public QQuickItemChangeListener
 {
-    Q_DECLARE_PUBLIC(QSGAnchors)
+    Q_DECLARE_PUBLIC(QQuickAnchors)
 public:
-    QSGAnchorsPrivate(QSGItem *i)
+    QQuickAnchorsPrivate(QQuickItem *i)
       : componentComplete(true), updatingMe(false), updatingHorizontalAnchor(0),
         updatingVerticalAnchor(0), updatingFill(0), updatingCenterIn(0), item(i), usedAnchors(0), fill(0),
         centerIn(0), leftMargin(0), rightMargin(0), topMargin(0), bottomMargin(0),
@@ -99,10 +99,10 @@ public:
     {
     }
 
-    void clearItem(QSGItem *);
+    void clearItem(QQuickItem *);
 
-    void addDepend(QSGItem *);
-    void remDepend(QSGItem *);
+    void addDepend(QQuickItem *);
+    void remDepend(QQuickItem *);
     bool isItemComplete() const;
 
     bool componentComplete:1;
@@ -122,15 +122,15 @@ public:
     void updateOnComplete();
     void updateMe();
 
-    // QSGItemGeometryListener interface
-    void itemGeometryChanged(QSGItem *, const QRectF &, const QRectF &);
-    QSGAnchorsPrivate *anchorPrivate() { return this; }
+    // QQuickItemGeometryListener interface
+    void itemGeometryChanged(QQuickItem *, const QRectF &, const QRectF &);
+    QQuickAnchorsPrivate *anchorPrivate() { return this; }
 
     bool checkHValid() const;
     bool checkVValid() const;
-    bool checkHAnchorValid(QSGAnchorLine anchor) const;
-    bool checkVAnchorValid(QSGAnchorLine anchor) const;
-    bool calcStretch(const QSGAnchorLine &edge1, const QSGAnchorLine &edge2, qreal offset1, qreal offset2, QSGAnchorLine::AnchorLine line, qreal &stretch);
+    bool checkHAnchorValid(QQuickAnchorLine anchor) const;
+    bool checkVAnchorValid(QQuickAnchorLine anchor) const;
+    bool calcStretch(const QQuickAnchorLine &edge1, const QQuickAnchorLine &edge2, qreal offset1, qreal offset2, QQuickAnchorLine::AnchorLine line, qreal &stretch);
 
     bool isMirrored() const;
     void updateHorizontalAnchors();
@@ -138,19 +138,19 @@ public:
     void fillChanged();
     void centerInChanged();
 
-    QSGItem *item;
-    QSGAnchors::Anchors usedAnchors;
+    QQuickItem *item;
+    QQuickAnchors::Anchors usedAnchors;
 
-    QSGItem *fill;
-    QSGItem *centerIn;
+    QQuickItem *fill;
+    QQuickItem *centerIn;
 
-    QSGAnchorLine left;
-    QSGAnchorLine right;
-    QSGAnchorLine top;
-    QSGAnchorLine bottom;
-    QSGAnchorLine vCenter;
-    QSGAnchorLine hCenter;
-    QSGAnchorLine baseline;
+    QQuickAnchorLine left;
+    QQuickAnchorLine right;
+    QQuickAnchorLine top;
+    QQuickAnchorLine bottom;
+    QQuickAnchorLine vCenter;
+    QQuickAnchorLine hCenter;
+    QQuickAnchorLine baseline;
 
     qreal leftMargin;
     qreal rightMargin;
@@ -161,13 +161,13 @@ public:
     qreal hCenterOffset;
     qreal baselineOffset;
 
-    static inline QSGAnchorsPrivate *get(QSGAnchors *o) {
-        return static_cast<QSGAnchorsPrivate *>(QObjectPrivate::get(o));
+    static inline QQuickAnchorsPrivate *get(QQuickAnchors *o) {
+        return static_cast<QQuickAnchorsPrivate *>(QObjectPrivate::get(o));
     }
 };
 
 QT_END_NAMESPACE
 
-Q_DECLARE_METATYPE(QSGAnchorLine)
+Q_DECLARE_METATYPE(QQuickAnchorLine)
 
 #endif
diff --git a/src/declarative/items/qsganimatedimage.cpp b/src/declarative/items/qquickanimatedimage.cpp
index 93e0284417..d4b08dd4f4 100644
--- a/src/declarative/items/qsganimatedimage.cpp
+++ b/src/declarative/items/qquickanimatedimage.cpp
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#include "qsganimatedimage_p.h"
-#include "qsganimatedimage_p_p.h"
+#include "qquickanimatedimage_p.h"
+#include "qquickanimatedimage_p_p.h"
 
 #ifndef QT_NO_MOVIE
 
@@ -53,7 +53,7 @@
 
 QT_BEGIN_NAMESPACE
 /*!
-    \qmlclass AnimatedImage QSGAnimatedImage
+    \qmlclass AnimatedImage QQuickAnimatedImage
     \inqmlmodule QtQuick 2
     \inherits Image
     \ingroup basic-visual-elements
@@ -122,14 +122,14 @@ QT_BEGIN_NAMESPACE
     The default value is false.
 */
 
-QSGAnimatedImage::QSGAnimatedImage(QSGItem *parent)
-    : QSGImage(*(new QSGAnimatedImagePrivate), parent)
+QQuickAnimatedImage::QQuickAnimatedImage(QQuickItem *parent)
+    : QQuickImage(*(new QQuickAnimatedImagePrivate), parent)
 {
 }
 
-QSGAnimatedImage::~QSGAnimatedImage()
+QQuickAnimatedImage::~QQuickAnimatedImage()
 {
-    Q_D(QSGAnimatedImage);
+    Q_D(QQuickAnimatedImage);
     delete d->_movie;
 }
 
@@ -141,17 +141,17 @@ QSGAnimatedImage::~QSGAnimatedImage()
   the animation.
 */
 
-bool QSGAnimatedImage::isPaused() const
+bool QQuickAnimatedImage::isPaused() const
 {
-    Q_D(const QSGAnimatedImage);
+    Q_D(const QQuickAnimatedImage);
     if (!d->_movie)
         return false;
     return d->_movie->state()==QMovie::Paused;
 }
 
-void QSGAnimatedImage::setPaused(bool pause)
+void QQuickAnimatedImage::setPaused(bool pause)
 {
-    Q_D(QSGAnimatedImage);
+    Q_D(QQuickAnimatedImage);
     if (pause == d->paused)
         return;
     d->paused = pause;
@@ -168,17 +168,17 @@ void QSGAnimatedImage::setPaused(bool pause)
   will start playing immediately.
 */
 
-bool QSGAnimatedImage::isPlaying() const
+bool QQuickAnimatedImage::isPlaying() const
 {
-    Q_D(const QSGAnimatedImage);
+    Q_D(const QQuickAnimatedImage);
     if (!d->_movie)
         return false;
     return d->_movie->state()!=QMovie::NotRunning;
 }
 
-void QSGAnimatedImage::setPlaying(bool play)
+void QQuickAnimatedImage::setPlaying(bool play)
 {
-    Q_D(QSGAnimatedImage);
+    Q_D(QQuickAnimatedImage);
     if (play == d->playing)
         return;
     d->playing = play;
@@ -200,17 +200,17 @@ void QSGAnimatedImage::setPlaying(bool play)
   frameCount is the number of frames in the animation. For some animation formats,
   frameCount is unknown and has a value of zero.
 */
-int QSGAnimatedImage::currentFrame() const
+int QQuickAnimatedImage::currentFrame() const
 {
-    Q_D(const QSGAnimatedImage);
+    Q_D(const QQuickAnimatedImage);
     if (!d->_movie)
         return d->preset_currentframe;
     return d->_movie->currentFrameNumber();
 }
 
-void QSGAnimatedImage::setCurrentFrame(int frame)
+void QQuickAnimatedImage::setCurrentFrame(int frame)
 {
-    Q_D(QSGAnimatedImage);
+    Q_D(QQuickAnimatedImage);
     if (!d->_movie) {
         d->preset_currentframe = frame;
         return;
@@ -218,17 +218,17 @@ void QSGAnimatedImage::setCurrentFrame(int frame)
     d->_movie->jumpToFrame(frame);
 }
 
-int QSGAnimatedImage::frameCount() const
+int QQuickAnimatedImage::frameCount() const
 {
-    Q_D(const QSGAnimatedImage);
+    Q_D(const QQuickAnimatedImage);
     if (!d->_movie)
         return 0;
     return d->_movie->frameCount();
 }
 
-void QSGAnimatedImage::setSource(const QUrl &url)
+void QQuickAnimatedImage::setSource(const QUrl &url)
 {
-    Q_D(QSGAnimatedImage);
+    Q_D(QQuickAnimatedImage);
     if (url == d->url)
         return;
 
@@ -247,11 +247,11 @@ void QSGAnimatedImage::setSource(const QUrl &url)
         load();
 }
 
-void QSGAnimatedImage::load()
+void QQuickAnimatedImage::load()
 {
-    Q_D(QSGAnimatedImage);
+    Q_D(QQuickAnimatedImage);
 
-    QSGImageBase::Status oldStatus = d->status;
+    QQuickImageBase::Status oldStatus = d->status;
     qreal oldProgress = d->progress;
 
     if (d->url.isEmpty()) {
@@ -314,9 +314,9 @@ void QSGAnimatedImage::load()
 
 #define ANIMATEDIMAGE_MAXIMUM_REDIRECT_RECURSION 16
 
-void QSGAnimatedImage::movieRequestFinished()
+void QQuickAnimatedImage::movieRequestFinished()
 {
-    Q_D(QSGAnimatedImage);
+    Q_D(QQuickAnimatedImage);
 
     d->redirectCount++;
     if (d->redirectCount < ANIMATEDIMAGE_MAXIMUM_REDIRECT_RECURSION) {
@@ -360,16 +360,16 @@ void QSGAnimatedImage::movieRequestFinished()
     emit statusChanged(d->status);
 }
 
-void QSGAnimatedImage::movieUpdate()
+void QQuickAnimatedImage::movieUpdate()
 {
-    Q_D(QSGAnimatedImage);
+    Q_D(QQuickAnimatedImage);
     d->setPixmap(d->_movie->currentPixmap());
     emit frameChanged();
 }
 
-void QSGAnimatedImage::playingStatusChanged()
+void QQuickAnimatedImage::playingStatusChanged()
 {
-    Q_D(QSGAnimatedImage);
+    Q_D(QQuickAnimatedImage);
     if ((d->_movie->state() != QMovie::NotRunning) != d->playing) {
         d->playing = (d->_movie->state() != QMovie::NotRunning);
         emit playingChanged();
@@ -380,10 +380,10 @@ void QSGAnimatedImage::playingStatusChanged()
     }
 }
 
-void QSGAnimatedImage::componentComplete()
+void QQuickAnimatedImage::componentComplete()
 {
-    Q_D(QSGAnimatedImage);
-    QSGItem::componentComplete(); // NOT QSGImage
+    Q_D(QQuickAnimatedImage);
+    QQuickItem::componentComplete(); // NOT QQuickImage
     if (d->url.isValid())
         load();
     if (!d->reply) {
diff --git a/src/declarative/items/qsganimatedimage_p.h b/src/declarative/items/qquickanimatedimage_p.h
index efbe01d802..ae96e4cc15 100644
--- a/src/declarative/items/qsganimatedimage_p.h
+++ b/src/declarative/items/qquickanimatedimage_p.h
@@ -40,10 +40,10 @@
 **
 ****************************************************************************/
 
-#ifndef QSGANIMATEDIMAGE_P_H
-#define QSGANIMATEDIMAGE_P_H
+#ifndef QQUICKANIMATEDIMAGE_P_H
+#define QQUICKANIMATEDIMAGE_P_H
 
-#include "qsgimage_p.h"
+#include "qquickimage_p.h"
 
 #ifndef QT_NO_MOVIE
 
@@ -54,9 +54,9 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(Declarative)
 
 class QMovie;
-class QSGAnimatedImagePrivate;
+class QQuickAnimatedImagePrivate;
 
-class Q_AUTOTEST_EXPORT QSGAnimatedImage : public QSGImage
+class Q_AUTOTEST_EXPORT QQuickAnimatedImage : public QQuickImage
 {
     Q_OBJECT
 
@@ -69,8 +69,8 @@ class Q_AUTOTEST_EXPORT QSGAnimatedImage : public QSGImage
     Q_PROPERTY(QSize sourceSize READ sourceSize NOTIFY sourceSizeChanged)
 
 public:
-    QSGAnimatedImage(QSGItem *parent=0);
-    ~QSGAnimatedImage();
+    QQuickAnimatedImage(QQuickItem *parent=0);
+    ~QQuickAnimatedImage();
 
     bool isPlaying() const;
     void setPlaying(bool play);
@@ -83,7 +83,7 @@ public:
 
     int frameCount() const;
 
-    // Extends QSGImage's src property*/
+    // Extends QQuickImage's src property*/
     virtual void setSource(const QUrl&);
 
 Q_SIGNALS:
@@ -102,16 +102,16 @@ protected:
     void componentComplete();
 
 private:
-    Q_DISABLE_COPY(QSGAnimatedImage)
-    Q_DECLARE_PRIVATE(QSGAnimatedImage)
+    Q_DISABLE_COPY(QQuickAnimatedImage)
+    Q_DECLARE_PRIVATE(QQuickAnimatedImage)
 };
 
 QT_END_NAMESPACE
 
-QML_DECLARE_TYPE(QSGAnimatedImage)
+QML_DECLARE_TYPE(QQuickAnimatedImage)
 
 QT_END_HEADER
 
 #endif // QT_NO_MOVIE
 
-#endif // QSGANIMATEDIMAGE_P_H
+#endif // QQUICKANIMATEDIMAGE_P_H
diff --git a/src/declarative/items/qsganimatedimage_p_p.h b/src/declarative/items/qquickanimatedimage_p_p.h
index f216df2502..0d5dd4a3b7 100644
--- a/src/declarative/items/qsganimatedimage_p_p.h
+++ b/src/declarative/items/qquickanimatedimage_p_p.h
@@ -40,8 +40,8 @@
 **
 ****************************************************************************/
 
-#ifndef QSGANIMATEDIMAGE_P_P_H
-#define QSGANIMATEDIMAGE_P_P_H
+#ifndef QQUICKANIMATEDIMAGE_P_P_H
+#define QQUICKANIMATEDIMAGE_P_P_H
 
 //
 //  W A R N I N G
@@ -54,7 +54,7 @@
 // We mean it.
 //
 
-#include "qsgimage_p_p.h"
+#include "qquickimage_p_p.h"
 
 #ifndef QT_NO_MOVIE
 
@@ -63,12 +63,12 @@ QT_BEGIN_NAMESPACE
 class QMovie;
 class QNetworkReply;
 
-class QSGAnimatedImagePrivate : public QSGImagePrivate
+class QQuickAnimatedImagePrivate : public QQuickImagePrivate
 {
-    Q_DECLARE_PUBLIC(QSGAnimatedImage)
+    Q_DECLARE_PUBLIC(QQuickAnimatedImage)
 
 public:
-    QSGAnimatedImagePrivate()
+    QQuickAnimatedImagePrivate()
       : playing(true), paused(false), preset_currentframe(0), _movie(0), reply(0), redirectCount(0)
     {
     }
@@ -85,4 +85,4 @@ QT_END_NAMESPACE
 
 #endif // QT_NO_MOVIE
 
-#endif // QSGANIMATEDIMAGE_P_P_H
+#endif // QQUICKANIMATEDIMAGE_P_P_H
diff --git a/src/declarative/items/qsganimation.cpp b/src/declarative/items/qquickanimation.cpp
index 81c83913c1..55eb4e2e13 100644
--- a/src/declarative/items/qsganimation.cpp
+++ b/src/declarative/items/qquickanimation.cpp
@@ -39,9 +39,9 @@
 **
 ****************************************************************************/
 
-#include "qsganimation_p.h"
-#include "qsganimation_p_p.h"
-#include "qsgstateoperations_p.h"
+#include "qquickanimation_p.h"
+#include "qquickanimation_p_p.h"
+#include "qquickstateoperations_p.h"
 
 #include <private/qdeclarativeproperty_p.h>
 #include <private/qdeclarativepath_p.h>
@@ -54,10 +54,10 @@
 
 QT_BEGIN_NAMESPACE
 
-QSGParentAnimation::QSGParentAnimation(QObject *parent)
-    : QDeclarativeAnimationGroup(*(new QSGParentAnimationPrivate), parent)
+QQuickParentAnimation::QQuickParentAnimation(QObject *parent)
+    : QDeclarativeAnimationGroup(*(new QQuickParentAnimationPrivate), parent)
 {
-    Q_D(QSGParentAnimation);
+    Q_D(QQuickParentAnimation);
     d->topLevelGroup = new QSequentialAnimationGroup;
     QDeclarative_setParent_noEvent(d->topLevelGroup, this);
 
@@ -74,19 +74,19 @@ QSGParentAnimation::QSGParentAnimation(QObject *parent)
     d->topLevelGroup->addAnimation(d->endAction);
 }
 
-QSGParentAnimation::~QSGParentAnimation()
+QQuickParentAnimation::~QQuickParentAnimation()
 {
 }
 
-QSGItem *QSGParentAnimation::target() const
+QQuickItem *QQuickParentAnimation::target() const
 {
-    Q_D(const QSGParentAnimation);
+    Q_D(const QQuickParentAnimation);
     return d->target;
 }
 
-void QSGParentAnimation::setTarget(QSGItem *target)
+void QQuickParentAnimation::setTarget(QQuickItem *target)
 {
-    Q_D(QSGParentAnimation);
+    Q_D(QQuickParentAnimation);
     if (target == d->target)
         return;
 
@@ -94,15 +94,15 @@ void QSGParentAnimation::setTarget(QSGItem *target)
     emit targetChanged();
 }
 
-QSGItem *QSGParentAnimation::newParent() const
+QQuickItem *QQuickParentAnimation::newParent() const
 {
-    Q_D(const QSGParentAnimation);
+    Q_D(const QQuickParentAnimation);
     return d->newParent;
 }
 
-void QSGParentAnimation::setNewParent(QSGItem *newParent)
+void QQuickParentAnimation::setNewParent(QQuickItem *newParent)
 {
-    Q_D(QSGParentAnimation);
+    Q_D(QQuickParentAnimation);
     if (newParent == d->newParent)
         return;
 
@@ -110,15 +110,15 @@ void QSGParentAnimation::setNewParent(QSGItem *newParent)
     emit newParentChanged();
 }
 
-QSGItem *QSGParentAnimation::via() const
+QQuickItem *QQuickParentAnimation::via() const
 {
-    Q_D(const QSGParentAnimation);
+    Q_D(const QQuickParentAnimation);
     return d->via;
 }
 
-void QSGParentAnimation::setVia(QSGItem *via)
+void QQuickParentAnimation::setVia(QQuickItem *via)
 {
-    Q_D(QSGParentAnimation);
+    Q_D(QQuickParentAnimation);
     if (via == d->via)
         return;
 
@@ -126,47 +126,47 @@ void QSGParentAnimation::setVia(QSGItem *via)
     emit viaChanged();
 }
 
-//### mirrors same-named function in QSGItem
-QPointF QSGParentAnimationPrivate::computeTransformOrigin(QSGItem::TransformOrigin origin, qreal width, qreal height) const
+//### mirrors same-named function in QQuickItem
+QPointF QQuickParentAnimationPrivate::computeTransformOrigin(QQuickItem::TransformOrigin origin, qreal width, qreal height) const
 {
     switch (origin) {
     default:
-    case QSGItem::TopLeft:
+    case QQuickItem::TopLeft:
         return QPointF(0, 0);
-    case QSGItem::Top:
+    case QQuickItem::Top:
         return QPointF(width / 2., 0);
-    case QSGItem::TopRight:
+    case QQuickItem::TopRight:
         return QPointF(width, 0);
-    case QSGItem::Left:
+    case QQuickItem::Left:
         return QPointF(0, height / 2.);
-    case QSGItem::Center:
+    case QQuickItem::Center:
         return QPointF(width / 2., height / 2.);
-    case QSGItem::Right:
+    case QQuickItem::Right:
         return QPointF(width, height / 2.);
-    case QSGItem::BottomLeft:
+    case QQuickItem::BottomLeft:
         return QPointF(0, height);
-    case QSGItem::Bottom:
+    case QQuickItem::Bottom:
         return QPointF(width / 2., height);
-    case QSGItem::BottomRight:
+    case QQuickItem::BottomRight:
         return QPointF(width, height);
     }
 }
 
-void QSGParentAnimation::transition(QDeclarativeStateActions &actions,
+void QQuickParentAnimation::transition(QDeclarativeStateActions &actions,
                         QDeclarativeProperties &modified,
                         TransitionDirection direction)
 {
-    Q_D(QSGParentAnimation);
+    Q_D(QQuickParentAnimation);
 
-    struct QSGParentAnimationData : public QAbstractAnimationAction
+    struct QQuickParentAnimationData : public QAbstractAnimationAction
     {
-        QSGParentAnimationData() {}
-        ~QSGParentAnimationData() { qDeleteAll(pc); }
+        QQuickParentAnimationData() {}
+        ~QQuickParentAnimationData() { qDeleteAll(pc); }
 
         QDeclarativeStateActions actions;
         //### reverse should probably apply on a per-action basis
         bool reverse;
-        QList<QSGParentChange *> pc;
+        QList<QQuickParentChange *> pc;
         virtual void doAction()
         {
             for (int ii = 0; ii < actions.count(); ++ii) {
@@ -179,14 +179,14 @@ void QSGParentAnimation::transition(QDeclarativeStateActions &actions,
         }
     };
 
-    QSGParentAnimationData *data = new QSGParentAnimationData;
-    QSGParentAnimationData *viaData = new QSGParentAnimationData;
+    QQuickParentAnimationData *data = new QQuickParentAnimationData;
+    QQuickParentAnimationData *viaData = new QQuickParentAnimationData;
 
     bool hasExplicit = false;
     if (d->target && d->newParent) {
         data->reverse = false;
         QDeclarativeAction myAction;
-        QSGParentChange *pc = new QSGParentChange;
+        QQuickParentChange *pc = new QQuickParentChange;
         pc->setObject(d->target);
         pc->setParent(d->newParent);
         myAction.event = pc;
@@ -196,7 +196,7 @@ void QSGParentAnimation::transition(QDeclarativeStateActions &actions,
         if (d->via) {
             viaData->reverse = false;
             QDeclarativeAction myVAction;
-            QSGParentChange *vpc = new QSGParentChange;
+            QQuickParentChange *vpc = new QQuickParentChange;
             vpc->setObject(d->target);
             vpc->setParent(d->via);
             myVAction.event = vpc;
@@ -211,17 +211,17 @@ void QSGParentAnimation::transition(QDeclarativeStateActions &actions,
     for (int i = 0; i < actions.size(); ++i) {
         QDeclarativeAction &action = actions[i];
         if (action.event && action.event->typeName() == QLatin1String("ParentChange")
-            && (!d->target || static_cast<QSGParentChange*>(action.event)->object() == d->target)) {
+            && (!d->target || static_cast<QQuickParentChange*>(action.event)->object() == d->target)) {
 
-            QSGParentChange *pc = static_cast<QSGParentChange*>(action.event);
+            QQuickParentChange *pc = static_cast<QQuickParentChange*>(action.event);
             QDeclarativeAction myAction = action;
             data->reverse = action.reverseEvent;
 
             //### this logic differs from PropertyAnimation
             //    (probably a result of modified vs. done)
             if (d->newParent) {
-                QSGParentChange *epc = new QSGParentChange;
-                epc->setObject(static_cast<QSGParentChange*>(action.event)->object());
+                QQuickParentChange *epc = new QQuickParentChange;
+                epc->setObject(static_cast<QQuickParentChange*>(action.event)->object());
                 epc->setParent(d->newParent);
                 myAction.event = epc;
                 data->pc << epc;
@@ -235,7 +235,7 @@ void QSGParentAnimation::transition(QDeclarativeStateActions &actions,
             if (d->via) {
                 viaData->reverse = false;
                 QDeclarativeAction myAction;
-                QSGParentChange *vpc = new QSGParentChange;
+                QQuickParentChange *vpc = new QQuickParentChange;
                 vpc->setObject(pc->object());
                 vpc->setParent(d->via);
                 myAction.event = vpc;
@@ -246,14 +246,14 @@ void QSGParentAnimation::transition(QDeclarativeStateActions &actions,
                 QDeclarativeAction &yAction = pc->yIsSet() && i < actions.size()-1 ? actions[++i] : dummyAction;
                 QDeclarativeAction &sAction = pc->scaleIsSet() && i < actions.size()-1 ? actions[++i] : dummyAction;
                 QDeclarativeAction &rAction = pc->rotationIsSet() && i < actions.size()-1 ? actions[++i] : dummyAction;
-                QSGItem *target = pc->object();
-                QSGItem *targetParent = action.reverseEvent ? pc->originalParent() : pc->parent();
+                QQuickItem *target = pc->object();
+                QQuickItem *targetParent = action.reverseEvent ? pc->originalParent() : pc->parent();
 
-                //### this mirrors the logic in QSGParentChange.
+                //### this mirrors the logic in QQuickParentChange.
                 bool ok;
                 const QTransform &transform = targetParent->itemTransform(d->via, &ok);
                 if (transform.type() >= QTransform::TxShear || !ok) {
-                    qmlInfo(this) << QSGParentAnimation::tr("Unable to preserve appearance under complex transform");
+                    qmlInfo(this) << QQuickParentAnimation::tr("Unable to preserve appearance under complex transform");
                     ok = false;
                 }
 
@@ -264,21 +264,21 @@ void QSGParentAnimation::transition(QDeclarativeStateActions &actions,
                     if (transform.m11() == transform.m22())
                         scale = transform.m11();
                     else {
-                        qmlInfo(this) << QSGParentAnimation::tr("Unable to preserve appearance under non-uniform scale");
+                        qmlInfo(this) << QQuickParentAnimation::tr("Unable to preserve appearance under non-uniform scale");
                         ok = false;
                     }
                 } else if (ok && isRotate) {
                     if (transform.m11() == transform.m22())
                         scale = qSqrt(transform.m11()*transform.m11() + transform.m12()*transform.m12());
                     else {
-                        qmlInfo(this) << QSGParentAnimation::tr("Unable to preserve appearance under non-uniform scale");
+                        qmlInfo(this) << QQuickParentAnimation::tr("Unable to preserve appearance under non-uniform scale");
                         ok = false;
                     }
 
                     if (scale != 0)
                         rotation = atan2(transform.m12()/scale, transform.m11()/scale) * 180/M_PI;
                     else {
-                        qmlInfo(this) << QSGParentAnimation::tr("Unable to preserve appearance under scale of 0");
+                        qmlInfo(this) << QQuickParentAnimation::tr("Unable to preserve appearance under scale of 0");
                         ok = false;
                     }
                 }
@@ -286,7 +286,7 @@ void QSGParentAnimation::transition(QDeclarativeStateActions &actions,
                 const QPointF &point = transform.map(QPointF(xAction.toValue.toReal(),yAction.toValue.toReal()));
                 qreal x = point.x();
                 qreal y = point.y();
-                if (ok && target->transformOrigin() != QSGItem::TopLeft) {
+                if (ok && target->transformOrigin() != QQuickItem::TopLeft) {
                     qreal w = target->width();
                     qreal h = target->height();
                     if (pc->widthIsSet() && i < actions.size() - 1)
@@ -341,65 +341,65 @@ void QSGParentAnimation::transition(QDeclarativeStateActions &actions,
 
 }
 
-QAbstractAnimation *QSGParentAnimation::qtAnimation()
+QAbstractAnimation *QQuickParentAnimation::qtAnimation()
 {
-    Q_D(QSGParentAnimation);
+    Q_D(QQuickParentAnimation);
     return d->topLevelGroup;
 }
 
-QSGAnchorAnimation::QSGAnchorAnimation(QObject *parent)
-: QDeclarativeAbstractAnimation(*(new QSGAnchorAnimationPrivate), parent)
+QQuickAnchorAnimation::QQuickAnchorAnimation(QObject *parent)
+: QDeclarativeAbstractAnimation(*(new QQuickAnchorAnimationPrivate), parent)
 {
-    Q_D(QSGAnchorAnimation);
+    Q_D(QQuickAnchorAnimation);
     d->va = new QDeclarativeBulkValueAnimator;
     QDeclarative_setParent_noEvent(d->va, this);
 }
 
-QSGAnchorAnimation::~QSGAnchorAnimation()
+QQuickAnchorAnimation::~QQuickAnchorAnimation()
 {
 }
 
-QAbstractAnimation *QSGAnchorAnimation::qtAnimation()
+QAbstractAnimation *QQuickAnchorAnimation::qtAnimation()
 {
-    Q_D(QSGAnchorAnimation);
+    Q_D(QQuickAnchorAnimation);
     return d->va;
 }
 
-QDeclarativeListProperty<QSGItem> QSGAnchorAnimation::targets()
+QDeclarativeListProperty<QQuickItem> QQuickAnchorAnimation::targets()
 {
-    Q_D(QSGAnchorAnimation);
-    return QDeclarativeListProperty<QSGItem>(this, d->targets);
+    Q_D(QQuickAnchorAnimation);
+    return QDeclarativeListProperty<QQuickItem>(this, d->targets);
 }
 
-int QSGAnchorAnimation::duration() const
+int QQuickAnchorAnimation::duration() const
 {
-    Q_D(const QSGAnchorAnimation);
+    Q_D(const QQuickAnchorAnimation);
     return d->va->duration();
 }
 
-void QSGAnchorAnimation::setDuration(int duration)
+void QQuickAnchorAnimation::setDuration(int duration)
 {
     if (duration < 0) {
         qmlInfo(this) << tr("Cannot set a duration of < 0");
         return;
     }
 
-    Q_D(QSGAnchorAnimation);
+    Q_D(QQuickAnchorAnimation);
     if (d->va->duration() == duration)
         return;
     d->va->setDuration(duration);
     emit durationChanged(duration);
 }
 
-QEasingCurve QSGAnchorAnimation::easing() const
+QEasingCurve QQuickAnchorAnimation::easing() const
 {
-    Q_D(const QSGAnchorAnimation);
+    Q_D(const QQuickAnchorAnimation);
     return d->va->easingCurve();
 }
 
-void QSGAnchorAnimation::setEasing(const QEasingCurve &e)
+void QQuickAnchorAnimation::setEasing(const QEasingCurve &e)
 {
-    Q_D(QSGAnchorAnimation);
+    Q_D(QQuickAnchorAnimation);
     if (d->va->easingCurve() == e)
         return;
 
@@ -407,12 +407,12 @@ void QSGAnchorAnimation::setEasing(const QEasingCurve &e)
     emit easingChanged(e);
 }
 
-void QSGAnchorAnimation::transition(QDeclarativeStateActions &actions,
+void QQuickAnchorAnimation::transition(QDeclarativeStateActions &actions,
                         QDeclarativeProperties &modified,
                         TransitionDirection direction)
 {
     Q_UNUSED(modified);
-    Q_D(QSGAnchorAnimation);
+    Q_D(QQuickAnchorAnimation);
     QDeclarativeAnimationPropertyUpdater *data = new QDeclarativeAnimationPropertyUpdater;
     data->interpolatorType = QMetaType::QReal;
     data->interpolator = d->interpolator;
@@ -424,8 +424,8 @@ void QSGAnchorAnimation::transition(QDeclarativeStateActions &actions,
     for (int ii = 0; ii < actions.count(); ++ii) {
         QDeclarativeAction &action = actions[ii];
         if (action.event && action.event->typeName() == QLatin1String("AnchorChanges")
-            && (d->targets.isEmpty() || d->targets.contains(static_cast<QSGAnchorChanges*>(action.event)->object()))) {
-            data->actions << static_cast<QSGAnchorChanges*>(action.event)->additionalActions();
+            && (d->targets.isEmpty() || d->targets.contains(static_cast<QQuickAnchorChanges*>(action.event)->object()))) {
+            data->actions << static_cast<QQuickAnchorChanges*>(action.event)->additionalActions();
         }
     }
 
@@ -442,47 +442,47 @@ void QSGAnchorAnimation::transition(QDeclarativeStateActions &actions,
     }
 }
 
-QSGPathAnimation::QSGPathAnimation(QObject *parent)
-: QDeclarativeAbstractAnimation(*(new QSGPathAnimationPrivate), parent)
+QQuickPathAnimation::QQuickPathAnimation(QObject *parent)
+: QDeclarativeAbstractAnimation(*(new QQuickPathAnimationPrivate), parent)
 {
-    Q_D(QSGPathAnimation);
+    Q_D(QQuickPathAnimation);
     d->pa = new QDeclarativeBulkValueAnimator;
     QDeclarative_setParent_noEvent(d->pa, this);
 }
 
-QSGPathAnimation::~QSGPathAnimation()
+QQuickPathAnimation::~QQuickPathAnimation()
 {
 }
 
-int QSGPathAnimation::duration() const
+int QQuickPathAnimation::duration() const
 {
-    Q_D(const QSGPathAnimation);
+    Q_D(const QQuickPathAnimation);
     return d->pa->duration();
 }
 
-void QSGPathAnimation::setDuration(int duration)
+void QQuickPathAnimation::setDuration(int duration)
 {
     if (duration < 0) {
         qmlInfo(this) << tr("Cannot set a duration of < 0");
         return;
     }
 
-    Q_D(QSGPathAnimation);
+    Q_D(QQuickPathAnimation);
     if (d->pa->duration() == duration)
         return;
     d->pa->setDuration(duration);
     emit durationChanged(duration);
 }
 
-QEasingCurve QSGPathAnimation::easing() const
+QEasingCurve QQuickPathAnimation::easing() const
 {
-    Q_D(const QSGPathAnimation);
+    Q_D(const QQuickPathAnimation);
     return d->pa->easingCurve();
 }
 
-void QSGPathAnimation::setEasing(const QEasingCurve &e)
+void QQuickPathAnimation::setEasing(const QEasingCurve &e)
 {
-    Q_D(QSGPathAnimation);
+    Q_D(QQuickPathAnimation);
     if (d->pa->easingCurve() == e)
         return;
 
@@ -490,15 +490,15 @@ void QSGPathAnimation::setEasing(const QEasingCurve &e)
     emit easingChanged(e);
 }
 
-QDeclarativePath *QSGPathAnimation::path() const
+QDeclarativePath *QQuickPathAnimation::path() const
 {
-    Q_D(const QSGPathAnimation);
+    Q_D(const QQuickPathAnimation);
     return d->path;
 }
 
-void QSGPathAnimation::setPath(QDeclarativePath *path)
+void QQuickPathAnimation::setPath(QDeclarativePath *path)
 {
-    Q_D(QSGPathAnimation);
+    Q_D(QQuickPathAnimation);
     if (d->path == path)
         return;
 
@@ -506,15 +506,15 @@ void QSGPathAnimation::setPath(QDeclarativePath *path)
     emit pathChanged();
 }
 
-QSGItem *QSGPathAnimation::target() const
+QQuickItem *QQuickPathAnimation::target() const
 {
-    Q_D(const QSGPathAnimation);
+    Q_D(const QQuickPathAnimation);
     return d->target;
 }
 
-void QSGPathAnimation::setTarget(QSGItem *target)
+void QQuickPathAnimation::setTarget(QQuickItem *target)
 {
-    Q_D(QSGPathAnimation);
+    Q_D(QQuickPathAnimation);
     if (d->target == target)
         return;
 
@@ -522,15 +522,15 @@ void QSGPathAnimation::setTarget(QSGItem *target)
     emit targetChanged();
 }
 
-QSGPathAnimation::Orientation QSGPathAnimation::orientation() const
+QQuickPathAnimation::Orientation QQuickPathAnimation::orientation() const
 {
-    Q_D(const QSGPathAnimation);
+    Q_D(const QQuickPathAnimation);
     return d->orientation;
 }
 
-void QSGPathAnimation::setOrientation(Orientation orientation)
+void QQuickPathAnimation::setOrientation(Orientation orientation)
 {
-    Q_D(QSGPathAnimation);
+    Q_D(QQuickPathAnimation);
     if (d->orientation == orientation)
         return;
 
@@ -538,15 +538,15 @@ void QSGPathAnimation::setOrientation(Orientation orientation)
     emit orientationChanged(d->orientation);
 }
 
-QPointF QSGPathAnimation::anchorPoint() const
+QPointF QQuickPathAnimation::anchorPoint() const
 {
-    Q_D(const QSGPathAnimation);
+    Q_D(const QQuickPathAnimation);
     return d->anchorPoint;
 }
 
-void QSGPathAnimation::setAnchorPoint(const QPointF &point)
+void QQuickPathAnimation::setAnchorPoint(const QPointF &point)
 {
-    Q_D(QSGPathAnimation);
+    Q_D(QQuickPathAnimation);
     if (d->anchorPoint == point)
         return;
 
@@ -554,45 +554,45 @@ void QSGPathAnimation::setAnchorPoint(const QPointF &point)
     emit anchorPointChanged(point);
 }
 
-qreal QSGPathAnimation::orientationEntryInterval() const
+qreal QQuickPathAnimation::orientationEntryInterval() const
 {
-    Q_D(const QSGPathAnimation);
+    Q_D(const QQuickPathAnimation);
     return d->entryInterval;
 }
 
-void QSGPathAnimation::setOrientationEntryInterval(qreal interval)
+void QQuickPathAnimation::setOrientationEntryInterval(qreal interval)
 {
-    Q_D(QSGPathAnimation);
+    Q_D(QQuickPathAnimation);
     if (d->entryInterval == interval)
         return;
     d->entryInterval = interval;
     emit orientationEntryIntervalChanged(interval);
 }
 
-qreal QSGPathAnimation::orientationExitInterval() const
+qreal QQuickPathAnimation::orientationExitInterval() const
 {
-    Q_D(const QSGPathAnimation);
+    Q_D(const QQuickPathAnimation);
     return d->exitInterval;
 }
 
-void QSGPathAnimation::setOrientationExitInterval(qreal interval)
+void QQuickPathAnimation::setOrientationExitInterval(qreal interval)
 {
-    Q_D(QSGPathAnimation);
+    Q_D(QQuickPathAnimation);
     if (d->exitInterval == interval)
         return;
     d->exitInterval = interval;
     emit orientationExitIntervalChanged(interval);
 }
 
-qreal QSGPathAnimation::endRotation() const
+qreal QQuickPathAnimation::endRotation() const
 {
-    Q_D(const QSGPathAnimation);
+    Q_D(const QQuickPathAnimation);
     return d->endRotation.isNull ? qreal(0) : d->endRotation.value;
 }
 
-void QSGPathAnimation::setEndRotation(qreal rotation)
+void QQuickPathAnimation::setEndRotation(qreal rotation)
 {
-    Q_D(QSGPathAnimation);
+    Q_D(QQuickPathAnimation);
     if (!d->endRotation.isNull && d->endRotation == rotation)
         return;
 
@@ -601,18 +601,18 @@ void QSGPathAnimation::setEndRotation(qreal rotation)
 }
 
 
-QAbstractAnimation *QSGPathAnimation::qtAnimation()
+QAbstractAnimation *QQuickPathAnimation::qtAnimation()
 {
-    Q_D(QSGPathAnimation);
+    Q_D(QQuickPathAnimation);
     return d->pa;
 }
 
-void QSGPathAnimation::transition(QDeclarativeStateActions &actions,
+void QQuickPathAnimation::transition(QDeclarativeStateActions &actions,
                                            QDeclarativeProperties &modified,
                                            TransitionDirection direction)
 {
-    Q_D(QSGPathAnimation);
-    QSGPathAnimationUpdater *data = new QSGPathAnimationUpdater;
+    Q_D(QQuickPathAnimation);
+    QQuickPathAnimationUpdater *data = new QQuickPathAnimationUpdater;
 
     data->orientation = d->orientation;
     data->anchorPoint = d->anchorPoint;
@@ -655,7 +655,7 @@ void QSGPathAnimation::transition(QDeclarativeStateActions &actions,
             yet been deleted, and has the same target, etc, which may be a bit fragile.
          */
         if (d->pa->getAnimValue()) {
-            QSGPathAnimationUpdater *prevData = static_cast<QSGPathAnimationUpdater*>(d->pa->getAnimValue());
+            QQuickPathAnimationUpdater *prevData = static_cast<QQuickPathAnimationUpdater*>(d->pa->getAnimValue());
 
             // get the original start angle that was used (so we can exactly reverse).
             data->startRotation = prevData->startRotation;
@@ -687,7 +687,7 @@ void QSGPathAnimation::transition(QDeclarativeStateActions &actions,
     }
 }
 
-void QSGPathAnimationUpdater::setValue(qreal v)
+void QQuickPathAnimationUpdater::setValue(qreal v)
 {
     if (interruptStart.isValid()) {
         if (reverse)
@@ -709,7 +709,7 @@ void QSGPathAnimationUpdater::setValue(qreal v)
     }
 
     qreal angle;
-    bool fixed = orientation == QSGPathAnimation::Fixed;
+    bool fixed = orientation == QQuickPathAnimation::Fixed;
     QPointF currentPos = !painterPath.isEmpty() ? path->sequentialPointAt(painterPath, pathLength, attributePoints, prevBez, v, fixed ? 0 : &angle) : path->sequentialPointAt(v, fixed ? 0 : &angle);
 
     //adjust position according to anchor point
@@ -728,16 +728,16 @@ void QSGPathAnimationUpdater::setValue(qreal v)
     //adjust angle according to orientation
     if (!fixed) {
         switch (orientation) {
-            case QSGPathAnimation::RightFirst:
+            case QQuickPathAnimation::RightFirst:
                 angle = -angle;
                 break;
-            case QSGPathAnimation::TopFirst:
+            case QQuickPathAnimation::TopFirst:
                 angle = -angle + 90;
                 break;
-            case QSGPathAnimation::LeftFirst:
+            case QQuickPathAnimation::LeftFirst:
                 angle = -angle + 180;
                 break;
-            case QSGPathAnimation::BottomFirst:
+            case QQuickPathAnimation::BottomFirst:
                 angle = -angle + 270;
                 break;
             default:
diff --git a/src/declarative/items/qsganimation_p.h b/src/declarative/items/qquickanimation_p.h
index af6279aad0..2ce72249e2 100644
--- a/src/declarative/items/qsganimation_p.h
+++ b/src/declarative/items/qquickanimation_p.h
@@ -40,10 +40,10 @@
 **
 ****************************************************************************/
 
-#ifndef QSGANIMATION_H
-#define QSGANIMATION_H
+#ifndef QQUICKANIMATION_H
+#define QQUICKANIMATION_H
 
-#include "qsgitem.h"
+#include "qquickitem.h"
 
 #include <private/qdeclarativeanimation_p.h>
 
@@ -55,28 +55,28 @@ QT_BEGIN_NAMESPACE
 
 QT_MODULE(Declarative)
 
-class QSGParentAnimationPrivate;
-class QSGParentAnimation : public QDeclarativeAnimationGroup
+class QQuickParentAnimationPrivate;
+class QQuickParentAnimation : public QDeclarativeAnimationGroup
 {
     Q_OBJECT
-    Q_DECLARE_PRIVATE(QSGParentAnimation)
+    Q_DECLARE_PRIVATE(QQuickParentAnimation)
 
-    Q_PROPERTY(QSGItem *target READ target WRITE setTarget NOTIFY targetChanged)
-    Q_PROPERTY(QSGItem *newParent READ newParent WRITE setNewParent NOTIFY newParentChanged)
-    Q_PROPERTY(QSGItem *via READ via WRITE setVia NOTIFY viaChanged)
+    Q_PROPERTY(QQuickItem *target READ target WRITE setTarget NOTIFY targetChanged)
+    Q_PROPERTY(QQuickItem *newParent READ newParent WRITE setNewParent NOTIFY newParentChanged)
+    Q_PROPERTY(QQuickItem *via READ via WRITE setVia NOTIFY viaChanged)
 
 public:
-    QSGParentAnimation(QObject *parent=0);
-    virtual ~QSGParentAnimation();
+    QQuickParentAnimation(QObject *parent=0);
+    virtual ~QQuickParentAnimation();
 
-    QSGItem *target() const;
-    void setTarget(QSGItem *);
+    QQuickItem *target() const;
+    void setTarget(QQuickItem *);
 
-    QSGItem *newParent() const;
-    void setNewParent(QSGItem *);
+    QQuickItem *newParent() const;
+    void setNewParent(QQuickItem *);
 
-    QSGItem *via() const;
-    void setVia(QSGItem *);
+    QQuickItem *via() const;
+    void setVia(QQuickItem *);
 
 Q_SIGNALS:
     void targetChanged();
@@ -90,20 +90,20 @@ protected:
     virtual QAbstractAnimation *qtAnimation();
 };
 
-class QSGAnchorAnimationPrivate;
-class QSGAnchorAnimation : public QDeclarativeAbstractAnimation
+class QQuickAnchorAnimationPrivate;
+class QQuickAnchorAnimation : public QDeclarativeAbstractAnimation
 {
     Q_OBJECT
-    Q_DECLARE_PRIVATE(QSGAnchorAnimation)
-    Q_PROPERTY(QDeclarativeListProperty<QSGItem> targets READ targets)
+    Q_DECLARE_PRIVATE(QQuickAnchorAnimation)
+    Q_PROPERTY(QDeclarativeListProperty<QQuickItem> targets READ targets)
     Q_PROPERTY(int duration READ duration WRITE setDuration NOTIFY durationChanged)
     Q_PROPERTY(QEasingCurve easing READ easing WRITE setEasing NOTIFY easingChanged)
 
 public:
-    QSGAnchorAnimation(QObject *parent=0);
-    virtual ~QSGAnchorAnimation();
+    QQuickAnchorAnimation(QObject *parent=0);
+    virtual ~QQuickAnchorAnimation();
 
-    QDeclarativeListProperty<QSGItem> targets();
+    QDeclarativeListProperty<QQuickItem> targets();
 
     int duration() const;
     void setDuration(int);
@@ -122,18 +122,18 @@ protected:
     virtual QAbstractAnimation *qtAnimation();
 };
 
-class QSGItem;
+class QQuickItem;
 class QDeclarativePath;
-class QSGPathAnimationPrivate;
-class Q_AUTOTEST_EXPORT QSGPathAnimation : public QDeclarativeAbstractAnimation
+class QQuickPathAnimationPrivate;
+class Q_AUTOTEST_EXPORT QQuickPathAnimation : public QDeclarativeAbstractAnimation
 {
     Q_OBJECT
-    Q_DECLARE_PRIVATE(QSGPathAnimation)
+    Q_DECLARE_PRIVATE(QQuickPathAnimation)
 
     Q_PROPERTY(int duration READ duration WRITE setDuration NOTIFY durationChanged)
     Q_PROPERTY(QEasingCurve easing READ easing WRITE setEasing NOTIFY easingChanged)
     Q_PROPERTY(QDeclarativePath *path READ path WRITE setPath NOTIFY pathChanged)
-    Q_PROPERTY(QSGItem *target READ target WRITE setTarget NOTIFY targetChanged)
+    Q_PROPERTY(QQuickItem *target READ target WRITE setTarget NOTIFY targetChanged)
     Q_PROPERTY(Orientation orientation READ orientation WRITE setOrientation NOTIFY orientationChanged)
     Q_PROPERTY(QPointF anchorPoint READ anchorPoint WRITE setAnchorPoint NOTIFY anchorPointChanged)
     Q_PROPERTY(qreal orientationEntryInterval READ orientationEntryInterval WRITE setOrientationEntryInterval NOTIFY orientationEntryIntervalChanged)
@@ -141,8 +141,8 @@ class Q_AUTOTEST_EXPORT QSGPathAnimation : public QDeclarativeAbstractAnimation
     Q_PROPERTY(qreal endRotation READ endRotation WRITE setEndRotation NOTIFY endRotationChanged)
 
 public:
-    QSGPathAnimation(QObject *parent=0);
-    virtual ~QSGPathAnimation();
+    QQuickPathAnimation(QObject *parent=0);
+    virtual ~QQuickPathAnimation();
 
     enum Orientation {
         Fixed,
@@ -162,8 +162,8 @@ public:
     QDeclarativePath *path() const;
     void setPath(QDeclarativePath *);
 
-    QSGItem *target() const;
-    void setTarget(QSGItem *);
+    QQuickItem *target() const;
+    void setTarget(QQuickItem *);
 
     Orientation orientation() const;
     void setOrientation(Orientation orientation);
@@ -200,10 +200,10 @@ Q_SIGNALS:
 
 QT_END_NAMESPACE
 
-QML_DECLARE_TYPE(QSGParentAnimation)
-QML_DECLARE_TYPE(QSGAnchorAnimation)
-QML_DECLARE_TYPE(QSGPathAnimation)
+QML_DECLARE_TYPE(QQuickParentAnimation)
+QML_DECLARE_TYPE(QQuickAnchorAnimation)
+QML_DECLARE_TYPE(QQuickPathAnimation)
 
 QT_END_HEADER
 
-#endif // QSGANIMATION_H
+#endif // QQUICKANIMATION_H
diff --git a/src/declarative/items/qsganimation_p_p.h b/src/declarative/items/qquickanimation_p_p.h
index 276efc5eb4..de2b6d42f9 100644
--- a/src/declarative/items/qsganimation_p_p.h
+++ b/src/declarative/items/qquickanimation_p_p.h
@@ -40,8 +40,8 @@
 **
 ****************************************************************************/
 
-#ifndef QSGANIMATION_P_H
-#define QSGANIMATION_P_H
+#ifndef QQUICKANIMATION_P_H
+#define QQUICKANIMATION_P_H
 
 //
 //  W A R N I N G
@@ -54,53 +54,53 @@
 // We mean it.
 //
 
-#include "qsganimation_p.h"
+#include "qquickanimation_p.h"
 
 #include <private/qdeclarativepath_p.h>
 #include <private/qdeclarativeanimation_p_p.h>
 
 QT_BEGIN_NAMESPACE
 
-class QSGParentAnimationPrivate : public QDeclarativeAnimationGroupPrivate
+class QQuickParentAnimationPrivate : public QDeclarativeAnimationGroupPrivate
 {
-    Q_DECLARE_PUBLIC(QSGParentAnimation)
+    Q_DECLARE_PUBLIC(QQuickParentAnimation)
 public:
-    QSGParentAnimationPrivate()
+    QQuickParentAnimationPrivate()
     : QDeclarativeAnimationGroupPrivate(), target(0), newParent(0),
        via(0), topLevelGroup(0), startAction(0), endAction(0) {}
 
-    QSGItem *target;
-    QSGItem *newParent;
-    QSGItem *via;
+    QQuickItem *target;
+    QQuickItem *newParent;
+    QQuickItem *via;
 
     QSequentialAnimationGroup *topLevelGroup;
     QActionAnimation *startAction;
     QActionAnimation *endAction;
 
-    QPointF computeTransformOrigin(QSGItem::TransformOrigin origin, qreal width, qreal height) const;
+    QPointF computeTransformOrigin(QQuickItem::TransformOrigin origin, qreal width, qreal height) const;
 };
 
-class QSGAnchorAnimationPrivate : public QDeclarativeAbstractAnimationPrivate
+class QQuickAnchorAnimationPrivate : public QDeclarativeAbstractAnimationPrivate
 {
-    Q_DECLARE_PUBLIC(QSGAnchorAnimation)
+    Q_DECLARE_PUBLIC(QQuickAnchorAnimation)
 public:
-    QSGAnchorAnimationPrivate() : rangeIsSet(false), va(0),
+    QQuickAnchorAnimationPrivate() : rangeIsSet(false), va(0),
         interpolator(QVariantAnimationPrivate::getInterpolator(QMetaType::QReal)) {}
 
     bool rangeIsSet;
     QDeclarativeBulkValueAnimator *va;
     QVariantAnimation::Interpolator interpolator;
-    QList<QSGItem*> targets;
+    QList<QQuickItem*> targets;
 };
 
-class QSGPathAnimationUpdater : public QDeclarativeBulkValueUpdater
+class QQuickPathAnimationUpdater : public QDeclarativeBulkValueUpdater
 {
 public:
-    QSGPathAnimationUpdater() : path(0), target(0), reverse(false),
+    QQuickPathAnimationUpdater() : path(0), target(0), reverse(false),
         fromSourced(false), fromDefined(false), toDefined(false),
-        toX(0), toY(0), currentV(0), orientation(QSGPathAnimation::Fixed),
+        toX(0), toY(0), currentV(0), orientation(QQuickPathAnimation::Fixed),
         entryInterval(0), exitInterval(0) {}
-    ~QSGPathAnimationUpdater() {}
+    ~QQuickPathAnimationUpdater() {}
 
         void setValue(qreal v);
 
@@ -111,7 +111,7 @@ public:
     qreal pathLength;
     QList<QDeclarativePath::AttributePoint> attributePoints;
 
-    QSGItem *target;
+    QQuickItem *target;
     bool reverse;
     bool fromSourced;
     bool fromDefined;
@@ -121,7 +121,7 @@ public:
     qreal currentV;
     QDeclarativeNullableValue<qreal> interruptStart;
     //TODO: bundle below into common struct
-    QSGPathAnimation::Orientation orientation;
+    QQuickPathAnimation::Orientation orientation;
     QPointF anchorPoint;
     qreal entryInterval;
     qreal exitInterval;
@@ -129,17 +129,17 @@ public:
     QDeclarativeNullableValue<qreal> startRotation;
 };
 
-class QSGPathAnimationPrivate : public QDeclarativeAbstractAnimationPrivate
+class QQuickPathAnimationPrivate : public QDeclarativeAbstractAnimationPrivate
 {
-    Q_DECLARE_PUBLIC(QSGPathAnimation)
+    Q_DECLARE_PUBLIC(QQuickPathAnimation)
 public:
-    QSGPathAnimationPrivate() : path(0), target(0),
-        rangeIsSet(false), orientation(QSGPathAnimation::Fixed), entryInterval(0), exitInterval(0), pa(0) {}
+    QQuickPathAnimationPrivate() : path(0), target(0),
+        rangeIsSet(false), orientation(QQuickPathAnimation::Fixed), entryInterval(0), exitInterval(0), pa(0) {}
 
     QDeclarativePath *path;
-    QSGItem *target;
+    QQuickItem *target;
     bool rangeIsSet;
-    QSGPathAnimation::Orientation orientation;
+    QQuickPathAnimation::Orientation orientation;
     QPointF anchorPoint;
     qreal entryInterval;
     qreal exitInterval;
@@ -150,4 +150,4 @@ public:
 
 QT_END_NAMESPACE
 
-#endif // QSGANIMATION_P_H
+#endif // QQUICKANIMATION_P_H
diff --git a/src/declarative/items/qsgborderimage.cpp b/src/declarative/items/qquickborderimage.cpp
index fb407d7e2c..92c1c6d115 100644
--- a/src/declarative/items/qsgborderimage.cpp
+++ b/src/declarative/items/qquickborderimage.cpp
@@ -39,9 +39,9 @@
 **
 ****************************************************************************/
 
-#include "qsgborderimage_p.h"
-#include "qsgborderimage_p_p.h"
-#include "qsgninepatchnode_p.h"
+#include "qquickborderimage_p.h"
+#include "qquickborderimage_p_p.h"
+#include "qquickninepatchnode_p.h"
 
 #include <QtDeclarative/qdeclarativeinfo.h>
 #include <QtCore/qfile.h>
@@ -52,7 +52,7 @@ QT_BEGIN_NAMESPACE
 
 
 /*!
-    \qmlclass BorderImage QSGBorderImage
+    \qmlclass BorderImage QQuickBorderImage
     \inqmlmodule QtQuick 2
     \brief The BorderImage element provides an image that can be used as a border.
     \inherits Item
@@ -163,14 +163,14 @@ QT_BEGIN_NAMESPACE
     local filesystem.  Images loaded via a network resource (e.g. HTTP)
     are always loaded asynchonously.
 */
-QSGBorderImage::QSGBorderImage(QSGItem *parent)
-: QSGImageBase(*(new QSGBorderImagePrivate), parent)
+QQuickBorderImage::QQuickBorderImage(QQuickItem *parent)
+: QQuickImageBase(*(new QQuickBorderImagePrivate), parent)
 {
 }
 
-QSGBorderImage::~QSGBorderImage()
+QQuickBorderImage::~QQuickBorderImage()
 {
-    Q_D(QSGBorderImage);
+    Q_D(QQuickBorderImage);
     if (d->sciReply)
         d->sciReply->deleteLater();
 }
@@ -268,9 +268,9 @@ QSGBorderImage::~QSGBorderImage()
 
     \sa Image::sourceSize
 */
-void QSGBorderImage::setSource(const QUrl &url)
+void QQuickBorderImage::setSource(const QUrl &url)
 {
-    Q_D(QSGBorderImage);
+    Q_D(QQuickBorderImage);
     //equality is fairly expensive, so we bypass for simple, common case
     if ((d->url.isEmpty() == url.isEmpty()) && url == d->url)
         return;
@@ -288,9 +288,9 @@ void QSGBorderImage::setSource(const QUrl &url)
         load();
 }
 
-void QSGBorderImage::load()
+void QQuickBorderImage::load()
 {
-    Q_D(QSGBorderImage);
+    Q_D(QQuickBorderImage);
     if (d->progress != 0.0) {
         d->progress = 0.0;
         emit progressChanged(d->progress);
@@ -310,7 +310,7 @@ void QSGBorderImage::load()
             if (!lf.isEmpty()) {
                 QFile file(lf);
                 file.open(QIODevice::ReadOnly);
-                setGridScaledImage(QSGGridScaledImage(&file));
+                setGridScaledImage(QQuickGridScaledImage(&file));
             } else {
                 QNetworkRequest req(d->url);
                 d->sciReply = qmlEngine(this)->networkAccessManager()->get(req);
@@ -381,9 +381,9 @@ void QSGBorderImage::load()
     \l {BorderImage::source}{.sci file}.
 */
 
-QSGScaleGrid *QSGBorderImage::border()
+QQuickScaleGrid *QQuickBorderImage::border()
 {
-    Q_D(QSGBorderImage);
+    Q_D(QQuickBorderImage);
     return d->getScaleGrid();
 }
 
@@ -401,15 +401,15 @@ QSGScaleGrid *QSGBorderImage::border()
 
     The default tile mode for each property is BorderImage.Stretch.
 */
-QSGBorderImage::TileMode QSGBorderImage::horizontalTileMode() const
+QQuickBorderImage::TileMode QQuickBorderImage::horizontalTileMode() const
 {
-    Q_D(const QSGBorderImage);
+    Q_D(const QQuickBorderImage);
     return d->horizontalTileMode;
 }
 
-void QSGBorderImage::setHorizontalTileMode(TileMode t)
+void QQuickBorderImage::setHorizontalTileMode(TileMode t)
 {
-    Q_D(QSGBorderImage);
+    Q_D(QQuickBorderImage);
     if (t != d->horizontalTileMode) {
         d->horizontalTileMode = t;
         emit horizontalTileModeChanged();
@@ -417,15 +417,15 @@ void QSGBorderImage::setHorizontalTileMode(TileMode t)
     }
 }
 
-QSGBorderImage::TileMode QSGBorderImage::verticalTileMode() const
+QQuickBorderImage::TileMode QQuickBorderImage::verticalTileMode() const
 {
-    Q_D(const QSGBorderImage);
+    Q_D(const QQuickBorderImage);
     return d->verticalTileMode;
 }
 
-void QSGBorderImage::setVerticalTileMode(TileMode t)
+void QQuickBorderImage::setVerticalTileMode(TileMode t)
 {
-    Q_D(QSGBorderImage);
+    Q_D(QQuickBorderImage);
     if (t != d->verticalTileMode) {
         d->verticalTileMode = t;
         emit verticalTileModeChanged();
@@ -433,14 +433,14 @@ void QSGBorderImage::setVerticalTileMode(TileMode t)
     }
 }
 
-void QSGBorderImage::setGridScaledImage(const QSGGridScaledImage& sci)
+void QQuickBorderImage::setGridScaledImage(const QQuickGridScaledImage& sci)
 {
-    Q_D(QSGBorderImage);
+    Q_D(QQuickBorderImage);
     if (!sci.isValid()) {
         d->status = Error;
         emit statusChanged(d->status);
     } else {
-        QSGScaleGrid *sg = border();
+        QQuickScaleGrid *sg = border();
         sg->setTop(sci.gridTop());
         sg->setBottom(sci.gridBottom());
         sg->setLeft(sci.gridLeft());
@@ -463,9 +463,9 @@ void QSGBorderImage::setGridScaledImage(const QSGGridScaledImage& sci)
             static int thisRequestFinished = -1;
             if (thisRequestProgress == -1) {
                 thisRequestProgress =
-                    QSGBorderImage::staticMetaObject.indexOfSlot("requestProgress(qint64,qint64)");
+                    QQuickBorderImage::staticMetaObject.indexOfSlot("requestProgress(qint64,qint64)");
                 thisRequestFinished =
-                    QSGBorderImage::staticMetaObject.indexOfSlot("requestFinished()");
+                    QQuickBorderImage::staticMetaObject.indexOfSlot("requestFinished()");
             }
 
             d->pix.connectFinished(this, thisRequestFinished);
@@ -493,9 +493,9 @@ void QSGBorderImage::setGridScaledImage(const QSGGridScaledImage& sci)
     }
 }
 
-void QSGBorderImage::requestFinished()
+void QQuickBorderImage::requestFinished()
 {
-    Q_D(QSGBorderImage);
+    Q_D(QQuickBorderImage);
 
     QSize impsize = d->pix.implicitSize();
     if (d->pix.isError()) {
@@ -519,9 +519,9 @@ void QSGBorderImage::requestFinished()
 
 #define BORDERIMAGE_MAX_REDIRECT 16
 
-void QSGBorderImage::sciRequestFinished()
+void QQuickBorderImage::sciRequestFinished()
 {
-    Q_D(QSGBorderImage);
+    Q_D(QQuickBorderImage);
 
     d->redirectCount++;
     if (d->redirectCount < BORDERIMAGE_MAX_REDIRECT) {
@@ -540,21 +540,21 @@ void QSGBorderImage::sciRequestFinished()
         d->sciReply = 0;
         emit statusChanged(d->status);
     } else {
-        QSGGridScaledImage sci(d->sciReply);
+        QQuickGridScaledImage sci(d->sciReply);
         d->sciReply->deleteLater();
         d->sciReply = 0;
         setGridScaledImage(sci);
     }
 }
 
-void QSGBorderImage::doUpdate()
+void QQuickBorderImage::doUpdate()
 {
     update();
 }
 
-QSGNode *QSGBorderImage::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *)
+QSGNode *QQuickBorderImage::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *)
 {
-    Q_D(QSGBorderImage);
+    Q_D(QQuickBorderImage);
 
     QSGTexture *texture = d->pix.texture(d->sceneGraphContext());
 
@@ -563,17 +563,17 @@ QSGNode *QSGBorderImage::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *
         return 0;
     }
 
-    QSGNinePatchNode *node = static_cast<QSGNinePatchNode *>(oldNode);
+    QQuickNinePatchNode *node = static_cast<QQuickNinePatchNode *>(oldNode);
 
     if (!node) {
-        node = new QSGNinePatchNode();
+        node = new QQuickNinePatchNode();
     }
 
     node->setTexture(texture);
 
     // Don't implicitly create the scalegrid in the rendering thread...
     if (d->border) {
-        const QSGScaleGrid *border = d->getScaleGrid();
+        const QQuickScaleGrid *border = d->getScaleGrid();
         node->setInnerRect(QRectF(border->left(),
                                   border->top(),
                                   qMax(1, d->pix.width() - border->right() - border->left()),
@@ -591,9 +591,9 @@ QSGNode *QSGBorderImage::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *
     return node;
 }
 
-void QSGBorderImage::pixmapChange()
+void QQuickBorderImage::pixmapChange()
 {
-    Q_D(QSGBorderImage);
+    Q_D(QQuickBorderImage);
 
     d->pixmapChanged = true;
 }
diff --git a/src/declarative/items/qsgborderimage_p.h b/src/declarative/items/qquickborderimage_p.h
index c88a61bfd4..0af6fca55d 100644
--- a/src/declarative/items/qsgborderimage_p.h
+++ b/src/declarative/items/qquickborderimage_p.h
@@ -40,35 +40,35 @@
 **
 ****************************************************************************/
 
-#ifndef QSGBORDERIMAGE_P_H
-#define QSGBORDERIMAGE_P_H
+#ifndef QQUICKBORDERIMAGE_P_H
+#define QQUICKBORDERIMAGE_P_H
 
-#include "qsgimagebase_p.h"
+#include "qquickimagebase_p.h"
 
 QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE
 
 QT_MODULE(Declarative)
 
-class QSGScaleGrid;
-class QSGGridScaledImage;
-class QSGBorderImagePrivate;
-class Q_AUTOTEST_EXPORT QSGBorderImage : public QSGImageBase
+class QQuickScaleGrid;
+class QQuickGridScaledImage;
+class QQuickBorderImagePrivate;
+class Q_AUTOTEST_EXPORT QQuickBorderImage : public QQuickImageBase
 {
     Q_OBJECT
     Q_ENUMS(TileMode)
 
-    Q_PROPERTY(QSGScaleGrid *border READ border CONSTANT)
+    Q_PROPERTY(QQuickScaleGrid *border READ border CONSTANT)
     Q_PROPERTY(TileMode horizontalTileMode READ horizontalTileMode WRITE setHorizontalTileMode NOTIFY horizontalTileModeChanged)
     Q_PROPERTY(TileMode verticalTileMode READ verticalTileMode WRITE setVerticalTileMode NOTIFY verticalTileModeChanged)
     // read-only for BorderImage
     Q_PROPERTY(QSize sourceSize READ sourceSize NOTIFY sourceSizeChanged)
 
 public:
-    QSGBorderImage(QSGItem *parent=0);
-    ~QSGBorderImage();
+    QQuickBorderImage(QQuickItem *parent=0);
+    ~QQuickBorderImage();
 
-    QSGScaleGrid *border();
+    QQuickScaleGrid *border();
 
     enum TileMode { Stretch = Qt::StretchTile, Repeat = Qt::RepeatTile, Round = Qt::RoundTile };
 
@@ -91,7 +91,7 @@ protected:
     virtual QSGNode *updatePaintNode(QSGNode *, UpdatePaintNodeData *);
 
 private:
-    void setGridScaledImage(const QSGGridScaledImage& sci);
+    void setGridScaledImage(const QQuickGridScaledImage& sci);
 
 private Q_SLOTS:
     void doUpdate();
@@ -99,12 +99,12 @@ private Q_SLOTS:
     void sciRequestFinished();
 
 private:
-    Q_DISABLE_COPY(QSGBorderImage)
-    Q_DECLARE_PRIVATE(QSGBorderImage)
+    Q_DISABLE_COPY(QQuickBorderImage)
+    Q_DECLARE_PRIVATE(QQuickBorderImage)
 };
 
 QT_END_NAMESPACE
-QML_DECLARE_TYPE(QSGBorderImage)
+QML_DECLARE_TYPE(QQuickBorderImage)
 QT_END_HEADER
 
-#endif // QSGBORDERIMAGE_P_H
+#endif // QQUICKBORDERIMAGE_P_H
diff --git a/src/declarative/items/qsgborderimage_p_p.h b/src/declarative/items/qquickborderimage_p_p.h
index 27816697f4..1875dc082a 100644
--- a/src/declarative/items/qsgborderimage_p_p.h
+++ b/src/declarative/items/qquickborderimage_p_p.h
@@ -40,8 +40,8 @@
 **
 ****************************************************************************/
 
-#ifndef QSGBORDERIMAGE_P_P_H
-#define QSGBORDERIMAGE_P_P_H
+#ifndef QQUICKBORDERIMAGE_P_P_H
+#define QQUICKBORDERIMAGE_P_P_H
 
 //
 //  W A R N I N G
@@ -54,45 +54,45 @@
 // We mean it.
 //
 
-#include "qsgimagebase_p_p.h"
-#include "qsgscalegrid_p_p.h"
+#include "qquickimagebase_p_p.h"
+#include "qquickscalegrid_p_p.h"
 
 QT_BEGIN_NAMESPACE
 
 class QNetworkReply;
-class QSGBorderImagePrivate : public QSGImageBasePrivate
+class QQuickBorderImagePrivate : public QQuickImageBasePrivate
 {
-    Q_DECLARE_PUBLIC(QSGBorderImage)
+    Q_DECLARE_PUBLIC(QQuickBorderImage)
 
 public:
-    QSGBorderImagePrivate()
+    QQuickBorderImagePrivate()
       : border(0), sciReply(0),
-        horizontalTileMode(QSGBorderImage::Stretch),
-        verticalTileMode(QSGBorderImage::Stretch),
+        horizontalTileMode(QQuickBorderImage::Stretch),
+        verticalTileMode(QQuickBorderImage::Stretch),
         redirectCount(0), pixmapChanged(false)
     {
     }
 
-    ~QSGBorderImagePrivate()
+    ~QQuickBorderImagePrivate()
     {
     }
 
 
-    QSGScaleGrid *getScaleGrid()
+    QQuickScaleGrid *getScaleGrid()
     {
-        Q_Q(QSGBorderImage);
+        Q_Q(QQuickBorderImage);
         if (!border) {
-            border = new QSGScaleGrid(q);
+            border = new QQuickScaleGrid(q);
             FAST_CONNECT(border, SIGNAL(borderChanged()), q, SLOT(doUpdate()))
         }
         return border;
     }
 
-    QSGScaleGrid *border;
+    QQuickScaleGrid *border;
     QUrl sciurl;
     QNetworkReply *sciReply;
-    QSGBorderImage::TileMode horizontalTileMode;
-    QSGBorderImage::TileMode verticalTileMode;
+    QQuickBorderImage::TileMode horizontalTileMode;
+    QQuickBorderImage::TileMode verticalTileMode;
     int redirectCount;
 
     bool pixmapChanged : 1;
@@ -100,4 +100,4 @@ public:
 
 QT_END_NAMESPACE
 
-#endif // QSGBORDERIMAGE_P_P_H
+#endif // QQUICKBORDERIMAGE_P_P_H
diff --git a/src/declarative/items/qsgcanvas.cpp b/src/declarative/items/qquickcanvas.cpp
index 1e3562775f..8f87ce7a9c 100644
--- a/src/declarative/items/qsgcanvas.cpp
+++ b/src/declarative/items/qquickcanvas.cpp
@@ -39,11 +39,11 @@
 **
 ****************************************************************************/
 
-#include "qsgcanvas.h"
-#include "qsgcanvas_p.h"
+#include "qquickcanvas.h"
+#include "qquickcanvas_p.h"
 
-#include "qsgitem.h"
-#include "qsgitem_p.h"
+#include "qquickitem.h"
+#include "qquickitem_p.h"
 
 #include <private/qsgrenderer_p.h>
 #include <private/qsgflashnode_p.h>
@@ -64,9 +64,9 @@
 
 QT_BEGIN_NAMESPACE
 
-#define QSG_CANVAS_TIMING
-#ifdef QSG_CANVAS_TIMING
-static bool qsg_canvas_timing = !qgetenv("QML_CANVAS_TIMING").isEmpty();
+#define QQUICK_CANVAS_TIMING
+#ifdef QQUICK_CANVAS_TIMING
+static bool qquick_canvas_timing = !qgetenv("QML_CANVAS_TIMING").isEmpty();
 static QTime threadTimer;
 static int syncTime;
 static int renderTime;
@@ -78,18 +78,18 @@ DEFINE_BOOL_CONFIG_OPTION(qmlNoThreadedRenderer, QML_BAD_GUI_RENDER_LOOP)
 
 extern Q_GUI_EXPORT QImage qt_gl_read_framebuffer(const QSize &size, bool alpha_format, bool include_alpha);
 
-void QSGCanvasPrivate::updateFocusItemTransform()
+void QQuickCanvasPrivate::updateFocusItemTransform()
 {
-    Q_Q(QSGCanvas);
-    QSGItem *focus = q->activeFocusItem();
+    Q_Q(QQuickCanvas);
+    QQuickItem *focus = q->activeFocusItem();
     if (focus && qApp->inputPanel()->inputItem() == focus)
-        qApp->inputPanel()->setInputItemTransform(QSGItemPrivate::get(focus)->itemToCanvasTransform());
+        qApp->inputPanel()->setInputItemTransform(QQuickItemPrivate::get(focus)->itemToCanvasTransform());
 }
 
-class QSGCanvasIncubationController : public QObject, public QDeclarativeIncubationController
+class QQuickCanvasIncubationController : public QObject, public QDeclarativeIncubationController
 {
 public:
-    QSGCanvasIncubationController(QSGCanvasPrivate *canvas) 
+    QQuickCanvasIncubationController(QQuickCanvasPrivate *canvas)
     : m_canvas(canvas), m_eventSent(false) {}
 
 protected:
@@ -121,19 +121,19 @@ protected:
     }
 
 private:
-    QSGCanvasPrivate *m_canvas;
+    QQuickCanvasPrivate *m_canvas;
     bool m_eventSent;
 };
 
-class QSGCanvasPlainRenderLoop : public QObject, public QSGCanvasRenderLoop
+class QQuickCanvasPlainRenderLoop : public QObject, public QQuickCanvasRenderLoop
 {
 public:
-    QSGCanvasPlainRenderLoop()
+    QQuickCanvasPlainRenderLoop()
         : updatePending(false)
         , animationRunning(false)
     {
-        qWarning("QSGCanvas: using non-threaded render loop. Be very sure to not access scene graph "
-                 "objects outside the QSGItem::updatePaintNode() call. Failing to do so will cause "
+        qWarning("QQuickCanvas: using non-threaded render loop. Be very sure to not access scene graph "
+                 "objects outside the QQuickItem::updatePaintNode() call. Failing to do so will cause "
                  "your code to crash on other platforms!");
     }
 
@@ -293,40 +293,40 @@ int sceneGraphRenderTime;
 int readbackTime;
 #endif
 
-QSGItem::UpdatePaintNodeData::UpdatePaintNodeData()
+QQuickItem::UpdatePaintNodeData::UpdatePaintNodeData()
 : transformNode(0)
 {
 }
 
-QSGRootItem::QSGRootItem()
+QQuickRootItem::QQuickRootItem()
 {
 }
 
-void QSGCanvas::exposeEvent(QExposeEvent *)
+void QQuickCanvas::exposeEvent(QExposeEvent *)
 {
-    Q_D(QSGCanvas);
+    Q_D(QQuickCanvas);
     d->thread->paint();
 }
 
-void QSGCanvas::resizeEvent(QResizeEvent *)
+void QQuickCanvas::resizeEvent(QResizeEvent *)
 {
-    Q_D(QSGCanvas);
+    Q_D(QQuickCanvas);
     d->thread->resize(size());
 }
 
-void QSGCanvas::animationStarted()
+void QQuickCanvas::animationStarted()
 {
     d_func()->thread->animationStarted();
 }
 
-void QSGCanvas::animationStopped()
+void QQuickCanvas::animationStopped()
 {
     d_func()->thread->animationStopped();
 }
 
-void QSGCanvas::showEvent(QShowEvent *)
+void QQuickCanvas::showEvent(QShowEvent *)
 {
-    Q_D(QSGCanvas);
+    Q_D(QQuickCanvas);
     if (d->vsyncAnimations) {
         if (!d->animationDriver) {
             d->animationDriver = d->context->createAnimationDriver(this);
@@ -342,9 +342,9 @@ void QSGCanvas::showEvent(QShowEvent *)
     }
 }
 
-void QSGCanvas::hideEvent(QHideEvent *)
+void QQuickCanvas::hideEvent(QHideEvent *)
 {
-    Q_D(QSGCanvas);
+    Q_D(QQuickCanvas);
     d->thread->stopRendering();
 }
 
@@ -353,21 +353,21 @@ void QSGCanvas::hideEvent(QHideEvent *)
 /*!
     Sets weither this canvas should use vsync driven animations.
 
-    This option can only be set on one single QSGCanvas, and that it's
+    This option can only be set on one single QQuickCanvas, and that it's
     vsync signal will then be used to drive all animations in the
     process.
 
-    This feature is primarily useful for single QSGCanvas, QML-only
+    This feature is primarily useful for single QQuickCanvas, QML-only
     applications.
 
-    \warning Enabling vsync on multiple QSGCanvas instances has
+    \warning Enabling vsync on multiple QQuickCanvas instances has
     undefined behavior.
  */
-void QSGCanvas::setVSyncAnimations(bool enabled)
+void QQuickCanvas::setVSyncAnimations(bool enabled)
 {
-    Q_D(QSGCanvas);
+    Q_D(QQuickCanvas);
     if (visible()) {
-        qWarning("QSGCanvas::setVSyncAnimations: Cannot be changed when widget is shown");
+        qWarning("QQuickCanvas::setVSyncAnimations: Cannot be changed when widget is shown");
         return;
     }
     d->vsyncAnimations = enabled;
@@ -379,13 +379,13 @@ void QSGCanvas::setVSyncAnimations(bool enabled)
     Returns true if this canvas should use vsync driven animations;
     otherwise returns false.
  */
-bool QSGCanvas::vsyncAnimations() const
+bool QQuickCanvas::vsyncAnimations() const
 {
-    Q_D(const QSGCanvas);
+    Q_D(const QQuickCanvas);
     return d->vsyncAnimations;
 }
 
-void QSGCanvasPrivate::initializeSceneGraph()
+void QQuickCanvasPrivate::initializeSceneGraph()
 {
     if (!context)
         context = QSGContext::createDefaultContext();
@@ -396,37 +396,37 @@ void QSGCanvasPrivate::initializeSceneGraph()
     QOpenGLContext *glctx = const_cast<QOpenGLContext *>(QOpenGLContext::currentContext());
     context->initialize(glctx);
 
-    Q_Q(QSGCanvas);
+    Q_Q(QQuickCanvas);
     QObject::connect(context->renderer(), SIGNAL(sceneGraphChanged()), q, SLOT(maybeUpdate()),
                      Qt::DirectConnection);
 
-    if (!QSGItemPrivate::get(rootItem)->itemNode()->parent()) {
-        context->rootNode()->appendChildNode(QSGItemPrivate::get(rootItem)->itemNode());
+    if (!QQuickItemPrivate::get(rootItem)->itemNode()->parent()) {
+        context->rootNode()->appendChildNode(QQuickItemPrivate::get(rootItem)->itemNode());
     }
 
     emit q_func()->sceneGraphInitialized();
 }
 
-void QSGCanvasPrivate::polishItems()
+void QQuickCanvasPrivate::polishItems()
 {
     while (!itemsToPolish.isEmpty()) {
-        QSet<QSGItem *>::Iterator iter = itemsToPolish.begin();
-        QSGItem *item = *iter;
+        QSet<QQuickItem *>::Iterator iter = itemsToPolish.begin();
+        QQuickItem *item = *iter;
         itemsToPolish.erase(iter);
-        QSGItemPrivate::get(item)->polishScheduled = false;
+        QQuickItemPrivate::get(item)->polishScheduled = false;
         item->updatePolish();
     }
     updateFocusItemTransform();
 }
 
 
-void QSGCanvasPrivate::syncSceneGraph()
+void QQuickCanvasPrivate::syncSceneGraph()
 {
     updateDirtyNodes();
 }
 
 
-void QSGCanvasPrivate::renderSceneGraph(const QSize &size)
+void QQuickCanvasPrivate::renderSceneGraph(const QSize &size)
 {
     context->renderer()->setDeviceRect(QRect(QPoint(0, 0), size));
     context->renderer()->setViewportRect(QRect(QPoint(0, 0), renderTarget ? renderTarget->size() : size));
@@ -447,13 +447,13 @@ void QSGCanvasPrivate::renderSceneGraph(const QSize &size)
 
 
 // ### Do we need this?
-void QSGCanvas::sceneGraphChanged()
+void QQuickCanvas::sceneGraphChanged()
 {
-//    Q_D(QSGCanvas);
+//    Q_D(QQuickCanvas);
 //    d->needsRepaint = true;
 }
 
-QSGCanvasPrivate::QSGCanvasPrivate()
+QQuickCanvasPrivate::QQuickCanvasPrivate()
     : rootItem(0)
     , activeFocusItem(0)
     , mouseGrabberItem(0)
@@ -467,22 +467,22 @@ QSGCanvasPrivate::QSGCanvasPrivate()
 {
 }
 
-QSGCanvasPrivate::~QSGCanvasPrivate()
+QQuickCanvasPrivate::~QQuickCanvasPrivate()
 {
 }
 
-void QSGCanvasPrivate::init(QSGCanvas *c)
+void QQuickCanvasPrivate::init(QQuickCanvas *c)
 {
     QUnifiedTimer::instance(true)->setConsistentTiming(qmlFixedAnimationStep());
 
     q_ptr = c;
 
-    Q_Q(QSGCanvas);
+    Q_Q(QQuickCanvas);
 
-    rootItem = new QSGRootItem;
-    QSGItemPrivate *rootItemPrivate = QSGItemPrivate::get(rootItem);
+    rootItem = new QQuickRootItem;
+    QQuickItemPrivate *rootItemPrivate = QQuickItemPrivate::get(rootItem);
     rootItemPrivate->canvas = q;
-    rootItemPrivate->flags |= QSGItem::ItemIsFocusScope;
+    rootItemPrivate->flags |= QQuickItem::ItemIsFocusScope;
 
     // QML always has focus. It is important that this call happens after the rootItem
     // has a canvas..
@@ -491,14 +491,14 @@ void QSGCanvasPrivate::init(QSGCanvas *c)
     bool threaded = !qmlNoThreadedRenderer();
 
     if (!QGuiApplicationPrivate::platformIntegration()->hasCapability(QPlatformIntegration::ThreadedOpenGL)) {
-        qWarning("QSGCanvas: platform does not support threaded rendering!");
+        qWarning("QQuickCanvas: platform does not support threaded rendering!");
         threaded = false;
     }
 
     if (threaded)
-        thread = new QSGCanvasRenderThread();
+        thread = new QQuickCanvasRenderThread();
     else
-        thread = new QSGCanvasPlainRenderLoop();
+        thread = new QQuickCanvasPlainRenderLoop();
 
     thread->renderer = q;
     thread->d = this;
@@ -510,7 +510,7 @@ void QSGCanvasPrivate::init(QSGCanvas *c)
     q->setFormat(context->defaultSurfaceFormat());
 }
 
-void QSGCanvasPrivate::transformTouchPoints(QList<QTouchEvent::TouchPoint> &touchPoints, const QTransform &transform)
+void QQuickCanvasPrivate::transformTouchPoints(QList<QTouchEvent::TouchPoint> &touchPoints, const QTransform &transform)
 {
     for (int i=0; i<touchPoints.count(); i++) {
         QTouchEvent::TouchPoint &touchPoint = touchPoints[i];
@@ -525,9 +525,9 @@ void QSGCanvasPrivate::transformTouchPoints(QList<QTouchEvent::TouchPoint> &touc
 Translates the data in \a touchEvent to this canvas.  This method leaves the item local positions in
 \a touchEvent untouched (these are filled in later).
 */
-void QSGCanvasPrivate::translateTouchEvent(QTouchEvent *touchEvent)
+void QQuickCanvasPrivate::translateTouchEvent(QTouchEvent *touchEvent)
 {
-//    Q_Q(QSGCanvas);
+//    Q_Q(QQuickCanvas);
 
 //    touchEvent->setWidget(q); // ### refactor...
 
@@ -549,29 +549,29 @@ void QSGCanvasPrivate::translateTouchEvent(QTouchEvent *touchEvent)
     touchEvent->setTouchPoints(touchPoints);
 }
 
-void QSGCanvasPrivate::setFocusInScope(QSGItem *scope, QSGItem *item, FocusOptions options)
+void QQuickCanvasPrivate::setFocusInScope(QQuickItem *scope, QQuickItem *item, FocusOptions options)
 {
-    Q_Q(QSGCanvas);
+    Q_Q(QQuickCanvas);
 
     Q_ASSERT(item);
     Q_ASSERT(scope || item == rootItem);
 
 #ifdef FOCUS_DEBUG
-    qWarning() << "QSGCanvasPrivate::setFocusInScope():";
+    qWarning() << "QQuickCanvasPrivate::setFocusInScope():";
     qWarning() << "    scope:" << (QObject *)scope;
     if (scope)
-        qWarning() << "    scopeSubFocusItem:" << (QObject *)QSGItemPrivate::get(scope)->subFocusItem;
+        qWarning() << "    scopeSubFocusItem:" << (QObject *)QQuickItemPrivate::get(scope)->subFocusItem;
     qWarning() << "    item:" << (QObject *)item;
     qWarning() << "    activeFocusItem:" << (QObject *)activeFocusItem;
 #endif
 
-    QSGItemPrivate *scopePrivate = scope ? QSGItemPrivate::get(scope) : 0;
-    QSGItemPrivate *itemPrivate = QSGItemPrivate::get(item);
+    QQuickItemPrivate *scopePrivate = scope ? QQuickItemPrivate::get(scope) : 0;
+    QQuickItemPrivate *itemPrivate = QQuickItemPrivate::get(item);
 
-    QSGItem *oldActiveFocusItem = 0;
-    QSGItem *newActiveFocusItem = 0;
+    QQuickItem *oldActiveFocusItem = 0;
+    QQuickItem *newActiveFocusItem = 0;
 
-    QVarLengthArray<QSGItem *, 20> changed;
+    QVarLengthArray<QQuickItem *, 20> changed;
 
     // Does this change the active focus?
     if (item == rootItem || scopePrivate->activeFocus) {
@@ -589,10 +589,10 @@ void QSGCanvasPrivate::setFocusInScope(QSGItem *scope, QSGItem *item, FocusOptio
             QFocusEvent event(QEvent::FocusOut, Qt::OtherFocusReason);
             q->sendEvent(oldActiveFocusItem, &event);
 
-            QSGItem *afi = oldActiveFocusItem;
+            QQuickItem *afi = oldActiveFocusItem;
             while (afi != scope) {
-                if (QSGItemPrivate::get(afi)->activeFocus) {
-                    QSGItemPrivate::get(afi)->activeFocus = false;
+                if (QQuickItemPrivate::get(afi)->activeFocus) {
+                    QQuickItemPrivate::get(afi)->activeFocus = false;
                     changed << afi;
                 }
                 afi = afi->parentItem();
@@ -601,26 +601,26 @@ void QSGCanvasPrivate::setFocusInScope(QSGItem *scope, QSGItem *item, FocusOptio
     }
 
     if (item != rootItem) {
-        QSGItem *oldSubFocusItem = scopePrivate->subFocusItem;
+        QQuickItem *oldSubFocusItem = scopePrivate->subFocusItem;
         // Correct focus chain in scope
         if (oldSubFocusItem) {
-            QSGItem *sfi = scopePrivate->subFocusItem->parentItem();
+            QQuickItem *sfi = scopePrivate->subFocusItem->parentItem();
             while (sfi != scope) {
-                QSGItemPrivate::get(sfi)->subFocusItem = 0;
+                QQuickItemPrivate::get(sfi)->subFocusItem = 0;
                 sfi = sfi->parentItem();
             }
         }
         {
             scopePrivate->subFocusItem = item;
-            QSGItem *sfi = scopePrivate->subFocusItem->parentItem();
+            QQuickItem *sfi = scopePrivate->subFocusItem->parentItem();
             while (sfi != scope) {
-                QSGItemPrivate::get(sfi)->subFocusItem = item;
+                QQuickItemPrivate::get(sfi)->subFocusItem = item;
                 sfi = sfi->parentItem();
             }
         }
 
         if (oldSubFocusItem) {
-            QSGItemPrivate::get(oldSubFocusItem)->focus = false;
+            QQuickItemPrivate::get(oldSubFocusItem)->focus = false;
             changed << oldSubFocusItem;
         }
     }
@@ -635,13 +635,13 @@ void QSGCanvasPrivate::setFocusInScope(QSGItem *scope, QSGItem *item, FocusOptio
     if (newActiveFocusItem) { // ### refactor:  && q->hasFocus()) {
         activeFocusItem = newActiveFocusItem;
 
-        QSGItemPrivate::get(newActiveFocusItem)->activeFocus = true;
+        QQuickItemPrivate::get(newActiveFocusItem)->activeFocus = true;
         changed << newActiveFocusItem;
 
-        QSGItem *afi = newActiveFocusItem->parentItem();
+        QQuickItem *afi = newActiveFocusItem->parentItem();
         while (afi && afi != scope) {
             if (afi->isFocusScope()) {
-                QSGItemPrivate::get(afi)->activeFocus = true;
+                QQuickItemPrivate::get(afi)->activeFocus = true;
                 changed << afi;
             }
             afi = afi->parentItem();
@@ -659,27 +659,27 @@ void QSGCanvasPrivate::setFocusInScope(QSGItem *scope, QSGItem *item, FocusOptio
         notifyFocusChangesRecur(changed.data(), changed.count() - 1);
 }
 
-void QSGCanvasPrivate::clearFocusInScope(QSGItem *scope, QSGItem *item, FocusOptions options)
+void QQuickCanvasPrivate::clearFocusInScope(QQuickItem *scope, QQuickItem *item, FocusOptions options)
 {
-    Q_Q(QSGCanvas);
+    Q_Q(QQuickCanvas);
 
     Q_UNUSED(item);
     Q_ASSERT(item);
     Q_ASSERT(scope || item == rootItem);
 
 #ifdef FOCUS_DEBUG
-    qWarning() << "QSGCanvasPrivate::clearFocusInScope():";
+    qWarning() << "QQuickCanvasPrivate::clearFocusInScope():";
     qWarning() << "    scope:" << (QObject *)scope;
     qWarning() << "    item:" << (QObject *)item;
     qWarning() << "    activeFocusItem:" << (QObject *)activeFocusItem;
 #endif
 
-    QSGItemPrivate *scopePrivate = scope ? QSGItemPrivate::get(scope) : 0;
+    QQuickItemPrivate *scopePrivate = scope ? QQuickItemPrivate::get(scope) : 0;
 
-    QSGItem *oldActiveFocusItem = 0;
-    QSGItem *newActiveFocusItem = 0;
+    QQuickItem *oldActiveFocusItem = 0;
+    QQuickItem *newActiveFocusItem = 0;
 
-    QVarLengthArray<QSGItem *, 20> changed;
+    QVarLengthArray<QQuickItem *, 20> changed;
 
     Q_ASSERT(item == rootItem || item == scopePrivate->subFocusItem);
 
@@ -698,10 +698,10 @@ void QSGCanvasPrivate::clearFocusInScope(QSGItem *scope, QSGItem *item, FocusOpt
         QFocusEvent event(QEvent::FocusOut, Qt::OtherFocusReason);
         q->sendEvent(oldActiveFocusItem, &event);
 
-        QSGItem *afi = oldActiveFocusItem;
+        QQuickItem *afi = oldActiveFocusItem;
         while (afi != scope) {
-            if (QSGItemPrivate::get(afi)->activeFocus) {
-                QSGItemPrivate::get(afi)->activeFocus = false;
+            if (QQuickItemPrivate::get(afi)->activeFocus) {
+                QQuickItemPrivate::get(afi)->activeFocus = false;
                 changed << afi;
             }
             afi = afi->parentItem();
@@ -709,23 +709,23 @@ void QSGCanvasPrivate::clearFocusInScope(QSGItem *scope, QSGItem *item, FocusOpt
     }
 
     if (item != rootItem) {
-        QSGItem *oldSubFocusItem = scopePrivate->subFocusItem;
+        QQuickItem *oldSubFocusItem = scopePrivate->subFocusItem;
         // Correct focus chain in scope
         if (oldSubFocusItem) {
-            QSGItem *sfi = scopePrivate->subFocusItem->parentItem();
+            QQuickItem *sfi = scopePrivate->subFocusItem->parentItem();
             while (sfi != scope) {
-                QSGItemPrivate::get(sfi)->subFocusItem = 0;
+                QQuickItemPrivate::get(sfi)->subFocusItem = 0;
                 sfi = sfi->parentItem();
             }
         }
         scopePrivate->subFocusItem = 0;
 
         if (oldSubFocusItem && !(options & DontChangeFocusProperty)) {
-            QSGItemPrivate::get(oldSubFocusItem)->focus = false;
+            QQuickItemPrivate::get(oldSubFocusItem)->focus = false;
             changed << oldSubFocusItem;
         }
     } else if (!(options & DontChangeFocusProperty)) {
-        QSGItemPrivate::get(item)->focus = false;
+        QQuickItemPrivate::get(item)->focus = false;
         changed << item;
     }
 
@@ -745,15 +745,15 @@ void QSGCanvasPrivate::clearFocusInScope(QSGItem *scope, QSGItem *item, FocusOpt
         notifyFocusChangesRecur(changed.data(), changed.count() - 1);
 }
 
-void QSGCanvasPrivate::notifyFocusChangesRecur(QSGItem **items, int remaining)
+void QQuickCanvasPrivate::notifyFocusChangesRecur(QQuickItem **items, int remaining)
 {
-    QDeclarativeGuard<QSGItem> item(*items);
+    QDeclarativeGuard<QQuickItem> item(*items);
 
     if (remaining)
         notifyFocusChangesRecur(items + 1, remaining - 1);
 
     if (item) {
-        QSGItemPrivate *itemPrivate = QSGItemPrivate::get(item);
+        QQuickItemPrivate *itemPrivate = QQuickItemPrivate::get(item);
 
         if (itemPrivate->notifiedFocus != itemPrivate->focus) {
             itemPrivate->notifiedFocus = itemPrivate->focus;
@@ -762,48 +762,48 @@ void QSGCanvasPrivate::notifyFocusChangesRecur(QSGItem **items, int remaining)
 
         if (item && itemPrivate->notifiedActiveFocus != itemPrivate->activeFocus) {
             itemPrivate->notifiedActiveFocus = itemPrivate->activeFocus;
-            itemPrivate->itemChange(QSGItem::ItemActiveFocusHasChanged, itemPrivate->activeFocus);
+            itemPrivate->itemChange(QQuickItem::ItemActiveFocusHasChanged, itemPrivate->activeFocus);
             emit item->activeFocusChanged(itemPrivate->activeFocus);
         }
     }
 }
 
-void QSGCanvasPrivate::updateInputMethodData()
+void QQuickCanvasPrivate::updateInputMethodData()
 {
-    QSGItem *inputItem = 0;
-    if (activeFocusItem && activeFocusItem->flags() & QSGItem::ItemAcceptsInputMethod)
+    QQuickItem *inputItem = 0;
+    if (activeFocusItem && activeFocusItem->flags() & QQuickItem::ItemAcceptsInputMethod)
         inputItem = activeFocusItem;
     qApp->inputPanel()->setInputItem(inputItem);
 }
 
-QVariant QSGCanvas::inputMethodQuery(Qt::InputMethodQuery query) const
+QVariant QQuickCanvas::inputMethodQuery(Qt::InputMethodQuery query) const
 {
-    Q_D(const QSGCanvas);
-    if (!d->activeFocusItem || !(QSGItemPrivate::get(d->activeFocusItem)->flags & QSGItem::ItemAcceptsInputMethod))
+    Q_D(const QQuickCanvas);
+    if (!d->activeFocusItem || !(QQuickItemPrivate::get(d->activeFocusItem)->flags & QQuickItem::ItemAcceptsInputMethod))
         return QVariant();
     QVariant value = d->activeFocusItem->inputMethodQuery(query);
 
     //map geometry types
     QVariant::Type type = value.type();
     if (type == QVariant::RectF || type == QVariant::Rect) {
-        const QTransform transform = QSGItemPrivate::get(d->activeFocusItem)->itemToCanvasTransform();
+        const QTransform transform = QQuickItemPrivate::get(d->activeFocusItem)->itemToCanvasTransform();
         value = transform.mapRect(value.toRectF());
     } else if (type == QVariant::PointF || type == QVariant::Point) {
-        const QTransform transform = QSGItemPrivate::get(d->activeFocusItem)->itemToCanvasTransform();
+        const QTransform transform = QQuickItemPrivate::get(d->activeFocusItem)->itemToCanvasTransform();
         value = transform.map(value.toPointF());
     }
     return value;
 }
 
-void QSGCanvasPrivate::dirtyItem(QSGItem *)
+void QQuickCanvasPrivate::dirtyItem(QQuickItem *)
 {
-    Q_Q(QSGCanvas);
+    Q_Q(QQuickCanvas);
     q->maybeUpdate();
 }
 
-void QSGCanvasPrivate::cleanup(QSGNode *n)
+void QQuickCanvasPrivate::cleanup(QSGNode *n)
 {
-    Q_Q(QSGCanvas);
+    Q_Q(QQuickCanvas);
 
     Q_ASSERT(!cleanupNodeList.contains(n));
     cleanupNodeList.append(n);
@@ -811,23 +811,23 @@ void QSGCanvasPrivate::cleanup(QSGNode *n)
 }
 
 
-QSGCanvas::QSGCanvas(QWindow *parent)
-    : QWindow(*(new QSGCanvasPrivate), parent)
+QQuickCanvas::QQuickCanvas(QWindow *parent)
+    : QWindow(*(new QQuickCanvasPrivate), parent)
 {
-    Q_D(QSGCanvas);
+    Q_D(QQuickCanvas);
     d->init(this);
 }
 
-QSGCanvas::QSGCanvas(QSGCanvasPrivate &dd, QWindow *parent)
+QQuickCanvas::QQuickCanvas(QQuickCanvasPrivate &dd, QWindow *parent)
     : QWindow(dd, parent)
 {
-    Q_D(QSGCanvas);
+    Q_D(QQuickCanvas);
     d->init(this);
 }
 
-QSGCanvas::~QSGCanvas()
+QQuickCanvas::~QQuickCanvas()
 {
-    Q_D(QSGCanvas);
+    Q_D(QQuickCanvas);
 
     if (d->thread->isRunning()) {
         d->thread->stopRendering();
@@ -835,9 +835,9 @@ QSGCanvas::~QSGCanvas()
         d->thread = 0;
     }
 
-    // ### should we change ~QSGItem to handle this better?
+    // ### should we change ~QQuickItem to handle this better?
     // manually cleanup for the root item (item destructor only handles these when an item is parented)
-    QSGItemPrivate *rootItemPrivate = QSGItemPrivate::get(d->rootItem);
+    QQuickItemPrivate *rootItemPrivate = QQuickItemPrivate::get(d->rootItem);
     rootItemPrivate->removeFromDirtyList();
 
     delete d->incubationController; d->incubationController = 0;
@@ -846,29 +846,29 @@ QSGCanvas::~QSGCanvas()
     d->cleanupNodes();
 }
 
-QSGItem *QSGCanvas::rootItem() const
+QQuickItem *QQuickCanvas::rootItem() const
 {
-    Q_D(const QSGCanvas);
+    Q_D(const QQuickCanvas);
 
     return d->rootItem;
 }
 
-QSGItem *QSGCanvas::activeFocusItem() const
+QQuickItem *QQuickCanvas::activeFocusItem() const
 {
-    Q_D(const QSGCanvas);
+    Q_D(const QQuickCanvas);
 
     return d->activeFocusItem;
 }
 
-QSGItem *QSGCanvas::mouseGrabberItem() const
+QQuickItem *QQuickCanvas::mouseGrabberItem() const
 {
-    Q_D(const QSGCanvas);
+    Q_D(const QQuickCanvas);
 
     return d->mouseGrabberItem;
 }
 
 
-bool QSGCanvasPrivate::clearHover()
+bool QQuickCanvasPrivate::clearHover()
 {
     if (hoverItems.isEmpty())
         return false;
@@ -876,16 +876,16 @@ bool QSGCanvasPrivate::clearHover()
     QPointF pos = QCursor::pos(); // ### refactor: q->mapFromGlobal(QCursor::pos());
 
     bool accepted = false;
-    foreach (QSGItem* item, hoverItems)
+    foreach (QQuickItem* item, hoverItems)
         accepted = sendHoverEvent(QEvent::HoverLeave, item, pos, pos, QGuiApplication::keyboardModifiers(), true) || accepted;
     hoverItems.clear();
     return accepted;
 }
 
 
-bool QSGCanvas::event(QEvent *e)
+bool QQuickCanvas::event(QEvent *e)
 {
-    Q_D(QSGCanvas);
+    Q_D(QQuickCanvas);
 
     switch (e->type()) {
 
@@ -920,47 +920,47 @@ bool QSGCanvas::event(QEvent *e)
     return QWindow::event(e);
 }
 
-void QSGCanvas::keyPressEvent(QKeyEvent *e)
+void QQuickCanvas::keyPressEvent(QKeyEvent *e)
 {
-    Q_D(QSGCanvas);
+    Q_D(QQuickCanvas);
 
     if (d->activeFocusItem)
         sendEvent(d->activeFocusItem, e);
 }
 
-void QSGCanvas::keyReleaseEvent(QKeyEvent *e)
+void QQuickCanvas::keyReleaseEvent(QKeyEvent *e)
 {
-    Q_D(QSGCanvas);
+    Q_D(QQuickCanvas);
 
     if (d->activeFocusItem)
         sendEvent(d->activeFocusItem, e);
 }
 
-void QSGCanvas::inputMethodEvent(QInputMethodEvent *e)
+void QQuickCanvas::inputMethodEvent(QInputMethodEvent *e)
 {
-    Q_D(QSGCanvas);
+    Q_D(QQuickCanvas);
 
     if (d->activeFocusItem)
         sendEvent(d->activeFocusItem, e);
 }
 
-bool QSGCanvasPrivate::deliverInitialMousePressEvent(QSGItem *item, QMouseEvent *event)
+bool QQuickCanvasPrivate::deliverInitialMousePressEvent(QQuickItem *item, QMouseEvent *event)
 {
-    Q_Q(QSGCanvas);
+    Q_Q(QQuickCanvas);
 
-    QSGItemPrivate *itemPrivate = QSGItemPrivate::get(item);
+    QQuickItemPrivate *itemPrivate = QQuickItemPrivate::get(item);
     if (itemPrivate->opacity == 0.0)
         return false;
 
-    if (itemPrivate->flags & QSGItem::ItemClipsChildrenToShape) {
+    if (itemPrivate->flags & QQuickItem::ItemClipsChildrenToShape) {
         QPointF p = item->mapFromScene(event->windowPos());
         if (!QRectF(0, 0, item->width(), item->height()).contains(p))
             return false;
     }
 
-    QList<QSGItem *> children = itemPrivate->paintOrderChildItems();
+    QList<QQuickItem *> children = itemPrivate->paintOrderChildItems();
     for (int ii = children.count() - 1; ii >= 0; --ii) {
-        QSGItem *child = children.at(ii);
+        QQuickItem *child = children.at(ii);
         if (!child->isVisible() || !child->isEnabled())
             continue;
         if (deliverInitialMousePressEvent(child, event))
@@ -986,9 +986,9 @@ bool QSGCanvasPrivate::deliverInitialMousePressEvent(QSGItem *item, QMouseEvent
     return false;
 }
 
-bool QSGCanvasPrivate::deliverMouseEvent(QMouseEvent *event)
+bool QQuickCanvasPrivate::deliverMouseEvent(QMouseEvent *event)
 {
-    Q_Q(QSGCanvas);
+    Q_Q(QQuickCanvas);
 
     lastMousePosition = event->windowPos();
 
@@ -999,7 +999,7 @@ bool QSGCanvasPrivate::deliverMouseEvent(QMouseEvent *event)
     }
 
     if (mouseGrabberItem) {
-        QSGItemPrivate *mgPrivate = QSGItemPrivate::get(mouseGrabberItem);
+        QQuickItemPrivate *mgPrivate = QQuickItemPrivate::get(mouseGrabberItem);
         const QTransform &transform = mgPrivate->canvasToItemTransform();
         QMouseEvent me(event->type(), transform.map(event->windowPos()), event->windowPos(), event->screenPos(),
                        event->button(), event->buttons(), event->modifiers());
@@ -1013,23 +1013,23 @@ bool QSGCanvasPrivate::deliverMouseEvent(QMouseEvent *event)
     return false;
 }
 
-void QSGCanvas::mousePressEvent(QMouseEvent *event)
+void QQuickCanvas::mousePressEvent(QMouseEvent *event)
 {
-    Q_D(QSGCanvas);
+    Q_D(QQuickCanvas);
 
 #ifdef MOUSE_DEBUG
-    qWarning() << "QSGCanvas::mousePressEvent()" << event->pos() << event->button() << event->buttons();
+    qWarning() << "QQuickCanvas::mousePressEvent()" << event->pos() << event->button() << event->buttons();
 #endif
 
     d->deliverMouseEvent(event);
 }
 
-void QSGCanvas::mouseReleaseEvent(QMouseEvent *event)
+void QQuickCanvas::mouseReleaseEvent(QMouseEvent *event)
 {
-    Q_D(QSGCanvas);
+    Q_D(QQuickCanvas);
 
 #ifdef MOUSE_DEBUG
-    qWarning() << "QSGCanvas::mouseReleaseEvent()" << event->pos() << event->button() << event->buttons();
+    qWarning() << "QQuickCanvas::mouseReleaseEvent()" << event->pos() << event->button() << event->buttons();
 #endif
 
     if (!d->mouseGrabberItem) {
@@ -1041,12 +1041,12 @@ void QSGCanvas::mouseReleaseEvent(QMouseEvent *event)
     d->mouseGrabberItem = 0;
 }
 
-void QSGCanvas::mouseDoubleClickEvent(QMouseEvent *event)
+void QQuickCanvas::mouseDoubleClickEvent(QMouseEvent *event)
 {
-    Q_D(QSGCanvas);
+    Q_D(QQuickCanvas);
 
 #ifdef MOUSE_DEBUG
-    qWarning() << "QSGCanvas::mouseDoubleClickEvent()" << event->pos() << event->button() << event->buttons();
+    qWarning() << "QQuickCanvas::mouseDoubleClickEvent()" << event->pos() << event->button() << event->buttons();
 #endif
 
     if (!d->mouseGrabberItem && (event->button() & event->buttons()) == event->buttons()) {
@@ -1060,12 +1060,12 @@ void QSGCanvas::mouseDoubleClickEvent(QMouseEvent *event)
     d->deliverMouseEvent(event);
 }
 
-bool QSGCanvasPrivate::sendHoverEvent(QEvent::Type type, QSGItem *item,
+bool QQuickCanvasPrivate::sendHoverEvent(QEvent::Type type, QQuickItem *item,
                                       const QPointF &scenePos, const QPointF &lastScenePos,
                                       Qt::KeyboardModifiers modifiers, bool accepted)
 {
-    Q_Q(QSGCanvas);
-    const QTransform transform = QSGItemPrivate::get(item)->canvasToItemTransform();
+    Q_Q(QQuickCanvas);
+    const QTransform transform = QQuickItemPrivate::get(item)->canvasToItemTransform();
 
     //create copy of event
     QHoverEvent hoverEvent(type, transform.map(scenePos), transform.map(lastScenePos), modifiers);
@@ -1076,12 +1076,12 @@ bool QSGCanvasPrivate::sendHoverEvent(QEvent::Type type, QSGItem *item,
     return hoverEvent.isAccepted();
 }
 
-void QSGCanvas::mouseMoveEvent(QMouseEvent *event)
+void QQuickCanvas::mouseMoveEvent(QMouseEvent *event)
 {
-    Q_D(QSGCanvas);
+    Q_D(QQuickCanvas);
 
 #ifdef MOUSE_DEBUG
-    qWarning() << "QSGCanvas::mouseMoveEvent()" << event->pos() << event->button() << event->buttons();
+    qWarning() << "QQuickCanvas::mouseMoveEvent()" << event->pos() << event->button() << event->buttons();
 #endif
 
     if (!d->mouseGrabberItem) {
@@ -1103,22 +1103,22 @@ void QSGCanvas::mouseMoveEvent(QMouseEvent *event)
     d->deliverMouseEvent(event);
 }
 
-bool QSGCanvasPrivate::deliverHoverEvent(QSGItem *item, const QPointF &scenePos, const QPointF &lastScenePos,
+bool QQuickCanvasPrivate::deliverHoverEvent(QQuickItem *item, const QPointF &scenePos, const QPointF &lastScenePos,
                                          Qt::KeyboardModifiers modifiers, bool &accepted)
 {
-    QSGItemPrivate *itemPrivate = QSGItemPrivate::get(item);
+    QQuickItemPrivate *itemPrivate = QQuickItemPrivate::get(item);
     if (itemPrivate->opacity == 0.0)
         return false;
 
-    if (itemPrivate->flags & QSGItem::ItemClipsChildrenToShape) {
+    if (itemPrivate->flags & QQuickItem::ItemClipsChildrenToShape) {
         QPointF p = item->mapFromScene(scenePos);
         if (!QRectF(0, 0, item->width(), item->height()).contains(p))
             return false;
     }
 
-    QList<QSGItem *> children = itemPrivate->paintOrderChildItems();
+    QList<QQuickItem *> children = itemPrivate->paintOrderChildItems();
     for (int ii = children.count() - 1; ii >= 0; --ii) {
-        QSGItem *child = children.at(ii);
+        QQuickItem *child = children.at(ii);
         if (!child->isVisible() || !child->isEnabled())
             continue;
         if (deliverHoverEvent(child, scenePos, lastScenePos, modifiers, accepted))
@@ -1132,8 +1132,8 @@ bool QSGCanvasPrivate::deliverHoverEvent(QSGItem *item, const QPointF &scenePos,
                 //move
                 accepted = sendHoverEvent(QEvent::HoverMove, item, scenePos, lastScenePos, modifiers, accepted);
             } else {
-                QList<QSGItem *> itemsToHover;
-                QSGItem* parent = item;
+                QList<QQuickItem *> itemsToHover;
+                QQuickItem* parent = item;
                 itemsToHover << item;
                 while ((parent = parent->parentItem()))
                     itemsToHover << parent;
@@ -1156,8 +1156,8 @@ bool QSGCanvasPrivate::deliverHoverEvent(QSGItem *item, const QPointF &scenePos,
                         startIdx = itemsToHover.count() - 1;
 
                     for (int i = startIdx; i >= 0; i--) {
-                        QSGItem *itemToHover = itemsToHover[i];
-                        if (QSGItemPrivate::get(itemToHover)->hoverEnabled) {
+                        QQuickItem *itemToHover = itemsToHover[i];
+                        if (QQuickItemPrivate::get(itemToHover)->hoverEnabled) {
                             hoverItems.prepend(itemToHover);
                             sendHoverEvent(QEvent::HoverEnter, itemToHover, scenePos, lastScenePos, modifiers, accepted);
                         }
@@ -1171,22 +1171,22 @@ bool QSGCanvasPrivate::deliverHoverEvent(QSGItem *item, const QPointF &scenePos,
     return false;
 }
 
-bool QSGCanvasPrivate::deliverWheelEvent(QSGItem *item, QWheelEvent *event)
+bool QQuickCanvasPrivate::deliverWheelEvent(QQuickItem *item, QWheelEvent *event)
 {
-    Q_Q(QSGCanvas);
-    QSGItemPrivate *itemPrivate = QSGItemPrivate::get(item);
+    Q_Q(QQuickCanvas);
+    QQuickItemPrivate *itemPrivate = QQuickItemPrivate::get(item);
     if (itemPrivate->opacity == 0.0)
         return false;
 
-    if (itemPrivate->flags & QSGItem::ItemClipsChildrenToShape) {
+    if (itemPrivate->flags & QQuickItem::ItemClipsChildrenToShape) {
         QPointF p = item->mapFromScene(event->posF());
         if (!QRectF(0, 0, item->width(), item->height()).contains(p))
             return false;
     }
 
-    QList<QSGItem *> children = itemPrivate->paintOrderChildItems();
+    QList<QQuickItem *> children = itemPrivate->paintOrderChildItems();
     for (int ii = children.count() - 1; ii >= 0; --ii) {
-        QSGItem *child = children.at(ii);
+        QQuickItem *child = children.at(ii);
         if (!child->isVisible() || !child->isEnabled())
             continue;
         if (deliverWheelEvent(child, event))
@@ -1208,18 +1208,18 @@ bool QSGCanvasPrivate::deliverWheelEvent(QSGItem *item, QWheelEvent *event)
 }
 
 #ifndef QT_NO_WHEELEVENT
-void QSGCanvas::wheelEvent(QWheelEvent *event)
+void QQuickCanvas::wheelEvent(QWheelEvent *event)
 {
-    Q_D(QSGCanvas);
+    Q_D(QQuickCanvas);
 #ifdef MOUSE_DEBUG
-    qWarning() << "QSGCanvas::wheelEvent()" << event->pos() << event->delta() << event->orientation();
+    qWarning() << "QQuickCanvas::wheelEvent()" << event->pos() << event->delta() << event->orientation();
 #endif
     event->ignore();
     d->deliverWheelEvent(d->rootItem, event);
 }
 #endif // QT_NO_WHEELEVENT
 
-bool QSGCanvasPrivate::deliverTouchEvent(QTouchEvent *event)
+bool QQuickCanvasPrivate::deliverTouchEvent(QTouchEvent *event)
 {
 #ifdef TOUCH_DEBUG
     if (event->type() == QEvent::TouchBegin)
@@ -1230,7 +1230,7 @@ bool QSGCanvasPrivate::deliverTouchEvent(QTouchEvent *event)
         qWarning("touchEndEvent");
 #endif
 
-    QHash<QSGItem *, QList<QTouchEvent::TouchPoint> > updatedPoints;
+    QHash<QQuickItem *, QList<QTouchEvent::TouchPoint> > updatedPoints;
 
     if (event->type() == QTouchEvent::TouchBegin) {     // all points are new touch points
         QSet<int> acceptedNewPoints;
@@ -1242,7 +1242,7 @@ bool QSGCanvasPrivate::deliverTouchEvent(QTouchEvent *event)
 
     const QList<QTouchEvent::TouchPoint> &touchPoints = event->touchPoints();
     QList<QTouchEvent::TouchPoint> newPoints;
-    QSGItem *item = 0;
+    QQuickItem *item = 0;
     for (int i=0; i<touchPoints.count(); i++) {
         const QTouchEvent::TouchPoint &touchPoint = touchPoints[i];
         switch (touchPoint.state()) {
@@ -1281,15 +1281,15 @@ bool QSGCanvasPrivate::deliverTouchEvent(QTouchEvent *event)
     return event->isAccepted();
 }
 
-bool QSGCanvasPrivate::deliverTouchPoints(QSGItem *item, QTouchEvent *event, const QList<QTouchEvent::TouchPoint> &newPoints, QSet<int> *acceptedNewPoints, QHash<QSGItem *, QList<QTouchEvent::TouchPoint> > *updatedPoints)
+bool QQuickCanvasPrivate::deliverTouchPoints(QQuickItem *item, QTouchEvent *event, const QList<QTouchEvent::TouchPoint> &newPoints, QSet<int> *acceptedNewPoints, QHash<QQuickItem *, QList<QTouchEvent::TouchPoint> > *updatedPoints)
 {
-    Q_Q(QSGCanvas);
-    QSGItemPrivate *itemPrivate = QSGItemPrivate::get(item);
+    Q_Q(QQuickCanvas);
+    QQuickItemPrivate *itemPrivate = QQuickItemPrivate::get(item);
 
     if (itemPrivate->opacity == 0.0)
         return false;
 
-    if (itemPrivate->flags & QSGItem::ItemClipsChildrenToShape) {
+    if (itemPrivate->flags & QQuickItem::ItemClipsChildrenToShape) {
         QRectF bounds(0, 0, item->width(), item->height());
         for (int i=0; i<newPoints.count(); i++) {
             QPointF p = item->mapFromScene(newPoints[i].scenePos());
@@ -1298,9 +1298,9 @@ bool QSGCanvasPrivate::deliverTouchPoints(QSGItem *item, QTouchEvent *event, con
         }
     }
 
-    QList<QSGItem *> children = itemPrivate->paintOrderChildItems();
+    QList<QQuickItem *> children = itemPrivate->paintOrderChildItems();
     for (int ii = children.count() - 1; ii >= 0; --ii) {
-        QSGItem *child = children.at(ii);
+        QQuickItem *child = children.at(ii);
         if (!child->isEnabled())
             continue;
         if (deliverTouchPoints(child, event, newPoints, acceptedNewPoints, updatedPoints))
@@ -1369,11 +1369,11 @@ bool QSGCanvasPrivate::deliverTouchPoints(QSGItem *item, QTouchEvent *event, con
     return false;
 }
 
-void QSGCanvasPrivate::deliverDragEvent(QSGDragGrabber *grabber, QEvent *event)
+void QQuickCanvasPrivate::deliverDragEvent(QQuickDragGrabber *grabber, QEvent *event)
 {
-    Q_Q(QSGCanvas);
+    Q_Q(QQuickCanvas);
     grabber->resetTarget();
-    QSGDragGrabber::iterator grabItem = grabber->begin();
+    QQuickDragGrabber::iterator grabItem = grabber->begin();
     if (grabItem != grabber->end()) {
         Q_ASSERT(event->type() != QEvent::DragEnter);
         if (event->type() == QEvent::Drop) {
@@ -1386,7 +1386,7 @@ void QSGCanvasPrivate::deliverDragEvent(QSGDragGrabber *grabber, QEvent *event)
                         e->mimeData(),
                         e->mouseButtons(),
                         e->keyboardModifiers());
-                QSGDropEventEx::copyActions(&translatedEvent, *e);
+                QQuickDropEventEx::copyActions(&translatedEvent, *e);
                 q->sendEvent(**grabItem, &translatedEvent);
                 e->setAccepted(translatedEvent.isAccepted());
                 e->setDropAction(translatedEvent.dropAction());
@@ -1411,7 +1411,7 @@ void QSGCanvasPrivate::deliverDragEvent(QSGDragGrabber *grabber, QEvent *event)
                                 moveEvent->mimeData(),
                                 moveEvent->mouseButtons(),
                                 moveEvent->keyboardModifiers());
-                        QSGDropEventEx::copyActions(&translatedEvent, *moveEvent);
+                        QQuickDropEventEx::copyActions(&translatedEvent, *moveEvent);
                         q->sendEvent(**grabItem, &translatedEvent);
                         ++grabItem;
                     } else {
@@ -1435,22 +1435,22 @@ void QSGCanvasPrivate::deliverDragEvent(QSGDragGrabber *grabber, QEvent *event)
                 e->mimeData(),
                 e->mouseButtons(),
                 e->keyboardModifiers());
-        QSGDropEventEx::copyActions(&enterEvent, *e);
+        QQuickDropEventEx::copyActions(&enterEvent, *e);
         event->setAccepted(deliverDragEvent(grabber, rootItem, &enterEvent));
     }
 }
 
-bool QSGCanvasPrivate::deliverDragEvent(QSGDragGrabber *grabber, QSGItem *item, QDragMoveEvent *event)
+bool QQuickCanvasPrivate::deliverDragEvent(QQuickDragGrabber *grabber, QQuickItem *item, QDragMoveEvent *event)
 {
-    Q_Q(QSGCanvas);
+    Q_Q(QQuickCanvas);
     bool accepted = false;
-    QSGItemPrivate *itemPrivate = QSGItemPrivate::get(item);
+    QQuickItemPrivate *itemPrivate = QQuickItemPrivate::get(item);
     if (itemPrivate->opacity == 0.0 || !item->isVisible() || !item->isEnabled())
         return false;
 
     QPointF p = item->mapFromScene(event->pos());
     if (QRectF(0, 0, item->width(), item->height()).contains(p)) {
-        if (event->type() == QEvent::DragMove || itemPrivate->flags & QSGItem::ItemAcceptsDrops) {
+        if (event->type() == QEvent::DragMove || itemPrivate->flags & QQuickItem::ItemAcceptsDrops) {
             QDragMoveEvent translatedEvent(
                     p.toPoint(),
                     event->possibleActions(),
@@ -1458,7 +1458,7 @@ bool QSGCanvasPrivate::deliverDragEvent(QSGDragGrabber *grabber, QSGItem *item,
                     event->mouseButtons(),
                     event->keyboardModifiers(),
                     event->type());
-            QSGDropEventEx::copyActions(&translatedEvent, *event);
+            QQuickDropEventEx::copyActions(&translatedEvent, *event);
             q->sendEvent(item, &translatedEvent);
             if (event->type() == QEvent::DragEnter) {
                 if (translatedEvent.isAccepted()) {
@@ -1469,7 +1469,7 @@ bool QSGCanvasPrivate::deliverDragEvent(QSGDragGrabber *grabber, QSGItem *item,
                 accepted = true;
             }
         }
-    } else if (itemPrivate->flags & QSGItem::ItemClipsChildrenToShape) {
+    } else if (itemPrivate->flags & QQuickItem::ItemClipsChildrenToShape) {
         return false;
     }
 
@@ -1479,8 +1479,8 @@ bool QSGCanvasPrivate::deliverDragEvent(QSGDragGrabber *grabber, QSGItem *item,
             event->mimeData(),
             event->mouseButtons(),
             event->keyboardModifiers());
-    QSGDropEventEx::copyActions(&enterEvent, *event);
-    QList<QSGItem *> children = itemPrivate->paintOrderChildItems();
+    QQuickDropEventEx::copyActions(&enterEvent, *event);
+    QList<QQuickItem *> children = itemPrivate->paintOrderChildItems();
     for (int ii = children.count() - 1; ii >= 0; --ii) {
         if (deliverDragEvent(grabber, children.at(ii), &enterEvent))
             return true;
@@ -1489,12 +1489,12 @@ bool QSGCanvasPrivate::deliverDragEvent(QSGDragGrabber *grabber, QSGItem *item,
     return accepted;
 }
 
-bool QSGCanvasPrivate::sendFilteredMouseEvent(QSGItem *target, QSGItem *item, QMouseEvent *event)
+bool QQuickCanvasPrivate::sendFilteredMouseEvent(QQuickItem *target, QQuickItem *item, QMouseEvent *event)
 {
     if (!target)
         return false;
 
-    QSGItemPrivate *targetPrivate = QSGItemPrivate::get(target);
+    QQuickItemPrivate *targetPrivate = QQuickItemPrivate::get(target);
     if (targetPrivate->filtersChildMouseEvents)
         if (target->childMouseEventFilter(item, event))
             return true;
@@ -1505,12 +1505,12 @@ bool QSGCanvasPrivate::sendFilteredMouseEvent(QSGItem *target, QSGItem *item, QM
     return false;
 }
 
-bool QSGCanvas::sendEvent(QSGItem *item, QEvent *e)
+bool QQuickCanvas::sendEvent(QQuickItem *item, QEvent *e)
 {
-    Q_D(QSGCanvas);
+    Q_D(QQuickCanvas);
 
     if (!item) {
-        qWarning("QSGCanvas::sendEvent: Cannot send event to a null item");
+        qWarning("QQuickCanvas::sendEvent: Cannot send event to a null item");
         return false;
     }
 
@@ -1520,23 +1520,23 @@ bool QSGCanvas::sendEvent(QSGItem *item, QEvent *e)
     case QEvent::KeyPress:
     case QEvent::KeyRelease:
         e->accept();
-        QSGItemPrivate::get(item)->deliverKeyEvent(static_cast<QKeyEvent *>(e));
+        QQuickItemPrivate::get(item)->deliverKeyEvent(static_cast<QKeyEvent *>(e));
         while (!e->isAccepted() && (item = item->parentItem())) {
             e->accept();
-            QSGItemPrivate::get(item)->deliverKeyEvent(static_cast<QKeyEvent *>(e));
+            QQuickItemPrivate::get(item)->deliverKeyEvent(static_cast<QKeyEvent *>(e));
         }
         break;
     case QEvent::InputMethod:
         e->accept();
-        QSGItemPrivate::get(item)->deliverInputMethodEvent(static_cast<QInputMethodEvent *>(e));
+        QQuickItemPrivate::get(item)->deliverInputMethodEvent(static_cast<QInputMethodEvent *>(e));
         while (!e->isAccepted() && (item = item->parentItem())) {
             e->accept();
-            QSGItemPrivate::get(item)->deliverInputMethodEvent(static_cast<QInputMethodEvent *>(e));
+            QQuickItemPrivate::get(item)->deliverInputMethodEvent(static_cast<QInputMethodEvent *>(e));
         }
         break;
     case QEvent::FocusIn:
     case QEvent::FocusOut:
-        QSGItemPrivate::get(item)->deliverFocusEvent(static_cast<QFocusEvent *>(e));
+        QQuickItemPrivate::get(item)->deliverFocusEvent(static_cast<QFocusEvent *>(e));
         break;
     case QEvent::MouseButtonPress:
     case QEvent::MouseButtonRelease:
@@ -1547,28 +1547,28 @@ bool QSGCanvas::sendEvent(QSGItem *item, QEvent *e)
             QMouseEvent *se = static_cast<QMouseEvent *>(e);
             if (!d->sendFilteredMouseEvent(item->parentItem(), item, se)) {
                 se->accept();
-                QSGItemPrivate::get(item)->deliverMouseEvent(se);
+                QQuickItemPrivate::get(item)->deliverMouseEvent(se);
             }
         }
         break;
     case QEvent::Wheel:
-        QSGItemPrivate::get(item)->deliverWheelEvent(static_cast<QWheelEvent *>(e));
+        QQuickItemPrivate::get(item)->deliverWheelEvent(static_cast<QWheelEvent *>(e));
         break;
     case QEvent::HoverEnter:
     case QEvent::HoverLeave:
     case QEvent::HoverMove:
-        QSGItemPrivate::get(item)->deliverHoverEvent(static_cast<QHoverEvent *>(e));
+        QQuickItemPrivate::get(item)->deliverHoverEvent(static_cast<QHoverEvent *>(e));
         break;
     case QEvent::TouchBegin:
     case QEvent::TouchUpdate:
     case QEvent::TouchEnd:
-        QSGItemPrivate::get(item)->deliverTouchEvent(static_cast<QTouchEvent *>(e));
+        QQuickItemPrivate::get(item)->deliverTouchEvent(static_cast<QTouchEvent *>(e));
         break;
     case QEvent::DragEnter:
     case QEvent::DragMove:
     case QEvent::DragLeave:
     case QEvent::Drop:
-        QSGItemPrivate::get(item)->deliverDragEvent(e);
+        QQuickItemPrivate::get(item)->deliverDragEvent(e);
         break;
     default:
         break;
@@ -1577,28 +1577,28 @@ bool QSGCanvas::sendEvent(QSGItem *item, QEvent *e)
     return false;
 }
 
-void QSGCanvasPrivate::cleanupNodes()
+void QQuickCanvasPrivate::cleanupNodes()
 {
     for (int ii = 0; ii < cleanupNodeList.count(); ++ii)
         delete cleanupNodeList.at(ii);
     cleanupNodeList.clear();
 }
 
-void QSGCanvasPrivate::updateDirtyNodes()
+void QQuickCanvasPrivate::updateDirtyNodes()
 {
 #ifdef DIRTY_DEBUG
-    qWarning() << "QSGCanvasPrivate::updateDirtyNodes():";
+    qWarning() << "QQuickCanvasPrivate::updateDirtyNodes():";
 #endif
 
     cleanupNodes();
 
-    QSGItem *updateList = dirtyItemList;
+    QQuickItem *updateList = dirtyItemList;
     dirtyItemList = 0;
-    if (updateList) QSGItemPrivate::get(updateList)->prevDirtyItem = &updateList;
+    if (updateList) QQuickItemPrivate::get(updateList)->prevDirtyItem = &updateList;
 
     while (updateList) {
-        QSGItem *item = updateList;
-        QSGItemPrivate *itemPriv = QSGItemPrivate::get(item);
+        QQuickItem *item = updateList;
+        QQuickItemPrivate *itemPriv = QQuickItemPrivate::get(item);
         itemPriv->removeFromDirtyList();
 
 #ifdef DIRTY_DEBUG
@@ -1608,18 +1608,18 @@ void QSGCanvasPrivate::updateDirtyNodes()
     }
 }
 
-void QSGCanvasPrivate::updateDirtyNode(QSGItem *item)
+void QQuickCanvasPrivate::updateDirtyNode(QQuickItem *item)
 {
 #ifdef QML_RUNTIME_TESTING
     bool didFlash = false;
 #endif
 
-    QSGItemPrivate *itemPriv = QSGItemPrivate::get(item);
+    QQuickItemPrivate *itemPriv = QQuickItemPrivate::get(item);
     quint32 dirty = itemPriv->dirtyAttributes;
     itemPriv->dirtyAttributes = 0;
 
-    if ((dirty & QSGItemPrivate::TransformUpdateMask) ||
-        (dirty & QSGItemPrivate::Size && itemPriv->origin != QSGItem::TopLeft &&
+    if ((dirty & QQuickItemPrivate::TransformUpdateMask) ||
+        (dirty & QQuickItemPrivate::Size && itemPriv->origin != QQuickItem::TopLeft &&
          (itemPriv->scale != 1. || itemPriv->rotation != 0.))) {
 
         QMatrix4x4 matrix;
@@ -1643,9 +1643,9 @@ void QSGCanvasPrivate::updateDirtyNode(QSGItem *item)
         itemPriv->itemNode()->setMatrix(matrix);
     }
 
-    bool clipEffectivelyChanged = dirty & QSGItemPrivate::Clip &&
+    bool clipEffectivelyChanged = dirty & QQuickItemPrivate::Clip &&
                                   ((item->clip() == false) != (itemPriv->clipNode == 0));
-    bool effectRefEffectivelyChanged = dirty & QSGItemPrivate::EffectReference &&
+    bool effectRefEffectivelyChanged = dirty & QQuickItemPrivate::EffectReference &&
                                   ((itemPriv->effectRefCount == 0) != (itemPriv->rootNode == 0));
 
     if (clipEffectivelyChanged) {
@@ -1654,7 +1654,7 @@ void QSGCanvasPrivate::updateDirtyNode(QSGItem *item)
 
         if (item->clip()) {
             Q_ASSERT(itemPriv->clipNode == 0);
-            itemPriv->clipNode = new QSGDefaultClipNode(item->boundingRect());
+            itemPriv->clipNode = new QQuickDefaultClipNode(item->boundingRect());
             itemPriv->clipNode->update();
 
             if (child)
@@ -1675,7 +1675,7 @@ void QSGCanvasPrivate::updateDirtyNode(QSGItem *item)
         }
     }
 
-    if (dirty & QSGItemPrivate::ChildrenUpdateMask)
+    if (dirty & QQuickItemPrivate::ChildrenUpdateMask)
         itemPriv->childContainerNode()->removeAllChildNodes();
 
     if (effectRefEffectivelyChanged) {
@@ -1707,16 +1707,16 @@ void QSGCanvasPrivate::updateDirtyNode(QSGItem *item)
         }
     }
 
-    if (dirty & QSGItemPrivate::ChildrenUpdateMask) {
+    if (dirty & QQuickItemPrivate::ChildrenUpdateMask) {
         QSGNode *groupNode = itemPriv->groupNode;
         if (groupNode)
             groupNode->removeAllChildNodes();
 
-        QList<QSGItem *> orderedChildren = itemPriv->paintOrderChildItems();
+        QList<QQuickItem *> orderedChildren = itemPriv->paintOrderChildItems();
         int ii = 0;
 
         for (; ii < orderedChildren.count() && orderedChildren.at(ii)->z() < 0; ++ii) {
-            QSGItemPrivate *childPrivate = QSGItemPrivate::get(orderedChildren.at(ii));
+            QQuickItemPrivate *childPrivate = QQuickItemPrivate::get(orderedChildren.at(ii));
             if (!childPrivate->explicitVisible && !childPrivate->effectRefCount)
                 continue;
             if (childPrivate->itemNode()->parent())
@@ -1730,7 +1730,7 @@ void QSGCanvasPrivate::updateDirtyNode(QSGItem *item)
             itemPriv->childContainerNode()->appendChildNode(itemPriv->paintNode);
 
         for (; ii < orderedChildren.count(); ++ii) {
-            QSGItemPrivate *childPrivate = QSGItemPrivate::get(orderedChildren.at(ii));
+            QQuickItemPrivate *childPrivate = QQuickItemPrivate::get(orderedChildren.at(ii));
             if (!childPrivate->explicitVisible && !childPrivate->effectRefCount)
                 continue;
             if (childPrivate->itemNode()->parent())
@@ -1740,12 +1740,12 @@ void QSGCanvasPrivate::updateDirtyNode(QSGItem *item)
         }
     }
 
-    if ((dirty & QSGItemPrivate::Size) && itemPriv->clipNode) {
+    if ((dirty & QQuickItemPrivate::Size) && itemPriv->clipNode) {
         itemPriv->clipNode->setRect(item->boundingRect());
         itemPriv->clipNode->update();
     }
 
-    if (dirty & (QSGItemPrivate::OpacityValue | QSGItemPrivate::Visible | QSGItemPrivate::HideReference)) {
+    if (dirty & (QQuickItemPrivate::OpacityValue | QQuickItemPrivate::Visible | QQuickItemPrivate::HideReference)) {
         qreal opacity = itemPriv->explicitVisible && itemPriv->hideRefCount == 0
                       ? itemPriv->opacity : qreal(0);
 
@@ -1769,9 +1769,9 @@ void QSGCanvasPrivate::updateDirtyNode(QSGItem *item)
             itemPriv->opacityNode->setOpacity(opacity);
     }
 
-    if (dirty & QSGItemPrivate::ContentUpdateMask) {
+    if (dirty & QQuickItemPrivate::ContentUpdateMask) {
 
-        if (itemPriv->flags & QSGItem::ItemHasContents) {
+        if (itemPriv->flags & QQuickItem::ItemHasContents) {
             updatePaintNodeData.transformNode = itemPriv->itemNode();
             itemPriv->paintNode = item->updatePaintNode(itemPriv->paintNode, &updatePaintNodeData);
 
@@ -1834,7 +1834,7 @@ void QSGCanvasPrivate::updateDirtyNode(QSGItem *item)
         itemPriv->childContainerNode()->appendChildNode(flash);
         didFlash = true;
     }
-    Q_Q(QSGCanvas);
+    Q_Q(QQuickCanvas);
     if (didFlash) {
         q->maybeUpdate();
     }
@@ -1842,9 +1842,9 @@ void QSGCanvasPrivate::updateDirtyNode(QSGItem *item)
 
 }
 
-void QSGCanvas::maybeUpdate()
+void QQuickCanvas::maybeUpdate()
 {
-    Q_D(QSGCanvas);
+    Q_D(QQuickCanvas);
 
     if (d->thread && d->thread->isRunning())
         d->thread->maybeUpdate();
@@ -1866,9 +1866,9 @@ void QSGCanvas::maybeUpdate()
     notification about this.
  */
 
-QSGEngine *QSGCanvas::sceneGraphEngine() const
+QSGEngine *QQuickCanvas::sceneGraphEngine() const
 {
-    Q_D(const QSGCanvas);
+    Q_D(const QQuickCanvas);
     if (d->context && d->context->isReady())
         return d->context->engine();
     return 0;
@@ -1887,11 +1887,11 @@ QSGEngine *QSGCanvas::sceneGraphEngine() const
     the rendering.
  */
 
-void QSGCanvas::setRenderTarget(QOpenGLFramebufferObject *fbo)
+void QQuickCanvas::setRenderTarget(QOpenGLFramebufferObject *fbo)
 {
-    Q_D(QSGCanvas);
+    Q_D(QQuickCanvas);
     if (d->context && d->context && QThread::currentThread() != d->context->thread()) {
-        qWarning("QSGCanvas::setRenderThread: Cannot set render target from outside the rendering thread");
+        qWarning("QQuickCanvas::setRenderThread: Cannot set render target from outside the rendering thread");
         return;
     }
 
@@ -1906,9 +1906,9 @@ void QSGCanvas::setRenderTarget(QOpenGLFramebufferObject *fbo)
     The default is to render to the surface of the canvas, in which
     case the render target is 0.
  */
-QOpenGLFramebufferObject *QSGCanvas::renderTarget() const
+QOpenGLFramebufferObject *QQuickCanvas::renderTarget() const
 {
-    Q_D(const QSGCanvas);
+    Q_D(const QQuickCanvas);
     return d->renderTarget;
 }
 
@@ -1922,37 +1922,37 @@ QOpenGLFramebufferObject *QSGCanvas::renderTarget() const
 
     \warning This function can only be called from the GUI thread.
  */
-QImage QSGCanvas::grabFrameBuffer()
+QImage QQuickCanvas::grabFrameBuffer()
 {
-    Q_D(QSGCanvas);
+    Q_D(QQuickCanvas);
     return d->thread ? d->thread->grab() : QImage();
 }
 
 /*!
     Returns an incubation controller that splices incubation between frames
-    for this canvas.  QSGView automatically installs this controller for you.
+    for this canvas.  QQuickView automatically installs this controller for you.
 
     The controller is owned by the canvas and will be destroyed when the canvas
     is deleted.
 */
-QDeclarativeIncubationController *QSGCanvas::incubationController() const
+QDeclarativeIncubationController *QQuickCanvas::incubationController() const
 {
-    Q_D(const QSGCanvas);
+    Q_D(const QQuickCanvas);
 
     if (!d->incubationController)
-        d->incubationController = new QSGCanvasIncubationController(const_cast<QSGCanvasPrivate *>(d));
+        d->incubationController = new QQuickCanvasIncubationController(const_cast<QQuickCanvasPrivate *>(d));
     return d->incubationController;
 }
 
 
-void QSGCanvasRenderLoop::createGLContext()
+void QQuickCanvasRenderLoop::createGLContext()
 {
     gl = new QOpenGLContext();
     gl->setFormat(renderer->requestedFormat());
     gl->create();
 }
 
-void QSGCanvasRenderThread::run()
+void QQuickCanvasRenderThread::run()
 {
 #ifdef THREAD_DEBUG
     qDebug("QML Rendering Thread Started");
@@ -2003,8 +2003,8 @@ void QSGCanvasRenderThread::run()
 #ifdef THREAD_DEBUG
         printf("                RenderThread: Doing locked sync\n");
 #endif
-#ifdef QSG_CANVAS_TIMING
-        if (qsg_canvas_timing)
+#ifdef QQUICK_CANVAS_TIMING
+        if (qquick_canvas_timing)
             threadTimer.start();
 #endif
         inSync = true;
@@ -2018,8 +2018,8 @@ void QSGCanvasRenderThread::run()
 #ifdef THREAD_DEBUG
         printf("                RenderThread: sync done\n");
 #endif
-#ifdef QSG_CANVAS_TIMING
-        if (qsg_canvas_timing)
+#ifdef QQUICK_CANVAS_TIMING
+        if (qquick_canvas_timing)
             syncTime = threadTimer.elapsed();
 #endif
 
@@ -2028,8 +2028,8 @@ void QSGCanvasRenderThread::run()
 #endif
 
         renderSceneGraph(windowSize);
-#ifdef QSG_CANVAS_TIMING
-        if (qsg_canvas_timing)
+#ifdef QQUICK_CANVAS_TIMING
+        if (qquick_canvas_timing)
             renderTime = threadTimer.elapsed() - syncTime;
 #endif
 
@@ -2051,8 +2051,8 @@ void QSGCanvasRenderThread::run()
 #ifdef THREAD_DEBUG
         printf("                RenderThread: swap complete...\n");
 #endif
-#ifdef QSG_CANVAS_TIMING
-        if (qsg_canvas_timing) {
+#ifdef QQUICK_CANVAS_TIMING
+        if (qquick_canvas_timing) {
             swapTime = threadTimer.elapsed() - renderTime;
             qDebug() << "- Breakdown of frame time: sync:" << syncTime
                      << "ms render:" << renderTime << "ms swap:" << swapTime
@@ -2107,7 +2107,7 @@ void QSGCanvasRenderThread::run()
 
 
 
-bool QSGCanvasRenderThread::event(QEvent *e)
+bool QQuickCanvasRenderThread::event(QEvent *e)
 {
     Q_ASSERT(QThread::currentThread() == qApp->thread());
 
@@ -2137,7 +2137,7 @@ bool QSGCanvasRenderThread::event(QEvent *e)
 
 
 
-void QSGCanvasRenderThread::exhaustSyncEvent()
+void QQuickCanvasRenderThread::exhaustSyncEvent()
 {
     if (isGuiBlockPending) {
         sync(true);
@@ -2147,7 +2147,7 @@ void QSGCanvasRenderThread::exhaustSyncEvent()
 
 
 
-void QSGCanvasRenderThread::sync(bool guiAlreadyLocked)
+void QQuickCanvasRenderThread::sync(bool guiAlreadyLocked)
 {
 #ifdef THREAD_DEBUG
     printf("GUI: sync - %s\n", guiAlreadyLocked ? "outside event" : "inside event");
@@ -2176,7 +2176,7 @@ void QSGCanvasRenderThread::sync(bool guiAlreadyLocked)
     ourselves.
  */
 
-void QSGCanvasRenderThread::lockInGui()
+void QQuickCanvasRenderThread::lockInGui()
 {
     // We must avoid recursive locking in the GUI thread, hence we
     // only lock when we are the first one to try to block.
@@ -2192,7 +2192,7 @@ void QSGCanvasRenderThread::lockInGui()
 
 
 
-void QSGCanvasRenderThread::unlockInGui()
+void QQuickCanvasRenderThread::unlockInGui()
 {
 #ifdef THREAD_DEBUG
     printf("GUI: releasing lock... %d\n", isGuiBlocked);
@@ -2205,7 +2205,7 @@ void QSGCanvasRenderThread::unlockInGui()
 
 
 
-void QSGCanvasRenderThread::animationStarted()
+void QQuickCanvasRenderThread::animationStarted()
 {
 #ifdef THREAD_DEBUG
     printf("GUI: animationStarted()\n");
@@ -2223,7 +2223,7 @@ void QSGCanvasRenderThread::animationStarted()
 
 
 
-void QSGCanvasRenderThread::animationStopped()
+void QQuickCanvasRenderThread::animationStopped()
 {
 #ifdef THREAD_DEBUG
     printf("GUI: animationStopped()...\n");
@@ -2235,7 +2235,7 @@ void QSGCanvasRenderThread::animationStopped()
 }
 
 
-void QSGCanvasRenderThread::paint()
+void QQuickCanvasRenderThread::paint()
 {
 #ifdef THREAD_DEBUG
     printf("GUI: paint called..\n");
@@ -2255,7 +2255,7 @@ void QSGCanvasRenderThread::paint()
 
 
 
-void QSGCanvasRenderThread::resize(const QSize &size)
+void QQuickCanvasRenderThread::resize(const QSize &size)
 {
 #ifdef THREAD_DEBUG
     printf("GUI: Resize Event: %dx%d\n", size.width(), size.height());
@@ -2281,7 +2281,7 @@ void QSGCanvasRenderThread::resize(const QSize &size)
 
 
 
-void QSGCanvasRenderThread::startRendering()
+void QQuickCanvasRenderThread::startRendering()
 {
 #ifdef THREAD_DEBUG
     printf("GUI: Starting Render Thread\n");
@@ -2295,7 +2295,7 @@ void QSGCanvasRenderThread::startRendering()
 
 
 
-void QSGCanvasRenderThread::stopRendering()
+void QQuickCanvasRenderThread::stopRendering()
 {
 #ifdef THREAD_DEBUG
     printf("GUI: stopping render thread\n");
@@ -2336,13 +2336,13 @@ void QSGCanvasRenderThread::stopRendering()
 
 
 
-QImage QSGCanvasRenderThread::grab()
+QImage QQuickCanvasRenderThread::grab()
 {
     if (!isRunning())
         return QImage();
 
     if (QThread::currentThread() != qApp->thread()) {
-        qWarning("QSGCanvas::grabFrameBuffer: can only be called from the GUI thread");
+        qWarning("QQuickCanvas::grabFrameBuffer: can only be called from the GUI thread");
         return QImage();
     }
 
@@ -2371,11 +2371,11 @@ QImage QSGCanvasRenderThread::grab()
 
 
 
-void QSGCanvasRenderThread::maybeUpdate()
+void QQuickCanvasRenderThread::maybeUpdate()
 {
     Q_ASSERT_X(QThread::currentThread() == QCoreApplication::instance()->thread() || inSync,
-               "QSGCanvas::update",
-               "Function can only be called from GUI thread or during QSGItem::updatePaintNode()");
+               "QQuickCanvas::update",
+               "Function can only be called from GUI thread or during QQuickItem::updatePaintNode()");
 
     if (inSync) {
         isExternalUpdatePending = true;
@@ -2394,6 +2394,6 @@ void QSGCanvasRenderThread::maybeUpdate()
 }
 
 
-#include "moc_qsgcanvas.cpp"
+#include "moc_qquickcanvas.cpp"
 
 QT_END_NAMESPACE
diff --git a/src/declarative/items/qsgcanvas.h b/src/declarative/items/qquickcanvas.h
index 094fe40553..8b69744161 100644
--- a/src/declarative/items/qsgcanvas.h
+++ b/src/declarative/items/qquickcanvas.h
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#ifndef QSGCANVAS_H
-#define QSGCANVAS_H
+#ifndef QQUICKCANVAS_H
+#define QQUICKCANVAS_H
 
 #include <QtCore/qmetatype.h>
 #include <QtGui/qopengl.h>
@@ -52,27 +52,27 @@ QT_BEGIN_NAMESPACE
 
 QT_MODULE(Declarative)
 
-class QSGItem;
+class QQuickItem;
 class QSGEngine;
-class QSGCanvasPrivate;
+class QQuickCanvasPrivate;
 class QOpenGLFramebufferObject;
 class QDeclarativeIncubationController;
 
-class Q_DECLARATIVE_EXPORT QSGCanvas : public QWindow
+class Q_DECLARATIVE_EXPORT QQuickCanvas : public QWindow
 {
 Q_OBJECT
-Q_DECLARE_PRIVATE(QSGCanvas)
+Q_DECLARE_PRIVATE(QQuickCanvas)
 public:
-    QSGCanvas(QWindow *parent = 0);
+    QQuickCanvas(QWindow *parent = 0);
 
-    virtual ~QSGCanvas();
+    virtual ~QQuickCanvas();
 
-    QSGItem *rootItem() const;
-    QSGItem *activeFocusItem() const;
+    QQuickItem *rootItem() const;
+    QQuickItem *activeFocusItem() const;
 
-    QSGItem *mouseGrabberItem() const;
+    QQuickItem *mouseGrabberItem() const;
 
-    bool sendEvent(QSGItem *, QEvent *);
+    bool sendEvent(QQuickItem *, QEvent *);
 
     QVariant inputMethodQuery(Qt::InputMethodQuery query) const;
 
@@ -93,7 +93,7 @@ Q_SIGNALS:
     void sceneGraphInitialized();
 
 protected:
-    QSGCanvas(QSGCanvasPrivate &dd, QWindow *parent = 0);
+    QQuickCanvas(QQuickCanvasPrivate &dd, QWindow *parent = 0);
 
     virtual void exposeEvent(QExposeEvent *);
     virtual void resizeEvent(QResizeEvent *);
@@ -120,16 +120,16 @@ private Q_SLOTS:
     void animationStopped();
 
 private:
-    friend class QSGItem;
-    friend class QSGCanvasRenderLoop;
-    Q_DISABLE_COPY(QSGCanvas)
+    friend class QQuickItem;
+    friend class QQuickCanvasRenderLoop;
+    Q_DISABLE_COPY(QQuickCanvas)
 };
 
 QT_END_NAMESPACE
 
-Q_DECLARE_METATYPE(QSGCanvas *)
+Q_DECLARE_METATYPE(QQuickCanvas *)
 
 QT_END_HEADER
 
-#endif // QSGCANVAS_H
+#endif // QQUICKCANVAS_H
 
diff --git a/src/declarative/items/qsgcanvas_p.h b/src/declarative/items/qquickcanvas_p.h
index e2ec7a1963..5c68442f29 100644
--- a/src/declarative/items/qsgcanvas_p.h
+++ b/src/declarative/items/qquickcanvas_p.h
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#ifndef QSGCANVAS_P_H
-#define QSGCANVAS_P_H
+#ifndef QQUICKCANVAS_P_H
+#define QQUICKCANVAS_P_H
 
 //
 //  W A R N I N G
@@ -53,12 +53,12 @@
 // We mean it.
 //
 
-#include "qsgitem.h"
-#include "qsgcanvas.h"
+#include "qquickitem.h"
+#include "qquickcanvas.h"
 #include <private/qdeclarativeguard_p.h>
 
 #include <private/qsgcontext_p.h>
-#include <private/qsgdrag_p.h>
+#include <private/qquickdrag_p.h>
 
 #include <QtCore/qthread.h>
 #include <QtCore/qmutex.h>
@@ -73,69 +73,69 @@
 QT_BEGIN_NAMESPACE
 
 //Make it easy to identify and customize the root item if needed
-class QSGRootItem : public QSGItem
+class QQuickRootItem : public QQuickItem
 {
     Q_OBJECT
 public:
-    QSGRootItem();
+    QQuickRootItem();
 };
 
-class QSGCanvasPrivate;
+class QQuickCanvasPrivate;
 
 class QTouchEvent;
-class QSGCanvasRenderLoop;
-class QSGCanvasIncubationController;
+class QQuickCanvasRenderLoop;
+class QQuickCanvasIncubationController;
 
-class QSGCanvasPrivate : public QWindowPrivate
+class QQuickCanvasPrivate : public QWindowPrivate
 {
 public:
-    Q_DECLARE_PUBLIC(QSGCanvas)
+    Q_DECLARE_PUBLIC(QQuickCanvas)
 
-    static inline QSGCanvasPrivate *get(QSGCanvas *c) { return c->d_func(); }
+    static inline QQuickCanvasPrivate *get(QQuickCanvas *c) { return c->d_func(); }
 
-    QSGCanvasPrivate();
-    virtual ~QSGCanvasPrivate();
+    QQuickCanvasPrivate();
+    virtual ~QQuickCanvasPrivate();
 
-    void init(QSGCanvas *);
+    void init(QQuickCanvas *);
 
-    QSGRootItem *rootItem;
+    QQuickRootItem *rootItem;
 
-    QSGItem *activeFocusItem;
-    QSGItem *mouseGrabberItem;
-    QSGDragGrabber dragGrabber;
+    QQuickItem *activeFocusItem;
+    QQuickItem *mouseGrabberItem;
+    QQuickDragGrabber dragGrabber;
 
     // Mouse positions are saved in widget coordinates
     QPointF lastMousePosition;
     void translateTouchEvent(QTouchEvent *touchEvent);
     static void transformTouchPoints(QList<QTouchEvent::TouchPoint> &touchPoints, const QTransform &transform);
-    bool deliverInitialMousePressEvent(QSGItem *, QMouseEvent *);
+    bool deliverInitialMousePressEvent(QQuickItem *, QMouseEvent *);
     bool deliverMouseEvent(QMouseEvent *);
-    bool sendFilteredMouseEvent(QSGItem *, QSGItem *, QMouseEvent *);
-    bool deliverWheelEvent(QSGItem *, QWheelEvent *);
-    bool deliverTouchPoints(QSGItem *, QTouchEvent *, const QList<QTouchEvent::TouchPoint> &, QSet<int> *,
-            QHash<QSGItem *, QList<QTouchEvent::TouchPoint> > *);
+    bool sendFilteredMouseEvent(QQuickItem *, QQuickItem *, QMouseEvent *);
+    bool deliverWheelEvent(QQuickItem *, QWheelEvent *);
+    bool deliverTouchPoints(QQuickItem *, QTouchEvent *, const QList<QTouchEvent::TouchPoint> &, QSet<int> *,
+            QHash<QQuickItem *, QList<QTouchEvent::TouchPoint> > *);
     bool deliverTouchEvent(QTouchEvent *);
-    bool deliverHoverEvent(QSGItem *, const QPointF &scenePos, const QPointF &lastScenePos, Qt::KeyboardModifiers modifiers, bool &accepted);
-    bool sendHoverEvent(QEvent::Type, QSGItem *, const QPointF &scenePos, const QPointF &lastScenePos,
+    bool deliverHoverEvent(QQuickItem *, const QPointF &scenePos, const QPointF &lastScenePos, Qt::KeyboardModifiers modifiers, bool &accepted);
+    bool sendHoverEvent(QEvent::Type, QQuickItem *, const QPointF &scenePos, const QPointF &lastScenePos,
                         Qt::KeyboardModifiers modifiers, bool accepted);
     bool clearHover();
-    void deliverDragEvent(QSGDragGrabber *, QEvent *);
-    bool deliverDragEvent(QSGDragGrabber *, QSGItem *, QDragMoveEvent *);
+    void deliverDragEvent(QQuickDragGrabber *, QEvent *);
+    bool deliverDragEvent(QQuickDragGrabber *, QQuickItem *, QDragMoveEvent *);
 
-    QList<QSGItem*> hoverItems;
+    QList<QQuickItem*> hoverItems;
     enum FocusOption {
         DontChangeFocusProperty = 0x01,
     };
     Q_DECLARE_FLAGS(FocusOptions, FocusOption)
 
-    void setFocusInScope(QSGItem *scope, QSGItem *item, FocusOptions = 0);
-    void clearFocusInScope(QSGItem *scope, QSGItem *item, FocusOptions = 0);
-    void notifyFocusChangesRecur(QSGItem **item, int remaining);
+    void setFocusInScope(QQuickItem *scope, QQuickItem *item, FocusOptions = 0);
+    void clearFocusInScope(QQuickItem *scope, QQuickItem *item, FocusOptions = 0);
+    void notifyFocusChangesRecur(QQuickItem **item, int remaining);
 
     void updateInputMethodData();
     void updateFocusItemTransform();
 
-    void dirtyItem(QSGItem *);
+    void dirtyItem(QQuickItem *);
     void cleanup(QSGNode *);
 
     void initializeSceneGraph();
@@ -143,24 +143,24 @@ public:
     void syncSceneGraph();
     void renderSceneGraph(const QSize &size);
 
-    QSGItem::UpdatePaintNodeData updatePaintNodeData;
+    QQuickItem::UpdatePaintNodeData updatePaintNodeData;
 
-    QSGItem *dirtyItemList;
+    QQuickItem *dirtyItemList;
     QList<QSGNode *> cleanupNodeList;
 
-    QSet<QSGItem *> itemsToPolish;
+    QSet<QQuickItem *> itemsToPolish;
 
     void updateDirtyNodes();
     void cleanupNodes();
-    bool updateEffectiveOpacity(QSGItem *);
-    void updateEffectiveOpacityRoot(QSGItem *, qreal);
-    void updateDirtyNode(QSGItem *);
+    bool updateEffectiveOpacity(QQuickItem *);
+    void updateEffectiveOpacityRoot(QQuickItem *, qreal);
+    void updateDirtyNode(QQuickItem *);
 
     QSGContext *context;
 
     uint vsyncAnimations : 1;
 
-    QSGCanvasRenderLoop *thread;
+    QQuickCanvasRenderLoop *thread;
     QSize widgetSize;
     QSize viewportSize;
 
@@ -168,26 +168,26 @@ public:
 
     QOpenGLFramebufferObject *renderTarget;
 
-    QHash<int, QSGItem *> itemForTouchPointId;
+    QHash<int, QQuickItem *> itemForTouchPointId;
 
-    mutable QSGCanvasIncubationController *incubationController;
+    mutable QQuickCanvasIncubationController *incubationController;
 };
 
-class QSGCanvasRenderLoop
+class QQuickCanvasRenderLoop
 {
 public:
-    QSGCanvasRenderLoop()
+    QQuickCanvasRenderLoop()
         : d(0)
         , renderer(0)
         , gl(0)
     {
     }
-    virtual ~QSGCanvasRenderLoop()
+    virtual ~QQuickCanvasRenderLoop()
     {
         delete gl;
     }
 
-    friend class QSGCanvasPrivate;
+    friend class QQuickCanvasPrivate;
 
     virtual void paint() = 0;
     virtual void resize(const QSize &size) = 0;
@@ -219,17 +219,17 @@ protected:
     }
 
 private:
-    QSGCanvasPrivate *d;
-    QSGCanvas *renderer;
+    QQuickCanvasPrivate *d;
+    QQuickCanvas *renderer;
 
     QOpenGLContext *gl;
 };
 
-class QSGCanvasRenderThread : public QThread, public QSGCanvasRenderLoop
+class QQuickCanvasRenderThread : public QThread, public QQuickCanvasRenderLoop
 {
     Q_OBJECT
 public:
-    QSGCanvasRenderThread()
+    QQuickCanvasRenderThread()
         : mutex(QMutex::NonRecursive)
         , allowMainThreadProcessingFlag(true)
         , animationRunning(false)
@@ -301,8 +301,8 @@ public:
     void run();
 };
 
-Q_DECLARE_OPERATORS_FOR_FLAGS(QSGCanvasPrivate::FocusOptions)
+Q_DECLARE_OPERATORS_FOR_FLAGS(QQuickCanvasPrivate::FocusOptions)
 
 QT_END_NAMESPACE
 
-#endif // QSGCANVAS_P_H
+#endif // QQUICKCANVAS_P_H
diff --git a/src/declarative/items/qsgclipnode.cpp b/src/declarative/items/qquickclipnode.cpp
index 1147636a17..4aeb2dcf69 100644
--- a/src/declarative/items/qsgclipnode.cpp
+++ b/src/declarative/items/qquickclipnode.cpp
@@ -40,12 +40,12 @@
 ****************************************************************************/
 
 
-#include "qsgclipnode_p.h"
+#include "qquickclipnode_p.h"
 
 #include <QtGui/qvector2d.h>
 #include <QtCore/qmath.h>
 
-QSGDefaultClipNode::QSGDefaultClipNode(const QRectF &rect)
+QQuickDefaultClipNode::QQuickDefaultClipNode(const QRectF &rect)
     : m_rect(rect)
     , m_radius(0)
     , m_dirty_geometry(true)
@@ -55,20 +55,20 @@ QSGDefaultClipNode::QSGDefaultClipNode(const QRectF &rect)
     setIsRectangular(true);
 }
 
-void QSGDefaultClipNode::setRect(const QRectF &rect)
+void QQuickDefaultClipNode::setRect(const QRectF &rect)
 {
     m_rect = rect;
     m_dirty_geometry = true;
 }
 
-void QSGDefaultClipNode::setRadius(qreal radius)
+void QQuickDefaultClipNode::setRadius(qreal radius)
 {
     m_radius = radius;
     m_dirty_geometry = true;
     setIsRectangular(radius == 0);
 }
 
-void QSGDefaultClipNode::update()
+void QQuickDefaultClipNode::update()
 {
     if (m_dirty_geometry) {
         updateGeometry();
@@ -76,7 +76,7 @@ void QSGDefaultClipNode::update()
     }
 }
 
-void QSGDefaultClipNode::updateGeometry()
+void QQuickDefaultClipNode::updateGeometry()
 {
     QSGGeometry *g = geometry();
 
diff --git a/src/declarative/items/qsgclipnode_p.h b/src/declarative/items/qquickclipnode_p.h
index 0e6d057204..0323c9a24a 100644
--- a/src/declarative/items/qsgclipnode_p.h
+++ b/src/declarative/items/qquickclipnode_p.h
@@ -39,15 +39,15 @@
 **
 ****************************************************************************/
 
-#ifndef QSGCLIPNODE_P_H
-#define QSGCLIPNODE_P_H
+#ifndef QQUICKCLIPNODE_P_H
+#define QQUICKCLIPNODE_P_H
 
 #include <qsgnode.h>
 
-class QSGDefaultClipNode : public QSGClipNode
+class QQuickDefaultClipNode : public QSGClipNode
 {
 public:
-    QSGDefaultClipNode(const QRectF &);
+    QQuickDefaultClipNode(const QRectF &);
 
     void setRect(const QRectF &);
     QRectF rect() const { return m_rect; }
@@ -68,4 +68,4 @@ private:
     QSGGeometry m_geometry;
 };
 
-#endif // QSGCLIPNODE_P_H
+#endif // QQUICKCLIPNODE_P_H
diff --git a/src/declarative/items/qsgdrag.cpp b/src/declarative/items/qquickdrag.cpp
index b95e495477..d3439b08bf 100644
--- a/src/declarative/items/qsgdrag.cpp
+++ b/src/declarative/items/qquickdrag.cpp
@@ -39,25 +39,25 @@
 **
 ****************************************************************************/
 
-#include "qsgdrag_p.h"
+#include "qquickdrag_p.h"
 
-#include <private/qsgitem_p.h>
-#include <private/qsgevents_p_p.h>
-#include <private/qsgitemchangelistener_p.h>
+#include <private/qquickitem_p.h>
+#include <private/qquickevents_p_p.h>
+#include <private/qquickitemchangelistener_p.h>
 #include <private/qv8engine_p.h>
 
 #include <QtGui/qevent.h>
 
 QT_BEGIN_NAMESPACE
 
-class QSGDragAttachedPrivate : public QObjectPrivate, public QSGItemChangeListener
+class QQuickDragAttachedPrivate : public QObjectPrivate, public QQuickItemChangeListener
 {
-    Q_DECLARE_PUBLIC(QSGDragAttached)
+    Q_DECLARE_PUBLIC(QQuickDragAttached)
 public:
-    static QSGDragAttachedPrivate *get(QSGDragAttached *attached) {
-        return static_cast<QSGDragAttachedPrivate *>(QObjectPrivate::get(attached)); }
+    static QQuickDragAttachedPrivate *get(QQuickDragAttached *attached) {
+        return static_cast<QQuickDragAttachedPrivate *>(QObjectPrivate::get(attached)); }
 
-    QSGDragAttachedPrivate()
+    QQuickDragAttachedPrivate()
         : attachedItem(0)
         , mimeData(0)
         , proposedAction(Qt::MoveAction)
@@ -67,17 +67,17 @@ public:
     {
     }
 
-    void itemGeometryChanged(QSGItem *, const QRectF &, const QRectF &);
+    void itemGeometryChanged(QQuickItem *, const QRectF &, const QRectF &);
     void start() { start(supportedActions); }
     void start(Qt::DropActions supportedActions);
-    void setTarget(QSGItem *item);
+    void setTarget(QQuickItem *item);
 
-    QSGDragGrabber dragGrabber;
+    QQuickDragGrabber dragGrabber;
 
     QDeclarativeGuard<QObject> source;
     QDeclarativeGuard<QObject> target;
-    QSGItem *attachedItem;
-    QSGDragMimeData *mimeData;
+    QQuickItem *attachedItem;
+    QQuickDragMimeData *mimeData;
     Qt::DropAction proposedAction;
     Qt::DropActions supportedActions;
     bool active : 1;
@@ -87,7 +87,7 @@ public:
 };
 
 /*!
-    \qmlclass Drag QSGDrag
+    \qmlclass Drag QQuickDrag
     \inqmlmodule QtQuick 2
     \brief The Drag attached property provides drag and drop events for moved Items.
 
@@ -113,17 +113,17 @@ public:
 
 */
 
-void QSGDragAttachedPrivate::itemGeometryChanged(QSGItem *, const QRectF &newGeometry, const QRectF &oldGeometry)
+void QQuickDragAttachedPrivate::itemGeometryChanged(QQuickItem *, const QRectF &newGeometry, const QRectF &oldGeometry)
 {
-    Q_Q(QSGDragAttached);
+    Q_Q(QQuickDragAttached);
     if (newGeometry.topLeft() == oldGeometry.topLeft() || !active)
         return;
 
-    if (QSGCanvas *canvas = attachedItem->canvas()) {
+    if (QQuickCanvas *canvas = attachedItem->canvas()) {
         QPoint scenePos = attachedItem->mapToScene(hotSpot).toPoint();
         QDragMoveEvent event(scenePos, mimeData->m_supportedActions, mimeData, Qt::NoButton, Qt::NoModifier);
-        QSGDropEventEx::setProposedAction(&event, proposedAction);
-        QSGCanvasPrivate::get(canvas)->deliverDragEvent(&dragGrabber, &event);
+        QQuickDropEventEx::setProposedAction(&event, proposedAction);
+        QQuickCanvasPrivate::get(canvas)->deliverDragEvent(&dragGrabber, &event);
         if (target != dragGrabber.target()) {
             target = dragGrabber.target();
             emit q->targetChanged();
@@ -131,17 +131,17 @@ void QSGDragAttachedPrivate::itemGeometryChanged(QSGItem *, const QRectF &newGeo
     }
 }
 
-QSGDragAttached::QSGDragAttached(QObject *parent)
-    : QObject(*new QSGDragAttachedPrivate, parent)
+QQuickDragAttached::QQuickDragAttached(QObject *parent)
+    : QObject(*new QQuickDragAttachedPrivate, parent)
 {
-    Q_D(QSGDragAttached);
-    d->attachedItem = qobject_cast<QSGItem *>(parent);
+    Q_D(QQuickDragAttached);
+    d->attachedItem = qobject_cast<QQuickItem *>(parent);
     d->source = d->attachedItem;
 }
 
-QSGDragAttached::~QSGDragAttached()
+QQuickDragAttached::~QQuickDragAttached()
 {
-    Q_D(QSGDragAttached);
+    Q_D(QQuickDragAttached);
     delete d->mimeData;
 }
 
@@ -158,15 +158,15 @@ QSGDragAttached::~QSGDragAttached()
     event with item's new position to the scene.
 */
 
-bool QSGDragAttached::isActive() const
+bool QQuickDragAttached::isActive() const
 {
-    Q_D(const QSGDragAttached);
+    Q_D(const QQuickDragAttached);
     return d->active;
 }
 
-void QSGDragAttached::setActive(bool active)
+void QQuickDragAttached::setActive(bool active)
 {
-    Q_D(QSGDragAttached);
+    Q_D(QQuickDragAttached);
     if (d->active != active) {
         if (active)
             d->start(d->supportedActions);
@@ -184,24 +184,24 @@ void QSGDragAttached::setActive(bool active)
     Changes to source while a Drag is active don't take effect until a new drag is started.
 */
 
-QObject *QSGDragAttached::source() const
+QObject *QQuickDragAttached::source() const
 {
-    Q_D(const QSGDragAttached);
+    Q_D(const QQuickDragAttached);
     return d->source;
 }
 
-void QSGDragAttached::setSource(QObject *item)
+void QQuickDragAttached::setSource(QObject *item)
 {
-    Q_D(QSGDragAttached);
+    Q_D(QQuickDragAttached);
     if (d->source != item) {
         d->source = item;
         emit sourceChanged();
     }
 }
 
-void QSGDragAttached::resetSource()
+void QQuickDragAttached::resetSource()
 {
-    Q_D(QSGDragAttached);
+    Q_D(QQuickDragAttached);
     if (d->source != d->attachedItem) {
         d->source = d->attachedItem;
         emit sourceChanged();
@@ -220,9 +220,9 @@ void QSGDragAttached::resetSource()
     the drag was cancelled the target will then be null.
 */
 
-QObject *QSGDragAttached::target() const
+QObject *QQuickDragAttached::target() const
 {
-    Q_D(const QSGDragAttached);
+    Q_D(const QQuickDragAttached);
     return d->target;
 }
 
@@ -236,15 +236,15 @@ QObject *QSGDragAttached::target() const
     Changes to hotSpot will take effect when the next event is sent.
 */
 
-QPointF QSGDragAttached::hotSpot() const
+QPointF QQuickDragAttached::hotSpot() const
 {
-    Q_D(const QSGDragAttached);
+    Q_D(const QQuickDragAttached);
     return d->hotSpot;
 }
 
-void QSGDragAttached::setHotSpot(const QPointF &hotSpot)
+void QQuickDragAttached::setHotSpot(const QPointF &hotSpot)
 {
-    Q_D(QSGDragAttached);
+    Q_D(QQuickDragAttached);
     if (d->hotSpot != hotSpot) {
         d->hotSpot = hotSpot;
         emit hotSpotChanged();
@@ -260,15 +260,15 @@ void QSGDragAttached::setHotSpot(const QPointF &hotSpot)
     Changes to keys while a Drag is active don't take effect until a new drag is started.
 */
 
-QStringList QSGDragAttached::keys() const
+QStringList QQuickDragAttached::keys() const
 {
-    Q_D(const QSGDragAttached);
+    Q_D(const QQuickDragAttached);
     return d->keys;
 }
 
-void QSGDragAttached::setKeys(const QStringList &keys)
+void QQuickDragAttached::setKeys(const QStringList &keys)
 {
-    Q_D(QSGDragAttached);
+    Q_D(QQuickDragAttached);
     if (d->keys != keys) {
         d->keys = keys;
         emit keysChanged();
@@ -284,15 +284,15 @@ void QSGDragAttached::setKeys(const QStringList &keys)
     until a new drag is started.
 */
 
-Qt::DropActions QSGDragAttached::supportedActions() const
+Qt::DropActions QQuickDragAttached::supportedActions() const
 {
-    Q_D(const QSGDragAttached);
+    Q_D(const QQuickDragAttached);
     return d->supportedActions;
 }
 
-void QSGDragAttached::setSupportedActions(Qt::DropActions actions)
+void QQuickDragAttached::setSupportedActions(Qt::DropActions actions)
 {
-    Q_D(QSGDragAttached);
+    Q_D(QQuickDragAttached);
     if (d->supportedActions != actions) {
         d->supportedActions = actions;
         emit supportedActionsChanged();
@@ -308,15 +308,15 @@ void QSGDragAttached::setSupportedActions(Qt::DropActions actions)
     Changes to proposedAction will take effect when the next event is sent.
 */
 
-Qt::DropAction QSGDragAttached::proposedAction() const
+Qt::DropAction QQuickDragAttached::proposedAction() const
 {
-    Q_D(const QSGDragAttached);
+    Q_D(const QQuickDragAttached);
     return d->proposedAction;
 }
 
-void QSGDragAttached::setProposedAction(Qt::DropAction action)
+void QQuickDragAttached::setProposedAction(Qt::DropAction action)
 {
-    Q_D(QSGDragAttached);
+    Q_D(QQuickDragAttached);
     if (d->proposedAction != action) {
         d->proposedAction = action;
         emit proposedActionChanged();
@@ -324,16 +324,16 @@ void QSGDragAttached::setProposedAction(Qt::DropAction action)
     }
 }
 
-void QSGDragAttachedPrivate::start(Qt::DropActions supportedActions)
+void QQuickDragAttachedPrivate::start(Qt::DropActions supportedActions)
 {
-    Q_Q(QSGDragAttached);
+    Q_Q(QQuickDragAttached);
     Q_ASSERT(!active);
 
-    if (QSGCanvas *canvas = attachedItem ? attachedItem->canvas() : 0) {
+    if (QQuickCanvas *canvas = attachedItem ? attachedItem->canvas() : 0) {
         if (!mimeData)
-            mimeData = new QSGDragMimeData;
+            mimeData = new QQuickDragMimeData;
         if (!listening) {
-            QSGItemPrivate::get(attachedItem)->addItemChangeListener(this, QSGItemPrivate::Geometry);
+            QQuickItemPrivate::get(attachedItem)->addItemChangeListener(this, QQuickItemPrivate::Geometry);
             listening = true;
         }
 
@@ -344,8 +344,8 @@ void QSGDragAttachedPrivate::start(Qt::DropActions supportedActions)
 
         QPoint scenePos = attachedItem->mapToScene(hotSpot).toPoint();
         QDragEnterEvent event(scenePos, supportedActions, mimeData, Qt::NoButton, Qt::NoModifier);
-        QSGDropEventEx::setProposedAction(&event, proposedAction);
-        QSGCanvasPrivate::get(canvas)->deliverDragEvent(&dragGrabber, &event);
+        QQuickDropEventEx::setProposedAction(&event, proposedAction);
+        QQuickCanvasPrivate::get(canvas)->deliverDragEvent(&dragGrabber, &event);
 
         emit q->activeChanged();
         if (target != dragGrabber.target()) {
@@ -364,9 +364,9 @@ void QSGDragAttachedPrivate::start(Qt::DropActions supportedActions)
     property for the started sequence.
 */
 
-void QSGDragAttached::start(QDeclarativeV8Function *args)
+void QQuickDragAttached::start(QDeclarativeV8Function *args)
 {
-    Q_D(QSGDragAttached);
+    Q_D(QQuickDragAttached);
     if (d->active)
         cancel();
 
@@ -400,9 +400,9 @@ void QSGDragAttached::start(QDeclarativeV8Function *args)
 
 */
 
-int QSGDragAttached::drop()
+int QQuickDragAttached::drop()
 {
-    Q_D(QSGDragAttached);
+    Q_D(QQuickDragAttached);
     Qt::DropAction acceptedAction = Qt::IgnoreAction;
 
     if (!d->active)
@@ -410,13 +410,13 @@ int QSGDragAttached::drop()
 
     QObject *target = 0;
 
-    if (QSGCanvas *canvas = d->attachedItem->canvas()) {
+    if (QQuickCanvas *canvas = d->attachedItem->canvas()) {
         QPoint scenePos = d->attachedItem->mapToScene(d->hotSpot).toPoint();
 
         QDropEvent event(
                 scenePos, d->mimeData->m_supportedActions, d->mimeData, Qt::NoButton, Qt::NoModifier);
-        QSGDropEventEx::setProposedAction(&event, d->proposedAction);
-        QSGCanvasPrivate::get(canvas)->deliverDragEvent(&d->dragGrabber, &event);
+        QQuickDropEventEx::setProposedAction(&event, d->proposedAction);
+        QQuickCanvasPrivate::get(canvas)->deliverDragEvent(&d->dragGrabber, &event);
 
         if (event.isAccepted()) {
             acceptedAction = event.dropAction();
@@ -440,15 +440,15 @@ int QSGDragAttached::drop()
     Ends a drag sequence.
 */
 
-void QSGDragAttached::cancel()
+void QQuickDragAttached::cancel()
 {
-    Q_D(QSGDragAttached);
+    Q_D(QQuickDragAttached);
     if (!d->active)
         return;
 
-    if (QSGCanvas *canvas = d->attachedItem->canvas()) {
+    if (QQuickCanvas *canvas = d->attachedItem->canvas()) {
         QDragLeaveEvent event;
-        QSGCanvasPrivate::get(canvas)->deliverDragEvent(&d->dragGrabber, &event);
+        QQuickCanvasPrivate::get(canvas)->deliverDragEvent(&d->dragGrabber, &event);
     }
 
     d->active = false;
diff --git a/src/declarative/items/qsgdrag_p.h b/src/declarative/items/qquickdrag_p.h
index 246c6e6beb..1d950299d7 100644
--- a/src/declarative/items/qsgdrag_p.h
+++ b/src/declarative/items/qquickdrag_p.h
@@ -40,10 +40,10 @@
 **
 ****************************************************************************/
 
-#ifndef QSGDRAG_P_H
-#define QSGDRAG_P_H
+#ifndef QQUICKDRAG_P_H
+#define QQUICKDRAG_P_H
 
-#include <qsgitem.h>
+#include <qquickitem.h>
 
 #include <private/qv8engine_p.h>
 
@@ -57,27 +57,27 @@ QT_BEGIN_NAMESPACE
 
 QT_MODULE(Declarative)
 
-class QSGItem;
-class QSGDrag;
-class QSGDragPrivate;
+class QQuickItem;
+class QQuickDrag;
+class QQuickDragPrivate;
 
-class QSGDragGrabber
+class QQuickDragGrabber
 {
-    class Item : public QDeclarativeGuard<QSGItem>
+    class Item : public QDeclarativeGuard<QQuickItem>
     {
     public:
-        Item(QSGItem *item) : QDeclarativeGuard<QSGItem>(item) {}
+        Item(QQuickItem *item) : QDeclarativeGuard<QQuickItem>(item) {}
 
         QIntrusiveListNode node;
     protected:
-        void objectDestroyed(QSGItem *) { delete this; }
+        void objectDestroyed(QQuickItem *) { delete this; }
     };
 
     typedef QIntrusiveList<Item, &Item::node> ItemList;
 
 public:
-    QSGDragGrabber() : m_target(0) {}
-    ~QSGDragGrabber() { while (!m_items.isEmpty()) delete m_items.first(); }
+    QQuickDragGrabber() : m_target(0) {}
+    ~QQuickDragGrabber() { while (!m_items.isEmpty()) delete m_items.first(); }
 
 
     QObject *target() const
@@ -96,7 +96,7 @@ public:
     iterator begin() { return m_items.begin(); }
     iterator end() { return m_items.end(); }
 
-    void grab(QSGItem *item) { m_items.insert(new Item(item)); }
+    void grab(QQuickItem *item) { m_items.insert(new Item(item)); }
     iterator release(iterator at) { Item *item = *at; at = at.erase(); delete item; return at; }
 
 private:
@@ -105,28 +105,28 @@ private:
     QObject *m_target;
 };
 
-class QSGDropEventEx : public QDropEvent
+class QQuickDropEventEx : public QDropEvent
 {
 public:
     void setProposedAction(Qt::DropAction action) { default_action = action; drop_action = action; }
 
     static void setProposedAction(QDropEvent *event, Qt::DropAction action) {
-        static_cast<QSGDropEventEx *>(event)->setProposedAction(action);
+        static_cast<QQuickDropEventEx *>(event)->setProposedAction(action);
     }
 
     void copyActions(const QDropEvent &from) {
         default_action = from.proposedAction(); drop_action = from.dropAction(); }
 
     static void copyActions(QDropEvent *to, const QDropEvent &from) {
-        static_cast<QSGDropEventEx *>(to)->copyActions(from);
+        static_cast<QQuickDropEventEx *>(to)->copyActions(from);
     }
 };
 
-class QSGDragMimeData : public QMimeData
+class QQuickDragMimeData : public QMimeData
 {
     Q_OBJECT
 public:
-    QSGDragMimeData()
+    QQuickDragMimeData()
         : m_source(0)
     {
     }
@@ -139,14 +139,14 @@ private:
     Qt::DropActions m_supportedActions;
     QStringList m_keys;
 
-    friend class QSGDragAttached;
-    friend class QSGDragAttachedPrivate;
+    friend class QQuickDragAttached;
+    friend class QQuickDragAttachedPrivate;
 };
 
 class QDeclarativeV8Function;
 
-class QSGDragAttachedPrivate;
-class QSGDragAttached : public QObject
+class QQuickDragAttachedPrivate;
+class QQuickDragAttached : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(bool active READ isActive WRITE setActive NOTIFY activeChanged)
@@ -157,8 +157,8 @@ class QSGDragAttached : public QObject
     Q_PROPERTY(Qt::DropActions supportedActions READ supportedActions WRITE setSupportedActions NOTIFY supportedActionsChanged)
     Q_PROPERTY(Qt::DropAction proposedAction READ proposedAction WRITE setProposedAction NOTIFY proposedActionChanged)
 public:
-    QSGDragAttached(QObject *parent);
-    ~QSGDragAttached();
+    QQuickDragAttached(QObject *parent);
+    ~QQuickDragAttached();
 
     bool isActive() const;
     void setActive(bool active);
@@ -197,7 +197,7 @@ Q_SIGNALS:
     void proposedActionChanged();
 
 private:
-    Q_DECLARE_PRIVATE(QSGDragAttached)
+    Q_DECLARE_PRIVATE(QQuickDragAttached)
 };
 
 
diff --git a/src/declarative/items/qsgdroparea.cpp b/src/declarative/items/qquickdroparea.cpp
index a1b81be1ae..b9b93085e6 100644
--- a/src/declarative/items/qsgdroparea.cpp
+++ b/src/declarative/items/qquickdroparea.cpp
@@ -39,30 +39,30 @@
 **
 ****************************************************************************/
 
-#include "qsgdroparea_p.h"
-#include "qsgdrag_p.h"
-#include "qsgitem_p.h"
-#include "qsgcanvas.h"
+#include "qquickdroparea_p.h"
+#include "qquickdrag_p.h"
+#include "qquickitem_p.h"
+#include "qquickcanvas.h"
 
 #include <private/qdeclarativeengine_p.h>
 
-QSGDropAreaDrag::QSGDropAreaDrag(QSGDropAreaPrivate *d, QObject *parent)
+QQuickDropAreaDrag::QQuickDropAreaDrag(QQuickDropAreaPrivate *d, QObject *parent)
     : QObject(parent)
     , d(d)
 {
 }
 
-QSGDropAreaDrag::~QSGDropAreaDrag()
+QQuickDropAreaDrag::~QQuickDropAreaDrag()
 {
 }
 
-class QSGDropAreaPrivate : public QSGItemPrivate
+class QQuickDropAreaPrivate : public QQuickItemPrivate
 {
-    Q_DECLARE_PUBLIC(QSGDropArea)
+    Q_DECLARE_PUBLIC(QQuickDropArea)
 
 public:
-    QSGDropAreaPrivate();
-    ~QSGDropAreaPrivate();
+    QQuickDropAreaPrivate();
+    ~QQuickDropAreaPrivate();
 
     bool hasMatchingKey(const QStringList &keys) const;
 
@@ -71,23 +71,23 @@ public:
     QStringList keys;
     QRegExp keyRegExp;
     QPointF dragPosition;
-    QSGDropAreaDrag *drag;
+    QQuickDropAreaDrag *drag;
     QDeclarativeGuard<QObject> source;
     QDeclarativeGuard<QMimeData> mimeData;
 };
 
-QSGDropAreaPrivate::QSGDropAreaPrivate()
+QQuickDropAreaPrivate::QQuickDropAreaPrivate()
     : drag(0)
 {
 }
 
-QSGDropAreaPrivate::~QSGDropAreaPrivate()
+QQuickDropAreaPrivate::~QQuickDropAreaPrivate()
 {
     delete drag;
 }
 
 /*!
-    \qmlclass DropArea QSGDropArea
+    \qmlclass DropArea QQuickDropArea
     \inqmlmodule QtQuick 2
     \brief The DropArea item provides drag and drop handling.
 
@@ -107,13 +107,13 @@ QSGDropAreaPrivate::~QSGDropAreaPrivate()
     instantiated for each active drag over a drag target.
 */
 
-QSGDropArea::QSGDropArea(QSGItem *parent)
-    : QSGItem(*new QSGDropAreaPrivate, parent)
+QQuickDropArea::QQuickDropArea(QQuickItem *parent)
+    : QQuickItem(*new QQuickDropAreaPrivate, parent)
 {
     setFlags(ItemAcceptsDrops);
 }
 
-QSGDropArea::~QSGDropArea()
+QQuickDropArea::~QQuickDropArea()
 {
 }
 
@@ -124,9 +124,9 @@ QSGDropArea::~QSGDropArea()
     dragged items.
 */
 
-bool QSGDropArea::containsDrag() const
+bool QQuickDropArea::containsDrag() const
 {
-    Q_D(const QSGDropArea);
+    Q_D(const QQuickDropArea);
     return d->mimeData;
 }
 
@@ -141,15 +141,15 @@ bool QSGDropArea::containsDrag() const
     \sa QtQuick2::Drag::keys
 */
 
-QStringList QSGDropArea::keys() const
+QStringList QQuickDropArea::keys() const
 {
-    Q_D(const QSGDropArea);
+    Q_D(const QQuickDropArea);
     return d->keys;
 }
 
-void QSGDropArea::setKeys(const QStringList &keys)
+void QQuickDropArea::setKeys(const QStringList &keys)
 {
-    Q_D(QSGDropArea);
+    Q_D(QQuickDropArea);
     if (d->keys != keys) {
         d->keys = keys;
 
@@ -166,11 +166,11 @@ void QSGDropArea::setKeys(const QStringList &keys)
     }
 }
 
-QSGDropAreaDrag *QSGDropArea::drag()
+QQuickDropAreaDrag *QQuickDropArea::drag()
 {
-    Q_D(QSGDropArea);
+    Q_D(QQuickDropArea);
     if (!d->drag)
-        d->drag = new QSGDropAreaDrag(d);
+        d->drag = new QQuickDropAreaDrag(d);
     return d->drag;
 }
 
@@ -180,7 +180,7 @@ QSGDropAreaDrag *QSGDropArea::drag()
     This property holds the source of a drag.
 */
 
-QObject *QSGDropAreaDrag::source() const
+QObject *QQuickDropAreaDrag::source() const
 {
     return d->source;
 }
@@ -192,12 +192,12 @@ QObject *QSGDropAreaDrag::source() const
     These properties hold the coordinates of the last drag event.
 */
 
-qreal QSGDropAreaDrag::x() const
+qreal QQuickDropAreaDrag::x() const
 {
     return d->dragPosition.x();
 }
 
-qreal QSGDropAreaDrag::y() const
+qreal QQuickDropAreaDrag::y() const
 {
     return d->dragPosition.y();
 }
@@ -208,9 +208,9 @@ qreal QSGDropAreaDrag::y() const
     This handler is called when the position of a drag has changed.
 */
 
-void QSGDropArea::dragMoveEvent(QDragMoveEvent *event)
+void QQuickDropArea::dragMoveEvent(QDragMoveEvent *event)
 {
-    Q_D(QSGDropArea);
+    Q_D(QQuickDropArea);
     if (!d->mimeData)
         return;
 
@@ -219,11 +219,11 @@ void QSGDropArea::dragMoveEvent(QDragMoveEvent *event)
         emit d->drag->positionChanged();
 
     event->accept();
-    QSGDropEvent dragTargetEvent(d, event);
+    QQuickDropEvent dragTargetEvent(d, event);
     emit positionChanged(&dragTargetEvent);
 }
 
-bool QSGDropAreaPrivate::hasMatchingKey(const QStringList &keys) const
+bool QQuickDropAreaPrivate::hasMatchingKey(const QStringList &keys) const
 {
     if (keyRegExp.isEmpty())
         return true;
@@ -235,9 +235,9 @@ bool QSGDropAreaPrivate::hasMatchingKey(const QStringList &keys) const
     return false;
 }
 
-QStringList QSGDropAreaPrivate::getKeys(const QMimeData *mimeData) const
+QStringList QQuickDropAreaPrivate::getKeys(const QMimeData *mimeData) const
 {
-    if (const QSGDragMimeData *dragMime = qobject_cast<const QSGDragMimeData *>(mimeData))
+    if (const QQuickDragMimeData *dragMime = qobject_cast<const QQuickDragMimeData *>(mimeData))
         return dragMime->keys();
     return mimeData->formats();
 }
@@ -248,9 +248,9 @@ QStringList QSGDropAreaPrivate::getKeys(const QMimeData *mimeData) const
     This handler is called when a \a drag enters the bounds of a DropArea.
 */
 
-void QSGDropArea::dragEnterEvent(QDragEnterEvent *event)
+void QQuickDropArea::dragEnterEvent(QDragEnterEvent *event)
 {
-    Q_D(QSGDropArea);
+    Q_D(QQuickDropArea);
     const QMimeData *mimeData = event->mimeData();
     if (!d->effectiveEnable || d->mimeData || !mimeData || !d->hasMatchingKey(d->getKeys(mimeData)))
         return;
@@ -258,12 +258,12 @@ void QSGDropArea::dragEnterEvent(QDragEnterEvent *event)
     d->dragPosition = event->pos();
 
     event->accept();
-    QSGDropEvent dragTargetEvent(d, event);
+    QQuickDropEvent dragTargetEvent(d, event);
     emit entered(&dragTargetEvent);
 
     if (event->isAccepted()) {
         d->mimeData = const_cast<QMimeData *>(mimeData);
-        if (QSGDragMimeData *dragMime = qobject_cast<QSGDragMimeData *>(d->mimeData))
+        if (QQuickDragMimeData *dragMime = qobject_cast<QQuickDragMimeData *>(d->mimeData))
             d->source = dragMime->source();
         else
             d->source = event->source();
@@ -282,9 +282,9 @@ void QSGDropArea::dragEnterEvent(QDragEnterEvent *event)
     This handler is called when a drag exits the bounds of a DropArea.
 */
 
-void QSGDropArea::dragLeaveEvent(QDragLeaveEvent *)
+void QQuickDropArea::dragLeaveEvent(QDragLeaveEvent *)
 {
-    Q_D(QSGDropArea);
+    Q_D(QQuickDropArea);
     if (!d->mimeData)
         return;
 
@@ -304,13 +304,13 @@ void QSGDropArea::dragLeaveEvent(QDragLeaveEvent *)
     a DropArea.
 */
 
-void QSGDropArea::dropEvent(QDropEvent *event)
+void QQuickDropArea::dropEvent(QDropEvent *event)
 {
-    Q_D(QSGDropArea);
+    Q_D(QQuickDropArea);
     if (!d->mimeData)
         return;
 
-    QSGDropEvent dragTargetEvent(d, event);
+    QQuickDropEvent dragTargetEvent(d, event);
     emit dropped(&dragTargetEvent);
 
     d->mimeData = 0;
@@ -321,7 +321,7 @@ void QSGDropArea::dropEvent(QDropEvent *event)
 }
 
 /*!
-    \qmlclass DragEvent QSGDragEvent
+    \qmlclass DragEvent QQuickDragEvent
     \inqmlmodule QtQuick 2
     \brief The DragEvent object provides information about a drag event.
 
@@ -348,9 +348,9 @@ void QSGDropArea::dropEvent(QDropEvent *event)
     This property holds the source of a drag event.
 */
 
-QObject *QSGDropEvent::source()
+QObject *QQuickDropEvent::source()
 {
-    if (const QSGDragMimeData *dragMime = qobject_cast<const QSGDragMimeData *>(event->mimeData()))
+    if (const QQuickDragMimeData *dragMime = qobject_cast<const QQuickDragMimeData *>(event->mimeData()))
         return dragMime->source();
     else
         return event->source();
@@ -363,7 +363,7 @@ QObject *QSGDropEvent::source()
     drag event.
 */
 
-QStringList QSGDropEvent::keys() const
+QStringList QQuickDropEvent::keys() const
 {
     return d->getKeys(event->mimeData());
 }
@@ -407,7 +407,7 @@ QStringList QSGDropEvent::keys() const
     If an \a action is specified it will overwrite the value of the \l action property.
 */
 
-void QSGDropEvent::accept(QDeclarativeV8Function *args)
+void QQuickDropEvent::accept(QDeclarativeV8Function *args)
 {
     Qt::DropAction action = event->dropAction();
 
diff --git a/src/declarative/items/qsgdroparea_p.h b/src/declarative/items/qquickdroparea_p.h
index cd51f57e0b..31e2bd7813 100644
--- a/src/declarative/items/qsgdroparea_p.h
+++ b/src/declarative/items/qquickdroparea_p.h
@@ -39,10 +39,10 @@
 **
 ****************************************************************************/
 
-#ifndef QSGDROPAREA_P_H
-#define QSGDROPAREA_P_H
+#ifndef QQUICKDROPAREA_P_H
+#define QQUICKDROPAREA_P_H
 
-#include "qsgitem.h"
+#include "qquickitem.h"
 
 #include <private/qdeclarativeguard_p.h>
 #include <private/qv8engine_p.h>
@@ -55,8 +55,8 @@ QT_BEGIN_NAMESPACE
 
 QT_MODULE(Declarative)
 
-class QSGDropAreaPrivate;
-class QSGDropEvent : public QObject
+class QQuickDropAreaPrivate;
+class QQuickDropEvent : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(qreal x READ x)
@@ -67,7 +67,7 @@ class QSGDropEvent : public QObject
     Q_PROPERTY(Qt::DropAction action READ action WRITE setAction RESET resetAction)
     Q_PROPERTY(bool accepted READ accepted WRITE setAccepted)
 public:
-    QSGDropEvent(QSGDropAreaPrivate *d, QDropEvent *event) : d(d), event(event) {}
+    QQuickDropEvent(QQuickDropAreaPrivate *d, QDropEvent *event) : d(d), event(event) {}
 
     qreal x() const { return event->pos().x(); }
     qreal y() const { return event->pos().y(); }
@@ -87,19 +87,19 @@ public:
     Q_INVOKABLE void accept(QDeclarativeV8Function *);
 
 private:
-    QSGDropAreaPrivate *d;
+    QQuickDropAreaPrivate *d;
     QDropEvent *event;
 };
 
-class QSGDropAreaDrag : public QObject
+class QQuickDropAreaDrag : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(qreal x READ x NOTIFY positionChanged)
     Q_PROPERTY(qreal y READ y NOTIFY positionChanged)
     Q_PROPERTY(QObject *source READ source NOTIFY sourceChanged)
 public:
-    QSGDropAreaDrag(QSGDropAreaPrivate *d, QObject *parent = 0);
-    ~QSGDropAreaDrag();
+    QQuickDropAreaDrag(QQuickDropAreaPrivate *d, QObject *parent = 0);
+    ~QQuickDropAreaDrag();
 
     qreal x() const;
     qreal y() const;
@@ -110,23 +110,23 @@ Q_SIGNALS:
     void sourceChanged();
 
 private:
-    QSGDropAreaPrivate *d;
+    QQuickDropAreaPrivate *d;
 
-    friend class QSGDropArea;
-    friend class QSGDropAreaPrivate;
+    friend class QQuickDropArea;
+    friend class QQuickDropAreaPrivate;
 };
 
-class QSGDropAreaPrivate;
-class Q_AUTOTEST_EXPORT QSGDropArea : public QSGItem
+class QQuickDropAreaPrivate;
+class Q_AUTOTEST_EXPORT QQuickDropArea : public QQuickItem
 {
     Q_OBJECT
     Q_PROPERTY(bool containsDrag READ containsDrag NOTIFY containsDragChanged)
     Q_PROPERTY(QStringList keys READ keys WRITE setKeys NOTIFY keysChanged)
-    Q_PROPERTY(QSGDropAreaDrag *drag READ drag CONSTANT)
+    Q_PROPERTY(QQuickDropAreaDrag *drag READ drag CONSTANT)
 
 public:
-    QSGDropArea(QSGItem *parent=0);
-    ~QSGDropArea();
+    QQuickDropArea(QQuickItem *parent=0);
+    ~QQuickDropArea();
 
     bool containsDrag() const;
     void setContainsDrag(bool drag);
@@ -134,17 +134,17 @@ public:
     QStringList keys() const;
     void setKeys(const QStringList &keys);
 
-    QSGDropAreaDrag *drag();
+    QQuickDropAreaDrag *drag();
 
 Q_SIGNALS:
     void containsDragChanged();
     void keysChanged();
     void sourceChanged();
 
-    void entered(QSGDropEvent *drag);
+    void entered(QQuickDropEvent *drag);
     void exited();
-    void positionChanged(QSGDropEvent *drag);
-    void dropped(QSGDropEvent *drop);
+    void positionChanged(QQuickDropEvent *drag);
+    void dropped(QQuickDropEvent *drop);
 
 protected:
     void dragMoveEvent(QDragMoveEvent *event);
@@ -153,15 +153,15 @@ protected:
     void dropEvent(QDropEvent *event);
 
 private:
-    Q_DISABLE_COPY(QSGDropArea)
-    Q_DECLARE_PRIVATE(QSGDropArea)
+    Q_DISABLE_COPY(QQuickDropArea)
+    Q_DECLARE_PRIVATE(QQuickDropArea)
 };
 
 QT_END_NAMESPACE
 
-QML_DECLARE_TYPE(QSGDropEvent)
-QML_DECLARE_TYPE(QSGDropArea)
+QML_DECLARE_TYPE(QQuickDropEvent)
+QML_DECLARE_TYPE(QQuickDropArea)
 
 QT_END_HEADER
 
-#endif // QSGDRAGTARGET_P_H
+#endif // QQUICKDROPAREA_P_H
diff --git a/src/declarative/items/qsgevents.cpp b/src/declarative/items/qquickevents.cpp
index 2173b4a21f..c546dd305a 100644
--- a/src/declarative/items/qsgevents.cpp
+++ b/src/declarative/items/qquickevents.cpp
@@ -39,12 +39,12 @@
 **
 ****************************************************************************/
 
-#include "qsgevents_p_p.h"
+#include "qquickevents_p_p.h"
 
 QT_BEGIN_NAMESPACE
 
 /*!
-    \qmlclass KeyEvent QSGKeyEvent
+    \qmlclass KeyEvent QQuickKeyEvent
     \inqmlmodule QtQuick 2
     \ingroup qml-event-elements
 
@@ -139,7 +139,7 @@ Item {
 
 
 /*!
-    \qmlclass MouseEvent QSGMouseEvent
+    \qmlclass MouseEvent QQuickMouseEvent
     \inqmlmodule QtQuick 2
     \ingroup qml-event-elements
 
@@ -153,7 +153,7 @@ Item {
 
 /*!
     \internal
-    \class QSGMouseEvent
+    \class QQuickMouseEvent
 */
 
 /*!
diff --git a/src/declarative/items/qsgevents_p_p.h b/src/declarative/items/qquickevents_p_p.h
index 1d2b6a9dec..cbe75ab9bf 100644
--- a/src/declarative/items/qsgevents_p_p.h
+++ b/src/declarative/items/qquickevents_p_p.h
@@ -40,8 +40,8 @@
 **
 ****************************************************************************/
 
-#ifndef QSGEVENTS_P_P_H
-#define QSGEVENTS_P_P_H
+#ifndef QQUICKEVENTS_P_P_H
+#define QQUICKEVENTS_P_P_H
 
 //
 //  W A R N I N G
@@ -61,7 +61,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class QSGKeyEvent : public QObject
+class QQuickKeyEvent : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(int key READ key)
@@ -72,9 +72,9 @@ class QSGKeyEvent : public QObject
     Q_PROPERTY(bool accepted READ isAccepted WRITE setAccepted)
 
 public:
-    QSGKeyEvent(QEvent::Type type, int key, Qt::KeyboardModifiers modifiers, const QString &text=QString(), bool autorep=false, ushort count=1)
+    QQuickKeyEvent(QEvent::Type type, int key, Qt::KeyboardModifiers modifiers, const QString &text=QString(), bool autorep=false, ushort count=1)
         : event(type, key, modifiers, text, autorep, count) { event.setAccepted(false); }
-    QSGKeyEvent(const QKeyEvent &ke)
+    QQuickKeyEvent(const QKeyEvent &ke)
         : event(ke) { event.setAccepted(false); }
 
     int key() const { return event.key(); }
@@ -91,7 +91,7 @@ private:
 };
 
 // used in QtLocation
-class Q_DECLARATIVE_EXPORT QSGMouseEvent : public QObject
+class Q_DECLARATIVE_EXPORT QQuickMouseEvent : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(int x READ x)
@@ -104,7 +104,7 @@ class Q_DECLARATIVE_EXPORT QSGMouseEvent : public QObject
     Q_PROPERTY(bool accepted READ isAccepted WRITE setAccepted)
 
 public:
-    QSGMouseEvent(int x, int y, Qt::MouseButton button, Qt::MouseButtons buttons, Qt::KeyboardModifiers modifiers
+    QQuickMouseEvent(int x, int y, Qt::MouseButton button, Qt::MouseButtons buttons, Qt::KeyboardModifiers modifiers
                   , bool isClick=false, bool wasHeld=false)
         : _x(x), _y(y), _button(button), _buttons(buttons), _modifiers(modifiers)
           , _wasHeld(wasHeld), _isClick(isClick), _accepted(true) {}
@@ -138,7 +138,7 @@ private:
 
 QT_END_NAMESPACE
 
-QML_DECLARE_TYPE(QSGKeyEvent)
-QML_DECLARE_TYPE(QSGMouseEvent)
+QML_DECLARE_TYPE(QQuickKeyEvent)
+QML_DECLARE_TYPE(QQuickMouseEvent)
 
-#endif // QSGEVENTS_P_P_H
+#endif // QQUICKEVENTS_P_P_H
diff --git a/src/declarative/items/qsgflickable.cpp b/src/declarative/items/qquickflickable.cpp
index 4871a43e8d..655472004d 100644
--- a/src/declarative/items/qsgflickable.cpp
+++ b/src/declarative/items/qquickflickable.cpp
@@ -39,10 +39,10 @@
 **
 ****************************************************************************/
 
-#include "qsgflickable_p.h"
-#include "qsgflickable_p_p.h"
-#include "qsgcanvas.h"
-#include "qsgcanvas_p.h"
+#include "qquickflickable_p.h"
+#include "qquickflickable_p_p.h"
+#include "qquickcanvas.h"
+#include "qquickcanvas_p.h"
 
 #include <QtDeclarative/qdeclarativeinfo.h>
 #include <QtGui/qevent.h>
@@ -91,35 +91,35 @@ static const int FlickThreshold = 20;
 // will ensure the Flickable retains the grab on consecutive flicks.
 static const int RetainGrabVelocity = 15;
 
-QSGFlickableVisibleArea::QSGFlickableVisibleArea(QSGFlickable *parent)
+QQuickFlickableVisibleArea::QQuickFlickableVisibleArea(QQuickFlickable *parent)
     : QObject(parent), flickable(parent), m_xPosition(0.), m_widthRatio(0.)
     , m_yPosition(0.), m_heightRatio(0.)
 {
 }
 
-qreal QSGFlickableVisibleArea::widthRatio() const
+qreal QQuickFlickableVisibleArea::widthRatio() const
 {
     return m_widthRatio;
 }
 
-qreal QSGFlickableVisibleArea::xPosition() const
+qreal QQuickFlickableVisibleArea::xPosition() const
 {
     return m_xPosition;
 }
 
-qreal QSGFlickableVisibleArea::heightRatio() const
+qreal QQuickFlickableVisibleArea::heightRatio() const
 {
     return m_heightRatio;
 }
 
-qreal QSGFlickableVisibleArea::yPosition() const
+qreal QQuickFlickableVisibleArea::yPosition() const
 {
     return m_yPosition;
 }
 
-void QSGFlickableVisibleArea::updateVisible()
+void QQuickFlickableVisibleArea::updateVisible()
 {
-    QSGFlickablePrivate *p = QSGFlickablePrivate::get(flickable);
+    QQuickFlickablePrivate *p = QQuickFlickablePrivate::get(flickable);
 
     bool changeX = false;
     bool changeY = false;
@@ -167,10 +167,10 @@ void QSGFlickableVisibleArea::updateVisible()
 }
 
 
-QSGFlickablePrivate::QSGFlickablePrivate()
-  : contentItem(new QSGItem)
-    , hData(this, &QSGFlickablePrivate::setViewportX)
-    , vData(this, &QSGFlickablePrivate::setViewportY)
+QQuickFlickablePrivate::QQuickFlickablePrivate()
+  : contentItem(new QQuickItem)
+    , hData(this, &QQuickFlickablePrivate::setViewportX)
+    , vData(this, &QQuickFlickablePrivate::setViewportY)
     , hMoved(false), vMoved(false)
     , stealMouse(false), pressed(false), interactive(true), calcVelocity(false)
     , pixelAligned(false)
@@ -178,22 +178,22 @@ QSGFlickablePrivate::QSGFlickablePrivate()
     , maxVelocity(QML_FLICK_DEFAULTMAXVELOCITY), reportedVelocitySmoothing(100)
     , delayedPressEvent(0), delayedPressTarget(0), pressDelay(0), fixupDuration(400)
     , fixupMode(Normal), vTime(0), visibleArea(0)
-    , flickableDirection(QSGFlickable::AutoFlickDirection)
-    , boundsBehavior(QSGFlickable::DragAndOvershootBounds)
+    , flickableDirection(QQuickFlickable::AutoFlickDirection)
+    , boundsBehavior(QQuickFlickable::DragAndOvershootBounds)
 {
 }
 
-void QSGFlickablePrivate::init()
+void QQuickFlickablePrivate::init()
 {
-    Q_Q(QSGFlickable);
+    Q_Q(QQuickFlickable);
     QDeclarative_setParent_noEvent(contentItem, q);
     contentItem->setParentItem(q);
     FAST_CONNECT(&timeline, SIGNAL(updated()), q, SLOT(ticked()))
     FAST_CONNECT(&timeline, SIGNAL(completed()), q, SLOT(movementEnding()))
     q->setAcceptedMouseButtons(Qt::LeftButton);
     q->setFiltersChildMouseEvents(true);
-    QSGItemPrivate *viewportPrivate = QSGItemPrivate::get(contentItem);
-    viewportPrivate->addItemChangeListener(this, QSGItemPrivate::Geometry);
+    QQuickItemPrivate *viewportPrivate = QQuickItemPrivate::get(contentItem);
+    viewportPrivate->addItemChangeListener(this, QQuickItemPrivate::Geometry);
     lastPosTime.invalidate();
 }
 
@@ -201,7 +201,7 @@ void QSGFlickablePrivate::init()
     Returns the amount to overshoot by given a velocity.
     Will be roughly in range 0 - size/4
 */
-qreal QSGFlickablePrivate::overShootDistance(qreal size)
+qreal QQuickFlickablePrivate::overShootDistance(qreal size)
 {
     if (maxVelocity <= 0)
         return 0.0;
@@ -209,7 +209,7 @@ qreal QSGFlickablePrivate::overShootDistance(qreal size)
     return qMin(qreal(QML_FLICK_OVERSHOOT), size/3);
 }
 
-void QSGFlickablePrivate::AxisData::addVelocitySample(qreal v, qreal maxVelocity)
+void QQuickFlickablePrivate::AxisData::addVelocitySample(qreal v, qreal maxVelocity)
 {
     if (v > maxVelocity)
         v = maxVelocity;
@@ -220,7 +220,7 @@ void QSGFlickablePrivate::AxisData::addVelocitySample(qreal v, qreal maxVelocity
         velocityBuffer.remove(0);
 }
 
-void QSGFlickablePrivate::AxisData::updateVelocity()
+void QQuickFlickablePrivate::AxisData::updateVelocity()
 {
     velocity = 0;
     if (velocityBuffer.count() > QML_FLICK_DISCARDSAMPLES) {
@@ -233,9 +233,9 @@ void QSGFlickablePrivate::AxisData::updateVelocity()
     }
 }
 
-void QSGFlickablePrivate::itemGeometryChanged(QSGItem *item, const QRectF &newGeom, const QRectF &oldGeom)
+void QQuickFlickablePrivate::itemGeometryChanged(QQuickItem *item, const QRectF &newGeom, const QRectF &oldGeom)
 {
-    Q_Q(QSGFlickable);
+    Q_Q(QQuickFlickable);
     if (item == contentItem) {
         if (newGeom.x() != oldGeom.x())
             emit q->contentXChanged();
@@ -244,22 +244,22 @@ void QSGFlickablePrivate::itemGeometryChanged(QSGItem *item, const QRectF &newGe
     }
 }
 
-void QSGFlickablePrivate::flickX(qreal velocity)
+void QQuickFlickablePrivate::flickX(qreal velocity)
 {
-    Q_Q(QSGFlickable);
+    Q_Q(QQuickFlickable);
     flick(hData, q->minXExtent(), q->maxXExtent(), q->width(), fixupX_callback, velocity);
 }
 
-void QSGFlickablePrivate::flickY(qreal velocity)
+void QQuickFlickablePrivate::flickY(qreal velocity)
 {
-    Q_Q(QSGFlickable);
+    Q_Q(QQuickFlickable);
     flick(vData, q->minYExtent(), q->maxYExtent(), q->height(), fixupY_callback, velocity);
 }
 
-void QSGFlickablePrivate::flick(AxisData &data, qreal minExtent, qreal maxExtent, qreal,
+void QQuickFlickablePrivate::flick(AxisData &data, qreal minExtent, qreal maxExtent, qreal,
                                          QDeclarativeTimeLineCallback::Callback fixupCallback, qreal velocity)
 {
-    Q_Q(QSGFlickable);
+    Q_Q(QQuickFlickable);
     qreal maxDistance = -1;
     data.fixingUp = false;
     // -ve velocity means list is moving up
@@ -279,7 +279,7 @@ void QSGFlickablePrivate::flick(AxisData &data, qreal minExtent, qreal maxExtent
                 v = maxVelocity;
         }
         timeline.reset(data.move);
-        if (boundsBehavior == QSGFlickable::DragAndOvershootBounds)
+        if (boundsBehavior == QQuickFlickable::DragAndOvershootBounds)
             timeline.accel(data.move, v, deceleration);
         else
             timeline.accel(data.move, v, deceleration, maxDistance);
@@ -304,29 +304,29 @@ void QSGFlickablePrivate::flick(AxisData &data, qreal minExtent, qreal maxExtent
     }
 }
 
-void QSGFlickablePrivate::fixupY_callback(void *data)
+void QQuickFlickablePrivate::fixupY_callback(void *data)
 {
-    ((QSGFlickablePrivate *)data)->fixupY();
+    ((QQuickFlickablePrivate *)data)->fixupY();
 }
 
-void QSGFlickablePrivate::fixupX_callback(void *data)
+void QQuickFlickablePrivate::fixupX_callback(void *data)
 {
-    ((QSGFlickablePrivate *)data)->fixupX();
+    ((QQuickFlickablePrivate *)data)->fixupX();
 }
 
-void QSGFlickablePrivate::fixupX()
+void QQuickFlickablePrivate::fixupX()
 {
-    Q_Q(QSGFlickable);
+    Q_Q(QQuickFlickable);
     fixup(hData, q->minXExtent(), q->maxXExtent());
 }
 
-void QSGFlickablePrivate::fixupY()
+void QQuickFlickablePrivate::fixupY()
 {
-    Q_Q(QSGFlickable);
+    Q_Q(QQuickFlickable);
     fixup(vData, q->minYExtent(), q->maxYExtent());
 }
 
-void QSGFlickablePrivate::fixup(AxisData &data, qreal minExtent, qreal maxExtent)
+void QQuickFlickablePrivate::fixup(AxisData &data, qreal minExtent, qreal maxExtent)
 {
     if (data.move.value() > minExtent || maxExtent > minExtent) {
         timeline.reset(data.move);
@@ -374,9 +374,9 @@ void QSGFlickablePrivate::fixup(AxisData &data, qreal minExtent, qreal maxExtent
     vTime = timeline.time();
 }
 
-void QSGFlickablePrivate::updateBeginningEnd()
+void QQuickFlickablePrivate::updateBeginningEnd()
 {
-    Q_Q(QSGFlickable);
+    Q_Q(QQuickFlickable);
     bool atBoundaryChange = false;
 
     // Vertical
@@ -455,7 +455,7 @@ is finished.
 */
 
 /*!
-    \qmlclass Flickable QSGFlickable
+    \qmlclass Flickable QQuickFlickable
     \inqmlmodule QtQuick 2
     \ingroup qml-basic-interaction-elements
 
@@ -555,21 +555,21 @@ is finished.
 
     \sa {declarative/ui-components/scrollbar}{scrollbar example}
 */
-QSGFlickable::QSGFlickable(QSGItem *parent)
-  : QSGItem(*(new QSGFlickablePrivate), parent)
+QQuickFlickable::QQuickFlickable(QQuickItem *parent)
+  : QQuickItem(*(new QQuickFlickablePrivate), parent)
 {
-    Q_D(QSGFlickable);
+    Q_D(QQuickFlickable);
     d->init();
 }
 
-QSGFlickable::QSGFlickable(QSGFlickablePrivate &dd, QSGItem *parent)
-  : QSGItem(dd, parent)
+QQuickFlickable::QQuickFlickable(QQuickFlickablePrivate &dd, QQuickItem *parent)
+  : QQuickItem(dd, parent)
 {
-    Q_D(QSGFlickable);
+    Q_D(QQuickFlickable);
     d->init();
 }
 
-QSGFlickable::~QSGFlickable()
+QQuickFlickable::~QQuickFlickable()
 {
 }
 
@@ -581,15 +581,15 @@ QSGFlickable::~QSGFlickable()
     corner of the Flickable. For example, if you flick an image up 100 pixels,
     \c contentY will be 100.
 */
-qreal QSGFlickable::contentX() const
+qreal QQuickFlickable::contentX() const
 {
-    Q_D(const QSGFlickable);
+    Q_D(const QQuickFlickable);
     return -d->contentItem->x();
 }
 
-void QSGFlickable::setContentX(qreal pos)
+void QQuickFlickable::setContentX(qreal pos)
 {
-    Q_D(QSGFlickable);
+    Q_D(QQuickFlickable);
     d->hData.explicitValue = true;
     d->timeline.reset(d->hData.move);
     d->vTime = d->timeline.time();
@@ -600,15 +600,15 @@ void QSGFlickable::setContentX(qreal pos)
     }
 }
 
-qreal QSGFlickable::contentY() const
+qreal QQuickFlickable::contentY() const
 {
-    Q_D(const QSGFlickable);
+    Q_D(const QQuickFlickable);
     return -d->contentItem->y();
 }
 
-void QSGFlickable::setContentY(qreal pos)
+void QQuickFlickable::setContentY(qreal pos)
 {
-    Q_D(QSGFlickable);
+    Q_D(QQuickFlickable);
     d->vData.explicitValue = true;
     d->timeline.reset(d->vData.move);
     d->vTime = d->timeline.time();
@@ -632,15 +632,15 @@ void QSGFlickable::setContentY(qreal pos)
     to freeze a flickable map while scrolling through a pop-up dialog that
     is a child of the Flickable.
 */
-bool QSGFlickable::isInteractive() const
+bool QQuickFlickable::isInteractive() const
 {
-    Q_D(const QSGFlickable);
+    Q_D(const QQuickFlickable);
     return d->interactive;
 }
 
-void QSGFlickable::setInteractive(bool interactive)
+void QQuickFlickable::setInteractive(bool interactive)
 {
-    Q_D(QSGFlickable);
+    Q_D(QQuickFlickable);
     if (interactive != d->interactive) {
         d->interactive = interactive;
         if (!interactive && (d->hData.flicking || d->vData.flicking)) {
@@ -665,15 +665,15 @@ void QSGFlickable::setInteractive(bool interactive)
 
     The reported velocity is smoothed to avoid erratic output.
 */
-qreal QSGFlickable::horizontalVelocity() const
+qreal QQuickFlickable::horizontalVelocity() const
 {
-    Q_D(const QSGFlickable);
+    Q_D(const QQuickFlickable);
     return d->hData.smoothVelocity.value();
 }
 
-qreal QSGFlickable::verticalVelocity() const
+qreal QQuickFlickable::verticalVelocity() const
 {
-    Q_D(const QSGFlickable);
+    Q_D(const QQuickFlickable);
     return d->vData.smoothVelocity.value();
 }
 
@@ -686,31 +686,31 @@ qreal QSGFlickable::verticalVelocity() const
     These properties are true if the flickable view is positioned at the beginning,
     or end respecively.
 */
-bool QSGFlickable::isAtXEnd() const
+bool QQuickFlickable::isAtXEnd() const
 {
-    Q_D(const QSGFlickable);
+    Q_D(const QQuickFlickable);
     return d->hData.atEnd;
 }
 
-bool QSGFlickable::isAtXBeginning() const
+bool QQuickFlickable::isAtXBeginning() const
 {
-    Q_D(const QSGFlickable);
+    Q_D(const QQuickFlickable);
     return d->hData.atBeginning;
 }
 
-bool QSGFlickable::isAtYEnd() const
+bool QQuickFlickable::isAtYEnd() const
 {
-    Q_D(const QSGFlickable);
+    Q_D(const QQuickFlickable);
     return d->vData.atEnd;
 }
 
-bool QSGFlickable::isAtYBeginning() const
+bool QQuickFlickable::isAtYBeginning() const
 {
-    Q_D(const QSGFlickable);
+    Q_D(const QQuickFlickable);
     return d->vData.atBeginning;
 }
 
-void QSGFlickable::ticked()
+void QQuickFlickable::ticked()
 {
     viewportMoved();
 }
@@ -733,17 +733,17 @@ void QSGFlickable::ticked()
     }
     \endcode
 */
-QSGItem *QSGFlickable::contentItem()
+QQuickItem *QQuickFlickable::contentItem()
 {
-    Q_D(QSGFlickable);
+    Q_D(QQuickFlickable);
     return d->contentItem;
 }
 
-QSGFlickableVisibleArea *QSGFlickable::visibleArea()
+QQuickFlickableVisibleArea *QQuickFlickable::visibleArea()
 {
-    Q_D(QSGFlickable);
+    Q_D(QQuickFlickable);
     if (!d->visibleArea)
-        d->visibleArea = new QSGFlickableVisibleArea(this);
+        d->visibleArea = new QQuickFlickableVisibleArea(this);
     return d->visibleArea;
 }
 
@@ -762,39 +762,39 @@ QSGFlickableVisibleArea *QSGFlickable::visibleArea()
     \o Flickable.HorizontalAndVerticalFlick - allows flicking in both directions.
     \endlist
 */
-QSGFlickable::FlickableDirection QSGFlickable::flickableDirection() const
+QQuickFlickable::FlickableDirection QQuickFlickable::flickableDirection() const
 {
-    Q_D(const QSGFlickable);
+    Q_D(const QQuickFlickable);
     return d->flickableDirection;
 }
 
-void QSGFlickable::setFlickableDirection(FlickableDirection direction)
+void QQuickFlickable::setFlickableDirection(FlickableDirection direction)
 {
-    Q_D(QSGFlickable);
+    Q_D(QQuickFlickable);
     if (direction != d->flickableDirection) {
         d->flickableDirection = direction;
         emit flickableDirectionChanged();
     }
 }
 
-bool QSGFlickable::pixelAligned() const
+bool QQuickFlickable::pixelAligned() const
 {
-    Q_D(const QSGFlickable);
+    Q_D(const QQuickFlickable);
     return d->pixelAligned;
 }
 
-void QSGFlickable::setPixelAligned(bool align)
+void QQuickFlickable::setPixelAligned(bool align)
 {
-    Q_D(QSGFlickable);
+    Q_D(QQuickFlickable);
     if (align != d->pixelAligned) {
         d->pixelAligned = align;
         emit pixelAlignedChanged();
     }
 }
 
-void QSGFlickablePrivate::handleMousePressEvent(QMouseEvent *event)
+void QQuickFlickablePrivate::handleMousePressEvent(QMouseEvent *event)
 {
-    Q_Q(QSGFlickable);
+    Q_Q(QQuickFlickable);
     if (interactive && timeline.isActive()
         && (qAbs(hData.smoothVelocity.value()) > RetainGrabVelocity
             || qAbs(vData.smoothVelocity.value()) > RetainGrabVelocity)) {
@@ -813,19 +813,19 @@ void QSGFlickablePrivate::handleMousePressEvent(QMouseEvent *event)
     vData.dragMaxBound = q->maxYExtent();
     fixupMode = Normal;
     lastPos = QPoint();
-    QSGItemPrivate::start(lastPosTime);
+    QQuickItemPrivate::start(lastPosTime);
     pressPos = event->localPos();
     hData.pressPos = hData.move.value();
     vData.pressPos = vData.move.value();
     hData.flicking = false;
     vData.flicking = false;
-    QSGItemPrivate::start(pressTime);
-    QSGItemPrivate::start(velocityTime);
+    QQuickItemPrivate::start(pressTime);
+    QQuickItemPrivate::start(velocityTime);
 }
 
-void QSGFlickablePrivate::handleMouseMoveEvent(QMouseEvent *event)
+void QQuickFlickablePrivate::handleMouseMoveEvent(QMouseEvent *event)
 {
-    Q_Q(QSGFlickable);
+    Q_Q(QQuickFlickable);
     if (!interactive || !lastPosTime.isValid())
         return;
     bool rejectY = false;
@@ -836,7 +836,7 @@ void QSGFlickablePrivate::handleMouseMoveEvent(QMouseEvent *event)
 
     if (q->yflick()) {
         int dy = int(event->localPos().y() - pressPos.y());
-        if (qAbs(dy) > qApp->styleHints()->startDragDistance() || QSGItemPrivate::elapsed(pressTime) > 200) {
+        if (qAbs(dy) > qApp->styleHints()->startDragDistance() || QQuickItemPrivate::elapsed(pressTime) > 200) {
             if (!vMoved)
                 vData.dragStartOffset = dy;
             qreal newY = dy + vData.pressPos - vData.dragStartOffset;
@@ -846,7 +846,7 @@ void QSGFlickablePrivate::handleMouseMoveEvent(QMouseEvent *event)
                 newY = minY + (newY - minY) / 2;
             if (newY < maxY && maxY - minY <= 0)
                 newY = maxY + (newY - maxY) / 2;
-            if (boundsBehavior == QSGFlickable::StopAtBounds && (newY > minY || newY < maxY)) {
+            if (boundsBehavior == QQuickFlickable::StopAtBounds && (newY > minY || newY < maxY)) {
                 rejectY = true;
                 if (newY < maxY) {
                     newY = maxY;
@@ -868,7 +868,7 @@ void QSGFlickablePrivate::handleMouseMoveEvent(QMouseEvent *event)
 
     if (q->xflick()) {
         int dx = int(event->localPos().x() - pressPos.x());
-        if (qAbs(dx) > qApp->styleHints()->startDragDistance() || QSGItemPrivate::elapsed(pressTime) > 200) {
+        if (qAbs(dx) > qApp->styleHints()->startDragDistance() || QQuickItemPrivate::elapsed(pressTime) > 200) {
             if (!hMoved)
                 hData.dragStartOffset = dx;
             qreal newX = dx + hData.pressPos - hData.dragStartOffset;
@@ -878,7 +878,7 @@ void QSGFlickablePrivate::handleMouseMoveEvent(QMouseEvent *event)
                 newX = minX + (newX - minX) / 2;
             if (newX < maxX && maxX - minX <= 0)
                 newX = maxX + (newX - maxX) / 2;
-            if (boundsBehavior == QSGFlickable::StopAtBounds && (newX > minX || newX < maxX)) {
+            if (boundsBehavior == QQuickFlickable::StopAtBounds && (newX > minX || newX < maxX)) {
                 rejectX = true;
                 if (newX < maxX) {
                     newX = maxX;
@@ -919,10 +919,10 @@ void QSGFlickablePrivate::handleMouseMoveEvent(QMouseEvent *event)
     }
 
     if (!lastPos.isNull()) {
-        qreal elapsed = qreal(QSGItemPrivate::elapsed(lastPosTime)) / 1000.;
+        qreal elapsed = qreal(QQuickItemPrivate::elapsed(lastPosTime)) / 1000.;
         if (elapsed <= 0)
             return;
-        QSGItemPrivate::restart(lastPosTime);
+        QQuickItemPrivate::restart(lastPosTime);
         qreal dy = event->localPos().y()-lastPos.y();
         if (q->yflick() && !rejectY)
             vData.addVelocitySample(dy/elapsed, maxVelocity);
@@ -934,15 +934,15 @@ void QSGFlickablePrivate::handleMouseMoveEvent(QMouseEvent *event)
     lastPos = event->localPos();
 }
 
-void QSGFlickablePrivate::handleMouseReleaseEvent(QMouseEvent *event)
+void QQuickFlickablePrivate::handleMouseReleaseEvent(QMouseEvent *event)
 {
-    Q_Q(QSGFlickable);
+    Q_Q(QQuickFlickable);
     stealMouse = false;
     q->setKeepMouseGrab(false);
     pressed = false;
 
     // if we drag then pause before release we should not cause a flick.
-    qint64 elapsed = QSGItemPrivate::elapsed(lastPosTime);
+    qint64 elapsed = QQuickItemPrivate::elapsed(lastPosTime);
 
     vData.updateVelocity();
     hData.updateVelocity();
@@ -980,47 +980,47 @@ void QSGFlickablePrivate::handleMouseReleaseEvent(QMouseEvent *event)
         q->movementEnding();
 }
 
-void QSGFlickable::mousePressEvent(QMouseEvent *event)
+void QQuickFlickable::mousePressEvent(QMouseEvent *event)
 {
-    Q_D(QSGFlickable);
+    Q_D(QQuickFlickable);
     if (d->interactive) {
         if (!d->pressed)
             d->handleMousePressEvent(event);
         event->accept();
     } else {
-        QSGItem::mousePressEvent(event);
+        QQuickItem::mousePressEvent(event);
     }
 }
 
-void QSGFlickable::mouseMoveEvent(QMouseEvent *event)
+void QQuickFlickable::mouseMoveEvent(QMouseEvent *event)
 {
-    Q_D(QSGFlickable);
+    Q_D(QQuickFlickable);
     if (d->interactive) {
         d->handleMouseMoveEvent(event);
         event->accept();
     } else {
-        QSGItem::mouseMoveEvent(event);
+        QQuickItem::mouseMoveEvent(event);
     }
 }
 
-void QSGFlickable::mouseReleaseEvent(QMouseEvent *event)
+void QQuickFlickable::mouseReleaseEvent(QMouseEvent *event)
 {
-    Q_D(QSGFlickable);
+    Q_D(QQuickFlickable);
     if (d->interactive) {
         d->clearDelayedPress();
         d->handleMouseReleaseEvent(event);
         event->accept();
         ungrabMouse();
     } else {
-        QSGItem::mouseReleaseEvent(event);
+        QQuickItem::mouseReleaseEvent(event);
     }
 }
 
-void QSGFlickable::wheelEvent(QWheelEvent *event)
+void QQuickFlickable::wheelEvent(QWheelEvent *event)
 {
-    Q_D(QSGFlickable);
+    Q_D(QQuickFlickable);
     if (!d->interactive) {
-        QSGItem::wheelEvent(event);
+        QQuickItem::wheelEvent(event);
     } else if (yflick() && event->orientation() == Qt::Vertical) {
         bool valid = false;
         if (event->delta() > 0 && contentY() > -minYExtent()) {
@@ -1058,16 +1058,16 @@ void QSGFlickable::wheelEvent(QWheelEvent *event)
             event->accept();
         }
     } else {
-        QSGItem::wheelEvent(event);
+        QQuickItem::wheelEvent(event);
     }
 }
 
-bool QSGFlickablePrivate::isOutermostPressDelay() const
+bool QQuickFlickablePrivate::isOutermostPressDelay() const
 {
-    Q_Q(const QSGFlickable);
-    QSGItem *item = q->parentItem();
+    Q_Q(const QQuickFlickable);
+    QQuickItem *item = q->parentItem();
     while (item) {
-        QSGFlickable *flick = qobject_cast<QSGFlickable*>(item);
+        QQuickFlickable *flick = qobject_cast<QQuickFlickable*>(item);
         if (flick && flick->pressDelay() > 0 && flick->isInteractive())
             return false;
         item = item->parentItem();
@@ -1076,9 +1076,9 @@ bool QSGFlickablePrivate::isOutermostPressDelay() const
     return true;
 }
 
-void QSGFlickablePrivate::captureDelayedPress(QMouseEvent *event)
+void QQuickFlickablePrivate::captureDelayedPress(QMouseEvent *event)
 {
-    Q_Q(QSGFlickable);
+    Q_Q(QQuickFlickable);
     if (!q->canvas() || pressDelay <= 0)
         return;
     if (!isOutermostPressDelay())
@@ -1089,7 +1089,7 @@ void QSGFlickablePrivate::captureDelayedPress(QMouseEvent *event)
     delayedPressTimer.start(pressDelay, q);
 }
 
-void QSGFlickablePrivate::clearDelayedPress()
+void QQuickFlickablePrivate::clearDelayedPress()
 {
     if (delayedPressEvent) {
         delayedPressTimer.stop();
@@ -1099,30 +1099,30 @@ void QSGFlickablePrivate::clearDelayedPress()
 }
 
 //XXX pixelAligned ignores the global position of the Flickable, i.e. assumes Flickable itself is pixel aligned.
-void QSGFlickablePrivate::setViewportX(qreal x)
+void QQuickFlickablePrivate::setViewportX(qreal x)
 {
     contentItem->setX(pixelAligned ? qRound(x) : x);
 }
 
-void QSGFlickablePrivate::setViewportY(qreal y)
+void QQuickFlickablePrivate::setViewportY(qreal y)
 {
     contentItem->setY(pixelAligned ? qRound(y) : y);
 }
 
-void QSGFlickable::timerEvent(QTimerEvent *event)
+void QQuickFlickable::timerEvent(QTimerEvent *event)
 {
-    Q_D(QSGFlickable);
+    Q_D(QQuickFlickable);
     if (event->timerId() == d->delayedPressTimer.timerId()) {
         d->delayedPressTimer.stop();
         if (d->delayedPressEvent) {
-            QSGItem *grabber = canvas() ? canvas()->mouseGrabberItem() : 0;
+            QQuickItem *grabber = canvas() ? canvas()->mouseGrabberItem() : 0;
             if (!grabber || grabber != this) {
                 // We replay the mouse press but the grabber we had might not be interessted by the event (e.g. overlay)
                 // so we reset the grabber
                 if (canvas()->mouseGrabberItem() == d->delayedPressTarget)
                     d->delayedPressTarget->ungrabMouse();
                 // Use the event handler that will take care of finding the proper item to propagate the event
-                QSGCanvasPrivate::get(canvas())->deliverMouseEvent(d->delayedPressEvent);
+                QQuickCanvasPrivate::get(canvas())->deliverMouseEvent(d->delayedPressEvent);
             }
             delete d->delayedPressEvent;
             d->delayedPressEvent = 0;
@@ -1130,49 +1130,49 @@ void QSGFlickable::timerEvent(QTimerEvent *event)
     }
 }
 
-qreal QSGFlickable::minYExtent() const
+qreal QQuickFlickable::minYExtent() const
 {
-    Q_D(const QSGFlickable);
+    Q_D(const QQuickFlickable);
     return d->vData.startMargin;
 }
 
-qreal QSGFlickable::minXExtent() const
+qreal QQuickFlickable::minXExtent() const
 {
-    Q_D(const QSGFlickable);
+    Q_D(const QQuickFlickable);
     return d->hData.startMargin;
 }
 
 /* returns -ve */
-qreal QSGFlickable::maxXExtent() const
+qreal QQuickFlickable::maxXExtent() const
 {
-    Q_D(const QSGFlickable);
+    Q_D(const QQuickFlickable);
     return width() - vWidth() - d->hData.endMargin;
 }
 /* returns -ve */
-qreal QSGFlickable::maxYExtent() const
+qreal QQuickFlickable::maxYExtent() const
 {
-    Q_D(const QSGFlickable);
+    Q_D(const QQuickFlickable);
     return height() - vHeight() - d->vData.endMargin;
 }
 
-void QSGFlickable::componentComplete()
+void QQuickFlickable::componentComplete()
 {
-    Q_D(QSGFlickable);
-    QSGItem::componentComplete();
+    Q_D(QQuickFlickable);
+    QQuickItem::componentComplete();
     if (!d->hData.explicitValue && d->hData.startMargin != 0.)
         setContentX(-minXExtent());
     if (!d->vData.explicitValue && d->vData.startMargin != 0.)
         setContentY(-minYExtent());
 }
 
-void QSGFlickable::viewportMoved()
+void QQuickFlickable::viewportMoved()
 {
-    Q_D(QSGFlickable);
+    Q_D(QQuickFlickable);
 
     qreal prevX = d->lastFlickablePosition.x();
     qreal prevY = d->lastFlickablePosition.y();
     if (d->pressed || d->calcVelocity) {
-        int elapsed = QSGItemPrivate::restart(d->velocityTime);
+        int elapsed = QQuickItemPrivate::restart(d->velocityTime);
         if (elapsed > 0) {
             qreal horizontalVelocity = (prevX - d->hData.move.value()) * 1000 / elapsed;
             if (qAbs(horizontalVelocity) > 0) {
@@ -1224,11 +1224,11 @@ void QSGFlickable::viewportMoved()
     d->updateBeginningEnd();
 }
 
-void QSGFlickable::geometryChanged(const QRectF &newGeometry,
+void QQuickFlickable::geometryChanged(const QRectF &newGeometry,
                              const QRectF &oldGeometry)
 {
-    Q_D(QSGFlickable);
-    QSGItem::geometryChanged(newGeometry, oldGeometry);
+    Q_D(QQuickFlickable);
+    QQuickItem::geometryChanged(newGeometry, oldGeometry);
 
     bool changed = false;
     if (newGeometry.width() != oldGeometry.width()) {
@@ -1240,7 +1240,7 @@ void QSGFlickable::geometryChanged(const QRectF &newGeometry,
         }
         // Make sure that we're entirely in view.
         if (!d->pressed && !d->hData.moving && !d->vData.moving) {
-            d->fixupMode = QSGFlickablePrivate::Immediate;
+            d->fixupMode = QQuickFlickablePrivate::Immediate;
             d->fixupX();
         }
     }
@@ -1253,7 +1253,7 @@ void QSGFlickable::geometryChanged(const QRectF &newGeometry,
         }
         // Make sure that we're entirely in view.
         if (!d->pressed && !d->hData.moving && !d->vData.moving) {
-            d->fixupMode = QSGFlickablePrivate::Immediate;
+            d->fixupMode = QQuickFlickablePrivate::Immediate;
             d->fixupY();
         }
     }
@@ -1262,54 +1262,54 @@ void QSGFlickable::geometryChanged(const QRectF &newGeometry,
         d->updateBeginningEnd();
 }
 
-void QSGFlickable::cancelFlick()
+void QQuickFlickable::cancelFlick()
 {
-    Q_D(QSGFlickable);
+    Q_D(QQuickFlickable);
     d->timeline.reset(d->hData.move);
     d->timeline.reset(d->vData.move);
     movementEnding();
 }
 
-void QSGFlickablePrivate::data_append(QDeclarativeListProperty<QObject> *prop, QObject *o)
+void QQuickFlickablePrivate::data_append(QDeclarativeListProperty<QObject> *prop, QObject *o)
 {
-    QSGItem *i = qobject_cast<QSGItem *>(o);
+    QQuickItem *i = qobject_cast<QQuickItem *>(o);
     if (i) {
-        i->setParentItem(static_cast<QSGFlickablePrivate*>(prop->data)->contentItem);
+        i->setParentItem(static_cast<QQuickFlickablePrivate*>(prop->data)->contentItem);
     } else {
         o->setParent(prop->object); // XXX todo - do we want this?
     }
 }
 
-int QSGFlickablePrivate::data_count(QDeclarativeListProperty<QObject> *)
+int QQuickFlickablePrivate::data_count(QDeclarativeListProperty<QObject> *)
 {
     // XXX todo
     return 0;
 }
 
-QObject *QSGFlickablePrivate::data_at(QDeclarativeListProperty<QObject> *, int)
+QObject *QQuickFlickablePrivate::data_at(QDeclarativeListProperty<QObject> *, int)
 {
     // XXX todo
     return 0;
 }
 
-void QSGFlickablePrivate::data_clear(QDeclarativeListProperty<QObject> *)
+void QQuickFlickablePrivate::data_clear(QDeclarativeListProperty<QObject> *)
 {
     // XXX todo
 }
 
-QDeclarativeListProperty<QObject> QSGFlickable::flickableData()
+QDeclarativeListProperty<QObject> QQuickFlickable::flickableData()
 {
-    Q_D(QSGFlickable);
-    return QDeclarativeListProperty<QObject>(this, (void *)d, QSGFlickablePrivate::data_append,
-                                             QSGFlickablePrivate::data_count,
-                                             QSGFlickablePrivate::data_at,
-                                             QSGFlickablePrivate::data_clear);
+    Q_D(QQuickFlickable);
+    return QDeclarativeListProperty<QObject>(this, (void *)d, QQuickFlickablePrivate::data_append,
+                                             QQuickFlickablePrivate::data_count,
+                                             QQuickFlickablePrivate::data_at,
+                                             QQuickFlickablePrivate::data_clear);
 }
 
-QDeclarativeListProperty<QSGItem> QSGFlickable::flickableChildren()
+QDeclarativeListProperty<QQuickItem> QQuickFlickable::flickableChildren()
 {
-    Q_D(QSGFlickable);
-    return QSGItemPrivate::get(d->contentItem)->children();
+    Q_D(QQuickFlickable);
+    return QQuickItemPrivate::get(d->contentItem)->children();
 }
 
 /*!
@@ -1333,15 +1333,15 @@ QDeclarativeListProperty<QSGItem> QSGFlickable::flickableChildren()
     boundary when flicked.
     \endlist
 */
-QSGFlickable::BoundsBehavior QSGFlickable::boundsBehavior() const
+QQuickFlickable::BoundsBehavior QQuickFlickable::boundsBehavior() const
 {
-    Q_D(const QSGFlickable);
+    Q_D(const QQuickFlickable);
     return d->boundsBehavior;
 }
 
-void QSGFlickable::setBoundsBehavior(BoundsBehavior b)
+void QQuickFlickable::setBoundsBehavior(BoundsBehavior b)
 {
-    Q_D(QSGFlickable);
+    Q_D(QQuickFlickable);
     if (b == d->boundsBehavior)
         return;
     d->boundsBehavior = b;
@@ -1365,15 +1365,15 @@ void QSGFlickable::setBoundsBehavior(BoundsBehavior b)
     using the \l {Item::childrenRect.width}{childrenRect.width}
     and \l {Item::childrenRect.height}{childrenRect.height} properties.
 */
-qreal QSGFlickable::contentWidth() const
+qreal QQuickFlickable::contentWidth() const
 {
-    Q_D(const QSGFlickable);
+    Q_D(const QQuickFlickable);
     return d->hData.viewSize;
 }
 
-void QSGFlickable::setContentWidth(qreal w)
+void QQuickFlickable::setContentWidth(qreal w)
 {
-    Q_D(QSGFlickable);
+    Q_D(QQuickFlickable);
     if (d->hData.viewSize == w)
         return;
     d->hData.viewSize = w;
@@ -1384,25 +1384,25 @@ void QSGFlickable::setContentWidth(qreal w)
     d->hData.markExtentsDirty();
     // Make sure that we're entirely in view.
     if (!d->pressed && !d->hData.moving && !d->vData.moving) {
-        d->fixupMode = QSGFlickablePrivate::Immediate;
+        d->fixupMode = QQuickFlickablePrivate::Immediate;
         d->fixupX();
     } else if (!d->pressed && d->hData.fixingUp) {
-        d->fixupMode = QSGFlickablePrivate::ExtentChanged;
+        d->fixupMode = QQuickFlickablePrivate::ExtentChanged;
         d->fixupX();
     }
     emit contentWidthChanged();
     d->updateBeginningEnd();
 }
 
-qreal QSGFlickable::contentHeight() const
+qreal QQuickFlickable::contentHeight() const
 {
-    Q_D(const QSGFlickable);
+    Q_D(const QQuickFlickable);
     return d->vData.viewSize;
 }
 
-void QSGFlickable::setContentHeight(qreal h)
+void QQuickFlickable::setContentHeight(qreal h)
 {
-    Q_D(QSGFlickable);
+    Q_D(QQuickFlickable);
     if (d->vData.viewSize == h)
         return;
     d->vData.viewSize = h;
@@ -1413,10 +1413,10 @@ void QSGFlickable::setContentHeight(qreal h)
     d->vData.markExtentsDirty();
     // Make sure that we're entirely in view.
     if (!d->pressed && !d->hData.moving && !d->vData.moving) {
-        d->fixupMode = QSGFlickablePrivate::Immediate;
+        d->fixupMode = QQuickFlickablePrivate::Immediate;
         d->fixupY();
     } else if (!d->pressed && d->vData.fixingUp) {
-        d->fixupMode = QSGFlickablePrivate::ExtentChanged;
+        d->fixupMode = QQuickFlickablePrivate::ExtentChanged;
         d->fixupY();
     }
     emit contentHeightChanged();
@@ -1434,84 +1434,84 @@ void QSGFlickable::setContentHeight(qreal h)
 */
 
 
-qreal QSGFlickable::topMargin() const
+qreal QQuickFlickable::topMargin() const
 {
-    Q_D(const QSGFlickable);
+    Q_D(const QQuickFlickable);
     return d->vData.startMargin;
 }
 
-void QSGFlickable::setTopMargin(qreal m)
+void QQuickFlickable::setTopMargin(qreal m)
 {
-    Q_D(QSGFlickable);
+    Q_D(QQuickFlickable);
     if (d->vData.startMargin == m)
         return;
     d->vData.startMargin = m;
     d->vData.markExtentsDirty();
     if (!d->pressed && !d->hData.moving && !d->vData.moving) {
-        d->fixupMode = QSGFlickablePrivate::Immediate;
+        d->fixupMode = QQuickFlickablePrivate::Immediate;
         d->fixupY();
     }
     emit topMarginChanged();
     d->updateBeginningEnd();
 }
 
-qreal QSGFlickable::bottomMargin() const
+qreal QQuickFlickable::bottomMargin() const
 {
-    Q_D(const QSGFlickable);
+    Q_D(const QQuickFlickable);
     return d->vData.endMargin;
 }
 
-void QSGFlickable::setBottomMargin(qreal m)
+void QQuickFlickable::setBottomMargin(qreal m)
 {
-    Q_D(QSGFlickable);
+    Q_D(QQuickFlickable);
     if (d->vData.endMargin == m)
         return;
     d->vData.endMargin = m;
     d->vData.markExtentsDirty();
     if (!d->pressed && !d->hData.moving && !d->vData.moving) {
-        d->fixupMode = QSGFlickablePrivate::Immediate;
+        d->fixupMode = QQuickFlickablePrivate::Immediate;
         d->fixupY();
     }
     emit bottomMarginChanged();
     d->updateBeginningEnd();
 }
 
-qreal QSGFlickable::leftMargin() const
+qreal QQuickFlickable::leftMargin() const
 {
-    Q_D(const QSGFlickable);
+    Q_D(const QQuickFlickable);
     return d->hData.startMargin;
 }
 
-void QSGFlickable::setLeftMargin(qreal m)
+void QQuickFlickable::setLeftMargin(qreal m)
 {
-    Q_D(QSGFlickable);
+    Q_D(QQuickFlickable);
     if (d->hData.startMargin == m)
         return;
     d->hData.startMargin = m;
     d->hData.markExtentsDirty();
     if (!d->pressed && !d->hData.moving && !d->vData.moving) {
-        d->fixupMode = QSGFlickablePrivate::Immediate;
+        d->fixupMode = QQuickFlickablePrivate::Immediate;
         d->fixupX();
     }
     emit leftMarginChanged();
     d->updateBeginningEnd();
 }
 
-qreal QSGFlickable::rightMargin() const
+qreal QQuickFlickable::rightMargin() const
 {
-    Q_D(const QSGFlickable);
+    Q_D(const QQuickFlickable);
     return d->hData.endMargin;
 }
 
-void QSGFlickable::setRightMargin(qreal m)
+void QQuickFlickable::setRightMargin(qreal m)
 {
-    Q_D(QSGFlickable);
+    Q_D(QQuickFlickable);
     if (d->hData.endMargin == m)
         return;
     d->hData.endMargin = m;
     d->hData.markExtentsDirty();
     if (!d->pressed && !d->hData.moving && !d->vData.moving) {
-        d->fixupMode = QSGFlickablePrivate::Immediate;
+        d->fixupMode = QQuickFlickablePrivate::Immediate;
         d->fixupX();
     }
     emit rightMarginChanged();
@@ -1527,15 +1527,15 @@ void QSGFlickable::setRightMargin(qreal m)
     or item insertion/removal outside the visible region.
 */
 
-qreal QSGFlickable::yOrigin() const
+qreal QQuickFlickable::yOrigin() const
 {
-    Q_D(const QSGFlickable);
+    Q_D(const QQuickFlickable);
     return -minYExtent() + d->vData.startMargin;
 }
 
-qreal QSGFlickable::xOrigin() const
+qreal QQuickFlickable::xOrigin() const
 {
-    Q_D(const QSGFlickable);
+    Q_D(const QQuickFlickable);
     return -minXExtent() + d->hData.startMargin;
 }
 
@@ -1552,9 +1552,9 @@ qreal QSGFlickable::xOrigin() const
     the bounds of the Flickable.  Calling \l returnToBounds() will
     move the content back within legal bounds.
 */
-void QSGFlickable::resizeContent(qreal w, qreal h, QPointF center)
+void QQuickFlickable::resizeContent(qreal w, qreal h, QPointF center)
 {
-    Q_D(QSGFlickable);
+    Q_D(QQuickFlickable);
     if (w != d->hData.viewSize) {
         qreal oldSize = d->hData.viewSize;
         d->hData.viewSize = w;
@@ -1586,50 +1586,50 @@ void QSGFlickable::resizeContent(qreal w, qreal h, QPointF center)
     This may be called to ensure that the content is within legal bounds
     after manually positioning the content.
 */
-void QSGFlickable::returnToBounds()
+void QQuickFlickable::returnToBounds()
 {
-    Q_D(QSGFlickable);
+    Q_D(QQuickFlickable);
     d->fixupX();
     d->fixupY();
 }
 
-qreal QSGFlickable::vWidth() const
+qreal QQuickFlickable::vWidth() const
 {
-    Q_D(const QSGFlickable);
+    Q_D(const QQuickFlickable);
     if (d->hData.viewSize < 0)
         return width();
     else
         return d->hData.viewSize;
 }
 
-qreal QSGFlickable::vHeight() const
+qreal QQuickFlickable::vHeight() const
 {
-    Q_D(const QSGFlickable);
+    Q_D(const QQuickFlickable);
     if (d->vData.viewSize < 0)
         return height();
     else
         return d->vData.viewSize;
 }
 
-bool QSGFlickable::xflick() const
+bool QQuickFlickable::xflick() const
 {
-    Q_D(const QSGFlickable);
-    if (d->flickableDirection == QSGFlickable::AutoFlickDirection)
+    Q_D(const QQuickFlickable);
+    if (d->flickableDirection == QQuickFlickable::AutoFlickDirection)
         return vWidth() != width();
-    return d->flickableDirection & QSGFlickable::HorizontalFlick;
+    return d->flickableDirection & QQuickFlickable::HorizontalFlick;
 }
 
-bool QSGFlickable::yflick() const
+bool QQuickFlickable::yflick() const
 {
-    Q_D(const QSGFlickable);
-    if (d->flickableDirection == QSGFlickable::AutoFlickDirection)
+    Q_D(const QQuickFlickable);
+    if (d->flickableDirection == QQuickFlickable::AutoFlickDirection)
         return vHeight() !=  height();
-    return d->flickableDirection & QSGFlickable::VerticalFlick;
+    return d->flickableDirection & QQuickFlickable::VerticalFlick;
 }
 
-void QSGFlickable::mouseUngrabEvent()
+void QQuickFlickable::mouseUngrabEvent()
 {
-    Q_D(QSGFlickable);
+    Q_D(QQuickFlickable);
     if (d->pressed) {
         // if our mouse grab has been removed (probably by another Flickable),
         // fix our state
@@ -1640,13 +1640,13 @@ void QSGFlickable::mouseUngrabEvent()
     }
 }
 
-bool QSGFlickable::sendMouseEvent(QMouseEvent *event)
+bool QQuickFlickable::sendMouseEvent(QMouseEvent *event)
 {
-    Q_D(QSGFlickable);
+    Q_D(QQuickFlickable);
     QRectF myRect = mapRectToScene(QRectF(0, 0, width(), height()));
 
-    QSGCanvas *c = canvas();
-    QSGItem *grabber = c ? c->mouseGrabberItem() : 0;
+    QQuickCanvas *c = canvas();
+    QQuickItem *grabber = c ? c->mouseGrabberItem() : 0;
     bool disabledItem = grabber && !grabber->isEnabled();
     bool stealThisEvent = d->stealMouse;
     if ((stealThisEvent || myRect.contains(event->windowPos())) && (!grabber || !grabber->keepMouseGrab() || disabledItem)) {
@@ -1674,7 +1674,7 @@ bool QSGFlickable::sendMouseEvent(QMouseEvent *event)
                 if (c->mouseGrabberItem() == d->delayedPressTarget)
                     d->delayedPressTarget->ungrabMouse();
                 //Use the event handler that will take care of finding the proper item to propagate the event
-                QSGCanvasPrivate::get(canvas())->deliverMouseEvent(d->delayedPressEvent);
+                QQuickCanvasPrivate::get(canvas())->deliverMouseEvent(d->delayedPressEvent);
                 d->clearDelayedPress();
                 // We send the release
                 canvas()->sendEvent(c->mouseGrabberItem(), event);
@@ -1688,7 +1688,7 @@ bool QSGFlickable::sendMouseEvent(QMouseEvent *event)
         default:
             break;
         }
-        grabber = qobject_cast<QSGItem*>(c->mouseGrabberItem());
+        grabber = qobject_cast<QQuickItem*>(c->mouseGrabberItem());
         if ((grabber && stealThisEvent && !grabber->keepMouseGrab() && grabber != this) || disabledItem) {
             d->clearDelayedPress();
             grabMouse();
@@ -1709,11 +1709,11 @@ bool QSGFlickable::sendMouseEvent(QMouseEvent *event)
 }
 
 
-bool QSGFlickable::childMouseEventFilter(QSGItem *i, QEvent *e)
+bool QQuickFlickable::childMouseEventFilter(QQuickItem *i, QEvent *e)
 {
-    Q_D(QSGFlickable);
+    Q_D(QQuickFlickable);
     if (!isVisible() || !d->interactive || !isEnabled())
-        return QSGItem::childMouseEventFilter(i, e);
+        return QQuickItem::childMouseEventFilter(i, e);
     switch (e->type()) {
     case QEvent::MouseButtonPress:
     case QEvent::MouseMove:
@@ -1723,7 +1723,7 @@ bool QSGFlickable::childMouseEventFilter(QSGItem *i, QEvent *e)
         break;
     }
 
-    return QSGItem::childMouseEventFilter(i, e);
+    return QQuickItem::childMouseEventFilter(i, e);
 }
 
 /*!
@@ -1732,15 +1732,15 @@ bool QSGFlickable::childMouseEventFilter(QSGItem *i, QEvent *e)
 
     The default value is platform dependent.
 */
-qreal QSGFlickable::maximumFlickVelocity() const
+qreal QQuickFlickable::maximumFlickVelocity() const
 {
-    Q_D(const QSGFlickable);
+    Q_D(const QQuickFlickable);
     return d->maxVelocity;
 }
 
-void QSGFlickable::setMaximumFlickVelocity(qreal v)
+void QQuickFlickable::setMaximumFlickVelocity(qreal v)
 {
-    Q_D(QSGFlickable);
+    Q_D(QQuickFlickable);
     if (v == d->maxVelocity)
         return;
     d->maxVelocity = v;
@@ -1753,24 +1753,24 @@ void QSGFlickable::setMaximumFlickVelocity(qreal v)
 
     The default value is platform dependent.
 */
-qreal QSGFlickable::flickDeceleration() const
+qreal QQuickFlickable::flickDeceleration() const
 {
-    Q_D(const QSGFlickable);
+    Q_D(const QQuickFlickable);
     return d->deceleration;
 }
 
-void QSGFlickable::setFlickDeceleration(qreal deceleration)
+void QQuickFlickable::setFlickDeceleration(qreal deceleration)
 {
-    Q_D(QSGFlickable);
+    Q_D(QQuickFlickable);
     if (deceleration == d->deceleration)
         return;
     d->deceleration = deceleration;
     emit flickDecelerationChanged();
 }
 
-bool QSGFlickable::isFlicking() const
+bool QQuickFlickable::isFlicking() const
 {
-    Q_D(const QSGFlickable);
+    Q_D(const QQuickFlickable);
     return d->hData.flicking ||  d->vData.flicking;
 }
 
@@ -1782,15 +1782,15 @@ bool QSGFlickable::isFlicking() const
     These properties describe whether the view is currently moving horizontally,
     vertically or in either direction, due to the user flicking the view.
 */
-bool QSGFlickable::isFlickingHorizontally() const
+bool QQuickFlickable::isFlickingHorizontally() const
 {
-    Q_D(const QSGFlickable);
+    Q_D(const QQuickFlickable);
     return d->hData.flicking;
 }
 
-bool QSGFlickable::isFlickingVertically() const
+bool QQuickFlickable::isFlickingVertically() const
 {
-    Q_D(const QSGFlickable);
+    Q_D(const QQuickFlickable);
     return d->vData.flicking;
 }
 
@@ -1802,27 +1802,27 @@ bool QSGFlickable::isFlickingVertically() const
     These properties describe whether the view is currently moving horizontally,
     vertically or in either direction, due to the user dragging the view.
 */
-bool QSGFlickable::isDragging() const
+bool QQuickFlickable::isDragging() const
 {
-    Q_D(const QSGFlickable);
+    Q_D(const QQuickFlickable);
     return d->hData.dragging ||  d->vData.dragging;
 }
 
-bool QSGFlickable::isDraggingHorizontally() const
+bool QQuickFlickable::isDraggingHorizontally() const
 {
-    Q_D(const QSGFlickable);
+    Q_D(const QQuickFlickable);
     return d->hData.dragging;
 }
 
-bool QSGFlickable::isDraggingVertically() const
+bool QQuickFlickable::isDraggingVertically() const
 {
-    Q_D(const QSGFlickable);
+    Q_D(const QQuickFlickable);
     return d->vData.dragging;
 }
 
-void QSGFlickablePrivate::draggingStarting()
+void QQuickFlickablePrivate::draggingStarting()
 {
-    Q_Q(QSGFlickable);
+    Q_Q(QQuickFlickable);
     bool wasDragging = hData.dragging || vData.dragging;
     if (hMoved && !hData.dragging) {
         hData.dragging = true;
@@ -1838,9 +1838,9 @@ void QSGFlickablePrivate::draggingStarting()
     }
 }
 
-void QSGFlickablePrivate::draggingEnding()
+void QQuickFlickablePrivate::draggingEnding()
 {
-    Q_Q(QSGFlickable);
+    Q_Q(QQuickFlickable);
     bool wasDragging = hData.dragging || vData.dragging;
     if (hData.dragging) {
         hData.dragging = false;
@@ -1870,15 +1870,15 @@ void QSGFlickablePrivate::draggingEnding()
     Note that for nested Flickables with pressDelay set, the pressDelay of
     inner Flickables is overridden by the outermost Flickable.
 */
-int QSGFlickable::pressDelay() const
+int QQuickFlickable::pressDelay() const
 {
-    Q_D(const QSGFlickable);
+    Q_D(const QQuickFlickable);
     return d->pressDelay;
 }
 
-void QSGFlickable::setPressDelay(int delay)
+void QQuickFlickable::setPressDelay(int delay)
 {
-    Q_D(QSGFlickable);
+    Q_D(QQuickFlickable);
     if (d->pressDelay == delay)
         return;
     d->pressDelay = delay;
@@ -1895,27 +1895,27 @@ void QSGFlickable::setPressDelay(int delay)
     flicking the view.
 */
 
-bool QSGFlickable::isMoving() const
+bool QQuickFlickable::isMoving() const
 {
-    Q_D(const QSGFlickable);
+    Q_D(const QQuickFlickable);
     return d->hData.moving || d->vData.moving;
 }
 
-bool QSGFlickable::isMovingHorizontally() const
+bool QQuickFlickable::isMovingHorizontally() const
 {
-    Q_D(const QSGFlickable);
+    Q_D(const QQuickFlickable);
     return d->hData.moving;
 }
 
-bool QSGFlickable::isMovingVertically() const
+bool QQuickFlickable::isMovingVertically() const
 {
-    Q_D(const QSGFlickable);
+    Q_D(const QQuickFlickable);
     return d->vData.moving;
 }
 
-void QSGFlickable::movementStarting()
+void QQuickFlickable::movementStarting()
 {
-    Q_D(QSGFlickable);
+    Q_D(QQuickFlickable);
     if (d->hMoved && !d->hData.moving) {
         d->hData.moving = true;
         emit movingChanged();
@@ -1932,18 +1932,18 @@ void QSGFlickable::movementStarting()
     }
 }
 
-void QSGFlickable::movementEnding()
+void QQuickFlickable::movementEnding()
 {
-    Q_D(QSGFlickable);
+    Q_D(QQuickFlickable);
     movementXEnding();
     movementYEnding();
     d->hData.smoothVelocity.setValue(0);
     d->vData.smoothVelocity.setValue(0);
 }
 
-void QSGFlickable::movementXEnding()
+void QQuickFlickable::movementXEnding()
 {
-    Q_D(QSGFlickable);
+    Q_D(QQuickFlickable);
     if (d->hData.flicking) {
         d->hData.flicking = false;
         emit flickingChanged();
@@ -1964,9 +1964,9 @@ void QSGFlickable::movementXEnding()
     d->hData.fixingUp = false;
 }
 
-void QSGFlickable::movementYEnding()
+void QQuickFlickable::movementYEnding()
 {
-    Q_D(QSGFlickable);
+    Q_D(QQuickFlickable);
     if (d->vData.flicking) {
         d->vData.flicking = false;
         emit flickingChanged();
@@ -1987,9 +1987,9 @@ void QSGFlickable::movementYEnding()
     d->vData.fixingUp = false;
 }
 
-void QSGFlickablePrivate::updateVelocity()
+void QQuickFlickablePrivate::updateVelocity()
 {
-    Q_Q(QSGFlickable);
+    Q_Q(QQuickFlickable);
     emit q->horizontalVelocityChanged();
     emit q->verticalVelocityChanged();
 }
diff --git a/src/declarative/items/qsgflickable_p.h b/src/declarative/items/qquickflickable_p.h
index 54581a5932..fe4ac40efb 100644
--- a/src/declarative/items/qsgflickable_p.h
+++ b/src/declarative/items/qquickflickable_p.h
@@ -40,10 +40,10 @@
 **
 ****************************************************************************/
 
-#ifndef QSGFLICKABLE_P_H
-#define QSGFLICKABLE_P_H
+#ifndef QQUICKFLICKABLE_P_H
+#define QQUICKFLICKABLE_P_H
 
-#include "qsgitem.h"
+#include "qquickitem.h"
 
 QT_BEGIN_HEADER
 
@@ -51,9 +51,9 @@ QT_BEGIN_NAMESPACE
 
 QT_MODULE(Declarative)
 
-class QSGFlickablePrivate;
-class QSGFlickableVisibleArea;
-class Q_AUTOTEST_EXPORT QSGFlickable : public QSGItem
+class QQuickFlickablePrivate;
+class QQuickFlickableVisibleArea;
+class Q_AUTOTEST_EXPORT QQuickFlickable : public QQuickItem
 {
     Q_OBJECT
 
@@ -61,7 +61,7 @@ class Q_AUTOTEST_EXPORT QSGFlickable : public QSGItem
     Q_PROPERTY(qreal contentHeight READ contentHeight WRITE setContentHeight NOTIFY contentHeightChanged)
     Q_PROPERTY(qreal contentX READ contentX WRITE setContentX NOTIFY contentXChanged)
     Q_PROPERTY(qreal contentY READ contentY WRITE setContentY NOTIFY contentYChanged)
-    Q_PROPERTY(QSGItem *contentItem READ contentItem CONSTANT)
+    Q_PROPERTY(QQuickItem *contentItem READ contentItem CONSTANT)
 
     Q_PROPERTY(qreal topMargin READ topMargin WRITE setTopMargin NOTIFY topMarginChanged)
     Q_PROPERTY(qreal bottomMargin READ bottomMargin WRITE setBottomMargin NOTIFY bottomMarginChanged)
@@ -96,23 +96,23 @@ class Q_AUTOTEST_EXPORT QSGFlickable : public QSGItem
     Q_PROPERTY(bool atXBeginning READ isAtXBeginning NOTIFY isAtBoundaryChanged)
     Q_PROPERTY(bool atYBeginning READ isAtYBeginning NOTIFY isAtBoundaryChanged)
 
-    Q_PROPERTY(QSGFlickableVisibleArea *visibleArea READ visibleArea CONSTANT)
+    Q_PROPERTY(QQuickFlickableVisibleArea *visibleArea READ visibleArea CONSTANT)
 
     Q_PROPERTY(bool pixelAligned READ pixelAligned WRITE setPixelAligned NOTIFY pixelAlignedChanged)
 
     Q_PROPERTY(QDeclarativeListProperty<QObject> flickableData READ flickableData)
-    Q_PROPERTY(QDeclarativeListProperty<QSGItem> flickableChildren READ flickableChildren)
+    Q_PROPERTY(QDeclarativeListProperty<QQuickItem> flickableChildren READ flickableChildren)
     Q_CLASSINFO("DefaultProperty", "flickableData")
 
     Q_ENUMS(FlickableDirection)
     Q_ENUMS(BoundsBehavior)
 
 public:
-    QSGFlickable(QSGItem *parent=0);
-    ~QSGFlickable();
+    QQuickFlickable(QQuickItem *parent=0);
+    ~QQuickFlickable();
 
     QDeclarativeListProperty<QObject> flickableData();
-    QDeclarativeListProperty<QSGItem> flickableChildren();
+    QDeclarativeListProperty<QQuickItem> flickableChildren();
 
     enum BoundsBehavior { StopAtBounds, DragOverBounds, DragAndOvershootBounds };
     BoundsBehavior boundsBehavior() const;
@@ -175,7 +175,7 @@ public:
     bool isAtYEnd() const;
     bool isAtYBeginning() const;
 
-    QSGItem *contentItem();
+    QQuickItem *contentItem();
 
     enum FlickableDirection { AutoFlickDirection=0x00, HorizontalFlick=0x01, VerticalFlick=0x02, HorizontalAndVerticalFlick=0x03 };
     FlickableDirection flickableDirection() const;
@@ -225,14 +225,14 @@ Q_SIGNALS:
     void pixelAlignedChanged();
 
 protected:
-    virtual bool childMouseEventFilter(QSGItem *, QEvent *);
+    virtual bool childMouseEventFilter(QQuickItem *, QEvent *);
     virtual void mousePressEvent(QMouseEvent *event);
     virtual void mouseMoveEvent(QMouseEvent *event);
     virtual void mouseReleaseEvent(QMouseEvent *event);
     virtual void wheelEvent(QWheelEvent *event);
     virtual void timerEvent(QTimerEvent *event);
 
-    QSGFlickableVisibleArea *visibleArea();
+    QQuickFlickableVisibleArea *visibleArea();
 
 protected Q_SLOTS:
     virtual void ticked();
@@ -260,18 +260,18 @@ protected:
     void cancelFlick();
 
 protected:
-    QSGFlickable(QSGFlickablePrivate &dd, QSGItem *parent);
+    QQuickFlickable(QQuickFlickablePrivate &dd, QQuickItem *parent);
 
 private:
-    Q_DISABLE_COPY(QSGFlickable)
-    Q_DECLARE_PRIVATE(QSGFlickable)
-    friend class QSGFlickableVisibleArea;
+    Q_DISABLE_COPY(QQuickFlickable)
+    Q_DECLARE_PRIVATE(QQuickFlickable)
+    friend class QQuickFlickableVisibleArea;
 };
 
 QT_END_NAMESPACE
 
-QML_DECLARE_TYPE(QSGFlickable)
+QML_DECLARE_TYPE(QQuickFlickable)
 
 QT_END_HEADER
 
-#endif // QSGFLICKABLE_P_H
+#endif // QQUICKFLICKABLE_P_H
diff --git a/src/declarative/items/qsgflickable_p_p.h b/src/declarative/items/qquickflickable_p_p.h
index b7a91a072b..8ceea6162f 100644
--- a/src/declarative/items/qsgflickable_p_p.h
+++ b/src/declarative/items/qquickflickable_p_p.h
@@ -40,8 +40,8 @@
 **
 ****************************************************************************/
 
-#ifndef QSGFLICKABLE_P_P_H
-#define QSGFLICKABLE_P_P_H
+#ifndef QQUICKFLICKABLE_P_P_H
+#define QQUICKFLICKABLE_P_P_H
 
 //
 //  W A R N I N G
@@ -54,9 +54,9 @@
 // We mean it.
 //
 
-#include "qsgflickable_p.h"
-#include "qsgitem_p.h"
-#include "qsgitemchangelistener_p.h"
+#include "qquickflickable_p.h"
+#include "qquickitem_p.h"
+#include "qquickitemchangelistener_p.h"
 
 #include <QtDeclarative/qdeclarative.h>
 #include <QtCore/qdatetime.h>
@@ -70,20 +70,20 @@ QT_BEGIN_NAMESPACE
 // Really slow flicks can be annoying.
 const qreal MinimumFlickVelocity = 75.0;
 
-class QSGFlickableVisibleArea;
-class QSGFlickablePrivate : public QSGItemPrivate, public QSGItemChangeListener
+class QQuickFlickableVisibleArea;
+class QQuickFlickablePrivate : public QQuickItemPrivate, public QQuickItemChangeListener
 {
-    Q_DECLARE_PUBLIC(QSGFlickable)
+    Q_DECLARE_PUBLIC(QQuickFlickable)
 
 public:
-    static inline QSGFlickablePrivate *get(QSGFlickable *o) { return o->d_func(); }
+    static inline QQuickFlickablePrivate *get(QQuickFlickable *o) { return o->d_func(); }
 
-    QSGFlickablePrivate();
+    QQuickFlickablePrivate();
     void init();
 
     struct Velocity : public QDeclarativeTimeLineValue
     {
-        Velocity(QSGFlickablePrivate *p)
+        Velocity(QQuickFlickablePrivate *p)
             : parent(p) {}
         virtual void setValue(qreal v) {
             if (v != value()) {
@@ -91,11 +91,11 @@ public:
                 parent->updateVelocity();
             }
         }
-        QSGFlickablePrivate *parent;
+        QQuickFlickablePrivate *parent;
     };
 
     struct AxisData {
-        AxisData(QSGFlickablePrivate *fp, void (QSGFlickablePrivate::*func)(qreal))
+        AxisData(QQuickFlickablePrivate *fp, void (QQuickFlickablePrivate::*func)(qreal))
             : move(fp, func), viewSize(-1), startMargin(0), endMargin(0)
             , smoothVelocity(fp), atEnd(false), atBeginning(true)
             , fixingUp(false), inOvershoot(false), moving(false), flicking(false)
@@ -119,7 +119,7 @@ public:
         void addVelocitySample(qreal v, qreal maxVelocity);
         void updateVelocity();
 
-        QDeclarativeTimeLineValueProxy<QSGFlickablePrivate> move;
+        QDeclarativeTimeLineValueProxy<QQuickFlickablePrivate> move;
         qreal viewSize;
         qreal pressPos;
         qreal dragStartOffset;
@@ -129,7 +129,7 @@ public:
         qreal flickTarget;
         qreal startMargin;
         qreal endMargin;
-        QSGFlickablePrivate::Velocity smoothVelocity;
+        QQuickFlickablePrivate::Velocity smoothVelocity;
         QPODVector<qreal,10> velocityBuffer;
         bool atEnd : 1;
         bool atBeginning : 1;
@@ -164,13 +164,13 @@ public:
 
     qreal overShootDistance(qreal size);
 
-    void itemGeometryChanged(QSGItem *, const QRectF &, const QRectF &);
+    void itemGeometryChanged(QQuickItem *, const QRectF &, const QRectF &);
 
     void draggingStarting();
     void draggingEnding();
 
 public:
-    QSGItem *contentItem;
+    QQuickItem *contentItem;
 
     AxisData hData;
     AxisData vData;
@@ -193,7 +193,7 @@ public:
     QPointF lastFlickablePosition;
     qreal reportedVelocitySmoothing;
     QMouseEvent *delayedPressEvent;
-    QSGItem *delayedPressTarget;
+    QQuickItem *delayedPressTarget;
     QBasicTimer delayedPressTimer;
     int pressDelay;
     int fixupDuration;
@@ -207,9 +207,9 @@ public:
     void updateVelocity();
     int vTime;
     QDeclarativeTimeLine velocityTimeline;
-    QSGFlickableVisibleArea *visibleArea;
-    QSGFlickable::FlickableDirection flickableDirection;
-    QSGFlickable::BoundsBehavior boundsBehavior;
+    QQuickFlickableVisibleArea *visibleArea;
+    QQuickFlickable::FlickableDirection flickableDirection;
+    QQuickFlickable::BoundsBehavior boundsBehavior;
 
     void handleMousePressEvent(QMouseEvent *);
     void handleMouseMoveEvent(QMouseEvent *);
@@ -222,7 +222,7 @@ public:
     static void data_clear(QDeclarativeListProperty<QObject> *);
 };
 
-class QSGFlickableVisibleArea : public QObject
+class QQuickFlickableVisibleArea : public QObject
 {
     Q_OBJECT
 
@@ -232,7 +232,7 @@ class QSGFlickableVisibleArea : public QObject
     Q_PROPERTY(qreal heightRatio READ heightRatio NOTIFY heightRatioChanged)
 
 public:
-    QSGFlickableVisibleArea(QSGFlickable *parent=0);
+    QQuickFlickableVisibleArea(QQuickFlickable *parent=0);
 
     qreal xPosition() const;
     qreal widthRatio() const;
@@ -248,7 +248,7 @@ signals:
     void heightRatioChanged(qreal heightRatio);
 
 private:
-    QSGFlickable *flickable;
+    QQuickFlickable *flickable;
     qreal m_xPosition;
     qreal m_widthRatio;
     qreal m_yPosition;
@@ -257,6 +257,6 @@ private:
 
 QT_END_NAMESPACE
 
-QML_DECLARE_TYPE(QSGFlickableVisibleArea)
+QML_DECLARE_TYPE(QQuickFlickableVisibleArea)
 
-#endif // QSGFLICKABLE_P_P_H
+#endif // QQUICKFLICKABLE_P_P_H
diff --git a/src/declarative/items/qsgflipable.cpp b/src/declarative/items/qquickflipable.cpp
index ac68b3171c..ed89f2aaf5 100644
--- a/src/declarative/items/qsgflipable.cpp
+++ b/src/declarative/items/qquickflipable.cpp
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#include "qsgflipable_p.h"
-#include "qsgitem_p.h"
+#include "qquickflipable_p.h"
+#include "qquickitem_p.h"
 
 #include <private/qdeclarativeguard_p.h>
 
@@ -50,11 +50,11 @@ QT_BEGIN_NAMESPACE
 
 // XXX todo - i think this needs work and a bit of a re-think
 
-class QSGLocalTransform : public QSGTransform
+class QQuickLocalTransform : public QQuickTransform
 {
     Q_OBJECT
 public:
-    QSGLocalTransform(QObject *parent) : QSGTransform(parent) {}
+    QQuickLocalTransform(QObject *parent) : QQuickTransform(parent) {}
 
     void setTransform(const QTransform &t) {
         transform = t;
@@ -67,20 +67,20 @@ private:
     QTransform transform;
 };
 
-class QSGFlipablePrivate : public QSGItemPrivate
+class QQuickFlipablePrivate : public QQuickItemPrivate
 {
-    Q_DECLARE_PUBLIC(QSGFlipable)
+    Q_DECLARE_PUBLIC(QQuickFlipable)
 public:
-    QSGFlipablePrivate() : current(QSGFlipable::Front), front(0), back(0), sideDirty(false) {}
+    QQuickFlipablePrivate() : current(QQuickFlipable::Front), front(0), back(0), sideDirty(false) {}
 
     virtual void transformChanged();
     void updateSide();
     void setBackTransform();
 
-    QSGFlipable::Side current;
-    QDeclarativeGuard<QSGLocalTransform> backTransform;
-    QDeclarativeGuard<QSGItem> front;
-    QDeclarativeGuard<QSGItem> back;
+    QQuickFlipable::Side current;
+    QDeclarativeGuard<QQuickLocalTransform> backTransform;
+    QDeclarativeGuard<QQuickItem> front;
+    QDeclarativeGuard<QQuickItem> back;
 
     bool sideDirty;
     bool wantBackXFlipped;
@@ -88,7 +88,7 @@ public:
 };
 
 /*!
-    \qmlclass Flipable QSGFlipable
+    \qmlclass Flipable QQuickFlipable
     \inqmlmodule QtQuick 2
     \ingroup qml-basic-interaction-elements
     \brief The Flipable item provides a surface that can be flipped.
@@ -128,12 +128,12 @@ public:
 
     \sa {declarative/ui-components/flipable}{Flipable example}
 */
-QSGFlipable::QSGFlipable(QSGItem *parent)
-: QSGItem(*(new QSGFlipablePrivate), parent)
+QQuickFlipable::QQuickFlipable(QQuickItem *parent)
+: QQuickItem(*(new QQuickFlipablePrivate), parent)
 {
 }
 
-QSGFlipable::~QSGFlipable()
+QQuickFlipable::~QQuickFlipable()
 {
 }
 
@@ -144,15 +144,15 @@ QSGFlipable::~QSGFlipable()
   The front and back sides of the flipable.
 */
 
-QSGItem *QSGFlipable::front()
+QQuickItem *QQuickFlipable::front()
 {
-    Q_D(const QSGFlipable);
+    Q_D(const QQuickFlipable);
     return d->front;
 }
 
-void QSGFlipable::setFront(QSGItem *front)
+void QQuickFlipable::setFront(QQuickItem *front)
 {
-    Q_D(QSGFlipable);
+    Q_D(QQuickFlipable);
     if (d->front) {
         qmlInfo(this) << tr("front is a write-once property");
         return;
@@ -164,15 +164,15 @@ void QSGFlipable::setFront(QSGItem *front)
     emit frontChanged();
 }
 
-QSGItem *QSGFlipable::back()
+QQuickItem *QQuickFlipable::back()
 {
-    Q_D(const QSGFlipable);
+    Q_D(const QQuickFlipable);
     return d->back;
 }
 
-void QSGFlipable::setBack(QSGItem *back)
+void QQuickFlipable::setBack(QQuickItem *back)
 {
-    Q_D(QSGFlipable);
+    Q_D(QQuickFlipable);
     if (d->back) {
         qmlInfo(this) << tr("back is a write-once property");
         return;
@@ -182,7 +182,7 @@ void QSGFlipable::setBack(QSGItem *back)
     d->back = back;
     d->back->setParentItem(this);
 
-    d->backTransform = new QSGLocalTransform(d->back);
+    d->backTransform = new QQuickLocalTransform(d->back);
     d->backTransform->prependToItem(d->back);
 
     if (Front == d->current)
@@ -194,10 +194,10 @@ void QSGFlipable::setBack(QSGItem *back)
     emit backChanged();
 }
 
-void QSGFlipable::retransformBack()
+void QQuickFlipable::retransformBack()
 {
-    Q_D(QSGFlipable);
-    if (d->current == QSGFlipable::Back && d->back)
+    Q_D(QQuickFlipable);
+    if (d->current == QQuickFlipable::Back && d->back)
         d->setBackTransform();
 }
 
@@ -207,38 +207,38 @@ void QSGFlipable::retransformBack()
   The side of the Flipable currently visible. Possible values are \c
   Flipable.Front and \c Flipable.Back.
 */
-QSGFlipable::Side QSGFlipable::side() const
+QQuickFlipable::Side QQuickFlipable::side() const
 {
-    Q_D(const QSGFlipable);
+    Q_D(const QQuickFlipable);
 
-    const_cast<QSGFlipablePrivate *>(d)->updateSide();
+    const_cast<QQuickFlipablePrivate *>(d)->updateSide();
     return d->current;
 }
 
-void QSGFlipablePrivate::transformChanged()
+void QQuickFlipablePrivate::transformChanged()
 {
-    Q_Q(QSGFlipable);
+    Q_Q(QQuickFlipable);
 
     if (!sideDirty) {
         sideDirty = true;
         q->polish();
     }
 
-    QSGItemPrivate::transformChanged();
+    QQuickItemPrivate::transformChanged();
 }
 
-void QSGFlipable::updatePolish()
+void QQuickFlipable::updatePolish()
 {
-    Q_D(QSGFlipable);
+    Q_D(QQuickFlipable);
     d->updateSide();
 }
 
 // determination on the currently visible side of the flipable
 // has to be done on the complete scene transform to give
 // correct results.
-void QSGFlipablePrivate::updateSide()
+void QQuickFlipablePrivate::updateSide()
 {
-    Q_Q(QSGFlipable);
+    Q_Q(QQuickFlipable);
 
     if (!sideDirty)
         return;
@@ -267,21 +267,21 @@ void QSGFlipablePrivate::updateSide()
     wantBackYFlipped = scenep1.x() >= scenep2.x();
     wantBackXFlipped = scenep2.y() >= scenep3.y();
 
-    QSGFlipable::Side newSide;
+    QQuickFlipable::Side newSide;
     if (cross > 0) {
-        newSide = QSGFlipable::Back;
+        newSide = QQuickFlipable::Back;
     } else {
-        newSide = QSGFlipable::Front;
+        newSide = QQuickFlipable::Front;
     }
 
     if (newSide != current) {
         current = newSide;
-        if (current == QSGFlipable::Back && back)
+        if (current == QQuickFlipable::Back && back)
             setBackTransform();
         if (front)
-            front->setOpacity((current==QSGFlipable::Front)?1.:0.);
+            front->setOpacity((current==QQuickFlipable::Front)?1.:0.);
         if (back)
-            back->setOpacity((current==QSGFlipable::Back)?1.:0.);
+            back->setOpacity((current==QQuickFlipable::Back)?1.:0.);
         emit q->sideChanged();
     }
 }
@@ -289,7 +289,7 @@ void QSGFlipablePrivate::updateSide()
 /* Depends on the width/height of the back item, and so needs reevaulating
    if those change.
 */
-void QSGFlipablePrivate::setBackTransform()
+void QQuickFlipablePrivate::setBackTransform()
 {
     QTransform mat;
     mat.translate(back->width()/2,back->height()/2);
@@ -305,4 +305,4 @@ void QSGFlipablePrivate::setBackTransform()
 
 QT_END_NAMESPACE
 
-#include "qsgflipable.moc"
+#include "qquickflipable.moc"
diff --git a/src/declarative/items/qsgflipable_p.h b/src/declarative/items/qquickflipable_p.h
index 4c83932152..698ec0fcb2 100644
--- a/src/declarative/items/qsgflipable_p.h
+++ b/src/declarative/items/qquickflipable_p.h
@@ -40,10 +40,10 @@
 **
 ****************************************************************************/
 
-#ifndef QSGFLIPABLE_P_H
-#define QSGFLIPABLE_P_H
+#ifndef QQUICKFLIPABLE_P_H
+#define QQUICKFLIPABLE_P_H
 
-#include "qsgitem.h"
+#include "qquickitem.h"
 
 #include <QtGui/qtransform.h>
 #include <QtGui/qvector3d.h>
@@ -55,26 +55,26 @@ QT_BEGIN_NAMESPACE
 
 QT_MODULE(Declarative)
 
-class QSGFlipablePrivate;
-class Q_AUTOTEST_EXPORT QSGFlipable : public QSGItem
+class QQuickFlipablePrivate;
+class Q_AUTOTEST_EXPORT QQuickFlipable : public QQuickItem
 {
     Q_OBJECT
 
     Q_ENUMS(Side)
-    Q_PROPERTY(QSGItem *front READ front WRITE setFront NOTIFY frontChanged)
-    Q_PROPERTY(QSGItem *back READ back WRITE setBack NOTIFY backChanged)
+    Q_PROPERTY(QQuickItem *front READ front WRITE setFront NOTIFY frontChanged)
+    Q_PROPERTY(QQuickItem *back READ back WRITE setBack NOTIFY backChanged)
     Q_PROPERTY(Side side READ side NOTIFY sideChanged)
     //### flipAxis
     //### flipRotation
 public:
-    QSGFlipable(QSGItem *parent=0);
-    ~QSGFlipable();
+    QQuickFlipable(QQuickItem *parent=0);
+    ~QQuickFlipable();
 
-    QSGItem *front();
-    void setFront(QSGItem *);
+    QQuickItem *front();
+    void setFront(QQuickItem *);
 
-    QSGItem *back();
-    void setBack(QSGItem *);
+    QQuickItem *back();
+    void setBack(QQuickItem *);
 
     enum Side { Front, Back };
     Side side() const;
@@ -91,14 +91,14 @@ private Q_SLOTS:
     void retransformBack();
 
 private:
-    Q_DISABLE_COPY(QSGFlipable)
-    Q_DECLARE_PRIVATE(QSGFlipable)
+    Q_DISABLE_COPY(QQuickFlipable)
+    Q_DECLARE_PRIVATE(QQuickFlipable)
 };
 
 QT_END_NAMESPACE
 
-QML_DECLARE_TYPE(QSGFlipable)
+QML_DECLARE_TYPE(QQuickFlipable)
 
 QT_END_HEADER
 
-#endif // QSGFLIPABLE_P_H
+#endif // QQUICKFLIPABLE_P_H
diff --git a/src/declarative/items/qsgfocusscope.cpp b/src/declarative/items/qquickfocusscope.cpp
index 2018d5ce7d..b807fe58f6 100644
--- a/src/declarative/items/qsgfocusscope.cpp
+++ b/src/declarative/items/qquickfocusscope.cpp
@@ -39,12 +39,12 @@
 **
 ****************************************************************************/
 
-#include "qsgfocusscope_p.h"
+#include "qquickfocusscope_p.h"
 
 QT_BEGIN_NAMESPACE
 
 /*!
-    \qmlclass FocusScope QSGFocusScope
+    \qmlclass FocusScope QQuickFocusScope
     \inqmlmodule QtQuick 2
     \ingroup qml-basic-interaction-elements
 
@@ -57,13 +57,13 @@ QT_BEGIN_NAMESPACE
 
     \sa {declarative/keyinteraction/focus}{Keyboard focus example}
 */
-QSGFocusScope::QSGFocusScope(QSGItem *parent)
-: QSGItem(parent)
+QQuickFocusScope::QQuickFocusScope(QQuickItem *parent)
+: QQuickItem(parent)
 {
     setFlag(ItemIsFocusScope);
 }
 
-QSGFocusScope::~QSGFocusScope()
+QQuickFocusScope::~QQuickFocusScope()
 {
 }
 
diff --git a/src/declarative/items/qsgfocusscope_p.h b/src/declarative/items/qquickfocusscope_p.h
index 222269bec9..ff1a389f62 100644
--- a/src/declarative/items/qsgfocusscope_p.h
+++ b/src/declarative/items/qquickfocusscope_p.h
@@ -40,10 +40,10 @@
 **
 ****************************************************************************/
 
-#ifndef QSGFOCUSSCOPE_P_H
-#define QSGFOCUSSCOPE_P_H
+#ifndef QQUICKFOCUSSCOPE_P_H
+#define QQUICKFOCUSSCOPE_P_H
 
-#include "qsgitem.h"
+#include "qquickitem.h"
 
 QT_BEGIN_HEADER
 
@@ -51,18 +51,18 @@ QT_BEGIN_NAMESPACE
 
 QT_MODULE(Declarative)
 
-class Q_AUTOTEST_EXPORT QSGFocusScope : public QSGItem
+class Q_AUTOTEST_EXPORT QQuickFocusScope : public QQuickItem
 {
     Q_OBJECT
 public:
-    QSGFocusScope(QSGItem *parent=0);
-    virtual ~QSGFocusScope();
+    QQuickFocusScope(QQuickItem *parent=0);
+    virtual ~QQuickFocusScope();
 };
 
 QT_END_NAMESPACE
 
-QML_DECLARE_TYPE(QSGFocusScope)
+QML_DECLARE_TYPE(QQuickFocusScope)
 
 QT_END_HEADER
 
-#endif // QSGFOCUSSCOPE_P_H
+#endif // QQUICKFOCUSSCOPE_P_H
diff --git a/src/declarative/items/qsggridview.cpp b/src/declarative/items/qquickgridview.cpp
index 2507a293de..a194772a1e 100644
--- a/src/declarative/items/qsggridview.cpp
+++ b/src/declarative/items/qquickgridview.cpp
@@ -39,10 +39,10 @@
 **
 ****************************************************************************/
 
-#include "qsggridview_p.h"
-#include "qsgvisualitemmodel_p.h"
-#include "qsgflickable_p_p.h"
-#include "qsgitemview_p_p.h"
+#include "qquickgridview_p.h"
+#include "qquickvisualitemmodel_p.h"
+#include "qquickflickable_p_p.h"
+#include "qquickitemview_p_p.h"
 
 #include <private/qdeclarativesmoothedanimation_p_p.h>
 #include <private/qlistmodelinterface_p.h>
@@ -64,10 +64,10 @@ QT_BEGIN_NAMESPACE
 class FxGridItemSG : public FxViewItem
 {
 public:
-    FxGridItemSG(QSGItem *i, QSGGridView *v, bool own) : FxViewItem(i, own), view(v) {
-        attached = static_cast<QSGGridViewAttached*>(qmlAttachedPropertiesObject<QSGGridView>(item));
+    FxGridItemSG(QQuickItem *i, QQuickGridView *v, bool own) : FxViewItem(i, own), view(v) {
+        attached = static_cast<QQuickGridViewAttached*>(qmlAttachedPropertiesObject<QQuickGridView>(item));
         if (attached)
-            static_cast<QSGGridViewAttached*>(attached)->setView(view);
+            static_cast<QQuickGridViewAttached*>(attached)->setView(view);
     }
 
     ~FxGridItemSG() {}
@@ -81,7 +81,7 @@ public:
     }
 
     qreal size() const {
-        return view->flow() == QSGGridView::LeftToRight ? view->cellHeight() : view->cellWidth();
+        return view->flow() == QQuickGridView::LeftToRight ? view->cellHeight() : view->cellWidth();
     }
 
     qreal sectionSize() const {
@@ -89,14 +89,14 @@ public:
     }
 
     qreal rowPos() const {
-        if (view->flow() == QSGGridView::LeftToRight)
+        if (view->flow() == QQuickGridView::LeftToRight)
             return item->y();
         else
             return (view->effectiveLayoutDirection() == Qt::RightToLeft ? -view->cellWidth()-item->x() : item->x());
     }
 
     qreal colPos() const {
-        if (view->flow() == QSGGridView::LeftToRight) {
+        if (view->flow() == QQuickGridView::LeftToRight) {
             if (view->effectiveLayoutDirection() == Qt::RightToLeft) {
                 qreal colSize = view->cellWidth();
                 int columns = view->width()/colSize;
@@ -109,7 +109,7 @@ public:
         }
     }
     qreal endRowPos() const {
-        if (view->flow() == QSGGridView::LeftToRight) {
+        if (view->flow() == QQuickGridView::LeftToRight) {
             return item->y() + view->cellHeight();
         } else {
             if (view->effectiveLayoutDirection() == Qt::RightToLeft)
@@ -120,14 +120,14 @@ public:
     }
     void setPosition(qreal col, qreal row) {
         if (view->effectiveLayoutDirection() == Qt::RightToLeft) {
-            if (view->flow() == QSGGridView::LeftToRight) {
+            if (view->flow() == QQuickGridView::LeftToRight) {
                 int columns = view->width()/view->cellWidth();
                 item->setPos(QPointF((view->cellWidth() * (columns-1) - col), row));
             } else {
                 item->setPos(QPointF(-view->cellWidth()-row, col));
             }
         } else {
-            if (view->flow() == QSGGridView::LeftToRight)
+            if (view->flow() == QQuickGridView::LeftToRight)
                 item->setPos(QPointF(col, row));
             else
                 item->setPos(QPointF(row, col));
@@ -138,14 +138,14 @@ public:
                 y >= item->y() && y < item->y() + view->cellHeight());
     }
 
-    QSGGridView *view;
+    QQuickGridView *view;
 };
 
 //----------------------------------------------------------------------------
 
-class QSGGridViewPrivate : public QSGItemViewPrivate
+class QQuickGridViewPrivate : public QQuickItemViewPrivate
 {
-    Q_DECLARE_PUBLIC(QSGGridView)
+    Q_DECLARE_PUBLIC(QQuickGridView)
 
 public:
     virtual Qt::Orientation layoutOrientation() const;
@@ -169,8 +169,8 @@ public:
     virtual bool removeNonVisibleItems(qreal bufferFrom, qreal bufferTo);
     virtual void visibleItemsChanged();
 
-    virtual FxViewItem *newViewItem(int index, QSGItem *item);
-    virtual void repositionPackageItemAt(QSGItem *item, int index);
+    virtual FxViewItem *newViewItem(int index, QQuickItem *item);
+    virtual void repositionPackageItemAt(QQuickItem *item, int index);
     virtual void resetItemPosition(FxViewItem *item, FxViewItem *toItem);
     virtual void resetFirstItemPosition();
     virtual void moveItemBy(FxViewItem *item, qreal forwards, qreal backwards);
@@ -194,66 +194,66 @@ public:
     virtual void initializeCurrentItem();
 
     virtual void updateViewport();
-    virtual void itemGeometryChanged(QSGItem *item, const QRectF &newGeometry, const QRectF &oldGeometry);
+    virtual void itemGeometryChanged(QQuickItem *item, const QRectF &newGeometry, const QRectF &oldGeometry);
     virtual void fixupPosition();
     virtual void fixup(AxisData &data, qreal minExtent, qreal maxExtent);
-    virtual void flick(QSGItemViewPrivate::AxisData &data, qreal minExtent, qreal maxExtent, qreal vSize,
+    virtual void flick(QQuickItemViewPrivate::AxisData &data, qreal minExtent, qreal maxExtent, qreal vSize,
                         QDeclarativeTimeLineCallback::Callback fixupCallback, qreal velocity);
 
-    QSGGridView::Flow flow;
+    QQuickGridView::Flow flow;
     qreal cellWidth;
     qreal cellHeight;
     int columns;
-    QSGGridView::SnapMode snapMode;
+    QQuickGridView::SnapMode snapMode;
 
     QSmoothedAnimation *highlightXAnimator;
     QSmoothedAnimation *highlightYAnimator;
 
-    QSGGridViewPrivate()
-        : flow(QSGGridView::LeftToRight)
+    QQuickGridViewPrivate()
+        : flow(QQuickGridView::LeftToRight)
         , cellWidth(100), cellHeight(100), columns(1)
-        , snapMode(QSGGridView::NoSnap)
+        , snapMode(QQuickGridView::NoSnap)
         , highlightXAnimator(0), highlightYAnimator(0)
     {}
 };
 
-Qt::Orientation QSGGridViewPrivate::layoutOrientation() const
+Qt::Orientation QQuickGridViewPrivate::layoutOrientation() const
 {
-    return flow == QSGGridView::LeftToRight ? Qt::Vertical : Qt::Horizontal;
+    return flow == QQuickGridView::LeftToRight ? Qt::Vertical : Qt::Horizontal;
 }
 
-bool QSGGridViewPrivate::isContentFlowReversed() const
+bool QQuickGridViewPrivate::isContentFlowReversed() const
 {
     return isRightToLeftTopToBottom();
 }
 
-bool QSGGridViewPrivate::isRightToLeftTopToBottom() const
+bool QQuickGridViewPrivate::isRightToLeftTopToBottom() const
 {
-    Q_Q(const QSGGridView);
-    return flow == QSGGridView::TopToBottom && q->effectiveLayoutDirection() == Qt::RightToLeft;
+    Q_Q(const QQuickGridView);
+    return flow == QQuickGridView::TopToBottom && q->effectiveLayoutDirection() == Qt::RightToLeft;
 }
 
-void QSGGridViewPrivate::changedVisibleIndex(int newIndex)
+void QQuickGridViewPrivate::changedVisibleIndex(int newIndex)
 {
     visibleIndex = newIndex / columns * columns;
 }
 
-void QSGGridViewPrivate::setPosition(qreal pos)
+void QQuickGridViewPrivate::setPosition(qreal pos)
 {
-    Q_Q(QSGGridView);
-    if (flow == QSGGridView::LeftToRight) {
-        q->QSGFlickable::setContentY(pos);
-        q->QSGFlickable::setContentX(0);
+    Q_Q(QQuickGridView);
+    if (flow == QQuickGridView::LeftToRight) {
+        q->QQuickFlickable::setContentY(pos);
+        q->QQuickFlickable::setContentX(0);
     } else {
         if (q->effectiveLayoutDirection() == Qt::LeftToRight)
-            q->QSGFlickable::setContentX(pos);
+            q->QQuickFlickable::setContentX(pos);
         else
-            q->QSGFlickable::setContentX(-pos-size());
-        q->QSGFlickable::setContentY(0);
+            q->QQuickFlickable::setContentX(-pos-size());
+        q->QQuickFlickable::setContentY(0);
     }
 }
 
-qreal QSGGridViewPrivate::originPosition() const
+qreal QQuickGridViewPrivate::originPosition() const
 {
     qreal pos = 0;
     if (!visibleItems.isEmpty())
@@ -261,7 +261,7 @@ qreal QSGGridViewPrivate::originPosition() const
     return pos;
 }
 
-qreal QSGGridViewPrivate::lastPosition() const
+qreal QQuickGridViewPrivate::lastPosition() const
 {
     qreal pos = 0;
     if (model && model->count()) {
@@ -271,24 +271,24 @@ qreal QSGGridViewPrivate::lastPosition() const
     return pos;
 }
 
-qreal QSGGridViewPrivate::positionAt(int index) const
+qreal QQuickGridViewPrivate::positionAt(int index) const
 {
     return rowPosAt(index);
 }
 
-qreal QSGGridViewPrivate::endPositionAt(int index) const
+qreal QQuickGridViewPrivate::endPositionAt(int index) const
 {
     return rowPosAt(index) + rowSize();
 }
 
-qreal QSGGridViewPrivate::rowSize() const {
-    return flow == QSGGridView::LeftToRight ? cellHeight : cellWidth;
+qreal QQuickGridViewPrivate::rowSize() const {
+    return flow == QQuickGridView::LeftToRight ? cellHeight : cellWidth;
 }
-qreal QSGGridViewPrivate::colSize() const {
-    return flow == QSGGridView::LeftToRight ? cellWidth : cellHeight;
+qreal QQuickGridViewPrivate::colSize() const {
+    return flow == QQuickGridView::LeftToRight ? cellWidth : cellHeight;
 }
 
-qreal QSGGridViewPrivate::colPosAt(int modelIndex) const
+qreal QQuickGridViewPrivate::colPosAt(int modelIndex) const
 {
     if (FxViewItem *item = visibleItem(modelIndex))
         return static_cast<FxGridItemSG*>(item)->colPos();
@@ -306,7 +306,7 @@ qreal QSGGridViewPrivate::colPosAt(int modelIndex) const
     return (modelIndex % columns) * colSize();
 }
 
-qreal QSGGridViewPrivate::rowPosAt(int modelIndex) const
+qreal QQuickGridViewPrivate::rowPosAt(int modelIndex) const
 {
     if (FxViewItem *item = visibleItem(modelIndex))
         return static_cast<FxGridItemSG*>(item)->rowPos();
@@ -329,9 +329,9 @@ qreal QSGGridViewPrivate::rowPosAt(int modelIndex) const
 }
 
 
-qreal QSGGridViewPrivate::snapPosAt(qreal pos) const
+qreal QQuickGridViewPrivate::snapPosAt(qreal pos) const
 {
-    Q_Q(const QSGGridView);
+    Q_Q(const QQuickGridView);
     qreal snapPos = 0;
     if (!visibleItems.isEmpty()) {
         qreal highlightStart = highlightRangeStart;
@@ -349,8 +349,8 @@ qreal QSGGridViewPrivate::snapPosAt(qreal pos) const
             maxExtent = q->minXExtent();
             minExtent = q->maxXExtent();
         } else {
-            maxExtent = flow == QSGGridView::LeftToRight ? -q->maxYExtent() : -q->maxXExtent();
-            minExtent = flow == QSGGridView::LeftToRight ? -q->minYExtent() : -q->minXExtent();
+            maxExtent = flow == QQuickGridView::LeftToRight ? -q->maxYExtent() : -q->maxXExtent();
+            minExtent = flow == QQuickGridView::LeftToRight ? -q->minYExtent() : -q->minXExtent();
         }
         if (snapPos > maxExtent)
             snapPos = maxExtent;
@@ -360,7 +360,7 @@ qreal QSGGridViewPrivate::snapPosAt(qreal pos) const
     return snapPos;
 }
 
-FxViewItem *QSGGridViewPrivate::snapItemAt(qreal pos) const
+FxViewItem *QQuickGridViewPrivate::snapItemAt(qreal pos) const
 {
     for (int i = 0; i < visibleItems.count(); ++i) {
         FxViewItem *item = visibleItems.at(i);
@@ -373,7 +373,7 @@ FxViewItem *QSGGridViewPrivate::snapItemAt(qreal pos) const
     return 0;
 }
 
-int QSGGridViewPrivate::snapIndex() const
+int QQuickGridViewPrivate::snapIndex() const
 {
     int index = currentIndex;
     for (int i = 0; i < visibleItems.count(); ++i) {
@@ -391,14 +391,14 @@ int QSGGridViewPrivate::snapIndex() const
     return index;
 }
 
-FxViewItem *QSGGridViewPrivate::newViewItem(int modelIndex, QSGItem *item)
+FxViewItem *QQuickGridViewPrivate::newViewItem(int modelIndex, QQuickItem *item)
 {
-    Q_Q(QSGGridView);
+    Q_Q(QQuickGridView);
     Q_UNUSED(modelIndex);
     return new FxGridItemSG(item, q, false);
 }
 
-bool QSGGridViewPrivate::addVisibleItems(qreal fillFrom, qreal fillTo, bool doBuffer)
+bool QQuickGridViewPrivate::addVisibleItems(qreal fillFrom, qreal fillTo, bool doBuffer)
 {
     int colPos = colPosAt(visibleIndex);
     int rowPos = rowPosAt(visibleIndex);
@@ -490,7 +490,7 @@ bool QSGGridViewPrivate::addVisibleItems(qreal fillFrom, qreal fillTo, bool doBu
     return changed;
 }
 
-bool QSGGridViewPrivate::removeNonVisibleItems(qreal bufferFrom, qreal bufferTo)
+bool QQuickGridViewPrivate::removeNonVisibleItems(qreal bufferFrom, qreal bufferTo)
 {
     FxGridItemSG *item = 0;
     bool changed = false;
@@ -521,21 +521,21 @@ bool QSGGridViewPrivate::removeNonVisibleItems(qreal bufferFrom, qreal bufferTo)
     return changed;
 }
 
-void QSGGridViewPrivate::visibleItemsChanged()
+void QQuickGridViewPrivate::visibleItemsChanged()
 {
     updateHeader();
     updateFooter();
     updateViewport();
 }
 
-void QSGGridViewPrivate::updateViewport()
+void QQuickGridViewPrivate::updateViewport()
 {
-    Q_Q(QSGGridView);
-    columns = (int)qMax((flow == QSGGridView::LeftToRight ? q->width() : q->height()) / colSize(), qreal(1.));
-    QSGItemViewPrivate::updateViewport();
+    Q_Q(QQuickGridView);
+    columns = (int)qMax((flow == QQuickGridView::LeftToRight ? q->width() : q->height()) / colSize(), qreal(1.));
+    QQuickItemViewPrivate::updateViewport();
 }
 
-void QSGGridViewPrivate::layoutVisibleItems()
+void QQuickGridViewPrivate::layoutVisibleItems()
 {
     if (visibleItems.count()) {
         FxGridItemSG *firstItem = static_cast<FxGridItemSG*>(visibleItems.first());
@@ -558,11 +558,11 @@ void QSGGridViewPrivate::layoutVisibleItems()
     }
 }
 
-void QSGGridViewPrivate::repositionPackageItemAt(QSGItem *item, int index)
+void QQuickGridViewPrivate::repositionPackageItemAt(QQuickItem *item, int index)
 {
-    Q_Q(QSGGridView);
+    Q_Q(QQuickGridView);
     qreal pos = position();
-    if (flow == QSGGridView::LeftToRight) {
+    if (flow == QQuickGridView::LeftToRight) {
         if (item->y() + item->height() > pos && item->y() < pos + q->height())
             item->setPos(QPointF(colPosAt(index), rowPosAt(index)));
     } else {
@@ -575,7 +575,7 @@ void QSGGridViewPrivate::repositionPackageItemAt(QSGItem *item, int index)
     }
 }
 
-void QSGGridViewPrivate::resetItemPosition(FxViewItem *item, FxViewItem *toItem)
+void QQuickGridViewPrivate::resetItemPosition(FxViewItem *item, FxViewItem *toItem)
 {
     if (item == toItem)
         return;
@@ -583,13 +583,13 @@ void QSGGridViewPrivate::resetItemPosition(FxViewItem *item, FxViewItem *toItem)
     static_cast<FxGridItemSG*>(item)->setPosition(toGridItem->colPos(), toGridItem->rowPos());
 }
 
-void QSGGridViewPrivate::resetFirstItemPosition()
+void QQuickGridViewPrivate::resetFirstItemPosition()
 {
     FxGridItemSG *item = static_cast<FxGridItemSG*>(visibleItems.first());
     item->setPosition(0, 0);
 }
 
-void QSGGridViewPrivate::moveItemBy(FxViewItem *item, qreal forwards, qreal backwards)
+void QQuickGridViewPrivate::moveItemBy(FxViewItem *item, qreal forwards, qreal backwards)
 {
     int moveCount = (forwards / rowSize()) - (backwards / rowSize());
 
@@ -597,9 +597,9 @@ void QSGGridViewPrivate::moveItemBy(FxViewItem *item, qreal forwards, qreal back
     gridItem->setPosition(gridItem->colPos(), gridItem->rowPos() + ((moveCount / columns) * rowSize()));
 }
 
-void QSGGridViewPrivate::createHighlight()
+void QQuickGridViewPrivate::createHighlight()
 {
-    Q_Q(QSGGridView);
+    Q_Q(QQuickGridView);
     bool changed = false;
     if (highlight) {
         if (trackedItem == highlight)
@@ -616,7 +616,7 @@ void QSGGridViewPrivate::createHighlight()
     }
 
     if (currentItem) {
-        QSGItem *item = createHighlightItem();
+        QQuickItem *item = createHighlightItem();
         if (item) {
             FxGridItemSG *newHighlight = new FxGridItemSG(item, q, true);
             if (autoHighlight)
@@ -636,13 +636,13 @@ void QSGGridViewPrivate::createHighlight()
         emit q->highlightItemChanged();
 }
 
-void QSGGridViewPrivate::updateHighlight()
+void QQuickGridViewPrivate::updateHighlight()
 {
     applyPendingChanges();
 
     if ((!currentItem && highlight) || (currentItem && !highlight))
         createHighlight();
-    bool strictHighlight = haveHighlightRange && highlightRange == QSGGridView::StrictlyEnforceRange;
+    bool strictHighlight = haveHighlightRange && highlightRange == QQuickGridView::StrictlyEnforceRange;
     if (currentItem && autoHighlight && highlight && (!strictHighlight || !pressed)) {
         // auto-update highlight
         highlightXAnimator->to = currentItem->item->x();
@@ -656,7 +656,7 @@ void QSGGridViewPrivate::updateHighlight()
     updateTrackedItem();
 }
 
-void QSGGridViewPrivate::resetHighlightPosition()
+void QQuickGridViewPrivate::resetHighlightPosition()
 {
     if (highlight && currentItem) {
         FxGridItemSG *cItem = static_cast<FxGridItemSG*>(currentItem);
@@ -664,36 +664,36 @@ void QSGGridViewPrivate::resetHighlightPosition()
     }
 }
 
-qreal QSGGridViewPrivate::headerSize() const
+qreal QQuickGridViewPrivate::headerSize() const
 {
     if (!header)
         return 0.0;
-    return flow == QSGGridView::LeftToRight ? header->item->height() : header->item->width();
+    return flow == QQuickGridView::LeftToRight ? header->item->height() : header->item->width();
 }
 
-qreal QSGGridViewPrivate::footerSize() const
+qreal QQuickGridViewPrivate::footerSize() const
 {
     if (!footer)
         return 0.0;
-    return flow == QSGGridView::LeftToRight? footer->item->height() : footer->item->width();
+    return flow == QQuickGridView::LeftToRight? footer->item->height() : footer->item->width();
 }
 
-bool QSGGridViewPrivate::showHeaderForIndex(int index) const
+bool QQuickGridViewPrivate::showHeaderForIndex(int index) const
 {
     return index / columns == 0;
 }
 
-bool QSGGridViewPrivate::showFooterForIndex(int index) const
+bool QQuickGridViewPrivate::showFooterForIndex(int index) const
 {
     return index / columns == (model->count()-1) / columns;
 }
 
-void QSGGridViewPrivate::updateFooter()
+void QQuickGridViewPrivate::updateFooter()
 {
-    Q_Q(QSGGridView);
+    Q_Q(QQuickGridView);
     bool created = false;
     if (!footer) {
-        QSGItem *item = createComponentItem(footerComponent, true);
+        QQuickItem *item = createComponentItem(footerComponent, true);
         if (!item)
             return;
         item->setZ(1);
@@ -705,7 +705,7 @@ void QSGGridViewPrivate::updateFooter()
     qreal colOffset = 0;
     qreal rowOffset = 0;
     if (q->effectiveLayoutDirection() == Qt::RightToLeft) {
-        if (flow == QSGGridView::TopToBottom)
+        if (flow == QQuickGridView::TopToBottom)
             rowOffset = gridItem->item->width() - cellWidth;
         else
             colOffset = gridItem->item->width() - cellWidth;
@@ -727,12 +727,12 @@ void QSGGridViewPrivate::updateFooter()
         emit q->footerItemChanged();
 }
 
-void QSGGridViewPrivate::updateHeader()
+void QQuickGridViewPrivate::updateHeader()
 {
-    Q_Q(QSGGridView);
+    Q_Q(QQuickGridView);
     bool created = false;
     if (!header) {
-        QSGItem *item = createComponentItem(headerComponent, true);
+        QQuickItem *item = createComponentItem(headerComponent, true);
         if (!item)
             return;
         item->setZ(1);
@@ -744,7 +744,7 @@ void QSGGridViewPrivate::updateHeader()
     qreal colOffset = 0;
     qreal rowOffset = -headerSize();
     if (q->effectiveLayoutDirection() == Qt::RightToLeft) {
-        if (flow == QSGGridView::TopToBottom)
+        if (flow == QQuickGridView::TopToBottom)
             rowOffset += gridItem->item->width()-cellWidth;
         else
             colOffset = gridItem->item->width()-cellWidth;
@@ -770,7 +770,7 @@ void QSGGridViewPrivate::updateHeader()
         emit q->headerItemChanged();
 }
 
-void QSGGridViewPrivate::initializeCurrentItem()
+void QQuickGridViewPrivate::initializeCurrentItem()
 {
     if (currentItem && currentIndex >= 0) {
         FxGridItemSG *gridItem = static_cast<FxGridItemSG*>(currentItem);
@@ -779,10 +779,10 @@ void QSGGridViewPrivate::initializeCurrentItem()
     }
 }
 
-void QSGGridViewPrivate::itemGeometryChanged(QSGItem *item, const QRectF &newGeometry, const QRectF &oldGeometry)
+void QQuickGridViewPrivate::itemGeometryChanged(QQuickItem *item, const QRectF &newGeometry, const QRectF &oldGeometry)
 {
-    Q_Q(QSGGridView);
-    QSGItemViewPrivate::itemGeometryChanged(item, newGeometry, oldGeometry);
+    Q_Q(QQuickGridView);
+    QQuickItemViewPrivate::itemGeometryChanged(item, newGeometry, oldGeometry);
     if (!q->isComponentComplete())
         return;
     if (item == q) {
@@ -794,29 +794,29 @@ void QSGGridViewPrivate::itemGeometryChanged(QSGItem *item, const QRectF &newGeo
     }
 }
 
-void QSGGridViewPrivate::fixupPosition()
+void QQuickGridViewPrivate::fixupPosition()
 {
     moveReason = Other;
-    if (flow == QSGGridView::LeftToRight)
+    if (flow == QQuickGridView::LeftToRight)
         fixupY();
     else
         fixupX();
 }
 
-void QSGGridViewPrivate::fixup(AxisData &data, qreal minExtent, qreal maxExtent)
+void QQuickGridViewPrivate::fixup(AxisData &data, qreal minExtent, qreal maxExtent)
 {
-    if ((flow == QSGGridView::TopToBottom && &data == &vData)
-        || (flow == QSGGridView::LeftToRight && &data == &hData))
+    if ((flow == QQuickGridView::TopToBottom && &data == &vData)
+        || (flow == QQuickGridView::LeftToRight && &data == &hData))
         return;
 
     fixupMode = moveReason == Mouse ? fixupMode : Immediate;
 
     qreal viewPos = isRightToLeftTopToBottom() ? -position()-size() : position();
 
-    bool strictHighlightRange = haveHighlightRange && highlightRange == QSGGridView::StrictlyEnforceRange;
-    if (snapMode != QSGGridView::NoSnap) {
+    bool strictHighlightRange = haveHighlightRange && highlightRange == QQuickGridView::StrictlyEnforceRange;
+    if (snapMode != QQuickGridView::NoSnap) {
         qreal tempPosition = isRightToLeftTopToBottom() ? -position()-size() : position();
-        if (snapMode == QSGGridView::SnapOneRow && moveReason == Mouse) {
+        if (snapMode == QQuickGridView::SnapOneRow && moveReason == Mouse) {
             // if we've been dragged < rowSize()/2 then bias towards the next row
             qreal dist = data.move.value() - (data.pressPos - data.dragStartOffset);
             qreal bias = 0;
@@ -858,7 +858,7 @@ void QSGGridViewPrivate::fixup(AxisData &data, qreal minExtent, qreal maxExtent)
             else
                 pos = qMax(qMin(bottomItem->position() - highlightRangeEnd, -maxExtent), -minExtent);
         } else {
-            QSGItemViewPrivate::fixup(data, minExtent, maxExtent);
+            QQuickItemViewPrivate::fixup(data, minExtent, maxExtent);
             return;
         }
 
@@ -873,7 +873,7 @@ void QSGGridViewPrivate::fixup(AxisData &data, qreal minExtent, qreal maxExtent)
             }
             vTime = timeline.time();
         }
-    } else if (haveHighlightRange && highlightRange == QSGGridView::StrictlyEnforceRange) {
+    } else if (haveHighlightRange && highlightRange == QQuickGridView::StrictlyEnforceRange) {
         if (currentItem) {
             updateHighlight();
             qreal pos = static_cast<FxGridItemSG*>(currentItem)->rowPos();
@@ -895,21 +895,21 @@ void QSGGridViewPrivate::fixup(AxisData &data, qreal minExtent, qreal maxExtent)
             vTime = timeline.time();
         }
     } else {
-        QSGItemViewPrivate::fixup(data, minExtent, maxExtent);
+        QQuickItemViewPrivate::fixup(data, minExtent, maxExtent);
     }
     data.inOvershoot = false;
     fixupMode = Normal;
 }
 
-void QSGGridViewPrivate::flick(AxisData &data, qreal minExtent, qreal maxExtent, qreal vSize,
+void QQuickGridViewPrivate::flick(AxisData &data, qreal minExtent, qreal maxExtent, qreal vSize,
                                         QDeclarativeTimeLineCallback::Callback fixupCallback, qreal velocity)
 {
-    Q_Q(QSGGridView);
+    Q_Q(QQuickGridView);
     data.fixingUp = false;
     moveReason = Mouse;
-    if ((!haveHighlightRange || highlightRange != QSGGridView::StrictlyEnforceRange)
-        && snapMode == QSGGridView::NoSnap) {
-        QSGItemViewPrivate::flick(data, minExtent, maxExtent, vSize, fixupCallback, velocity);
+    if ((!haveHighlightRange || highlightRange != QQuickGridView::StrictlyEnforceRange)
+        && snapMode == QQuickGridView::NoSnap) {
+        QQuickItemViewPrivate::flick(data, minExtent, maxExtent, vSize, fixupCallback, velocity);
         return;
     }
     qreal maxDistance = 0;
@@ -917,7 +917,7 @@ void QSGGridViewPrivate::flick(AxisData &data, qreal minExtent, qreal maxExtent,
     // -ve velocity means list is moving up/left
     if (velocity > 0) {
         if (data.move.value() < minExtent) {
-            if (snapMode == QSGGridView::SnapOneRow) {
+            if (snapMode == QQuickGridView::SnapOneRow) {
                 // if we've been dragged < averageSize/2 then bias towards the next item
                 qreal dist = data.move.value() - (data.pressPos - data.dragStartOffset);
                 qreal bias = dist < rowSize()/2 ? rowSize()/2 : 0;
@@ -930,11 +930,11 @@ void QSGGridViewPrivate::flick(AxisData &data, qreal minExtent, qreal maxExtent,
                 maxDistance = qAbs(minExtent - data.move.value());
             }
         }
-        if (snapMode == QSGGridView::NoSnap && highlightRange != QSGGridView::StrictlyEnforceRange)
+        if (snapMode == QQuickGridView::NoSnap && highlightRange != QQuickGridView::StrictlyEnforceRange)
             data.flickTarget = minExtent;
     } else {
         if (data.move.value() > maxExtent) {
-            if (snapMode == QSGGridView::SnapOneRow) {
+            if (snapMode == QQuickGridView::SnapOneRow) {
                 // if we've been dragged < averageSize/2 then bias towards the next item
                 qreal dist = data.move.value() - (data.pressPos - data.dragStartOffset);
                 qreal bias = -dist < rowSize()/2 ? rowSize()/2 : 0;
@@ -947,10 +947,10 @@ void QSGGridViewPrivate::flick(AxisData &data, qreal minExtent, qreal maxExtent,
                 maxDistance = qAbs(maxExtent - data.move.value());
             }
         }
-        if (snapMode == QSGGridView::NoSnap && highlightRange != QSGGridView::StrictlyEnforceRange)
+        if (snapMode == QQuickGridView::NoSnap && highlightRange != QQuickGridView::StrictlyEnforceRange)
             data.flickTarget = maxExtent;
     }
-    bool overShoot = boundsBehavior == QSGFlickable::DragAndOvershootBounds;
+    bool overShoot = boundsBehavior == QQuickFlickable::DragAndOvershootBounds;
     if (maxDistance > 0 || overShoot) {
         // This mode requires the grid to stop exactly on a row boundary.
         qreal v = velocity;
@@ -963,13 +963,13 @@ void QSGGridViewPrivate::flick(AxisData &data, qreal minExtent, qreal maxExtent,
         qreal accel = deceleration;
         qreal v2 = v * v;
         qreal overshootDist = 0.0;
-        if ((maxDistance > 0.0 && v2 / (2.0f * maxDistance) < accel) || snapMode == QSGGridView::SnapOneRow) {
+        if ((maxDistance > 0.0 && v2 / (2.0f * maxDistance) < accel) || snapMode == QQuickGridView::SnapOneRow) {
             // + rowSize()/4 to encourage moving at least one item in the flick direction
             qreal dist = v2 / (accel * 2.0) + rowSize()/4;
             dist = qMin(dist, maxDistance);
             if (v > 0)
                 dist = -dist;
-            if (snapMode != QSGGridView::SnapOneRow) {
+            if (snapMode != QQuickGridView::SnapOneRow) {
                 qreal distTemp = isRightToLeftTopToBottom() ? -dist : dist;
                 data.flickTarget = -snapPosAt(-dataValue + distTemp);
             }
@@ -1024,7 +1024,7 @@ void QSGGridViewPrivate::flick(AxisData &data, qreal minExtent, qreal maxExtent,
 
 //----------------------------------------------------------------------------
 /*!
-    \qmlclass GridView QSGGridView
+    \qmlclass GridView QQuickGridView
     \inqmlmodule QtQuick 2
     \ingroup qml-view-elements
 
@@ -1098,24 +1098,24 @@ void QSGGridViewPrivate::flick(AxisData &data, qreal minExtent, qreal maxExtent,
     \sa {declarative/modelviews/gridview}{GridView example}
 */
 
-QSGGridView::QSGGridView(QSGItem *parent)
-    : QSGItemView(*(new QSGGridViewPrivate), parent)
+QQuickGridView::QQuickGridView(QQuickItem *parent)
+    : QQuickItemView(*(new QQuickGridViewPrivate), parent)
 {
 }
 
-QSGGridView::~QSGGridView()
+QQuickGridView::~QQuickGridView()
 {
 }
 
-void QSGGridView::setHighlightFollowsCurrentItem(bool autoHighlight)
+void QQuickGridView::setHighlightFollowsCurrentItem(bool autoHighlight)
 {
-    Q_D(QSGGridView);
+    Q_D(QQuickGridView);
     if (d->autoHighlight != autoHighlight) {
         if (!autoHighlight && d->highlightXAnimator) {
             d->highlightXAnimator->stop();
             d->highlightYAnimator->stop();
         }
-        QSGItemView::setHighlightFollowsCurrentItem(autoHighlight);
+        QQuickItemView::setHighlightFollowsCurrentItem(autoHighlight);
     }
 }
 
@@ -1355,15 +1355,15 @@ void QSGGridView::setHighlightFollowsCurrentItem(bool autoHighlight)
     delegates; the fewer elements in a delegate, the faster a view may be
     scrolled.
 */
-void QSGGridView::setHighlightMoveDuration(int duration)
+void QQuickGridView::setHighlightMoveDuration(int duration)
 {
-    Q_D(QSGGridView);
+    Q_D(QQuickGridView);
     if (d->highlightMoveDuration != duration) {
         if (d->highlightYAnimator) {
             d->highlightXAnimator->userDuration = duration;
             d->highlightYAnimator->userDuration = duration;
         }
-        QSGItemView::setHighlightMoveDuration(duration);
+        QQuickItemView::setHighlightMoveDuration(duration);
     }
 }
 
@@ -1378,15 +1378,15 @@ void QSGGridView::setHighlightMoveDuration(int duration)
     \o GridView.TopToBottom - Items are laid out from top to bottom, and the view scrolls horizontally
     \endlist
 */
-QSGGridView::Flow QSGGridView::flow() const
+QQuickGridView::Flow QQuickGridView::flow() const
 {
-    Q_D(const QSGGridView);
+    Q_D(const QQuickGridView);
     return d->flow;
 }
 
-void QSGGridView::setFlow(Flow flow)
+void QQuickGridView::setFlow(Flow flow)
 {
-    Q_D(QSGGridView);
+    Q_D(QQuickGridView);
     if (d->flow != flow) {
         d->flow = flow;
         if (d->flow == LeftToRight) {
@@ -1412,15 +1412,15 @@ void QSGGridView::setFlow(Flow flow)
 
   The default cell size is 100x100.
 */
-qreal QSGGridView::cellWidth() const
+qreal QQuickGridView::cellWidth() const
 {
-    Q_D(const QSGGridView);
+    Q_D(const QQuickGridView);
     return d->cellWidth;
 }
 
-void QSGGridView::setCellWidth(qreal cellWidth)
+void QQuickGridView::setCellWidth(qreal cellWidth)
 {
-    Q_D(QSGGridView);
+    Q_D(QQuickGridView);
     if (cellWidth != d->cellWidth && cellWidth > 0) {
         d->cellWidth = qMax(qreal(1), cellWidth);
         d->updateViewport();
@@ -1430,15 +1430,15 @@ void QSGGridView::setCellWidth(qreal cellWidth)
     }
 }
 
-qreal QSGGridView::cellHeight() const
+qreal QQuickGridView::cellHeight() const
 {
-    Q_D(const QSGGridView);
+    Q_D(const QQuickGridView);
     return d->cellHeight;
 }
 
-void QSGGridView::setCellHeight(qreal cellHeight)
+void QQuickGridView::setCellHeight(qreal cellHeight)
 {
-    Q_D(QSGGridView);
+    Q_D(QQuickGridView);
     if (cellHeight != d->cellHeight && cellHeight > 0) {
         d->cellHeight = qMax(qreal(1), cellHeight);
         d->updateViewport();
@@ -1463,15 +1463,15 @@ void QSGGridView::setCellHeight(qreal cellHeight)
     \endlist
 
 */
-QSGGridView::SnapMode QSGGridView::snapMode() const
+QQuickGridView::SnapMode QQuickGridView::snapMode() const
 {
-    Q_D(const QSGGridView);
+    Q_D(const QQuickGridView);
     return d->snapMode;
 }
 
-void QSGGridView::setSnapMode(SnapMode mode)
+void QQuickGridView::setSnapMode(SnapMode mode)
 {
-    Q_D(QSGGridView);
+    Q_D(QQuickGridView);
     if (d->snapMode != mode) {
         d->snapMode = mode;
         emit snapModeChanged();
@@ -1497,10 +1497,10 @@ void QSGGridView::setSnapMode(SnapMode mode)
 
     \sa footer
 */
-void QSGGridView::viewportMoved()
+void QQuickGridView::viewportMoved()
 {
-    Q_D(QSGGridView);
-    QSGItemView::viewportMoved();
+    Q_D(QQuickGridView);
+    QQuickItemView::viewportMoved();
     if (!d->itemCount)
         return;
     if (d->inViewportMoved)
@@ -1511,22 +1511,22 @@ void QSGGridView::viewportMoved()
     if (d->hData.flicking || d->vData.flicking) {
         if (yflick()) {
             if (d->vData.velocity > 0)
-                d->bufferMode = QSGGridViewPrivate::BufferBefore;
+                d->bufferMode = QQuickGridViewPrivate::BufferBefore;
             else if (d->vData.velocity < 0)
-                d->bufferMode = QSGGridViewPrivate::BufferAfter;
+                d->bufferMode = QQuickGridViewPrivate::BufferAfter;
         }
 
         if (xflick()) {
             if (d->hData.velocity > 0)
-                d->bufferMode = QSGGridViewPrivate::BufferBefore;
+                d->bufferMode = QQuickGridViewPrivate::BufferBefore;
             else if (d->hData.velocity < 0)
-                d->bufferMode = QSGGridViewPrivate::BufferAfter;
+                d->bufferMode = QQuickGridViewPrivate::BufferAfter;
         }
     }
     d->refill();
     if (d->hData.flicking || d->vData.flicking || d->hData.moving || d->vData.moving)
-        d->moveReason = QSGGridViewPrivate::Mouse;
-    if (d->moveReason != QSGGridViewPrivate::SetIndex) {
+        d->moveReason = QQuickGridViewPrivate::Mouse;
+    if (d->moveReason != QQuickGridViewPrivate::SetIndex) {
         if (d->haveHighlightRange && d->highlightRange == StrictlyEnforceRange && d->highlight) {
             // reposition highlight
             qreal pos = d->highlight->position();
@@ -1561,11 +1561,11 @@ void QSGGridView::viewportMoved()
     d->inViewportMoved = false;
 }
 
-void QSGGridView::keyPressEvent(QKeyEvent *event)
+void QQuickGridView::keyPressEvent(QKeyEvent *event)
 {
-    Q_D(QSGGridView);
+    Q_D(QQuickGridView);
     if (d->model && d->model->count() && d->interactive) {
-        d->moveReason = QSGGridViewPrivate::SetIndex;
+        d->moveReason = QQuickGridViewPrivate::SetIndex;
         int oldCurrent = currentIndex();
         switch (event->key()) {
         case Qt::Key_Up:
@@ -1589,7 +1589,7 @@ void QSGGridView::keyPressEvent(QKeyEvent *event)
         }
     }
     event->ignore();
-    QSGItemView::keyPressEvent(event);
+    QQuickItemView::keyPressEvent(event);
 }
 /*!
     \qmlmethod QtQuick2::GridView::moveCurrentIndexUp()
@@ -1602,13 +1602,13 @@ void QSGGridView::keyPressEvent(QKeyEvent *event)
 */
 
 
-void QSGGridView::moveCurrentIndexUp()
+void QQuickGridView::moveCurrentIndexUp()
 {
-    Q_D(QSGGridView);
+    Q_D(QQuickGridView);
     const int count = d->model ? d->model->count() : 0;
     if (!count)
         return;
-    if (d->flow == QSGGridView::LeftToRight) {
+    if (d->flow == QQuickGridView::LeftToRight) {
         if (currentIndex() >= d->columns || d->wrap) {
             int index = currentIndex() - d->columns;
             setCurrentIndex((index >= 0 && index < count) ? index : count-1);
@@ -1630,13 +1630,13 @@ void QSGGridView::moveCurrentIndexUp()
 
     \bold Note: methods should only be called after the Component has completed.
 */
-void QSGGridView::moveCurrentIndexDown()
+void QQuickGridView::moveCurrentIndexDown()
 {
-    Q_D(QSGGridView);
+    Q_D(QQuickGridView);
     const int count = d->model ? d->model->count() : 0;
     if (!count)
         return;
-    if (d->flow == QSGGridView::LeftToRight) {
+    if (d->flow == QQuickGridView::LeftToRight) {
         if (currentIndex() < count - d->columns || d->wrap) {
             int index = currentIndex()+d->columns;
             setCurrentIndex((index >= 0 && index < count) ? index : 0);
@@ -1658,14 +1658,14 @@ void QSGGridView::moveCurrentIndexDown()
 
     \bold Note: methods should only be called after the Component has completed.
 */
-void QSGGridView::moveCurrentIndexLeft()
+void QQuickGridView::moveCurrentIndexLeft()
 {
-    Q_D(QSGGridView);
+    Q_D(QQuickGridView);
     const int count = d->model ? d->model->count() : 0;
     if (!count)
         return;
     if (effectiveLayoutDirection() == Qt::LeftToRight) {
-        if (d->flow == QSGGridView::LeftToRight) {
+        if (d->flow == QQuickGridView::LeftToRight) {
             if (currentIndex() > 0 || d->wrap) {
                 int index = currentIndex() - 1;
                 setCurrentIndex((index >= 0 && index < count) ? index : count-1);
@@ -1677,7 +1677,7 @@ void QSGGridView::moveCurrentIndexLeft()
             }
         }
     } else {
-        if (d->flow == QSGGridView::LeftToRight) {
+        if (d->flow == QQuickGridView::LeftToRight) {
             if (currentIndex() < count - 1 || d->wrap) {
                 int index = currentIndex() + 1;
                 setCurrentIndex((index >= 0 && index < count) ? index : 0);
@@ -1701,14 +1701,14 @@ void QSGGridView::moveCurrentIndexLeft()
 
     \bold Note: methods should only be called after the Component has completed.
 */
-void QSGGridView::moveCurrentIndexRight()
+void QQuickGridView::moveCurrentIndexRight()
 {
-    Q_D(QSGGridView);
+    Q_D(QQuickGridView);
     const int count = d->model ? d->model->count() : 0;
     if (!count)
         return;
     if (effectiveLayoutDirection() == Qt::LeftToRight) {
-        if (d->flow == QSGGridView::LeftToRight) {
+        if (d->flow == QQuickGridView::LeftToRight) {
             if (currentIndex() < count - 1 || d->wrap) {
                 int index = currentIndex() + 1;
                 setCurrentIndex((index >= 0 && index < count) ? index : 0);
@@ -1720,7 +1720,7 @@ void QSGGridView::moveCurrentIndexRight()
             }
         }
     } else {
-        if (d->flow == QSGGridView::LeftToRight) {
+        if (d->flow == QQuickGridView::LeftToRight) {
             if (currentIndex() > 0 || d->wrap) {
                 int index = currentIndex() - 1;
                 setCurrentIndex((index >= 0 && index < count) ? index : count-1);
@@ -1734,9 +1734,9 @@ void QSGGridView::moveCurrentIndexRight()
     }
 }
 
-bool QSGGridViewPrivate::applyInsertionChange(const QDeclarativeChangeSet::Insert &change, FxViewItem *firstVisible, InsertionsResult *insertResult)
+bool QQuickGridViewPrivate::applyInsertionChange(const QDeclarativeChangeSet::Insert &change, FxViewItem *firstVisible, InsertionsResult *insertResult)
 {
-    Q_Q(QSGGridView);
+    Q_Q(QQuickGridView);
 
     int modelIndex = change.index;
     int count = change.count;
@@ -1922,9 +1922,9 @@ bool QSGGridViewPrivate::applyInsertionChange(const QDeclarativeChangeSet::Inser
     \bold Note: methods should only be called after the Component has completed.
 */
 
-QSGGridViewAttached *QSGGridView::qmlAttachedProperties(QObject *obj)
+QQuickGridViewAttached *QQuickGridView::qmlAttachedProperties(QObject *obj)
 {
-    return new QSGGridViewAttached(obj);
+    return new QQuickGridViewAttached(obj);
 }
 
 QT_END_NAMESPACE
diff --git a/src/declarative/items/qsggridview_p.h b/src/declarative/items/qquickgridview_p.h
index c3b92d0448..b02c0a8350 100644
--- a/src/declarative/items/qsggridview_p.h
+++ b/src/declarative/items/qquickgridview_p.h
@@ -40,10 +40,10 @@
 **
 ****************************************************************************/
 
-#ifndef QSGGRIDVIEW_P_H
-#define QSGGRIDVIEW_P_H
+#ifndef QQUICKGRIDVIEW_P_H
+#define QQUICKGRIDVIEW_P_H
 
-#include "qsgitemview_p.h"
+#include "qquickitemview_p.h"
 
 #include <private/qdeclarativeguard_p.h>
 
@@ -52,13 +52,13 @@ QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE
 
 QT_MODULE(Declarative)
-class QSGVisualModel;
-class QSGGridViewAttached;
-class QSGGridViewPrivate;
-class Q_AUTOTEST_EXPORT QSGGridView : public QSGItemView
+class QQuickVisualModel;
+class QQuickGridViewAttached;
+class QQuickGridViewPrivate;
+class Q_AUTOTEST_EXPORT QQuickGridView : public QQuickItemView
 {
     Q_OBJECT
-    Q_DECLARE_PRIVATE(QSGGridView)
+    Q_DECLARE_PRIVATE(QQuickGridView)
 
     Q_PROPERTY(Flow flow READ flow WRITE setFlow NOTIFY flowChanged)
     Q_PROPERTY(qreal cellWidth READ cellWidth WRITE setCellWidth NOTIFY cellWidthChanged)
@@ -71,8 +71,8 @@ class Q_AUTOTEST_EXPORT QSGGridView : public QSGItemView
     Q_CLASSINFO("DefaultProperty", "data")
 
 public:
-    QSGGridView(QSGItem *parent=0);
-    ~QSGGridView();
+    QQuickGridView(QQuickItem *parent=0);
+    ~QQuickGridView();
 
     virtual void setHighlightFollowsCurrentItem(bool);
     virtual void setHighlightMoveDuration(int);
@@ -91,7 +91,7 @@ public:
     SnapMode snapMode() const;
     void setSnapMode(SnapMode mode);
 
-    static QSGGridViewAttached *qmlAttachedProperties(QObject *);
+    static QQuickGridViewAttached *qmlAttachedProperties(QObject *);
 
 public Q_SLOTS:
     void moveCurrentIndexUp();
@@ -111,17 +111,17 @@ protected:
     virtual void keyPressEvent(QKeyEvent *);
 };
 
-class QSGGridViewAttached : public QSGItemViewAttached
+class QQuickGridViewAttached : public QQuickItemViewAttached
 {
     Q_OBJECT
 public:
-    QSGGridViewAttached(QObject *parent)
-        : QSGItemViewAttached(parent), m_view(0) {}
-    ~QSGGridViewAttached() {}
+    QQuickGridViewAttached(QObject *parent)
+        : QQuickItemViewAttached(parent), m_view(0) {}
+    ~QQuickGridViewAttached() {}
 
-    Q_PROPERTY(QSGGridView *view READ view NOTIFY viewChanged)
-    QSGGridView *view() { return m_view; }
-    void setView(QSGGridView *view) {
+    Q_PROPERTY(QQuickGridView *view READ view NOTIFY viewChanged)
+    QQuickGridView *view() { return m_view; }
+    void setView(QQuickGridView *view) {
         if (view != m_view) {
             m_view = view;
             emit viewChanged();
@@ -132,15 +132,15 @@ Q_SIGNALS:
     void viewChanged();
 
 public:
-    QDeclarativeGuard<QSGGridView> m_view;
+    QDeclarativeGuard<QQuickGridView> m_view;
 };
 
 
 QT_END_NAMESPACE
 
-QML_DECLARE_TYPE(QSGGridView)
-QML_DECLARE_TYPEINFO(QSGGridView, QML_HAS_ATTACHED_PROPERTIES)
+QML_DECLARE_TYPE(QQuickGridView)
+QML_DECLARE_TYPEINFO(QQuickGridView, QML_HAS_ATTACHED_PROPERTIES)
 
 QT_END_HEADER
 
-#endif // QSGGRIDVIEW_P_H
+#endif // QQUICKGRIDVIEW_P_H
diff --git a/src/declarative/items/qsgimage.cpp b/src/declarative/items/qquickimage.cpp
index 9461de4278..073795768c 100644
--- a/src/declarative/items/qsgimage.cpp
+++ b/src/declarative/items/qquickimage.cpp
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#include "qsgimage_p.h"
-#include "qsgimage_p_p.h"
+#include "qquickimage_p.h"
+#include "qquickimage_p_p.h"
 
 #include <private/qsgtextureprovider_p.h>
 
@@ -52,11 +52,11 @@
 
 QT_BEGIN_NAMESPACE
 
-class QSGImageTextureProvider : public QSGTextureProvider
+class QQuickImageTextureProvider : public QSGTextureProvider
 {
     Q_OBJECT
 public:
-    QSGImageTextureProvider()
+    QQuickImageTextureProvider()
         : m_texture(0)
         , m_smooth(false)
     {
@@ -65,7 +65,7 @@ public:
     QSGTexture *texture() const {
 
         if (m_texture->isAtlasTexture())
-            const_cast<QSGImageTextureProvider *>(this)->m_texture = m_texture->removedFromAtlas();
+            const_cast<QQuickImageTextureProvider *>(this)->m_texture = m_texture->removedFromAtlas();
 
         if (m_texture) {
             m_texture->setFiltering(m_smooth ? QSGTexture::Linear : QSGTexture::Nearest);
@@ -76,27 +76,27 @@ public:
         return m_texture;
     }
 
-    friend class QSGImage;
+    friend class QQuickImage;
 
     QSGTexture *m_texture;
     bool m_smooth;
 };
 
-#include "qsgimage.moc"
+#include "qquickimage.moc"
 
-QSGImagePrivate::QSGImagePrivate()
-    : fillMode(QSGImage::Stretch)
+QQuickImagePrivate::QQuickImagePrivate()
+    : fillMode(QQuickImage::Stretch)
     , paintedWidth(0)
     , paintedHeight(0)
     , pixmapChanged(false)
-    , hAlign(QSGImage::AlignHCenter)
-    , vAlign(QSGImage::AlignVCenter)
+    , hAlign(QQuickImage::AlignHCenter)
+    , vAlign(QQuickImage::AlignVCenter)
     , provider(0)
 {
 }
 
 /*!
-    \qmlclass Image QSGImage
+    \qmlclass Image QQuickImage
     \inqmlmodule QtQuick 2
     \ingroup qml-basic-visual-elements
     \brief The Image element displays an image in a declarative user interface
@@ -150,30 +150,30 @@ QSGImagePrivate::QSGImagePrivate()
     \sa {declarative/imageelements/image}{Image example}, QDeclarativeImageProvider
 */
 
-QSGImage::QSGImage(QSGItem *parent)
-    : QSGImageBase(*(new QSGImagePrivate), parent)
+QQuickImage::QQuickImage(QQuickItem *parent)
+    : QQuickImageBase(*(new QQuickImagePrivate), parent)
 {
 }
 
-QSGImage::QSGImage(QSGImagePrivate &dd, QSGItem *parent)
-    : QSGImageBase(dd, parent)
+QQuickImage::QQuickImage(QQuickImagePrivate &dd, QQuickItem *parent)
+    : QQuickImageBase(dd, parent)
 {
 }
 
-QSGImage::~QSGImage()
+QQuickImage::~QQuickImage()
 {
-    Q_D(QSGImage);
+    Q_D(QQuickImage);
     if (d->provider)
         d->provider->deleteLater();
 }
 
-void QSGImagePrivate::setPixmap(const QPixmap &pixmap)
+void QQuickImagePrivate::setPixmap(const QPixmap &pixmap)
 {
-    Q_Q(QSGImage);
+    Q_Q(QQuickImage);
     pix.setPixmap(pixmap);
 
     q->pixmapChange();
-    status = pix.isNull() ? QSGImageBase::Null : QSGImageBase::Ready;
+    status = pix.isNull() ? QQuickImageBase::Null : QQuickImageBase::Ready;
 
     q->update();
 }
@@ -274,15 +274,15 @@ void QSGImagePrivate::setPixmap(const QPixmap &pixmap)
 
     \sa {declarative/imageelements/image}{Image example}
 */
-QSGImage::FillMode QSGImage::fillMode() const
+QQuickImage::FillMode QQuickImage::fillMode() const
 {
-    Q_D(const QSGImage);
+    Q_D(const QQuickImage);
     return d->fillMode;
 }
 
-void QSGImage::setFillMode(FillMode mode)
+void QQuickImage::setFillMode(FillMode mode)
 {
-    Q_D(QSGImage);
+    Q_D(QQuickImage);
     if (d->fillMode == mode)
         return;
     d->fillMode = mode;
@@ -302,15 +302,15 @@ void QSGImage::setFillMode(FillMode mode)
     \c paintedWidth or \c paintedHeight can be smaller or larger than
     \c width and \c height of the Image element.
 */
-qreal QSGImage::paintedWidth() const
+qreal QQuickImage::paintedWidth() const
 {
-    Q_D(const QSGImage);
+    Q_D(const QQuickImage);
     return d->paintedWidth;
 }
 
-qreal QSGImage::paintedHeight() const
+qreal QQuickImage::paintedHeight() const
 {
-    Q_D(const QSGImage);
+    Q_D(const QQuickImage);
     return d->paintedHeight;
 }
 
@@ -472,9 +472,9 @@ qreal QSGImage::paintedHeight() const
     The valid values for \c verticalAlignment are \c Image.AlignTop, \c Image.AlignBottom
     and \c Image.AlignVCenter.
 */
-void QSGImage::updatePaintedGeometry()
+void QQuickImage::updatePaintedGeometry()
 {
-    Q_D(QSGImage);
+    Q_D(QQuickImage);
 
     if (d->fillMode == PreserveAspectFit) {
         if (!d->pix.width() || !d->pix.height()) {
@@ -526,39 +526,39 @@ void QSGImage::updatePaintedGeometry()
     emit paintedGeometryChanged();
 }
 
-void QSGImage::geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry)
+void QQuickImage::geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry)
 {
-    QSGImageBase::geometryChanged(newGeometry, oldGeometry);
+    QQuickImageBase::geometryChanged(newGeometry, oldGeometry);
     updatePaintedGeometry();
 }
 
-QRectF QSGImage::boundingRect() const
+QRectF QQuickImage::boundingRect() const
 {
-    Q_D(const QSGImage);
+    Q_D(const QQuickImage);
     return QRectF(0, 0, qMax(width(), d->paintedWidth), qMax(height(), d->paintedHeight));
 }
 
-QSGTextureProvider *QSGImage::textureProvider() const
+QSGTextureProvider *QQuickImage::textureProvider() const
 {
-    Q_D(const QSGImage);
+    Q_D(const QQuickImage);
     if (!d->provider) {
         // Make sure it gets thread affinity on the rendering thread so deletion works properly..
         Q_ASSERT_X(d->canvas
                    && d->sceneGraphContext()
                    && QThread::currentThread() == d->sceneGraphContext()->thread(),
-                   "QSGImage::textureProvider",
+                   "QQuickImage::textureProvider",
                    "Cannot be used outside the GUI thread");
-        QSGImagePrivate *dd = const_cast<QSGImagePrivate *>(d);
-        dd->provider = new QSGImageTextureProvider;
+        QQuickImagePrivate *dd = const_cast<QQuickImagePrivate *>(d);
+        dd->provider = new QQuickImageTextureProvider;
         dd->provider->m_texture = d->pix.texture(d->sceneGraphContext());
     }
 
     return d->provider;
 }
 
-QSGNode *QSGImage::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *)
+QSGNode *QQuickImage::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *)
 {
-    Q_D(QSGImage);
+    Q_D(QQuickImage);
 
     QSGTexture *texture = d->pix.texture(d->sceneGraphContext());
 
@@ -597,15 +597,15 @@ QSGNode *QSGImage::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *)
     qreal pixHeight = (d->fillMode == PreserveAspectFit) ? d->paintedHeight : d->pix.height();
 
     int xOffset = 0;
-    if (d->hAlign == QSGImage::AlignHCenter)
+    if (d->hAlign == QQuickImage::AlignHCenter)
         xOffset = qCeil((width() - pixWidth) / 2.);
-    else if (d->hAlign == QSGImage::AlignRight)
+    else if (d->hAlign == QQuickImage::AlignRight)
         xOffset = qCeil(width() - pixWidth);
 
     int yOffset = 0;
-    if (d->vAlign == QSGImage::AlignVCenter)
+    if (d->vAlign == QQuickImage::AlignVCenter)
         yOffset = qCeil((height() - pixHeight) / 2.);
-    else if (d->vAlign == QSGImage::AlignBottom)
+    else if (d->vAlign == QQuickImage::AlignBottom)
         yOffset = qCeil(height() - pixHeight);
 
     switch (d->fillMode) {
@@ -628,18 +628,18 @@ QSGNode *QSGImage::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *)
         if (wscale > hscale) {
             int src = (hscale / wscale) * qreal(d->pix.height());
             int y = 0;
-            if (d->vAlign == QSGImage::AlignVCenter)
+            if (d->vAlign == QQuickImage::AlignVCenter)
                 y = qCeil((d->pix.height() - src) / 2.);
-            else if (d->vAlign == QSGImage::AlignBottom)
+            else if (d->vAlign == QQuickImage::AlignBottom)
                 y = qCeil(d->pix.height() - src);
             sourceRect = QRectF(0, y, d->pix.width(), src);
 
         } else {
             int src = (wscale / hscale) * qreal(d->pix.width());
             int x = 0;
-            if (d->hAlign == QSGImage::AlignHCenter)
+            if (d->hAlign == QQuickImage::AlignHCenter)
                 x = qCeil((d->pix.width() - src) / 2.);
-            else if (d->hAlign == QSGImage::AlignRight)
+            else if (d->hAlign == QQuickImage::AlignRight)
                 x = qCeil(d->pix.width() - src);
             sourceRect = QRectF(x, 0, src, d->pix.height());
         }
@@ -697,15 +697,15 @@ QSGNode *QSGImage::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *)
     return node;
 }
 
-void QSGImage::pixmapChange()
+void QQuickImage::pixmapChange()
 {
-    Q_D(QSGImage);
+    Q_D(QQuickImage);
     // PreserveAspectFit calculates the implicit size differently so we
     // don't call our superclass pixmapChange(), since that would
     // result in the implicit size being set incorrectly, then updated
     // in updatePaintedGeometry()
     if (d->fillMode != PreserveAspectFit)
-        QSGImageBase::pixmapChange();
+        QQuickImageBase::pixmapChange();
     updatePaintedGeometry();
     d->pixmapChanged = true;
 
@@ -714,15 +714,15 @@ void QSGImage::pixmapChange()
         update();
 }
 
-QSGImage::VAlignment QSGImage::verticalAlignment() const
+QQuickImage::VAlignment QQuickImage::verticalAlignment() const
 {
-    Q_D(const QSGImage);
+    Q_D(const QQuickImage);
     return d->vAlign;
 }
 
-void QSGImage::setVerticalAlignment(VAlignment align)
+void QQuickImage::setVerticalAlignment(VAlignment align)
 {
-    Q_D(QSGImage);
+    Q_D(QQuickImage);
     if (d->vAlign == align)
         return;
 
@@ -732,15 +732,15 @@ void QSGImage::setVerticalAlignment(VAlignment align)
     emit verticalAlignmentChanged(align);
 }
 
-QSGImage::HAlignment QSGImage::horizontalAlignment() const
+QQuickImage::HAlignment QQuickImage::horizontalAlignment() const
 {
-    Q_D(const QSGImage);
+    Q_D(const QQuickImage);
     return d->hAlign;
 }
 
-void QSGImage::setHorizontalAlignment(HAlignment align)
+void QQuickImage::setHorizontalAlignment(HAlignment align)
 {
-    Q_D(QSGImage);
+    Q_D(QQuickImage);
     if (d->hAlign == align)
         return;
 
diff --git a/src/declarative/items/qsgimage_p.h b/src/declarative/items/qquickimage_p.h
index 9bf1d910d1..0d1c8dcba3 100644
--- a/src/declarative/items/qsgimage_p.h
+++ b/src/declarative/items/qquickimage_p.h
@@ -40,10 +40,10 @@
 **
 ****************************************************************************/
 
-#ifndef QSGIMAGE_P_H
-#define QSGIMAGE_P_H
+#ifndef QQUICKIMAGE_P_H
+#define QQUICKIMAGE_P_H
 
-#include "qsgimagebase_p.h"
+#include "qquickimagebase_p.h"
 #include <private/qsgtextureprovider_p.h>
 
 QT_BEGIN_HEADER
@@ -52,8 +52,8 @@ QT_BEGIN_NAMESPACE
 
 QT_MODULE(Declarative)
 
-class QSGImagePrivate;
-class Q_AUTOTEST_EXPORT QSGImage : public QSGImageBase
+class QQuickImagePrivate;
+class Q_AUTOTEST_EXPORT QQuickImage : public QQuickImageBase
 {
     Q_OBJECT
     Q_ENUMS(FillMode)
@@ -67,8 +67,8 @@ class Q_AUTOTEST_EXPORT QSGImage : public QSGImageBase
     Q_PROPERTY(VAlignment verticalAlignment READ verticalAlignment WRITE setVerticalAlignment NOTIFY verticalAlignmentChanged)
 
 public:
-    QSGImage(QSGItem *parent=0);
-    ~QSGImage();
+    QQuickImage(QQuickItem *parent=0);
+    ~QQuickImage();
 
     enum HAlignment { AlignLeft = Qt::AlignLeft,
                        AlignRight = Qt::AlignRight,
@@ -103,7 +103,7 @@ Q_SIGNALS:
     void verticalAlignmentChanged(VAlignment alignment);
 
 protected:
-    QSGImage(QSGImagePrivate &dd, QSGItem *parent);
+    QQuickImage(QQuickImagePrivate &dd, QQuickItem *parent);
     void pixmapChange();
     void updatePaintedGeometry();
 
@@ -111,12 +111,12 @@ protected:
     virtual QSGNode *updatePaintNode(QSGNode *, UpdatePaintNodeData *);
 
 private:
-    Q_DISABLE_COPY(QSGImage)
-    Q_DECLARE_PRIVATE(QSGImage)
+    Q_DISABLE_COPY(QQuickImage)
+    Q_DECLARE_PRIVATE(QQuickImage)
 };
 
 QT_END_NAMESPACE
-QML_DECLARE_TYPE(QSGImage)
+QML_DECLARE_TYPE(QQuickImage)
 QT_END_HEADER
 
-#endif // QSGIMAGE_P_H
+#endif // QQUICKIMAGE_P_H
diff --git a/src/declarative/items/qsgimage_p_p.h b/src/declarative/items/qquickimage_p_p.h
index 9f8b9716c7..b343821d2f 100644
--- a/src/declarative/items/qsgimage_p_p.h
+++ b/src/declarative/items/qquickimage_p_p.h
@@ -40,8 +40,8 @@
 **
 ****************************************************************************/
 
-#ifndef QSGIMAGE_P_P_H
-#define QSGIMAGE_P_P_H
+#ifndef QQUICKIMAGE_P_P_H
+#define QQUICKIMAGE_P_P_H
 
 //
 //  W A R N I N G
@@ -54,32 +54,32 @@
 // We mean it.
 //
 
-#include "qsgimagebase_p_p.h"
-#include "qsgimage_p.h"
+#include "qquickimagebase_p_p.h"
+#include "qquickimage_p.h"
 
 QT_BEGIN_NAMESPACE
 
-class QSGImageTextureProvider;
+class QQuickImageTextureProvider;
 
-class QSGImagePrivate : public QSGImageBasePrivate
+class QQuickImagePrivate : public QQuickImageBasePrivate
 {
-    Q_DECLARE_PUBLIC(QSGImage)
+    Q_DECLARE_PUBLIC(QQuickImage)
 
 public:
-    QSGImagePrivate();
+    QQuickImagePrivate();
 
-    QSGImage::FillMode fillMode;
+    QQuickImage::FillMode fillMode;
     qreal paintedWidth;
     qreal paintedHeight;
     void setPixmap(const QPixmap &pix);
 
     bool pixmapChanged : 1;
-    QSGImage::HAlignment hAlign;
-    QSGImage::VAlignment vAlign;
+    QQuickImage::HAlignment hAlign;
+    QQuickImage::VAlignment vAlign;
 
-    QSGImageTextureProvider *provider;
+    QQuickImageTextureProvider *provider;
 };
 
 QT_END_NAMESPACE
 
-#endif // QSGIMAGE_P_P_H
+#endif // QQUICKIMAGE_P_P_H
diff --git a/src/declarative/items/qsgimagebase.cpp b/src/declarative/items/qquickimagebase.cpp
index 0c08010d34..3eb196d152 100644
--- a/src/declarative/items/qsgimagebase.cpp
+++ b/src/declarative/items/qquickimagebase.cpp
@@ -39,67 +39,67 @@
 **
 ****************************************************************************/
 
-#include "qsgimagebase_p.h"
-#include "qsgimagebase_p_p.h"
+#include "qquickimagebase_p.h"
+#include "qquickimagebase_p_p.h"
 
 #include <QtDeclarative/qdeclarativeinfo.h>
 
 QT_BEGIN_NAMESPACE
 
-QSGImageBase::QSGImageBase(QSGItem *parent)
-: QSGImplicitSizeItem(*(new QSGImageBasePrivate), parent)
+QQuickImageBase::QQuickImageBase(QQuickItem *parent)
+: QQuickImplicitSizeItem(*(new QQuickImageBasePrivate), parent)
 {
     setFlag(ItemHasContents);
 }
 
-QSGImageBase::QSGImageBase(QSGImageBasePrivate &dd, QSGItem *parent)
-: QSGImplicitSizeItem(dd, parent)
+QQuickImageBase::QQuickImageBase(QQuickImageBasePrivate &dd, QQuickItem *parent)
+: QQuickImplicitSizeItem(dd, parent)
 {
     setFlag(ItemHasContents);
 }
 
-QSGImageBase::~QSGImageBase()
+QQuickImageBase::~QQuickImageBase()
 {
 }
 
-QSGImageBase::Status QSGImageBase::status() const
+QQuickImageBase::Status QQuickImageBase::status() const
 {
-    Q_D(const QSGImageBase);
+    Q_D(const QQuickImageBase);
     return d->status;
 }
 
 
-qreal QSGImageBase::progress() const
+qreal QQuickImageBase::progress() const
 {
-    Q_D(const QSGImageBase);
+    Q_D(const QQuickImageBase);
     return d->progress;
 }
 
 
-bool QSGImageBase::asynchronous() const
+bool QQuickImageBase::asynchronous() const
 {
-    Q_D(const QSGImageBase);
+    Q_D(const QQuickImageBase);
     return d->async;
 }
 
-void QSGImageBase::setAsynchronous(bool async)
+void QQuickImageBase::setAsynchronous(bool async)
 {
-    Q_D(QSGImageBase);
+    Q_D(QQuickImageBase);
     if (d->async != async) {
         d->async = async;
         emit asynchronousChanged();
     }
 }
 
-QUrl QSGImageBase::source() const
+QUrl QQuickImageBase::source() const
 {
-    Q_D(const QSGImageBase);
+    Q_D(const QQuickImageBase);
     return d->url;
 }
 
-void QSGImageBase::setSource(const QUrl &url)
+void QQuickImageBase::setSource(const QUrl &url)
 {
-    Q_D(QSGImageBase);
+    Q_D(QQuickImageBase);
     //equality is fairly expensive, so we bypass for simple, common case
     if ((d->url.isEmpty() == url.isEmpty()) && url == d->url)
         return;
@@ -111,9 +111,9 @@ void QSGImageBase::setSource(const QUrl &url)
         load();
 }
 
-void QSGImageBase::setSourceSize(const QSize& size)
+void QQuickImageBase::setSourceSize(const QSize& size)
 {
-    Q_D(QSGImageBase);
+    Q_D(QQuickImageBase);
     if (d->sourcesize == size)
         return;
 
@@ -124,18 +124,18 @@ void QSGImageBase::setSourceSize(const QSize& size)
         load();
 }
 
-QSize QSGImageBase::sourceSize() const
+QSize QQuickImageBase::sourceSize() const
 {
-    Q_D(const QSGImageBase);
+    Q_D(const QQuickImageBase);
 
     int width = d->sourcesize.width();
     int height = d->sourcesize.height();
     return QSize(width != -1 ? width : d->pix.width(), height != -1 ? height : d->pix.height());
 }
 
-void QSGImageBase::resetSourceSize()
+void QQuickImageBase::resetSourceSize()
 {
-    Q_D(QSGImageBase);
+    Q_D(QQuickImageBase);
     if (!d->explicitSourceSize)
         return;
     d->explicitSourceSize = false;
@@ -145,15 +145,15 @@ void QSGImageBase::resetSourceSize()
         load();
 }
 
-bool QSGImageBase::cache() const
+bool QQuickImageBase::cache() const
 {
-    Q_D(const QSGImageBase);
+    Q_D(const QQuickImageBase);
     return d->cache;
 }
 
-void QSGImageBase::setCache(bool cache)
+void QQuickImageBase::setCache(bool cache)
 {
-    Q_D(QSGImageBase);
+    Q_D(QQuickImageBase);
     if (d->cache == cache)
         return;
 
@@ -163,15 +163,15 @@ void QSGImageBase::setCache(bool cache)
         load();
 }
 
-QPixmap QSGImageBase::pixmap() const
+QPixmap QQuickImageBase::pixmap() const
 {
-    Q_D(const QSGImageBase);
+    Q_D(const QQuickImageBase);
     return d->pix.pixmap();
 }
 
-void QSGImageBase::setMirror(bool mirror)
+void QQuickImageBase::setMirror(bool mirror)
 {
-    Q_D(QSGImageBase);
+    Q_D(QQuickImageBase);
     if (mirror == d->mirror)
         return;
 
@@ -183,15 +183,15 @@ void QSGImageBase::setMirror(bool mirror)
     emit mirrorChanged();
 }
 
-bool QSGImageBase::mirror() const
+bool QQuickImageBase::mirror() const
 {
-    Q_D(const QSGImageBase);
+    Q_D(const QQuickImageBase);
     return d->mirror;
 }
 
-void QSGImageBase::load()
+void QQuickImageBase::load()
 {
-    Q_D(QSGImageBase);
+    Q_D(QQuickImageBase);
 
     if (d->url.isEmpty()) {
         d->pix.clear(this);
@@ -221,9 +221,9 @@ void QSGImageBase::load()
             static int thisRequestFinished = -1;
             if (thisRequestProgress == -1) {
                 thisRequestProgress =
-                    QSGImageBase::staticMetaObject.indexOfSlot("requestProgress(qint64,qint64)");
+                    QQuickImageBase::staticMetaObject.indexOfSlot("requestProgress(qint64,qint64)");
                 thisRequestFinished =
-                    QSGImageBase::staticMetaObject.indexOfSlot("requestFinished()");
+                    QQuickImageBase::staticMetaObject.indexOfSlot("requestFinished()");
             }
 
             d->pix.connectFinished(this, thisRequestFinished);
@@ -235,11 +235,11 @@ void QSGImageBase::load()
     }
 }
 
-void QSGImageBase::requestFinished()
+void QQuickImageBase::requestFinished()
 {
-    Q_D(QSGImageBase);
+    Q_D(QQuickImageBase);
 
-    QSGImageBase::Status oldStatus = d->status;
+    QQuickImageBase::Status oldStatus = d->status;
     qreal oldProgress = d->progress;
 
     if (d->pix.isError()) {
@@ -264,26 +264,26 @@ void QSGImageBase::requestFinished()
     update();
 }
 
-void QSGImageBase::requestProgress(qint64 received, qint64 total)
+void QQuickImageBase::requestProgress(qint64 received, qint64 total)
 {
-    Q_D(QSGImageBase);
+    Q_D(QQuickImageBase);
     if (d->status == Loading && total > 0) {
         d->progress = qreal(received)/total;
         emit progressChanged(d->progress);
     }
 }
 
-void QSGImageBase::componentComplete()
+void QQuickImageBase::componentComplete()
 {
-    Q_D(QSGImageBase);
-    QSGItem::componentComplete();
+    Q_D(QQuickImageBase);
+    QQuickItem::componentComplete();
     if (d->url.isValid())
         load();
 }
 
-void QSGImageBase::pixmapChange()
+void QQuickImageBase::pixmapChange()
 {
-    Q_D(QSGImageBase);
+    Q_D(QQuickImageBase);
     setImplicitWidth(d->pix.width());
     setImplicitHeight(d->pix.height());
 }
diff --git a/src/declarative/items/qsgimagebase_p.h b/src/declarative/items/qquickimagebase_p.h
index e17ca3b059..f15ab6e5b1 100644
--- a/src/declarative/items/qsgimagebase_p.h
+++ b/src/declarative/items/qquickimagebase_p.h
@@ -40,17 +40,17 @@
 **
 ****************************************************************************/
 
-#ifndef QSGIMAGEBASE_P_H
-#define QSGIMAGEBASE_P_H
+#ifndef QQUICKIMAGEBASE_P_H
+#define QQUICKIMAGEBASE_P_H
 
-#include "qsgimplicitsizeitem_p.h"
+#include "qquickimplicitsizeitem_p.h"
 
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-class QSGImageBasePrivate;
-class Q_AUTOTEST_EXPORT QSGImageBase : public QSGImplicitSizeItem
+class QQuickImageBasePrivate;
+class Q_AUTOTEST_EXPORT QQuickImageBase : public QQuickImplicitSizeItem
 {
     Q_OBJECT
     Q_ENUMS(Status)
@@ -64,8 +64,8 @@ class Q_AUTOTEST_EXPORT QSGImageBase : public QSGImplicitSizeItem
     Q_PROPERTY(bool mirror READ mirror WRITE setMirror NOTIFY mirrorChanged)
 
 public:
-    QSGImageBase(QSGItem *parent=0);
-    ~QSGImageBase();
+    QQuickImageBase(QQuickItem *parent=0);
+    ~QQuickImageBase();
     enum Status { Null, Ready, Loading, Error };
     Status status() const;
     qreal progress() const;
@@ -91,7 +91,7 @@ public:
 Q_SIGNALS:
     void sourceChanged(const QUrl &);
     void sourceSizeChanged();
-    void statusChanged(QSGImageBase::Status);
+    void statusChanged(QQuickImageBase::Status);
     void progressChanged(qreal progress);
     void asynchronousChanged();
     void cacheChanged();
@@ -101,19 +101,19 @@ protected:
     virtual void load();
     virtual void componentComplete();
     virtual void pixmapChange();
-    QSGImageBase(QSGImageBasePrivate &dd, QSGItem *parent);
+    QQuickImageBase(QQuickImageBasePrivate &dd, QQuickItem *parent);
 
 private Q_SLOTS:
     virtual void requestFinished();
     void requestProgress(qint64,qint64);
 
 private:
-    Q_DISABLE_COPY(QSGImageBase)
-    Q_DECLARE_PRIVATE(QSGImageBase)
+    Q_DISABLE_COPY(QQuickImageBase)
+    Q_DECLARE_PRIVATE(QQuickImageBase)
 };
 
 QT_END_NAMESPACE
 
 QT_END_HEADER
 
-#endif // QSGIMAGEBASE_P_H
+#endif // QQUICKIMAGEBASE_P_H
diff --git a/src/declarative/items/qsgimagebase_p_p.h b/src/declarative/items/qquickimagebase_p_p.h
index dd1a00fde4..2347a82e92 100644
--- a/src/declarative/items/qsgimagebase_p_p.h
+++ b/src/declarative/items/qquickimagebase_p_p.h
@@ -40,8 +40,8 @@
 **
 ****************************************************************************/
 
-#ifndef QSGIMAGEBASE_P_P_H
-#define QSGIMAGEBASE_P_P_H
+#ifndef QQUICKIMAGEBASE_P_P_H
+#define QQUICKIMAGEBASE_P_P_H
 
 //
 //  W A R N I N G
@@ -54,21 +54,21 @@
 // We mean it.
 //
 
-#include "qsgimplicitsizeitem_p_p.h"
-#include "qsgimagebase_p.h"
+#include "qquickimplicitsizeitem_p_p.h"
+#include "qquickimagebase_p.h"
 
 #include <private/qdeclarativepixmapcache_p.h>
 
 QT_BEGIN_NAMESPACE
 
 class QNetworkReply;
-class QSGImageBasePrivate : public QSGImplicitSizeItemPrivate
+class QQuickImageBasePrivate : public QQuickImplicitSizeItemPrivate
 {
-    Q_DECLARE_PUBLIC(QSGImageBase)
+    Q_DECLARE_PUBLIC(QQuickImageBase)
 
 public:
-    QSGImageBasePrivate()
-      : status(QSGImageBase::Null),
+    QQuickImageBasePrivate()
+      : status(QQuickImageBase::Null),
         progress(0.0),
         explicitSourceSize(false),
         async(false),
@@ -78,7 +78,7 @@ public:
     }
 
     QDeclarativePixmap pix;
-    QSGImageBase::Status status;
+    QQuickImageBase::Status status;
     QUrl url;
     qreal progress;
     QSize sourcesize;
@@ -90,4 +90,4 @@ public:
 
 QT_END_NAMESPACE
 
-#endif // QSGIMAGEBASE_P_P_H
+#endif // QQUICKIMAGEBASE_P_P_H
diff --git a/src/declarative/items/qsgimplicitsizeitem.cpp b/src/declarative/items/qquickimplicitsizeitem.cpp
index 163b73b39c..807fb48cb6 100644
--- a/src/declarative/items/qsgimplicitsizeitem.cpp
+++ b/src/declarative/items/qquickimplicitsizeitem.cpp
@@ -39,53 +39,53 @@
 **
 ****************************************************************************/
 
-#include "qsgimplicitsizeitem_p.h"
-#include "qsgimplicitsizeitem_p_p.h"
+#include "qquickimplicitsizeitem_p.h"
+#include "qquickimplicitsizeitem_p_p.h"
 
 QT_BEGIN_NAMESPACE
 
-void QSGImplicitSizeItemPrivate::implicitWidthChanged()
+void QQuickImplicitSizeItemPrivate::implicitWidthChanged()
 {
-    Q_Q(QSGImplicitSizeItem);
+    Q_Q(QQuickImplicitSizeItem);
     emit q->implicitWidthChanged();
 }
 
-void QSGImplicitSizeItemPrivate::implicitHeightChanged()
+void QQuickImplicitSizeItemPrivate::implicitHeightChanged()
 {
-    Q_Q(QSGImplicitSizeItem);
+    Q_Q(QQuickImplicitSizeItem);
     emit q->implicitHeightChanged();
 }
 
-QSGImplicitSizeItem::QSGImplicitSizeItem(QSGItem *parent)
-    : QSGItem(*(new QSGImplicitSizeItemPrivate), parent)
+QQuickImplicitSizeItem::QQuickImplicitSizeItem(QQuickItem *parent)
+    : QQuickItem(*(new QQuickImplicitSizeItemPrivate), parent)
 {
 }
 
-QSGImplicitSizeItem::QSGImplicitSizeItem(QSGImplicitSizeItemPrivate &dd, QSGItem *parent)
-    : QSGItem(dd, parent)
+QQuickImplicitSizeItem::QQuickImplicitSizeItem(QQuickImplicitSizeItemPrivate &dd, QQuickItem *parent)
+    : QQuickItem(dd, parent)
 {
 }
 
 
-void QSGImplicitSizePaintedItemPrivate::implicitWidthChanged()
+void QQuickImplicitSizePaintedItemPrivate::implicitWidthChanged()
 {
-    Q_Q(QSGImplicitSizePaintedItem);
+    Q_Q(QQuickImplicitSizePaintedItem);
     emit q->implicitWidthChanged();
 }
 
-void QSGImplicitSizePaintedItemPrivate::implicitHeightChanged()
+void QQuickImplicitSizePaintedItemPrivate::implicitHeightChanged()
 {
-    Q_Q(QSGImplicitSizePaintedItem);
+    Q_Q(QQuickImplicitSizePaintedItem);
     emit q->implicitHeightChanged();
 }
 
-QSGImplicitSizePaintedItem::QSGImplicitSizePaintedItem(QSGItem *parent)
-    : QSGPaintedItem(*(new QSGImplicitSizePaintedItemPrivate), parent)
+QQuickImplicitSizePaintedItem::QQuickImplicitSizePaintedItem(QQuickItem *parent)
+    : QQuickPaintedItem(*(new QQuickImplicitSizePaintedItemPrivate), parent)
 {
 }
 
-QSGImplicitSizePaintedItem::QSGImplicitSizePaintedItem(QSGImplicitSizePaintedItemPrivate &dd, QSGItem *parent)
-    : QSGPaintedItem(dd, parent)
+QQuickImplicitSizePaintedItem::QQuickImplicitSizePaintedItem(QQuickImplicitSizePaintedItemPrivate &dd, QQuickItem *parent)
+    : QQuickPaintedItem(dd, parent)
 {
 }
 
diff --git a/src/declarative/items/qsgimplicitsizeitem_p.h b/src/declarative/items/qquickimplicitsizeitem_p.h
index b839fc2f3a..eaa9b3909b 100644
--- a/src/declarative/items/qsgimplicitsizeitem_p.h
+++ b/src/declarative/items/qquickimplicitsizeitem_p.h
@@ -40,49 +40,49 @@
 **
 ****************************************************************************/
 
-#ifndef QSGIMPLICITSIZEITEM_H
-#define QSGIMPLICITSIZEITEM_H
+#ifndef QQUICKIMPLICITSIZEITEM_H
+#define QQUICKIMPLICITSIZEITEM_H
 
-#include "qsgpainteditem.h"
+#include "qquickpainteditem.h"
 
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-class QSGImplicitSizeItemPrivate;
-class Q_AUTOTEST_EXPORT QSGImplicitSizeItem : public QSGItem
+class QQuickImplicitSizeItemPrivate;
+class Q_AUTOTEST_EXPORT QQuickImplicitSizeItem : public QQuickItem
 {
     Q_OBJECT
     Q_PROPERTY(qreal implicitWidth READ implicitWidth NOTIFY implicitWidthChanged)
     Q_PROPERTY(qreal implicitHeight READ implicitHeight NOTIFY implicitHeightChanged)
 
 public:
-    QSGImplicitSizeItem(QSGItem *parent = 0);
+    QQuickImplicitSizeItem(QQuickItem *parent = 0);
 
 protected:
-    QSGImplicitSizeItem(QSGImplicitSizeItemPrivate &dd, QSGItem *parent);
+    QQuickImplicitSizeItem(QQuickImplicitSizeItemPrivate &dd, QQuickItem *parent);
 
 Q_SIGNALS:
     void implicitWidthChanged();
     void implicitHeightChanged();
 
 private:
-    Q_DISABLE_COPY(QSGImplicitSizeItem)
-    Q_DECLARE_PRIVATE(QSGImplicitSizeItem)
+    Q_DISABLE_COPY(QQuickImplicitSizeItem)
+    Q_DECLARE_PRIVATE(QQuickImplicitSizeItem)
 };
 
-class QSGImplicitSizePaintedItemPrivate;
-class Q_AUTOTEST_EXPORT QSGImplicitSizePaintedItem : public QSGPaintedItem
+class QQuickImplicitSizePaintedItemPrivate;
+class Q_AUTOTEST_EXPORT QQuickImplicitSizePaintedItem : public QQuickPaintedItem
 {
     Q_OBJECT
     Q_PROPERTY(qreal implicitWidth READ implicitWidth NOTIFY implicitWidthChanged)
     Q_PROPERTY(qreal implicitHeight READ implicitHeight NOTIFY implicitHeightChanged)
 
 public:
-    QSGImplicitSizePaintedItem(QSGItem *parent = 0);
+    QQuickImplicitSizePaintedItem(QQuickItem *parent = 0);
 
 protected:
-    QSGImplicitSizePaintedItem(QSGImplicitSizePaintedItemPrivate &dd, QSGItem *parent);
+    QQuickImplicitSizePaintedItem(QQuickImplicitSizePaintedItemPrivate &dd, QQuickItem *parent);
     virtual void drawContents(QPainter *, const QRect &) {};
 
 Q_SIGNALS:
@@ -90,12 +90,12 @@ Q_SIGNALS:
     void implicitHeightChanged();
 
 private:
-    Q_DISABLE_COPY(QSGImplicitSizePaintedItem)
-    Q_DECLARE_PRIVATE(QSGImplicitSizePaintedItem)
+    Q_DISABLE_COPY(QQuickImplicitSizePaintedItem)
+    Q_DECLARE_PRIVATE(QQuickImplicitSizePaintedItem)
 };
 
 QT_END_NAMESPACE
 
 QT_END_HEADER
 
-#endif // QSGIMPLICITSIZEITEM_H
+#endif // QQUICKIMPLICITSIZEITEM_H
diff --git a/src/declarative/items/qsgimplicitsizeitem_p_p.h b/src/declarative/items/qquickimplicitsizeitem_p_p.h
index 3ddd69d7d3..683fcc1618 100644
--- a/src/declarative/items/qsgimplicitsizeitem_p_p.h
+++ b/src/declarative/items/qquickimplicitsizeitem_p_p.h
@@ -40,8 +40,8 @@
 **
 ****************************************************************************/
 
-#ifndef QSGIMPLICITSIZEITEM_P_H
-#define QSGIMPLICITSIZEITEM_P_H
+#ifndef QQUICKIMPLICITSIZEITEM_P_H
+#define QQUICKIMPLICITSIZEITEM_P_H
 
 //
 //  W A R N I N G
@@ -54,18 +54,18 @@
 // We mean it.
 //
 
-#include "qsgitem_p.h"
-#include "qsgpainteditem_p.h"
-#include "qsgimplicitsizeitem_p.h"
+#include "qquickitem_p.h"
+#include "qquickpainteditem_p.h"
+#include "qquickimplicitsizeitem_p.h"
 
 QT_BEGIN_NAMESPACE
 
-class QSGImplicitSizeItemPrivate : public QSGItemPrivate
+class QQuickImplicitSizeItemPrivate : public QQuickItemPrivate
 {
-    Q_DECLARE_PUBLIC(QSGImplicitSizeItem)
+    Q_DECLARE_PUBLIC(QQuickImplicitSizeItem)
 
 public:
-    QSGImplicitSizeItemPrivate()
+    QQuickImplicitSizeItemPrivate()
     {
     }
 
@@ -74,12 +74,12 @@ public:
 };
 
 
-class QSGImplicitSizePaintedItemPrivate : public QSGPaintedItemPrivate
+class QQuickImplicitSizePaintedItemPrivate : public QQuickPaintedItemPrivate
 {
-    Q_DECLARE_PUBLIC(QSGImplicitSizePaintedItem)
+    Q_DECLARE_PUBLIC(QQuickImplicitSizePaintedItem)
 
 public:
-    QSGImplicitSizePaintedItemPrivate()
+    QQuickImplicitSizePaintedItemPrivate()
     {
     }
 
@@ -89,4 +89,4 @@ public:
 
 QT_END_NAMESPACE
 
-#endif // QSGIMPLICITSIZEITEM_P_H
+#endif // QQUICKIMPLICITSIZEITEM_P_H
diff --git a/src/declarative/items/qsgitem.cpp b/src/declarative/items/qquickitem.cpp
index bdea19b3e0..b6951d9a77 100644
--- a/src/declarative/items/qsgitem.cpp
+++ b/src/declarative/items/qquickitem.cpp
@@ -39,13 +39,13 @@
 **
 ****************************************************************************/
 
-#include "qsgitem.h"
+#include "qquickitem.h"
 
-#include "qsgcanvas.h"
+#include "qquickcanvas.h"
 #include <QtDeclarative/qjsengine.h>
-#include "qsgcanvas_p.h"
+#include "qquickcanvas_p.h"
 
-#include "qsgevents_p_p.h"
+#include "qquickevents_p_p.h"
 
 #include <QtDeclarative/qdeclarativeengine.h>
 #include <QtDeclarative/qdeclarativecomponent.h>
@@ -63,7 +63,7 @@
 #include <private/qdeclarativeopenmetaobject_p.h>
 #include <private/qdeclarativestate_p.h>
 #include <private/qlistmodelinterface_p.h>
-#include <private/qsgitem_p.h>
+#include <private/qquickitem_p.h>
 
 #include <float.h>
 
@@ -73,7 +73,7 @@
 QT_BEGIN_NAMESPACE
 
 /*!
-    \qmlclass Transform QSGTransform
+    \qmlclass Transform QQuickTransform
     \inqmlmodule QtQuick 2
     \ingroup qml-transform-elements
     \brief The Transform elements provide a way of building advanced transformations on Items.
@@ -95,7 +95,7 @@ QT_BEGIN_NAMESPACE
 */
 
 /*!
-    \qmlclass Translate QSGTranslate
+    \qmlclass Translate QQuickTranslate
     \inqmlmodule QtQuick 2
     \ingroup qml-transform-elements
     \brief The Translate object provides a way to move an Item without changing its x or y properties.
@@ -137,7 +137,7 @@ QT_BEGIN_NAMESPACE
 */
 
 /*!
-    \qmlclass Scale QSGScale
+    \qmlclass Scale QQuickScale
     \inqmlmodule QtQuick 2
     \ingroup qml-transform-elements
     \brief The Scale element provides a way to scale an Item.
@@ -179,7 +179,7 @@ QT_BEGIN_NAMESPACE
 */
 
 /*!
-    \qmlclass Rotation QSGRotation
+    \qmlclass Rotation QQuickRotation
     \inqmlmodule QtQuick 2
     \ingroup qml-transform-elements
     \brief The Rotation object provides a way to rotate an Item.
@@ -234,61 +234,61 @@ QT_BEGIN_NAMESPACE
     The angle to rotate, in degrees clockwise.
 */
 
-QSGTransformPrivate::QSGTransformPrivate()
+QQuickTransformPrivate::QQuickTransformPrivate()
 {
 }
 
-QSGTransform::QSGTransform(QObject *parent)
-: QObject(*(new QSGTransformPrivate), parent)
+QQuickTransform::QQuickTransform(QObject *parent)
+: QObject(*(new QQuickTransformPrivate), parent)
 {
 }
 
-QSGTransform::QSGTransform(QSGTransformPrivate &dd, QObject *parent)
+QQuickTransform::QQuickTransform(QQuickTransformPrivate &dd, QObject *parent)
 : QObject(dd, parent)
 {
 }
 
-QSGTransform::~QSGTransform()
+QQuickTransform::~QQuickTransform()
 {
-    Q_D(QSGTransform);
+    Q_D(QQuickTransform);
     for (int ii = 0; ii < d->items.count(); ++ii) {
-        QSGItemPrivate *p = QSGItemPrivate::get(d->items.at(ii));
+        QQuickItemPrivate *p = QQuickItemPrivate::get(d->items.at(ii));
         p->transforms.removeOne(this);
-        p->dirty(QSGItemPrivate::Transform);
+        p->dirty(QQuickItemPrivate::Transform);
     }
 }
 
-void QSGTransform::update()
+void QQuickTransform::update()
 {
-    Q_D(QSGTransform);
+    Q_D(QQuickTransform);
     for (int ii = 0; ii < d->items.count(); ++ii) {
-        QSGItemPrivate *p = QSGItemPrivate::get(d->items.at(ii));
-        p->dirty(QSGItemPrivate::Transform);
+        QQuickItemPrivate *p = QQuickItemPrivate::get(d->items.at(ii));
+        p->dirty(QQuickItemPrivate::Transform);
     }
 }
 
-QSGContents::QSGContents(QSGItem *item)
+QQuickContents::QQuickContents(QQuickItem *item)
 : m_item(item), m_x(0), m_y(0), m_width(0), m_height(0)
 {
     //### optimize
     connect(this, SIGNAL(rectChanged(QRectF)), m_item, SIGNAL(childrenRectChanged(QRectF)));
 }
 
-QSGContents::~QSGContents()
+QQuickContents::~QQuickContents()
 {
-    QList<QSGItem *> children = m_item->childItems();
+    QList<QQuickItem *> children = m_item->childItems();
     for (int i = 0; i < children.count(); ++i) {
-        QSGItem *child = children.at(i);
-        QSGItemPrivate::get(child)->removeItemChangeListener(this, QSGItemPrivate::Geometry | QSGItemPrivate::Destroyed);
+        QQuickItem *child = children.at(i);
+        QQuickItemPrivate::get(child)->removeItemChangeListener(this, QQuickItemPrivate::Geometry | QQuickItemPrivate::Destroyed);
     }
 }
 
-QRectF QSGContents::rectF() const
+QRectF QQuickContents::rectF() const
 {
     return QRectF(m_x, m_y, m_width, m_height);
 }
 
-void QSGContents::calcHeight(QSGItem *changed)
+void QQuickContents::calcHeight(QQuickItem *changed)
 {
     qreal oldy = m_y;
     qreal oldheight = m_height;
@@ -306,9 +306,9 @@ void QSGContents::calcHeight(QSGItem *changed)
     } else {
         qreal top = FLT_MAX;
         qreal bottom = 0;
-        QList<QSGItem *> children = m_item->childItems();
+        QList<QQuickItem *> children = m_item->childItems();
         for (int i = 0; i < children.count(); ++i) {
-            QSGItem *child = children.at(i);
+            QQuickItem *child = children.at(i);
             qreal y = child->y();
             if (y + child->height() > bottom)
                 bottom = y + child->height();
@@ -324,7 +324,7 @@ void QSGContents::calcHeight(QSGItem *changed)
         emit rectChanged(rectF());
 }
 
-void QSGContents::calcWidth(QSGItem *changed)
+void QQuickContents::calcWidth(QQuickItem *changed)
 {
     qreal oldx = m_x;
     qreal oldwidth = m_width;
@@ -342,9 +342,9 @@ void QSGContents::calcWidth(QSGItem *changed)
     } else {
         qreal left = FLT_MAX;
         qreal right = 0;
-        QList<QSGItem *> children = m_item->childItems();
+        QList<QQuickItem *> children = m_item->childItems();
         for (int i = 0; i < children.count(); ++i) {
-            QSGItem *child = children.at(i);
+            QQuickItem *child = children.at(i);
             qreal x = child->x();
             if (x + child->width() > right)
                 right = x + child->width();
@@ -360,19 +360,19 @@ void QSGContents::calcWidth(QSGItem *changed)
         emit rectChanged(rectF());
 }
 
-void QSGContents::complete()
+void QQuickContents::complete()
 {
-    QList<QSGItem *> children = m_item->childItems();
+    QList<QQuickItem *> children = m_item->childItems();
     for (int i = 0; i < children.count(); ++i) {
-        QSGItem *child = children.at(i);
-        QSGItemPrivate::get(child)->addItemChangeListener(this, QSGItemPrivate::Geometry | QSGItemPrivate::Destroyed);
+        QQuickItem *child = children.at(i);
+        QQuickItemPrivate::get(child)->addItemChangeListener(this, QQuickItemPrivate::Geometry | QQuickItemPrivate::Destroyed);
         //###what about changes to visibility?
     }
 
     calcGeometry();
 }
 
-void QSGContents::itemGeometryChanged(QSGItem *changed, const QRectF &newGeometry, const QRectF &oldGeometry)
+void QQuickContents::itemGeometryChanged(QQuickItem *changed, const QRectF &newGeometry, const QRectF &oldGeometry)
 {
     Q_UNUSED(changed)
     //### we can only pass changed if the left edge has moved left, or the right edge has moved right
@@ -382,53 +382,53 @@ void QSGContents::itemGeometryChanged(QSGItem *changed, const QRectF &newGeometr
         calcHeight(/*changed*/);
 }
 
-void QSGContents::itemDestroyed(QSGItem *item)
+void QQuickContents::itemDestroyed(QQuickItem *item)
 {
     if (item)
-        QSGItemPrivate::get(item)->removeItemChangeListener(this, QSGItemPrivate::Geometry | QSGItemPrivate::Destroyed);
+        QQuickItemPrivate::get(item)->removeItemChangeListener(this, QQuickItemPrivate::Geometry | QQuickItemPrivate::Destroyed);
     calcGeometry();
 }
 
-void QSGContents::childRemoved(QSGItem *item)
+void QQuickContents::childRemoved(QQuickItem *item)
 {
     if (item)
-        QSGItemPrivate::get(item)->removeItemChangeListener(this, QSGItemPrivate::Geometry | QSGItemPrivate::Destroyed);
+        QQuickItemPrivate::get(item)->removeItemChangeListener(this, QQuickItemPrivate::Geometry | QQuickItemPrivate::Destroyed);
     calcGeometry();
 }
 
-void QSGContents::childAdded(QSGItem *item)
+void QQuickContents::childAdded(QQuickItem *item)
 {
     if (item)
-        QSGItemPrivate::get(item)->addItemChangeListener(this, QSGItemPrivate::Geometry | QSGItemPrivate::Destroyed);
+        QQuickItemPrivate::get(item)->addItemChangeListener(this, QQuickItemPrivate::Geometry | QQuickItemPrivate::Destroyed);
     calcWidth(item);
     calcHeight(item);
 }
 
-QSGItemKeyFilter::QSGItemKeyFilter(QSGItem *item)
+QQuickItemKeyFilter::QQuickItemKeyFilter(QQuickItem *item)
 : m_processPost(false), m_next(0)
 {
-    QSGItemPrivate *p = item?QSGItemPrivate::get(item):0;
+    QQuickItemPrivate *p = item?QQuickItemPrivate::get(item):0;
     if (p) {
         m_next = p->keyHandler;
         p->keyHandler = this;
     }
 }
 
-QSGItemKeyFilter::~QSGItemKeyFilter()
+QQuickItemKeyFilter::~QQuickItemKeyFilter()
 {
 }
 
-void QSGItemKeyFilter::keyPressed(QKeyEvent *event, bool post)
+void QQuickItemKeyFilter::keyPressed(QKeyEvent *event, bool post)
 {
     if (m_next) m_next->keyPressed(event, post);
 }
 
-void QSGItemKeyFilter::keyReleased(QKeyEvent *event, bool post)
+void QQuickItemKeyFilter::keyReleased(QKeyEvent *event, bool post)
 {
     if (m_next) m_next->keyReleased(event, post);
 }
 
-void QSGItemKeyFilter::inputMethodEvent(QInputMethodEvent *event, bool post)
+void QQuickItemKeyFilter::inputMethodEvent(QInputMethodEvent *event, bool post)
 {
     if (m_next)
         m_next->inputMethodEvent(event, post);
@@ -436,18 +436,18 @@ void QSGItemKeyFilter::inputMethodEvent(QInputMethodEvent *event, bool post)
         event->ignore();
 }
 
-QVariant QSGItemKeyFilter::inputMethodQuery(Qt::InputMethodQuery query) const
+QVariant QQuickItemKeyFilter::inputMethodQuery(Qt::InputMethodQuery query) const
 {
     if (m_next) return m_next->inputMethodQuery(query);
     return QVariant();
 }
 
-void QSGItemKeyFilter::componentComplete()
+void QQuickItemKeyFilter::componentComplete()
 {
     if (m_next) m_next->componentComplete();
 }
 /*!
-    \qmlclass KeyNavigation QSGKeyNavigationAttached
+    \qmlclass KeyNavigation QQuickKeyNavigationAttached
     \inqmlmodule QtQuick 2
     \ingroup qml-basic-interaction-elements
     \brief The KeyNavigation attached property supports key navigation by arrow keys.
@@ -510,146 +510,146 @@ void QSGItemKeyFilter::componentComplete()
     when the Tab key or Shift+Tab key combination (Backtab) are pressed.
 */
 
-QSGKeyNavigationAttached::QSGKeyNavigationAttached(QObject *parent)
-: QObject(*(new QSGKeyNavigationAttachedPrivate), parent),
-  QSGItemKeyFilter(qobject_cast<QSGItem*>(parent))
+QQuickKeyNavigationAttached::QQuickKeyNavigationAttached(QObject *parent)
+: QObject(*(new QQuickKeyNavigationAttachedPrivate), parent),
+  QQuickItemKeyFilter(qobject_cast<QQuickItem*>(parent))
 {
     m_processPost = true;
 }
 
-QSGKeyNavigationAttached *
-QSGKeyNavigationAttached::qmlAttachedProperties(QObject *obj)
+QQuickKeyNavigationAttached *
+QQuickKeyNavigationAttached::qmlAttachedProperties(QObject *obj)
 {
-    return new QSGKeyNavigationAttached(obj);
+    return new QQuickKeyNavigationAttached(obj);
 }
 
-QSGItem *QSGKeyNavigationAttached::left() const
+QQuickItem *QQuickKeyNavigationAttached::left() const
 {
-    Q_D(const QSGKeyNavigationAttached);
+    Q_D(const QQuickKeyNavigationAttached);
     return d->left;
 }
 
-void QSGKeyNavigationAttached::setLeft(QSGItem *i)
+void QQuickKeyNavigationAttached::setLeft(QQuickItem *i)
 {
-    Q_D(QSGKeyNavigationAttached);
+    Q_D(QQuickKeyNavigationAttached);
     if (d->left == i)
         return;
     d->left = i;
     d->leftSet = true;
-    QSGKeyNavigationAttached* other =
-            qobject_cast<QSGKeyNavigationAttached*>(qmlAttachedPropertiesObject<QSGKeyNavigationAttached>(i));
+    QQuickKeyNavigationAttached* other =
+            qobject_cast<QQuickKeyNavigationAttached*>(qmlAttachedPropertiesObject<QQuickKeyNavigationAttached>(i));
     if (other && !other->d_func()->rightSet){
-        other->d_func()->right = qobject_cast<QSGItem*>(parent());
+        other->d_func()->right = qobject_cast<QQuickItem*>(parent());
         emit other->rightChanged();
     }
     emit leftChanged();
 }
 
-QSGItem *QSGKeyNavigationAttached::right() const
+QQuickItem *QQuickKeyNavigationAttached::right() const
 {
-    Q_D(const QSGKeyNavigationAttached);
+    Q_D(const QQuickKeyNavigationAttached);
     return d->right;
 }
 
-void QSGKeyNavigationAttached::setRight(QSGItem *i)
+void QQuickKeyNavigationAttached::setRight(QQuickItem *i)
 {
-    Q_D(QSGKeyNavigationAttached);
+    Q_D(QQuickKeyNavigationAttached);
     if (d->right == i)
         return;
     d->right = i;
     d->rightSet = true;
-    QSGKeyNavigationAttached* other =
-            qobject_cast<QSGKeyNavigationAttached*>(qmlAttachedPropertiesObject<QSGKeyNavigationAttached>(i));
+    QQuickKeyNavigationAttached* other =
+            qobject_cast<QQuickKeyNavigationAttached*>(qmlAttachedPropertiesObject<QQuickKeyNavigationAttached>(i));
     if (other && !other->d_func()->leftSet){
-        other->d_func()->left = qobject_cast<QSGItem*>(parent());
+        other->d_func()->left = qobject_cast<QQuickItem*>(parent());
         emit other->leftChanged();
     }
     emit rightChanged();
 }
 
-QSGItem *QSGKeyNavigationAttached::up() const
+QQuickItem *QQuickKeyNavigationAttached::up() const
 {
-    Q_D(const QSGKeyNavigationAttached);
+    Q_D(const QQuickKeyNavigationAttached);
     return d->up;
 }
 
-void QSGKeyNavigationAttached::setUp(QSGItem *i)
+void QQuickKeyNavigationAttached::setUp(QQuickItem *i)
 {
-    Q_D(QSGKeyNavigationAttached);
+    Q_D(QQuickKeyNavigationAttached);
     if (d->up == i)
         return;
     d->up = i;
     d->upSet = true;
-    QSGKeyNavigationAttached* other =
-            qobject_cast<QSGKeyNavigationAttached*>(qmlAttachedPropertiesObject<QSGKeyNavigationAttached>(i));
+    QQuickKeyNavigationAttached* other =
+            qobject_cast<QQuickKeyNavigationAttached*>(qmlAttachedPropertiesObject<QQuickKeyNavigationAttached>(i));
     if (other && !other->d_func()->downSet){
-        other->d_func()->down = qobject_cast<QSGItem*>(parent());
+        other->d_func()->down = qobject_cast<QQuickItem*>(parent());
         emit other->downChanged();
     }
     emit upChanged();
 }
 
-QSGItem *QSGKeyNavigationAttached::down() const
+QQuickItem *QQuickKeyNavigationAttached::down() const
 {
-    Q_D(const QSGKeyNavigationAttached);
+    Q_D(const QQuickKeyNavigationAttached);
     return d->down;
 }
 
-void QSGKeyNavigationAttached::setDown(QSGItem *i)
+void QQuickKeyNavigationAttached::setDown(QQuickItem *i)
 {
-    Q_D(QSGKeyNavigationAttached);
+    Q_D(QQuickKeyNavigationAttached);
     if (d->down == i)
         return;
     d->down = i;
     d->downSet = true;
-    QSGKeyNavigationAttached* other =
-            qobject_cast<QSGKeyNavigationAttached*>(qmlAttachedPropertiesObject<QSGKeyNavigationAttached>(i));
+    QQuickKeyNavigationAttached* other =
+            qobject_cast<QQuickKeyNavigationAttached*>(qmlAttachedPropertiesObject<QQuickKeyNavigationAttached>(i));
     if (other && !other->d_func()->upSet) {
-        other->d_func()->up = qobject_cast<QSGItem*>(parent());
+        other->d_func()->up = qobject_cast<QQuickItem*>(parent());
         emit other->upChanged();
     }
     emit downChanged();
 }
 
-QSGItem *QSGKeyNavigationAttached::tab() const
+QQuickItem *QQuickKeyNavigationAttached::tab() const
 {
-    Q_D(const QSGKeyNavigationAttached);
+    Q_D(const QQuickKeyNavigationAttached);
     return d->tab;
 }
 
-void QSGKeyNavigationAttached::setTab(QSGItem *i)
+void QQuickKeyNavigationAttached::setTab(QQuickItem *i)
 {
-    Q_D(QSGKeyNavigationAttached);
+    Q_D(QQuickKeyNavigationAttached);
     if (d->tab == i)
         return;
     d->tab = i;
     d->tabSet = true;
-    QSGKeyNavigationAttached* other =
-            qobject_cast<QSGKeyNavigationAttached*>(qmlAttachedPropertiesObject<QSGKeyNavigationAttached>(i));
+    QQuickKeyNavigationAttached* other =
+            qobject_cast<QQuickKeyNavigationAttached*>(qmlAttachedPropertiesObject<QQuickKeyNavigationAttached>(i));
     if (other && !other->d_func()->backtabSet) {
-        other->d_func()->backtab = qobject_cast<QSGItem*>(parent());
+        other->d_func()->backtab = qobject_cast<QQuickItem*>(parent());
         emit other->backtabChanged();
     }
     emit tabChanged();
 }
 
-QSGItem *QSGKeyNavigationAttached::backtab() const
+QQuickItem *QQuickKeyNavigationAttached::backtab() const
 {
-    Q_D(const QSGKeyNavigationAttached);
+    Q_D(const QQuickKeyNavigationAttached);
     return d->backtab;
 }
 
-void QSGKeyNavigationAttached::setBacktab(QSGItem *i)
+void QQuickKeyNavigationAttached::setBacktab(QQuickItem *i)
 {
-    Q_D(QSGKeyNavigationAttached);
+    Q_D(QQuickKeyNavigationAttached);
     if (d->backtab == i)
         return;
     d->backtab = i;
     d->backtabSet = true;
-    QSGKeyNavigationAttached* other =
-            qobject_cast<QSGKeyNavigationAttached*>(qmlAttachedPropertiesObject<QSGKeyNavigationAttached>(i));
+    QQuickKeyNavigationAttached* other =
+            qobject_cast<QQuickKeyNavigationAttached*>(qmlAttachedPropertiesObject<QQuickKeyNavigationAttached>(i));
     if (other && !other->d_func()->tabSet) {
-        other->d_func()->tab = qobject_cast<QSGItem*>(parent());
+        other->d_func()->tab = qobject_cast<QQuickItem*>(parent());
         emit other->tabChanged();
     }
     emit backtabChanged();
@@ -670,12 +670,12 @@ void QSGKeyNavigationAttached::setBacktab(QSGItem *i)
     handled by the KeyNavigation attached property handler.
     \endlist
 */
-QSGKeyNavigationAttached::Priority QSGKeyNavigationAttached::priority() const
+QQuickKeyNavigationAttached::Priority QQuickKeyNavigationAttached::priority() const
 {
     return m_processPost ? AfterItem : BeforeItem;
 }
 
-void QSGKeyNavigationAttached::setPriority(Priority order)
+void QQuickKeyNavigationAttached::setPriority(Priority order)
 {
     bool processPost = order == AfterItem;
     if (processPost != m_processPost) {
@@ -684,22 +684,22 @@ void QSGKeyNavigationAttached::setPriority(Priority order)
     }
 }
 
-void QSGKeyNavigationAttached::keyPressed(QKeyEvent *event, bool post)
+void QQuickKeyNavigationAttached::keyPressed(QKeyEvent *event, bool post)
 {
-    Q_D(QSGKeyNavigationAttached);
+    Q_D(QQuickKeyNavigationAttached);
     event->ignore();
 
     if (post != m_processPost) {
-        QSGItemKeyFilter::keyPressed(event, post);
+        QQuickItemKeyFilter::keyPressed(event, post);
         return;
     }
 
     bool mirror = false;
     switch (event->key()) {
     case Qt::Key_Left: {
-        if (QSGItem *parentItem = qobject_cast<QSGItem*>(parent()))
-            mirror = QSGItemPrivate::get(parentItem)->effectiveLayoutMirror;
-        QSGItem* leftItem = mirror ? d->right : d->left;
+        if (QQuickItem *parentItem = qobject_cast<QQuickItem*>(parent()))
+            mirror = QQuickItemPrivate::get(parentItem)->effectiveLayoutMirror;
+        QQuickItem* leftItem = mirror ? d->right : d->left;
         if (leftItem) {
             setFocusNavigation(leftItem, mirror ? "right" : "left");
             event->accept();
@@ -707,9 +707,9 @@ void QSGKeyNavigationAttached::keyPressed(QKeyEvent *event, bool post)
         break;
     }
     case Qt::Key_Right: {
-        if (QSGItem *parentItem = qobject_cast<QSGItem*>(parent()))
-            mirror = QSGItemPrivate::get(parentItem)->effectiveLayoutMirror;
-        QSGItem* rightItem = mirror ? d->left : d->right;
+        if (QQuickItem *parentItem = qobject_cast<QQuickItem*>(parent()))
+            mirror = QQuickItemPrivate::get(parentItem)->effectiveLayoutMirror;
+        QQuickItem* rightItem = mirror ? d->left : d->right;
         if (rightItem) {
             setFocusNavigation(rightItem, mirror ? "left" : "right");
             event->accept();
@@ -744,30 +744,30 @@ void QSGKeyNavigationAttached::keyPressed(QKeyEvent *event, bool post)
         break;
     }
 
-    if (!event->isAccepted()) QSGItemKeyFilter::keyPressed(event, post);
+    if (!event->isAccepted()) QQuickItemKeyFilter::keyPressed(event, post);
 }
 
-void QSGKeyNavigationAttached::keyReleased(QKeyEvent *event, bool post)
+void QQuickKeyNavigationAttached::keyReleased(QKeyEvent *event, bool post)
 {
-    Q_D(QSGKeyNavigationAttached);
+    Q_D(QQuickKeyNavigationAttached);
     event->ignore();
 
     if (post != m_processPost) {
-        QSGItemKeyFilter::keyReleased(event, post);
+        QQuickItemKeyFilter::keyReleased(event, post);
         return;
     }
 
     bool mirror = false;
     switch (event->key()) {
     case Qt::Key_Left:
-        if (QSGItem *parentItem = qobject_cast<QSGItem*>(parent()))
-            mirror = QSGItemPrivate::get(parentItem)->effectiveLayoutMirror;
+        if (QQuickItem *parentItem = qobject_cast<QQuickItem*>(parent()))
+            mirror = QQuickItemPrivate::get(parentItem)->effectiveLayoutMirror;
         if (mirror ? d->right : d->left)
             event->accept();
         break;
     case Qt::Key_Right:
-        if (QSGItem *parentItem = qobject_cast<QSGItem*>(parent()))
-            mirror = QSGItemPrivate::get(parentItem)->effectiveLayoutMirror;
+        if (QQuickItem *parentItem = qobject_cast<QQuickItem*>(parent()))
+            mirror = QQuickItemPrivate::get(parentItem)->effectiveLayoutMirror;
         if (mirror ? d->left : d->right)
             event->accept();
         break;
@@ -795,12 +795,12 @@ void QSGKeyNavigationAttached::keyReleased(QKeyEvent *event, bool post)
         break;
     }
 
-    if (!event->isAccepted()) QSGItemKeyFilter::keyReleased(event, post);
+    if (!event->isAccepted()) QQuickItemKeyFilter::keyReleased(event, post);
 }
 
-void QSGKeyNavigationAttached::setFocusNavigation(QSGItem *currentItem, const char *dir)
+void QQuickKeyNavigationAttached::setFocusNavigation(QQuickItem *currentItem, const char *dir)
 {
-    QSGItem *initialItem = currentItem;
+    QQuickItem *initialItem = currentItem;
     bool isNextItem = false;
     do {
         isNextItem = false;
@@ -808,9 +808,9 @@ void QSGKeyNavigationAttached::setFocusNavigation(QSGItem *currentItem, const ch
             currentItem->setFocus(true);
         } else {
             QObject *attached =
-                qmlAttachedPropertiesObject<QSGKeyNavigationAttached>(currentItem, false);
+                qmlAttachedPropertiesObject<QQuickKeyNavigationAttached>(currentItem, false);
             if (attached) {
-                QSGItem *tempItem = qvariant_cast<QSGItem*>(attached->property(dir));
+                QQuickItem *tempItem = qvariant_cast<QQuickItem*>(attached->property(dir));
                 if (tempItem) {
                     currentItem = tempItem;
                     isNextItem = true;
@@ -821,7 +821,7 @@ void QSGKeyNavigationAttached::setFocusNavigation(QSGItem *currentItem, const ch
     while (currentItem != initialItem && isNextItem);
 }
 
-const QSGKeysAttached::SigMap QSGKeysAttached::sigMap[] = {
+const QQuickKeysAttached::SigMap QQuickKeysAttached::sigMap[] = {
     { Qt::Key_Left, "leftPressed" },
     { Qt::Key_Right, "rightPressed" },
     { Qt::Key_Up, "upPressed" },
@@ -853,13 +853,13 @@ const QSGKeysAttached::SigMap QSGKeysAttached::sigMap[] = {
     { 0, 0 }
 };
 
-bool QSGKeysAttachedPrivate::isConnected(const char *signalName)
+bool QQuickKeysAttachedPrivate::isConnected(const char *signalName)
 {
     return isSignalConnected(signalIndex(signalName));
 }
 
 /*!
-    \qmlclass Keys QSGKeysAttached
+    \qmlclass Keys QQuickKeysAttached
     \inqmlmodule QtQuick 2
     \ingroup qml-basic-interaction-elements
     \brief The Keys attached property provides key handling to Items.
@@ -1245,25 +1245,25 @@ bool QSGKeysAttachedPrivate::isConnected(const char *signalName)
     parameter provides information about the event.
 */
 
-QSGKeysAttached::QSGKeysAttached(QObject *parent)
-: QObject(*(new QSGKeysAttachedPrivate), parent),
-  QSGItemKeyFilter(qobject_cast<QSGItem*>(parent))
+QQuickKeysAttached::QQuickKeysAttached(QObject *parent)
+: QObject(*(new QQuickKeysAttachedPrivate), parent),
+  QQuickItemKeyFilter(qobject_cast<QQuickItem*>(parent))
 {
-    Q_D(QSGKeysAttached);
+    Q_D(QQuickKeysAttached);
     m_processPost = false;
-    d->item = qobject_cast<QSGItem*>(parent);
+    d->item = qobject_cast<QQuickItem*>(parent);
 }
 
-QSGKeysAttached::~QSGKeysAttached()
+QQuickKeysAttached::~QQuickKeysAttached()
 {
 }
 
-QSGKeysAttached::Priority QSGKeysAttached::priority() const
+QQuickKeysAttached::Priority QQuickKeysAttached::priority() const
 {
     return m_processPost ? AfterItem : BeforeItem;
 }
 
-void QSGKeysAttached::setPriority(Priority order)
+void QQuickKeysAttached::setPriority(Priority order)
 {
     bool processPost = order == AfterItem;
     if (processPost != m_processPost) {
@@ -1272,26 +1272,26 @@ void QSGKeysAttached::setPriority(Priority order)
     }
 }
 
-void QSGKeysAttached::componentComplete()
+void QQuickKeysAttached::componentComplete()
 {
-    Q_D(QSGKeysAttached);
+    Q_D(QQuickKeysAttached);
     if (d->item) {
         for (int ii = 0; ii < d->targets.count(); ++ii) {
-            QSGItem *targetItem = d->targets.at(ii);
-            if (targetItem && (targetItem->flags() & QSGItem::ItemAcceptsInputMethod)) {
-                d->item->setFlag(QSGItem::ItemAcceptsInputMethod);
+            QQuickItem *targetItem = d->targets.at(ii);
+            if (targetItem && (targetItem->flags() & QQuickItem::ItemAcceptsInputMethod)) {
+                d->item->setFlag(QQuickItem::ItemAcceptsInputMethod);
                 break;
             }
         }
     }
 }
 
-void QSGKeysAttached::keyPressed(QKeyEvent *event, bool post)
+void QQuickKeysAttached::keyPressed(QKeyEvent *event, bool post)
 {
-    Q_D(QSGKeysAttached);
+    Q_D(QQuickKeysAttached);
     if (post != m_processPost || !d->enabled || d->inPress) {
         event->ignore();
-        QSGItemKeyFilter::keyPressed(event, post);
+        QQuickItemKeyFilter::keyPressed(event, post);
         return;
     }
 
@@ -1299,7 +1299,7 @@ void QSGKeysAttached::keyPressed(QKeyEvent *event, bool post)
     if (d->item && d->item->canvas()) {
         d->inPress = true;
         for (int ii = 0; ii < d->targets.count(); ++ii) {
-            QSGItem *i = d->targets.at(ii);
+            QQuickItem *i = d->targets.at(ii);
             if (i && i->isVisible()) {
                 d->item->canvas()->sendEvent(i, event);
                 if (event->isAccepted()) {
@@ -1311,37 +1311,37 @@ void QSGKeysAttached::keyPressed(QKeyEvent *event, bool post)
         d->inPress = false;
     }
 
-    QSGKeyEvent ke(*event);
+    QQuickKeyEvent ke(*event);
     QByteArray keySignal = keyToSignal(event->key());
     if (!keySignal.isEmpty()) {
-        keySignal += "(QSGKeyEvent*)";
+        keySignal += "(QQuickKeyEvent*)";
         if (d->isConnected(keySignal)) {
             // If we specifically handle a key then default to accepted
             ke.setAccepted(true);
-            int idx = QSGKeysAttached::staticMetaObject.indexOfSignal(keySignal);
-            metaObject()->method(idx).invoke(this, Qt::DirectConnection, Q_ARG(QSGKeyEvent*, &ke));
+            int idx = QQuickKeysAttached::staticMetaObject.indexOfSignal(keySignal);
+            metaObject()->method(idx).invoke(this, Qt::DirectConnection, Q_ARG(QQuickKeyEvent*, &ke));
         }
     }
     if (!ke.isAccepted())
         emit pressed(&ke);
     event->setAccepted(ke.isAccepted());
 
-    if (!event->isAccepted()) QSGItemKeyFilter::keyPressed(event, post);
+    if (!event->isAccepted()) QQuickItemKeyFilter::keyPressed(event, post);
 }
 
-void QSGKeysAttached::keyReleased(QKeyEvent *event, bool post)
+void QQuickKeysAttached::keyReleased(QKeyEvent *event, bool post)
 {
-    Q_D(QSGKeysAttached);
+    Q_D(QQuickKeysAttached);
     if (post != m_processPost || !d->enabled || d->inRelease) {
         event->ignore();
-        QSGItemKeyFilter::keyReleased(event, post);
+        QQuickItemKeyFilter::keyReleased(event, post);
         return;
     }
 
     if (d->item && d->item->canvas()) {
         d->inRelease = true;
         for (int ii = 0; ii < d->targets.count(); ++ii) {
-            QSGItem *i = d->targets.at(ii);
+            QQuickItem *i = d->targets.at(ii);
             if (i && i->isVisible()) {
                 d->item->canvas()->sendEvent(i, event);
                 if (event->isAccepted()) {
@@ -1353,21 +1353,21 @@ void QSGKeysAttached::keyReleased(QKeyEvent *event, bool post)
         d->inRelease = false;
     }
 
-    QSGKeyEvent ke(*event);
+    QQuickKeyEvent ke(*event);
     emit released(&ke);
     event->setAccepted(ke.isAccepted());
 
-    if (!event->isAccepted()) QSGItemKeyFilter::keyReleased(event, post);
+    if (!event->isAccepted()) QQuickItemKeyFilter::keyReleased(event, post);
 }
 
-void QSGKeysAttached::inputMethodEvent(QInputMethodEvent *event, bool post)
+void QQuickKeysAttached::inputMethodEvent(QInputMethodEvent *event, bool post)
 {
-    Q_D(QSGKeysAttached);
+    Q_D(QQuickKeysAttached);
     if (post == m_processPost && d->item && !d->inIM && d->item->canvas()) {
         d->inIM = true;
         for (int ii = 0; ii < d->targets.count(); ++ii) {
-            QSGItem *i = d->targets.at(ii);
-            if (i && i->isVisible() && (i->flags() & QSGItem::ItemAcceptsInputMethod)) {
+            QQuickItem *i = d->targets.at(ii);
+            if (i && i->isVisible() && (i->flags() & QQuickItem::ItemAcceptsInputMethod)) {
                 d->item->canvas()->sendEvent(i, event);
                 if (event->isAccepted()) {
                     d->imeItem = i;
@@ -1378,16 +1378,16 @@ void QSGKeysAttached::inputMethodEvent(QInputMethodEvent *event, bool post)
         }
         d->inIM = false;
     }
-    QSGItemKeyFilter::inputMethodEvent(event, post);
+    QQuickItemKeyFilter::inputMethodEvent(event, post);
 }
 
-QVariant QSGKeysAttached::inputMethodQuery(Qt::InputMethodQuery query) const
+QVariant QQuickKeysAttached::inputMethodQuery(Qt::InputMethodQuery query) const
 {
-    Q_D(const QSGKeysAttached);
+    Q_D(const QQuickKeysAttached);
     if (d->item) {
         for (int ii = 0; ii < d->targets.count(); ++ii) {
-            QSGItem *i = d->targets.at(ii);
-            if (i && i->isVisible() && (i->flags() & QSGItem::ItemAcceptsInputMethod) && i == d->imeItem) {
+            QQuickItem *i = d->targets.at(ii);
+            if (i && i->isVisible() && (i->flags() & QQuickItem::ItemAcceptsInputMethod) && i == d->imeItem) {
                 //### how robust is i == d->imeItem check?
                 QVariant v = i->inputMethodQuery(query);
                 if (v.userType() == QVariant::RectF)
@@ -1396,16 +1396,16 @@ QVariant QSGKeysAttached::inputMethodQuery(Qt::InputMethodQuery query) const
             }
         }
     }
-    return QSGItemKeyFilter::inputMethodQuery(query);
+    return QQuickItemKeyFilter::inputMethodQuery(query);
 }
 
-QSGKeysAttached *QSGKeysAttached::qmlAttachedProperties(QObject *obj)
+QQuickKeysAttached *QQuickKeysAttached::qmlAttachedProperties(QObject *obj)
 {
-    return new QSGKeysAttached(obj);
+    return new QQuickKeysAttached(obj);
 }
 
 /*!
-    \qmlclass LayoutMirroring QSGLayoutMirroringAttached
+    \qmlclass LayoutMirroring QQuickLayoutMirroringAttached
     \inqmlmodule QtQuick 2
     \ingroup qml-utility-elements
     \brief The LayoutMirroring attached property is used to mirror layout behavior.
@@ -1468,26 +1468,26 @@ QSGKeysAttached *QSGKeysAttached::qmlAttachedProperties(QObject *obj)
 */
 
 
-QSGLayoutMirroringAttached::QSGLayoutMirroringAttached(QObject *parent) : QObject(parent), itemPrivate(0)
+QQuickLayoutMirroringAttached::QQuickLayoutMirroringAttached(QObject *parent) : QObject(parent), itemPrivate(0)
 {
-    if (QSGItem *item = qobject_cast<QSGItem*>(parent)) {
-        itemPrivate = QSGItemPrivate::get(item);
+    if (QQuickItem *item = qobject_cast<QQuickItem*>(parent)) {
+        itemPrivate = QQuickItemPrivate::get(item);
         itemPrivate->attachedLayoutDirection = this;
     } else
         qmlInfo(parent) << tr("LayoutDirection attached property only works with Items");
 }
 
-QSGLayoutMirroringAttached * QSGLayoutMirroringAttached::qmlAttachedProperties(QObject *object)
+QQuickLayoutMirroringAttached * QQuickLayoutMirroringAttached::qmlAttachedProperties(QObject *object)
 {
-    return new QSGLayoutMirroringAttached(object);
+    return new QQuickLayoutMirroringAttached(object);
 }
 
-bool QSGLayoutMirroringAttached::enabled() const
+bool QQuickLayoutMirroringAttached::enabled() const
 {
     return itemPrivate ? itemPrivate->effectiveLayoutMirror : false;
 }
 
-void QSGLayoutMirroringAttached::setEnabled(bool enabled)
+void QQuickLayoutMirroringAttached::setEnabled(bool enabled)
 {
     if (!itemPrivate)
         return;
@@ -1500,7 +1500,7 @@ void QSGLayoutMirroringAttached::setEnabled(bool enabled)
     }
 }
 
-void QSGLayoutMirroringAttached::resetEnabled()
+void QQuickLayoutMirroringAttached::resetEnabled()
 {
     if (itemPrivate && !itemPrivate->isMirrorImplicit) {
         itemPrivate->isMirrorImplicit = true;
@@ -1508,12 +1508,12 @@ void QSGLayoutMirroringAttached::resetEnabled()
     }
 }
 
-bool QSGLayoutMirroringAttached::childrenInherit() const
+bool QQuickLayoutMirroringAttached::childrenInherit() const
 {
     return itemPrivate ? itemPrivate->inheritMirrorFromItem : false;
 }
 
-void QSGLayoutMirroringAttached::setChildrenInherit(bool childrenInherit) {
+void QQuickLayoutMirroringAttached::setChildrenInherit(bool childrenInherit) {
     if (itemPrivate && childrenInherit != itemPrivate->inheritMirrorFromItem) {
         itemPrivate->inheritMirrorFromItem = childrenInherit;
         itemPrivate->resolveLayoutMirror();
@@ -1521,18 +1521,18 @@ void QSGLayoutMirroringAttached::setChildrenInherit(bool childrenInherit) {
     }
 }
 
-void QSGItemPrivate::resolveLayoutMirror()
+void QQuickItemPrivate::resolveLayoutMirror()
 {
-    Q_Q(QSGItem);
-    if (QSGItem *parentItem = q->parentItem()) {
-        QSGItemPrivate *parentPrivate = QSGItemPrivate::get(parentItem);
+    Q_Q(QQuickItem);
+    if (QQuickItem *parentItem = q->parentItem()) {
+        QQuickItemPrivate *parentPrivate = QQuickItemPrivate::get(parentItem);
         setImplicitLayoutMirror(parentPrivate->inheritedLayoutMirror, parentPrivate->inheritMirrorFromParent);
     } else {
         setImplicitLayoutMirror(isMirrorImplicit ? false : effectiveLayoutMirror, inheritMirrorFromItem);
     }
 }
 
-void QSGItemPrivate::setImplicitLayoutMirror(bool mirror, bool inherit)
+void QQuickItemPrivate::setImplicitLayoutMirror(bool mirror, bool inherit)
 {
     inherit = inherit || inheritMirrorFromItem;
     if (!isMirrorImplicit && inheritMirrorFromItem)
@@ -1546,19 +1546,19 @@ void QSGItemPrivate::setImplicitLayoutMirror(bool mirror, bool inherit)
     if (isMirrorImplicit)
         setLayoutMirror(inherit ? inheritedLayoutMirror : false);
     for (int i = 0; i < childItems.count(); ++i) {
-        if (QSGItem *child = qobject_cast<QSGItem *>(childItems.at(i))) {
-            QSGItemPrivate *childPrivate = QSGItemPrivate::get(child);
+        if (QQuickItem *child = qobject_cast<QQuickItem *>(childItems.at(i))) {
+            QQuickItemPrivate *childPrivate = QQuickItemPrivate::get(child);
             childPrivate->setImplicitLayoutMirror(inheritedLayoutMirror, inheritMirrorFromParent);
         }
     }
 }
 
-void QSGItemPrivate::setLayoutMirror(bool mirror)
+void QQuickItemPrivate::setLayoutMirror(bool mirror)
 {
     if (mirror != effectiveLayoutMirror) {
         effectiveLayoutMirror = mirror;
         if (_anchors) {
-            QSGAnchorsPrivate *anchor_d = QSGAnchorsPrivate::get(_anchors);
+            QQuickAnchorsPrivate *anchor_d = QQuickAnchorsPrivate::get(_anchors);
             anchor_d->fillChanged();
             anchor_d->centerInChanged();
             anchor_d->updateHorizontalAnchors();
@@ -1572,23 +1572,23 @@ void QSGItemPrivate::setLayoutMirror(bool mirror)
 }
 
 /*!
-    \class QSGItem
-    \brief The QSGItem class provides the most basic of all visual items in QML.
+    \class QQuickItem
+    \brief The QQuickItem class provides the most basic of all visual items in QML.
 
-    All visual items in Qt Declarative inherit from QSGItem.  Although QSGItem
+    All visual items in Qt Declarative inherit from QQuickItem.  Although QQuickItem
     has no visual appearance, it defines all the properties that are
     common across visual items - such as the x and y position, the
     width and height, \l {anchor-layout}{anchoring} and key handling.
 
-    You can subclass QSGItem to provide your own custom visual item that inherits
-    these features. Note that, because it does not draw anything, QSGItem sets the
-    QGraphicsItem::ItemHasNoContents flag. If you subclass QSGItem to create a visual
+    You can subclass QQuickItem to provide your own custom visual item that inherits
+    these features. Note that, because it does not draw anything, QQuickItem sets the
+    QGraphicsItem::ItemHasNoContents flag. If you subclass QQuickItem to create a visual
     item, you will need to unset this flag.
 
 */
 
 /*!
-    \qmlclass Item QSGItem
+    \qmlclass Item QQuickItem
     \inqmlmodule QtQuick 2
     \ingroup qml-basic-visual-elements
     \brief The Item is the most basic of all visual items in QML.
@@ -1655,66 +1655,66 @@ void QSGItemPrivate::setLayoutMirror(bool mirror)
 */
 
 /*!
-    \fn void QSGItem::childrenRectChanged(const QRectF &)
+    \fn void QQuickItem::childrenRectChanged(const QRectF &)
     \internal
 */
 
 /*!
-    \fn void QSGItem::baselineOffsetChanged(qreal)
+    \fn void QQuickItem::baselineOffsetChanged(qreal)
     \internal
 */
 
 /*!
-    \fn void QSGItem::stateChanged(const QString &state)
+    \fn void QQuickItem::stateChanged(const QString &state)
     \internal
 */
 
 /*!
-    \fn void QSGItem::parentChanged(QSGItem *)
+    \fn void QQuickItem::parentChanged(QQuickItem *)
     \internal
 */
 
 /*!
-    \fn void QSGItem::smoothChanged(bool)
+    \fn void QQuickItem::smoothChanged(bool)
     \internal
 */
 
 /*!
-    \fn void QSGItem::clipChanged(bool)
+    \fn void QQuickItem::clipChanged(bool)
     \internal
 */
 
-/*! \fn void QSGItem::transformOriginChanged(TransformOrigin)
+/*! \fn void QQuickItem::transformOriginChanged(TransformOrigin)
   \internal
 */
 
 /*!
-    \fn void QSGItem::focusChanged(bool)
+    \fn void QQuickItem::focusChanged(bool)
     \internal
 */
 
 /*!
-    \fn void QSGItem::activeFocusChanged(bool)
+    \fn void QQuickItem::activeFocusChanged(bool)
     \internal
 */
 /*!
-    \fn QSGItem::QSGItem(QSGItem *parent)
+    \fn QQuickItem::QQuickItem(QQuickItem *parent)
 
-    Constructs a QSGItem with the given \a parent.
+    Constructs a QQuickItem with the given \a parent.
 */
-QSGItem::QSGItem(QSGItem* parent)
-: QObject(*(new QSGItemPrivate), parent)
+QQuickItem::QQuickItem(QQuickItem* parent)
+: QObject(*(new QQuickItemPrivate), parent)
 {
-    Q_D(QSGItem);
+    Q_D(QQuickItem);
     d->init(parent);
 }
 
 /*! \internal
 */
-QSGItem::QSGItem(QSGItemPrivate &dd, QSGItem *parent)
+QQuickItem::QQuickItem(QQuickItemPrivate &dd, QQuickItem *parent)
 : QObject(dd, parent)
 {
-    Q_D(QSGItem);
+    Q_D(QQuickItem);
     d->init(parent);
 }
 
@@ -1729,9 +1729,9 @@ static void qt_print_item_count()
 #endif
 
 /*!
-    Destroys the QSGItem.
+    Destroys the QQuickItem.
 */
-QSGItem::~QSGItem()
+QQuickItem::~QQuickItem()
 {
 #ifndef QT_NO_DEBUG
     --qt_item_count;
@@ -1739,32 +1739,32 @@ QSGItem::~QSGItem()
         qDebug("Item destroyed after qt_print_item_count() was called.");
 #endif
 
-    Q_D(QSGItem);
+    Q_D(QQuickItem);
 
     if (d->parentItem)
         setParentItem(0);
     else if (d->canvas && d->itemNodeInstance)
-        QSGCanvasPrivate::get(d->canvas)->cleanup(d->itemNodeInstance); // cleanup root
+        QQuickCanvasPrivate::get(d->canvas)->cleanup(d->itemNodeInstance); // cleanup root
     // XXX todo - optimize
     while (!d->childItems.isEmpty())
         d->childItems.first()->setParentItem(0);
 
     for (int ii = 0; ii < d->changeListeners.count(); ++ii) {
-        QSGAnchorsPrivate *anchor = d->changeListeners.at(ii).listener->anchorPrivate();
+        QQuickAnchorsPrivate *anchor = d->changeListeners.at(ii).listener->anchorPrivate();
         if (anchor)
             anchor->clearItem(this);
     }
 
     // XXX todo - the original checks if the parent is being destroyed
     for (int ii = 0; ii < d->changeListeners.count(); ++ii) {
-        QSGAnchorsPrivate *anchor = d->changeListeners.at(ii).listener->anchorPrivate();
+        QQuickAnchorsPrivate *anchor = d->changeListeners.at(ii).listener->anchorPrivate();
         if (anchor && anchor->item && anchor->item->parent() != this) //child will be deleted anyway
             anchor->updateOnComplete();
     }
 
     for (int ii = 0; ii < d->changeListeners.count(); ++ii) {
-        const QSGItemPrivate::ChangeListener &change = d->changeListeners.at(ii);
-        if (change.types & QSGItemPrivate::Destroyed)
+        const QQuickItemPrivate::ChangeListener &change = d->changeListeners.at(ii);
+        if (change.types & QQuickItemPrivate::Destroyed)
             change.listener->itemDestroyed(this);
     }
     d->changeListeners.clear();
@@ -1803,24 +1803,24 @@ QSGItem::~QSGItem()
 */
 
 /*!
-    \property QSGItem::parent
+    \property QQuickItem::parent
     This property holds the parent of the item.
 */
-void QSGItem::setParentItem(QSGItem *parentItem)
+void QQuickItem::setParentItem(QQuickItem *parentItem)
 {
-    Q_D(QSGItem);
+    Q_D(QQuickItem);
     if (parentItem == d->parentItem)
         return;
 
     d->removeFromDirtyList();
 
-    QSGItem *oldParentItem = d->parentItem;
-    QSGItem *scopeFocusedItem = 0;
+    QQuickItem *oldParentItem = d->parentItem;
+    QQuickItem *scopeFocusedItem = 0;
 
     if (oldParentItem) {
-        QSGItemPrivate *op = QSGItemPrivate::get(oldParentItem);
+        QQuickItemPrivate *op = QQuickItemPrivate::get(oldParentItem);
 
-        QSGItem *scopeItem = 0;
+        QQuickItem *scopeItem = 0;
 
         if (d->canvas && hasFocus()) {
             scopeItem = oldParentItem;
@@ -1833,41 +1833,41 @@ void QSGItem::setParentItem(QSGItem *parentItem)
         }
 
         if (scopeFocusedItem)
-            QSGCanvasPrivate::get(d->canvas)->clearFocusInScope(scopeItem, scopeFocusedItem,
-                                                                QSGCanvasPrivate::DontChangeFocusProperty);
+            QQuickCanvasPrivate::get(d->canvas)->clearFocusInScope(scopeItem, scopeFocusedItem,
+                                                                QQuickCanvasPrivate::DontChangeFocusProperty);
 
         op->removeChild(this);
     }
 
     d->parentItem = parentItem;
 
-    QSGCanvas *parentCanvas = parentItem?QSGItemPrivate::get(parentItem)->canvas:0;
+    QQuickCanvas *parentCanvas = parentItem?QQuickItemPrivate::get(parentItem)->canvas:0;
     if (d->canvas != parentCanvas) {
-        QSGItemPrivate::InitializationState initState;
+        QQuickItemPrivate::InitializationState initState;
         initState.clear();
         d->initCanvas(&initState, parentCanvas);
     }
 
-    d->dirty(QSGItemPrivate::ParentChanged);
+    d->dirty(QQuickItemPrivate::ParentChanged);
 
     if (d->parentItem)
-        QSGItemPrivate::get(d->parentItem)->addChild(this);
+        QQuickItemPrivate::get(d->parentItem)->addChild(this);
 
     d->setEffectiveVisibleRecur(d->calcEffectiveVisible());
     d->setEffectiveEnableRecur(d->calcEffectiveEnable());
 
     if (scopeFocusedItem && d->parentItem && d->canvas) {
         // We need to test whether this item becomes scope focused
-        QSGItem *scopeItem = 0;
+        QQuickItem *scopeItem = 0;
         scopeItem = d->parentItem;
         while (!scopeItem->isFocusScope()) scopeItem = scopeItem->parentItem();
 
         if (scopeItem->scopedFocusItem()) {
-            QSGItemPrivate::get(scopeFocusedItem)->focus = false;
+            QQuickItemPrivate::get(scopeFocusedItem)->focus = false;
             emit scopeFocusedItem->focusChanged(false);
         } else {
-            QSGCanvasPrivate::get(d->canvas)->setFocusInScope(scopeItem, scopeFocusedItem,
-                                                              QSGCanvasPrivate::DontChangeFocusProperty);
+            QQuickCanvasPrivate::get(d->canvas)->setFocusInScope(scopeItem, scopeFocusedItem,
+                                                              QQuickCanvasPrivate::DontChangeFocusProperty);
         }
     }
 
@@ -1878,18 +1878,18 @@ void QSGItem::setParentItem(QSGItem *parentItem)
     emit parentChanged(d->parentItem);
 }
 
-void QSGItem::stackBefore(const QSGItem *sibling)
+void QQuickItem::stackBefore(const QQuickItem *sibling)
 {
-    Q_D(QSGItem);
-    if (!sibling || sibling == this || !d->parentItem || d->parentItem != QSGItemPrivate::get(sibling)->parentItem) {
-        qWarning("QSGItem::stackBefore: Cannot stack before %p, which must be a sibling", sibling);
+    Q_D(QQuickItem);
+    if (!sibling || sibling == this || !d->parentItem || d->parentItem != QQuickItemPrivate::get(sibling)->parentItem) {
+        qWarning("QQuickItem::stackBefore: Cannot stack before %p, which must be a sibling", sibling);
         return;
     }
 
-    QSGItemPrivate *parentPrivate = QSGItemPrivate::get(d->parentItem);
+    QQuickItemPrivate *parentPrivate = QQuickItemPrivate::get(d->parentItem);
 
     int myIndex = parentPrivate->childItems.indexOf(this);
-    int siblingIndex = parentPrivate->childItems.indexOf(const_cast<QSGItem *>(sibling));
+    int siblingIndex = parentPrivate->childItems.indexOf(const_cast<QQuickItem *>(sibling));
 
     Q_ASSERT(myIndex != -1 && siblingIndex != -1);
 
@@ -1902,24 +1902,24 @@ void QSGItem::stackBefore(const QSGItem *sibling)
 
     parentPrivate->childItems.insert(siblingIndex, this);
 
-    parentPrivate->dirty(QSGItemPrivate::ChildrenStackingChanged);
+    parentPrivate->dirty(QQuickItemPrivate::ChildrenStackingChanged);
 
     for (int ii = qMin(siblingIndex, myIndex); ii < parentPrivate->childItems.count(); ++ii)
-        QSGItemPrivate::get(parentPrivate->childItems.at(ii))->siblingOrderChanged();
+        QQuickItemPrivate::get(parentPrivate->childItems.at(ii))->siblingOrderChanged();
 }
 
-void QSGItem::stackAfter(const QSGItem *sibling)
+void QQuickItem::stackAfter(const QQuickItem *sibling)
 {
-    Q_D(QSGItem);
-    if (!sibling || sibling == this || !d->parentItem || d->parentItem != QSGItemPrivate::get(sibling)->parentItem) {
-        qWarning("QSGItem::stackAfter: Cannot stack after %p, which must be a sibling", sibling);
+    Q_D(QQuickItem);
+    if (!sibling || sibling == this || !d->parentItem || d->parentItem != QQuickItemPrivate::get(sibling)->parentItem) {
+        qWarning("QQuickItem::stackAfter: Cannot stack after %p, which must be a sibling", sibling);
         return;
     }
 
-    QSGItemPrivate *parentPrivate = QSGItemPrivate::get(d->parentItem);
+    QQuickItemPrivate *parentPrivate = QQuickItemPrivate::get(d->parentItem);
 
     int myIndex = parentPrivate->childItems.indexOf(this);
-    int siblingIndex = parentPrivate->childItems.indexOf(const_cast<QSGItem *>(sibling));
+    int siblingIndex = parentPrivate->childItems.indexOf(const_cast<QQuickItem *>(sibling));
 
     Q_ASSERT(myIndex != -1 && siblingIndex != -1);
 
@@ -1932,91 +1932,91 @@ void QSGItem::stackAfter(const QSGItem *sibling)
 
     parentPrivate->childItems.insert(siblingIndex + 1, this);
 
-    parentPrivate->dirty(QSGItemPrivate::ChildrenStackingChanged);
+    parentPrivate->dirty(QQuickItemPrivate::ChildrenStackingChanged);
 
     for (int ii = qMin(myIndex, siblingIndex + 1); ii < parentPrivate->childItems.count(); ++ii)
-        QSGItemPrivate::get(parentPrivate->childItems.at(ii))->siblingOrderChanged();
+        QQuickItemPrivate::get(parentPrivate->childItems.at(ii))->siblingOrderChanged();
 }
 
 /*!
-    Returns the QSGItem parent of this item.
+    Returns the QQuickItem parent of this item.
 */
-QSGItem *QSGItem::parentItem() const
+QQuickItem *QQuickItem::parentItem() const
 {
-    Q_D(const QSGItem);
+    Q_D(const QQuickItem);
     return d->parentItem;
 }
 
-QSGEngine *QSGItem::sceneGraphEngine() const
+QSGEngine *QQuickItem::sceneGraphEngine() const
 {
     return canvas()->sceneGraphEngine();
 }
 
-QSGCanvas *QSGItem::canvas() const
+QQuickCanvas *QQuickItem::canvas() const
 {
-    Q_D(const QSGItem);
+    Q_D(const QQuickItem);
     return d->canvas;
 }
 
-static bool itemZOrder_sort(QSGItem *lhs, QSGItem *rhs)
+static bool itemZOrder_sort(QQuickItem *lhs, QQuickItem *rhs)
 {
     return lhs->z() < rhs->z();
 }
 
-QList<QSGItem *> QSGItemPrivate::paintOrderChildItems() const
+QList<QQuickItem *> QQuickItemPrivate::paintOrderChildItems() const
 {
     // XXX todo - optimize, don't sort and return items that are
     // ignored anyway, like invisible or disabled items.
-    QList<QSGItem *> items = childItems;
+    QList<QQuickItem *> items = childItems;
     qStableSort(items.begin(), items.end(), itemZOrder_sort);
     return items;
 }
 
-void QSGItemPrivate::addChild(QSGItem *child)
+void QQuickItemPrivate::addChild(QQuickItem *child)
 {
-    Q_Q(QSGItem);
+    Q_Q(QQuickItem);
 
     Q_ASSERT(!childItems.contains(child));
 
     childItems.append(child);
 
-    dirty(QSGItemPrivate::ChildrenChanged);
+    dirty(QQuickItemPrivate::ChildrenChanged);
 
-    itemChange(QSGItem::ItemChildAddedChange, child);
+    itemChange(QQuickItem::ItemChildAddedChange, child);
 
     emit q->childrenChanged();
 }
 
-void QSGItemPrivate::removeChild(QSGItem *child)
+void QQuickItemPrivate::removeChild(QQuickItem *child)
 {
-    Q_Q(QSGItem);
+    Q_Q(QQuickItem);
 
     Q_ASSERT(child);
     Q_ASSERT(childItems.contains(child));
     childItems.removeOne(child);
     Q_ASSERT(!childItems.contains(child));
 
-    dirty(QSGItemPrivate::ChildrenChanged);
+    dirty(QQuickItemPrivate::ChildrenChanged);
 
-    itemChange(QSGItem::ItemChildRemovedChange, child);
+    itemChange(QQuickItem::ItemChildRemovedChange, child);
 
     emit q->childrenChanged();
 }
 
-void QSGItemPrivate::InitializationState::clear()
+void QQuickItemPrivate::InitializationState::clear()
 {
     focusScope = 0;
 }
 
-void QSGItemPrivate::InitializationState::clear(QSGItem *fs)
+void QQuickItemPrivate::InitializationState::clear(QQuickItem *fs)
 {
     focusScope = fs;
 }
 
-QSGItem *QSGItemPrivate::InitializationState::getFocusScope(QSGItem *item)
+QQuickItem *QQuickItemPrivate::InitializationState::getFocusScope(QQuickItem *item)
 {
     if (!focusScope) {
-        QSGItem *fs = item->parentItem();
+        QQuickItem *fs = item->parentItem();
         while (!fs->isFocusScope())
             fs = fs->parentItem();
         focusScope = fs;
@@ -2024,13 +2024,13 @@ QSGItem *QSGItemPrivate::InitializationState::getFocusScope(QSGItem *item)
     return focusScope;
 }
 
-void QSGItemPrivate::initCanvas(InitializationState *state, QSGCanvas *c)
+void QQuickItemPrivate::initCanvas(InitializationState *state, QQuickCanvas *c)
 {
-    Q_Q(QSGItem);
+    Q_Q(QQuickItem);
 
     if (canvas) {
         removeFromDirtyList();
-        QSGCanvasPrivate *c = QSGCanvasPrivate::get(canvas);
+        QQuickCanvasPrivate *c = QQuickCanvasPrivate::get(canvas);
         if (polishScheduled)
             c->itemsToPolish.remove(q);
         if (c->mouseGrabberItem == q)
@@ -2044,7 +2044,7 @@ void QSGItemPrivate::initCanvas(InitializationState *state, QSGCanvas *c)
     canvas = c;
 
     if (canvas && polishScheduled)
-        QSGCanvasPrivate::get(canvas)->itemsToPolish.insert(q);
+        QQuickCanvasPrivate::get(canvas)->itemsToPolish.insert(q);
 
     itemNodeInstance = 0;
     opacityNode = 0;
@@ -2063,8 +2063,8 @@ void QSGItemPrivate::initCanvas(InitializationState *state, QSGCanvas *c)
     }
 
     for (int ii = 0; ii < childItems.count(); ++ii) {
-        QSGItem *child = childItems.at(ii);
-        QSGItemPrivate::get(child)->initCanvas(childState, c);
+        QQuickItem *child = childItems.at(ii);
+        QQuickItemPrivate::get(child)->initCanvas(childState, c);
     }
 
     if (c && focus) {
@@ -2073,19 +2073,19 @@ void QSGItemPrivate::initCanvas(InitializationState *state, QSGCanvas *c)
             focus = false;
             emit q->focusChanged(false);
         } else {
-            QSGCanvasPrivate::get(canvas)->setFocusInScope(state->getFocusScope(q), q);
+            QQuickCanvasPrivate::get(canvas)->setFocusInScope(state->getFocusScope(q), q);
         }
     }
 
     dirty(Canvas);
 
-    itemChange(QSGItem::ItemSceneChange, c);
+    itemChange(QQuickItem::ItemSceneChange, c);
 }
 
 /*!
 Returns a transform that maps points from canvas space into item space.
 */
-QTransform QSGItemPrivate::canvasToItemTransform() const
+QTransform QQuickItemPrivate::canvasToItemTransform() const
 {
     // XXX todo - optimize
     return itemToCanvasTransform().inverted();
@@ -2094,10 +2094,10 @@ QTransform QSGItemPrivate::canvasToItemTransform() const
 /*!
 Returns a transform that maps points from item space into canvas space.
 */
-QTransform QSGItemPrivate::itemToCanvasTransform() const
+QTransform QQuickItemPrivate::itemToCanvasTransform() const
 {
     // XXX todo
-    QTransform rv = parentItem?QSGItemPrivate::get(parentItem)->itemToCanvasTransform():QTransform();
+    QTransform rv = parentItem?QQuickItemPrivate::get(parentItem)->itemToCanvasTransform():QTransform();
     itemToParentTransform(rv);
     return rv;
 }
@@ -2105,7 +2105,7 @@ QTransform QSGItemPrivate::itemToCanvasTransform() const
 /*!
 Motifies \a t with this items local transform relative to its parent.
 */
-void QSGItemPrivate::itemToParentTransform(QTransform &t) const
+void QQuickItemPrivate::itemToParentTransform(QTransform &t) const
 {
     if (x || y)
         t.translate(x, y);
@@ -2175,14 +2175,14 @@ void QSGItemPrivate::itemToParentTransform(QTransform &t) const
 
     \sa componentComplete()
 */
-bool QSGItem::isComponentComplete() const
+bool QQuickItem::isComponentComplete() const
 {
-    Q_D(const QSGItem);
+    Q_D(const QQuickItem);
     return d->componentComplete;
 }
 
-QSGItemPrivate::QSGItemPrivate()
-: _anchors(0), _contents(0), baselineOffset(0), _anchorLines(0), _stateGroup(0), origin(QSGItem::Center),
+QQuickItemPrivate::QQuickItemPrivate()
+: _anchors(0), _contents(0), baselineOffset(0), _anchorLines(0), _stateGroup(0), origin(QQuickItem::Center),
 
   flags(0), widthValid(false), heightValid(false), componentComplete(true),
   keepMouse(false), hoverEnabled(false), smooth(false), focus(false), activeFocus(false), notifiedFocus(false),
@@ -2210,7 +2210,7 @@ QSGItemPrivate::QSGItemPrivate()
 {
 }
 
-void QSGItemPrivate::init(QSGItem *parent)
+void QQuickItemPrivate::init(QQuickItem *parent)
 {
 #ifndef QT_NO_DEBUG
     ++qt_item_count;
@@ -2221,31 +2221,31 @@ void QSGItemPrivate::init(QSGItem *parent)
     }
 #endif
 
-    Q_Q(QSGItem);
+    Q_Q(QQuickItem);
     baselineOffset.invalidate();
 
     if (parent) {
         q->setParentItem(parent);
-        QSGItemPrivate *parentPrivate = QSGItemPrivate::get(parent);
+        QQuickItemPrivate *parentPrivate = QQuickItemPrivate::get(parent);
         setImplicitLayoutMirror(parentPrivate->inheritedLayoutMirror, parentPrivate->inheritMirrorFromParent);
     }
 }
 
-void QSGItemPrivate::data_append(QDeclarativeListProperty<QObject> *prop, QObject *o)
+void QQuickItemPrivate::data_append(QDeclarativeListProperty<QObject> *prop, QObject *o)
 {
     if (!o)
         return;
 
-    QSGItem *that = static_cast<QSGItem *>(prop->object);
+    QQuickItem *that = static_cast<QQuickItem *>(prop->object);
 
     // This test is measurably (albeit only slightly) faster than qobject_cast<>()
     const QMetaObject *mo = o->metaObject();
-    while (mo && mo != &QSGItem::staticMetaObject) {
+    while (mo && mo != &QQuickItem::staticMetaObject) {
         mo = mo->d.superdata;
     }
 
     if (mo) {
-        QSGItem *item = static_cast<QSGItem *>(o);
+        QQuickItem *item = static_cast<QQuickItem *>(o);
         item->setParentItem(that);
     } else {
         if (o->inherits("QGraphicsItem"))
@@ -2290,14 +2290,14 @@ void QSGItemPrivate::data_append(QDeclarativeListProperty<QObject> *prop, QObjec
     specify it.
  */
 
-int QSGItemPrivate::data_count(QDeclarativeListProperty<QObject> *prop)
+int QQuickItemPrivate::data_count(QDeclarativeListProperty<QObject> *prop)
 {
     Q_UNUSED(prop);
     // XXX todo
     return 0;
 }
 
-QObject *QSGItemPrivate::data_at(QDeclarativeListProperty<QObject> *prop, int i)
+QObject *QQuickItemPrivate::data_at(QDeclarativeListProperty<QObject> *prop, int i)
 {
     Q_UNUSED(prop);
     Q_UNUSED(i);
@@ -2305,13 +2305,13 @@ QObject *QSGItemPrivate::data_at(QDeclarativeListProperty<QObject> *prop, int i)
     return 0;
 }
 
-void QSGItemPrivate::data_clear(QDeclarativeListProperty<QObject> *prop)
+void QQuickItemPrivate::data_clear(QDeclarativeListProperty<QObject> *prop)
 {
     Q_UNUSED(prop);
     // XXX todo
 }
 
-QObject *QSGItemPrivate::resources_at(QDeclarativeListProperty<QObject> *prop, int index)
+QObject *QQuickItemPrivate::resources_at(QDeclarativeListProperty<QObject> *prop, int index)
 {
     const QObjectList children = prop->object->children();
     if (index < children.count())
@@ -2320,18 +2320,18 @@ QObject *QSGItemPrivate::resources_at(QDeclarativeListProperty<QObject> *prop, i
         return 0;
 }
 
-void QSGItemPrivate::resources_append(QDeclarativeListProperty<QObject> *prop, QObject *o)
+void QQuickItemPrivate::resources_append(QDeclarativeListProperty<QObject> *prop, QObject *o)
 {
     // XXX todo - do we really want this behavior?
     o->setParent(prop->object);
 }
 
-int QSGItemPrivate::resources_count(QDeclarativeListProperty<QObject> *prop)
+int QQuickItemPrivate::resources_count(QDeclarativeListProperty<QObject> *prop)
 {
     return prop->object->children().count();
 }
 
-void QSGItemPrivate::resources_clear(QDeclarativeListProperty<QObject> *prop)
+void QQuickItemPrivate::resources_clear(QDeclarativeListProperty<QObject> *prop)
 {
     // XXX todo - do we really want this behavior?
     const QObjectList children = prop->object->children();
@@ -2339,54 +2339,54 @@ void QSGItemPrivate::resources_clear(QDeclarativeListProperty<QObject> *prop)
         children.at(index)->setParent(0);
 }
 
-QSGItem *QSGItemPrivate::children_at(QDeclarativeListProperty<QSGItem> *prop, int index)
+QQuickItem *QQuickItemPrivate::children_at(QDeclarativeListProperty<QQuickItem> *prop, int index)
 {
-    QSGItemPrivate *p = QSGItemPrivate::get(static_cast<QSGItem *>(prop->object));
+    QQuickItemPrivate *p = QQuickItemPrivate::get(static_cast<QQuickItem *>(prop->object));
     if (index >= p->childItems.count() || index < 0)
         return 0;
     else
         return p->childItems.at(index);
 }
 
-void QSGItemPrivate::children_append(QDeclarativeListProperty<QSGItem> *prop, QSGItem *o)
+void QQuickItemPrivate::children_append(QDeclarativeListProperty<QQuickItem> *prop, QQuickItem *o)
 {
     if (!o)
         return;
 
-    QSGItem *that = static_cast<QSGItem *>(prop->object);
+    QQuickItem *that = static_cast<QQuickItem *>(prop->object);
     if (o->parentItem() == that)
         o->setParentItem(0);
 
     o->setParentItem(that);
 }
 
-int QSGItemPrivate::children_count(QDeclarativeListProperty<QSGItem> *prop)
+int QQuickItemPrivate::children_count(QDeclarativeListProperty<QQuickItem> *prop)
 {
-    QSGItemPrivate *p = QSGItemPrivate::get(static_cast<QSGItem *>(prop->object));
+    QQuickItemPrivate *p = QQuickItemPrivate::get(static_cast<QQuickItem *>(prop->object));
     return p->childItems.count();
 }
 
-void QSGItemPrivate::children_clear(QDeclarativeListProperty<QSGItem> *prop)
+void QQuickItemPrivate::children_clear(QDeclarativeListProperty<QQuickItem> *prop)
 {
-    QSGItem *that = static_cast<QSGItem *>(prop->object);
-    QSGItemPrivate *p = QSGItemPrivate::get(that);
+    QQuickItem *that = static_cast<QQuickItem *>(prop->object);
+    QQuickItemPrivate *p = QQuickItemPrivate::get(that);
     while (!p->childItems.isEmpty())
         p->childItems.at(0)->setParentItem(0);
 }
 
-int QSGItemPrivate::transform_count(QDeclarativeListProperty<QSGTransform> *prop)
+int QQuickItemPrivate::transform_count(QDeclarativeListProperty<QQuickTransform> *prop)
 {
-    QSGItem *that = static_cast<QSGItem *>(prop->object);
-    return QSGItemPrivate::get(that)->transforms.count();
+    QQuickItem *that = static_cast<QQuickItem *>(prop->object);
+    return QQuickItemPrivate::get(that)->transforms.count();
 }
 
-void QSGTransform::appendToItem(QSGItem *item)
+void QQuickTransform::appendToItem(QQuickItem *item)
 {
-    Q_D(QSGTransform);
+    Q_D(QQuickTransform);
     if (!item)
         return;
 
-    QSGItemPrivate *p = QSGItemPrivate::get(item);
+    QQuickItemPrivate *p = QQuickItemPrivate::get(item);
 
     if (!d->items.isEmpty() && !p->transforms.isEmpty() && p->transforms.contains(this)) {
         p->transforms.removeOne(this);
@@ -2396,16 +2396,16 @@ void QSGTransform::appendToItem(QSGItem *item)
         d->items.append(item);
     }
 
-    p->dirty(QSGItemPrivate::Transform);
+    p->dirty(QQuickItemPrivate::Transform);
 }
 
-void QSGTransform::prependToItem(QSGItem *item)
+void QQuickTransform::prependToItem(QQuickItem *item)
 {
-    Q_D(QSGTransform);
+    Q_D(QQuickTransform);
     if (!item)
         return;
 
-    QSGItemPrivate *p = QSGItemPrivate::get(item);
+    QQuickItemPrivate *p = QQuickItemPrivate::get(item);
 
     if (!d->items.isEmpty() && !p->transforms.isEmpty() && p->transforms.contains(this)) {
         p->transforms.removeOne(this);
@@ -2415,22 +2415,22 @@ void QSGTransform::prependToItem(QSGItem *item)
         d->items.append(item);
     }
 
-    p->dirty(QSGItemPrivate::Transform);
+    p->dirty(QQuickItemPrivate::Transform);
 }
 
-void QSGItemPrivate::transform_append(QDeclarativeListProperty<QSGTransform> *prop, QSGTransform *transform)
+void QQuickItemPrivate::transform_append(QDeclarativeListProperty<QQuickTransform> *prop, QQuickTransform *transform)
 {
     if (!transform)
         return;
 
-    QSGItem *that = static_cast<QSGItem *>(prop->object);
+    QQuickItem *that = static_cast<QQuickItem *>(prop->object);
     transform->appendToItem(that);
 }
 
-QSGTransform *QSGItemPrivate::transform_at(QDeclarativeListProperty<QSGTransform> *prop, int idx)
+QQuickTransform *QQuickItemPrivate::transform_at(QDeclarativeListProperty<QQuickTransform> *prop, int idx)
 {
-    QSGItem *that = static_cast<QSGItem *>(prop->object);
-    QSGItemPrivate *p = QSGItemPrivate::get(that);
+    QQuickItem *that = static_cast<QQuickItem *>(prop->object);
+    QQuickItemPrivate *p = QQuickItemPrivate::get(that);
 
     if (idx < 0 || idx >= p->transforms.count())
         return 0;
@@ -2438,24 +2438,24 @@ QSGTransform *QSGItemPrivate::transform_at(QDeclarativeListProperty<QSGTransform
         return p->transforms.at(idx);
 }
 
-void QSGItemPrivate::transform_clear(QDeclarativeListProperty<QSGTransform> *prop)
+void QQuickItemPrivate::transform_clear(QDeclarativeListProperty<QQuickTransform> *prop)
 {
-    QSGItem *that = static_cast<QSGItem *>(prop->object);
-    QSGItemPrivate *p = QSGItemPrivate::get(that);
+    QQuickItem *that = static_cast<QQuickItem *>(prop->object);
+    QQuickItemPrivate *p = QQuickItemPrivate::get(that);
 
     for (int ii = 0; ii < p->transforms.count(); ++ii) {
-        QSGTransform *t = p->transforms.at(ii);
-        QSGTransformPrivate *tp = QSGTransformPrivate::get(t);
+        QQuickTransform *t = p->transforms.at(ii);
+        QQuickTransformPrivate *tp = QQuickTransformPrivate::get(t);
         tp->items.removeOne(that);
     }
 
     p->transforms.clear();
 
-    p->dirty(QSGItemPrivate::Transform);
+    p->dirty(QQuickItemPrivate::Transform);
 }
 
 /*!
-    \property QSGItem::childrenRect
+    \property QQuickItem::childrenRect
     \brief The geometry of an item's children.
 
     This property holds the (collective) position and size of the item's children.
@@ -2666,7 +2666,7 @@ void QSGItemPrivate::transform_clear(QDeclarativeListProperty<QSGTransform> *pro
 */
 
 /*!
-  \property QSGItem::baselineOffset
+  \property QQuickItem::baselineOffset
   \brief The position of the item's baseline in local coordinates.
 
   The baseline of a \l Text item is the imaginary line on which the text
@@ -2675,67 +2675,67 @@ void QSGItemPrivate::transform_clear(QDeclarativeListProperty<QSGTransform> *pro
 
   For non-text items, a default baseline offset of 0 is used.
 */
-QSGAnchors *QSGItemPrivate::anchors() const
+QQuickAnchors *QQuickItemPrivate::anchors() const
 {
     if (!_anchors) {
-        Q_Q(const QSGItem);
-        _anchors = new QSGAnchors(const_cast<QSGItem *>(q));
+        Q_Q(const QQuickItem);
+        _anchors = new QQuickAnchors(const_cast<QQuickItem *>(q));
         if (!componentComplete)
             _anchors->classBegin();
     }
     return _anchors;
 }
 
-QSGItemPrivate::AnchorLines *QSGItemPrivate::anchorLines() const
+QQuickItemPrivate::AnchorLines *QQuickItemPrivate::anchorLines() const
 {
-    Q_Q(const QSGItem);
+    Q_Q(const QQuickItem);
     if (!_anchorLines) _anchorLines =
-        new AnchorLines(const_cast<QSGItem *>(q));
+        new AnchorLines(const_cast<QQuickItem *>(q));
     return _anchorLines;
 }
 
-void QSGItemPrivate::siblingOrderChanged()
+void QQuickItemPrivate::siblingOrderChanged()
 {
-    Q_Q(QSGItem);
+    Q_Q(QQuickItem);
     for (int ii = 0; ii < changeListeners.count(); ++ii) {
-        const QSGItemPrivate::ChangeListener &change = changeListeners.at(ii);
-        if (change.types & QSGItemPrivate::SiblingOrder) {
+        const QQuickItemPrivate::ChangeListener &change = changeListeners.at(ii);
+        if (change.types & QQuickItemPrivate::SiblingOrder) {
             change.listener->itemSiblingOrderChanged(q);
         }
     }
 }
 
-QDeclarativeListProperty<QObject> QSGItemPrivate::data()
+QDeclarativeListProperty<QObject> QQuickItemPrivate::data()
 {
-    return QDeclarativeListProperty<QObject>(q_func(), 0, QSGItemPrivate::data_append,
-                                             QSGItemPrivate::data_count,
-                                             QSGItemPrivate::data_at,
-                                             QSGItemPrivate::data_clear);
+    return QDeclarativeListProperty<QObject>(q_func(), 0, QQuickItemPrivate::data_append,
+                                             QQuickItemPrivate::data_count,
+                                             QQuickItemPrivate::data_at,
+                                             QQuickItemPrivate::data_clear);
 }
 
-QRectF QSGItem::childrenRect()
+QRectF QQuickItem::childrenRect()
 {
-    Q_D(QSGItem);
+    Q_D(QQuickItem);
     if (!d->_contents) {
-        d->_contents = new QSGContents(this);
+        d->_contents = new QQuickContents(this);
         if (d->componentComplete)
             d->_contents->complete();
     }
     return d->_contents->rectF();
 }
 
-QList<QSGItem *> QSGItem::childItems() const
+QList<QQuickItem *> QQuickItem::childItems() const
 {
-    Q_D(const QSGItem);
+    Q_D(const QQuickItem);
     return d->childItems;
 }
 
-bool QSGItem::clip() const
+bool QQuickItem::clip() const
 {
     return flags() & ItemClipsChildrenToShape;
 }
 
-void QSGItem::setClip(bool c)
+void QQuickItem::setClip(bool c)
 {
     if (clip() == c)
         return;
@@ -2751,16 +2751,16 @@ void QSGItem::setClip(bool c)
   geometry from \a oldGeometry to \a newGeometry. If the two
   geometries are the same, it doesn't do anything.
  */
-void QSGItem::geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry)
+void QQuickItem::geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry)
 {
-    Q_D(QSGItem);
+    Q_D(QQuickItem);
 
     if (d->_anchors)
-        QSGAnchorsPrivate::get(d->_anchors)->updateMe();
+        QQuickAnchorsPrivate::get(d->_anchors)->updateMe();
 
     for (int ii = 0; ii < d->changeListeners.count(); ++ii) {
-        const QSGItemPrivate::ChangeListener &change = d->changeListeners.at(ii);
-        if (change.types & QSGItemPrivate::Geometry)
+        const QQuickItemPrivate::ChangeListener &change = d->changeListeners.at(ii);
+        if (change.types & QQuickItemPrivate::Geometry)
             change.listener->itemGeometryChanged(this, newGeometry, oldGeometry);
     }
 
@@ -2780,150 +2780,150 @@ void QSGItem::geometryChanged(const QRectF &newGeometry, const QRectF &oldGeomet
     this item. \a oldNode is the node that was returned the last time the function was called.
 
     The main thread is blocked while this function is executed so it is safe to read
-    values from the QSGItem instance and other objects in the main thread.
+    values from the QQuickItem instance and other objects in the main thread.
 
     \warning This is the only function in which it is allowed to make use of scene graph
     objects from the main thread. Use of scene graph objects outside this function will
     result in race conditions and potential crashes.
  */
 
-QSGNode *QSGItem::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *)
+QSGNode *QQuickItem::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *)
 {
     delete oldNode;
     return 0;
 }
 
-QSGTransformNode *QSGItemPrivate::createTransformNode()
+QSGTransformNode *QQuickItemPrivate::createTransformNode()
 {
     return new QSGTransformNode;
 }
 
-void QSGItem::updatePolish()
+void QQuickItem::updatePolish()
 {
 }
 
-void QSGItemPrivate::removeItemChangeListener(QSGItemChangeListener *listener, ChangeTypes types)
+void QQuickItemPrivate::removeItemChangeListener(QQuickItemChangeListener *listener, ChangeTypes types)
 {
     ChangeListener change(listener, types);
     changeListeners.removeOne(change);
 }
 
-void QSGItem::keyPressEvent(QKeyEvent *event)
+void QQuickItem::keyPressEvent(QKeyEvent *event)
 {
     event->ignore();
 }
 
-void QSGItem::keyReleaseEvent(QKeyEvent *event)
+void QQuickItem::keyReleaseEvent(QKeyEvent *event)
 {
     event->ignore();
 }
 
-void QSGItem::inputMethodEvent(QInputMethodEvent *event)
+void QQuickItem::inputMethodEvent(QInputMethodEvent *event)
 {
     event->ignore();
 }
 
-void QSGItem::focusInEvent(QFocusEvent *)
+void QQuickItem::focusInEvent(QFocusEvent *)
 {
 }
 
-void QSGItem::focusOutEvent(QFocusEvent *)
+void QQuickItem::focusOutEvent(QFocusEvent *)
 {
 }
 
-void QSGItem::mousePressEvent(QMouseEvent *event)
+void QQuickItem::mousePressEvent(QMouseEvent *event)
 {
     event->ignore();
 }
 
-void QSGItem::mouseMoveEvent(QMouseEvent *event)
+void QQuickItem::mouseMoveEvent(QMouseEvent *event)
 {
     event->ignore();
 }
 
-void QSGItem::mouseReleaseEvent(QMouseEvent *event)
+void QQuickItem::mouseReleaseEvent(QMouseEvent *event)
 {
     event->ignore();
 }
 
-void QSGItem::mouseDoubleClickEvent(QMouseEvent *event)
+void QQuickItem::mouseDoubleClickEvent(QMouseEvent *event)
 {
     mousePressEvent(event);
 }
 
-void QSGItem::mouseUngrabEvent()
+void QQuickItem::mouseUngrabEvent()
 {
     // XXX todo
 }
 
-void QSGItem::wheelEvent(QWheelEvent *event)
+void QQuickItem::wheelEvent(QWheelEvent *event)
 {
     event->ignore();
 }
 
-void QSGItem::touchEvent(QTouchEvent *event)
+void QQuickItem::touchEvent(QTouchEvent *event)
 {
     event->ignore();
 }
 
-void QSGItem::hoverEnterEvent(QHoverEvent *event)
+void QQuickItem::hoverEnterEvent(QHoverEvent *event)
 {
     Q_UNUSED(event);
 }
 
-void QSGItem::hoverMoveEvent(QHoverEvent *event)
+void QQuickItem::hoverMoveEvent(QHoverEvent *event)
 {
     Q_UNUSED(event);
 }
 
-void QSGItem::hoverLeaveEvent(QHoverEvent *event)
+void QQuickItem::hoverLeaveEvent(QHoverEvent *event)
 {
     Q_UNUSED(event);
 }
 
-void QSGItem::dragEnterEvent(QDragEnterEvent *event)
+void QQuickItem::dragEnterEvent(QDragEnterEvent *event)
 {
     Q_UNUSED(event);
 }
 
-void QSGItem::dragMoveEvent(QDragMoveEvent *event)
+void QQuickItem::dragMoveEvent(QDragMoveEvent *event)
 {
 
     Q_UNUSED(event);
 }
 
-void QSGItem::dragLeaveEvent(QDragLeaveEvent *event)
+void QQuickItem::dragLeaveEvent(QDragLeaveEvent *event)
 {
 
     Q_UNUSED(event);
 }
 
-void QSGItem::dropEvent(QDropEvent *event)
+void QQuickItem::dropEvent(QDropEvent *event)
 {
     Q_UNUSED(event);
 }
 
-bool QSGItem::childMouseEventFilter(QSGItem *, QEvent *)
+bool QQuickItem::childMouseEventFilter(QQuickItem *, QEvent *)
 {
     return false;
 }
 
-void QSGItem::windowDeactivateEvent()
+void QQuickItem::windowDeactivateEvent()
 {
-    foreach (QSGItem* item, childItems()) {
+    foreach (QQuickItem* item, childItems()) {
         item->windowDeactivateEvent();
     }
 }
 
-Qt::InputMethodHints QSGItem::inputMethodHints() const
+Qt::InputMethodHints QQuickItem::inputMethodHints() const
 {
-    Q_D(const QSGItem);
+    Q_D(const QQuickItem);
     return d->imHints;
 }
 
-void QSGItem::setInputMethodHints(Qt::InputMethodHints hints)
+void QQuickItem::setInputMethodHints(Qt::InputMethodHints hints)
 {
-    Q_D(QSGItem);
+    Q_D(QQuickItem);
     d->imHints = hints;
 
     if (!d->canvas || d->canvas->activeFocusItem() != this)
@@ -2934,16 +2934,16 @@ void QSGItem::setInputMethodHints(Qt::InputMethodHints hints)
         qApp->inputPanel()->update(Qt::ImHints);
 }
 
-void QSGItem::updateMicroFocus()
+void QQuickItem::updateMicroFocus()
 {
     QInputPanel *p = qApp->inputPanel();
     if (p->inputItem() == this)
         qApp->inputPanel()->update(Qt::ImQueryInput);
 }
 
-QVariant QSGItem::inputMethodQuery(Qt::InputMethodQuery query) const
+QVariant QQuickItem::inputMethodQuery(Qt::InputMethodQuery query) const
 {
-    Q_D(const QSGItem);
+    Q_D(const QQuickItem);
     QVariant v;
 
     switch (query) {
@@ -2970,62 +2970,62 @@ QVariant QSGItem::inputMethodQuery(Qt::InputMethodQuery query) const
     return v;
 }
 
-QSGAnchorLine QSGItemPrivate::left() const
+QQuickAnchorLine QQuickItemPrivate::left() const
 {
     return anchorLines()->left;
 }
 
-QSGAnchorLine QSGItemPrivate::right() const
+QQuickAnchorLine QQuickItemPrivate::right() const
 {
     return anchorLines()->right;
 }
 
-QSGAnchorLine QSGItemPrivate::horizontalCenter() const
+QQuickAnchorLine QQuickItemPrivate::horizontalCenter() const
 {
     return anchorLines()->hCenter;
 }
 
-QSGAnchorLine QSGItemPrivate::top() const
+QQuickAnchorLine QQuickItemPrivate::top() const
 {
     return anchorLines()->top;
 }
 
-QSGAnchorLine QSGItemPrivate::bottom() const
+QQuickAnchorLine QQuickItemPrivate::bottom() const
 {
     return anchorLines()->bottom;
 }
 
-QSGAnchorLine QSGItemPrivate::verticalCenter() const
+QQuickAnchorLine QQuickItemPrivate::verticalCenter() const
 {
     return anchorLines()->vCenter;
 }
 
-QSGAnchorLine QSGItemPrivate::baseline() const
+QQuickAnchorLine QQuickItemPrivate::baseline() const
 {
     return anchorLines()->baseline;
 }
 
-qreal QSGItem::baselineOffset() const
+qreal QQuickItem::baselineOffset() const
 {
-    Q_D(const QSGItem);
+    Q_D(const QQuickItem);
     if (!d->baselineOffset.isValid()) {
         return 0.0;
     } else
         return d->baselineOffset;
 }
 
-void QSGItem::setBaselineOffset(qreal offset)
+void QQuickItem::setBaselineOffset(qreal offset)
 {
-    Q_D(QSGItem);
+    Q_D(QQuickItem);
     if (offset == d->baselineOffset)
         return;
 
     d->baselineOffset = offset;
 
     for (int ii = 0; ii < d->changeListeners.count(); ++ii) {
-        const QSGItemPrivate::ChangeListener &change = d->changeListeners.at(ii);
-        if (change.types & QSGItemPrivate::Geometry) {
-            QSGAnchorsPrivate *anchor = change.listener->anchorPrivate();
+        const QQuickItemPrivate::ChangeListener &change = d->changeListeners.at(ii);
+        if (change.types & QQuickItemPrivate::Geometry) {
+            QQuickAnchorsPrivate *anchor = change.listener->anchorPrivate();
             if (anchor)
                 anchor->updateVerticalAnchors();
         }
@@ -3033,20 +3033,20 @@ void QSGItem::setBaselineOffset(qreal offset)
     emit baselineOffsetChanged(offset);
 }
 
-void QSGItem::update()
+void QQuickItem::update()
 {
-    Q_D(QSGItem);
+    Q_D(QQuickItem);
     Q_ASSERT(flags() & ItemHasContents);
-    d->dirty(QSGItemPrivate::Content);
+    d->dirty(QQuickItemPrivate::Content);
 }
 
-void QSGItem::polish()
+void QQuickItem::polish()
 {
-    Q_D(QSGItem);
+    Q_D(QQuickItem);
     if (!d->polishScheduled) {
         d->polishScheduled = true;
         if (d->canvas) {
-            QSGCanvasPrivate *p = QSGCanvasPrivate::get(d->canvas);
+            QQuickCanvasPrivate *p = QQuickCanvasPrivate::get(d->canvas);
             bool maybeupdate = p->itemsToPolish.isEmpty();
             p->itemsToPolish.insert(this);
             if (maybeupdate) d->canvas->maybeUpdate();
@@ -3054,15 +3054,15 @@ void QSGItem::polish()
     }
 }
 
-void QSGItem::mapFromItem(QDeclarativeV8Function *args) const
+void QQuickItem::mapFromItem(QDeclarativeV8Function *args) const
 {
     if (args->Length() != 0) {
         v8::Local<v8::Value> item = (*args)[0];
         QV8Engine *engine = args->engine();
 
-        QSGItem *itemObj = 0;
+        QQuickItem *itemObj = 0;
         if (!item->IsNull())
-            itemObj = qobject_cast<QSGItem*>(engine->toQObject(item));
+            itemObj = qobject_cast<QQuickItem*>(engine->toQObject(item));
 
         if (!itemObj && !item->IsNull()) {
             qmlInfo(this) << "mapFromItem() given argument \"" << engine->toString(item->ToString())
@@ -3083,29 +3083,29 @@ void QSGItem::mapFromItem(QDeclarativeV8Function *args) const
     }
 }
 
-QTransform QSGItem::itemTransform(QSGItem *other, bool *ok) const
+QTransform QQuickItem::itemTransform(QQuickItem *other, bool *ok) const
 {
-    Q_D(const QSGItem);
+    Q_D(const QQuickItem);
 
     // XXX todo - we need to be able to handle common parents better and detect
     // invalid cases
     if (ok) *ok = true;
 
     QTransform t = d->itemToCanvasTransform();
-    if (other) t *= QSGItemPrivate::get(other)->canvasToItemTransform();
+    if (other) t *= QQuickItemPrivate::get(other)->canvasToItemTransform();
 
     return t;
 }
 
-void QSGItem::mapToItem(QDeclarativeV8Function *args) const
+void QQuickItem::mapToItem(QDeclarativeV8Function *args) const
 {
     if (args->Length() != 0) {
         v8::Local<v8::Value> item = (*args)[0];
         QV8Engine *engine = args->engine();
 
-        QSGItem *itemObj = 0;
+        QQuickItem *itemObj = 0;
         if (!item->IsNull())
-            itemObj = qobject_cast<QSGItem*>(engine->toQObject(item));
+            itemObj = qobject_cast<QQuickItem*>(engine->toQObject(item));
 
         if (!itemObj && !item->IsNull()) {
             qmlInfo(this) << "mapToItem() given argument \"" << engine->toString(item->ToString())
@@ -3126,24 +3126,24 @@ void QSGItem::mapToItem(QDeclarativeV8Function *args) const
     }
 }
 
-void QSGItem::forceActiveFocus()
+void QQuickItem::forceActiveFocus()
 {
     setFocus(true);
-    QSGItem *parent = parentItem();
+    QQuickItem *parent = parentItem();
     while (parent) {
-        if (parent->flags() & QSGItem::ItemIsFocusScope) {
+        if (parent->flags() & QQuickItem::ItemIsFocusScope) {
             parent->setFocus(true);
         }
         parent = parent->parentItem();
     }
 }
 
-QSGItem *QSGItem::childAt(qreal x, qreal y) const
+QQuickItem *QQuickItem::childAt(qreal x, qreal y) const
 {
     // XXX todo - should this include transform etc.?
-    const QList<QSGItem *> children = childItems();
+    const QList<QQuickItem *> children = childItems();
     for (int i = children.count()-1; i >= 0; --i) {
-        QSGItem *child = children.at(i);
+        QQuickItem *child = children.at(i);
         if (child->isVisible() && child->x() <= x
                 && child->x() + child->width() >= x
                 && child->y() <= y
@@ -3153,34 +3153,34 @@ QSGItem *QSGItem::childAt(qreal x, qreal y) const
     return 0;
 }
 
-QDeclarativeListProperty<QObject> QSGItemPrivate::resources()
+QDeclarativeListProperty<QObject> QQuickItemPrivate::resources()
 {
-    return QDeclarativeListProperty<QObject>(q_func(), 0, QSGItemPrivate::resources_append,
-                                             QSGItemPrivate::resources_count,
-                                             QSGItemPrivate::resources_at,
-                                             QSGItemPrivate::resources_clear);
+    return QDeclarativeListProperty<QObject>(q_func(), 0, QQuickItemPrivate::resources_append,
+                                             QQuickItemPrivate::resources_count,
+                                             QQuickItemPrivate::resources_at,
+                                             QQuickItemPrivate::resources_clear);
 }
 
-QDeclarativeListProperty<QSGItem> QSGItemPrivate::children()
+QDeclarativeListProperty<QQuickItem> QQuickItemPrivate::children()
 {
-    return QDeclarativeListProperty<QSGItem>(q_func(), 0, QSGItemPrivate::children_append,
-                                             QSGItemPrivate::children_count,
-                                             QSGItemPrivate::children_at,
-                                             QSGItemPrivate::children_clear);
+    return QDeclarativeListProperty<QQuickItem>(q_func(), 0, QQuickItemPrivate::children_append,
+                                             QQuickItemPrivate::children_count,
+                                             QQuickItemPrivate::children_at,
+                                             QQuickItemPrivate::children_clear);
 
 }
 
-QDeclarativeListProperty<QDeclarativeState> QSGItemPrivate::states()
+QDeclarativeListProperty<QDeclarativeState> QQuickItemPrivate::states()
 {
     return _states()->statesProperty();
 }
 
-QDeclarativeListProperty<QDeclarativeTransition> QSGItemPrivate::transitions()
+QDeclarativeListProperty<QDeclarativeTransition> QQuickItemPrivate::transitions()
 {
     return _states()->transitionsProperty();
 }
 
-QString QSGItemPrivate::state() const
+QString QQuickItemPrivate::state() const
 {
     if (!_stateGroup)
         return QString();
@@ -3188,33 +3188,33 @@ QString QSGItemPrivate::state() const
         return _stateGroup->state();
 }
 
-void QSGItemPrivate::setState(const QString &state)
+void QQuickItemPrivate::setState(const QString &state)
 {
     _states()->setState(state);
 }
 
-QString QSGItem::state() const
+QString QQuickItem::state() const
 {
-    Q_D(const QSGItem);
+    Q_D(const QQuickItem);
     return d->state();
 }
 
-void QSGItem::setState(const QString &state)
+void QQuickItem::setState(const QString &state)
 {
-    Q_D(QSGItem);
+    Q_D(QQuickItem);
     d->setState(state);
 }
 
-QDeclarativeListProperty<QSGTransform> QSGItem::transform()
+QDeclarativeListProperty<QQuickTransform> QQuickItem::transform()
 {
-    Q_D(QSGItem);
-    return QDeclarativeListProperty<QSGTransform>(this, 0, d->transform_append, d->transform_count,
+    Q_D(QQuickItem);
+    return QDeclarativeListProperty<QQuickTransform>(this, 0, d->transform_append, d->transform_count,
                                                   d->transform_at, d->transform_clear);
 }
 
-void QSGItem::classBegin()
+void QQuickItem::classBegin()
 {
-    Q_D(QSGItem);
+    Q_D(QQuickItem);
     d->componentComplete = false;
     if (d->_stateGroup)
         d->_stateGroup->classBegin();
@@ -3222,15 +3222,15 @@ void QSGItem::classBegin()
         d->_anchors->classBegin();
 }
 
-void QSGItem::componentComplete()
+void QQuickItem::componentComplete()
 {
-    Q_D(QSGItem);
+    Q_D(QQuickItem);
     d->componentComplete = true;
     if (d->_stateGroup)
         d->_stateGroup->componentComplete();
     if (d->_anchors) {
         d->_anchors->componentComplete();
-        QSGAnchorsPrivate::get(d->_anchors)->updateOnComplete();
+        QQuickAnchorsPrivate::get(d->_anchors)->updateOnComplete();
     }
     if (d->keyHandler)
         d->keyHandler->componentComplete();
@@ -3238,9 +3238,9 @@ void QSGItem::componentComplete()
         d->_contents->complete();
 }
 
-QDeclarativeStateGroup *QSGItemPrivate::_states()
+QDeclarativeStateGroup *QQuickItemPrivate::_states()
 {
-    Q_Q(QSGItem);
+    Q_Q(QQuickItem);
     if (!_stateGroup) {
         _stateGroup = new QDeclarativeStateGroup;
         if (!componentComplete)
@@ -3252,56 +3252,56 @@ QDeclarativeStateGroup *QSGItemPrivate::_states()
     return _stateGroup;
 }
 
-QSGItemPrivate::AnchorLines::AnchorLines(QSGItem *q)
+QQuickItemPrivate::AnchorLines::AnchorLines(QQuickItem *q)
 {
     left.item = q;
-    left.anchorLine = QSGAnchorLine::Left;
+    left.anchorLine = QQuickAnchorLine::Left;
     right.item = q;
-    right.anchorLine = QSGAnchorLine::Right;
+    right.anchorLine = QQuickAnchorLine::Right;
     hCenter.item = q;
-    hCenter.anchorLine = QSGAnchorLine::HCenter;
+    hCenter.anchorLine = QQuickAnchorLine::HCenter;
     top.item = q;
-    top.anchorLine = QSGAnchorLine::Top;
+    top.anchorLine = QQuickAnchorLine::Top;
     bottom.item = q;
-    bottom.anchorLine = QSGAnchorLine::Bottom;
+    bottom.anchorLine = QQuickAnchorLine::Bottom;
     vCenter.item = q;
-    vCenter.anchorLine = QSGAnchorLine::VCenter;
+    vCenter.anchorLine = QQuickAnchorLine::VCenter;
     baseline.item = q;
-    baseline.anchorLine = QSGAnchorLine::Baseline;
+    baseline.anchorLine = QQuickAnchorLine::Baseline;
 }
 
-QPointF QSGItemPrivate::computeTransformOrigin() const
+QPointF QQuickItemPrivate::computeTransformOrigin() const
 {
     switch (origin) {
     default:
-    case QSGItem::TopLeft:
+    case QQuickItem::TopLeft:
         return QPointF(0, 0);
-    case QSGItem::Top:
+    case QQuickItem::Top:
         return QPointF(width / 2., 0);
-    case QSGItem::TopRight:
+    case QQuickItem::TopRight:
         return QPointF(width, 0);
-    case QSGItem::Left:
+    case QQuickItem::Left:
         return QPointF(0, height / 2.);
-    case QSGItem::Center:
+    case QQuickItem::Center:
         return QPointF(width / 2., height / 2.);
-    case QSGItem::Right:
+    case QQuickItem::Right:
         return QPointF(width, height / 2.);
-    case QSGItem::BottomLeft:
+    case QQuickItem::BottomLeft:
         return QPointF(0, height);
-    case QSGItem::Bottom:
+    case QQuickItem::Bottom:
         return QPointF(width / 2., height);
-    case QSGItem::BottomRight:
+    case QQuickItem::BottomRight:
         return QPointF(width, height);
     }
 }
 
-void QSGItemPrivate::transformChanged()
+void QQuickItemPrivate::transformChanged()
 {
 }
 
-void QSGItemPrivate::deliverKeyEvent(QKeyEvent *e)
+void QQuickItemPrivate::deliverKeyEvent(QKeyEvent *e)
 {
-    Q_Q(QSGItem);
+    Q_Q(QQuickItem);
 
     Q_ASSERT(e->isAccepted());
     if (keyHandler) {
@@ -3334,9 +3334,9 @@ void QSGItemPrivate::deliverKeyEvent(QKeyEvent *e)
     }
 }
 
-void QSGItemPrivate::deliverInputMethodEvent(QInputMethodEvent *e)
+void QQuickItemPrivate::deliverInputMethodEvent(QInputMethodEvent *e)
 {
-    Q_Q(QSGItem);
+    Q_Q(QQuickItem);
 
     Q_ASSERT(e->isAccepted());
     if (keyHandler) {
@@ -3360,9 +3360,9 @@ void QSGItemPrivate::deliverInputMethodEvent(QInputMethodEvent *e)
     }
 }
 
-void QSGItemPrivate::deliverFocusEvent(QFocusEvent *e)
+void QQuickItemPrivate::deliverFocusEvent(QFocusEvent *e)
 {
-    Q_Q(QSGItem);
+    Q_Q(QQuickItem);
 
     if (e->type() == QEvent::FocusIn) {
         q->focusInEvent(e);
@@ -3371,9 +3371,9 @@ void QSGItemPrivate::deliverFocusEvent(QFocusEvent *e)
     }
 }
 
-void QSGItemPrivate::deliverMouseEvent(QMouseEvent *e)
+void QQuickItemPrivate::deliverMouseEvent(QMouseEvent *e)
 {
-    Q_Q(QSGItem);
+    Q_Q(QQuickItem);
 
     Q_ASSERT(e->isAccepted());
 
@@ -3395,21 +3395,21 @@ void QSGItemPrivate::deliverMouseEvent(QMouseEvent *e)
     }
 }
 
-void QSGItemPrivate::deliverWheelEvent(QWheelEvent *e)
+void QQuickItemPrivate::deliverWheelEvent(QWheelEvent *e)
 {
-    Q_Q(QSGItem);
+    Q_Q(QQuickItem);
     q->wheelEvent(e);
 }
 
-void QSGItemPrivate::deliverTouchEvent(QTouchEvent *e)
+void QQuickItemPrivate::deliverTouchEvent(QTouchEvent *e)
 {
-    Q_Q(QSGItem);
+    Q_Q(QQuickItem);
     q->touchEvent(e);
 }
 
-void QSGItemPrivate::deliverHoverEvent(QHoverEvent *e)
+void QQuickItemPrivate::deliverHoverEvent(QHoverEvent *e)
 {
-    Q_Q(QSGItem);
+    Q_Q(QQuickItem);
     switch (e->type()) {
     default:
         Q_ASSERT(!"Unknown event type");
@@ -3425,9 +3425,9 @@ void QSGItemPrivate::deliverHoverEvent(QHoverEvent *e)
     }
 }
 
-void QSGItemPrivate::deliverDragEvent(QEvent *e)
+void QQuickItemPrivate::deliverDragEvent(QEvent *e)
 {
-    Q_Q(QSGItem);
+    Q_Q(QQuickItem);
     switch (e->type()) {
     default:
         Q_ASSERT(!"Unknown event type");
@@ -3446,7 +3446,7 @@ void QSGItemPrivate::deliverDragEvent(QEvent *e)
     }
 }
 
-void QSGItem::itemChange(ItemChange change, const ItemChangeData &value)
+void QQuickItem::itemChange(ItemChange change, const ItemChangeData &value)
 {
     Q_UNUSED(change);
     Q_UNUSED(value);
@@ -3455,65 +3455,65 @@ void QSGItem::itemChange(ItemChange change, const ItemChangeData &value)
 /*! \internal */
 // XXX todo - do we want/need this anymore?
 // Note that it's now used for varying clip rect
-QRectF QSGItem::boundingRect() const
+QRectF QQuickItem::boundingRect() const
 {
-    Q_D(const QSGItem);
+    Q_D(const QQuickItem);
     return QRectF(0, 0, d->width, d->height);
 }
 
-QSGItem::TransformOrigin QSGItem::transformOrigin() const
+QQuickItem::TransformOrigin QQuickItem::transformOrigin() const
 {
-    Q_D(const QSGItem);
+    Q_D(const QQuickItem);
     return d->origin;
 }
 
-void QSGItem::setTransformOrigin(TransformOrigin origin)
+void QQuickItem::setTransformOrigin(TransformOrigin origin)
 {
-    Q_D(QSGItem);
+    Q_D(QQuickItem);
     if (origin == d->origin)
         return;
 
     d->origin = origin;
-    d->dirty(QSGItemPrivate::TransformOrigin);
+    d->dirty(QQuickItemPrivate::TransformOrigin);
 
     emit transformOriginChanged(d->origin);
 }
 
-QPointF QSGItem::transformOriginPoint() const
+QPointF QQuickItem::transformOriginPoint() const
 {
-    Q_D(const QSGItem);
+    Q_D(const QQuickItem);
     if (!d->transformOriginPoint.isNull())
         return d->transformOriginPoint;
     return d->computeTransformOrigin();
 }
 
-void QSGItem::setTransformOriginPoint(const QPointF &point)
+void QQuickItem::setTransformOriginPoint(const QPointF &point)
 {
-    Q_D(QSGItem);
+    Q_D(QQuickItem);
     if (d->transformOriginPoint == point)
         return;
 
     d->transformOriginPoint = point;
-    d->dirty(QSGItemPrivate::TransformOrigin);
+    d->dirty(QQuickItemPrivate::TransformOrigin);
 }
 
-qreal QSGItem::z() const
+qreal QQuickItem::z() const
 {
-    Q_D(const QSGItem);
+    Q_D(const QQuickItem);
     return d->z;
 }
 
-void QSGItem::setZ(qreal v)
+void QQuickItem::setZ(qreal v)
 {
-    Q_D(QSGItem);
+    Q_D(QQuickItem);
     if (d->z == v)
         return;
 
     d->z = v;
 
-    d->dirty(QSGItemPrivate::ZValue);
+    d->dirty(QQuickItemPrivate::ZValue);
     if (d->parentItem)
-        QSGItemPrivate::get(d->parentItem)->dirty(QSGItemPrivate::ChildrenStackingChanged);
+        QQuickItemPrivate::get(d->parentItem)->dirty(QQuickItemPrivate::ChildrenStackingChanged);
 
     emit zChanged();
 }
@@ -3645,76 +3645,76 @@ void QSGItem::setZ(qreal v)
   \sa setKeepMouseGrab()
  */
 
-qreal QSGItem::rotation() const
+qreal QQuickItem::rotation() const
 {
-    Q_D(const QSGItem);
+    Q_D(const QQuickItem);
     return d->rotation;
 }
 
-void QSGItem::setRotation(qreal r)
+void QQuickItem::setRotation(qreal r)
 {
-    Q_D(QSGItem);
+    Q_D(QQuickItem);
     if (d->rotation == r)
         return;
 
     d->rotation = r;
 
-    d->dirty(QSGItemPrivate::BasicTransform);
+    d->dirty(QQuickItemPrivate::BasicTransform);
 
     d->itemChange(ItemRotationHasChanged, r);
 
     emit rotationChanged();
 }
 
-qreal QSGItem::scale() const
+qreal QQuickItem::scale() const
 {
-    Q_D(const QSGItem);
+    Q_D(const QQuickItem);
     return d->scale;
 }
 
-void QSGItem::setScale(qreal s)
+void QQuickItem::setScale(qreal s)
 {
-    Q_D(QSGItem);
+    Q_D(QQuickItem);
     if (d->scale == s)
         return;
 
     d->scale = s;
 
-    d->dirty(QSGItemPrivate::BasicTransform);
+    d->dirty(QQuickItemPrivate::BasicTransform);
 
     emit scaleChanged();
 }
 
-qreal QSGItem::opacity() const
+qreal QQuickItem::opacity() const
 {
-    Q_D(const QSGItem);
+    Q_D(const QQuickItem);
     return d->opacity;
 }
 
-void QSGItem::setOpacity(qreal o)
+void QQuickItem::setOpacity(qreal o)
 {
-    Q_D(QSGItem);
+    Q_D(QQuickItem);
     if (d->opacity == o)
         return;
 
     d->opacity = o;
 
-    d->dirty(QSGItemPrivate::OpacityValue);
+    d->dirty(QQuickItemPrivate::OpacityValue);
 
     d->itemChange(ItemOpacityHasChanged, o);
 
     emit opacityChanged();
 }
 
-bool QSGItem::isVisible() const
+bool QQuickItem::isVisible() const
 {
-    Q_D(const QSGItem);
+    Q_D(const QQuickItem);
     return d->effectiveVisible;
 }
 
-void QSGItem::setVisible(bool v)
+void QQuickItem::setVisible(bool v)
 {
-    Q_D(QSGItem);
+    Q_D(QQuickItem);
     if (v == d->explicitVisible)
         return;
 
@@ -3723,15 +3723,15 @@ void QSGItem::setVisible(bool v)
     d->setEffectiveVisibleRecur(d->calcEffectiveVisible());
 }
 
-bool QSGItem::isEnabled() const
+bool QQuickItem::isEnabled() const
 {
-    Q_D(const QSGItem);
+    Q_D(const QQuickItem);
     return d->effectiveEnable;
 }
 
-void QSGItem::setEnabled(bool e)
+void QQuickItem::setEnabled(bool e)
 {
-    Q_D(QSGItem);
+    Q_D(QQuickItem);
     if (e == d->explicitEnable)
         return;
 
@@ -3740,17 +3740,17 @@ void QSGItem::setEnabled(bool e)
     d->setEffectiveEnableRecur(d->calcEffectiveEnable());
 }
 
-bool QSGItemPrivate::calcEffectiveVisible() const
+bool QQuickItemPrivate::calcEffectiveVisible() const
 {
     // XXX todo - Should the effective visible of an element with no parent just be the current
     // effective visible?  This would prevent pointless re-processing in the case of an element
     // moving to/from a no-parent situation, but it is different from what graphics view does.
-    return explicitVisible && (!parentItem || QSGItemPrivate::get(parentItem)->effectiveVisible);
+    return explicitVisible && (!parentItem || QQuickItemPrivate::get(parentItem)->effectiveVisible);
 }
 
-void QSGItemPrivate::setEffectiveVisibleRecur(bool newEffectiveVisible)
+void QQuickItemPrivate::setEffectiveVisibleRecur(bool newEffectiveVisible)
 {
-    Q_Q(QSGItem);
+    Q_Q(QQuickItem);
 
     if (newEffectiveVisible && !explicitVisible) {
         // This item locally overrides visibility
@@ -3764,37 +3764,37 @@ void QSGItemPrivate::setEffectiveVisibleRecur(bool newEffectiveVisible)
 
     effectiveVisible = newEffectiveVisible;
     dirty(Visible);
-    if (parentItem) QSGItemPrivate::get(parentItem)->dirty(ChildrenStackingChanged);
+    if (parentItem) QQuickItemPrivate::get(parentItem)->dirty(ChildrenStackingChanged);
 
     if (canvas) {
-        QSGCanvasPrivate *canvasPriv = QSGCanvasPrivate::get(canvas);
+        QQuickCanvasPrivate *canvasPriv = QQuickCanvasPrivate::get(canvas);
         if (canvasPriv->mouseGrabberItem == q)
             q->ungrabMouse();
     }
 
     for (int ii = 0; ii < childItems.count(); ++ii)
-        QSGItemPrivate::get(childItems.at(ii))->setEffectiveVisibleRecur(newEffectiveVisible);
+        QQuickItemPrivate::get(childItems.at(ii))->setEffectiveVisibleRecur(newEffectiveVisible);
 
     for (int ii = 0; ii < changeListeners.count(); ++ii) {
-        const QSGItemPrivate::ChangeListener &change = changeListeners.at(ii);
-        if (change.types & QSGItemPrivate::Visibility)
+        const QQuickItemPrivate::ChangeListener &change = changeListeners.at(ii);
+        if (change.types & QQuickItemPrivate::Visibility)
             change.listener->itemVisibilityChanged(q);
     }
 
     emit q->visibleChanged();
 }
 
-bool QSGItemPrivate::calcEffectiveEnable() const
+bool QQuickItemPrivate::calcEffectiveEnable() const
 {
     // XXX todo - Should the effective enable of an element with no parent just be the current
     // effective enable?  This would prevent pointless re-processing in the case of an element
     // moving to/from a no-parent situation, but it is different from what graphics view does.
-    return explicitEnable && (!parentItem || QSGItemPrivate::get(parentItem)->effectiveEnable);
+    return explicitEnable && (!parentItem || QQuickItemPrivate::get(parentItem)->effectiveEnable);
 }
 
-void QSGItemPrivate::setEffectiveEnableRecur(bool newEffectiveEnable)
+void QQuickItemPrivate::setEffectiveEnableRecur(bool newEffectiveEnable)
 {
-    Q_Q(QSGItem);
+    Q_Q(QQuickItem);
 
     // XXX todo - need to fixup focus
 
@@ -3811,18 +3811,18 @@ void QSGItemPrivate::setEffectiveEnableRecur(bool newEffectiveEnable)
     effectiveEnable = newEffectiveEnable;
 
     if (canvas) {
-        QSGCanvasPrivate *canvasPriv = QSGCanvasPrivate::get(canvas);
+        QQuickCanvasPrivate *canvasPriv = QQuickCanvasPrivate::get(canvas);
         if (canvasPriv->mouseGrabberItem == q)
             q->ungrabMouse();
     }
 
     for (int ii = 0; ii < childItems.count(); ++ii)
-        QSGItemPrivate::get(childItems.at(ii))->setEffectiveEnableRecur(newEffectiveEnable);
+        QQuickItemPrivate::get(childItems.at(ii))->setEffectiveEnableRecur(newEffectiveEnable);
 
     emit q->enabledChanged();
 }
 
-QString QSGItemPrivate::dirtyToString() const
+QString QQuickItemPrivate::dirtyToString() const
 {
 #define DIRTY_TO_STRING(value) if (dirtyAttributes & value) { \
     if (!rv.isEmpty()) \
@@ -3854,9 +3854,9 @@ QString QSGItemPrivate::dirtyToString() const
     return rv;
 }
 
-void QSGItemPrivate::dirty(DirtyType type)
+void QQuickItemPrivate::dirty(DirtyType type)
 {
-    Q_Q(QSGItem);
+    Q_Q(QQuickItem);
     if (type & (TransformOrigin | Transform | BasicTransform | Position | Size))
         transformChanged();
 
@@ -3864,22 +3864,22 @@ void QSGItemPrivate::dirty(DirtyType type)
         dirtyAttributes |= type;
         if (canvas) {
             addToDirtyList();
-            QSGCanvasPrivate::get(canvas)->dirtyItem(q);
+            QQuickCanvasPrivate::get(canvas)->dirtyItem(q);
         }
     }
 }
 
-void QSGItemPrivate::addToDirtyList()
+void QQuickItemPrivate::addToDirtyList()
 {
-    Q_Q(QSGItem);
+    Q_Q(QQuickItem);
 
     Q_ASSERT(canvas);
     if (!prevDirtyItem) {
         Q_ASSERT(!nextDirtyItem);
 
-        QSGCanvasPrivate *p = QSGCanvasPrivate::get(canvas);
+        QQuickCanvasPrivate *p = QQuickCanvasPrivate::get(canvas);
         nextDirtyItem = p->dirtyItemList;
-        if (nextDirtyItem) QSGItemPrivate::get(nextDirtyItem)->prevDirtyItem = &nextDirtyItem;
+        if (nextDirtyItem) QQuickItemPrivate::get(nextDirtyItem)->prevDirtyItem = &nextDirtyItem;
         prevDirtyItem = &p->dirtyItemList;
         p->dirtyItemList = q;
         p->dirtyItem(q);
@@ -3887,10 +3887,10 @@ void QSGItemPrivate::addToDirtyList()
     Q_ASSERT(prevDirtyItem);
 }
 
-void QSGItemPrivate::removeFromDirtyList()
+void QQuickItemPrivate::removeFromDirtyList()
 {
     if (prevDirtyItem) {
-        if (nextDirtyItem) QSGItemPrivate::get(nextDirtyItem)->prevDirtyItem = prevDirtyItem;
+        if (nextDirtyItem) QQuickItemPrivate::get(nextDirtyItem)->prevDirtyItem = prevDirtyItem;
         *prevDirtyItem = nextDirtyItem;
         prevDirtyItem = 0;
         nextDirtyItem = 0;
@@ -3899,12 +3899,12 @@ void QSGItemPrivate::removeFromDirtyList()
     Q_ASSERT(!nextDirtyItem);
 }
 
-void QSGItemPrivate::refFromEffectItem(bool hide)
+void QQuickItemPrivate::refFromEffectItem(bool hide)
 {
     ++effectRefCount;
     if (1 == effectRefCount) {
         dirty(EffectReference);
-        if (parentItem) QSGItemPrivate::get(parentItem)->dirty(ChildrenStackingChanged);
+        if (parentItem) QQuickItemPrivate::get(parentItem)->dirty(ChildrenStackingChanged);
     }
     if (hide) {
         if (++hideRefCount == 1)
@@ -3912,13 +3912,13 @@ void QSGItemPrivate::refFromEffectItem(bool hide)
     }
 }
 
-void QSGItemPrivate::derefFromEffectItem(bool unhide)
+void QQuickItemPrivate::derefFromEffectItem(bool unhide)
 {
     Q_ASSERT(effectRefCount);
     --effectRefCount;
     if (0 == effectRefCount) {
         dirty(EffectReference);
-        if (parentItem) QSGItemPrivate::get(parentItem)->dirty(ChildrenStackingChanged);
+        if (parentItem) QQuickItemPrivate::get(parentItem)->dirty(ChildrenStackingChanged);
     }
     if (unhide) {
         if (--hideRefCount == 0)
@@ -3926,70 +3926,70 @@ void QSGItemPrivate::derefFromEffectItem(bool unhide)
     }
 }
 
-void QSGItemPrivate::itemChange(QSGItem::ItemChange change, const QSGItem::ItemChangeData &data)
+void QQuickItemPrivate::itemChange(QQuickItem::ItemChange change, const QQuickItem::ItemChangeData &data)
 {
-    Q_Q(QSGItem);
+    Q_Q(QQuickItem);
     switch (change) {
-    case QSGItem::ItemChildAddedChange:
+    case QQuickItem::ItemChildAddedChange:
         q->itemChange(change, data);
         if (_contents && componentComplete)
             _contents->childAdded(data.item);
         for (int ii = 0; ii < changeListeners.count(); ++ii) {
-            const QSGItemPrivate::ChangeListener &change = changeListeners.at(ii);
-            if (change.types & QSGItemPrivate::Children) {
+            const QQuickItemPrivate::ChangeListener &change = changeListeners.at(ii);
+            if (change.types & QQuickItemPrivate::Children) {
                 change.listener->itemChildAdded(q, data.item);
             }
         }
         break;
-    case QSGItem::ItemChildRemovedChange:
+    case QQuickItem::ItemChildRemovedChange:
         q->itemChange(change, data);
         if (_contents && componentComplete)
             _contents->childRemoved(data.item);
         for (int ii = 0; ii < changeListeners.count(); ++ii) {
-            const QSGItemPrivate::ChangeListener &change = changeListeners.at(ii);
-            if (change.types & QSGItemPrivate::Children) {
+            const QQuickItemPrivate::ChangeListener &change = changeListeners.at(ii);
+            if (change.types & QQuickItemPrivate::Children) {
                 change.listener->itemChildRemoved(q, data.item);
             }
         }
         break;
-    case QSGItem::ItemSceneChange:
+    case QQuickItem::ItemSceneChange:
         q->itemChange(change, data);
         break;
-    case QSGItem::ItemVisibleHasChanged:
+    case QQuickItem::ItemVisibleHasChanged:
         q->itemChange(change, data);
         for (int ii = 0; ii < changeListeners.count(); ++ii) {
-            const QSGItemPrivate::ChangeListener &change = changeListeners.at(ii);
-            if (change.types & QSGItemPrivate::Visibility) {
+            const QQuickItemPrivate::ChangeListener &change = changeListeners.at(ii);
+            if (change.types & QQuickItemPrivate::Visibility) {
                 change.listener->itemVisibilityChanged(q);
             }
         }
         break;
-    case QSGItem::ItemParentHasChanged:
+    case QQuickItem::ItemParentHasChanged:
         q->itemChange(change, data);
         for (int ii = 0; ii < changeListeners.count(); ++ii) {
-            const QSGItemPrivate::ChangeListener &change = changeListeners.at(ii);
-            if (change.types & QSGItemPrivate::Parent) {
+            const QQuickItemPrivate::ChangeListener &change = changeListeners.at(ii);
+            if (change.types & QQuickItemPrivate::Parent) {
                 change.listener->itemParentChanged(q, data.item);
             }
         }
         break;
-    case QSGItem::ItemOpacityHasChanged:
+    case QQuickItem::ItemOpacityHasChanged:
         q->itemChange(change, data);
         for (int ii = 0; ii < changeListeners.count(); ++ii) {
-            const QSGItemPrivate::ChangeListener &change = changeListeners.at(ii);
-            if (change.types & QSGItemPrivate::Opacity) {
+            const QQuickItemPrivate::ChangeListener &change = changeListeners.at(ii);
+            if (change.types & QQuickItemPrivate::Opacity) {
                 change.listener->itemOpacityChanged(q);
             }
         }
         break;
-    case QSGItem::ItemActiveFocusHasChanged:
+    case QQuickItem::ItemActiveFocusHasChanged:
         q->itemChange(change, data);
         break;
-    case QSGItem::ItemRotationHasChanged:
+    case QQuickItem::ItemRotationHasChanged:
         q->itemChange(change, data);
         for (int ii = 0; ii < changeListeners.count(); ++ii) {
-            const QSGItemPrivate::ChangeListener &change = changeListeners.at(ii);
-            if (change.types & QSGItemPrivate::Rotation) {
+            const QQuickItemPrivate::ChangeListener &change = changeListeners.at(ii);
+            if (change.types & QQuickItemPrivate::Rotation) {
                 change.listener->itemRotationChanged(q);
             }
         }
@@ -3998,7 +3998,7 @@ void QSGItemPrivate::itemChange(QSGItem::ItemChange change, const QSGItem::ItemC
 }
 
 /*!
-    \property QSGItem::smooth
+    \property QQuickItem::smooth
     \brief whether the item is smoothly transformed.
 
     This property is provided purely for the purpose of optimization. Turning
@@ -4016,9 +4016,9 @@ void QSGItemPrivate::itemChange(QSGItem::ItemChange change, const QSGItem::ItemC
 
     \sa setSmooth()
 */
-bool QSGItem::smooth() const
+bool QQuickItem::smooth() const
 {
-    Q_D(const QSGItem);
+    Q_D(const QQuickItem);
     return d->smooth;
 }
 
@@ -4028,104 +4028,104 @@ bool QSGItem::smooth() const
 
     \sa smooth()
 */
-void QSGItem::setSmooth(bool smooth)
+void QQuickItem::setSmooth(bool smooth)
 {
-    Q_D(QSGItem);
+    Q_D(QQuickItem);
     if (d->smooth == smooth)
         return;
 
     d->smooth = smooth;
-    d->dirty(QSGItemPrivate::Smooth);
+    d->dirty(QQuickItemPrivate::Smooth);
 
     emit smoothChanged(smooth);
 }
 
-QSGItem::Flags QSGItem::flags() const
+QQuickItem::Flags QQuickItem::flags() const
 {
-    Q_D(const QSGItem);
-    return (QSGItem::Flags)d->flags;
+    Q_D(const QQuickItem);
+    return (QQuickItem::Flags)d->flags;
 }
 
-void QSGItem::setFlag(Flag flag, bool enabled)
+void QQuickItem::setFlag(Flag flag, bool enabled)
 {
-    Q_D(QSGItem);
+    Q_D(QQuickItem);
     if (enabled)
         setFlags((Flags)(d->flags | (quint32)flag));
     else
         setFlags((Flags)(d->flags & ~(quint32)flag));
 }
 
-void QSGItem::setFlags(Flags flags)
+void QQuickItem::setFlags(Flags flags)
 {
-    Q_D(QSGItem);
+    Q_D(QQuickItem);
 
     if ((flags & ItemIsFocusScope) != (d->flags & ItemIsFocusScope)) {
         if (flags & ItemIsFocusScope && !d->childItems.isEmpty() && d->canvas) {
-            qWarning("QSGItem: Cannot set FocusScope once item has children and is in a canvas.");
+            qWarning("QQuickItem: Cannot set FocusScope once item has children and is in a canvas.");
             flags &= ~ItemIsFocusScope;
         } else if (d->flags & ItemIsFocusScope) {
-            qWarning("QSGItem: Cannot unset FocusScope flag.");
+            qWarning("QQuickItem: Cannot unset FocusScope flag.");
             flags |= ItemIsFocusScope;
         }
     }
 
     if ((flags & ItemClipsChildrenToShape ) != (d->flags & ItemClipsChildrenToShape))
-        d->dirty(QSGItemPrivate::Clip);
+        d->dirty(QQuickItemPrivate::Clip);
 
     d->flags = flags;
 }
 
-qreal QSGItem::x() const
+qreal QQuickItem::x() const
 {
-    Q_D(const QSGItem);
+    Q_D(const QQuickItem);
     return d->x;
 }
 
-qreal QSGItem::y() const
+qreal QQuickItem::y() const
 {
-    Q_D(const QSGItem);
+    Q_D(const QQuickItem);
     return d->y;
 }
 
-QPointF QSGItem::pos() const
+QPointF QQuickItem::pos() const
 {
-    Q_D(const QSGItem);
+    Q_D(const QQuickItem);
     return QPointF(d->x, d->y);
 }
 
-void QSGItem::setX(qreal v)
+void QQuickItem::setX(qreal v)
 {
-    Q_D(QSGItem);
+    Q_D(QQuickItem);
     if (d->x == v)
         return;
 
     qreal oldx = d->x;
     d->x = v;
 
-    d->dirty(QSGItemPrivate::Position);
+    d->dirty(QQuickItemPrivate::Position);
 
     geometryChanged(QRectF(x(), y(), width(), height()),
                     QRectF(oldx, y(), width(), height()));
 }
 
-void QSGItem::setY(qreal v)
+void QQuickItem::setY(qreal v)
 {
-    Q_D(QSGItem);
+    Q_D(QQuickItem);
     if (d->y == v)
         return;
 
     qreal oldy = d->y;
     d->y = v;
 
-    d->dirty(QSGItemPrivate::Position);
+    d->dirty(QQuickItemPrivate::Position);
 
     geometryChanged(QRectF(x(), y(), width(), height()),
                     QRectF(x(), oldy, width(), height()));
 }
 
-void QSGItem::setPos(const QPointF &pos)
+void QQuickItem::setPos(const QPointF &pos)
 {
-    Q_D(QSGItem);
+    Q_D(QQuickItem);
     if (QPointF(d->x, d->y) == pos)
         return;
 
@@ -4135,21 +4135,21 @@ void QSGItem::setPos(const QPointF &pos)
     d->x = pos.x();
     d->y = pos.y();
 
-    d->dirty(QSGItemPrivate::Position);
+    d->dirty(QQuickItemPrivate::Position);
 
     geometryChanged(QRectF(x(), y(), width(), height()),
                     QRectF(oldx, oldy, width(), height()));
 }
 
-qreal QSGItem::width() const
+qreal QQuickItem::width() const
 {
-    Q_D(const QSGItem);
+    Q_D(const QQuickItem);
     return d->width;
 }
 
-void QSGItem::setWidth(qreal w)
+void QQuickItem::setWidth(qreal w)
 {
-    Q_D(QSGItem);
+    Q_D(QQuickItem);
     if (qIsNaN(w))
         return;
 
@@ -4160,35 +4160,35 @@ void QSGItem::setWidth(qreal w)
     qreal oldWidth = d->width;
     d->width = w;
 
-    d->dirty(QSGItemPrivate::Size);
+    d->dirty(QQuickItemPrivate::Size);
 
     geometryChanged(QRectF(x(), y(), width(), height()),
                     QRectF(x(), y(), oldWidth, height()));
 }
 
-void QSGItem::resetWidth()
+void QQuickItem::resetWidth()
 {
-    Q_D(QSGItem);
+    Q_D(QQuickItem);
     d->widthValid = false;
     setImplicitWidth(implicitWidth());
 }
 
-void QSGItemPrivate::implicitWidthChanged()
+void QQuickItemPrivate::implicitWidthChanged()
 {
-    Q_Q(QSGItem);
+    Q_Q(QQuickItem);
     emit q->implicitWidthChanged();
 }
 
-qreal QSGItemPrivate::getImplicitWidth() const
+qreal QQuickItemPrivate::getImplicitWidth() const
 {
     return implicitWidth;
 }
 /*!
     Returns the width of the item that is implied by other properties that determine the content.
 */
-qreal QSGItem::implicitWidth() const
+qreal QQuickItem::implicitWidth() const
 {
-    Q_D(const QSGItem);
+    Q_D(const QQuickItem);
     return d->getImplicitWidth();
 }
 
@@ -4231,9 +4231,9 @@ qreal QSGItem::implicitWidth() const
     Sets the implied width of the item to \a w.
     This is the width implied by other properties that determine the content.
 */
-void QSGItem::setImplicitWidth(qreal w)
+void QQuickItem::setImplicitWidth(qreal w)
 {
-    Q_D(QSGItem);
+    Q_D(QQuickItem);
     bool changed = w != d->implicitWidth;
     d->implicitWidth = w;
     if (d->width == w || widthValid()) {
@@ -4245,7 +4245,7 @@ void QSGItem::setImplicitWidth(qreal w)
     qreal oldWidth = d->width;
     d->width = w;
 
-    d->dirty(QSGItemPrivate::Size);
+    d->dirty(QQuickItemPrivate::Size);
 
     geometryChanged(QRectF(x(), y(), width(), height()),
                     QRectF(x(), y(), oldWidth, height()));
@@ -4257,21 +4257,21 @@ void QSGItem::setImplicitWidth(qreal w)
 /*!
     Returns whether the width property has been set explicitly.
 */
-bool QSGItem::widthValid() const
+bool QQuickItem::widthValid() const
 {
-    Q_D(const QSGItem);
+    Q_D(const QQuickItem);
     return d->widthValid;
 }
 
-qreal QSGItem::height() const
+qreal QQuickItem::height() const
 {
-    Q_D(const QSGItem);
+    Q_D(const QQuickItem);
     return d->height;
 }
 
-void QSGItem::setHeight(qreal h)
+void QQuickItem::setHeight(qreal h)
 {
-    Q_D(QSGItem);
+    Q_D(QQuickItem);
     if (qIsNaN(h))
         return;
 
@@ -4282,26 +4282,26 @@ void QSGItem::setHeight(qreal h)
     qreal oldHeight = d->height;
     d->height = h;
 
-    d->dirty(QSGItemPrivate::Size);
+    d->dirty(QQuickItemPrivate::Size);
 
     geometryChanged(QRectF(x(), y(), width(), height()),
                     QRectF(x(), y(), width(), oldHeight));
 }
 
-void QSGItem::resetHeight()
+void QQuickItem::resetHeight()
 {
-    Q_D(QSGItem);
+    Q_D(QQuickItem);
     d->heightValid = false;
     setImplicitHeight(implicitHeight());
 }
 
-void QSGItemPrivate::implicitHeightChanged()
+void QQuickItemPrivate::implicitHeightChanged()
 {
-    Q_Q(QSGItem);
+    Q_Q(QQuickItem);
     emit q->implicitHeightChanged();
 }
 
-qreal QSGItemPrivate::getImplicitHeight() const
+qreal QQuickItemPrivate::getImplicitHeight() const
 {
     return implicitHeight;
 }
@@ -4309,9 +4309,9 @@ qreal QSGItemPrivate::getImplicitHeight() const
 /*!
     Returns the height of the item that is implied by other properties that determine the content.
 */
-qreal QSGItem::implicitHeight() const
+qreal QQuickItem::implicitHeight() const
 {
-    Q_D(const QSGItem);
+    Q_D(const QQuickItem);
     return d->getImplicitHeight();
 }
 
@@ -4320,9 +4320,9 @@ qreal QSGItem::implicitHeight() const
     Sets the implied height of the item to \a h.
     This is the height implied by other properties that determine the content.
 */
-void QSGItem::setImplicitHeight(qreal h)
+void QQuickItem::setImplicitHeight(qreal h)
 {
-    Q_D(QSGItem);
+    Q_D(QQuickItem);
     bool changed = h != d->implicitHeight;
     d->implicitHeight = h;
     if (d->height == h || heightValid()) {
@@ -4334,7 +4334,7 @@ void QSGItem::setImplicitHeight(qreal h)
     qreal oldHeight = d->height;
     d->height = h;
 
-    d->dirty(QSGItemPrivate::Size);
+    d->dirty(QQuickItemPrivate::Size);
 
     geometryChanged(QRectF(x(), y(), width(), height()),
                     QRectF(x(), y(), width(), oldHeight));
@@ -4346,15 +4346,15 @@ void QSGItem::setImplicitHeight(qreal h)
 /*!
     Returns whether the height property has been set explicitly.
 */
-bool QSGItem::heightValid() const
+bool QQuickItem::heightValid() const
 {
-    Q_D(const QSGItem);
+    Q_D(const QQuickItem);
     return d->heightValid;
 }
 
-void QSGItem::setSize(const QSizeF &size)
+void QQuickItem::setSize(const QSizeF &size)
 {
-    Q_D(QSGItem);
+    Q_D(QQuickItem);
     d->heightValid = true;
     d->widthValid = true;
 
@@ -4366,53 +4366,53 @@ void QSGItem::setSize(const QSizeF &size)
     d->height = size.height();
     d->width = size.width();
 
-    d->dirty(QSGItemPrivate::Size);
+    d->dirty(QQuickItemPrivate::Size);
 
     geometryChanged(QRectF(x(), y(), width(), height()),
                     QRectF(x(), y(), oldWidth, oldHeight));
 }
 
-bool QSGItem::hasActiveFocus() const
+bool QQuickItem::hasActiveFocus() const
 {
-    Q_D(const QSGItem);
+    Q_D(const QQuickItem);
     return d->activeFocus;
 }
 
-bool QSGItem::hasFocus() const
+bool QQuickItem::hasFocus() const
 {
-    Q_D(const QSGItem);
+    Q_D(const QQuickItem);
     return d->focus;
 }
 
-void QSGItem::setFocus(bool focus)
+void QQuickItem::setFocus(bool focus)
 {
-    Q_D(QSGItem);
+    Q_D(QQuickItem);
     if (d->focus == focus)
         return;
 
     if (d->canvas) {
         // Need to find our nearest focus scope
-        QSGItem *scope = parentItem();
+        QQuickItem *scope = parentItem();
         while (scope && !scope->isFocusScope())
             scope = scope->parentItem();
         if (focus)
-            QSGCanvasPrivate::get(d->canvas)->setFocusInScope(scope, this);
+            QQuickCanvasPrivate::get(d->canvas)->setFocusInScope(scope, this);
         else
-            QSGCanvasPrivate::get(d->canvas)->clearFocusInScope(scope, this);
+            QQuickCanvasPrivate::get(d->canvas)->clearFocusInScope(scope, this);
     } else {
         d->focus = focus;
         emit focusChanged(focus);
     }
 }
 
-bool QSGItem::isFocusScope() const
+bool QQuickItem::isFocusScope() const
 {
     return flags() & ItemIsFocusScope;
 }
 
-QSGItem *QSGItem::scopedFocusItem() const
+QQuickItem *QQuickItem::scopedFocusItem() const
 {
-    Q_D(const QSGItem);
+    Q_D(const QQuickItem);
     if (!isFocusScope())
         return 0;
     else
@@ -4420,33 +4420,33 @@ QSGItem *QSGItem::scopedFocusItem() const
 }
 
 
-Qt::MouseButtons QSGItem::acceptedMouseButtons() const
+Qt::MouseButtons QQuickItem::acceptedMouseButtons() const
 {
-    Q_D(const QSGItem);
+    Q_D(const QQuickItem);
     return d->acceptedMouseButtons;
 }
 
-void QSGItem::setAcceptedMouseButtons(Qt::MouseButtons buttons)
+void QQuickItem::setAcceptedMouseButtons(Qt::MouseButtons buttons)
 {
-    Q_D(QSGItem);
+    Q_D(QQuickItem);
     d->acceptedMouseButtons = buttons;
 }
 
-bool QSGItem::filtersChildMouseEvents() const
+bool QQuickItem::filtersChildMouseEvents() const
 {
-    Q_D(const QSGItem);
+    Q_D(const QQuickItem);
     return d->filtersChildMouseEvents;
 }
 
-void QSGItem::setFiltersChildMouseEvents(bool filter)
+void QQuickItem::setFiltersChildMouseEvents(bool filter)
 {
-    Q_D(QSGItem);
+    Q_D(QQuickItem);
     d->filtersChildMouseEvents = filter;
 }
 
-bool QSGItem::isUnderMouse() const
+bool QQuickItem::isUnderMouse() const
 {
-    Q_D(const QSGItem);
+    Q_D(const QQuickItem);
     if (!d->canvas)
         return false;
 
@@ -4456,41 +4456,41 @@ bool QSGItem::isUnderMouse() const
     return false;
 }
 
-bool QSGItem::acceptHoverEvents() const
+bool QQuickItem::acceptHoverEvents() const
 {
-    Q_D(const QSGItem);
+    Q_D(const QQuickItem);
     return d->hoverEnabled;
 }
 
-void QSGItem::setAcceptHoverEvents(bool enabled)
+void QQuickItem::setAcceptHoverEvents(bool enabled)
 {
-    Q_D(QSGItem);
+    Q_D(QQuickItem);
     d->hoverEnabled = enabled;
 }
 
-void QSGItem::grabMouse()
+void QQuickItem::grabMouse()
 {
-    Q_D(QSGItem);
+    Q_D(QQuickItem);
     if (!d->canvas)
         return;
-    QSGCanvasPrivate *canvasPriv = QSGCanvasPrivate::get(d->canvas);
+    QQuickCanvasPrivate *canvasPriv = QQuickCanvasPrivate::get(d->canvas);
     if (canvasPriv->mouseGrabberItem == this)
         return;
 
-    QSGItem *oldGrabber = canvasPriv->mouseGrabberItem;
+    QQuickItem *oldGrabber = canvasPriv->mouseGrabberItem;
     canvasPriv->mouseGrabberItem = this;
     if (oldGrabber)
         oldGrabber->mouseUngrabEvent();
 }
 
-void QSGItem::ungrabMouse()
+void QQuickItem::ungrabMouse()
 {
-    Q_D(QSGItem);
+    Q_D(QQuickItem);
     if (!d->canvas)
         return;
-    QSGCanvasPrivate *canvasPriv = QSGCanvasPrivate::get(d->canvas);
+    QQuickCanvasPrivate *canvasPriv = QQuickCanvasPrivate::get(d->canvas);
     if (canvasPriv->mouseGrabberItem != this) {
-        qWarning("QSGItem::ungrabMouse(): Item is not the mouse grabber.");
+        qWarning("QQuickItem::ungrabMouse(): Item is not the mouse grabber.");
         return;
     }
 
@@ -4498,9 +4498,9 @@ void QSGItem::ungrabMouse()
     mouseUngrabEvent();
 }
 
-bool QSGItem::keepMouseGrab() const
+bool QQuickItem::keepMouseGrab() const
 {
-    Q_D(const QSGItem);
+    Q_D(const QQuickItem);
     return d->keepMouse;
 }
 
@@ -4522,9 +4522,9 @@ bool QSGItem::keepMouseGrab() const
 
   \sa keepMouseGrab()
  */
-void QSGItem::setKeepMouseGrab(bool keep)
+void QQuickItem::setKeepMouseGrab(bool keep)
 {
-    Q_D(QSGItem);
+    Q_D(QQuickItem);
     d->keepMouse = keep;
 }
 
@@ -4548,7 +4548,7 @@ void QSGItem::setKeepMouseGrab(bool keep)
     If \a item is a \c null value, this maps \a x and \a y to the coordinate
     system of the root QML view.
 */
-QPointF QSGItem::mapToItem(const QSGItem *item, const QPointF &point) const
+QPointF QQuickItem::mapToItem(const QQuickItem *item, const QPointF &point) const
 {
     QPointF p = mapToScene(point);
     if (item)
@@ -4556,50 +4556,50 @@ QPointF QSGItem::mapToItem(const QSGItem *item, const QPointF &point) const
     return p;
 }
 
-QPointF QSGItem::mapToScene(const QPointF &point) const
+QPointF QQuickItem::mapToScene(const QPointF &point) const
 {
-    Q_D(const QSGItem);
+    Q_D(const QQuickItem);
     return d->itemToCanvasTransform().map(point);
 }
 
-QRectF QSGItem::mapRectToItem(const QSGItem *item, const QRectF &rect) const
+QRectF QQuickItem::mapRectToItem(const QQuickItem *item, const QRectF &rect) const
 {
-    Q_D(const QSGItem);
+    Q_D(const QQuickItem);
     QTransform t = d->itemToCanvasTransform();
     if (item)
-        t *= QSGItemPrivate::get(item)->canvasToItemTransform();
+        t *= QQuickItemPrivate::get(item)->canvasToItemTransform();
     return t.mapRect(rect);
 }
 
-QRectF QSGItem::mapRectToScene(const QRectF &rect) const
+QRectF QQuickItem::mapRectToScene(const QRectF &rect) const
 {
-    Q_D(const QSGItem);
+    Q_D(const QQuickItem);
     return d->itemToCanvasTransform().mapRect(rect);
 }
 
-QPointF QSGItem::mapFromItem(const QSGItem *item, const QPointF &point) const
+QPointF QQuickItem::mapFromItem(const QQuickItem *item, const QPointF &point) const
 {
     QPointF p = item?item->mapToScene(point):point;
     return mapFromScene(p);
 }
 
-QPointF QSGItem::mapFromScene(const QPointF &point) const
+QPointF QQuickItem::mapFromScene(const QPointF &point) const
 {
-    Q_D(const QSGItem);
+    Q_D(const QQuickItem);
     return d->canvasToItemTransform().map(point);
 }
 
-QRectF QSGItem::mapRectFromItem(const QSGItem *item, const QRectF &rect) const
+QRectF QQuickItem::mapRectFromItem(const QQuickItem *item, const QRectF &rect) const
 {
-    Q_D(const QSGItem);
-    QTransform t = item?QSGItemPrivate::get(item)->itemToCanvasTransform():QTransform();
+    Q_D(const QQuickItem);
+    QTransform t = item?QQuickItemPrivate::get(item)->itemToCanvasTransform():QTransform();
     t *= d->canvasToItemTransform();
     return t.mapRect(rect);
 }
 
-QRectF QSGItem::mapRectFromScene(const QRectF &rect) const
+QRectF QQuickItem::mapRectFromScene(const QRectF &rect) const
 {
-    Q_D(const QSGItem);
+    Q_D(const QQuickItem);
     return d->canvasToItemTransform().mapRect(rect);
 }
 
@@ -4708,7 +4708,7 @@ QRectF QSGItem::mapRectFromScene(const QRectF &rect) const
 */
 
 /*!
-  \property QSGItem::clip
+  \property QQuickItem::clip
   This property holds whether clipping is enabled. The default clip value is \c false.
 
   If clipping is enabled, an item will clip its own painting, as well
@@ -4751,7 +4751,7 @@ QRectF QSGItem::mapRectFromScene(const QRectF &rect) const
 */
 
 /*!
-    \enum QSGItem::TransformOrigin
+    \enum QQuickItem::TransformOrigin
 
     Controls the point about which simple transforms like scale apply.
 
@@ -4826,100 +4826,100 @@ QRectF QSGItem::mapRectFromScene(const QRectF &rect) const
 
 
 /*!
-  \property QSGItem::anchors
+  \property QQuickItem::anchors
   \internal
 */
 
 /*!
-  \property QSGItem::left
+  \property QQuickItem::left
   \internal
 */
 
 /*!
-  \property QSGItem::right
+  \property QQuickItem::right
   \internal
 */
 
 /*!
-  \property QSGItem::horizontalCenter
+  \property QQuickItem::horizontalCenter
   \internal
 */
 
 /*!
-  \property QSGItem::top
+  \property QQuickItem::top
   \internal
 */
 
 /*!
-  \property QSGItem::bottom
+  \property QQuickItem::bottom
   \internal
 */
 
 /*!
-  \property QSGItem::verticalCenter
+  \property QQuickItem::verticalCenter
   \internal
 */
 
 /*!
-  \property QSGItem::focus
+  \property QQuickItem::focus
   \internal
 */
 
 /*!
-  \property QSGItem::transform
+  \property QQuickItem::transform
   \internal
 */
 
 /*!
-  \property QSGItem::transformOrigin
+  \property QQuickItem::transformOrigin
   \internal
 */
 
 /*!
-  \property QSGItem::activeFocus
+  \property QQuickItem::activeFocus
   \internal
 */
 
 /*!
-  \property QSGItem::baseline
+  \property QQuickItem::baseline
   \internal
 */
 
 /*!
-  \property QSGItem::data
+  \property QQuickItem::data
   \internal
 */
 
 /*!
-  \property QSGItem::resources
+  \property QQuickItem::resources
   \internal
 */
 
 /*!
-  \property QSGItem::state
+  \property QQuickItem::state
   \internal
 */
 
 /*!
-  \property QSGItem::states
+  \property QQuickItem::states
   \internal
 */
 
 /*!
-  \property QSGItem::transformOriginPoint
+  \property QQuickItem::transformOriginPoint
   \internal
 */
 
 /*!
-  \property QSGItem::transitions
+  \property QQuickItem::transitions
   \internal
 */
 
-bool QSGItem::event(QEvent *ev)
+bool QQuickItem::event(QEvent *ev)
 {
 #if 0
     if (ev->type() == QEvent::PolishRequest) {
-        Q_D(QSGItem);
+        Q_D(QQuickItem);
         d->polishScheduled = false;
         updatePolish();
         return true;
@@ -4947,10 +4947,10 @@ bool QSGItem::event(QEvent *ev)
 }
 
 #ifndef QT_NO_DEBUG_STREAM
-QDebug operator<<(QDebug debug, QSGItem *item)
+QDebug operator<<(QDebug debug, QQuickItem *item)
 {
     if (!item) {
-        debug << "QSGItem(0)";
+        debug << "QQuickItem(0)";
         return debug;
     }
 
@@ -4963,8 +4963,8 @@ QDebug operator<<(QDebug debug, QSGItem *item)
 }
 #endif
 
-qint64 QSGItemPrivate::consistentTime = -1;
-void QSGItemPrivate::setConsistentTime(qint64 t)
+qint64 QQuickItemPrivate::consistentTime = -1;
+void QQuickItemPrivate::setConsistentTime(qint64 t)
 {
     consistentTime = t;
 }
@@ -4973,15 +4973,15 @@ class QElapsedTimerConsistentTimeHack
 {
 public:
     void start() {
-        t1 = QSGItemPrivate::consistentTime;
+        t1 = QQuickItemPrivate::consistentTime;
         t2 = 0;
     }
     qint64 elapsed() {
-        return QSGItemPrivate::consistentTime - t1;
+        return QQuickItemPrivate::consistentTime - t1;
     }
     qint64 restart() {
-        qint64 val = QSGItemPrivate::consistentTime - t1;
-        t1 = QSGItemPrivate::consistentTime;
+        qint64 val = QQuickItemPrivate::consistentTime - t1;
+        t1 = QQuickItemPrivate::consistentTime;
         t2 = 0;
         return val;
     }
@@ -4991,32 +4991,32 @@ private:
     qint64 t2;
 };
 
-void QSGItemPrivate::start(QElapsedTimer &t)
+void QQuickItemPrivate::start(QElapsedTimer &t)
 {
-    if (QSGItemPrivate::consistentTime == -1)
+    if (QQuickItemPrivate::consistentTime == -1)
         t.start();
     else
         ((QElapsedTimerConsistentTimeHack*)&t)->start();
 }
 
-qint64 QSGItemPrivate::elapsed(QElapsedTimer &t)
+qint64 QQuickItemPrivate::elapsed(QElapsedTimer &t)
 {
-    if (QSGItemPrivate::consistentTime == -1)
+    if (QQuickItemPrivate::consistentTime == -1)
         return t.elapsed();
     else
         return ((QElapsedTimerConsistentTimeHack*)&t)->elapsed();
 }
 
-qint64 QSGItemPrivate::restart(QElapsedTimer &t)
+qint64 QQuickItemPrivate::restart(QElapsedTimer &t)
 {
-    if (QSGItemPrivate::consistentTime == -1)
+    if (QQuickItemPrivate::consistentTime == -1)
         return t.restart();
     else
         return ((QElapsedTimerConsistentTimeHack*)&t)->restart();
 }
 
 /*!
-    \fn bool QSGItem::isTextureProvider() const
+    \fn bool QQuickItem::isTextureProvider() const
 
     Returns true if this item is a texture provider. The default
     implementation returns false.
@@ -5025,7 +5025,7 @@ qint64 QSGItemPrivate::restart(QElapsedTimer &t)
  */
 
 /*!
-    \fn QSGTextureProvider *QSGItem::textureProvider() const
+    \fn QSGTextureProvider *QQuickItem::textureProvider() const
 
     Returns the texture provider for an item. The default implementation
     returns 0.
@@ -5035,4 +5035,4 @@ qint64 QSGItemPrivate::restart(QElapsedTimer &t)
 
 QT_END_NAMESPACE
 
-#include <moc_qsgitem.cpp>
+#include <moc_qquickitem.cpp>
diff --git a/src/declarative/items/qsgitem.h b/src/declarative/items/qquickitem.h
index 018453f68f..be50677bf1 100644
--- a/src/declarative/items/qsgitem.h
+++ b/src/declarative/items/qquickitem.h
@@ -40,8 +40,8 @@
 **
 ****************************************************************************/
 
-#ifndef QSGITEM_H
-#define QSGITEM_H
+#ifndef QQUICKITEM_H
+#define QQUICKITEM_H
 
 #include <QtDeclarative/qdeclarative.h>
 #include <QtDeclarative/qdeclarativecomponent.h>
@@ -57,17 +57,17 @@ QT_BEGIN_NAMESPACE
 
 QT_MODULE(Declarative)
 
-class QSGItem;
-class QSGTransformPrivate;
-class QSGTransform : public QObject
+class QQuickItem;
+class QQuickTransformPrivate;
+class QQuickTransform : public QObject
 {
     Q_OBJECT
 public:
-    QSGTransform(QObject *parent = 0);
-    ~QSGTransform();
+    QQuickTransform(QObject *parent = 0);
+    ~QQuickTransform();
 
-    void appendToItem(QSGItem *);
-    void prependToItem(QSGItem *);
+    void appendToItem(QQuickItem *);
+    void prependToItem(QQuickItem *);
 
     virtual void applyTo(QMatrix4x4 *matrix) const = 0;
 
@@ -75,36 +75,35 @@ protected Q_SLOTS:
     void update();
 
 protected:
-    QSGTransform(QSGTransformPrivate &dd, QObject *parent);
+    QQuickTransform(QQuickTransformPrivate &dd, QObject *parent);
 
 private:
-    Q_DECLARE_PRIVATE(QSGTransform)
+    Q_DECLARE_PRIVATE(QQuickTransform)
 };
 
 class QDeclarativeV8Function;
 class QDeclarativeState;
-class QSGAnchorLine;
+class QQuickAnchorLine;
 class QDeclarativeTransition;
-class QSGKeyEvent;
-class QSGAnchors;
-class QSGItemPrivate;
-class QSGCanvas;
-class QSGDragEvent;
+class QQuickKeyEvent;
+class QQuickAnchors;
+class QQuickItemPrivate;
+class QQuickCanvas;
 class QSGEngine;
 class QTouchEvent;
 class QSGNode;
 class QSGTransformNode;
 class QSGTextureProvider;
 
-class Q_DECLARATIVE_EXPORT QSGItem : public QObject, public QDeclarativeParserStatus
+class Q_DECLARATIVE_EXPORT QQuickItem : public QObject, public QDeclarativeParserStatus
 {
     Q_OBJECT
     Q_INTERFACES(QDeclarativeParserStatus)
 
-    Q_PROPERTY(QSGItem *parent READ parentItem WRITE setParentItem NOTIFY parentChanged DESIGNABLE false FINAL)
-    Q_PRIVATE_PROPERTY(QSGItem::d_func(), QDeclarativeListProperty<QObject> data READ data DESIGNABLE false)
-    Q_PRIVATE_PROPERTY(QSGItem::d_func(), QDeclarativeListProperty<QObject> resources READ resources DESIGNABLE false)
-    Q_PRIVATE_PROPERTY(QSGItem::d_func(), QDeclarativeListProperty<QSGItem> children READ children NOTIFY childrenChanged DESIGNABLE false)
+    Q_PROPERTY(QQuickItem *parent READ parentItem WRITE setParentItem NOTIFY parentChanged DESIGNABLE false FINAL)
+    Q_PRIVATE_PROPERTY(QQuickItem::d_func(), QDeclarativeListProperty<QObject> data READ data DESIGNABLE false)
+    Q_PRIVATE_PROPERTY(QQuickItem::d_func(), QDeclarativeListProperty<QObject> resources READ resources DESIGNABLE false)
+    Q_PRIVATE_PROPERTY(QQuickItem::d_func(), QDeclarativeListProperty<QQuickItem> children READ children NOTIFY childrenChanged DESIGNABLE false)
 
     Q_PROPERTY(QPointF pos READ pos FINAL)
     Q_PROPERTY(qreal x READ x WRITE setX NOTIFY xChanged FINAL)
@@ -117,18 +116,18 @@ class Q_DECLARATIVE_EXPORT QSGItem : public QObject, public QDeclarativeParserSt
     Q_PROPERTY(bool enabled READ isEnabled WRITE setEnabled NOTIFY enabledChanged)
     Q_PROPERTY(bool visible READ isVisible WRITE setVisible NOTIFY visibleChanged FINAL)
 
-    Q_PRIVATE_PROPERTY(QSGItem::d_func(), QDeclarativeListProperty<QDeclarativeState> states READ states DESIGNABLE false)
-    Q_PRIVATE_PROPERTY(QSGItem::d_func(), QDeclarativeListProperty<QDeclarativeTransition> transitions READ transitions DESIGNABLE false)
+    Q_PRIVATE_PROPERTY(QQuickItem::d_func(), QDeclarativeListProperty<QDeclarativeState> states READ states DESIGNABLE false)
+    Q_PRIVATE_PROPERTY(QQuickItem::d_func(), QDeclarativeListProperty<QDeclarativeTransition> transitions READ transitions DESIGNABLE false)
     Q_PROPERTY(QString state READ state WRITE setState NOTIFY stateChanged)
     Q_PROPERTY(QRectF childrenRect READ childrenRect NOTIFY childrenRectChanged DESIGNABLE false FINAL)
-    Q_PRIVATE_PROPERTY(QSGItem::d_func(), QSGAnchors * anchors READ anchors DESIGNABLE false CONSTANT FINAL)
-    Q_PRIVATE_PROPERTY(QSGItem::d_func(), QSGAnchorLine left READ left CONSTANT FINAL)
-    Q_PRIVATE_PROPERTY(QSGItem::d_func(), QSGAnchorLine right READ right CONSTANT FINAL)
-    Q_PRIVATE_PROPERTY(QSGItem::d_func(), QSGAnchorLine horizontalCenter READ horizontalCenter CONSTANT FINAL)
-    Q_PRIVATE_PROPERTY(QSGItem::d_func(), QSGAnchorLine top READ top CONSTANT FINAL)
-    Q_PRIVATE_PROPERTY(QSGItem::d_func(), QSGAnchorLine bottom READ bottom CONSTANT FINAL)
-    Q_PRIVATE_PROPERTY(QSGItem::d_func(), QSGAnchorLine verticalCenter READ verticalCenter CONSTANT FINAL)
-    Q_PRIVATE_PROPERTY(QSGItem::d_func(), QSGAnchorLine baseline READ baseline CONSTANT FINAL)
+    Q_PRIVATE_PROPERTY(QQuickItem::d_func(), QQuickAnchors * anchors READ anchors DESIGNABLE false CONSTANT FINAL)
+    Q_PRIVATE_PROPERTY(QQuickItem::d_func(), QQuickAnchorLine left READ left CONSTANT FINAL)
+    Q_PRIVATE_PROPERTY(QQuickItem::d_func(), QQuickAnchorLine right READ right CONSTANT FINAL)
+    Q_PRIVATE_PROPERTY(QQuickItem::d_func(), QQuickAnchorLine horizontalCenter READ horizontalCenter CONSTANT FINAL)
+    Q_PRIVATE_PROPERTY(QQuickItem::d_func(), QQuickAnchorLine top READ top CONSTANT FINAL)
+    Q_PRIVATE_PROPERTY(QQuickItem::d_func(), QQuickAnchorLine bottom READ bottom CONSTANT FINAL)
+    Q_PRIVATE_PROPERTY(QQuickItem::d_func(), QQuickAnchorLine verticalCenter READ verticalCenter CONSTANT FINAL)
+    Q_PRIVATE_PROPERTY(QQuickItem::d_func(), QQuickAnchorLine baseline READ baseline CONSTANT FINAL)
     Q_PROPERTY(qreal baselineOffset READ baselineOffset WRITE setBaselineOffset NOTIFY baselineOffsetChanged)
 
     Q_PROPERTY(bool clip READ clip WRITE setClip NOTIFY clipChanged)
@@ -140,7 +139,7 @@ class Q_DECLARATIVE_EXPORT QSGItem : public QObject, public QDeclarativeParserSt
     Q_PROPERTY(qreal scale READ scale WRITE setScale NOTIFY scaleChanged)
     Q_PROPERTY(TransformOrigin transformOrigin READ transformOrigin WRITE setTransformOrigin NOTIFY transformOriginChanged)
     Q_PROPERTY(QPointF transformOriginPoint READ transformOriginPoint)  // XXX todo - notify?
-    Q_PROPERTY(QDeclarativeListProperty<QSGTransform> transform READ transform DESIGNABLE false FINAL)
+    Q_PROPERTY(QDeclarativeListProperty<QQuickTransform> transform READ transform DESIGNABLE false FINAL)
 
     Q_PROPERTY(bool smooth READ smooth WRITE setSmooth NOTIFY smoothChanged)
     Q_PROPERTY(qreal implicitWidth READ implicitWidth WRITE setImplicitWidth NOTIFY implicitWidthChanged)
@@ -156,7 +155,7 @@ public:
         ItemIsFocusScope          = 0x04,
         ItemHasContents           = 0x08,
         ItemAcceptsDrops          = 0x10
-        // Remember to increment the size of QSGItemPrivate::flags
+        // Remember to increment the size of QQuickItemPrivate::flags
     };
     Q_DECLARE_FLAGS(Flags, Flag)
 
@@ -172,13 +171,13 @@ public:
     };
 
     union ItemChangeData {
-        ItemChangeData(QSGItem *v) : item(v) {}
-        ItemChangeData(QSGCanvas *v) : canvas(v) {}
+        ItemChangeData(QQuickItem *v) : item(v) {}
+        ItemChangeData(QQuickCanvas *v) : canvas(v) {}
         ItemChangeData(qreal v) : realValue(v) {}
         ItemChangeData(bool v) : boolValue(v) {}
 
-        QSGItem *item;
-        QSGCanvas *canvas;
+        QQuickItem *item;
+        QQuickCanvas *canvas;
         qreal realValue;
         bool boolValue;
     };
@@ -189,19 +188,19 @@ public:
         BottomLeft, Bottom, BottomRight
     };
 
-    QSGItem(QSGItem *parent = 0);
-    virtual ~QSGItem();
+    QQuickItem(QQuickItem *parent = 0);
+    virtual ~QQuickItem();
 
     QSGEngine *sceneGraphEngine() const;
 
-    QSGCanvas *canvas() const;
-    QSGItem *parentItem() const;
-    void setParentItem(QSGItem *parent);
-    void stackBefore(const QSGItem *);
-    void stackAfter(const QSGItem *);
+    QQuickCanvas *canvas() const;
+    QQuickItem *parentItem() const;
+    void setParentItem(QQuickItem *parent);
+    void stackBefore(const QQuickItem *);
+    void stackAfter(const QQuickItem *);
 
     QRectF childrenRect();
-    QList<QSGItem *> childItems() const;
+    QList<QQuickItem *> childItems() const;
 
     bool clip() const;
     void setClip(bool);
@@ -212,7 +211,7 @@ public:
     qreal baselineOffset() const;
     void setBaselineOffset(qreal);
 
-    QDeclarativeListProperty<QSGTransform> transform();
+    QDeclarativeListProperty<QQuickTransform> transform();
 
     qreal x() const;
     qreal y() const;
@@ -268,7 +267,7 @@ public:
     bool hasFocus() const;
     void setFocus(bool);
     bool isFocusScope() const;
-    QSGItem *scopedFocusItem() const;
+    QQuickItem *scopedFocusItem() const;
 
     Qt::MouseButtons acceptedMouseButtons() const;
     void setAcceptedMouseButtons(Qt::MouseButtons buttons);
@@ -283,14 +282,14 @@ public:
     bool filtersChildMouseEvents() const;
     void setFiltersChildMouseEvents(bool filter);
 
-    QTransform itemTransform(QSGItem *, bool *) const;
-    QPointF mapToItem(const QSGItem *item, const QPointF &point) const;
+    QTransform itemTransform(QQuickItem *, bool *) const;
+    QPointF mapToItem(const QQuickItem *item, const QPointF &point) const;
     QPointF mapToScene(const QPointF &point) const;
-    QRectF mapRectToItem(const QSGItem *item, const QRectF &rect) const;
+    QRectF mapRectToItem(const QQuickItem *item, const QRectF &rect) const;
     QRectF mapRectToScene(const QRectF &rect) const;
-    QPointF mapFromItem(const QSGItem *item, const QPointF &point) const;
+    QPointF mapFromItem(const QQuickItem *item, const QPointF &point) const;
     QPointF mapFromScene(const QPointF &point) const;
-    QRectF mapRectFromItem(const QSGItem *item, const QRectF &rect) const;
+    QRectF mapRectFromItem(const QQuickItem *item, const QRectF &rect) const;
     QRectF mapRectFromScene(const QRectF &rect) const;
 
     void polish();
@@ -298,7 +297,7 @@ public:
     Q_INVOKABLE void mapFromItem(QDeclarativeV8Function*) const;
     Q_INVOKABLE void mapToItem(QDeclarativeV8Function*) const;
     Q_INVOKABLE void forceActiveFocus();
-    Q_INVOKABLE QSGItem *childAt(qreal x, qreal y) const;
+    Q_INVOKABLE QQuickItem *childAt(qreal x, qreal y) const;
 
     Qt::InputMethodHints inputMethodHints() const;
     void setInputMethodHints(Qt::InputMethodHints hints);
@@ -307,7 +306,7 @@ public:
     struct UpdatePaintNodeData {
        QSGTransformNode *transformNode;
     private:
-       friend class QSGCanvasPrivate;
+       friend class QQuickCanvasPrivate;
        UpdatePaintNodeData();
     };
 
@@ -324,7 +323,7 @@ Q_SIGNALS:
     void stateChanged(const QString &);
     void focusChanged(bool);
     void activeFocusChanged(bool);
-    void parentChanged(QSGItem *);
+    void parentChanged(QQuickItem *);
     void transformOriginChanged(TransformOrigin);
     void smoothChanged(bool);
     void clipChanged(bool);
@@ -378,7 +377,7 @@ protected:
     virtual void dragMoveEvent(QDragMoveEvent *);
     virtual void dragLeaveEvent(QDragLeaveEvent *);
     virtual void dropEvent(QDropEvent *);
-    virtual bool childMouseEventFilter(QSGItem *, QEvent *);
+    virtual bool childMouseEventFilter(QQuickItem *, QEvent *);
     virtual void windowDeactivateEvent();
 
     virtual void geometryChanged(const QRectF &newGeometry,
@@ -388,28 +387,28 @@ protected:
     virtual void updatePolish();
 
 protected:
-    QSGItem(QSGItemPrivate &dd, QSGItem *parent = 0);
+    QQuickItem(QQuickItemPrivate &dd, QQuickItem *parent = 0);
 
 private:
-    friend class QSGCanvas;
-    friend class QSGCanvasPrivate;
+    friend class QQuickCanvas;
+    friend class QQuickCanvasPrivate;
     friend class QSGRenderer;
-    Q_DISABLE_COPY(QSGItem)
-    Q_DECLARE_PRIVATE(QSGItem)
+    Q_DISABLE_COPY(QQuickItem)
+    Q_DECLARE_PRIVATE(QQuickItem)
 };
 
 // XXX todo
-Q_DECLARE_OPERATORS_FOR_FLAGS(QSGItem::Flags)
+Q_DECLARE_OPERATORS_FOR_FLAGS(QQuickItem::Flags)
 
 #ifndef QT_NO_DEBUG_STREAM
-QDebug Q_DECLARATIVE_EXPORT operator<<(QDebug debug, QSGItem *item);
+QDebug Q_DECLARATIVE_EXPORT operator<<(QDebug debug, QQuickItem *item);
 #endif
 
 QT_END_NAMESPACE
 
-QML_DECLARE_TYPE(QSGItem)
-QML_DECLARE_TYPE(QSGTransform)
+QML_DECLARE_TYPE(QQuickItem)
+QML_DECLARE_TYPE(QQuickTransform)
 
 QT_END_HEADER
 
-#endif // QSGITEM_H
+#endif // QQUICKITEM_H
diff --git a/src/declarative/items/qsgitem_p.h b/src/declarative/items/qquickitem_p.h
index c0ed1dbc8b..94b195f2d8 100644
--- a/src/declarative/items/qsgitem_p.h
+++ b/src/declarative/items/qquickitem_p.h
@@ -40,8 +40,8 @@
 **
 ****************************************************************************/
 
-#ifndef QSGITEM_P_H
-#define QSGITEM_P_H
+#ifndef QQUICKITEM_P_H
+#define QQUICKITEM_P_H
 
 //
 //  W A R N I N G
@@ -54,16 +54,16 @@
 // We mean it.
 //
 
-#include "qsgitem.h"
+#include "qquickitem.h"
 
-#include "qsganchors_p.h"
-#include "qsganchors_p_p.h"
-#include "qsgitemchangelistener_p.h"
+#include "qquickanchors_p.h"
+#include "qquickanchors_p_p.h"
+#include "qquickitemchangelistener_p.h"
 
-#include "qsgcanvas_p.h"
+#include "qquickcanvas_p.h"
 
-#include "qsgnode.h"
-#include "qsgclipnode_p.h"
+#include <qsgnode.h>
+#include "qquickclipnode_p.h"
 
 #include <private/qpodvector_p.h>
 #include <private/qdeclarativestate_p.h>
@@ -81,21 +81,21 @@
 QT_BEGIN_NAMESPACE
 
 class QNetworkReply;
-class QSGItemKeyFilter;
-class QSGLayoutMirroringAttached;
+class QQuickItemKeyFilter;
+class QQuickLayoutMirroringAttached;
 
 //### merge into private?
-class QSGContents : public QObject, public QSGItemChangeListener
+class QQuickContents : public QObject, public QQuickItemChangeListener
 {
     Q_OBJECT
 public:
-    QSGContents(QSGItem *item);
-    ~QSGContents();
+    QQuickContents(QQuickItem *item);
+    ~QQuickContents();
 
     QRectF rectF() const;
 
-    void childRemoved(QSGItem *item);
-    void childAdded(QSGItem *item);
+    void childRemoved(QQuickItem *item);
+    void childAdded(QQuickItem *item);
 
     void calcGeometry() { calcWidth(); calcHeight(); }
     void complete();
@@ -104,46 +104,46 @@ Q_SIGNALS:
     void rectChanged(QRectF);
 
 protected:
-    void itemGeometryChanged(QSGItem *item, const QRectF &newGeometry, const QRectF &oldGeometry);
-    void itemDestroyed(QSGItem *item);
-    //void itemVisibilityChanged(QSGItem *item)
+    void itemGeometryChanged(QQuickItem *item, const QRectF &newGeometry, const QRectF &oldGeometry);
+    void itemDestroyed(QQuickItem *item);
+    //void itemVisibilityChanged(QQuickItem *item)
 
 private:
-    void calcHeight(QSGItem *changed = 0);
-    void calcWidth(QSGItem *changed = 0);
+    void calcHeight(QQuickItem *changed = 0);
+    void calcWidth(QQuickItem *changed = 0);
 
-    QSGItem *m_item;
+    QQuickItem *m_item;
     qreal m_x;
     qreal m_y;
     qreal m_width;
     qreal m_height;
 };
 
-class QSGTransformPrivate : public QObjectPrivate
+class QQuickTransformPrivate : public QObjectPrivate
 {
-    Q_DECLARE_PUBLIC(QSGTransform);
+    Q_DECLARE_PUBLIC(QQuickTransform);
 public:
-    static QSGTransformPrivate* get(QSGTransform *transform) { return transform->d_func(); }
+    static QQuickTransformPrivate* get(QQuickTransform *transform) { return transform->d_func(); }
 
-    QSGTransformPrivate();
+    QQuickTransformPrivate();
 
-    QList<QSGItem *> items;
+    QList<QQuickItem *> items;
 };
 
-class Q_DECLARATIVE_EXPORT QSGItemPrivate : public QObjectPrivate
+class Q_DECLARATIVE_EXPORT QQuickItemPrivate : public QObjectPrivate
 {
-    Q_DECLARE_PUBLIC(QSGItem)
+    Q_DECLARE_PUBLIC(QQuickItem)
 
 public:
-    static QSGItemPrivate* get(QSGItem *item) { return item->d_func(); }
-    static const QSGItemPrivate* get(const QSGItem *item) { return item->d_func(); }
+    static QQuickItemPrivate* get(QQuickItem *item) { return item->d_func(); }
+    static const QQuickItemPrivate* get(const QQuickItem *item) { return item->d_func(); }
 
-    QSGItemPrivate();
-    void init(QSGItem *parent);
+    QQuickItemPrivate();
+    void init(QQuickItem *parent);
 
     QDeclarativeListProperty<QObject> data();
     QDeclarativeListProperty<QObject> resources();
-    QDeclarativeListProperty<QSGItem> children();
+    QDeclarativeListProperty<QQuickItem> children();
 
     QDeclarativeListProperty<QDeclarativeState> states();
     QDeclarativeListProperty<QDeclarativeTransition> transitions();
@@ -151,13 +151,13 @@ public:
     QString state() const;
     void setState(const QString &);
 
-    QSGAnchorLine left() const;
-    QSGAnchorLine right() const;
-    QSGAnchorLine horizontalCenter() const;
-    QSGAnchorLine top() const;
-    QSGAnchorLine bottom() const;
-    QSGAnchorLine verticalCenter() const;
-    QSGAnchorLine baseline() const;
+    QQuickAnchorLine left() const;
+    QQuickAnchorLine right() const;
+    QQuickAnchorLine horizontalCenter() const;
+    QQuickAnchorLine top() const;
+    QQuickAnchorLine bottom() const;
+    QQuickAnchorLine verticalCenter() const;
+    QQuickAnchorLine baseline() const;
 
     // data property
     static void data_append(QDeclarativeListProperty<QObject> *, QObject *);
@@ -172,32 +172,32 @@ public:
     static void resources_clear(QDeclarativeListProperty<QObject> *);
 
     // children property
-    static void children_append(QDeclarativeListProperty<QSGItem> *, QSGItem *);
-    static int children_count(QDeclarativeListProperty<QSGItem> *);
-    static QSGItem *children_at(QDeclarativeListProperty<QSGItem> *, int);
-    static void children_clear(QDeclarativeListProperty<QSGItem> *);
+    static void children_append(QDeclarativeListProperty<QQuickItem> *, QQuickItem *);
+    static int children_count(QDeclarativeListProperty<QQuickItem> *);
+    static QQuickItem *children_at(QDeclarativeListProperty<QQuickItem> *, int);
+    static void children_clear(QDeclarativeListProperty<QQuickItem> *);
 
     // transform property
-    static int transform_count(QDeclarativeListProperty<QSGTransform> *list);
-    static void transform_append(QDeclarativeListProperty<QSGTransform> *list, QSGTransform *);
-    static QSGTransform *transform_at(QDeclarativeListProperty<QSGTransform> *list, int);
-    static void transform_clear(QDeclarativeListProperty<QSGTransform> *list);
+    static int transform_count(QDeclarativeListProperty<QQuickTransform> *list);
+    static void transform_append(QDeclarativeListProperty<QQuickTransform> *list, QQuickTransform *);
+    static QQuickTransform *transform_at(QDeclarativeListProperty<QQuickTransform> *list, int);
+    static void transform_clear(QDeclarativeListProperty<QQuickTransform> *list);
 
-    QSGAnchors *anchors() const;
-    mutable QSGAnchors *_anchors;
-    QSGContents *_contents;
+    QQuickAnchors *anchors() const;
+    mutable QQuickAnchors *_anchors;
+    QQuickContents *_contents;
 
     QDeclarativeNullableValue<qreal> baselineOffset;
 
     struct AnchorLines {
-        AnchorLines(QSGItem *);
-        QSGAnchorLine left;
-        QSGAnchorLine right;
-        QSGAnchorLine hCenter;
-        QSGAnchorLine top;
-        QSGAnchorLine bottom;
-        QSGAnchorLine vCenter;
-        QSGAnchorLine baseline;
+        AnchorLines(QQuickItem *);
+        QQuickAnchorLine left;
+        QQuickAnchorLine right;
+        QQuickAnchorLine hCenter;
+        QQuickAnchorLine top;
+        QQuickAnchorLine bottom;
+        QQuickAnchorLine vCenter;
+        QQuickAnchorLine baseline;
     };
     mutable AnchorLines *_anchorLines;
     AnchorLines *anchorLines() const;
@@ -216,22 +216,22 @@ public:
     Q_DECLARE_FLAGS(ChangeTypes, ChangeType)
 
     struct ChangeListener {
-        ChangeListener(QSGItemChangeListener *l, QSGItemPrivate::ChangeTypes t) : listener(l), types(t) {}
-        QSGItemChangeListener *listener;
-        QSGItemPrivate::ChangeTypes types;
+        ChangeListener(QQuickItemChangeListener *l, QQuickItemPrivate::ChangeTypes t) : listener(l), types(t) {}
+        QQuickItemChangeListener *listener;
+        QQuickItemPrivate::ChangeTypes types;
         bool operator==(const ChangeListener &other) const { return listener == other.listener && types == other.types; }
     };
 
-    void addItemChangeListener(QSGItemChangeListener *listener, ChangeTypes types) {
+    void addItemChangeListener(QQuickItemChangeListener *listener, ChangeTypes types) {
         changeListeners.append(ChangeListener(listener, types));
     }
-    void removeItemChangeListener(QSGItemChangeListener *, ChangeTypes types);
+    void removeItemChangeListener(QQuickItemChangeListener *, ChangeTypes types);
     QPODVector<ChangeListener,4> changeListeners;
 
     QDeclarativeStateGroup *_states();
     QDeclarativeStateGroup *_stateGroup;
 
-    QSGItem::TransformOrigin origin:5;
+    QQuickItem::TransformOrigin origin:5;
     quint32 flags:5;
     bool widthValid:1;
     bool heightValid:1;
@@ -257,27 +257,27 @@ public:
     bool childrenDoNotOverlap:1;
     quint32 dummy:1;
 
-    QSGCanvas *canvas;
-    QSGContext *sceneGraphContext() const { Q_ASSERT(canvas); return static_cast<QSGCanvasPrivate *>(QObjectPrivate::get(canvas))->context; }
+    QQuickCanvas *canvas;
+    QSGContext *sceneGraphContext() const { Q_ASSERT(canvas); return static_cast<QQuickCanvasPrivate *>(QObjectPrivate::get(canvas))->context; }
 
-    QSGItem *parentItem;
-    QList<QSGItem *> childItems;
-    QList<QSGItem *> paintOrderChildItems() const;
-    void addChild(QSGItem *);
-    void removeChild(QSGItem *);
+    QQuickItem *parentItem;
+    QList<QQuickItem *> childItems;
+    QList<QQuickItem *> paintOrderChildItems() const;
+    void addChild(QQuickItem *);
+    void removeChild(QQuickItem *);
     void siblingOrderChanged();
 
     class InitializationState {
     public:
-        QSGItem *getFocusScope(QSGItem *item);
+        QQuickItem *getFocusScope(QQuickItem *item);
         void clear();
-        void clear(QSGItem *focusScope);
+        void clear(QQuickItem *focusScope);
     private:
-        QSGItem *focusScope;
+        QQuickItem *focusScope;
     };
-    void initCanvas(InitializationState *, QSGCanvas *);
+    void initCanvas(InitializationState *, QQuickCanvas *);
 
-    QSGItem *subFocusItem;
+    QQuickItem *subFocusItem;
 
     QTransform canvasToItemTransform() const;
     QTransform itemToCanvasTransform() const;
@@ -295,7 +295,7 @@ public:
     qreal rotation;
     qreal opacity;
 
-    QSGLayoutMirroringAttached* attachedLayoutDirection;
+    QQuickLayoutMirroringAttached* attachedLayoutDirection;
 
     Qt::MouseButtons acceptedMouseButtons;
     Qt::InputMethodHints imHints;
@@ -315,10 +315,10 @@ public:
     }
 
     QPointF computeTransformOrigin() const;
-    QList<QSGTransform *> transforms;
+    QList<QQuickTransform *> transforms;
     virtual void transformChanged();
 
-    QSGItemKeyFilter *keyHandler;
+    QQuickItemKeyFilter *keyHandler;
     void deliverKeyEvent(QKeyEvent *);
     void deliverInputMethodEvent(QInputMethodEvent *);
     void deliverFocusEvent(QFocusEvent *);
@@ -369,8 +369,8 @@ public:
     void dirty(DirtyType);
     void addToDirtyList();
     void removeFromDirtyList();
-    QSGItem *nextDirtyItem;
-    QSGItem**prevDirtyItem;
+    QQuickItem *nextDirtyItem;
+    QQuickItem**prevDirtyItem;
 
     inline QSGTransformNode *itemNode();
     inline QSGNode *childContainerNode();
@@ -386,7 +386,7 @@ public:
 
     QSGTransformNode *itemNodeInstance;
     QSGOpacityNode *opacityNode;
-    QSGDefaultClipNode *clipNode;
+    QQuickDefaultClipNode *clipNode;
     QSGRootNode *rootNode;
     QSGNode *groupNode;
     QSGNode *paintNode;
@@ -401,7 +401,7 @@ public:
     int effectRefCount;
     int hideRefCount;
 
-    void itemChange(QSGItem::ItemChange, const QSGItem::ItemChangeData &);
+    void itemChange(QQuickItem::ItemChange, const QQuickItem::ItemChangeData &);
 
     virtual void mirrorChange() {}
 
@@ -413,16 +413,16 @@ public:
 };
 
 /*
-    Key filters can be installed on a QSGItem, but not removed.  Currently they
+    Key filters can be installed on a QQuickItem, but not removed.  Currently they
     are only used by attached objects (which are only destroyed on Item
     destruction), so this isn't a problem.  If in future this becomes any form
     of public API, they will have to support removal too.
 */
-class QSGItemKeyFilter
+class QQuickItemKeyFilter
 {
 public:
-    QSGItemKeyFilter(QSGItem * = 0);
-    virtual ~QSGItemKeyFilter();
+    QQuickItemKeyFilter(QQuickItem * = 0);
+    virtual ~QQuickItemKeyFilter();
 
     virtual void keyPressed(QKeyEvent *event, bool post);
     virtual void keyReleased(QKeyEvent *event, bool post);
@@ -433,24 +433,24 @@ public:
     bool m_processPost;
 
 private:
-    QSGItemKeyFilter *m_next;
+    QQuickItemKeyFilter *m_next;
 };
 
-class QSGKeyNavigationAttachedPrivate : public QObjectPrivate
+class QQuickKeyNavigationAttachedPrivate : public QObjectPrivate
 {
 public:
-    QSGKeyNavigationAttachedPrivate()
+    QQuickKeyNavigationAttachedPrivate()
         : QObjectPrivate(),
           left(0), right(0), up(0), down(0), tab(0), backtab(0),
           leftSet(false), rightSet(false), upSet(false), downSet(false),
           tabSet(false), backtabSet(false) {}
 
-    QSGItem *left;
-    QSGItem *right;
-    QSGItem *up;
-    QSGItem *down;
-    QSGItem *tab;
-    QSGItem *backtab;
+    QQuickItem *left;
+    QQuickItem *right;
+    QQuickItem *up;
+    QQuickItem *down;
+    QQuickItem *tab;
+    QQuickItem *backtab;
     bool leftSet : 1;
     bool rightSet : 1;
     bool upSet : 1;
@@ -459,42 +459,42 @@ public:
     bool backtabSet : 1;
 };
 
-class QSGKeyNavigationAttached : public QObject, public QSGItemKeyFilter
+class QQuickKeyNavigationAttached : public QObject, public QQuickItemKeyFilter
 {
     Q_OBJECT
-    Q_DECLARE_PRIVATE(QSGKeyNavigationAttached)
-
-    Q_PROPERTY(QSGItem *left READ left WRITE setLeft NOTIFY leftChanged)
-    Q_PROPERTY(QSGItem *right READ right WRITE setRight NOTIFY rightChanged)
-    Q_PROPERTY(QSGItem *up READ up WRITE setUp NOTIFY upChanged)
-    Q_PROPERTY(QSGItem *down READ down WRITE setDown NOTIFY downChanged)
-    Q_PROPERTY(QSGItem *tab READ tab WRITE setTab NOTIFY tabChanged)
-    Q_PROPERTY(QSGItem *backtab READ backtab WRITE setBacktab NOTIFY backtabChanged)
+    Q_DECLARE_PRIVATE(QQuickKeyNavigationAttached)
+
+    Q_PROPERTY(QQuickItem *left READ left WRITE setLeft NOTIFY leftChanged)
+    Q_PROPERTY(QQuickItem *right READ right WRITE setRight NOTIFY rightChanged)
+    Q_PROPERTY(QQuickItem *up READ up WRITE setUp NOTIFY upChanged)
+    Q_PROPERTY(QQuickItem *down READ down WRITE setDown NOTIFY downChanged)
+    Q_PROPERTY(QQuickItem *tab READ tab WRITE setTab NOTIFY tabChanged)
+    Q_PROPERTY(QQuickItem *backtab READ backtab WRITE setBacktab NOTIFY backtabChanged)
     Q_PROPERTY(Priority priority READ priority WRITE setPriority NOTIFY priorityChanged)
 
     Q_ENUMS(Priority)
 
 public:
-    QSGKeyNavigationAttached(QObject * = 0);
-
-    QSGItem *left() const;
-    void setLeft(QSGItem *);
-    QSGItem *right() const;
-    void setRight(QSGItem *);
-    QSGItem *up() const;
-    void setUp(QSGItem *);
-    QSGItem *down() const;
-    void setDown(QSGItem *);
-    QSGItem *tab() const;
-    void setTab(QSGItem *);
-    QSGItem *backtab() const;
-    void setBacktab(QSGItem *);
+    QQuickKeyNavigationAttached(QObject * = 0);
+
+    QQuickItem *left() const;
+    void setLeft(QQuickItem *);
+    QQuickItem *right() const;
+    void setRight(QQuickItem *);
+    QQuickItem *up() const;
+    void setUp(QQuickItem *);
+    QQuickItem *down() const;
+    void setDown(QQuickItem *);
+    QQuickItem *tab() const;
+    void setTab(QQuickItem *);
+    QQuickItem *backtab() const;
+    void setBacktab(QQuickItem *);
 
     enum Priority { BeforeItem, AfterItem };
     Priority priority() const;
     void setPriority(Priority);
 
-    static QSGKeyNavigationAttached *qmlAttachedProperties(QObject *);
+    static QQuickKeyNavigationAttached *qmlAttachedProperties(QObject *);
 
 Q_SIGNALS:
     void leftChanged();
@@ -508,17 +508,17 @@ Q_SIGNALS:
 private:
     virtual void keyPressed(QKeyEvent *event, bool post);
     virtual void keyReleased(QKeyEvent *event, bool post);
-    void setFocusNavigation(QSGItem *currentItem, const char *dir);
+    void setFocusNavigation(QQuickItem *currentItem, const char *dir);
 };
 
-class QSGLayoutMirroringAttached : public QObject
+class QQuickLayoutMirroringAttached : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(bool enabled READ enabled WRITE setEnabled RESET resetEnabled NOTIFY enabledChanged)
     Q_PROPERTY(bool childrenInherit READ childrenInherit WRITE setChildrenInherit NOTIFY childrenInheritChanged)
 
 public:
-    explicit QSGLayoutMirroringAttached(QObject *parent = 0);
+    explicit QQuickLayoutMirroringAttached(QObject *parent = 0);
 
     bool enabled() const;
     void setEnabled(bool);
@@ -527,19 +527,19 @@ public:
     bool childrenInherit() const;
     void setChildrenInherit(bool);
 
-    static QSGLayoutMirroringAttached *qmlAttachedProperties(QObject *);
+    static QQuickLayoutMirroringAttached *qmlAttachedProperties(QObject *);
 Q_SIGNALS:
     void enabledChanged();
     void childrenInheritChanged();
 private:
-    friend class QSGItemPrivate;
-    QSGItemPrivate *itemPrivate;
+    friend class QQuickItemPrivate;
+    QQuickItemPrivate *itemPrivate;
 };
 
-class QSGKeysAttachedPrivate : public QObjectPrivate
+class QQuickKeysAttachedPrivate : public QObjectPrivate
 {
 public:
-    QSGKeysAttachedPrivate()
+    QQuickKeysAttachedPrivate()
         : QObjectPrivate(), inPress(false), inRelease(false)
         , inIM(false), enabled(true), imeItem(0), item(0)
     {}
@@ -553,29 +553,29 @@ public:
 
     bool enabled : 1;
 
-    QSGItem *imeItem;
-    QList<QSGItem *> targets;
-    QSGItem *item;
+    QQuickItem *imeItem;
+    QList<QQuickItem *> targets;
+    QQuickItem *item;
 };
 
-class QSGKeysAttached : public QObject, public QSGItemKeyFilter
+class QQuickKeysAttached : public QObject, public QQuickItemKeyFilter
 {
     Q_OBJECT
-    Q_DECLARE_PRIVATE(QSGKeysAttached)
+    Q_DECLARE_PRIVATE(QQuickKeysAttached)
 
     Q_PROPERTY(bool enabled READ enabled WRITE setEnabled NOTIFY enabledChanged)
-    Q_PROPERTY(QDeclarativeListProperty<QSGItem> forwardTo READ forwardTo)
+    Q_PROPERTY(QDeclarativeListProperty<QQuickItem> forwardTo READ forwardTo)
     Q_PROPERTY(Priority priority READ priority WRITE setPriority NOTIFY priorityChanged)
 
     Q_ENUMS(Priority)
 
 public:
-    QSGKeysAttached(QObject *parent=0);
-    ~QSGKeysAttached();
+    QQuickKeysAttached(QObject *parent=0);
+    ~QQuickKeysAttached();
 
-    bool enabled() const { Q_D(const QSGKeysAttached); return d->enabled; }
+    bool enabled() const { Q_D(const QQuickKeysAttached); return d->enabled; }
     void setEnabled(bool enabled) {
-        Q_D(QSGKeysAttached);
+        Q_D(QQuickKeysAttached);
         if (enabled != d->enabled) {
             d->enabled = enabled;
             emit enabledChanged();
@@ -586,60 +586,60 @@ public:
     Priority priority() const;
     void setPriority(Priority);
 
-    QDeclarativeListProperty<QSGItem> forwardTo() {
-        Q_D(QSGKeysAttached);
-        return QDeclarativeListProperty<QSGItem>(this, d->targets);
+    QDeclarativeListProperty<QQuickItem> forwardTo() {
+        Q_D(QQuickKeysAttached);
+        return QDeclarativeListProperty<QQuickItem>(this, d->targets);
     }
 
     virtual void componentComplete();
 
-    static QSGKeysAttached *qmlAttachedProperties(QObject *);
+    static QQuickKeysAttached *qmlAttachedProperties(QObject *);
 
 Q_SIGNALS:
     void enabledChanged();
     void priorityChanged();
-    void pressed(QSGKeyEvent *event);
-    void released(QSGKeyEvent *event);
-    void digit0Pressed(QSGKeyEvent *event);
-    void digit1Pressed(QSGKeyEvent *event);
-    void digit2Pressed(QSGKeyEvent *event);
-    void digit3Pressed(QSGKeyEvent *event);
-    void digit4Pressed(QSGKeyEvent *event);
-    void digit5Pressed(QSGKeyEvent *event);
-    void digit6Pressed(QSGKeyEvent *event);
-    void digit7Pressed(QSGKeyEvent *event);
-    void digit8Pressed(QSGKeyEvent *event);
-    void digit9Pressed(QSGKeyEvent *event);
-
-    void leftPressed(QSGKeyEvent *event);
-    void rightPressed(QSGKeyEvent *event);
-    void upPressed(QSGKeyEvent *event);
-    void downPressed(QSGKeyEvent *event);
-    void tabPressed(QSGKeyEvent *event);
-    void backtabPressed(QSGKeyEvent *event);
-
-    void asteriskPressed(QSGKeyEvent *event);
-    void numberSignPressed(QSGKeyEvent *event);
-    void escapePressed(QSGKeyEvent *event);
-    void returnPressed(QSGKeyEvent *event);
-    void enterPressed(QSGKeyEvent *event);
-    void deletePressed(QSGKeyEvent *event);
-    void spacePressed(QSGKeyEvent *event);
-    void backPressed(QSGKeyEvent *event);
-    void cancelPressed(QSGKeyEvent *event);
-    void selectPressed(QSGKeyEvent *event);
-    void yesPressed(QSGKeyEvent *event);
-    void noPressed(QSGKeyEvent *event);
-    void context1Pressed(QSGKeyEvent *event);
-    void context2Pressed(QSGKeyEvent *event);
-    void context3Pressed(QSGKeyEvent *event);
-    void context4Pressed(QSGKeyEvent *event);
-    void callPressed(QSGKeyEvent *event);
-    void hangupPressed(QSGKeyEvent *event);
-    void flipPressed(QSGKeyEvent *event);
-    void menuPressed(QSGKeyEvent *event);
-    void volumeUpPressed(QSGKeyEvent *event);
-    void volumeDownPressed(QSGKeyEvent *event);
+    void pressed(QQuickKeyEvent *event);
+    void released(QQuickKeyEvent *event);
+    void digit0Pressed(QQuickKeyEvent *event);
+    void digit1Pressed(QQuickKeyEvent *event);
+    void digit2Pressed(QQuickKeyEvent *event);
+    void digit3Pressed(QQuickKeyEvent *event);
+    void digit4Pressed(QQuickKeyEvent *event);
+    void digit5Pressed(QQuickKeyEvent *event);
+    void digit6Pressed(QQuickKeyEvent *event);
+    void digit7Pressed(QQuickKeyEvent *event);
+    void digit8Pressed(QQuickKeyEvent *event);
+    void digit9Pressed(QQuickKeyEvent *event);
+
+    void leftPressed(QQuickKeyEvent *event);
+    void rightPressed(QQuickKeyEvent *event);
+    void upPressed(QQuickKeyEvent *event);
+    void downPressed(QQuickKeyEvent *event);
+    void tabPressed(QQuickKeyEvent *event);
+    void backtabPressed(QQuickKeyEvent *event);
+
+    void asteriskPressed(QQuickKeyEvent *event);
+    void numberSignPressed(QQuickKeyEvent *event);
+    void escapePressed(QQuickKeyEvent *event);
+    void returnPressed(QQuickKeyEvent *event);
+    void enterPressed(QQuickKeyEvent *event);
+    void deletePressed(QQuickKeyEvent *event);
+    void spacePressed(QQuickKeyEvent *event);
+    void backPressed(QQuickKeyEvent *event);
+    void cancelPressed(QQuickKeyEvent *event);
+    void selectPressed(QQuickKeyEvent *event);
+    void yesPressed(QQuickKeyEvent *event);
+    void noPressed(QQuickKeyEvent *event);
+    void context1Pressed(QQuickKeyEvent *event);
+    void context2Pressed(QQuickKeyEvent *event);
+    void context3Pressed(QQuickKeyEvent *event);
+    void context4Pressed(QQuickKeyEvent *event);
+    void callPressed(QQuickKeyEvent *event);
+    void hangupPressed(QQuickKeyEvent *event);
+    void flipPressed(QQuickKeyEvent *event);
+    void menuPressed(QQuickKeyEvent *event);
+    void volumeUpPressed(QQuickKeyEvent *event);
+    void volumeDownPressed(QQuickKeyEvent *event);
 
 private:
     virtual void keyPressed(QKeyEvent *event, bool post);
@@ -669,20 +669,20 @@ private:
     static const SigMap sigMap[];
 };
 
-QSGTransformNode *QSGItemPrivate::itemNode()
+QSGTransformNode *QQuickItemPrivate::itemNode()
 {
     if (!itemNodeInstance) {
         itemNodeInstance = createTransformNode();
         itemNodeInstance->setFlag(QSGNode::OwnedByParent, false);
 #ifdef QML_RUNTIME_TESTING
-        Q_Q(QSGItem);
-        itemNodeInstance->description = QString::fromLatin1("QSGItem(%1)").arg(QString::fromLatin1(q->metaObject()->className()));
+        Q_Q(QQuickItem);
+        itemNodeInstance->description = QString::fromLatin1("QQuickItem(%1)").arg(QString::fromLatin1(q->metaObject()->className()));
 #endif
     }
     return itemNodeInstance;
 }
 
-QSGNode *QSGItemPrivate::childContainerNode()
+QSGNode *QQuickItemPrivate::childContainerNode()
 {
     if (!groupNode) {
         groupNode = new QSGNode();
@@ -702,15 +702,15 @@ QSGNode *QSGItemPrivate::childContainerNode()
     return groupNode;
 }
 
-Q_DECLARE_OPERATORS_FOR_FLAGS(QSGItemPrivate::ChangeTypes);
+Q_DECLARE_OPERATORS_FOR_FLAGS(QQuickItemPrivate::ChangeTypes);
 
 QT_END_NAMESPACE
 
-QML_DECLARE_TYPE(QSGKeysAttached)
-QML_DECLARE_TYPEINFO(QSGKeysAttached, QML_HAS_ATTACHED_PROPERTIES)
-QML_DECLARE_TYPE(QSGKeyNavigationAttached)
-QML_DECLARE_TYPEINFO(QSGKeyNavigationAttached, QML_HAS_ATTACHED_PROPERTIES)
-QML_DECLARE_TYPE(QSGLayoutMirroringAttached)
-QML_DECLARE_TYPEINFO(QSGLayoutMirroringAttached, QML_HAS_ATTACHED_PROPERTIES)
+QML_DECLARE_TYPE(QQuickKeysAttached)
+QML_DECLARE_TYPEINFO(QQuickKeysAttached, QML_HAS_ATTACHED_PROPERTIES)
+QML_DECLARE_TYPE(QQuickKeyNavigationAttached)
+QML_DECLARE_TYPEINFO(QQuickKeyNavigationAttached, QML_HAS_ATTACHED_PROPERTIES)
+QML_DECLARE_TYPE(QQuickLayoutMirroringAttached)
+QML_DECLARE_TYPEINFO(QQuickLayoutMirroringAttached, QML_HAS_ATTACHED_PROPERTIES)
 
-#endif // QSGITEM_P_H
+#endif // QQUICKITEM_P_H
diff --git a/src/declarative/items/qsgitemchangelistener_p.h b/src/declarative/items/qquickitemchangelistener_p.h
index 3ea0c9cee7..a021658f9e 100644
--- a/src/declarative/items/qsgitemchangelistener_p.h
+++ b/src/declarative/items/qquickitemchangelistener_p.h
@@ -40,8 +40,8 @@
 **
 ****************************************************************************/
 
-#ifndef QSGITEMCHANGELISTENER_P_H
-#define QSGITEMCHANGELISTENER_P_H
+#ifndef QQUICKITEMCHANGELISTENER_P_H
+#define QQUICKITEMCHANGELISTENER_P_H
 
 //
 //  W A R N I N G
@@ -59,24 +59,24 @@
 QT_BEGIN_NAMESPACE
 
 class QRectF;
-class QSGItem;
-class QSGAnchorsPrivate;
-class QSGItemChangeListener
+class QQuickItem;
+class QQuickAnchorsPrivate;
+class QQuickItemChangeListener
 {
 public:
-    virtual void itemGeometryChanged(QSGItem *, const QRectF &, const QRectF &) {}
-    virtual void itemSiblingOrderChanged(QSGItem *) {}
-    virtual void itemVisibilityChanged(QSGItem *) {}
-    virtual void itemOpacityChanged(QSGItem *) {}
-    virtual void itemDestroyed(QSGItem *) {}
-    virtual void itemChildAdded(QSGItem *, QSGItem *) {}
-    virtual void itemChildRemoved(QSGItem *, QSGItem *) {}
-    virtual void itemParentChanged(QSGItem *, QSGItem *) {}
-    virtual void itemRotationChanged(QSGItem *) {}
+    virtual void itemGeometryChanged(QQuickItem *, const QRectF &, const QRectF &) {}
+    virtual void itemSiblingOrderChanged(QQuickItem *) {}
+    virtual void itemVisibilityChanged(QQuickItem *) {}
+    virtual void itemOpacityChanged(QQuickItem *) {}
+    virtual void itemDestroyed(QQuickItem *) {}
+    virtual void itemChildAdded(QQuickItem *, QQuickItem *) {}
+    virtual void itemChildRemoved(QQuickItem *, QQuickItem *) {}
+    virtual void itemParentChanged(QQuickItem *, QQuickItem *) {}
+    virtual void itemRotationChanged(QQuickItem *) {}
 
-    virtual QSGAnchorsPrivate *anchorPrivate() { return 0; }
+    virtual QQuickAnchorsPrivate *anchorPrivate() { return 0; }
 };
 
 QT_END_NAMESPACE
 
-#endif // QSGITEMCHANGELISTENER_P_H
+#endif // QQUICKITEMCHANGELISTENER_P_H
diff --git a/src/declarative/items/qquickitemsmodule.cpp b/src/declarative/items/qquickitemsmodule.cpp
new file mode 100644
index 0000000000..38b5a91e56
--- /dev/null
+++ b/src/declarative/items/qquickitemsmodule.cpp
@@ -0,0 +1,228 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** 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 "qquickitemsmodule_p.h"
+
+#include "qquickitem.h"
+#include "qquickitem_p.h"
+#include "qquickevents_p_p.h"
+#include "qquickrectangle_p.h"
+#include "qquickfocusscope_p.h"
+#include "qquicktext_p.h"
+#include "qquicktextinput_p.h"
+#include "qquicktextedit_p.h"
+#include "qquickimage_p.h"
+#include "qquickborderimage_p.h"
+#include "qquickscalegrid_p_p.h"
+#include "qquickmousearea_p.h"
+#include "qquickpincharea_p.h"
+#include "qquickflickable_p.h"
+#include "qquickflickable_p_p.h"
+#include "qquicklistview_p.h"
+#include "qquickvisualitemmodel_p.h"
+#include "qquickvisualdatamodel_p.h"
+#include "qquickgridview_p.h"
+#include "qquickpathview_p.h"
+#include <private/qdeclarativepath_p.h>
+#include <private/qdeclarativepathinterpolator_p.h>
+#include "qquickpositioners_p.h"
+#include "qquickrepeater_p.h"
+#include "qquickloader_p.h"
+#include "qquickanimatedimage_p.h"
+#include "qquickflipable_p.h"
+#include "qquicktranslate_p.h"
+#include "qquickstateoperations_p.h"
+#include "qquickanimation_p.h"
+#include <private/qquickshadereffect_p.h>
+#include <private/qquickshadereffectsource_p.h>
+//#include <private/qquickpincharea_p.h>
+#include <private/qquickcanvasitem_p.h>
+#include <private/qquickcontext2d_p.h>
+#include "qquicksprite_p.h"
+#include "qquickspriteimage_p.h"
+#include "qquickdrag_p.h"
+#include "qquickdroparea_p.h"
+
+static QDeclarativePrivate::AutoParentResult qquickitem_autoParent(QObject *obj, QObject *parent)
+{
+    QQuickItem *item = qobject_cast<QQuickItem *>(obj);
+    if (!item)
+        return QDeclarativePrivate::IncompatibleObject;
+
+    QQuickItem *parentItem = qobject_cast<QQuickItem *>(parent);
+    if (!parentItem)
+        return QDeclarativePrivate::IncompatibleParent;
+
+    item->setParentItem(parentItem);
+    return QDeclarativePrivate::Parented;
+}
+
+static void qt_quickitems_defineModule(const char *uri, int major, int minor)
+{
+    QDeclarativePrivate::RegisterAutoParent autoparent = { 0, &qquickitem_autoParent };
+    QDeclarativePrivate::qmlregister(QDeclarativePrivate::AutoParentRegistration, &autoparent);
+
+#ifdef QT_NO_MOVIE
+    qmlRegisterTypeNotAvailable(uri,major,minor,"AnimatedImage", qApp->translate("QQuickAnimatedImage","Qt was built without support for QMovie"));
+#else
+    qmlRegisterType<QQuickAnimatedImage>(uri,major,minor,"AnimatedImage");
+#endif
+    qmlRegisterType<QQuickBorderImage>(uri,major,minor,"BorderImage");
+    qmlRegisterType<QQuickColumn>(uri,major,minor,"Column");
+    qmlRegisterType<QQuickFlickable>(uri,major,minor,"Flickable");
+    qmlRegisterType<QQuickFlipable>(uri,major,minor,"Flipable");
+    qmlRegisterType<QQuickFlow>(uri,major,minor,"Flow");
+//    qmlRegisterType<QDeclarativeFocusPanel>(uri,major,minor,"FocusPanel");
+    qmlRegisterType<QQuickFocusScope>(uri,major,minor,"FocusScope");
+    qmlRegisterType<QQuickGradient>(uri,major,minor,"Gradient");
+    qmlRegisterType<QQuickGradientStop>(uri,major,minor,"GradientStop");
+    qmlRegisterType<QQuickGrid>(uri,major,minor,"Grid");
+    qmlRegisterType<QQuickGridView>(uri,major,minor,"GridView");
+    qmlRegisterType<QQuickImage>(uri,major,minor,"Image");
+    qmlRegisterType<QQuickItem>(uri,major,minor,"Item");
+    qmlRegisterType<QQuickListView>(uri,major,minor,"ListView");
+    qmlRegisterType<QQuickLoader>(uri,major,minor,"Loader");
+    qmlRegisterType<QQuickMouseArea>(uri,major,minor,"MouseArea");
+    qmlRegisterType<QDeclarativePath>(uri,major,minor,"Path");
+    qmlRegisterType<QDeclarativePathAttribute>(uri,major,minor,"PathAttribute");
+    qmlRegisterType<QDeclarativePathCubic>(uri,major,minor,"PathCubic");
+    qmlRegisterType<QDeclarativePathLine>(uri,major,minor,"PathLine");
+    qmlRegisterType<QDeclarativePathPercent>(uri,major,minor,"PathPercent");
+    qmlRegisterType<QDeclarativePathQuad>(uri,major,minor,"PathQuad");
+    qmlRegisterType<QDeclarativePathCatmullRomCurve>("QtQuick",2,0,"PathCurve");
+    qmlRegisterType<QDeclarativePathArc>("QtQuick",2,0,"PathArc");
+    qmlRegisterType<QDeclarativePathSvg>("QtQuick",2,0,"PathSvg");
+    qmlRegisterType<QQuickPathView>(uri,major,minor,"PathView");
+    qmlRegisterUncreatableType<QQuickBasePositioner>(uri,major,minor,"Positioner",
+                                                  QStringLiteral("Positioner is an abstract type that is only available as an attached property."));
+#ifndef QT_NO_VALIDATOR
+    qmlRegisterType<QIntValidator>(uri,major,minor,"IntValidator");
+    qmlRegisterType<QDoubleValidator>(uri,major,minor,"DoubleValidator");
+    qmlRegisterType<QRegExpValidator>(uri,major,minor,"RegExpValidator");
+#endif
+    qmlRegisterType<QQuickRectangle>(uri,major,minor,"Rectangle");
+    qmlRegisterType<QQuickRepeater>(uri,major,minor,"Repeater");
+    qmlRegisterType<QQuickRow>(uri,major,minor,"Row");
+    qmlRegisterType<QQuickTranslate>(uri,major,minor,"Translate");
+    qmlRegisterType<QQuickRotation>(uri,major,minor,"Rotation");
+    qmlRegisterType<QQuickScale>(uri,major,minor,"Scale");
+    qmlRegisterType<QQuickText>(uri,major,minor,"Text");
+    qmlRegisterType<QQuickTextEdit>(uri,major,minor,"TextEdit");
+    qmlRegisterType<QQuickTextInput>(uri,major,minor,"TextInput");
+    qmlRegisterType<QQuickViewSection>(uri,major,minor,"ViewSection");
+    qmlRegisterType<QQuickVisualDataModel>(uri,major,minor,"VisualDataModel");
+    qmlRegisterType<QQuickVisualDataGroup>(uri,major,minor,"VisualDataGroup");
+    qmlRegisterType<QQuickVisualItemModel>(uri,major,minor,"VisualItemModel");
+
+    qmlRegisterType<QQuickAnchors>();
+    qmlRegisterType<QQuickKeyEvent>();
+    qmlRegisterType<QQuickMouseEvent>();
+    qmlRegisterType<QQuickTransform>();
+    qmlRegisterType<QDeclarativePathElement>();
+    qmlRegisterType<QDeclarativeCurve>();
+    qmlRegisterType<QQuickScaleGrid>();
+    qmlRegisterType<QQuickTextLine>();
+#ifndef QT_NO_VALIDATOR
+    qmlRegisterType<QValidator>();
+#endif
+    qmlRegisterType<QQuickVisualModel>();
+    qmlRegisterType<QQuickPen>();
+    qmlRegisterType<QQuickFlickableVisibleArea>();
+    qRegisterMetaType<QQuickAnchorLine>("QQuickAnchorLine");
+
+    qmlRegisterUncreatableType<QQuickKeyNavigationAttached>(uri,major,minor,"KeyNavigation",QQuickKeyNavigationAttached::tr("KeyNavigation is only available via attached properties"));
+    qmlRegisterUncreatableType<QQuickKeysAttached>(uri,major,minor,"Keys",QQuickKeysAttached::tr("Keys is only available via attached properties"));
+    qmlRegisterUncreatableType<QQuickLayoutMirroringAttached>(uri,major,minor,"LayoutMirroring", QQuickLayoutMirroringAttached::tr("LayoutMirroring is only available via attached properties"));
+
+    qmlRegisterType<QQuickPinchArea>(uri,major,minor,"PinchArea");
+    qmlRegisterType<QQuickPinch>(uri,major,minor,"Pinch");
+    qmlRegisterType<QQuickPinchEvent>();
+
+    qmlRegisterType<QQuickShaderEffectItem>("QtQuick", 2, 0, "ShaderEffectItem"); // TODO: Remove after grace period.
+    qmlRegisterType<QQuickShaderEffect>("QtQuick", 2, 0, "ShaderEffect");
+    qmlRegisterType<QQuickShaderEffectSource>("QtQuick", 2, 0, "ShaderEffectSource");
+    qmlRegisterUncreatableType<QQuickShaderEffectMesh>("QtQuick", 2, 0, "ShaderEffectMesh", QQuickShaderEffectMesh::tr("Cannot create instance of abstract class ShaderEffectMesh."));
+    qmlRegisterType<QQuickGridMesh>("QtQuick", 2, 0, "GridMesh");
+
+    qmlRegisterUncreatableType<QQuickPaintedItem>("QtQuick", 2, 0, "PaintedItem", QQuickPaintedItem::tr("Cannot create instance of abstract class PaintedItem"));
+
+    qmlRegisterType<QQuickCanvasItem>("QtQuick", 2, 0, "Canvas");
+
+    qmlRegisterType<QQuickSprite>("QtQuick", 2, 0, "Sprite");
+    qmlRegisterType<QQuickSpriteImage>("QtQuick", 2, 0, "SpriteImage");
+
+    qmlRegisterType<QQuickParentChange>(uri, major, minor,"ParentChange");
+    qmlRegisterType<QQuickAnchorChanges>(uri, major, minor,"AnchorChanges");
+    qmlRegisterType<QQuickAnchorSet>();
+    qmlRegisterType<QQuickAnchorAnimation>(uri, major, minor,"AnchorAnimation");
+    qmlRegisterType<QQuickParentAnimation>(uri, major, minor,"ParentAnimation");
+    qmlRegisterType<QQuickPathAnimation>("QtQuick",2,0,"PathAnimation");
+    qmlRegisterType<QDeclarativePathInterpolator>("QtQuick",2,0,"PathInterpolator");
+
+    qmlRegisterType<QQuickDropArea>("QtQuick", 2, 0, "DropArea");
+    qmlRegisterType<QQuickDropEvent>();
+    qmlRegisterType<QQuickDropAreaDrag>();
+    qmlRegisterUncreatableType<QQuickDrag>("QtQuick", 2, 0, "Drag", QQuickDragAttached::tr("Drag is only available via attached properties"));
+}
+
+void QQuickItemsModule::defineModule()
+{
+    static bool initialized = false;
+    if (initialized)
+        return;
+    initialized = true;
+
+    // XXX todo -  Remove before final integration...
+    QByteArray mode = qgetenv("QMLSCENE_IMPORT_NAME");
+    QByteArray name = "QtQuick";
+    int majorVersion = 2;
+    int minorVersion = 0;
+    if (mode == "quick1") {
+        majorVersion = 1;
+    } else if (mode == "qt") {
+        name = "Qt";
+        majorVersion = 4;
+        minorVersion = 7;
+    }
+
+    qt_quickitems_defineModule(name, majorVersion, minorVersion);
+}
+
diff --git a/src/declarative/items/qsgitemsmodule_p.h b/src/declarative/items/qquickitemsmodule_p.h
index b030669736..d3682007d7 100644
--- a/src/declarative/items/qsgitemsmodule_p.h
+++ b/src/declarative/items/qquickitemsmodule_p.h
@@ -40,8 +40,8 @@
 **
 ****************************************************************************/
 
-#ifndef QSGITEMSMODULE_P_H
-#define QSGITEMSMODULE_P_H
+#ifndef QQUICKITEMSMODULE_P_H
+#define QQUICKITEMSMODULE_P_H
 
 #include <qdeclarative.h>
 
@@ -51,7 +51,7 @@ QT_BEGIN_NAMESPACE
 
 QT_MODULE(Declarative)
 
-class QSGItemsModule
+class QQuickItemsModule
 {
 public:
     static void defineModule();
@@ -61,5 +61,5 @@ QT_END_NAMESPACE
 
 QT_END_HEADER
 
-#endif // QSGITEMSMODULE_P_H
+#endif // QQUICKITEMSMODULE_P_H
 
diff --git a/src/declarative/items/qsgitemview.cpp b/src/declarative/items/qquickitemview.cpp
index 5b95097dcc..b3429ded7c 100644
--- a/src/declarative/items/qsgitemview.cpp
+++ b/src/declarative/items/qquickitemview.cpp
@@ -39,12 +39,12 @@
 **
 ****************************************************************************/
 
-#include "qsgitemview_p_p.h"
+#include "qquickitemview_p_p.h"
 
 QT_BEGIN_NAMESPACE
 
 
-FxViewItem::FxViewItem(QSGItem *i, bool own)
+FxViewItem::FxViewItem(QQuickItem *i, bool own)
     : item(i), ownItem(own), index(-1)
 {
 }
@@ -59,18 +59,18 @@ FxViewItem::~FxViewItem()
 }
 
 
-QSGItemViewChangeSet::QSGItemViewChangeSet()
+QQuickItemViewChangeSet::QQuickItemViewChangeSet()
     : active(false)
 {
     reset();
 }
 
-bool QSGItemViewChangeSet::hasPendingChanges() const
+bool QQuickItemViewChangeSet::hasPendingChanges() const
 {
     return !pendingChanges.isEmpty();
 }
 
-void QSGItemViewChangeSet::applyChanges(const QDeclarativeChangeSet &changeSet)
+void QQuickItemViewChangeSet::applyChanges(const QDeclarativeChangeSet &changeSet)
 {
     pendingChanges.apply(changeSet);
 
@@ -115,7 +115,7 @@ void QSGItemViewChangeSet::applyChanges(const QDeclarativeChangeSet &changeSet)
     }
 }
 
-void QSGItemViewChangeSet::prepare(int currentIndex, int count)
+void QQuickItemViewChangeSet::prepare(int currentIndex, int count)
 {
     if (active)
         return;
@@ -125,7 +125,7 @@ void QSGItemViewChangeSet::prepare(int currentIndex, int count)
     newCurrentIndex = currentIndex;
 }
 
-void QSGItemViewChangeSet::reset()
+void QQuickItemViewChangeSet::reset()
 {
     itemCount = 0;
     newCurrentIndex = -1;
@@ -137,16 +137,16 @@ void QSGItemViewChangeSet::reset()
 }
 
 
-QSGItemView::QSGItemView(QSGFlickablePrivate &dd, QSGItem *parent)
-    : QSGFlickable(dd, parent)
+QQuickItemView::QQuickItemView(QQuickFlickablePrivate &dd, QQuickItem *parent)
+    : QQuickFlickable(dd, parent)
 {
-    Q_D(QSGItemView);
+    Q_D(QQuickItemView);
     d->init();
 }
 
-QSGItemView::~QSGItemView()
+QQuickItemView::~QQuickItemView()
 {
-    Q_D(QSGItemView);
+    Q_D(QQuickItemView);
     d->clear();
     if (d->ownModel)
         delete d->model;
@@ -155,34 +155,34 @@ QSGItemView::~QSGItemView()
 }
 
 
-QSGItem *QSGItemView::currentItem() const
+QQuickItem *QQuickItemView::currentItem() const
 {
-    Q_D(const QSGItemView);
+    Q_D(const QQuickItemView);
     if (!d->currentItem)
         return 0;
-    const_cast<QSGItemViewPrivate*>(d)->applyPendingChanges();
+    const_cast<QQuickItemViewPrivate*>(d)->applyPendingChanges();
     return d->currentItem->item;
 }
 
-QVariant QSGItemView::model() const
+QVariant QQuickItemView::model() const
 {
-    Q_D(const QSGItemView);
+    Q_D(const QQuickItemView);
     return d->modelVariant;
 }
 
-void QSGItemView::setModel(const QVariant &model)
+void QQuickItemView::setModel(const QVariant &model)
 {
-    Q_D(QSGItemView);
+    Q_D(QQuickItemView);
     if (d->modelVariant == model)
         return;
     if (d->model) {
         disconnect(d->model, SIGNAL(modelUpdated(QDeclarativeChangeSet,bool)),
                 this, SLOT(modelUpdated(QDeclarativeChangeSet,bool)));
-        disconnect(d->model, SIGNAL(createdItem(int,QSGItem*)), this, SLOT(createdItem(int,QSGItem*)));
-        disconnect(d->model, SIGNAL(destroyingItem(QSGItem*)), this, SLOT(destroyingItem(QSGItem*)));
+        disconnect(d->model, SIGNAL(createdItem(int,QQuickItem*)), this, SLOT(createdItem(int,QQuickItem*)));
+        disconnect(d->model, SIGNAL(destroyingItem(QQuickItem*)), this, SLOT(destroyingItem(QQuickItem*)));
     }
 
-    QSGVisualModel *oldModel = d->model;
+    QQuickVisualModel *oldModel = d->model;
 
     d->clear();
     d->setPosition(d->contentStartPosition());
@@ -190,8 +190,8 @@ void QSGItemView::setModel(const QVariant &model)
     d->modelVariant = model;
 
     QObject *object = qvariant_cast<QObject*>(model);
-    QSGVisualModel *vim = 0;
-    if (object && (vim = qobject_cast<QSGVisualModel *>(object))) {
+    QQuickVisualModel *vim = 0;
+    if (object && (vim = qobject_cast<QQuickVisualModel *>(object))) {
         if (d->ownModel) {
             delete oldModel;
             d->ownModel = false;
@@ -199,66 +199,66 @@ void QSGItemView::setModel(const QVariant &model)
         d->model = vim;
     } else {
         if (!d->ownModel) {
-            d->model = new QSGVisualDataModel(qmlContext(this), this);
+            d->model = new QQuickVisualDataModel(qmlContext(this), this);
             d->ownModel = true;
             if (isComponentComplete())
-                static_cast<QSGVisualDataModel *>(d->model.data())->componentComplete();
+                static_cast<QQuickVisualDataModel *>(d->model.data())->componentComplete();
         } else {
             d->model = oldModel;
         }
-        if (QSGVisualDataModel *dataModel = qobject_cast<QSGVisualDataModel*>(d->model))
+        if (QQuickVisualDataModel *dataModel = qobject_cast<QQuickVisualDataModel*>(d->model))
             dataModel->setModel(model);
     }
 
     if (d->model) {
-        d->bufferMode = QSGItemViewPrivate::BufferBefore | QSGItemViewPrivate::BufferAfter;
+        d->bufferMode = QQuickItemViewPrivate::BufferBefore | QQuickItemViewPrivate::BufferAfter;
         if (isComponentComplete()) {
             updateSections();
             d->refill();
             if ((d->currentIndex >= d->model->count() || d->currentIndex < 0) && !d->currentIndexCleared) {
                 setCurrentIndex(0);
             } else {
-                d->moveReason = QSGItemViewPrivate::SetIndex;
+                d->moveReason = QQuickItemViewPrivate::SetIndex;
                 d->updateCurrent(d->currentIndex);
                 if (d->highlight && d->currentItem) {
                     if (d->autoHighlight)
                         d->resetHighlightPosition();
                     d->updateTrackedItem();
                 }
-                d->moveReason = QSGItemViewPrivate::Other;
+                d->moveReason = QQuickItemViewPrivate::Other;
             }
             d->updateViewport();
         }
         connect(d->model, SIGNAL(modelUpdated(QDeclarativeChangeSet,bool)),
                 this, SLOT(modelUpdated(QDeclarativeChangeSet,bool)));
-        connect(d->model, SIGNAL(createdItem(int,QSGItem*)), this, SLOT(createdItem(int,QSGItem*)));
-        connect(d->model, SIGNAL(destroyingItem(QSGItem*)), this, SLOT(destroyingItem(QSGItem*)));
+        connect(d->model, SIGNAL(createdItem(int,QQuickItem*)), this, SLOT(createdItem(int,QQuickItem*)));
+        connect(d->model, SIGNAL(destroyingItem(QQuickItem*)), this, SLOT(destroyingItem(QQuickItem*)));
         emit countChanged();
     }
     emit modelChanged();
 }
 
-QDeclarativeComponent *QSGItemView::delegate() const
+QDeclarativeComponent *QQuickItemView::delegate() const
 {
-    Q_D(const QSGItemView);
+    Q_D(const QQuickItemView);
     if (d->model) {
-        if (QSGVisualDataModel *dataModel = qobject_cast<QSGVisualDataModel*>(d->model))
+        if (QQuickVisualDataModel *dataModel = qobject_cast<QQuickVisualDataModel*>(d->model))
             return dataModel->delegate();
     }
 
     return 0;
 }
 
-void QSGItemView::setDelegate(QDeclarativeComponent *delegate)
+void QQuickItemView::setDelegate(QDeclarativeComponent *delegate)
 {
-    Q_D(QSGItemView);
+    Q_D(QQuickItemView);
     if (delegate == this->delegate())
         return;
     if (!d->ownModel) {
-        d->model = new QSGVisualDataModel(qmlContext(this));
+        d->model = new QQuickVisualDataModel(qmlContext(this));
         d->ownModel = true;
     }
-    if (QSGVisualDataModel *dataModel = qobject_cast<QSGVisualDataModel*>(d->model)) {
+    if (QQuickVisualDataModel *dataModel = qobject_cast<QQuickVisualDataModel*>(d->model)) {
         int oldCount = dataModel->count();
         dataModel->setDelegate(delegate);
         if (isComponentComplete()) {
@@ -269,14 +269,14 @@ void QSGItemView::setDelegate(QDeclarativeComponent *delegate)
             d->currentItem = 0;
             updateSections();
             d->refill();
-            d->moveReason = QSGItemViewPrivate::SetIndex;
+            d->moveReason = QQuickItemViewPrivate::SetIndex;
             d->updateCurrent(d->currentIndex);
             if (d->highlight && d->currentItem) {
                 if (d->autoHighlight)
                     d->resetHighlightPosition();
                 d->updateTrackedItem();
             }
-            d->moveReason = QSGItemViewPrivate::Other;
+            d->moveReason = QQuickItemViewPrivate::Other;
             d->updateViewport();
         }
         if (oldCount != dataModel->count())
@@ -286,25 +286,25 @@ void QSGItemView::setDelegate(QDeclarativeComponent *delegate)
 }
 
 
-int QSGItemView::count() const
+int QQuickItemView::count() const
 {
-    Q_D(const QSGItemView);
+    Q_D(const QQuickItemView);
     if (!d->model)
         return 0;
-    const_cast<QSGItemViewPrivate*>(d)->applyPendingChanges();
+    const_cast<QQuickItemViewPrivate*>(d)->applyPendingChanges();
     return d->model->count();
 }
 
-int QSGItemView::currentIndex() const
+int QQuickItemView::currentIndex() const
 {
-    Q_D(const QSGItemView);
-    const_cast<QSGItemViewPrivate*>(d)->applyPendingChanges();
+    Q_D(const QQuickItemView);
+    const_cast<QQuickItemViewPrivate*>(d)->applyPendingChanges();
     return d->currentIndex;
 }
 
-void QSGItemView::setCurrentIndex(int index)
+void QQuickItemView::setCurrentIndex(int index)
 {
-    Q_D(QSGItemView);
+    Q_D(QQuickItemView);
     if (d->requestedIndex >= 0)  // currently creating item
         return;
     d->currentIndexCleared = (index == -1);
@@ -313,7 +313,7 @@ void QSGItemView::setCurrentIndex(int index)
     if (index == d->currentIndex)
         return;
     if (isComponentComplete() && d->isValid()) {
-        d->moveReason = QSGItemViewPrivate::SetIndex;
+        d->moveReason = QQuickItemViewPrivate::SetIndex;
         d->updateCurrent(index);
     } else if (d->currentIndex != index) {
         d->currentIndex = index;
@@ -322,34 +322,34 @@ void QSGItemView::setCurrentIndex(int index)
 }
 
 
-bool QSGItemView::isWrapEnabled() const
+bool QQuickItemView::isWrapEnabled() const
 {
-    Q_D(const QSGItemView);
+    Q_D(const QQuickItemView);
     return d->wrap;
 }
 
-void QSGItemView::setWrapEnabled(bool wrap)
+void QQuickItemView::setWrapEnabled(bool wrap)
 {
-    Q_D(QSGItemView);
+    Q_D(QQuickItemView);
     if (d->wrap == wrap)
         return;
     d->wrap = wrap;
     emit keyNavigationWrapsChanged();
 }
 
-int QSGItemView::cacheBuffer() const
+int QQuickItemView::cacheBuffer() const
 {
-    Q_D(const QSGItemView);
+    Q_D(const QQuickItemView);
     return d->buffer;
 }
 
-void QSGItemView::setCacheBuffer(int b)
+void QQuickItemView::setCacheBuffer(int b)
 {
-    Q_D(QSGItemView);
+    Q_D(QQuickItemView);
     if (d->buffer != b) {
         d->buffer = b;
         if (isComponentComplete()) {
-            d->bufferMode = QSGItemViewPrivate::BufferBefore | QSGItemViewPrivate::BufferAfter;
+            d->bufferMode = QQuickItemViewPrivate::BufferBefore | QQuickItemViewPrivate::BufferAfter;
             d->refill();
         }
         emit cacheBufferChanged();
@@ -357,15 +357,15 @@ void QSGItemView::setCacheBuffer(int b)
 }
 
 
-Qt::LayoutDirection QSGItemView::layoutDirection() const
+Qt::LayoutDirection QQuickItemView::layoutDirection() const
 {
-    Q_D(const QSGItemView);
+    Q_D(const QQuickItemView);
     return d->layoutDirection;
 }
 
-void QSGItemView::setLayoutDirection(Qt::LayoutDirection layoutDirection)
+void QQuickItemView::setLayoutDirection(Qt::LayoutDirection layoutDirection)
 {
-    Q_D(QSGItemView);
+    Q_D(QQuickItemView);
     if (d->layoutDirection != layoutDirection) {
         d->layoutDirection = layoutDirection;
         d->regenerate();
@@ -374,9 +374,9 @@ void QSGItemView::setLayoutDirection(Qt::LayoutDirection layoutDirection)
     }
 }
 
-Qt::LayoutDirection QSGItemView::effectiveLayoutDirection() const
+Qt::LayoutDirection QQuickItemView::effectiveLayoutDirection() const
 {
-    Q_D(const QSGItemView);
+    Q_D(const QQuickItemView);
     if (d->effectiveLayoutMirror)
         return d->layoutDirection == Qt::RightToLeft ? Qt::LeftToRight : Qt::RightToLeft;
     else
@@ -384,22 +384,22 @@ Qt::LayoutDirection QSGItemView::effectiveLayoutDirection() const
 }
 
 
-QDeclarativeComponent *QSGItemView::header() const
+QDeclarativeComponent *QQuickItemView::header() const
 {
-    Q_D(const QSGItemView);
+    Q_D(const QQuickItemView);
     return d->headerComponent;
 }
 
-QSGItem *QSGItemView::headerItem() const
+QQuickItem *QQuickItemView::headerItem() const
 {
-    Q_D(const QSGItemView);
-    const_cast<QSGItemViewPrivate*>(d)->applyPendingChanges();
+    Q_D(const QQuickItemView);
+    const_cast<QQuickItemViewPrivate*>(d)->applyPendingChanges();
     return d->header ? d->header->item : 0;
 }
 
-void QSGItemView::setHeader(QDeclarativeComponent *headerComponent)
+void QQuickItemView::setHeader(QDeclarativeComponent *headerComponent)
 {
-    Q_D(QSGItemView);
+    Q_D(QQuickItemView);
     if (d->headerComponent != headerComponent) {
         d->applyPendingChanges();
         delete d->header;
@@ -420,22 +420,22 @@ void QSGItemView::setHeader(QDeclarativeComponent *headerComponent)
     }
 }
 
-QDeclarativeComponent *QSGItemView::footer() const
+QDeclarativeComponent *QQuickItemView::footer() const
 {
-    Q_D(const QSGItemView);
+    Q_D(const QQuickItemView);
     return d->footerComponent;
 }
 
-QSGItem *QSGItemView::footerItem() const
+QQuickItem *QQuickItemView::footerItem() const
 {
-    Q_D(const QSGItemView);
-    const_cast<QSGItemViewPrivate*>(d)->applyPendingChanges();
+    Q_D(const QQuickItemView);
+    const_cast<QQuickItemViewPrivate*>(d)->applyPendingChanges();
     return d->footer ? d->footer->item : 0;
 }
 
-void QSGItemView::setFooter(QDeclarativeComponent *footerComponent)
+void QQuickItemView::setFooter(QDeclarativeComponent *footerComponent)
 {
-    Q_D(QSGItemView);
+    Q_D(QQuickItemView);
     if (d->footerComponent != footerComponent) {
         d->applyPendingChanges();
         delete d->footer;
@@ -453,16 +453,16 @@ void QSGItemView::setFooter(QDeclarativeComponent *footerComponent)
     }
 }
 
-QDeclarativeComponent *QSGItemView::highlight() const
+QDeclarativeComponent *QQuickItemView::highlight() const
 {
-    Q_D(const QSGItemView);
-    const_cast<QSGItemViewPrivate*>(d)->applyPendingChanges();
+    Q_D(const QQuickItemView);
+    const_cast<QQuickItemViewPrivate*>(d)->applyPendingChanges();
     return d->highlightComponent;
 }
 
-void QSGItemView::setHighlight(QDeclarativeComponent *highlightComponent)
+void QQuickItemView::setHighlight(QDeclarativeComponent *highlightComponent)
 {
-    Q_D(QSGItemView);
+    Q_D(QQuickItemView);
     if (highlightComponent != d->highlightComponent) {
         d->applyPendingChanges();
         d->highlightComponent = highlightComponent;
@@ -473,22 +473,22 @@ void QSGItemView::setHighlight(QDeclarativeComponent *highlightComponent)
     }
 }
 
-QSGItem *QSGItemView::highlightItem() const
+QQuickItem *QQuickItemView::highlightItem() const
 {
-    Q_D(const QSGItemView);
-    const_cast<QSGItemViewPrivate*>(d)->applyPendingChanges();
+    Q_D(const QQuickItemView);
+    const_cast<QQuickItemViewPrivate*>(d)->applyPendingChanges();
     return d->highlight ? d->highlight->item : 0;
 }
 
-bool QSGItemView::highlightFollowsCurrentItem() const
+bool QQuickItemView::highlightFollowsCurrentItem() const
 {
-    Q_D(const QSGItemView);
+    Q_D(const QQuickItemView);
     return d->autoHighlight;
 }
 
-void QSGItemView::setHighlightFollowsCurrentItem(bool autoHighlight)
+void QQuickItemView::setHighlightFollowsCurrentItem(bool autoHighlight)
 {
-    Q_D(QSGItemView);
+    Q_D(QQuickItemView);
     if (d->autoHighlight != autoHighlight) {
         d->autoHighlight = autoHighlight;
         if (autoHighlight)
@@ -497,15 +497,15 @@ void QSGItemView::setHighlightFollowsCurrentItem(bool autoHighlight)
     }
 }
 
-QSGItemView::HighlightRangeMode QSGItemView::highlightRangeMode() const
+QQuickItemView::HighlightRangeMode QQuickItemView::highlightRangeMode() const
 {
-    Q_D(const QSGItemView);
-    return static_cast<QSGItemView::HighlightRangeMode>(d->highlightRange);
+    Q_D(const QQuickItemView);
+    return static_cast<QQuickItemView::HighlightRangeMode>(d->highlightRange);
 }
 
-void QSGItemView::setHighlightRangeMode(HighlightRangeMode mode)
+void QQuickItemView::setHighlightRangeMode(HighlightRangeMode mode)
 {
-    Q_D(QSGItemView);
+    Q_D(QQuickItemView);
     if (d->highlightRange == mode)
         return;
     d->highlightRange = mode;
@@ -514,15 +514,15 @@ void QSGItemView::setHighlightRangeMode(HighlightRangeMode mode)
 }
 
 //###Possibly rename these properties, since they are very useful even without a highlight?
-qreal QSGItemView::preferredHighlightBegin() const
+qreal QQuickItemView::preferredHighlightBegin() const
 {
-    Q_D(const QSGItemView);
+    Q_D(const QQuickItemView);
     return d->highlightRangeStart;
 }
 
-void QSGItemView::setPreferredHighlightBegin(qreal start)
+void QQuickItemView::setPreferredHighlightBegin(qreal start)
 {
-    Q_D(QSGItemView);
+    Q_D(QQuickItemView);
     d->highlightRangeStartValid = true;
     if (d->highlightRangeStart == start)
         return;
@@ -531,9 +531,9 @@ void QSGItemView::setPreferredHighlightBegin(qreal start)
     emit preferredHighlightBeginChanged();
 }
 
-void QSGItemView::resetPreferredHighlightBegin()
+void QQuickItemView::resetPreferredHighlightBegin()
 {
-    Q_D(QSGItemView);
+    Q_D(QQuickItemView);
     d->highlightRangeStartValid = false;
     if (d->highlightRangeStart == 0)
         return;
@@ -541,15 +541,15 @@ void QSGItemView::resetPreferredHighlightBegin()
     emit preferredHighlightBeginChanged();
 }
 
-qreal QSGItemView::preferredHighlightEnd() const
+qreal QQuickItemView::preferredHighlightEnd() const
 {
-    Q_D(const QSGItemView);
+    Q_D(const QQuickItemView);
     return d->highlightRangeEnd;
 }
 
-void QSGItemView::setPreferredHighlightEnd(qreal end)
+void QQuickItemView::setPreferredHighlightEnd(qreal end)
 {
-    Q_D(QSGItemView);
+    Q_D(QQuickItemView);
     d->highlightRangeEndValid = true;
     if (d->highlightRangeEnd == end)
         return;
@@ -558,9 +558,9 @@ void QSGItemView::setPreferredHighlightEnd(qreal end)
     emit preferredHighlightEndChanged();
 }
 
-void QSGItemView::resetPreferredHighlightEnd()
+void QQuickItemView::resetPreferredHighlightEnd()
 {
-    Q_D(QSGItemView);
+    Q_D(QQuickItemView);
     d->highlightRangeEndValid = false;
     if (d->highlightRangeEnd == 0)
         return;
@@ -568,27 +568,27 @@ void QSGItemView::resetPreferredHighlightEnd()
     emit preferredHighlightEndChanged();
 }
 
-int QSGItemView::highlightMoveDuration() const
+int QQuickItemView::highlightMoveDuration() const
 {
-    Q_D(const QSGItemView);
+    Q_D(const QQuickItemView);
     return d->highlightMoveDuration;
 }
 
-void QSGItemView::setHighlightMoveDuration(int duration)
+void QQuickItemView::setHighlightMoveDuration(int duration)
 {
-    Q_D(QSGItemView);
+    Q_D(QQuickItemView);
     if (d->highlightMoveDuration != duration) {
         d->highlightMoveDuration = duration;
         emit highlightMoveDurationChanged();
     }
 }
 
-void QSGItemViewPrivate::positionViewAtIndex(int index, int mode)
+void QQuickItemViewPrivate::positionViewAtIndex(int index, int mode)
 {
-    Q_Q(QSGItemView);
+    Q_Q(QQuickItemView);
     if (!isValid())
         return;
-    if (mode < QSGItemView::Beginning || mode > QSGItemView::Contain)
+    if (mode < QQuickItemView::Beginning || mode > QQuickItemView::Contain)
         return;
 
     applyPendingChanges();
@@ -616,26 +616,26 @@ void QSGItemViewPrivate::positionViewAtIndex(int index, int mode)
     if (item) {
         const qreal itemPos = item->position();
         switch (mode) {
-        case QSGItemView::Beginning:
+        case QQuickItemView::Beginning:
             pos = itemPos;
             if (index < 0 && header)
                 pos -= headerSize();
             break;
-        case QSGItemView::Center:
+        case QQuickItemView::Center:
             pos = itemPos - (size() - item->size())/2;
             break;
-        case QSGItemView::End:
+        case QQuickItemView::End:
             pos = itemPos - size() + item->size();
             if (index >= model->count() && footer)
                 pos += footerSize();
             break;
-        case QSGItemView::Visible:
+        case QQuickItemView::Visible:
             if (itemPos > pos + size())
                 pos = itemPos - size() + item->size();
             else if (item->endPosition() <= pos)
                 pos = itemPos;
             break;
-        case QSGItemView::Contain:
+        case QQuickItemView::Contain:
             if (item->endPosition() >= pos + size())
                 pos = itemPos - size() + item->size();
             if (itemPos < pos)
@@ -648,7 +648,7 @@ void QSGItemViewPrivate::positionViewAtIndex(int index, int mode)
         else
             minExtent = isContentFlowReversed() ? q->maxXExtent()-size(): -q->minXExtent();
         pos = qMax(pos, minExtent);
-        moveReason = QSGItemViewPrivate::Other;
+        moveReason = QQuickItemViewPrivate::Other;
         q->cancelFlick();
         setPosition(pos);
 
@@ -661,34 +661,34 @@ void QSGItemViewPrivate::positionViewAtIndex(int index, int mode)
     fixupPosition();
 }
 
-void QSGItemView::positionViewAtIndex(int index, int mode)
+void QQuickItemView::positionViewAtIndex(int index, int mode)
 {
-    Q_D(QSGItemView);
+    Q_D(QQuickItemView);
     if (!d->isValid() || index < 0 || index >= d->model->count())
         return;
     d->positionViewAtIndex(index, mode);
 }
 
 
-void QSGItemView::positionViewAtBeginning()
+void QQuickItemView::positionViewAtBeginning()
 {
-    Q_D(QSGItemView);
+    Q_D(QQuickItemView);
     if (!d->isValid())
         return;
     d->positionViewAtIndex(-1, Beginning);
 }
 
-void QSGItemView::positionViewAtEnd()
+void QQuickItemView::positionViewAtEnd()
 {
-    Q_D(QSGItemView);
+    Q_D(QQuickItemView);
     if (!d->isValid())
         return;
     d->positionViewAtIndex(d->model->count(), End);
 }
 
-int QSGItemView::indexAt(qreal x, qreal y) const
+int QQuickItemView::indexAt(qreal x, qreal y) const
 {
-    Q_D(const QSGItemView);
+    Q_D(const QQuickItemView);
     for (int i = 0; i < d->visibleItems.count(); ++i) {
         const FxViewItem *item = d->visibleItems.at(i);
         if (item->contains(x, y))
@@ -698,15 +698,15 @@ int QSGItemView::indexAt(qreal x, qreal y) const
     return -1;
 }
 
-void QSGItemViewPrivate::applyPendingChanges()
+void QQuickItemViewPrivate::applyPendingChanges()
 {
-    Q_Q(QSGItemView);
+    Q_Q(QQuickItemView);
     if (q->isComponentComplete() && currentChanges.hasPendingChanges())
         layout();
 }
 
 // for debugging only
-void QSGItemViewPrivate::checkVisible() const
+void QQuickItemViewPrivate::checkVisible() const
 {
     int skip = 0;
     for (int i = 0; i < visibleItems.count(); ++i) {
@@ -719,10 +719,10 @@ void QSGItemViewPrivate::checkVisible() const
     }
 }
 
-void QSGItemViewPrivate::itemGeometryChanged(QSGItem *item, const QRectF &newGeometry, const QRectF &oldGeometry)
+void QQuickItemViewPrivate::itemGeometryChanged(QQuickItem *item, const QRectF &newGeometry, const QRectF &oldGeometry)
 {
-    Q_Q(QSGItemView);
-    QSGFlickablePrivate::itemGeometryChanged(item, newGeometry, oldGeometry);
+    Q_Q(QQuickItemView);
+    QQuickFlickablePrivate::itemGeometryChanged(item, newGeometry, oldGeometry);
     if (!q->isComponentComplete())
         return;
 
@@ -744,9 +744,9 @@ void QSGItemViewPrivate::itemGeometryChanged(QSGItem *item, const QRectF &newGeo
         q->trackedPositionChanged();
 }
 
-void QSGItemView::destroyRemoved()
+void QQuickItemView::destroyRemoved()
 {
-    Q_D(QSGItemView);
+    Q_D(QQuickItemView);
     for (QList<FxViewItem*>::Iterator it = d->visibleItems.begin();
             it != d->visibleItems.end();) {
         FxViewItem *item = *it;
@@ -764,18 +764,18 @@ void QSGItemView::destroyRemoved()
     d->layout();
 }
 
-void QSGItemView::modelUpdated(const QDeclarativeChangeSet &changeSet, bool reset)
+void QQuickItemView::modelUpdated(const QDeclarativeChangeSet &changeSet, bool reset)
 {
-    Q_D(QSGItemView);
+    Q_D(QQuickItemView);
     if (reset) {
-        d->moveReason = QSGItemViewPrivate::SetIndex;
+        d->moveReason = QQuickItemViewPrivate::SetIndex;
         d->regenerate();
         if (d->highlight && d->currentItem) {
             if (d->autoHighlight)
                 d->resetHighlightPosition();
             d->updateTrackedItem();
         }
-        d->moveReason = QSGItemViewPrivate::Other;
+        d->moveReason = QQuickItemViewPrivate::Other;
 
         emit countChanged();
     } else {
@@ -785,9 +785,9 @@ void QSGItemView::modelUpdated(const QDeclarativeChangeSet &changeSet, bool rese
     }
 }
 
-void QSGItemView::createdItem(int index, QSGItem *item)
+void QQuickItemView::createdItem(int index, QQuickItem *item)
 {
-    Q_D(QSGItemView);
+    Q_D(QQuickItemView);
     if (d->requestedIndex != index) {
         item->setParentItem(contentItem());
         d->unrequestedItems.insert(item, index);
@@ -795,27 +795,27 @@ void QSGItemView::createdItem(int index, QSGItem *item)
     }
 }
 
-void QSGItemView::destroyingItem(QSGItem *item)
+void QQuickItemView::destroyingItem(QQuickItem *item)
 {
-    Q_D(QSGItemView);
+    Q_D(QQuickItemView);
     d->unrequestedItems.remove(item);
 }
 
-void QSGItemView::animStopped()
+void QQuickItemView::animStopped()
 {
-    Q_D(QSGItemView);
-    d->bufferMode = QSGItemViewPrivate::NoBuffer;
-    if (d->haveHighlightRange && d->highlightRange == QSGItemView::StrictlyEnforceRange)
+    Q_D(QQuickItemView);
+    d->bufferMode = QQuickItemViewPrivate::NoBuffer;
+    if (d->haveHighlightRange && d->highlightRange == QQuickItemView::StrictlyEnforceRange)
         d->updateHighlight();
 }
 
 
-void QSGItemView::trackedPositionChanged()
+void QQuickItemView::trackedPositionChanged()
 {
-    Q_D(QSGItemView);
+    Q_D(QQuickItemView);
     if (!d->trackedItem || !d->currentItem)
         return;
-    if (d->moveReason == QSGItemViewPrivate::SetIndex) {
+    if (d->moveReason == QQuickItemViewPrivate::SetIndex) {
         qreal trackedPos = d->trackedItem->position();
         qreal trackedSize = d->trackedItem->size();
         if (d->trackedItem != d->currentItem) {
@@ -875,19 +875,19 @@ void QSGItemView::trackedPositionChanged()
     }
 }
 
-void QSGItemView::geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry)
+void QQuickItemView::geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry)
 {
-    Q_D(QSGItemView);
+    Q_D(QQuickItemView);
     d->markExtentsDirty();
-    QSGFlickable::geometryChanged(newGeometry, oldGeometry);
+    QQuickFlickable::geometryChanged(newGeometry, oldGeometry);
 }
 
 
-qreal QSGItemView::minYExtent() const
+qreal QQuickItemView::minYExtent() const
 {
-    Q_D(const QSGItemView);
+    Q_D(const QQuickItemView);
     if (d->layoutOrientation() == Qt::Horizontal)
-        return QSGFlickable::minYExtent();
+        return QQuickFlickable::minYExtent();
 
     if (d->vData.minExtentDirty) {
         d->minExtent = d->vData.startMargin-d->startPosition();
@@ -905,9 +905,9 @@ qreal QSGItemView::minYExtent() const
     return d->minExtent;
 }
 
-qreal QSGItemView::maxYExtent() const
+qreal QQuickItemView::maxYExtent() const
 {
-    Q_D(const QSGItemView);
+    Q_D(const QQuickItemView);
     if (d->layoutOrientation() == Qt::Horizontal)
         return height();
 
@@ -934,11 +934,11 @@ qreal QSGItemView::maxYExtent() const
     return d->maxExtent;
 }
 
-qreal QSGItemView::minXExtent() const
+qreal QQuickItemView::minXExtent() const
 {
-    Q_D(const QSGItemView);
+    Q_D(const QQuickItemView);
     if (d->layoutOrientation() == Qt::Vertical)
-        return QSGFlickable::minXExtent();
+        return QQuickFlickable::minXExtent();
 
     if (d->hData.minExtentDirty) {
         d->minExtent = -d->startPosition();
@@ -978,9 +978,9 @@ qreal QSGItemView::minXExtent() const
     return d->minExtent;
 }
 
-qreal QSGItemView::maxXExtent() const
+qreal QQuickItemView::maxXExtent() const
 {
-    Q_D(const QSGItemView);
+    Q_D(const QQuickItemView);
     if (d->layoutOrientation() == Qt::Vertical)
         return width();
 
@@ -1031,45 +1031,45 @@ qreal QSGItemView::maxXExtent() const
     return d->maxExtent;
 }
 
-void QSGItemView::setContentX(qreal pos)
+void QQuickItemView::setContentX(qreal pos)
 {
-    Q_D(QSGItemView);
+    Q_D(QQuickItemView);
     // Positioning the view manually should override any current movement state
-    d->moveReason = QSGItemViewPrivate::Other;
-    QSGFlickable::setContentX(pos);
+    d->moveReason = QQuickItemViewPrivate::Other;
+    QQuickFlickable::setContentX(pos);
 }
 
-void QSGItemView::setContentY(qreal pos)
+void QQuickItemView::setContentY(qreal pos)
 {
-    Q_D(QSGItemView);
+    Q_D(QQuickItemView);
     // Positioning the view manually should override any current movement state
-    d->moveReason = QSGItemViewPrivate::Other;
-    QSGFlickable::setContentY(pos);
+    d->moveReason = QQuickItemViewPrivate::Other;
+    QQuickFlickable::setContentY(pos);
 }
 
-qreal QSGItemView::xOrigin() const
+qreal QQuickItemView::xOrigin() const
 {
-    Q_D(const QSGItemView);
+    Q_D(const QQuickItemView);
     if (d->isContentFlowReversed())
         return -maxXExtent() + d->size() - d->hData.startMargin;
     else
         return -minXExtent() + d->hData.startMargin;
 }
 
-void QSGItemView::updatePolish()
+void QQuickItemView::updatePolish()
 {
-    Q_D(QSGItemView);
-    QSGFlickable::updatePolish();
+    Q_D(QQuickItemView);
+    QQuickFlickable::updatePolish();
     d->layout();
 }
 
-void QSGItemView::componentComplete()
+void QQuickItemView::componentComplete()
 {
-    Q_D(QSGItemView);
+    Q_D(QQuickItemView);
     if (d->model && d->ownModel)
-        static_cast<QSGVisualDataModel *>(d->model.data())->componentComplete();
+        static_cast<QQuickVisualDataModel *>(d->model.data())->componentComplete();
 
-    QSGFlickable::componentComplete();
+    QQuickFlickable::componentComplete();
 
     updateSections();
     d->updateHeader();
@@ -1078,7 +1078,7 @@ void QSGItemView::componentComplete()
     d->setPosition(d->contentStartPosition());
     if (d->isValid()) {
         d->refill();
-        d->moveReason = QSGItemViewPrivate::SetIndex;
+        d->moveReason = QQuickItemViewPrivate::SetIndex;
         if (d->currentIndex < 0 && !d->currentIndexCleared)
             d->updateCurrent(0);
         else
@@ -1088,7 +1088,7 @@ void QSGItemView::componentComplete()
                 d->resetHighlightPosition();
             d->updateTrackedItem();
         }
-        d->moveReason = QSGItemViewPrivate::Other;
+        d->moveReason = QQuickItemViewPrivate::Other;
         d->fixupPosition();
     }
     if (d->model && d->model->count())
@@ -1097,7 +1097,7 @@ void QSGItemView::componentComplete()
 
 
 
-QSGItemViewPrivate::QSGItemViewPrivate()
+QQuickItemViewPrivate::QQuickItemViewPrivate()
     : itemCount(0)
     , buffer(0), bufferMode(BufferBefore | BufferAfter)
     , layoutDirection(Qt::LeftToRight)
@@ -1106,7 +1106,7 @@ QSGItemViewPrivate::QSGItemViewPrivate()
     , currentIndex(-1), currentItem(0)
     , trackedItem(0), requestedIndex(-1)
     , highlightComponent(0), highlight(0)
-    , highlightRange(QSGItemView::NoHighlightRange)
+    , highlightRange(QQuickItemView::NoHighlightRange)
     , highlightRangeStart(0), highlightRangeEnd(0)
     , highlightMoveDuration(150)
     , headerComponent(0), header(0), footerComponent(0), footer(0)
@@ -1117,36 +1117,36 @@ QSGItemViewPrivate::QSGItemViewPrivate()
 {
 }
 
-bool QSGItemViewPrivate::isValid() const
+bool QQuickItemViewPrivate::isValid() const
 {
     return model && model->count() && model->isValid();
 }
 
-qreal QSGItemViewPrivate::position() const
+qreal QQuickItemViewPrivate::position() const
 {
-    Q_Q(const QSGItemView);
+    Q_Q(const QQuickItemView);
     return layoutOrientation() == Qt::Vertical ? q->contentY() : q->contentX();
 }
 
-qreal QSGItemViewPrivate::size() const
+qreal QQuickItemViewPrivate::size() const
 {
-    Q_Q(const QSGItemView);
+    Q_Q(const QQuickItemView);
     return layoutOrientation() == Qt::Vertical ? q->height() : q->width();
 }
 
-qreal QSGItemViewPrivate::startPosition() const
+qreal QQuickItemViewPrivate::startPosition() const
 {
     return isContentFlowReversed() ? -lastPosition() : originPosition();
 }
 
-qreal QSGItemViewPrivate::endPosition() const
+qreal QQuickItemViewPrivate::endPosition() const
 {
     return isContentFlowReversed() ? -originPosition() : lastPosition();
 }
 
-qreal QSGItemViewPrivate::contentStartPosition() const
+qreal QQuickItemViewPrivate::contentStartPosition() const
 {
-    Q_Q(const QSGItemView);
+    Q_Q(const QQuickItemView);
     qreal pos = -headerSize();
     if (layoutOrientation() == Qt::Vertical)
         pos -= vData.startMargin;
@@ -1158,7 +1158,7 @@ qreal QSGItemViewPrivate::contentStartPosition() const
     return pos;
 }
 
-int QSGItemViewPrivate::findLastVisibleIndex(int defaultValue) const
+int QQuickItemViewPrivate::findLastVisibleIndex(int defaultValue) const
 {
     if (visibleItems.count()) {
         int i = visibleItems.count() - 1;
@@ -1170,7 +1170,7 @@ int QSGItemViewPrivate::findLastVisibleIndex(int defaultValue) const
     return defaultValue;
 }
 
-FxViewItem *QSGItemViewPrivate::visibleItem(int modelIndex) const {
+FxViewItem *QQuickItemViewPrivate::visibleItem(int modelIndex) const {
     if (modelIndex >= visibleIndex && modelIndex < visibleIndex + visibleItems.count()) {
         for (int i = modelIndex - visibleIndex; i < visibleItems.count(); ++i) {
             FxViewItem *item = visibleItems.at(i);
@@ -1181,7 +1181,7 @@ FxViewItem *QSGItemViewPrivate::visibleItem(int modelIndex) const {
     return 0;
 }
 
-FxViewItem *QSGItemViewPrivate::firstVisibleItem() const {
+FxViewItem *QQuickItemViewPrivate::firstVisibleItem() const {
     const qreal pos = isContentFlowReversed() ? -position()-size() : position();
     for (int i = 0; i < visibleItems.count(); ++i) {
         FxViewItem *item = visibleItems.at(i);
@@ -1194,7 +1194,7 @@ FxViewItem *QSGItemViewPrivate::firstVisibleItem() const {
 // Map a model index to visibleItems list index.
 // These may differ if removed items are still present in the visible list,
 // e.g. doing a removal animation
-int QSGItemViewPrivate::mapFromModel(int modelIndex) const
+int QQuickItemViewPrivate::mapFromModel(int modelIndex) const
 {
     if (modelIndex < visibleIndex || modelIndex >= visibleIndex + visibleItems.count())
         return -1;
@@ -1208,19 +1208,19 @@ int QSGItemViewPrivate::mapFromModel(int modelIndex) const
     return -1; // Not in visibleList
 }
 
-void QSGItemViewPrivate::init()
+void QQuickItemViewPrivate::init()
 {
-    Q_Q(QSGItemView);
-    QSGItemPrivate::get(contentItem)->childrenDoNotOverlap = true;
-    q->setFlag(QSGItem::ItemIsFocusScope);
+    Q_Q(QQuickItemView);
+    QQuickItemPrivate::get(contentItem)->childrenDoNotOverlap = true;
+    q->setFlag(QQuickItem::ItemIsFocusScope);
     addItemChangeListener(this, Geometry);
     QObject::connect(q, SIGNAL(movementEnded()), q, SLOT(animStopped()));
-    q->setFlickableDirection(QSGFlickable::VerticalFlick);
+    q->setFlickableDirection(QQuickFlickable::VerticalFlick);
 }
 
-void QSGItemViewPrivate::updateCurrent(int modelIndex)
+void QQuickItemViewPrivate::updateCurrent(int modelIndex)
 {
-    Q_Q(QSGItemView);
+    Q_Q(QQuickItemView);
     applyPendingChanges();
 
     if (!q->isComponentComplete() || !isValid() || modelIndex < 0 || modelIndex >= model->count()) {
@@ -1259,7 +1259,7 @@ void QSGItemViewPrivate::updateCurrent(int modelIndex)
     releaseItem(oldCurrentItem);
 }
 
-void QSGItemViewPrivate::clear()
+void QQuickItemViewPrivate::clear()
 {
     currentChanges.reset();
     timeline.clear();
@@ -1279,14 +1279,14 @@ void QSGItemViewPrivate::clear()
 }
 
 
-void QSGItemViewPrivate::mirrorChange()
+void QQuickItemViewPrivate::mirrorChange()
 {
-    Q_Q(QSGItemView);
+    Q_Q(QQuickItemView);
     regenerate();
     emit q->effectiveLayoutDirectionChanged();
 }
 
-void QSGItemViewPrivate::refill()
+void QQuickItemViewPrivate::refill()
 {
     if (isContentFlowReversed())
         refill(-position()-size(), -position());
@@ -1294,9 +1294,9 @@ void QSGItemViewPrivate::refill()
         refill(position(), position()+size());
 }
 
-void QSGItemViewPrivate::refill(qreal from, qreal to, bool doBuffer)
+void QQuickItemViewPrivate::refill(qreal from, qreal to, bool doBuffer)
 {
-    Q_Q(QSGItemView);
+    Q_Q(QQuickItemView);
     if (!isValid() || !q->isComponentComplete())
         return;
 
@@ -1339,9 +1339,9 @@ void QSGItemViewPrivate::refill(qreal from, qreal to, bool doBuffer)
         emit q->countChanged();
 }
 
-void QSGItemViewPrivate::regenerate()
+void QQuickItemViewPrivate::regenerate()
 {
-    Q_Q(QSGItemView);
+    Q_Q(QQuickItemView);
     if (q->isComponentComplete()) {
         currentChanges.reset();
         delete header;
@@ -1358,9 +1358,9 @@ void QSGItemViewPrivate::regenerate()
     }
 }
 
-void QSGItemViewPrivate::updateViewport()
+void QQuickItemViewPrivate::updateViewport()
 {
-    Q_Q(QSGItemView);
+    Q_Q(QQuickItemView);
     if (isValid()) {
         if (layoutOrientation() == Qt::Vertical)
             q->setContentHeight(endPosition() - startPosition());
@@ -1369,9 +1369,9 @@ void QSGItemViewPrivate::updateViewport()
     }
 }
 
-void QSGItemViewPrivate::layout()
+void QQuickItemViewPrivate::layout()
 {
-    Q_Q(QSGItemView);
+    Q_Q(QQuickItemView);
     if (inApplyModelChanges)
         return;
 
@@ -1403,15 +1403,15 @@ void QSGItemViewPrivate::layout()
     updateUnrequestedPositions();
 }
 
-bool QSGItemViewPrivate::applyModelChanges()
+bool QQuickItemViewPrivate::applyModelChanges()
 {
-    Q_Q(QSGItemView);
+    Q_Q(QQuickItemView);
     if (!q->isComponentComplete() || !currentChanges.hasPendingChanges() || inApplyModelChanges)
         return false;
     inApplyModelChanges = true;
 
     updateUnrequestedIndexes();
-    moveReason = QSGItemViewPrivate::Other;
+    moveReason = QQuickItemViewPrivate::Other;
 
     int prevCount = itemCount;
     bool removedVisible = false;
@@ -1551,14 +1551,14 @@ bool QSGItemViewPrivate::applyModelChanges()
     return visibleAffected;
 }
 
-FxViewItem *QSGItemViewPrivate::createItem(int modelIndex)
+FxViewItem *QQuickItemViewPrivate::createItem(int modelIndex)
 {
-    Q_Q(QSGItemView);
+    Q_Q(QQuickItemView);
 
     requestedIndex = modelIndex;
     FxViewItem *viewItem = 0;
 
-    if (QSGItem *item = model->item(modelIndex, false)) {
+    if (QQuickItem *item = model->item(modelIndex, false)) {
         viewItem = newViewItem(modelIndex, item);
         if (viewItem) {
             viewItem->index = modelIndex;
@@ -1584,15 +1584,15 @@ FxViewItem *QSGItemViewPrivate::createItem(int modelIndex)
 }
 
 
-void QSGItemViewPrivate::releaseItem(FxViewItem *item)
+void QQuickItemViewPrivate::releaseItem(FxViewItem *item)
 {
-    Q_Q(QSGItemView);
+    Q_Q(QQuickItemView);
     if (!item || !model)
         return;
     if (trackedItem == item)
         trackedItem = 0;
-    QSGItemPrivate *itemPrivate = QSGItemPrivate::get(item->item);
-    itemPrivate->removeItemChangeListener(this, QSGItemPrivate::Geometry);
+    QQuickItemPrivate *itemPrivate = QQuickItemPrivate::get(item->item);
+    itemPrivate->removeItemChangeListener(this, QQuickItemPrivate::Geometry);
     if (model->release(item->item) == 0) {
         // item was not destroyed, and we no longer reference it.
         unrequestedItems.insert(item->item, model->indexOf(item->item, q));
@@ -1600,16 +1600,16 @@ void QSGItemViewPrivate::releaseItem(FxViewItem *item)
     delete item;
 }
 
-QSGItem *QSGItemViewPrivate::createHighlightItem()
+QQuickItem *QQuickItemViewPrivate::createHighlightItem()
 {
     return createComponentItem(highlightComponent, true, true);
 }
 
-QSGItem *QSGItemViewPrivate::createComponentItem(QDeclarativeComponent *component, bool receiveItemGeometryChanges, bool createDefault)
+QQuickItem *QQuickItemViewPrivate::createComponentItem(QDeclarativeComponent *component, bool receiveItemGeometryChanges, bool createDefault)
 {
-    Q_Q(QSGItemView);
+    Q_Q(QQuickItemView);
 
-    QSGItem *item = 0;
+    QQuickItem *item = 0;
     if (component) {
         QDeclarativeContext *creationContext = component->creationContext();
         QDeclarativeContext *context = new QDeclarativeContext(
@@ -1617,29 +1617,29 @@ QSGItem *QSGItemViewPrivate::createComponentItem(QDeclarativeComponent *componen
         QObject *nobj = component->create(context);
         if (nobj) {
             QDeclarative_setParent_noEvent(context, nobj);
-            item = qobject_cast<QSGItem *>(nobj);
+            item = qobject_cast<QQuickItem *>(nobj);
             if (!item)
                 delete nobj;
         } else {
             delete context;
         }
     } else if (createDefault) {
-        item = new QSGItem;
+        item = new QQuickItem;
     }
     if (item) {
         QDeclarative_setParent_noEvent(item, q->contentItem());
         item->setParentItem(q->contentItem());
         if (receiveItemGeometryChanges) {
-            QSGItemPrivate *itemPrivate = QSGItemPrivate::get(item);
-            itemPrivate->addItemChangeListener(this, QSGItemPrivate::Geometry);
+            QQuickItemPrivate *itemPrivate = QQuickItemPrivate::get(item);
+            itemPrivate->addItemChangeListener(this, QQuickItemPrivate::Geometry);
         }
     }
     return item;
 }
 
-void QSGItemViewPrivate::updateTrackedItem()
+void QQuickItemViewPrivate::updateTrackedItem()
 {
-    Q_Q(QSGItemView);
+    Q_Q(QQuickItemView);
     FxViewItem *item = currentItem;
     if (highlight)
         item = highlight;
@@ -1649,20 +1649,20 @@ void QSGItemViewPrivate::updateTrackedItem()
         q->trackedPositionChanged();
 }
 
-void QSGItemViewPrivate::updateUnrequestedIndexes()
+void QQuickItemViewPrivate::updateUnrequestedIndexes()
 {
-    Q_Q(QSGItemView);
-    for (QHash<QSGItem*,int>::iterator it = unrequestedItems.begin(); it != unrequestedItems.end(); ++it)
+    Q_Q(QQuickItemView);
+    for (QHash<QQuickItem*,int>::iterator it = unrequestedItems.begin(); it != unrequestedItems.end(); ++it)
         *it = model->indexOf(it.key(), q);
 }
 
-void QSGItemViewPrivate::updateUnrequestedPositions()
+void QQuickItemViewPrivate::updateUnrequestedPositions()
 {
-    for (QHash<QSGItem*,int>::const_iterator it = unrequestedItems.begin(); it != unrequestedItems.end(); ++it)
+    for (QHash<QQuickItem*,int>::const_iterator it = unrequestedItems.begin(); it != unrequestedItems.end(); ++it)
         repositionPackageItemAt(it.key(), it.value());
 }
 
-void QSGItemViewPrivate::updateVisibleIndex()
+void QQuickItemViewPrivate::updateVisibleIndex()
 {
     visibleIndex = 0;
     for (QList<FxViewItem*>::Iterator it = visibleItems.begin(); it != visibleItems.end(); ++it) {
diff --git a/src/declarative/items/qsgitemview_p.h b/src/declarative/items/qquickitemview_p.h
index 7b8efbbda0..8bb63539b4 100644
--- a/src/declarative/items/qsgitemview_p.h
+++ b/src/declarative/items/qquickitemview_p.h
@@ -39,10 +39,10 @@
 **
 ****************************************************************************/
 
-#ifndef QSGITEMVIEW_P_H
-#define QSGITEMVIEW_P_H
+#ifndef QQUICKITEMVIEW_P_H
+#define QQUICKITEMVIEW_P_H
 
-#include "qsgflickable_p.h"
+#include "qquickflickable_p.h"
 
 QT_BEGIN_HEADER
 
@@ -52,9 +52,9 @@ QT_MODULE(Declarative)
 
 class QDeclarativeChangeSet;
 
-class QSGItemViewPrivate;
+class QQuickItemViewPrivate;
 
-class Q_AUTOTEST_EXPORT QSGItemView : public QSGFlickable
+class Q_AUTOTEST_EXPORT QQuickItemView : public QQuickFlickable
 {
     Q_OBJECT
 
@@ -63,7 +63,7 @@ class Q_AUTOTEST_EXPORT QSGItemView : public QSGFlickable
     Q_PROPERTY(int count READ count NOTIFY countChanged)
 
     Q_PROPERTY(int currentIndex READ currentIndex WRITE setCurrentIndex NOTIFY currentIndexChanged)
-    Q_PROPERTY(QSGItem *currentItem READ currentItem NOTIFY currentIndexChanged)
+    Q_PROPERTY(QQuickItem *currentItem READ currentItem NOTIFY currentIndexChanged)
 
     Q_PROPERTY(bool keyNavigationWraps READ isWrapEnabled WRITE setWrapEnabled NOTIFY keyNavigationWrapsChanged)
     Q_PROPERTY(int cacheBuffer READ cacheBuffer WRITE setCacheBuffer NOTIFY cacheBufferChanged)
@@ -72,12 +72,12 @@ class Q_AUTOTEST_EXPORT QSGItemView : public QSGFlickable
     Q_PROPERTY(Qt::LayoutDirection effectiveLayoutDirection READ effectiveLayoutDirection NOTIFY effectiveLayoutDirectionChanged)
 
     Q_PROPERTY(QDeclarativeComponent *header READ header WRITE setHeader NOTIFY headerChanged)
-    Q_PROPERTY(QSGItem *headerItem READ headerItem NOTIFY headerItemChanged)
+    Q_PROPERTY(QQuickItem *headerItem READ headerItem NOTIFY headerItemChanged)
     Q_PROPERTY(QDeclarativeComponent *footer READ footer WRITE setFooter NOTIFY footerChanged)
-    Q_PROPERTY(QSGItem *footerItem READ footerItem NOTIFY footerItemChanged)
+    Q_PROPERTY(QQuickItem *footerItem READ footerItem NOTIFY footerItemChanged)
 
     Q_PROPERTY(QDeclarativeComponent *highlight READ highlight WRITE setHighlight NOTIFY highlightChanged)
-    Q_PROPERTY(QSGItem *highlightItem READ highlightItem NOTIFY highlightItemChanged)
+    Q_PROPERTY(QQuickItem *highlightItem READ highlightItem NOTIFY highlightItemChanged)
     Q_PROPERTY(bool highlightFollowsCurrentItem READ highlightFollowsCurrentItem WRITE setHighlightFollowsCurrentItem NOTIFY highlightFollowsCurrentItemChanged)
     Q_PROPERTY(HighlightRangeMode highlightRangeMode READ highlightRangeMode WRITE setHighlightRangeMode NOTIFY highlightRangeModeChanged)
     Q_PROPERTY(qreal preferredHighlightBegin READ preferredHighlightBegin WRITE setPreferredHighlightBegin NOTIFY preferredHighlightBeginChanged RESET resetPreferredHighlightBegin)
@@ -88,8 +88,8 @@ class Q_AUTOTEST_EXPORT QSGItemView : public QSGFlickable
     Q_ENUMS(PositionMode)
 
 public:
-    QSGItemView(QSGFlickablePrivate &dd, QSGItem *parent = 0);
-    ~QSGItemView();
+    QQuickItemView(QQuickFlickablePrivate &dd, QQuickItem *parent = 0);
+    ~QQuickItemView();
 
     QVariant model() const;
     void setModel(const QVariant &);
@@ -102,7 +102,7 @@ public:
     int currentIndex() const;
     void setCurrentIndex(int idx);
 
-    QSGItem *currentItem() const;
+    QQuickItem *currentItem() const;
 
     bool isWrapEnabled() const;
     void setWrapEnabled(bool);
@@ -116,16 +116,16 @@ public:
 
     QDeclarativeComponent *footer() const;
     void setFooter(QDeclarativeComponent *);
-    QSGItem *footerItem() const;
+    QQuickItem *footerItem() const;
 
     QDeclarativeComponent *header() const;
     void setHeader(QDeclarativeComponent *);
-    QSGItem *headerItem() const;
+    QQuickItem *headerItem() const;
 
     QDeclarativeComponent *highlight() const;
     void setHighlight(QDeclarativeComponent *);
 
-    QSGItem *highlightItem() const;
+    QQuickItem *highlightItem() const;
 
     bool highlightFollowsCurrentItem() const;
     virtual void setHighlightFollowsCurrentItem(bool);
@@ -193,20 +193,20 @@ protected:
 protected slots:
     virtual void updateSections() {}
     void destroyRemoved();
-    void createdItem(int index, QSGItem *item);
+    void createdItem(int index, QQuickItem *item);
     void modelUpdated(const QDeclarativeChangeSet &changeSet, bool reset);
-    void destroyingItem(QSGItem *item);
+    void destroyingItem(QQuickItem *item);
     void animStopped();
     void trackedPositionChanged();
 
 
 
 private:
-    Q_DECLARE_PRIVATE(QSGItemView)
+    Q_DECLARE_PRIVATE(QQuickItemView)
 };
 
 
-class Q_AUTOTEST_EXPORT QSGItemViewAttached : public QObject
+class Q_AUTOTEST_EXPORT QQuickItemViewAttached : public QObject
 {
     Q_OBJECT
 
@@ -218,9 +218,9 @@ class Q_AUTOTEST_EXPORT QSGItemViewAttached : public QObject
     Q_PROPERTY(QString nextSection READ nextSection NOTIFY nextSectionChanged)
 
 public:
-    QSGItemViewAttached(QObject *parent)
+    QQuickItemViewAttached(QObject *parent)
         : QObject(parent), m_isCurrent(false), m_delayRemove(false) {}
-    ~QSGItemViewAttached() {}
+    ~QQuickItemViewAttached() {}
 
     bool isCurrentItem() const { return m_isCurrent; }
     void setIsCurrentItem(bool c) {
@@ -290,5 +290,5 @@ public:
 QT_END_NAMESPACE
 QT_END_HEADER
 
-#endif // QSGITEMVIEW_P_H
+#endif // QQUICKITEMVIEW_P_H
 
diff --git a/src/declarative/items/qsgitemview_p_p.h b/src/declarative/items/qquickitemview_p_p.h
index 5eaa84c6b2..398de84c25 100644
--- a/src/declarative/items/qsgitemview_p_p.h
+++ b/src/declarative/items/qquickitemview_p_p.h
@@ -39,12 +39,12 @@
 **
 ****************************************************************************/
 
-#ifndef QSGITEMVIEW_P_P_H
-#define QSGITEMVIEW_P_P_H
+#ifndef QQUICKITEMVIEW_P_P_H
+#define QQUICKITEMVIEW_P_P_H
 
-#include "qsgitemview_p.h"
-#include "qsgflickable_p_p.h"
-#include "qsgvisualdatamodel_p.h"
+#include "qquickitemview_p.h"
+#include "qquickflickable_p_p.h"
+#include "qquickvisualdatamodel_p.h"
 #include <private/qdeclarativechangeset_p.h>
 
 
@@ -57,7 +57,7 @@ QT_MODULE(Declarative)
 class FxViewItem
 {
 public:
-    FxViewItem(QSGItem *, bool own);
+    FxViewItem(QQuickItem *, bool own);
     ~FxViewItem();
 
     // these are positions and sizes along the current direction of scrolling/flicking
@@ -68,16 +68,16 @@ public:
 
     virtual bool contains(qreal x, qreal y) const = 0;
 
-    QSGItem *item;
+    QQuickItem *item;
     bool ownItem;
     int index;
-    QSGItemViewAttached *attached;
+    QQuickItemViewAttached *attached;
 };
 
-class QSGItemViewChangeSet
+class QQuickItemViewChangeSet
 {
 public:
-    QSGItemViewChangeSet();
+    QQuickItemViewChangeSet();
 
     bool hasPendingChanges() const;
     void prepare(int currentIndex, int count);
@@ -95,11 +95,11 @@ public:
     bool currentRemoved : 1;
 };
 
-class QSGItemViewPrivate : public QSGFlickablePrivate
+class QQuickItemViewPrivate : public QQuickFlickablePrivate
 {
-    Q_DECLARE_PUBLIC(QSGItemView)
+    Q_DECLARE_PUBLIC(QQuickItemView)
 public:
-    QSGItemViewPrivate();
+    QQuickItemViewPrivate();
 
     struct InsertionsResult {
         QList<FxViewItem *> addedItems;
@@ -136,8 +136,8 @@ public:
     FxViewItem *createItem(int modelIndex);
     virtual void releaseItem(FxViewItem *item);
 
-    QSGItem *createHighlightItem();
-    QSGItem *createComponentItem(QDeclarativeComponent *component, bool receiveItemGeometryChanges, bool createDefault = false);
+    QQuickItem *createHighlightItem();
+    QQuickItem *createComponentItem(QDeclarativeComponent *component, bool receiveItemGeometryChanges, bool createDefault = false);
 
     void updateCurrent(int modelIndex);
     void updateTrackedItem();
@@ -157,7 +157,7 @@ public:
             hData.markExtentsDirty();
     }
 
-    QDeclarativeGuard<QSGVisualModel> model;
+    QDeclarativeGuard<QQuickVisualModel> model;
     QVariant modelVariant;
     int itemCount;
     int buffer;
@@ -171,9 +171,9 @@ public:
     int currentIndex;
     FxViewItem *currentItem;
     FxViewItem *trackedItem;
-    QHash<QSGItem*,int> unrequestedItems;
+    QHash<QQuickItem*,int> unrequestedItems;
     int requestedIndex;
-    QSGItemViewChangeSet currentChanges;
+    QQuickItemViewChangeSet currentChanges;
 
     // XXX split into struct
     QDeclarativeComponent *highlightComponent;
@@ -231,8 +231,8 @@ protected:
     virtual bool removeNonVisibleItems(qreal bufferFrom, qreal bufferTo) = 0;
     virtual void visibleItemsChanged() = 0;
 
-    virtual FxViewItem *newViewItem(int index, QSGItem *item) = 0;
-    virtual void repositionPackageItemAt(QSGItem *item, int index) = 0;
+    virtual FxViewItem *newViewItem(int index, QQuickItem *item) = 0;
+    virtual void repositionPackageItemAt(QQuickItem *item, int index) = 0;
     virtual void resetItemPosition(FxViewItem *item, FxViewItem *toItem) = 0;
     virtual void resetFirstItemPosition() = 0;
     virtual void moveItemBy(FxViewItem *item, qreal forwards, qreal backwards) = 0;
@@ -245,7 +245,7 @@ protected:
     virtual void initializeCurrentItem() {}
     virtual void updateSections() {}
 
-    virtual void itemGeometryChanged(QSGItem *item, const QRectF &newGeometry, const QRectF &oldGeometry);
+    virtual void itemGeometryChanged(QQuickItem *item, const QRectF &newGeometry, const QRectF &oldGeometry);
 };
 
 
@@ -253,4 +253,4 @@ QT_END_NAMESPACE
 
 QT_END_HEADER
 
-#endif // QSGITEMVIEW_P_P_H
+#endif // QQUICKITEMVIEW_P_P_H
diff --git a/src/declarative/items/qsglistview.cpp b/src/declarative/items/qquicklistview.cpp
index 5ea9efe274..e43a831c4c 100644
--- a/src/declarative/items/qsglistview.cpp
+++ b/src/declarative/items/qquicklistview.cpp
@@ -39,9 +39,9 @@
 **
 ****************************************************************************/
 
-#include "qsglistview_p.h"
-#include "qsgitemview_p_p.h"
-#include "qsgvisualitemmodel_p.h"
+#include "qquicklistview_p.h"
+#include "qquickitemview_p_p.h"
+#include "qquickvisualitemmodel_p.h"
 
 #include <QtDeclarative/qdeclarativeexpression.h>
 #include <QtDeclarative/qdeclarativeengine.h>
@@ -62,11 +62,11 @@ QT_BEGIN_NAMESPACE
 
 class FxListItemSG;
 
-class QSGListViewPrivate : public QSGItemViewPrivate
+class QQuickListViewPrivate : public QQuickItemViewPrivate
 {
-    Q_DECLARE_PUBLIC(QSGListView)
+    Q_DECLARE_PUBLIC(QQuickListView)
 public:
-    static QSGListViewPrivate* get(QSGListView *item) { return item->d_func(); }
+    static QQuickListViewPrivate* get(QQuickListView *item) { return item->d_func(); }
 
     virtual Qt::Orientation layoutOrientation() const;
     virtual bool isContentFlowReversed() const;
@@ -89,10 +89,10 @@ public:
     virtual bool removeNonVisibleItems(qreal bufferFrom, qreal bufferTo);
     virtual void visibleItemsChanged();
 
-    virtual FxViewItem *newViewItem(int index, QSGItem *item);
+    virtual FxViewItem *newViewItem(int index, QQuickItem *item);
     virtual void initializeViewItem(FxViewItem *item);
     virtual void releaseItem(FxViewItem *item);
-    virtual void repositionPackageItemAt(QSGItem *item, int index);
+    virtual void repositionPackageItemAt(QQuickItem *item, int index);
     virtual void resetItemPosition(FxViewItem *item, FxViewItem *toItem);
     virtual void resetFirstItemPosition();
     virtual void moveItemBy(FxViewItem *item, qreal forwards, qreal backwards);
@@ -106,8 +106,8 @@ public:
     bool applyInsertionChange(const QDeclarativeChangeSet::Insert &, FxViewItem *firstVisible, InsertionsResult *);
 
     virtual void updateSections();
-    QSGItem *getSectionItem(const QString &section);
-    void releaseSectionItem(QSGItem *item);
+    QQuickItem *getSectionItem(const QString &section);
+    void releaseSectionItem(QQuickItem *item);
     void updateInlineSection(FxListItemSG *);
     void updateCurrentSection();
     void updateStickySections();
@@ -124,17 +124,17 @@ public:
 
     void updateAverage();
 
-    void itemGeometryChanged(QSGItem *item, const QRectF &newGeometry, const QRectF &oldGeometry);
+    void itemGeometryChanged(QQuickItem *item, const QRectF &newGeometry, const QRectF &oldGeometry);
     virtual void fixupPosition();
     virtual void fixup(AxisData &data, qreal minExtent, qreal maxExtent);
-    virtual void flick(QSGItemViewPrivate::AxisData &data, qreal minExtent, qreal maxExtent, qreal vSize,
+    virtual void flick(QQuickItemViewPrivate::AxisData &data, qreal minExtent, qreal maxExtent, qreal vSize,
                         QDeclarativeTimeLineCallback::Callback fixupCallback, qreal velocity);
 
-    QSGListView::Orientation orient;
+    QQuickListView::Orientation orient;
     qreal visiblePos;
     qreal averageSize;
     qreal spacing;
-    QSGListView::SnapMode snapMode;
+    QQuickListView::SnapMode snapMode;
 
     QSmoothedAnimation *highlightPosAnimator;
     QSmoothedAnimation *highlightSizeAnimator;
@@ -142,13 +142,13 @@ public:
     qreal highlightResizeSpeed;
     int highlightResizeDuration;
 
-    QSGViewSection *sectionCriteria;
+    QQuickViewSection *sectionCriteria;
     QString currentSection;
     static const int sectionCacheSize = 5;
-    QSGItem *sectionCache[sectionCacheSize];
-    QSGItem *currentSectionItem;
+    QQuickItem *sectionCache[sectionCacheSize];
+    QQuickItem *currentSectionItem;
     QString currentStickySection;
-    QSGItem *nextSectionItem;
+    QQuickItem *nextSectionItem;
     QString nextStickySection;
     QString lastVisibleSection;
     QString nextSection;
@@ -157,29 +157,29 @@ public:
     bool correctFlick : 1;
     bool inFlickCorrection : 1;
 
-    QSGListViewPrivate()
-        : orient(QSGListView::Vertical)
+    QQuickListViewPrivate()
+        : orient(QQuickListView::Vertical)
         , visiblePos(0)
         , averageSize(100.0), spacing(0.0)
-        , snapMode(QSGListView::NoSnap)
+        , snapMode(QQuickListView::NoSnap)
         , highlightPosAnimator(0), highlightSizeAnimator(0)
         , highlightMoveSpeed(400), highlightResizeSpeed(400), highlightResizeDuration(-1)
         , sectionCriteria(0), currentSectionItem(0), nextSectionItem(0)
         , overshootDist(0.0), correctFlick(false), inFlickCorrection(false)
     {}
 
-    friend class QSGViewSection;
+    friend class QQuickViewSection;
 };
 
 //----------------------------------------------------------------------------
 
-QSGViewSection::QSGViewSection(QSGListView *parent)
+QQuickViewSection::QQuickViewSection(QQuickListView *parent)
     : QObject(parent), m_criteria(FullString), m_delegate(0), m_labelPositioning(InlineLabels)
-    , m_view(parent ? QSGListViewPrivate::get(parent) : 0)
+    , m_view(parent ? QQuickListViewPrivate::get(parent) : 0)
 {
 }
 
-void QSGViewSection::setProperty(const QString &property)
+void QQuickViewSection::setProperty(const QString &property)
 {
     if (property != m_property) {
         m_property = property;
@@ -188,7 +188,7 @@ void QSGViewSection::setProperty(const QString &property)
     }
 }
 
-void QSGViewSection::setCriteria(QSGViewSection::SectionCriteria criteria)
+void QQuickViewSection::setCriteria(QQuickViewSection::SectionCriteria criteria)
 {
     if (criteria != m_criteria) {
         m_criteria = criteria;
@@ -197,7 +197,7 @@ void QSGViewSection::setCriteria(QSGViewSection::SectionCriteria criteria)
     }
 }
 
-void QSGViewSection::setDelegate(QDeclarativeComponent *delegate)
+void QQuickViewSection::setDelegate(QDeclarativeComponent *delegate)
 {
     if (delegate != m_delegate) {
         m_delegate = delegate;
@@ -206,7 +206,7 @@ void QSGViewSection::setDelegate(QDeclarativeComponent *delegate)
     }
 }
 
-QString QSGViewSection::sectionString(const QString &value)
+QString QQuickViewSection::sectionString(const QString &value)
 {
     if (m_criteria == FirstCharacter)
         return value.isEmpty() ? QString() : value.at(0);
@@ -214,7 +214,7 @@ QString QSGViewSection::sectionString(const QString &value)
         return value;
 }
 
-void QSGViewSection::setLabelPositioning(int l)
+void QQuickViewSection::setLabelPositioning(int l)
 {
     if (m_labelPositioning != l) {
         m_labelPositioning = l;
@@ -228,17 +228,17 @@ void QSGViewSection::setLabelPositioning(int l)
 class FxListItemSG : public FxViewItem
 {
 public:
-    FxListItemSG(QSGItem *i, QSGListView *v, bool own) : FxViewItem(i, own), section(0), view(v) {
-        attached = static_cast<QSGListViewAttached*>(qmlAttachedPropertiesObject<QSGListView>(item));
+    FxListItemSG(QQuickItem *i, QQuickListView *v, bool own) : FxViewItem(i, own), section(0), view(v) {
+        attached = static_cast<QQuickListViewAttached*>(qmlAttachedPropertiesObject<QQuickListView>(item));
         if (attached)
-            static_cast<QSGListViewAttached*>(attached)->setView(view);
+            static_cast<QQuickListViewAttached*>(attached)->setView(view);
     }
 
     ~FxListItemSG() {}
 
     qreal position() const {
         if (section) {
-            if (view->orientation() == QSGListView::Vertical)
+            if (view->orientation() == QQuickListView::Vertical)
                 return section->y();
             else
                 return (view->effectiveLayoutDirection() == Qt::RightToLeft ? -section->width()-section->x() : section->x());
@@ -247,27 +247,27 @@ public:
         }
     }
     qreal itemPosition() const {
-        if (view->orientation() == QSGListView::Vertical)
+        if (view->orientation() == QQuickListView::Vertical)
             return item->y();
         else
             return (view->effectiveLayoutDirection() == Qt::RightToLeft ? -item->width()-item->x() : item->x());
     }
     qreal size() const {
         if (section)
-            return (view->orientation() == QSGListView::Vertical ? item->height()+section->height() : item->width()+section->width());
+            return (view->orientation() == QQuickListView::Vertical ? item->height()+section->height() : item->width()+section->width());
         else
-            return (view->orientation() == QSGListView::Vertical ? item->height() : item->width());
+            return (view->orientation() == QQuickListView::Vertical ? item->height() : item->width());
     }
     qreal itemSize() const {
-        return (view->orientation() == QSGListView::Vertical ? item->height() : item->width());
+        return (view->orientation() == QQuickListView::Vertical ? item->height() : item->width());
     }
     qreal sectionSize() const {
         if (section)
-            return (view->orientation() == QSGListView::Vertical ? section->height() : section->width());
+            return (view->orientation() == QQuickListView::Vertical ? section->height() : section->width());
         return 0.0;
     }
     qreal endPosition() const {
-        if (view->orientation() == QSGListView::Vertical) {
+        if (view->orientation() == QQuickListView::Vertical) {
             return item->y() + item->height();
         } else {
             return (view->effectiveLayoutDirection() == Qt::RightToLeft
@@ -276,7 +276,7 @@ public:
         }
     }
     void setPosition(qreal pos) {
-        if (view->orientation() == QSGListView::Vertical) {
+        if (view->orientation() == QQuickListView::Vertical) {
             if (section) {
                 section->setY(pos);
                 pos += section->height();
@@ -299,7 +299,7 @@ public:
         }
     }
     void setSize(qreal size) {
-        if (view->orientation() == QSGListView::Vertical)
+        if (view->orientation() == QQuickListView::Vertical)
             item->setHeight(size);
         else
             item->setWidth(size);
@@ -309,31 +309,31 @@ public:
                 y >= item->y() && y < item->y() + item->height());
     }
 
-    QSGItem *section;
-    QSGListView *view;
+    QQuickItem *section;
+    QQuickListView *view;
 };
 
 //----------------------------------------------------------------------------
 
-bool QSGListViewPrivate::isContentFlowReversed() const
+bool QQuickListViewPrivate::isContentFlowReversed() const
 {
     return isRightToLeft();
 }
 
-Qt::Orientation QSGListViewPrivate::layoutOrientation() const
+Qt::Orientation QQuickListViewPrivate::layoutOrientation() const
 {
     return static_cast<Qt::Orientation>(orient);
 }
 
-bool QSGListViewPrivate::isRightToLeft() const
+bool QQuickListViewPrivate::isRightToLeft() const
 {
-    Q_Q(const QSGListView);
-    return orient == QSGListView::Horizontal && q->effectiveLayoutDirection() == Qt::RightToLeft;
+    Q_Q(const QQuickListView);
+    return orient == QQuickListView::Horizontal && q->effectiveLayoutDirection() == Qt::RightToLeft;
 }
 
 // Returns the item before modelIndex, if created.
 // May return an item marked for removal.
-FxViewItem *QSGListViewPrivate::itemBefore(int modelIndex) const
+FxViewItem *QQuickListViewPrivate::itemBefore(int modelIndex) const
 {
     if (modelIndex < visibleIndex)
         return 0;
@@ -352,20 +352,20 @@ FxViewItem *QSGListViewPrivate::itemBefore(int modelIndex) const
     return 0;
 }
 
-void QSGListViewPrivate::setPosition(qreal pos)
+void QQuickListViewPrivate::setPosition(qreal pos)
 {
-    Q_Q(QSGListView);
-    if (orient == QSGListView::Vertical) {
-        q->QSGFlickable::setContentY(pos);
+    Q_Q(QQuickListView);
+    if (orient == QQuickListView::Vertical) {
+        q->QQuickFlickable::setContentY(pos);
     } else {
         if (isRightToLeft())
-            q->QSGFlickable::setContentX(-pos-size());
+            q->QQuickFlickable::setContentX(-pos-size());
         else
-            q->QSGFlickable::setContentX(pos);
+            q->QQuickFlickable::setContentX(pos);
     }
 }
 
-qreal QSGListViewPrivate::originPosition() const
+qreal QQuickListViewPrivate::originPosition() const
 {
     qreal pos = 0;
     if (!visibleItems.isEmpty()) {
@@ -376,7 +376,7 @@ qreal QSGListViewPrivate::originPosition() const
     return pos;
 }
 
-qreal QSGListViewPrivate::lastPosition() const
+qreal QQuickListViewPrivate::lastPosition() const
 {
     qreal pos = 0;
     if (!visibleItems.isEmpty()) {
@@ -394,7 +394,7 @@ qreal QSGListViewPrivate::lastPosition() const
     return pos;
 }
 
-qreal QSGListViewPrivate::positionAt(int modelIndex) const
+qreal QQuickListViewPrivate::positionAt(int modelIndex) const
 {
     if (FxViewItem *item = visibleItem(modelIndex))
         return item->position();
@@ -415,7 +415,7 @@ qreal QSGListViewPrivate::positionAt(int modelIndex) const
     return 0;
 }
 
-qreal QSGListViewPrivate::endPositionAt(int modelIndex) const
+qreal QQuickListViewPrivate::endPositionAt(int modelIndex) const
 {
     if (FxViewItem *item = visibleItem(modelIndex))
         return item->endPosition();
@@ -431,7 +431,7 @@ qreal QSGListViewPrivate::endPositionAt(int modelIndex) const
     return 0;
 }
 
-QString QSGListViewPrivate::sectionAt(int modelIndex)
+QString QQuickListViewPrivate::sectionAt(int modelIndex)
 {
     if (FxViewItem *item = visibleItem(modelIndex))
         return item->attached->section();
@@ -445,7 +445,7 @@ QString QSGListViewPrivate::sectionAt(int modelIndex)
     return section;
 }
 
-qreal QSGListViewPrivate::snapPosAt(qreal pos)
+qreal QQuickListViewPrivate::snapPosAt(qreal pos)
 {
     if (FxViewItem *snapItem = snapItemAt(pos))
         return snapItem->position();
@@ -460,7 +460,7 @@ qreal QSGListViewPrivate::snapPosAt(qreal pos)
     return qRound((pos - originPosition()) / averageSize) * averageSize + originPosition();
 }
 
-FxViewItem *QSGListViewPrivate::snapItemAt(qreal pos)
+FxViewItem *QQuickListViewPrivate::snapItemAt(qreal pos)
 {
     FxViewItem *snapItem = 0;
     qreal prevItemSize = 0;
@@ -478,19 +478,19 @@ FxViewItem *QSGListViewPrivate::snapItemAt(qreal pos)
     return snapItem;
 }
 
-void QSGListViewPrivate::changedVisibleIndex(int newIndex)
+void QQuickListViewPrivate::changedVisibleIndex(int newIndex)
 {
     visiblePos = positionAt(newIndex);
     visibleIndex = newIndex;
 }
 
-void QSGListViewPrivate::init()
+void QQuickListViewPrivate::init()
 {
-    QSGItemViewPrivate::init();
-    ::memset(sectionCache, 0, sizeof(QSGItem*) * sectionCacheSize);
+    QQuickItemViewPrivate::init();
+    ::memset(sectionCache, 0, sizeof(QQuickItem*) * sectionCacheSize);
 }
 
-void QSGListViewPrivate::clear()
+void QQuickListViewPrivate::clear()
 {
     for (int i = 0; i < sectionCacheSize; ++i) {
         delete sectionCache[i];
@@ -500,12 +500,12 @@ void QSGListViewPrivate::clear()
     currentSectionItem = 0;
     nextSectionItem = 0;
     lastVisibleSection = QString();
-    QSGItemViewPrivate::clear();
+    QQuickItemViewPrivate::clear();
 }
 
-FxViewItem *QSGListViewPrivate::newViewItem(int modelIndex, QSGItem *item)
+FxViewItem *QQuickListViewPrivate::newViewItem(int modelIndex, QQuickItem *item)
 {
-    Q_Q(QSGListView);
+    Q_Q(QQuickListView);
 
     FxListItemSG *listItem = new FxListItemSG(item, q, false);
     listItem->index = modelIndex;
@@ -522,7 +522,7 @@ FxViewItem *QSGListViewPrivate::newViewItem(int modelIndex, QSGItem *item)
         }
         if (modelIndex < model->count()-1) {
             if (FxViewItem *item = visibleItem(modelIndex+1))
-                listItem->attached->m_nextSection = static_cast<QSGListViewAttached*>(item->attached)->section();
+                listItem->attached->m_nextSection = static_cast<QQuickListViewAttached*>(item->attached)->section();
             else
                 listItem->attached->m_nextSection = sectionAt(modelIndex+1);
         }
@@ -531,12 +531,12 @@ FxViewItem *QSGListViewPrivate::newViewItem(int modelIndex, QSGItem *item)
     return listItem;
 }
 
-void QSGListViewPrivate::initializeViewItem(FxViewItem *item)
+void QQuickListViewPrivate::initializeViewItem(FxViewItem *item)
 {
-    QSGItemViewPrivate::initializeViewItem(item);
+    QQuickItemViewPrivate::initializeViewItem(item);
 
-    QSGItemPrivate *itemPrivate = QSGItemPrivate::get(item->item);
-    itemPrivate->addItemChangeListener(this, QSGItemPrivate::Geometry);
+    QQuickItemPrivate *itemPrivate = QQuickItemPrivate::get(item->item);
+    itemPrivate->addItemChangeListener(this, QQuickItemPrivate::Geometry);
 
     if (sectionCriteria && sectionCriteria->delegate()) {
         if (item->attached->m_prevSection != item->attached->m_section)
@@ -544,7 +544,7 @@ void QSGListViewPrivate::initializeViewItem(FxViewItem *item)
     }
 }
 
-void QSGListViewPrivate::releaseItem(FxViewItem *item)
+void QQuickListViewPrivate::releaseItem(FxViewItem *item)
 {
     if (item) {
         FxListItemSG* listItem = static_cast<FxListItemSG*>(item);
@@ -562,10 +562,10 @@ void QSGListViewPrivate::releaseItem(FxViewItem *item)
             delete listItem->section;
         }
     }
-    QSGItemViewPrivate::releaseItem(item);
+    QQuickItemViewPrivate::releaseItem(item);
 }
 
-bool QSGListViewPrivate::addVisibleItems(qreal fillFrom, qreal fillTo, bool doBuffer)
+bool QQuickListViewPrivate::addVisibleItems(qreal fillFrom, qreal fillTo, bool doBuffer)
 {
     qreal itemEnd = visiblePos;
     if (visibleItems.count()) {
@@ -629,7 +629,7 @@ bool QSGListViewPrivate::addVisibleItems(qreal fillFrom, qreal fillTo, bool doBu
     return changed;
 }
 
-bool QSGListViewPrivate::removeNonVisibleItems(qreal bufferFrom, qreal bufferTo)
+bool QQuickListViewPrivate::removeNonVisibleItems(qreal bufferFrom, qreal bufferTo)
 {
     FxViewItem *item = 0;
     bool changed = false;
@@ -658,7 +658,7 @@ bool QSGListViewPrivate::removeNonVisibleItems(qreal bufferFrom, qreal bufferTo)
     return changed;
 }
 
-void QSGListViewPrivate::visibleItemsChanged()
+void QQuickListViewPrivate::visibleItemsChanged()
 {
     if (visibleItems.count())
         visiblePos = (*visibleItems.constBegin())->position();
@@ -675,7 +675,7 @@ void QSGListViewPrivate::visibleItemsChanged()
     updateUnrequestedPositions();
 }
 
-void QSGListViewPrivate::layoutVisibleItems()
+void QQuickListViewPrivate::layoutVisibleItems()
 {
     if (!visibleItems.isEmpty()) {
         bool fixedCurrent = currentItem && (*visibleItems.constBegin())->item == currentItem->item;
@@ -697,11 +697,11 @@ void QSGListViewPrivate::layoutVisibleItems()
     }
 }
 
-void QSGListViewPrivate::repositionPackageItemAt(QSGItem *item, int index)
+void QQuickListViewPrivate::repositionPackageItemAt(QQuickItem *item, int index)
 {
-    Q_Q(QSGListView);
+    Q_Q(QQuickListView);
     qreal pos = position();
-    if (orient == QSGListView::Vertical) {
+    if (orient == QQuickListView::Vertical) {
         if (item->y() + item->height() > pos && item->y() < pos + q->height())
             item->setY(positionAt(index));
     } else {
@@ -714,28 +714,28 @@ void QSGListViewPrivate::repositionPackageItemAt(QSGItem *item, int index)
     }
 }
 
-void QSGListViewPrivate::resetItemPosition(FxViewItem *item, FxViewItem *toItem)
+void QQuickListViewPrivate::resetItemPosition(FxViewItem *item, FxViewItem *toItem)
 {
     if (item == toItem)
         return;
     static_cast<FxListItemSG*>(item)->setPosition(toItem->position());
 }
 
-void QSGListViewPrivate::resetFirstItemPosition()
+void QQuickListViewPrivate::resetFirstItemPosition()
 {
     FxListItemSG *item = static_cast<FxListItemSG*>(visibleItems.first());
     item->setPosition(0);
 }
 
-void QSGListViewPrivate::moveItemBy(FxViewItem *item, qreal forwards, qreal backwards)
+void QQuickListViewPrivate::moveItemBy(FxViewItem *item, qreal forwards, qreal backwards)
 {
     qreal diff = forwards - backwards;
     static_cast<FxListItemSG*>(item)->setPosition(item->position() + diff);
 }
 
-void QSGListViewPrivate::createHighlight()
+void QQuickListViewPrivate::createHighlight()
 {
-    Q_Q(QSGListView);
+    Q_Q(QQuickListView);
     bool changed = false;
     if (highlight) {
         if (trackedItem == highlight)
@@ -752,7 +752,7 @@ void QSGListViewPrivate::createHighlight()
     }
 
     if (currentItem) {
-        QSGItem *item = createHighlightItem();
+        QQuickItem *item = createHighlightItem();
         if (item) {
             FxListItemSG *newHighlight = new FxListItemSG(item, q, true);
 
@@ -760,13 +760,13 @@ void QSGListViewPrivate::createHighlight()
                 newHighlight->setSize(static_cast<FxListItemSG*>(currentItem)->itemSize());
                 newHighlight->setPosition(static_cast<FxListItemSG*>(currentItem)->itemPosition());
             }
-            const QLatin1String posProp(orient == QSGListView::Vertical ? "y" : "x");
+            const QLatin1String posProp(orient == QQuickListView::Vertical ? "y" : "x");
             highlightPosAnimator = new QSmoothedAnimation(q);
             highlightPosAnimator->target = QDeclarativeProperty(item, posProp);
             highlightPosAnimator->velocity = highlightMoveSpeed;
             highlightPosAnimator->userDuration = highlightMoveDuration;
 
-            const QLatin1String sizeProp(orient == QSGListView::Vertical ? "height" : "width");
+            const QLatin1String sizeProp(orient == QQuickListView::Vertical ? "height" : "width");
             highlightSizeAnimator = new QSmoothedAnimation(q);
             highlightSizeAnimator->velocity = highlightResizeSpeed;
             highlightSizeAnimator->userDuration = highlightResizeDuration;
@@ -780,13 +780,13 @@ void QSGListViewPrivate::createHighlight()
         emit q->highlightItemChanged();
 }
 
-void QSGListViewPrivate::updateHighlight()
+void QQuickListViewPrivate::updateHighlight()
 {
     applyPendingChanges();
 
     if ((!currentItem && highlight) || (currentItem && !highlight))
         createHighlight();
-    bool strictHighlight = haveHighlightRange && highlightRange == QSGListView::StrictlyEnforceRange;
+    bool strictHighlight = haveHighlightRange && highlightRange == QQuickListView::StrictlyEnforceRange;
     if (currentItem && autoHighlight && highlight && (!strictHighlight || !pressed)) {
         // auto-update highlight
         FxListItemSG *listItem = static_cast<FxListItemSG*>(currentItem);
@@ -794,7 +794,7 @@ void QSGListViewPrivate::updateHighlight()
                 ? -listItem->itemPosition()-listItem->itemSize()
                 : listItem->itemPosition();
         highlightSizeAnimator->to = listItem->itemSize();
-        if (orient == QSGListView::Vertical) {
+        if (orient == QQuickListView::Vertical) {
             if (highlight->item->width() == 0)
                 highlight->item->setWidth(currentItem->item->width());
         } else {
@@ -808,16 +808,16 @@ void QSGListViewPrivate::updateHighlight()
     updateTrackedItem();
 }
 
-void QSGListViewPrivate::resetHighlightPosition()
+void QQuickListViewPrivate::resetHighlightPosition()
 {
     if (highlight && currentItem)
         static_cast<FxListItemSG*>(highlight)->setPosition(static_cast<FxListItemSG*>(currentItem)->itemPosition());
 }
 
-QSGItem * QSGListViewPrivate::getSectionItem(const QString &section)
+QQuickItem * QQuickListViewPrivate::getSectionItem(const QString &section)
 {
-    Q_Q(QSGListView);
-    QSGItem *sectionItem = 0;
+    Q_Q(QQuickListView);
+    QQuickItem *sectionItem = 0;
     int i = sectionCacheSize-1;
     while (i >= 0 && !sectionCache[i])
         --i;
@@ -835,7 +835,7 @@ QSGItem * QSGListViewPrivate::getSectionItem(const QString &section)
         QObject *nobj = sectionCriteria->delegate()->beginCreate(context);
         if (nobj) {
             QDeclarative_setParent_noEvent(context, nobj);
-            sectionItem = qobject_cast<QSGItem *>(nobj);
+            sectionItem = qobject_cast<QQuickItem *>(nobj);
             if (!sectionItem) {
                 delete nobj;
             } else {
@@ -852,7 +852,7 @@ QSGItem * QSGListViewPrivate::getSectionItem(const QString &section)
     return sectionItem;
 }
 
-void QSGListViewPrivate::releaseSectionItem(QSGItem *item)
+void QQuickListViewPrivate::releaseSectionItem(QQuickItem *item)
 {
     int i = 0;
     do {
@@ -866,13 +866,13 @@ void QSGListViewPrivate::releaseSectionItem(QSGItem *item)
     delete item;
 }
 
-void QSGListViewPrivate::updateInlineSection(FxListItemSG *listItem)
+void QQuickListViewPrivate::updateInlineSection(FxListItemSG *listItem)
 {
     if (!sectionCriteria || !sectionCriteria->delegate())
         return;
     if (listItem->attached->m_prevSection != listItem->attached->m_section
-            && (sectionCriteria->labelPositioning() & QSGViewSection::InlineLabels
-                || (listItem->index == 0 && sectionCriteria->labelPositioning() & QSGViewSection::CurrentLabelAtStart))) {
+            && (sectionCriteria->labelPositioning() & QQuickViewSection::InlineLabels
+                || (listItem->index == 0 && sectionCriteria->labelPositioning() & QQuickViewSection::CurrentLabelAtStart))) {
         if (!listItem->section) {
             qreal pos = listItem->position();
             listItem->section = getSectionItem(listItem->attached->m_section);
@@ -889,7 +889,7 @@ void QSGListViewPrivate::updateInlineSection(FxListItemSG *listItem)
     }
 }
 
-void QSGListViewPrivate::updateStickySections()
+void QQuickListViewPrivate::updateStickySections()
 {
     if (!sectionCriteria || visibleItems.isEmpty()
             || (!sectionCriteria->labelPositioning() && !currentSectionItem && !nextSectionItem))
@@ -897,20 +897,20 @@ void QSGListViewPrivate::updateStickySections()
 
     bool isRtl = isRightToLeft();
     qreal viewPos = isRightToLeft() ? -position()-size() : position();
-    QSGItem *sectionItem = 0;
-    QSGItem *lastSectionItem = 0;
+    QQuickItem *sectionItem = 0;
+    QQuickItem *lastSectionItem = 0;
     int index = 0;
     while (index < visibleItems.count()) {
-        if (QSGItem *section = static_cast<FxListItemSG *>(visibleItems.at(index))->section) {
+        if (QQuickItem *section = static_cast<FxListItemSG *>(visibleItems.at(index))->section) {
             // Find the current section header and last visible section header
             // and hide them if they will overlap a static section header.
-            qreal sectionPos = orient == QSGListView::Vertical ? section->y() : section->x();
-            qreal sectionSize = orient == QSGListView::Vertical ? section->height() : section->width();
+            qreal sectionPos = orient == QQuickListView::Vertical ? section->y() : section->x();
+            qreal sectionSize = orient == QQuickListView::Vertical ? section->height() : section->width();
             bool visTop = true;
-            if (sectionCriteria->labelPositioning() & QSGViewSection::CurrentLabelAtStart)
+            if (sectionCriteria->labelPositioning() & QQuickViewSection::CurrentLabelAtStart)
                 visTop = isRtl ? -sectionPos-sectionSize >= viewPos : sectionPos >= viewPos;
             bool visBot = true;
-            if (sectionCriteria->labelPositioning() & QSGViewSection::NextLabelAtEnd)
+            if (sectionCriteria->labelPositioning() & QQuickViewSection::NextLabelAtEnd)
                 visBot = isRtl ? -sectionPos <= viewPos + size() : sectionPos + sectionSize < viewPos + size();
             section->setVisible(visBot && visTop);
             if (visTop && !sectionItem)
@@ -927,7 +927,7 @@ void QSGListViewPrivate::updateStickySections()
     }
 
     // Current section header
-    if (sectionCriteria->labelPositioning() & QSGViewSection::CurrentLabelAtStart) {
+    if (sectionCriteria->labelPositioning() & QQuickViewSection::CurrentLabelAtStart) {
         if (!currentSectionItem) {
             currentSectionItem = getSectionItem(currentSection);
         } else if (currentStickySection != currentSection) {
@@ -938,19 +938,19 @@ void QSGListViewPrivate::updateStickySections()
         if (!currentSectionItem)
             return;
 
-        qreal sectionSize = orient == QSGListView::Vertical ? currentSectionItem->height() : currentSectionItem->width();
-        bool atBeginning = orient == QSGListView::Vertical ? vData.atBeginning : (isRightToLeft() ? hData.atEnd : hData.atBeginning);
+        qreal sectionSize = orient == QQuickListView::Vertical ? currentSectionItem->height() : currentSectionItem->width();
+        bool atBeginning = orient == QQuickListView::Vertical ? vData.atBeginning : (isRightToLeft() ? hData.atEnd : hData.atBeginning);
         currentSectionItem->setVisible(!atBeginning && (!header || header->endPosition() < viewPos));
         qreal pos = isRtl ? position() + size() - sectionSize : viewPos;
         if (sectionItem) {
-            qreal sectionPos = orient == QSGListView::Vertical ? sectionItem->y() : sectionItem->x();
+            qreal sectionPos = orient == QQuickListView::Vertical ? sectionItem->y() : sectionItem->x();
             pos = isRtl ? qMax(pos, sectionPos + sectionSize) : qMin(pos, sectionPos - sectionSize);
         }
         if (header)
             pos = isRtl ? qMin(header->endPosition(), pos) : qMax(header->endPosition(), pos);
         if (footer)
             pos = isRtl ? qMax(-footer->position(), pos) : qMin(footer->position() - sectionSize, pos);
-        if (orient == QSGListView::Vertical)
+        if (orient == QQuickListView::Vertical)
             currentSectionItem->setY(pos);
         else
             currentSectionItem->setX(pos);
@@ -960,7 +960,7 @@ void QSGListViewPrivate::updateStickySections()
     }
 
     // Next section footer
-    if (sectionCriteria->labelPositioning() & QSGViewSection::NextLabelAtEnd) {
+    if (sectionCriteria->labelPositioning() & QQuickViewSection::NextLabelAtEnd) {
         if (!nextSectionItem) {
             nextSectionItem = getSectionItem(nextSection);
         } else if (nextStickySection != nextSection) {
@@ -971,16 +971,16 @@ void QSGListViewPrivate::updateStickySections()
         if (!nextSectionItem)
             return;
 
-        qreal sectionSize = orient == QSGListView::Vertical ? nextSectionItem->height() : nextSectionItem->width();
+        qreal sectionSize = orient == QQuickListView::Vertical ? nextSectionItem->height() : nextSectionItem->width();
         nextSectionItem->setVisible(!nextSection.isEmpty());
         qreal pos = isRtl ? position() : viewPos + size() - sectionSize;
         if (lastSectionItem) {
-            qreal sectionPos = orient == QSGListView::Vertical ? lastSectionItem->y() : lastSectionItem->x();
+            qreal sectionPos = orient == QQuickListView::Vertical ? lastSectionItem->y() : lastSectionItem->x();
             pos = isRtl ? qMin(pos, sectionPos - sectionSize) : qMax(pos, sectionPos + sectionSize);
         }
         if (header)
             pos = isRtl ? qMin(header->endPosition() - sectionSize, pos) : qMax(header->endPosition(), pos);
-        if (orient == QSGListView::Vertical)
+        if (orient == QQuickListView::Vertical)
             nextSectionItem->setY(pos);
         else
             nextSectionItem->setX(pos);
@@ -990,22 +990,22 @@ void QSGListViewPrivate::updateStickySections()
     }
 }
 
-void QSGListViewPrivate::updateSections()
+void QQuickListViewPrivate::updateSections()
 {
-    Q_Q(QSGListView);
+    Q_Q(QQuickListView);
     if (!q->isComponentComplete())
         return;
 
-    QSGItemViewPrivate::updateSections();
+    QQuickItemViewPrivate::updateSections();
 
     if (sectionCriteria && !visibleItems.isEmpty()) {
         QString prevSection;
         if (visibleIndex > 0)
             prevSection = sectionAt(visibleIndex-1);
-        QSGListViewAttached *prevAtt = 0;
+        QQuickListViewAttached *prevAtt = 0;
         int idx = -1;
         for (int i = 0; i < visibleItems.count(); ++i) {
-            QSGListViewAttached *attached = static_cast<QSGListViewAttached*>(visibleItems.at(i)->attached);
+            QQuickListViewAttached *attached = static_cast<QQuickListViewAttached*>(visibleItems.at(i)->attached);
             attached->setPrevSection(prevSection);
             if (visibleItems.at(i)->index != -1) {
                 QString propValue = model->stringValue(visibleItems.at(i)->index, sectionCriteria->property());
@@ -1031,9 +1031,9 @@ void QSGListViewPrivate::updateSections()
     updateStickySections();
 }
 
-void QSGListViewPrivate::updateCurrentSection()
+void QQuickListViewPrivate::updateCurrentSection()
 {
-    Q_Q(QSGListView);
+    Q_Q(QQuickListView);
     if (!sectionCriteria || visibleItems.isEmpty()) {
         if (!currentSection.isEmpty()) {
             currentSection.clear();
@@ -1041,10 +1041,10 @@ void QSGListViewPrivate::updateCurrentSection()
         }
         return;
     }
-    bool inlineSections = sectionCriteria->labelPositioning() & QSGViewSection::InlineLabels;
+    bool inlineSections = sectionCriteria->labelPositioning() & QQuickViewSection::InlineLabels;
     qreal sectionThreshold = position();
     if (currentSectionItem && !inlineSections)
-        sectionThreshold += orient == QSGListView::Vertical ? currentSectionItem->height() : currentSectionItem->width();
+        sectionThreshold += orient == QQuickListView::Vertical ? currentSectionItem->height() : currentSectionItem->width();
     int index = 0;
     int modelIndex = visibleIndex;
     while (index < visibleItems.count() && visibleItems.at(index)->endPosition() <= sectionThreshold) {
@@ -1064,7 +1064,7 @@ void QSGListViewPrivate::updateCurrentSection()
         emit q->currentSectionChanged();
     }
 
-    if (sectionCriteria->labelPositioning() & QSGViewSection::NextLabelAtEnd) {
+    if (sectionCriteria->labelPositioning() & QQuickViewSection::NextLabelAtEnd) {
         // Don't want to scan for next section on every movement, so remember
         // the last section in the visible area and only scan for the next
         // section when that changes.  Clearing lastVisibleSection will also
@@ -1072,7 +1072,7 @@ void QSGListViewPrivate::updateCurrentSection()
         QString lastSection = currentSection;
         qreal endPos = isRightToLeft() ? -position() : position() + size();
         if (nextSectionItem && !inlineSections)
-            endPos -= orient == QSGListView::Vertical ? nextSectionItem->height() : nextSectionItem->width();
+            endPos -= orient == QQuickListView::Vertical ? nextSectionItem->height() : nextSectionItem->width();
         while (index < visibleItems.count() && static_cast<FxListItemSG*>(visibleItems.at(index))->itemPosition() < endPos) {
             if (visibleItems.at(index)->index != -1)
                 modelIndex = visibleItems.at(index)->index;
@@ -1095,9 +1095,9 @@ void QSGListViewPrivate::updateCurrentSection()
     }
 }
 
-void QSGListViewPrivate::initializeCurrentItem()
+void QQuickListViewPrivate::initializeCurrentItem()
 {
-    QSGItemViewPrivate::initializeCurrentItem();
+    QQuickItemViewPrivate::initializeCurrentItem();
 
     if (currentItem) {
         FxListItemSG *listItem = static_cast<FxListItemSG *>(currentItem);
@@ -1122,7 +1122,7 @@ void QSGListViewPrivate::initializeCurrentItem()
     }
 }
 
-void QSGListViewPrivate::updateAverage()
+void QQuickListViewPrivate::updateAverage()
 {
     if (!visibleItems.count())
         return;
@@ -1132,32 +1132,32 @@ void QSGListViewPrivate::updateAverage()
     averageSize = qRound(sum / visibleItems.count());
 }
 
-qreal QSGListViewPrivate::headerSize() const
+qreal QQuickListViewPrivate::headerSize() const
 {
     return header ? header->size() : 0.0;
 }
 
-qreal QSGListViewPrivate::footerSize() const
+qreal QQuickListViewPrivate::footerSize() const
 {
     return footer ? footer->size() : 0.0;
 }
 
-bool QSGListViewPrivate::showHeaderForIndex(int index) const
+bool QQuickListViewPrivate::showHeaderForIndex(int index) const
 {
     return index == 0;
 }
 
-bool QSGListViewPrivate::showFooterForIndex(int index) const
+bool QQuickListViewPrivate::showFooterForIndex(int index) const
 {
     return index == model->count()-1;
 }
 
-void QSGListViewPrivate::updateFooter()
+void QQuickListViewPrivate::updateFooter()
 {
-    Q_Q(QSGListView);
+    Q_Q(QQuickListView);
     bool created = false;
     if (!footer) {
-        QSGItem *item = createComponentItem(footerComponent, true);
+        QQuickItem *item = createComponentItem(footerComponent, true);
         if (!item)
             return;
         item->setZ(1);
@@ -1183,12 +1183,12 @@ void QSGListViewPrivate::updateFooter()
         emit q->footerItemChanged();
 }
 
-void QSGListViewPrivate::updateHeader()
+void QQuickListViewPrivate::updateHeader()
 {
-    Q_Q(QSGListView);
+    Q_Q(QQuickListView);
     bool created = false;
     if (!header) {
-        QSGItem *item = createComponentItem(headerComponent, true);
+        QQuickItem *item = createComponentItem(headerComponent, true);
         if (!item)
             return;
         item->setZ(1);
@@ -1215,47 +1215,47 @@ void QSGListViewPrivate::updateHeader()
         emit q->headerItemChanged();
 }
 
-void QSGListViewPrivate::itemGeometryChanged(QSGItem *item, const QRectF &newGeometry, const QRectF &oldGeometry)
+void QQuickListViewPrivate::itemGeometryChanged(QQuickItem *item, const QRectF &newGeometry, const QRectF &oldGeometry)
 {
-    Q_Q(QSGListView);
-    QSGItemViewPrivate::itemGeometryChanged(item, newGeometry, oldGeometry);
+    Q_Q(QQuickListView);
+    QQuickItemViewPrivate::itemGeometryChanged(item, newGeometry, oldGeometry);
     if (!q->isComponentComplete())
         return;
     if (item != contentItem && (!highlight || item != highlight->item)) {
-        if ((orient == QSGListView::Vertical && newGeometry.height() != oldGeometry.height())
-            || (orient == QSGListView::Horizontal && newGeometry.width() != oldGeometry.width())) {
+        if ((orient == QQuickListView::Vertical && newGeometry.height() != oldGeometry.height())
+            || (orient == QQuickListView::Horizontal && newGeometry.width() != oldGeometry.width())) {
             forceLayout = true;
             q->polish();
         }
     }
 }
 
-void QSGListViewPrivate::fixupPosition()
+void QQuickListViewPrivate::fixupPosition()
 {
-    if ((haveHighlightRange && highlightRange == QSGListView::StrictlyEnforceRange)
-        || snapMode != QSGListView::NoSnap)
+    if ((haveHighlightRange && highlightRange == QQuickListView::StrictlyEnforceRange)
+        || snapMode != QQuickListView::NoSnap)
         moveReason = Other;
-    if (orient == QSGListView::Vertical)
+    if (orient == QQuickListView::Vertical)
         fixupY();
     else
         fixupX();
 }
 
-void QSGListViewPrivate::fixup(AxisData &data, qreal minExtent, qreal maxExtent)
+void QQuickListViewPrivate::fixup(AxisData &data, qreal minExtent, qreal maxExtent)
 {
-    if ((orient == QSGListView::Horizontal && &data == &vData)
-        || (orient == QSGListView::Vertical && &data == &hData))
+    if ((orient == QQuickListView::Horizontal && &data == &vData)
+        || (orient == QQuickListView::Vertical && &data == &hData))
         return;
 
     correctFlick = false;
     fixupMode = moveReason == Mouse ? fixupMode : Immediate;
-    bool strictHighlightRange = haveHighlightRange && highlightRange == QSGListView::StrictlyEnforceRange;
+    bool strictHighlightRange = haveHighlightRange && highlightRange == QQuickListView::StrictlyEnforceRange;
 
     qreal viewPos = isRightToLeft() ? -position()-size() : position();
 
-    if (snapMode != QSGListView::NoSnap && moveReason != QSGListViewPrivate::SetIndex) {
+    if (snapMode != QQuickListView::NoSnap && moveReason != QQuickListViewPrivate::SetIndex) {
         qreal tempPosition = isRightToLeft() ? -position()-size() : position();
-        if (snapMode == QSGListView::SnapOneItem && moveReason == Mouse) {
+        if (snapMode == QQuickListView::SnapOneItem && moveReason == Mouse) {
             // if we've been dragged < averageSize/2 then bias towards the next item
             qreal dist = data.move.value() - (data.pressPos - data.dragStartOffset);
             qreal bias = 0;
@@ -1296,7 +1296,7 @@ void QSGListViewPrivate::fixup(AxisData &data, qreal minExtent, qreal maxExtent)
             else
                 pos = qMax(qMin(bottomItem->position() - highlightRangeEnd, -maxExtent), -minExtent);
         } else {
-            QSGItemViewPrivate::fixup(data, minExtent, maxExtent);
+            QQuickItemViewPrivate::fixup(data, minExtent, maxExtent);
             return;
         }
 
@@ -1311,7 +1311,7 @@ void QSGListViewPrivate::fixup(AxisData &data, qreal minExtent, qreal maxExtent)
             }
             vTime = timeline.time();
         }
-    } else if (currentItem && strictHighlightRange && moveReason != QSGListViewPrivate::SetIndex) {
+    } else if (currentItem && strictHighlightRange && moveReason != QQuickListViewPrivate::SetIndex) {
         updateHighlight();
         qreal pos = static_cast<FxListItemSG*>(currentItem)->itemPosition();
         if (viewPos < pos + static_cast<FxListItemSG*>(currentItem)->itemSize() - highlightRangeEnd)
@@ -1332,22 +1332,22 @@ void QSGListViewPrivate::fixup(AxisData &data, qreal minExtent, qreal maxExtent)
         }
         vTime = timeline.time();
     } else {
-        QSGItemViewPrivate::fixup(data, minExtent, maxExtent);
+        QQuickItemViewPrivate::fixup(data, minExtent, maxExtent);
     }
     data.inOvershoot = false;
     fixupMode = Normal;
 }
 
-void QSGListViewPrivate::flick(AxisData &data, qreal minExtent, qreal maxExtent, qreal vSize,
+void QQuickListViewPrivate::flick(AxisData &data, qreal minExtent, qreal maxExtent, qreal vSize,
                                         QDeclarativeTimeLineCallback::Callback fixupCallback, qreal velocity)
 {
-    Q_Q(QSGListView);
+    Q_Q(QQuickListView);
 
     data.fixingUp = false;
     moveReason = Mouse;
-    if ((!haveHighlightRange || highlightRange != QSGListView::StrictlyEnforceRange) && snapMode == QSGListView::NoSnap) {
+    if ((!haveHighlightRange || highlightRange != QQuickListView::StrictlyEnforceRange) && snapMode == QQuickListView::NoSnap) {
         correctFlick = true;
-        QSGItemViewPrivate::flick(data, minExtent, maxExtent, vSize, fixupCallback, velocity);
+        QQuickItemViewPrivate::flick(data, minExtent, maxExtent, vSize, fixupCallback, velocity);
         return;
     }
     qreal maxDistance = 0;
@@ -1356,7 +1356,7 @@ void QSGListViewPrivate::flick(AxisData &data, qreal minExtent, qreal maxExtent,
     // -ve velocity means list is moving up/left
     if (velocity > 0) {
         if (data.move.value() < minExtent) {
-            if (snapMode == QSGListView::SnapOneItem && !hData.flicking && !vData.flicking) {
+            if (snapMode == QQuickListView::SnapOneItem && !hData.flicking && !vData.flicking) {
                 // if we've been dragged < averageSize/2 then bias towards the next item
                 qreal dist = data.move.value() - (data.pressPos - data.dragStartOffset);
                 qreal bias = dist < averageSize/2 ? averageSize/2 : 0;
@@ -1369,11 +1369,11 @@ void QSGListViewPrivate::flick(AxisData &data, qreal minExtent, qreal maxExtent,
                 maxDistance = qAbs(minExtent - data.move.value());
             }
         }
-        if (snapMode == QSGListView::NoSnap && highlightRange != QSGListView::StrictlyEnforceRange)
+        if (snapMode == QQuickListView::NoSnap && highlightRange != QQuickListView::StrictlyEnforceRange)
             data.flickTarget = minExtent;
     } else {
         if (data.move.value() > maxExtent) {
-            if (snapMode == QSGListView::SnapOneItem && !hData.flicking && !vData.flicking) {
+            if (snapMode == QQuickListView::SnapOneItem && !hData.flicking && !vData.flicking) {
                 // if we've been dragged < averageSize/2 then bias towards the next item
                 qreal dist = data.move.value() - (data.pressPos - data.dragStartOffset);
                 qreal bias = -dist < averageSize/2 ? averageSize/2 : 0;
@@ -1386,10 +1386,10 @@ void QSGListViewPrivate::flick(AxisData &data, qreal minExtent, qreal maxExtent,
                 maxDistance = qAbs(maxExtent - data.move.value());
             }
         }
-        if (snapMode == QSGListView::NoSnap && highlightRange != QSGListView::StrictlyEnforceRange)
+        if (snapMode == QQuickListView::NoSnap && highlightRange != QQuickListView::StrictlyEnforceRange)
             data.flickTarget = maxExtent;
     }
-    bool overShoot = boundsBehavior == QSGFlickable::DragAndOvershootBounds;
+    bool overShoot = boundsBehavior == QQuickFlickable::DragAndOvershootBounds;
     if (maxDistance > 0 || overShoot) {
         // These modes require the list to stop exactly on an item boundary.
         // The initial flick will estimate the boundary to stop on.
@@ -1413,8 +1413,8 @@ void QSGListViewPrivate::flick(AxisData &data, qreal minExtent, qreal maxExtent,
                 dist = qMin(dist, maxDistance);
             if (v > 0)
                 dist = -dist;
-            if ((maxDistance > 0.0 && v2 / (2.0f * maxDistance) < accel) || snapMode == QSGListView::SnapOneItem) {
-                if (snapMode != QSGListView::SnapOneItem) {
+            if ((maxDistance > 0.0 && v2 / (2.0f * maxDistance) < accel) || snapMode == QQuickListView::SnapOneItem) {
+                if (snapMode != QQuickListView::SnapOneItem) {
                     qreal distTemp = isRightToLeft() ? -dist : dist;
                     data.flickTarget = -snapPosAt(-(dataValue - highlightRangeStart) + distTemp) + highlightRangeStart;
                 }
@@ -1470,7 +1470,7 @@ void QSGListViewPrivate::flick(AxisData &data, qreal minExtent, qreal maxExtent,
         } else {
             // reevaluate the target boundary.
             qreal newtarget = data.flickTarget;
-            if (snapMode != QSGListView::NoSnap || highlightRange == QSGListView::StrictlyEnforceRange) {
+            if (snapMode != QQuickListView::NoSnap || highlightRange == QQuickListView::StrictlyEnforceRange) {
                 qreal tempFlickTarget = isRightToLeft() ? -data.flickTarget+size() : data.flickTarget;
                 newtarget = -snapPosAt(-(tempFlickTarget - highlightRangeStart)) + highlightRangeStart;
                 newtarget = isRightToLeft() ? -newtarget+size() : newtarget;
@@ -1506,7 +1506,7 @@ void QSGListViewPrivate::flick(AxisData &data, qreal minExtent, qreal maxExtent,
 //----------------------------------------------------------------------------
 
 /*!
-    \qmlclass ListView QSGListView
+    \qmlclass ListView QQuickListView
     \inqmlmodule QtQuick 2
     \ingroup qml-view-elements
     \inherits Flickable
@@ -1567,12 +1567,12 @@ void QSGListViewPrivate::flick(AxisData &data, qreal minExtent, qreal maxExtent,
 
     \sa {QML Data Models}, GridView, {declarative/modelviews/listview}{ListView examples}
 */
-QSGListView::QSGListView(QSGItem *parent)
-    : QSGItemView(*(new QSGListViewPrivate), parent)
+QQuickListView::QQuickListView(QQuickItem *parent)
+    : QQuickItemView(*(new QQuickListViewPrivate), parent)
 {
 }
 
-QSGListView::~QSGListView()
+QQuickListView::~QQuickListView()
 {
 }
 
@@ -1773,9 +1773,9 @@ QSGListView::~QSGListView()
     \o ListView.NoHighlightRange - this is the default value.
     \endlist
 */
-void QSGListView::setHighlightFollowsCurrentItem(bool autoHighlight)
+void QQuickListView::setHighlightFollowsCurrentItem(bool autoHighlight)
 {
-    Q_D(QSGListView);
+    Q_D(QQuickListView);
     if (d->autoHighlight != autoHighlight) {
         if (!autoHighlight) {
             if (d->highlightPosAnimator)
@@ -1783,7 +1783,7 @@ void QSGListView::setHighlightFollowsCurrentItem(bool autoHighlight)
             if (d->highlightSizeAnimator)
                 d->highlightSizeAnimator->stop();
         }
-        QSGItemView::setHighlightFollowsCurrentItem(autoHighlight);
+        QQuickItemView::setHighlightFollowsCurrentItem(autoHighlight);
     }
 }
 
@@ -1794,15 +1794,15 @@ void QSGListView::setHighlightFollowsCurrentItem(bool autoHighlight)
 
     The default value is 0.
 */
-qreal QSGListView::spacing() const
+qreal QQuickListView::spacing() const
 {
-    Q_D(const QSGListView);
+    Q_D(const QQuickListView);
     return d->spacing;
 }
 
-void QSGListView::setSpacing(qreal spacing)
+void QQuickListView::setSpacing(qreal spacing)
 {
-    Q_D(QSGListView);
+    Q_D(QQuickListView);
     if (spacing != d->spacing) {
         d->spacing = spacing;
         d->forceLayout = true;
@@ -1832,15 +1832,15 @@ void QSGListView::setSpacing(qreal spacing)
     \image listview-highlight.png
     \endtable
 */
-QSGListView::Orientation QSGListView::orientation() const
+QQuickListView::Orientation QQuickListView::orientation() const
 {
-    Q_D(const QSGListView);
+    Q_D(const QQuickListView);
     return d->orient;
 }
 
-void QSGListView::setOrientation(QSGListView::Orientation orientation)
+void QQuickListView::setOrientation(QQuickListView::Orientation orientation)
 {
-    Q_D(QSGListView);
+    Q_D(QQuickListView);
     if (d->orient != orientation) {
         d->orient = orientation;
         if (d->orient == Vertical) {
@@ -1979,11 +1979,11 @@ void QSGListView::setOrientation(QSGListView::Orientation orientation)
 
     \sa {declarative/modelviews/listview}{ListView examples}
 */
-QSGViewSection *QSGListView::sectionCriteria()
+QQuickViewSection *QQuickListView::sectionCriteria()
 {
-    Q_D(QSGListView);
+    Q_D(QQuickListView);
     if (!d->sectionCriteria) {
-        d->sectionCriteria = new QSGViewSection(this);
+        d->sectionCriteria = new QQuickViewSection(this);
         connect(d->sectionCriteria, SIGNAL(propertyChanged()), this, SLOT(updateSections()));
     }
     return d->sectionCriteria;
@@ -1993,9 +1993,9 @@ QSGViewSection *QSGListView::sectionCriteria()
     \qmlproperty string QtQuick2::ListView::currentSection
     This property holds the section that is currently at the beginning of the view.
 */
-QString QSGListView::currentSection() const
+QString QQuickListView::currentSection() const
 {
-    Q_D(const QSGListView);
+    Q_D(const QQuickListView);
     return d->currentSection;
 }
 
@@ -2018,15 +2018,15 @@ QString QSGListView::currentSection() const
 
     \sa highlightFollowsCurrentItem
 */
-qreal QSGListView::highlightMoveSpeed() const
+qreal QQuickListView::highlightMoveSpeed() const
 {
-    Q_D(const QSGListView);
+    Q_D(const QQuickListView);
     return d->highlightMoveSpeed;
 }
 
-void QSGListView::setHighlightMoveSpeed(qreal speed)
+void QQuickListView::setHighlightMoveSpeed(qreal speed)
 {
-    Q_D(QSGListView);
+    Q_D(QQuickListView);
     if (d->highlightMoveSpeed != speed) {
         d->highlightMoveSpeed = speed;
         if (d->highlightPosAnimator)
@@ -2035,25 +2035,25 @@ void QSGListView::setHighlightMoveSpeed(qreal speed)
     }
 }
 
-void QSGListView::setHighlightMoveDuration(int duration)
+void QQuickListView::setHighlightMoveDuration(int duration)
 {
-    Q_D(QSGListView);
+    Q_D(QQuickListView);
     if (d->highlightMoveDuration != duration) {
         if (d->highlightPosAnimator)
             d->highlightPosAnimator->userDuration = duration;
-        QSGItemView::setHighlightMoveDuration(duration);
+        QQuickItemView::setHighlightMoveDuration(duration);
     }
 }
 
-qreal QSGListView::highlightResizeSpeed() const
+qreal QQuickListView::highlightResizeSpeed() const
 {
-    Q_D(const QSGListView);
+    Q_D(const QQuickListView);
     return d->highlightResizeSpeed;
 }
 
-void QSGListView::setHighlightResizeSpeed(qreal speed)
+void QQuickListView::setHighlightResizeSpeed(qreal speed)
 {
-    Q_D(QSGListView);
+    Q_D(QQuickListView);
     if (d->highlightResizeSpeed != speed) {
         d->highlightResizeSpeed = speed;
         if (d->highlightSizeAnimator)
@@ -2062,15 +2062,15 @@ void QSGListView::setHighlightResizeSpeed(qreal speed)
     }
 }
 
-int QSGListView::highlightResizeDuration() const
+int QQuickListView::highlightResizeDuration() const
 {
-    Q_D(const QSGListView);
+    Q_D(const QQuickListView);
     return d->highlightResizeDuration;
 }
 
-void QSGListView::setHighlightResizeDuration(int duration)
+void QQuickListView::setHighlightResizeDuration(int duration)
 {
-    Q_D(QSGListView);
+    Q_D(QQuickListView);
     if (d->highlightResizeDuration != duration) {
         d->highlightResizeDuration = duration;
         if (d->highlightSizeAnimator)
@@ -2100,15 +2100,15 @@ void QSGListView::setHighlightResizeDuration(int duration)
 
     \sa highlightRangeMode
 */
-QSGListView::SnapMode QSGListView::snapMode() const
+QQuickListView::SnapMode QQuickListView::snapMode() const
 {
-    Q_D(const QSGListView);
+    Q_D(const QQuickListView);
     return d->snapMode;
 }
 
-void QSGListView::setSnapMode(SnapMode mode)
+void QQuickListView::setSnapMode(SnapMode mode)
 {
-    Q_D(QSGListView);
+    Q_D(QQuickListView);
     if (d->snapMode != mode) {
         d->snapMode = mode;
         emit snapModeChanged();
@@ -2137,10 +2137,10 @@ void QSGListView::setSnapMode(SnapMode mode)
     \sa footer
 */
 
-void QSGListView::viewportMoved()
+void QQuickListView::viewportMoved()
 {
-    Q_D(QSGListView);
-    QSGItemView::viewportMoved();
+    Q_D(QQuickListView);
+    QQuickItemView::viewportMoved();
     if (!d->itemCount)
         return;
     // Recursion can occur due to refill changing the content size.
@@ -2150,8 +2150,8 @@ void QSGListView::viewportMoved()
     d->lazyRelease = true;
     d->refill();
     if (d->hData.flicking || d->vData.flicking || d->hData.moving || d->vData.moving)
-        d->moveReason = QSGListViewPrivate::Mouse;
-    if (d->moveReason != QSGListViewPrivate::SetIndex) {
+        d->moveReason = QQuickListViewPrivate::Mouse;
+    if (d->moveReason != QQuickListViewPrivate::SetIndex) {
         if (d->haveHighlightRange && d->highlightRange == StrictlyEnforceRange && d->highlight) {
             // reposition highlight
             qreal pos = d->highlight->position();
@@ -2185,13 +2185,13 @@ void QSGListView::viewportMoved()
                 if ((minY - d->vData.move.value() < height()/2 || d->vData.flickTarget - d->vData.move.value() < height()/2)
                     && minY != d->vData.flickTarget)
                     d->flickY(-d->vData.smoothVelocity.value());
-                d->bufferMode = QSGListViewPrivate::BufferBefore;
+                d->bufferMode = QQuickListViewPrivate::BufferBefore;
             } else if (d->vData.velocity < 0) {
                 const qreal maxY = maxYExtent();
                 if ((d->vData.move.value() - maxY < height()/2 || d->vData.move.value() - d->vData.flickTarget < height()/2)
                     && maxY != d->vData.flickTarget)
                     d->flickY(-d->vData.smoothVelocity.value());
-                d->bufferMode = QSGListViewPrivate::BufferAfter;
+                d->bufferMode = QQuickListViewPrivate::BufferAfter;
             }
         }
 
@@ -2201,13 +2201,13 @@ void QSGListView::viewportMoved()
                 if ((minX - d->hData.move.value() < width()/2 || d->hData.flickTarget - d->hData.move.value() < width()/2)
                     && minX != d->hData.flickTarget)
                     d->flickX(-d->hData.smoothVelocity.value());
-                d->bufferMode = d->isRightToLeft() ? QSGListViewPrivate::BufferAfter : QSGListViewPrivate::BufferBefore;
+                d->bufferMode = d->isRightToLeft() ? QQuickListViewPrivate::BufferAfter : QQuickListViewPrivate::BufferBefore;
             } else if (d->hData.velocity < 0) {
                 const qreal maxX = maxXExtent();
                 if ((d->hData.move.value() - maxX < width()/2 || d->hData.move.value() - d->hData.flickTarget < width()/2)
                     && maxX != d->hData.flickTarget)
                     d->flickX(-d->hData.smoothVelocity.value());
-                d->bufferMode = d->isRightToLeft() ? QSGListViewPrivate::BufferBefore : QSGListViewPrivate::BufferAfter;
+                d->bufferMode = d->isRightToLeft() ? QQuickListViewPrivate::BufferBefore : QQuickListViewPrivate::BufferAfter;
             }
         }
         d->inFlickCorrection = false;
@@ -2219,13 +2219,13 @@ void QSGListView::viewportMoved()
     d->inViewportMoved = false;
 }
 
-void QSGListView::keyPressEvent(QKeyEvent *event)
+void QQuickListView::keyPressEvent(QKeyEvent *event)
 {
-    Q_D(QSGListView);
+    Q_D(QQuickListView);
     if (d->model && d->model->count() && d->interactive) {
-        if ((d->orient == QSGListView::Horizontal && !d->isRightToLeft() && event->key() == Qt::Key_Left)
-                    || (d->orient == QSGListView::Horizontal && d->isRightToLeft() && event->key() == Qt::Key_Right)
-                    || (d->orient == QSGListView::Vertical && event->key() == Qt::Key_Up)) {
+        if ((d->orient == QQuickListView::Horizontal && !d->isRightToLeft() && event->key() == Qt::Key_Left)
+                    || (d->orient == QQuickListView::Horizontal && d->isRightToLeft() && event->key() == Qt::Key_Right)
+                    || (d->orient == QQuickListView::Vertical && event->key() == Qt::Key_Up)) {
             if (currentIndex() > 0 || (d->wrap && !event->isAutoRepeat())) {
                 decrementCurrentIndex();
                 event->accept();
@@ -2234,9 +2234,9 @@ void QSGListView::keyPressEvent(QKeyEvent *event)
                 event->accept();
                 return;
             }
-        } else if ((d->orient == QSGListView::Horizontal && !d->isRightToLeft() && event->key() == Qt::Key_Right)
-                    || (d->orient == QSGListView::Horizontal && d->isRightToLeft() && event->key() == Qt::Key_Left)
-                    || (d->orient == QSGListView::Vertical && event->key() == Qt::Key_Down)) {
+        } else if ((d->orient == QQuickListView::Horizontal && !d->isRightToLeft() && event->key() == Qt::Key_Right)
+                    || (d->orient == QQuickListView::Horizontal && d->isRightToLeft() && event->key() == Qt::Key_Left)
+                    || (d->orient == QQuickListView::Vertical && event->key() == Qt::Key_Down)) {
             if (currentIndex() < d->model->count() - 1 || (d->wrap && !event->isAutoRepeat())) {
                 incrementCurrentIndex();
                 event->accept();
@@ -2248,18 +2248,18 @@ void QSGListView::keyPressEvent(QKeyEvent *event)
         }
     }
     event->ignore();
-    QSGItemView::keyPressEvent(event);
+    QQuickItemView::keyPressEvent(event);
 }
 
-void QSGListView::geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry)
+void QQuickListView::geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry)
 {
-    Q_D(QSGListView);
-    if (d->isRightToLeft() && d->orient == QSGListView::Horizontal) {
+    Q_D(QQuickListView);
+    if (d->isRightToLeft() && d->orient == QQuickListView::Horizontal) {
         // maintain position relative to the right edge
         int dx = newGeometry.width() - oldGeometry.width();
         setContentX(contentX() - dx);
     }
-    QSGItemView::geometryChanged(newGeometry, oldGeometry);
+    QQuickItemView::geometryChanged(newGeometry, oldGeometry);
 }
 
 
@@ -2272,12 +2272,12 @@ void QSGListView::geometryChanged(const QRectF &newGeometry, const QRectF &oldGe
 
     \bold Note: methods should only be called after the Component has completed.
 */
-void QSGListView::incrementCurrentIndex()
+void QQuickListView::incrementCurrentIndex()
 {
-    Q_D(QSGListView);
+    Q_D(QQuickListView);
     int count = d->model ? d->model->count() : 0;
     if (count && (currentIndex() < count - 1 || d->wrap)) {
-        d->moveReason = QSGListViewPrivate::SetIndex;
+        d->moveReason = QQuickListViewPrivate::SetIndex;
         int index = currentIndex()+1;
         setCurrentIndex((index >= 0 && index < count) ? index : 0);
     }
@@ -2292,20 +2292,20 @@ void QSGListView::incrementCurrentIndex()
 
     \bold Note: methods should only be called after the Component has completed.
 */
-void QSGListView::decrementCurrentIndex()
+void QQuickListView::decrementCurrentIndex()
 {
-    Q_D(QSGListView);
+    Q_D(QQuickListView);
     int count = d->model ? d->model->count() : 0;
     if (count && (currentIndex() > 0 || d->wrap)) {
-        d->moveReason = QSGListViewPrivate::SetIndex;
+        d->moveReason = QQuickListViewPrivate::SetIndex;
         int index = currentIndex()-1;
         setCurrentIndex((index >= 0 && index < count) ? index : count-1);
     }
 }
 
-void QSGListView::updateSections()
+void QQuickListView::updateSections()
 {
-    Q_D(QSGListView);
+    Q_D(QQuickListView);
     if (isComponentComplete() && d->model) {
         QList<QByteArray> roles;
         if (d->sectionCriteria && !d->sectionCriteria->property().isEmpty())
@@ -2319,9 +2319,9 @@ void QSGListView::updateSections()
     }
 }
 
-bool QSGListViewPrivate::applyInsertionChange(const QDeclarativeChangeSet::Insert &change, FxViewItem *firstVisible, InsertionsResult *insertResult)
+bool QQuickListViewPrivate::applyInsertionChange(const QDeclarativeChangeSet::Insert &change, FxViewItem *firstVisible, InsertionsResult *insertResult)
 {
-    Q_Q(QSGListView);
+    Q_Q(QQuickListView);
 
     int modelIndex = change.index;
     int count = change.count;
@@ -2492,9 +2492,9 @@ bool QSGListViewPrivate::applyInsertionChange(const QDeclarativeChangeSet::Inser
     \bold Note: methods should only be called after the Component has completed.
 */
 
-QSGListViewAttached *QSGListView::qmlAttachedProperties(QObject *obj)
+QQuickListViewAttached *QQuickListView::qmlAttachedProperties(QObject *obj)
 {
-    return new QSGListViewAttached(obj);
+    return new QQuickListViewAttached(obj);
 }
 
 QT_END_NAMESPACE
diff --git a/src/declarative/items/qsglistview_p.h b/src/declarative/items/qquicklistview_p.h
index a3c31dfaf4..0266e23cd5 100644
--- a/src/declarative/items/qsglistview_p.h
+++ b/src/declarative/items/qquicklistview_p.h
@@ -40,10 +40,10 @@
 **
 ****************************************************************************/
 
-#ifndef QSGLISTVIEW_P_H
-#define QSGLISTVIEW_P_H
+#ifndef QQUICKLISTVIEW_P_H
+#define QQUICKLISTVIEW_P_H
 
-#include "qsgitemview_p.h"
+#include "qquickitemview_p.h"
 
 #include <private/qdeclarativeguard_p.h>
 
@@ -53,9 +53,9 @@ QT_BEGIN_NAMESPACE
 
 QT_MODULE(Declarative)
 
-class QSGListView;
-class QSGListViewPrivate;
-class Q_AUTOTEST_EXPORT QSGViewSection : public QObject
+class QQuickListView;
+class QQuickListViewPrivate;
+class Q_AUTOTEST_EXPORT QQuickViewSection : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(QString property READ property WRITE setProperty NOTIFY propertyChanged)
@@ -65,7 +65,7 @@ class Q_AUTOTEST_EXPORT QSGViewSection : public QObject
     Q_ENUMS(SectionCriteria)
     Q_ENUMS(LabelPositioning)
 public:
-    QSGViewSection(QSGListView *parent=0);
+    QQuickViewSection(QQuickListView *parent=0);
 
     QString property() const { return m_property; }
     void setProperty(const QString &);
@@ -94,16 +94,16 @@ private:
     SectionCriteria m_criteria;
     QDeclarativeComponent *m_delegate;
     int m_labelPositioning;
-    QSGListViewPrivate *m_view;
+    QQuickListViewPrivate *m_view;
 };
 
 
-class QSGVisualModel;
-class QSGListViewAttached;
-class Q_AUTOTEST_EXPORT QSGListView : public QSGItemView
+class QQuickVisualModel;
+class QQuickListViewAttached;
+class Q_AUTOTEST_EXPORT QQuickListView : public QQuickItemView
 {
     Q_OBJECT
-    Q_DECLARE_PRIVATE(QSGListView)
+    Q_DECLARE_PRIVATE(QQuickListView)
 
     // XXX deprecate these two properties (only duration should be necessary)
     Q_PROPERTY(qreal highlightMoveSpeed READ highlightMoveSpeed WRITE setHighlightMoveSpeed NOTIFY highlightMoveSpeedChanged)
@@ -114,7 +114,7 @@ class Q_AUTOTEST_EXPORT QSGListView : public QSGItemView
     Q_PROPERTY(qreal spacing READ spacing WRITE setSpacing NOTIFY spacingChanged)
     Q_PROPERTY(Orientation orientation READ orientation WRITE setOrientation NOTIFY orientationChanged)
 
-    Q_PROPERTY(QSGViewSection *section READ sectionCriteria CONSTANT)
+    Q_PROPERTY(QQuickViewSection *section READ sectionCriteria CONSTANT)
     Q_PROPERTY(QString currentSection READ currentSection NOTIFY currentSectionChanged)
 
     Q_PROPERTY(SnapMode snapMode READ snapMode WRITE setSnapMode NOTIFY snapModeChanged)
@@ -124,8 +124,8 @@ class Q_AUTOTEST_EXPORT QSGListView : public QSGItemView
     Q_CLASSINFO("DefaultProperty", "data")
 
 public:
-    QSGListView(QSGItem *parent=0);
-    ~QSGListView();
+    QQuickListView(QQuickItem *parent=0);
+    ~QQuickListView();
 
     qreal spacing() const;
     void setSpacing(qreal spacing);
@@ -134,7 +134,7 @@ public:
     Orientation orientation() const;
     void setOrientation(Orientation);
 
-    QSGViewSection *sectionCriteria();
+    QQuickViewSection *sectionCriteria();
     QString currentSection() const;
 
     virtual void setHighlightFollowsCurrentItem(bool);
@@ -154,7 +154,7 @@ public:
     SnapMode snapMode() const;
     void setSnapMode(SnapMode mode);
 
-    static QSGListViewAttached *qmlAttachedProperties(QObject *);
+    static QQuickListViewAttached *qmlAttachedProperties(QObject *);
 
 public Q_SLOTS:
     void incrementCurrentIndex();
@@ -178,18 +178,18 @@ protected Q_SLOTS:
     void updateSections();
 };
 
-class QSGListViewAttached : public QSGItemViewAttached
+class QQuickListViewAttached : public QQuickItemViewAttached
 {
     Q_OBJECT
 
 public:
-    QSGListViewAttached(QObject *parent)
-        : QSGItemViewAttached(parent), m_view(0) {}
-    ~QSGListViewAttached() {}
+    QQuickListViewAttached(QObject *parent)
+        : QQuickItemViewAttached(parent), m_view(0) {}
+    ~QQuickListViewAttached() {}
 
-    Q_PROPERTY(QSGListView *view READ view NOTIFY viewChanged)
-    QSGListView *view() { return m_view; }
-    void setView(QSGListView *view) {
+    Q_PROPERTY(QQuickListView *view READ view NOTIFY viewChanged)
+    QQuickListView *view() { return m_view; }
+    void setView(QQuickListView *view) {
         if (view != m_view) {
             m_view = view;
             emit viewChanged();
@@ -200,16 +200,16 @@ Q_SIGNALS:
     void viewChanged();
 
 public:
-    QDeclarativeGuard<QSGListView> m_view;
+    QDeclarativeGuard<QQuickListView> m_view;
 };
 
 
 QT_END_NAMESPACE
 
-QML_DECLARE_TYPEINFO(QSGListView, QML_HAS_ATTACHED_PROPERTIES)
-QML_DECLARE_TYPE(QSGListView)
-QML_DECLARE_TYPE(QSGViewSection)
+QML_DECLARE_TYPEINFO(QQuickListView, QML_HAS_ATTACHED_PROPERTIES)
+QML_DECLARE_TYPE(QQuickListView)
+QML_DECLARE_TYPE(QQuickViewSection)
 
 QT_END_HEADER
 
-#endif // QSGLISTVIEW_P_H
+#endif // QQUICKLISTVIEW_P_H
diff --git a/src/declarative/items/qsgloader.cpp b/src/declarative/items/qquickloader.cpp
index e655e179cd..cef98a6f7c 100644
--- a/src/declarative/items/qsgloader.cpp
+++ b/src/declarative/items/qquickloader.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include "qsgloader_p_p.h"
+#include "qquickloader_p_p.h"
 
 #include <QtDeclarative/qdeclarativeinfo.h>
 
@@ -52,20 +52,20 @@
 
 QT_BEGIN_NAMESPACE
 
-QSGLoaderPrivate::QSGLoaderPrivate()
+QQuickLoaderPrivate::QQuickLoaderPrivate()
     : item(0), component(0), itemContext(0), incubator(0), updatingSize(false),
       itemWidthValid(false), itemHeightValid(false),
       active(true), loadingFromSource(false), asynchronous(false)
 {
 }
 
-QSGLoaderPrivate::~QSGLoaderPrivate()
+QQuickLoaderPrivate::~QQuickLoaderPrivate()
 {
     delete incubator;
     disposeInitialPropertyValues();
 }
 
-void QSGLoaderPrivate::itemGeometryChanged(QSGItem *resizeItem, const QRectF &newGeometry, const QRectF &oldGeometry)
+void QQuickLoaderPrivate::itemGeometryChanged(QQuickItem *resizeItem, const QRectF &newGeometry, const QRectF &oldGeometry)
 {
     if (resizeItem == item) {
         if (!updatingSize && newGeometry.width() != oldGeometry.width())
@@ -74,10 +74,10 @@ void QSGLoaderPrivate::itemGeometryChanged(QSGItem *resizeItem, const QRectF &ne
             itemHeightValid = true;
         _q_updateSize(false);
     }
-    QSGItemChangeListener::itemGeometryChanged(resizeItem, newGeometry, oldGeometry);
+    QQuickItemChangeListener::itemGeometryChanged(resizeItem, newGeometry, oldGeometry);
 }
 
-void QSGLoaderPrivate::clear()
+void QQuickLoaderPrivate::clear()
 {
     disposeInitialPropertyValues();
 
@@ -91,8 +91,8 @@ void QSGLoaderPrivate::clear()
     source = QUrl();
 
     if (item) {
-        QSGItemPrivate *p = QSGItemPrivate::get(item);
-        p->removeItemChangeListener(this, QSGItemPrivate::Geometry);
+        QQuickItemPrivate *p = QQuickItemPrivate::get(item);
+        p->removeItemChangeListener(this, QQuickItemPrivate::Geometry);
 
         // We can't delete immediately because our item may have triggered
         // the Loader to load a different item.
@@ -103,10 +103,10 @@ void QSGLoaderPrivate::clear()
     }
 }
 
-void QSGLoaderPrivate::initResize()
+void QQuickLoaderPrivate::initResize()
 {
-    QSGItemPrivate *p = QSGItemPrivate::get(item);
-    p->addItemChangeListener(this, QSGItemPrivate::Geometry);
+    QQuickItemPrivate *p = QQuickItemPrivate::get(item);
+    p->addItemChangeListener(this, QQuickItemPrivate::Geometry);
     // We may override the item's size, so we need to remember
     // whether the item provided its own valid size.
     itemWidthValid = p->widthValid;
@@ -115,7 +115,7 @@ void QSGLoaderPrivate::initResize()
 }
 
 /*!
-    \qmlclass Loader QSGLoader
+    \qmlclass Loader QQuickLoader
     \inqmlmodule QtQuick 2
     \ingroup qml-utility-elements
     \inherits Item
@@ -223,18 +223,18 @@ void QSGLoaderPrivate::initResize()
     \sa {dynamic-object-creation}{Dynamic Object Creation}
 */
 
-QSGLoader::QSGLoader(QSGItem *parent)
-  : QSGImplicitSizeItem(*(new QSGLoaderPrivate), parent)
+QQuickLoader::QQuickLoader(QQuickItem *parent)
+  : QQuickImplicitSizeItem(*(new QQuickLoaderPrivate), parent)
 {
     setFlag(ItemIsFocusScope);
 }
 
-QSGLoader::~QSGLoader()
+QQuickLoader::~QQuickLoader()
 {
-    Q_D(QSGLoader);
+    Q_D(QQuickLoader);
     if (d->item) {
-        QSGItemPrivate *p = QSGItemPrivate::get(d->item);
-        p->removeItemChangeListener(d, QSGItemPrivate::Geometry);
+        QQuickItemPrivate *p = QQuickItemPrivate::get(d->item);
+        p->removeItemChangeListener(d, QQuickItemPrivate::Geometry);
     }
 }
 
@@ -253,15 +253,15 @@ QSGLoader::~QSGLoader()
 
     \sa source, sourceComponent
  */
-bool QSGLoader::active() const
+bool QQuickLoader::active() const
 {
-    Q_D(const QSGLoader);
+    Q_D(const QQuickLoader);
     return d->active;
 }
 
-void QSGLoader::setActive(bool newVal)
+void QQuickLoader::setActive(bool newVal)
 {
-    Q_D(QSGLoader);
+    Q_D(QQuickLoader);
     if (d->active != newVal) {
         d->active = newVal;
         if (newVal == true) {
@@ -272,8 +272,8 @@ void QSGLoader::setActive(bool newVal)
             }
         } else {
             if (d->item) {
-                QSGItemPrivate *p = QSGItemPrivate::get(d->item);
-                p->removeItemChangeListener(d, QSGItemPrivate::Geometry);
+                QQuickItemPrivate *p = QQuickItemPrivate::get(d->item);
+                p->removeItemChangeListener(d, QQuickItemPrivate::Geometry);
 
                 // We can't delete immediately because our item may have triggered
                 // the Loader to load a different item.
@@ -303,20 +303,20 @@ void QSGLoader::setActive(bool newVal)
 
     \sa sourceComponent, status, progress
 */
-QUrl QSGLoader::source() const
+QUrl QQuickLoader::source() const
 {
-    Q_D(const QSGLoader);
+    Q_D(const QQuickLoader);
     return d->source;
 }
 
-void QSGLoader::setSource(const QUrl &url)
+void QQuickLoader::setSource(const QUrl &url)
 {
     setSource(url, true); // clear previous values
 }
 
-void QSGLoader::setSource(const QUrl &url, bool needsClear)
+void QQuickLoader::setSource(const QUrl &url, bool needsClear)
 {
-    Q_D(QSGLoader);
+    Q_D(QQuickLoader);
     if (d->source == url)
         return;
 
@@ -332,9 +332,9 @@ void QSGLoader::setSource(const QUrl &url, bool needsClear)
         emit sourceChanged();
 }
 
-void QSGLoader::loadFromSource()
+void QQuickLoader::loadFromSource()
 {
-    Q_D(QSGLoader);
+    Q_D(QQuickLoader);
     if (d->source.isEmpty()) {
         emit sourceChanged();
         emit statusChanged();
@@ -371,15 +371,15 @@ void QSGLoader::loadFromSource()
     \sa source, progress
 */
 
-QDeclarativeComponent *QSGLoader::sourceComponent() const
+QDeclarativeComponent *QQuickLoader::sourceComponent() const
 {
-    Q_D(const QSGLoader);
+    Q_D(const QQuickLoader);
     return d->component;
 }
 
-void QSGLoader::setSourceComponent(QDeclarativeComponent *comp)
+void QQuickLoader::setSourceComponent(QDeclarativeComponent *comp)
 {
-    Q_D(QSGLoader);
+    Q_D(QQuickLoader);
     if (comp == d->component)
         return;
 
@@ -394,14 +394,14 @@ void QSGLoader::setSourceComponent(QDeclarativeComponent *comp)
         emit sourceComponentChanged();
 }
 
-void QSGLoader::resetSourceComponent()
+void QQuickLoader::resetSourceComponent()
 {
     setSourceComponent(0);
 }
 
-void QSGLoader::loadFromSourceComponent()
+void QQuickLoader::loadFromSourceComponent()
 {
-    Q_D(QSGLoader);
+    Q_D(QQuickLoader);
     if (!d->component) {
         emit sourceComponentChanged();
         emit statusChanged();
@@ -476,10 +476,10 @@ void QSGLoader::loadFromSourceComponent()
 
     \sa source, active
 */
-void QSGLoader::setSource(QDeclarativeV8Function *args)
+void QQuickLoader::setSource(QDeclarativeV8Function *args)
 {
     Q_ASSERT(args);
-    Q_D(QSGLoader);
+    Q_D(QQuickLoader);
 
     bool ipvError = false;
     args->returnValue(v8::Undefined());
@@ -498,7 +498,7 @@ void QSGLoader::setSource(QDeclarativeV8Function *args)
     setSource(sourceUrl, false); // already cleared and set ipv above.
 }
 
-void QSGLoaderPrivate::disposeInitialPropertyValues()
+void QQuickLoaderPrivate::disposeInitialPropertyValues()
 {
     if (!initialPropertyValues.IsEmpty())
         qPersistentDispose(initialPropertyValues);
@@ -506,9 +506,9 @@ void QSGLoaderPrivate::disposeInitialPropertyValues()
         qPersistentDispose(qmlGlobalForIpv);
 }
 
-void QSGLoaderPrivate::load()
+void QQuickLoaderPrivate::load()
 {
-    Q_Q(QSGLoader);
+    Q_Q(QQuickLoader);
 
     if (!q->isComponentComplete() || !component)
         return;
@@ -530,16 +530,16 @@ void QSGLoaderPrivate::load()
     }
 }
 
-void QSGLoaderIncubator::setInitialState(QObject *o)
+void QQuickLoaderIncubator::setInitialState(QObject *o)
 {
     loader->setInitialState(o);
 }
 
-void QSGLoaderPrivate::setInitialState(QObject *obj)
+void QQuickLoaderPrivate::setInitialState(QObject *obj)
 {
-    Q_Q(QSGLoader);
+    Q_Q(QQuickLoader);
 
-    QSGItem *item = qobject_cast<QSGItem*>(obj);
+    QQuickItem *item = qobject_cast<QQuickItem*>(obj);
     if (item) {
         QDeclarative_setParent_noEvent(itemContext, obj);
         QDeclarative_setParent_noEvent(item, q);
@@ -554,24 +554,24 @@ void QSGLoaderPrivate::setInitialState(QObject *obj)
     d->initializeObjectWithInitialProperties(qmlGlobalForIpv, initialPropertyValues, obj);
 }
 
-void QSGLoaderIncubator::statusChanged(Status status)
+void QQuickLoaderIncubator::statusChanged(Status status)
 {
     loader->incubatorStateChanged(status);
 }
 
-void QSGLoaderPrivate::incubatorStateChanged(QDeclarativeIncubator::Status status)
+void QQuickLoaderPrivate::incubatorStateChanged(QDeclarativeIncubator::Status status)
 {
-    Q_Q(QSGLoader);
+    Q_Q(QQuickLoader);
     if (status == QDeclarativeIncubator::Loading || status == QDeclarativeIncubator::Null)
         return;
 
     if (status == QDeclarativeIncubator::Ready) {
         QObject *obj = incubator->object();
-        item = qobject_cast<QSGItem*>(obj);
+        item = qobject_cast<QQuickItem*>(obj);
         if (item) {
             initResize();
         } else {
-            qmlInfo(q) << QSGLoader::tr("Loader does not support loading non-visual elements.");
+            qmlInfo(q) << QQuickLoader::tr("Loader does not support loading non-visual elements.");
             delete itemContext;
             itemContext = 0;
             delete obj;
@@ -595,9 +595,9 @@ void QSGLoaderPrivate::incubatorStateChanged(QDeclarativeIncubator::Status statu
     disposeInitialPropertyValues(); // cleanup
 }
 
-void QSGLoaderPrivate::_q_sourceLoaded()
+void QQuickLoaderPrivate::_q_sourceLoaded()
 {
-    Q_Q(QSGLoader);
+    Q_Q(QQuickLoader);
     if (!component || !component->errors().isEmpty()) {
         if (component)
             QDeclarativeEnginePrivate::warning(qmlEngine(q), component->errors());
@@ -624,7 +624,7 @@ void QSGLoaderPrivate::_q_sourceLoaded()
         }
     }
     if (!incubator)
-        incubator = new QSGLoaderIncubator(this, asynchronous ? QDeclarativeIncubator::Asynchronous : QDeclarativeIncubator::AsynchronousIfNested);
+        incubator = new QQuickLoaderIncubator(this, asynchronous ? QDeclarativeIncubator::Asynchronous : QDeclarativeIncubator::AsynchronousIfNested);
 
     component->create(*incubator, itemContext);
 
@@ -672,9 +672,9 @@ void QSGLoaderPrivate::_q_sourceLoaded()
     \sa progress
 */
 
-QSGLoader::Status QSGLoader::status() const
+QQuickLoader::Status QQuickLoader::status() const
 {
-    Q_D(const QSGLoader);
+    Q_D(const QQuickLoader);
 
     if (!d->active)
         return Null;
@@ -709,10 +709,10 @@ QSGLoader::Status QSGLoader::status() const
     return d->source.isEmpty() ? Null : Error;
 }
 
-void QSGLoader::componentComplete()
+void QQuickLoader::componentComplete()
 {
-    Q_D(QSGLoader);
-    QSGItem::componentComplete();
+    Q_D(QQuickLoader);
+    QQuickItem::componentComplete();
     if (active()) {
         if (d->loadingFromSource) {
             d->component = new QDeclarativeComponent(qmlEngine(this), d->source, this);
@@ -738,9 +738,9 @@ this value will rapidly change from 0 to 1.
 
 \sa status
 */
-qreal QSGLoader::progress() const
+qreal QQuickLoader::progress() const
 {
-    Q_D(const QSGLoader);
+    Q_D(const QQuickLoader);
 
     if (d->item)
         return 1.0;
@@ -759,15 +759,15 @@ This property holds whether the component will be instantiated asynchronously.
 Note that this property affects object instantiation only; it is unrelated to
 loading a component asynchronously via a network.
 */
-bool QSGLoader::asynchronous() const
+bool QQuickLoader::asynchronous() const
 {
-    Q_D(const QSGLoader);
+    Q_D(const QQuickLoader);
     return d->asynchronous;
 }
 
-void QSGLoader::setAsynchronous(bool a)
+void QQuickLoader::setAsynchronous(bool a)
 {
-    Q_D(QSGLoader);
+    Q_D(QQuickLoader);
     if (d->asynchronous == a)
         return;
 
@@ -775,9 +775,9 @@ void QSGLoader::setAsynchronous(bool a)
     emit asynchronousChanged();
 }
 
-void QSGLoaderPrivate::_q_updateSize(bool loaderGeometryChanged)
+void QQuickLoaderPrivate::_q_updateSize(bool loaderGeometryChanged)
 {
-    Q_Q(QSGLoader);
+    Q_Q(QQuickLoader);
     if (!item || updatingSize)
         return;
 
@@ -804,22 +804,22 @@ void QSGLoaderPrivate::_q_updateSize(bool loaderGeometryChanged)
     \qmlproperty Item QtQuick2::Loader::item
     This property holds the top-level item that is currently loaded.
 */
-QSGItem *QSGLoader::item() const
+QQuickItem *QQuickLoader::item() const
 {
-    Q_D(const QSGLoader);
+    Q_D(const QQuickLoader);
     return d->item;
 }
 
-void QSGLoader::geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry)
+void QQuickLoader::geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry)
 {
-    Q_D(QSGLoader);
+    Q_D(QQuickLoader);
     if (newGeometry != oldGeometry) {
         d->_q_updateSize();
     }
-    QSGItem::geometryChanged(newGeometry, oldGeometry);
+    QQuickItem::geometryChanged(newGeometry, oldGeometry);
 }
 
-QUrl QSGLoaderPrivate::resolveSourceUrl(QDeclarativeV8Function *args)
+QUrl QQuickLoaderPrivate::resolveSourceUrl(QDeclarativeV8Function *args)
 {
     QV8Engine *v8engine = args->engine();
     QString arg = v8engine->toString((*args)[0]->ToString());
@@ -831,7 +831,7 @@ QUrl QSGLoaderPrivate::resolveSourceUrl(QDeclarativeV8Function *args)
     return context->resolvedUrl(QUrl(arg));
 }
 
-v8::Handle<v8::Object> QSGLoaderPrivate::extractInitialPropertyValues(QDeclarativeV8Function *args, QObject *loader, bool *error)
+v8::Handle<v8::Object> QQuickLoaderPrivate::extractInitialPropertyValues(QDeclarativeV8Function *args, QObject *loader, bool *error)
 {
     v8::Local<v8::Object> valuemap;
     if (args->Length() >= 2) {
@@ -848,6 +848,6 @@ v8::Handle<v8::Object> QSGLoaderPrivate::extractInitialPropertyValues(QDeclarati
     return valuemap;
 }
 
-#include <moc_qsgloader_p.cpp>
+#include <moc_qquickloader_p.cpp>
 
 QT_END_NAMESPACE
diff --git a/src/declarative/items/qsgloader_p.h b/src/declarative/items/qquickloader_p.h
index 3a41e79915..3dcab4c654 100644
--- a/src/declarative/items/qsgloader_p.h
+++ b/src/declarative/items/qquickloader_p.h
@@ -40,10 +40,10 @@
 **
 ****************************************************************************/
 
-#ifndef QSGLOADER_P_H
-#define QSGLOADER_P_H
+#ifndef QQUICKLOADER_P_H
+#define QQUICKLOADER_P_H
 
-#include "qsgimplicitsizeitem_p.h"
+#include "qquickimplicitsizeitem_p.h"
 
 QT_BEGIN_HEADER
 
@@ -51,8 +51,8 @@ QT_BEGIN_NAMESPACE
 
 QT_MODULE(Declarative)
 
-class QSGLoaderPrivate;
-class Q_AUTOTEST_EXPORT QSGLoader : public QSGImplicitSizeItem
+class QQuickLoaderPrivate;
+class Q_AUTOTEST_EXPORT QQuickLoader : public QQuickImplicitSizeItem
 {
     Q_OBJECT
     Q_ENUMS(Status)
@@ -60,14 +60,14 @@ class Q_AUTOTEST_EXPORT QSGLoader : public QSGImplicitSizeItem
     Q_PROPERTY(bool active READ active WRITE setActive NOTIFY activeChanged)
     Q_PROPERTY(QUrl source READ source WRITE setSource NOTIFY sourceChanged)
     Q_PROPERTY(QDeclarativeComponent *sourceComponent READ sourceComponent WRITE setSourceComponent RESET resetSourceComponent NOTIFY sourceComponentChanged)
-    Q_PROPERTY(QSGItem *item READ item NOTIFY itemChanged)
+    Q_PROPERTY(QQuickItem *item READ item NOTIFY itemChanged)
     Q_PROPERTY(Status status READ status NOTIFY statusChanged)
     Q_PROPERTY(qreal progress READ progress NOTIFY progressChanged)
     Q_PROPERTY(bool asynchronous READ asynchronous WRITE setAsynchronous NOTIFY asynchronousChanged)
 
 public:
-    QSGLoader(QSGItem *parent = 0);
-    virtual ~QSGLoader();
+    QQuickLoader(QQuickItem *parent = 0);
+    virtual ~QQuickLoader();
 
     bool active() const;
     void setActive(bool newVal);
@@ -88,7 +88,7 @@ public:
     bool asynchronous() const;
     void setAsynchronous(bool a);
 
-    QSGItem *item() const;
+    QQuickItem *item() const;
 
 Q_SIGNALS:
     void itemChanged();
@@ -108,16 +108,16 @@ private:
     void setSource(const QUrl &sourceUrl, bool needsClear);
     void loadFromSource();
     void loadFromSourceComponent();
-    Q_DISABLE_COPY(QSGLoader)
-    Q_DECLARE_PRIVATE(QSGLoader)
+    Q_DISABLE_COPY(QQuickLoader)
+    Q_DECLARE_PRIVATE(QQuickLoader)
     Q_PRIVATE_SLOT(d_func(), void _q_sourceLoaded())
     Q_PRIVATE_SLOT(d_func(), void _q_updateSize())
 };
 
 QT_END_NAMESPACE
 
-QML_DECLARE_TYPE(QSGLoader)
+QML_DECLARE_TYPE(QQuickLoader)
 
 QT_END_HEADER
 
-#endif // QSGLOADER_P_H
+#endif // QQUICKLOADER_P_H
diff --git a/src/declarative/items/qsgloader_p_p.h b/src/declarative/items/qquickloader_p_p.h
index 36059ca51a..63d73e8da2 100644
--- a/src/declarative/items/qsgloader_p_p.h
+++ b/src/declarative/items/qquickloader_p_p.h
@@ -40,8 +40,8 @@
 **
 ****************************************************************************/
 
-#ifndef QSGLOADER_P_P_H
-#define QSGLOADER_P_P_H
+#ifndef QQUICKLOADER_P_P_H
+#define QQUICKLOADER_P_P_H
 
 //
 //  W A R N I N G
@@ -54,9 +54,9 @@
 // We mean it.
 //
 
-#include "qsgloader_p.h"
-#include "qsgimplicitsizeitem_p_p.h"
-#include "qsgitemchangelistener_p.h"
+#include "qquickloader_p.h"
+#include "qquickimplicitsizeitem_p_p.h"
+#include "qquickitemchangelistener_p.h"
 #include <qdeclarativeincubator.h>
 
 #include <private/qv8_p.h>
@@ -64,30 +64,30 @@
 QT_BEGIN_NAMESPACE
 
 
-class QSGLoaderPrivate;
-class QSGLoaderIncubator : public QDeclarativeIncubator
+class QQuickLoaderPrivate;
+class QQuickLoaderIncubator : public QDeclarativeIncubator
 {
 public:
-    QSGLoaderIncubator(QSGLoaderPrivate *l, IncubationMode mode) : QDeclarativeIncubator(mode), loader(l) {}
+    QQuickLoaderIncubator(QQuickLoaderPrivate *l, IncubationMode mode) : QDeclarativeIncubator(mode), loader(l) {}
 
 protected:
     virtual void statusChanged(Status);
     virtual void setInitialState(QObject *);
 
 private:
-    QSGLoaderPrivate *loader;
+    QQuickLoaderPrivate *loader;
 };
 
 class QDeclarativeContext;
-class QSGLoaderPrivate : public QSGImplicitSizeItemPrivate, public QSGItemChangeListener
+class QQuickLoaderPrivate : public QQuickImplicitSizeItemPrivate, public QQuickItemChangeListener
 {
-    Q_DECLARE_PUBLIC(QSGLoader)
+    Q_DECLARE_PUBLIC(QQuickLoader)
 
 public:
-    QSGLoaderPrivate();
-    ~QSGLoaderPrivate();
+    QQuickLoaderPrivate();
+    ~QQuickLoaderPrivate();
 
-    void itemGeometryChanged(QSGItem *item, const QRectF &newGeometry, const QRectF &oldGeometry);
+    void itemGeometryChanged(QQuickItem *item, const QRectF &newGeometry, const QRectF &oldGeometry);
     void clear();
     void initResize();
     void load();
@@ -99,10 +99,10 @@ public:
     v8::Handle<v8::Object> extractInitialPropertyValues(QDeclarativeV8Function *args, QObject *loader, bool *error);
 
     QUrl source;
-    QSGItem *item;
+    QQuickItem *item;
     QDeclarativeComponent *component;
     QDeclarativeContext *itemContext;
-    QSGLoaderIncubator *incubator;
+    QQuickLoaderIncubator *incubator;
     v8::Persistent<v8::Object> initialPropertyValues;
     v8::Persistent<v8::Object> qmlGlobalForIpv;
     bool updatingSize: 1;
@@ -118,4 +118,4 @@ public:
 
 QT_END_NAMESPACE
 
-#endif // QSGLOADER_P_P_H
+#endif // QQUICKLOADER_P_P_H
diff --git a/src/declarative/items/qsgmousearea.cpp b/src/declarative/items/qquickmousearea.cpp
index a401b52e95..19e7fd457b 100644
--- a/src/declarative/items/qsgmousearea.cpp
+++ b/src/declarative/items/qquickmousearea.cpp
@@ -39,11 +39,11 @@
 **
 ****************************************************************************/
 
-#include "qsgmousearea_p.h"
-#include "qsgmousearea_p_p.h"
-#include "qsgcanvas.h"
-#include "qsgevents_p_p.h"
-#include "qsgdrag_p.h"
+#include "qquickmousearea_p.h"
+#include "qquickmousearea_p_p.h"
+#include "qquickcanvas.h"
+#include "qquickevents_p_p.h"
+#include "qquickdrag_p.h"
 
 #include <QtGui/qevent.h>
 #include <QtGui/qguiapplication.h>
@@ -54,22 +54,22 @@
 QT_BEGIN_NAMESPACE
 static const int PressAndHoldDelay = 800;
 
-QSGDrag::QSGDrag(QObject *parent)
+QQuickDrag::QQuickDrag(QObject *parent)
 : QObject(parent), _target(0), _axis(XandYAxis), _xmin(-FLT_MAX),
 _xmax(FLT_MAX), _ymin(-FLT_MAX), _ymax(FLT_MAX), _active(false), _filterChildren(false)
 {
 }
 
-QSGDrag::~QSGDrag()
+QQuickDrag::~QQuickDrag()
 {
 }
 
-QSGItem *QSGDrag::target() const
+QQuickItem *QQuickDrag::target() const
 {
     return _target;
 }
 
-void QSGDrag::setTarget(QSGItem *t)
+void QQuickDrag::setTarget(QQuickItem *t)
 {
     if (_target == t)
         return;
@@ -77,7 +77,7 @@ void QSGDrag::setTarget(QSGItem *t)
     emit targetChanged();
 }
 
-void QSGDrag::resetTarget()
+void QQuickDrag::resetTarget()
 {
     if (_target == 0)
         return;
@@ -85,12 +85,12 @@ void QSGDrag::resetTarget()
     emit targetChanged();
 }
 
-QSGDrag::Axis QSGDrag::axis() const
+QQuickDrag::Axis QQuickDrag::axis() const
 {
     return _axis;
 }
 
-void QSGDrag::setAxis(QSGDrag::Axis a)
+void QQuickDrag::setAxis(QQuickDrag::Axis a)
 {
     if (_axis == a)
         return;
@@ -98,12 +98,12 @@ void QSGDrag::setAxis(QSGDrag::Axis a)
     emit axisChanged();
 }
 
-qreal QSGDrag::xmin() const
+qreal QQuickDrag::xmin() const
 {
     return _xmin;
 }
 
-void QSGDrag::setXmin(qreal m)
+void QQuickDrag::setXmin(qreal m)
 {
     if (_xmin == m)
         return;
@@ -111,12 +111,12 @@ void QSGDrag::setXmin(qreal m)
     emit minimumXChanged();
 }
 
-qreal QSGDrag::xmax() const
+qreal QQuickDrag::xmax() const
 {
     return _xmax;
 }
 
-void QSGDrag::setXmax(qreal m)
+void QQuickDrag::setXmax(qreal m)
 {
     if (_xmax == m)
         return;
@@ -124,12 +124,12 @@ void QSGDrag::setXmax(qreal m)
     emit maximumXChanged();
 }
 
-qreal QSGDrag::ymin() const
+qreal QQuickDrag::ymin() const
 {
     return _ymin;
 }
 
-void QSGDrag::setYmin(qreal m)
+void QQuickDrag::setYmin(qreal m)
 {
     if (_ymin == m)
         return;
@@ -137,12 +137,12 @@ void QSGDrag::setYmin(qreal m)
     emit minimumYChanged();
 }
 
-qreal QSGDrag::ymax() const
+qreal QQuickDrag::ymax() const
 {
     return _ymax;
 }
 
-void QSGDrag::setYmax(qreal m)
+void QQuickDrag::setYmax(qreal m)
 {
     if (_ymax == m)
         return;
@@ -150,12 +150,12 @@ void QSGDrag::setYmax(qreal m)
     emit maximumYChanged();
 }
 
-bool QSGDrag::active() const
+bool QQuickDrag::active() const
 {
     return _active;
 }
 
-void QSGDrag::setActive(bool drag)
+void QQuickDrag::setActive(bool drag)
 {
     if (_active == drag)
         return;
@@ -163,12 +163,12 @@ void QSGDrag::setActive(bool drag)
     emit activeChanged();
 }
 
-bool QSGDrag::filterChildren() const
+bool QQuickDrag::filterChildren() const
 {
     return _filterChildren;
 }
 
-void QSGDrag::setFilterChildren(bool filter)
+void QQuickDrag::setFilterChildren(bool filter)
 {
     if (_filterChildren == filter)
         return;
@@ -176,31 +176,31 @@ void QSGDrag::setFilterChildren(bool filter)
     emit filterChildrenChanged();
 }
 
-QSGDragAttached *QSGDrag::qmlAttachedProperties(QObject *obj)
+QQuickDragAttached *QQuickDrag::qmlAttachedProperties(QObject *obj)
 {
-    return new QSGDragAttached(obj);
+    return new QQuickDragAttached(obj);
 }
 
-QSGMouseAreaPrivate::QSGMouseAreaPrivate()
+QQuickMouseAreaPrivate::QQuickMouseAreaPrivate()
 : absorb(true), hovered(false), pressed(false), longPress(false),
   moved(false), stealMouse(false), doubleClick(false), preventStealing(false),
   drag(0)
 {
 }
 
-QSGMouseAreaPrivate::~QSGMouseAreaPrivate()
+QQuickMouseAreaPrivate::~QQuickMouseAreaPrivate()
 {
     delete drag;
 }
 
-void QSGMouseAreaPrivate::init()
+void QQuickMouseAreaPrivate::init()
 {
-    Q_Q(QSGMouseArea);
+    Q_Q(QQuickMouseArea);
     q->setAcceptedMouseButtons(Qt::LeftButton);
     q->setFiltersChildMouseEvents(true);
 }
 
-void QSGMouseAreaPrivate::saveEvent(QMouseEvent *event)
+void QQuickMouseAreaPrivate::saveEvent(QMouseEvent *event)
 {
     lastPos = event->localPos();
     lastScenePos = event->windowPos();
@@ -209,59 +209,59 @@ void QSGMouseAreaPrivate::saveEvent(QMouseEvent *event)
     lastModifiers = event->modifiers();
 }
 
-bool QSGMouseAreaPrivate::isPressAndHoldConnected()
+bool QQuickMouseAreaPrivate::isPressAndHoldConnected()
 {
-    Q_Q(QSGMouseArea);
-    static int idx = QObjectPrivate::get(q)->signalIndex("pressAndHold(QSGMouseEvent*)");
+    Q_Q(QQuickMouseArea);
+    static int idx = QObjectPrivate::get(q)->signalIndex("pressAndHold(QQuickMouseEvent*)");
     return QObjectPrivate::get(q)->isSignalConnected(idx);
 }
 
-bool QSGMouseAreaPrivate::isDoubleClickConnected()
+bool QQuickMouseAreaPrivate::isDoubleClickConnected()
 {
-    Q_Q(QSGMouseArea);
-    static int idx = QObjectPrivate::get(q)->signalIndex("doubleClicked(QSGMouseEvent*)");
+    Q_Q(QQuickMouseArea);
+    static int idx = QObjectPrivate::get(q)->signalIndex("doubleClicked(QQuickMouseEvent*)");
     return QObjectPrivate::get(q)->isSignalConnected(idx);
 }
 
-bool QSGMouseAreaPrivate::isClickConnected()
+bool QQuickMouseAreaPrivate::isClickConnected()
 {
-    Q_Q(QSGMouseArea);
-    static int idx = QObjectPrivate::get(q)->signalIndex("clicked(QSGMouseEvent*)");
+    Q_Q(QQuickMouseArea);
+    static int idx = QObjectPrivate::get(q)->signalIndex("clicked(QQuickMouseEvent*)");
     return QObjectPrivate::get(q)->isSignalConnected(idx);
 }
 
-void QSGMouseAreaPrivate::propagate(QSGMouseEvent* event, PropagateType t)
+void QQuickMouseAreaPrivate::propagate(QQuickMouseEvent* event, PropagateType t)
 {
-    Q_Q(QSGMouseArea);
+    Q_Q(QQuickMouseArea);
     QPointF scenePos = q->mapToScene(QPointF(event->x(), event->y()));
     propagateHelper(event, canvas->rootItem(), scenePos, t);
 }
 
-bool QSGMouseAreaPrivate::propagateHelper(QSGMouseEvent *ev, QSGItem *item,const QPointF &sp, PropagateType sig)
+bool QQuickMouseAreaPrivate::propagateHelper(QQuickMouseEvent *ev, QQuickItem *item,const QPointF &sp, PropagateType sig)
 {
-    //Based off of QSGCanvas::deliverInitialMousePressEvent
+    //Based off of QQuickCanvas::deliverInitialMousePressEvent
     //But specific to MouseArea, so doesn't belong in canvas
-    Q_Q(const QSGMouseArea);
-    QSGItemPrivate *itemPrivate = QSGItemPrivate::get(item);
+    Q_Q(const QQuickMouseArea);
+    QQuickItemPrivate *itemPrivate = QQuickItemPrivate::get(item);
     if (itemPrivate->opacity == 0.0)
         return false;
 
-    if (itemPrivate->flags & QSGItem::ItemClipsChildrenToShape) {
+    if (itemPrivate->flags & QQuickItem::ItemClipsChildrenToShape) {
         QPointF p = item->mapFromScene(sp);
         if (!QRectF(0, 0, item->width(), item->height()).contains(p))
             return false;
     }
 
-    QList<QSGItem *> children = itemPrivate->paintOrderChildItems();
+    QList<QQuickItem *> children = itemPrivate->paintOrderChildItems();
     for (int ii = children.count() - 1; ii >= 0; --ii) {
-        QSGItem *child = children.at(ii);
+        QQuickItem *child = children.at(ii);
         if (!child->isVisible() || !child->isEnabled())
             continue;
         if (propagateHelper(ev, child, sp, sig))
             return true;
     }
 
-    QSGMouseArea* ma = qobject_cast<QSGMouseArea*>(item);
+    QQuickMouseArea* ma = qobject_cast<QQuickMouseArea*>(item);
     if (ma && ma != q && itemPrivate->acceptedMouseButtons & ev->button()) {
         switch (sig) {
         case Click:
@@ -296,7 +296,7 @@ bool QSGMouseAreaPrivate::propagateHelper(QSGMouseEvent *ev, QSGItem *item,const
 }
 
 /*!
-    \qmlclass MouseArea QSGMouseArea
+    \qmlclass MouseArea QQuickMouseArea
     \inqmlmodule QtQuick 2
     \ingroup qml-basic-interaction-elements
     \brief The MouseArea item enables simple mouse handling.
@@ -508,14 +508,14 @@ bool QSGMouseAreaPrivate::propagateHelper(QSGMouseEvent *ev, QSGItem *item,const
     the logic when the MouseArea has lost the mouse handling to the \l Flickable,
     \c onCanceled should be used in addition to onReleased.
 */
-QSGMouseArea::QSGMouseArea(QSGItem *parent)
-  : QSGItem(*(new QSGMouseAreaPrivate), parent)
+QQuickMouseArea::QQuickMouseArea(QQuickItem *parent)
+  : QQuickItem(*(new QQuickMouseAreaPrivate), parent)
 {
-    Q_D(QSGMouseArea);
+    Q_D(QQuickMouseArea);
     d->init();
 }
 
-QSGMouseArea::~QSGMouseArea()
+QQuickMouseArea::~QQuickMouseArea()
 {
 }
 
@@ -538,15 +538,15 @@ QSGMouseArea::~QSGMouseArea()
 
     The coordinates are relative to the MouseArea.
 */
-qreal QSGMouseArea::mouseX() const
+qreal QQuickMouseArea::mouseX() const
 {
-    Q_D(const QSGMouseArea);
+    Q_D(const QQuickMouseArea);
     return d->lastPos.x();
 }
 
-qreal QSGMouseArea::mouseY() const
+qreal QQuickMouseArea::mouseY() const
 {
-    Q_D(const QSGMouseArea);
+    Q_D(const QQuickMouseArea);
     return d->lastPos.y();
 }
 
@@ -556,15 +556,15 @@ qreal QSGMouseArea::mouseY() const
 
     By default, this property is true.
 */
-bool QSGMouseArea::isEnabled() const
+bool QQuickMouseArea::isEnabled() const
 {
-    Q_D(const QSGMouseArea);
+    Q_D(const QQuickMouseArea);
     return d->absorb;
 }
 
-void QSGMouseArea::setEnabled(bool a)
+void QQuickMouseArea::setEnabled(bool a)
 {
-    Q_D(QSGMouseArea);
+    Q_D(QQuickMouseArea);
     if (a != d->absorb) {
         d->absorb = a;
         emit enabledChanged();
@@ -587,15 +587,15 @@ void QSGMouseArea::setEnabled(bool a)
 
     By default this property is false.
 */
-bool QSGMouseArea::preventStealing() const
+bool QQuickMouseArea::preventStealing() const
 {
-    Q_D(const QSGMouseArea);
+    Q_D(const QQuickMouseArea);
     return d->preventStealing;
 }
 
-void QSGMouseArea::setPreventStealing(bool prevent)
+void QQuickMouseArea::setPreventStealing(bool prevent)
 {
-    Q_D(QSGMouseArea);
+    Q_D(QQuickMouseArea);
     if (prevent != d->preventStealing) {
         d->preventStealing = prevent;
         setKeepMouseGrab(d->preventStealing && d->absorb);
@@ -620,25 +620,25 @@ void QSGMouseArea::setPreventStealing(bool prevent)
 
     \sa acceptedButtons
 */
-Qt::MouseButtons QSGMouseArea::pressedButtons() const
+Qt::MouseButtons QQuickMouseArea::pressedButtons() const
 {
-    Q_D(const QSGMouseArea);
+    Q_D(const QQuickMouseArea);
     return d->lastButtons;
 }
 
-void QSGMouseArea::mousePressEvent(QMouseEvent *event)
+void QQuickMouseArea::mousePressEvent(QMouseEvent *event)
 {
-    Q_D(QSGMouseArea);
+    Q_D(QQuickMouseArea);
     d->moved = false;
     d->stealMouse = d->preventStealing;
     if (!d->absorb)
-        QSGItem::mousePressEvent(event);
+        QQuickItem::mousePressEvent(event);
     else {
         d->longPress = false;
         d->saveEvent(event);
         if (d->drag) {
-            d->dragX = drag()->axis() & QSGDrag::XAxis;
-            d->dragY = drag()->axis() & QSGDrag::YAxis;
+            d->dragX = drag()->axis() & QQuickDrag::XAxis;
+            d->dragY = drag()->axis() & QQuickDrag::YAxis;
         }
         if (d->drag)
             d->drag->setActive(false);
@@ -651,11 +651,11 @@ void QSGMouseArea::mousePressEvent(QMouseEvent *event)
     }
 }
 
-void QSGMouseArea::mouseMoveEvent(QMouseEvent *event)
+void QQuickMouseArea::mouseMoveEvent(QMouseEvent *event)
 {
-    Q_D(QSGMouseArea);
+    Q_D(QQuickMouseArea);
     if (!d->absorb) {
-        QSGItem::mouseMoveEvent(event);
+        QQuickItem::mouseMoveEvent(event);
         return;
     }
 
@@ -728,7 +728,7 @@ void QSGMouseArea::mouseMoveEvent(QMouseEvent *event)
 
         d->moved = true;
     }
-    QSGMouseEvent me(d->lastPos.x(), d->lastPos.y(), d->lastButton, d->lastButtons, d->lastModifiers, false, d->longPress);
+    QQuickMouseEvent me(d->lastPos.x(), d->lastPos.y(), d->lastButton, d->lastButtons, d->lastModifiers, false, d->longPress);
     emit mouseXChanged(&me);
     me.setPosition(d->lastPos);
     emit mouseYChanged(&me);
@@ -736,12 +736,12 @@ void QSGMouseArea::mouseMoveEvent(QMouseEvent *event)
     emit positionChanged(&me);
 }
 
-void QSGMouseArea::mouseReleaseEvent(QMouseEvent *event)
+void QQuickMouseArea::mouseReleaseEvent(QMouseEvent *event)
 {
-    Q_D(QSGMouseArea);
+    Q_D(QQuickMouseArea);
     d->stealMouse = false;
     if (!d->absorb) {
-        QSGItem::mouseReleaseEvent(event);
+        QQuickItem::mouseReleaseEvent(event);
     } else {
         d->saveEvent(event);
         setPressed(false);
@@ -750,7 +750,7 @@ void QSGMouseArea::mouseReleaseEvent(QMouseEvent *event)
         // If we don't accept hover, we need to reset containsMouse.
         if (!acceptHoverEvents())
             setHovered(false);
-        QSGCanvas *c = canvas();
+        QQuickCanvas *c = canvas();
         if (c && c->mouseGrabberItem() == this)
             ungrabMouse();
         setKeepMouseGrab(false);
@@ -759,31 +759,31 @@ void QSGMouseArea::mouseReleaseEvent(QMouseEvent *event)
     d->doubleClick = false;
 }
 
-void QSGMouseArea::mouseDoubleClickEvent(QMouseEvent *event)
+void QQuickMouseArea::mouseDoubleClickEvent(QMouseEvent *event)
 {
-    Q_D(QSGMouseArea);
+    Q_D(QQuickMouseArea);
     if (d->absorb) {
         d->saveEvent(event);
-        QSGMouseEvent me(d->lastPos.x(), d->lastPos.y(), d->lastButton, d->lastButtons, d->lastModifiers, true, false);
+        QQuickMouseEvent me(d->lastPos.x(), d->lastPos.y(), d->lastButton, d->lastButtons, d->lastModifiers, true, false);
         me.setAccepted(d->isDoubleClickConnected());
         emit this->doubleClicked(&me);
         if (!me.isAccepted())
-            d->propagate(&me, QSGMouseAreaPrivate::DoubleClick);
+            d->propagate(&me, QQuickMouseAreaPrivate::DoubleClick);
         d->doubleClick = d->isDoubleClickConnected() || me.isAccepted();
     }
-    QSGItem::mouseDoubleClickEvent(event);
+    QQuickItem::mouseDoubleClickEvent(event);
 }
 
-void QSGMouseArea::hoverEnterEvent(QHoverEvent *event)
+void QQuickMouseArea::hoverEnterEvent(QHoverEvent *event)
 {
-    Q_D(QSGMouseArea);
+    Q_D(QQuickMouseArea);
     if (!d->absorb) {
-        QSGItem::hoverEnterEvent(event);
+        QQuickItem::hoverEnterEvent(event);
     } else {
         d->lastPos = event->posF();
         d->lastModifiers = event->modifiers();
         setHovered(true);
-        QSGMouseEvent me(d->lastPos.x(), d->lastPos.y(), Qt::NoButton, Qt::NoButton, d->lastModifiers, false, false);
+        QQuickMouseEvent me(d->lastPos.x(), d->lastPos.y(), Qt::NoButton, Qt::NoButton, d->lastModifiers, false, false);
         emit mouseXChanged(&me);
         me.setPosition(d->lastPos);
         emit mouseYChanged(&me);
@@ -791,15 +791,15 @@ void QSGMouseArea::hoverEnterEvent(QHoverEvent *event)
     }
 }
 
-void QSGMouseArea::hoverMoveEvent(QHoverEvent *event)
+void QQuickMouseArea::hoverMoveEvent(QHoverEvent *event)
 {
-    Q_D(QSGMouseArea);
+    Q_D(QQuickMouseArea);
     if (!d->absorb) {
-        QSGItem::hoverMoveEvent(event);
+        QQuickItem::hoverMoveEvent(event);
     } else {
         d->lastPos = event->posF();
         d->lastModifiers = event->modifiers();
-        QSGMouseEvent me(d->lastPos.x(), d->lastPos.y(), Qt::NoButton, Qt::NoButton, d->lastModifiers, false, false);
+        QQuickMouseEvent me(d->lastPos.x(), d->lastPos.y(), Qt::NoButton, Qt::NoButton, d->lastModifiers, false, false);
         emit mouseXChanged(&me);
         me.setPosition(d->lastPos);
         emit mouseYChanged(&me);
@@ -808,18 +808,18 @@ void QSGMouseArea::hoverMoveEvent(QHoverEvent *event)
     }
 }
 
-void QSGMouseArea::hoverLeaveEvent(QHoverEvent *event)
+void QQuickMouseArea::hoverLeaveEvent(QHoverEvent *event)
 {
-    Q_D(QSGMouseArea);
+    Q_D(QQuickMouseArea);
     if (!d->absorb)
-        QSGItem::hoverLeaveEvent(event);
+        QQuickItem::hoverLeaveEvent(event);
     else
         setHovered(false);
 }
 
-void QSGMouseArea::ungrabMouse()
+void QQuickMouseArea::ungrabMouse()
 {
-    Q_D(QSGMouseArea);
+    Q_D(QQuickMouseArea);
     if (d->pressed) {
         // if our mouse grab has been removed (probably by Flickable), fix our
         // state
@@ -835,18 +835,18 @@ void QSGMouseArea::ungrabMouse()
     }
 }
 
-void QSGMouseArea::mouseUngrabEvent()
+void QQuickMouseArea::mouseUngrabEvent()
 {
     ungrabMouse();
 }
 
-bool QSGMouseArea::sendMouseEvent(QMouseEvent *event)
+bool QQuickMouseArea::sendMouseEvent(QMouseEvent *event)
 {
-    Q_D(QSGMouseArea);
+    Q_D(QQuickMouseArea);
     QRectF myRect = mapRectToScene(QRectF(0, 0, width(), height()));
 
-    QSGCanvas *c = canvas();
-    QSGItem *grabber = c ? c->mouseGrabberItem() : 0;
+    QQuickCanvas *c = canvas();
+    QQuickItem *grabber = c ? c->mouseGrabberItem() : 0;
     bool stealThisEvent = d->stealMouse;
     if ((stealThisEvent || myRect.contains(event->windowPos())) && (!grabber || !grabber->keepMouseGrab())) {
         QMouseEvent mouseEvent(event->type(), mapFromScene(event->windowPos()), event->windowPos(), event->screenPos(),
@@ -889,11 +889,11 @@ bool QSGMouseArea::sendMouseEvent(QMouseEvent *event)
     return false;
 }
 
-bool QSGMouseArea::childMouseEventFilter(QSGItem *i, QEvent *e)
+bool QQuickMouseArea::childMouseEventFilter(QQuickItem *i, QEvent *e)
 {
-    Q_D(QSGMouseArea);
+    Q_D(QQuickMouseArea);
     if (!d->absorb || !isVisible() || !d->drag || !d->drag->filterChildren())
-        return QSGItem::childMouseEventFilter(i, e);
+        return QQuickItem::childMouseEventFilter(i, e);
     switch (e->type()) {
     case QEvent::MouseButtonPress:
     case QEvent::MouseMove:
@@ -903,39 +903,39 @@ bool QSGMouseArea::childMouseEventFilter(QSGItem *i, QEvent *e)
         break;
     }
 
-    return QSGItem::childMouseEventFilter(i, e);
+    return QQuickItem::childMouseEventFilter(i, e);
 }
 
-void QSGMouseArea::timerEvent(QTimerEvent *event)
+void QQuickMouseArea::timerEvent(QTimerEvent *event)
 {
-    Q_D(QSGMouseArea);
+    Q_D(QQuickMouseArea);
     if (event->timerId() == d->pressAndHoldTimer.timerId()) {
         d->pressAndHoldTimer.stop();
         bool dragged = d->drag && d->drag->active();
         if (d->pressed && dragged == false && d->hovered == true) {
             d->longPress = true;
-            QSGMouseEvent me(d->lastPos.x(), d->lastPos.y(), d->lastButton, d->lastButtons, d->lastModifiers, false, d->longPress);
+            QQuickMouseEvent me(d->lastPos.x(), d->lastPos.y(), d->lastButton, d->lastButtons, d->lastModifiers, false, d->longPress);
             me.setAccepted(d->isPressAndHoldConnected());
             emit pressAndHold(&me);
             if (!me.isAccepted())
-                d->propagate(&me, QSGMouseAreaPrivate::PressAndHold);
+                d->propagate(&me, QQuickMouseAreaPrivate::PressAndHold);
             if (!me.isAccepted()) // no one handled the long press - allow click
                 d->longPress = false;
         }
     }
 }
 
-void QSGMouseArea::windowDeactivateEvent()
+void QQuickMouseArea::windowDeactivateEvent()
 {
     ungrabMouse();
-    QSGItem::windowDeactivateEvent();
+    QQuickItem::windowDeactivateEvent();
 }
 
-void QSGMouseArea::geometryChanged(const QRectF &newGeometry,
+void QQuickMouseArea::geometryChanged(const QRectF &newGeometry,
                                             const QRectF &oldGeometry)
 {
-    Q_D(QSGMouseArea);
-    QSGItem::geometryChanged(newGeometry, oldGeometry);
+    Q_D(QQuickMouseArea);
+    QQuickItem::geometryChanged(newGeometry, oldGeometry);
 
     if (d->lastScenePos.isNull)
         d->lastScenePos = mapToScene(d->lastPos);
@@ -943,9 +943,9 @@ void QSGMouseArea::geometryChanged(const QRectF &newGeometry,
         d->lastPos = mapFromScene(d->lastScenePos);
 }
 
-void QSGMouseArea::itemChange(ItemChange change, const ItemChangeData &value)
+void QQuickMouseArea::itemChange(ItemChange change, const ItemChangeData &value)
 {
-    Q_D(QSGMouseArea);
+    Q_D(QQuickMouseArea);
     switch (change) {
     case ItemVisibleHasChanged:
         if (acceptHoverEvents() && d->hovered != (isVisible() && isUnderMouse()))
@@ -955,7 +955,7 @@ void QSGMouseArea::itemChange(ItemChange change, const ItemChangeData &value)
         break;
     }
 
-    QSGItem::itemChange(change, value);
+    QQuickItem::itemChange(change, value);
 }
 
 /*!
@@ -969,12 +969,12 @@ void QSGMouseArea::itemChange(ItemChange change, const ItemChangeData &value)
     This property affects the containsMouse property and the onEntered, onExited and
     onPositionChanged signals.
 */
-bool QSGMouseArea::hoverEnabled() const
+bool QQuickMouseArea::hoverEnabled() const
 {
     return acceptHoverEvents();
 }
 
-void QSGMouseArea::setHoverEnabled(bool h)
+void QQuickMouseArea::setHoverEnabled(bool h)
 {
     if (h == acceptHoverEvents())
         return;
@@ -991,9 +991,9 @@ void QSGMouseArea::setHoverEnabled(bool h)
     \warning This property is not updated if the area moves under the mouse: \e containsMouse will not change.
     In addition, if hoverEnabled is false, containsMouse will only be valid when the mouse is pressed.
 */
-bool QSGMouseArea::hovered() const
+bool QQuickMouseArea::hovered() const
 {
-    Q_D(const QSGMouseArea);
+    Q_D(const QQuickMouseArea);
     return d->hovered;
 }
 
@@ -1001,15 +1001,15 @@ bool QSGMouseArea::hovered() const
     \qmlproperty bool QtQuick2::MouseArea::pressed
     This property holds whether the mouse area is currently pressed.
 */
-bool QSGMouseArea::pressed() const
+bool QQuickMouseArea::pressed() const
 {
-    Q_D(const QSGMouseArea);
+    Q_D(const QQuickMouseArea);
     return d->pressed;
 }
 
-void QSGMouseArea::setHovered(bool h)
+void QQuickMouseArea::setHovered(bool h)
 {
-    Q_D(QSGMouseArea);
+    Q_D(QQuickMouseArea);
     if (d->hovered != h) {
         d->hovered = h;
         emit hoveredChanged();
@@ -1036,12 +1036,12 @@ void QSGMouseArea::setHovered(bool h)
 
     The default value is \c Qt.LeftButton.
 */
-Qt::MouseButtons QSGMouseArea::acceptedButtons() const
+Qt::MouseButtons QQuickMouseArea::acceptedButtons() const
 {
     return acceptedMouseButtons();
 }
 
-void QSGMouseArea::setAcceptedButtons(Qt::MouseButtons buttons)
+void QQuickMouseArea::setAcceptedButtons(Qt::MouseButtons buttons)
 {
     if (buttons != acceptedMouseButtons()) {
         setAcceptedMouseButtons(buttons);
@@ -1049,15 +1049,15 @@ void QSGMouseArea::setAcceptedButtons(Qt::MouseButtons buttons)
     }
 }
 
-bool QSGMouseArea::setPressed(bool p)
+bool QQuickMouseArea::setPressed(bool p)
 {
-    Q_D(QSGMouseArea);
+    Q_D(QQuickMouseArea);
     bool dragged = d->drag && d->drag->active();
     bool isclick = d->pressed == true && p == false && dragged == false && d->hovered == true;
 
     if (d->pressed != p) {
         d->pressed = p;
-        QSGMouseEvent me(d->lastPos.x(), d->lastPos.y(), d->lastButton, d->lastButtons, d->lastModifiers, isclick, d->longPress);
+        QQuickMouseEvent me(d->lastPos.x(), d->lastPos.y(), d->lastButton, d->lastButtons, d->lastModifiers, isclick, d->longPress);
         if (d->pressed) {
             if (!d->doubleClick)
                 emit pressed(&me);
@@ -1074,7 +1074,7 @@ bool QSGMouseArea::setPressed(bool p)
                 me.setAccepted(d->isClickConnected());
                 emit clicked(&me);
                 if (!me.isAccepted())
-                    d->propagate(&me, QSGMouseAreaPrivate::Click);
+                    d->propagate(&me, QQuickMouseAreaPrivate::Click);
             }
         }
 
@@ -1120,11 +1120,11 @@ bool QSGMouseArea::setPressed(bool p)
 
 */
 
-QSGDrag *QSGMouseArea::drag()
+QQuickDrag *QQuickMouseArea::drag()
 {
-    Q_D(QSGMouseArea);
+    Q_D(QQuickMouseArea);
     if (!d->drag)
-        d->drag = new QSGDrag;
+        d->drag = new QQuickDrag;
     return d->drag;
 }
 
diff --git a/src/declarative/items/qsgmousearea_p.h b/src/declarative/items/qquickmousearea_p.h
index f0edf41777..6f15ff6eb4 100644
--- a/src/declarative/items/qsgmousearea_p.h
+++ b/src/declarative/items/qquickmousearea_p.h
@@ -40,10 +40,10 @@
 **
 ****************************************************************************/
 
-#ifndef QSGMOUSEAREA_P_H
-#define QSGMOUSEAREA_P_H
+#ifndef QQUICKMOUSEAREA_P_H
+#define QQUICKMOUSEAREA_P_H
 
-#include "qsgitem.h"
+#include "qquickitem.h"
 
 #include <QtCore/qstringlist.h>
 
@@ -53,14 +53,14 @@ QT_BEGIN_NAMESPACE
 
 QT_MODULE(Declarative)
 
-class QSGDragAttached;
-class QSGMouseEvent;
-class Q_AUTOTEST_EXPORT QSGDrag : public QObject
+class QQuickDragAttached;
+class QQuickMouseEvent;
+class Q_AUTOTEST_EXPORT QQuickDrag : public QObject
 {
     Q_OBJECT
 
     Q_ENUMS(Axis)
-    Q_PROPERTY(QSGItem *target READ target WRITE setTarget NOTIFY targetChanged RESET resetTarget)
+    Q_PROPERTY(QQuickItem *target READ target WRITE setTarget NOTIFY targetChanged RESET resetTarget)
     Q_PROPERTY(Axis axis READ axis WRITE setAxis NOTIFY axisChanged)
     Q_PROPERTY(qreal minimumX READ xmin WRITE setXmin NOTIFY minimumXChanged)
     Q_PROPERTY(qreal maximumX READ xmax WRITE setXmax NOTIFY maximumXChanged)
@@ -71,11 +71,11 @@ class Q_AUTOTEST_EXPORT QSGDrag : public QObject
     //### consider drag and drop
 
 public:
-    QSGDrag(QObject *parent=0);
-    ~QSGDrag();
+    QQuickDrag(QObject *parent=0);
+    ~QQuickDrag();
 
-    QSGItem *target() const;
-    void setTarget(QSGItem *target);
+    QQuickItem *target() const;
+    void setTarget(QQuickItem *target);
     void resetTarget();
 
     enum Axis { XAxis=0x01, YAxis=0x02, XandYAxis=0x03 };
@@ -97,7 +97,7 @@ public:
     bool filterChildren() const;
     void setFilterChildren(bool);
 
-    static QSGDragAttached *qmlAttachedProperties(QObject *obj);
+    static QQuickDragAttached *qmlAttachedProperties(QObject *obj);
 
 Q_SIGNALS:
     void targetChanged();
@@ -110,7 +110,7 @@ Q_SIGNALS:
     void filterChildrenChanged();
 
 private:
-    QSGItem *_target;
+    QQuickItem *_target;
     Axis _axis;
     qreal _xmin;
     qreal _xmax;
@@ -118,12 +118,12 @@ private:
     qreal _ymax;
     bool _active : 1;
     bool _filterChildren: 1;
-    Q_DISABLE_COPY(QSGDrag)
+    Q_DISABLE_COPY(QQuickDrag)
 };
 
-class QSGMouseAreaPrivate;
+class QQuickMouseAreaPrivate;
 // used in QtLocation
-class Q_DECLARATIVE_EXPORT QSGMouseArea : public QSGItem
+class Q_DECLARATIVE_EXPORT QQuickMouseArea : public QQuickItem
 {
     Q_OBJECT
 
@@ -135,12 +135,12 @@ class Q_DECLARATIVE_EXPORT QSGMouseArea : public QSGItem
     Q_PROPERTY(Qt::MouseButtons pressedButtons READ pressedButtons NOTIFY pressedChanged)
     Q_PROPERTY(Qt::MouseButtons acceptedButtons READ acceptedButtons WRITE setAcceptedButtons NOTIFY acceptedButtonsChanged)
     Q_PROPERTY(bool hoverEnabled READ hoverEnabled WRITE setHoverEnabled NOTIFY hoverEnabledChanged)
-    Q_PROPERTY(QSGDrag *drag READ drag CONSTANT) //### add flicking to QSGDrag or add a QDeclarativeFlick ???
+    Q_PROPERTY(QQuickDrag *drag READ drag CONSTANT) //### add flicking to QQuickDrag or add a QDeclarativeFlick ???
     Q_PROPERTY(bool preventStealing READ preventStealing WRITE setPreventStealing NOTIFY preventStealingChanged)
 
 public:
-    QSGMouseArea(QSGItem *parent=0);
-    ~QSGMouseArea();
+    QQuickMouseArea(QQuickItem *parent=0);
+    ~QQuickMouseArea();
 
     qreal mouseX() const;
     qreal mouseY() const;
@@ -159,7 +159,7 @@ public:
     bool hoverEnabled() const;
     void setHoverEnabled(bool h);
 
-    QSGDrag *drag();
+    QQuickDrag *drag();
 
     bool preventStealing() const;
     void setPreventStealing(bool prevent);
@@ -170,16 +170,16 @@ Q_SIGNALS:
     void enabledChanged();
     void acceptedButtonsChanged();
     void hoverEnabledChanged();
-    void positionChanged(QSGMouseEvent *mouse);
-    void mouseXChanged(QSGMouseEvent *mouse);
-    void mouseYChanged(QSGMouseEvent *mouse);
+    void positionChanged(QQuickMouseEvent *mouse);
+    void mouseXChanged(QQuickMouseEvent *mouse);
+    void mouseYChanged(QQuickMouseEvent *mouse);
     void preventStealingChanged();
 
-    void pressed(QSGMouseEvent *mouse);
-    void pressAndHold(QSGMouseEvent *mouse);
-    void released(QSGMouseEvent *mouse);
-    void clicked(QSGMouseEvent *mouse);
-    void doubleClicked(QSGMouseEvent *mouse);
+    void pressed(QQuickMouseEvent *mouse);
+    void pressAndHold(QQuickMouseEvent *mouse);
+    void released(QQuickMouseEvent *mouse);
+    void clicked(QQuickMouseEvent *mouse);
+    void doubleClicked(QQuickMouseEvent *mouse);
     void entered();
     void exited();
     void canceled();
@@ -197,7 +197,7 @@ protected:
     virtual void hoverEnterEvent(QHoverEvent *event);
     virtual void hoverMoveEvent(QHoverEvent *event);
     virtual void hoverLeaveEvent(QHoverEvent *event);
-    virtual bool childMouseEventFilter(QSGItem *i, QEvent *e);
+    virtual bool childMouseEventFilter(QQuickItem *i, QEvent *e);
     virtual void timerEvent(QTimerEvent *event);
     virtual void windowDeactivateEvent();
 
@@ -211,16 +211,16 @@ private:
     void ungrabMouse();
 
 private:
-    Q_DISABLE_COPY(QSGMouseArea)
-    Q_DECLARE_PRIVATE(QSGMouseArea)
+    Q_DISABLE_COPY(QQuickMouseArea)
+    Q_DECLARE_PRIVATE(QQuickMouseArea)
 };
 
 QT_END_NAMESPACE
 
-QML_DECLARE_TYPE(QSGDrag)
-QML_DECLARE_TYPEINFO(QSGDrag, QML_HAS_ATTACHED_PROPERTIES)
-QML_DECLARE_TYPE(QSGMouseArea)
+QML_DECLARE_TYPE(QQuickDrag)
+QML_DECLARE_TYPEINFO(QQuickDrag, QML_HAS_ATTACHED_PROPERTIES)
+QML_DECLARE_TYPE(QQuickMouseArea)
 
 QT_END_HEADER
 
-#endif // QSGMOUSEAREA_P_H
+#endif // QQUICKMOUSEAREA_P_H
diff --git a/src/declarative/items/qsgmousearea_p_p.h b/src/declarative/items/qquickmousearea_p_p.h
index 6cf663ac6d..9f81bf976f 100644
--- a/src/declarative/items/qsgmousearea_p_p.h
+++ b/src/declarative/items/qquickmousearea_p_p.h
@@ -40,8 +40,8 @@
 **
 ****************************************************************************/
 
-#ifndef QSGMOUSEAREA_P_P_H
-#define QSGMOUSEAREA_P_P_H
+#ifndef QQUICKMOUSEAREA_P_P_H
+#define QQUICKMOUSEAREA_P_P_H
 
 //
 //  W A R N I N G
@@ -54,22 +54,22 @@
 // We mean it.
 //
 
-#include "qsgitem_p.h"
+#include "qquickitem_p.h"
 
 #include <QtGui/qevent.h>
 #include <QtCore/qbasictimer.h>
 
 QT_BEGIN_NAMESPACE
 
-class QSGMouseEvent;
-class QSGMouseArea;
-class QSGMouseAreaPrivate : public QSGItemPrivate
+class QQuickMouseEvent;
+class QQuickMouseArea;
+class QQuickMouseAreaPrivate : public QQuickItemPrivate
 {
-    Q_DECLARE_PUBLIC(QSGMouseArea)
+    Q_DECLARE_PUBLIC(QQuickMouseArea)
 
 public:
-    QSGMouseAreaPrivate();
-    ~QSGMouseAreaPrivate();
+    QQuickMouseAreaPrivate();
+    ~QQuickMouseAreaPrivate();
     void init();
 
     void saveEvent(QMouseEvent *event);
@@ -78,8 +78,8 @@ public:
         DoubleClick,
         PressAndHold
     };
-    void propagate(QSGMouseEvent* event, PropagateType);
-    bool propagateHelper(QSGMouseEvent*, QSGItem*,const QPointF &, PropagateType);
+    void propagate(QQuickMouseEvent* event, PropagateType);
+    bool propagateHelper(QQuickMouseEvent*, QQuickItem*,const QPointF &, PropagateType);
 
     bool isPressAndHoldConnected();
     bool isDoubleClickConnected();
@@ -95,7 +95,7 @@ public:
     bool stealMouse : 1;
     bool doubleClick : 1;
     bool preventStealing : 1;
-    QSGDrag *drag;
+    QQuickDrag *drag;
     QPointF startScene;
     QPointF targetStartPos;
     QPointF lastPos;
@@ -108,4 +108,4 @@ public:
 
 QT_END_NAMESPACE
 
-#endif // QSGMOUSEAREA_P_P_H
+#endif // QQUICKMOUSEAREA_P_P_H
diff --git a/src/declarative/items/qsgninepatchnode.cpp b/src/declarative/items/qquickninepatchnode.cpp
index 3658b3cb98..2974725348 100644
--- a/src/declarative/items/qsgninepatchnode.cpp
+++ b/src/declarative/items/qquickninepatchnode.cpp
@@ -39,14 +39,14 @@
 **
 ****************************************************************************/
 
-#include "qsgninepatchnode_p.h"
+#include "qquickninepatchnode_p.h"
 #include <private/qsgadaptationlayer_p.h>
 #include <private/qmath_p.h>
 
-QSGNinePatchNode::QSGNinePatchNode()
+QQuickNinePatchNode::QQuickNinePatchNode()
     : m_geometry(QSGGeometry::defaultAttributes_TexturedPoint2D(), 0)
-    , m_horizontalTileMode(QSGBorderImage::Stretch)
-    , m_verticalTileMode(QSGBorderImage::Stretch)
+    , m_horizontalTileMode(QQuickBorderImage::Stretch)
+    , m_verticalTileMode(QQuickBorderImage::Stretch)
     , m_dirtyGeometry(false)
     , m_mirror(false)
 {
@@ -59,7 +59,7 @@ QSGNinePatchNode::QSGNinePatchNode()
 #endif
 }
 
-void QSGNinePatchNode::setInnerRect(const QRectF &rect)
+void QQuickNinePatchNode::setInnerRect(const QRectF &rect)
 {
     if (m_innerRect == rect)
         return;
@@ -67,7 +67,7 @@ void QSGNinePatchNode::setInnerRect(const QRectF &rect)
     m_dirtyGeometry = true;
 }
 
-void QSGNinePatchNode::setRect(const QRectF &rect)
+void QQuickNinePatchNode::setRect(const QRectF &rect)
 {
     if (m_targetRect == rect)
         return;
@@ -75,25 +75,25 @@ void QSGNinePatchNode::setRect(const QRectF &rect)
     m_dirtyGeometry = true;
 }
 
-void QSGNinePatchNode::setHorzontalTileMode(QSGBorderImage::TileMode mode)
+void QQuickNinePatchNode::setHorzontalTileMode(QQuickBorderImage::TileMode mode)
 {
-    if (mode == QSGBorderImage::TileMode(m_horizontalTileMode))
+    if (mode == QQuickBorderImage::TileMode(m_horizontalTileMode))
         return;
     m_horizontalTileMode = mode;
     m_dirtyGeometry = true;
 }
 
 
-void QSGNinePatchNode::setVerticalTileMode(QSGBorderImage::TileMode mode)
+void QQuickNinePatchNode::setVerticalTileMode(QQuickBorderImage::TileMode mode)
 {
-    if (mode == QSGBorderImage::TileMode(m_verticalTileMode))
+    if (mode == QQuickBorderImage::TileMode(m_verticalTileMode))
         return;
     m_verticalTileMode = mode;
     m_dirtyGeometry = true;
 }
 
 
-void QSGNinePatchNode::setFiltering(QSGTexture::Filtering filtering)
+void QQuickNinePatchNode::setFiltering(QSGTexture::Filtering filtering)
 {
     if (m_material.filtering() == filtering)
         return;
@@ -103,12 +103,12 @@ void QSGNinePatchNode::setFiltering(QSGTexture::Filtering filtering)
     markDirty(DirtyMaterial);
 }
 
-QSGTexture::Filtering QSGNinePatchNode::filtering() const
+QSGTexture::Filtering QQuickNinePatchNode::filtering() const
 {
     return m_material.filtering();
 }
 
-void QSGNinePatchNode::setTexture(QSGTexture *texture)
+void QQuickNinePatchNode::setTexture(QSGTexture *texture)
 {
     if (texture == m_material.texture())
         return;
@@ -117,12 +117,12 @@ void QSGNinePatchNode::setTexture(QSGTexture *texture)
     markDirty(DirtyMaterial);
 }
 
-QSGTexture *QSGNinePatchNode::texture() const
+QSGTexture *QQuickNinePatchNode::texture() const
 {
     return m_material.texture();
 }
 
-void QSGNinePatchNode::setMirror(bool m)
+void QQuickNinePatchNode::setMirror(bool m)
 {
     if (m_mirror == m)
         return;
@@ -131,7 +131,7 @@ void QSGNinePatchNode::setMirror(bool m)
 }
 
 
-void QSGNinePatchNode::update()
+void QQuickNinePatchNode::update()
 {
     if (!m_dirtyGeometry)
         return;
@@ -158,10 +158,10 @@ void QSGNinePatchNode::update()
     float xTexSize = m_innerRect.width(); // Size of the texture to stretch/tile
     float xSize = m_targetRect.width() - m_innerRect.left() - rightBorder; // Size of area to fill with chunks
 
-    if (m_horizontalTileMode == QSGBorderImage::Repeat) {
+    if (m_horizontalTileMode == QQuickBorderImage::Repeat) {
         xChunkCount = qCeil(xSize / xTexSize);
         xChunkSize = xTexSize;
-    } else if (m_horizontalTileMode == QSGBorderImage::Round) {
+    } else if (m_horizontalTileMode == QQuickBorderImage::Round) {
         xChunkCount = qCeil(xSize / xTexSize);
         qreal fullWidth = xChunkCount * xTexSize;
         xChunkSize = xTexSize * xSize / fullWidth;
@@ -175,10 +175,10 @@ void QSGNinePatchNode::update()
     float yTexSize = m_innerRect.height(); // Size of the texture to stretch/tile
     float ySize = m_targetRect.height() - m_innerRect.top() - bottomBorder;
 
-    if (m_verticalTileMode == QSGBorderImage::Repeat) {
+    if (m_verticalTileMode == QQuickBorderImage::Repeat) {
         yChunkCount = qCeil(ySize / yTexSize);
         yChunkSize = yTexSize;
-    } else if (m_verticalTileMode == QSGBorderImage::Round) {
+    } else if (m_verticalTileMode == QQuickBorderImage::Round) {
         yChunkCount = qCeil(ySize / yTexSize);
         qreal fullHeight = yChunkCount * yTexSize;
         yChunkSize = yTexSize * ySize / fullHeight;
@@ -214,7 +214,7 @@ void QSGNinePatchNode::update()
 
         // Special case the last one
         if (yc == yChunkCount - 1) {
-            float t = m_verticalTileMode == QSGBorderImage::Repeat
+            float t = m_verticalTileMode == QQuickBorderImage::Repeat
                     ? yTexChunk1 + (yTexChunk2 - yTexChunk1) * (m_targetRect.height() - bottomBorder - yy) / yChunkSize
                     : yTexChunk2;
             fillRow(v, m_targetRect.height() - bottomBorder, t, xChunkCount, xChunkSize, textureSubRect, textureSize);
@@ -267,7 +267,7 @@ void QSGNinePatchNode::update()
     markDirty(QSGNode::DirtyGeometry);
 }
 
-void QSGNinePatchNode::fillRow(QSGGeometry::TexturedPoint2D *&v, float y, float ty, int xChunkCount, float xChunkSize,
+void QQuickNinePatchNode::fillRow(QSGGeometry::TexturedPoint2D *&v, float y, float ty, int xChunkCount, float xChunkSize,
                                const QRectF &tsr,   // texture sub rect, for atlasses
                                const QSize &ts)     // texture size in pixels
 {
@@ -287,7 +287,7 @@ void QSGNinePatchNode::fillRow(QSGGeometry::TexturedPoint2D *&v, float y, float
 
         // Special case the last one
         if (xc == xChunkCount - 1) {
-            float t = m_horizontalTileMode == QSGBorderImage::Repeat
+            float t = m_horizontalTileMode == QQuickBorderImage::Repeat
                     ? xTexChunk1 + (xTexChunk2 - xTexChunk1) * (m_targetRect.width() - rightBorder - xx) / xChunkSize
                     : xTexChunk2;
             v->set(m_targetRect.width() - rightBorder, y, t, ty);
diff --git a/src/declarative/items/qsgninepatchnode_p.h b/src/declarative/items/qquickninepatchnode_p.h
index fd0a0c5477..cdb0fd8e70 100644
--- a/src/declarative/items/qsgninepatchnode_p.h
+++ b/src/declarative/items/qquickninepatchnode_p.h
@@ -39,19 +39,19 @@
 **
 ****************************************************************************/
 
-#ifndef QSGNINEPATCHNODE_H
-#define QSGNINEPATCHNODE_H
+#ifndef QQUICKNINEPATCHNODE_H
+#define QQUICKNINEPATCHNODE_H
 
 #include "qsgnode.h"
 #include "qsgtexturematerial.h"
-#include "qsgborderimage_p.h"
+#include "qquickborderimage_p.h"
 
 class TextureReference;
 
-class QSGNinePatchNode : public QSGGeometryNode
+class QQuickNinePatchNode : public QSGGeometryNode
 {
 public:
-    QSGNinePatchNode();
+    QQuickNinePatchNode();
 
     void setTexture(QSGTexture *texture);
     QSGTexture *texture() const;
@@ -65,14 +65,14 @@ public:
     void setFiltering(QSGTexture::Filtering filtering);
     QSGTexture::Filtering filtering() const;
 
-    void setHorzontalTileMode(QSGBorderImage::TileMode mode);
-    QSGBorderImage::TileMode horizontalTileMode() const {
-        return (QSGBorderImage::TileMode) m_horizontalTileMode;
+    void setHorzontalTileMode(QQuickBorderImage::TileMode mode);
+    QQuickBorderImage::TileMode horizontalTileMode() const {
+        return (QQuickBorderImage::TileMode) m_horizontalTileMode;
     }
 
-    void setVerticalTileMode(QSGBorderImage::TileMode mode);
-    QSGBorderImage::TileMode verticalTileMode() const {
-        return (QSGBorderImage::TileMode) m_verticalTileMode;
+    void setVerticalTileMode(QQuickBorderImage::TileMode mode);
+    QQuickBorderImage::TileMode verticalTileMode() const {
+        return (QQuickBorderImage::TileMode) m_verticalTileMode;
     }
 
     void setMirror(bool m);
@@ -95,4 +95,4 @@ private:
     uint m_mirror : 1;
 };
 
-#endif // QSGNINEPATCHNODE_H
+#endif // QQUICKNINEPATCHNODE_H
diff --git a/src/declarative/items/qsgpainteditem.cpp b/src/declarative/items/qquickpainteditem.cpp
index 16c3b3df95..5e5eb79f36 100644
--- a/src/declarative/items/qsgpainteditem.cpp
+++ b/src/declarative/items/qquickpainteditem.cpp
@@ -39,24 +39,25 @@
 **
 ****************************************************************************/
 
-#include "qsgpainteditem.h"
-#include <private/qsgpainteditem_p.h>
-#include <private/qsgpainternode_p.h>
+#include "qquickpainteditem.h"
+#include <private/qquickpainteditem_p.h>
 
+#include <private/qsgpainternode_p.h>
 #include <private/qsgcontext_p.h>
 #include <private/qsgadaptationlayer_p.h>
+
 #include <qmath.h>
 
 QT_BEGIN_NAMESPACE
 
 /*!
-    \class QSGPaintedItem
-    \brief The QSGPaintedItem class provides a way to use the QPainter API in the
+    \class QQuickPaintedItem
+    \brief The QQuickPaintedItem class provides a way to use the QPainter API in the
     QML Scene Graph.
 
     \inmodule QtDeclarative
 
-    The QSGPaintedItem makes it possible to use the QPainter API with the QML Scene Graph.
+    The QQuickPaintedItem makes it possible to use the QPainter API with the QML Scene Graph.
     It sets up a textured rectangle in the Scene Graph and uses a QPainter to paint
     onto the texture. The render target can be either a QImage or a QOpenGLFramebufferObject.
     When the render target is a QImage, QPainter first renders into the image then
@@ -66,19 +67,19 @@ QT_BEGIN_NAMESPACE
 
     To enable QPainter to do anti-aliased rendering, use setAntialiasing().
 
-    QSGPaintedItem is meant to make it easier to port old code that is using the
+    QQuickPaintedItem is meant to make it easier to port old code that is using the
     QPainter API to the QML Scene Graph API and it should be used only for that purpose.
 
-    To write your own painted item, you first create a subclass of QSGPaintedItem, and then
+    To write your own painted item, you first create a subclass of QQuickPaintedItem, and then
     start by implementing its only pure virtual public function: paint(), which implements
     the actual painting. To get the size of the area painted by the item, use
     contentsBoundingRect().
 */
 
 /*!
-    \enum QSGPaintedItem::RenderTarget
+    \enum QQuickPaintedItem::RenderTarget
 
-    This enum describes QSGPaintedItem's render targets. The render target is the
+    This enum describes QQuickPaintedItem's render targets. The render target is the
     surface QPainter paints onto before the item is rendered on screen.
 
     \value Image The default; QPainter paints into a QImage using the raster paint engine.
@@ -95,13 +96,13 @@ QT_BEGIN_NAMESPACE
 */
 
 /*!
-    \enum QSGPaintedItem::PerformanceHint
+    \enum QQuickPaintedItem::PerformanceHint
 
     This enum describes flags that you can enable to improve rendering
-    performance in QSGPaintedItem. By default, none of these flags are set.
+    performance in QQuickPaintedItem. By default, none of these flags are set.
 
     \value FastFBOResizing If your item gets resized often and you are using the
-    QSGPaintedItem::FramebufferObject render target, set this flag to true to reduce the
+    QQuickPaintedItem::FramebufferObject render target, set this flag to true to reduce the
     item resizing time at the cost of using more graphics memory. Resizing a Framebuffer object
     is a costly operation, by enabling this property the Framebuffer Object will use a texture
     larger than the actual size of the item to avoid as much as possible resizing it.
@@ -110,11 +111,11 @@ QT_BEGIN_NAMESPACE
 /*!
     \internal
 */
-QSGPaintedItemPrivate::QSGPaintedItemPrivate()
-    : QSGItemPrivate()
+QQuickPaintedItemPrivate::QQuickPaintedItemPrivate()
+    : QQuickItemPrivate()
     , contentsScale(1.0)
     , fillColor(Qt::transparent)
-    , renderTarget(QSGPaintedItem::Image)
+    , renderTarget(QQuickPaintedItem::Image)
     , performanceHints(0)
     , geometryDirty(false)
     , contentsDirty(false)
@@ -125,10 +126,10 @@ QSGPaintedItemPrivate::QSGPaintedItemPrivate()
 }
 
 /*!
-    Constructs a QSGPaintedItem with the given \a parent item.
+    Constructs a QQuickPaintedItem with the given \a parent item.
  */
-QSGPaintedItem::QSGPaintedItem(QSGItem *parent)
-    : QSGItem(*(new QSGPaintedItemPrivate), parent)
+QQuickPaintedItem::QQuickPaintedItem(QQuickItem *parent)
+    : QQuickItem(*(new QQuickPaintedItemPrivate), parent)
 {
     setFlag(ItemHasContents);
 }
@@ -136,16 +137,16 @@ QSGPaintedItem::QSGPaintedItem(QSGItem *parent)
 /*!
     \internal
 */
-QSGPaintedItem::QSGPaintedItem(QSGPaintedItemPrivate &dd, QSGItem *parent)
-    : QSGItem(dd, parent)
+QQuickPaintedItem::QQuickPaintedItem(QQuickPaintedItemPrivate &dd, QQuickItem *parent)
+    : QQuickItem(dd, parent)
 {
     setFlag(ItemHasContents);
 }
 
 /*!
-    Destroys the QSGPaintedItem.
+    Destroys the QQuickPaintedItem.
 */
-QSGPaintedItem::~QSGPaintedItem()
+QQuickPaintedItem::~QQuickPaintedItem()
 {
 }
 
@@ -161,16 +162,16 @@ QSGPaintedItem::~QSGPaintedItem()
 
     \sa paint()
 */
-void QSGPaintedItem::update(const QRect &rect)
+void QQuickPaintedItem::update(const QRect &rect)
 {
-    Q_D(QSGPaintedItem);
+    Q_D(QQuickPaintedItem);
     d->contentsDirty = true;
 
     if (rect.isNull() && !d->dirtyRect.isNull())
         d->dirtyRect = contentsBoundingRect().toAlignedRect();
     else
         d->dirtyRect |= (contentsBoundingRect() & rect).toAlignedRect();
-    QSGItem::update();
+    QQuickItem::update();
 }
 
 /*!
@@ -180,9 +181,9 @@ void QSGPaintedItem::update(const QRect &rect)
 
     \sa setOpaquePainting()
 */
-bool QSGPaintedItem::opaquePainting() const
+bool QQuickPaintedItem::opaquePainting() const
 {
-    Q_D(const QSGPaintedItem);
+    Q_D(const QQuickPaintedItem);
     return d->opaquePainting;
 }
 
@@ -196,15 +197,15 @@ bool QSGPaintedItem::opaquePainting() const
 
     \sa opaquePainting()
 */
-void QSGPaintedItem::setOpaquePainting(bool opaque)
+void QQuickPaintedItem::setOpaquePainting(bool opaque)
 {
-    Q_D(QSGPaintedItem);
+    Q_D(QQuickPaintedItem);
 
     if (d->opaquePainting == opaque)
         return;
 
     d->opaquePainting = opaque;
-    QSGItem::update();
+    QQuickItem::update();
 }
 
 /*!
@@ -214,9 +215,9 @@ void QSGPaintedItem::setOpaquePainting(bool opaque)
 
     \sa setAntialiasing()
 */
-bool QSGPaintedItem::antialiasing() const
+bool QQuickPaintedItem::antialiasing() const
 {
-    Q_D(const QSGPaintedItem);
+    Q_D(const QQuickPaintedItem);
     return d->antialiasing;
 }
 
@@ -227,9 +228,9 @@ bool QSGPaintedItem::antialiasing() const
 
     \sa antialiasing()
 */
-void QSGPaintedItem::setAntialiasing(bool enable)
+void QQuickPaintedItem::setAntialiasing(bool enable)
 {
-    Q_D(QSGPaintedItem);
+    Q_D(QQuickPaintedItem);
 
     if (d->antialiasing == enable)
         return;
@@ -245,9 +246,9 @@ void QSGPaintedItem::setAntialiasing(bool enable)
 
     \sa setMipmap()
 */
-bool QSGPaintedItem::mipmap() const
+bool QQuickPaintedItem::mipmap() const
 {
-    Q_D(const QSGPaintedItem);
+    Q_D(const QQuickPaintedItem);
     return d->mipmap;
 }
 
@@ -261,9 +262,9 @@ bool QSGPaintedItem::mipmap() const
 
     \sa mipmap()
 */
-void QSGPaintedItem::setMipmap(bool enable)
+void QQuickPaintedItem::setMipmap(bool enable)
 {
-    Q_D(QSGPaintedItem);
+    Q_D(QQuickPaintedItem);
 
     if (d->mipmap == enable)
         return;
@@ -279,9 +280,9 @@ void QSGPaintedItem::setMipmap(bool enable)
 
     \sa setPerformanceHint(), setPerformanceHints()
 */
-QSGPaintedItem::PerformanceHints QSGPaintedItem::performanceHints() const
+QQuickPaintedItem::PerformanceHints QQuickPaintedItem::performanceHints() const
 {
-    Q_D(const QSGPaintedItem);
+    Q_D(const QQuickPaintedItem);
     return d->performanceHints;
 }
 
@@ -293,9 +294,9 @@ QSGPaintedItem::PerformanceHints QSGPaintedItem::performanceHints() const
 
     \sa setPerformanceHints(), performanceHints()
 */
-void QSGPaintedItem::setPerformanceHint(QSGPaintedItem::PerformanceHint hint, bool enabled)
+void QQuickPaintedItem::setPerformanceHint(QQuickPaintedItem::PerformanceHint hint, bool enabled)
 {
-    Q_D(QSGPaintedItem);
+    Q_D(QQuickPaintedItem);
     PerformanceHints oldHints = d->performanceHints;
     if (enabled)
         d->performanceHints |= hint;
@@ -312,9 +313,9 @@ void QSGPaintedItem::setPerformanceHint(QSGPaintedItem::PerformanceHint hint, bo
 
     \sa setPerformanceHint(), performanceHints()
 */
-void QSGPaintedItem::setPerformanceHints(QSGPaintedItem::PerformanceHints hints)
+void QQuickPaintedItem::setPerformanceHints(QQuickPaintedItem::PerformanceHints hints)
 {
-    Q_D(QSGPaintedItem);
+    Q_D(QQuickPaintedItem);
     if (d->performanceHints == hints)
         return;
     d->performanceHints = hints;
@@ -330,11 +331,11 @@ void QSGPaintedItem::setPerformanceHints(QSGPaintedItem::PerformanceHints hints)
 
     Use this function to know the area painted by the item.
 
-    \sa QSGItem::width(), QSGItem::height(), contentsSize(), contentsScale()
+    \sa QQuickItem::width(), QQuickItem::height(), contentsSize(), contentsScale()
 */
-QRectF QSGPaintedItem::contentsBoundingRect() const
+QRectF QQuickPaintedItem::contentsBoundingRect() const
 {
-    Q_D(const QSGPaintedItem);
+    Q_D(const QQuickPaintedItem);
 
     qreal w = d->width;
     QSizeF sz = d->contentsSize * d->contentsScale;
@@ -348,22 +349,22 @@ QRectF QSGPaintedItem::contentsBoundingRect() const
 }
 
 /*!
-    \property QSGPaintedItem::contentsSize
+    \property QQuickPaintedItem::contentsSize
     \brief The size of the contents
 
     The contents size is the size of the item in regards to how it is painted
     using the paint() function.  This is distinct from the size of the
     item in regards to height() and width().
 */
-QSize QSGPaintedItem::contentsSize() const
+QSize QQuickPaintedItem::contentsSize() const
 {
-    Q_D(const QSGPaintedItem);
+    Q_D(const QQuickPaintedItem);
     return d->contentsSize;
 }
 
-void QSGPaintedItem::setContentsSize(const QSize &size)
+void QQuickPaintedItem::setContentsSize(const QSize &size)
 {
-    Q_D(QSGPaintedItem);
+    Q_D(QQuickPaintedItem);
 
     if (d->contentsSize == size)
         return;
@@ -375,13 +376,13 @@ void QSGPaintedItem::setContentsSize(const QSize &size)
 /*!
     This convenience function is equivalent to calling setContentsSize(QSize()).
 */
-void QSGPaintedItem::resetContentsSize()
+void QQuickPaintedItem::resetContentsSize()
 {
     setContentsSize(QSize());
 }
 
 /*!
-    \property QSGPaintedItem::contentsScale
+    \property QQuickPaintedItem::contentsScale
     \brief The scale of the contents
 
     All painting happening in paint() is scaled by the contents scale. This is distinct
@@ -389,15 +390,15 @@ void QSGPaintedItem::resetContentsSize()
 
     The default value is 1.
 */
-qreal QSGPaintedItem::contentsScale() const
+qreal QQuickPaintedItem::contentsScale() const
 {
-    Q_D(const QSGPaintedItem);
+    Q_D(const QQuickPaintedItem);
     return d->contentsScale;
 }
 
-void QSGPaintedItem::setContentsScale(qreal scale)
+void QQuickPaintedItem::setContentsScale(qreal scale)
 {
-    Q_D(QSGPaintedItem);
+    Q_D(QQuickPaintedItem);
 
     if (d->contentsScale == scale)
         return;
@@ -407,20 +408,20 @@ void QSGPaintedItem::setContentsScale(qreal scale)
 }
 
 /*!
-    \property QSGPaintedItem::fillColor
+    \property QQuickPaintedItem::fillColor
     \brief The item's background fill color.
 
     By default, the fill color is set to Qt::transparent.
 */
-QColor QSGPaintedItem::fillColor() const
+QColor QQuickPaintedItem::fillColor() const
 {
-    Q_D(const QSGPaintedItem);
+    Q_D(const QQuickPaintedItem);
     return d->fillColor;
 }
 
-void QSGPaintedItem::setFillColor(const QColor &c)
+void QQuickPaintedItem::setFillColor(const QColor &c)
 {
-    Q_D(QSGPaintedItem);
+    Q_D(QQuickPaintedItem);
 
     if (d->fillColor == c)
         return;
@@ -432,29 +433,29 @@ void QSGPaintedItem::setFillColor(const QColor &c)
 }
 
 /*!
-    \property QSGPaintedItem::renderTarget
+    \property QQuickPaintedItem::renderTarget
     \brief The item's render target.
 
     This property defines which render target the QPainter renders into, it can be either
-    QSGPaintedItem::Image or QSGPaintedItem::FramebufferObject. Both have certains benefits,
+    QQuickPaintedItem::Image or QQuickPaintedItem::FramebufferObject. Both have certains benefits,
     typically performance versus quality. Using a framebuffer object avoids a costly upload
     of the image contents to the texture in graphics memory, while using an image enables
     high quality anti-aliasing.
 
     \warning Resizing a framebuffer object is a costly operation, avoid using
-    the QSGPaintedItem::FramebufferObject render target if the item gets resized often.
+    the QQuickPaintedItem::FramebufferObject render target if the item gets resized often.
 
-    By default, the render target is QSGPaintedItem::Image.
+    By default, the render target is QQuickPaintedItem::Image.
 */
-QSGPaintedItem::RenderTarget QSGPaintedItem::renderTarget() const
+QQuickPaintedItem::RenderTarget QQuickPaintedItem::renderTarget() const
 {
-    Q_D(const QSGPaintedItem);
+    Q_D(const QQuickPaintedItem);
     return d->renderTarget;
 }
 
-void QSGPaintedItem::setRenderTarget(RenderTarget target)
+void QQuickPaintedItem::setRenderTarget(RenderTarget target)
 {
-    Q_D(QSGPaintedItem);
+    Q_D(QQuickPaintedItem);
 
     if (d->renderTarget == target)
         return;
@@ -466,14 +467,14 @@ void QSGPaintedItem::setRenderTarget(RenderTarget target)
 }
 
 /*!
-    \fn virtual void QSGPaintedItem::paint(QPainter *painter) = 0
+    \fn virtual void QQuickPaintedItem::paint(QPainter *painter) = 0
 
     This function, which is usually called by the QML Scene Graph, paints the
     contents of an item in local coordinates.
 
     The function is called after the item has been filled with the fillColor.
 
-    Reimplement this function in a QSGPaintedItem subclass to provide the
+    Reimplement this function in a QQuickPaintedItem subclass to provide the
     item's painting implementation, using \a painter.
 
     \note The QML Scene Graph uses two separate threads, the main thread does things such as
@@ -486,11 +487,11 @@ void QSGPaintedItem::setRenderTarget(RenderTarget target)
 /*!
     This function is called after the item's geometry has changed.
 */
-void QSGPaintedItem::geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry)
+void QQuickPaintedItem::geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry)
 {
-    Q_D(QSGPaintedItem);
+    Q_D(QQuickPaintedItem);
     d->geometryDirty = true;
-    QSGItem::geometryChanged(newGeometry, oldGeometry);
+    QQuickItem::geometryChanged(newGeometry, oldGeometry);
 }
 
 
@@ -498,10 +499,10 @@ void QSGPaintedItem::geometryChanged(const QRectF &newGeometry, const QRectF &ol
     This function is called when the Scene Graph node associated to the item needs to
     be updated.
 */
-QSGNode *QSGPaintedItem::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *data)
+QSGNode *QQuickPaintedItem::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *data)
 {
     Q_UNUSED(data);
-    Q_D(QSGPaintedItem);
+    Q_D(QQuickPaintedItem);
 
     if (width() <= 0 || height() <= 0) {
         delete oldNode;
diff --git a/src/declarative/items/qsgpainteditem.h b/src/declarative/items/qquickpainteditem.h
index eaae3be7b5..5f461fd711 100644
--- a/src/declarative/items/qsgpainteditem.h
+++ b/src/declarative/items/qquickpainteditem.h
@@ -39,18 +39,18 @@
 **
 ****************************************************************************/
 
-#ifndef QSGPAINTEDITEM_P_H
-#define QSGPAINTEDITEM_P_H
+#ifndef QQUICKPAINTEDITEM_P_H
+#define QQUICKPAINTEDITEM_P_H
 
-#include <qsgitem.h>
+#include <qquickitem.h>
 #include <QtGui/qcolor.h>
 
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-class QSGPaintedItemPrivate;
-class Q_DECLARATIVE_EXPORT QSGPaintedItem : public QSGItem
+class QQuickPaintedItemPrivate;
+class Q_DECLARATIVE_EXPORT QQuickPaintedItem : public QQuickItem
 {
     Q_OBJECT
     Q_ENUMS(RenderTarget)
@@ -60,8 +60,8 @@ class Q_DECLARATIVE_EXPORT QSGPaintedItem : public QSGItem
     Q_PROPERTY(qreal contentsScale READ contentsScale WRITE setContentsScale NOTIFY contentsScaleChanged)
     Q_PROPERTY(RenderTarget renderTarget READ renderTarget WRITE setRenderTarget NOTIFY renderTargetChanged)
 public:
-    QSGPaintedItem(QSGItem *parent = 0);
-    virtual ~QSGPaintedItem();
+    QQuickPaintedItem(QQuickItem *parent = 0);
+    virtual ~QQuickPaintedItem();
 
     enum RenderTarget {
         Image,
@@ -112,19 +112,19 @@ Q_SIGNALS:
     void renderTargetChanged();
 
 protected:
-    QSGPaintedItem(QSGPaintedItemPrivate &dd, QSGItem *parent = 0);
+    QQuickPaintedItem(QQuickPaintedItemPrivate &dd, QQuickItem *parent = 0);
     virtual void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry);
     virtual QSGNode *updatePaintNode(QSGNode *, UpdatePaintNodeData *);
 
 private:
-    Q_DISABLE_COPY(QSGPaintedItem)
-    Q_DECLARE_PRIVATE(QSGPaintedItem)
+    Q_DISABLE_COPY(QQuickPaintedItem)
+    Q_DECLARE_PRIVATE(QQuickPaintedItem)
 };
 
-Q_DECLARE_OPERATORS_FOR_FLAGS(QSGPaintedItem::PerformanceHints)
+Q_DECLARE_OPERATORS_FOR_FLAGS(QQuickPaintedItem::PerformanceHints)
 
 QT_END_NAMESPACE
 
 QT_END_HEADER
 
-#endif // QSGPAINTEDITEM_P_H
+#endif // QQUICKPAINTEDITEM_P_H
diff --git a/src/declarative/items/qsgpainteditem_p.h b/src/declarative/items/qquickpainteditem_p.h
index f698e186bf..00061d9977 100644
--- a/src/declarative/items/qsgpainteditem_p.h
+++ b/src/declarative/items/qquickpainteditem_p.h
@@ -40,24 +40,24 @@
 **
 ****************************************************************************/
 
-#ifndef QSGPAINTEDITEM_P_P_H
-#define QSGPAINTEDITEM_P_P_H
+#ifndef QQUICKPAINTEDITEM_P_P_H
+#define QQUICKPAINTEDITEM_P_P_H
 
-#include "qsgitem_p.h"
+#include "qquickitem_p.h"
 #include <QtGui/qcolor.h>
 
 QT_BEGIN_NAMESPACE
 
-class QSGPaintedItemPrivate : public QSGItemPrivate
+class QQuickPaintedItemPrivate : public QQuickItemPrivate
 {
 public:
-    QSGPaintedItemPrivate();
+    QQuickPaintedItemPrivate();
 
     QSize contentsSize;
     qreal contentsScale;
     QColor fillColor;
-    QSGPaintedItem::RenderTarget renderTarget;
-    QSGPaintedItem::PerformanceHints performanceHints;
+    QQuickPaintedItem::RenderTarget renderTarget;
+    QQuickPaintedItem::PerformanceHints performanceHints;
 
     QRect dirtyRect;
 
@@ -70,4 +70,4 @@ public:
 
 QT_END_NAMESPACE
 
-#endif // QSGPAINTEDITEM_P_P_H
+#endif // QQUICKPAINTEDITEM_P_P_H
diff --git a/src/declarative/items/qsgpathview.cpp b/src/declarative/items/qquickpathview.cpp
index 5e2ad84e3b..dc73bf2dd3 100644
--- a/src/declarative/items/qsgpathview.cpp
+++ b/src/declarative/items/qquickpathview.cpp
@@ -39,9 +39,9 @@
 **
 ****************************************************************************/
 
-#include "qsgpathview_p.h"
-#include "qsgpathview_p_p.h"
-#include "qsgcanvas.h"
+#include "qquickpathview_p.h"
+#include "qquickpathview_p_p.h"
+#include "qquickcanvas.h"
 
 #include <private/qdeclarativestate_p.h>
 #include <private/qdeclarativeopenmetaobject_p.h>
@@ -69,7 +69,7 @@ inline qreal qmlMod(qreal x, qreal y)
 
 static QDeclarativeOpenMetaObjectType *qPathViewAttachedType = 0;
 
-QSGPathViewAttached::QSGPathViewAttached(QObject *parent)
+QQuickPathViewAttached::QQuickPathViewAttached(QObject *parent)
 : QObject(parent), m_percent(-1), m_view(0), m_onPath(false), m_isCurrent(false)
 {
     if (qPathViewAttachedType) {
@@ -80,91 +80,91 @@ QSGPathViewAttached::QSGPathViewAttached(QObject *parent)
     }
 }
 
-QSGPathViewAttached::~QSGPathViewAttached()
+QQuickPathViewAttached::~QQuickPathViewAttached()
 {
 }
 
-QVariant QSGPathViewAttached::value(const QByteArray &name) const
+QVariant QQuickPathViewAttached::value(const QByteArray &name) const
 {
     return m_metaobject->value(name);
 }
-void QSGPathViewAttached::setValue(const QByteArray &name, const QVariant &val)
+void QQuickPathViewAttached::setValue(const QByteArray &name, const QVariant &val)
 {
     m_metaobject->setValue(name, val);
 }
 
 
-void QSGPathViewPrivate::init()
+void QQuickPathViewPrivate::init()
 {
-    Q_Q(QSGPathView);
+    Q_Q(QQuickPathView);
     offset = 0;
     q->setAcceptedMouseButtons(Qt::LeftButton);
-    q->setFlag(QSGItem::ItemIsFocusScope);
+    q->setFlag(QQuickItem::ItemIsFocusScope);
     q->setFiltersChildMouseEvents(true);
     FAST_CONNECT(&tl, SIGNAL(updated()), q, SLOT(ticked()))
     lastPosTime.invalidate();
     FAST_CONNECT(&tl, SIGNAL(completed()), q, SLOT(movementEnding()))
 }
 
-QSGItem *QSGPathViewPrivate::getItem(int modelIndex, bool onPath)
+QQuickItem *QQuickPathViewPrivate::getItem(int modelIndex, bool onPath)
 {
-    Q_Q(QSGPathView);
+    Q_Q(QQuickPathView);
     requestedIndex = modelIndex;
-    QSGItem *item = model->item(modelIndex, false);
+    QQuickItem *item = model->item(modelIndex, false);
     if (item) {
         if (!attType) {
             // pre-create one metatype to share with all attached objects
-            attType = new QDeclarativeOpenMetaObjectType(&QSGPathViewAttached::staticMetaObject, qmlEngine(q));
+            attType = new QDeclarativeOpenMetaObjectType(&QQuickPathViewAttached::staticMetaObject, qmlEngine(q));
             foreach (const QString &attr, path->attributes())
                 attType->createProperty(attr.toUtf8());
         }
         qPathViewAttachedType = attType;
-        QSGPathViewAttached *att = static_cast<QSGPathViewAttached *>(qmlAttachedPropertiesObject<QSGPathView>(item));
+        QQuickPathViewAttached *att = static_cast<QQuickPathViewAttached *>(qmlAttachedPropertiesObject<QQuickPathView>(item));
         qPathViewAttachedType = 0;
         if (att) {
             att->m_view = q;
             att->setOnPath(onPath);
         }
         item->setParentItem(q);
-        QSGItemPrivate *itemPrivate = QSGItemPrivate::get(item);
-        itemPrivate->addItemChangeListener(this, QSGItemPrivate::Geometry);
+        QQuickItemPrivate *itemPrivate = QQuickItemPrivate::get(item);
+        itemPrivate->addItemChangeListener(this, QQuickItemPrivate::Geometry);
     }
     requestedIndex = -1;
     return item;
 }
 
-void QSGPathViewPrivate::releaseItem(QSGItem *item)
+void QQuickPathViewPrivate::releaseItem(QQuickItem *item)
 {
     if (!item || !model)
         return;
-    QSGItemPrivate *itemPrivate = QSGItemPrivate::get(item);
-    itemPrivate->removeItemChangeListener(this, QSGItemPrivate::Geometry);
+    QQuickItemPrivate *itemPrivate = QQuickItemPrivate::get(item);
+    itemPrivate->removeItemChangeListener(this, QQuickItemPrivate::Geometry);
     if (model->release(item) == 0) {
         // item was not destroyed, and we no longer reference it.
-        if (QSGPathViewAttached *att = attached(item))
+        if (QQuickPathViewAttached *att = attached(item))
             att->setOnPath(false);
     }
 }
 
-QSGPathViewAttached *QSGPathViewPrivate::attached(QSGItem *item)
+QQuickPathViewAttached *QQuickPathViewPrivate::attached(QQuickItem *item)
 {
-    return static_cast<QSGPathViewAttached *>(qmlAttachedPropertiesObject<QSGPathView>(item, false));
+    return static_cast<QQuickPathViewAttached *>(qmlAttachedPropertiesObject<QQuickPathView>(item, false));
 }
 
-void QSGPathViewPrivate::clear()
+void QQuickPathViewPrivate::clear()
 {
     if (currentItem) {
         releaseItem(currentItem);
         currentItem = 0;
     }
     for (int i=0; i<items.count(); i++){
-        QSGItem *p = items[i];
+        QQuickItem *p = items[i];
         releaseItem(p);
     }
     items.clear();
 }
 
-void QSGPathViewPrivate::updateMappedRange()
+void QQuickPathViewPrivate::updateMappedRange()
 {
     if (model && pathItems != -1 && pathItems < modelCount)
         mappedRange = qreal(pathItems)/modelCount;
@@ -172,13 +172,13 @@ void QSGPathViewPrivate::updateMappedRange()
         mappedRange = 1.0;
 }
 
-qreal QSGPathViewPrivate::positionOfIndex(qreal index) const
+qreal QQuickPathViewPrivate::positionOfIndex(qreal index) const
 {
     qreal pos = -1.0;
 
     if (model && index >= 0 && index < modelCount) {
         qreal start = 0.0;
-        if (haveHighlightRange && highlightRangeMode != QSGPathView::NoHighlightRange)
+        if (haveHighlightRange && highlightRangeMode != QQuickPathView::NoHighlightRange)
             start = highlightRangeStart;
         qreal globalPos = index + offset;
         globalPos = qmlMod(globalPos, qreal(modelCount)) / modelCount;
@@ -195,9 +195,9 @@ qreal QSGPathViewPrivate::positionOfIndex(qreal index) const
     return pos;
 }
 
-void QSGPathViewPrivate::createHighlight()
+void QQuickPathViewPrivate::createHighlight()
 {
-    Q_Q(QSGPathView);
+    Q_Q(QQuickPathView);
     if (!q->isComponentComplete())
         return;
 
@@ -209,7 +209,7 @@ void QSGPathViewPrivate::createHighlight()
         changed = true;
     }
 
-    QSGItem *item = 0;
+    QQuickItem *item = 0;
     if (highlightComponent) {
         QDeclarativeContext *creationContext = highlightComponent->creationContext();
         QDeclarativeContext *highlightContext = new QDeclarativeContext(
@@ -217,14 +217,14 @@ void QSGPathViewPrivate::createHighlight()
         QObject *nobj = highlightComponent->create(highlightContext);
         if (nobj) {
             QDeclarative_setParent_noEvent(highlightContext, nobj);
-            item = qobject_cast<QSGItem *>(nobj);
+            item = qobject_cast<QQuickItem *>(nobj);
             if (!item)
                 delete nobj;
         } else {
             delete highlightContext;
         }
     } else {
-        item = new QSGItem;
+        item = new QQuickItem;
     }
     if (item) {
         QDeclarative_setParent_noEvent(item, q);
@@ -236,13 +236,13 @@ void QSGPathViewPrivate::createHighlight()
         emit q->highlightItemChanged();
 }
 
-void QSGPathViewPrivate::updateHighlight()
+void QQuickPathViewPrivate::updateHighlight()
 {
-    Q_Q(QSGPathView);
+    Q_Q(QQuickPathView);
     if (!q->isComponentComplete() || !isValid())
         return;
     if (highlightItem) {
-        if (haveHighlightRange && highlightRangeMode == QSGPathView::StrictlyEnforceRange) {
+        if (haveHighlightRange && highlightRangeMode == QQuickPathView::StrictlyEnforceRange) {
             updateItem(highlightItem, highlightRangeStart);
         } else {
             qreal target = currentIndex;
@@ -273,12 +273,12 @@ void QSGPathViewPrivate::updateHighlight()
     }
 }
 
-void QSGPathViewPrivate::setHighlightPosition(qreal pos)
+void QQuickPathViewPrivate::setHighlightPosition(qreal pos)
 {
     if (pos != highlightPosition) {
         qreal start = 0.0;
         qreal end = 1.0;
-        if (haveHighlightRange && highlightRangeMode != QSGPathView::NoHighlightRange) {
+        if (haveHighlightRange && highlightRangeMode != QQuickPathView::NoHighlightRange) {
             start = highlightRangeStart;
             end = highlightRangeEnd;
         }
@@ -298,27 +298,27 @@ void QSGPathViewPrivate::setHighlightPosition(qreal pos)
         highlightPosition = pos;
         qreal pathPos = positionOfIndex(pos);
         updateItem(highlightItem, pathPos);
-        if (QSGPathViewAttached *att = attached(highlightItem))
+        if (QQuickPathViewAttached *att = attached(highlightItem))
             att->setOnPath(pathPos != -1.0);
     }
 }
 
-void QSGPathView::pathUpdated()
+void QQuickPathView::pathUpdated()
 {
-    Q_D(QSGPathView);
-    QList<QSGItem*>::iterator it = d->items.begin();
+    Q_D(QQuickPathView);
+    QList<QQuickItem*>::iterator it = d->items.begin();
     while (it != d->items.end()) {
-        QSGItem *item = *it;
-        if (QSGPathViewAttached *att = d->attached(item))
+        QQuickItem *item = *it;
+        if (QQuickPathViewAttached *att = d->attached(item))
             att->m_percent = -1;
         ++it;
     }
     refill();
 }
 
-void QSGPathViewPrivate::updateItem(QSGItem *item, qreal percent)
+void QQuickPathViewPrivate::updateItem(QQuickItem *item, qreal percent)
 {
-    if (QSGPathViewAttached *att = attached(item)) {
+    if (QQuickPathViewAttached *att = attached(item)) {
         if (qFuzzyCompare(att->m_percent, percent))
             return;
         att->m_percent = percent;
@@ -330,9 +330,9 @@ void QSGPathViewPrivate::updateItem(QSGItem *item, qreal percent)
     item->setY(qRound(pf.y() - item->height()/2));
 }
 
-void QSGPathViewPrivate::regenerate()
+void QQuickPathViewPrivate::regenerate()
 {
-    Q_Q(QSGPathView);
+    Q_Q(QQuickPathView);
     if (!q->isComponentComplete())
         return;
 
@@ -347,7 +347,7 @@ void QSGPathViewPrivate::regenerate()
 }
 
 /*!
-    \qmlclass PathView QSGPathView
+    \qmlclass PathView QQuickPathView
     \inqmlmodule QtQuick 2
     \ingroup qml-view-elements
     \brief The PathView element lays out model-provided items on a path.
@@ -411,16 +411,16 @@ void QSGPathViewPrivate::regenerate()
     \sa Path, {declarative/modelviews/pathview}{PathView example}
 */
 
-QSGPathView::QSGPathView(QSGItem *parent)
-  : QSGItem(*(new QSGPathViewPrivate), parent)
+QQuickPathView::QQuickPathView(QQuickItem *parent)
+  : QQuickItem(*(new QQuickPathViewPrivate), parent)
 {
-    Q_D(QSGPathView);
+    Q_D(QQuickPathView);
     d->init();
 }
 
-QSGPathView::~QSGPathView()
+QQuickPathView::~QQuickPathView()
 {
-    Q_D(QSGPathView);
+    Q_D(QQuickPathView);
     d->clear();
     if (d->attType)
         d->attType->release();
@@ -476,24 +476,24 @@ QSGPathView::~QSGPathView()
 
     \sa {qmlmodels}{Data Models}
 */
-QVariant QSGPathView::model() const
+QVariant QQuickPathView::model() const
 {
-    Q_D(const QSGPathView);
+    Q_D(const QQuickPathView);
     return d->modelVariant;
 }
 
-void QSGPathView::setModel(const QVariant &model)
+void QQuickPathView::setModel(const QVariant &model)
 {
-    Q_D(QSGPathView);
+    Q_D(QQuickPathView);
     if (d->modelVariant == model)
         return;
 
     if (d->model) {
         disconnect(d->model, SIGNAL(modelUpdated(QDeclarativeChangeSet,bool)),
                 this, SLOT(modelUpdated(QDeclarativeChangeSet,bool)));
-        disconnect(d->model, SIGNAL(createdItem(int,QSGItem*)), this, SLOT(createdItem(int,QSGItem*)));
+        disconnect(d->model, SIGNAL(createdItem(int,QQuickItem*)), this, SLOT(createdItem(int,QQuickItem*)));
         for (int i=0; i<d->items.count(); i++){
-            QSGItem *p = d->items[i];
+            QQuickItem *p = d->items[i];
             d->model->release(p);
         }
         d->items.clear();
@@ -501,8 +501,8 @@ void QSGPathView::setModel(const QVariant &model)
 
     d->modelVariant = model;
     QObject *object = qvariant_cast<QObject*>(model);
-    QSGVisualModel *vim = 0;
-    if (object && (vim = qobject_cast<QSGVisualModel *>(object))) {
+    QQuickVisualModel *vim = 0;
+    if (object && (vim = qobject_cast<QQuickVisualModel *>(object))) {
         if (d->ownModel) {
             delete d->model;
             d->ownModel = false;
@@ -510,19 +510,19 @@ void QSGPathView::setModel(const QVariant &model)
         d->model = vim;
     } else {
         if (!d->ownModel) {
-            d->model = new QSGVisualDataModel(qmlContext(this));
+            d->model = new QQuickVisualDataModel(qmlContext(this));
             d->ownModel = true;
             if (isComponentComplete())
-                static_cast<QSGVisualDataModel *>(d->model.data())->componentComplete();
+                static_cast<QQuickVisualDataModel *>(d->model.data())->componentComplete();
         }
-        if (QSGVisualDataModel *dataModel = qobject_cast<QSGVisualDataModel*>(d->model))
+        if (QQuickVisualDataModel *dataModel = qobject_cast<QQuickVisualDataModel*>(d->model))
             dataModel->setModel(model);
     }
     d->modelCount = 0;
     if (d->model) {
         connect(d->model, SIGNAL(modelUpdated(QDeclarativeChangeSet,bool)),
                 this, SLOT(modelUpdated(QDeclarativeChangeSet,bool)));
-        connect(d->model, SIGNAL(createdItem(int,QSGItem*)), this, SLOT(createdItem(int,QSGItem*)));
+        connect(d->model, SIGNAL(createdItem(int,QQuickItem*)), this, SLOT(createdItem(int,QQuickItem*)));
         d->modelCount = d->model->count();
         if (d->model->count())
             d->offset = qmlMod(d->offset, qreal(d->model->count()));
@@ -542,9 +542,9 @@ void QSGPathView::setModel(const QVariant &model)
     \qmlproperty int QtQuick2::PathView::count
     This property holds the number of items in the model.
 */
-int QSGPathView::count() const
+int QQuickPathView::count() const
 {
-    Q_D(const QSGPathView);
+    Q_D(const QQuickPathView);
     return d->model ? d->modelCount : 0;
 }
 
@@ -553,15 +553,15 @@ int QSGPathView::count() const
     This property holds the path used to lay out the items.
     For more information see the \l Path documentation.
 */
-QDeclarativePath *QSGPathView::path() const
+QDeclarativePath *QQuickPathView::path() const
 {
-    Q_D(const QSGPathView);
+    Q_D(const QQuickPathView);
     return d->path;
 }
 
-void QSGPathView::setPath(QDeclarativePath *path)
+void QQuickPathView::setPath(QDeclarativePath *path)
 {
-    Q_D(QSGPathView);
+    Q_D(QQuickPathView);
     if (d->path == path)
         return;
     if (d->path)
@@ -583,42 +583,42 @@ void QSGPathView::setPath(QDeclarativePath *path)
     \qmlproperty int QtQuick2::PathView::currentIndex
     This property holds the index of the current item.
 */
-int QSGPathView::currentIndex() const
+int QQuickPathView::currentIndex() const
 {
-    Q_D(const QSGPathView);
+    Q_D(const QQuickPathView);
     return d->currentIndex;
 }
 
-void QSGPathView::setCurrentIndex(int idx)
+void QQuickPathView::setCurrentIndex(int idx)
 {
-    Q_D(QSGPathView);
+    Q_D(QQuickPathView);
     if (d->model && d->modelCount)
         idx = qAbs(idx % d->modelCount);
     if (d->model && idx != d->currentIndex) {
         if (d->currentItem) {
-            if (QSGPathViewAttached *att = d->attached(d->currentItem))
+            if (QQuickPathViewAttached *att = d->attached(d->currentItem))
                 att->setIsCurrentItem(false);
             d->releaseItem(d->currentItem);
         }
         d->currentItem = 0;
-        d->moveReason = QSGPathViewPrivate::SetIndex;
+        d->moveReason = QQuickPathViewPrivate::SetIndex;
         d->currentIndex = idx;
         if (d->modelCount) {
             int itemIndex = (idx - d->firstIndex + d->modelCount) % d->modelCount;
             if (itemIndex < d->items.count()) {
                 d->currentItem = d->model->item(d->currentIndex, true);
                 d->currentItem->setFocus(true);
-                if (QSGPathViewAttached *att = d->attached(d->currentItem))
+                if (QQuickPathViewAttached *att = d->attached(d->currentItem))
                     att->setIsCurrentItem(true);
             } else {
                 d->currentItem = d->getItem(d->currentIndex, false);
                 d->updateItem(d->currentItem, d->currentIndex < d->firstIndex ? 0.0 : 1.0);
-                if (QSGPathViewAttached *att = d->attached(d->currentItem))
+                if (QQuickPathViewAttached *att = d->attached(d->currentItem))
                     att->setIsCurrentItem(true);
                 if (d->model->completePending())
                     d->model->completeItem();
             }
-            if (d->haveHighlightRange && d->highlightRangeMode == QSGPathView::StrictlyEnforceRange)
+            if (d->haveHighlightRange && d->highlightRangeMode == QQuickPathView::StrictlyEnforceRange)
                 d->snapToCurrent();
             d->currentItemOffset = d->positionOfIndex(d->currentIndex);
             d->updateHighlight();
@@ -627,9 +627,9 @@ void QSGPathView::setCurrentIndex(int idx)
     }
 }
 
-QSGItem *QSGPathView::currentItem() const
+QQuickItem *QQuickPathView::currentItem() const
 {
-    Q_D(const QSGPathView);
+    Q_D(const QQuickPathView);
     return d->currentItem;
 }
 
@@ -640,10 +640,10 @@ QSGItem *QSGPathView::currentItem() const
 
     \bold Note: methods should only be called after the Component has completed.
 */
-void QSGPathView::incrementCurrentIndex()
+void QQuickPathView::incrementCurrentIndex()
 {
-    Q_D(QSGPathView);
-    d->moveDirection = QSGPathViewPrivate::Positive;
+    Q_D(QQuickPathView);
+    d->moveDirection = QQuickPathViewPrivate::Positive;
     setCurrentIndex(currentIndex()+1);
 }
 
@@ -654,14 +654,14 @@ void QSGPathView::incrementCurrentIndex()
 
     \bold Note: methods should only be called after the Component has completed.
 */
-void QSGPathView::decrementCurrentIndex()
+void QQuickPathView::decrementCurrentIndex()
 {
-    Q_D(QSGPathView);
+    Q_D(QQuickPathView);
     if (d->model && d->modelCount) {
         int idx = currentIndex()-1;
         if (idx < 0)
             idx = d->modelCount - 1;
-        d->moveDirection = QSGPathViewPrivate::Negative;
+        d->moveDirection = QQuickPathViewPrivate::Negative;
         setCurrentIndex(idx);
     }
 }
@@ -672,22 +672,22 @@ void QSGPathView::decrementCurrentIndex()
     The offset specifies how far along the path the items are from their initial positions.
     This is a real number that ranges from 0.0 to the count of items in the model.
 */
-qreal QSGPathView::offset() const
+qreal QQuickPathView::offset() const
 {
-    Q_D(const QSGPathView);
+    Q_D(const QQuickPathView);
     return d->offset;
 }
 
-void QSGPathView::setOffset(qreal offset)
+void QQuickPathView::setOffset(qreal offset)
 {
-    Q_D(QSGPathView);
+    Q_D(QQuickPathView);
     d->setOffset(offset);
     d->updateCurrent();
 }
 
-void QSGPathViewPrivate::setOffset(qreal o)
+void QQuickPathViewPrivate::setOffset(qreal o)
 {
-    Q_Q(QSGPathView);
+    Q_Q(QQuickPathView);
     if (offset != o) {
         if (isValid() && q->isComponentComplete()) {
             offset = qmlMod(o, qreal(modelCount));
@@ -701,7 +701,7 @@ void QSGPathViewPrivate::setOffset(qreal o)
     }
 }
 
-void QSGPathViewPrivate::setAdjustedOffset(qreal o)
+void QQuickPathViewPrivate::setAdjustedOffset(qreal o)
 {
     setOffset(o+offsetAdj);
 }
@@ -730,15 +730,15 @@ void QSGPathViewPrivate::setAdjustedOffset(qreal o)
     \sa highlightItem, highlightRangeMode
 */
 
-QDeclarativeComponent *QSGPathView::highlight() const
+QDeclarativeComponent *QQuickPathView::highlight() const
 {
-    Q_D(const QSGPathView);
+    Q_D(const QQuickPathView);
     return d->highlightComponent;
 }
 
-void QSGPathView::setHighlight(QDeclarativeComponent *highlight)
+void QQuickPathView::setHighlight(QDeclarativeComponent *highlight)
 {
-    Q_D(QSGPathView);
+    Q_D(QQuickPathView);
     if (highlight != d->highlightComponent) {
         d->highlightComponent = highlight;
         d->createHighlight();
@@ -755,9 +755,9 @@ void QSGPathView::setHighlight(QDeclarativeComponent *highlight)
 
   \sa highlight
 */
-QSGItem *QSGPathView::highlightItem()
+QQuickItem *QQuickPathView::highlightItem()
 {
-    Q_D(const QSGPathView);
+    Q_D(const QQuickPathView);
     return d->highlightItem;
 }
 /*!
@@ -795,15 +795,15 @@ QSGItem *QSGPathView::highlightItem()
     Note that a valid range requires preferredHighlightEnd to be greater
     than or equal to preferredHighlightBegin.
 */
-qreal QSGPathView::preferredHighlightBegin() const
+qreal QQuickPathView::preferredHighlightBegin() const
 {
-    Q_D(const QSGPathView);
+    Q_D(const QQuickPathView);
     return d->highlightRangeStart;
 }
 
-void QSGPathView::setPreferredHighlightBegin(qreal start)
+void QQuickPathView::setPreferredHighlightBegin(qreal start)
 {
-    Q_D(QSGPathView);
+    Q_D(QQuickPathView);
     if (d->highlightRangeStart == start || start < 0 || start > 1.0)
         return;
     d->highlightRangeStart = start;
@@ -812,15 +812,15 @@ void QSGPathView::setPreferredHighlightBegin(qreal start)
     emit preferredHighlightBeginChanged();
 }
 
-qreal QSGPathView::preferredHighlightEnd() const
+qreal QQuickPathView::preferredHighlightEnd() const
 {
-    Q_D(const QSGPathView);
+    Q_D(const QQuickPathView);
     return d->highlightRangeEnd;
 }
 
-void QSGPathView::setPreferredHighlightEnd(qreal end)
+void QQuickPathView::setPreferredHighlightEnd(qreal end)
 {
-    Q_D(QSGPathView);
+    Q_D(QQuickPathView);
     if (d->highlightRangeEnd == end || end < 0 || end > 1.0)
         return;
     d->highlightRangeEnd = end;
@@ -829,15 +829,15 @@ void QSGPathView::setPreferredHighlightEnd(qreal end)
     emit preferredHighlightEndChanged();
 }
 
-QSGPathView::HighlightRangeMode QSGPathView::highlightRangeMode() const
+QQuickPathView::HighlightRangeMode QQuickPathView::highlightRangeMode() const
 {
-    Q_D(const QSGPathView);
+    Q_D(const QQuickPathView);
     return d->highlightRangeMode;
 }
 
-void QSGPathView::setHighlightRangeMode(HighlightRangeMode mode)
+void QQuickPathView::setHighlightRangeMode(HighlightRangeMode mode)
 {
-    Q_D(QSGPathView);
+    Q_D(QQuickPathView);
     if (d->highlightRangeMode == mode)
         return;
     d->highlightRangeMode = mode;
@@ -854,15 +854,15 @@ void QSGPathView::setHighlightRangeMode(HighlightRangeMode mode)
 
     The default value for the duration is 300ms.
 */
-int QSGPathView::highlightMoveDuration() const
+int QQuickPathView::highlightMoveDuration() const
 {
-    Q_D(const QSGPathView);
+    Q_D(const QQuickPathView);
     return d->highlightMoveDuration;
 }
 
-void QSGPathView::setHighlightMoveDuration(int duration)
+void QQuickPathView::setHighlightMoveDuration(int duration)
 {
-    Q_D(QSGPathView);
+    Q_D(QQuickPathView);
     if (d->highlightMoveDuration == duration)
         return;
     d->highlightMoveDuration = duration;
@@ -877,15 +877,15 @@ void QSGPathView::setHighlightMoveDuration(int duration)
     dragMargin is greater than zero, a drag can be initiated by clicking
     within dragMargin pixels of the path.
 */
-qreal QSGPathView::dragMargin() const
+qreal QQuickPathView::dragMargin() const
 {
-    Q_D(const QSGPathView);
+    Q_D(const QQuickPathView);
     return d->dragMargin;
 }
 
-void QSGPathView::setDragMargin(qreal dragMargin)
+void QQuickPathView::setDragMargin(qreal dragMargin)
 {
-    Q_D(QSGPathView);
+    Q_D(QQuickPathView);
     if (d->dragMargin == dragMargin)
         return;
     d->dragMargin = dragMargin;
@@ -898,15 +898,15 @@ void QSGPathView::setDragMargin(qreal dragMargin)
 
     The default is 100.
 */
-qreal QSGPathView::flickDeceleration() const
+qreal QQuickPathView::flickDeceleration() const
 {
-    Q_D(const QSGPathView);
+    Q_D(const QQuickPathView);
     return d->deceleration;
 }
 
-void QSGPathView::setFlickDeceleration(qreal dec)
+void QQuickPathView::setFlickDeceleration(qreal dec)
 {
-    Q_D(QSGPathView);
+    Q_D(QQuickPathView);
     if (d->deceleration == dec)
         return;
     d->deceleration = dec;
@@ -921,15 +921,15 @@ void QSGPathView::setFlickDeceleration(qreal dec)
     This property is useful for temporarily disabling flicking. This allows
     special interaction with PathView's children.
 */
-bool QSGPathView::isInteractive() const
+bool QQuickPathView::isInteractive() const
 {
-    Q_D(const QSGPathView);
+    Q_D(const QQuickPathView);
     return d->interactive;
 }
 
-void QSGPathView::setInteractive(bool interactive)
+void QQuickPathView::setInteractive(bool interactive)
 {
-    Q_D(QSGPathView);
+    Q_D(QQuickPathView);
     if (interactive != d->interactive) {
         d->interactive = interactive;
         if (!interactive)
@@ -944,9 +944,9 @@ void QSGPathView::setInteractive(bool interactive)
     This property holds whether the view is currently moving
     due to the user either dragging or flicking the view.
 */
-bool QSGPathView::isMoving() const
+bool QQuickPathView::isMoving() const
 {
-    Q_D(const QSGPathView);
+    Q_D(const QQuickPathView);
     return d->moving;
 }
 
@@ -956,9 +956,9 @@ bool QSGPathView::isMoving() const
     This property holds whether the view is currently moving
     due to the user flicking the view.
 */
-bool QSGPathView::isFlicking() const
+bool QQuickPathView::isFlicking() const
 {
-    Q_D(const QSGPathView);
+    Q_D(const QQuickPathView);
     return d->flicking;
 }
 
@@ -1011,27 +1011,27 @@ bool QSGPathView::isFlicking() const
     Here is an example delegate:
     \snippet doc/src/snippets/declarative/pathview/pathview.qml 1
 */
-QDeclarativeComponent *QSGPathView::delegate() const
+QDeclarativeComponent *QQuickPathView::delegate() const
 {
-    Q_D(const QSGPathView);
+    Q_D(const QQuickPathView);
      if (d->model) {
-        if (QSGVisualDataModel *dataModel = qobject_cast<QSGVisualDataModel*>(d->model))
+        if (QQuickVisualDataModel *dataModel = qobject_cast<QQuickVisualDataModel*>(d->model))
             return dataModel->delegate();
     }
 
     return 0;
 }
 
-void QSGPathView::setDelegate(QDeclarativeComponent *delegate)
+void QQuickPathView::setDelegate(QDeclarativeComponent *delegate)
 {
-    Q_D(QSGPathView);
+    Q_D(QQuickPathView);
     if (delegate == this->delegate())
         return;
     if (!d->ownModel) {
-        d->model = new QSGVisualDataModel(qmlContext(this));
+        d->model = new QQuickVisualDataModel(qmlContext(this));
         d->ownModel = true;
     }
-    if (QSGVisualDataModel *dataModel = qobject_cast<QSGVisualDataModel*>(d->model)) {
+    if (QQuickVisualDataModel *dataModel = qobject_cast<QQuickVisualDataModel*>(d->model)) {
         int oldCount = dataModel->count();
         dataModel->setDelegate(delegate);
         d->modelCount = dataModel->count();
@@ -1046,15 +1046,15 @@ void QSGPathView::setDelegate(QDeclarativeComponent *delegate)
   \qmlproperty int QtQuick2::PathView::pathItemCount
   This property holds the number of items visible on the path at any one time.
 */
-int QSGPathView::pathItemCount() const
+int QQuickPathView::pathItemCount() const
 {
-    Q_D(const QSGPathView);
+    Q_D(const QQuickPathView);
     return d->pathItems;
 }
 
-void QSGPathView::setPathItemCount(int i)
+void QQuickPathView::setPathItemCount(int i)
 {
-    Q_D(QSGPathView);
+    Q_D(QQuickPathView);
     if (i == d->pathItems)
         return;
     if (i < 1)
@@ -1067,7 +1067,7 @@ void QSGPathView::setPathItemCount(int i)
     emit pathItemCountChanged();
 }
 
-QPointF QSGPathViewPrivate::pointNear(const QPointF &point, qreal *nearPercent) const
+QPointF QQuickPathViewPrivate::pointNear(const QPointF &point, qreal *nearPercent) const
 {
     //XXX maybe do recursively at increasing resolution.
     qreal mindist = 1e10; // big number
@@ -1090,20 +1090,20 @@ QPointF QSGPathViewPrivate::pointNear(const QPointF &point, qreal *nearPercent)
     return nearPoint;
 }
 
-void QSGPathView::mousePressEvent(QMouseEvent *event)
+void QQuickPathView::mousePressEvent(QMouseEvent *event)
 {
-    Q_D(QSGPathView);
+    Q_D(QQuickPathView);
     if (d->interactive) {
         d->handleMousePressEvent(event);
         event->accept();
     } else {
-        QSGItem::mousePressEvent(event);
+        QQuickItem::mousePressEvent(event);
     }
 }
 
-void QSGPathViewPrivate::handleMousePressEvent(QMouseEvent *event)
+void QQuickPathViewPrivate::handleMousePressEvent(QMouseEvent *event)
 {
-    Q_Q(QSGPathView);
+    Q_Q(QQuickPathView);
     if (!interactive || !items.count())
         return;
     QPointF scenePoint = q->mapToScene(event->localPos());
@@ -1131,26 +1131,26 @@ void QSGPathViewPrivate::handleMousePressEvent(QMouseEvent *event)
 
     lastElapsed = 0;
     lastDist = 0;
-    QSGItemPrivate::start(lastPosTime);
+    QQuickItemPrivate::start(lastPosTime);
     tl.clear();
 }
 
-void QSGPathView::mouseMoveEvent(QMouseEvent *event)
+void QQuickPathView::mouseMoveEvent(QMouseEvent *event)
 {
-    Q_D(QSGPathView);
+    Q_D(QQuickPathView);
     if (d->interactive) {
         d->handleMouseMoveEvent(event);
         if (d->stealMouse)
             setKeepMouseGrab(true);
         event->accept();
     } else {
-        QSGItem::mouseMoveEvent(event);
+        QQuickItem::mouseMoveEvent(event);
     }
 }
 
-void QSGPathViewPrivate::handleMouseMoveEvent(QMouseEvent *event)
+void QQuickPathViewPrivate::handleMouseMoveEvent(QMouseEvent *event)
 {
-    Q_Q(QSGPathView);
+    Q_Q(QQuickPathView);
     if (!interactive || !lastPosTime.isValid())
         return;
 
@@ -1165,7 +1165,7 @@ void QSGPathViewPrivate::handleMouseMoveEvent(QMouseEvent *event)
     }
 
     if (stealMouse) {
-        moveReason = QSGPathViewPrivate::Mouse;
+        moveReason = QQuickPathViewPrivate::Mouse;
         qreal diff = (newPc - startPc)*modelCount*mappedRange;
         if (diff) {
             q->setOffset(offset + diff);
@@ -1175,7 +1175,7 @@ void QSGPathViewPrivate::handleMouseMoveEvent(QMouseEvent *event)
             else if (diff < -modelCount/2)
                 diff += modelCount;
 
-            lastElapsed = QSGItemPrivate::restart(lastPosTime);
+            lastElapsed = QQuickItemPrivate::restart(lastPosTime);
             lastDist = diff;
             startPc = newPc;
         }
@@ -1187,27 +1187,27 @@ void QSGPathViewPrivate::handleMouseMoveEvent(QMouseEvent *event)
     }
 }
 
-void QSGPathView::mouseReleaseEvent(QMouseEvent *event)
+void QQuickPathView::mouseReleaseEvent(QMouseEvent *event)
 {
-    Q_D(QSGPathView);
+    Q_D(QQuickPathView);
     if (d->interactive) {
         d->handleMouseReleaseEvent(event);
         event->accept();
         ungrabMouse();
     } else {
-        QSGItem::mouseReleaseEvent(event);
+        QQuickItem::mouseReleaseEvent(event);
     }
 }
 
-void QSGPathViewPrivate::handleMouseReleaseEvent(QMouseEvent *)
+void QQuickPathViewPrivate::handleMouseReleaseEvent(QMouseEvent *)
 {
-    Q_Q(QSGPathView);
+    Q_Q(QQuickPathView);
     stealMouse = false;
     q->setKeepMouseGrab(false);
     if (!interactive || !lastPosTime.isValid())
         return;
 
-    qreal elapsed = qreal(lastElapsed + QSGItemPrivate::elapsed(lastPosTime)) / 1000.;
+    qreal elapsed = qreal(lastElapsed + QQuickItemPrivate::elapsed(lastPosTime)) / 1000.;
     qreal velocity = elapsed > 0. ? lastDist / elapsed : 0;
     if (model && modelCount && qAbs(velocity) > 1.) {
         qreal count = pathItems == -1 ? modelCount : pathItems;
@@ -1218,7 +1218,7 @@ void QSGPathViewPrivate::handleMouseReleaseEvent(QMouseEvent *)
         qreal accel = deceleration/10;
         // + 0.25 to encourage moving at least one item in the flick direction
         qreal dist = qMin(qreal(modelCount-1), qreal(v2 / (accel * 2.0) + 0.25));
-        if (haveHighlightRange && highlightRangeMode == QSGPathView::StrictlyEnforceRange) {
+        if (haveHighlightRange && highlightRangeMode == QQuickPathView::StrictlyEnforceRange) {
             // round to nearest item.
             if (velocity > 0.)
                 dist = qRound(dist + offset) - offset;
@@ -1250,12 +1250,12 @@ void QSGPathViewPrivate::handleMouseReleaseEvent(QMouseEvent *)
         q->movementEnding();
 }
 
-bool QSGPathView::sendMouseEvent(QMouseEvent *event)
+bool QQuickPathView::sendMouseEvent(QMouseEvent *event)
 {
-    Q_D(QSGPathView);
+    Q_D(QQuickPathView);
     QRectF myRect = mapRectToScene(QRectF(0, 0, width(), height()));
-    QSGCanvas *c = canvas();
-    QSGItem *grabber = c ? c->mouseGrabberItem() : 0;
+    QQuickCanvas *c = canvas();
+    QQuickItem *grabber = c ? c->mouseGrabberItem() : 0;
     bool stealThisEvent = d->stealMouse;
     if ((stealThisEvent || myRect.contains(event->windowPos())) && (!grabber || !grabber->keepMouseGrab())) {
         QMouseEvent mouseEvent(event->type(), mapFromScene(event->windowPos()), event->windowPos(), event->screenPos(),
@@ -1290,11 +1290,11 @@ bool QSGPathView::sendMouseEvent(QMouseEvent *event)
     return false;
 }
 
-bool QSGPathView::childMouseEventFilter(QSGItem *i, QEvent *e)
+bool QQuickPathView::childMouseEventFilter(QQuickItem *i, QEvent *e)
 {
-    Q_D(QSGPathView);
+    Q_D(QQuickPathView);
     if (!isVisible() || !d->interactive)
-        return QSGItem::childMouseEventFilter(i, e);
+        return QQuickItem::childMouseEventFilter(i, e);
 
     switch (e->type()) {
     case QEvent::MouseButtonPress:
@@ -1305,12 +1305,12 @@ bool QSGPathView::childMouseEventFilter(QSGItem *i, QEvent *e)
         break;
     }
 
-    return QSGItem::childMouseEventFilter(i, e);
+    return QQuickItem::childMouseEventFilter(i, e);
 }
 
-void QSGPathView::mouseUngrabEvent()
+void QQuickPathView::mouseUngrabEvent()
 {
-    Q_D(QSGPathView);
+    Q_D(QQuickPathView);
     if (d->stealMouse) {
         // if our mouse grab has been removed (probably by a Flickable),
         // fix our state
@@ -1320,19 +1320,19 @@ void QSGPathView::mouseUngrabEvent()
     }
 }
 
-void QSGPathView::updatePolish()
+void QQuickPathView::updatePolish()
 {
-    QSGItem::updatePolish();
+    QQuickItem::updatePolish();
     refill();
 }
 
-void QSGPathView::componentComplete()
+void QQuickPathView::componentComplete()
 {
-    Q_D(QSGPathView);
+    Q_D(QQuickPathView);
     if (d->model && d->ownModel)
-        static_cast<QSGVisualDataModel *>(d->model.data())->componentComplete();
+        static_cast<QQuickVisualDataModel *>(d->model.data())->componentComplete();
 
-    QSGItem::componentComplete();
+    QQuickItem::componentComplete();
 
     d->createHighlight();
     // It is possible that a refill has already happended to to Path
@@ -1348,9 +1348,9 @@ void QSGPathView::componentComplete()
         emit countChanged();
 }
 
-void QSGPathView::refill()
+void QQuickPathView::refill()
 {
-    Q_D(QSGPathView);
+    Q_D(QQuickPathView);
     if (!d->isValid() || !isComponentComplete())
         return;
 
@@ -1359,10 +1359,10 @@ void QSGPathView::refill()
 
     // first move existing items and remove items off path
     int idx = d->firstIndex;
-    QList<QSGItem*>::iterator it = d->items.begin();
+    QList<QQuickItem*>::iterator it = d->items.begin();
     while (it != d->items.end()) {
         qreal pos = d->positionOfIndex(idx);
-        QSGItem *item = *it;
+        QQuickItem *item = *it;
         if (pos >= 0.0) {
             d->updateItem(item, pos);
             if (idx == d->currentIndex) {
@@ -1393,7 +1393,7 @@ void QSGPathView::refill()
         if (d->items.count() < count) {
             int idx = qRound(d->modelCount - d->offset) % d->modelCount;
             qreal startPos = 0.0;
-            if (d->haveHighlightRange && d->highlightRangeMode != QSGPathView::NoHighlightRange)
+            if (d->haveHighlightRange && d->highlightRangeMode != QQuickPathView::NoHighlightRange)
                 startPos = d->highlightRangeStart;
             if (d->firstIndex >= 0) {
                 startPos = d->positionOfIndex(d->firstIndex);
@@ -1402,7 +1402,7 @@ void QSGPathView::refill()
             qreal pos = d->positionOfIndex(idx);
             while ((pos > startPos || !d->items.count()) && d->items.count() < count) {
                 // qDebug() << "append" << idx;
-                QSGItem *item = d->getItem(idx);
+                QQuickItem *item = d->getItem(idx);
                 if (d->model->completePending())
                     item->setZ(idx+1);
                 if (d->currentIndex == idx) {
@@ -1427,7 +1427,7 @@ void QSGPathView::refill()
             pos = d->positionOfIndex(idx);
             while ((pos >= 0.0 && pos < startPos) && d->items.count() < count) {
                 // qDebug() << "prepend" << idx;
-                QSGItem *item = d->getItem(idx);
+                QQuickItem *item = d->getItem(idx);
                 if (d->model->completePending())
                     item->setZ(idx+1);
                 if (d->currentIndex == idx) {
@@ -1450,12 +1450,12 @@ void QSGPathView::refill()
     if (!currentVisible) {
         d->currentItemOffset = 1.0;
         if (d->currentItem) {
-            if (QSGPathViewAttached *att = d->attached(d->currentItem))
+            if (QQuickPathViewAttached *att = d->attached(d->currentItem))
                 att->setOnPath(false);
         } else if (d->currentIndex >= 0 && d->currentIndex < d->modelCount) {
             d->currentItem = d->getItem(d->currentIndex, false);
             d->updateItem(d->currentItem, d->currentIndex < d->firstIndex ? 0.0 : 1.0);
-            if (QSGPathViewAttached *att = d->attached(d->currentItem))
+            if (QQuickPathViewAttached *att = d->attached(d->currentItem))
                 att->setIsCurrentItem(true);
             if (d->model->completePending())
                 d->model->completeItem();
@@ -1463,26 +1463,26 @@ void QSGPathView::refill()
     } else if (!d->currentItem) {
         d->currentItem = d->model->item(d->currentIndex, true);
         d->currentItem->setFocus(true);
-        if (QSGPathViewAttached *att = d->attached(d->currentItem))
+        if (QQuickPathViewAttached *att = d->attached(d->currentItem))
             att->setIsCurrentItem(true);
     }
 
-    if (d->highlightItem && d->haveHighlightRange && d->highlightRangeMode == QSGPathView::StrictlyEnforceRange) {
+    if (d->highlightItem && d->haveHighlightRange && d->highlightRangeMode == QQuickPathView::StrictlyEnforceRange) {
         d->updateItem(d->highlightItem, d->highlightRangeStart);
-        if (QSGPathViewAttached *att = d->attached(d->highlightItem))
+        if (QQuickPathViewAttached *att = d->attached(d->highlightItem))
             att->setOnPath(true);
-    } else if (d->highlightItem && d->moveReason != QSGPathViewPrivate::SetIndex) {
+    } else if (d->highlightItem && d->moveReason != QQuickPathViewPrivate::SetIndex) {
         d->updateItem(d->highlightItem, d->currentItemOffset);
-        if (QSGPathViewAttached *att = d->attached(d->highlightItem))
+        if (QQuickPathViewAttached *att = d->attached(d->highlightItem))
             att->setOnPath(currentVisible);
     }
     while (d->itemCache.count())
         d->releaseItem(d->itemCache.takeLast());
 }
 
-void QSGPathView::modelUpdated(const QDeclarativeChangeSet &changeSet, bool reset)
+void QQuickPathView::modelUpdated(const QDeclarativeChangeSet &changeSet, bool reset)
 {
-    Q_D(QSGPathView);
+    Q_D(QQuickPathView);
     if (!d->model || !d->model->isValid() || !d->path || !isComponentComplete())
         return;
 
@@ -1515,7 +1515,7 @@ void QSGPathView::modelUpdated(const QDeclarativeChangeSet &changeSet, bool rese
                 moveId = r.moveId;
                 moveOffset = d->currentIndex - r.index;
             } else if (d->currentItem) {
-                if (QSGPathViewAttached *att = d->attached(d->currentItem))
+                if (QQuickPathViewAttached *att = d->attached(d->currentItem))
                     att->setIsCurrentItem(true);
                 d->releaseItem(d->currentItem);
                 d->currentItem = 0;
@@ -1559,7 +1559,7 @@ void QSGPathView::modelUpdated(const QDeclarativeChangeSet &changeSet, bool rese
     } else if (removed) {
         d->regenerate();
         d->updateCurrent();
-        if (!d->flicking && !d->moving && d->haveHighlightRange && d->highlightRangeMode == QSGPathView::StrictlyEnforceRange)
+        if (!d->flicking && !d->moving && d->haveHighlightRange && d->highlightRangeMode == QQuickPathView::StrictlyEnforceRange)
             d->snapToCurrent();
     } else if (inserted) {
         d->firstIndex = -1;
@@ -1574,18 +1574,18 @@ void QSGPathView::modelUpdated(const QDeclarativeChangeSet &changeSet, bool rese
         emit countChanged();
 }
 
-void QSGPathView::createdItem(int index, QSGItem *item)
+void QQuickPathView::createdItem(int index, QQuickItem *item)
 {
-    Q_D(QSGPathView);
+    Q_D(QQuickPathView);
     if (d->requestedIndex != index) {
         if (!d->attType) {
             // pre-create one metatype to share with all attached objects
-            d->attType = new QDeclarativeOpenMetaObjectType(&QSGPathViewAttached::staticMetaObject, qmlEngine(this));
+            d->attType = new QDeclarativeOpenMetaObjectType(&QQuickPathViewAttached::staticMetaObject, qmlEngine(this));
             foreach (const QString &attr, d->path->attributes())
                 d->attType->createProperty(attr.toUtf8());
         }
         qPathViewAttachedType = d->attType;
-        QSGPathViewAttached *att = static_cast<QSGPathViewAttached *>(qmlAttachedPropertiesObject<QSGPathView>(item));
+        QQuickPathViewAttached *att = static_cast<QQuickPathViewAttached *>(qmlAttachedPropertiesObject<QQuickPathView>(item));
         qPathViewAttachedType = 0;
         if (att) {
             att->m_view = this;
@@ -1596,20 +1596,20 @@ void QSGPathView::createdItem(int index, QSGItem *item)
     }
 }
 
-void QSGPathView::destroyingItem(QSGItem *item)
+void QQuickPathView::destroyingItem(QQuickItem *item)
 {
     Q_UNUSED(item);
 }
 
-void QSGPathView::ticked()
+void QQuickPathView::ticked()
 {
-    Q_D(QSGPathView);
+    Q_D(QQuickPathView);
     d->updateCurrent();
 }
 
-void QSGPathView::movementEnding()
+void QQuickPathView::movementEnding()
 {
-    Q_D(QSGPathView);
+    Q_D(QQuickPathView);
     if (d->flicking) {
         d->flicking = false;
         emit flickingChanged();
@@ -1623,7 +1623,7 @@ void QSGPathView::movementEnding()
 }
 
 // find the item closest to the snap position
-int QSGPathViewPrivate::calcCurrentIndex()
+int QQuickPathViewPrivate::calcCurrentIndex()
 {
     int current = -1;
     if (modelCount && model && items.count()) {
@@ -1637,18 +1637,18 @@ int QSGPathViewPrivate::calcCurrentIndex()
     return current;
 }
 
-void QSGPathViewPrivate::updateCurrent()
+void QQuickPathViewPrivate::updateCurrent()
 {
-    Q_Q(QSGPathView);
+    Q_Q(QQuickPathView);
     if (moveReason != Mouse)
         return;
-    if (!modelCount || !haveHighlightRange || highlightRangeMode != QSGPathView::StrictlyEnforceRange)
+    if (!modelCount || !haveHighlightRange || highlightRangeMode != QQuickPathView::StrictlyEnforceRange)
         return;
 
     int idx = calcCurrentIndex();
     if (model && idx != currentIndex) {
         if (currentItem) {
-            if (QSGPathViewAttached *att = attached(currentItem))
+            if (QQuickPathViewAttached *att = attached(currentItem))
                 att->setIsCurrentItem(false);
             releaseItem(currentItem);
         }
@@ -1658,12 +1658,12 @@ void QSGPathViewPrivate::updateCurrent()
         if (itemIndex < items.count()) {
             currentItem = model->item(currentIndex, true);
             currentItem->setFocus(true);
-            if (QSGPathViewAttached *att = attached(currentItem))
+            if (QQuickPathViewAttached *att = attached(currentItem))
                 att->setIsCurrentItem(true);
         } else if (currentIndex >= 0 && currentIndex < modelCount) {
             currentItem = getItem(currentIndex, false);
             updateItem(currentItem, currentIndex < firstIndex ? 0.0 : 1.0);
-            if (QSGPathViewAttached *att = attached(currentItem))
+            if (QQuickPathViewAttached *att = attached(currentItem))
                 att->setIsCurrentItem(true);
             if (model->completePending())
                 model->completeItem();
@@ -1672,16 +1672,16 @@ void QSGPathViewPrivate::updateCurrent()
     }
 }
 
-void QSGPathViewPrivate::fixOffsetCallback(void *d)
+void QQuickPathViewPrivate::fixOffsetCallback(void *d)
 {
-    ((QSGPathViewPrivate *)d)->fixOffset();
+    ((QQuickPathViewPrivate *)d)->fixOffset();
 }
 
-void QSGPathViewPrivate::fixOffset()
+void QQuickPathViewPrivate::fixOffset()
 {
-    Q_Q(QSGPathView);
+    Q_Q(QQuickPathView);
     if (model && items.count()) {
-        if (haveHighlightRange && highlightRangeMode == QSGPathView::StrictlyEnforceRange) {
+        if (haveHighlightRange && highlightRangeMode == QQuickPathView::StrictlyEnforceRange) {
             int curr = calcCurrentIndex();
             if (curr != currentIndex)
                 q->setCurrentIndex(curr);
@@ -1691,7 +1691,7 @@ void QSGPathViewPrivate::fixOffset()
     }
 }
 
-void QSGPathViewPrivate::snapToCurrent()
+void QQuickPathViewPrivate::snapToCurrent()
 {
     if (!model || modelCount <= 0)
         return;
@@ -1729,9 +1729,9 @@ void QSGPathViewPrivate::snapToCurrent()
     moveDirection = Shortest;
 }
 
-QSGPathViewAttached *QSGPathView::qmlAttachedProperties(QObject *obj)
+QQuickPathViewAttached *QQuickPathView::qmlAttachedProperties(QObject *obj)
 {
-    return new QSGPathViewAttached(obj);
+    return new QQuickPathViewAttached(obj);
 }
 
 QT_END_NAMESPACE
diff --git a/src/declarative/items/qsgpathview_p.h b/src/declarative/items/qquickpathview_p.h
index b70745ebcb..657d721ae6 100644
--- a/src/declarative/items/qsgpathview_p.h
+++ b/src/declarative/items/qquickpathview_p.h
@@ -40,10 +40,10 @@
 **
 ****************************************************************************/
 
-#ifndef QSGPATHVIEW_P_H
-#define QSGPATHVIEW_P_H
+#ifndef QQUICKPATHVIEW_P_H
+#define QQUICKPATHVIEW_P_H
 
-#include "qsgitem.h"
+#include "qquickitem.h"
 
 #include <private/qdeclarativepath_p.h>
 
@@ -55,20 +55,20 @@ QT_MODULE(Declarative)
 
 class QDeclarativeChangeSet;
 
-class QSGPathViewPrivate;
-class QSGPathViewAttached;
-class Q_AUTOTEST_EXPORT QSGPathView : public QSGItem
+class QQuickPathViewPrivate;
+class QQuickPathViewAttached;
+class Q_AUTOTEST_EXPORT QQuickPathView : public QQuickItem
 {
     Q_OBJECT
 
     Q_PROPERTY(QVariant model READ model WRITE setModel NOTIFY modelChanged)
     Q_PROPERTY(QDeclarativePath *path READ path WRITE setPath NOTIFY pathChanged)
     Q_PROPERTY(int currentIndex READ currentIndex WRITE setCurrentIndex NOTIFY currentIndexChanged)
-    Q_PROPERTY(QSGItem *currentItem READ currentItem NOTIFY currentIndexChanged)
+    Q_PROPERTY(QQuickItem *currentItem READ currentItem NOTIFY currentIndexChanged)
     Q_PROPERTY(qreal offset READ offset WRITE setOffset NOTIFY offsetChanged)
 
     Q_PROPERTY(QDeclarativeComponent *highlight READ highlight WRITE setHighlight NOTIFY highlightChanged)
-    Q_PROPERTY(QSGItem *highlightItem READ highlightItem NOTIFY highlightItemChanged)
+    Q_PROPERTY(QQuickItem *highlightItem READ highlightItem NOTIFY highlightItemChanged)
 
     Q_PROPERTY(qreal preferredHighlightBegin READ preferredHighlightBegin WRITE setPreferredHighlightBegin NOTIFY preferredHighlightBeginChanged)
     Q_PROPERTY(qreal preferredHighlightEnd READ preferredHighlightEnd WRITE setPreferredHighlightEnd NOTIFY preferredHighlightEndChanged)
@@ -89,8 +89,8 @@ class Q_AUTOTEST_EXPORT QSGPathView : public QSGItem
     Q_ENUMS(HighlightRangeMode)
 
 public:
-    QSGPathView(QSGItem *parent=0);
-    virtual ~QSGPathView();
+    QQuickPathView(QQuickItem *parent=0);
+    virtual ~QQuickPathView();
 
     QVariant model() const;
     void setModel(const QVariant &);
@@ -101,14 +101,14 @@ public:
     int currentIndex() const;
     void setCurrentIndex(int idx);
 
-    QSGItem *currentItem() const;
+    QQuickItem *currentItem() const;
 
     qreal offset() const;
     void setOffset(qreal offset);
 
     QDeclarativeComponent *highlight() const;
     void setHighlight(QDeclarativeComponent *highlight);
-    QSGItem *highlightItem();
+    QQuickItem *highlightItem();
 
     enum HighlightRangeMode { NoHighlightRange, ApplyRange, StrictlyEnforceRange };
     HighlightRangeMode highlightRangeMode() const;
@@ -143,7 +143,7 @@ public:
     int pathItemCount() const;
     void setPathItemCount(int);
 
-    static QSGPathViewAttached *qmlAttachedProperties(QObject *);
+    static QQuickPathViewAttached *qmlAttachedProperties(QObject *);
 
 public Q_SLOTS:
     void incrementCurrentIndex();
@@ -180,7 +180,7 @@ protected:
     void mouseMoveEvent(QMouseEvent *event);
     void mouseReleaseEvent(QMouseEvent *);
     bool sendMouseEvent(QMouseEvent *event);
-    bool childMouseEventFilter(QSGItem *, QEvent *);
+    bool childMouseEventFilter(QQuickItem *, QEvent *);
     void mouseUngrabEvent();
     void componentComplete();
 
@@ -189,30 +189,30 @@ private Q_SLOTS:
     void ticked();
     void movementEnding();
     void modelUpdated(const QDeclarativeChangeSet &changeSet, bool reset);
-    void createdItem(int index, QSGItem *item);
-    void destroyingItem(QSGItem *item);
+    void createdItem(int index, QQuickItem *item);
+    void destroyingItem(QQuickItem *item);
     void pathUpdated();
 
 private:
-    friend class QSGPathViewAttached;
-    Q_DISABLE_COPY(QSGPathView)
-    Q_DECLARE_PRIVATE(QSGPathView)
+    friend class QQuickPathViewAttached;
+    Q_DISABLE_COPY(QQuickPathView)
+    Q_DECLARE_PRIVATE(QQuickPathView)
 };
 
 class QDeclarativeOpenMetaObject;
-class QSGPathViewAttached : public QObject
+class QQuickPathViewAttached : public QObject
 {
     Q_OBJECT
 
-    Q_PROPERTY(QSGPathView *view READ view CONSTANT)
+    Q_PROPERTY(QQuickPathView *view READ view CONSTANT)
     Q_PROPERTY(bool isCurrentItem READ isCurrentItem NOTIFY currentItemChanged)
     Q_PROPERTY(bool onPath READ isOnPath NOTIFY pathChanged)
 
 public:
-    QSGPathViewAttached(QObject *parent);
-    ~QSGPathViewAttached();
+    QQuickPathViewAttached(QObject *parent);
+    ~QQuickPathViewAttached();
 
-    QSGPathView *view() { return m_view; }
+    QQuickPathView *view() { return m_view; }
 
     bool isCurrentItem() const { return m_isCurrent; }
     void setIsCurrentItem(bool c) {
@@ -239,9 +239,9 @@ Q_SIGNALS:
     void pathChanged();
 
 private:
-    friend class QSGPathViewPrivate;
-    friend class QSGPathView;
-    QSGPathView *m_view;
+    friend class QQuickPathViewPrivate;
+    friend class QQuickPathView;
+    QQuickPathView *m_view;
     QDeclarativeOpenMetaObject *m_metaobject;
     bool m_onPath : 1;
     bool m_isCurrent : 1;
@@ -250,8 +250,8 @@ private:
 
 QT_END_NAMESPACE
 
-QML_DECLARE_TYPE(QSGPathView)
-QML_DECLARE_TYPEINFO(QSGPathView, QML_HAS_ATTACHED_PROPERTIES)
+QML_DECLARE_TYPE(QQuickPathView)
+QML_DECLARE_TYPEINFO(QQuickPathView, QML_HAS_ATTACHED_PROPERTIES)
 QT_END_HEADER
 
-#endif // QSGPATHVIEW_P_H
+#endif // QQUICKPATHVIEW_P_H
diff --git a/src/declarative/items/qsgpathview_p_p.h b/src/declarative/items/qquickpathview_p_p.h
index 10549d9709..87d9313645 100644
--- a/src/declarative/items/qsgpathview_p_p.h
+++ b/src/declarative/items/qquickpathview_p_p.h
@@ -40,8 +40,8 @@
 **
 ****************************************************************************/
 
-#ifndef QDECLARATIVEPATHVIEW_P_H
-#define QDECLARATIVEPATHVIEW_P_H
+#ifndef QQUICKPATHVIEW_P_P_H
+#define QQUICKPATHVIEW_P_P_H
 
 //
 //  W A R N I N G
@@ -54,9 +54,9 @@
 // We mean it.
 //
 
-#include "qsgpathview_p.h"
-#include "qsgitem_p.h"
-#include "qsgvisualdatamodel_p.h"
+#include "qquickpathview_p.h"
+#include "qquickitem_p.h"
+#include "qquickvisualdatamodel_p.h"
 
 #include <QtDeclarative/qdeclarative.h>
 #include <QtCore/qdatetime.h>
@@ -69,52 +69,52 @@
 QT_BEGIN_NAMESPACE
 
 class QDeclarativeOpenMetaObjectType;
-class QSGPathViewAttached;
-class QSGPathViewPrivate : public QSGItemPrivate, public QSGItemChangeListener
+class QQuickPathViewAttached;
+class QQuickPathViewPrivate : public QQuickItemPrivate, public QQuickItemChangeListener
 {
-    Q_DECLARE_PUBLIC(QSGPathView)
+    Q_DECLARE_PUBLIC(QQuickPathView)
 
 public:
-    QSGPathViewPrivate()
+    QQuickPathViewPrivate()
       : path(0), currentIndex(0), currentItemOffset(0.0), startPc(0), lastDist(0)
         , lastElapsed(0), offset(0.0), offsetAdj(0.0), mappedRange(1.0)
         , stealMouse(false), ownModel(false), interactive(true), haveHighlightRange(true)
         , autoHighlight(true), highlightUp(false), layoutScheduled(false)
         , moving(false), flicking(false)
         , dragMargin(0), deceleration(100)
-        , moveOffset(this, &QSGPathViewPrivate::setAdjustedOffset)
+        , moveOffset(this, &QQuickPathViewPrivate::setAdjustedOffset)
         , firstIndex(-1), pathItems(-1), requestedIndex(-1)
         , moveReason(Other), moveDirection(Shortest), attType(0), highlightComponent(0), highlightItem(0)
-        , moveHighlight(this, &QSGPathViewPrivate::setHighlightPosition)
+        , moveHighlight(this, &QQuickPathViewPrivate::setHighlightPosition)
         , highlightPosition(0)
         , highlightRangeStart(0), highlightRangeEnd(0)
-        , highlightRangeMode(QSGPathView::StrictlyEnforceRange)
+        , highlightRangeMode(QQuickPathView::StrictlyEnforceRange)
         , highlightMoveDuration(300), modelCount(0)
     {
     }
 
     void init();
 
-    void itemGeometryChanged(QSGItem *item, const QRectF &newGeometry, const QRectF &oldGeometry) {
+    void itemGeometryChanged(QQuickItem *item, const QRectF &newGeometry, const QRectF &oldGeometry) {
         if ((newGeometry.size() != oldGeometry.size())
             && (!highlightItem || item != highlightItem)) {
-            if (QSGPathViewAttached *att = attached(item))
+            if (QQuickPathViewAttached *att = attached(item))
                 att->m_percent = -1;
             scheduleLayout();
         }
     }
 
     void scheduleLayout() {
-        Q_Q(QSGPathView);
+        Q_Q(QQuickPathView);
         if (!layoutScheduled) {
             layoutScheduled = true;
             q->polish();
         }
     }
 
-    QSGItem *getItem(int modelIndex, bool onPath = true);
-    void releaseItem(QSGItem *item);
-    QSGPathViewAttached *attached(QSGItem *item);
+    QQuickItem *getItem(int modelIndex, bool onPath = true);
+    void releaseItem(QQuickItem *item);
+    QQuickPathViewAttached *attached(QQuickItem *item);
     void clear();
     void updateMappedRange();
     qreal positionOfIndex(qreal index) const;
@@ -136,13 +136,13 @@ public:
     void setOffset(qreal offset);
     void setAdjustedOffset(qreal offset);
     void regenerate();
-    void updateItem(QSGItem *, qreal);
+    void updateItem(QQuickItem *, qreal);
     void snapToCurrent();
     QPointF pointNear(const QPointF &point, qreal *nearPercent=0) const;
 
     QDeclarativePath *path;
     int currentIndex;
-    QDeclarativeGuard<QSGItem> currentItem;
+    QDeclarativeGuard<QQuickItem> currentItem;
     qreal currentItemOffset;
     qreal startPc;
     QPointF startPoint;
@@ -165,13 +165,13 @@ public:
     qreal dragMargin;
     qreal deceleration;
     QDeclarativeTimeLine tl;
-    QDeclarativeTimeLineValueProxy<QSGPathViewPrivate> moveOffset;
+    QDeclarativeTimeLineValueProxy<QQuickPathViewPrivate> moveOffset;
     int firstIndex;
     int pathItems;
     int requestedIndex;
-    QList<QSGItem *> items;
-    QList<QSGItem *> itemCache;
-    QDeclarativeGuard<QSGVisualModel> model;
+    QList<QQuickItem *> items;
+    QList<QQuickItem *> itemCache;
+    QDeclarativeGuard<QQuickVisualModel> model;
     QVariant modelVariant;
     enum MovementReason { Other, SetIndex, Mouse };
     MovementReason moveReason;
@@ -179,12 +179,12 @@ public:
     MovementDirection moveDirection;
     QDeclarativeOpenMetaObjectType *attType;
     QDeclarativeComponent *highlightComponent;
-    QSGItem *highlightItem;
-    QDeclarativeTimeLineValueProxy<QSGPathViewPrivate> moveHighlight;
+    QQuickItem *highlightItem;
+    QDeclarativeTimeLineValueProxy<QQuickPathViewPrivate> moveHighlight;
     qreal highlightPosition;
     qreal highlightRangeStart;
     qreal highlightRangeEnd;
-    QSGPathView::HighlightRangeMode highlightRangeMode;
+    QQuickPathView::HighlightRangeMode highlightRangeMode;
     int highlightMoveDuration;
     int modelCount;
 };
diff --git a/src/declarative/items/qsgpincharea.cpp b/src/declarative/items/qquickpincharea.cpp
index 2dbe683f26..c1f60ae640 100644
--- a/src/declarative/items/qsgpincharea.cpp
+++ b/src/declarative/items/qquickpincharea.cpp
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#include "qsgpincharea_p_p.h"
-#include "qsgcanvas.h"
+#include "qquickpincharea_p_p.h"
+#include "qquickcanvas.h"
 
 #include <QtGui/qevent.h>
 #include <QtGui/qguiapplication.h>
@@ -52,7 +52,7 @@
 QT_BEGIN_NAMESPACE
 
 /*!
-    \qmlclass PinchEvent QSGPinchEvent
+    \qmlclass PinchEvent QQuickPinchEvent
     \inqmlmodule QtQuick 2
     \ingroup qml-event-elements
     \brief The PinchEvent object provides information about a pinch event.
@@ -147,7 +147,7 @@ QT_BEGIN_NAMESPACE
     all touch points have been released.
 */
 
-QSGPinch::QSGPinch()
+QQuickPinch::QQuickPinch()
     : m_target(0), m_minScale(1.0), m_maxScale(1.0)
     , m_minRotation(0.0), m_maxRotation(0.0)
     , m_axis(NoDrag), m_xmin(-FLT_MAX), m_xmax(FLT_MAX)
@@ -155,13 +155,13 @@ QSGPinch::QSGPinch()
 {
 }
 
-QSGPinchAreaPrivate::~QSGPinchAreaPrivate()
+QQuickPinchAreaPrivate::~QQuickPinchAreaPrivate()
 {
     delete pinch;
 }
 
 /*!
-    \qmlclass PinchArea QSGPinchArea
+    \qmlclass PinchArea QQuickPinchArea
     \inqmlmodule QtQuick 2
     \brief The PinchArea item enables simple pinch gesture handling.
     \inherits Item
@@ -241,14 +241,14 @@ QSGPinchAreaPrivate::~QSGPinchAreaPrivate()
     \endlist
 */
 
-QSGPinchArea::QSGPinchArea(QSGItem *parent)
-  : QSGItem(*(new QSGPinchAreaPrivate), parent)
+QQuickPinchArea::QQuickPinchArea(QQuickItem *parent)
+  : QQuickItem(*(new QQuickPinchAreaPrivate), parent)
 {
-    Q_D(QSGPinchArea);
+    Q_D(QQuickPinchArea);
     d->init();
 }
 
-QSGPinchArea::~QSGPinchArea()
+QQuickPinchArea::~QQuickPinchArea()
 {
 }
 /*!
@@ -257,26 +257,26 @@ QSGPinchArea::~QSGPinchArea()
 
     This property defaults to true.
 */
-bool QSGPinchArea::isEnabled() const
+bool QQuickPinchArea::isEnabled() const
 {
-    Q_D(const QSGPinchArea);
+    Q_D(const QQuickPinchArea);
     return d->absorb;
 }
 
-void QSGPinchArea::setEnabled(bool a)
+void QQuickPinchArea::setEnabled(bool a)
 {
-    Q_D(QSGPinchArea);
+    Q_D(QQuickPinchArea);
     if (a != d->absorb) {
         d->absorb = a;
         emit enabledChanged();
     }
 }
 
-void QSGPinchArea::touchEvent(QTouchEvent *event)
+void QQuickPinchArea::touchEvent(QTouchEvent *event)
 {
-    Q_D(QSGPinchArea);
+    Q_D(QQuickPinchArea);
     if (!d->absorb || !isVisible()) {
-        QSGItem::event(event);
+        QQuickItem::event(event);
         return;
     }
 
@@ -296,18 +296,18 @@ void QSGPinchArea::touchEvent(QTouchEvent *event)
         updatePinch();
         break;
     default:
-        QSGItem::event(event);
+        QQuickItem::event(event);
     }
 }
 
-void QSGPinchArea::updatePinch()
+void QQuickPinchArea::updatePinch()
 {
-    Q_D(QSGPinchArea);
+    Q_D(QQuickPinchArea);
     if (d->touchPoints.count() == 0) {
         if (d->inPinch) {
             d->inPinch = false;
             QPointF pinchCenter = mapFromScene(d->sceneLastCenter);
-            QSGPinchEvent pe(pinchCenter, d->pinchLastScale, d->pinchLastAngle, d->pinchRotation);
+            QQuickPinchEvent pe(pinchCenter, d->pinchLastScale, d->pinchLastAngle, d->pinchRotation);
             pe.setStartCenter(d->pinchStartCenter);
             pe.setPreviousCenter(pinchCenter);
             pe.setPreviousAngle(d->pinchLastAngle);
@@ -326,7 +326,7 @@ void QSGPinchArea::updatePinch()
         d->pinchRejected = false;
         d->stealMouse = false;
         setKeepMouseGrab(false);
-        QSGCanvas *c = canvas();
+        QQuickCanvas *c = canvas();
         if (c && c->mouseGrabberItem() == this)
             ungrabMouse();
         return;
@@ -378,7 +378,7 @@ void QSGPinchArea::updatePinch()
                 d->pinchRotation = 0.0;
                 d->lastPoint1 = p1;
                 d->lastPoint2 = p2;
-                QSGPinchEvent pe(d->pinchStartCenter, 1.0, angle, 0.0);
+                QQuickPinchEvent pe(d->pinchStartCenter, 1.0, angle, 0.0);
                 pe.setStartCenter(d->pinchStartCenter);
                 pe.setPreviousCenter(d->pinchStartCenter);
                 pe.setPreviousAngle(d->pinchLastAngle);
@@ -392,7 +392,7 @@ void QSGPinchArea::updatePinch()
                 if (pe.accepted()) {
                     d->inPinch = true;
                     d->stealMouse = true;
-                    QSGCanvas *c = canvas();
+                    QQuickCanvas *c = canvas();
                     if (c && c->mouseGrabberItem() != this)
                         grabMouse();
                     setKeepMouseGrab(true);
@@ -415,7 +415,7 @@ void QSGPinchArea::updatePinch()
                 da += 360;
             d->pinchRotation += da;
             QPointF pinchCenter = mapFromScene(sceneCenter);
-            QSGPinchEvent pe(pinchCenter, scale, angle, d->pinchRotation);
+            QQuickPinchEvent pe(pinchCenter, scale, angle, d->pinchRotation);
             pe.setStartCenter(d->pinchStartCenter);
             pe.setPreviousCenter(mapFromScene(d->sceneLastCenter));
             pe.setPreviousAngle(d->pinchLastAngle);
@@ -436,7 +436,7 @@ void QSGPinchArea::updatePinch()
                 s = qMin(qMax(pinch()->minimumScale(),s), pinch()->maximumScale());
                 pinch()->target()->setScale(s);
                 QPointF pos = sceneCenter - d->sceneStartCenter + d->pinchStartPos;
-                if (pinch()->axis() & QSGPinch::XAxis) {
+                if (pinch()->axis() & QQuickPinch::XAxis) {
                     qreal x = pos.x();
                     if (x < pinch()->xmin())
                         x = pinch()->xmin();
@@ -444,7 +444,7 @@ void QSGPinchArea::updatePinch()
                         x = pinch()->xmax();
                     pinch()->target()->setX(x);
                 }
-                if (pinch()->axis() & QSGPinch::YAxis) {
+                if (pinch()->axis() & QQuickPinch::YAxis) {
                     qreal y = pos.y();
                     if (y < pinch()->ymin())
                         y = pinch()->ymin();
@@ -463,53 +463,53 @@ void QSGPinchArea::updatePinch()
     }
 }
 
-void QSGPinchArea::mousePressEvent(QMouseEvent *event)
+void QQuickPinchArea::mousePressEvent(QMouseEvent *event)
 {
-    Q_D(QSGPinchArea);
+    Q_D(QQuickPinchArea);
     d->stealMouse = false;
     if (!d->absorb)
-        QSGItem::mousePressEvent(event);
+        QQuickItem::mousePressEvent(event);
     else {
         setKeepMouseGrab(false);
         event->setAccepted(true);
     }
 }
 
-void QSGPinchArea::mouseMoveEvent(QMouseEvent *event)
+void QQuickPinchArea::mouseMoveEvent(QMouseEvent *event)
 {
-    Q_D(QSGPinchArea);
+    Q_D(QQuickPinchArea);
     if (!d->absorb) {
-        QSGItem::mouseMoveEvent(event);
+        QQuickItem::mouseMoveEvent(event);
         return;
     }
 }
 
-void QSGPinchArea::mouseReleaseEvent(QMouseEvent *event)
+void QQuickPinchArea::mouseReleaseEvent(QMouseEvent *event)
 {
-    Q_D(QSGPinchArea);
+    Q_D(QQuickPinchArea);
     d->stealMouse = false;
     if (!d->absorb) {
-        QSGItem::mouseReleaseEvent(event);
+        QQuickItem::mouseReleaseEvent(event);
     } else {
-        QSGCanvas *c = canvas();
+        QQuickCanvas *c = canvas();
         if (c && c->mouseGrabberItem() == this)
             ungrabMouse();
         setKeepMouseGrab(false);
     }
 }
 
-void QSGPinchArea::mouseUngrabEvent()
+void QQuickPinchArea::mouseUngrabEvent()
 {
     setKeepMouseGrab(false);
 }
 
-bool QSGPinchArea::sendMouseEvent(QMouseEvent *event)
+bool QQuickPinchArea::sendMouseEvent(QMouseEvent *event)
 {
-    Q_D(QSGPinchArea);
+    Q_D(QQuickPinchArea);
     QRectF myRect = mapRectToScene(QRectF(0, 0, width(), height()));
 
-    QSGCanvas *c = canvas();
-    QSGItem *grabber = c ? c->mouseGrabberItem() : 0;
+    QQuickCanvas *c = canvas();
+    QQuickItem *grabber = c ? c->mouseGrabberItem() : 0;
     bool stealThisEvent = d->stealMouse;
     if ((stealThisEvent || myRect.contains(event->windowPos())) && (!grabber || !grabber->keepMouseGrab())) {
         QMouseEvent mouseEvent(event->type(), mapFromScene(event->windowPos()), event->windowPos(), event->screenPos(),
@@ -544,11 +544,11 @@ bool QSGPinchArea::sendMouseEvent(QMouseEvent *event)
     return false;
 }
 
-bool QSGPinchArea::childMouseEventFilter(QSGItem *i, QEvent *e)
+bool QQuickPinchArea::childMouseEventFilter(QQuickItem *i, QEvent *e)
 {
-    Q_D(QSGPinchArea);
+    Q_D(QQuickPinchArea);
     if (!d->absorb || !isVisible())
-        return QSGItem::childMouseEventFilter(i, e);
+        return QQuickItem::childMouseEventFilter(i, e);
     switch (e->type()) {
     case QEvent::MouseButtonPress:
     case QEvent::MouseMove:
@@ -573,25 +573,25 @@ bool QSGPinchArea::childMouseEventFilter(QSGItem *i, QEvent *e)
         break;
     }
 
-    return QSGItem::childMouseEventFilter(i, e);
+    return QQuickItem::childMouseEventFilter(i, e);
 }
 
-void QSGPinchArea::geometryChanged(const QRectF &newGeometry,
+void QQuickPinchArea::geometryChanged(const QRectF &newGeometry,
                                             const QRectF &oldGeometry)
 {
-    QSGItem::geometryChanged(newGeometry, oldGeometry);
+    QQuickItem::geometryChanged(newGeometry, oldGeometry);
 }
 
-void QSGPinchArea::itemChange(ItemChange change, const ItemChangeData &value)
+void QQuickPinchArea::itemChange(ItemChange change, const ItemChangeData &value)
 {
-    QSGItem::itemChange(change, value);
+    QQuickItem::itemChange(change, value);
 }
 
-QSGPinch *QSGPinchArea::pinch()
+QQuickPinch *QQuickPinchArea::pinch()
 {
-    Q_D(QSGPinchArea);
+    Q_D(QQuickPinchArea);
     if (!d->pinch)
-        d->pinch = new QSGPinch;
+        d->pinch = new QQuickPinch;
     return d->pinch;
 }
 
diff --git a/src/declarative/items/qsgpincharea_p.h b/src/declarative/items/qquickpincharea_p.h
index f27bddb193..c98a1fdd9e 100644
--- a/src/declarative/items/qsgpincharea_p.h
+++ b/src/declarative/items/qquickpincharea_p.h
@@ -40,10 +40,10 @@
 **
 ****************************************************************************/
 
-#ifndef QSGPINCHAREA_H
-#define QSGPINCHAREA_H
+#ifndef QQUICKPINCHAREA_H
+#define QQUICKPINCHAREA_H
 
-#include "qsgitem.h"
+#include "qquickitem.h"
 
 QT_BEGIN_HEADER
 
@@ -51,12 +51,12 @@ QT_BEGIN_NAMESPACE
 
 QT_MODULE(Declarative)
 
-class Q_AUTOTEST_EXPORT QSGPinch : public QObject
+class Q_AUTOTEST_EXPORT QQuickPinch : public QObject
 {
     Q_OBJECT
 
     Q_ENUMS(Axis)
-    Q_PROPERTY(QSGItem *target READ target WRITE setTarget RESET resetTarget)
+    Q_PROPERTY(QQuickItem *target READ target WRITE setTarget RESET resetTarget)
     Q_PROPERTY(qreal minimumScale READ minimumScale WRITE setMinimumScale NOTIFY minimumScaleChanged)
     Q_PROPERTY(qreal maximumScale READ maximumScale WRITE setMaximumScale NOTIFY maximumScaleChanged)
     Q_PROPERTY(qreal minimumRotation READ minimumRotation WRITE setMinimumRotation NOTIFY minimumRotationChanged)
@@ -69,10 +69,10 @@ class Q_AUTOTEST_EXPORT QSGPinch : public QObject
     Q_PROPERTY(bool active READ active NOTIFY activeChanged)
 
 public:
-    QSGPinch();
+    QQuickPinch();
 
-    QSGItem *target() const { return m_target; }
-    void setTarget(QSGItem *target) {
+    QQuickItem *target() const { return m_target; }
+    void setTarget(QQuickItem *target) {
         if (target == m_target)
             return;
         m_target = target;
@@ -175,7 +175,7 @@ signals:
     void activeChanged();
 
 private:
-    QSGItem *m_target;
+    QQuickItem *m_target;
     qreal m_minScale;
     qreal m_maxScale;
     qreal m_minRotation;
@@ -188,7 +188,7 @@ private:
     bool m_active;
 };
 
-class Q_AUTOTEST_EXPORT QSGPinchEvent : public QObject
+class Q_AUTOTEST_EXPORT QQuickPinchEvent : public QObject
 {
     Q_OBJECT
 
@@ -208,7 +208,7 @@ class Q_AUTOTEST_EXPORT QSGPinchEvent : public QObject
     Q_PROPERTY(bool accepted READ accepted WRITE setAccepted)
 
 public:
-    QSGPinchEvent(QPointF c, qreal s, qreal a, qreal r)
+    QQuickPinchEvent(QPointF c, qreal s, qreal a, qreal r)
         : QObject(), m_center(c), m_scale(s), m_angle(a), m_rotation(r)
         , m_pointCount(0), m_accepted(true) {}
 
@@ -256,29 +256,29 @@ private:
 };
 
 
-class QSGMouseEvent;
-class QSGPinchAreaPrivate;
-class Q_AUTOTEST_EXPORT QSGPinchArea : public QSGItem
+class QQuickMouseEvent;
+class QQuickPinchAreaPrivate;
+class Q_AUTOTEST_EXPORT QQuickPinchArea : public QQuickItem
 {
     Q_OBJECT
 
     Q_PROPERTY(bool enabled READ isEnabled WRITE setEnabled NOTIFY enabledChanged)
-    Q_PROPERTY(QSGPinch *pinch READ pinch CONSTANT)
+    Q_PROPERTY(QQuickPinch *pinch READ pinch CONSTANT)
 
 public:
-    QSGPinchArea(QSGItem *parent=0);
-    ~QSGPinchArea();
+    QQuickPinchArea(QQuickItem *parent=0);
+    ~QQuickPinchArea();
 
     bool isEnabled() const;
     void setEnabled(bool);
 
-    QSGPinch *pinch();
+    QQuickPinch *pinch();
 
 Q_SIGNALS:
     void enabledChanged();
-    void pinchStarted(QSGPinchEvent *pinch);
-    void pinchUpdated(QSGPinchEvent *pinch);
-    void pinchFinished(QSGPinchEvent *pinch);
+    void pinchStarted(QQuickPinchEvent *pinch);
+    void pinchUpdated(QQuickPinchEvent *pinch);
+    void pinchFinished(QQuickPinchEvent *pinch);
 
 protected:
     virtual void mousePressEvent(QMouseEvent *event);
@@ -286,7 +286,7 @@ protected:
     virtual void mouseMoveEvent(QMouseEvent *event);
     virtual void mouseUngrabEvent();
     virtual bool sendMouseEvent(QMouseEvent *event);
-    virtual bool childMouseEventFilter(QSGItem *i, QEvent *e);
+    virtual bool childMouseEventFilter(QQuickItem *i, QEvent *e);
     virtual void touchEvent(QTouchEvent *event);
 
     virtual void geometryChanged(const QRectF &newGeometry,
@@ -299,17 +299,17 @@ private:
     void handleRelease();
 
 private:
-    Q_DISABLE_COPY(QSGPinchArea)
-    Q_DECLARE_PRIVATE(QSGPinchArea)
+    Q_DISABLE_COPY(QQuickPinchArea)
+    Q_DECLARE_PRIVATE(QQuickPinchArea)
 };
 
 QT_END_NAMESPACE
 
-QML_DECLARE_TYPE(QSGPinch)
-QML_DECLARE_TYPE(QSGPinchEvent)
-QML_DECLARE_TYPE(QSGPinchArea)
+QML_DECLARE_TYPE(QQuickPinch)
+QML_DECLARE_TYPE(QQuickPinchEvent)
+QML_DECLARE_TYPE(QQuickPinchArea)
 
 QT_END_HEADER
 
-#endif // QSGPINCHAREA_H
+#endif // QQUICKPINCHAREA_H
 
diff --git a/src/declarative/items/qsgpincharea_p_p.h b/src/declarative/items/qquickpincharea_p_p.h
index 9cf928b828..1c9d5c5ba4 100644
--- a/src/declarative/items/qsgpincharea_p_p.h
+++ b/src/declarative/items/qquickpincharea_p_p.h
@@ -40,8 +40,8 @@
 **
 ****************************************************************************/
 
-#ifndef QSGPINCHAREA_P_H
-#define QSGPINCHAREA_P_H
+#ifndef QQUICKPINCHAREA_P_H
+#define QQUICKPINCHAREA_P_H
 
 //
 //  W A R N I N G
@@ -56,17 +56,17 @@
 
 #include <qevent.h>
 
-#include "qsgitem_p.h"
-#include "qsgpincharea_p.h"
+#include "qquickitem_p.h"
+#include "qquickpincharea_p.h"
 
 QT_BEGIN_NAMESPACE
 
-class QSGPinch;
-class QSGPinchAreaPrivate : public QSGItemPrivate
+class QQuickPinch;
+class QQuickPinchAreaPrivate : public QQuickItemPrivate
 {
-    Q_DECLARE_PUBLIC(QSGPinchArea)
+    Q_DECLARE_PUBLIC(QQuickPinchArea)
 public:
-    QSGPinchAreaPrivate()
+    QQuickPinchAreaPrivate()
       : absorb(true), stealMouse(false), inPinch(false)
       , pinchRejected(false), pinchActivated(false), initPinch(false)
       , pinch(0), pinchStartDist(0), pinchStartScale(1.0)
@@ -75,11 +75,11 @@ public:
     {
     }
 
-    ~QSGPinchAreaPrivate();
+    ~QQuickPinchAreaPrivate();
 
     void init()
     {
-        Q_Q(QSGPinchArea);
+        Q_Q(QQuickPinchArea);
         q->setAcceptedMouseButtons(Qt::LeftButton);
         q->setFiltersChildMouseEvents(true);
     }
@@ -90,7 +90,7 @@ public:
     bool pinchRejected : 1;
     bool pinchActivated : 1;
     bool initPinch : 1;
-    QSGPinch *pinch;
+    QQuickPinch *pinch;
     QPointF sceneStartPoint1;
     QPointF sceneStartPoint2;
     QPointF lastPoint1;
@@ -112,5 +112,5 @@ public:
 
 QT_END_NAMESPACE
 
-#endif // QSGPINCHAREA_P_H
+#endif // QQUICKPINCHAREA_P_H
 
diff --git a/src/declarative/items/qsgpositioners.cpp b/src/declarative/items/qquickpositioners.cpp
index eaca2101e2..15cd35c2f0 100644
--- a/src/declarative/items/qsgpositioners.cpp
+++ b/src/declarative/items/qquickpositioners.cpp
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#include "qsgpositioners_p.h"
-#include "qsgpositioners_p_p.h"
+#include "qquickpositioners_p.h"
+#include "qquickpositioners_p_p.h"
 
 #include <QtDeclarative/qdeclarative.h>
 #include <QtDeclarative/qdeclarativeinfo.h>
@@ -54,38 +54,38 @@
 
 QT_BEGIN_NAMESPACE
 
-static const QSGItemPrivate::ChangeTypes watchedChanges
-    = QSGItemPrivate::Geometry
-    | QSGItemPrivate::SiblingOrder
-    | QSGItemPrivate::Visibility
-    | QSGItemPrivate::Destroyed;
+static const QQuickItemPrivate::ChangeTypes watchedChanges
+    = QQuickItemPrivate::Geometry
+    | QQuickItemPrivate::SiblingOrder
+    | QQuickItemPrivate::Visibility
+    | QQuickItemPrivate::Destroyed;
 
-void QSGBasePositionerPrivate::watchChanges(QSGItem *other)
+void QQuickBasePositionerPrivate::watchChanges(QQuickItem *other)
 {
-    QSGItemPrivate *otherPrivate = QSGItemPrivate::get(other);
+    QQuickItemPrivate *otherPrivate = QQuickItemPrivate::get(other);
     otherPrivate->addItemChangeListener(this, watchedChanges);
 }
 
-void QSGBasePositionerPrivate::unwatchChanges(QSGItem* other)
+void QQuickBasePositionerPrivate::unwatchChanges(QQuickItem* other)
 {
-    QSGItemPrivate *otherPrivate = QSGItemPrivate::get(other);
+    QQuickItemPrivate *otherPrivate = QQuickItemPrivate::get(other);
     otherPrivate->removeItemChangeListener(this, watchedChanges);
 }
 
-QSGBasePositioner::QSGBasePositioner(PositionerType at, QSGItem *parent)
-    : QSGImplicitSizeItem(*(new QSGBasePositionerPrivate), parent)
+QQuickBasePositioner::QQuickBasePositioner(PositionerType at, QQuickItem *parent)
+    : QQuickImplicitSizeItem(*(new QQuickBasePositionerPrivate), parent)
 {
-    Q_D(QSGBasePositioner);
+    Q_D(QQuickBasePositioner);
     d->init(at);
 }
 /*!
     \internal
-    \class QSGBasePositioner
-    \brief The QSGBasePositioner class provides a base for QSGGraphics layouts.
+    \class QQuickBasePositioner
+    \brief The QQuickBasePositioner class provides a base for QQuickGraphics layouts.
 
-    To create a QSGGraphics Positioner, simply subclass QSGBasePositioner and implement
+    To create a QQuickGraphics Positioner, simply subclass QQuickBasePositioner and implement
     doLayout(), which is automatically called when the layout might need
-    updating. In doLayout() use the setX and setY functions from QSGBasePositioner, and the
+    updating. In doLayout() use the setX and setY functions from QQuickBasePositioner, and the
     base class will apply the positions along with the appropriate transitions. The items to
     position are provided in order as the protected member positionedItems.
 
@@ -98,37 +98,37 @@ QSGBasePositioner::QSGBasePositioner(PositionerType at, QSGItem *parent)
     changes into one calculation.
 */
 
-QSGBasePositioner::QSGBasePositioner(QSGBasePositionerPrivate &dd, PositionerType at, QSGItem *parent)
-    : QSGImplicitSizeItem(dd, parent)
+QQuickBasePositioner::QQuickBasePositioner(QQuickBasePositionerPrivate &dd, PositionerType at, QQuickItem *parent)
+    : QQuickImplicitSizeItem(dd, parent)
 {
-    Q_D(QSGBasePositioner);
+    Q_D(QQuickBasePositioner);
     d->init(at);
 }
 
-QSGBasePositioner::~QSGBasePositioner()
+QQuickBasePositioner::~QQuickBasePositioner()
 {
-    Q_D(QSGBasePositioner);
+    Q_D(QQuickBasePositioner);
     for (int i = 0; i < positionedItems.count(); ++i)
         d->unwatchChanges(positionedItems.at(i).item);
     positionedItems.clear();
 }
 
-void QSGBasePositioner::updatePolish()
+void QQuickBasePositioner::updatePolish()
 {
-    Q_D(QSGBasePositioner);
+    Q_D(QQuickBasePositioner);
     if (d->positioningDirty)
         prePositioning();
 }
 
-int QSGBasePositioner::spacing() const
+int QQuickBasePositioner::spacing() const
 {
-    Q_D(const QSGBasePositioner);
+    Q_D(const QQuickBasePositioner);
     return d->spacing;
 }
 
-void QSGBasePositioner::setSpacing(int s)
+void QQuickBasePositioner::setSpacing(int s)
 {
-    Q_D(QSGBasePositioner);
+    Q_D(QQuickBasePositioner);
     if (s==d->spacing)
         return;
     d->spacing = s;
@@ -136,30 +136,30 @@ void QSGBasePositioner::setSpacing(int s)
     emit spacingChanged();
 }
 
-QDeclarativeTransition *QSGBasePositioner::move() const
+QDeclarativeTransition *QQuickBasePositioner::move() const
 {
-    Q_D(const QSGBasePositioner);
+    Q_D(const QQuickBasePositioner);
     return d->moveTransition;
 }
 
-void QSGBasePositioner::setMove(QDeclarativeTransition *mt)
+void QQuickBasePositioner::setMove(QDeclarativeTransition *mt)
 {
-    Q_D(QSGBasePositioner);
+    Q_D(QQuickBasePositioner);
     if (mt == d->moveTransition)
         return;
     d->moveTransition = mt;
     emit moveChanged();
 }
 
-QDeclarativeTransition *QSGBasePositioner::add() const
+QDeclarativeTransition *QQuickBasePositioner::add() const
 {
-    Q_D(const QSGBasePositioner);
+    Q_D(const QQuickBasePositioner);
     return d->addTransition;
 }
 
-void QSGBasePositioner::setAdd(QDeclarativeTransition *add)
+void QQuickBasePositioner::setAdd(QDeclarativeTransition *add)
 {
-    Q_D(QSGBasePositioner);
+    Q_D(QQuickBasePositioner);
     if (add == d->addTransition)
         return;
 
@@ -167,22 +167,22 @@ void QSGBasePositioner::setAdd(QDeclarativeTransition *add)
     emit addChanged();
 }
 
-void QSGBasePositioner::componentComplete()
+void QQuickBasePositioner::componentComplete()
 {
-    QSGItem::componentComplete();
+    QQuickItem::componentComplete();
     positionedItems.reserve(childItems().count());
     prePositioning();
     reportConflictingAnchors();
 }
 
-void QSGBasePositioner::itemChange(ItemChange change, const ItemChangeData &value)
+void QQuickBasePositioner::itemChange(ItemChange change, const ItemChangeData &value)
 {
-    Q_D(QSGBasePositioner);
+    Q_D(QQuickBasePositioner);
     if (change == ItemChildAddedChange){
         d->setPositioningDirty();
     } else if (change == ItemChildRemovedChange) {
-        QSGItem *child = value.item;
-        QSGBasePositioner::PositionedItem posItem(child);
+        QQuickItem *child = value.item;
+        QQuickBasePositioner::PositionedItem posItem(child);
         int idx = positionedItems.find(posItem);
         if (idx >= 0) {
             d->unwatchChanges(child);
@@ -191,12 +191,12 @@ void QSGBasePositioner::itemChange(ItemChange change, const ItemChangeData &valu
         d->setPositioningDirty();
     }
 
-    QSGItem::itemChange(change, value);
+    QQuickItem::itemChange(change, value);
 }
 
-void QSGBasePositioner::prePositioning()
+void QQuickBasePositioner::prePositioning()
 {
-    Q_D(QSGBasePositioner);
+    Q_D(QQuickBasePositioner);
     if (!isComponentComplete())
         return;
 
@@ -206,13 +206,13 @@ void QSGBasePositioner::prePositioning()
     d->positioningDirty = false;
     d->doingPositioning = true;
     //Need to order children by creation order modified by stacking order
-    QList<QSGItem *> children = childItems();
+    QList<QQuickItem *> children = childItems();
 
     QPODVector<PositionedItem,8> oldItems;
     positionedItems.copyAndClear(oldItems);
     for (int ii = 0; ii < children.count(); ++ii) {
-        QSGItem *child = children.at(ii);
-        QSGItemPrivate *childPrivate = QSGItemPrivate::get(child);
+        QQuickItem *child = children.at(ii);
+        QQuickItemPrivate *childPrivate = QQuickItemPrivate::get(child);
         PositionedItem *item = 0;
         PositionedItem posItem(child);
         int wIdx = oldItems.find(posItem);
@@ -249,9 +249,9 @@ void QSGBasePositioner::prePositioning()
     setImplicitWidth(contentSize.width());
 }
 
-void QSGBasePositioner::positionX(int x, const PositionedItem &target)
+void QQuickBasePositioner::positionX(int x, const PositionedItem &target)
 {
-    Q_D(QSGBasePositioner);
+    Q_D(QQuickBasePositioner);
     if (d->type == Horizontal || d->type == Both) {
         if (target.isNew) {
             if (!d->addTransition || !d->addTransition->enabled())
@@ -267,9 +267,9 @@ void QSGBasePositioner::positionX(int x, const PositionedItem &target)
     }
 }
 
-void QSGBasePositioner::positionY(int y, const PositionedItem &target)
+void QQuickBasePositioner::positionY(int y, const PositionedItem &target)
 {
-    Q_D(QSGBasePositioner);
+    Q_D(QQuickBasePositioner);
     if (d->type == Vertical || d->type == Both) {
         if (target.isNew) {
             if (!d->addTransition || !d->addTransition->enabled())
@@ -285,9 +285,9 @@ void QSGBasePositioner::positionY(int y, const PositionedItem &target)
     }
 }
 
-void QSGBasePositioner::finishApplyTransitions()
+void QQuickBasePositioner::finishApplyTransitions()
 {
-    Q_D(QSGBasePositioner);
+    Q_D(QQuickBasePositioner);
     // Note that if a transition is not set the transition manager will
     // apply the changes directly, in the case add/move aren't set
     d->addTransitionManager.transition(d->addActions, d->addTransition);
@@ -296,19 +296,19 @@ void QSGBasePositioner::finishApplyTransitions()
     d->moveActions.clear();
 }
 
-QSGPositionerAttached *QSGBasePositioner::qmlAttachedProperties(QObject *obj)
+QQuickPositionerAttached *QQuickBasePositioner::qmlAttachedProperties(QObject *obj)
 {
-    return new QSGPositionerAttached(obj);
+    return new QQuickPositionerAttached(obj);
 }
 
-void QSGBasePositioner::updateAttachedProperties(QSGPositionerAttached *specificProperty, QSGItem *specificPropertyOwner) const
+void QQuickBasePositioner::updateAttachedProperties(QQuickPositionerAttached *specificProperty, QQuickItem *specificPropertyOwner) const
 {
     // If this function is deemed too expensive or shows up in profiles, it could
     // be changed to run only when there are attached properties present. This
     // could be a flag in the positioner that is set by the attached property
     // constructor.
-    QSGPositionerAttached *prevLastProperty = 0;
-    QSGPositionerAttached *lastProperty = 0;
+    QQuickPositionerAttached *prevLastProperty = 0;
+    QQuickPositionerAttached *lastProperty = 0;
 
     int visibleItemIndex = 0;
     for (int ii = 0; ii < positionedItems.count(); ++ii) {
@@ -316,14 +316,14 @@ void QSGBasePositioner::updateAttachedProperties(QSGPositionerAttached *specific
         if (!child.item)
             continue;
 
-        QSGPositionerAttached *property = 0;
+        QQuickPositionerAttached *property = 0;
 
         if (specificProperty) {
             if (specificPropertyOwner == child.item) {
                 property = specificProperty;
             }
         } else {
-            property = static_cast<QSGPositionerAttached *>(qmlAttachedPropertiesObject<QSGBasePositioner>(child.item, false));
+            property = static_cast<QQuickPositionerAttached *>(qmlAttachedPropertiesObject<QQuickBasePositioner>(child.item, false));
         }
 
         if (child.isVisible) {
@@ -351,7 +351,7 @@ void QSGBasePositioner::updateAttachedProperties(QSGPositionerAttached *specific
 }
 
 /*!
-    \qmlclass Positioner QSGPositionerAttached
+    \qmlclass Positioner QQuickPositionerAttached
     \inqmlmodule QtQuick 2
     \ingroup qml-positioning-elements
     \brief The Positioner type provides attached properties that contain details on where an item exists in a positioner.
@@ -361,11 +361,11 @@ void QSGBasePositioner::updateAttachedProperties(QSGPositionerAttached *specific
     where it exists within the positioner.
 */
 
-QSGPositionerAttached::QSGPositionerAttached(QObject *parent) : QObject(parent), m_index(-1), m_isFirstItem(false), m_isLastItem(false)
+QQuickPositionerAttached::QQuickPositionerAttached(QObject *parent) : QObject(parent), m_index(-1), m_isFirstItem(false), m_isLastItem(false)
 {
-    QSGItem *attachedItem = qobject_cast<QSGItem *>(parent);
+    QQuickItem *attachedItem = qobject_cast<QQuickItem *>(parent);
     if (attachedItem) {
-        QSGBasePositioner *positioner = qobject_cast<QSGBasePositioner *>(attachedItem->parent());
+        QQuickBasePositioner *positioner = qobject_cast<QQuickBasePositioner *>(attachedItem->parent());
         if (positioner) {
             positioner->updateAttachedProperties(this, attachedItem);
         }
@@ -378,7 +378,7 @@ QSGPositionerAttached::QSGPositionerAttached(QObject *parent) : QObject(parent),
     This property allows the item to determine
     its index within the positioner.
 */
-void QSGPositionerAttached::setIndex(int index)
+void QQuickPositionerAttached::setIndex(int index)
 {
     if (m_index == index)
         return;
@@ -393,7 +393,7 @@ void QSGPositionerAttached::setIndex(int index)
     These properties allow the item to determine if it
     is the first or last item in the positioner, respectively.
 */
-void QSGPositionerAttached::setIsFirstItem(bool isFirstItem)
+void QQuickPositionerAttached::setIsFirstItem(bool isFirstItem)
 {
     if (m_isFirstItem == isFirstItem)
         return;
@@ -401,7 +401,7 @@ void QSGPositionerAttached::setIsFirstItem(bool isFirstItem)
     emit isFirstItemChanged();
 }
 
-void QSGPositionerAttached::setIsLastItem(bool isLastItem)
+void QQuickPositionerAttached::setIsLastItem(bool isLastItem)
 {
     if (m_isLastItem == isLastItem)
         return;
@@ -410,7 +410,7 @@ void QSGPositionerAttached::setIsLastItem(bool isLastItem)
 }
 
 /*!
-  \qmlclass Column QSGColumn
+  \qmlclass Column QQuickColumn
     \inqmlmodule QtQuick 2
   \ingroup qml-positioning-elements
   \brief The Column item arranges its children vertically.
@@ -527,12 +527,12 @@ void QSGPositionerAttached::setIsLastItem(bool isLastItem)
 
   \sa Grid::spacing
 */
-QSGColumn::QSGColumn(QSGItem *parent)
-: QSGBasePositioner(Vertical, parent)
+QQuickColumn::QQuickColumn(QQuickItem *parent)
+: QQuickBasePositioner(Vertical, parent)
 {
 }
 
-void QSGColumn::doPositioning(QSizeF *contentSize)
+void QQuickColumn::doPositioning(QSizeF *contentSize)
 {
     int voffset = 0;
 
@@ -555,18 +555,18 @@ void QSGColumn::doPositioning(QSizeF *contentSize)
     contentSize->setHeight(voffset);
 }
 
-void QSGColumn::reportConflictingAnchors()
+void QQuickColumn::reportConflictingAnchors()
 {
-    QSGBasePositionerPrivate *d = static_cast<QSGBasePositionerPrivate*>(QSGBasePositionerPrivate::get(this));
+    QQuickBasePositionerPrivate *d = static_cast<QQuickBasePositionerPrivate*>(QQuickBasePositionerPrivate::get(this));
     for (int ii = 0; ii < positionedItems.count(); ++ii) {
         const PositionedItem &child = positionedItems.at(ii);
         if (child.item) {
-            QSGAnchors *anchors = QSGItemPrivate::get(static_cast<QSGItem *>(child.item))->_anchors;
+            QQuickAnchors *anchors = QQuickItemPrivate::get(static_cast<QQuickItem *>(child.item))->_anchors;
             if (anchors) {
-                QSGAnchors::Anchors usedAnchors = anchors->usedAnchors();
-                if (usedAnchors & QSGAnchors::TopAnchor ||
-                    usedAnchors & QSGAnchors::BottomAnchor ||
-                    usedAnchors & QSGAnchors::VCenterAnchor ||
+                QQuickAnchors::Anchors usedAnchors = anchors->usedAnchors();
+                if (usedAnchors & QQuickAnchors::TopAnchor ||
+                    usedAnchors & QQuickAnchors::BottomAnchor ||
+                    usedAnchors & QQuickAnchors::VCenterAnchor ||
                     anchors->fill() || anchors->centerIn()) {
                     d->anchorConflict = true;
                     break;
@@ -579,7 +579,7 @@ void QSGColumn::reportConflictingAnchors()
     }
 }
 /*!
-  \qmlclass Row QSGRow
+  \qmlclass Row QQuickRow
     \inqmlmodule QtQuick 2
   \ingroup qml-positioning-elements
   \brief The Row item arranges its children horizontally.
@@ -675,8 +675,8 @@ void QSGColumn::reportConflictingAnchors()
   \sa Grid::spacing
 */
 
-QSGRow::QSGRow(QSGItem *parent)
-: QSGBasePositioner(Horizontal, parent)
+QQuickRow::QQuickRow(QQuickItem *parent)
+: QQuickBasePositioner(Horizontal, parent)
 {
 }
 /*!
@@ -696,21 +696,21 @@ QSGRow::QSGRow(QSGItem *parent)
     \sa Grid::layoutDirection, Flow::layoutDirection, {declarative/righttoleft/layoutdirection}{Layout directions example}
 */
 
-Qt::LayoutDirection QSGRow::layoutDirection() const
+Qt::LayoutDirection QQuickRow::layoutDirection() const
 {
-    return QSGBasePositionerPrivate::getLayoutDirection(this);
+    return QQuickBasePositionerPrivate::getLayoutDirection(this);
 }
 
-void QSGRow::setLayoutDirection(Qt::LayoutDirection layoutDirection)
+void QQuickRow::setLayoutDirection(Qt::LayoutDirection layoutDirection)
 {
-    QSGBasePositionerPrivate *d = static_cast<QSGBasePositionerPrivate* >(QSGBasePositionerPrivate::get(this));
+    QQuickBasePositionerPrivate *d = static_cast<QQuickBasePositionerPrivate* >(QQuickBasePositionerPrivate::get(this));
     if (d->layoutDirection != layoutDirection) {
         d->layoutDirection = layoutDirection;
         // For RTL layout the positioning changes when the width changes.
         if (d->layoutDirection == Qt::RightToLeft)
-            d->addItemChangeListener(d, QSGItemPrivate::Geometry);
+            d->addItemChangeListener(d, QQuickItemPrivate::Geometry);
         else
-            d->removeItemChangeListener(d, QSGItemPrivate::Geometry);
+            d->removeItemChangeListener(d, QQuickItemPrivate::Geometry);
         prePositioning();
         emit layoutDirectionChanged();
         emit effectiveLayoutDirectionChanged();
@@ -727,14 +727,14 @@ void QSGRow::setLayoutDirection(Qt::LayoutDirection layoutDirection)
     \sa Row::layoutDirection, {LayoutMirroring}{LayoutMirroring}
 */
 
-Qt::LayoutDirection QSGRow::effectiveLayoutDirection() const
+Qt::LayoutDirection QQuickRow::effectiveLayoutDirection() const
 {
-    return QSGBasePositionerPrivate::getEffectiveLayoutDirection(this);
+    return QQuickBasePositionerPrivate::getEffectiveLayoutDirection(this);
 }
 
-void QSGRow::doPositioning(QSizeF *contentSize)
+void QQuickRow::doPositioning(QSizeF *contentSize)
 {
-    QSGBasePositionerPrivate *d = static_cast<QSGBasePositionerPrivate* >(QSGBasePositionerPrivate::get(this));
+    QQuickBasePositionerPrivate *d = static_cast<QQuickBasePositionerPrivate* >(QQuickBasePositionerPrivate::get(this));
     int hoffset = 0;
 
     QList<int> hoffsets;
@@ -781,18 +781,18 @@ void QSGRow::doPositioning(QSizeF *contentSize)
     }
 }
 
-void QSGRow::reportConflictingAnchors()
+void QQuickRow::reportConflictingAnchors()
 {
-    QSGBasePositionerPrivate *d = static_cast<QSGBasePositionerPrivate*>(QSGBasePositionerPrivate::get(this));
+    QQuickBasePositionerPrivate *d = static_cast<QQuickBasePositionerPrivate*>(QQuickBasePositionerPrivate::get(this));
     for (int ii = 0; ii < positionedItems.count(); ++ii) {
         const PositionedItem &child = positionedItems.at(ii);
         if (child.item) {
-            QSGAnchors *anchors = QSGItemPrivate::get(static_cast<QSGItem *>(child.item))->_anchors;
+            QQuickAnchors *anchors = QQuickItemPrivate::get(static_cast<QQuickItem *>(child.item))->_anchors;
             if (anchors) {
-                QSGAnchors::Anchors usedAnchors = anchors->usedAnchors();
-                if (usedAnchors & QSGAnchors::LeftAnchor ||
-                    usedAnchors & QSGAnchors::RightAnchor ||
-                    usedAnchors & QSGAnchors::HCenterAnchor ||
+                QQuickAnchors::Anchors usedAnchors = anchors->usedAnchors();
+                if (usedAnchors & QQuickAnchors::LeftAnchor ||
+                    usedAnchors & QQuickAnchors::RightAnchor ||
+                    usedAnchors & QQuickAnchors::HCenterAnchor ||
                     anchors->fill() || anchors->centerIn()) {
                     d->anchorConflict = true;
                     break;
@@ -805,7 +805,7 @@ void QSGRow::reportConflictingAnchors()
 }
 
 /*!
-  \qmlclass Grid QSGGrid
+  \qmlclass Grid QQuickGrid
     \inqmlmodule QtQuick 2
   \ingroup qml-positioning-elements
   \brief The Grid item positions its children in a grid.
@@ -917,8 +917,8 @@ void QSGRow::reportConflictingAnchors()
 
   \sa rows, columns
 */
-QSGGrid::QSGGrid(QSGItem *parent) :
-    QSGBasePositioner(Both, parent), m_rows(-1), m_columns(-1), m_rowSpacing(-1), m_columnSpacing(-1), m_flow(LeftToRight)
+QQuickGrid::QQuickGrid(QQuickItem *parent) :
+    QQuickBasePositioner(Both, parent), m_rows(-1), m_columns(-1), m_rowSpacing(-1), m_columnSpacing(-1), m_flow(LeftToRight)
 {
 }
 
@@ -940,7 +940,7 @@ QSGGrid::QSGGrid(QSGItem *parent) :
     number of rows, some rows will be of zero width.
 */
 
-void QSGGrid::setColumns(const int columns)
+void QQuickGrid::setColumns(const int columns)
 {
     if (columns == m_columns)
         return;
@@ -949,7 +949,7 @@ void QSGGrid::setColumns(const int columns)
     emit columnsChanged();
 }
 
-void QSGGrid::setRows(const int rows)
+void QQuickGrid::setRows(const int rows)
 {
     if (rows == m_rows)
         return;
@@ -971,12 +971,12 @@ void QSGGrid::setRows(const int rows)
        other from top to bottom, then wrapped to the next column.
     \endlist
 */
-QSGGrid::Flow QSGGrid::flow() const
+QQuickGrid::Flow QQuickGrid::flow() const
 {
     return m_flow;
 }
 
-void QSGGrid::setFlow(Flow flow)
+void QQuickGrid::setFlow(Flow flow)
 {
     if (m_flow != flow) {
         m_flow = flow;
@@ -993,7 +993,7 @@ void QSGGrid::setFlow(Flow flow)
     \sa columnSpacing
     \since QtQuick2.0
 */
-void QSGGrid::setRowSpacing(const int rowSpacing)
+void QQuickGrid::setRowSpacing(const int rowSpacing)
 {
     if (rowSpacing == m_rowSpacing)
         return;
@@ -1010,7 +1010,7 @@ void QSGGrid::setRowSpacing(const int rowSpacing)
     \sa rowSpacing
     \since QtQuick2.0
 */
-void QSGGrid::setColumnSpacing(const int columnSpacing)
+void QQuickGrid::setColumnSpacing(const int columnSpacing)
 {
     if (columnSpacing == m_columnSpacing)
         return;
@@ -1037,21 +1037,21 @@ void QSGGrid::setColumnSpacing(const int columnSpacing)
 
     \sa Flow::layoutDirection, Row::layoutDirection, {declarative/righttoleft/layoutdirection}{Layout directions example}
 */
-Qt::LayoutDirection QSGGrid::layoutDirection() const
+Qt::LayoutDirection QQuickGrid::layoutDirection() const
 {
-    return QSGBasePositionerPrivate::getLayoutDirection(this);
+    return QQuickBasePositionerPrivate::getLayoutDirection(this);
 }
 
-void QSGGrid::setLayoutDirection(Qt::LayoutDirection layoutDirection)
+void QQuickGrid::setLayoutDirection(Qt::LayoutDirection layoutDirection)
 {
-    QSGBasePositionerPrivate *d = static_cast<QSGBasePositionerPrivate*>(QSGBasePositionerPrivate::get(this));
+    QQuickBasePositionerPrivate *d = static_cast<QQuickBasePositionerPrivate*>(QQuickBasePositionerPrivate::get(this));
     if (d->layoutDirection != layoutDirection) {
         d->layoutDirection = layoutDirection;
         // For RTL layout the positioning changes when the width changes.
         if (d->layoutDirection == Qt::RightToLeft)
-            d->addItemChangeListener(d, QSGItemPrivate::Geometry);
+            d->addItemChangeListener(d, QQuickItemPrivate::Geometry);
         else
-            d->removeItemChangeListener(d, QSGItemPrivate::Geometry);
+            d->removeItemChangeListener(d, QQuickItemPrivate::Geometry);
         prePositioning();
         emit layoutDirectionChanged();
         emit effectiveLayoutDirectionChanged();
@@ -1068,14 +1068,14 @@ void QSGGrid::setLayoutDirection(Qt::LayoutDirection layoutDirection)
 
     \sa Grid::layoutDirection, {LayoutMirroring}{LayoutMirroring}
 */
-Qt::LayoutDirection QSGGrid::effectiveLayoutDirection() const
+Qt::LayoutDirection QQuickGrid::effectiveLayoutDirection() const
 {
-    return QSGBasePositionerPrivate::getEffectiveLayoutDirection(this);
+    return QQuickBasePositionerPrivate::getEffectiveLayoutDirection(this);
 }
 
-void QSGGrid::doPositioning(QSizeF *contentSize)
+void QQuickGrid::doPositioning(QSizeF *contentSize)
 {
-    QSGBasePositionerPrivate *d = static_cast<QSGBasePositionerPrivate*>(QSGBasePositionerPrivate::get(this));
+    QQuickBasePositionerPrivate *d = static_cast<QQuickBasePositionerPrivate*>(QQuickBasePositionerPrivate::get(this));
     int c = m_columns;
     int r = m_rows;
     //Is allocating the extra QPODVector too much overhead?
@@ -1221,13 +1221,13 @@ void QSGGrid::doPositioning(QSizeF *contentSize)
     }
 }
 
-void QSGGrid::reportConflictingAnchors()
+void QQuickGrid::reportConflictingAnchors()
 {
-    QSGBasePositionerPrivate *d = static_cast<QSGBasePositionerPrivate*>(QSGBasePositionerPrivate::get(this));
+    QQuickBasePositionerPrivate *d = static_cast<QQuickBasePositionerPrivate*>(QQuickBasePositionerPrivate::get(this));
     for (int ii = 0; ii < positionedItems.count(); ++ii) {
         const PositionedItem &child = positionedItems.at(ii);
         if (child.item) {
-            QSGAnchors *anchors = QSGItemPrivate::get(static_cast<QSGItem *>(child.item))->_anchors;
+            QQuickAnchors *anchors = QQuickItemPrivate::get(static_cast<QQuickItem *>(child.item))->_anchors;
             if (anchors && (anchors->usedAnchors() || anchors->fill() || anchors->centerIn())) {
                 d->anchorConflict = true;
                 break;
@@ -1239,7 +1239,7 @@ void QSGGrid::reportConflictingAnchors()
 }
 
 /*!
-  \qmlclass Flow QSGFlow
+  \qmlclass Flow QQuickFlow
     \inqmlmodule QtQuick 2
   \ingroup qml-positioning-elements
   \brief The Flow item arranges its children side by side, wrapping as necessary.
@@ -1341,24 +1341,24 @@ void QSGGrid::reportConflictingAnchors()
   \sa Grid::spacing
 */
 
-class QSGFlowPrivate : public QSGBasePositionerPrivate
+class QQuickFlowPrivate : public QQuickBasePositionerPrivate
 {
-    Q_DECLARE_PUBLIC(QSGFlow)
+    Q_DECLARE_PUBLIC(QQuickFlow)
 
 public:
-    QSGFlowPrivate()
-        : QSGBasePositionerPrivate(), flow(QSGFlow::LeftToRight)
+    QQuickFlowPrivate()
+        : QQuickBasePositionerPrivate(), flow(QQuickFlow::LeftToRight)
     {}
 
-    QSGFlow::Flow flow;
+    QQuickFlow::Flow flow;
 };
 
-QSGFlow::QSGFlow(QSGItem *parent)
-: QSGBasePositioner(*(new QSGFlowPrivate), Both, parent)
+QQuickFlow::QQuickFlow(QQuickItem *parent)
+: QQuickBasePositioner(*(new QQuickFlowPrivate), Both, parent)
 {
-    Q_D(QSGFlow);
+    Q_D(QQuickFlow);
     // Flow layout requires relayout if its own size changes too.
-    d->addItemChangeListener(d, QSGItemPrivate::Geometry);
+    d->addItemChangeListener(d, QQuickItemPrivate::Geometry);
 }
 
 /*!
@@ -1376,15 +1376,15 @@ QSGFlow::QSGFlow(QSGItem *parent)
     then wrapped to the next column.
     \endlist
 */
-QSGFlow::Flow QSGFlow::flow() const
+QQuickFlow::Flow QQuickFlow::flow() const
 {
-    Q_D(const QSGFlow);
+    Q_D(const QQuickFlow);
     return d->flow;
 }
 
-void QSGFlow::setFlow(Flow flow)
+void QQuickFlow::setFlow(Flow flow)
 {
-    Q_D(QSGFlow);
+    Q_D(QQuickFlow);
     if (d->flow != flow) {
         d->flow = flow;
         prePositioning();
@@ -1411,15 +1411,15 @@ void QSGFlow::setFlow(Flow flow)
     \sa Grid::layoutDirection, Row::layoutDirection, {declarative/righttoleft/layoutdirection}{Layout directions example}
 */
 
-Qt::LayoutDirection QSGFlow::layoutDirection() const
+Qt::LayoutDirection QQuickFlow::layoutDirection() const
 {
-    Q_D(const QSGFlow);
+    Q_D(const QQuickFlow);
     return d->layoutDirection;
 }
 
-void QSGFlow::setLayoutDirection(Qt::LayoutDirection layoutDirection)
+void QQuickFlow::setLayoutDirection(Qt::LayoutDirection layoutDirection)
 {
-    Q_D(QSGFlow);
+    Q_D(QQuickFlow);
     if (d->layoutDirection != layoutDirection) {
         d->layoutDirection = layoutDirection;
         prePositioning();
@@ -1439,14 +1439,14 @@ void QSGFlow::setLayoutDirection(Qt::LayoutDirection layoutDirection)
     \sa Flow::layoutDirection, {LayoutMirroring}{LayoutMirroring}
 */
 
-Qt::LayoutDirection QSGFlow::effectiveLayoutDirection() const
+Qt::LayoutDirection QQuickFlow::effectiveLayoutDirection() const
 {
-    return QSGBasePositionerPrivate::getEffectiveLayoutDirection(this);
+    return QQuickBasePositionerPrivate::getEffectiveLayoutDirection(this);
 }
 
-void QSGFlow::doPositioning(QSizeF *contentSize)
+void QQuickFlow::doPositioning(QSizeF *contentSize)
 {
-    Q_D(QSGFlow);
+    Q_D(QQuickFlow);
 
     int hoffset = 0;
     int voffset = 0;
@@ -1513,13 +1513,13 @@ void QSGFlow::doPositioning(QSizeF *contentSize)
     }
 }
 
-void QSGFlow::reportConflictingAnchors()
+void QQuickFlow::reportConflictingAnchors()
 {
-    Q_D(QSGFlow);
+    Q_D(QQuickFlow);
     for (int ii = 0; ii < positionedItems.count(); ++ii) {
         const PositionedItem &child = positionedItems.at(ii);
         if (child.item) {
-            QSGAnchors *anchors = QSGItemPrivate::get(static_cast<QSGItem *>(child.item))->_anchors;
+            QQuickAnchors *anchors = QQuickItemPrivate::get(static_cast<QQuickItem *>(child.item))->_anchors;
             if (anchors && (anchors->usedAnchors() || anchors->fill() || anchors->centerIn())) {
                 d->anchorConflict = true;
                 break;
diff --git a/src/declarative/items/qsgpositioners_p.h b/src/declarative/items/qquickpositioners_p.h
index f8711251d3..b8e8879205 100644
--- a/src/declarative/items/qsgpositioners_p.h
+++ b/src/declarative/items/qquickpositioners_p.h
@@ -40,10 +40,10 @@
 **
 ****************************************************************************/
 
-#ifndef QSGPOSITIONERS_P_H
-#define QSGPOSITIONERS_P_H
+#ifndef QQUICKPOSITIONERS_P_H
+#define QQUICKPOSITIONERS_P_H
 
-#include "qsgimplicitsizeitem_p.h"
+#include "qquickimplicitsizeitem_p.h"
 
 #include <private/qdeclarativestate_p.h>
 #include <private/qpodvector_p.h>
@@ -57,14 +57,14 @@ QT_BEGIN_NAMESPACE
 
 QT_MODULE(Declarative)
 
-class QSGBasePositionerPrivate;
+class QQuickBasePositionerPrivate;
 
-class QSGPositionerAttached : public QObject
+class QQuickPositionerAttached : public QObject
 {
     Q_OBJECT
 
 public:
-    QSGPositionerAttached(QObject *parent);
+    QQuickPositionerAttached(QObject *parent);
 
     Q_PROPERTY(int index READ index NOTIFY indexChanged)
     Q_PROPERTY(bool isFirstItem READ isFirstItem NOTIFY isFirstItemChanged)
@@ -90,7 +90,7 @@ private:
     bool m_isLastItem;
 };
 
-class Q_DECLARATIVE_PRIVATE_EXPORT QSGBasePositioner : public QSGImplicitSizeItem
+class Q_DECLARATIVE_PRIVATE_EXPORT QQuickBasePositioner : public QQuickImplicitSizeItem
 {
     Q_OBJECT
 
@@ -99,8 +99,8 @@ class Q_DECLARATIVE_PRIVATE_EXPORT QSGBasePositioner : public QSGImplicitSizeIte
     Q_PROPERTY(QDeclarativeTransition *add READ add WRITE setAdd NOTIFY addChanged)
 public:
     enum PositionerType { None = 0x0, Horizontal = 0x1, Vertical = 0x2, Both = 0x3 };
-    QSGBasePositioner(PositionerType, QSGItem *parent);
-    ~QSGBasePositioner();
+    QQuickBasePositioner(PositionerType, QQuickItem *parent);
+    ~QQuickBasePositioner();
 
     int spacing() const;
     void setSpacing(int);
@@ -111,12 +111,12 @@ public:
     QDeclarativeTransition *add() const;
     void setAdd(QDeclarativeTransition *);
 
-    static QSGPositionerAttached *qmlAttachedProperties(QObject *obj);
+    static QQuickPositionerAttached *qmlAttachedProperties(QObject *obj);
 
-    void updateAttachedProperties(QSGPositionerAttached *specificProperty = 0, QSGItem *specificPropertyOwner = 0) const;
+    void updateAttachedProperties(QQuickPositionerAttached *specificProperty = 0, QQuickItem *specificPropertyOwner = 0) const;
 
 protected:
-    QSGBasePositioner(QSGBasePositionerPrivate &dd, PositionerType at, QSGItem *parent);
+    QQuickBasePositioner(QQuickBasePositionerPrivate &dd, PositionerType at, QQuickItem *parent);
     virtual void componentComplete();
     virtual void itemChange(ItemChange, const ItemChangeData &);
     void finishApplyTransitions();
@@ -136,9 +136,9 @@ protected:
     virtual void reportConflictingAnchors()=0;
     class PositionedItem {
     public :
-        PositionedItem(QSGItem *i) : item(i), isNew(false), isVisible(true) {}
+        PositionedItem(QQuickItem *i) : item(i), isNew(false), isVisible(true) {}
         bool operator==(const PositionedItem &other) const { return other.item == item; }
-        QSGItem *item;
+        QQuickItem *item;
         bool isNew;
         bool isVisible;
     };
@@ -148,30 +148,30 @@ protected:
     void positionY(int,const PositionedItem &target);
 
 private:
-    Q_DISABLE_COPY(QSGBasePositioner)
-    Q_DECLARE_PRIVATE(QSGBasePositioner)
+    Q_DISABLE_COPY(QQuickBasePositioner)
+    Q_DECLARE_PRIVATE(QQuickBasePositioner)
 };
 
-class Q_AUTOTEST_EXPORT QSGColumn : public QSGBasePositioner
+class Q_AUTOTEST_EXPORT QQuickColumn : public QQuickBasePositioner
 {
     Q_OBJECT
 public:
-    QSGColumn(QSGItem *parent=0);
+    QQuickColumn(QQuickItem *parent=0);
 
 protected:
     virtual void doPositioning(QSizeF *contentSize);
     virtual void reportConflictingAnchors();
 private:
-    Q_DISABLE_COPY(QSGColumn)
+    Q_DISABLE_COPY(QQuickColumn)
 };
 
-class Q_AUTOTEST_EXPORT QSGRow: public QSGBasePositioner
+class Q_AUTOTEST_EXPORT QQuickRow: public QQuickBasePositioner
 {
     Q_OBJECT
     Q_PROPERTY(Qt::LayoutDirection layoutDirection READ layoutDirection WRITE setLayoutDirection NOTIFY layoutDirectionChanged)
     Q_PROPERTY(Qt::LayoutDirection effectiveLayoutDirection READ effectiveLayoutDirection NOTIFY effectiveLayoutDirectionChanged)
 public:
-    QSGRow(QSGItem *parent=0);
+    QQuickRow(QQuickItem *parent=0);
 
     Qt::LayoutDirection layoutDirection() const;
     void setLayoutDirection (Qt::LayoutDirection);
@@ -185,10 +185,10 @@ protected:
     virtual void doPositioning(QSizeF *contentSize);
     virtual void reportConflictingAnchors();
 private:
-    Q_DISABLE_COPY(QSGRow)
+    Q_DISABLE_COPY(QQuickRow)
 };
 
-class Q_AUTOTEST_EXPORT QSGGrid : public QSGBasePositioner
+class Q_AUTOTEST_EXPORT QQuickGrid : public QQuickBasePositioner
 {
     Q_OBJECT
     Q_PROPERTY(int rows READ rows WRITE setRows NOTIFY rowsChanged)
@@ -200,7 +200,7 @@ class Q_AUTOTEST_EXPORT QSGGrid : public QSGBasePositioner
     Q_PROPERTY(Qt::LayoutDirection effectiveLayoutDirection READ effectiveLayoutDirection NOTIFY effectiveLayoutDirectionChanged)
 
 public:
-    QSGGrid(QSGItem *parent=0);
+    QQuickGrid(QQuickItem *parent=0);
 
     int rows() const {return m_rows;}
     void setRows(const int rows);
@@ -242,18 +242,18 @@ private:
     int m_rowSpacing;
     int m_columnSpacing;
     Flow m_flow;
-    Q_DISABLE_COPY(QSGGrid)
+    Q_DISABLE_COPY(QQuickGrid)
 };
 
-class QSGFlowPrivate;
-class Q_AUTOTEST_EXPORT QSGFlow: public QSGBasePositioner
+class QQuickFlowPrivate;
+class Q_AUTOTEST_EXPORT QQuickFlow: public QQuickBasePositioner
 {
     Q_OBJECT
     Q_PROPERTY(Flow flow READ flow WRITE setFlow NOTIFY flowChanged)
     Q_PROPERTY(Qt::LayoutDirection layoutDirection READ layoutDirection WRITE setLayoutDirection NOTIFY layoutDirectionChanged)
     Q_PROPERTY(Qt::LayoutDirection effectiveLayoutDirection READ effectiveLayoutDirection NOTIFY effectiveLayoutDirectionChanged)
 public:
-    QSGFlow(QSGItem *parent=0);
+    QQuickFlow(QQuickItem *parent=0);
 
     Q_ENUMS(Flow)
     enum Flow { LeftToRight, TopToBottom };
@@ -273,23 +273,23 @@ protected:
     virtual void doPositioning(QSizeF *contentSize);
     virtual void reportConflictingAnchors();
 protected:
-    QSGFlow(QSGFlowPrivate &dd, QSGItem *parent);
+    QQuickFlow(QQuickFlowPrivate &dd, QQuickItem *parent);
 private:
-    Q_DISABLE_COPY(QSGFlow)
-    Q_DECLARE_PRIVATE(QSGFlow)
+    Q_DISABLE_COPY(QQuickFlow)
+    Q_DECLARE_PRIVATE(QQuickFlow)
 };
 
 
 QT_END_NAMESPACE
 
-QML_DECLARE_TYPE(QSGColumn)
-QML_DECLARE_TYPE(QSGRow)
-QML_DECLARE_TYPE(QSGGrid)
-QML_DECLARE_TYPE(QSGFlow)
+QML_DECLARE_TYPE(QQuickColumn)
+QML_DECLARE_TYPE(QQuickRow)
+QML_DECLARE_TYPE(QQuickGrid)
+QML_DECLARE_TYPE(QQuickFlow)
 
-QML_DECLARE_TYPE(QSGBasePositioner)
-QML_DECLARE_TYPEINFO(QSGBasePositioner, QML_HAS_ATTACHED_PROPERTIES)
+QML_DECLARE_TYPE(QQuickBasePositioner)
+QML_DECLARE_TYPEINFO(QQuickBasePositioner, QML_HAS_ATTACHED_PROPERTIES)
 
 QT_END_HEADER
 
-#endif // QSGPOSITIONERS_P_H
+#endif // QQUICKPOSITIONERS_P_H
diff --git a/src/declarative/items/qsgpositioners_p_p.h b/src/declarative/items/qquickpositioners_p_p.h
index 3c1185378b..86c6c74ba6 100644
--- a/src/declarative/items/qsgpositioners_p_p.h
+++ b/src/declarative/items/qquickpositioners_p_p.h
@@ -40,8 +40,8 @@
 **
 ****************************************************************************/
 
-#ifndef QSGPOSITIONERS_P_P_H
-#define QSGPOSITIONERS_P_P_H
+#ifndef QQUICKPOSITIONERS_P_P_H
+#define QQUICKPOSITIONERS_P_P_H
 
 //
 //  W A R N I N G
@@ -54,8 +54,8 @@
 // We mean it.
 //
 
-#include "qsgpositioners_p.h"
-#include "qsgimplicitsizeitem_p_p.h"
+#include "qquickpositioners_p.h"
+#include "qquickimplicitsizeitem_p_p.h"
 
 #include <private/qdeclarativestate_p.h>
 #include <private/qdeclarativetransitionmanager_p_p.h>
@@ -67,19 +67,19 @@
 
 QT_BEGIN_NAMESPACE
 
-class QSGBasePositionerPrivate : public QSGImplicitSizeItemPrivate, public QSGItemChangeListener
+class QQuickBasePositionerPrivate : public QQuickImplicitSizeItemPrivate, public QQuickItemChangeListener
 {
-    Q_DECLARE_PUBLIC(QSGBasePositioner)
+    Q_DECLARE_PUBLIC(QQuickBasePositioner)
 
 public:
-    QSGBasePositionerPrivate()
-        : spacing(0), type(QSGBasePositioner::None)
+    QQuickBasePositionerPrivate()
+        : spacing(0), type(QQuickBasePositioner::None)
         , moveTransition(0), addTransition(0), positioningDirty(false)
         , doingPositioning(false), anchorConflict(false), layoutDirection(Qt::LeftToRight)
     {
     }
 
-    void init(QSGBasePositioner::PositionerType at)
+    void init(QQuickBasePositioner::PositionerType at)
     {
         type = at;
         childrenDoNotOverlap = true;
@@ -87,7 +87,7 @@ public:
 
     int spacing;
 
-    QSGBasePositioner::PositionerType type;
+    QQuickBasePositioner::PositionerType type;
     QDeclarativeTransition *moveTransition;
     QDeclarativeTransition *addTransition;
     QDeclarativeStateOperation::ActionList addActions;
@@ -95,10 +95,10 @@ public:
     QDeclarativeTransitionManager addTransitionManager;
     QDeclarativeTransitionManager moveTransitionManager;
 
-    void watchChanges(QSGItem *other);
-    void unwatchChanges(QSGItem* other);
+    void watchChanges(QQuickItem *other);
+    void unwatchChanges(QQuickItem* other);
     void setPositioningDirty() {
-        Q_Q(QSGBasePositioner);
+        Q_Q(QQuickBasePositioner);
         if (!positioningDirty) {
             positioningDirty = true;
             q->polish();
@@ -112,45 +112,45 @@ public:
     Qt::LayoutDirection layoutDirection;
 
     void mirrorChange() {
-        if (type != QSGBasePositioner::Vertical)
+        if (type != QQuickBasePositioner::Vertical)
             setPositioningDirty();
     }
     bool isLeftToRight() const {
-        if (type == QSGBasePositioner::Vertical)
+        if (type == QQuickBasePositioner::Vertical)
             return true;
         else
             return effectiveLayoutMirror ? layoutDirection == Qt::RightToLeft : layoutDirection == Qt::LeftToRight;
     }
 
-    virtual void itemSiblingOrderChanged(QSGItem* other)
+    virtual void itemSiblingOrderChanged(QQuickItem* other)
     {
         Q_UNUSED(other);
         setPositioningDirty();
     }
 
-    void itemGeometryChanged(QSGItem *, const QRectF &newGeometry, const QRectF &oldGeometry)
+    void itemGeometryChanged(QQuickItem *, const QRectF &newGeometry, const QRectF &oldGeometry)
     {
         if (newGeometry.size() != oldGeometry.size())
             setPositioningDirty();
     }
 
-    virtual void itemVisibilityChanged(QSGItem *)
+    virtual void itemVisibilityChanged(QQuickItem *)
     {
         setPositioningDirty();
     }
 
-    void itemDestroyed(QSGItem *item)
+    void itemDestroyed(QQuickItem *item)
     {
-        Q_Q(QSGBasePositioner);
-        q->positionedItems.removeOne(QSGBasePositioner::PositionedItem(item));
+        Q_Q(QQuickBasePositioner);
+        q->positionedItems.removeOne(QQuickBasePositioner::PositionedItem(item));
     }
 
-    static Qt::LayoutDirection getLayoutDirection(const QSGBasePositioner *positioner)
+    static Qt::LayoutDirection getLayoutDirection(const QQuickBasePositioner *positioner)
     {
         return positioner->d_func()->layoutDirection;
     }
 
-    static Qt::LayoutDirection getEffectiveLayoutDirection(const QSGBasePositioner *positioner)
+    static Qt::LayoutDirection getEffectiveLayoutDirection(const QQuickBasePositioner *positioner)
     {
         if (positioner->d_func()->effectiveLayoutMirror)
             return positioner->d_func()->layoutDirection == Qt::RightToLeft ? Qt::LeftToRight : Qt::RightToLeft;
@@ -161,4 +161,4 @@ public:
 
 QT_END_NAMESPACE
 
-#endif // QSGPOSITIONERS_P_P_H
+#endif // QQUICKPOSITIONERS_P_P_H
diff --git a/src/declarative/items/qsgrectangle.cpp b/src/declarative/items/qquickrectangle.cpp
index 25f0eda5d5..a7f592eac3 100644
--- a/src/declarative/items/qsgrectangle.cpp
+++ b/src/declarative/items/qquickrectangle.cpp
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#include "qsgrectangle_p.h"
-#include "qsgrectangle_p_p.h"
+#include "qquickrectangle_p.h"
+#include "qquickrectangle_p_p.h"
 
 #include <private/qsgcontext_p.h>
 #include <private/qsgadaptationlayer_p.h>
@@ -54,8 +54,8 @@ QT_BEGIN_NAMESPACE
 // XXX todo - should we change rectangle to draw entirely within its width/height?
 /*!
     \internal
-    \class QSGPen
-    \brief The QSGPen class provides a pen used for drawing rectangle borders on a QSGView.
+    \class QQuickPen
+    \brief The QQuickPen class provides a pen used for drawing rectangle borders on a QQuickView.
 
     By default, the pen is invalid and nothing is drawn. You must either set a color (then the default
     width is 1) or a width (then the default color is black).
@@ -71,7 +71,7 @@ QT_BEGIN_NAMESPACE
     \endqml
 */
 
-QSGPen::QSGPen(QObject *parent)
+QQuickPen::QQuickPen(QObject *parent)
     : QObject(parent)
     , m_width(1)
     , m_color("#000000")
@@ -80,12 +80,12 @@ QSGPen::QSGPen(QObject *parent)
 {
 }
 
-qreal QSGPen::width() const
+qreal QQuickPen::width() const
 {
     return m_width;
 }
 
-void QSGPen::setWidth(qreal w)
+void QQuickPen::setWidth(qreal w)
 {
     if (m_width == w && m_valid)
         return;
@@ -95,24 +95,24 @@ void QSGPen::setWidth(qreal w)
     emit penChanged();
 }
 
-QColor QSGPen::color() const
+QColor QQuickPen::color() const
 {
     return m_color;
 }
 
-void QSGPen::setColor(const QColor &c)
+void QQuickPen::setColor(const QColor &c)
 {
     m_color = c;
     m_valid = m_color.alpha() && (qRound(m_width) >= 1 || (!m_aligned && m_width > 0));
     emit penChanged();
 }
 
-bool QSGPen::aligned() const
+bool QQuickPen::aligned() const
 {
     return m_aligned;
 }
 
-void QSGPen::setAligned(bool aligned)
+void QQuickPen::setAligned(bool aligned)
 {
     if (aligned == m_aligned)
         return;
@@ -121,13 +121,13 @@ void QSGPen::setAligned(bool aligned)
     emit penChanged();
 }
 
-bool QSGPen::isValid() const
+bool QQuickPen::isValid() const
 {
     return m_valid;
 }
 
 /*!
-    \qmlclass GradientStop QSGGradientStop
+    \qmlclass GradientStop QQuickGradientStop
     \inqmlmodule QtQuick 2
     \ingroup qml-basic-visual-elements
     \brief The GradientStop item defines the color at a position in a Gradient.
@@ -146,39 +146,39 @@ bool QSGPen::isValid() const
 
     \sa Gradient
 */
-QSGGradientStop::QSGGradientStop(QObject *parent)
+QQuickGradientStop::QQuickGradientStop(QObject *parent)
     : QObject(parent)
 {
 }
 
-qreal QSGGradientStop::position() const
+qreal QQuickGradientStop::position() const
 {
     return m_position;
 }
 
-void QSGGradientStop::setPosition(qreal position)
+void QQuickGradientStop::setPosition(qreal position)
 {
     m_position = position; updateGradient();
 }
 
-QColor QSGGradientStop::color() const
+QColor QQuickGradientStop::color() const
 {
     return m_color;
 }
 
-void QSGGradientStop::setColor(const QColor &color)
+void QQuickGradientStop::setColor(const QColor &color)
 {
     m_color = color; updateGradient();
 }
 
-void QSGGradientStop::updateGradient()
+void QQuickGradientStop::updateGradient()
 {
-    if (QSGGradient *grad = qobject_cast<QSGGradient*>(parent()))
+    if (QQuickGradient *grad = qobject_cast<QQuickGradient*>(parent()))
         grad->doUpdate();
 }
 
 /*!
-    \qmlclass Gradient QSGGradient
+    \qmlclass Gradient QQuickGradient
     \inqmlmodule QtQuick 2
     \ingroup qml-basic-visual-elements
     \brief The Gradient item defines a gradient fill.
@@ -238,27 +238,27 @@ void QSGGradientStop::updateGradient()
 
     To set the gradient stops, define them as children of the Gradient element.
 */
-QSGGradient::QSGGradient(QObject *parent)
+QQuickGradient::QQuickGradient(QObject *parent)
 : QObject(parent), m_gradient(0)
 {
 }
 
-QSGGradient::~QSGGradient()
+QQuickGradient::~QQuickGradient()
 {
     delete m_gradient;
 }
 
-QDeclarativeListProperty<QSGGradientStop> QSGGradient::stops()
+QDeclarativeListProperty<QQuickGradientStop> QQuickGradient::stops()
 {
-    return QDeclarativeListProperty<QSGGradientStop>(this, m_stops);
+    return QDeclarativeListProperty<QQuickGradientStop>(this, m_stops);
 }
 
-const QGradient *QSGGradient::gradient() const
+const QGradient *QQuickGradient::gradient() const
 {
     if (!m_gradient && !m_stops.isEmpty()) {
         m_gradient = new QLinearGradient(0,0,0,1.0);
         for (int i = 0; i < m_stops.count(); ++i) {
-            const QSGGradientStop *stop = m_stops.at(i);
+            const QQuickGradientStop *stop = m_stops.at(i);
             m_gradient->setCoordinateMode(QGradient::ObjectBoundingMode);
             m_gradient->setColorAt(stop->position(), stop->color());
         }
@@ -267,17 +267,17 @@ const QGradient *QSGGradient::gradient() const
     return m_gradient;
 }
 
-void QSGGradient::doUpdate()
+void QQuickGradient::doUpdate()
 {
     delete m_gradient;
     m_gradient = 0;
     emit updated();
 }
 
-int QSGRectanglePrivate::doUpdateSlotIdx = -1;
+int QQuickRectanglePrivate::doUpdateSlotIdx = -1;
 
 /*!
-    \qmlclass Rectangle QSGRectangle
+    \qmlclass Rectangle QQuickRectangle
     \inqmlmodule QtQuick 2
     \ingroup qml-basic-visual-elements
     \brief The Rectangle item provides a filled rectangle with an optional border.
@@ -321,15 +321,15 @@ int QSGRectanglePrivate::doUpdateSlotIdx = -1;
     \sa Image
 */
 
-QSGRectangle::QSGRectangle(QSGItem *parent)
-: QSGItem(*(new QSGRectanglePrivate), parent)
+QQuickRectangle::QQuickRectangle(QQuickItem *parent)
+: QQuickItem(*(new QQuickRectanglePrivate), parent)
 {
     setFlag(ItemHasContents);
 }
 
-void QSGRectangle::doUpdate()
+void QQuickRectangle::doUpdate()
 {
-    Q_D(QSGRectangle);
+    Q_D(QQuickRectangle);
     qreal penMargin = 0;
     qreal penOffset = 0;
     if (d->pen && d->pen->isValid()) {
@@ -344,7 +344,7 @@ void QSGRectangle::doUpdate()
     if (penMargin != d->penMargin || penOffset != d->penOffset) {
         d->penMargin = penMargin;
         d->penOffset = penOffset;
-        d->dirty(QSGItemPrivate::Size); // update clip
+        d->dirty(QQuickItemPrivate::Size); // update clip
     }
     update();
 }
@@ -376,9 +376,9 @@ void QSGRectangle::doUpdate()
     Here, the innermost rectangle's border is clipped on the bottom and right edges by its
     parent. To avoid this, the border width can be set to two instead of one.
 */
-QSGPen *QSGRectangle::border()
+QQuickPen *QQuickRectangle::border()
 {
-    Q_D(QSGRectangle);
+    Q_D(QQuickRectangle);
     return d->getPen();
 }
 
@@ -401,22 +401,22 @@ QSGPen *QSGRectangle::border()
 
     \sa Gradient, color
 */
-QSGGradient *QSGRectangle::gradient() const
+QQuickGradient *QQuickRectangle::gradient() const
 {
-    Q_D(const QSGRectangle);
+    Q_D(const QQuickRectangle);
     return d->gradient;
 }
 
-void QSGRectangle::setGradient(QSGGradient *gradient)
+void QQuickRectangle::setGradient(QQuickGradient *gradient)
 {
-    Q_D(QSGRectangle);
+    Q_D(QQuickRectangle);
     if (d->gradient == gradient)
         return;
     static int updatedSignalIdx = -1;
     if (updatedSignalIdx < 0)
-        updatedSignalIdx = QSGGradient::staticMetaObject.indexOfSignal("updated()");
+        updatedSignalIdx = QQuickGradient::staticMetaObject.indexOfSignal("updated()");
     if (d->doUpdateSlotIdx < 0)
-        d->doUpdateSlotIdx = QSGRectangle::staticMetaObject.indexOfSlot("doUpdate()");
+        d->doUpdateSlotIdx = QQuickRectangle::staticMetaObject.indexOfSlot("doUpdate()");
     if (d->gradient)
         QMetaObject::disconnect(d->gradient, updatedSignalIdx, this, d->doUpdateSlotIdx);
     d->gradient = gradient;
@@ -433,15 +433,15 @@ void QSGRectangle::setGradient(QSGGradient *gradient)
     painted as a normal rectangle. The same radius is used by all 4 corners; there is currently
     no way to specify different radii for different corners.
 */
-qreal QSGRectangle::radius() const
+qreal QQuickRectangle::radius() const
 {
-    Q_D(const QSGRectangle);
+    Q_D(const QQuickRectangle);
     return d->radius;
 }
 
-void QSGRectangle::setRadius(qreal radius)
+void QQuickRectangle::setRadius(qreal radius)
 {
-    Q_D(QSGRectangle);
+    Q_D(QQuickRectangle);
     if (d->radius == radius)
         return;
 
@@ -470,15 +470,15 @@ void QSGRectangle::setRadius(qreal radius)
 
     \sa gradient
 */
-QColor QSGRectangle::color() const
+QColor QQuickRectangle::color() const
 {
-    Q_D(const QSGRectangle);
+    Q_D(const QQuickRectangle);
     return d->color;
 }
 
-void QSGRectangle::setColor(const QColor &c)
+void QQuickRectangle::setColor(const QColor &c)
 {
-    Q_D(QSGRectangle);
+    Q_D(QQuickRectangle);
     if (d->color == c)
         return;
 
@@ -487,10 +487,10 @@ void QSGRectangle::setColor(const QColor &c)
     emit colorChanged();
 }
 
-QSGNode *QSGRectangle::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *data)
+QSGNode *QQuickRectangle::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *data)
 {
     Q_UNUSED(data);
-    Q_D(QSGRectangle);
+    Q_D(QQuickRectangle);
 
     if (width() <= 0 || height() <= 0) {
         delete oldNode;
@@ -515,7 +515,7 @@ QSGNode *QSGRectangle::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *da
 
     QGradientStops stops;
     if (d->gradient) {
-        QList<QSGGradientStop *> qxstops = d->gradient->m_stops;
+        QList<QQuickGradientStop *> qxstops = d->gradient->m_stops;
         for (int i = 0; i < qxstops.size(); ++i){
             int j = 0;
             while (j < stops.size() && stops.at(j).first < qxstops[i]->position())
@@ -545,9 +545,9 @@ QSGNode *QSGRectangle::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *da
     On this image, smooth is turned off on the top half and on on the bottom half.
 */
 
-QRectF QSGRectangle::boundingRect() const
+QRectF QQuickRectangle::boundingRect() const
 {
-    Q_D(const QSGRectangle);
+    Q_D(const QQuickRectangle);
     return QRectF(d->penOffset - d->penMargin, d->penOffset - d->penMargin,
                   d->width + 2 * d->penMargin, d->height + 2 * d->penMargin);
 }
diff --git a/src/declarative/items/qsgrectangle_p.h b/src/declarative/items/qquickrectangle_p.h
index 4d93e6662a..838b944c62 100644
--- a/src/declarative/items/qsgrectangle_p.h
+++ b/src/declarative/items/qquickrectangle_p.h
@@ -40,10 +40,10 @@
 **
 ****************************************************************************/
 
-#ifndef QSGRECTANGLE_P_H
-#define QSGRECTANGLE_P_H
+#ifndef QQUICKRECTANGLE_P_H
+#define QQUICKRECTANGLE_P_H
 
-#include "qsgitem.h"
+#include "qquickitem.h"
 
 #include <QtGui/qbrush.h>
 
@@ -54,7 +54,7 @@ QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE
 
 QT_MODULE(Declarative)
-class Q_DECLARATIVE_PRIVATE_EXPORT QSGPen : public QObject
+class Q_DECLARATIVE_PRIVATE_EXPORT QQuickPen : public QObject
 {
     Q_OBJECT
 
@@ -62,7 +62,7 @@ class Q_DECLARATIVE_PRIVATE_EXPORT QSGPen : public QObject
     Q_PROPERTY(QColor color READ color WRITE setColor NOTIFY penChanged)
     Q_PROPERTY(bool aligned READ aligned WRITE setAligned NOTIFY penChanged)
 public:
-    QSGPen(QObject *parent=0);
+    QQuickPen(QObject *parent=0);
 
     qreal width() const;
     void setWidth(qreal w);
@@ -85,7 +85,7 @@ private:
     bool m_valid : 1;
 };
 
-class Q_AUTOTEST_EXPORT QSGGradientStop : public QObject
+class Q_AUTOTEST_EXPORT QQuickGradientStop : public QObject
 {
     Q_OBJECT
 
@@ -93,7 +93,7 @@ class Q_AUTOTEST_EXPORT QSGGradientStop : public QObject
     Q_PROPERTY(QColor color READ color WRITE setColor)
 
 public:
-    QSGGradientStop(QObject *parent=0);
+    QQuickGradientStop(QObject *parent=0);
 
     qreal position() const;
     void setPosition(qreal position);
@@ -109,18 +109,18 @@ private:
     QColor m_color;
 };
 
-class Q_AUTOTEST_EXPORT QSGGradient : public QObject
+class Q_AUTOTEST_EXPORT QQuickGradient : public QObject
 {
     Q_OBJECT
 
-    Q_PROPERTY(QDeclarativeListProperty<QSGGradientStop> stops READ stops)
+    Q_PROPERTY(QDeclarativeListProperty<QQuickGradientStop> stops READ stops)
     Q_CLASSINFO("DefaultProperty", "stops")
 
 public:
-    QSGGradient(QObject *parent=0);
-    ~QSGGradient();
+    QQuickGradient(QObject *parent=0);
+    ~QQuickGradient();
 
-    QDeclarativeListProperty<QSGGradientStop> stops();
+    QDeclarativeListProperty<QQuickGradientStop> stops();
 
     const QGradient *gradient() const;
 
@@ -131,31 +131,31 @@ private:
     void doUpdate();
 
 private:
-    QList<QSGGradientStop *> m_stops;
+    QList<QQuickGradientStop *> m_stops;
     mutable QGradient *m_gradient;
-    friend class QSGRectangle;
-    friend class QSGGradientStop;
+    friend class QQuickRectangle;
+    friend class QQuickGradientStop;
 };
 
-class QSGRectanglePrivate;
-class Q_DECLARATIVE_PRIVATE_EXPORT QSGRectangle : public QSGItem
+class QQuickRectanglePrivate;
+class Q_DECLARATIVE_PRIVATE_EXPORT QQuickRectangle : public QQuickItem
 {
     Q_OBJECT
 
     Q_PROPERTY(QColor color READ color WRITE setColor NOTIFY colorChanged)
-    Q_PROPERTY(QSGGradient *gradient READ gradient WRITE setGradient)
-    Q_PROPERTY(QSGPen * border READ border CONSTANT)
+    Q_PROPERTY(QQuickGradient *gradient READ gradient WRITE setGradient)
+    Q_PROPERTY(QQuickPen * border READ border CONSTANT)
     Q_PROPERTY(qreal radius READ radius WRITE setRadius NOTIFY radiusChanged)
 public:
-    QSGRectangle(QSGItem *parent=0);
+    QQuickRectangle(QQuickItem *parent=0);
 
     QColor color() const;
     void setColor(const QColor &);
 
-    QSGPen *border();
+    QQuickPen *border();
 
-    QSGGradient *gradient() const;
-    void setGradient(QSGGradient *gradient);
+    QQuickGradient *gradient() const;
+    void setGradient(QQuickGradient *gradient);
 
     qreal radius() const;
     void setRadius(qreal radius);
@@ -173,17 +173,17 @@ private Q_SLOTS:
     void doUpdate();
 
 private:
-    Q_DISABLE_COPY(QSGRectangle)
-    Q_DECLARE_PRIVATE(QSGRectangle)
+    Q_DISABLE_COPY(QQuickRectangle)
+    Q_DECLARE_PRIVATE(QQuickRectangle)
 };
 
 QT_END_NAMESPACE
 
-QML_DECLARE_TYPE(QSGPen)
-QML_DECLARE_TYPE(QSGGradientStop)
-QML_DECLARE_TYPE(QSGGradient)
-QML_DECLARE_TYPE(QSGRectangle)
+QML_DECLARE_TYPE(QQuickPen)
+QML_DECLARE_TYPE(QQuickGradientStop)
+QML_DECLARE_TYPE(QQuickGradient)
+QML_DECLARE_TYPE(QQuickRectangle)
 
 QT_END_HEADER
 
-#endif // QSGRECTANGLE_P_H
+#endif // QQUICKRECTANGLE_P_H
diff --git a/src/declarative/items/qsgrectangle_p_p.h b/src/declarative/items/qquickrectangle_p_p.h
index 234a029aaf..93140ce75a 100644
--- a/src/declarative/items/qsgrectangle_p_p.h
+++ b/src/declarative/items/qquickrectangle_p_p.h
@@ -40,8 +40,8 @@
 **
 ****************************************************************************/
 
-#ifndef QSGRECTANGLE_P_P_H
-#define QSGRECTANGLE_P_P_H
+#ifndef QQUICKRECTANGLE_P_P_H
+#define QQUICKRECTANGLE_P_P_H
 
 //
 //  W A R N I N G
@@ -54,44 +54,44 @@
 // We mean it.
 //
 
-#include "qsgitem_p.h"
+#include "qquickitem_p.h"
 
 QT_BEGIN_NAMESPACE
 
-class QSGGradient;
-class QSGRectangle;
-class QSGRectanglePrivate : public QSGItemPrivate
+class QQuickGradient;
+class QQuickRectangle;
+class QQuickRectanglePrivate : public QQuickItemPrivate
 {
-    Q_DECLARE_PUBLIC(QSGRectangle)
+    Q_DECLARE_PUBLIC(QQuickRectangle)
 
 public:
-    QSGRectanglePrivate() :
+    QQuickRectanglePrivate() :
     color(Qt::white), gradient(0), pen(0), radius(0), penMargin(0), penOffset(0)
     {
     }
 
-    ~QSGRectanglePrivate()
+    ~QQuickRectanglePrivate()
     {
         delete pen;
     }
 
     QColor color;
-    QSGGradient *gradient;
-    QSGPen *pen;
+    QQuickGradient *gradient;
+    QQuickPen *pen;
     qreal radius;
     qreal penMargin;
     qreal penOffset;
     static int doUpdateSlotIdx;
 
-    QSGPen *getPen() {
+    QQuickPen *getPen() {
         if (!pen) {
-            Q_Q(QSGRectangle);
-            pen = new QSGPen;
+            Q_Q(QQuickRectangle);
+            pen = new QQuickPen;
             static int penChangedSignalIdx = -1;
             if (penChangedSignalIdx < 0)
-                penChangedSignalIdx = QSGPen::staticMetaObject.indexOfSignal("penChanged()");
+                penChangedSignalIdx = QQuickPen::staticMetaObject.indexOfSignal("penChanged()");
             if (doUpdateSlotIdx < 0)
-                doUpdateSlotIdx = QSGRectangle::staticMetaObject.indexOfSlot("doUpdate()");
+                doUpdateSlotIdx = QQuickRectangle::staticMetaObject.indexOfSlot("doUpdate()");
             QMetaObject::connect(pen, penChangedSignalIdx, q, doUpdateSlotIdx);
         }
         return pen;
@@ -100,4 +100,4 @@ public:
 
 QT_END_NAMESPACE
 
-#endif // QSGRECTANGLE_P_P_H
+#endif // QQUICKRECTANGLE_P_P_H
diff --git a/src/declarative/items/qsgrepeater.cpp b/src/declarative/items/qquickrepeater.cpp
index 10adb75893..48632efe83 100644
--- a/src/declarative/items/qsgrepeater.cpp
+++ b/src/declarative/items/qquickrepeater.cpp
@@ -39,9 +39,9 @@
 **
 ****************************************************************************/
 
-#include "qsgrepeater_p.h"
-#include "qsgrepeater_p_p.h"
-#include "qsgvisualdatamodel_p.h"
+#include "qquickrepeater_p.h"
+#include "qquickrepeater_p_p.h"
+#include "qquickvisualdatamodel_p.h"
 
 #include <private/qdeclarativeglobal_p.h>
 #include <private/qdeclarativelistaccessor_p.h>
@@ -50,19 +50,19 @@
 
 QT_BEGIN_NAMESPACE
 
-QSGRepeaterPrivate::QSGRepeaterPrivate()
+QQuickRepeaterPrivate::QQuickRepeaterPrivate()
 : model(0), ownModel(false)
 {
 }
 
-QSGRepeaterPrivate::~QSGRepeaterPrivate()
+QQuickRepeaterPrivate::~QQuickRepeaterPrivate()
 {
     if (ownModel)
         delete model;
 }
 
 /*!
-    \qmlclass Repeater QSGRepeater
+    \qmlclass Repeater QQuickRepeater
     \inqmlmodule QtQuick 2
     \ingroup qml-utility-elements
     \inherits Item
@@ -145,12 +145,12 @@ QSGRepeaterPrivate::~QSGRepeaterPrivate()
     Do not keep a reference to \a item if it was created by this repeater, as
     in these cases it will be deleted shortly after the handler is called.
 */
-QSGRepeater::QSGRepeater(QSGItem *parent)
-  : QSGItem(*(new QSGRepeaterPrivate), parent)
+QQuickRepeater::QQuickRepeater(QQuickItem *parent)
+  : QQuickItem(*(new QQuickRepeaterPrivate), parent)
 {
 }
 
-QSGRepeater::~QSGRepeater()
+QQuickRepeater::~QQuickRepeater()
 {
 }
 
@@ -172,15 +172,15 @@ QSGRepeater::~QSGRepeater()
 
     \sa {qmlmodels}{Data Models}
 */
-QVariant QSGRepeater::model() const
+QVariant QQuickRepeater::model() const
 {
-    Q_D(const QSGRepeater);
+    Q_D(const QQuickRepeater);
     return d->dataSource;
 }
 
-void QSGRepeater::setModel(const QVariant &model)
+void QQuickRepeater::setModel(const QVariant &model)
 {
-    Q_D(QSGRepeater);
+    Q_D(QQuickRepeater);
     if (d->dataSource == model)
         return;
 
@@ -189,14 +189,14 @@ void QSGRepeater::setModel(const QVariant &model)
         disconnect(d->model, SIGNAL(modelUpdated(QDeclarativeChangeSet,bool)),
                 this, SLOT(modelUpdated(QDeclarativeChangeSet,bool)));
         /*
-        disconnect(d->model, SIGNAL(createdItem(int,QSGItem*)), this, SLOT(createdItem(int,QSGItem*)));
-        disconnect(d->model, SIGNAL(destroyingItem(QSGItem*)), this, SLOT(destroyingItem(QSGItem*)));
+        disconnect(d->model, SIGNAL(createdItem(int,QQuickItem*)), this, SLOT(createdItem(int,QQuickItem*)));
+        disconnect(d->model, SIGNAL(destroyingItem(QQuickItem*)), this, SLOT(destroyingItem(QQuickItem*)));
     */
     }
     d->dataSource = model;
     QObject *object = qvariant_cast<QObject*>(model);
-    QSGVisualModel *vim = 0;
-    if (object && (vim = qobject_cast<QSGVisualModel *>(object))) {
+    QQuickVisualModel *vim = 0;
+    if (object && (vim = qobject_cast<QQuickVisualModel *>(object))) {
         if (d->ownModel) {
             delete d->model;
             d->ownModel = false;
@@ -204,20 +204,20 @@ void QSGRepeater::setModel(const QVariant &model)
         d->model = vim;
     } else {
         if (!d->ownModel) {
-            d->model = new QSGVisualDataModel(qmlContext(this));
+            d->model = new QQuickVisualDataModel(qmlContext(this));
             d->ownModel = true;
             if (isComponentComplete())
-                static_cast<QSGVisualDataModel *>(d->model)->componentComplete();
+                static_cast<QQuickVisualDataModel *>(d->model)->componentComplete();
         }
-        if (QSGVisualDataModel *dataModel = qobject_cast<QSGVisualDataModel*>(d->model))
+        if (QQuickVisualDataModel *dataModel = qobject_cast<QQuickVisualDataModel*>(d->model))
             dataModel->setModel(model);
     }
     if (d->model) {
         connect(d->model, SIGNAL(modelUpdated(QDeclarativeChangeSet,bool)),
                 this, SLOT(modelUpdated(QDeclarativeChangeSet,bool)));
         /*
-        connect(d->model, SIGNAL(createdItem(int,QSGItem*)), this, SLOT(createdItem(int,QSGItem*)));
-        connect(d->model, SIGNAL(destroyingItem(QSGItem*)), this, SLOT(destroyingItem(QSGItem*)));
+        connect(d->model, SIGNAL(createdItem(int,QQuickItem*)), this, SLOT(createdItem(int,QQuickItem*)));
+        connect(d->model, SIGNAL(destroyingItem(QQuickItem*)), this, SLOT(destroyingItem(QQuickItem*)));
         */
         regenerate();
     }
@@ -258,29 +258,29 @@ void QSGRepeater::setModel(const QVariant &model)
 
     \sa {QML Data Models}
  */
-QDeclarativeComponent *QSGRepeater::delegate() const
+QDeclarativeComponent *QQuickRepeater::delegate() const
 {
-    Q_D(const QSGRepeater);
+    Q_D(const QQuickRepeater);
     if (d->model) {
-        if (QSGVisualDataModel *dataModel = qobject_cast<QSGVisualDataModel*>(d->model))
+        if (QQuickVisualDataModel *dataModel = qobject_cast<QQuickVisualDataModel*>(d->model))
             return dataModel->delegate();
     }
 
     return 0;
 }
 
-void QSGRepeater::setDelegate(QDeclarativeComponent *delegate)
+void QQuickRepeater::setDelegate(QDeclarativeComponent *delegate)
 {
-    Q_D(QSGRepeater);
-    if (QSGVisualDataModel *dataModel = qobject_cast<QSGVisualDataModel*>(d->model))
+    Q_D(QQuickRepeater);
+    if (QQuickVisualDataModel *dataModel = qobject_cast<QQuickVisualDataModel*>(d->model))
        if (delegate == dataModel->delegate())
            return;
 
     if (!d->ownModel) {
-        d->model = new QSGVisualDataModel(qmlContext(this));
+        d->model = new QQuickVisualDataModel(qmlContext(this));
         d->ownModel = true;
     }
-    if (QSGVisualDataModel *dataModel = qobject_cast<QSGVisualDataModel*>(d->model)) {
+    if (QQuickVisualDataModel *dataModel = qobject_cast<QQuickVisualDataModel*>(d->model)) {
         dataModel->setDelegate(delegate);
         regenerate();
         emit delegateChanged();
@@ -292,9 +292,9 @@ void QSGRepeater::setDelegate(QDeclarativeComponent *delegate)
 
     This property holds the number of items in the repeater.
 */
-int QSGRepeater::count() const
+int QQuickRepeater::count() const
 {
-    Q_D(const QSGRepeater);
+    Q_D(const QQuickRepeater);
     if (d->model)
         return d->model->count();
     return 0;
@@ -306,41 +306,41 @@ int QSGRepeater::count() const
     Returns the \l Item that has been created at the given \a index, or \c null
     if no item exists at \a index.
 */
-QSGItem *QSGRepeater::itemAt(int index) const
+QQuickItem *QQuickRepeater::itemAt(int index) const
 {
-    Q_D(const QSGRepeater);
+    Q_D(const QQuickRepeater);
     if (index >= 0 && index < d->deletables.count())
         return d->deletables[index];
     return 0;
 }
 
-void QSGRepeater::componentComplete()
+void QQuickRepeater::componentComplete()
 {
-    Q_D(QSGRepeater);
+    Q_D(QQuickRepeater);
     if (d->model && d->ownModel)
-        static_cast<QSGVisualDataModel *>(d->model)->componentComplete();
-    QSGItem::componentComplete();
+        static_cast<QQuickVisualDataModel *>(d->model)->componentComplete();
+    QQuickItem::componentComplete();
     regenerate();
     if (d->model && d->model->count())
         emit countChanged();
 }
 
-void QSGRepeater::itemChange(ItemChange change, const ItemChangeData &value)
+void QQuickRepeater::itemChange(ItemChange change, const ItemChangeData &value)
 {
-    QSGItem::itemChange(change, value);
+    QQuickItem::itemChange(change, value);
     if (change == ItemParentHasChanged) {
         regenerate();
     }
 }
 
-void QSGRepeater::clear()
+void QQuickRepeater::clear()
 {
-    Q_D(QSGRepeater);
+    Q_D(QQuickRepeater);
     bool complete = isComponentComplete();
 
     if (d->model) {
         while (d->deletables.count() > 0) {
-            QSGItem *item = d->deletables.takeLast();
+            QQuickItem *item = d->deletables.takeLast();
             if (complete)
                 emit itemRemoved(d->deletables.count()-1, item);
             d->model->release(item);
@@ -349,9 +349,9 @@ void QSGRepeater::clear()
     d->deletables.clear();
 }
 
-void QSGRepeater::regenerate()
+void QQuickRepeater::regenerate()
 {
-    Q_D(QSGRepeater);
+    Q_D(QQuickRepeater);
     if (!isComponentComplete())
         return;
 
@@ -361,7 +361,7 @@ void QSGRepeater::regenerate()
         return;
 
     for (int ii = 0; ii < count(); ++ii) {
-        QSGItem *item = d->model->item(ii);
+        QQuickItem *item = d->model->item(ii);
         if (item) {
             QDeclarative_setParent_noEvent(item, parentItem());
             item->setParentItem(parentItem());
@@ -372,9 +372,9 @@ void QSGRepeater::regenerate()
     }
 }
 
-void QSGRepeater::modelUpdated(const QDeclarativeChangeSet &changeSet, bool reset)
+void QQuickRepeater::modelUpdated(const QDeclarativeChangeSet &changeSet, bool reset)
 {
-    Q_D(QSGRepeater);
+    Q_D(QQuickRepeater);
 
     if (!isComponentComplete())
         return;
@@ -385,7 +385,7 @@ void QSGRepeater::modelUpdated(const QDeclarativeChangeSet &changeSet, bool rese
     }
 
     int difference = 0;
-    QHash<int, QList<QPointer<QSGItem> > > moved;
+    QHash<int, QList<QPointer<QQuickItem> > > moved;
     foreach (const QDeclarativeChangeSet::Remove &remove, changeSet.removes()) {
         int index = qMin(remove.index, d->deletables.count());
         int count = qMin(remove.index + remove.count, d->deletables.count()) - index;
@@ -395,7 +395,7 @@ void QSGRepeater::modelUpdated(const QDeclarativeChangeSet &changeSet, bool rese
                     d->deletables.begin() + index,
                     d->deletables.begin() + index + count);
         } else while (count--) {
-            QSGItem *item = d->deletables.takeAt(index);
+            QQuickItem *item = d->deletables.takeAt(index);
             emit itemRemoved(index, item);
             if (item)
                 d->model->release(item);
@@ -407,16 +407,16 @@ void QSGRepeater::modelUpdated(const QDeclarativeChangeSet &changeSet, bool rese
     foreach (const QDeclarativeChangeSet::Insert &insert, changeSet.inserts()) {
         int index = qMin(insert.index, d->deletables.count());
         if (insert.isMove()) {
-            QList<QPointer<QSGItem> > items = moved.value(insert.moveId);
+            QList<QPointer<QQuickItem> > items = moved.value(insert.moveId);
             d->deletables = d->deletables.mid(0, index) + items + d->deletables.mid(index);
-            QSGItem *stackBefore = index + items.count() < d->deletables.count()
+            QQuickItem *stackBefore = index + items.count() < d->deletables.count()
                     ? d->deletables.at(index + items.count())
                     : this;
             for (int i = index; i < index + items.count(); ++i)
                 d->deletables.at(i)->stackBefore(stackBefore);
         } else for (int i = 0; i < insert.count; ++i) {
             int modelIndex = index + i;
-            QSGItem *item = d->model->item(modelIndex);
+            QQuickItem *item = d->model->item(modelIndex);
             if (item) {
                 QDeclarative_setParent_noEvent(item, parentItem());
                 item->setParentItem(parentItem());
diff --git a/src/declarative/items/qsgrepeater_p.h b/src/declarative/items/qquickrepeater_p.h
index 2094d94993..66e583e406 100644
--- a/src/declarative/items/qsgrepeater_p.h
+++ b/src/declarative/items/qquickrepeater_p.h
@@ -40,10 +40,10 @@
 **
 ****************************************************************************/
 
-#ifndef QSGREPEATER_P_H
-#define QSGREPEATER_P_H
+#ifndef QQUICKREPEATER_P_H
+#define QQUICKREPEATER_P_H
 
-#include "qsgitem.h"
+#include "qquickitem.h"
 
 QT_BEGIN_HEADER
 
@@ -53,8 +53,8 @@ QT_MODULE(Declarative)
 
 class QDeclarativeChangeSet;
 
-class QSGRepeaterPrivate;
-class Q_AUTOTEST_EXPORT QSGRepeater : public QSGItem
+class QQuickRepeaterPrivate;
+class Q_AUTOTEST_EXPORT QQuickRepeater : public QQuickItem
 {
     Q_OBJECT
 
@@ -64,8 +64,8 @@ class Q_AUTOTEST_EXPORT QSGRepeater : public QSGItem
     Q_CLASSINFO("DefaultProperty", "delegate")
 
 public:
-    QSGRepeater(QSGItem *parent=0);
-    virtual ~QSGRepeater();
+    QQuickRepeater(QQuickItem *parent=0);
+    virtual ~QQuickRepeater();
 
     QVariant model() const;
     void setModel(const QVariant &);
@@ -75,15 +75,15 @@ public:
 
     int count() const;
 
-    Q_INVOKABLE QSGItem *itemAt(int index) const;
+    Q_INVOKABLE QQuickItem *itemAt(int index) const;
 
 Q_SIGNALS:
     void modelChanged();
     void delegateChanged();
     void countChanged();
 
-    void itemAdded(int index, QSGItem *item);
-    void itemRemoved(int index, QSGItem *item);
+    void itemAdded(int index, QQuickItem *item);
+    void itemRemoved(int index, QQuickItem *item);
 
 private:
     void clear();
@@ -97,14 +97,14 @@ private Q_SLOTS:
     void modelUpdated(const QDeclarativeChangeSet &changeSet, bool reset);
 
 private:
-    Q_DISABLE_COPY(QSGRepeater)
-    Q_DECLARE_PRIVATE(QSGRepeater)
+    Q_DISABLE_COPY(QQuickRepeater)
+    Q_DECLARE_PRIVATE(QQuickRepeater)
 };
 
 QT_END_NAMESPACE
 
-QML_DECLARE_TYPE(QSGRepeater)
+QML_DECLARE_TYPE(QQuickRepeater)
 
 QT_END_HEADER
 
-#endif // QSGREPEATER_P_H
+#endif // QQUICKREPEATER_P_H
diff --git a/src/declarative/items/qsgrepeater_p_p.h b/src/declarative/items/qquickrepeater_p_p.h
index ae4c78e1a4..a1ec15960a 100644
--- a/src/declarative/items/qsgrepeater_p_p.h
+++ b/src/declarative/items/qquickrepeater_p_p.h
@@ -40,8 +40,8 @@
 **
 ****************************************************************************/
 
-#ifndef QSGREPEATER_P_P_H
-#define QSGREPEATER_P_P_H
+#ifndef QQUICKREPEATER_P_P_H
+#define QQUICKREPEATER_P_P_H
 
 //
 //  W A R N I N G
@@ -54,30 +54,30 @@
 // We mean it.
 //
 
-#include "qsgrepeater_p.h"
-#include "qsgitem_p.h"
+#include "qquickrepeater_p.h"
+#include "qquickitem_p.h"
 
 #include <QtCore/qpointer.h>
 
 QT_BEGIN_NAMESPACE
 
 class QDeclarativeContext;
-class QSGVisualModel;
-class QSGRepeaterPrivate : public QSGItemPrivate
+class QQuickVisualModel;
+class QQuickRepeaterPrivate : public QQuickItemPrivate
 {
-    Q_DECLARE_PUBLIC(QSGRepeater)
+    Q_DECLARE_PUBLIC(QQuickRepeater)
 
 public:
-    QSGRepeaterPrivate();
-    ~QSGRepeaterPrivate();
+    QQuickRepeaterPrivate();
+    ~QQuickRepeaterPrivate();
 
-    QSGVisualModel *model;
+    QQuickVisualModel *model;
     QVariant dataSource;
     bool ownModel;
 
-    QList<QPointer<QSGItem> > deletables;
+    QList<QPointer<QQuickItem> > deletables;
 };
 
 QT_END_NAMESPACE
 
-#endif // QSGREPEATER_P_P_H
+#endif // QQUICKREPEATER_P_P_H
diff --git a/src/declarative/items/qsgscalegrid.cpp b/src/declarative/items/qquickscalegrid.cpp
index 1c4ce8d289..9a8f652a9b 100644
--- a/src/declarative/items/qsgscalegrid.cpp
+++ b/src/declarative/items/qquickscalegrid.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include "qsgscalegrid_p_p.h"
+#include "qquickscalegrid_p_p.h"
 
 #include <QtDeclarative/qdeclarative.h>
 
@@ -47,24 +47,24 @@ QT_BEGIN_NAMESPACE
 
 /*!
     \internal
-    \class QSGScaleGrid
-    \brief The QSGScaleGrid class allows you to specify a 3x3 grid to use in scaling an image.
+    \class QQuickScaleGrid
+    \brief The QQuickScaleGrid class allows you to specify a 3x3 grid to use in scaling an image.
 */
 
-QSGScaleGrid::QSGScaleGrid(QObject *parent) : QObject(parent), _left(0), _top(0), _right(0), _bottom(0)
+QQuickScaleGrid::QQuickScaleGrid(QObject *parent) : QObject(parent), _left(0), _top(0), _right(0), _bottom(0)
 {
 }
 
-QSGScaleGrid::~QSGScaleGrid()
+QQuickScaleGrid::~QQuickScaleGrid()
 {
 }
 
-bool QSGScaleGrid::isNull() const
+bool QQuickScaleGrid::isNull() const
 {
     return !_left && !_top && !_right && !_bottom;
 }
 
-void QSGScaleGrid::setLeft(int pos)
+void QQuickScaleGrid::setLeft(int pos)
 {
     if (_left != pos) {
         _left = pos;
@@ -72,7 +72,7 @@ void QSGScaleGrid::setLeft(int pos)
     }
 }
 
-void QSGScaleGrid::setTop(int pos)
+void QQuickScaleGrid::setTop(int pos)
 {
     if (_top != pos) {
         _top = pos;
@@ -80,7 +80,7 @@ void QSGScaleGrid::setTop(int pos)
     }
 }
 
-void QSGScaleGrid::setRight(int pos)
+void QQuickScaleGrid::setRight(int pos)
 {
     if (_right != pos) {
         _right = pos;
@@ -88,7 +88,7 @@ void QSGScaleGrid::setRight(int pos)
     }
 }
 
-void QSGScaleGrid::setBottom(int pos)
+void QQuickScaleGrid::setBottom(int pos)
 {
     if (_bottom != pos) {
         _bottom = pos;
@@ -96,18 +96,18 @@ void QSGScaleGrid::setBottom(int pos)
     }
 }
 
-QSGGridScaledImage::QSGGridScaledImage()
+QQuickGridScaledImage::QQuickGridScaledImage()
 : _l(-1), _r(-1), _t(-1), _b(-1),
-  _h(QSGBorderImage::Stretch), _v(QSGBorderImage::Stretch)
+  _h(QQuickBorderImage::Stretch), _v(QQuickBorderImage::Stretch)
 {
 }
 
-QSGGridScaledImage::QSGGridScaledImage(const QSGGridScaledImage &o)
+QQuickGridScaledImage::QQuickGridScaledImage(const QQuickGridScaledImage &o)
 : _l(o._l), _r(o._r), _t(o._t), _b(o._b), _h(o._h), _v(o._v), _pix(o._pix)
 {
 }
 
-QSGGridScaledImage &QSGGridScaledImage::operator=(const QSGGridScaledImage &o)
+QQuickGridScaledImage &QQuickGridScaledImage::operator=(const QQuickGridScaledImage &o)
 {
     _l = o._l;
     _r = o._r;
@@ -119,8 +119,8 @@ QSGGridScaledImage &QSGGridScaledImage::operator=(const QSGGridScaledImage &o)
     return *this;
 }
 
-QSGGridScaledImage::QSGGridScaledImage(QIODevice *data)
-: _l(-1), _r(-1), _t(-1), _b(-1), _h(QSGBorderImage::Stretch), _v(QSGBorderImage::Stretch)
+QQuickGridScaledImage::QQuickGridScaledImage(QIODevice *data)
+: _l(-1), _r(-1), _t(-1), _b(-1), _h(QQuickBorderImage::Stretch), _v(QQuickBorderImage::Stretch)
 {
     int l = -1;
     int r = -1;
@@ -168,45 +168,45 @@ QSGGridScaledImage::QSGGridScaledImage(QIODevice *data)
         _pix = _pix.mid(1, _pix.size() - 2); // remove leading/trailing quotes.
 }
 
-QSGBorderImage::TileMode QSGGridScaledImage::stringToRule(const QString &s)
+QQuickBorderImage::TileMode QQuickGridScaledImage::stringToRule(const QString &s)
 {
     if (s == QLatin1String("Stretch"))
-        return QSGBorderImage::Stretch;
+        return QQuickBorderImage::Stretch;
     if (s == QLatin1String("Repeat"))
-        return QSGBorderImage::Repeat;
+        return QQuickBorderImage::Repeat;
     if (s == QLatin1String("Round"))
-        return QSGBorderImage::Round;
+        return QQuickBorderImage::Round;
 
-    qWarning("QSGGridScaledImage: Invalid tile rule specified. Using Stretch.");
-    return QSGBorderImage::Stretch;
+    qWarning("QQuickGridScaledImage: Invalid tile rule specified. Using Stretch.");
+    return QQuickBorderImage::Stretch;
 }
 
-bool QSGGridScaledImage::isValid() const
+bool QQuickGridScaledImage::isValid() const
 {
     return _l >= 0;
 }
 
-int QSGGridScaledImage::gridLeft() const
+int QQuickGridScaledImage::gridLeft() const
 {
     return _l;
 }
 
-int QSGGridScaledImage::gridRight() const
+int QQuickGridScaledImage::gridRight() const
 {
     return _r;
 }
 
-int QSGGridScaledImage::gridTop() const
+int QQuickGridScaledImage::gridTop() const
 {
     return _t;
 }
 
-int QSGGridScaledImage::gridBottom() const
+int QQuickGridScaledImage::gridBottom() const
 {
     return _b;
 }
 
-QString QSGGridScaledImage::pixmapUrl() const
+QString QQuickGridScaledImage::pixmapUrl() const
 {
     return _pix;
 }
diff --git a/src/declarative/items/qsgscalegrid_p_p.h b/src/declarative/items/qquickscalegrid_p_p.h
index 03d68c4683..8d93c3b1c9 100644
--- a/src/declarative/items/qsgscalegrid_p_p.h
+++ b/src/declarative/items/qquickscalegrid_p_p.h
@@ -40,10 +40,10 @@
 **
 ****************************************************************************/
 
-#ifndef QSGSCALEGRID_P_P_H
-#define QSGSCALEGRID_P_P_H
+#ifndef QQUICKSCALEGRID_P_P_H
+#define QQUICKSCALEGRID_P_P_H
 
-#include "qsgborderimage_p.h"
+#include "qquickborderimage_p.h"
 
 #include <QtDeclarative/qdeclarative.h>
 #include <QtCore/qobject.h>
@@ -57,7 +57,7 @@ QT_BEGIN_NAMESPACE
 
 QT_MODULE(Declarative)
 
-class Q_DECLARATIVE_PRIVATE_EXPORT QSGScaleGrid : public QObject
+class Q_DECLARATIVE_PRIVATE_EXPORT QQuickScaleGrid : public QObject
 {
     Q_OBJECT
     Q_ENUMS(TileRule)
@@ -68,8 +68,8 @@ class Q_DECLARATIVE_PRIVATE_EXPORT QSGScaleGrid : public QObject
     Q_PROPERTY(int bottom READ bottom WRITE setBottom NOTIFY borderChanged)
 
 public:
-    QSGScaleGrid(QObject *parent=0);
-    ~QSGScaleGrid();
+    QQuickScaleGrid(QObject *parent=0);
+    ~QQuickScaleGrid();
 
     bool isNull() const;
 
@@ -95,40 +95,40 @@ private:
     int _bottom;
 };
 
-class Q_DECLARATIVE_PRIVATE_EXPORT QSGGridScaledImage
+class Q_DECLARATIVE_PRIVATE_EXPORT QQuickGridScaledImage
 {
 public:
-    QSGGridScaledImage();
-    QSGGridScaledImage(const QSGGridScaledImage &);
-    QSGGridScaledImage(QIODevice*);
-    QSGGridScaledImage &operator=(const QSGGridScaledImage &);
+    QQuickGridScaledImage();
+    QQuickGridScaledImage(const QQuickGridScaledImage &);
+    QQuickGridScaledImage(QIODevice*);
+    QQuickGridScaledImage &operator=(const QQuickGridScaledImage &);
     bool isValid() const;
     int gridLeft() const;
     int gridRight() const;
     int gridTop() const;
     int gridBottom() const;
-    QSGBorderImage::TileMode horizontalTileRule() const { return _h; }
-    QSGBorderImage::TileMode verticalTileRule() const { return _v; }
+    QQuickBorderImage::TileMode horizontalTileRule() const { return _h; }
+    QQuickBorderImage::TileMode verticalTileRule() const { return _v; }
 
     QString pixmapUrl() const;
 
 private:
-    static QSGBorderImage::TileMode stringToRule(const QString &);
+    static QQuickBorderImage::TileMode stringToRule(const QString &);
 
 private:
     int _l;
     int _r;
     int _t;
     int _b;
-    QSGBorderImage::TileMode _h;
-    QSGBorderImage::TileMode _v;
+    QQuickBorderImage::TileMode _h;
+    QQuickBorderImage::TileMode _v;
     QString _pix;
 };
 
 QT_END_NAMESPACE
 
-QML_DECLARE_TYPE(QSGScaleGrid)
+QML_DECLARE_TYPE(QQuickScaleGrid)
 
 QT_END_HEADER
 
-#endif // QSGSCALEGRID_P_P_H
+#endif // QQUICKSCALEGRID_P_P_H
diff --git a/src/declarative/items/qsgshadereffect.cpp b/src/declarative/items/qquickshadereffect.cpp
index f84d023906..a3b57be1eb 100644
--- a/src/declarative/items/qsgshadereffect.cpp
+++ b/src/declarative/items/qquickshadereffect.cpp
@@ -39,18 +39,18 @@
 **
 ****************************************************************************/
 
-#include <private/qsgshadereffect_p.h>
-#include <private/qsgshadereffectnode_p.h>
+#include <private/qquickshadereffect_p.h>
+#include <private/qquickshadereffectnode_p.h>
 
 #include "qsgmaterial.h"
-#include "qsgitem_p.h"
+#include "qquickitem_p.h"
 
 #include <private/qsgcontext_p.h>
 #include <private/qsgtextureprovider_p.h>
-#include "qsgcanvas.h"
+#include "qquickcanvas.h"
 
-#include "qsgimage_p.h"
-#include "qsgshadereffectsource_p.h"
+#include "qquickimage_p.h"
+#include "qquickshadereffectsource_p.h"
 
 #include <QtCore/qsignalmapper.h>
 #include <QtGui/qopenglframebufferobject.h>
@@ -89,15 +89,15 @@ const char *qtTexCoordAttributeName()
 }
 
 // TODO: Remove after grace period.
-QSGShaderEffectItem::QSGShaderEffectItem(QSGItem *parent)
-    : QSGShaderEffect(parent)
+QQuickShaderEffectItem::QQuickShaderEffectItem(QQuickItem *parent)
+    : QQuickShaderEffect(parent)
 {
     qWarning("ShaderEffectItem has been deprecated. Use ShaderEffect instead.");
 }
 
 
 /*!
-    \qmlclass ShaderEffect QSGShaderEffect
+    \qmlclass ShaderEffect QQuickShaderEffect
     \inqmlmodule QtQuick 2
     \ingroup qml-basic-visual-elements
     \brief The ShaderEffect element applies custom shaders to a rectangle.
@@ -188,8 +188,8 @@ QSGShaderEffectItem::QSGShaderEffectItem(QSGItem *parent)
     bottom-left which is common in OpenGL.
 */
 
-QSGShaderEffect::QSGShaderEffect(QSGItem *parent)
-    : QSGItem(parent)
+QQuickShaderEffect::QQuickShaderEffect(QQuickItem *parent)
+    : QQuickItem(parent)
     , m_meshResolution(1, 1)
     , m_mesh(0)
     , m_cullMode(NoCulling)
@@ -199,18 +199,18 @@ QSGShaderEffect::QSGShaderEffect(QSGItem *parent)
     , m_dirtyMesh(true)
     , m_dirtyGeometry(true)
 {
-    setFlag(QSGItem::ItemHasContents);
+    setFlag(QQuickItem::ItemHasContents);
 }
 
-QSGShaderEffect::~QSGShaderEffect()
+QQuickShaderEffect::~QQuickShaderEffect()
 {
     reset();
 }
 
-void QSGShaderEffect::componentComplete()
+void QQuickShaderEffect::componentComplete()
 {
     updateProperties();
-    QSGItem::componentComplete();
+    QQuickItem::componentComplete();
 }
 
 /*!
@@ -221,7 +221,7 @@ void QSGShaderEffect::componentComplete()
     shader as "varying highp vec2 qt_TexCoord0".
 */
 
-void QSGShaderEffect::setFragmentShader(const QByteArray &code)
+void QQuickShaderEffect::setFragmentShader(const QByteArray &code)
 {
     if (m_source.fragmentCode.constData() == code.constData())
         return;
@@ -242,7 +242,7 @@ void QSGShaderEffect::setFragmentShader(const QByteArray &code)
     sampler2D named "source".
 */
 
-void QSGShaderEffect::setVertexShader(const QByteArray &code)
+void QQuickShaderEffect::setVertexShader(const QByteArray &code)
 {
     if (m_source.vertexCode.constData() == code.constData())
         return;
@@ -263,7 +263,7 @@ void QSGShaderEffect::setVertexShader(const QByteArray &code)
     property to false when blending is not needed. The default value is true.
 */
 
-void QSGShaderEffect::setBlending(bool enable)
+void QQuickShaderEffect::setBlending(bool enable)
 {
     if (blending() == enable)
         return;
@@ -278,7 +278,7 @@ void QSGShaderEffect::setBlending(bool enable)
     \qmlproperty variant QtQuick2::ShaderEffect::mesh
 
     This property defines the mesh used to draw the ShaderEffect. It can hold
-    any mesh object deriving from \l QSGShaderEffectMesh, such as \l GridMesh.
+    any mesh object deriving from \l QQuickShaderEffectMesh, such as \l GridMesh.
     If a size value is assigned to this property, the ShaderEffect implicitly
     uses a \l GridMesh with the value as
     \l{GridMesh::resolution}{mesh resolution}. By default, this property is
@@ -287,15 +287,15 @@ void QSGShaderEffect::setBlending(bool enable)
     \sa GridMesh
 */
 
-QVariant QSGShaderEffect::mesh() const
+QVariant QQuickShaderEffect::mesh() const
 {
     return m_mesh ? qVariantFromValue(static_cast<QObject *>(m_mesh))
                   : qVariantFromValue(m_meshResolution);
 }
 
-void QSGShaderEffect::setMesh(const QVariant &mesh)
+void QQuickShaderEffect::setMesh(const QVariant &mesh)
 {
-    QSGShaderEffectMesh *newMesh = qobject_cast<QSGShaderEffectMesh *>(qVariantValue<QObject *>(mesh));
+    QQuickShaderEffectMesh *newMesh = qobject_cast<QQuickShaderEffectMesh *>(qVariantValue<QObject *>(mesh));
     if (newMesh && newMesh == m_mesh)
         return;
     if (m_mesh)
@@ -318,7 +318,7 @@ void QSGShaderEffect::setMesh(const QVariant &mesh)
                 }
             }
             if (!ok)
-                qWarning("ShaderEffect: mesh property must be size or object deriving from QSGShaderEffectMesh.");
+                qWarning("ShaderEffect: mesh property must be size or object deriving from QQuickShaderEffectMesh.");
         }
         m_defaultMesh.setResolution(m_meshResolution);
     }
@@ -342,7 +342,7 @@ void QSGShaderEffect::setMesh(const QVariant &mesh)
     The default is NoCulling.
 */
 
-void QSGShaderEffect::setCullMode(CullMode face)
+void QQuickShaderEffect::setCullMode(CullMode face)
 {
     if (face == m_cullMode)
         return;
@@ -351,26 +351,26 @@ void QSGShaderEffect::setCullMode(CullMode face)
     emit cullModeChanged();
 }
 
-void QSGShaderEffect::changeSource(int index)
+void QQuickShaderEffect::changeSource(int index)
 {
     Q_ASSERT(index >= 0 && index < m_sources.size());
     QVariant v = property(m_sources.at(index).name.constData());
     setSource(v, index);
 }
 
-void QSGShaderEffect::updateData()
+void QQuickShaderEffect::updateData()
 {
     m_dirtyData = true;
     update();
 }
 
-void QSGShaderEffect::updateGeometry()
+void QQuickShaderEffect::updateGeometry()
 {
     m_dirtyGeometry = true;
     update();
 }
 
-void QSGShaderEffect::setSource(const QVariant &var, int index)
+void QQuickShaderEffect::setSource(const QVariant &var, int index)
 {
     Q_ASSERT(index >= 0 && index < m_sources.size());
 
@@ -385,7 +385,7 @@ void QSGShaderEffect::setSource(const QVariant &var, int index)
     }
 
     QObject *obj = qVariantValue<QObject *>(var);
-    QSGItem *item = qobject_cast<QSGItem *>(obj);
+    QQuickItem *item = qobject_cast<QQuickItem *>(obj);
     if (!item || !item->isTextureProvider()) {
         qWarning("ShaderEffect: source uniform [%s] is not assigned a valid texture provider: %s [%s]",
                  source.name.constData(), qPrintable(obj->objectName()), obj->metaObject()->className());
@@ -405,7 +405,7 @@ void QSGShaderEffect::setSource(const QVariant &var, int index)
     }
 }
 
-void QSGShaderEffect::disconnectPropertySignals()
+void QQuickShaderEffect::disconnectPropertySignals()
 {
     disconnect(this, 0, this, SLOT(updateData()));
     for (int i = 0; i < m_sources.size(); ++i) {
@@ -415,7 +415,7 @@ void QSGShaderEffect::disconnectPropertySignals()
     }
 }
 
-void QSGShaderEffect::connectPropertySignals()
+void QQuickShaderEffect::connectPropertySignals()
 {
     QSet<QByteArray>::const_iterator it;
     for (it = m_source.uniformNames.begin(); it != m_source.uniformNames.end(); ++it) {
@@ -423,12 +423,12 @@ void QSGShaderEffect::connectPropertySignals()
         if (pi >= 0) {
             QMetaProperty mp = metaObject()->property(pi);
             if (!mp.hasNotifySignal())
-                qWarning("QSGShaderEffect: property '%s' does not have notification method!", it->constData());
+                qWarning("QQuickShaderEffect: property '%s' does not have notification method!", it->constData());
             QByteArray signalName("2");
             signalName.append(mp.notifySignal().signature());
             connect(this, signalName, this, SLOT(updateData()));
         } else {
-            qWarning("QSGShaderEffect: '%s' does not have a matching property!", it->constData());
+            qWarning("QQuickShaderEffect: '%s' does not have a matching property!", it->constData());
         }
     }
     for (int i = 0; i < m_sources.size(); ++i) {
@@ -442,12 +442,12 @@ void QSGShaderEffect::connectPropertySignals()
             source.mapper->setMapping(this, i);
             connect(source.mapper, SIGNAL(mapped(int)), this, SLOT(changeSource(int)));
         } else {
-            qWarning("QSGShaderEffect: '%s' does not have a matching source!", source.name.constData());
+            qWarning("QQuickShaderEffect: '%s' does not have a matching source!", source.name.constData());
         }
     }
 }
 
-void QSGShaderEffect::reset()
+void QQuickShaderEffect::reset()
 {
     disconnectPropertySignals();
 
@@ -460,7 +460,7 @@ void QSGShaderEffect::reset()
     for (int i = 0; i < m_sources.size(); ++i) {
         const SourceData &source = m_sources.at(i);
         delete source.mapper;
-        QSGItem *item = qobject_cast<QSGItem *>(source.sourceObject);
+        QQuickItem *item = qobject_cast<QQuickItem *>(source.sourceObject);
         if (item && item->parentItem() == this)
             item->setParentItem(0);
     }
@@ -470,7 +470,7 @@ void QSGShaderEffect::reset()
     m_dirtyMesh = true;
 }
 
-void QSGShaderEffect::updateProperties()
+void QQuickShaderEffect::updateProperties()
 {
     QByteArray vertexCode = m_source.vertexCode;
     QByteArray fragmentCode = m_source.fragmentCode;
@@ -483,13 +483,13 @@ void QSGShaderEffect::updateProperties()
     lookThroughShaderCode(fragmentCode);
 
     if (!m_mesh && !m_source.attributeNames.contains(qt_position_attribute_name))
-        qWarning("QSGShaderEffect: Missing reference to \'%s\'.", qt_position_attribute_name);
+        qWarning("QQuickShaderEffect: Missing reference to \'%s\'.", qt_position_attribute_name);
     if (!m_mesh && !m_source.attributeNames.contains(qt_texcoord_attribute_name))
-        qWarning("QSGShaderEffect: Missing reference to \'%s\'.", qt_texcoord_attribute_name);
+        qWarning("QQuickShaderEffect: Missing reference to \'%s\'.", qt_texcoord_attribute_name);
     if (!m_source.respectsMatrix)
-        qWarning("QSGShaderEffect: Missing reference to \'qt_Matrix\'.");
+        qWarning("QQuickShaderEffect: Missing reference to \'qt_Matrix\'.");
     if (!m_source.respectsOpacity)
-        qWarning("QSGShaderEffect: Missing reference to \'qt_Opacity\'.");
+        qWarning("QQuickShaderEffect: Missing reference to \'qt_Opacity\'.");
 
     for (int i = 0; i < m_sources.size(); ++i) {
         QVariant v = property(m_sources.at(i).name);
@@ -499,7 +499,7 @@ void QSGShaderEffect::updateProperties()
     connectPropertySignals();
 }
 
-void QSGShaderEffect::lookThroughShaderCode(const QByteArray &code)
+void QQuickShaderEffect::lookThroughShaderCode(const QByteArray &code)
 {
     // Regexp for matching attributes and uniforms.
     // In human readable form: attribute|uniform [lowp|mediump|highp] <type> <name>
@@ -542,15 +542,15 @@ void QSGShaderEffect::lookThroughShaderCode(const QByteArray &code)
     }
 }
 
-void QSGShaderEffect::geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry)
+void QQuickShaderEffect::geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry)
 {
     m_dirtyGeometry = true;
-    QSGItem::geometryChanged(newGeometry, oldGeometry);
+    QQuickItem::geometryChanged(newGeometry, oldGeometry);
 }
 
-QSGNode *QSGShaderEffect::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *)
+QSGNode *QQuickShaderEffect::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *)
 {
-    QSGShaderEffectNode *node = static_cast<QSGShaderEffectNode *>(oldNode);
+    QQuickShaderEffectNode *node = static_cast<QQuickShaderEffectNode *>(oldNode);
 
     // In the case of a bad vertex shader, don't try to create a node...
     if (m_source.attributeNames.isEmpty()) {
@@ -560,13 +560,13 @@ QSGNode *QSGShaderEffect::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData
     }
 
     if (!node) {
-        node = new QSGShaderEffectNode;
+        node = new QQuickShaderEffectNode;
         m_programDirty = true;
         m_dirtyData = true;
         m_dirtyGeometry = true;
     }
 
-    QSGShaderEffectMaterial *material = node->shaderMaterial();
+    QQuickShaderEffectMaterial *material = node->shaderMaterial();
 
     if (m_dirtyMesh) {
         node->setGeometry(0);
@@ -578,7 +578,7 @@ QSGNode *QSGShaderEffect::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData
         node->setFlag(QSGNode::OwnsGeometry, false);
         QSGGeometry *geometry = node->geometry();
         QRectF rect(0, 0, width(), height());
-        QSGShaderEffectMesh *mesh = m_mesh ? m_mesh : &m_defaultMesh;
+        QQuickShaderEffectMesh *mesh = m_mesh ? m_mesh : &m_defaultMesh;
 
         geometry = mesh->updateGeometry(geometry, m_source.attributeNames, rect);
         if (!geometry) {
@@ -593,7 +593,7 @@ QSGNode *QSGShaderEffect::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData
     }
 
     if (m_programDirty) {
-        QSGShaderEffectProgram s = m_source;
+        QQuickShaderEffectProgram s = m_source;
         if (s.fragmentCode.isEmpty())
             s.fragmentCode = qt_default_fragment_code;
         if (s.vertexCode.isEmpty())
@@ -612,7 +612,7 @@ QSGNode *QSGShaderEffect::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData
     }
 
     if (int(material->cullMode()) != int(m_cullMode)) {
-        material->setCullMode(QSGShaderEffectMaterial::CullMode(m_cullMode));
+        material->setCullMode(QQuickShaderEffectMaterial::CullMode(m_cullMode));
         node->markDirty(QSGNode::DirtyMaterial);
     }
 
diff --git a/src/declarative/items/qsgshadereffect_p.h b/src/declarative/items/qquickshadereffect_p.h
index 08af5f6bff..257fa40aa8 100644
--- a/src/declarative/items/qsgshadereffect_p.h
+++ b/src/declarative/items/qquickshadereffect_p.h
@@ -39,15 +39,15 @@
 **
 ****************************************************************************/
 
-#ifndef SHADEREFFECTITEM_H
-#define SHADEREFFECTITEM_H
+#ifndef QQUICKSHADEREFFECT_P_H
+#define QQUICKSHADEREFFECT_P_H
 
-#include "qsgitem.h"
+#include "qquickitem.h"
 
 #include "qsgmaterial.h"
 #include <private/qsgadaptationlayer_p.h>
-#include <private/qsgshadereffectnode_p.h>
-#include "qsgshadereffectmesh_p.h"
+#include <private/qquickshadereffectnode_p.h>
+#include "qquickshadereffectmesh_p.h"
 
 #include <QtCore/qpointer.h>
 
@@ -62,9 +62,9 @@ const char *qtTexCoordAttributeName();
 
 class QSGContext;
 class QSignalMapper;
-class QSGCustomMaterialShader;
+class QQuickCustomMaterialShader;
 
-class QSGShaderEffect : public QSGItem
+class QQuickShaderEffect : public QQuickItem
 {
     Q_OBJECT
     Q_PROPERTY(QByteArray fragmentShader READ fragmentShader WRITE setFragmentShader NOTIFY fragmentShaderChanged)
@@ -77,13 +77,13 @@ class QSGShaderEffect : public QSGItem
 public:
     enum CullMode
     {
-        NoCulling = QSGShaderEffectMaterial::NoCulling,
-        BackFaceCulling = QSGShaderEffectMaterial::BackFaceCulling,
-        FrontFaceCulling = QSGShaderEffectMaterial::FrontFaceCulling
+        NoCulling = QQuickShaderEffectMaterial::NoCulling,
+        BackFaceCulling = QQuickShaderEffectMaterial::BackFaceCulling,
+        FrontFaceCulling = QQuickShaderEffectMaterial::FrontFaceCulling
     };
 
-    QSGShaderEffect(QSGItem *parent = 0);
-    ~QSGShaderEffect();
+    QQuickShaderEffect(QQuickItem *parent = 0);
+    ~QQuickShaderEffect();
 
     virtual void componentComplete();
 
@@ -119,8 +119,8 @@ private Q_SLOTS:
     void updateGeometry();
 
 private:
-    friend class QSGCustomMaterialShader;
-    friend class QSGShaderEffectNode;
+    friend class QQuickCustomMaterialShader;
+    friend class QQuickShaderEffectNode;
 
     void setSource(const QVariant &var, int index);
     void disconnectPropertySignals();
@@ -129,16 +129,16 @@ private:
     void updateProperties();
     void lookThroughShaderCode(const QByteArray &code);
 
-    QSGShaderEffectProgram m_source;
+    QQuickShaderEffectProgram m_source;
     QSize m_meshResolution;
-    QSGShaderEffectMesh *m_mesh;
-    QSGGridMesh m_defaultMesh;
+    QQuickShaderEffectMesh *m_mesh;
+    QQuickGridMesh m_defaultMesh;
     CullMode m_cullMode;
 
     struct SourceData
     {
         QSignalMapper *mapper;
-        QPointer<QSGItem> sourceObject;
+        QPointer<QQuickItem> sourceObject;
         QByteArray name;
     };
     QVector<SourceData> m_sources;
@@ -152,14 +152,14 @@ private:
 };
 
 // TODO: Remove after grace period.
-class QSGShaderEffectItem : public QSGShaderEffect
+class QQuickShaderEffectItem : public QQuickShaderEffect
 {
 public:
-    QSGShaderEffectItem(QSGItem *parent = 0);
+    QQuickShaderEffectItem(QQuickItem *parent = 0);
 };
 
 QT_END_NAMESPACE
 
 QT_END_HEADER
 
-#endif // SHADEREFFECTITEM_H
+#endif // QQUICKSHADEREFFECT_P_H
diff --git a/src/declarative/items/qsgshadereffectmesh.cpp b/src/declarative/items/qquickshadereffectmesh.cpp
index 53fd917e06..79b37d40bd 100644
--- a/src/declarative/items/qsgshadereffectmesh.cpp
+++ b/src/declarative/items/qquickshadereffectmesh.cpp
@@ -39,19 +39,19 @@
 **
 ****************************************************************************/
 
-#include "qsgshadereffectmesh_p.h"
+#include "qquickshadereffectmesh_p.h"
 #include "qsggeometry.h"
-#include "qsgshadereffect_p.h"
+#include "qquickshadereffect_p.h"
 
 QT_BEGIN_NAMESPACE
 
-QSGShaderEffectMesh::QSGShaderEffectMesh(QObject *parent)
+QQuickShaderEffectMesh::QQuickShaderEffectMesh(QObject *parent)
     : QObject(parent)
 {
 }
 
 /*!
-    \qmlclass GridMesh QSGGridMesh
+    \qmlclass GridMesh QQuickGridMesh
     \inqmlmodule QtQuick 2
     \ingroup qml-utility-elements
     \brief GridMesh defines a mesh with vertices arranged in a grid.
@@ -61,14 +61,14 @@ QSGShaderEffectMesh::QSGShaderEffectMesh(QObject *parent)
     The grid resolution is specified with the \l resolution property.
 */
 
-QSGGridMesh::QSGGridMesh(QObject *parent)
-    : QSGShaderEffectMesh(parent)
+QQuickGridMesh::QQuickGridMesh(QObject *parent)
+    : QQuickShaderEffectMesh(parent)
     , m_resolution(1, 1)
 {
     connect(this, SIGNAL(resolutionChanged()), this, SIGNAL(geometryChanged()));
 }
 
-QSGGeometry *QSGGridMesh::updateGeometry(QSGGeometry *geometry, const QVector<QByteArray> &attributes, const QRectF &dstRect) const
+QSGGeometry *QQuickGridMesh::updateGeometry(QSGGeometry *geometry, const QVector<QByteArray> &attributes, const QRectF &dstRect) const
 {
     int vmesh = m_resolution.height();
     int hmesh = m_resolution.width();
@@ -78,14 +78,14 @@ QSGGeometry *QSGGridMesh::updateGeometry(QSGGeometry *geometry, const QVector<QB
         bool error = true;
         switch (attrCount) {
         case 0:
-            qWarning("QSGGridMesh:: No attributes specified.");
+            qWarning("QQuickGridMesh:: No attributes specified.");
             break;
         case 1:
             if (attributes.at(0) == qtPositionAttributeName()) {
                 error = false;
                 break;
             }
-            qWarning("QSGGridMesh:: Missing \'%s\' attribute.",
+            qWarning("QQuickGridMesh:: Missing \'%s\' attribute.",
                      qtPositionAttributeName());
             break;
         case 2:
@@ -95,11 +95,11 @@ QSGGeometry *QSGGridMesh::updateGeometry(QSGGeometry *geometry, const QVector<QB
                 error = false;
                 break;
             }
-            qWarning("QSGGridMesh:: Missing \'%s\' or \'%s\' attribute.",
+            qWarning("QQuickGridMesh:: Missing \'%s\' or \'%s\' attribute.",
                      qtPositionAttributeName(), qtTexCoordAttributeName());
             break;
         default:
-            qWarning("QSGGridMesh:: Too many attributes specified.");
+            qWarning("QQuickGridMesh:: Too many attributes specified.");
             break;
         }
 
@@ -196,7 +196,7 @@ QSGGeometry *QSGGridMesh::updateGeometry(QSGGeometry *geometry, const QVector<QB
     \endrow
 */
 
-void QSGGridMesh::setResolution(const QSize &res)
+void QQuickGridMesh::setResolution(const QSize &res)
 {
     if (res == m_resolution)
         return;
@@ -207,7 +207,7 @@ void QSGGridMesh::setResolution(const QSize &res)
     emit resolutionChanged();
 }
 
-QSize QSGGridMesh::resolution() const
+QSize QQuickGridMesh::resolution() const
 {
     return m_resolution;
 }
diff --git a/src/declarative/items/qsgshadereffectmesh_p.h b/src/declarative/items/qquickshadereffectmesh_p.h
index 428674fdba..40549f73a8 100644
--- a/src/declarative/items/qsgshadereffectmesh_p.h
+++ b/src/declarative/items/qquickshadereffectmesh_p.h
@@ -47,8 +47,8 @@
 #include <QtCore/qvariant.h>
 #include <QtGui/qopenglfunctions.h>
 
-#ifndef SHADEREFFECTMESH_H
-#define SHADEREFFECTMESH_H
+#ifndef QQUICKSHADEREFFECTMESH_P_H
+#define QQUICKSHADEREFFECTMESH_P_H
 
 QT_BEGIN_HEADER
 
@@ -59,11 +59,11 @@ QT_MODULE(Declarative)
 class QSGGeometry;
 class QRectF;
 
-class Q_DECLARATIVE_EXPORT QSGShaderEffectMesh : public QObject
+class Q_DECLARATIVE_EXPORT QQuickShaderEffectMesh : public QObject
 {
     Q_OBJECT
 public:
-    QSGShaderEffectMesh(QObject *parent = 0);
+    QQuickShaderEffectMesh(QObject *parent = 0);
     // If 'geometry' != 0, 'attributes' is the same as last time the function was called.
     virtual QSGGeometry *updateGeometry(QSGGeometry *geometry, const QVector<QByteArray> &attributes, const QRectF &rect) const = 0;
 
@@ -72,12 +72,12 @@ Q_SIGNALS:
     void geometryChanged();
 };
 
-class QSGGridMesh : public QSGShaderEffectMesh
+class QQuickGridMesh : public QQuickShaderEffectMesh
 {
     Q_OBJECT
     Q_PROPERTY(QSize resolution READ resolution WRITE setResolution NOTIFY resolutionChanged)
 public:
-    QSGGridMesh(QObject *parent = 0);
+    QQuickGridMesh(QObject *parent = 0);
     virtual QSGGeometry *updateGeometry(QSGGeometry *geometry, const QVector<QByteArray> &attributes, const QRectF &rect) const;
 
     void setResolution(const QSize &res);
@@ -100,4 +100,4 @@ QT_END_NAMESPACE
 
 QT_END_HEADER
 
-#endif // SHADEREFFECTITEM_H
+#endif // QQUICKSHADEREFFECTMESH_P_H
diff --git a/src/declarative/items/qsgshadereffectnode.cpp b/src/declarative/items/qquickshadereffectnode.cpp
index c5d208345e..67ca124c91 100644
--- a/src/declarative/items/qsgshadereffectnode.cpp
+++ b/src/declarative/items/qquickshadereffectnode.cpp
@@ -39,30 +39,30 @@
 **
 ****************************************************************************/
 
-#include <private/qsgshadereffectnode_p.h>
+#include <private/qquickshadereffectnode_p.h>
 
-#include "qsgshadereffectmesh_p.h"
+#include "qquickshadereffectmesh_p.h"
 #include <private/qsgtextureprovider_p.h>
 #include <private/qsgrenderer_p.h>
 
 QT_BEGIN_NAMESPACE
 
-class QSGCustomMaterialShader : public QSGMaterialShader
+class QQuickCustomMaterialShader : public QSGMaterialShader
 {
 public:
-    QSGCustomMaterialShader(const QSGShaderEffectMaterialKey &key, const QVector<QByteArray> &attributes);
+    QQuickCustomMaterialShader(const QQuickShaderEffectMaterialKey &key, const QVector<QByteArray> &attributes);
     virtual void deactivate();
     virtual void updateState(const RenderState &state, QSGMaterial *newEffect, QSGMaterial *oldEffect);
     virtual char const *const *attributeNames() const;
 
 protected:
-    friend class QSGShaderEffectNode;
+    friend class QQuickShaderEffectNode;
 
     virtual void initialize();
     virtual const char *vertexShader() const;
     virtual const char *fragmentShader() const;
 
-    const QSGShaderEffectMaterialKey m_key;
+    const QQuickShaderEffectMaterialKey m_key;
     QVector<const char *> m_attributeNames;
     const QVector<QByteArray> m_attributes;
 
@@ -72,7 +72,7 @@ protected:
     uint m_textureIndicesSet;
 };
 
-QSGCustomMaterialShader::QSGCustomMaterialShader(const QSGShaderEffectMaterialKey &key, const QVector<QByteArray> &attributes)
+QQuickCustomMaterialShader::QQuickCustomMaterialShader(const QQuickShaderEffectMaterialKey &key, const QVector<QByteArray> &attributes)
     : m_key(key)
     , m_attributes(attributes)
     , m_textureIndicesSet(false)
@@ -82,17 +82,17 @@ QSGCustomMaterialShader::QSGCustomMaterialShader(const QSGShaderEffectMaterialKe
     m_attributeNames.append(0);
 }
 
-void QSGCustomMaterialShader::deactivate()
+void QQuickCustomMaterialShader::deactivate()
 {
     QSGMaterialShader::deactivate();
     glDisable(GL_CULL_FACE);
 }
 
-void QSGCustomMaterialShader::updateState(const RenderState &state, QSGMaterial *newEffect, QSGMaterial *oldEffect)
+void QQuickCustomMaterialShader::updateState(const RenderState &state, QSGMaterial *newEffect, QSGMaterial *oldEffect)
 {
     Q_ASSERT(newEffect != 0);
 
-    const QSGShaderEffectMaterial *material = static_cast<const QSGShaderEffectMaterial *>(newEffect);
+    const QQuickShaderEffectMaterial *material = static_cast<const QQuickShaderEffectMaterial *>(newEffect);
 
     if (!m_textureIndicesSet) {
         for (int i = 0; i < material->m_textures.size(); ++i)
@@ -166,14 +166,14 @@ void QSGCustomMaterialShader::updateState(const RenderState &state, QSGMaterial
         }
     }
 
-    const QSGShaderEffectMaterial *oldMaterial = static_cast<const QSGShaderEffectMaterial *>(oldEffect);
+    const QQuickShaderEffectMaterial *oldMaterial = static_cast<const QQuickShaderEffectMaterial *>(oldEffect);
     if (oldEffect == 0 || material->cullMode() != oldMaterial->cullMode()) {
         switch (material->cullMode()) {
-        case QSGShaderEffectMaterial::FrontFaceCulling:
+        case QQuickShaderEffectMaterial::FrontFaceCulling:
             glEnable(GL_CULL_FACE);
             glCullFace(GL_FRONT);
             break;
-        case QSGShaderEffectMaterial::BackFaceCulling:
+        case QQuickShaderEffectMaterial::BackFaceCulling:
             glEnable(GL_CULL_FACE);
             glCullFace(GL_BACK);
             break;
@@ -187,12 +187,12 @@ void QSGCustomMaterialShader::updateState(const RenderState &state, QSGMaterial
         program()->setUniformValue(m_matrixLoc, state.combinedMatrix());
 }
 
-char const *const *QSGCustomMaterialShader::attributeNames() const
+char const *const *QQuickCustomMaterialShader::attributeNames() const
 {
     return m_attributeNames.constData();
 }
 
-void QSGCustomMaterialShader::initialize()
+void QQuickCustomMaterialShader::initialize()
 {
     m_opacityLoc = program()->uniformLocation("qt_Opacity");
     m_matrixLoc = program()->uniformLocation("qt_Matrix");
@@ -201,62 +201,62 @@ void QSGCustomMaterialShader::initialize()
         m_matrixLoc = program()->uniformLocation("qt_ModelViewProjectionMatrix");
 }
 
-const char *QSGCustomMaterialShader::vertexShader() const
+const char *QQuickCustomMaterialShader::vertexShader() const
 {
     return m_key.vertexCode.constData();
 }
 
-const char *QSGCustomMaterialShader::fragmentShader() const
+const char *QQuickCustomMaterialShader::fragmentShader() const
 {
     return m_key.fragmentCode.constData();
 }
 
 
-bool QSGShaderEffectMaterialKey::operator == (const QSGShaderEffectMaterialKey &other) const
+bool QQuickShaderEffectMaterialKey::operator == (const QQuickShaderEffectMaterialKey &other) const
 {
     return vertexCode == other.vertexCode && fragmentCode == other.fragmentCode && className == other.className;
 }
 
-uint qHash(const QSGShaderEffectMaterialKey &key)
+uint qHash(const QQuickShaderEffectMaterialKey &key)
 {
     return qHash(qMakePair(qMakePair(key.vertexCode, key.fragmentCode), key.className));
 }
 
 
-QHash<QSGShaderEffectMaterialKey, QSharedPointer<QSGMaterialType> > QSGShaderEffectMaterial::materialMap;
+QHash<QQuickShaderEffectMaterialKey, QSharedPointer<QSGMaterialType> > QQuickShaderEffectMaterial::materialMap;
 
-QSGShaderEffectMaterial::QSGShaderEffectMaterial()
+QQuickShaderEffectMaterial::QQuickShaderEffectMaterial()
     : m_cullMode(NoCulling)
 {
     setFlag(Blending, true);
 }
 
-QSGMaterialType *QSGShaderEffectMaterial::type() const
+QSGMaterialType *QQuickShaderEffectMaterial::type() const
 {
     return m_type.data();
 }
 
-QSGMaterialShader *QSGShaderEffectMaterial::createShader() const
+QSGMaterialShader *QQuickShaderEffectMaterial::createShader() const
 {
-    return new QSGCustomMaterialShader(m_source, m_source.attributeNames);
+    return new QQuickCustomMaterialShader(m_source, m_source.attributeNames);
 }
 
-int QSGShaderEffectMaterial::compare(const QSGMaterial *other) const
+int QQuickShaderEffectMaterial::compare(const QSGMaterial *other) const
 {
-    return this - static_cast<const QSGShaderEffectMaterial *>(other);
+    return this - static_cast<const QQuickShaderEffectMaterial *>(other);
 }
 
-void QSGShaderEffectMaterial::setCullMode(QSGShaderEffectMaterial::CullMode face)
+void QQuickShaderEffectMaterial::setCullMode(QQuickShaderEffectMaterial::CullMode face)
 {
     m_cullMode = face;
 }
 
-QSGShaderEffectMaterial::CullMode QSGShaderEffectMaterial::cullMode() const
+QQuickShaderEffectMaterial::CullMode QQuickShaderEffectMaterial::cullMode() const
 {
     return m_cullMode;
 }
 
-void QSGShaderEffectMaterial::setProgramSource(const QSGShaderEffectProgram &source)
+void QQuickShaderEffectMaterial::setProgramSource(const QQuickShaderEffectProgram &source)
 {
     m_source = source;
     m_type = materialMap.value(m_source);
@@ -266,22 +266,22 @@ void QSGShaderEffectMaterial::setProgramSource(const QSGShaderEffectProgram &sou
     }
 }
 
-void QSGShaderEffectMaterial::setUniforms(const QVector<QPair<QByteArray, QVariant> > &uniformValues)
+void QQuickShaderEffectMaterial::setUniforms(const QVector<QPair<QByteArray, QVariant> > &uniformValues)
 {
     m_uniformValues = uniformValues;
 }
 
-void QSGShaderEffectMaterial::setTextureProviders(const QVector<QPair<QByteArray, QSGTextureProvider *> > &textures)
+void QQuickShaderEffectMaterial::setTextureProviders(const QVector<QPair<QByteArray, QSGTextureProvider *> > &textures)
 {
     m_textures = textures;
 }
 
-const QVector<QPair<QByteArray, QSGTextureProvider *> > &QSGShaderEffectMaterial::textureProviders() const
+const QVector<QPair<QByteArray, QSGTextureProvider *> > &QQuickShaderEffectMaterial::textureProviders() const
 {
     return m_textures;
 }
 
-void QSGShaderEffectMaterial::updateTextures() const
+void QQuickShaderEffectMaterial::updateTextures() const
 {
     for (int i = 0; i < m_textures.size(); ++i) {
         if (QSGTextureProvider *provider = m_textures.at(i).second) {
@@ -292,25 +292,25 @@ void QSGShaderEffectMaterial::updateTextures() const
 }
 
 
-QSGShaderEffectNode::QSGShaderEffectNode()
+QQuickShaderEffectNode::QQuickShaderEffectNode()
 {
     QSGNode::setFlag(UsePreprocess, true);
     setMaterial(&m_material);
 }
 
-QSGShaderEffectNode::~QSGShaderEffectNode()
+QQuickShaderEffectNode::~QQuickShaderEffectNode()
 {
 }
 
-void QSGShaderEffectNode::markDirtyTexture()
+void QQuickShaderEffectNode::markDirtyTexture()
 {
     markDirty(DirtyMaterial);
 }
 
-void QSGShaderEffectNode::preprocess()
+void QQuickShaderEffectNode::preprocess()
 {
     Q_ASSERT(material());
-    static_cast<QSGShaderEffectMaterial *>(material())->updateTextures();
+    static_cast<QQuickShaderEffectMaterial *>(material())->updateTextures();
 }
 
 QT_END_NAMESPACE
diff --git a/src/declarative/items/qsgshadereffectnode_p.h b/src/declarative/items/qquickshadereffectnode_p.h
index d95dfaf3cb..50213ff396 100644
--- a/src/declarative/items/qsgshadereffectnode_p.h
+++ b/src/declarative/items/qquickshadereffectnode_p.h
@@ -39,13 +39,13 @@
 **
 ****************************************************************************/
 
-#ifndef SHADEREFFECTNODE_H
-#define SHADEREFFECTNODE_H
+#ifndef QQUICKSHADEREFFECTNODE_P_H
+#define QQUICKSHADEREFFECTNODE_P_H
 
 #include "qsgnode.h"
 #include "qsgmaterial.h"
 #include <private/qsgtextureprovider_p.h>
-#include <qsgitem.h>
+#include <qquickitem.h>
 
 #include <QtCore/qsharedpointer.h>
 #include <QtCore/qpointer.h>
@@ -56,20 +56,20 @@ QT_BEGIN_NAMESPACE
 
 QT_MODULE(Declarative)
 
-struct QSGShaderEffectMaterialKey {
+struct QQuickShaderEffectMaterialKey {
     QByteArray vertexCode;
     QByteArray fragmentCode;
     const char *className;
 
-    bool operator == (const QSGShaderEffectMaterialKey &other) const;
+    bool operator == (const QQuickShaderEffectMaterialKey &other) const;
 };
 
-uint qHash(const QSGShaderEffectMaterialKey &key);
+uint qHash(const QQuickShaderEffectMaterialKey &key);
 
 // TODO: Implement support for multisampling.
-struct QSGShaderEffectProgram : public QSGShaderEffectMaterialKey
+struct QQuickShaderEffectProgram : public QQuickShaderEffectMaterialKey
 {
-    QSGShaderEffectProgram() : respectsOpacity(false), respectsMatrix(false) {}
+    QQuickShaderEffectProgram() : respectsOpacity(false), respectsMatrix(false) {}
 
     QVector<QByteArray> attributeNames;
     QSet<QByteArray> uniformNames;
@@ -79,8 +79,8 @@ struct QSGShaderEffectProgram : public QSGShaderEffectMaterialKey
 };
 
 
-class QSGCustomMaterialShader;
-class QSGShaderEffectMaterial : public QSGMaterial
+class QQuickCustomMaterialShader;
+class QQuickShaderEffectMaterial : public QSGMaterial
 {
 public:
     enum CullMode
@@ -90,7 +90,7 @@ public:
         FrontFaceCulling
     };
 
-    QSGShaderEffectMaterial();
+    QQuickShaderEffectMaterial();
     virtual QSGMaterialType *type() const;
     virtual QSGMaterialShader *createShader() const;
     virtual int compare(const QSGMaterial *other) const;
@@ -98,55 +98,54 @@ public:
     void setCullMode(CullMode face);
     CullMode cullMode() const;
 
-    void setProgramSource(const QSGShaderEffectProgram &);
+    void setProgramSource(const QQuickShaderEffectProgram &);
     void setUniforms(const QVector<QPair<QByteArray, QVariant> > &uniformValues);
     void setTextureProviders(const QVector<QPair<QByteArray, QSGTextureProvider *> > &textures);
     const QVector<QPair<QByteArray, QSGTextureProvider *> > &textureProviders() const;
     void updateTextures() const;
 
 protected:
-    friend class QSGShaderEffect;
-    friend class QSGCustomMaterialShader;
+    friend class QQuickCustomMaterialShader;
 
     // The type pointer needs to be unique. It is not safe to let the type object be part of the
-    // QSGShaderEffectMaterial, since it can be deleted and a new one constructed on top of the old
-    // one. The new QSGShaderEffectMaterial would then get the same type pointer as the old one, and
+    // QQuickShaderEffectMaterial, since it can be deleted and a new one constructed on top of the old
+    // one. The new QQuickShaderEffectMaterial would then get the same type pointer as the old one, and
     // CustomMaterialShaders based on the old one would incorrectly be used together with the new
     // one. To guarantee that the type pointer is unique, the type object must live as long as
     // there are any CustomMaterialShaders of that type.
     QSharedPointer<QSGMaterialType> m_type;
 
-    QSGShaderEffectProgram m_source;
+    QQuickShaderEffectProgram m_source;
     QVector<QPair<QByteArray, QVariant> > m_uniformValues;
     QVector<QPair<QByteArray, QSGTextureProvider *> > m_textures;
     CullMode m_cullMode;
 
-    static QHash<QSGShaderEffectMaterialKey, QSharedPointer<QSGMaterialType> > materialMap;
+    static QHash<QQuickShaderEffectMaterialKey, QSharedPointer<QSGMaterialType> > materialMap;
 };
 
 
 class QSGShaderEffectMesh;
 
-class QSGShaderEffectNode : public QObject, public QSGGeometryNode
+class QQuickShaderEffectNode : public QObject, public QSGGeometryNode
 {
     Q_OBJECT
 public:
-    QSGShaderEffectNode();
-    virtual ~QSGShaderEffectNode();
+    QQuickShaderEffectNode();
+    virtual ~QQuickShaderEffectNode();
 
     virtual void preprocess();
 
-    QSGShaderEffectMaterial *shaderMaterial() { return &m_material; }
+    QQuickShaderEffectMaterial *shaderMaterial() { return &m_material; }
 
 private Q_SLOTS:
     void markDirtyTexture();
 
 private:
-    QSGShaderEffectMaterial m_material;
+    QQuickShaderEffectMaterial m_material;
 };
 
 QT_END_NAMESPACE
 
 QT_END_HEADER
 
-#endif // SHADEREFFECTNODE_H
+#endif // QQUICKSHADEREFFECTNODE_P_H
diff --git a/src/declarative/items/qsgshadereffectsource.cpp b/src/declarative/items/qquickshadereffectsource.cpp
index 4bbabe1701..587f7bad98 100644
--- a/src/declarative/items/qsgshadereffectsource.cpp
+++ b/src/declarative/items/qquickshadereffectsource.cpp
@@ -39,10 +39,10 @@
 **
 ****************************************************************************/
 
-#include "qsgshadereffectsource_p.h"
+#include "qquickshadereffectsource_p.h"
 
-#include "qsgitem_p.h"
-#include "qsgcanvas_p.h"
+#include "qquickitem_p.h"
+#include "qquickcanvas_p.h"
 #include <private/qsgadaptationlayer_p.h>
 #include <private/qsgrenderer_p.h>
 
@@ -54,11 +54,11 @@ QT_BEGIN_NAMESPACE
 
 DEFINE_BOOL_CONFIG_OPTION(qmlFboOverlay, QML_FBO_OVERLAY)
 
-class QSGShaderEffectSourceTextureProvider : public QSGTextureProvider
+class QQuickShaderEffectSourceTextureProvider : public QSGTextureProvider
 {
     Q_OBJECT
 public:
-    QSGShaderEffectSourceTextureProvider()
+    QQuickShaderEffectSourceTextureProvider()
         : sourceTexture(0)
     {
     }
@@ -71,28 +71,28 @@ public:
         return sourceTexture;
     }
 
-    QSGShaderEffectTexture *sourceTexture;
+    QQuickShaderEffectTexture *sourceTexture;
 
     QSGTexture::Filtering mipmapFiltering;
     QSGTexture::Filtering filtering;
     QSGTexture::WrapMode horizontalWrap;
     QSGTexture::WrapMode verticalWrap;
 };
-#include "qsgshadereffectsource.moc"
+#include "qquickshadereffectsource.moc"
 
 
-QSGShaderEffectSourceNode::QSGShaderEffectSourceNode()
+QQuickShaderEffectSourceNode::QQuickShaderEffectSourceNode()
 {
     setFlag(UsePreprocess, true);
 }
 
-void QSGShaderEffectSourceNode::markDirtyTexture()
+void QQuickShaderEffectSourceNode::markDirtyTexture()
 {
     markDirty(DirtyMaterial);
 }
 
 
-QSGShaderEffectTexture::QSGShaderEffectTexture(QSGItem *shaderSource)
+QQuickShaderEffectTexture::QQuickShaderEffectTexture(QQuickItem *shaderSource)
     : QSGDynamicTexture()
     , m_item(0)
     , m_format(GL_RGBA)
@@ -103,7 +103,7 @@ QSGShaderEffectTexture::QSGShaderEffectTexture(QSGItem *shaderSource)
 #ifdef QSG_DEBUG_FBO_OVERLAY
     , m_debugOverlay(0)
 #endif
-    , m_context(QSGItemPrivate::get(shaderSource)->sceneGraphContext())
+    , m_context(QQuickItemPrivate::get(shaderSource)->sceneGraphContext())
     , m_mipmap(false)
     , m_live(true)
     , m_recursive(false)
@@ -114,7 +114,7 @@ QSGShaderEffectTexture::QSGShaderEffectTexture(QSGItem *shaderSource)
 {
 }
 
-QSGShaderEffectTexture::~QSGShaderEffectTexture()
+QQuickShaderEffectTexture::~QQuickShaderEffectTexture()
 {
     delete m_renderer;
     delete m_fbo;
@@ -124,23 +124,23 @@ QSGShaderEffectTexture::~QSGShaderEffectTexture()
 #endif
 }
 
-int QSGShaderEffectTexture::textureId() const
+int QQuickShaderEffectTexture::textureId() const
 {
     return m_fbo ? m_fbo->texture() : 0;
 }
 
-bool QSGShaderEffectTexture::hasAlphaChannel() const
+bool QQuickShaderEffectTexture::hasAlphaChannel() const
 {
     return m_format != GL_RGB;
 }
 
-bool QSGShaderEffectTexture::hasMipmaps() const
+bool QQuickShaderEffectTexture::hasMipmaps() const
 {
     return m_mipmap;
 }
 
 
-void QSGShaderEffectTexture::bind()
+void QQuickShaderEffectTexture::bind()
 {
 #ifndef QT_NO_DEBUG
     if (!m_recursive && m_fbo && ((m_multisampling && m_secondaryFbo->isBound()) || m_fbo->isBound()))
@@ -150,7 +150,7 @@ void QSGShaderEffectTexture::bind()
     updateBindOptions();
 }
 
-bool QSGShaderEffectTexture::updateTexture()
+bool QQuickShaderEffectTexture::updateTexture()
 {
     if ((m_live || m_grab) && m_dirtyTexture) {
         grab();
@@ -160,7 +160,7 @@ bool QSGShaderEffectTexture::updateTexture()
     return false;
 }
 
-void QSGShaderEffectTexture::setHasMipmaps(bool mipmap)
+void QQuickShaderEffectTexture::setHasMipmaps(bool mipmap)
 {
     if (mipmap == m_mipmap)
         return;
@@ -170,7 +170,7 @@ void QSGShaderEffectTexture::setHasMipmaps(bool mipmap)
 }
 
 
-void QSGShaderEffectTexture::setItem(QSGNode *item)
+void QQuickShaderEffectTexture::setItem(QSGNode *item)
 {
     if (item == m_item)
         return;
@@ -178,7 +178,7 @@ void QSGShaderEffectTexture::setItem(QSGNode *item)
     markDirtyTexture();
 }
 
-void QSGShaderEffectTexture::setRect(const QRectF &rect)
+void QQuickShaderEffectTexture::setRect(const QRectF &rect)
 {
     if (rect == m_rect)
         return;
@@ -186,7 +186,7 @@ void QSGShaderEffectTexture::setRect(const QRectF &rect)
     markDirtyTexture();
 }
 
-void QSGShaderEffectTexture::setSize(const QSize &size)
+void QQuickShaderEffectTexture::setSize(const QSize &size)
 {
     if (size == m_size)
         return;
@@ -194,7 +194,7 @@ void QSGShaderEffectTexture::setSize(const QSize &size)
     markDirtyTexture();
 }
 
-void QSGShaderEffectTexture::setFormat(GLenum format)
+void QQuickShaderEffectTexture::setFormat(GLenum format)
 {
     if (format == m_format)
         return;
@@ -202,7 +202,7 @@ void QSGShaderEffectTexture::setFormat(GLenum format)
     markDirtyTexture();
 }
 
-void QSGShaderEffectTexture::setLive(bool live)
+void QQuickShaderEffectTexture::setLive(bool live)
 {
     if (live == m_live)
         return;
@@ -210,7 +210,7 @@ void QSGShaderEffectTexture::setLive(bool live)
     markDirtyTexture();
 }
 
-void QSGShaderEffectTexture::scheduleUpdate()
+void QQuickShaderEffectTexture::scheduleUpdate()
 {
     if (m_grab)
         return;
@@ -219,19 +219,19 @@ void QSGShaderEffectTexture::scheduleUpdate()
         emit textureChanged();
 }
 
-void QSGShaderEffectTexture::setRecursive(bool recursive)
+void QQuickShaderEffectTexture::setRecursive(bool recursive)
 {
     m_recursive = recursive;
 }
 
-void QSGShaderEffectTexture::markDirtyTexture()
+void QQuickShaderEffectTexture::markDirtyTexture()
 {
     m_dirtyTexture = true;
     if (m_live || m_grab)
         emit textureChanged();
 }
 
-void QSGShaderEffectTexture::grab()
+void QQuickShaderEffectTexture::grab()
 {
     if (!m_item || m_size.isNull()) {
         delete m_fbo;
@@ -390,7 +390,7 @@ void QSGShaderEffectTexture::grab()
         markDirtyTexture(); // Continuously update if 'live' and 'recursive'.
 }
 
-QImage QSGShaderEffectTexture::toImage() const
+QImage QQuickShaderEffectTexture::toImage() const
 {
     if (m_fbo)
         return m_fbo->toImage();
@@ -399,7 +399,7 @@ QImage QSGShaderEffectTexture::toImage() const
 }
 
 /*!
-    \qmlclass ShaderEffectSource QSGShaderEffectSource
+    \qmlclass ShaderEffectSource QQuickShaderEffectSource
     \since 5.0
     \ingroup qml-basic-visual-elements
     \brief The ShaderEffectSource element renders a QML element into a texture
@@ -475,8 +475,8 @@ QImage QSGShaderEffectTexture::toImage() const
     but not multisampled framebuffer objects.
 */
 
-QSGShaderEffectSource::QSGShaderEffectSource(QSGItem *parent)
-    : QSGItem(parent)
+QQuickShaderEffectSource::QQuickShaderEffectSource(QQuickItem *parent)
+    : QQuickItem(parent)
     , m_provider(0)
     , m_texture(0)
     , m_wrapMode(ClampToEdge)
@@ -492,7 +492,7 @@ QSGShaderEffectSource::QSGShaderEffectSource(QSGItem *parent)
     setFlag(ItemHasContents);
 }
 
-QSGShaderEffectSource::~QSGShaderEffectSource()
+QQuickShaderEffectSource::~QQuickShaderEffectSource()
 {
     if (m_texture)
         m_texture->deleteLater();
@@ -501,36 +501,36 @@ QSGShaderEffectSource::~QSGShaderEffectSource()
         m_provider->deleteLater();
 
     if (m_sourceItem)
-        QSGItemPrivate::get(m_sourceItem)->derefFromEffectItem(m_hideSource);
+        QQuickItemPrivate::get(m_sourceItem)->derefFromEffectItem(m_hideSource);
 }
 
-void QSGShaderEffectSource::ensureTexture()
+void QQuickShaderEffectSource::ensureTexture()
 {
     if (m_texture)
         return;
 
-    Q_ASSERT_X(QSGItemPrivate::get(this)->canvas
-               && QSGItemPrivate::get(this)->sceneGraphContext()
-               && QThread::currentThread() == QSGItemPrivate::get(this)->sceneGraphContext()->thread(),
-               "QSGShaderEffectSource::ensureTexture",
+    Q_ASSERT_X(QQuickItemPrivate::get(this)->canvas
+               && QQuickItemPrivate::get(this)->sceneGraphContext()
+               && QThread::currentThread() == QQuickItemPrivate::get(this)->sceneGraphContext()->thread(),
+               "QQuickShaderEffectSource::ensureTexture",
                "Cannot be used outside the rendering thread");
 
-    m_texture = new QSGShaderEffectTexture(this);
+    m_texture = new QQuickShaderEffectTexture(this);
     connect(m_texture, SIGNAL(textureChanged()), this, SLOT(update()));
 }
 
-QSGTextureProvider *QSGShaderEffectSource::textureProvider() const
+QSGTextureProvider *QQuickShaderEffectSource::textureProvider() const
 {
     if (!m_provider) {
         // Make sure it gets thread affinity on the rendering thread so deletion works properly..
-        Q_ASSERT_X(QSGItemPrivate::get(this)->canvas
-                   && QSGItemPrivate::get(this)->sceneGraphContext()
-                   && QThread::currentThread() == QSGItemPrivate::get(this)->sceneGraphContext()->thread(),
-                   "QSGShaderEffectSource::textureProvider",
+        Q_ASSERT_X(QQuickItemPrivate::get(this)->canvas
+                   && QQuickItemPrivate::get(this)->sceneGraphContext()
+                   && QThread::currentThread() == QQuickItemPrivate::get(this)->sceneGraphContext()->thread(),
+                   "QQuickShaderEffectSource::textureProvider",
                    "Cannot be used outside the rendering thread");
-        const_cast<QSGShaderEffectSource *>(this)->m_provider = new QSGShaderEffectSourceTextureProvider();
+        const_cast<QQuickShaderEffectSource *>(this)->m_provider = new QQuickShaderEffectSourceTextureProvider();
 
-        const_cast<QSGShaderEffectSource *>(this)->ensureTexture();
+        const_cast<QQuickShaderEffectSource *>(this)->ensureTexture();
         connect(m_texture, SIGNAL(textureChanged()), m_provider, SIGNAL(textureChanged()), Qt::DirectConnection);
         m_provider->sourceTexture = m_texture;
     }
@@ -555,12 +555,12 @@ QSGTextureProvider *QSGShaderEffectSource::textureProvider() const
     wrap mode with non-power-of-two textures.
 */
 
-QSGShaderEffectSource::WrapMode QSGShaderEffectSource::wrapMode() const
+QQuickShaderEffectSource::WrapMode QQuickShaderEffectSource::wrapMode() const
 {
     return m_wrapMode;
 }
 
-void QSGShaderEffectSource::setWrapMode(WrapMode mode)
+void QQuickShaderEffectSource::setWrapMode(WrapMode mode)
 {
     if (mode == m_wrapMode)
         return;
@@ -575,17 +575,17 @@ void QSGShaderEffectSource::setWrapMode(WrapMode mode)
     This property holds the element to be rendered into the texture.
 */
 
-QSGItem *QSGShaderEffectSource::sourceItem() const
+QQuickItem *QQuickShaderEffectSource::sourceItem() const
 {
     return m_sourceItem;
 }
 
-void QSGShaderEffectSource::setSourceItem(QSGItem *item)
+void QQuickShaderEffectSource::setSourceItem(QQuickItem *item)
 {
     if (item == m_sourceItem)
         return;
     if (m_sourceItem)
-        QSGItemPrivate::get(m_sourceItem)->derefFromEffectItem(m_hideSource);
+        QQuickItemPrivate::get(m_sourceItem)->derefFromEffectItem(m_hideSource);
     m_sourceItem = item;
     if (m_sourceItem) {
         // TODO: Find better solution.
@@ -596,7 +596,7 @@ void QSGShaderEffectSource::setSourceItem(QSGItem *item)
             m_sourceItem->setParentItem(this);
             m_sourceItem->setVisible(false);
         }
-        QSGItemPrivate::get(m_sourceItem)->refFromEffectItem(m_hideSource);
+        QQuickItemPrivate::get(m_sourceItem)->refFromEffectItem(m_hideSource);
     }
     update();
     emit sourceItemChanged();
@@ -611,12 +611,12 @@ void QSGShaderEffectSource::setSourceItem(QSGItem *item)
     the whole \l sourceItem is rendered to texture.
 */
 
-QRectF QSGShaderEffectSource::sourceRect() const
+QRectF QQuickShaderEffectSource::sourceRect() const
 {
     return m_sourceRect;
 }
 
-void QSGShaderEffectSource::setSourceRect(const QRectF &rect)
+void QQuickShaderEffectSource::setSourceRect(const QRectF &rect)
 {
     if (rect == m_sourceRect)
         return;
@@ -636,12 +636,12 @@ void QSGShaderEffectSource::setSourceRect(const QRectF &rect)
     size.
 */
 
-QSize QSGShaderEffectSource::textureSize() const
+QSize QQuickShaderEffectSource::textureSize() const
 {
     return m_textureSize;
 }
 
-void QSGShaderEffectSource::setTextureSize(const QSize &size)
+void QQuickShaderEffectSource::setTextureSize(const QSize &size)
 {
     if (size == m_textureSize)
         return;
@@ -667,12 +667,12 @@ void QSGShaderEffectSource::setTextureSize(const QSize &size)
     \note Some OpenGL implementations do not support the GL_ALPHA format.
 */
 
-QSGShaderEffectSource::Format QSGShaderEffectSource::format() const
+QQuickShaderEffectSource::Format QQuickShaderEffectSource::format() const
 {
     return m_format;
 }
 
-void QSGShaderEffectSource::setFormat(QSGShaderEffectSource::Format format)
+void QQuickShaderEffectSource::setFormat(QQuickShaderEffectSource::Format format)
 {
     if (format == m_format)
         return;
@@ -689,12 +689,12 @@ void QSGShaderEffectSource::setFormat(QSGShaderEffectSource::Format format)
     \l sourceItem. The property is true by default.
 */
 
-bool QSGShaderEffectSource::live() const
+bool QQuickShaderEffectSource::live() const
 {
     return m_live;
 }
 
-void QSGShaderEffectSource::setLive(bool live)
+void QQuickShaderEffectSource::setLive(bool live)
 {
     if (live == m_live)
         return;
@@ -714,18 +714,18 @@ void QSGShaderEffectSource::setLive(bool live)
     and meant to replace the \l sourceItem.
 */
 
-bool QSGShaderEffectSource::hideSource() const
+bool QQuickShaderEffectSource::hideSource() const
 {
     return m_hideSource;
 }
 
-void QSGShaderEffectSource::setHideSource(bool hide)
+void QQuickShaderEffectSource::setHideSource(bool hide)
 {
     if (hide == m_hideSource)
         return;
     if (m_sourceItem) {
-        QSGItemPrivate::get(m_sourceItem)->refFromEffectItem(hide);
-        QSGItemPrivate::get(m_sourceItem)->derefFromEffectItem(m_hideSource);
+        QQuickItemPrivate::get(m_sourceItem)->refFromEffectItem(hide);
+        QQuickItemPrivate::get(m_sourceItem)->derefFromEffectItem(m_hideSource);
     }
     m_hideSource = hide;
     update();
@@ -741,12 +741,12 @@ void QSGShaderEffectSource::setHideSource(bool hide)
     non-power-of-two textures.
 */
 
-bool QSGShaderEffectSource::mipmap() const
+bool QQuickShaderEffectSource::mipmap() const
 {
     return m_mipmap;
 }
 
-void QSGShaderEffectSource::setMipmap(bool enabled)
+void QQuickShaderEffectSource::setMipmap(bool enabled)
 {
     if (enabled == m_mipmap)
         return;
@@ -773,12 +773,12 @@ void QSGShaderEffectSource::setMipmap(bool enabled)
     updating it means that it immediately becomes dirty again.
 */
 
-bool QSGShaderEffectSource::recursive() const
+bool QQuickShaderEffectSource::recursive() const
 {
     return m_recursive;
 }
 
-void QSGShaderEffectSource::setRecursive(bool enabled)
+void QQuickShaderEffectSource::setRecursive(bool enabled)
 {
     if (enabled == m_recursive)
         return;
@@ -793,7 +793,7 @@ void QSGShaderEffectSource::setRecursive(bool enabled)
     Use this to update the texture when \l live is false.
 */
 
-void QSGShaderEffectSource::scheduleUpdate()
+void QQuickShaderEffectSource::scheduleUpdate()
 {
     if (m_grab)
         return;
@@ -801,29 +801,29 @@ void QSGShaderEffectSource::scheduleUpdate()
     update();
 }
 
-static void get_wrap_mode(QSGShaderEffectSource::WrapMode mode, QSGTexture::WrapMode *hWrap, QSGTexture::WrapMode *vWrap)
+static void get_wrap_mode(QQuickShaderEffectSource::WrapMode mode, QSGTexture::WrapMode *hWrap, QSGTexture::WrapMode *vWrap)
 {
     switch (mode) {
-    case QSGShaderEffectSource::RepeatHorizontally:
+    case QQuickShaderEffectSource::RepeatHorizontally:
         *hWrap = QSGTexture::Repeat;
         *vWrap = QSGTexture::ClampToEdge;
         break;
-    case QSGShaderEffectSource::RepeatVertically:
+    case QQuickShaderEffectSource::RepeatVertically:
         *vWrap = QSGTexture::Repeat;
         *hWrap = QSGTexture::ClampToEdge;
         break;
-    case QSGShaderEffectSource::Repeat:
+    case QQuickShaderEffectSource::Repeat:
         *hWrap = *vWrap = QSGTexture::Repeat;
         break;
     default:
-        // QSGShaderEffectSource::ClampToEdge
+        // QQuickShaderEffectSource::ClampToEdge
         *hWrap = *vWrap = QSGTexture::ClampToEdge;
         break;
     }
 }
 
 
-QSGNode *QSGShaderEffectSource::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *)
+QSGNode *QQuickShaderEffectSource::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *)
 {
     if (!m_sourceItem || m_sourceItem->width() == 0 || m_sourceItem->height() == 0) {
         delete oldNode;
@@ -832,9 +832,9 @@ QSGNode *QSGShaderEffectSource::updatePaintNode(QSGNode *oldNode, UpdatePaintNod
 
     ensureTexture();
 
-    QSGShaderEffectTexture *tex = qobject_cast<QSGShaderEffectTexture *>(m_texture);
+    QQuickShaderEffectTexture *tex = qobject_cast<QQuickShaderEffectTexture *>(m_texture);
     tex->setLive(m_live);
-    tex->setItem(QSGItemPrivate::get(m_sourceItem)->itemNode());
+    tex->setItem(QQuickItemPrivate::get(m_sourceItem)->itemNode());
     QRectF sourceRect = m_sourceRect.width() == 0 || m_sourceRect.height() == 0
                       ? QRectF(0, 0, m_sourceItem->width(), m_sourceItem->height())
                       : m_sourceRect;
@@ -843,7 +843,7 @@ QSGNode *QSGShaderEffectSource::updatePaintNode(QSGNode *oldNode, UpdatePaintNod
                       ? QSize(qCeil(qAbs(sourceRect.width())), qCeil(qAbs(sourceRect.height())))
                       : m_textureSize;
     Q_ASSERT(!textureSize.isEmpty());
-    QSGItemPrivate *d = static_cast<QSGItemPrivate *>(QObjectPrivate::get(this));
+    QQuickItemPrivate *d = static_cast<QQuickItemPrivate *>(QObjectPrivate::get(this));
     const QSize minTextureSize = d->sceneGraphContext()->minimumFBOSize();
     // Keep power-of-two by doubling the size.
     while (textureSize.width() < minTextureSize.width())
@@ -860,7 +860,7 @@ QSGNode *QSGShaderEffectSource::updatePaintNode(QSGNode *oldNode, UpdatePaintNod
         tex->scheduleUpdate();
     m_grab = false;
 
-    QSGTexture::Filtering filtering = QSGItemPrivate::get(this)->smooth
+    QSGTexture::Filtering filtering = QQuickItemPrivate::get(this)->smooth
                                             ? QSGTexture::Linear
                                             : QSGTexture::Nearest;
     QSGTexture::Filtering mmFiltering = m_mipmap ? filtering : QSGTexture::None;
@@ -880,9 +880,9 @@ QSGNode *QSGShaderEffectSource::updatePaintNode(QSGNode *oldNode, UpdatePaintNod
         return 0;
     }
 
-    QSGShaderEffectSourceNode *node = static_cast<QSGShaderEffectSourceNode *>(oldNode);
+    QQuickShaderEffectSourceNode *node = static_cast<QQuickShaderEffectSourceNode *>(oldNode);
     if (!node) {
-        node = new QSGShaderEffectSourceNode;
+        node = new QQuickShaderEffectSourceNode;
         node->setTexture(m_texture);
         connect(m_texture, SIGNAL(textureChanged()), node, SLOT(markDirtyTexture()), Qt::DirectConnection);
     }
diff --git a/src/declarative/items/qsgshadereffectsource_p.h b/src/declarative/items/qquickshadereffectsource_p.h
index 5d65b26cca..8117c06b9c 100644
--- a/src/declarative/items/qsgshadereffectsource_p.h
+++ b/src/declarative/items/qquickshadereffectsource_p.h
@@ -39,10 +39,10 @@
 **
 ****************************************************************************/
 
-#ifndef SHADEREFFECTSOURCE_H
-#define SHADEREFFECTSOURCE_H
+#ifndef QQUICKSHADEREFFECTSOURCE_P_H
+#define QQUICKSHADEREFFECTSOURCE_P_H
 
-#include "qsgitem.h"
+#include "qquickitem.h"
 #include <private/qsgtextureprovider_p.h>
 #include <private/qsgadaptationlayer_p.h>
 #include <private/qsgcontext_p.h>
@@ -64,25 +64,25 @@ class QSGNode;
 class UpdatePaintNodeData;
 class QOpenGLFramebufferObject;
 
-class QSGShaderEffectSourceTextureProvider;
+class QQuickShaderEffectSourceTextureProvider;
 
-class QSGShaderEffectSourceNode : public QObject, public QSGDefaultImageNode
+class QQuickShaderEffectSourceNode : public QObject, public QSGDefaultImageNode
 {
     Q_OBJECT
 
 public:
-    QSGShaderEffectSourceNode();
+    QQuickShaderEffectSourceNode();
 
 private Q_SLOTS:
     void markDirtyTexture();
 };
 
-class Q_DECLARATIVE_EXPORT QSGShaderEffectTexture : public QSGDynamicTexture
+class Q_DECLARATIVE_EXPORT QQuickShaderEffectTexture : public QSGDynamicTexture
 {
     Q_OBJECT
 public:
-    QSGShaderEffectTexture(QSGItem *shaderSource);
-    ~QSGShaderEffectTexture();
+    QQuickShaderEffectTexture(QQuickItem *shaderSource);
+    ~QQuickShaderEffectTexture();
 
     virtual bool updateTexture();
 
@@ -132,7 +132,7 @@ private:
     QSize m_size;
     GLenum m_format;
 
-    QSGItem *m_shaderSource;
+    QQuickItem *m_shaderSource;
     QSGRenderer *m_renderer;
     QOpenGLFramebufferObject *m_fbo;
     QOpenGLFramebufferObject *m_secondaryFbo;
@@ -152,11 +152,11 @@ private:
     uint m_grab : 1;
 };
 
-class Q_DECLARATIVE_EXPORT QSGShaderEffectSource : public QSGItem
+class Q_DECLARATIVE_EXPORT QQuickShaderEffectSource : public QQuickItem
 {
     Q_OBJECT
     Q_PROPERTY(WrapMode wrapMode READ wrapMode WRITE setWrapMode NOTIFY wrapModeChanged)
-    Q_PROPERTY(QSGItem *sourceItem READ sourceItem WRITE setSourceItem NOTIFY sourceItemChanged)
+    Q_PROPERTY(QQuickItem *sourceItem READ sourceItem WRITE setSourceItem NOTIFY sourceItemChanged)
     Q_PROPERTY(QRectF sourceRect READ sourceRect WRITE setSourceRect NOTIFY sourceRectChanged)
     Q_PROPERTY(QSize textureSize READ textureSize WRITE setTextureSize NOTIFY textureSizeChanged)
     Q_PROPERTY(Format format READ format WRITE setFormat NOTIFY formatChanged)
@@ -180,14 +180,14 @@ public:
         RGBA = GL_RGBA
     };
 
-    QSGShaderEffectSource(QSGItem *parent = 0);
-    ~QSGShaderEffectSource();
+    QQuickShaderEffectSource(QQuickItem *parent = 0);
+    ~QQuickShaderEffectSource();
 
     WrapMode wrapMode() const;
     void setWrapMode(WrapMode mode);
 
-    QSGItem *sourceItem() const;
-    void setSourceItem(QSGItem *item);
+    QQuickItem *sourceItem() const;
+    void setSourceItem(QQuickItem *item);
 
     QRectF sourceRect() const;
     void setSourceRect(const QRectF &rect);
@@ -234,10 +234,10 @@ protected:
 private:
     void ensureTexture();
 
-    QSGShaderEffectSourceTextureProvider *m_provider;
-    QSGShaderEffectTexture *m_texture;
+    QQuickShaderEffectSourceTextureProvider *m_provider;
+    QQuickShaderEffectTexture *m_texture;
     WrapMode m_wrapMode;
-    QPointer<QSGItem> m_sourceItem;
+    QPointer<QQuickItem> m_sourceItem;
     QRectF m_sourceRect;
     QSize m_textureSize;
     Format m_format;
@@ -252,4 +252,4 @@ QT_END_NAMESPACE
 
 QT_END_HEADER
 
-#endif // SHADEREFFECTSOURCE_H
+#endif // QQUICKSHADEREFFECTSOURCE_P_H
diff --git a/src/declarative/items/qsgsprite.cpp b/src/declarative/items/qquicksprite.cpp
index afd32a651f..b476905269 100644
--- a/src/declarative/items/qsgsprite.cpp
+++ b/src/declarative/items/qquicksprite.cpp
@@ -39,13 +39,13 @@
 **
 ****************************************************************************/
 
-#include "qsgsprite_p.h"
+#include "qquicksprite_p.h"
 #include <QDebug>
 
 QT_BEGIN_NAMESPACE
 
 /*!
-    \qmlclass Sprite QSGSprite
+    \qmlclass Sprite QQuickSprite
     \inqmlmodule QtQuick 2
     \brief The Sprite element represents a sprite animation
 
@@ -117,8 +117,8 @@ QT_BEGIN_NAMESPACE
     Q_PROPERTY(int frameHeight READ frameHeight WRITE setFrameHeight NOTIFY frameHeightChanged)
     Q_PROPERTY(int frameWidth READ frameWidth WRITE setFrameWidth NOTIFY frameWidthChanged)
 
-QSGSprite::QSGSprite(QObject *parent) :
-    QSGStochasticState(parent)
+QQuickSprite::QQuickSprite(QObject *parent) :
+    QQuickStochasticState(parent)
     , m_generatedCount(0)
     , m_framesPerRow(0)
     , m_frameHeight(0)
diff --git a/src/declarative/items/qsgsprite_p.h b/src/declarative/items/qquicksprite_p.h
index 58b6c13f97..e7f3bbce80 100644
--- a/src/declarative/items/qsgsprite_p.h
+++ b/src/declarative/items/qquicksprite_p.h
@@ -39,14 +39,14 @@
 **
 ****************************************************************************/
 
-#ifndef SPRITESTATE_H
-#define SPRITESTATE_H
+#ifndef QQUICKSPRITE_P_H
+#define QQUICKSPRITE_P_H
 
 #include <QObject>
 #include <QUrl>
 #include <QVariantMap>
 #include <QDeclarativeListProperty>
-#include "qsgspriteengine_p.h"
+#include "qquickspriteengine_p.h"
 
 QT_BEGIN_HEADER
 
@@ -55,7 +55,7 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(Declarative)
 
 
-class QSGSprite : public QSGStochasticState
+class QQuickSprite : public QQuickStochasticState
 {
     Q_OBJECT
     Q_PROPERTY(QUrl source READ source WRITE setSource NOTIFY sourceChanged)
@@ -65,7 +65,7 @@ class QSGSprite : public QSGStochasticState
     Q_PROPERTY(int frameWidth READ frameWidth WRITE setFrameWidth NOTIFY frameWidthChanged)
 
 public:
-    explicit QSGSprite(QObject *parent = 0);
+    explicit QQuickSprite(QObject *parent = 0);
 
     QUrl source() const
     {
@@ -120,8 +120,8 @@ public slots:
 
 private:
     friend class QSGImageParticle;
-    friend class QSGSpriteEngine;
-    friend class QSGStochasticEngine;
+    friend class QQuickSpriteEngine;
+    friend class QQuickStochasticEngine;
     int m_generatedCount;
     int m_framesPerRow;
     QUrl m_source;
@@ -133,4 +133,4 @@ private:
 
 QT_END_NAMESPACE
 QT_END_HEADER
-#endif // SPRITESTATE_H
+#endif // QQUICKSPRITE_P_H
diff --git a/src/declarative/items/qsgspriteengine.cpp b/src/declarative/items/qquickspriteengine.cpp
index a376a06483..9cf21eb2d9 100644
--- a/src/declarative/items/qsgspriteengine.cpp
+++ b/src/declarative/items/qquickspriteengine.cpp
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#include "qsgspriteengine_p.h"
-#include "qsgsprite_p.h"
+#include "qquickspriteengine_p.h"
+#include "qquicksprite_p.h"
 #include <QDebug>
 #include <QPainter>
 #include <QSet>
@@ -53,7 +53,7 @@ QT_BEGIN_NAMESPACE
    Also solve the state data initialization/transfer issue so as to not need to make friends
 */
 
-QSGStochasticEngine::QSGStochasticEngine(QObject *parent) :
+QQuickStochasticEngine::QQuickStochasticEngine(QObject *parent) :
     QObject(parent), m_timeOffset(0)
 {
     //Default size 1
@@ -61,7 +61,7 @@ QSGStochasticEngine::QSGStochasticEngine(QObject *parent) :
     m_advanceTime.start();
 }
 
-QSGStochasticEngine::QSGStochasticEngine(QList<QSGStochasticState*> states, QObject *parent) :
+QQuickStochasticEngine::QQuickStochasticEngine(QList<QQuickStochasticState*> states, QObject *parent) :
     QObject(parent), m_states(states), m_timeOffset(0)
 {
     //Default size 1
@@ -69,28 +69,28 @@ QSGStochasticEngine::QSGStochasticEngine(QList<QSGStochasticState*> states, QObj
     m_advanceTime.start();
 }
 
-QSGStochasticEngine::~QSGStochasticEngine()
+QQuickStochasticEngine::~QQuickStochasticEngine()
 {
 }
 
-QSGSpriteEngine::QSGSpriteEngine(QObject *parent)
-    : QSGStochasticEngine(parent)
+QQuickSpriteEngine::QQuickSpriteEngine(QObject *parent)
+    : QQuickStochasticEngine(parent)
 {
 }
 
-QSGSpriteEngine::QSGSpriteEngine(QList<QSGSprite*> sprites, QObject *parent)
-    : QSGStochasticEngine(parent)
+QQuickSpriteEngine::QQuickSpriteEngine(QList<QQuickSprite*> sprites, QObject *parent)
+    : QQuickStochasticEngine(parent)
 {
-    foreach (QSGSprite* sprite, sprites)
-        m_states << (QSGStochasticState*)sprite;
+    foreach (QQuickSprite* sprite, sprites)
+        m_states << (QQuickStochasticState*)sprite;
 }
 
-QSGSpriteEngine::~QSGSpriteEngine()
+QQuickSpriteEngine::~QQuickSpriteEngine()
 {
 }
 
 
-int QSGSpriteEngine::maxFrames()
+int QQuickSpriteEngine::maxFrames()
 {
     return m_maxFrames;
 }
@@ -102,7 +102,7 @@ int QSGSpriteEngine::maxFrames()
 TODO: All these calculations should be pre-calculated and cached during initialization for a significant performance boost
 TODO: Above idea needs to have the varying duration offset added to it
 */
-int QSGSpriteEngine::spriteState(int sprite)
+int QQuickSpriteEngine::spriteState(int sprite)
 {
     int state = m_things[sprite];
     if (!m_sprites[state]->m_generatedCount)
@@ -112,7 +112,7 @@ int QSGSpriteEngine::spriteState(int sprite)
     return state + extra;
 }
 
-int QSGSpriteEngine::spriteStart(int sprite)
+int QQuickSpriteEngine::spriteStart(int sprite)
 {
     int state = m_things[sprite];
     if (!m_sprites[state]->m_generatedCount)
@@ -122,7 +122,7 @@ int QSGSpriteEngine::spriteStart(int sprite)
     return state + extra*rowDuration;
 }
 
-int QSGSpriteEngine::spriteFrames(int sprite)
+int QQuickSpriteEngine::spriteFrames(int sprite)
 {
     int state = m_things[sprite];
     if (!m_sprites[state]->m_generatedCount)
@@ -135,7 +135,7 @@ int QSGSpriteEngine::spriteFrames(int sprite)
         return m_sprites[state]->m_framesPerRow;
 }
 
-int QSGSpriteEngine::spriteDuration(int sprite)
+int QQuickSpriteEngine::spriteDuration(int sprite)
 {
     int state = m_things[sprite];
     if (!m_sprites[state]->m_generatedCount)
@@ -148,7 +148,7 @@ int QSGSpriteEngine::spriteDuration(int sprite)
         return rowDuration;
 }
 
-int QSGSpriteEngine::spriteY(int sprite)
+int QQuickSpriteEngine::spriteY(int sprite)
 {
     int state = m_things[sprite];
     if (!m_sprites[state]->m_generatedCount)
@@ -158,24 +158,24 @@ int QSGSpriteEngine::spriteY(int sprite)
     return m_sprites[state]->m_rowY + m_sprites[state]->m_frameHeight * extra;
 }
 
-int QSGSpriteEngine::spriteWidth(int sprite)
+int QQuickSpriteEngine::spriteWidth(int sprite)
 {
     int state = m_things[sprite];
     return m_sprites[state]->m_frameWidth;
 }
 
-int QSGSpriteEngine::spriteHeight(int sprite)
+int QQuickSpriteEngine::spriteHeight(int sprite)
 {
     int state = m_things[sprite];
     return m_sprites[state]->m_frameHeight;
 }
 
-int QSGSpriteEngine::spriteCount()//TODO: Actually image state count, need to rename these things to make sense together
+int QQuickSpriteEngine::spriteCount()//TODO: Actually image state count, need to rename these things to make sense together
 {
     return m_imageStateCount;
 }
 
-void QSGStochasticEngine::setGoal(int state, int sprite, bool jump)
+void QQuickStochasticEngine::setGoal(int state, int sprite, bool jump)
 {
     if (sprite >= m_things.count() || state >= m_states.count())
         return;
@@ -195,7 +195,7 @@ void QSGStochasticEngine::setGoal(int state, int sprite, bool jump)
     return;
 }
 
-QImage QSGSpriteEngine::assembledImage()
+QImage QQuickSpriteEngine::assembledImage()
 {
     int h = 0;
     int w = 0;
@@ -204,15 +204,15 @@ QImage QSGSpriteEngine::assembledImage()
     int maxSize = 0;
 
     glGetIntegerv(GL_MAX_TEXTURE_SIZE, &maxSize);
-    foreach (QSGStochasticState* s, m_states){
-        QSGSprite* sprite = qobject_cast<QSGSprite*>(s);
+    foreach (QQuickStochasticState* s, m_states){
+        QQuickSprite* sprite = qobject_cast<QQuickSprite*>(s);
         if (sprite)
             m_sprites << sprite;
         else
-            qDebug() << "Error: Non-sprite in QSGSpriteEngine";
+            qDebug() << "Error: Non-sprite in QQuickSpriteEngine";
     }
 
-    foreach (QSGSprite* state, m_sprites){
+    foreach (QQuickSprite* state, m_sprites){
         if (state->frames() > m_maxFrames)
             m_maxFrames = state->frames();
 
@@ -254,7 +254,7 @@ QImage QSGSpriteEngine::assembledImage()
     image.fill(0);
     QPainter p(&image);
     int y = 0;
-    foreach (QSGSprite* state, m_sprites){
+    foreach (QQuickSprite* state, m_sprites){
         QImage img(state->source().toLocalFile());
         int frameWidth = state->m_frameWidth;
         int frameHeight = state->m_frameHeight;
@@ -305,7 +305,7 @@ QImage QSGSpriteEngine::assembledImage()
     return image;
 }
 
-void QSGStochasticEngine::setCount(int c)
+void QQuickStochasticEngine::setCount(int c)
 {
     m_things.resize(c);
     m_goals.resize(c);
@@ -313,7 +313,7 @@ void QSGStochasticEngine::setCount(int c)
     m_startTimes.resize(c);
 }
 
-void QSGStochasticEngine::start(int index, int state)
+void QQuickStochasticEngine::start(int index, int state)
 {
     if (index >= m_things.count())
         return;
@@ -323,7 +323,7 @@ void QSGStochasticEngine::start(int index, int state)
     restart(index);
 }
 
-void QSGStochasticEngine::stop(int index)
+void QQuickStochasticEngine::stop(int index)
 {
     if (index >= m_things.count())
         return;
@@ -332,7 +332,7 @@ void QSGStochasticEngine::stop(int index)
         m_stateUpdates[i].second.removeAll(index);
 }
 
-void QSGStochasticEngine::restart(int index)
+void QQuickStochasticEngine::restart(int index)
 {
     m_startTimes[index] = m_timeOffset + m_advanceTime.elapsed();
     int time = m_duration[index] * m_states[m_things[index]]->frames() + m_startTimes[index];
@@ -341,7 +341,7 @@ void QSGStochasticEngine::restart(int index)
     addToUpdateList(time, index);
 }
 
-uint QSGStochasticEngine::updateSprites(uint time)//### would returning a list of changed idxs be faster than signals?
+uint QQuickStochasticEngine::updateSprites(uint time)//### would returning a list of changed idxs be faster than signals?
 {
     //Sprite State Update;
     QSet<int> changedIndexes;
@@ -404,7 +404,7 @@ uint QSGStochasticEngine::updateSprites(uint time)//### would returning a list o
     return m_stateUpdates.first().first;
 }
 
-int QSGStochasticEngine::goalSeek(int curIdx, int spriteIdx, int dist)
+int QQuickStochasticEngine::goalSeek(int curIdx, int spriteIdx, int dist)
 {
     QString goalName;
     if (m_goals[spriteIdx] != -1)
@@ -420,7 +420,7 @@ int QSGStochasticEngine::goalSeek(int curIdx, int spriteIdx, int dist)
             return curIdx;
     if (dist < 0)
         dist = m_states.count();
-    QSGStochasticState* curState = m_states[curIdx];
+    QQuickStochasticState* curState = m_states[curIdx];
     for (QVariantMap::const_iterator iter = curState->m_to.constBegin();
         iter!=curState->m_to.constEnd(); iter++){
         if (iter.key() == goalName)
@@ -479,7 +479,7 @@ int QSGStochasticEngine::goalSeek(int curIdx, int spriteIdx, int dist)
     return -1;
 }
 
-void QSGStochasticEngine::addToUpdateList(uint t, int idx)
+void QQuickStochasticEngine::addToUpdateList(uint t, int idx)
 {
     for (int i=0; i<m_stateUpdates.count(); i++){
         if (m_stateUpdates[i].first==t){
diff --git a/src/declarative/items/qsgspriteengine_p.h b/src/declarative/items/qquickspriteengine_p.h
index 8140b3814d..6d527d12dc 100644
--- a/src/declarative/items/qsgspriteengine_p.h
+++ b/src/declarative/items/qquickspriteengine_p.h
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#ifndef SPRITEENGINE_H
-#define SPRITEENGINE_H
+#ifndef QQUICKSPRITEENGINE_P_H
+#define QQUICKSPRITEENGINE_P_H
 
 #include <QObject>
 #include <QVector>
@@ -57,8 +57,8 @@ QT_BEGIN_NAMESPACE
 
 QT_MODULE(Declarative)
 
-class QSGSprite;
-class Q_AUTOTEST_EXPORT QSGStochasticState : public QObject //For internal use
+class QQuickSprite;
+class Q_AUTOTEST_EXPORT QQuickStochasticState : public QObject //For internal use
 {
     Q_OBJECT
     Q_PROPERTY(int duration READ duration WRITE setDuration NOTIFY durationChanged)
@@ -69,7 +69,7 @@ class Q_AUTOTEST_EXPORT QSGStochasticState : public QObject //For internal use
     Q_PROPERTY(int frames READ frames WRITE setFrames NOTIFY framesChanged)
 
 public:
-    QSGStochasticState(QObject* parent = 0)
+    QQuickStochasticState(QObject* parent = 0)
         : QObject(parent)
         , m_frames(1)
         , m_duration(1000)
@@ -185,23 +185,23 @@ private:
     qreal m_speedModifier;
     int m_durationVariance;
 
-    friend class QSGStochasticEngine;
+    friend class QQuickStochasticEngine;
 };
 
-class Q_AUTOTEST_EXPORT QSGStochasticEngine : public QObject
+class Q_AUTOTEST_EXPORT QQuickStochasticEngine : public QObject
 {
     Q_OBJECT
     //TODO: Optimize single state case?
     Q_PROPERTY(QString globalGoal READ globalGoal WRITE setGlobalGoal NOTIFY globalGoalChanged)
-    Q_PROPERTY(QDeclarativeListProperty<QSGStochasticState> states READ states)
+    Q_PROPERTY(QDeclarativeListProperty<QQuickStochasticState> states READ states)
 public:
-    explicit QSGStochasticEngine(QObject *parent = 0);
-    QSGStochasticEngine(QList<QSGStochasticState*> states, QObject *parent=0);
-    ~QSGStochasticEngine();
+    explicit QQuickStochasticEngine(QObject *parent = 0);
+    QQuickStochasticEngine(QList<QQuickStochasticState*> states, QObject *parent=0);
+    ~QQuickStochasticEngine();
 
-    QDeclarativeListProperty<QSGStochasticState> states()
+    QDeclarativeListProperty<QQuickStochasticState> states()
     {
-        return QDeclarativeListProperty<QSGStochasticState>(this, m_states);
+        return QDeclarativeListProperty<QQuickStochasticState>(this, m_states);
     }
 
     QString globalGoal() const
@@ -219,8 +219,8 @@ public:
     void stop(int index=0);
     int curState(int index=0) {return m_things[index];}
 
-    QSGStochasticState* state(int idx){return m_states[idx];}
-    int stateIndex(QSGStochasticState* s){return m_states.indexOf(s);}
+    QQuickStochasticState* state(int idx){return m_states[idx];}
+    int stateIndex(QQuickStochasticState* s){return m_states.indexOf(s);}
     int stateCount() {return m_states.count();}
 private:
 signals:
@@ -244,7 +244,7 @@ protected:
     void restart(int index);
     void addToUpdateList(uint t, int idx);
     int goalSeek(int curState, int idx, int dist=-1);
-    QList<QSGStochasticState*> m_states;
+    QList<QQuickStochasticState*> m_states;
     //### Consider struct or class for the four data variables?
     QVector<int> m_things;//int is the index in m_states of the current state
     QVector<int> m_goals;
@@ -259,17 +259,17 @@ protected:
     int m_imageStateCount;
 };
 
-class QSGSpriteEngine : public QSGStochasticEngine
+class QQuickSpriteEngine : public QQuickStochasticEngine
 {
     Q_OBJECT
-    Q_PROPERTY(QDeclarativeListProperty<QSGSprite> sprites READ sprites)
+    Q_PROPERTY(QDeclarativeListProperty<QQuickSprite> sprites READ sprites)
 public:
-    explicit QSGSpriteEngine(QObject *parent = 0);
-    QSGSpriteEngine(QList<QSGSprite*> sprites, QObject *parent=0);
-    ~QSGSpriteEngine();
-    QDeclarativeListProperty<QSGSprite> sprites()
+    explicit QQuickSpriteEngine(QObject *parent = 0);
+    QQuickSpriteEngine(QList<QQuickSprite*> sprites, QObject *parent=0);
+    ~QQuickSpriteEngine();
+    QDeclarativeListProperty<QQuickSprite> sprites()
     {
-        return QDeclarativeListProperty<QSGSprite>(this, m_sprites);
+        return QDeclarativeListProperty<QQuickSprite>(this, m_sprites);
     }
 
 
@@ -285,34 +285,34 @@ public:
     int maxFrames();
     QImage assembledImage();
 private:
-    QList<QSGSprite*> m_sprites;
+    QList<QQuickSprite*> m_sprites;
 };
 
 //Common use is to have your own list property which is transparently an engine
-inline void spriteAppend(QDeclarativeListProperty<QSGSprite> *p, QSGSprite* s)
+inline void spriteAppend(QDeclarativeListProperty<QQuickSprite> *p, QQuickSprite* s)
 {
-    reinterpret_cast<QList<QSGSprite *> *>(p->data)->append(s);
+    reinterpret_cast<QList<QQuickSprite *> *>(p->data)->append(s);
     p->object->metaObject()->invokeMethod(p->object, "createEngine");
 }
 
-inline QSGSprite* spriteAt(QDeclarativeListProperty<QSGSprite> *p, int idx)
+inline QQuickSprite* spriteAt(QDeclarativeListProperty<QQuickSprite> *p, int idx)
 {
-    return reinterpret_cast<QList<QSGSprite *> *>(p->data)->at(idx);
+    return reinterpret_cast<QList<QQuickSprite *> *>(p->data)->at(idx);
 }
 
-inline void spriteClear(QDeclarativeListProperty<QSGSprite> *p)
+inline void spriteClear(QDeclarativeListProperty<QQuickSprite> *p)
 {
-    reinterpret_cast<QList<QSGSprite *> *>(p->data)->clear();
+    reinterpret_cast<QList<QQuickSprite *> *>(p->data)->clear();
     p->object->metaObject()->invokeMethod(p->object, "createEngine");
 }
 
-inline int spriteCount(QDeclarativeListProperty<QSGSprite> *p)
+inline int spriteCount(QDeclarativeListProperty<QQuickSprite> *p)
 {
-    return reinterpret_cast<QList<QSGSprite *> *>(p->data)->count();
+    return reinterpret_cast<QList<QQuickSprite *> *>(p->data)->count();
 }
 
 QT_END_NAMESPACE
 
 QT_END_HEADER
 
-#endif // SPRITEENGINE_H
+#endif // QQUICKSPRITEENGINE_P_H
diff --git a/src/declarative/items/qsgspriteimage.cpp b/src/declarative/items/qquickspriteimage.cpp
index f6cd35f4f3..36ab73490c 100644
--- a/src/declarative/items/qsgspriteimage.cpp
+++ b/src/declarative/items/qquickspriteimage.cpp
@@ -39,9 +39,9 @@
 **
 ****************************************************************************/
 
-#include "qsgspriteimage_p.h"
-#include "qsgsprite_p.h"
-#include "qsgspriteengine_p.h"
+#include "qquickspriteimage_p.h"
+#include "qquicksprite_p.h"
+#include "qquickspriteengine_p.h"
 #include <private/qsgcontext_p.h>
 #include <private/qsgadaptationlayer_p.h>
 #include <qsgnode.h>
@@ -96,16 +96,16 @@ static const char fragmentShaderCode[] =
     "    gl_FragColor = mix(texture2D(texture, fTexS.xy), texture2D(texture, fTexS.zw), progress) * qt_Opacity;\n"
     "}\n";
 
-class QSGSpriteMaterial : public QSGMaterial
+class QQuickSpriteMaterial : public QSGMaterial
 {
 public:
-    QSGSpriteMaterial();
-    virtual ~QSGSpriteMaterial();
+    QQuickSpriteMaterial();
+    virtual ~QQuickSpriteMaterial();
     virtual QSGMaterialType *type() const { static QSGMaterialType type; return &type; }
     virtual QSGMaterialShader *createShader() const;
     virtual int compare(const QSGMaterial *other) const
     {
-        return this - static_cast<const QSGSpriteMaterial *>(other);
+        return this - static_cast<const QQuickSpriteMaterial *>(other);
     }
 
     QSGTexture *texture;
@@ -125,7 +125,7 @@ public:
     float elementHeight;
 };
 
-QSGSpriteMaterial::QSGSpriteMaterial()
+QQuickSpriteMaterial::QQuickSpriteMaterial()
     : timestamp(0)
     , interpolate(1.0f)
     , frameDuration(1.0f)
@@ -143,7 +143,7 @@ QSGSpriteMaterial::QSGSpriteMaterial()
     setFlag(Blending, true);
 }
 
-QSGSpriteMaterial::~QSGSpriteMaterial()
+QQuickSpriteMaterial::~QQuickSpriteMaterial()
 {
     delete texture;
 }
@@ -165,7 +165,7 @@ public:
 
     virtual void updateState(const RenderState &state, QSGMaterial *newEffect, QSGMaterial *)
     {
-        QSGSpriteMaterial *m = static_cast<QSGSpriteMaterial *>(newEffect);
+        QQuickSpriteMaterial *m = static_cast<QQuickSpriteMaterial *>(newEffect);
         m->texture->bind();
 
         program()->setUniformValue(m_opacity_id, state.opacity());
@@ -210,7 +210,7 @@ public:
 
 float SpriteMaterialData::chunkOfBytes[1024];
 
-QSGMaterialShader *QSGSpriteMaterial::createShader() const
+QSGMaterialShader *QQuickSpriteMaterial::createShader() const
 {
     return new SpriteMaterialData;
 }
@@ -228,7 +228,7 @@ struct SpriteVertices {
 };
 
 /*!
-    \qmlclass SpriteImage QSGSpriteImage
+    \qmlclass SpriteImage QQuickSpriteImage
     \inqmlmodule QtQuick 2
     \inherits Item
     \brief The SpriteImage element draws a sprite animation
@@ -256,8 +256,8 @@ struct SpriteVertices {
 */
 
 //TODO: Implicitly size element to size of first sprite?
-QSGSpriteImage::QSGSpriteImage(QSGItem *parent) :
-    QSGItem(parent)
+QQuickSpriteImage::QQuickSpriteImage(QQuickItem *parent) :
+    QQuickItem(parent)
     , m_node(0)
     , m_material(0)
     , m_spriteEngine(0)
@@ -270,18 +270,18 @@ QSGSpriteImage::QSGSpriteImage(QSGItem *parent) :
             this, SLOT(update()));
 }
 
-QDeclarativeListProperty<QSGSprite> QSGSpriteImage::sprites()
+QDeclarativeListProperty<QQuickSprite> QQuickSpriteImage::sprites()
 {
-    return QDeclarativeListProperty<QSGSprite>(this, &m_sprites, spriteAppend, spriteCount, spriteAt, spriteClear);
+    return QDeclarativeListProperty<QQuickSprite>(this, &m_sprites, spriteAppend, spriteCount, spriteAt, spriteClear);
 }
 
-void QSGSpriteImage::createEngine()
+void QQuickSpriteImage::createEngine()
 {
     //TODO: delay until component complete
     if (m_spriteEngine)
         delete m_spriteEngine;
     if (m_sprites.count())
-        m_spriteEngine = new QSGSpriteEngine(m_sprites, this);
+        m_spriteEngine = new QQuickSpriteEngine(m_sprites, this);
     else
         m_spriteEngine = 0;
     reset();
@@ -298,14 +298,14 @@ static QSGGeometry::AttributeSet SpriteImage_AttributeSet =
     SpriteImage_Attributes
 };
 
-QSGGeometryNode* QSGSpriteImage::buildNode()
+QSGGeometryNode* QQuickSpriteImage::buildNode()
 {
     if (!m_spriteEngine) {
         qWarning() << "SpriteImage: No sprite engine...";
         return 0;
     }
 
-    m_material = new QSGSpriteMaterial();
+    m_material = new QQuickSpriteMaterial();
 
     QImage image = m_spriteEngine->assembledImage();
     if (image.isNull())
@@ -362,12 +362,12 @@ QSGGeometryNode* QSGSpriteImage::buildNode()
     return m_node;
 }
 
-void QSGSpriteImage::reset()
+void QQuickSpriteImage::reset()
 {
     m_pleaseReset = true;
 }
 
-QSGNode *QSGSpriteImage::updatePaintNode(QSGNode *, UpdatePaintNodeData *)
+QSGNode *QQuickSpriteImage::updatePaintNode(QSGNode *, UpdatePaintNodeData *)
 {
     if (m_pleaseReset) {
         delete m_node;
@@ -389,7 +389,7 @@ QSGNode *QSGSpriteImage::updatePaintNode(QSGNode *, UpdatePaintNodeData *)
     return m_node;
 }
 
-void QSGSpriteImage::prepareNextFrame()
+void QQuickSpriteImage::prepareNextFrame()
 {
     if (m_node == 0)
         m_node = buildNode();
diff --git a/src/declarative/items/qsgspriteimage_p.h b/src/declarative/items/qquickspriteimage_p.h
index 84c5b50136..1ffc95d952 100644
--- a/src/declarative/items/qsgspriteimage_p.h
+++ b/src/declarative/items/qquickspriteimage_p.h
@@ -39,10 +39,10 @@
 **
 ****************************************************************************/
 
-#ifndef SPRITEIMAGE_H
-#define SPRITEIMAGE_H
+#ifndef QQUICKSPRITEIMAGE_P_H
+#define QQUICKSPRITEIMAGE_P_H
 
-#include <QSGItem>
+#include <QQuickItem>
 #include <QTime>
 
 QT_BEGIN_HEADER
@@ -52,23 +52,23 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(Declarative)
 
 class QSGContext;
-class QSGSprite;
-class QSGSpriteEngine;
+class QQuickSprite;
+class QQuickSpriteEngine;
 class QSGGeometryNode;
-class QSGSpriteMaterial;
-class QSGSpriteImage : public QSGItem
+class QQuickSpriteMaterial;
+class QQuickSpriteImage : public QQuickItem
 {
     Q_OBJECT
     Q_PROPERTY(bool running READ running WRITE setRunning NOTIFY runningChanged)
     Q_PROPERTY(bool interpolate READ interpolate WRITE setInterpolate NOTIFY interpolateChanged)
     //###try to share similar spriteEngines for less overhead?
-    Q_PROPERTY(QDeclarativeListProperty<QSGSprite> sprites READ sprites)
+    Q_PROPERTY(QDeclarativeListProperty<QQuickSprite> sprites READ sprites)
     Q_CLASSINFO("DefaultProperty", "sprites")
 
 public:
-    explicit QSGSpriteImage(QSGItem *parent = 0);
+    explicit QQuickSpriteImage(QQuickItem *parent = 0);
 
-    QDeclarativeListProperty<QSGSprite> sprites();
+    QDeclarativeListProperty<QQuickSprite> sprites();
 
     bool running() const
     {
@@ -112,9 +112,9 @@ private:
     void prepareNextFrame();
     QSGGeometryNode* buildNode();
     QSGGeometryNode *m_node;
-    QSGSpriteMaterial *m_material;
-    QList<QSGSprite*> m_sprites;
-    QSGSpriteEngine* m_spriteEngine;
+    QQuickSpriteMaterial *m_material;
+    QList<QQuickSprite*> m_sprites;
+    QQuickSpriteEngine* m_spriteEngine;
     QTime m_timestamp;
     int m_maxFrames;
     bool m_pleaseReset;
@@ -126,4 +126,4 @@ QT_END_NAMESPACE
 
 QT_END_HEADER
 
-#endif // SPRITEIMAGE_H
+#endif // QQUICKSPRITEIMAGE_P_H
diff --git a/src/declarative/items/qsgstateoperations.cpp b/src/declarative/items/qquickstateoperations.cpp
index 8f878f3aaa..8c53e0a63f 100644
--- a/src/declarative/items/qsgstateoperations.cpp
+++ b/src/declarative/items/qquickstateoperations.cpp
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#include "qsgstateoperations_p.h"
-#include "qsgitem_p.h"
+#include "qquickstateoperations_p.h"
+#include "qquickitem_p.h"
 
 #include <private/qdeclarativestate_p_p.h>
 
@@ -49,19 +49,19 @@
 
 QT_BEGIN_NAMESPACE
 
-class QSGParentChangePrivate : public QDeclarativeStateOperationPrivate
+class QQuickParentChangePrivate : public QDeclarativeStateOperationPrivate
 {
-    Q_DECLARE_PUBLIC(QSGParentChange)
+    Q_DECLARE_PUBLIC(QQuickParentChange)
 public:
-    QSGParentChangePrivate() : target(0), parent(0), origParent(0), origStackBefore(0),
+    QQuickParentChangePrivate() : target(0), parent(0), origParent(0), origStackBefore(0),
         rewindParent(0), rewindStackBefore(0) {}
 
-    QSGItem *target;
-    QDeclarativeGuard<QSGItem> parent;
-    QDeclarativeGuard<QSGItem> origParent;
-    QDeclarativeGuard<QSGItem> origStackBefore;
-    QSGItem *rewindParent;
-    QSGItem *rewindStackBefore;
+    QQuickItem *target;
+    QDeclarativeGuard<QQuickItem> parent;
+    QDeclarativeGuard<QQuickItem> origParent;
+    QDeclarativeGuard<QQuickItem> origStackBefore;
+    QQuickItem *rewindParent;
+    QQuickItem *rewindStackBefore;
 
     QDeclarativeNullableValue<QDeclarativeScriptString> xString;
     QDeclarativeNullableValue<QDeclarativeScriptString> yString;
@@ -70,17 +70,17 @@ public:
     QDeclarativeNullableValue<QDeclarativeScriptString> scaleString;
     QDeclarativeNullableValue<QDeclarativeScriptString> rotationString;
 
-    void doChange(QSGItem *targetParent, QSGItem *stackBefore = 0);
+    void doChange(QQuickItem *targetParent, QQuickItem *stackBefore = 0);
 };
 
-void QSGParentChangePrivate::doChange(QSGItem *targetParent, QSGItem *stackBefore)
+void QQuickParentChangePrivate::doChange(QQuickItem *targetParent, QQuickItem *stackBefore)
 {
     if (targetParent && target && target->parentItem()) {
-        Q_Q(QSGParentChange);
+        Q_Q(QQuickParentChange);
         bool ok;
         const QTransform &transform = target->parentItem()->itemTransform(targetParent, &ok);
         if (transform.type() >= QTransform::TxShear || !ok) {
-            qmlInfo(q) << QSGParentChange::tr("Unable to preserve appearance under complex transform");
+            qmlInfo(q) << QQuickParentChange::tr("Unable to preserve appearance under complex transform");
             ok = false;
         }
 
@@ -91,21 +91,21 @@ void QSGParentChangePrivate::doChange(QSGItem *targetParent, QSGItem *stackBefor
             if (transform.m11() == transform.m22())
                 scale = transform.m11();
             else {
-                qmlInfo(q) << QSGParentChange::tr("Unable to preserve appearance under non-uniform scale");
+                qmlInfo(q) << QQuickParentChange::tr("Unable to preserve appearance under non-uniform scale");
                 ok = false;
             }
         } else if (ok && isRotate) {
             if (transform.m11() == transform.m22())
                 scale = qSqrt(transform.m11()*transform.m11() + transform.m12()*transform.m12());
             else {
-                qmlInfo(q) << QSGParentChange::tr("Unable to preserve appearance under non-uniform scale");
+                qmlInfo(q) << QQuickParentChange::tr("Unable to preserve appearance under non-uniform scale");
                 ok = false;
             }
 
             if (scale != 0)
                 rotation = atan2(transform.m12()/scale, transform.m11()/scale) * 180/M_PI;
             else {
-                qmlInfo(q) << QSGParentChange::tr("Unable to preserve appearance under scale of 0");
+                qmlInfo(q) << QQuickParentChange::tr("Unable to preserve appearance under scale of 0");
                 ok = false;
             }
         }
@@ -117,7 +117,7 @@ void QSGParentChangePrivate::doChange(QSGItem *targetParent, QSGItem *stackBefor
         // setParentItem will update the transformOriginPoint if needed
         target->setParentItem(targetParent);
 
-        if (ok && target->transformOrigin() != QSGItem::TopLeft) {
+        if (ok && target->transformOrigin() != QQuickItem::TopLeft) {
             qreal tempxt = target->transformOriginPoint().x();
             qreal tempyt = target->transformOriginPoint().y();
             QTransform t;
@@ -147,156 +147,156 @@ void QSGParentChangePrivate::doChange(QSGItem *targetParent, QSGItem *stackBefor
         target->stackBefore(stackBefore);
 }
 
-QSGParentChange::QSGParentChange(QObject *parent)
-    : QDeclarativeStateOperation(*(new QSGParentChangePrivate), parent)
+QQuickParentChange::QQuickParentChange(QObject *parent)
+    : QDeclarativeStateOperation(*(new QQuickParentChangePrivate), parent)
 {
 }
 
-QSGParentChange::~QSGParentChange()
+QQuickParentChange::~QQuickParentChange()
 {
 }
 
-QDeclarativeScriptString QSGParentChange::x() const
+QDeclarativeScriptString QQuickParentChange::x() const
 {
-    Q_D(const QSGParentChange);
+    Q_D(const QQuickParentChange);
     return d->xString.value;
 }
 
-void QSGParentChange::setX(QDeclarativeScriptString x)
+void QQuickParentChange::setX(QDeclarativeScriptString x)
 {
-    Q_D(QSGParentChange);
+    Q_D(QQuickParentChange);
     d->xString = x;
 }
 
-bool QSGParentChange::xIsSet() const
+bool QQuickParentChange::xIsSet() const
 {
-    Q_D(const QSGParentChange);
+    Q_D(const QQuickParentChange);
     return d->xString.isValid();
 }
 
-QDeclarativeScriptString QSGParentChange::y() const
+QDeclarativeScriptString QQuickParentChange::y() const
 {
-    Q_D(const QSGParentChange);
+    Q_D(const QQuickParentChange);
     return d->yString.value;
 }
 
-void QSGParentChange::setY(QDeclarativeScriptString y)
+void QQuickParentChange::setY(QDeclarativeScriptString y)
 {
-    Q_D(QSGParentChange);
+    Q_D(QQuickParentChange);
     d->yString = y;
 }
 
-bool QSGParentChange::yIsSet() const
+bool QQuickParentChange::yIsSet() const
 {
-    Q_D(const QSGParentChange);
+    Q_D(const QQuickParentChange);
     return d->yString.isValid();
 }
 
-QDeclarativeScriptString QSGParentChange::width() const
+QDeclarativeScriptString QQuickParentChange::width() const
 {
-    Q_D(const QSGParentChange);
+    Q_D(const QQuickParentChange);
     return d->widthString.value;
 }
 
-void QSGParentChange::setWidth(QDeclarativeScriptString width)
+void QQuickParentChange::setWidth(QDeclarativeScriptString width)
 {
-    Q_D(QSGParentChange);
+    Q_D(QQuickParentChange);
     d->widthString = width;
 }
 
-bool QSGParentChange::widthIsSet() const
+bool QQuickParentChange::widthIsSet() const
 {
-    Q_D(const QSGParentChange);
+    Q_D(const QQuickParentChange);
     return d->widthString.isValid();
 }
 
-QDeclarativeScriptString QSGParentChange::height() const
+QDeclarativeScriptString QQuickParentChange::height() const
 {
-    Q_D(const QSGParentChange);
+    Q_D(const QQuickParentChange);
     return d->heightString.value;
 }
 
-void QSGParentChange::setHeight(QDeclarativeScriptString height)
+void QQuickParentChange::setHeight(QDeclarativeScriptString height)
 {
-    Q_D(QSGParentChange);
+    Q_D(QQuickParentChange);
     d->heightString = height;
 }
 
-bool QSGParentChange::heightIsSet() const
+bool QQuickParentChange::heightIsSet() const
 {
-    Q_D(const QSGParentChange);
+    Q_D(const QQuickParentChange);
     return d->heightString.isValid();
 }
 
-QDeclarativeScriptString QSGParentChange::scale() const
+QDeclarativeScriptString QQuickParentChange::scale() const
 {
-    Q_D(const QSGParentChange);
+    Q_D(const QQuickParentChange);
     return d->scaleString.value;
 }
 
-void QSGParentChange::setScale(QDeclarativeScriptString scale)
+void QQuickParentChange::setScale(QDeclarativeScriptString scale)
 {
-    Q_D(QSGParentChange);
+    Q_D(QQuickParentChange);
     d->scaleString = scale;
 }
 
-bool QSGParentChange::scaleIsSet() const
+bool QQuickParentChange::scaleIsSet() const
 {
-    Q_D(const QSGParentChange);
+    Q_D(const QQuickParentChange);
     return d->scaleString.isValid();
 }
 
-QDeclarativeScriptString QSGParentChange::rotation() const
+QDeclarativeScriptString QQuickParentChange::rotation() const
 {
-    Q_D(const QSGParentChange);
+    Q_D(const QQuickParentChange);
     return d->rotationString.value;
 }
 
-void QSGParentChange::setRotation(QDeclarativeScriptString rotation)
+void QQuickParentChange::setRotation(QDeclarativeScriptString rotation)
 {
-    Q_D(QSGParentChange);
+    Q_D(QQuickParentChange);
     d->rotationString = rotation;
 }
 
-bool QSGParentChange::rotationIsSet() const
+bool QQuickParentChange::rotationIsSet() const
 {
-    Q_D(const QSGParentChange);
+    Q_D(const QQuickParentChange);
     return d->rotationString.isValid();
 }
 
-QSGItem *QSGParentChange::originalParent() const
+QQuickItem *QQuickParentChange::originalParent() const
 {
-    Q_D(const QSGParentChange);
+    Q_D(const QQuickParentChange);
     return d->origParent;
 }
 
-QSGItem *QSGParentChange::object() const
+QQuickItem *QQuickParentChange::object() const
 {
-    Q_D(const QSGParentChange);
+    Q_D(const QQuickParentChange);
     return d->target;
 }
 
-void QSGParentChange::setObject(QSGItem *target)
+void QQuickParentChange::setObject(QQuickItem *target)
 {
-    Q_D(QSGParentChange);
+    Q_D(QQuickParentChange);
     d->target = target;
 }
 
-QSGItem *QSGParentChange::parent() const
+QQuickItem *QQuickParentChange::parent() const
 {
-    Q_D(const QSGParentChange);
+    Q_D(const QQuickParentChange);
     return d->parent;
 }
 
-void QSGParentChange::setParent(QSGItem *parent)
+void QQuickParentChange::setParent(QQuickItem *parent)
 {
-    Q_D(QSGParentChange);
+    Q_D(QQuickParentChange);
     d->parent = parent;
 }
 
-QDeclarativeStateOperation::ActionList QSGParentChange::actions()
+QDeclarativeStateOperation::ActionList QQuickParentChange::actions()
 {
-    Q_D(QSGParentChange);
+    Q_D(QQuickParentChange);
     if (!d->target || !d->parent)
         return ActionList();
 
@@ -423,18 +423,18 @@ QDeclarativeStateOperation::ActionList QSGParentChange::actions()
     return actions;
 }
 
-void QSGParentChange::saveOriginals()
+void QQuickParentChange::saveOriginals()
 {
-    Q_D(QSGParentChange);
+    Q_D(QQuickParentChange);
     saveCurrentValues();
     d->origParent = d->rewindParent;
     d->origStackBefore = d->rewindStackBefore;
 }
 
-/*void QSGParentChange::copyOriginals(QDeclarativeActionEvent *other)
+/*void QQuickParentChange::copyOriginals(QDeclarativeActionEvent *other)
 {
-    Q_D(QSGParentChange);
-    QSGParentChange *pc = static_cast<QSGParentChange*>(other);
+    Q_D(QQuickParentChange);
+    QQuickParentChange *pc = static_cast<QQuickParentChange*>(other);
 
     d->origParent = pc->d_func()->rewindParent;
     d->origStackBefore = pc->d_func()->rewindStackBefore;
@@ -442,41 +442,41 @@ void QSGParentChange::saveOriginals()
     saveCurrentValues();
 }*/
 
-void QSGParentChange::execute(Reason)
+void QQuickParentChange::execute(Reason)
 {
-    Q_D(QSGParentChange);
+    Q_D(QQuickParentChange);
     d->doChange(d->parent);
 }
 
-bool QSGParentChange::isReversable()
+bool QQuickParentChange::isReversable()
 {
     return true;
 }
 
-void QSGParentChange::reverse(Reason)
+void QQuickParentChange::reverse(Reason)
 {
-    Q_D(QSGParentChange);
+    Q_D(QQuickParentChange);
     d->doChange(d->origParent, d->origStackBefore);
 }
 
-QString QSGParentChange::typeName() const
+QString QQuickParentChange::typeName() const
 {
     return QLatin1String("ParentChange");
 }
 
-bool QSGParentChange::override(QDeclarativeActionEvent*other)
+bool QQuickParentChange::override(QDeclarativeActionEvent*other)
 {
-    Q_D(QSGParentChange);
+    Q_D(QQuickParentChange);
     if (other->typeName() != QLatin1String("ParentChange"))
         return false;
-    if (QSGParentChange *otherPC = static_cast<QSGParentChange*>(other))
+    if (QQuickParentChange *otherPC = static_cast<QQuickParentChange*>(other))
         return (d->target == otherPC->object());
     return false;
 }
 
-void QSGParentChange::saveCurrentValues()
+void QQuickParentChange::saveCurrentValues()
 {
-    Q_D(QSGParentChange);
+    Q_D(QQuickParentChange);
     if (!d->target) {
         d->rewindParent = 0;
         d->rewindStackBefore = 0;
@@ -489,7 +489,7 @@ void QSGParentChange::saveCurrentValues()
     if (!d->rewindParent)
         return;
 
-    QList<QSGItem *> children = d->rewindParent->childItems();
+    QList<QQuickItem *> children = d->rewindParent->childItems();
     for (int ii = 0; ii < children.count() - 1; ++ii) {
         if (children.at(ii) == d->target) {
             d->rewindStackBefore = children.at(ii + 1);
@@ -498,28 +498,28 @@ void QSGParentChange::saveCurrentValues()
     }
 }
 
-void QSGParentChange::rewind()
+void QQuickParentChange::rewind()
 {
-    Q_D(QSGParentChange);
+    Q_D(QQuickParentChange);
     d->doChange(d->rewindParent, d->rewindStackBefore);
 }
 
-class QSGAnchorSetPrivate : public QObjectPrivate
+class QQuickAnchorSetPrivate : public QObjectPrivate
 {
-    Q_DECLARE_PUBLIC(QSGAnchorSet)
+    Q_DECLARE_PUBLIC(QQuickAnchorSet)
 public:
-    QSGAnchorSetPrivate()
+    QQuickAnchorSetPrivate()
       : usedAnchors(0), resetAnchors(0), fill(0),
         centerIn(0)/*, leftMargin(0), rightMargin(0), topMargin(0), bottomMargin(0),
         margins(0), vCenterOffset(0), hCenterOffset(0), baselineOffset(0)*/
     {
     }
 
-    QSGAnchors::Anchors usedAnchors;
-    QSGAnchors::Anchors resetAnchors;
+    QQuickAnchors::Anchors usedAnchors;
+    QQuickAnchors::Anchors resetAnchors;
 
-    QSGItem *fill;
-    QSGItem *centerIn;
+    QQuickItem *fill;
+    QQuickItem *centerIn;
 
     QDeclarativeScriptString leftScript;
     QDeclarativeScriptString rightScript;
@@ -539,216 +539,216 @@ public:
     qreal baselineOffset;*/
 };
 
-QSGAnchorSet::QSGAnchorSet(QObject *parent)
-  : QObject(*new QSGAnchorSetPrivate, parent)
+QQuickAnchorSet::QQuickAnchorSet(QObject *parent)
+  : QObject(*new QQuickAnchorSetPrivate, parent)
 {
 }
 
-QSGAnchorSet::~QSGAnchorSet()
+QQuickAnchorSet::~QQuickAnchorSet()
 {
 }
 
-QDeclarativeScriptString QSGAnchorSet::top() const
+QDeclarativeScriptString QQuickAnchorSet::top() const
 {
-    Q_D(const QSGAnchorSet);
+    Q_D(const QQuickAnchorSet);
     return d->topScript;
 }
 
-void QSGAnchorSet::setTop(const QDeclarativeScriptString &edge)
+void QQuickAnchorSet::setTop(const QDeclarativeScriptString &edge)
 {
-    Q_D(QSGAnchorSet);
-    d->usedAnchors |= QSGAnchors::TopAnchor;
+    Q_D(QQuickAnchorSet);
+    d->usedAnchors |= QQuickAnchors::TopAnchor;
     d->topScript = edge;
     if (edge.script() == QLatin1String("undefined"))
         resetTop();
 }
 
-void QSGAnchorSet::resetTop()
+void QQuickAnchorSet::resetTop()
 {
-    Q_D(QSGAnchorSet);
-    d->usedAnchors &= ~QSGAnchors::TopAnchor;
+    Q_D(QQuickAnchorSet);
+    d->usedAnchors &= ~QQuickAnchors::TopAnchor;
     d->topScript = QDeclarativeScriptString();
-    d->resetAnchors |= QSGAnchors::TopAnchor;
+    d->resetAnchors |= QQuickAnchors::TopAnchor;
 }
 
-QDeclarativeScriptString QSGAnchorSet::bottom() const
+QDeclarativeScriptString QQuickAnchorSet::bottom() const
 {
-    Q_D(const QSGAnchorSet);
+    Q_D(const QQuickAnchorSet);
     return d->bottomScript;
 }
 
-void QSGAnchorSet::setBottom(const QDeclarativeScriptString &edge)
+void QQuickAnchorSet::setBottom(const QDeclarativeScriptString &edge)
 {
-    Q_D(QSGAnchorSet);
-    d->usedAnchors |= QSGAnchors::BottomAnchor;
+    Q_D(QQuickAnchorSet);
+    d->usedAnchors |= QQuickAnchors::BottomAnchor;
     d->bottomScript = edge;
     if (edge.script() == QLatin1String("undefined"))
         resetBottom();
 }
 
-void QSGAnchorSet::resetBottom()
+void QQuickAnchorSet::resetBottom()
 {
-    Q_D(QSGAnchorSet);
-    d->usedAnchors &= ~QSGAnchors::BottomAnchor;
+    Q_D(QQuickAnchorSet);
+    d->usedAnchors &= ~QQuickAnchors::BottomAnchor;
     d->bottomScript = QDeclarativeScriptString();
-    d->resetAnchors |= QSGAnchors::BottomAnchor;
+    d->resetAnchors |= QQuickAnchors::BottomAnchor;
 }
 
-QDeclarativeScriptString QSGAnchorSet::verticalCenter() const
+QDeclarativeScriptString QQuickAnchorSet::verticalCenter() const
 {
-    Q_D(const QSGAnchorSet);
+    Q_D(const QQuickAnchorSet);
     return d->vCenterScript;
 }
 
-void QSGAnchorSet::setVerticalCenter(const QDeclarativeScriptString &edge)
+void QQuickAnchorSet::setVerticalCenter(const QDeclarativeScriptString &edge)
 {
-    Q_D(QSGAnchorSet);
-    d->usedAnchors |= QSGAnchors::VCenterAnchor;
+    Q_D(QQuickAnchorSet);
+    d->usedAnchors |= QQuickAnchors::VCenterAnchor;
     d->vCenterScript = edge;
     if (edge.script() == QLatin1String("undefined"))
         resetVerticalCenter();
 }
 
-void QSGAnchorSet::resetVerticalCenter()
+void QQuickAnchorSet::resetVerticalCenter()
 {
-    Q_D(QSGAnchorSet);
-    d->usedAnchors &= ~QSGAnchors::VCenterAnchor;
+    Q_D(QQuickAnchorSet);
+    d->usedAnchors &= ~QQuickAnchors::VCenterAnchor;
     d->vCenterScript = QDeclarativeScriptString();
-    d->resetAnchors |= QSGAnchors::VCenterAnchor;
+    d->resetAnchors |= QQuickAnchors::VCenterAnchor;
 }
 
-QDeclarativeScriptString QSGAnchorSet::baseline() const
+QDeclarativeScriptString QQuickAnchorSet::baseline() const
 {
-    Q_D(const QSGAnchorSet);
+    Q_D(const QQuickAnchorSet);
     return d->baselineScript;
 }
 
-void QSGAnchorSet::setBaseline(const QDeclarativeScriptString &edge)
+void QQuickAnchorSet::setBaseline(const QDeclarativeScriptString &edge)
 {
-    Q_D(QSGAnchorSet);
-    d->usedAnchors |= QSGAnchors::BaselineAnchor;
+    Q_D(QQuickAnchorSet);
+    d->usedAnchors |= QQuickAnchors::BaselineAnchor;
     d->baselineScript = edge;
     if (edge.script() == QLatin1String("undefined"))
         resetBaseline();
 }
 
-void QSGAnchorSet::resetBaseline()
+void QQuickAnchorSet::resetBaseline()
 {
-    Q_D(QSGAnchorSet);
-    d->usedAnchors &= ~QSGAnchors::BaselineAnchor;
+    Q_D(QQuickAnchorSet);
+    d->usedAnchors &= ~QQuickAnchors::BaselineAnchor;
     d->baselineScript = QDeclarativeScriptString();
-    d->resetAnchors |= QSGAnchors::BaselineAnchor;
+    d->resetAnchors |= QQuickAnchors::BaselineAnchor;
 }
 
-QDeclarativeScriptString QSGAnchorSet::left() const
+QDeclarativeScriptString QQuickAnchorSet::left() const
 {
-    Q_D(const QSGAnchorSet);
+    Q_D(const QQuickAnchorSet);
     return d->leftScript;
 }
 
-void QSGAnchorSet::setLeft(const QDeclarativeScriptString &edge)
+void QQuickAnchorSet::setLeft(const QDeclarativeScriptString &edge)
 {
-    Q_D(QSGAnchorSet);
-    d->usedAnchors |= QSGAnchors::LeftAnchor;
+    Q_D(QQuickAnchorSet);
+    d->usedAnchors |= QQuickAnchors::LeftAnchor;
     d->leftScript = edge;
     if (edge.script() == QLatin1String("undefined"))
         resetLeft();
 }
 
-void QSGAnchorSet::resetLeft()
+void QQuickAnchorSet::resetLeft()
 {
-    Q_D(QSGAnchorSet);
-    d->usedAnchors &= ~QSGAnchors::LeftAnchor;
+    Q_D(QQuickAnchorSet);
+    d->usedAnchors &= ~QQuickAnchors::LeftAnchor;
     d->leftScript = QDeclarativeScriptString();
-    d->resetAnchors |= QSGAnchors::LeftAnchor;
+    d->resetAnchors |= QQuickAnchors::LeftAnchor;
 }
 
-QDeclarativeScriptString QSGAnchorSet::right() const
+QDeclarativeScriptString QQuickAnchorSet::right() const
 {
-    Q_D(const QSGAnchorSet);
+    Q_D(const QQuickAnchorSet);
     return d->rightScript;
 }
 
-void QSGAnchorSet::setRight(const QDeclarativeScriptString &edge)
+void QQuickAnchorSet::setRight(const QDeclarativeScriptString &edge)
 {
-    Q_D(QSGAnchorSet);
-    d->usedAnchors |= QSGAnchors::RightAnchor;
+    Q_D(QQuickAnchorSet);
+    d->usedAnchors |= QQuickAnchors::RightAnchor;
     d->rightScript = edge;
     if (edge.script() == QLatin1String("undefined"))
         resetRight();
 }
 
-void QSGAnchorSet::resetRight()
+void QQuickAnchorSet::resetRight()
 {
-    Q_D(QSGAnchorSet);
-    d->usedAnchors &= ~QSGAnchors::RightAnchor;
+    Q_D(QQuickAnchorSet);
+    d->usedAnchors &= ~QQuickAnchors::RightAnchor;
     d->rightScript = QDeclarativeScriptString();
-    d->resetAnchors |= QSGAnchors::RightAnchor;
+    d->resetAnchors |= QQuickAnchors::RightAnchor;
 }
 
-QDeclarativeScriptString QSGAnchorSet::horizontalCenter() const
+QDeclarativeScriptString QQuickAnchorSet::horizontalCenter() const
 {
-    Q_D(const QSGAnchorSet);
+    Q_D(const QQuickAnchorSet);
     return d->hCenterScript;
 }
 
-void QSGAnchorSet::setHorizontalCenter(const QDeclarativeScriptString &edge)
+void QQuickAnchorSet::setHorizontalCenter(const QDeclarativeScriptString &edge)
 {
-    Q_D(QSGAnchorSet);
-    d->usedAnchors |= QSGAnchors::HCenterAnchor;
+    Q_D(QQuickAnchorSet);
+    d->usedAnchors |= QQuickAnchors::HCenterAnchor;
     d->hCenterScript = edge;
     if (edge.script() == QLatin1String("undefined"))
         resetHorizontalCenter();
 }
 
-void QSGAnchorSet::resetHorizontalCenter()
+void QQuickAnchorSet::resetHorizontalCenter()
 {
-    Q_D(QSGAnchorSet);
-    d->usedAnchors &= ~QSGAnchors::HCenterAnchor;
+    Q_D(QQuickAnchorSet);
+    d->usedAnchors &= ~QQuickAnchors::HCenterAnchor;
     d->hCenterScript = QDeclarativeScriptString();
-    d->resetAnchors |= QSGAnchors::HCenterAnchor;
+    d->resetAnchors |= QQuickAnchors::HCenterAnchor;
 }
 
-QSGItem *QSGAnchorSet::fill() const
+QQuickItem *QQuickAnchorSet::fill() const
 {
-    Q_D(const QSGAnchorSet);
+    Q_D(const QQuickAnchorSet);
     return d->fill;
 }
 
-void QSGAnchorSet::setFill(QSGItem *f)
+void QQuickAnchorSet::setFill(QQuickItem *f)
 {
-    Q_D(QSGAnchorSet);
+    Q_D(QQuickAnchorSet);
     d->fill = f;
 }
 
-void QSGAnchorSet::resetFill()
+void QQuickAnchorSet::resetFill()
 {
     setFill(0);
 }
 
-QSGItem *QSGAnchorSet::centerIn() const
+QQuickItem *QQuickAnchorSet::centerIn() const
 {
-    Q_D(const QSGAnchorSet);
+    Q_D(const QQuickAnchorSet);
     return d->centerIn;
 }
 
-void QSGAnchorSet::setCenterIn(QSGItem* c)
+void QQuickAnchorSet::setCenterIn(QQuickItem* c)
 {
-    Q_D(QSGAnchorSet);
+    Q_D(QQuickAnchorSet);
     d->centerIn = c;
 }
 
-void QSGAnchorSet::resetCenterIn()
+void QQuickAnchorSet::resetCenterIn()
 {
     setCenterIn(0);
 }
 
 
-class QSGAnchorChangesPrivate : public QDeclarativeStateOperationPrivate
+class QQuickAnchorChangesPrivate : public QDeclarativeStateOperationPrivate
 {
 public:
-    QSGAnchorChangesPrivate()
-        : target(0), anchorSet(new QSGAnchorSet),
+    QQuickAnchorChangesPrivate()
+        : target(0), anchorSet(new QQuickAnchorSet),
           leftBinding(0), rightBinding(0), hCenterBinding(0),
           topBinding(0), bottomBinding(0), vCenterBinding(0), baselineBinding(0),
           origLeftBinding(0), origRightBinding(0), origHCenterBinding(0),
@@ -757,10 +757,10 @@ public:
     {
 
     }
-    ~QSGAnchorChangesPrivate() { delete anchorSet; }
+    ~QQuickAnchorChangesPrivate() { delete anchorSet; }
 
-    QSGItem *target;
-    QSGAnchorSet *anchorSet;
+    QQuickItem *target;
+    QQuickAnchorSet *anchorSet;
 
     QDeclarativeBinding *leftBinding;
     QDeclarativeBinding *rightBinding;
@@ -778,13 +778,13 @@ public:
     QDeclarativeAbstractBinding *origVCenterBinding;
     QDeclarativeAbstractBinding *origBaselineBinding;
 
-    QSGAnchorLine rewindLeft;
-    QSGAnchorLine rewindRight;
-    QSGAnchorLine rewindHCenter;
-    QSGAnchorLine rewindTop;
-    QSGAnchorLine rewindBottom;
-    QSGAnchorLine rewindVCenter;
-    QSGAnchorLine rewindBaseline;
+    QQuickAnchorLine rewindLeft;
+    QQuickAnchorLine rewindRight;
+    QQuickAnchorLine rewindHCenter;
+    QQuickAnchorLine rewindTop;
+    QQuickAnchorLine rewindBottom;
+    QQuickAnchorLine rewindVCenter;
+    QQuickAnchorLine rewindBaseline;
 
     qreal fromX;
     qreal fromY;
@@ -825,18 +825,18 @@ public:
     QDeclarativeProperty baselineProp;
 };
 
-QSGAnchorChanges::QSGAnchorChanges(QObject *parent)
- : QDeclarativeStateOperation(*(new QSGAnchorChangesPrivate), parent)
+QQuickAnchorChanges::QQuickAnchorChanges(QObject *parent)
+ : QDeclarativeStateOperation(*(new QQuickAnchorChangesPrivate), parent)
 {
 }
 
-QSGAnchorChanges::~QSGAnchorChanges()
+QQuickAnchorChanges::~QQuickAnchorChanges()
 {
 }
 
-QSGAnchorChanges::ActionList QSGAnchorChanges::actions()
+QQuickAnchorChanges::ActionList QQuickAnchorChanges::actions()
 {
-    Q_D(QSGAnchorChanges);
+    Q_D(QQuickAnchorChanges);
     d->leftBinding = d->rightBinding = d->hCenterBinding = d->topBinding
                    = d->bottomBinding = d->vCenterBinding = d->baselineBinding = 0;
 
@@ -848,31 +848,31 @@ QSGAnchorChanges::ActionList QSGAnchorChanges::actions()
     d->vCenterProp = QDeclarativeProperty(d->target, QLatin1String("anchors.verticalCenter"));
     d->baselineProp = QDeclarativeProperty(d->target, QLatin1String("anchors.baseline"));
 
-    if (d->anchorSet->d_func()->usedAnchors & QSGAnchors::LeftAnchor) {
+    if (d->anchorSet->d_func()->usedAnchors & QQuickAnchors::LeftAnchor) {
         d->leftBinding = new QDeclarativeBinding(d->anchorSet->d_func()->leftScript.script(), d->target, qmlContext(this));
         d->leftBinding->setTarget(d->leftProp);
     }
-    if (d->anchorSet->d_func()->usedAnchors & QSGAnchors::RightAnchor) {
+    if (d->anchorSet->d_func()->usedAnchors & QQuickAnchors::RightAnchor) {
         d->rightBinding = new QDeclarativeBinding(d->anchorSet->d_func()->rightScript.script(), d->target, qmlContext(this));
         d->rightBinding->setTarget(d->rightProp);
     }
-    if (d->anchorSet->d_func()->usedAnchors & QSGAnchors::HCenterAnchor) {
+    if (d->anchorSet->d_func()->usedAnchors & QQuickAnchors::HCenterAnchor) {
         d->hCenterBinding = new QDeclarativeBinding(d->anchorSet->d_func()->hCenterScript.script(), d->target, qmlContext(this));
         d->hCenterBinding->setTarget(d->hCenterProp);
     }
-    if (d->anchorSet->d_func()->usedAnchors & QSGAnchors::TopAnchor) {
+    if (d->anchorSet->d_func()->usedAnchors & QQuickAnchors::TopAnchor) {
         d->topBinding = new QDeclarativeBinding(d->anchorSet->d_func()->topScript.script(), d->target, qmlContext(this));
         d->topBinding->setTarget(d->topProp);
     }
-    if (d->anchorSet->d_func()->usedAnchors & QSGAnchors::BottomAnchor) {
+    if (d->anchorSet->d_func()->usedAnchors & QQuickAnchors::BottomAnchor) {
         d->bottomBinding = new QDeclarativeBinding(d->anchorSet->d_func()->bottomScript.script(), d->target, qmlContext(this));
         d->bottomBinding->setTarget(d->bottomProp);
     }
-    if (d->anchorSet->d_func()->usedAnchors & QSGAnchors::VCenterAnchor) {
+    if (d->anchorSet->d_func()->usedAnchors & QQuickAnchors::VCenterAnchor) {
         d->vCenterBinding = new QDeclarativeBinding(d->anchorSet->d_func()->vCenterScript.script(), d->target, qmlContext(this));
         d->vCenterBinding->setTarget(d->vCenterProp);
     }
-    if (d->anchorSet->d_func()->usedAnchors & QSGAnchors::BaselineAnchor) {
+    if (d->anchorSet->d_func()->usedAnchors & QQuickAnchors::BaselineAnchor) {
         d->baselineBinding = new QDeclarativeBinding(d->anchorSet->d_func()->baselineScript.script(), d->target, qmlContext(this));
         d->baselineBinding->setTarget(d->baselineProp);
     }
@@ -882,31 +882,31 @@ QSGAnchorChanges::ActionList QSGAnchorChanges::actions()
     return ActionList() << a;
 }
 
-QSGAnchorSet *QSGAnchorChanges::anchors()
+QQuickAnchorSet *QQuickAnchorChanges::anchors()
 {
-    Q_D(QSGAnchorChanges);
+    Q_D(QQuickAnchorChanges);
     return d->anchorSet;
 }
 
-QSGItem *QSGAnchorChanges::object() const
+QQuickItem *QQuickAnchorChanges::object() const
 {
-    Q_D(const QSGAnchorChanges);
+    Q_D(const QQuickAnchorChanges);
     return d->target;
 }
 
-void QSGAnchorChanges::setObject(QSGItem *target)
+void QQuickAnchorChanges::setObject(QQuickItem *target)
 {
-    Q_D(QSGAnchorChanges);
+    Q_D(QQuickAnchorChanges);
     d->target = target;
 }
 
-void QSGAnchorChanges::execute(Reason reason)
+void QQuickAnchorChanges::execute(Reason reason)
 {
-    Q_D(QSGAnchorChanges);
+    Q_D(QQuickAnchorChanges);
     if (!d->target)
         return;
 
-    QSGItemPrivate *targetPrivate = QSGItemPrivate::get(d->target);
+    QQuickItemPrivate *targetPrivate = QQuickItemPrivate::get(d->target);
     //incorporate any needed "reverts"
     if (d->applyOrigLeft) {
         if (!d->origLeftBinding)
@@ -955,31 +955,31 @@ void QSGAnchorChanges::execute(Reason reason)
     }
 
     //reset any anchors that have been specified as "undefined"
-    if (d->anchorSet->d_func()->resetAnchors & QSGAnchors::LeftAnchor) {
+    if (d->anchorSet->d_func()->resetAnchors & QQuickAnchors::LeftAnchor) {
         targetPrivate->anchors()->resetLeft();
         QDeclarativePropertyPrivate::setBinding(d->leftProp, 0);
     }
-    if (d->anchorSet->d_func()->resetAnchors & QSGAnchors::RightAnchor) {
+    if (d->anchorSet->d_func()->resetAnchors & QQuickAnchors::RightAnchor) {
         targetPrivate->anchors()->resetRight();
         QDeclarativePropertyPrivate::setBinding(d->rightProp, 0);
     }
-    if (d->anchorSet->d_func()->resetAnchors & QSGAnchors::HCenterAnchor) {
+    if (d->anchorSet->d_func()->resetAnchors & QQuickAnchors::HCenterAnchor) {
         targetPrivate->anchors()->resetHorizontalCenter();
         QDeclarativePropertyPrivate::setBinding(d->hCenterProp, 0);
     }
-    if (d->anchorSet->d_func()->resetAnchors & QSGAnchors::TopAnchor) {
+    if (d->anchorSet->d_func()->resetAnchors & QQuickAnchors::TopAnchor) {
         targetPrivate->anchors()->resetTop();
         QDeclarativePropertyPrivate::setBinding(d->topProp, 0);
     }
-    if (d->anchorSet->d_func()->resetAnchors & QSGAnchors::BottomAnchor) {
+    if (d->anchorSet->d_func()->resetAnchors & QQuickAnchors::BottomAnchor) {
         targetPrivate->anchors()->resetBottom();
         QDeclarativePropertyPrivate::setBinding(d->bottomProp, 0);
     }
-    if (d->anchorSet->d_func()->resetAnchors & QSGAnchors::VCenterAnchor) {
+    if (d->anchorSet->d_func()->resetAnchors & QQuickAnchors::VCenterAnchor) {
         targetPrivate->anchors()->resetVerticalCenter();
         QDeclarativePropertyPrivate::setBinding(d->vCenterProp, 0);
     }
-    if (d->anchorSet->d_func()->resetAnchors & QSGAnchors::BaselineAnchor) {
+    if (d->anchorSet->d_func()->resetAnchors & QQuickAnchors::BaselineAnchor) {
         targetPrivate->anchors()->resetBaseline();
         QDeclarativePropertyPrivate::setBinding(d->baselineProp, 0);
     }
@@ -1001,18 +1001,18 @@ void QSGAnchorChanges::execute(Reason reason)
         QDeclarativePropertyPrivate::setBinding(d->baselineBinding->property(), d->baselineBinding);
 }
 
-bool QSGAnchorChanges::isReversable()
+bool QQuickAnchorChanges::isReversable()
 {
     return true;
 }
 
-void QSGAnchorChanges::reverse(Reason reason)
+void QQuickAnchorChanges::reverse(Reason reason)
 {
-    Q_D(QSGAnchorChanges);
+    Q_D(QQuickAnchorChanges);
     if (!d->target)
         return;
 
-    QSGItemPrivate *targetPrivate = QSGItemPrivate::get(d->target);
+    QQuickItemPrivate *targetPrivate = QQuickItemPrivate::get(d->target);
     //reset any anchors set by the state
     if (d->leftBinding) {
         targetPrivate->anchors()->resetLeft();
@@ -1081,32 +1081,32 @@ void QSGAnchorChanges::reverse(Reason reason)
         QDeclarativePropertyPrivate::setBinding(d->baselineProp, d->origBaselineBinding);
 
     //restore any absolute geometry changed by the state's anchors
-    QSGAnchors::Anchors stateVAnchors = d->anchorSet->d_func()->usedAnchors & QSGAnchors::Vertical_Mask;
-    QSGAnchors::Anchors origVAnchors = targetPrivate->anchors()->usedAnchors() & QSGAnchors::Vertical_Mask;
-    QSGAnchors::Anchors stateHAnchors = d->anchorSet->d_func()->usedAnchors & QSGAnchors::Horizontal_Mask;
-    QSGAnchors::Anchors origHAnchors = targetPrivate->anchors()->usedAnchors() & QSGAnchors::Horizontal_Mask;
+    QQuickAnchors::Anchors stateVAnchors = d->anchorSet->d_func()->usedAnchors & QQuickAnchors::Vertical_Mask;
+    QQuickAnchors::Anchors origVAnchors = targetPrivate->anchors()->usedAnchors() & QQuickAnchors::Vertical_Mask;
+    QQuickAnchors::Anchors stateHAnchors = d->anchorSet->d_func()->usedAnchors & QQuickAnchors::Horizontal_Mask;
+    QQuickAnchors::Anchors origHAnchors = targetPrivate->anchors()->usedAnchors() & QQuickAnchors::Horizontal_Mask;
 
     bool stateSetWidth = (stateHAnchors &&
-                          stateHAnchors != QSGAnchors::LeftAnchor &&
-                          stateHAnchors != QSGAnchors::RightAnchor &&
-                          stateHAnchors != QSGAnchors::HCenterAnchor);
+                          stateHAnchors != QQuickAnchors::LeftAnchor &&
+                          stateHAnchors != QQuickAnchors::RightAnchor &&
+                          stateHAnchors != QQuickAnchors::HCenterAnchor);
     bool origSetWidth = (origHAnchors &&
-                         origHAnchors != QSGAnchors::LeftAnchor &&
-                         origHAnchors != QSGAnchors::RightAnchor &&
-                         origHAnchors != QSGAnchors::HCenterAnchor);
+                         origHAnchors != QQuickAnchors::LeftAnchor &&
+                         origHAnchors != QQuickAnchors::RightAnchor &&
+                         origHAnchors != QQuickAnchors::HCenterAnchor);
     if (d->origWidth.isValid() && stateSetWidth && !origSetWidth)
         d->target->setWidth(d->origWidth.value);
 
     bool stateSetHeight = (stateVAnchors &&
-                           stateVAnchors != QSGAnchors::TopAnchor &&
-                           stateVAnchors != QSGAnchors::BottomAnchor &&
-                           stateVAnchors != QSGAnchors::VCenterAnchor &&
-                           stateVAnchors != QSGAnchors::BaselineAnchor);
+                           stateVAnchors != QQuickAnchors::TopAnchor &&
+                           stateVAnchors != QQuickAnchors::BottomAnchor &&
+                           stateVAnchors != QQuickAnchors::VCenterAnchor &&
+                           stateVAnchors != QQuickAnchors::BaselineAnchor);
     bool origSetHeight = (origVAnchors &&
-                          origVAnchors != QSGAnchors::TopAnchor &&
-                          origVAnchors != QSGAnchors::BottomAnchor &&
-                          origVAnchors != QSGAnchors::VCenterAnchor &&
-                          origVAnchors != QSGAnchors::BaselineAnchor);
+                          origVAnchors != QQuickAnchors::TopAnchor &&
+                          origVAnchors != QQuickAnchors::BottomAnchor &&
+                          origVAnchors != QQuickAnchors::VCenterAnchor &&
+                          origVAnchors != QQuickAnchors::BaselineAnchor);
     if (d->origHeight.isValid() && stateSetHeight && !origSetHeight)
         d->target->setHeight(d->origHeight.value);
 
@@ -1117,19 +1117,19 @@ void QSGAnchorChanges::reverse(Reason reason)
         d->target->setY(d->origY);
 }
 
-QString QSGAnchorChanges::typeName() const
+QString QQuickAnchorChanges::typeName() const
 {
     return QLatin1String("AnchorChanges");
 }
 
-QList<QDeclarativeAction> QSGAnchorChanges::additionalActions()
+QList<QDeclarativeAction> QQuickAnchorChanges::additionalActions()
 {
-    Q_D(QSGAnchorChanges);
+    Q_D(QQuickAnchorChanges);
     QList<QDeclarativeAction> extra;
 
-    QSGAnchors::Anchors combined = d->anchorSet->d_func()->usedAnchors | d->anchorSet->d_func()->resetAnchors;
-    bool hChange = combined & QSGAnchors::Horizontal_Mask;
-    bool vChange = combined & QSGAnchors::Vertical_Mask;
+    QQuickAnchors::Anchors combined = d->anchorSet->d_func()->usedAnchors | d->anchorSet->d_func()->resetAnchors;
+    bool hChange = combined & QQuickAnchors::Horizontal_Mask;
+    bool vChange = combined & QQuickAnchors::Vertical_Mask;
 
     if (d->target) {
         QDeclarativeAction a;
@@ -1158,14 +1158,14 @@ QList<QDeclarativeAction> QSGAnchorChanges::additionalActions()
     return extra;
 }
 
-bool QSGAnchorChanges::changesBindings()
+bool QQuickAnchorChanges::changesBindings()
 {
     return true;
 }
 
-void QSGAnchorChanges::saveOriginals()
+void QQuickAnchorChanges::saveOriginals()
 {
-    Q_D(QSGAnchorChanges);
+    Q_D(QQuickAnchorChanges);
     if (!d->target)
         return;
 
@@ -1177,7 +1177,7 @@ void QSGAnchorChanges::saveOriginals()
     d->origVCenterBinding = QDeclarativePropertyPrivate::binding(d->vCenterProp);
     d->origBaselineBinding = QDeclarativePropertyPrivate::binding(d->baselineProp);
 
-    QSGItemPrivate *targetPrivate = QSGItemPrivate::get(d->target);
+    QQuickItemPrivate *targetPrivate = QQuickItemPrivate::get(d->target);
     if (targetPrivate->widthValid)
         d->origWidth = d->target->width();
     if (targetPrivate->heightValid)
@@ -1191,23 +1191,23 @@ void QSGAnchorChanges::saveOriginals()
     saveCurrentValues();
 }
 
-void QSGAnchorChanges::copyOriginals(QDeclarativeActionEvent *other)
+void QQuickAnchorChanges::copyOriginals(QDeclarativeActionEvent *other)
 {
-    Q_D(QSGAnchorChanges);
-    QSGAnchorChanges *ac = static_cast<QSGAnchorChanges*>(other);
-    QSGAnchorChangesPrivate *acp = ac->d_func();
+    Q_D(QQuickAnchorChanges);
+    QQuickAnchorChanges *ac = static_cast<QQuickAnchorChanges*>(other);
+    QQuickAnchorChangesPrivate *acp = ac->d_func();
 
-    QSGAnchors::Anchors combined = acp->anchorSet->d_func()->usedAnchors |
+    QQuickAnchors::Anchors combined = acp->anchorSet->d_func()->usedAnchors |
                                             acp->anchorSet->d_func()->resetAnchors;
 
     //probably also need to revert some things
-    d->applyOrigLeft = (combined & QSGAnchors::LeftAnchor);
-    d->applyOrigRight = (combined & QSGAnchors::RightAnchor);
-    d->applyOrigHCenter = (combined & QSGAnchors::HCenterAnchor);
-    d->applyOrigTop = (combined & QSGAnchors::TopAnchor);
-    d->applyOrigBottom = (combined & QSGAnchors::BottomAnchor);
-    d->applyOrigVCenter = (combined & QSGAnchors::VCenterAnchor);
-    d->applyOrigBaseline = (combined & QSGAnchors::BaselineAnchor);
+    d->applyOrigLeft = (combined & QQuickAnchors::LeftAnchor);
+    d->applyOrigRight = (combined & QQuickAnchors::RightAnchor);
+    d->applyOrigHCenter = (combined & QQuickAnchors::HCenterAnchor);
+    d->applyOrigTop = (combined & QQuickAnchors::TopAnchor);
+    d->applyOrigBottom = (combined & QQuickAnchors::BottomAnchor);
+    d->applyOrigVCenter = (combined & QQuickAnchors::VCenterAnchor);
+    d->applyOrigBaseline = (combined & QQuickAnchors::BaselineAnchor);
 
     d->origLeftBinding = acp->origLeftBinding;
     d->origRightBinding = acp->origRightBinding;
@@ -1229,9 +1229,9 @@ void QSGAnchorChanges::copyOriginals(QDeclarativeActionEvent *other)
     saveCurrentValues();
 }
 
-void QSGAnchorChanges::clearBindings()
+void QQuickAnchorChanges::clearBindings()
 {
-    Q_D(QSGAnchorChanges);
+    Q_D(QQuickAnchorChanges);
     if (!d->target)
         return;
 
@@ -1241,60 +1241,60 @@ void QSGAnchorChanges::clearBindings()
     d->fromWidth = d->target->width();
     d->fromHeight = d->target->height();
 
-    QSGItemPrivate *targetPrivate = QSGItemPrivate::get(d->target);
+    QQuickItemPrivate *targetPrivate = QQuickItemPrivate::get(d->target);
     //reset any anchors with corresponding reverts
     //reset any anchors that have been specified as "undefined"
     //reset any anchors that we'll be setting in the state
-    QSGAnchors::Anchors combined = d->anchorSet->d_func()->resetAnchors |
+    QQuickAnchors::Anchors combined = d->anchorSet->d_func()->resetAnchors |
                                             d->anchorSet->d_func()->usedAnchors;
-    if (d->applyOrigLeft || (combined & QSGAnchors::LeftAnchor)) {
+    if (d->applyOrigLeft || (combined & QQuickAnchors::LeftAnchor)) {
         targetPrivate->anchors()->resetLeft();
         QDeclarativePropertyPrivate::setBinding(d->leftProp, 0);
     }
-    if (d->applyOrigRight || (combined & QSGAnchors::RightAnchor)) {
+    if (d->applyOrigRight || (combined & QQuickAnchors::RightAnchor)) {
         targetPrivate->anchors()->resetRight();
         QDeclarativePropertyPrivate::setBinding(d->rightProp, 0);
     }
-    if (d->applyOrigHCenter || (combined & QSGAnchors::HCenterAnchor)) {
+    if (d->applyOrigHCenter || (combined & QQuickAnchors::HCenterAnchor)) {
         targetPrivate->anchors()->resetHorizontalCenter();
         QDeclarativePropertyPrivate::setBinding(d->hCenterProp, 0);
     }
-    if (d->applyOrigTop || (combined & QSGAnchors::TopAnchor)) {
+    if (d->applyOrigTop || (combined & QQuickAnchors::TopAnchor)) {
         targetPrivate->anchors()->resetTop();
         QDeclarativePropertyPrivate::setBinding(d->topProp, 0);
     }
-    if (d->applyOrigBottom || (combined & QSGAnchors::BottomAnchor)) {
+    if (d->applyOrigBottom || (combined & QQuickAnchors::BottomAnchor)) {
         targetPrivate->anchors()->resetBottom();
         QDeclarativePropertyPrivate::setBinding(d->bottomProp, 0);
     }
-    if (d->applyOrigVCenter || (combined & QSGAnchors::VCenterAnchor)) {
+    if (d->applyOrigVCenter || (combined & QQuickAnchors::VCenterAnchor)) {
         targetPrivate->anchors()->resetVerticalCenter();
         QDeclarativePropertyPrivate::setBinding(d->vCenterProp, 0);
     }
-    if (d->applyOrigBaseline || (combined & QSGAnchors::BaselineAnchor)) {
+    if (d->applyOrigBaseline || (combined & QQuickAnchors::BaselineAnchor)) {
         targetPrivate->anchors()->resetBaseline();
         QDeclarativePropertyPrivate::setBinding(d->baselineProp, 0);
     }
 }
 
-bool QSGAnchorChanges::override(QDeclarativeActionEvent*other)
+bool QQuickAnchorChanges::override(QDeclarativeActionEvent*other)
 {
     if (other->typeName() != QLatin1String("AnchorChanges"))
         return false;
     if (static_cast<QDeclarativeActionEvent*>(this) == other)
         return true;
-    if (static_cast<QSGAnchorChanges*>(other)->object() == object())
+    if (static_cast<QQuickAnchorChanges*>(other)->object() == object())
         return true;
     return false;
 }
 
-void QSGAnchorChanges::rewind()
+void QQuickAnchorChanges::rewind()
 {
-    Q_D(QSGAnchorChanges);
+    Q_D(QQuickAnchorChanges);
     if (!d->target)
         return;
 
-    QSGItemPrivate *targetPrivate = QSGItemPrivate::get(d->target);
+    QQuickItemPrivate *targetPrivate = QQuickItemPrivate::get(d->target);
 
     //restore previous values (but not previous bindings, i.e. anchors)
     d->target->setX(d->rewindX);
@@ -1307,13 +1307,13 @@ void QSGAnchorChanges::rewind()
     }
 }
 
-void QSGAnchorChanges::saveCurrentValues()
+void QQuickAnchorChanges::saveCurrentValues()
 {
-    Q_D(QSGAnchorChanges);
+    Q_D(QQuickAnchorChanges);
     if (!d->target)
         return;
 
-    QSGItemPrivate *targetPrivate = QSGItemPrivate::get(d->target);
+    QQuickItemPrivate *targetPrivate = QQuickItemPrivate::get(d->target);
     d->rewindLeft = targetPrivate->anchors()->left();
     d->rewindRight = targetPrivate->anchors()->right();
     d->rewindHCenter = targetPrivate->anchors()->horizontalCenter();
@@ -1328,9 +1328,9 @@ void QSGAnchorChanges::saveCurrentValues()
     d->rewindHeight = d->target->height();
 }
 
-void QSGAnchorChanges::saveTargetValues()
+void QQuickAnchorChanges::saveTargetValues()
 {
-    Q_D(QSGAnchorChanges);
+    Q_D(QQuickAnchorChanges);
     if (!d->target)
         return;
 
@@ -1340,7 +1340,7 @@ void QSGAnchorChanges::saveTargetValues()
     d->toHeight = d->target->height();
 }
 
-#include <moc_qsgstateoperations_p.cpp>
+#include <moc_qquickstateoperations_p.cpp>
 
 QT_END_NAMESPACE
 
diff --git a/src/declarative/items/qsgstateoperations_p.h b/src/declarative/items/qquickstateoperations_p.h
index 0a4a8f5e03..7844c6d7dd 100644
--- a/src/declarative/items/qsgstateoperations_p.h
+++ b/src/declarative/items/qquickstateoperations_p.h
@@ -40,11 +40,11 @@
 **
 ****************************************************************************/
 
-#ifndef QSGSTATEOPERATIONS_H
-#define QSGSTATEOPERATIONS_H
+#ifndef QQUICKSTATEOPERATIONS_P_H
+#define QQUICKSTATEOPERATIONS_P_H
 
-#include "qsgitem.h"
-#include "qsganchors_p.h"
+#include "qquickitem.h"
+#include "qquickanchors_p.h"
 
 #include <private/qdeclarativestate_p.h>
 
@@ -56,14 +56,14 @@ QT_BEGIN_NAMESPACE
 
 QT_MODULE(Declarative)
 
-class QSGParentChangePrivate;
-class Q_AUTOTEST_EXPORT QSGParentChange : public QDeclarativeStateOperation, public QDeclarativeActionEvent
+class QQuickParentChangePrivate;
+class Q_AUTOTEST_EXPORT QQuickParentChange : public QDeclarativeStateOperation, public QDeclarativeActionEvent
 {
     Q_OBJECT
-    Q_DECLARE_PRIVATE(QSGParentChange)
+    Q_DECLARE_PRIVATE(QQuickParentChange)
 
-    Q_PROPERTY(QSGItem *target READ object WRITE setObject)
-    Q_PROPERTY(QSGItem *parent READ parent WRITE setParent)
+    Q_PROPERTY(QQuickItem *target READ object WRITE setObject)
+    Q_PROPERTY(QQuickItem *parent READ parent WRITE setParent)
     Q_PROPERTY(QDeclarativeScriptString x READ x WRITE setX)
     Q_PROPERTY(QDeclarativeScriptString y READ y WRITE setY)
     Q_PROPERTY(QDeclarativeScriptString width READ width WRITE setWidth)
@@ -71,16 +71,16 @@ class Q_AUTOTEST_EXPORT QSGParentChange : public QDeclarativeStateOperation, pub
     Q_PROPERTY(QDeclarativeScriptString scale READ scale WRITE setScale)
     Q_PROPERTY(QDeclarativeScriptString rotation READ rotation WRITE setRotation)
 public:
-    QSGParentChange(QObject *parent=0);
-    ~QSGParentChange();
+    QQuickParentChange(QObject *parent=0);
+    ~QQuickParentChange();
 
-    QSGItem *object() const;
-    void setObject(QSGItem *);
+    QQuickItem *object() const;
+    void setObject(QQuickItem *);
 
-    QSGItem *parent() const;
-    void setParent(QSGItem *);
+    QQuickItem *parent() const;
+    void setParent(QQuickItem *);
 
-    QSGItem *originalParent() const;
+    QQuickItem *originalParent() const;
 
     QDeclarativeScriptString x() const;
     void setX(QDeclarativeScriptString x);
@@ -119,9 +119,9 @@ public:
     virtual void saveCurrentValues();
 };
 
-class QSGAnchorChanges;
-class QSGAnchorSetPrivate;
-class Q_AUTOTEST_EXPORT QSGAnchorSet : public QObject
+class QQuickAnchorChanges;
+class QQuickAnchorSetPrivate;
+class Q_AUTOTEST_EXPORT QQuickAnchorSet : public QObject
 {
     Q_OBJECT
 
@@ -132,8 +132,8 @@ class Q_AUTOTEST_EXPORT QSGAnchorSet : public QObject
     Q_PROPERTY(QDeclarativeScriptString bottom READ bottom WRITE setBottom RESET resetBottom)
     Q_PROPERTY(QDeclarativeScriptString verticalCenter READ verticalCenter WRITE setVerticalCenter RESET resetVerticalCenter)
     Q_PROPERTY(QDeclarativeScriptString baseline READ baseline WRITE setBaseline RESET resetBaseline)
-    //Q_PROPERTY(QSGItem *fill READ fill WRITE setFill RESET resetFill)
-    //Q_PROPERTY(QSGItem *centerIn READ centerIn WRITE setCenterIn RESET resetCenterIn)
+    //Q_PROPERTY(QQuickItem *fill READ fill WRITE setFill RESET resetFill)
+    //Q_PROPERTY(QQuickItem *centerIn READ centerIn WRITE setCenterIn RESET resetCenterIn)
 
     /*Q_PROPERTY(qreal margins READ margins WRITE setMargins NOTIFY marginsChanged)
     Q_PROPERTY(qreal leftMargin READ leftMargin WRITE setLeftMargin NOTIFY leftMarginChanged)
@@ -145,8 +145,8 @@ class Q_AUTOTEST_EXPORT QSGAnchorSet : public QObject
     Q_PROPERTY(qreal baselineOffset READ baselineOffset WRITE setBaselineOffset NOTIFY baselineOffsetChanged())*/
 
 public:
-    QSGAnchorSet(QObject *parent=0);
-    virtual ~QSGAnchorSet();
+    QQuickAnchorSet(QObject *parent=0);
+    virtual ~QQuickAnchorSet();
 
     QDeclarativeScriptString left() const;
     void setLeft(const QDeclarativeScriptString &edge);
@@ -176,12 +176,12 @@ public:
     void setBaseline(const QDeclarativeScriptString &edge);
     void resetBaseline();
 
-    QSGItem *fill() const;
-    void setFill(QSGItem *);
+    QQuickItem *fill() const;
+    void setFill(QQuickItem *);
     void resetFill();
 
-    QSGItem *centerIn() const;
-    void setCenterIn(QSGItem *);
+    QQuickItem *centerIn() const;
+    void setCenterIn(QQuickItem *);
     void resetCenterIn();
 
     /*qreal leftMargin() const;
@@ -208,7 +208,7 @@ public:
     qreal baselineOffset() const;
     void setBaselineOffset(qreal);*/
 
-    QSGAnchors::Anchors usedAnchors() const;
+    QQuickAnchors::Anchors usedAnchors() const;
 
 /*Q_SIGNALS:
     void leftMarginChanged();
@@ -221,30 +221,30 @@ public:
     void baselineOffsetChanged();*/
 
 private:
-    friend class QSGAnchorChanges;
-    Q_DISABLE_COPY(QSGAnchorSet)
-    Q_DECLARE_PRIVATE(QSGAnchorSet)
+    friend class QQuickAnchorChanges;
+    Q_DISABLE_COPY(QQuickAnchorSet)
+    Q_DECLARE_PRIVATE(QQuickAnchorSet)
 };
 
-class QSGAnchorChangesPrivate;
-class Q_AUTOTEST_EXPORT QSGAnchorChanges : public QDeclarativeStateOperation, public QDeclarativeActionEvent
+class QQuickAnchorChangesPrivate;
+class Q_AUTOTEST_EXPORT QQuickAnchorChanges : public QDeclarativeStateOperation, public QDeclarativeActionEvent
 {
     Q_OBJECT
-    Q_DECLARE_PRIVATE(QSGAnchorChanges)
+    Q_DECLARE_PRIVATE(QQuickAnchorChanges)
 
-    Q_PROPERTY(QSGItem *target READ object WRITE setObject)
-    Q_PROPERTY(QSGAnchorSet *anchors READ anchors CONSTANT)
+    Q_PROPERTY(QQuickItem *target READ object WRITE setObject)
+    Q_PROPERTY(QQuickAnchorSet *anchors READ anchors CONSTANT)
 
 public:
-    QSGAnchorChanges(QObject *parent=0);
-    ~QSGAnchorChanges();
+    QQuickAnchorChanges(QObject *parent=0);
+    ~QQuickAnchorChanges();
 
     virtual ActionList actions();
 
-    QSGAnchorSet *anchors();
+    QQuickAnchorSet *anchors();
 
-    QSGItem *object() const;
-    void setObject(QSGItem *);
+    QQuickItem *object() const;
+    void setObject(QQuickItem *);
 
     virtual void execute(Reason reason = ActualChange);
     virtual bool isReversable();
@@ -265,11 +265,11 @@ public:
 
 QT_END_NAMESPACE
 
-QML_DECLARE_TYPE(QSGParentChange)
-QML_DECLARE_TYPE(QSGAnchorSet)
-QML_DECLARE_TYPE(QSGAnchorChanges)
+QML_DECLARE_TYPE(QQuickParentChange)
+QML_DECLARE_TYPE(QQuickAnchorSet)
+QML_DECLARE_TYPE(QQuickAnchorChanges)
 
 QT_END_HEADER
 
-#endif // QSGSTATEOPERATIONS_H
+#endif // QQUICKSTATEOPERATIONS_P_H
 
diff --git a/src/declarative/items/qsgtext.cpp b/src/declarative/items/qquicktext.cpp
index 6c55e82802..bf736e6a10 100644
--- a/src/declarative/items/qsgtext.cpp
+++ b/src/declarative/items/qquicktext.cpp
@@ -39,14 +39,14 @@
 **
 ****************************************************************************/
 
-#include "qsgtext_p.h"
-#include "qsgtext_p_p.h"
+#include "qquicktext_p.h"
+#include "qquicktext_p_p.h"
 
 #include <private/qsgdistancefieldglyphcache_p.h>
 #include <private/qsgcontext_p.h>
 #include <private/qsgadaptationlayer_p.h>
-#include "qsgtextnode_p.h"
-#include "qsgimage_p_p.h"
+#include "qquicktextnode_p.h"
+#include "qquickimage_p_p.h"
 #include <private/qsgtexture_p.h>
 
 #include <QtDeclarative/qdeclarativeinfo.h>
@@ -68,12 +68,12 @@ QT_BEGIN_NAMESPACE
 
 extern Q_GUI_EXPORT bool qt_applefontsmoothing_enabled;
 
-class QSGTextDocumentWithImageResources : public QTextDocument {
+class QQuickTextDocumentWithImageResources : public QTextDocument {
     Q_OBJECT
 
 public:
-    QSGTextDocumentWithImageResources(QSGText *parent);
-    virtual ~QSGTextDocumentWithImageResources();
+    QQuickTextDocumentWithImageResources(QQuickText *parent);
+    virtual ~QQuickTextDocumentWithImageResources();
 
     void setText(const QString &);
     int resourcesLoading() const { return outstanding; }
@@ -94,13 +94,13 @@ private:
 DEFINE_BOOL_CONFIG_OPTION(qmlDisableDistanceField, QML_DISABLE_DISTANCEFIELD)
 DEFINE_BOOL_CONFIG_OPTION(enableImageCache, QML_ENABLE_TEXT_IMAGE_CACHE);
 
-QString QSGTextPrivate::elideChar = QString(0x2026);
+QString QQuickTextPrivate::elideChar = QString(0x2026);
 
-QSGTextPrivate::QSGTextPrivate()
-: color((QRgb)0), style(QSGText::Normal), hAlign(QSGText::AlignLeft),
-  vAlign(QSGText::AlignTop), elideMode(QSGText::ElideNone),
-  format(QSGText::AutoText), wrapMode(QSGText::NoWrap), lineHeight(1),
-  lineHeightMode(QSGText::ProportionalHeight), lineCount(1), maximumLineCount(INT_MAX),
+QQuickTextPrivate::QQuickTextPrivate()
+: color((QRgb)0), style(QQuickText::Normal), hAlign(QQuickText::AlignLeft),
+  vAlign(QQuickText::AlignTop), elideMode(QQuickText::ElideNone),
+  format(QQuickText::AutoText), wrapMode(QQuickText::NoWrap), lineHeight(1),
+  lineHeightMode(QQuickText::ProportionalHeight), lineCount(1), maximumLineCount(INT_MAX),
   maximumLineCountValid(false),
   texture(0),
   imageCacheDirty(false), updateOnComponentComplete(true),
@@ -117,26 +117,26 @@ QSGTextPrivate::QSGTextPrivate()
     cacheAllTextAsImage = enableImageCache();
 }
 
-void QSGTextPrivate::init()
+void QQuickTextPrivate::init()
 {
-    Q_Q(QSGText);
+    Q_Q(QQuickText);
     q->setAcceptedMouseButtons(Qt::LeftButton);
-    q->setFlag(QSGItem::ItemHasContents);
+    q->setFlag(QQuickItem::ItemHasContents);
 }
 
-QSGTextDocumentWithImageResources::QSGTextDocumentWithImageResources(QSGText *parent)
+QQuickTextDocumentWithImageResources::QQuickTextDocumentWithImageResources(QQuickText *parent)
 : QTextDocument(parent), outstanding(0)
 {
     setUndoRedoEnabled(false);
 }
 
-QSGTextDocumentWithImageResources::~QSGTextDocumentWithImageResources()
+QQuickTextDocumentWithImageResources::~QQuickTextDocumentWithImageResources()
 {
     if (!m_resources.isEmpty())
         qDeleteAll(m_resources);
 }
 
-QVariant QSGTextDocumentWithImageResources::loadResource(int type, const QUrl &name)
+QVariant QQuickTextDocumentWithImageResources::loadResource(int type, const QUrl &name)
 {
     QDeclarativeContext *context = qmlContext(parent());
     QUrl url = context->resolvedUrl(name);
@@ -168,23 +168,23 @@ QVariant QSGTextDocumentWithImageResources::loadResource(int type, const QUrl &n
     return QTextDocument::loadResource(type,url); // The *resolved* URL
 }
 
-void QSGTextDocumentWithImageResources::requestFinished()
+void QQuickTextDocumentWithImageResources::requestFinished()
 {
     outstanding--;
     if (outstanding == 0) {
-        QSGText *textItem = static_cast<QSGText*>(parent());
+        QQuickText *textItem = static_cast<QQuickText*>(parent());
         QString text = textItem->text();
 #ifndef QT_NO_TEXTHTMLPARSER
         setHtml(text);
 #else
         setPlainText(text);
 #endif
-        QSGTextPrivate *d = QSGTextPrivate::get(textItem);
+        QQuickTextPrivate *d = QQuickTextPrivate::get(textItem);
         d->updateLayout();
     }
 }
 
-void QSGTextDocumentWithImageResources::setText(const QString &text)
+void QQuickTextDocumentWithImageResources::setText(const QString &text)
 {
     if (!m_resources.isEmpty()) {
         qDeleteAll(m_resources);
@@ -199,28 +199,28 @@ void QSGTextDocumentWithImageResources::setText(const QString &text)
 #endif
 }
 
-QSet<QUrl> QSGTextDocumentWithImageResources::errors;
+QSet<QUrl> QQuickTextDocumentWithImageResources::errors;
 
-QSGTextPrivate::~QSGTextPrivate()
+QQuickTextPrivate::~QQuickTextPrivate()
 {
     delete textLine; textLine = 0;
 }
 
-qreal QSGTextPrivate::getImplicitWidth() const
+qreal QQuickTextPrivate::getImplicitWidth() const
 {
     if (!requireImplicitWidth) {
         // We don't calculate implicitWidth unless it is required.
         // We need to force a size update now to ensure implicitWidth is calculated
-        QSGTextPrivate *me = const_cast<QSGTextPrivate*>(this);
+        QQuickTextPrivate *me = const_cast<QQuickTextPrivate*>(this);
         me->requireImplicitWidth = true;
         me->updateSize();
     }
     return implicitWidth;
 }
 
-void QSGTextPrivate::updateLayout()
+void QQuickTextPrivate::updateLayout()
 {
-    Q_Q(QSGText);
+    Q_Q(QQuickText);
     if (!q->isComponentComplete()) {
         updateOnComponentComplete = true;
         return;
@@ -235,7 +235,7 @@ void QSGTextPrivate::updateLayout()
             QString tmp = text;
             tmp.replace(QLatin1Char('\n'), QChar::LineSeparator);
             singleline = !tmp.contains(QChar::LineSeparator);
-            if (singleline && !maximumLineCountValid && elideMode != QSGText::ElideNone && q->widthValid()) {
+            if (singleline && !maximumLineCountValid && elideMode != QQuickText::ElideNone && q->widthValid()) {
                 QFontMetrics fm(font);
                 tmp = fm.elidedText(tmp,(Qt::TextElideMode)elideMode,q->width());
                 if (tmp != text) {
@@ -257,9 +257,9 @@ void QSGTextPrivate::updateLayout()
     } else {
         ensureDoc();
         QTextBlockFormat::LineHeightTypes type;
-        type = lineHeightMode == QSGText::FixedHeight ? QTextBlockFormat::FixedHeight : QTextBlockFormat::ProportionalHeight;
+        type = lineHeightMode == QQuickText::FixedHeight ? QTextBlockFormat::FixedHeight : QTextBlockFormat::ProportionalHeight;
         QTextBlockFormat blockFormat;
-        blockFormat.setLineHeight((lineHeightMode == QSGText::FixedHeight ? lineHeight : lineHeight * 100), type);
+        blockFormat.setLineHeight((lineHeightMode == QQuickText::FixedHeight ? lineHeight : lineHeight * 100), type);
         for (QTextBlock it = doc->begin(); it != doc->end(); it = it.next()) {
             QTextCursor cursor(it);
             cursor.mergeBlockFormat(blockFormat);
@@ -269,9 +269,9 @@ void QSGTextPrivate::updateLayout()
     updateSize();
 }
 
-void QSGTextPrivate::updateSize()
+void QQuickTextPrivate::updateSize()
 {
-    Q_Q(QSGText);
+    Q_Q(QQuickText);
 
     if (!q->isComponentComplete()) {
         updateOnComponentComplete = true;
@@ -314,12 +314,12 @@ void QSGTextPrivate::updateSize()
         singleline = false; // richtext can't elide or be optimized for single-line case
         ensureDoc();
         doc->setDefaultFont(font);
-        QSGText::HAlignment horizontalAlignment = q->effectiveHAlign();
+        QQuickText::HAlignment horizontalAlignment = q->effectiveHAlign();
         if (rightToLeftText) {
-            if (horizontalAlignment == QSGText::AlignLeft)
-                horizontalAlignment = QSGText::AlignRight;
-            else if (horizontalAlignment == QSGText::AlignRight)
-                horizontalAlignment = QSGText::AlignLeft;
+            if (horizontalAlignment == QQuickText::AlignLeft)
+                horizontalAlignment = QQuickText::AlignRight;
+            else if (horizontalAlignment == QQuickText::AlignRight)
+                horizontalAlignment = QQuickText::AlignLeft;
         }
         QTextOption option;
         option.setAlignment((Qt::Alignment)int(horizontalAlignment | vAlign));
@@ -331,7 +331,7 @@ void QSGTextPrivate::updateSize()
             doc->setTextWidth(-1);
             naturalWidth = doc->idealWidth();
         }
-        if (wrapMode != QSGText::NoWrap && q->widthValid())
+        if (wrapMode != QQuickText::NoWrap && q->widthValid())
             doc->setTextWidth(q->width());
         else
             doc->setTextWidth(doc->idealWidth()); // ### Text does not align if width is not set (QTextDoc bug)
@@ -343,9 +343,9 @@ void QSGTextPrivate::updateSize()
     int yoff = 0;
 
     if (q->heightValid()) {
-        if (vAlign == QSGText::AlignBottom)
+        if (vAlign == QQuickText::AlignBottom)
             yoff = dy;
-        else if (vAlign == QSGText::AlignVCenter)
+        else if (vAlign == QQuickText::AlignVCenter)
             yoff = dy/2;
     }
     q->setBaselineOffset(fm.ascent() + yoff);
@@ -366,37 +366,37 @@ void QSGTextPrivate::updateSize()
     q->update();
 }
 
-QSGTextLine::QSGTextLine()
+QQuickTextLine::QQuickTextLine()
     : QObject(), m_line(0), m_height(0)
 {
 }
 
-void QSGTextLine::setLine(QTextLine *line)
+void QQuickTextLine::setLine(QTextLine *line)
 {
     m_line = line;
 }
 
-int QSGTextLine::number() const
+int QQuickTextLine::number() const
 {
     if (m_line)
         return m_line->lineNumber();
     return 0;
 }
 
-qreal QSGTextLine::width() const
+qreal QQuickTextLine::width() const
 {
     if (m_line)
         return m_line->width();
     return 0;
 }
 
-void QSGTextLine::setWidth(qreal width)
+void QQuickTextLine::setWidth(qreal width)
 {
     if (m_line)
         m_line->setLineWidth(width);
 }
 
-qreal QSGTextLine::height() const
+qreal QQuickTextLine::height() const
 {
     if (m_height)
         return m_height;
@@ -405,42 +405,42 @@ qreal QSGTextLine::height() const
     return 0;
 }
 
-void QSGTextLine::setHeight(qreal height)
+void QQuickTextLine::setHeight(qreal height)
 {
     if (m_line)
         m_line->setPosition(QPointF(m_line->x(), m_line->y() - m_line->height() + height));
     m_height = height;
 }
 
-qreal QSGTextLine::x() const
+qreal QQuickTextLine::x() const
 {
     if (m_line)
         return m_line->x();
     return 0;
 }
 
-void QSGTextLine::setX(qreal x)
+void QQuickTextLine::setX(qreal x)
 {
     if (m_line)
         m_line->setPosition(QPointF(x, m_line->y()));
 }
 
-qreal QSGTextLine::y() const
+qreal QQuickTextLine::y() const
 {
     if (m_line)
         return m_line->y();
     return 0;
 }
 
-void QSGTextLine::setY(qreal y)
+void QQuickTextLine::setY(qreal y)
 {
     if (m_line)
         m_line->setPosition(QPointF(m_line->x(), y));
 }
 
-void QSGText::doLayout()
+void QQuickText::doLayout()
 {
-    Q_D(QSGText);
+    Q_D(QQuickText);
     d->updateSize();
 }
 
@@ -471,15 +471,15 @@ void QSGText::doLayout()
     \endcode
 */
 
-bool QSGTextPrivate::isLineLaidOutConnected()
+bool QQuickTextPrivate::isLineLaidOutConnected()
 {
-    static int idx = this->signalIndex("lineLaidOut(QSGTextLine*)");
+    static int idx = this->signalIndex("lineLaidOut(QQuickTextLine*)");
     return this->isSignalConnected(idx);
 }
 
-void QSGTextPrivate::setupCustomLineGeometry(QTextLine &line, qreal &height, qreal elideWidth = 0)
+void QQuickTextPrivate::setupCustomLineGeometry(QTextLine &line, qreal &height, qreal elideWidth = 0)
 {
-    Q_Q(QSGText);
+    Q_Q(QQuickText);
 
 #if defined(Q_OS_MAC)
     if (QThread::currentThread() != paintingThread) {
@@ -488,18 +488,18 @@ void QSGTextPrivate::setupCustomLineGeometry(QTextLine &line, qreal &height, qre
             linesRects.clear();
 
         if (!textLine)
-            textLine = new QSGTextLine;
+            textLine = new QQuickTextLine;
         textLine->setLine(&line);
         textLine->setY(height);
         textLine->setHeight(0);
 
         // use the text item's width by default if it has one and wrap is on
-        if (q->widthValid() && q->wrapMode() != QSGText::NoWrap)
+        if (q->widthValid() && q->wrapMode() != QQuickText::NoWrap)
             textLine->setWidth(q->width() - elideWidth);
         else
             textLine->setWidth(INT_MAX);
         if (lineHeight != 1.0)
-            textLine->setHeight((lineHeightMode == QSGText::FixedHeight) ? lineHeight : line.height() * lineHeight);
+            textLine->setHeight((lineHeightMode == QQuickText::FixedHeight) ? lineHeight : line.height() * lineHeight);
 
         emit q->lineLaidOut(textLine);
 
@@ -518,16 +518,16 @@ void QSGTextPrivate::setupCustomLineGeometry(QTextLine &line, qreal &height, qre
 }
 
 /*!
-    Lays out the QSGTextPrivate::layout QTextLayout in the constraints of the QSGText.
+    Lays out the QQuickTextPrivate::layout QTextLayout in the constraints of the QQuickText.
 
     Returns the size of the final text.  This can be used to position the text vertically (the text is
     already absolutely positioned horizontally).
 */
-QRect QSGTextPrivate::setupTextLayout()
+QRect QQuickTextPrivate::setupTextLayout()
 {
     // ### text layout handling should be profiled and optimized as needed
     // what about QStackTextEngine engine(tmp, d->font.font()); QTextLayout textLayout(&engine);
-    Q_Q(QSGText);
+    Q_Q(QQuickText);
     layout.setCacheEnabled(true);
 
     qreal lineWidth = 0;
@@ -600,7 +600,7 @@ QRect QSGTextPrivate::setupTextLayout()
             if (--linesLeft == 0) {
                 if (visibleTextLength < text.length()) {
                     truncate = true;
-                    if (elideMode == QSGText::ElideRight && q->widthValid()) {
+                    if (elideMode == QQuickText::ElideRight && q->widthValid()) {
                         qreal elideWidth = fm.width(elideChar);
                         // Need to correct for alignment
                         if (customLayout)
@@ -654,7 +654,7 @@ QRect QSGTextPrivate::setupTextLayout()
             br = br.united(QRectF(elidePos, QSizeF(fm.width(elideChar), fm.ascent())));
         }
         br = br.united(line.naturalTextRect());
-        height += (lineHeightMode == QSGText::FixedHeight) ? lineHeight : line.height() * lineHeight;
+        height += (lineHeightMode == QQuickText::FixedHeight) ? lineHeight : line.height() * lineHeight;
     }
     if (!customLayout)
         br.setHeight(height);
@@ -672,10 +672,10 @@ QRect QSGTextPrivate::setupTextLayout()
 }
 
 /*!
-    Returns a painted version of the QSGTextPrivate::layout QTextLayout.
+    Returns a painted version of the QQuickTextPrivate::layout QTextLayout.
     If \a drawStyle is true, the style color overrides all colors in the document.
 */
-QPixmap QSGTextPrivate::textLayoutImage(bool drawStyle)
+QPixmap QQuickTextPrivate::textLayoutImage(bool drawStyle)
 {
     QSize size = layedOutTextRect.size();
 
@@ -697,10 +697,10 @@ QPixmap QSGTextPrivate::textLayoutImage(bool drawStyle)
 }
 
 /*!
-    Paints the QSGTextPrivate::layout QTextLayout into \a painter at \a pos.  If
+    Paints the QQuickTextPrivate::layout QTextLayout into \a painter at \a pos.  If
     \a drawStyle is true, the style color overrides all colors in the document.
 */
-void QSGTextPrivate::drawTextLayout(QPainter *painter, const QPointF &pos, bool drawStyle)
+void QQuickTextPrivate::drawTextLayout(QPainter *painter, const QPointF &pos, bool drawStyle)
 {
     if (drawStyle)
         painter->setPen(styleColor);
@@ -713,10 +713,10 @@ void QSGTextPrivate::drawTextLayout(QPainter *painter, const QPointF &pos, bool
 }
 
 /*!
-    Returns a painted version of the QSGTextPrivate::doc QTextDocument.
+    Returns a painted version of the QQuickTextPrivate::doc QTextDocument.
     If \a drawStyle is true, the style color overrides all colors in the document.
 */
-QPixmap QSGTextPrivate::textDocumentImage(bool drawStyle)
+QPixmap QQuickTextPrivate::textDocumentImage(bool drawStyle)
 {
     QSize size = doc->size().toSize();
 
@@ -752,11 +752,11 @@ QPixmap QSGTextPrivate::textDocumentImage(bool drawStyle)
 /*!
     Mark the image cache as dirty.
 */
-void QSGTextPrivate::invalidateImageCache()
+void QQuickTextPrivate::invalidateImageCache()
 {
-    Q_Q(QSGText);
+    Q_Q(QQuickText);
 
-    if (richTextAsImage || cacheAllTextAsImage || (qmlDisableDistanceField() && style != QSGText::Normal)) { // If actually using the image cache
+    if (richTextAsImage || cacheAllTextAsImage || (qmlDisableDistanceField() && style != QQuickText::Normal)) { // If actually using the image cache
         if (imageCacheDirty)
             return;
 
@@ -771,9 +771,9 @@ void QSGTextPrivate::invalidateImageCache()
 /*!
     Tests if the image cache is dirty, and repaints it if it is.
 */
-void QSGTextPrivate::checkImageCache()
+void QQuickTextPrivate::checkImageCache()
 {
-    Q_Q(QSGText);
+    Q_Q(QQuickText);
 
     if (!imageCacheDirty)
         return;
@@ -789,22 +789,22 @@ void QSGTextPrivate::checkImageCache()
 
         if (richText) {
             textImage = textDocumentImage(false);
-            if (style != QSGText::Normal)
+            if (style != QQuickText::Normal)
                 styledImage = textDocumentImage(true); //### should use styleColor
         } else {
             textImage = textLayoutImage(false);
-            if (style != QSGText::Normal)
+            if (style != QQuickText::Normal)
                 styledImage = textLayoutImage(true); //### should use styleColor
         }
 
         switch (style) {
-        case QSGText::Outline:
+        case QQuickText::Outline:
             imageCache = drawOutline(textImage, styledImage);
             break;
-        case QSGText::Sunken:
+        case QQuickText::Sunken:
             imageCache = drawOutline(textImage, styledImage, -1);
             break;
-        case QSGText::Raised:
+        case QQuickText::Raised:
             imageCache = drawOutline(textImage, styledImage, 1);
             break;
         default:
@@ -820,13 +820,13 @@ void QSGTextPrivate::checkImageCache()
 }
 
 /*!
-    Ensures the QSGTextPrivate::doc variable is set to a valid text document
+    Ensures the QQuickTextPrivate::doc variable is set to a valid text document
 */
-void QSGTextPrivate::ensureDoc()
+void QQuickTextPrivate::ensureDoc()
 {
     if (!doc) {
-        Q_Q(QSGText);
-        doc = new QSGTextDocumentWithImageResources(q);
+        Q_Q(QQuickText);
+        doc = new QQuickTextDocumentWithImageResources(q);
         doc->setDocumentMargin(0);
     }
 }
@@ -834,7 +834,7 @@ void QSGTextPrivate::ensureDoc()
 /*!
     Draw \a styleSource as an outline around \a source and return the new image.
 */
-QPixmap QSGTextPrivate::drawOutline(const QPixmap &source, const QPixmap &styleSource)
+QPixmap QQuickTextPrivate::drawOutline(const QPixmap &source, const QPixmap &styleSource)
 {
     QPixmap img = QPixmap(styleSource.width() + 2, styleSource.height() + 2);
     img.fill(Qt::transparent);
@@ -861,7 +861,7 @@ QPixmap QSGTextPrivate::drawOutline(const QPixmap &source, const QPixmap &styleS
 /*!
     Draw \a styleSource below \a source at \a yOffset and return the new image.
 */
-QPixmap QSGTextPrivate::drawOutline(const QPixmap &source, const QPixmap &styleSource, int yOffset)
+QPixmap QQuickTextPrivate::drawOutline(const QPixmap &source, const QPixmap &styleSource, int yOffset)
 {
     QPixmap img = QPixmap(styleSource.width() + 2, styleSource.height() + 2);
     img.fill(Qt::transparent);
@@ -877,7 +877,7 @@ QPixmap QSGTextPrivate::drawOutline(const QPixmap &source, const QPixmap &styleS
 }
 
 /*!
-    \qmlclass Text QSGText
+    \qmlclass Text QQuickText
     \inqmlmodule QtQuick 2
     \ingroup qml-basic-visual-elements
     \brief The Text item allows you to add formatted text to a scene.
@@ -919,14 +919,14 @@ QPixmap QSGTextPrivate::drawOutline(const QPixmap &source, const QPixmap &styleS
 
     \sa {declarative/text/fonts}{Fonts example}
 */
-QSGText::QSGText(QSGItem *parent)
-: QSGImplicitSizeItem(*(new QSGTextPrivate), parent)
+QQuickText::QQuickText(QQuickItem *parent)
+: QQuickImplicitSizeItem(*(new QQuickTextPrivate), parent)
 {
-    Q_D(QSGText);
+    Q_D(QQuickText);
     d->init();
 }
 
-QSGText::~QSGText()
+QQuickText::~QQuickText()
 {
 }
 
@@ -1073,15 +1073,15 @@ QSGText::~QSGText()
     Text { text: "Hello"; font.capitalization: Font.AllLowercase }
     \endqml
 */
-QFont QSGText::font() const
+QFont QQuickText::font() const
 {
-    Q_D(const QSGText);
+    Q_D(const QQuickText);
     return d->sourceFont;
 }
 
-void QSGText::setFont(const QFont &font)
+void QQuickText::setFont(const QFont &font)
 {
-    Q_D(QSGText);
+    Q_D(QQuickText);
     if (d->sourceFont == font)
         return;
 
@@ -1109,15 +1109,15 @@ void QSGText::setFont(const QFont &font)
     The item will try to automatically determine whether the text should
     be treated as styled text. This determination is made using Qt::mightBeRichText().
 */
-QString QSGText::text() const
+QString QQuickText::text() const
 {
-    Q_D(const QSGText);
+    Q_D(const QQuickText);
     return d->text;
 }
 
-void QSGText::setText(const QString &n)
+void QQuickText::setText(const QString &n)
 {
-    Q_D(QSGText);
+    Q_D(QQuickText);
     if (d->text == n)
         return;
 
@@ -1161,15 +1161,15 @@ void QSGText::setText(const QString &n)
     }
     \endqml
 */
-QColor QSGText::color() const
+QColor QQuickText::color() const
 {
-    Q_D(const QSGText);
+    Q_D(const QQuickText);
     return d->color;
 }
 
-void QSGText::setColor(const QColor &color)
+void QQuickText::setColor(const QColor &color)
 {
-    Q_D(QSGText);
+    Q_D(QQuickText);
     if (d->color == color)
         return;
 
@@ -1201,15 +1201,15 @@ void QSGText::setColor(const QColor &color)
 
     \image declarative-textstyle.png
 */
-QSGText::TextStyle QSGText::style() const
+QQuickText::TextStyle QQuickText::style() const
 {
-    Q_D(const QSGText);
+    Q_D(const QQuickText);
     return d->style;
 }
 
-void QSGText::setStyle(QSGText::TextStyle style)
+void QQuickText::setStyle(QQuickText::TextStyle style)
 {
-    Q_D(QSGText);
+    Q_D(QQuickText);
     if (d->style == style)
         return;
 
@@ -1236,15 +1236,15 @@ void QSGText::setStyle(QSGText::TextStyle style)
 
     \sa style
  */
-QColor QSGText::styleColor() const
+QColor QQuickText::styleColor() const
 {
-    Q_D(const QSGText);
+    Q_D(const QQuickText);
     return d->styleColor;
 }
 
-void QSGText::setStyleColor(const QColor &color)
+void QQuickText::setStyleColor(const QColor &color)
 {
-    Q_D(QSGText);
+    Q_D(QQuickText);
     if (d->styleColor == color)
         return;
 
@@ -1277,40 +1277,40 @@ void QSGText::setStyleColor(const QColor &color)
     \c horizontalAlignment will remain unchanged. To query the effective horizontal alignment
     of Text, use the read-only property \c effectiveHorizontalAlignment.
 */
-QSGText::HAlignment QSGText::hAlign() const
+QQuickText::HAlignment QQuickText::hAlign() const
 {
-    Q_D(const QSGText);
+    Q_D(const QQuickText);
     return d->hAlign;
 }
 
-void QSGText::setHAlign(HAlignment align)
+void QQuickText::setHAlign(HAlignment align)
 {
-    Q_D(QSGText);
+    Q_D(QQuickText);
     bool forceAlign = d->hAlignImplicit && d->effectiveLayoutMirror;
     d->hAlignImplicit = false;
     if (d->setHAlign(align, forceAlign) && isComponentComplete())
         d->updateLayout();
 }
 
-void QSGText::resetHAlign()
+void QQuickText::resetHAlign()
 {
-    Q_D(QSGText);
+    Q_D(QQuickText);
     d->hAlignImplicit = true;
     if (d->determineHorizontalAlignment() && isComponentComplete())
         d->updateLayout();
 }
 
-QSGText::HAlignment QSGText::effectiveHAlign() const
+QQuickText::HAlignment QQuickText::effectiveHAlign() const
 {
-    Q_D(const QSGText);
-    QSGText::HAlignment effectiveAlignment = d->hAlign;
+    Q_D(const QQuickText);
+    QQuickText::HAlignment effectiveAlignment = d->hAlign;
     if (!d->hAlignImplicit && d->effectiveLayoutMirror) {
         switch (d->hAlign) {
-        case QSGText::AlignLeft:
-            effectiveAlignment = QSGText::AlignRight;
+        case QQuickText::AlignLeft:
+            effectiveAlignment = QQuickText::AlignRight;
             break;
-        case QSGText::AlignRight:
-            effectiveAlignment = QSGText::AlignLeft;
+        case QQuickText::AlignRight:
+            effectiveAlignment = QQuickText::AlignLeft;
             break;
         default:
             break;
@@ -1319,11 +1319,11 @@ QSGText::HAlignment QSGText::effectiveHAlign() const
     return effectiveAlignment;
 }
 
-bool QSGTextPrivate::setHAlign(QSGText::HAlignment alignment, bool forceAlign)
+bool QQuickTextPrivate::setHAlign(QQuickText::HAlignment alignment, bool forceAlign)
 {
-    Q_Q(QSGText);
+    Q_Q(QQuickText);
     if (hAlign != alignment || forceAlign) {
-        QSGText::HAlignment oldEffectiveHAlign = q->effectiveHAlign();
+        QQuickText::HAlignment oldEffectiveHAlign = q->effectiveHAlign();
         hAlign = alignment;
 
         emit q->horizontalAlignmentChanged(hAlign);
@@ -1334,41 +1334,41 @@ bool QSGTextPrivate::setHAlign(QSGText::HAlignment alignment, bool forceAlign)
     return false;
 }
 
-bool QSGTextPrivate::determineHorizontalAlignment()
+bool QQuickTextPrivate::determineHorizontalAlignment()
 {
-    Q_Q(QSGText);
+    Q_Q(QQuickText);
     if (hAlignImplicit && q->isComponentComplete()) {
         bool alignToRight = text.isEmpty() ? QGuiApplication::keyboardInputDirection() == Qt::RightToLeft : rightToLeftText;
-        return setHAlign(alignToRight ? QSGText::AlignRight : QSGText::AlignLeft);
+        return setHAlign(alignToRight ? QQuickText::AlignRight : QQuickText::AlignLeft);
     }
     return false;
 }
 
-void QSGTextPrivate::mirrorChange()
+void QQuickTextPrivate::mirrorChange()
 {
-    Q_Q(QSGText);
+    Q_Q(QQuickText);
     if (q->isComponentComplete()) {
-        if (!hAlignImplicit && (hAlign == QSGText::AlignRight || hAlign == QSGText::AlignLeft)) {
+        if (!hAlignImplicit && (hAlign == QQuickText::AlignRight || hAlign == QQuickText::AlignLeft)) {
             updateLayout();
             emit q->effectiveHorizontalAlignmentChanged();
         }
     }
 }
 
-QTextDocument *QSGTextPrivate::textDocument()
+QTextDocument *QQuickTextPrivate::textDocument()
 {
     return doc;
 }
 
-QSGText::VAlignment QSGText::vAlign() const
+QQuickText::VAlignment QQuickText::vAlign() const
 {
-    Q_D(const QSGText);
+    Q_D(const QQuickText);
     return d->vAlign;
 }
 
-void QSGText::setVAlign(VAlignment align)
+void QQuickText::setVAlign(VAlignment align)
 {
-    Q_D(QSGText);
+    Q_D(QQuickText);
     if (d->vAlign == align)
         return;
 
@@ -1389,15 +1389,15 @@ void QSGText::setVAlign(VAlignment align)
     \o Text.Wrap - if possible, wrapping occurs at a word boundary; otherwise it will occur at the appropriate point on the line, even in the middle of a word.
     \endlist
 */
-QSGText::WrapMode QSGText::wrapMode() const
+QQuickText::WrapMode QQuickText::wrapMode() const
 {
-    Q_D(const QSGText);
+    Q_D(const QQuickText);
     return d->wrapMode;
 }
 
-void QSGText::setWrapMode(WrapMode mode)
+void QQuickText::setWrapMode(WrapMode mode)
 {
-    Q_D(QSGText);
+    Q_D(QQuickText);
     if (mode == d->wrapMode)
         return;
 
@@ -1416,9 +1416,9 @@ void QSGText::setWrapMode(WrapMode mode)
 
     \sa maximumLineCount
 */
-int QSGText::lineCount() const
+int QQuickText::lineCount() const
 {
-    Q_D(const QSGText);
+    Q_D(const QQuickText);
     return d->lineCount;
 }
 
@@ -1432,9 +1432,9 @@ int QSGText::lineCount() const
 
     \sa maximumLineCount, elide
 */
-bool QSGText::truncated() const
+bool QQuickText::truncated() const
 {
-    Q_D(const QSGText);
+    Q_D(const QQuickText);
     return d->truncated;
 }
 
@@ -1449,15 +1449,15 @@ bool QSGText::truncated() const
 
     \sa lineCount, elide
 */
-int QSGText::maximumLineCount() const
+int QQuickText::maximumLineCount() const
 {
-    Q_D(const QSGText);
+    Q_D(const QQuickText);
     return d->maximumLineCount;
 }
 
-void QSGText::setMaximumLineCount(int lines)
+void QQuickText::setMaximumLineCount(int lines)
 {
-    Q_D(QSGText);
+    Q_D(QQuickText);
 
     d->maximumLineCountValid = lines==INT_MAX ? false : true;
     if (d->maximumLineCount != lines) {
@@ -1467,9 +1467,9 @@ void QSGText::setMaximumLineCount(int lines)
     }
 }
 
-void QSGText::resetMaximumLineCount()
+void QQuickText::resetMaximumLineCount()
 {
-    Q_D(QSGText);
+    Q_D(QQuickText);
     setMaximumLineCount(INT_MAX);
     d->elidePos = QPointF();
     if (d->truncated != false) {
@@ -1538,15 +1538,15 @@ Column {
     \o \image declarative-textformat.png
     \endtable
 */
-QSGText::TextFormat QSGText::textFormat() const
+QQuickText::TextFormat QQuickText::textFormat() const
 {
-    Q_D(const QSGText);
+    Q_D(const QQuickText);
     return d->format;
 }
 
-void QSGText::setTextFormat(TextFormat format)
+void QQuickText::setTextFormat(TextFormat format)
 {
-    Q_D(QSGText);
+    Q_D(QQuickText);
     if (format == d->format)
         return;
     d->format = format;
@@ -1593,15 +1593,15 @@ void QSGText::setTextFormat(TextFormat format)
     Multi-length strings are ordered from longest to shortest, separated by the
     Unicode "String Terminator" character \c U009C (write this in QML with \c{"\u009C"} or \c{"\x9C"}).
 */
-QSGText::TextElideMode QSGText::elideMode() const
+QQuickText::TextElideMode QQuickText::elideMode() const
 {
-    Q_D(const QSGText);
+    Q_D(const QQuickText);
     return d->elideMode;
 }
 
-void QSGText::setElideMode(QSGText::TextElideMode mode)
+void QQuickText::setElideMode(QQuickText::TextElideMode mode)
 {
-    Q_D(QSGText);
+    Q_D(QQuickText);
     if (mode == d->elideMode)
         return;
 
@@ -1612,9 +1612,9 @@ void QSGText::setElideMode(QSGText::TextElideMode mode)
 }
 
 /*! \internal */
-QRectF QSGText::boundingRect() const
+QRectF QQuickText::boundingRect() const
 {
-    Q_D(const QSGText);
+    Q_D(const QQuickText);
 
     QRect rect = d->layedOutTextRect;
     if (d->style != Normal)
@@ -1638,14 +1638,14 @@ QRectF QSGText::boundingRect() const
 }
 
 /*! \internal */
-void QSGText::geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry)
+void QQuickText::geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry)
 {
-    Q_D(QSGText);
+    Q_D(QQuickText);
     if ((!d->internalWidthUpdate && newGeometry.width() != oldGeometry.width())
-            && (d->wrapMode != QSGText::NoWrap
-                || d->elideMode != QSGText::ElideNone
-                || d->hAlign != QSGText::AlignLeft)) {
-        if ((d->singleline || d->maximumLineCountValid) && d->elideMode != QSGText::ElideNone && widthValid()) {
+            && (d->wrapMode != QQuickText::NoWrap
+                || d->elideMode != QQuickText::ElideNone
+                || d->hAlign != QQuickText::AlignLeft)) {
+        if ((d->singleline || d->maximumLineCountValid) && d->elideMode != QQuickText::ElideNone && widthValid()) {
             // We need to re-elide
             d->updateLayout();
         } else {
@@ -1654,13 +1654,13 @@ void QSGText::geometryChanged(const QRectF &newGeometry, const QRectF &oldGeomet
         }
     }
 
-    QSGItem::geometryChanged(newGeometry, oldGeometry);
+    QQuickItem::geometryChanged(newGeometry, oldGeometry);
 }
 
-QSGNode *QSGText::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *data)
+QSGNode *QQuickText::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *data)
 {
     Q_UNUSED(data);
-    Q_D(QSGText);
+    Q_D(QQuickText);
 
     if (d->text.isEmpty()) {
         delete oldNode;
@@ -1676,7 +1676,7 @@ QSGNode *QSGText::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *data)
         d->updateLayout();
 #endif
 
-    // XXX todo - some styled text can be done by the QSGTextNode
+    // XXX todo - some styled text can be done by the QQuickTextNode
     if (d->richTextAsImage || d->cacheAllTextAsImage || (qmlDisableDistanceField() && d->style != Normal)) {
         bool wasDirty = d->textureImageCacheDirty;
         d->textureImageCacheDirty = false;
@@ -1687,12 +1687,12 @@ QSGNode *QSGText::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *data)
         }
 
         QSGImageNode *node = 0;
-        if (!oldNode || d->nodeType != QSGTextPrivate::NodeIsTexture) {
+        if (!oldNode || d->nodeType != QQuickTextPrivate::NodeIsTexture) {
             delete oldNode;
-            node = QSGItemPrivate::get(this)->sceneGraphContext()->createImageNode();
+            node = QQuickItemPrivate::get(this)->sceneGraphContext()->createImageNode();
             d->texture = new QSGPlainTexture();
             wasDirty = true;
-            d->nodeType = QSGTextPrivate::NodeIsTexture;
+            d->nodeType = QQuickTextPrivate::NodeIsTexture;
         } else {
             node = static_cast<QSGImageNode *>(oldNode);
             Q_ASSERT(d->texture);
@@ -1714,13 +1714,13 @@ QSGNode *QSGText::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *data)
         return node;
 
     } else {
-        QSGTextNode *node = 0;
-        if (!oldNode || d->nodeType != QSGTextPrivate::NodeIsText) {
+        QQuickTextNode *node = 0;
+        if (!oldNode || d->nodeType != QQuickTextPrivate::NodeIsText) {
             delete oldNode;
-            node = new QSGTextNode(QSGItemPrivate::get(this)->sceneGraphContext());
-            d->nodeType = QSGTextPrivate::NodeIsText;
+            node = new QQuickTextNode(QQuickItemPrivate::get(this)->sceneGraphContext());
+            d->nodeType = QQuickTextPrivate::NodeIsText;
         } else {
-            node = static_cast<QSGTextNode *>(oldNode);
+            node = static_cast<QQuickTextNode *>(oldNode);
         }
 
         node->deleteContent();
@@ -1738,14 +1738,14 @@ QSGNode *QSGText::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *data)
     }
 }
 
-bool QSGText::event(QEvent *e)
+bool QQuickText::event(QEvent *e)
 {
-    Q_D(QSGText);
+    Q_D(QQuickText);
     if (e->type() == QEvent::User) {
         d->checkImageCache();
         return true;
     } else {
-        return QSGImplicitSizeItem::event(e);
+        return QQuickImplicitSizeItem::event(e);
     }
 }
 
@@ -1755,9 +1755,9 @@ bool QSGText::event(QEvent *e)
     Returns the width of the text, including width past the width
     which is covered due to insufficient wrapping if WrapMode is set.
 */
-qreal QSGText::paintedWidth() const
+qreal QQuickText::paintedWidth() const
 {
-    Q_D(const QSGText);
+    Q_D(const QQuickText);
     return d->paintedSize.width();
 }
 
@@ -1767,9 +1767,9 @@ qreal QSGText::paintedWidth() const
     Returns the height of the text, including height past the height
     which is covered due to there being more text than fits in the set height.
 */
-qreal QSGText::paintedHeight() const
+qreal QQuickText::paintedHeight() const
 {
-    Q_D(const QSGText);
+    Q_D(const QQuickText);
     return d->paintedSize.height();
 }
 
@@ -1782,15 +1782,15 @@ qreal QSGText::paintedHeight() const
     The default value is a multiplier of 1.0.
     The line height must be a positive value.
 */
-qreal QSGText::lineHeight() const
+qreal QQuickText::lineHeight() const
 {
-    Q_D(const QSGText);
+    Q_D(const QQuickText);
     return d->lineHeight;
 }
 
-void QSGText::setLineHeight(qreal lineHeight)
+void QQuickText::setLineHeight(qreal lineHeight)
 {
-    Q_D(QSGText);
+    Q_D(QQuickText);
 
     if ((d->lineHeight == lineHeight) || (lineHeight < 0.0))
         return;
@@ -1812,15 +1812,15 @@ void QSGText::setLineHeight(qreal lineHeight)
     \o Text.FixedHeight - this sets the line height to a fixed line height (in pixels).
     \endlist
 */
-QSGText::LineHeightMode QSGText::lineHeightMode() const
+QQuickText::LineHeightMode QQuickText::lineHeightMode() const
 {
-    Q_D(const QSGText);
+    Q_D(const QQuickText);
     return d->lineHeightMode;
 }
 
-void QSGText::setLineHeightMode(LineHeightMode mode)
+void QQuickText::setLineHeightMode(LineHeightMode mode)
 {
-    Q_D(QSGText);
+    Q_D(QQuickText);
     if (mode == d->lineHeightMode)
         return;
 
@@ -1833,17 +1833,17 @@ void QSGText::setLineHeightMode(LineHeightMode mode)
 /*!
     Returns the number of resources (images) that are being loaded asynchronously.
 */
-int QSGText::resourcesLoading() const
+int QQuickText::resourcesLoading() const
 {
-    Q_D(const QSGText);
+    Q_D(const QQuickText);
     return d->doc ? d->doc->resourcesLoading() : 0;
 }
 
 /*! \internal */
-void QSGText::componentComplete()
+void QQuickText::componentComplete()
 {
-    Q_D(QSGText);
-    QSGItem::componentComplete();
+    Q_D(QQuickText);
+    QQuickItem::componentComplete();
     if (d->updateOnComponentComplete) {
         d->updateOnComponentComplete = false;
         if (d->richText) {
@@ -1860,7 +1860,7 @@ void QSGText::componentComplete()
 }
 
 
-QString QSGTextPrivate::anchorAt(const QPointF &mousePos)
+QString QQuickTextPrivate::anchorAt(const QPointF &mousePos)
 {
     if (styledText) {
         for (int i = 0; i < layout.lineCount(); ++i) {
@@ -1881,16 +1881,16 @@ QString QSGTextPrivate::anchorAt(const QPointF &mousePos)
     return QString();
 }
 
-bool QSGTextPrivate::isLinkActivatedConnected()
+bool QQuickTextPrivate::isLinkActivatedConnected()
 {
     static int idx = this->signalIndex("linkActivated(QString)");
     return this->isSignalConnected(idx);
 }
 
 /*!  \internal */
-void QSGText::mousePressEvent(QMouseEvent *event)
+void QQuickText::mousePressEvent(QMouseEvent *event)
 {
-    Q_D(QSGText);
+    Q_D(QQuickText);
 
     if (d->isLinkActivatedConnected()) {
         if (d->styledText)
@@ -1905,14 +1905,14 @@ void QSGText::mousePressEvent(QMouseEvent *event)
     // ### may malfunction if two of the same links are clicked & dragged onto each other)
 
     if (!event->isAccepted())
-        QSGItem::mousePressEvent(event);
+        QQuickItem::mousePressEvent(event);
 
 }
 
 /*! \internal */
-void QSGText::mouseReleaseEvent(QMouseEvent *event)
+void QQuickText::mouseReleaseEvent(QMouseEvent *event)
 {
-    Q_D(QSGText);
+    Q_D(QQuickText);
 
     // ### confirm the link, and send a signal out
 
@@ -1930,9 +1930,9 @@ void QSGText::mouseReleaseEvent(QMouseEvent *event)
         event->setAccepted(false);
 
     if (!event->isAccepted())
-        QSGItem::mouseReleaseEvent(event);
+        QQuickItem::mouseReleaseEvent(event);
 }
 
 QT_END_NAMESPACE
 
-#include "qsgtext.moc"
+#include "qquicktext.moc"
diff --git a/src/declarative/items/qsgtext_p.h b/src/declarative/items/qquicktext_p.h
index aa07c8a25e..be77f2eb45 100644
--- a/src/declarative/items/qsgtext_p.h
+++ b/src/declarative/items/qquicktext_p.h
@@ -40,10 +40,10 @@
 **
 ****************************************************************************/
 
-#ifndef QSGTEXT_P_H
-#define QSGTEXT_P_H
+#ifndef QQUICKTEXT_P_H
+#define QQUICKTEXT_P_H
 
-#include "qsgimplicitsizeitem_p.h"
+#include "qquickimplicitsizeitem_p.h"
 
 #include <private/qdeclarativeglobal_p.h>
 
@@ -54,9 +54,9 @@ QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE
 
 QT_MODULE(Declarative)
-class QSGTextPrivate;
-class QSGTextLine;
-class Q_DECLARATIVE_PRIVATE_EXPORT QSGText : public QSGImplicitSizeItem
+class QQuickTextPrivate;
+class QQuickTextLine;
+class Q_DECLARATIVE_PRIVATE_EXPORT QQuickText : public QQuickImplicitSizeItem
 {
     Q_OBJECT
     Q_ENUMS(HAlignment)
@@ -88,8 +88,8 @@ class Q_DECLARATIVE_PRIVATE_EXPORT QSGText : public QSGImplicitSizeItem
     Q_PROPERTY(LineHeightMode lineHeightMode READ lineHeightMode WRITE setLineHeightMode NOTIFY lineHeightModeChanged)
 
 public:
-    QSGText(QSGItem *parent=0);
-    ~QSGText();
+    QQuickText(QQuickItem *parent=0);
+    ~QQuickText();
 
     enum HAlignment { AlignLeft = Qt::AlignLeft,
                        AlignRight = Qt::AlignRight,
@@ -194,7 +194,7 @@ Q_SIGNALS:
     void lineHeightChanged(qreal lineHeight);
     void lineHeightModeChanged(LineHeightMode mode);
     void effectiveHorizontalAlignmentChanged();
-    void lineLaidOut(QSGTextLine *line);
+    void lineLaidOut(QQuickTextLine *line);
 
 protected:
     void mousePressEvent(QMouseEvent *event);
@@ -205,12 +205,12 @@ protected:
     virtual bool event(QEvent *);
 
 private:
-    Q_DISABLE_COPY(QSGText)
-    Q_DECLARE_PRIVATE(QSGText)
+    Q_DISABLE_COPY(QQuickText)
+    Q_DECLARE_PRIVATE(QQuickText)
 };
 
 class QTextLine;
-class Q_AUTOTEST_EXPORT QSGTextLine : public QObject
+class Q_AUTOTEST_EXPORT QQuickTextLine : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(int number READ number)
@@ -220,7 +220,7 @@ class Q_AUTOTEST_EXPORT QSGTextLine : public QObject
     Q_PROPERTY(qreal y READ y WRITE setY)
 
 public:
-    QSGTextLine();
+    QQuickTextLine();
 
     void setLine(QTextLine* line);
     int number() const;
@@ -244,9 +244,9 @@ private:
 
 QT_END_NAMESPACE
 
-QML_DECLARE_TYPE(QSGText)
-QML_DECLARE_TYPE(QSGTextLine)
+QML_DECLARE_TYPE(QQuickText)
+QML_DECLARE_TYPE(QQuickTextLine)
 
 QT_END_HEADER
 
-#endif // QSGTEXT_P_H
+#endif // QQUICKTEXT_P_H
diff --git a/src/declarative/items/qsgtext_p_p.h b/src/declarative/items/qquicktext_p_p.h
index 8b83263f6f..16cc29ac13 100644
--- a/src/declarative/items/qsgtext_p_p.h
+++ b/src/declarative/items/qquicktext_p_p.h
@@ -40,8 +40,8 @@
 **
 ****************************************************************************/
 
-#ifndef QSGTEXT_P_P_H
-#define QSGTEXT_P_P_H
+#ifndef QQUICKTEXT_P_P_H
+#define QQUICKTEXT_P_P_H
 
 //
 //  W A R N I N G
@@ -54,8 +54,8 @@
 // We mean it.
 //
 
-#include "qsgitem.h"
-#include "qsgimplicitsizeitem_p_p.h"
+#include "qquickitem.h"
+#include "qquickimplicitsizeitem_p_p.h"
 
 #include <QtDeclarative/qdeclarative.h>
 #include <QtGui/qtextlayout.h>
@@ -63,21 +63,21 @@
 QT_BEGIN_NAMESPACE
 
 class QTextLayout;
-class QSGTextDocumentWithImageResources;
+class QQuickTextDocumentWithImageResources;
 class QSGPlainTexture;
 
-class Q_AUTOTEST_EXPORT QSGTextPrivate : public QSGImplicitSizeItemPrivate
+class Q_AUTOTEST_EXPORT QQuickTextPrivate : public QQuickImplicitSizeItemPrivate
 {
-    Q_DECLARE_PUBLIC(QSGText)
+    Q_DECLARE_PUBLIC(QQuickText)
 public:
-    QSGTextPrivate();
-    ~QSGTextPrivate();
+    QQuickTextPrivate();
+    ~QQuickTextPrivate();
     void init();
 
     void updateSize();
     void updateLayout();
     bool determineHorizontalAlignment();
-    bool setHAlign(QSGText::HAlignment, bool forceAlign = false);
+    bool setHAlign(QQuickText::HAlignment, bool forceAlign = false);
     void mirrorChange();
     QTextDocument *textDocument();
     bool isLineLaidOutConnected();
@@ -86,16 +86,16 @@ public:
     QFont font;
     QFont sourceFont;
     QColor  color;
-    QSGText::TextStyle style;
+    QQuickText::TextStyle style;
     QColor  styleColor;
     QString activeLink;
-    QSGText::HAlignment hAlign;
-    QSGText::VAlignment vAlign;
-    QSGText::TextElideMode elideMode;
-    QSGText::TextFormat format;
-    QSGText::WrapMode wrapMode;
+    QQuickText::HAlignment hAlign;
+    QQuickText::VAlignment vAlign;
+    QQuickText::TextElideMode elideMode;
+    QQuickText::TextFormat format;
+    QQuickText::WrapMode wrapMode;
     qreal lineHeight;
-    QSGText::LineHeightMode lineHeightMode;
+    QQuickText::LineHeightMode lineHeightMode;
     int lineCount;
     int maximumLineCount;
     int maximumLineCountValid;
@@ -131,7 +131,7 @@ public:
 
     void ensureDoc();
     QPixmap textDocumentImage(bool drawStyle);
-    QSGTextDocumentWithImageResources *doc;
+    QQuickTextDocumentWithImageResources *doc;
 
     QRect setupTextLayout();
     void setupCustomLineGeometry(QTextLine &line, qreal &height, qreal elideWidth);
@@ -141,12 +141,12 @@ public:
     QString anchorAt(const QPointF &pos);
     QTextLayout layout;
     QList<QRectF> linesRects;
-    QSGTextLine *textLine;
+    QQuickTextLine *textLine;
 
     static QPixmap drawOutline(const QPixmap &source, const QPixmap &styleSource);
     static QPixmap drawOutline(const QPixmap &source, const QPixmap &styleSource, int yOffset);
 
-    static inline QSGTextPrivate *get(QSGText *t) {
+    static inline QQuickTextPrivate *get(QQuickText *t) {
         return t->d_func();
     }
 
@@ -165,4 +165,4 @@ public:
 
 QT_END_NAMESPACE
 
-#endif // QSGTEXT_P_P_H
+#endif // QQUICKTEXT_P_P_H
diff --git a/src/declarative/items/qsgtextedit.cpp b/src/declarative/items/qquicktextedit.cpp
index bbc751f99c..75f60bc08c 100644
--- a/src/declarative/items/qsgtextedit.cpp
+++ b/src/declarative/items/qquicktextedit.cpp
@@ -39,11 +39,11 @@
 **
 ****************************************************************************/
 
-#include "qsgtextedit_p.h"
-#include "qsgtextedit_p_p.h"
-#include "qsgevents_p_p.h"
-#include "qsgcanvas.h"
-#include "qsgtextnode_p.h"
+#include "qquicktextedit_p.h"
+#include "qquicktextedit_p_p.h"
+#include "qquickevents_p_p.h"
+#include "qquickcanvas.h"
+#include "qquicktextnode_p.h"
 #include "qsgsimplerectnode.h"
 
 #include <QtDeclarative/qdeclarativeinfo.h>
@@ -66,7 +66,7 @@ DEFINE_BOOL_CONFIG_OPTION(qmlDisableDistanceField, QML_DISABLE_DISTANCEFIELD)
 DEFINE_BOOL_CONFIG_OPTION(qmlEnableImageCache, QML_ENABLE_TEXT_IMAGE_CACHE)
 
 /*!
-    \qmlclass TextEdit QSGTextEdit
+    \qmlclass TextEdit QQuickTextEdit
     \inqmlmodule QtQuick 2
     \ingroup qml-basic-visual-elements
     \brief The TextEdit item displays multiple lines of editable formatted text.
@@ -116,16 +116,16 @@ TextEdit {
     The link must be in rich text or HTML format and the
     \a link string provides access to the particular link.
 */
-QSGTextEdit::QSGTextEdit(QSGItem *parent)
-: QSGImplicitSizeItem(*(new QSGTextEditPrivate), parent)
+QQuickTextEdit::QQuickTextEdit(QQuickItem *parent)
+: QQuickImplicitSizeItem(*(new QQuickTextEditPrivate), parent)
 {
-    Q_D(QSGTextEdit);
+    Q_D(QQuickTextEdit);
     d->init();
 }
 
-QString QSGTextEdit::text() const
+QString QQuickTextEdit::text() const
 {
-    Q_D(const QSGTextEdit);
+    Q_D(const QQuickTextEdit);
 
 #ifndef QT_NO_TEXTHTMLPARSER
     if (d->richText)
@@ -248,10 +248,10 @@ QString QSGTextEdit::text() const
     automatically determine whether the text should be treated as
     rich text.  This determination is made using Qt::mightBeRichText().
 */
-void QSGTextEdit::setText(const QString &text)
+void QQuickTextEdit::setText(const QString &text)
 {
-    Q_D(QSGTextEdit);
-    if (QSGTextEdit::text() == text)
+    Q_D(QQuickTextEdit);
+    if (QQuickTextEdit::text() == text)
         return;
 
     d->richText = d->format == RichText || (d->format == AutoText && Qt::mightBeRichText(text));
@@ -307,15 +307,15 @@ Column {
     \o \image declarative-textformat.png
     \endtable
 */
-QSGTextEdit::TextFormat QSGTextEdit::textFormat() const
+QQuickTextEdit::TextFormat QQuickTextEdit::textFormat() const
 {
-    Q_D(const QSGTextEdit);
+    Q_D(const QQuickTextEdit);
     return d->format;
 }
 
-void QSGTextEdit::setTextFormat(TextFormat format)
+void QQuickTextEdit::setTextFormat(TextFormat format)
 {
-    Q_D(QSGTextEdit);
+    Q_D(QQuickTextEdit);
     if (format == d->format)
         return;
     bool wasRich = d->richText;
@@ -338,15 +338,15 @@ void QSGTextEdit::setTextFormat(TextFormat format)
     emit textFormatChanged(d->format);
 }
 
-QFont QSGTextEdit::font() const
+QFont QQuickTextEdit::font() const
 {
-    Q_D(const QSGTextEdit);
+    Q_D(const QQuickTextEdit);
     return d->sourceFont;
 }
 
-void QSGTextEdit::setFont(const QFont &font)
+void QQuickTextEdit::setFont(const QFont &font)
 {
-    Q_D(QSGTextEdit);
+    Q_D(QQuickTextEdit);
     if (d->sourceFont == font)
         return;
 
@@ -386,15 +386,15 @@ void QSGTextEdit::setFont(const QFont &font)
     TextEdit { color: "steelblue" }
     \endqml
 */
-QColor QSGTextEdit::color() const
+QColor QQuickTextEdit::color() const
 {
-    Q_D(const QSGTextEdit);
+    Q_D(const QQuickTextEdit);
     return d->color;
 }
 
-void QSGTextEdit::setColor(const QColor &color)
+void QQuickTextEdit::setColor(const QColor &color)
 {
-    Q_D(QSGTextEdit);
+    Q_D(QQuickTextEdit);
     if (d->color == color)
         return;
 
@@ -411,15 +411,15 @@ void QSGTextEdit::setColor(const QColor &color)
 
     The text highlight color, used behind selections.
 */
-QColor QSGTextEdit::selectionColor() const
+QColor QQuickTextEdit::selectionColor() const
 {
-    Q_D(const QSGTextEdit);
+    Q_D(const QQuickTextEdit);
     return d->selectionColor;
 }
 
-void QSGTextEdit::setSelectionColor(const QColor &color)
+void QQuickTextEdit::setSelectionColor(const QColor &color)
 {
-    Q_D(QSGTextEdit);
+    Q_D(QQuickTextEdit);
     if (d->selectionColor == color)
         return;
 
@@ -436,15 +436,15 @@ void QSGTextEdit::setSelectionColor(const QColor &color)
 
     The selected text color, used in selections.
 */
-QColor QSGTextEdit::selectedTextColor() const
+QColor QQuickTextEdit::selectedTextColor() const
 {
-    Q_D(const QSGTextEdit);
+    Q_D(const QQuickTextEdit);
     return d->selectedTextColor;
 }
 
-void QSGTextEdit::setSelectedTextColor(const QColor &color)
+void QQuickTextEdit::setSelectedTextColor(const QColor &color)
 {
-    Q_D(QSGTextEdit);
+    Q_D(QQuickTextEdit);
     if (d->selectedTextColor == color)
         return;
 
@@ -486,15 +486,15 @@ void QSGTextEdit::setSelectedTextColor(const QColor &color)
     \c horizontalAlignment will remain unchanged. To query the effective horizontal alignment
     of TextEdit, use the read-only property \c effectiveHorizontalAlignment.
 */
-QSGTextEdit::HAlignment QSGTextEdit::hAlign() const
+QQuickTextEdit::HAlignment QQuickTextEdit::hAlign() const
 {
-    Q_D(const QSGTextEdit);
+    Q_D(const QQuickTextEdit);
     return d->hAlign;
 }
 
-void QSGTextEdit::setHAlign(HAlignment align)
+void QQuickTextEdit::setHAlign(HAlignment align)
 {
-    Q_D(QSGTextEdit);
+    Q_D(QQuickTextEdit);
     bool forceAlign = d->hAlignImplicit && d->effectiveLayoutMirror;
     d->hAlignImplicit = false;
     if (d->setHAlign(align, forceAlign) && isComponentComplete()) {
@@ -503,9 +503,9 @@ void QSGTextEdit::setHAlign(HAlignment align)
     }
 }
 
-void QSGTextEdit::resetHAlign()
+void QQuickTextEdit::resetHAlign()
 {
-    Q_D(QSGTextEdit);
+    Q_D(QQuickTextEdit);
     d->hAlignImplicit = true;
     if (d->determineHorizontalAlignment() && isComponentComplete()) {
         d->updateDefaultTextOption();
@@ -513,17 +513,17 @@ void QSGTextEdit::resetHAlign()
     }
 }
 
-QSGTextEdit::HAlignment QSGTextEdit::effectiveHAlign() const
+QQuickTextEdit::HAlignment QQuickTextEdit::effectiveHAlign() const
 {
-    Q_D(const QSGTextEdit);
-    QSGTextEdit::HAlignment effectiveAlignment = d->hAlign;
+    Q_D(const QQuickTextEdit);
+    QQuickTextEdit::HAlignment effectiveAlignment = d->hAlign;
     if (!d->hAlignImplicit && d->effectiveLayoutMirror) {
         switch (d->hAlign) {
-        case QSGTextEdit::AlignLeft:
-            effectiveAlignment = QSGTextEdit::AlignRight;
+        case QQuickTextEdit::AlignLeft:
+            effectiveAlignment = QQuickTextEdit::AlignRight;
             break;
-        case QSGTextEdit::AlignRight:
-            effectiveAlignment = QSGTextEdit::AlignLeft;
+        case QQuickTextEdit::AlignRight:
+            effectiveAlignment = QQuickTextEdit::AlignLeft;
             break;
         default:
             break;
@@ -532,11 +532,11 @@ QSGTextEdit::HAlignment QSGTextEdit::effectiveHAlign() const
     return effectiveAlignment;
 }
 
-bool QSGTextEditPrivate::setHAlign(QSGTextEdit::HAlignment alignment, bool forceAlign)
+bool QQuickTextEditPrivate::setHAlign(QQuickTextEdit::HAlignment alignment, bool forceAlign)
 {
-    Q_Q(QSGTextEdit);
+    Q_Q(QQuickTextEdit);
     if (hAlign != alignment || forceAlign) {
-        QSGTextEdit::HAlignment oldEffectiveHAlign = q->effectiveHAlign();
+        QQuickTextEdit::HAlignment oldEffectiveHAlign = q->effectiveHAlign();
         hAlign = alignment;
         emit q->horizontalAlignmentChanged(alignment);
         if (oldEffectiveHAlign != q->effectiveHAlign())
@@ -546,21 +546,21 @@ bool QSGTextEditPrivate::setHAlign(QSGTextEdit::HAlignment alignment, bool force
     return false;
 }
 
-bool QSGTextEditPrivate::determineHorizontalAlignment()
+bool QQuickTextEditPrivate::determineHorizontalAlignment()
 {
-    Q_Q(QSGTextEdit);
+    Q_Q(QQuickTextEdit);
     if (hAlignImplicit && q->isComponentComplete()) {
         bool alignToRight = text.isEmpty() ? QGuiApplication::keyboardInputDirection() == Qt::RightToLeft : rightToLeftText;
-        return setHAlign(alignToRight ? QSGTextEdit::AlignRight : QSGTextEdit::AlignLeft);
+        return setHAlign(alignToRight ? QQuickTextEdit::AlignRight : QQuickTextEdit::AlignLeft);
     }
     return false;
 }
 
-void QSGTextEditPrivate::mirrorChange()
+void QQuickTextEditPrivate::mirrorChange()
 {
-    Q_Q(QSGTextEdit);
+    Q_Q(QQuickTextEdit);
     if (q->isComponentComplete()) {
-        if (!hAlignImplicit && (hAlign == QSGTextEdit::AlignRight || hAlign == QSGTextEdit::AlignLeft)) {
+        if (!hAlignImplicit && (hAlign == QQuickTextEdit::AlignRight || hAlign == QQuickTextEdit::AlignLeft)) {
             updateDefaultTextOption();
             q->updateSize();
             emit q->effectiveHorizontalAlignmentChanged();
@@ -568,15 +568,15 @@ void QSGTextEditPrivate::mirrorChange()
     }
 }
 
-QSGTextEdit::VAlignment QSGTextEdit::vAlign() const
+QQuickTextEdit::VAlignment QQuickTextEdit::vAlign() const
 {
-    Q_D(const QSGTextEdit);
+    Q_D(const QQuickTextEdit);
     return d->vAlign;
 }
 
-void QSGTextEdit::setVAlign(QSGTextEdit::VAlignment alignment)
+void QQuickTextEdit::setVAlign(QQuickTextEdit::VAlignment alignment)
 {
-    Q_D(QSGTextEdit);
+    Q_D(QQuickTextEdit);
     if (alignment == d->vAlign)
         return;
     d->vAlign = alignment;
@@ -600,15 +600,15 @@ void QSGTextEdit::setVAlign(QSGTextEdit::VAlignment alignment)
 
     The default is TextEdit.NoWrap. If you set a width, consider using TextEdit.Wrap.
 */
-QSGTextEdit::WrapMode QSGTextEdit::wrapMode() const
+QQuickTextEdit::WrapMode QQuickTextEdit::wrapMode() const
 {
-    Q_D(const QSGTextEdit);
+    Q_D(const QQuickTextEdit);
     return d->wrapMode;
 }
 
-void QSGTextEdit::setWrapMode(WrapMode mode)
+void QQuickTextEdit::setWrapMode(WrapMode mode)
 {
-    Q_D(QSGTextEdit);
+    Q_D(QQuickTextEdit);
     if (mode == d->wrapMode)
         return;
     d->wrapMode = mode;
@@ -622,9 +622,9 @@ void QSGTextEdit::setWrapMode(WrapMode mode)
 
     Returns the total number of lines in the textEdit item.
 */
-int QSGTextEdit::lineCount() const
+int QQuickTextEdit::lineCount() const
 {
-    Q_D(const QSGTextEdit);
+    Q_D(const QQuickTextEdit);
     return d->lineCount;
 }
 
@@ -634,9 +634,9 @@ int QSGTextEdit::lineCount() const
     Returns the width of the text, including the width past the width
     which is covered due to insufficient wrapping if \l wrapMode is set.
 */
-qreal QSGTextEdit::paintedWidth() const
+qreal QQuickTextEdit::paintedWidth() const
 {
-    Q_D(const QSGTextEdit);
+    Q_D(const QQuickTextEdit);
     return d->paintedSize.width();
 }
 
@@ -646,9 +646,9 @@ qreal QSGTextEdit::paintedWidth() const
     Returns the height of the text, including the height past the height
     that is covered if the text does not fit within the set height.
 */
-qreal QSGTextEdit::paintedHeight() const
+qreal QQuickTextEdit::paintedHeight() const
 {
-    Q_D(const QSGTextEdit);
+    Q_D(const QQuickTextEdit);
     return d->paintedSize.height();
 }
 
@@ -659,9 +659,9 @@ qreal QSGTextEdit::paintedHeight() const
     and height properties correspond to the cursor that would describe
     that position.
 */
-QRectF QSGTextEdit::positionToRectangle(int pos) const
+QRectF QQuickTextEdit::positionToRectangle(int pos) const
 {
-    Q_D(const QSGTextEdit);
+    Q_D(const QQuickTextEdit);
     QTextCursor c(d->document);
     c.setPosition(pos);
     return d->control->cursorRect(c);
@@ -676,9 +676,9 @@ QRectF QSGTextEdit::positionToRectangle(int pos) const
     Position 0 is before the first character, position 1 is after the first character
     but before the second, and so on until position \l {text}.length, which is after all characters.
 */
-int QSGTextEdit::positionAt(int x, int y) const
+int QQuickTextEdit::positionAt(int x, int y) const
 {
-    Q_D(const QSGTextEdit);
+    Q_D(const QQuickTextEdit);
     int r = d->document->documentLayout()->hitTest(QPoint(x,y-d->yoff), Qt::FuzzyHit);
     QTextCursor cursor = d->control->textCursor();
     if (r > cursor.position()) {
@@ -736,10 +736,10 @@ int QSGTextEdit::positionAt(int x, int y) const
     The same sequence with TextEdit.SelectWords will extend the selection start to a word boundary
     before or on position 5 and extend the selection end to a word boundary on or past position 9.
 */
-void QSGTextEdit::moveCursorSelection(int pos)
+void QQuickTextEdit::moveCursorSelection(int pos)
 {
     //Note that this is the same as setCursorPosition but with the KeepAnchor flag set
-    Q_D(QSGTextEdit);
+    Q_D(QQuickTextEdit);
     QTextCursor cursor = d->control->textCursor();
     if (cursor.position() == pos)
         return;
@@ -747,9 +747,9 @@ void QSGTextEdit::moveCursorSelection(int pos)
     d->control->setTextCursor(cursor);
 }
 
-void QSGTextEdit::moveCursorSelection(int pos, SelectionMode mode)
+void QQuickTextEdit::moveCursorSelection(int pos, SelectionMode mode)
 {
-    Q_D(QSGTextEdit);
+    Q_D(QQuickTextEdit);
     QTextCursor cursor = d->control->textCursor();
     if (cursor.position() == pos)
         return;
@@ -803,15 +803,15 @@ void QSGTextEdit::moveCursorSelection(int pos, SelectionMode mode)
     This property is set and unset when the text edit gets active focus, but it can also
     be set directly (useful, for example, if a KeyProxy might forward keys to it).
 */
-bool QSGTextEdit::isCursorVisible() const
+bool QQuickTextEdit::isCursorVisible() const
 {
-    Q_D(const QSGTextEdit);
+    Q_D(const QQuickTextEdit);
     return d->cursorVisible;
 }
 
-void QSGTextEdit::setCursorVisible(bool on)
+void QQuickTextEdit::setCursorVisible(bool on)
 {
-    Q_D(QSGTextEdit);
+    Q_D(QQuickTextEdit);
     if (d->cursorVisible == on)
         return;
     d->cursorVisible = on;
@@ -826,15 +826,15 @@ void QSGTextEdit::setCursorVisible(bool on)
     \qmlproperty int QtQuick2::TextEdit::cursorPosition
     The position of the cursor in the TextEdit.
 */
-int QSGTextEdit::cursorPosition() const
+int QQuickTextEdit::cursorPosition() const
 {
-    Q_D(const QSGTextEdit);
+    Q_D(const QQuickTextEdit);
     return d->control->textCursor().position();
 }
 
-void QSGTextEdit::setCursorPosition(int pos)
+void QQuickTextEdit::setCursorPosition(int pos)
 {
-    Q_D(QSGTextEdit);
+    Q_D(QQuickTextEdit);
     if (pos < 0 || pos > d->text.length())
         return;
     QTextCursor cursor = d->control->textCursor();
@@ -857,15 +857,15 @@ void QSGTextEdit::setCursorPosition(int pos)
     Note that the root item of the delegate component must be a QDeclarativeItem or
     QDeclarativeItem derived item.
 */
-QDeclarativeComponent* QSGTextEdit::cursorDelegate() const
+QDeclarativeComponent* QQuickTextEdit::cursorDelegate() const
 {
-    Q_D(const QSGTextEdit);
+    Q_D(const QQuickTextEdit);
     return d->cursorComponent;
 }
 
-void QSGTextEdit::setCursorDelegate(QDeclarativeComponent* c)
+void QQuickTextEdit::setCursorDelegate(QDeclarativeComponent* c)
 {
-    Q_D(QSGTextEdit);
+    Q_D(QQuickTextEdit);
     if (d->cursorComponent) {
         if (d->cursor) {
             d->control->setCursorWidth(-1);
@@ -886,14 +886,14 @@ void QSGTextEdit::setCursorDelegate(QDeclarativeComponent* c)
     emit cursorDelegateChanged();
 }
 
-void QSGTextEdit::loadCursorDelegate()
+void QQuickTextEdit::loadCursorDelegate()
 {
-    Q_D(QSGTextEdit);
+    Q_D(QQuickTextEdit);
     if (d->cursorComponent->isLoading())
         return;
     QDeclarativeContext *creationContext = d->cursorComponent->creationContext();
     QObject *object = d->cursorComponent->create(creationContext ? creationContext : qmlContext(this));
-    d->cursor = qobject_cast<QSGItem*>(object);
+    d->cursor = qobject_cast<QQuickItem*>(object);
     if (d->cursor) {
         d->control->setCursorWidth(0);
         updateCursor();
@@ -917,9 +917,9 @@ void QSGTextEdit::loadCursorDelegate()
 
     \sa selectionEnd, cursorPosition, selectedText
 */
-int QSGTextEdit::selectionStart() const
+int QQuickTextEdit::selectionStart() const
 {
-    Q_D(const QSGTextEdit);
+    Q_D(const QQuickTextEdit);
     return d->control->textCursor().selectionStart();
 }
 
@@ -933,9 +933,9 @@ int QSGTextEdit::selectionStart() const
 
     \sa selectionStart, cursorPosition, selectedText
 */
-int QSGTextEdit::selectionEnd() const
+int QQuickTextEdit::selectionEnd() const
 {
-    Q_D(const QSGTextEdit);
+    Q_D(const QQuickTextEdit);
     return d->control->textCursor().selectionEnd();
 }
 
@@ -953,9 +953,9 @@ int QSGTextEdit::selectionEnd() const
             myTextEdit.selectionEnd);
     \endcode
 */
-QString QSGTextEdit::selectedText() const
+QString QQuickTextEdit::selectedText() const
 {
-    Q_D(const QSGTextEdit);
+    Q_D(const QQuickTextEdit);
     return d->control->textCursor().selectedText();
 }
 
@@ -965,15 +965,15 @@ QString QSGTextEdit::selectedText() const
     Whether the TextEdit should gain active focus on a mouse press. By default this is
     set to true.
 */
-bool QSGTextEdit::focusOnPress() const
+bool QQuickTextEdit::focusOnPress() const
 {
-    Q_D(const QSGTextEdit);
+    Q_D(const QQuickTextEdit);
     return d->focusOnPress;
 }
 
-void QSGTextEdit::setFocusOnPress(bool on)
+void QQuickTextEdit::setFocusOnPress(bool on)
 {
-    Q_D(QSGTextEdit);
+    Q_D(QQuickTextEdit);
     if (d->focusOnPress == on)
         return;
     d->focusOnPress = on;
@@ -986,15 +986,15 @@ void QSGTextEdit::setFocusOnPress(bool on)
     Whether the TextEdit should keep the selection visible when it loses active focus to another
     item in the scene. By default this is set to true;
 */
-bool QSGTextEdit::persistentSelection() const
+bool QQuickTextEdit::persistentSelection() const
 {
-    Q_D(const QSGTextEdit);
+    Q_D(const QQuickTextEdit);
     return d->persistentSelection;
 }
 
-void QSGTextEdit::setPersistentSelection(bool on)
+void QQuickTextEdit::setPersistentSelection(bool on)
 {
-    Q_D(QSGTextEdit);
+    Q_D(QQuickTextEdit);
     if (d->persistentSelection == on)
         return;
     d->persistentSelection = on;
@@ -1006,15 +1006,15 @@ void QSGTextEdit::setPersistentSelection(bool on)
 
    The margin, in pixels, around the text in the TextEdit.
 */
-qreal QSGTextEdit::textMargin() const
+qreal QQuickTextEdit::textMargin() const
 {
-    Q_D(const QSGTextEdit);
+    Q_D(const QQuickTextEdit);
     return d->textMargin;
 }
 
-void QSGTextEdit::setTextMargin(qreal margin)
+void QQuickTextEdit::setTextMargin(qreal margin)
 {
-    Q_D(QSGTextEdit);
+    Q_D(QQuickTextEdit);
     if (d->textMargin == margin)
         return;
     d->textMargin = margin;
@@ -1022,22 +1022,22 @@ void QSGTextEdit::setTextMargin(qreal margin)
     emit textMarginChanged(d->textMargin);
 }
 
-void QSGTextEdit::geometryChanged(const QRectF &newGeometry,
+void QQuickTextEdit::geometryChanged(const QRectF &newGeometry,
                                   const QRectF &oldGeometry)
 {
     if (newGeometry.width() != oldGeometry.width())
         updateSize();
-    QSGImplicitSizeItem::geometryChanged(newGeometry, oldGeometry);
+    QQuickImplicitSizeItem::geometryChanged(newGeometry, oldGeometry);
 }
 
 /*!
     Ensures any delayed caching or data loading the class
     needs to performed is complete.
 */
-void QSGTextEdit::componentComplete()
+void QQuickTextEdit::componentComplete()
 {
-    Q_D(QSGTextEdit);
-    QSGImplicitSizeItem::componentComplete();
+    Q_D(QQuickTextEdit);
+    QQuickImplicitSizeItem::componentComplete();
 
     if (d->richText)
         d->useImageFallback = qmlEnableImageCache();
@@ -1060,15 +1060,15 @@ void QSGTextEdit::componentComplete()
     not be an appropriate interaction (eg. may conflict with how
     the text needs to behave inside a Flickable.
 */
-bool QSGTextEdit::selectByMouse() const
+bool QQuickTextEdit::selectByMouse() const
 {
-    Q_D(const QSGTextEdit);
+    Q_D(const QQuickTextEdit);
     return d->selectByMouse;
 }
 
-void QSGTextEdit::setSelectByMouse(bool on)
+void QQuickTextEdit::setSelectByMouse(bool on)
 {
-    Q_D(QSGTextEdit);
+    Q_D(QQuickTextEdit);
     if (d->selectByMouse != on) {
         d->selectByMouse = on;
         setKeepMouseGrab(on);
@@ -1092,15 +1092,15 @@ void QSGTextEdit::setSelectByMouse(bool on)
 
     This property only applies when \l selectByMouse is true.
 */
-QSGTextEdit::SelectionMode QSGTextEdit::mouseSelectionMode() const
+QQuickTextEdit::SelectionMode QQuickTextEdit::mouseSelectionMode() const
 {
-    Q_D(const QSGTextEdit);
+    Q_D(const QQuickTextEdit);
     return d->mouseSelectionMode;
 }
 
-void QSGTextEdit::setMouseSelectionMode(SelectionMode mode)
+void QQuickTextEdit::setMouseSelectionMode(SelectionMode mode)
 {
-    Q_D(QSGTextEdit);
+    Q_D(QQuickTextEdit);
     if (d->mouseSelectionMode != mode) {
         d->mouseSelectionMode = mode;
         d->control->setWordSelectionEnabled(mode == SelectWords);
@@ -1116,13 +1116,13 @@ void QSGTextEdit::setMouseSelectionMode(SelectionMode mode)
 
     By default this property is false.
 */
-void QSGTextEdit::setReadOnly(bool r)
+void QQuickTextEdit::setReadOnly(bool r)
 {
-    Q_D(QSGTextEdit);
+    Q_D(QQuickTextEdit);
     if (r == isReadOnly())
         return;
 
-    setFlag(QSGItem::ItemAcceptsInputMethod, !r);
+    setFlag(QQuickItem::ItemAcceptsInputMethod, !r);
     Qt::TextInteractionFlags flags = Qt::LinksAccessibleByMouse;
     if (d->selectByMouse)
         flags = flags | Qt::TextSelectableByMouse;
@@ -1135,9 +1135,9 @@ void QSGTextEdit::setReadOnly(bool r)
     emit readOnlyChanged(r);
 }
 
-bool QSGTextEdit::isReadOnly() const
+bool QQuickTextEdit::isReadOnly() const
 {
-    Q_D(const QSGTextEdit);
+    Q_D(const QQuickTextEdit);
     return !(d->control->textInteractionFlags() & Qt::TextEditable);
 }
 
@@ -1145,9 +1145,9 @@ bool QSGTextEdit::isReadOnly() const
     Sets how the text edit should interact with user input to the given
     \a flags.
 */
-void QSGTextEdit::setTextInteractionFlags(Qt::TextInteractionFlags flags)
+void QQuickTextEdit::setTextInteractionFlags(Qt::TextInteractionFlags flags)
 {
-    Q_D(QSGTextEdit);
+    Q_D(QQuickTextEdit);
     d->control->setTextInteractionFlags(flags);
 }
 
@@ -1155,9 +1155,9 @@ void QSGTextEdit::setTextInteractionFlags(Qt::TextInteractionFlags flags)
     Returns the flags specifying how the text edit should interact
     with user input.
 */
-Qt::TextInteractionFlags QSGTextEdit::textInteractionFlags() const
+Qt::TextInteractionFlags QQuickTextEdit::textInteractionFlags() const
 {
-    Q_D(const QSGTextEdit);
+    Q_D(const QQuickTextEdit);
     return d->control->textInteractionFlags();
 }
 
@@ -1167,44 +1167,44 @@ Qt::TextInteractionFlags QSGTextEdit::textInteractionFlags() const
     The rectangle where the text cursor is rendered
     within the text edit. Read-only.
 */
-QRect QSGTextEdit::cursorRectangle() const
+QRect QQuickTextEdit::cursorRectangle() const
 {
-    Q_D(const QSGTextEdit);
+    Q_D(const QQuickTextEdit);
     return d->control->cursorRect().toRect().translated(0,d->yoff);
 }
 
-bool QSGTextEdit::event(QEvent *event)
+bool QQuickTextEdit::event(QEvent *event)
 {
-    Q_D(QSGTextEdit);
+    Q_D(QQuickTextEdit);
     if (event->type() == QEvent::ShortcutOverride) {
         d->control->processEvent(event, QPointF(0, -d->yoff));
         return event->isAccepted();
     }
-    return QSGImplicitSizeItem::event(event);
+    return QQuickImplicitSizeItem::event(event);
 }
 
 /*!
 \overload
 Handles the given key \a event.
 */
-void QSGTextEdit::keyPressEvent(QKeyEvent *event)
+void QQuickTextEdit::keyPressEvent(QKeyEvent *event)
 {
-    Q_D(QSGTextEdit);
+    Q_D(QQuickTextEdit);
     d->control->processEvent(event, QPointF(0, -d->yoff));
     if (!event->isAccepted())
-        QSGImplicitSizeItem::keyPressEvent(event);
+        QQuickImplicitSizeItem::keyPressEvent(event);
 }
 
 /*!
 \overload
 Handles the given key \a event.
 */
-void QSGTextEdit::keyReleaseEvent(QKeyEvent *event)
+void QQuickTextEdit::keyReleaseEvent(QKeyEvent *event)
 {
-    Q_D(QSGTextEdit);
+    Q_D(QQuickTextEdit);
     d->control->processEvent(event, QPointF(0, -d->yoff));
     if (!event->isAccepted())
-        QSGImplicitSizeItem::keyReleaseEvent(event);
+        QQuickImplicitSizeItem::keyReleaseEvent(event);
 }
 
 /*!
@@ -1212,9 +1212,9 @@ void QSGTextEdit::keyReleaseEvent(QKeyEvent *event)
 
     Removes active text selection.
 */
-void QSGTextEdit::deselect()
+void QQuickTextEdit::deselect()
 {
-    Q_D(QSGTextEdit);
+    Q_D(QQuickTextEdit);
     QTextCursor c = d->control->textCursor();
     c.clearSelection();
     d->control->setTextCursor(c);
@@ -1225,9 +1225,9 @@ void QSGTextEdit::deselect()
 
     Causes all text to be selected.
 */
-void QSGTextEdit::selectAll()
+void QQuickTextEdit::selectAll()
 {
-    Q_D(QSGTextEdit);
+    Q_D(QQuickTextEdit);
     d->control->selectAll();
 }
 
@@ -1236,9 +1236,9 @@ void QSGTextEdit::selectAll()
 
     Causes the word closest to the current cursor position to be selected.
 */
-void QSGTextEdit::selectWord()
+void QQuickTextEdit::selectWord()
 {
-    Q_D(QSGTextEdit);
+    Q_D(QQuickTextEdit);
     QTextCursor c = d->control->textCursor();
     c.select(QTextCursor::WordUnderCursor);
     d->control->setTextCursor(c);
@@ -1257,9 +1257,9 @@ void QSGTextEdit::selectWord()
 
     \sa selectionStart, selectionEnd
 */
-void QSGTextEdit::select(int start, int end)
+void QQuickTextEdit::select(int start, int end)
 {
-    Q_D(QSGTextEdit);
+    Q_D(QQuickTextEdit);
     if (start < 0 || end < 0 || start > d->text.length() || end > d->text.length())
         return;
     QTextCursor cursor = d->control->textCursor();
@@ -1279,9 +1279,9 @@ void QSGTextEdit::select(int start, int end)
     Returns true if the natural reading direction of the editor text
     found between positions \a start and \a end is right to left.
 */
-bool QSGTextEdit::isRightToLeft(int start, int end)
+bool QQuickTextEdit::isRightToLeft(int start, int end)
 {
-    Q_D(QSGTextEdit);
+    Q_D(QQuickTextEdit);
     if (start > end) {
         qmlInfo(this) << "isRightToLeft(start, end) called with the end property being smaller than the start.";
         return false;
@@ -1296,9 +1296,9 @@ bool QSGTextEdit::isRightToLeft(int start, int end)
 
     Moves the currently selected text to the system clipboard.
 */
-void QSGTextEdit::cut()
+void QQuickTextEdit::cut()
 {
-    Q_D(QSGTextEdit);
+    Q_D(QQuickTextEdit);
     d->control->cut();
 }
 
@@ -1307,9 +1307,9 @@ void QSGTextEdit::cut()
 
     Copies the currently selected text to the system clipboard.
 */
-void QSGTextEdit::copy()
+void QQuickTextEdit::copy()
 {
-    Q_D(QSGTextEdit);
+    Q_D(QQuickTextEdit);
     d->control->copy();
 }
 
@@ -1318,9 +1318,9 @@ void QSGTextEdit::copy()
 
     Replaces the currently selected text by the contents of the system clipboard.
 */
-void QSGTextEdit::paste()
+void QQuickTextEdit::paste()
 {
-    Q_D(QSGTextEdit);
+    Q_D(QQuickTextEdit);
     d->control->paste();
 }
 #endif // QT_NO_CLIPBOARD
@@ -1329,9 +1329,9 @@ void QSGTextEdit::paste()
 \overload
 Handles the given mouse \a event.
 */
-void QSGTextEdit::mousePressEvent(QMouseEvent *event)
+void QQuickTextEdit::mousePressEvent(QMouseEvent *event)
 {
-    Q_D(QSGTextEdit);
+    Q_D(QQuickTextEdit);
     if (d->focusOnPress){
         bool hadActiveFocus = hasActiveFocus();
         forceActiveFocus();
@@ -1341,75 +1341,75 @@ void QSGTextEdit::mousePressEvent(QMouseEvent *event)
     }
     d->control->processEvent(event, QPointF(0, -d->yoff));
     if (!event->isAccepted())
-        QSGImplicitSizeItem::mousePressEvent(event);
+        QQuickImplicitSizeItem::mousePressEvent(event);
 }
 
 /*!
 \overload
 Handles the given mouse \a event.
 */
-void QSGTextEdit::mouseReleaseEvent(QMouseEvent *event)
+void QQuickTextEdit::mouseReleaseEvent(QMouseEvent *event)
 {
-    Q_D(QSGTextEdit);
+    Q_D(QQuickTextEdit);
     d->control->processEvent(event, QPointF(0, -d->yoff));
 
     if (!event->isAccepted())
-        QSGImplicitSizeItem::mouseReleaseEvent(event);
+        QQuickImplicitSizeItem::mouseReleaseEvent(event);
 }
 
 /*!
 \overload
 Handles the given mouse \a event.
 */
-void QSGTextEdit::mouseDoubleClickEvent(QMouseEvent *event)
+void QQuickTextEdit::mouseDoubleClickEvent(QMouseEvent *event)
 {
-    Q_D(QSGTextEdit);
+    Q_D(QQuickTextEdit);
     d->control->processEvent(event, QPointF(0, -d->yoff));
     if (!event->isAccepted())
-        QSGImplicitSizeItem::mouseDoubleClickEvent(event);
+        QQuickImplicitSizeItem::mouseDoubleClickEvent(event);
 }
 
 /*!
 \overload
 Handles the given mouse \a event.
 */
-void QSGTextEdit::mouseMoveEvent(QMouseEvent *event)
+void QQuickTextEdit::mouseMoveEvent(QMouseEvent *event)
 {
-    Q_D(QSGTextEdit);
+    Q_D(QQuickTextEdit);
     d->control->processEvent(event, QPointF(0, -d->yoff));
     if (!event->isAccepted())
-        QSGImplicitSizeItem::mouseMoveEvent(event);
+        QQuickImplicitSizeItem::mouseMoveEvent(event);
 }
 
 /*!
 \overload
 Handles the given input method \a event.
 */
-void QSGTextEdit::inputMethodEvent(QInputMethodEvent *event)
+void QQuickTextEdit::inputMethodEvent(QInputMethodEvent *event)
 {
-    Q_D(QSGTextEdit);
+    Q_D(QQuickTextEdit);
     const bool wasComposing = isInputMethodComposing();
     d->control->processEvent(event, QPointF(0, -d->yoff));
     if (wasComposing != isInputMethodComposing())
         emit inputMethodComposingChanged();
 }
 
-void QSGTextEdit::itemChange(ItemChange change, const ItemChangeData &value)
+void QQuickTextEdit::itemChange(ItemChange change, const ItemChangeData &value)
 {
-    Q_D(QSGTextEdit);
+    Q_D(QQuickTextEdit);
     if (change == ItemActiveFocusHasChanged) {
         setCursorVisible(value.boolValue); // ### refactor: focus handling && d->canvas && d->canvas->hasFocus());
     }
-    QSGItem::itemChange(change, value);
+    QQuickItem::itemChange(change, value);
 }
 
 /*!
 \overload
 Returns the value of the given \a property.
 */
-QVariant QSGTextEdit::inputMethodQuery(Qt::InputMethodQuery property) const
+QVariant QQuickTextEdit::inputMethodQuery(Qt::InputMethodQuery property) const
 {
-    Q_D(const QSGTextEdit);
+    Q_D(const QQuickTextEdit);
 
     QVariant v;
     switch (property) {
@@ -1427,9 +1427,9 @@ QVariant QSGTextEdit::inputMethodQuery(Qt::InputMethodQuery property) const
 
 }
 
-void QSGTextEdit::updateImageCache(const QRectF &)
+void QQuickTextEdit::updateImageCache(const QRectF &)
 {
-    Q_D(QSGTextEdit);
+    Q_D(QQuickTextEdit);
 
     // Do we really need the image cache?
     if (!d->richText || !d->useImageFallback) {
@@ -1458,19 +1458,19 @@ void QSGTextEdit::updateImageCache(const QRectF &)
 
 }
 
-QSGNode *QSGTextEdit::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *updatePaintNodeData)
+QSGNode *QQuickTextEdit::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *updatePaintNodeData)
 {
     Q_UNUSED(updatePaintNodeData);
-    Q_D(QSGTextEdit);
+    Q_D(QQuickTextEdit);
 
     QSGNode *currentNode = oldNode;
     if (d->richText && d->useImageFallback) {
         QSGImageNode *node = 0;
-        if (oldNode == 0 || d->nodeType != QSGTextEditPrivate::NodeIsTexture) {
+        if (oldNode == 0 || d->nodeType != QQuickTextEditPrivate::NodeIsTexture) {
             delete oldNode;
-            node = QSGItemPrivate::get(this)->sceneGraphContext()->createImageNode();
+            node = QQuickItemPrivate::get(this)->sceneGraphContext()->createImageNode();
             d->texture = new QSGPlainTexture();
-            d->nodeType = QSGTextEditPrivate::NodeIsTexture;
+            d->nodeType = QQuickTextEditPrivate::NodeIsTexture;
             currentNode = node;
         } else {
             node = static_cast<QSGImageNode *>(oldNode);
@@ -1497,14 +1497,14 @@ QSGNode *QSGTextEdit::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *upd
         d->document->markContentsDirty(0, d->document->characterCount());
 #endif
 
-        QSGTextNode *node = 0;
-        if (oldNode == 0 || d->nodeType != QSGTextEditPrivate::NodeIsText) {
+        QQuickTextNode *node = 0;
+        if (oldNode == 0 || d->nodeType != QQuickTextEditPrivate::NodeIsText) {
             delete oldNode;
-            node = new QSGTextNode(QSGItemPrivate::get(this)->sceneGraphContext());
-            d->nodeType = QSGTextEditPrivate::NodeIsText;
+            node = new QQuickTextNode(QQuickItemPrivate::get(this)->sceneGraphContext());
+            d->nodeType = QQuickTextEditPrivate::NodeIsText;
             currentNode = node;
         } else {
-            node = static_cast<QSGTextNode *>(oldNode);
+            node = static_cast<QQuickTextNode *>(oldNode);
         }
 
         node->deleteContent();
@@ -1514,7 +1514,7 @@ QSGNode *QSGTextEdit::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *upd
 
         QColor selectionColor = d->control->palette().color(QPalette::Highlight);
         QColor selectedTextColor = d->control->palette().color(QPalette::HighlightedText);
-        node->addTextDocument(bounds.topLeft(), d->document, d->color, QSGText::Normal, QColor(),
+        node->addTextDocument(bounds.topLeft(), d->document, d->color, QQuickText::Normal, QColor(),
                               selectionColor, selectedTextColor, selectionStart(),
                               selectionEnd() - 1);  // selectionEnd() returns first char after
                                                     // selection
@@ -1527,8 +1527,8 @@ QSGNode *QSGTextEdit::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *upd
 #endif
     }
 
-    if (d->nodeType == QSGTextEditPrivate::NodeIsText && d->cursorComponent == 0 && !isReadOnly()) {
-        QSGTextNode *node = static_cast<QSGTextNode *>(currentNode);
+    if (d->nodeType == QQuickTextEditPrivate::NodeIsText && d->cursorComponent == 0 && !isReadOnly()) {
+        QQuickTextNode *node = static_cast<QQuickTextNode *>(currentNode);
 
         QColor color = (!d->cursorVisible || !d->control->cursorOn())
                 ? QColor(0, 0, 0, 0)
@@ -1566,9 +1566,9 @@ QSGNode *QSGTextEdit::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *upd
     Returns true if the TextEdit is writable and the content of the clipboard is
     suitable for pasting into the TextEdit.
 */
-bool QSGTextEdit::canPaste() const
+bool QQuickTextEdit::canPaste() const
 {
-    Q_D(const QSGTextEdit);
+    Q_D(const QQuickTextEdit);
     return d->canPaste;
 }
 
@@ -1584,22 +1584,22 @@ bool QSGTextEdit::canPaste() const
     to determine when to disable events handlers that may interfere with the
     correct operation of an input method.
 */
-bool QSGTextEdit::isInputMethodComposing() const
+bool QQuickTextEdit::isInputMethodComposing() const
 {
-    Q_D(const QSGTextEdit);
+    Q_D(const QQuickTextEdit);
     if (QTextLayout *layout = d->control->textCursor().block().layout())
         return layout->preeditAreaText().length() > 0;
     return false;
 }
 
-void QSGTextEditPrivate::init()
+void QQuickTextEditPrivate::init()
 {
-    Q_Q(QSGTextEdit);
+    Q_Q(QQuickTextEdit);
 
     q->setSmooth(smooth);
     q->setAcceptedMouseButtons(Qt::LeftButton);
-    q->setFlag(QSGItem::ItemAcceptsInputMethod);
-    q->setFlag(QSGItem::ItemHasContents);
+    q->setFlag(QQuickItem::ItemAcceptsInputMethod);
+    q->setFlag(QQuickItem::ItemHasContents);
 
     control = new QTextControl(q);
     control->setIgnoreUnusedNavigationEvents(true);
@@ -1612,7 +1612,7 @@ void QSGTextEditPrivate::init()
     // cursor blinks.
     if (!QObject::disconnect(control, SIGNAL(updateCursorRequest(QRectF)),
                              control, SIGNAL(updateRequest(QRectF)))) {
-        qWarning("QSGTextEditPrivate::init: Failed to disconnect updateCursorRequest and updateRequest");
+        qWarning("QQuickTextEditPrivate::init: Failed to disconnect updateCursorRequest and updateRequest");
     }
 
     // QTextControl follows the default text color
@@ -1647,9 +1647,9 @@ void QSGTextEditPrivate::init()
     updateDefaultTextOption();
 }
 
-void QSGTextEdit::q_textChanged()
+void QQuickTextEdit::q_textChanged()
 {
-    Q_D(QSGTextEdit);
+    Q_D(QQuickTextEdit);
     d->text = text();
     d->rightToLeftText = d->document->begin().layout()->engine()->isRightToLeft();
     d->determineHorizontalAlignment();
@@ -1659,9 +1659,9 @@ void QSGTextEdit::q_textChanged()
     emit textChanged(d->text);
 }
 
-void QSGTextEdit::moveCursorDelegate()
+void QQuickTextEdit::moveCursorDelegate()
 {
-    Q_D(QSGTextEdit);
+    Q_D(QQuickTextEdit);
     d->determineHorizontalAlignment();
     updateMicroFocus();
     emit cursorRectangleChanged();
@@ -1672,9 +1672,9 @@ void QSGTextEdit::moveCursorDelegate()
     d->cursor->setY(cursorRect.y());
 }
 
-void QSGTextEditPrivate::updateSelection()
+void QQuickTextEditPrivate::updateSelection()
 {
-    Q_Q(QSGTextEdit);
+    Q_Q(QQuickTextEdit);
     QTextCursor cursor = control->textCursor();
     bool startChange = (lastSelectionStart != cursor.selectionStart());
     bool endChange = (lastSelectionEnd != cursor.selectionEnd());
@@ -1689,9 +1689,9 @@ void QSGTextEditPrivate::updateSelection()
         q->selectionEndChanged();
 }
 
-void QSGTextEdit::updateSelectionMarkers()
+void QQuickTextEdit::updateSelectionMarkers()
 {
-    Q_D(QSGTextEdit);
+    Q_D(QQuickTextEdit);
     if (d->lastSelectionStart != d->control->textCursor().selectionStart()) {
         d->lastSelectionStart = d->control->textCursor().selectionStart();
         emit selectionStartChanged();
@@ -1702,10 +1702,10 @@ void QSGTextEdit::updateSelectionMarkers()
     }
 }
 
-QRectF QSGTextEdit::boundingRect() const
+QRectF QQuickTextEdit::boundingRect() const
 {
-    Q_D(const QSGTextEdit);
-    QRectF r = QSGImplicitSizeItem::boundingRect();
+    Q_D(const QQuickTextEdit);
+    QRectF r = QQuickImplicitSizeItem::boundingRect();
     int cursorWidth = 1;
     if (d->cursor)
         cursorWidth = d->cursor->width();
@@ -1718,23 +1718,23 @@ QRectF QSGTextEdit::boundingRect() const
     return r.translated(0,d->yoff);
 }
 
-qreal QSGTextEditPrivate::getImplicitWidth() const
+qreal QQuickTextEditPrivate::getImplicitWidth() const
 {
-    Q_Q(const QSGTextEdit);
+    Q_Q(const QQuickTextEdit);
     if (!requireImplicitWidth) {
         // We don't calculate implicitWidth unless it is required.
         // We need to force a size update now to ensure implicitWidth is calculated
-        const_cast<QSGTextEditPrivate*>(this)->requireImplicitWidth = true;
-        const_cast<QSGTextEdit*>(q)->updateSize();
+        const_cast<QQuickTextEditPrivate*>(this)->requireImplicitWidth = true;
+        const_cast<QQuickTextEdit*>(q)->updateSize();
     }
     return implicitWidth;
 }
 
 //### we should perhaps be a bit smarter here -- depending on what has changed, we shouldn't
 //    need to do all the calculations each time
-void QSGTextEdit::updateSize()
+void QQuickTextEdit::updateSize()
 {
-    Q_D(QSGTextEdit);
+    Q_D(QQuickTextEdit);
     if (isComponentComplete()) {
         qreal naturalWidth = d->implicitWidth;
         // ### assumes that if the width is set, the text will fill to edges
@@ -1794,9 +1794,9 @@ void QSGTextEdit::updateSize()
     updateDocument();
 }
 
-void QSGTextEdit::updateDocument()
+void QQuickTextEdit::updateDocument()
 {
-    Q_D(QSGTextEdit);
+    Q_D(QQuickTextEdit);
     d->documentDirty = true;
 
     if (isComponentComplete()) {
@@ -1805,18 +1805,18 @@ void QSGTextEdit::updateDocument()
     }
 }
 
-void QSGTextEdit::updateCursor()
+void QQuickTextEdit::updateCursor()
 {
-    Q_D(QSGTextEdit);
+    Q_D(QQuickTextEdit);
     if (isComponentComplete()) {
         updateImageCache(d->control->cursorRect());
         update();
     }
 }
 
-void QSGTextEdit::updateTotalLines()
+void QQuickTextEdit::updateTotalLines()
 {
-    Q_D(QSGTextEdit);
+    Q_D(QQuickTextEdit);
 
     int subLines = 0;
 
@@ -1834,18 +1834,18 @@ void QSGTextEdit::updateTotalLines()
     }
 }
 
-void QSGTextEditPrivate::updateDefaultTextOption()
+void QQuickTextEditPrivate::updateDefaultTextOption()
 {
-    Q_Q(QSGTextEdit);
+    Q_Q(QQuickTextEdit);
     QTextOption opt = document->defaultTextOption();
     int oldAlignment = opt.alignment();
 
-    QSGTextEdit::HAlignment horizontalAlignment = q->effectiveHAlign();
+    QQuickTextEdit::HAlignment horizontalAlignment = q->effectiveHAlign();
     if (rightToLeftText) {
-        if (horizontalAlignment == QSGTextEdit::AlignLeft)
-            horizontalAlignment = QSGTextEdit::AlignRight;
-        else if (horizontalAlignment == QSGTextEdit::AlignRight)
-            horizontalAlignment = QSGTextEdit::AlignLeft;
+        if (horizontalAlignment == QQuickTextEdit::AlignLeft)
+            horizontalAlignment = QQuickTextEdit::AlignRight;
+        else if (horizontalAlignment == QQuickTextEdit::AlignRight)
+            horizontalAlignment = QQuickTextEdit::AlignLeft;
     }
     opt.setAlignment((Qt::Alignment)(int)(horizontalAlignment | vAlign));
 
@@ -1905,7 +1905,7 @@ void QSGTextEditPrivate::updateDefaultTextOption()
         }
     \endcode
 */
-void QSGTextEdit::openSoftwareInputPanel()
+void QQuickTextEdit::openSoftwareInputPanel()
 {
     if (qGuiApp)
         qGuiApp->inputPanel()->show();
@@ -1950,23 +1950,23 @@ void QSGTextEdit::openSoftwareInputPanel()
         }
     \endcode
 */
-void QSGTextEdit::closeSoftwareInputPanel()
+void QQuickTextEdit::closeSoftwareInputPanel()
 {
     if (qGuiApp)
         qGuiApp->inputPanel()->hide();
 }
 
-void QSGTextEdit::focusInEvent(QFocusEvent *event)
+void QQuickTextEdit::focusInEvent(QFocusEvent *event)
 {
-    Q_D(const QSGTextEdit);
+    Q_D(const QQuickTextEdit);
     if (d->focusOnPress && !isReadOnly())
         openSoftwareInputPanel();
-    QSGImplicitSizeItem::focusInEvent(event);
+    QQuickImplicitSizeItem::focusInEvent(event);
 }
 
-void QSGTextEdit::q_canPasteChanged()
+void QQuickTextEdit::q_canPasteChanged()
 {
-    Q_D(QSGTextEdit);
+    Q_D(QQuickTextEdit);
     bool old = d->canPaste;
     d->canPaste = d->control->canPaste();
     if (old!=d->canPaste)
diff --git a/src/declarative/items/qsgtextedit_p.h b/src/declarative/items/qquicktextedit_p.h
index fced11808f..e237e2eba2 100644
--- a/src/declarative/items/qsgtextedit_p.h
+++ b/src/declarative/items/qquicktextedit_p.h
@@ -40,10 +40,10 @@
 **
 ****************************************************************************/
 
-#ifndef QSGTEXTEDIT_P_H
-#define QSGTEXTEDIT_P_H
+#ifndef QQUICKTEXTEDIT_P_H
+#define QQUICKTEXTEDIT_P_H
 
-#include "qsgimplicitsizeitem_p.h"
+#include "qquickimplicitsizeitem_p.h"
 
 #include <QtGui/qtextoption.h>
 
@@ -53,8 +53,8 @@ QT_BEGIN_NAMESPACE
 
 QT_MODULE(Declarative)
 
-class QSGTextEditPrivate;
-class Q_AUTOTEST_EXPORT QSGTextEdit : public QSGImplicitSizeItem
+class QQuickTextEditPrivate;
+class Q_AUTOTEST_EXPORT QQuickTextEdit : public QQuickImplicitSizeItem
 {
     Q_OBJECT
     Q_ENUMS(VAlignment)
@@ -94,7 +94,7 @@ class Q_AUTOTEST_EXPORT QSGTextEdit : public QSGImplicitSizeItem
     Q_PROPERTY(bool inputMethodComposing READ isInputMethodComposing NOTIFY inputMethodComposingChanged)
 
 public:
-    QSGTextEdit(QSGItem *parent=0);
+    QQuickTextEdit(QQuickItem *parent=0);
 
     enum HAlignment {
         AlignLeft = Qt::AlignLeft,
@@ -293,14 +293,14 @@ protected:
     QSGNode *updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *updatePaintNodeData);
 
 private:
-    Q_DISABLE_COPY(QSGTextEdit)
-    Q_DECLARE_PRIVATE(QSGTextEdit)
+    Q_DISABLE_COPY(QQuickTextEdit)
+    Q_DECLARE_PRIVATE(QQuickTextEdit)
 };
 
 QT_END_NAMESPACE
 
-QML_DECLARE_TYPE(QSGTextEdit)
+QML_DECLARE_TYPE(QQuickTextEdit)
 
 QT_END_HEADER
 
-#endif // QSGTEXTEDIT_P_H
+#endif // QQUICKTEXTEDIT_P_H
diff --git a/src/declarative/items/qsgtextedit_p_p.h b/src/declarative/items/qquicktextedit_p_p.h
index 51904d1cde..7bcbe2a189 100644
--- a/src/declarative/items/qsgtextedit_p_p.h
+++ b/src/declarative/items/qquicktextedit_p_p.h
@@ -40,8 +40,8 @@
 **
 ****************************************************************************/
 
-#ifndef QSGTEXTEDIT_P_P_H
-#define QSGTEXTEDIT_P_P_H
+#ifndef QQUICKTEXTEDIT_P_P_H
+#define QQUICKTEXTEDIT_P_P_H
 
 //
 //  W A R N I N G
@@ -54,8 +54,8 @@
 // We mean it.
 //
 
-#include "qsgtextedit_p.h"
-#include "qsgimplicitsizeitem_p_p.h"
+#include "qquicktextedit_p.h"
+#include "qquickimplicitsizeitem_p_p.h"
 
 #include <QtDeclarative/qdeclarative.h>
 #include <QtGui/qpixmap.h>
@@ -64,19 +64,19 @@ QT_BEGIN_NAMESPACE
 class QTextLayout;
 class QTextDocument;
 class QTextControl;
-class QSGTextEditPrivate : public QSGImplicitSizeItemPrivate
+class QQuickTextEditPrivate : public QQuickImplicitSizeItemPrivate
 {
-    Q_DECLARE_PUBLIC(QSGTextEdit)
+    Q_DECLARE_PUBLIC(QQuickTextEdit)
 
 public:
-    QSGTextEditPrivate()
-      : color("black"), hAlign(QSGTextEdit::AlignLeft), vAlign(QSGTextEdit::AlignTop),
+    QQuickTextEditPrivate()
+      : color("black"), hAlign(QQuickTextEdit::AlignLeft), vAlign(QQuickTextEdit::AlignTop),
       documentDirty(true), dirty(false), richText(false), cursorVisible(false), focusOnPress(true),
       persistentSelection(true), requireImplicitWidth(false), selectByMouse(false), canPaste(false),
       hAlignImplicit(true), rightToLeftText(false), useImageFallback(false),
       textMargin(0.0), lastSelectionStart(0), lastSelectionEnd(0), cursorComponent(0), cursor(0),
-      format(QSGTextEdit::AutoText), document(0), wrapMode(QSGTextEdit::NoWrap),
-      mouseSelectionMode(QSGTextEdit::SelectCharacters),
+      format(QQuickTextEdit::AutoText), document(0), wrapMode(QQuickTextEdit::NoWrap),
+      mouseSelectionMode(QQuickTextEdit::SelectCharacters),
       lineCount(0), yoff(0), nodeType(NodeIsNull), texture(0)
     {
     }
@@ -87,7 +87,7 @@ public:
     void relayoutDocument();
     void updateSelection();
     bool determineHorizontalAlignment();
-    bool setHAlign(QSGTextEdit::HAlignment, bool forceAlign = false);
+    bool setHAlign(QQuickTextEdit::HAlignment, bool forceAlign = false);
     void mirrorChange();
     qreal getImplicitWidth() const;
 
@@ -99,8 +99,8 @@ public:
     QColor  selectedTextColor;
     QString style;
     QColor  styleColor;
-    QSGTextEdit::HAlignment hAlign;
-    QSGTextEdit::VAlignment vAlign;
+    QQuickTextEdit::HAlignment hAlign;
+    QQuickTextEdit::VAlignment vAlign;
 
     bool documentDirty : 1;
     bool dirty : 1;
@@ -119,12 +119,12 @@ public:
     int lastSelectionStart;
     int lastSelectionEnd;
     QDeclarativeComponent* cursorComponent;
-    QSGItem* cursor;
-    QSGTextEdit::TextFormat format;
+    QQuickItem* cursor;
+    QQuickTextEdit::TextFormat format;
     QTextDocument *document;
     QTextControl *control;
-    QSGTextEdit::WrapMode wrapMode;
-    QSGTextEdit::SelectionMode mouseSelectionMode;
+    QQuickTextEdit::WrapMode wrapMode;
+    QQuickTextEdit::SelectionMode mouseSelectionMode;
     int lineCount;
     int yoff;
     QSize paintedSize;
@@ -141,4 +141,4 @@ public:
 
 QT_END_NAMESPACE
 
-#endif // QSGTEXTEDIT_P_P_H
+#endif // QQUICKTEXTEDIT_P_P_H
diff --git a/src/declarative/items/qsgtextinput.cpp b/src/declarative/items/qquicktextinput.cpp
index 6d0fa47d4f..e28832ed4e 100644
--- a/src/declarative/items/qsgtextinput.cpp
+++ b/src/declarative/items/qquicktextinput.cpp
@@ -39,9 +39,9 @@
 **
 ****************************************************************************/
 
-#include "qsgtextinput_p.h"
-#include "qsgtextinput_p_p.h"
-#include "qsgcanvas.h"
+#include "qquicktextinput_p.h"
+#include "qquicktextinput_p_p.h"
+#include "qquickcanvas.h"
 
 #include <private/qdeclarativeglobal_p.h>
 #include <private/qsgdistancefieldglyphcache_p.h>
@@ -49,7 +49,7 @@
 #include <QtDeclarative/qdeclarativeinfo.h>
 #include <QtGui/qevent.h>
 #include <QTextBoundaryFinder>
-#include "qsgtextnode_p.h"
+#include "qquicktextnode_p.h"
 #include <qsgsimplerectnode.h>
 
 #include <QtGui/qstylehints.h>
@@ -60,7 +60,7 @@ QT_BEGIN_NAMESPACE
 DEFINE_BOOL_CONFIG_OPTION(qmlDisableDistanceField, QML_DISABLE_DISTANCEFIELD)
 
 /*!
-    \qmlclass TextInput QSGTextInput
+    \qmlclass TextInput QQuickTextInput
     \inqmlmodule QtQuick 2
     \ingroup qml-basic-visual-elements
     \brief The TextInput item displays an editable line of text.
@@ -78,14 +78,14 @@ DEFINE_BOOL_CONFIG_OPTION(qmlDisableDistanceField, QML_DISABLE_DISTANCEFIELD)
 
     \sa TextEdit, Text, {declarative/text/textselection}{Text Selection example}
 */
-QSGTextInput::QSGTextInput(QSGItem* parent)
-: QSGImplicitSizeItem(*(new QSGTextInputPrivate), parent)
+QQuickTextInput::QQuickTextInput(QQuickItem* parent)
+: QQuickImplicitSizeItem(*(new QQuickTextInputPrivate), parent)
 {
-    Q_D(QSGTextInput);
+    Q_D(QQuickTextInput);
     d->init();
 }
 
-QSGTextInput::~QSGTextInput()
+QQuickTextInput::~QQuickTextInput()
 {
 }
 
@@ -94,15 +94,15 @@ QSGTextInput::~QSGTextInput()
 
     The text in the TextInput.
 */
-QString QSGTextInput::text() const
+QString QQuickTextInput::text() const
 {
-    Q_D(const QSGTextInput);
+    Q_D(const QQuickTextInput);
     return d->control->text();
 }
 
-void QSGTextInput::setText(const QString &s)
+void QQuickTextInput::setText(const QString &s)
 {
-    Q_D(QSGTextInput);
+    Q_D(QQuickTextInput);
     if (s == text())
         return;
     d->control->setText(s);
@@ -213,15 +213,15 @@ void QSGTextInput::setText(const QString &s)
     \endqml
 */
 
-QFont QSGTextInput::font() const
+QFont QQuickTextInput::font() const
 {
-    Q_D(const QSGTextInput);
+    Q_D(const QQuickTextInput);
     return d->sourceFont;
 }
 
-void QSGTextInput::setFont(const QFont &font)
+void QQuickTextInput::setFont(const QFont &font)
 {
-    Q_D(QSGTextInput);
+    Q_D(QQuickTextInput);
     if (d->sourceFont == font)
         return;
 
@@ -249,15 +249,15 @@ void QSGTextInput::setFont(const QFont &font)
 
     The text color.
 */
-QColor QSGTextInput::color() const
+QColor QQuickTextInput::color() const
 {
-    Q_D(const QSGTextInput);
+    Q_D(const QQuickTextInput);
     return d->color;
 }
 
-void QSGTextInput::setColor(const QColor &c)
+void QQuickTextInput::setColor(const QColor &c)
 {
-    Q_D(QSGTextInput);
+    Q_D(QQuickTextInput);
     if (c != d->color) {
         d->color = c;
         update();
@@ -271,15 +271,15 @@ void QSGTextInput::setColor(const QColor &c)
 
     The text highlight color, used behind selections.
 */
-QColor QSGTextInput::selectionColor() const
+QColor QQuickTextInput::selectionColor() const
 {
-    Q_D(const QSGTextInput);
+    Q_D(const QQuickTextInput);
     return d->selectionColor;
 }
 
-void QSGTextInput::setSelectionColor(const QColor &color)
+void QQuickTextInput::setSelectionColor(const QColor &color)
 {
-    Q_D(QSGTextInput);
+    Q_D(QQuickTextInput);
     if (d->selectionColor == color)
         return;
 
@@ -296,15 +296,15 @@ void QSGTextInput::setSelectionColor(const QColor &color)
 
     The highlighted text color, used in selections.
 */
-QColor QSGTextInput::selectedTextColor() const
+QColor QQuickTextInput::selectedTextColor() const
 {
-    Q_D(const QSGTextInput);
+    Q_D(const QQuickTextInput);
     return d->selectedTextColor;
 }
 
-void QSGTextInput::setSelectedTextColor(const QColor &color)
+void QQuickTextInput::setSelectedTextColor(const QColor &color)
 {
-    Q_D(QSGTextInput);
+    Q_D(QQuickTextInput);
     if (d->selectedTextColor == color)
         return;
 
@@ -340,15 +340,15 @@ void QSGTextInput::setSelectedTextColor(const QColor &color)
     \c horizontalAlignment will remain unchanged. To query the effective horizontal alignment
     of TextInput, use the read-only property \c effectiveHorizontalAlignment.
 */
-QSGTextInput::HAlignment QSGTextInput::hAlign() const
+QQuickTextInput::HAlignment QQuickTextInput::hAlign() const
 {
-    Q_D(const QSGTextInput);
+    Q_D(const QQuickTextInput);
     return d->hAlign;
 }
 
-void QSGTextInput::setHAlign(HAlignment align)
+void QQuickTextInput::setHAlign(HAlignment align)
 {
-    Q_D(QSGTextInput);
+    Q_D(QQuickTextInput);
     bool forceAlign = d->hAlignImplicit && d->effectiveLayoutMirror;
     d->hAlignImplicit = false;
     if (d->setHAlign(align, forceAlign) && isComponentComplete()) {
@@ -356,26 +356,26 @@ void QSGTextInput::setHAlign(HAlignment align)
     }
 }
 
-void QSGTextInput::resetHAlign()
+void QQuickTextInput::resetHAlign()
 {
-    Q_D(QSGTextInput);
+    Q_D(QQuickTextInput);
     d->hAlignImplicit = true;
     if (d->determineHorizontalAlignment() && isComponentComplete()) {
         updateCursorRectangle();
     }
 }
 
-QSGTextInput::HAlignment QSGTextInput::effectiveHAlign() const
+QQuickTextInput::HAlignment QQuickTextInput::effectiveHAlign() const
 {
-    Q_D(const QSGTextInput);
-    QSGTextInput::HAlignment effectiveAlignment = d->hAlign;
+    Q_D(const QQuickTextInput);
+    QQuickTextInput::HAlignment effectiveAlignment = d->hAlign;
     if (!d->hAlignImplicit && d->effectiveLayoutMirror) {
         switch (d->hAlign) {
-        case QSGTextInput::AlignLeft:
-            effectiveAlignment = QSGTextInput::AlignRight;
+        case QQuickTextInput::AlignLeft:
+            effectiveAlignment = QQuickTextInput::AlignRight;
             break;
-        case QSGTextInput::AlignRight:
-            effectiveAlignment = QSGTextInput::AlignLeft;
+        case QQuickTextInput::AlignRight:
+            effectiveAlignment = QQuickTextInput::AlignLeft;
             break;
         default:
             break;
@@ -384,11 +384,11 @@ QSGTextInput::HAlignment QSGTextInput::effectiveHAlign() const
     return effectiveAlignment;
 }
 
-bool QSGTextInputPrivate::setHAlign(QSGTextInput::HAlignment alignment, bool forceAlign)
+bool QQuickTextInputPrivate::setHAlign(QQuickTextInput::HAlignment alignment, bool forceAlign)
 {
-    Q_Q(QSGTextInput);
-    if ((hAlign != alignment || forceAlign) && alignment <= QSGTextInput::AlignHCenter) { // justify not supported
-        QSGTextInput::HAlignment oldEffectiveHAlign = q->effectiveHAlign();
+    Q_Q(QQuickTextInput);
+    if ((hAlign != alignment || forceAlign) && alignment <= QQuickTextInput::AlignHCenter) { // justify not supported
+        QQuickTextInput::HAlignment oldEffectiveHAlign = q->effectiveHAlign();
         hAlign = alignment;
         emit q->horizontalAlignmentChanged(alignment);
         if (oldEffectiveHAlign != q->effectiveHAlign())
@@ -398,7 +398,7 @@ bool QSGTextInputPrivate::setHAlign(QSGTextInput::HAlignment alignment, bool for
     return false;
 }
 
-bool QSGTextInputPrivate::determineHorizontalAlignment()
+bool QQuickTextInputPrivate::determineHorizontalAlignment()
 {
     if (hAlignImplicit) {
         // if no explicit alignment has been set, follow the natural layout direction of the text
@@ -406,16 +406,16 @@ bool QSGTextInputPrivate::determineHorizontalAlignment()
         if (text.isEmpty())
             text = control->preeditAreaText();
         bool isRightToLeft = text.isEmpty() ? QGuiApplication::keyboardInputDirection() == Qt::RightToLeft : text.isRightToLeft();
-        return setHAlign(isRightToLeft ? QSGTextInput::AlignRight : QSGTextInput::AlignLeft);
+        return setHAlign(isRightToLeft ? QQuickTextInput::AlignRight : QQuickTextInput::AlignLeft);
     }
     return false;
 }
 
-void QSGTextInputPrivate::mirrorChange()
+void QQuickTextInputPrivate::mirrorChange()
 {
-    Q_Q(QSGTextInput);
+    Q_Q(QQuickTextInput);
     if (q->isComponentComplete()) {
-        if (!hAlignImplicit && (hAlign == QSGTextInput::AlignRight || hAlign == QSGTextInput::AlignLeft)) {
+        if (!hAlignImplicit && (hAlign == QQuickTextInput::AlignRight || hAlign == QQuickTextInput::AlignLeft)) {
             q->updateCursorRectangle();
             emit q->effectiveHorizontalAlignmentChanged();
         }
@@ -431,19 +431,19 @@ void QSGTextInputPrivate::mirrorChange()
     property. Any bindings or attempts to set the text property will still
     work.
 */
-bool QSGTextInput::isReadOnly() const
+bool QQuickTextInput::isReadOnly() const
 {
-    Q_D(const QSGTextInput);
+    Q_D(const QQuickTextInput);
     return d->control->isReadOnly();
 }
 
-void QSGTextInput::setReadOnly(bool ro)
+void QQuickTextInput::setReadOnly(bool ro)
 {
-    Q_D(QSGTextInput);
+    Q_D(QQuickTextInput);
     if (d->control->isReadOnly() == ro)
         return;
 
-    setFlag(QSGItem::ItemAcceptsInputMethod, !ro);
+    setFlag(QQuickItem::ItemAcceptsInputMethod, !ro);
     d->control->setReadOnly(ro);
     if (!ro)
         d->control->setCursorPosition(d->control->end());
@@ -459,15 +459,15 @@ void QSGTextInput::setReadOnly(bool ro)
 
     By default, this property contains a value of 32767.
 */
-int QSGTextInput::maxLength() const
+int QQuickTextInput::maxLength() const
 {
-    Q_D(const QSGTextInput);
+    Q_D(const QQuickTextInput);
     return d->control->maxLength();
 }
 
-void QSGTextInput::setMaxLength(int ml)
+void QQuickTextInput::setMaxLength(int ml)
 {
-    Q_D(QSGTextInput);
+    Q_D(QQuickTextInput);
     if (d->control->maxLength() == ml)
         return;
 
@@ -502,15 +502,15 @@ void QSGTextInput::setMaxLength(int ml)
     In the above snippet the cursor will still become visible when the
     TextInput gains active focus.
 */
-bool QSGTextInput::isCursorVisible() const
+bool QQuickTextInput::isCursorVisible() const
 {
-    Q_D(const QSGTextInput);
+    Q_D(const QQuickTextInput);
     return d->cursorVisible;
 }
 
-void QSGTextInput::setCursorVisible(bool on)
+void QQuickTextInput::setCursorVisible(bool on)
 {
-    Q_D(QSGTextInput);
+    Q_D(QQuickTextInput);
     if (d->cursorVisible == on)
         return;
     d->cursorVisible = on;
@@ -527,14 +527,14 @@ void QSGTextInput::setCursorVisible(bool on)
     \qmlproperty int QtQuick2::TextInput::cursorPosition
     The position of the cursor in the TextInput.
 */
-int QSGTextInput::cursorPosition() const
+int QQuickTextInput::cursorPosition() const
 {
-    Q_D(const QSGTextInput);
+    Q_D(const QQuickTextInput);
     return d->control->cursor();
 }
-void QSGTextInput::setCursorPosition(int cp)
+void QQuickTextInput::setCursorPosition(int cp)
 {
-    Q_D(QSGTextInput);
+    Q_D(QQuickTextInput);
     if (cp < 0 || cp > d->control->text().length())
         return;
     d->control->moveCursor(cp);
@@ -544,9 +544,9 @@ void QSGTextInput::setCursorPosition(int cp)
   Returns a Rect which encompasses the cursor, but which may be larger than is
   required. Ignores custom cursor delegates.
 */
-QRect QSGTextInput::cursorRectangle() const
+QRect QQuickTextInput::cursorRectangle() const
 {
-    Q_D(const QSGTextInput);
+    Q_D(const QQuickTextInput);
     QRect r = d->control->cursorRect();
     // Scroll and make consistent with TextEdit
     // QLineControl inexplicably adds 1 to the height and horizontal padding
@@ -564,9 +564,9 @@ QRect QSGTextInput::cursorRectangle() const
 
     \sa selectionEnd, cursorPosition, selectedText
 */
-int QSGTextInput::selectionStart() const
+int QQuickTextInput::selectionStart() const
 {
-    Q_D(const QSGTextInput);
+    Q_D(const QQuickTextInput);
     return d->lastSelectionStart;
 }
 /*!
@@ -579,9 +579,9 @@ int QSGTextInput::selectionStart() const
 
     \sa selectionStart, cursorPosition, selectedText
 */
-int QSGTextInput::selectionEnd() const
+int QQuickTextInput::selectionEnd() const
 {
-    Q_D(const QSGTextInput);
+    Q_D(const QQuickTextInput);
     return d->lastSelectionEnd;
 }
 /*!
@@ -597,9 +597,9 @@ int QSGTextInput::selectionEnd() const
 
     \sa selectionStart, selectionEnd
 */
-void QSGTextInput::select(int start, int end)
+void QQuickTextInput::select(int start, int end)
 {
-    Q_D(QSGTextInput);
+    Q_D(QQuickTextInput);
     if (start < 0 || end < 0 || start > d->control->text().length() || end > d->control->text().length())
         return;
     d->control->setSelection(start, end-start);
@@ -619,9 +619,9 @@ void QSGTextInput::select(int start, int end)
         myTextInput.selectionEnd);
     \endjs
 */
-QString QSGTextInput::selectedText() const
+QString QQuickTextInput::selectedText() const
 {
-    Q_D(const QSGTextInput);
+    Q_D(const QQuickTextInput);
     return d->control->selectedText();
 }
 
@@ -631,15 +631,15 @@ QString QSGTextInput::selectedText() const
     Whether the TextInput should gain active focus on a mouse press. By default this is
     set to true.
 */
-bool QSGTextInput::focusOnPress() const
+bool QQuickTextInput::focusOnPress() const
 {
-    Q_D(const QSGTextInput);
+    Q_D(const QQuickTextInput);
     return d->focusOnPress;
 }
 
-void QSGTextInput::setFocusOnPress(bool b)
+void QQuickTextInput::setFocusOnPress(bool b)
 {
-    Q_D(QSGTextInput);
+    Q_D(QQuickTextInput);
     if (d->focusOnPress == b)
         return;
 
@@ -653,15 +653,15 @@ void QSGTextInput::setFocusOnPress(bool b)
     Whether the TextInput should scroll when the text is longer than the width. By default this is
     set to true.
 */
-bool QSGTextInput::autoScroll() const
+bool QQuickTextInput::autoScroll() const
 {
-    Q_D(const QSGTextInput);
+    Q_D(const QQuickTextInput);
     return d->autoScroll;
 }
 
-void QSGTextInput::setAutoScroll(bool b)
+void QQuickTextInput::setAutoScroll(bool b)
 {
-    Q_D(QSGTextInput);
+    Q_D(QQuickTextInput);
     if (d->autoScroll == b)
         return;
 
@@ -781,16 +781,16 @@ void QSGTextInput::setAutoScroll(bool b)
     \sa acceptableInput, inputMask
 */
 
-QValidator* QSGTextInput::validator() const
+QValidator* QQuickTextInput::validator() const
 {
-    Q_D(const QSGTextInput);
+    Q_D(const QQuickTextInput);
     //###const cast isn't good, but needed for property system?
     return const_cast<QValidator*>(d->control->validator());
 }
 
-void QSGTextInput::setValidator(QValidator* v)
+void QQuickTextInput::setValidator(QValidator* v)
 {
-    Q_D(QSGTextInput);
+    Q_D(QQuickTextInput);
     if (d->control->validator() == v)
         return;
 
@@ -813,15 +813,15 @@ void QSGTextInput::setValidator(QValidator* v)
 
     \sa acceptableInput, validator
 */
-QString QSGTextInput::inputMask() const
+QString QQuickTextInput::inputMask() const
 {
-    Q_D(const QSGTextInput);
+    Q_D(const QQuickTextInput);
     return d->control->inputMask();
 }
 
-void QSGTextInput::setInputMask(const QString &im)
+void QQuickTextInput::setInputMask(const QString &im)
 {
-    Q_D(QSGTextInput);
+    Q_D(QQuickTextInput);
     if (d->control->inputMask() == im)
         return;
 
@@ -837,9 +837,9 @@ void QSGTextInput::setInputMask(const QString &im)
     if the current text is acceptable to the validator or input mask as a final
     string (not as an intermediate string).
 */
-bool QSGTextInput::hasAcceptableInput() const
+bool QQuickTextInput::hasAcceptableInput() const
 {
-    Q_D(const QSGTextInput);
+    Q_D(const QQuickTextInput);
     return d->control->hasAcceptableInput();
 }
 
@@ -852,16 +852,16 @@ bool QSGTextInput::hasAcceptableInput() const
     state.
 */
 
-void QSGTextInputPrivate::updateInputMethodHints()
+void QQuickTextInputPrivate::updateInputMethodHints()
 {
-    Q_Q(QSGTextInput);
+    Q_Q(QQuickTextInput);
     Qt::InputMethodHints hints = inputMethodHints;
     uint echo = control->echoMode();
-    if (echo == QSGTextInput::Password || echo == QSGTextInput::NoEcho)
+    if (echo == QQuickTextInput::Password || echo == QQuickTextInput::NoEcho)
         hints |= Qt::ImhHiddenText;
-    else if (echo == QSGTextInput::PasswordEchoOnEdit)
+    else if (echo == QQuickTextInput::PasswordEchoOnEdit)
         hints &= ~Qt::ImhHiddenText;
-    if (echo != QSGTextInput::Normal)
+    if (echo != QQuickTextInput::Normal)
         hints |= (Qt::ImhNoAutoUppercase | Qt::ImhNoPredictiveText);
     q->setInputMethodHints(hints);
 }
@@ -877,15 +877,15 @@ void QSGTextInputPrivate::updateInputMethodHints()
     while editing, otherwise displays asterisks.
     \endlist
 */
-QSGTextInput::EchoMode QSGTextInput::echoMode() const
+QQuickTextInput::EchoMode QQuickTextInput::echoMode() const
 {
-    Q_D(const QSGTextInput);
-    return (QSGTextInput::EchoMode)d->control->echoMode();
+    Q_D(const QQuickTextInput);
+    return (QQuickTextInput::EchoMode)d->control->echoMode();
 }
 
-void QSGTextInput::setEchoMode(QSGTextInput::EchoMode echo)
+void QQuickTextInput::setEchoMode(QQuickTextInput::EchoMode echo)
 {
-    Q_D(QSGTextInput);
+    Q_D(QQuickTextInput);
     if (echoMode() == echo)
         return;
     d->control->setEchoMode((QLineControl::EchoMode)echo);
@@ -894,15 +894,15 @@ void QSGTextInput::setEchoMode(QSGTextInput::EchoMode echo)
     emit echoModeChanged(echoMode());
 }
 
-Qt::InputMethodHints QSGTextInput::imHints() const
+Qt::InputMethodHints QQuickTextInput::imHints() const
 {
-    Q_D(const QSGTextInput);
+    Q_D(const QQuickTextInput);
     return d->inputMethodHints;
 }
 
-void QSGTextInput::setIMHints(Qt::InputMethodHints hints)
+void QQuickTextInput::setIMHints(Qt::InputMethodHints hints)
 {
-    Q_D(QSGTextInput);
+    Q_D(QQuickTextInput);
     if (d->inputMethodHints == hints)
         return;
     d->inputMethodHints = hints;
@@ -922,15 +922,15 @@ void QSGTextInput::setIMHints(Qt::InputMethodHints hints)
     Note that the root item of the delegate component must be a QDeclarativeItem or
     QDeclarativeItem derived item.
 */
-QDeclarativeComponent* QSGTextInput::cursorDelegate() const
+QDeclarativeComponent* QQuickTextInput::cursorDelegate() const
 {
-    Q_D(const QSGTextInput);
+    Q_D(const QQuickTextInput);
     return d->cursorComponent;
 }
 
-void QSGTextInput::setCursorDelegate(QDeclarativeComponent* c)
+void QQuickTextInput::setCursorDelegate(QDeclarativeComponent* c)
 {
-    Q_D(QSGTextInput);
+    Q_D(QQuickTextInput);
     if (d->cursorComponent == c)
         return;
 
@@ -945,22 +945,22 @@ void QSGTextInput::setCursorDelegate(QDeclarativeComponent* c)
     emit cursorDelegateChanged();
 }
 
-void QSGTextInputPrivate::startCreatingCursor()
+void QQuickTextInputPrivate::startCreatingCursor()
 {
-    Q_Q(QSGTextInput);
+    Q_Q(QQuickTextInput);
     if (cursorComponent->isReady()) {
         q->createCursor();
     } else if (cursorComponent->isLoading()) {
         q->connect(cursorComponent, SIGNAL(statusChanged(int)),
                 q, SLOT(createCursor()));
     } else { // isError
-        qmlInfo(q, cursorComponent->errors()) << QSGTextInput::tr("Could not load cursor delegate");
+        qmlInfo(q, cursorComponent->errors()) << QQuickTextInput::tr("Could not load cursor delegate");
     }
 }
 
-void QSGTextInput::createCursor()
+void QQuickTextInput::createCursor()
 {
-    Q_D(QSGTextInput);
+    Q_D(QQuickTextInput);
     if (d->cursorComponent->isError()) {
         qmlInfo(this, d->cursorComponent->errors()) << tr("Could not load cursor delegate");
         return;
@@ -973,7 +973,7 @@ void QSGTextInput::createCursor()
         delete d->cursorItem;
     QDeclarativeContext *creationContext = d->cursorComponent->creationContext();
     QObject *object = d->cursorComponent->create(creationContext ? creationContext : qmlContext(this));
-    d->cursorItem = qobject_cast<QSGItem*>(object);
+    d->cursorItem = qobject_cast<QQuickItem*>(object);
     if (!d->cursorItem) {
         delete object;
         qmlInfo(this, d->cursorComponent->errors()) << tr("Could not instantiate cursor delegate");
@@ -995,9 +995,9 @@ void QSGTextInput::createCursor()
     This is similar to setting the cursorPosition, and then querying the cursor
     rectangle, but the cursorPosition is not changed.
 */
-QRectF QSGTextInput::positionToRectangle(int pos) const
+QRectF QQuickTextInput::positionToRectangle(int pos) const
 {
-    Q_D(const QSGTextInput);
+    Q_D(const QQuickTextInput);
     if (pos > d->control->cursorPosition())
         pos += d->control->preeditAreaText().length();
     return QRectF(d->control->cursorToX(pos)-d->hscroll,
@@ -1024,14 +1024,14 @@ QRectF QSGTextInput::positionToRectangle(int pos) const
     \o TextInput.CursorOnCharacter - Returns the position before the character that is nearest x.
     \endlist
 */
-int QSGTextInput::positionAt(int x) const
+int QQuickTextInput::positionAt(int x) const
 {
     return positionAt(x, CursorBetweenCharacters);
 }
 
-int QSGTextInput::positionAt(int x, CursorPosition position) const
+int QQuickTextInput::positionAt(int x, CursorPosition position) const
 {
-    Q_D(const QSGTextInput);
+    Q_D(const QQuickTextInput);
     int pos = d->control->xToPos(x + d->hscroll, QTextLine::CursorPosition(position));
     const int cursor = d->control->cursor();
     if (pos > cursor) {
@@ -1043,9 +1043,9 @@ int QSGTextInput::positionAt(int x, CursorPosition position) const
     return pos;
 }
 
-void QSGTextInput::keyPressEvent(QKeyEvent* ev)
+void QQuickTextInput::keyPressEvent(QKeyEvent* ev)
 {
-    Q_D(QSGTextInput);
+    Q_D(QQuickTextInput);
     // Don't allow MacOSX up/down support, and we don't allow a completer.
     bool ignore = (ev->key() == Qt::Key_Up || ev->key() == Qt::Key_Down) && ev->modifiers() == Qt::NoModifier;
     if (!ignore && (d->lastSelectionStart == d->lastSelectionEnd) && (ev->key() == Qt::Key_Right || ev->key() == Qt::Key_Left)) {
@@ -1063,12 +1063,12 @@ void QSGTextInput::keyPressEvent(QKeyEvent* ev)
         d->control->processKeyEvent(ev);
     }
     if (!ev->isAccepted())
-        QSGImplicitSizeItem::keyPressEvent(ev);
+        QQuickImplicitSizeItem::keyPressEvent(ev);
 }
 
-void QSGTextInput::inputMethodEvent(QInputMethodEvent *ev)
+void QQuickTextInput::inputMethodEvent(QInputMethodEvent *ev)
 {
-    Q_D(QSGTextInput);
+    Q_D(QQuickTextInput);
     const bool wasComposing = d->control->preeditAreaText().length() > 0;
     if (d->control->isReadOnly()) {
         ev->ignore();
@@ -1076,15 +1076,15 @@ void QSGTextInput::inputMethodEvent(QInputMethodEvent *ev)
         d->control->processInputMethodEvent(ev);
     }
     if (!ev->isAccepted())
-        QSGImplicitSizeItem::inputMethodEvent(ev);
+        QQuickImplicitSizeItem::inputMethodEvent(ev);
 
     if (wasComposing != (d->control->preeditAreaText().length() > 0))
         emit inputMethodComposingChanged();
 }
 
-void QSGTextInput::mouseDoubleClickEvent(QMouseEvent *event)
+void QQuickTextInput::mouseDoubleClickEvent(QMouseEvent *event)
 {
-    Q_D(QSGTextInput);
+    Q_D(QQuickTextInput);
     if (d->sendMouseEventToInputContext(event))
         return;
     if (d->selectByMouse) {
@@ -1096,13 +1096,13 @@ void QSGTextInput::mouseDoubleClickEvent(QMouseEvent *event)
             d->tripleClickTimer.start();
         }
     } else {
-        QSGImplicitSizeItem::mouseDoubleClickEvent(event);
+        QQuickImplicitSizeItem::mouseDoubleClickEvent(event);
     }
 }
 
-void QSGTextInput::mousePressEvent(QMouseEvent *event)
+void QQuickTextInput::mousePressEvent(QMouseEvent *event)
 {
-    Q_D(QSGTextInput);
+    Q_D(QQuickTextInput);
     if (d->sendMouseEventToInputContext(event))
         return;
     if (d->focusOnPress) {
@@ -1130,9 +1130,9 @@ void QSGTextInput::mousePressEvent(QMouseEvent *event)
     event->setAccepted(true);
 }
 
-void QSGTextInput::mouseMoveEvent(QMouseEvent *event)
+void QQuickTextInput::mouseMoveEvent(QMouseEvent *event)
 {
-    Q_D(QSGTextInput);
+    Q_D(QQuickTextInput);
     if (d->sendMouseEventToInputContext(event))
         return;
     if (d->selectPressed) {
@@ -1141,13 +1141,13 @@ void QSGTextInput::mouseMoveEvent(QMouseEvent *event)
         moveCursorSelection(d->xToPos(event->localPos().x()), d->mouseSelectionMode);
         event->setAccepted(true);
     } else {
-        QSGImplicitSizeItem::mouseMoveEvent(event);
+        QQuickImplicitSizeItem::mouseMoveEvent(event);
     }
 }
 
-void QSGTextInput::mouseReleaseEvent(QMouseEvent *event)
+void QQuickTextInput::mouseReleaseEvent(QMouseEvent *event)
 {
-    Q_D(QSGTextInput);
+    Q_D(QQuickTextInput);
     if (d->sendMouseEventToInputContext(event))
         return;
     if (d->selectPressed) {
@@ -1156,10 +1156,10 @@ void QSGTextInput::mouseReleaseEvent(QMouseEvent *event)
     }
     d->control->processEvent(event);
     if (!event->isAccepted())
-        QSGImplicitSizeItem::mouseReleaseEvent(event);
+        QQuickImplicitSizeItem::mouseReleaseEvent(event);
 }
 
-bool QSGTextInputPrivate::sendMouseEventToInputContext(QMouseEvent *event)
+bool QQuickTextInputPrivate::sendMouseEventToInputContext(QMouseEvent *event)
 {
 #if !defined QT_NO_IM
     if (control->composeMode() && event->type() == QEvent::KeyRelease) {
@@ -1185,16 +1185,16 @@ bool QSGTextInputPrivate::sendMouseEventToInputContext(QMouseEvent *event)
     return false;
 }
 
-void QSGTextInput::mouseUngrabEvent()
+void QQuickTextInput::mouseUngrabEvent()
 {
-    Q_D(QSGTextInput);
+    Q_D(QQuickTextInput);
     d->selectPressed = false;
     setKeepMouseGrab(false);
 }
 
-bool QSGTextInput::event(QEvent* ev)
+bool QQuickTextInput::event(QEvent* ev)
 {
-    Q_D(QSGTextInput);
+    Q_D(QQuickTextInput);
     //Anything we don't deal with ourselves, pass to the control
     bool handled = false;
     switch (ev->type()) {
@@ -1210,34 +1210,34 @@ bool QSGTextInput::event(QEvent* ev)
             handled = d->control->processEvent(ev);
     }
     if (!handled)
-        handled = QSGImplicitSizeItem::event(ev);
+        handled = QQuickImplicitSizeItem::event(ev);
     return handled;
 }
 
-void QSGTextInput::geometryChanged(const QRectF &newGeometry,
+void QQuickTextInput::geometryChanged(const QRectF &newGeometry,
                                   const QRectF &oldGeometry)
 {
     if (newGeometry.width() != oldGeometry.width()) {
         updateSize();
         updateCursorRectangle();
     }
-    QSGImplicitSizeItem::geometryChanged(newGeometry, oldGeometry);
+    QQuickImplicitSizeItem::geometryChanged(newGeometry, oldGeometry);
 }
 
-int QSGTextInputPrivate::calculateTextWidth()
+int QQuickTextInputPrivate::calculateTextWidth()
 {
     return qRound(control->naturalTextWidth());
 }
 
-void QSGTextInputPrivate::updateHorizontalScroll()
+void QQuickTextInputPrivate::updateHorizontalScroll()
 {
-    Q_Q(QSGTextInput);
+    Q_Q(QQuickTextInput);
     const int preeditLength = control->preeditAreaText().length();
     const int width = q->width();
     int widthUsed = calculateTextWidth();
 
     if (!autoScroll || widthUsed <=  width) {
-        QSGTextInput::HAlignment effectiveHAlign = q->effectiveHAlign();
+        QQuickTextInput::HAlignment effectiveHAlign = q->effectiveHAlign();
         // text fits in br; use hscroll for alignment
         switch (effectiveHAlign & ~(Qt::AlignAbsolute|Qt::AlignVertical_Mask)) {
         case Qt::AlignRight:
@@ -1275,14 +1275,14 @@ void QSGTextInputPrivate::updateHorizontalScroll()
     }
 }
 
-QSGNode *QSGTextInput::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *data)
+QSGNode *QQuickTextInput::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *data)
 {
     Q_UNUSED(data);
-    Q_D(QSGTextInput);
+    Q_D(QQuickTextInput);
 
-    QSGTextNode *node = static_cast<QSGTextNode *>(oldNode);
+    QQuickTextNode *node = static_cast<QQuickTextNode *>(oldNode);
     if (node == 0)
-        node = new QSGTextNode(QSGItemPrivate::get(this)->sceneGraphContext());
+        node = new QQuickTextNode(QQuickItemPrivate::get(this)->sceneGraphContext());
     d->textNode = node;
 
     if (!d->textLayoutDirty) {
@@ -1320,7 +1320,7 @@ QSGNode *QSGTextInput::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *da
         QTextLayout *textLayout = d->control->textLayout();
         if (!textLayout->text().isEmpty()) {
             node->addTextLayout(offset, textLayout, d->color,
-                                QSGText::Normal, QColor(),
+                                QQuickText::Normal, QColor(),
                                 d->selectionColor, d->selectedTextColor,
                                 d->control->selectionStart(),
                                 d->control->selectionEnd() - 1); // selectionEnd() returns first char after
@@ -1344,9 +1344,9 @@ QSGNode *QSGTextInput::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *da
     return node;
 }
 
-QVariant QSGTextInput::inputMethodQuery(Qt::InputMethodQuery property) const
+QVariant QQuickTextInput::inputMethodQuery(Qt::InputMethodQuery property) const
 {
-    Q_D(const QSGTextInput);
+    Q_D(const QQuickTextInput);
     switch (property) {
     case Qt::ImEnabled:
         return QVariant((bool)(flags() & ItemAcceptsInputMethod));
@@ -1386,9 +1386,9 @@ QVariant QSGTextInput::inputMethodQuery(Qt::InputMethodQuery property) const
 
     Removes active text selection.
 */
-void QSGTextInput::deselect()
+void QQuickTextInput::deselect()
 {
-    Q_D(QSGTextInput);
+    Q_D(QQuickTextInput);
     d->control->deselect();
 }
 
@@ -1397,9 +1397,9 @@ void QSGTextInput::deselect()
 
     Causes all text to be selected.
 */
-void QSGTextInput::selectAll()
+void QQuickTextInput::selectAll()
 {
-    Q_D(QSGTextInput);
+    Q_D(QQuickTextInput);
     d->control->setSelection(0, d->control->text().length());
 }
 
@@ -1409,9 +1409,9 @@ void QSGTextInput::selectAll()
     Returns true if the natural reading direction of the editor text
     found between positions \a start and \a end is right to left.
 */
-bool QSGTextInput::isRightToLeft(int start, int end)
+bool QQuickTextInput::isRightToLeft(int start, int end)
 {
-    Q_D(QSGTextInput);
+    Q_D(QQuickTextInput);
     if (start > end) {
         qmlInfo(this) << "isRightToLeft(start, end) called with the end property being smaller than the start.";
         return false;
@@ -1426,9 +1426,9 @@ bool QSGTextInput::isRightToLeft(int start, int end)
 
     Moves the currently selected text to the system clipboard.
 */
-void QSGTextInput::cut()
+void QQuickTextInput::cut()
 {
-    Q_D(QSGTextInput);
+    Q_D(QQuickTextInput);
     d->control->copy();
     d->control->del();
 }
@@ -1438,9 +1438,9 @@ void QSGTextInput::cut()
 
     Copies the currently selected text to the system clipboard.
 */
-void QSGTextInput::copy()
+void QQuickTextInput::copy()
 {
-    Q_D(QSGTextInput);
+    Q_D(QQuickTextInput);
     d->control->copy();
 }
 
@@ -1449,9 +1449,9 @@ void QSGTextInput::copy()
 
     Replaces the currently selected text by the contents of the system clipboard.
 */
-void QSGTextInput::paste()
+void QQuickTextInput::paste()
 {
-    Q_D(QSGTextInput);
+    Q_D(QQuickTextInput);
     if (!d->control->isReadOnly())
         d->control->paste();
 }
@@ -1462,9 +1462,9 @@ void QSGTextInput::paste()
 
     Causes the word closest to the current cursor position to be selected.
 */
-void QSGTextInput::selectWord()
+void QQuickTextInput::selectWord()
 {
-    Q_D(QSGTextInput);
+    Q_D(QQuickTextInput);
     d->control->selectWordAtPos(d->control->cursor());
 }
 
@@ -1492,15 +1492,15 @@ void QSGTextInput::selectWord()
    the first character is used. If the string is empty, the value
    is ignored and the property is not set.
 */
-QString QSGTextInput::passwordCharacter() const
+QString QQuickTextInput::passwordCharacter() const
 {
-    Q_D(const QSGTextInput);
+    Q_D(const QQuickTextInput);
     return QString(d->control->passwordCharacter());
 }
 
-void QSGTextInput::setPasswordCharacter(const QString &str)
+void QQuickTextInput::setPasswordCharacter(const QString &str)
 {
-    Q_D(QSGTextInput);
+    Q_D(QQuickTextInput);
     if (str.length() < 1)
         return;
     d->control->setPasswordCharacter(str.constData()[0]);
@@ -1521,9 +1521,9 @@ void QSGTextInput::setPasswordCharacter(const QString &str)
    this property holds the text visible to the user, while
    the \l text property holds the actual entered text.
 */
-QString QSGTextInput::displayText() const
+QString QQuickTextInput::displayText() const
 {
-    Q_D(const QSGTextInput);
+    Q_D(const QQuickTextInput);
     return d->control->displayText();
 }
 
@@ -1537,15 +1537,15 @@ QString QSGTextInput::displayText() const
     not be an appropriate interaction (eg. may conflict with how
     the text needs to behave inside a Flickable.
 */
-bool QSGTextInput::selectByMouse() const
+bool QQuickTextInput::selectByMouse() const
 {
-    Q_D(const QSGTextInput);
+    Q_D(const QQuickTextInput);
     return d->selectByMouse;
 }
 
-void QSGTextInput::setSelectByMouse(bool on)
+void QQuickTextInput::setSelectByMouse(bool on)
 {
-    Q_D(QSGTextInput);
+    Q_D(QQuickTextInput);
     if (d->selectByMouse != on) {
         d->selectByMouse = on;
         emit selectByMouseChanged(on);
@@ -1565,15 +1565,15 @@ void QSGTextInput::setSelectByMouse(bool on)
     This property only applies when \l selectByMouse is true.
 */
 
-QSGTextInput::SelectionMode QSGTextInput::mouseSelectionMode() const
+QQuickTextInput::SelectionMode QQuickTextInput::mouseSelectionMode() const
 {
-    Q_D(const QSGTextInput);
+    Q_D(const QQuickTextInput);
     return d->mouseSelectionMode;
 }
 
-void QSGTextInput::setMouseSelectionMode(SelectionMode mode)
+void QQuickTextInput::setMouseSelectionMode(SelectionMode mode)
 {
-    Q_D(QSGTextInput);
+    Q_D(QQuickTextInput);
     if (d->mouseSelectionMode != mode) {
         d->mouseSelectionMode = mode;
         emit mouseSelectionModeChanged(mode);
@@ -1586,15 +1586,15 @@ void QSGTextInput::setMouseSelectionMode(SelectionMode mode)
     Returns true if the TextInput is writable and the content of the clipboard is
     suitable for pasting into the TextEdit.
 */
-bool QSGTextInput::canPaste() const
+bool QQuickTextInput::canPaste() const
 {
-    Q_D(const QSGTextInput);
+    Q_D(const QQuickTextInput);
     return d->canPaste;
 }
 
-void QSGTextInput::moveCursorSelection(int position)
+void QQuickTextInput::moveCursorSelection(int position)
 {
-    Q_D(QSGTextInput);
+    Q_D(QQuickTextInput);
     d->control->moveCursor(position, true);
 }
 
@@ -1635,9 +1635,9 @@ void QSGTextInput::moveCursorSelection(int position)
     The same sequence with TextInput.SelectWords will extend the selection start to a word boundary
     before or on position 5 and extend the selection end to a word boundary on or past position 9.
 */
-void QSGTextInput::moveCursorSelection(int pos, SelectionMode mode)
+void QQuickTextInput::moveCursorSelection(int pos, SelectionMode mode)
 {
-    Q_D(QSGTextInput);
+    Q_D(QQuickTextInput);
 
     if (mode == SelectCharacters) {
         d->control->moveCursor(pos, true);
@@ -1731,7 +1731,7 @@ void QSGTextInput::moveCursorSelection(int pos, SelectionMode mode)
         }
     \endqml
 */
-void QSGTextInput::openSoftwareInputPanel()
+void QQuickTextInput::openSoftwareInputPanel()
 {
     if (qGuiApp)
         qGuiApp->inputPanel()->show();
@@ -1776,33 +1776,33 @@ void QSGTextInput::openSoftwareInputPanel()
         }
     \endqml
 */
-void QSGTextInput::closeSoftwareInputPanel()
+void QQuickTextInput::closeSoftwareInputPanel()
 {
     if (qGuiApp)
         qGuiApp->inputPanel()->hide();
 }
 
-void QSGTextInput::focusInEvent(QFocusEvent *event)
+void QQuickTextInput::focusInEvent(QFocusEvent *event)
 {
-    Q_D(const QSGTextInput);
+    Q_D(const QQuickTextInput);
     if (d->focusOnPress && !isReadOnly())
         openSoftwareInputPanel();
-    QSGImplicitSizeItem::focusInEvent(event);
+    QQuickImplicitSizeItem::focusInEvent(event);
 }
 
-void QSGTextInput::itemChange(ItemChange change, const ItemChangeData &value)
+void QQuickTextInput::itemChange(ItemChange change, const ItemChangeData &value)
 {
-    Q_D(QSGTextInput);
+    Q_D(QQuickTextInput);
     if (change == ItemActiveFocusHasChanged) {
         bool hasFocus = value.boolValue;
         d->focused = hasFocus;
         setCursorVisible(hasFocus); // ### refactor:  && d->canvas && d->canvas->hasFocus()
-        if (echoMode() == QSGTextInput::PasswordEchoOnEdit && !hasFocus)
+        if (echoMode() == QQuickTextInput::PasswordEchoOnEdit && !hasFocus)
             d->control->updatePasswordEchoEditing(false);//QLineControl sets it on key events, but doesn't deal with focus events
         if (!hasFocus)
             d->control->deselect();
     }
-    QSGItem::itemChange(change, value);
+    QQuickItem::itemChange(change, value);
 }
 
 /*!
@@ -1817,15 +1817,15 @@ void QSGTextInput::itemChange(ItemChange change, const ItemChangeData &value)
     used to determine when to disable events handlers that may interfere with
     the correct operation of an input method.
 */
-bool QSGTextInput::isInputMethodComposing() const
+bool QQuickTextInput::isInputMethodComposing() const
 {
-    Q_D(const QSGTextInput);
+    Q_D(const QQuickTextInput);
     return d->control->preeditAreaText().length() > 0;
 }
 
-void QSGTextInputPrivate::init()
+void QQuickTextInputPrivate::init()
 {
-    Q_Q(QSGTextInput);
+    Q_Q(QQuickTextInput);
 #if defined(Q_WS_MAC)
     control->setThreadChecks(true);
 #endif
@@ -1834,8 +1834,8 @@ void QSGTextInputPrivate::init()
     control->setPasswordCharacter(QLatin1Char('*'));
     q->setSmooth(smooth);
     q->setAcceptedMouseButtons(Qt::LeftButton);
-    q->setFlag(QSGItem::ItemAcceptsInputMethod);
-    q->setFlag(QSGItem::ItemHasContents);
+    q->setFlag(QQuickItem::ItemAcceptsInputMethod);
+    q->setFlag(QQuickItem::ItemHasContents);
     q->connect(control, SIGNAL(cursorPositionChanged(int,int)),
                q, SLOT(cursorPosChanged()));
     q->connect(control, SIGNAL(selectionChanged()),
@@ -1874,9 +1874,9 @@ void QSGTextInputPrivate::init()
     }
 }
 
-void QSGTextInput::cursorPosChanged()
+void QQuickTextInput::cursorPosChanged()
 {
-    Q_D(QSGTextInput);
+    Q_D(QQuickTextInput);
     updateCursorRectangle();
     emit cursorPositionChanged();
     // XXX todo - not in 4.8?
@@ -1896,9 +1896,9 @@ void QSGTextInput::cursorPosChanged()
     }
 }
 
-void QSGTextInput::updateCursorRectangle()
+void QQuickTextInput::updateCursorRectangle()
 {
-    Q_D(QSGTextInput);
+    Q_D(QQuickTextInput);
     d->determineHorizontalAlignment();
     d->updateHorizontalScroll();
     updateRect();//TODO: Only update rect between pos's
@@ -1908,9 +1908,9 @@ void QSGTextInput::updateCursorRectangle()
         d->cursorItem->setX(d->control->cursorToX() - d->hscroll);
 }
 
-void QSGTextInput::selectionChanged()
+void QQuickTextInput::selectionChanged()
 {
-    Q_D(QSGTextInput);
+    Q_D(QQuickTextInput);
     updateRect();//TODO: Only update rect in selection
     emit selectedTextChanged();
 
@@ -1928,9 +1928,9 @@ void QSGTextInput::selectionChanged()
     }
 }
 
-void QSGTextInput::q_textChanged()
+void QQuickTextInput::q_textChanged()
 {
-    Q_D(QSGTextInput);
+    Q_D(QQuickTextInput);
     emit textChanged();
     emit displayTextChanged();
     updateSize();
@@ -1943,21 +1943,21 @@ void QSGTextInput::q_textChanged()
     }
 }
 
-void QSGTextInputPrivate::showCursor()
+void QQuickTextInputPrivate::showCursor()
 {
     if (textNode != 0 && textNode->cursorNode() != 0)
         textNode->cursorNode()->setColor(color);
 }
 
-void QSGTextInputPrivate::hideCursor()
+void QQuickTextInputPrivate::hideCursor()
 {
     if (textNode != 0 && textNode->cursorNode() != 0)
         textNode->cursorNode()->setColor(QColor(0, 0, 0, 0));
 }
 
-void QSGTextInput::updateRect(const QRect &r)
+void QQuickTextInput::updateRect(const QRect &r)
 {
-    Q_D(QSGTextInput);
+    Q_D(QQuickTextInput);
     if (!isComponentComplete())
         return;
 
@@ -1968,10 +1968,10 @@ void QSGTextInput::updateRect(const QRect &r)
     update();
 }
 
-QRectF QSGTextInput::boundingRect() const
+QRectF QQuickTextInput::boundingRect() const
 {
-    Q_D(const QSGTextInput);
-    QRectF r = QSGImplicitSizeItem::boundingRect();
+    Q_D(const QQuickTextInput);
+    QRectF r = QQuickImplicitSizeItem::boundingRect();
 
     int cursorWidth = d->cursorItem ? d->cursorItem->width() : d->control->cursorWidth();
 
@@ -1981,9 +1981,9 @@ QRectF QSGTextInput::boundingRect() const
     return r;
 }
 
-void QSGTextInput::updateSize(bool needsRedraw)
+void QQuickTextInput::updateSize(bool needsRedraw)
 {
-    Q_D(QSGTextInput);
+    Q_D(QQuickTextInput);
     int w = width();
     int h = height();
     setImplicitHeight(d->control->height()-1); // -1 to counter QLineControl's +1 which is not consistent with Text.
@@ -1992,9 +1992,9 @@ void QSGTextInput::updateSize(bool needsRedraw)
         update();
 }
 
-void QSGTextInput::q_canPasteChanged()
+void QQuickTextInput::q_canPasteChanged()
 {
-    Q_D(QSGTextInput);
+    Q_D(QQuickTextInput);
     bool old = d->canPaste;
 #ifndef QT_NO_CLIPBOARD
     d->canPaste = !d->control->isReadOnly() && QGuiApplication::clipboard()->text().length() != 0;
diff --git a/src/declarative/items/qsgtextinput_p.h b/src/declarative/items/qquicktextinput_p.h
index 6addc94bbb..a322b8c73a 100644
--- a/src/declarative/items/qsgtextinput_p.h
+++ b/src/declarative/items/qquicktextinput_p.h
@@ -40,10 +40,10 @@
 **
 ****************************************************************************/
 
-#ifndef QSGTEXTINPUT_P_H
-#define QSGTEXTINPUT_P_H
+#ifndef QQUICKTEXTINPUT_P_H
+#define QQUICKTEXTINPUT_P_H
 
-#include "qsgimplicitsizeitem_p.h"
+#include "qquickimplicitsizeitem_p.h"
 #include <QtGui/qvalidator.h>
 
 QT_BEGIN_HEADER
@@ -52,9 +52,9 @@ QT_BEGIN_NAMESPACE
 
 QT_MODULE(Declarative)
 
-class QSGTextInputPrivate;
+class QQuickTextInputPrivate;
 class QValidator;
-class Q_AUTOTEST_EXPORT QSGTextInput : public QSGImplicitSizeItem
+class Q_AUTOTEST_EXPORT QQuickTextInput : public QQuickImplicitSizeItem
 {
     Q_OBJECT
     Q_ENUMS(HAlignment)
@@ -97,8 +97,8 @@ class Q_AUTOTEST_EXPORT QSGTextInput : public QSGImplicitSizeItem
     Q_PROPERTY(bool inputMethodComposing READ isInputMethodComposing NOTIFY inputMethodComposingChanged)
 
 public:
-    QSGTextInput(QSGItem * parent=0);
-    ~QSGTextInput();
+    QQuickTextInput(QQuickItem * parent=0);
+    ~QQuickTextInput();
 
     enum EchoMode {//To match QLineEdit::EchoMode
         Normal,
@@ -285,12 +285,12 @@ private Q_SLOTS:
     void q_canPasteChanged();
 
 private:
-    Q_DECLARE_PRIVATE(QSGTextInput)
+    Q_DECLARE_PRIVATE(QQuickTextInput)
 };
 
 QT_END_NAMESPACE
 
-QML_DECLARE_TYPE(QSGTextInput)
+QML_DECLARE_TYPE(QQuickTextInput)
 #ifndef QT_NO_VALIDATOR
 QML_DECLARE_TYPE(QValidator)
 QML_DECLARE_TYPE(QIntValidator)
@@ -300,4 +300,4 @@ QML_DECLARE_TYPE(QRegExpValidator)
 
 QT_END_HEADER
 
-#endif // QSGTEXTINPUT_P_H
+#endif // QQUICKTEXTINPUT_P_H
diff --git a/src/declarative/items/qsgtextinput_p_p.h b/src/declarative/items/qquicktextinput_p_p.h
index ed2395bb0e..900b0804bb 100644
--- a/src/declarative/items/qsgtextinput_p_p.h
+++ b/src/declarative/items/qquicktextinput_p_p.h
@@ -40,12 +40,12 @@
 **
 ****************************************************************************/
 
-#ifndef QSGTEXTINPUT_P_P_H
-#define QSGTEXTINPUT_P_P_H
+#ifndef QQUICKTEXTINPUT_P_P_H
+#define QQUICKTEXTINPUT_P_P_H
 
-#include "qsgtextinput_p.h"
-#include "qsgtext_p.h"
-#include "qsgimplicitsizeitem_p_p.h"
+#include "qquicktextinput_p.h"
+#include "qquicktext_p.h"
+#include "qquickimplicitsizeitem_p_p.h"
 
 #include <private/qlinecontrol_p.h>
 
@@ -68,19 +68,19 @@
 
 QT_BEGIN_NAMESPACE
 
-class QSGTextNode;
+class QQuickTextNode;
 
-class Q_AUTOTEST_EXPORT QSGTextInputPrivate : public QSGImplicitSizeItemPrivate
+class Q_AUTOTEST_EXPORT QQuickTextInputPrivate : public QQuickImplicitSizeItemPrivate
 {
-    Q_DECLARE_PUBLIC(QSGTextInput)
+    Q_DECLARE_PUBLIC(QQuickTextInput)
 public:
-    QSGTextInputPrivate()
+    QQuickTextInputPrivate()
                  : control(new QLineControl(QString()))
                  , color((QRgb)0)
-                 , style(QSGText::Normal)
+                 , style(QQuickText::Normal)
                  , styleColor((QRgb)0)
-                 , hAlign(QSGTextInput::AlignLeft)
-                 , mouseSelectionMode(QSGTextInput::SelectCharacters)
+                 , hAlign(QQuickTextInput::AlignLeft)
+                 , mouseSelectionMode(QQuickTextInput::SelectCharacters)
                  , inputMethodHints(Qt::ImhNone)
                  , textNode(0)
                  , hscroll(0)
@@ -98,13 +98,13 @@ public:
     {
     }
 
-    ~QSGTextInputPrivate()
+    ~QQuickTextInputPrivate()
     {
     }
 
     int xToPos(int x, QTextLine::CursorPosition betweenOrOn = QTextLine::CursorBetweenCharacters) const
     {
-        Q_Q(const QSGTextInput);
+        Q_Q(const QQuickTextInput);
         QRect cr = q->boundingRect().toRect();
         x-= cr.x() - hscroll;
         return control->xToPos(x, betweenOrOn);
@@ -114,7 +114,7 @@ public:
     void startCreatingCursor();
     void updateHorizontalScroll();
     bool determineHorizontalAlignment();
-    bool setHAlign(QSGTextInput::HAlignment, bool forceAlign = false);
+    bool setHAlign(QQuickTextInput::HAlignment, bool forceAlign = false);
     void mirrorChange();
     int calculateTextWidth();
     bool sendMouseEventToInputContext(QMouseEvent *event);
@@ -129,15 +129,15 @@ public:
     QColor  color;
     QColor  selectionColor;
     QColor  selectedTextColor;
-    QSGText::TextStyle style;
+    QQuickText::TextStyle style;
     QColor  styleColor;
-    QSGTextInput::HAlignment hAlign;
-    QSGTextInput::SelectionMode mouseSelectionMode;
+    QQuickTextInput::HAlignment hAlign;
+    QQuickTextInput::SelectionMode mouseSelectionMode;
     Qt::InputMethodHints inputMethodHints;
     QPointer<QDeclarativeComponent> cursorComponent;
-    QPointer<QSGItem> cursorItem;
+    QPointer<QQuickItem> cursorItem;
     QPointF pressPos;
-    QSGTextNode *textNode;
+    QQuickTextNode *textNode;
     QElapsedTimer tripleClickTimer;
     QPoint tripleClickStartPoint;
 
@@ -159,7 +159,7 @@ public:
     bool selectPressed:1;
     bool textLayoutDirty:1;
 
-    static inline QSGTextInputPrivate *get(QSGTextInput *t) {
+    static inline QQuickTextInputPrivate *get(QQuickTextInput *t) {
         return t->d_func();
     }
     bool hasPendingTripleClick() const {
@@ -169,4 +169,4 @@ public:
 
 QT_END_NAMESPACE
 
-#endif // QSGTEXTINPUT_P_P_H
+#endif // QQUICKTEXTINPUT_P_P_H
diff --git a/src/declarative/items/qsgtextnode.cpp b/src/declarative/items/qquicktextnode.cpp
index f712bd768e..fab592ffdc 100644
--- a/src/declarative/items/qsgtextnode.cpp
+++ b/src/declarative/items/qquicktextnode.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include "qsgtextnode_p.h"
+#include "qquicktextnode_p.h"
 #include "qsgsimplerectnode.h"
 #include <private/qsgadaptationlayer_p.h>
 #include <private/qsgdistancefieldglyphcache_p.h>
@@ -67,9 +67,9 @@
 QT_BEGIN_NAMESPACE
 
 /*!
-  Creates an empty QSGTextNode
+  Creates an empty QQuickTextNode
 */
-QSGTextNode::QSGTextNode(QSGContext *context)
+QQuickTextNode::QQuickTextNode(QSGContext *context)
     : m_context(context), m_cursorNode(0)
 {
 #if defined(QML_RUNTIME_TESTING)
@@ -77,13 +77,13 @@ QSGTextNode::QSGTextNode(QSGContext *context)
 #endif
 }
 
-QSGTextNode::~QSGTextNode()
+QQuickTextNode::~QQuickTextNode()
 {
     qDeleteAll(m_textures);
 }
 
 #if 0
-void QSGTextNode::setColor(const QColor &color)
+void QQuickTextNode::setColor(const QColor &color)
 {
     if (m_usePixmapCache) {
         setUpdateFlag(UpdateNodes);
@@ -103,9 +103,9 @@ void QSGTextNode::setColor(const QColor &color)
     m_color = color;
 }
 
-void QSGTextNode::setStyleColor(const QColor &styleColor)
+void QQuickTextNode::setStyleColor(const QColor &styleColor)
 {
-    if (m_textStyle != QSGTextNode::NormalTextStyle) {
+    if (m_textStyle != QQuickTextNode::NormalTextStyle) {
         if (m_usePixmapCache) {
             setUpdateFlag(UpdateNodes);
         } else {
@@ -126,8 +126,8 @@ void QSGTextNode::setStyleColor(const QColor &styleColor)
 }
 #endif
 
-QSGGlyphNode *QSGTextNode::addGlyphs(const QPointF &position, const QGlyphRun &glyphs, const QColor &color,
-                                     QSGText::TextStyle style, const QColor &styleColor,
+QSGGlyphNode *QQuickTextNode::addGlyphs(const QPointF &position, const QGlyphRun &glyphs, const QColor &color,
+                                     QQuickText::TextStyle style, const QColor &styleColor,
                                      QSGNode *parentNode)
 {
     QSGGlyphNode *node = m_context->createGlyphNode();
@@ -153,7 +153,7 @@ QSGGlyphNode *QSGTextNode::addGlyphs(const QPointF &position, const QGlyphRun &g
     return node;
 }
 
-void QSGTextNode::setCursor(const QRectF &rect, const QColor &color)
+void QQuickTextNode::setCursor(const QRectF &rect, const QColor &color)
 {
     if (m_cursorNode != 0)
         delete m_cursorNode;
@@ -173,7 +173,7 @@ namespace {
         BinaryTreeNode()
             : selectionState(Unselected)
             , clipNode(0)
-            , decorations(QSGTextNode::NoDecoration)
+            , decorations(QQuickTextNode::NoDecoration)
             , ascent(0.0)
             , leftChildIndex(-1)
             , rightChildIndex(-1)
@@ -185,7 +185,7 @@ namespace {
             : boundingRect(brect)
             , selectionState(selState)
             , clipNode(0)
-            , decorations(QSGTextNode::NoDecoration)
+            , decorations(QQuickTextNode::NoDecoration)
             , image(i)
             , ascent(a)
             , leftChildIndex(-1)
@@ -194,7 +194,7 @@ namespace {
         }
 
         BinaryTreeNode(const QGlyphRun &g, SelectionState selState, const QRectF &brect,
-                       const QSGTextNode::Decorations &decs, const QColor &c, const QColor &bc,
+                       const QQuickTextNode::Decorations &decs, const QColor &c, const QColor &bc,
                        const QPointF &pos, qreal a)
             : glyphRun(g)
             , boundingRect(brect)
@@ -214,7 +214,7 @@ namespace {
         QRectF boundingRect;
         SelectionState selectionState;
         QSGClipNode *clipNode;
-        QSGTextNode::Decorations decorations;
+        QQuickTextNode::Decorations decorations;
         QColor color;
         QColor backgroundColor;
         QPointF position;
@@ -246,11 +246,11 @@ namespace {
             if (qFuzzyIsNull(searchRect.width()) || qFuzzyIsNull(searchRect.height()))
                 return;
 
-            QSGTextNode::Decorations decorations = QSGTextNode::NoDecoration;
-            decorations |= (glyphRun.underline() ? QSGTextNode::Underline : QSGTextNode::NoDecoration);
-            decorations |= (glyphRun.overline()  ? QSGTextNode::Overline  : QSGTextNode::NoDecoration);
-            decorations |= (glyphRun.strikeOut() ? QSGTextNode::StrikeOut : QSGTextNode::NoDecoration);
-            decorations |= (backgroundColor.isValid() ? QSGTextNode::Background : QSGTextNode::NoDecoration);
+            QQuickTextNode::Decorations decorations = QQuickTextNode::NoDecoration;
+            decorations |= (glyphRun.underline() ? QQuickTextNode::Underline : QQuickTextNode::NoDecoration);
+            decorations |= (glyphRun.overline()  ? QQuickTextNode::Overline  : QQuickTextNode::NoDecoration);
+            decorations |= (glyphRun.strikeOut() ? QQuickTextNode::StrikeOut : QQuickTextNode::NoDecoration);
+            decorations |= (backgroundColor.isValid() ? QQuickTextNode::Background : QQuickTextNode::NoDecoration);
 
             qreal ascent = glyphRun.rawFont().ascent();
             insert(binaryTree, BinaryTreeNode(glyphRun, selectionState, searchRect, decorations,
@@ -340,8 +340,8 @@ namespace {
                                 int start, int end,
                                 int selectionStart, int selectionEnd);
 
-        void addToSceneGraph(QSGTextNode *parent,
-                             QSGText::TextStyle style = QSGText::Normal,
+        void addToSceneGraph(QQuickTextNode *parent,
+                             QQuickText::TextStyle style = QQuickText::Normal,
                              const QColor &styleColor = QColor());
 
         void setSelectionColor(const QColor &selectionColor)
@@ -441,7 +441,7 @@ namespace {
         BinaryTreeNode::SelectionState currentSelectionState = BinaryTreeNode::Unselected;
         QRectF currentRect;
 
-        QSGTextNode::Decorations currentDecorations = QSGTextNode::NoDecoration;
+        QQuickTextNode::Decorations currentDecorations = QQuickTextNode::NoDecoration;
         qreal underlineOffset = 0.0;
         qreal underlineThickness = 0.0;
 
@@ -475,7 +475,7 @@ namespace {
                     currentSelectionState = node->selectionState;
 
                 // Update decorations
-                if (currentDecorations != QSGTextNode::NoDecoration) {
+                if (currentDecorations != QQuickTextNode::NoDecoration) {
                     decorationRect.setY(m_position.y() + m_currentLine.y());
                     decorationRect.setHeight(m_currentLine.height());
 
@@ -483,16 +483,16 @@ namespace {
                         decorationRect.setRight(node->boundingRect.left());
 
                     TextDecoration textDecoration(currentSelectionState, decorationRect, lastColor);
-                    if (currentDecorations & QSGTextNode::Underline)
+                    if (currentDecorations & QQuickTextNode::Underline)
                         pendingUnderlines.append(textDecoration);
 
-                    if (currentDecorations & QSGTextNode::Overline)
+                    if (currentDecorations & QQuickTextNode::Overline)
                         pendingOverlines.append(textDecoration);
 
-                    if (currentDecorations & QSGTextNode::StrikeOut)
+                    if (currentDecorations & QQuickTextNode::StrikeOut)
                         pendingStrikeOuts.append(textDecoration);
 
-                    if (currentDecorations & QSGTextNode::Background)
+                    if (currentDecorations & QQuickTextNode::Background)
                         m_backgrounds.append(qMakePair(decorationRect, lastBackgroundColor));
                 }
 
@@ -548,7 +548,7 @@ namespace {
                     // If previous item(s) had underline and current does not, then we add the
                     // pending lines to the lists and likewise for overlines and strikeouts
                     if (!pendingUnderlines.isEmpty()
-                      && !(node->decorations & QSGTextNode::Underline)) {
+                      && !(node->decorations & QQuickTextNode::Underline)) {
                         addTextDecorations(pendingUnderlines, underlineOffset, underlineThickness);
 
                         pendingUnderlines.clear();
@@ -581,19 +581,19 @@ namespace {
 
                     // Merge current values with previous. Prefer greatest thickness
                     QRawFont rawFont = node->glyphRun.rawFont();
-                    if (node->decorations & QSGTextNode::Underline) {
+                    if (node->decorations & QQuickTextNode::Underline) {
                         if (rawFont.lineThickness() > underlineThickness) {
                             underlineThickness = rawFont.lineThickness();
                             underlineOffset = rawFont.underlinePosition();
                         }
                     }
 
-                    if (node->decorations & QSGTextNode::Overline) {
+                    if (node->decorations & QQuickTextNode::Overline) {
                         overlineOffset = -rawFont.ascent();
                         overlineThickness = rawFont.lineThickness();
                     }
 
-                    if (node->decorations & QSGTextNode::StrikeOut) {
+                    if (node->decorations & QQuickTextNode::StrikeOut) {
                         strikeOutThickness = rawFont.lineThickness();
                         strikeOutOffset = rawFont.ascent() / -3.0;
                     }
@@ -869,8 +869,8 @@ namespace {
         }
     }
 
-    void SelectionEngine::addToSceneGraph(QSGTextNode *parentNode,
-                                          QSGText::TextStyle style,
+    void SelectionEngine::addToSceneGraph(QQuickTextNode *parentNode,
+                                          QQuickText::TextStyle style,
                                           const QColor &styleColor)
     {
         if (m_currentLine.isValid())
@@ -971,7 +971,7 @@ namespace {
     }
 }
 
-void QSGTextNode::mergeFormats(QTextLayout *textLayout,
+void QQuickTextNode::mergeFormats(QTextLayout *textLayout,
                                QVarLengthArray<QTextLayout::FormatRange> *mergedFormats)
 {
     Q_ASSERT(mergedFormats != 0);
@@ -1037,7 +1037,7 @@ namespace {
 
 }
 
-void QSGTextNode::addImage(const QRectF &rect, const QImage &image)
+void QQuickTextNode::addImage(const QRectF &rect, const QImage &image)
 {
     QSGImageNode *node = m_context->createImageNode();
     QSGTexture *texture = m_context->createTexture(image);
@@ -1048,9 +1048,9 @@ void QSGTextNode::addImage(const QRectF &rect, const QImage &image)
     node->update();
 }
 
-void QSGTextNode::addTextDocument(const QPointF &, QTextDocument *textDocument,
+void QQuickTextNode::addTextDocument(const QPointF &, QTextDocument *textDocument,
                                   const QColor &textColor,
-                                  QSGText::TextStyle style, const QColor &styleColor,
+                                  QQuickText::TextStyle style, const QColor &styleColor,
                                   const QColor &selectionColor, const QColor &selectedTextColor,
                                   int selectionStart, int selectionEnd)
 {
@@ -1222,8 +1222,8 @@ void QSGTextNode::addTextDocument(const QPointF &, QTextDocument *textDocument,
     engine.addToSceneGraph(this, style, styleColor);
 }
 
-void QSGTextNode::addTextLayout(const QPointF &position, QTextLayout *textLayout, const QColor &color,
-                                QSGText::TextStyle style, const QColor &styleColor,
+void QQuickTextNode::addTextLayout(const QPointF &position, QTextLayout *textLayout, const QColor &color,
+                                QQuickText::TextStyle style, const QColor &styleColor,
                                 const QColor &selectionColor, const QColor &selectedTextColor,
                                 int selectionStart, int selectionEnd)
 {
@@ -1259,7 +1259,7 @@ void QSGTextNode::addTextLayout(const QPointF &position, QTextLayout *textLayout
     engine.addToSceneGraph(this, style, styleColor);
 }
 
-void QSGTextNode::deleteContent()
+void QQuickTextNode::deleteContent()
 {
     while (firstChild() != 0)
         delete firstChild();
@@ -1267,7 +1267,7 @@ void QSGTextNode::deleteContent()
 }
 
 #if 0
-void QSGTextNode::updateNodes()
+void QQuickTextNode::updateNodes()
 {
     return;
     deleteContent();
diff --git a/src/declarative/items/qsgtextnode_p.h b/src/declarative/items/qquicktextnode_p.h
index 7a9462c24e..16e92e34f3 100644
--- a/src/declarative/items/qsgtextnode_p.h
+++ b/src/declarative/items/qquicktextnode_p.h
@@ -39,11 +39,11 @@
 **
 ****************************************************************************/
 
-#ifndef QSGTEXTNODE_P_H
-#define QSGTEXTNODE_P_H
+#ifndef QQUICKTEXTNODE_P_H
+#define QQUICKTEXTNODE_P_H
 
 #include <qsgnode.h>
-#include "qsgtext_p.h"
+#include "qquicktext_p.h"
 #include <qglyphrun.h>
 
 #include <QtGui/qcolor.h>
@@ -62,7 +62,7 @@ class QSGSimpleRectNode;
 class QSGClipNode;
 class QSGTexture;
 
-class QSGTextNode : public QSGTransformNode
+class QQuickTextNode : public QSGTransformNode
 {
 public:
     enum Decoration {
@@ -74,18 +74,18 @@ public:
     };
     Q_DECLARE_FLAGS(Decorations, Decoration)
 
-    QSGTextNode(QSGContext *);
-    ~QSGTextNode();
+    QQuickTextNode(QSGContext *);
+    ~QQuickTextNode();
 
     static bool isComplexRichText(QTextDocument *);
 
     void deleteContent();
     void addTextLayout(const QPointF &position, QTextLayout *textLayout, const QColor &color = QColor(),
-                       QSGText::TextStyle style = QSGText::Normal, const QColor &styleColor = QColor(),
+                       QQuickText::TextStyle style = QQuickText::Normal, const QColor &styleColor = QColor(),
                        const QColor &selectionColor = QColor(), const QColor &selectedTextColor = QColor(),
                        int selectionStart = -1, int selectionEnd = -1);
     void addTextDocument(const QPointF &position, QTextDocument *textDocument, const QColor &color = QColor(),
-                         QSGText::TextStyle style = QSGText::Normal, const QColor &styleColor = QColor(),
+                         QQuickText::TextStyle style = QQuickText::Normal, const QColor &styleColor = QColor(),
                          const QColor &selectionColor = QColor(), const QColor &selectedTextColor = QColor(),
                          int selectionStart = -1, int selectionEnd = -1);
 
@@ -93,7 +93,7 @@ public:
     QSGSimpleRectNode *cursorNode() const { return m_cursorNode; }
 
     QSGGlyphNode *addGlyphs(const QPointF &position, const QGlyphRun &glyphs, const QColor &color,
-                            QSGText::TextStyle style = QSGText::Normal, const QColor &styleColor = QColor(),
+                            QQuickText::TextStyle style = QQuickText::Normal, const QColor &styleColor = QColor(),
                             QSGNode *parentNode = 0);
     void addImage(const QRectF &rect, const QImage &image);
 
@@ -107,4 +107,4 @@ private:
 
 QT_END_NAMESPACE
 
-#endif // QSGTEXTNODE_P_H
+#endif // QQUICKTEXTNODE_P_H
diff --git a/src/declarative/items/qsgtranslate.cpp b/src/declarative/items/qquicktranslate.cpp
index 577cf4d427..7347cb0624 100644
--- a/src/declarative/items/qsgtranslate.cpp
+++ b/src/declarative/items/qquicktranslate.cpp
@@ -39,17 +39,17 @@
 **
 ****************************************************************************/
 
-#include "qsgtranslate_p.h"
-#include "qsgitem_p.h"
+#include "qquicktranslate_p.h"
+#include "qquickitem_p.h"
 
 #include <QtCore/qmath.h>
 
 QT_BEGIN_NAMESPACE
 
-class QSGTranslatePrivate : public QSGTransformPrivate
+class QQuickTranslatePrivate : public QQuickTransformPrivate
 {
 public:
-    QSGTranslatePrivate()
+    QQuickTranslatePrivate()
     : x(0), y(0) {}
 
     qreal x;
@@ -57,37 +57,37 @@ public:
 };
 
 /*!
-    Constructs an empty QSGTranslate object with the given \a parent.
+    Constructs an empty QQuickTranslate object with the given \a parent.
 */
-QSGTranslate::QSGTranslate(QObject *parent)
-: QSGTransform(*new QSGTranslatePrivate, parent)
+QQuickTranslate::QQuickTranslate(QObject *parent)
+: QQuickTransform(*new QQuickTranslatePrivate, parent)
 {
 }
 
 /*!
     Destroys the graphics scale.
 */
-QSGTranslate::~QSGTranslate()
+QQuickTranslate::~QQuickTranslate()
 {
 }
 
 /*!
-    \property QSGTranslate::x
+    \property QQuickTranslate::x
     \brief the horizontal translation.
 
     The translation can be any real number; the default value is 0.0.
 
     \sa y
 */
-qreal QSGTranslate::x() const
+qreal QQuickTranslate::x() const
 {
-    Q_D(const QSGTranslate);
+    Q_D(const QQuickTranslate);
     return d->x;
 }
 
-void QSGTranslate::setX(qreal x)
+void QQuickTranslate::setX(qreal x)
 {
-    Q_D(QSGTranslate);
+    Q_D(QQuickTranslate);
     if (d->x == x)
         return;
     d->x = x;
@@ -96,21 +96,21 @@ void QSGTranslate::setX(qreal x)
 }
 
 /*!
-    \property QSGTranslate::y
+    \property QQuickTranslate::y
     \brief the vertical translation.
 
     The translation can be any real number; the default value is 0.0.
 
     \sa x
 */
-qreal QSGTranslate::y() const
+qreal QQuickTranslate::y() const
 {
-    Q_D(const QSGTranslate);
+    Q_D(const QQuickTranslate);
     return d->y;
 }
-void QSGTranslate::setY(qreal y)
+void QQuickTranslate::setY(qreal y)
 {
-    Q_D(QSGTranslate);
+    Q_D(QQuickTranslate);
     if (d->y == y)
         return;
     d->y = y;
@@ -118,16 +118,16 @@ void QSGTranslate::setY(qreal y)
     emit yChanged();
 }
 
-void QSGTranslate::applyTo(QMatrix4x4 *matrix) const
+void QQuickTranslate::applyTo(QMatrix4x4 *matrix) const
 {
-    Q_D(const QSGTranslate);
+    Q_D(const QQuickTranslate);
     matrix->translate(d->x, d->y, 0);
 }
 
-class QSGScalePrivate : public QSGTransformPrivate
+class QQuickScalePrivate : public QQuickTransformPrivate
 {
 public:
-    QSGScalePrivate()
+    QQuickScalePrivate()
         : xScale(1), yScale(1), zScale(1) {}
     QVector3D origin;
     qreal xScale;
@@ -135,23 +135,23 @@ public:
     qreal zScale;
 };
 
-QSGScale::QSGScale(QObject *parent)
-    : QSGTransform(*new QSGScalePrivate, parent)
+QQuickScale::QQuickScale(QObject *parent)
+    : QQuickTransform(*new QQuickScalePrivate, parent)
 {
 }
 
-QSGScale::~QSGScale()
+QQuickScale::~QQuickScale()
 {
 }
 
-QVector3D QSGScale::origin() const
+QVector3D QQuickScale::origin() const
 {
-    Q_D(const QSGScale);
+    Q_D(const QQuickScale);
     return d->origin;
 }
-void QSGScale::setOrigin(const QVector3D &point)
+void QQuickScale::setOrigin(const QVector3D &point)
 {
-    Q_D(QSGScale);
+    Q_D(QQuickScale);
     if (d->origin == point)
         return;
     d->origin = point;
@@ -159,14 +159,14 @@ void QSGScale::setOrigin(const QVector3D &point)
     emit originChanged();
 }
 
-qreal QSGScale::xScale() const
+qreal QQuickScale::xScale() const
 {
-    Q_D(const QSGScale);
+    Q_D(const QQuickScale);
     return d->xScale;
 }
-void QSGScale::setXScale(qreal scale)
+void QQuickScale::setXScale(qreal scale)
 {
-    Q_D(QSGScale);
+    Q_D(QQuickScale);
     if (d->xScale == scale)
         return;
     d->xScale = scale;
@@ -175,14 +175,14 @@ void QSGScale::setXScale(qreal scale)
     emit scaleChanged();
 }
 
-qreal QSGScale::yScale() const
+qreal QQuickScale::yScale() const
 {
-    Q_D(const QSGScale);
+    Q_D(const QQuickScale);
     return d->yScale;
 }
-void QSGScale::setYScale(qreal scale)
+void QQuickScale::setYScale(qreal scale)
 {
-    Q_D(QSGScale);
+    Q_D(QQuickScale);
     if (d->yScale == scale)
         return;
     d->yScale = scale;
@@ -191,14 +191,14 @@ void QSGScale::setYScale(qreal scale)
     emit scaleChanged();
 }
 
-qreal QSGScale::zScale() const
+qreal QQuickScale::zScale() const
 {
-    Q_D(const QSGScale);
+    Q_D(const QQuickScale);
     return d->zScale;
 }
-void QSGScale::setZScale(qreal scale)
+void QQuickScale::setZScale(qreal scale)
 {
-    Q_D(QSGScale);
+    Q_D(QQuickScale);
     if (d->zScale == scale)
         return;
     d->zScale = scale;
@@ -207,42 +207,42 @@ void QSGScale::setZScale(qreal scale)
     emit scaleChanged();
 }
 
-void QSGScale::applyTo(QMatrix4x4 *matrix) const
+void QQuickScale::applyTo(QMatrix4x4 *matrix) const
 {
-    Q_D(const QSGScale);
+    Q_D(const QQuickScale);
     matrix->translate(d->origin);
     matrix->scale(d->xScale, d->yScale, d->zScale);
     matrix->translate(-d->origin);
 }
 
-class QSGRotationPrivate : public QSGTransformPrivate
+class QQuickRotationPrivate : public QQuickTransformPrivate
 {
 public:
-    QSGRotationPrivate()
+    QQuickRotationPrivate()
         : angle(0), axis(0, 0, 1) {}
     QVector3D origin;
     qreal angle;
     QVector3D axis;
 };
 
-QSGRotation::QSGRotation(QObject *parent)
-    : QSGTransform(*new QSGRotationPrivate, parent)
+QQuickRotation::QQuickRotation(QObject *parent)
+    : QQuickTransform(*new QQuickRotationPrivate, parent)
 {
 }
 
-QSGRotation::~QSGRotation()
+QQuickRotation::~QQuickRotation()
 {
 }
 
-QVector3D QSGRotation::origin() const
+QVector3D QQuickRotation::origin() const
 {
-    Q_D(const QSGRotation);
+    Q_D(const QQuickRotation);
     return d->origin;
 }
 
-void QSGRotation::setOrigin(const QVector3D &point)
+void QQuickRotation::setOrigin(const QVector3D &point)
 {
-    Q_D(QSGRotation);
+    Q_D(QQuickRotation);
     if (d->origin == point)
         return;
     d->origin = point;
@@ -250,14 +250,14 @@ void QSGRotation::setOrigin(const QVector3D &point)
     emit originChanged();
 }
 
-qreal QSGRotation::angle() const
+qreal QQuickRotation::angle() const
 {
-    Q_D(const QSGRotation);
+    Q_D(const QQuickRotation);
     return d->angle;
 }
-void QSGRotation::setAngle(qreal angle)
+void QQuickRotation::setAngle(qreal angle)
 {
-    Q_D(QSGRotation);
+    Q_D(QQuickRotation);
     if (d->angle == angle)
         return;
     d->angle = angle;
@@ -265,14 +265,14 @@ void QSGRotation::setAngle(qreal angle)
     emit angleChanged();
 }
 
-QVector3D QSGRotation::axis() const
+QVector3D QQuickRotation::axis() const
 {
-    Q_D(const QSGRotation);
+    Q_D(const QQuickRotation);
     return d->axis;
 }
-void QSGRotation::setAxis(const QVector3D &axis)
+void QQuickRotation::setAxis(const QVector3D &axis)
 {
-    Q_D(QSGRotation);
+    Q_D(QQuickRotation);
     if (d->axis == axis)
          return;
     d->axis = axis;
@@ -280,7 +280,7 @@ void QSGRotation::setAxis(const QVector3D &axis)
     emit axisChanged();
 }
 
-void QSGRotation::setAxis(Qt::Axis axis)
+void QQuickRotation::setAxis(Qt::Axis axis)
 {
     switch (axis)
     {
@@ -304,9 +304,9 @@ public:
     }
 };
 
-void QSGRotation::applyTo(QMatrix4x4 *matrix) const
+void QQuickRotation::applyTo(QMatrix4x4 *matrix) const
 {
-    Q_D(const QSGRotation);
+    Q_D(const QQuickRotation);
 
     if (d->angle == 0. || d->axis.isNull())
         return;
diff --git a/src/declarative/items/qsgtranslate_p.h b/src/declarative/items/qquicktranslate_p.h
index fb85daabcf..6c2333df34 100644
--- a/src/declarative/items/qsgtranslate_p.h
+++ b/src/declarative/items/qquicktranslate_p.h
@@ -40,10 +40,10 @@
 **
 ****************************************************************************/
 
-#ifndef QSGTRANSLATE_P_H
-#define QSGTRANSLATE_P_H
+#ifndef QQUICKTRANSLATE_P_H
+#define QQUICKTRANSLATE_P_H
 
-#include "qsgitem.h"
+#include "qquickitem.h"
 
 #include <QtGui/qmatrix4x4.h>
 
@@ -53,8 +53,8 @@ QT_BEGIN_NAMESPACE
 
 QT_MODULE(Declarative)
 
-class QSGTranslatePrivate;
-class Q_AUTOTEST_EXPORT QSGTranslate : public QSGTransform
+class QQuickTranslatePrivate;
+class Q_AUTOTEST_EXPORT QQuickTranslate : public QQuickTransform
 {
     Q_OBJECT
 
@@ -62,8 +62,8 @@ class Q_AUTOTEST_EXPORT QSGTranslate : public QSGTransform
     Q_PROPERTY(qreal y READ y WRITE setY NOTIFY yChanged)
 
 public:
-    QSGTranslate(QObject *parent = 0);
-    ~QSGTranslate();
+    QQuickTranslate(QObject *parent = 0);
+    ~QQuickTranslate();
 
     qreal x() const;
     void setX(qreal);
@@ -78,12 +78,12 @@ Q_SIGNALS:
     void yChanged();
 
 private:
-    Q_DECLARE_PRIVATE(QSGTranslate)
-    Q_DISABLE_COPY(QSGTranslate)
+    Q_DECLARE_PRIVATE(QQuickTranslate)
+    Q_DISABLE_COPY(QQuickTranslate)
 };
 
-class QSGScalePrivate;
-class Q_AUTOTEST_EXPORT QSGScale : public QSGTransform
+class QQuickScalePrivate;
+class Q_AUTOTEST_EXPORT QQuickScale : public QQuickTransform
 {
     Q_OBJECT
 
@@ -92,8 +92,8 @@ class Q_AUTOTEST_EXPORT QSGScale : public QSGTransform
     Q_PROPERTY(qreal yScale READ yScale WRITE setYScale NOTIFY yScaleChanged)
     Q_PROPERTY(qreal zScale READ zScale WRITE setZScale NOTIFY zScaleChanged)
 public:
-    QSGScale(QObject *parent = 0);
-    ~QSGScale();
+    QQuickScale(QObject *parent = 0);
+    ~QQuickScale();
 
     QVector3D origin() const;
     void setOrigin(const QVector3D &point);
@@ -117,11 +117,11 @@ Q_SIGNALS:
     void scaleChanged();
 
 private:
-    Q_DECLARE_PRIVATE(QSGScale)
+    Q_DECLARE_PRIVATE(QQuickScale)
 };
 
-class QSGRotationPrivate;
-class Q_AUTOTEST_EXPORT QSGRotation : public QSGTransform
+class QQuickRotationPrivate;
+class Q_AUTOTEST_EXPORT QQuickRotation : public QQuickTransform
 {
     Q_OBJECT
 
@@ -129,8 +129,8 @@ class Q_AUTOTEST_EXPORT QSGRotation : public QSGTransform
     Q_PROPERTY(qreal angle READ angle WRITE setAngle NOTIFY angleChanged)
     Q_PROPERTY(QVector3D axis READ axis WRITE setAxis NOTIFY axisChanged)
 public:
-    QSGRotation(QObject *parent = 0);
-    ~QSGRotation();
+    QQuickRotation(QObject *parent = 0);
+    ~QQuickRotation();
 
     QVector3D origin() const;
     void setOrigin(const QVector3D &point);
@@ -150,12 +150,12 @@ Q_SIGNALS:
     void axisChanged();
 
 private:
-    Q_DECLARE_PRIVATE(QSGRotation)
+    Q_DECLARE_PRIVATE(QQuickRotation)
 };
 
 QT_END_NAMESPACE
 
-QML_DECLARE_TYPE(QSGTranslate)
+QML_DECLARE_TYPE(QQuickTranslate)
 
 QT_END_HEADER
 
diff --git a/src/declarative/items/qsgview.cpp b/src/declarative/items/qquickview.cpp
index 841c8ebe31..cc87b775a5 100644
--- a/src/declarative/items/qsgview.cpp
+++ b/src/declarative/items/qquickview.cpp
@@ -39,12 +39,12 @@
 **
 ****************************************************************************/
 
-#include "qsgview.h"
-#include "qsgview_p.h"
+#include "qquickview.h"
+#include "qquickview_p.h"
 
-#include "qsgcanvas_p.h"
-#include "qsgitem_p.h"
-#include "qsgitemchangelistener_p.h"
+#include "qquickcanvas_p.h"
+#include "qquickitem_p.h"
+#include "qquickitemchangelistener_p.h"
 
 #include <private/qdeclarativedebugtrace_p.h>
 #include <private/qdeclarativeinspectorservice_p.h>
@@ -60,11 +60,11 @@ QT_BEGIN_NAMESPACE
 
 DEFINE_BOOL_CONFIG_OPTION(frameRateDebug, QML_SHOW_FRAMERATE)
 
-void QSGViewPrivate::init()
+void QQuickViewPrivate::init()
 {
-    Q_Q(QSGView);
+    Q_Q(QQuickView);
 
-    QDeclarativeEnginePrivate::get(&engine)->sgContext = QSGCanvasPrivate::context;
+    QDeclarativeEnginePrivate::get(&engine)->sgContext = QQuickCanvasPrivate::context;
 
     engine.setIncubationController(q->incubationController());
 
@@ -72,12 +72,12 @@ void QSGViewPrivate::init()
         QDeclarativeInspectorService::instance()->addView(q);
 }
 
-QSGViewPrivate::QSGViewPrivate()
-    : root(0), component(0), resizeMode(QSGView::SizeViewToRootObject), initialSize(0,0), resized(false)
+QQuickViewPrivate::QQuickViewPrivate()
+    : root(0), component(0), resizeMode(QQuickView::SizeViewToRootObject), initialSize(0,0), resized(false)
 {
 }
 
-QSGViewPrivate::~QSGViewPrivate()
+QQuickViewPrivate::~QQuickViewPrivate()
 {
     if (QDeclarativeDebugService::isDebuggingEnabled())
         QDeclarativeInspectorService::instance()->removeView(q_func());
@@ -85,9 +85,9 @@ QSGViewPrivate::~QSGViewPrivate()
     delete root;
 }
 
-void QSGViewPrivate::execute()
+void QQuickViewPrivate::execute()
 {
-    Q_Q(QSGView);
+    Q_Q(QQuickView);
     if (root) {
         delete root;
         root = 0;
@@ -107,87 +107,87 @@ void QSGViewPrivate::execute()
     }
 }
 
-void QSGViewPrivate::itemGeometryChanged(QSGItem *resizeItem, const QRectF &newGeometry, const QRectF &oldGeometry)
+void QQuickViewPrivate::itemGeometryChanged(QQuickItem *resizeItem, const QRectF &newGeometry, const QRectF &oldGeometry)
 {
-    Q_Q(QSGView);
-    if (resizeItem == root && resizeMode == QSGView::SizeViewToRootObject) {
+    Q_Q(QQuickView);
+    if (resizeItem == root && resizeMode == QQuickView::SizeViewToRootObject) {
         // wait for both width and height to be changed
         resizetimer.start(0,q);
     }
-    QSGItemChangeListener::itemGeometryChanged(resizeItem, newGeometry, oldGeometry);
+    QQuickItemChangeListener::itemGeometryChanged(resizeItem, newGeometry, oldGeometry);
 }
 
-QSGView::QSGView(QWindow *parent, Qt::WindowFlags f)
-: QSGCanvas(*(new QSGViewPrivate), parent)
+QQuickView::QQuickView(QWindow *parent, Qt::WindowFlags f)
+: QQuickCanvas(*(new QQuickViewPrivate), parent)
 {
     setWindowFlags(f);
     d_func()->init();
 }
 
-QSGView::QSGView(const QUrl &source, QWindow *parent, Qt::WindowFlags f)
-: QSGCanvas(*(new QSGViewPrivate), parent)
+QQuickView::QQuickView(const QUrl &source, QWindow *parent, Qt::WindowFlags f)
+: QQuickCanvas(*(new QQuickViewPrivate), parent)
 {
     setWindowFlags(f);
     d_func()->init();
     setSource(source);
 }
 
-QSGView::~QSGView()
+QQuickView::~QQuickView()
 {
 }
 
-void QSGView::setSource(const QUrl& url)
+void QQuickView::setSource(const QUrl& url)
 {
-    Q_D(QSGView);
+    Q_D(QQuickView);
     d->source = url;
     d->execute();
 }
 
-QUrl QSGView::source() const
+QUrl QQuickView::source() const
 {
-    Q_D(const QSGView);
+    Q_D(const QQuickView);
     return d->source;
 }
 
-QDeclarativeEngine* QSGView::engine() const
+QDeclarativeEngine* QQuickView::engine() const
 {
-    Q_D(const QSGView);
+    Q_D(const QQuickView);
     return const_cast<QDeclarativeEngine *>(&d->engine);
 }
 
-QDeclarativeContext* QSGView::rootContext() const
+QDeclarativeContext* QQuickView::rootContext() const
 {
-    Q_D(const QSGView);
+    Q_D(const QQuickView);
     return d->engine.rootContext();
 }
 
-QSGView::Status QSGView::status() const
+QQuickView::Status QQuickView::status() const
 {
-    Q_D(const QSGView);
+    Q_D(const QQuickView);
     if (!d->component)
-        return QSGView::Null;
+        return QQuickView::Null;
 
-    return QSGView::Status(d->component->status());
+    return QQuickView::Status(d->component->status());
 }
 
-QList<QDeclarativeError> QSGView::errors() const
+QList<QDeclarativeError> QQuickView::errors() const
 {
-    Q_D(const QSGView);
+    Q_D(const QQuickView);
     if (d->component)
         return d->component->errors();
     return QList<QDeclarativeError>();
 }
 
-void QSGView::setResizeMode(ResizeMode mode)
+void QQuickView::setResizeMode(ResizeMode mode)
 {
-    Q_D(QSGView);
+    Q_D(QQuickView);
     if (d->resizeMode == mode)
         return;
 
     if (d->root) {
         if (d->resizeMode == SizeViewToRootObject) {
-            QSGItemPrivate *p = QSGItemPrivate::get(d->root);
-            p->removeItemChangeListener(d, QSGItemPrivate::Geometry);
+            QQuickItemPrivate *p = QQuickItemPrivate::get(d->root);
+            p->removeItemChangeListener(d, QQuickItemPrivate::Geometry);
         }
     }
 
@@ -197,29 +197,29 @@ void QSGView::setResizeMode(ResizeMode mode)
     }
 }
 
-void QSGViewPrivate::initResize()
+void QQuickViewPrivate::initResize()
 {
     if (root) {
-        if (resizeMode == QSGView::SizeViewToRootObject) {
-            QSGItemPrivate *p = QSGItemPrivate::get(root);
-            p->addItemChangeListener(this, QSGItemPrivate::Geometry);
+        if (resizeMode == QQuickView::SizeViewToRootObject) {
+            QQuickItemPrivate *p = QQuickItemPrivate::get(root);
+            p->addItemChangeListener(this, QQuickItemPrivate::Geometry);
         }
     }
     updateSize();
 }
 
-void QSGViewPrivate::updateSize()
+void QQuickViewPrivate::updateSize()
 {
-    Q_Q(QSGView);
+    Q_Q(QQuickView);
     if (!root)
         return;
 
-    if (resizeMode == QSGView::SizeViewToRootObject) {
+    if (resizeMode == QQuickView::SizeViewToRootObject) {
         QSize newSize = QSize(root->width(), root->height());
         if (newSize.isValid() && newSize != q->size()) {
             q->resize(newSize);
         }
-    } else if (resizeMode == QSGView::SizeRootObjectToView) {
+    } else if (resizeMode == QQuickView::SizeRootObjectToView) {
         if (!qFuzzyCompare(q->width(), root->width()))
             root->setWidth(q->width());
         if (!qFuzzyCompare(q->height(), root->height()))
@@ -227,7 +227,7 @@ void QSGViewPrivate::updateSize()
     }
 }
 
-QSize QSGViewPrivate::rootObjectSize() const
+QSize QQuickViewPrivate::rootObjectSize() const
 {
     QSize rootObjectSize(0,0);
     int widthCandidate = -1;
@@ -245,18 +245,18 @@ QSize QSGViewPrivate::rootObjectSize() const
     return rootObjectSize;
 }
 
-QSGView::ResizeMode QSGView::resizeMode() const
+QQuickView::ResizeMode QQuickView::resizeMode() const
 {
-    Q_D(const QSGView);
+    Q_D(const QQuickView);
     return d->resizeMode;
 }
 
 /*!
   \internal
  */
-void QSGView::continueExecute()
+void QQuickView::continueExecute()
 {
-    Q_D(QSGView);
+    Q_D(QQuickView);
     disconnect(d->component, SIGNAL(statusChanged(QDeclarativeComponent::Status)), this, SLOT(continueExecute()));
 
     if (d->component->isError()) {
@@ -287,16 +287,16 @@ void QSGView::continueExecute()
 /*!
   \internal
 */
-void QSGViewPrivate::setRootObject(QObject *obj)
+void QQuickViewPrivate::setRootObject(QObject *obj)
 {
-    Q_Q(QSGView);
+    Q_Q(QQuickView);
     if (root == obj)
         return;
-    if (QSGItem *sgItem = qobject_cast<QSGItem *>(obj)) {
+    if (QQuickItem *sgItem = qobject_cast<QQuickItem *>(obj)) {
         root = sgItem;
-        sgItem->setParentItem(q->QSGCanvas::rootItem());
+        sgItem->setParentItem(q->QQuickCanvas::rootItem());
     } else {
-        qWarning() << "QSGView only supports loading of root objects that derive from QSGItem." << endl
+        qWarning() << "QQuickView only supports loading of root objects that derive from QQuickItem." << endl
                    << endl
                    << "If your example is using QML 2, (such as qmlscene) and the .qml file you" << endl
                    << "loaded has 'import QtQuick 1.0' or 'import Qt 4.7', this error will occur." << endl
@@ -313,7 +313,7 @@ void QSGViewPrivate::setRootObject(QObject *obj)
     }
     if (root) {
         initialSize = rootObjectSize();
-        if ((resizeMode == QSGView::SizeViewToRootObject || !resized) // ### refactor:  || !q->testAttribute(Qt::WA_Resized)
+        if ((resizeMode == QQuickView::SizeViewToRootObject || !resized) // ### refactor:  || !q->testAttribute(Qt::WA_Resized)
              && initialSize != q->size()) {
 
             q->resize(initialSize);
@@ -328,9 +328,9 @@ void QSGViewPrivate::setRootObject(QObject *obj)
   If the \l {QTimerEvent} {timer event} \a e is this
   view's resize timer, sceneResized() is emitted.
  */
-void QSGView::timerEvent(QTimerEvent* e)
+void QQuickView::timerEvent(QTimerEvent* e)
 {
-    Q_D(QSGView);
+    Q_D(QQuickView);
     if (!e || e->timerId() == d->resizetimer.timerId()) {
         d->updateSize();
         d->resizetimer.stop();
@@ -341,9 +341,9 @@ void QSGView::timerEvent(QTimerEvent* e)
     \internal
     Preferred size follows the root object geometry.
 */
-QSize QSGView::sizeHint() const
+QSize QQuickView::sizeHint() const
 {
-    Q_D(const QSGView);
+    Q_D(const QQuickView);
     QSize rootObjectSize = d->rootObjectSize();
     if (rootObjectSize.isEmpty()) {
         return size();
@@ -352,15 +352,15 @@ QSize QSGView::sizeHint() const
     }
 }
 
-QSize QSGView::initialSize() const
+QSize QQuickView::initialSize() const
 {
-    Q_D(const QSGView);
+    Q_D(const QQuickView);
     return d->initialSize;
 }
 
-QSGItem *QSGView::rootObject() const
+QQuickItem *QQuickView::rootObject() const
 {
-    Q_D(const QSGView);
+    Q_D(const QQuickView);
     return d->root;
 }
 
@@ -369,48 +369,48 @@ QSGItem *QSGView::rootObject() const
   This function handles the \l {QResizeEvent} {resize event}
   \a e.
  */
-void QSGView::resizeEvent(QResizeEvent *e)
+void QQuickView::resizeEvent(QResizeEvent *e)
 {
-    Q_D(QSGView);
+    Q_D(QQuickView);
     if (d->resizeMode == SizeRootObjectToView)
         d->updateSize();
 
-    QSGCanvas::resizeEvent(e);
+    QQuickCanvas::resizeEvent(e);
 }
 
-void QSGView::keyPressEvent(QKeyEvent *e)
+void QQuickView::keyPressEvent(QKeyEvent *e)
 {
     QDeclarativeDebugTrace::addEvent(QDeclarativeDebugTrace::Key);
 
-    QSGCanvas::keyPressEvent(e);
+    QQuickCanvas::keyPressEvent(e);
 }
 
-void QSGView::keyReleaseEvent(QKeyEvent *e)
+void QQuickView::keyReleaseEvent(QKeyEvent *e)
 {
     QDeclarativeDebugTrace::addEvent(QDeclarativeDebugTrace::Key);
 
-    QSGCanvas::keyReleaseEvent(e);
+    QQuickCanvas::keyReleaseEvent(e);
 }
 
-void QSGView::mouseMoveEvent(QMouseEvent *e)
+void QQuickView::mouseMoveEvent(QMouseEvent *e)
 {
     QDeclarativeDebugTrace::addEvent(QDeclarativeDebugTrace::Mouse);
 
-    QSGCanvas::mouseMoveEvent(e);
+    QQuickCanvas::mouseMoveEvent(e);
 }
 
-void QSGView::mousePressEvent(QMouseEvent *e)
+void QQuickView::mousePressEvent(QMouseEvent *e)
 {
     QDeclarativeDebugTrace::addEvent(QDeclarativeDebugTrace::Mouse);
 
-    QSGCanvas::mousePressEvent(e);
+    QQuickCanvas::mousePressEvent(e);
 }
 
-void QSGView::mouseReleaseEvent(QMouseEvent *e)
+void QQuickView::mouseReleaseEvent(QMouseEvent *e)
 {
     QDeclarativeDebugTrace::addEvent(QDeclarativeDebugTrace::Mouse);
 
-    QSGCanvas::mouseReleaseEvent(e);
+    QQuickCanvas::mouseReleaseEvent(e);
 }
 
 
diff --git a/src/declarative/items/qsgview.h b/src/declarative/items/qquickview.h
index 2d8e8b4067..8321655d63 100644
--- a/src/declarative/items/qsgview.h
+++ b/src/declarative/items/qquickview.h
@@ -40,10 +40,10 @@
 **
 ****************************************************************************/
 
-#ifndef QSGVIEW_H
-#define QSGVIEW_H
+#ifndef QQUICKVIEW_H
+#define QQUICKVIEW_H
 
-#include <qsgcanvas.h>
+#include <qquickcanvas.h>
 #include <QtCore/qurl.h>
 #include <QtDeclarative/qdeclarativedebug.h>
 
@@ -56,10 +56,10 @@ QT_MODULE(Declarative)
 class QDeclarativeEngine;
 class QDeclarativeContext;
 class QDeclarativeError;
-class QSGItem;
+class QQuickItem;
 
-class QSGViewPrivate;
-class Q_DECLARATIVE_EXPORT QSGView : public QSGCanvas
+class QQuickViewPrivate;
+class Q_DECLARATIVE_EXPORT QQuickView : public QQuickCanvas
 {
     Q_OBJECT
     Q_PROPERTY(ResizeMode resizeMode READ resizeMode WRITE setResizeMode)
@@ -67,16 +67,16 @@ class Q_DECLARATIVE_EXPORT QSGView : public QSGCanvas
     Q_PROPERTY(QUrl source READ source WRITE setSource DESIGNABLE true)
     Q_ENUMS(ResizeMode Status)
 public:
-    explicit QSGView(QWindow *parent = 0, Qt::WindowFlags f = 0);
-    QSGView(const QUrl &source, QWindow *parent = 0, Qt::WindowFlags f = 0);
-    virtual ~QSGView();
+    explicit QQuickView(QWindow *parent = 0, Qt::WindowFlags f = 0);
+    QQuickView(const QUrl &source, QWindow *parent = 0, Qt::WindowFlags f = 0);
+    virtual ~QQuickView();
 
     QUrl source() const;
 
     QDeclarativeEngine* engine() const;
     QDeclarativeContext* rootContext() const;
 
-    QSGItem *rootObject() const;
+    QQuickItem *rootObject() const;
 
     enum ResizeMode { SizeViewToRootObject, SizeRootObjectToView };
     ResizeMode resizeMode() const;
@@ -94,7 +94,7 @@ public Q_SLOTS:
     void setSource(const QUrl&);
 
 Q_SIGNALS:
-    void statusChanged(QSGView::Status);
+    void statusChanged(QQuickView::Status);
 
 private Q_SLOTS:
     void continueExecute();
@@ -109,12 +109,12 @@ protected:
     virtual void mouseReleaseEvent(QMouseEvent *);
     virtual void mouseMoveEvent(QMouseEvent *);
 private:
-    Q_DISABLE_COPY(QSGView)
-    Q_DECLARE_PRIVATE(QSGView)
+    Q_DISABLE_COPY(QQuickView)
+    Q_DECLARE_PRIVATE(QQuickView)
 };
 
 QT_END_NAMESPACE
 
 QT_END_HEADER
 
-#endif // QSGVIEW_H
+#endif // QQUICKVIEW_H
diff --git a/src/declarative/items/qsgview_p.h b/src/declarative/items/qquickview_p.h
index f2b962c28e..12be09bab9 100644
--- a/src/declarative/items/qsgview_p.h
+++ b/src/declarative/items/qquickview_p.h
@@ -39,19 +39,19 @@
 **
 ****************************************************************************/
 
-#ifndef QSGVIEW_P_H
-#define QSGVIEW_P_H
+#ifndef QQUICKVIEW_P_H
+#define QQUICKVIEW_P_H
 
-#include "qsgview.h"
+#include "qquickview.h"
 
 #include <QtCore/qurl.h>
 #include <QtCore/qelapsedtimer.h>
 #include <QtCore/qtimer.h>
 #include <QtCore/qpointer.h>
 #include <QtDeclarative/qdeclarativeengine.h>
-#include "qsgcanvas_p.h"
+#include "qquickcanvas_p.h"
 
-#include "qsgitemchangelistener_p.h"
+#include "qquickitemchangelistener_p.h"
 
 QT_BEGIN_HEADER
 
@@ -61,22 +61,22 @@ QT_MODULE(Declarative)
 
 class QDeclarativeContext;
 class QDeclarativeError;
-class QSGItem;
+class QQuickItem;
 class QDeclarativeComponent;
 
-class QSGViewPrivate : public QSGCanvasPrivate,
-                       public QSGItemChangeListener
+class QQuickViewPrivate : public QQuickCanvasPrivate,
+                       public QQuickItemChangeListener
 {
-    Q_DECLARE_PUBLIC(QSGView)
+    Q_DECLARE_PUBLIC(QQuickView)
 public:
-    static QSGViewPrivate* get(QSGView *view) { return view->d_func(); }
-    static const QSGViewPrivate* get(const QSGView *view) { return view->d_func(); }
+    static QQuickViewPrivate* get(QQuickView *view) { return view->d_func(); }
+    static const QQuickViewPrivate* get(const QQuickView *view) { return view->d_func(); }
 
-    QSGViewPrivate();
-    ~QSGViewPrivate();
+    QQuickViewPrivate();
+    ~QQuickViewPrivate();
 
     void execute();
-    void itemGeometryChanged(QSGItem *item, const QRectF &newGeometry, const QRectF &oldGeometry);
+    void itemGeometryChanged(QQuickItem *item, const QRectF &newGeometry, const QRectF &oldGeometry);
     void initResize();
     void updateSize();
     void setRootObject(QObject *);
@@ -85,7 +85,7 @@ public:
 
     QSize rootObjectSize() const;
 
-    QPointer<QSGItem> root;
+    QPointer<QQuickItem> root;
 
     QUrl source;
 
@@ -93,7 +93,7 @@ public:
     QDeclarativeComponent *component;
     QBasicTimer resizetimer;
 
-    QSGView::ResizeMode resizeMode;
+    QQuickView::ResizeMode resizeMode;
     QSize initialSize;
     QElapsedTimer frameTimer;
 
@@ -104,4 +104,4 @@ QT_END_NAMESPACE
 
 QT_END_HEADER
 
-#endif // QSGVIEW_P_H
+#endif // QQUICKVIEW_P_H
diff --git a/src/declarative/items/qsgvisualadaptormodel.cpp b/src/declarative/items/qquickvisualadaptormodel.cpp
index 4e3a1a6dc3..28ea830db4 100644
--- a/src/declarative/items/qsgvisualadaptormodel.cpp
+++ b/src/declarative/items/qquickvisualadaptormodel.cpp
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#include "qsgvisualadaptormodel_p.h"
-#include "qsgitem.h"
+#include "qquickvisualadaptormodel_p.h"
+#include "qquickitem.h"
 
 #include <QtDeclarative/qdeclarativecontext.h>
 #include <QtDeclarative/qdeclarativeengine.h>
@@ -109,13 +109,13 @@ public:
     QMetaObjectBuilder builder;
 };
 
-class QSGVisualAdaptorModelData : public QObject
+class QQuickVisualAdaptorModelData : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(int index READ index NOTIFY indexChanged)
 public:
-    QSGVisualAdaptorModelData(int index, QSGVisualAdaptorModel *model);
-    ~QSGVisualAdaptorModelData();
+    QQuickVisualAdaptorModelData(int index, QQuickVisualAdaptorModel *model);
+    ~QQuickVisualAdaptorModelData();
 
     int index() const;
     void setIndex(int index);
@@ -125,18 +125,18 @@ Q_SIGNALS:
 
 public:
     int m_index;
-    QDeclarativeGuard<QSGVisualAdaptorModel> m_model;
+    QDeclarativeGuard<QQuickVisualAdaptorModel> m_model;
     QIntrusiveListNode m_cacheNode;
 };
 
-typedef QIntrusiveList<QSGVisualAdaptorModelData, &QSGVisualAdaptorModelData::m_cacheNode> QSGVisualAdaptorModelDataCache;
+typedef QIntrusiveList<QQuickVisualAdaptorModelData, &QQuickVisualAdaptorModelData::m_cacheNode> QQuickVisualAdaptorModelDataCache;
 
-class QSGVisualAdaptorModelDataMetaObject;
-class QSGVisualAdaptorModelPrivate : public QObjectPrivate
+class QQuickVisualAdaptorModelDataMetaObject;
+class QQuickVisualAdaptorModelPrivate : public QObjectPrivate
 {
-    Q_DECLARE_PUBLIC(QSGVisualAdaptorModel)
+    Q_DECLARE_PUBLIC(QQuickVisualAdaptorModel)
 public:
-    QSGVisualAdaptorModelPrivate()
+    QQuickVisualAdaptorModelPrivate()
         : m_engine(0)
         , m_listAccessor(0)
         , m_delegateDataType(0)
@@ -148,8 +148,8 @@ public:
     }
 
 
-    static QSGVisualAdaptorModelPrivate *get(QSGVisualAdaptorModel *m) {
-        return static_cast<QSGVisualAdaptorModelPrivate *>(QObjectPrivate::get(m));
+    static QQuickVisualAdaptorModelPrivate *get(QQuickVisualAdaptorModel *m) {
+        return static_cast<QQuickVisualAdaptorModelPrivate *>(QObjectPrivate::get(m));
     }
 
     void addProperty(int role, int propertyId, const char *propertyName, const char *propertyType, bool isModelData = false);
@@ -162,13 +162,13 @@ public:
         m_delegateDataType->propertyOffset = T::staticMetaObject.propertyCount();
         m_delegateDataType->signalOffset = T::staticMetaObject.methodCount();
     }
-    QSGVisualAdaptorModelData *createMetaObject(int index, QSGVisualAdaptorModel *model);
+    QQuickVisualAdaptorModelData *createMetaObject(int index, QQuickVisualAdaptorModel *model);
 
-    static QSGVisualAdaptorModelData *initializeModelData(int index, QSGVisualAdaptorModel *model) {
+    static QQuickVisualAdaptorModelData *initializeModelData(int index, QQuickVisualAdaptorModel *model) {
         return get(model)->createMetaObject(index, model);
     }
 
-    typedef QSGVisualAdaptorModelData *(*CreateModelData)(int index, QSGVisualAdaptorModel *model);
+    typedef QQuickVisualAdaptorModelData *(*CreateModelData)(int index, QQuickVisualAdaptorModel *model);
 
     struct PropertyData {
         int role;
@@ -194,7 +194,7 @@ public:
 
     int m_ref;
     int m_count;
-    QSGVisualAdaptorModel::Flags m_flags;
+    QQuickVisualAdaptorModel::Flags m_flags;
     bool m_objectList : 1;
 
     QVariant m_modelVariant;
@@ -205,13 +205,13 @@ public:
     QList<QByteArray> watchedRoles;
     QHash<QByteArray,int> m_roleNames;
     QVector<PropertyData> m_propertyData;
-    QSGVisualAdaptorModelDataCache m_cache;
+    QQuickVisualAdaptorModelDataCache m_cache;
 };
 
-class QSGVisualAdaptorModelDataMetaObject : public QAbstractDynamicMetaObject
+class QQuickVisualAdaptorModelDataMetaObject : public QAbstractDynamicMetaObject
 {
 public:
-    QSGVisualAdaptorModelDataMetaObject(QSGVisualAdaptorModelData *data, VDMDelegateDataType *type)
+    QQuickVisualAdaptorModelDataMetaObject(QQuickVisualAdaptorModelData *data, VDMDelegateDataType *type)
         : m_data(data)
         , m_type(type)
     {
@@ -221,22 +221,22 @@ public:
         m_type->addref();
     }
 
-    ~QSGVisualAdaptorModelDataMetaObject() { m_type->release(); }
+    ~QQuickVisualAdaptorModelDataMetaObject() { m_type->release(); }
 
-    QSGVisualAdaptorModelData *m_data;
+    QQuickVisualAdaptorModelData *m_data;
     VDMDelegateDataType *m_type;
 };
 
-class QSGVDMAbstractItemModelDataMetaObject : public QSGVisualAdaptorModelDataMetaObject
+class QQuickVDMAbstractItemModelDataMetaObject : public QQuickVisualAdaptorModelDataMetaObject
 {
 public:
-    QSGVDMAbstractItemModelDataMetaObject(QSGVisualAdaptorModelData *object, VDMDelegateDataType *type)
-        : QSGVisualAdaptorModelDataMetaObject(object, type) {}
+    QQuickVDMAbstractItemModelDataMetaObject(QQuickVisualAdaptorModelData *object, VDMDelegateDataType *type)
+        : QQuickVisualAdaptorModelDataMetaObject(object, type) {}
 
     int metaCall(QMetaObject::Call call, int id, void **arguments)
     {
         if (call == QMetaObject::ReadProperty && id >= m_type->propertyOffset) {
-            QSGVisualAdaptorModelPrivate *model = QSGVisualAdaptorModelPrivate::get(m_data->m_model);
+            QQuickVisualAdaptorModelPrivate *model = QQuickVisualAdaptorModelPrivate::get(m_data->m_model);
             if (m_data->m_index == -1 || !model->m_abstractItemModel)
                 return -1;
             *static_cast<QVariant *>(arguments[0]) = model->m_abstractItemModel->index(
@@ -248,38 +248,38 @@ public:
     }
 };
 
-class QSGVDMAbstractItemModelData : public QSGVisualAdaptorModelData
+class QQuickVDMAbstractItemModelData : public QQuickVisualAdaptorModelData
 {
     Q_OBJECT
     Q_PROPERTY(bool hasModelChildren READ hasModelChildren CONSTANT)
 public:
     bool hasModelChildren() const
     {
-        QSGVisualAdaptorModelPrivate *model = QSGVisualAdaptorModelPrivate::get(m_model);
+        QQuickVisualAdaptorModelPrivate *model = QQuickVisualAdaptorModelPrivate::get(m_model);
         return model->m_abstractItemModel->hasChildren(model->m_abstractItemModel->index(m_index, 0, model->m_root));
     }
 
-    static QSGVisualAdaptorModelData *create(int index, QSGVisualAdaptorModel *model) {
-        return new QSGVDMAbstractItemModelData(index, model); }
+    static QQuickVisualAdaptorModelData *create(int index, QQuickVisualAdaptorModel *model) {
+        return new QQuickVDMAbstractItemModelData(index, model); }
 private:
-    QSGVDMAbstractItemModelData(int index, QSGVisualAdaptorModel *model)
-        : QSGVisualAdaptorModelData(index, model)
+    QQuickVDMAbstractItemModelData(int index, QQuickVisualAdaptorModel *model)
+        : QQuickVisualAdaptorModelData(index, model)
     {
-        new QSGVDMAbstractItemModelDataMetaObject(
-                this, QSGVisualAdaptorModelPrivate::get(m_model)->m_delegateDataType);
+        new QQuickVDMAbstractItemModelDataMetaObject(
+                this, QQuickVisualAdaptorModelPrivate::get(m_model)->m_delegateDataType);
     }
 };
 
-class QSGVDMListModelInterfaceDataMetaObject : public QSGVisualAdaptorModelDataMetaObject
+class QQuickVDMListModelInterfaceDataMetaObject : public QQuickVisualAdaptorModelDataMetaObject
 {
 public:
-    QSGVDMListModelInterfaceDataMetaObject(QSGVisualAdaptorModelData *object, VDMDelegateDataType *type)
-        : QSGVisualAdaptorModelDataMetaObject(object, type) {}
+    QQuickVDMListModelInterfaceDataMetaObject(QQuickVisualAdaptorModelData *object, VDMDelegateDataType *type)
+        : QQuickVisualAdaptorModelDataMetaObject(object, type) {}
 
     int metaCall(QMetaObject::Call call, int id, void **arguments)
     {
         if (call == QMetaObject::ReadProperty && id >= m_type->propertyOffset) {
-            QSGVisualAdaptorModelPrivate *model = QSGVisualAdaptorModelPrivate::get(m_data->m_model);
+            QQuickVisualAdaptorModelPrivate *model = QQuickVisualAdaptorModelPrivate::get(m_data->m_model);
             if (m_data->m_index == -1 || !model->m_listModelInterface)
                 return -1;
             *static_cast<QVariant *>(arguments[0]) = model->m_listModelInterface->data(
@@ -291,43 +291,43 @@ public:
     }
 };
 
-class QSGVDMListModelInterfaceData : public QSGVisualAdaptorModelData
+class QQuickVDMListModelInterfaceData : public QQuickVisualAdaptorModelData
 {
 public:
-    static QSGVisualAdaptorModelData *create(int index, QSGVisualAdaptorModel *model) {
-        return new QSGVDMListModelInterfaceData(index, model); }
+    static QQuickVisualAdaptorModelData *create(int index, QQuickVisualAdaptorModel *model) {
+        return new QQuickVDMListModelInterfaceData(index, model); }
 private:
-    QSGVDMListModelInterfaceData(int index, QSGVisualAdaptorModel *model)
-        : QSGVisualAdaptorModelData(index, model)
+    QQuickVDMListModelInterfaceData(int index, QQuickVisualAdaptorModel *model)
+        : QQuickVisualAdaptorModelData(index, model)
     {
-        new QSGVDMListModelInterfaceDataMetaObject(
-                this, QSGVisualAdaptorModelPrivate::get(m_model)->m_delegateDataType);
+        new QQuickVDMListModelInterfaceDataMetaObject(
+                this, QQuickVisualAdaptorModelPrivate::get(m_model)->m_delegateDataType);
     }
 };
 
-class QSGVDMListAccessorData : public QSGVisualAdaptorModelData
+class QQuickVDMListAccessorData : public QQuickVisualAdaptorModelData
 {
     Q_OBJECT
     Q_PROPERTY(QVariant modelData READ modelData CONSTANT)
 public:
     QVariant modelData() const {
-        return QSGVisualAdaptorModelPrivate::get(m_model)->m_listAccessor->at(m_index); }
+        return QQuickVisualAdaptorModelPrivate::get(m_model)->m_listAccessor->at(m_index); }
 
-    static QSGVisualAdaptorModelData *create(int index, QSGVisualAdaptorModel *model) {
-        return new QSGVDMListAccessorData(index, model); }
+    static QQuickVisualAdaptorModelData *create(int index, QQuickVisualAdaptorModel *model) {
+        return new QQuickVDMListAccessorData(index, model); }
 private:
-    QSGVDMListAccessorData(int index, QSGVisualAdaptorModel *model)
-        : QSGVisualAdaptorModelData(index, model)
+    QQuickVDMListAccessorData(int index, QQuickVisualAdaptorModel *model)
+        : QQuickVisualAdaptorModelData(index, model)
     {
     }
 };
 
-class QSGVDMObjectDataMetaObject : public QSGVisualAdaptorModelDataMetaObject
+class QQuickVDMObjectDataMetaObject : public QQuickVisualAdaptorModelDataMetaObject
 {
 public:
-    QSGVDMObjectDataMetaObject(QSGVisualAdaptorModelData *data, VDMDelegateDataType *type)
-        : QSGVisualAdaptorModelDataMetaObject(data, type)
-        , m_object(QSGVisualAdaptorModelPrivate::get(data->m_model)->m_listAccessor->at(data->m_index).value<QObject *>())
+    QQuickVDMObjectDataMetaObject(QQuickVisualAdaptorModelData *data, VDMDelegateDataType *type)
+        : QQuickVisualAdaptorModelDataMetaObject(data, type)
+        , m_object(QQuickVisualAdaptorModelPrivate::get(data->m_model)->m_listAccessor->at(data->m_index).value<QObject *>())
     {}
 
     int metaCall(QMetaObject::Call call, int id, void **arguments)
@@ -403,29 +403,29 @@ public:
     QDeclarativeGuard<QObject> m_object;
 };
 
-class QSGVDMObjectData : public QSGVisualAdaptorModelData, public QSGVisualAdaptorModelProxyInterface
+class QQuickVDMObjectData : public QQuickVisualAdaptorModelData, public QQuickVisualAdaptorModelProxyInterface
 {
     Q_OBJECT
     Q_PROPERTY(QObject *modelData READ modelData CONSTANT)
-    Q_INTERFACES(QSGVisualAdaptorModelProxyInterface)
+    Q_INTERFACES(QQuickVisualAdaptorModelProxyInterface)
 public:
     QObject *modelData() const { return m_metaObject->m_object; }
     QObject *proxiedObject() { return m_metaObject->m_object; }
 
-    static QSGVisualAdaptorModelData *create(int index, QSGVisualAdaptorModel *model) {
-        return new QSGVDMObjectData(index, model); }
+    static QQuickVisualAdaptorModelData *create(int index, QQuickVisualAdaptorModel *model) {
+        return new QQuickVDMObjectData(index, model); }
 
 private:
-    QSGVDMObjectData(int index, QSGVisualAdaptorModel *model)
-        : QSGVisualAdaptorModelData(index, model)
-        , m_metaObject(new QSGVDMObjectDataMetaObject(this, QSGVisualAdaptorModelPrivate::get(m_model)->m_delegateDataType))
+    QQuickVDMObjectData(int index, QQuickVisualAdaptorModel *model)
+        : QQuickVisualAdaptorModelData(index, model)
+        , m_metaObject(new QQuickVDMObjectDataMetaObject(this, QQuickVisualAdaptorModelPrivate::get(m_model)->m_delegateDataType))
     {
     }
 
-    QSGVDMObjectDataMetaObject *m_metaObject;
+    QQuickVDMObjectDataMetaObject *m_metaObject;
 };
 
-void QSGVisualAdaptorModelPrivate::addProperty(
+void QQuickVisualAdaptorModelPrivate::addProperty(
         int role, int propertyId, const char *propertyName, const char *propertyType, bool isModelData)
 {
     PropertyData propertyData;
@@ -439,7 +439,7 @@ void QSGVisualAdaptorModelPrivate::addProperty(
     m_propertyData.append(propertyData);
 }
 
-QSGVisualAdaptorModelData *QSGVisualAdaptorModelPrivate::createMetaObject(int index, QSGVisualAdaptorModel *model)
+QQuickVisualAdaptorModelData *QQuickVisualAdaptorModelPrivate::createMetaObject(int index, QQuickVisualAdaptorModel *model)
 {
     Q_ASSERT(!m_delegateDataType);
 
@@ -448,14 +448,14 @@ QSGVisualAdaptorModelData *QSGVisualAdaptorModelPrivate::createMetaObject(int in
     if (m_listAccessor
             && m_listAccessor->type() != QDeclarativeListAccessor::ListProperty
             && m_listAccessor->type() != QDeclarativeListAccessor::Instance) {
-        createModelData = &QSGVDMListAccessorData::create;
-        m_flags = QSGVisualAdaptorModel::MetaObjectCacheable;
-        return QSGVDMListAccessorData::create(index, model);
+        createModelData = &QQuickVDMListAccessorData::create;
+        m_flags = QQuickVisualAdaptorModel::MetaObjectCacheable;
+        return QQuickVDMListAccessorData::create(index, model);
     }
 
     m_delegateDataType = new VDMDelegateDataType;
     if (m_listModelInterface) {
-        setModelDataType<QSGVDMListModelInterfaceData>();
+        setModelDataType<QQuickVDMListModelInterfaceData>();
         QList<int> roles = m_listModelInterface->roles();
         for (int propertyId = 0; propertyId < roles.count(); ++propertyId) {
             const int role = roles.at(propertyId);
@@ -465,9 +465,9 @@ QSGVisualAdaptorModelData *QSGVisualAdaptorModelPrivate::createMetaObject(int in
         }
         if (m_propertyData.count() == 1)
             addProperty(roles.first(), 1, "modelData", "QVariant", true);
-        m_flags = QSGVisualAdaptorModel::MetaObjectCacheable;
+        m_flags = QQuickVisualAdaptorModel::MetaObjectCacheable;
     } else if (m_abstractItemModel) {
-        setModelDataType<QSGVDMAbstractItemModelData>();
+        setModelDataType<QQuickVDMAbstractItemModelData>();
         QHash<int, QByteArray> roleNames = m_abstractItemModel->roleNames();
         for (QHash<int, QByteArray>::const_iterator it = roleNames.begin(); it != roleNames.end(); ++it) {
             addProperty(it.key(), m_propertyData.count(), it.value(), "QVariant");
@@ -475,11 +475,11 @@ QSGVisualAdaptorModelData *QSGVisualAdaptorModelPrivate::createMetaObject(int in
         }
         if (m_propertyData.count() == 1)
             addProperty(roleNames.begin().key(), 1, "modelData", "QVariant", true);
-        m_flags = QSGVisualAdaptorModel::MetaObjectCacheable;
+        m_flags = QQuickVisualAdaptorModel::MetaObjectCacheable;
     } else if (m_listAccessor) {
-        setModelDataType<QSGVDMObjectData>();
+        setModelDataType<QQuickVDMObjectData>();
         m_objectList = true;
-        m_flags = QSGVisualAdaptorModel::ProxiedObject;
+        m_flags = QQuickVisualAdaptorModel::ProxiedObject;
     } else {
         Q_ASSERT(!"No model set on VisualDataModel");
         return 0;
@@ -492,23 +492,23 @@ QSGVisualAdaptorModelData *QSGVisualAdaptorModelPrivate::createMetaObject(int in
     return createModelData(index, model);
 }
 
-QSGVisualAdaptorModelData::QSGVisualAdaptorModelData(int index, QSGVisualAdaptorModel *model)
+QQuickVisualAdaptorModelData::QQuickVisualAdaptorModelData(int index, QQuickVisualAdaptorModel *model)
     : m_index(index)
     , m_model(model)
 {
 }
 
-QSGVisualAdaptorModelData::~QSGVisualAdaptorModelData()
+QQuickVisualAdaptorModelData::~QQuickVisualAdaptorModelData()
 {
 }
 
-int QSGVisualAdaptorModelData::index() const
+int QQuickVisualAdaptorModelData::index() const
 {
     return m_index;
 }
 
 // This is internal only - it should not be set from qml
-void QSGVisualAdaptorModelData::setIndex(int index)
+void QQuickVisualAdaptorModelData::setIndex(int index)
 {
     m_index = index;
     emit indexChanged();
@@ -516,35 +516,35 @@ void QSGVisualAdaptorModelData::setIndex(int index)
 
 //---------------------------------------------------------------------------
 
-QSGVisualAdaptorModel::QSGVisualAdaptorModel(QObject *parent)
-    : QObject(*(new QSGVisualAdaptorModelPrivate), parent)
+QQuickVisualAdaptorModel::QQuickVisualAdaptorModel(QObject *parent)
+    : QObject(*(new QQuickVisualAdaptorModelPrivate), parent)
 {
 }
 
-QSGVisualAdaptorModel::~QSGVisualAdaptorModel()
+QQuickVisualAdaptorModel::~QQuickVisualAdaptorModel()
 {
-    Q_D(QSGVisualAdaptorModel);
+    Q_D(QQuickVisualAdaptorModel);
     if (d->m_listAccessor)
         delete d->m_listAccessor;
     if (d->m_delegateDataType)
         d->m_delegateDataType->release();
 }
 
-QSGVisualAdaptorModel::Flags QSGVisualAdaptorModel::flags() const
+QQuickVisualAdaptorModel::Flags QQuickVisualAdaptorModel::flags() const
 {
-    Q_D(const QSGVisualAdaptorModel);
+    Q_D(const QQuickVisualAdaptorModel);
     return d->m_flags;
 }
 
-QVariant QSGVisualAdaptorModel::model() const
+QVariant QQuickVisualAdaptorModel::model() const
 {
-    Q_D(const QSGVisualAdaptorModel);
+    Q_D(const QQuickVisualAdaptorModel);
     return d->m_modelVariant;
 }
 
-void QSGVisualAdaptorModel::setModel(const QVariant &model, QDeclarativeEngine *engine)
+void QQuickVisualAdaptorModel::setModel(const QVariant &model, QDeclarativeEngine *engine)
 {
-    Q_D(QSGVisualAdaptorModel);
+    Q_D(QQuickVisualAdaptorModel);
     delete d->m_listAccessor;
     d->m_engine = engine;
     d->m_listAccessor = 0;
@@ -576,11 +576,11 @@ void QSGVisualAdaptorModel::setModel(const QVariant &model, QDeclarativeEngine *
 
     d->m_roles.clear();
     d->m_roleNames.clear();
-    d->m_flags = QSGVisualAdaptorModel::Flags();
+    d->m_flags = QQuickVisualAdaptorModel::Flags();
     if (d->m_delegateDataType)
         d->m_delegateDataType->release();
     d->m_delegateDataType = 0;
-    d->createModelData = &QSGVisualAdaptorModelPrivate::initializeModelData;
+    d->createModelData = &QQuickVisualAdaptorModelPrivate::initializeModelData;
 
     if (d->m_count)
         emit itemsRemoved(0, d->m_count);
@@ -621,15 +621,15 @@ void QSGVisualAdaptorModel::setModel(const QVariant &model, QDeclarativeEngine *
         emit itemsInserted(0, d->m_count);
 }
 
-QVariant QSGVisualAdaptorModel::rootIndex() const
+QVariant QQuickVisualAdaptorModel::rootIndex() const
 {
-    Q_D(const QSGVisualAdaptorModel);
+    Q_D(const QQuickVisualAdaptorModel);
     return QVariant::fromValue(d->m_root);
 }
 
-void QSGVisualAdaptorModel::setRootIndex(const QVariant &root)
+void QQuickVisualAdaptorModel::setRootIndex(const QVariant &root)
 {
-    Q_D(QSGVisualAdaptorModel);
+    Q_D(QQuickVisualAdaptorModel);
     QModelIndex modelIndex = qvariant_cast<QModelIndex>(root);
     if (d->m_root != modelIndex) {
         int oldCount = d->modelCount();
@@ -645,46 +645,46 @@ void QSGVisualAdaptorModel::setRootIndex(const QVariant &root)
     }
 }
 
-QVariant QSGVisualAdaptorModel::modelIndex(int idx) const
+QVariant QQuickVisualAdaptorModel::modelIndex(int idx) const
 {
-    Q_D(const QSGVisualAdaptorModel);
+    Q_D(const QQuickVisualAdaptorModel);
     if (d->m_abstractItemModel)
         return QVariant::fromValue(d->m_abstractItemModel->index(idx, 0, d->m_root));
     return QVariant::fromValue(QModelIndex());
 }
 
-QVariant QSGVisualAdaptorModel::parentModelIndex() const
+QVariant QQuickVisualAdaptorModel::parentModelIndex() const
 {
-    Q_D(const QSGVisualAdaptorModel);
+    Q_D(const QQuickVisualAdaptorModel);
     if (d->m_abstractItemModel)
         return QVariant::fromValue(d->m_abstractItemModel->parent(d->m_root));
     return QVariant::fromValue(QModelIndex());
 }
 
-int QSGVisualAdaptorModel::count() const
+int QQuickVisualAdaptorModel::count() const
 {
-    Q_D(const QSGVisualAdaptorModel);
+    Q_D(const QQuickVisualAdaptorModel);
     return d->modelCount();
 }
 
-QObject *QSGVisualAdaptorModel::data(int index)
+QObject *QQuickVisualAdaptorModel::data(int index)
 {
-    Q_D(QSGVisualAdaptorModel);
-    QSGVisualAdaptorModelData *data = d->createModelData(index, this);
+    Q_D(QQuickVisualAdaptorModel);
+    QQuickVisualAdaptorModelData *data = d->createModelData(index, this);
     d->m_cache.insert(data);
     return data;
 }
 
-QString QSGVisualAdaptorModel::stringValue(int index, const QString &name)
+QString QQuickVisualAdaptorModel::stringValue(int index, const QString &name)
 {
-    Q_D(QSGVisualAdaptorModel);
+    Q_D(QQuickVisualAdaptorModel);
     if ((!d->m_listModelInterface || !d->m_abstractItemModel) && d->m_listAccessor) {
         if (QObject *object = d->m_listAccessor->at(index).value<QObject*>())
             return object->property(name.toUtf8()).toString();
     }
 
     QString val;
-    QSGVisualAdaptorModelData *data = d->createModelData(index, this);
+    QQuickVisualAdaptorModelData *data = d->createModelData(index, this);
 
     QDeclarativeData *ddata = QDeclarativeData::get(data);
     if (ddata && ddata->propertyCache) {
@@ -711,38 +711,38 @@ QString QSGVisualAdaptorModel::stringValue(int index, const QString &name)
     return val;
 }
 
-int QSGVisualAdaptorModel::indexOf(QObject *object) const
+int QQuickVisualAdaptorModel::indexOf(QObject *object) const
 {
-    if (QSGVisualAdaptorModelData *data = qobject_cast<QSGVisualAdaptorModelData *>(object))
+    if (QQuickVisualAdaptorModelData *data = qobject_cast<QQuickVisualAdaptorModelData *>(object))
         return data->index();
     return -1;
 }
 
-bool QSGVisualAdaptorModel::canFetchMore() const
+bool QQuickVisualAdaptorModel::canFetchMore() const
 {
-    Q_D(const QSGVisualAdaptorModel);
+    Q_D(const QQuickVisualAdaptorModel);
     return d->m_abstractItemModel && d->m_abstractItemModel->canFetchMore(d->m_root);
 }
 
-void QSGVisualAdaptorModel::fetchMore()
+void QQuickVisualAdaptorModel::fetchMore()
 {
-    Q_D(QSGVisualAdaptorModel);
+    Q_D(QQuickVisualAdaptorModel);
     if (d->m_abstractItemModel)
         d->m_abstractItemModel->fetchMore(d->m_root);
 }
 
-void QSGVisualAdaptorModel::replaceWatchedRoles(const QList<QByteArray> &oldRoles, const QList<QByteArray> &newRoles)
+void QQuickVisualAdaptorModel::replaceWatchedRoles(const QList<QByteArray> &oldRoles, const QList<QByteArray> &newRoles)
 {
-    Q_D(QSGVisualAdaptorModel);
+    Q_D(QQuickVisualAdaptorModel);
     d->watchedRoleIds.clear();
     foreach (const QByteArray &oldRole, oldRoles)
         d->watchedRoles.removeOne(oldRole);
     d->watchedRoles += newRoles;
 }
 
-void QSGVisualAdaptorModel::_q_itemsChanged(int index, int count, const QList<int> &roles)
+void QQuickVisualAdaptorModel::_q_itemsChanged(int index, int count, const QList<int> &roles)
 {
-    Q_D(QSGVisualAdaptorModel);
+    Q_D(QQuickVisualAdaptorModel);
     bool changed = roles.isEmpty();
     if (!d->watchedRoles.isEmpty() && d->watchedRoleIds.isEmpty()) {
         foreach (QByteArray r, d->watchedRoles) {
@@ -766,11 +766,11 @@ void QSGVisualAdaptorModel::_q_itemsChanged(int index, int count, const QList<in
             signalIndexes.append(propertyId + d->m_delegateDataType->signalOffset);
     }
 
-    typedef QSGVisualAdaptorModelDataCache::iterator iterator;
+    typedef QQuickVisualAdaptorModelDataCache::iterator iterator;
     for (iterator it = d->m_cache.begin(); it != d->m_cache.end(); ++it) {
         const int idx = it->index();
         if (idx >= index && idx < index + count) {
-            QSGVisualAdaptorModelData *data = *it;
+            QQuickVisualAdaptorModelData *data = *it;
             for (int i = 0; i < signalIndexes.count(); ++i)
                 QMetaObject::activate(data, signalIndexes.at(i), 0);
         }
@@ -779,14 +779,14 @@ void QSGVisualAdaptorModel::_q_itemsChanged(int index, int count, const QList<in
         emit itemsChanged(index, count);
 }
 
-void QSGVisualAdaptorModel::_q_itemsInserted(int index, int count)
+void QQuickVisualAdaptorModel::_q_itemsInserted(int index, int count)
 {
-    Q_D(QSGVisualAdaptorModel);
+    Q_D(QQuickVisualAdaptorModel);
     if (count <= 0)
         return;
     d->m_count += count;
 
-    typedef QSGVisualAdaptorModelDataCache::iterator iterator;
+    typedef QQuickVisualAdaptorModelDataCache::iterator iterator;
     for (iterator it = d->m_cache.begin(); it != d->m_cache.end(); ++it) {
         if (it->index() >= index)
             it->setIndex(it->index() + count);
@@ -795,14 +795,14 @@ void QSGVisualAdaptorModel::_q_itemsInserted(int index, int count)
     emit itemsInserted(index, count);
 }
 
-void QSGVisualAdaptorModel::_q_itemsRemoved(int index, int count)
+void QQuickVisualAdaptorModel::_q_itemsRemoved(int index, int count)
 {
-    Q_D(QSGVisualAdaptorModel);
+    Q_D(QQuickVisualAdaptorModel);
     if (count <= 0)
         return;
     d->m_count -= count;
 
-    typedef QSGVisualAdaptorModelDataCache::iterator iterator;
+    typedef QQuickVisualAdaptorModelDataCache::iterator iterator;
     for (iterator it = d->m_cache.begin(); it != d->m_cache.end(); ++it) {
         if (it->index() >= index + count)
             it->setIndex(it->index() - count);
@@ -813,14 +813,14 @@ void QSGVisualAdaptorModel::_q_itemsRemoved(int index, int count)
     emit itemsRemoved(index, count);
 }
 
-void QSGVisualAdaptorModel::_q_itemsMoved(int from, int to, int count)
+void QQuickVisualAdaptorModel::_q_itemsMoved(int from, int to, int count)
 {
-    Q_D(QSGVisualAdaptorModel);
+    Q_D(QQuickVisualAdaptorModel);
     const int minimum = qMin(from, to);
     const int maximum = qMax(from, to) + count;
     const int difference = from > to ? count : -count;
 
-    typedef QSGVisualAdaptorModelDataCache::iterator iterator;
+    typedef QQuickVisualAdaptorModelDataCache::iterator iterator;
     for (iterator it = d->m_cache.begin(); it != d->m_cache.end(); ++it) {
         if (it->index() >= from && it->index() < from + count)
             it->setIndex(it->index() - from + to);
@@ -830,23 +830,23 @@ void QSGVisualAdaptorModel::_q_itemsMoved(int from, int to, int count)
     emit itemsMoved(from, to, count);
 }
 
-void QSGVisualAdaptorModel::_q_rowsInserted(const QModelIndex &parent, int begin, int end)
+void QQuickVisualAdaptorModel::_q_rowsInserted(const QModelIndex &parent, int begin, int end)
 {
-    Q_D(QSGVisualAdaptorModel);
+    Q_D(QQuickVisualAdaptorModel);
     if (parent == d->m_root)
         _q_itemsInserted(begin, end - begin + 1);
 }
 
-void QSGVisualAdaptorModel::_q_rowsRemoved(const QModelIndex &parent, int begin, int end)
+void QQuickVisualAdaptorModel::_q_rowsRemoved(const QModelIndex &parent, int begin, int end)
 {
-    Q_D(QSGVisualAdaptorModel);
+    Q_D(QQuickVisualAdaptorModel);
     if (parent == d->m_root)
         _q_itemsRemoved(begin, end - begin + 1);
 }
 
-void QSGVisualAdaptorModel::_q_rowsMoved(const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationRow)
+void QQuickVisualAdaptorModel::_q_rowsMoved(const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationRow)
 {
-   Q_D(QSGVisualAdaptorModel);
+   Q_D(QQuickVisualAdaptorModel);
     const int count = sourceEnd - sourceStart + 1;
     if (destinationParent == d->m_root && sourceParent == d->m_root) {
         _q_itemsMoved(sourceStart, sourceStart > destinationRow ? destinationRow : destinationRow-count, count);
@@ -857,22 +857,22 @@ void QSGVisualAdaptorModel::_q_rowsMoved(const QModelIndex &sourceParent, int so
     }
 }
 
-void QSGVisualAdaptorModel::_q_dataChanged(const QModelIndex &begin, const QModelIndex &end)
+void QQuickVisualAdaptorModel::_q_dataChanged(const QModelIndex &begin, const QModelIndex &end)
 {
-    Q_D(QSGVisualAdaptorModel);
+    Q_D(QQuickVisualAdaptorModel);
     if (begin.parent() == d->m_root)
         _q_itemsChanged(begin.row(), end.row() - begin.row() + 1, d->m_roles);
 }
 
-void QSGVisualAdaptorModel::_q_layoutChanged()
+void QQuickVisualAdaptorModel::_q_layoutChanged()
 {
-    Q_D(QSGVisualAdaptorModel);
+    Q_D(QQuickVisualAdaptorModel);
     _q_itemsChanged(0, count(), d->m_roles);
 }
 
-void QSGVisualAdaptorModel::_q_modelReset()
+void QQuickVisualAdaptorModel::_q_modelReset()
 {
-    Q_D(QSGVisualAdaptorModel);
+    Q_D(QQuickVisualAdaptorModel);
     int oldCount = d->m_count;
     d->m_root = QModelIndex();
     d->m_count = d->modelCount();
@@ -886,4 +886,4 @@ QT_END_NAMESPACE
 
 QML_DECLARE_TYPE(QListModelInterface)
 
-#include <qsgvisualadaptormodel.moc>
+#include <qquickvisualadaptormodel.moc>
diff --git a/src/declarative/items/qsgvisualadaptormodel_p.h b/src/declarative/items/qquickvisualadaptormodel_p.h
index 43af78b37e..31eba503ea 100644
--- a/src/declarative/items/qsgvisualadaptormodel_p.h
+++ b/src/declarative/items/qquickvisualadaptormodel_p.h
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#ifndef QSGVISUALADAPTORMODEL_P_H
-#define QSGVISUALADAPTORMODEL_P_H
+#ifndef QQUICKVISUALADAPTORMODEL_P_H
+#define QQUICKVISUALADAPTORMODEL_P_H
 
 #include <QtCore/qobject.h>
 #include <QtCore/qabstractitemmodel.h>
@@ -53,11 +53,11 @@ QT_BEGIN_NAMESPACE
 
 class QDeclarativeEngine;
 
-class QSGVisualAdaptorModelPrivate;
-class QSGVisualAdaptorModel : public QObject
+class QQuickVisualAdaptorModelPrivate;
+class QQuickVisualAdaptorModel : public QObject
 {
     Q_OBJECT
-    Q_DECLARE_PRIVATE(QSGVisualAdaptorModel)
+    Q_DECLARE_PRIVATE(QQuickVisualAdaptorModel)
 public:
     enum Flag
     {
@@ -66,8 +66,8 @@ public:
     };
     Q_DECLARE_FLAGS(Flags, Flag)
 
-    QSGVisualAdaptorModel(QObject *parent = 0);
-    virtual ~QSGVisualAdaptorModel();
+    QQuickVisualAdaptorModel(QObject *parent = 0);
+    virtual ~QQuickVisualAdaptorModel();
 
     Flags flags() const;
 
@@ -111,18 +111,18 @@ private Q_SLOTS:
     void _q_modelReset();
 
 private:
-    Q_DISABLE_COPY(QSGVisualAdaptorModel)
+    Q_DISABLE_COPY(QQuickVisualAdaptorModel)
 };
 
-class QSGVisualAdaptorModelProxyInterface
+class QQuickVisualAdaptorModelProxyInterface
 {
 public:
-    virtual ~QSGVisualAdaptorModelProxyInterface() {}
+    virtual ~QQuickVisualAdaptorModelProxyInterface() {}
 
     virtual QObject *proxiedObject() = 0;
 };
 
-Q_DECLARE_INTERFACE(QSGVisualAdaptorModelProxyInterface, "com.trolltech.qml.QSGVisualAdaptorModelProxyInterface")
+Q_DECLARE_INTERFACE(QQuickVisualAdaptorModelProxyInterface, "com.trolltech.qml.QQuickVisualAdaptorModelProxyInterface")
 
 QT_END_NAMESPACE
 
diff --git a/src/declarative/items/qsgvisualdatamodel.cpp b/src/declarative/items/qquickvisualdatamodel.cpp
index 47edc5d8f0..1a24e168d6 100644
--- a/src/declarative/items/qsgvisualdatamodel.cpp
+++ b/src/declarative/items/qquickvisualdatamodel.cpp
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#include "qsgvisualdatamodel_p.h"
-#include "qsgitem.h"
+#include "qquickvisualdatamodel_p.h"
+#include "qquickitem.h"
 
 #include <QtCore/qcoreapplication.h>
 #include <QtDeclarative/qdeclarativecontext.h>
@@ -58,7 +58,7 @@
 #include <private/qdeclarativeglobal_p.h>
 #include <private/qmetaobjectbuilder_p.h>
 #include <private/qdeclarativeproperty_p.h>
-#include <private/qsgvisualadaptormodel_p.h>
+#include <private/qquickvisualadaptormodel_p.h>
 #include <private/qdeclarativechangeset_p.h>
 #include <private/qdeclarativelistcompositor_p.h>
 #include <private/qdeclarativeengine_p.h>
@@ -71,7 +71,7 @@ QT_BEGIN_NAMESPACE
 
 typedef QDeclarativeListCompositor Compositor;
 
-class QSGVisualDataGroupEmitter
+class QQuickVisualDataGroupEmitter
 {
 public:
     virtual void emitModelUpdated(const QDeclarativeChangeSet &changeSet, bool reset) = 0;
@@ -81,21 +81,21 @@ public:
     QIntrusiveListNode emitterNode;
 };
 
-typedef QIntrusiveList<QSGVisualDataGroupEmitter, &QSGVisualDataGroupEmitter::emitterNode> QSGVisualDataGroupEmitterList;
+typedef QIntrusiveList<QQuickVisualDataGroupEmitter, &QQuickVisualDataGroupEmitter::emitterNode> QQuickVisualDataGroupEmitterList;
 
 //---------------------------------------------------------------------------
 
-class QSGVisualDataGroupPrivate : public QObjectPrivate
+class QQuickVisualDataGroupPrivate : public QObjectPrivate
 {
 public:
-    Q_DECLARE_PUBLIC(QSGVisualDataGroup)
+    Q_DECLARE_PUBLIC(QQuickVisualDataGroup)
 
-    QSGVisualDataGroupPrivate() : group(Compositor::Cache), defaultInclude(false) {}
+    QQuickVisualDataGroupPrivate() : group(Compositor::Cache), defaultInclude(false) {}
 
-    static QSGVisualDataGroupPrivate *get(QSGVisualDataGroup *group) {
-        return static_cast<QSGVisualDataGroupPrivate *>(QObjectPrivate::get(group)); }
+    static QQuickVisualDataGroupPrivate *get(QQuickVisualDataGroup *group) {
+        return static_cast<QQuickVisualDataGroupPrivate *>(QObjectPrivate::get(group)); }
 
-    void setModel(QSGVisualDataModel *model, Compositor::Group group);
+    void setModel(QQuickVisualDataModel *model, Compositor::Group group);
     void emitChanges(QV8Engine *engine);
     void emitModelUpdated(bool reset);
 
@@ -105,8 +105,8 @@ public:
     bool parseGroupArgs(QDeclarativeV8Function *args, int *index, int *count, int *groups) const;
 
     Compositor::Group group;
-    QDeclarativeGuard<QSGVisualDataModel> model;
-    QSGVisualDataGroupEmitterList emitters;
+    QDeclarativeGuard<QQuickVisualDataModel> model;
+    QQuickVisualDataGroupEmitterList emitters;
     QDeclarativeChangeSet changeSet;
     QString name;
     bool defaultInclude;
@@ -114,33 +114,33 @@ public:
 
 //---------------------------------------------------------------------------
 
-class QSGVisualDataModelCacheItem;
-class QSGVisualDataModelCacheMetaType;
-class QSGVisualDataModelParts;
+class QQuickVisualDataModelCacheItem;
+class QQuickVisualDataModelCacheMetaType;
+class QQuickVisualDataModelParts;
 
-class QSGVisualDataModelPrivate : public QObjectPrivate, public QSGVisualDataGroupEmitter
+class QQuickVisualDataModelPrivate : public QObjectPrivate, public QQuickVisualDataGroupEmitter
 {
-    Q_DECLARE_PUBLIC(QSGVisualDataModel)
+    Q_DECLARE_PUBLIC(QQuickVisualDataModel)
 public:
-    QSGVisualDataModelPrivate(QDeclarativeContext *);
+    QQuickVisualDataModelPrivate(QDeclarativeContext *);
 
-    static QSGVisualDataModelPrivate *get(QSGVisualDataModel *m) {
-        return static_cast<QSGVisualDataModelPrivate *>(QObjectPrivate::get(m));
+    static QQuickVisualDataModelPrivate *get(QQuickVisualDataModel *m) {
+        return static_cast<QQuickVisualDataModelPrivate *>(QObjectPrivate::get(m));
     }
 
     void init();
-    void connectModel(QSGVisualAdaptorModel *model);
+    void connectModel(QQuickVisualAdaptorModel *model);
 
     QObject *object(Compositor::Group group, int index, bool complete, bool reference);
     void destroy(QObject *object);
-    QSGVisualDataModel::ReleaseFlags release(QObject *object);
+    QQuickVisualDataModel::ReleaseFlags release(QObject *object);
     QString stringValue(Compositor::Group group, int index, const QString &name);
     int cacheIndexOf(QObject *object) const;
     void emitCreatedPackage(Compositor::iterator at, QDeclarativePackage *package);
-    void emitCreatedItem(Compositor::iterator at, QSGItem *item) {
+    void emitCreatedItem(Compositor::iterator at, QQuickItem *item) {
         emit q_func()->createdItem(at.index[m_compositorGroup], item); }
     void emitDestroyingPackage(QDeclarativePackage *package);
-    void emitDestroyingItem(QSGItem *item) { emit q_func()->destroyingItem(item); }
+    void emitDestroyingItem(QQuickItem *item) { emit q_func()->destroyingItem(item); }
 
     void updateFilterGroup();
 
@@ -151,12 +151,12 @@ public:
     void itemsInserted(
             const QVector<Compositor::Insert> &inserts,
             QVarLengthArray<QVector<QDeclarativeChangeSet::Insert>, Compositor::MaximumGroupCount> *translatedInserts,
-            QHash<int, QList<QSGVisualDataModelCacheItem *> > *movedItems = 0);
+            QHash<int, QList<QQuickVisualDataModelCacheItem *> > *movedItems = 0);
     void itemsInserted(const QVector<Compositor::Insert> &inserts);
     void itemsRemoved(
             const QVector<Compositor::Remove> &removes,
             QVarLengthArray<QVector<QDeclarativeChangeSet::Remove>, Compositor::MaximumGroupCount> *translatedRemoves,
-            QHash<int, QList<QSGVisualDataModelCacheItem *> > *movedItems = 0);
+            QHash<int, QList<QQuickVisualDataModelCacheItem *> > *movedItems = 0);
     void itemsRemoved(const QVector<Compositor::Remove> &removes);
     void itemsMoved(
             const QVector<Compositor::Remove> &removes, const QVector<Compositor::Insert> &inserts);
@@ -166,18 +166,18 @@ public:
     void emitModelUpdated(const QDeclarativeChangeSet &changeSet, bool reset);
 
 
-    static void group_append(QDeclarativeListProperty<QSGVisualDataGroup> *property, QSGVisualDataGroup *group);
-    static int group_count(QDeclarativeListProperty<QSGVisualDataGroup> *property);
-    static QSGVisualDataGroup *group_at(QDeclarativeListProperty<QSGVisualDataGroup> *property, int index);
+    static void group_append(QDeclarativeListProperty<QQuickVisualDataGroup> *property, QQuickVisualDataGroup *group);
+    static int group_count(QDeclarativeListProperty<QQuickVisualDataGroup> *property);
+    static QQuickVisualDataGroup *group_at(QDeclarativeListProperty<QQuickVisualDataGroup> *property, int index);
 
-    QSGVisualAdaptorModel *m_adaptorModel;
+    QQuickVisualAdaptorModel *m_adaptorModel;
     QDeclarativeComponent *m_delegate;
-    QSGVisualDataModelCacheMetaType *m_cacheMetaType;
+    QQuickVisualDataModelCacheMetaType *m_cacheMetaType;
     QDeclarativeGuard<QDeclarativeContext> m_context;
 
-    QList<QSGVisualDataModelCacheItem *> m_cache;
-    QSGVisualDataModelParts *m_parts;
-    QSGVisualDataGroupEmitterList m_pendingParts;
+    QList<QQuickVisualDataModelCacheItem *> m_cache;
+    QQuickVisualDataModelParts *m_parts;
+    QQuickVisualDataGroupEmitterList m_pendingParts;
 
     QDeclarativeListCompositor m_compositor;
     QDeclarativeListCompositor::Group m_compositorGroup;
@@ -192,24 +192,24 @@ public:
 
     union {
         struct {
-            QSGVisualDataGroup *m_cacheItems;
-            QSGVisualDataGroup *m_items;
-            QSGVisualDataGroup *m_persistedItems;
+            QQuickVisualDataGroup *m_cacheItems;
+            QQuickVisualDataGroup *m_items;
+            QQuickVisualDataGroup *m_persistedItems;
         };
-        QSGVisualDataGroup *m_groups[Compositor::MaximumGroupCount];
+        QQuickVisualDataGroup *m_groups[Compositor::MaximumGroupCount];
     };
     int m_groupCount;
 };
 
 //---------------------------------------------------------------------------
 
-class QSGVisualPartsModel : public QSGVisualModel, public QSGVisualDataGroupEmitter
+class QQuickVisualPartsModel : public QQuickVisualModel, public QQuickVisualDataGroupEmitter
 {
     Q_OBJECT
     Q_PROPERTY(QString filterOnGroup READ filterGroup WRITE setFilterGroup NOTIFY filterGroupChanged RESET resetFilterGroup)
 public:
-    QSGVisualPartsModel(QSGVisualDataModel *model, const QString &part, QObject *parent = 0);
-    ~QSGVisualPartsModel();
+    QQuickVisualPartsModel(QQuickVisualDataModel *model, const QString &part, QObject *parent = 0);
+    ~QQuickVisualPartsModel();
 
     QString filterGroup() const;
     void setFilterGroup(const QString &group);
@@ -219,14 +219,14 @@ public:
 
     int count() const;
     bool isValid() const;
-    QSGItem *item(int index, bool complete=true);
-    ReleaseFlags release(QSGItem *item);
+    QQuickItem *item(int index, bool complete=true);
+    ReleaseFlags release(QQuickItem *item);
     bool completePending() const;
     void completeItem();
     QString stringValue(int index, const QString &role);
     void setWatchedRoles(QList<QByteArray> roles);
 
-    int indexOf(QSGItem *item, QObject *objectContext) const;
+    int indexOf(QQuickItem *item, QObject *objectContext) const;
 
     void emitModelUpdated(const QDeclarativeChangeSet &changeSet, bool reset);
 
@@ -237,7 +237,7 @@ Q_SIGNALS:
     void filterGroupChanged();
 
 private:
-    QSGVisualDataModel *m_model;
+    QQuickVisualDataModel *m_model;
     QHash<QObject *, QDeclarativePackage *> m_packaged;
     QString m_part;
     QString m_filterGroup;
@@ -246,53 +246,53 @@ private:
     bool m_inheritGroup;
 };
 
-class QSGVisualDataModelPartsMetaObject : public QDeclarativeOpenMetaObject
+class QQuickVisualDataModelPartsMetaObject : public QDeclarativeOpenMetaObject
 {
 public:
-    QSGVisualDataModelPartsMetaObject(QObject *parent)
+    QQuickVisualDataModelPartsMetaObject(QObject *parent)
     : QDeclarativeOpenMetaObject(parent) {}
 
     virtual void propertyCreated(int, QMetaPropertyBuilder &);
     virtual QVariant initialValue(int);
 };
 
-class QSGVisualDataModelParts : public QObject
+class QQuickVisualDataModelParts : public QObject
 {
 Q_OBJECT
 public:
-    QSGVisualDataModelParts(QSGVisualDataModel *parent);
+    QQuickVisualDataModelParts(QQuickVisualDataModel *parent);
 
-    QSGVisualDataModel *model;
-    QList<QSGVisualPartsModel *> models;
+    QQuickVisualDataModel *model;
+    QList<QQuickVisualPartsModel *> models;
 };
 
-void QSGVisualDataModelPartsMetaObject::propertyCreated(int, QMetaPropertyBuilder &prop)
+void QQuickVisualDataModelPartsMetaObject::propertyCreated(int, QMetaPropertyBuilder &prop)
 {
     prop.setWritable(false);
 }
 
-QVariant QSGVisualDataModelPartsMetaObject::initialValue(int id)
+QVariant QQuickVisualDataModelPartsMetaObject::initialValue(int id)
 {
-    QSGVisualDataModelParts *parts = static_cast<QSGVisualDataModelParts *>(object());
-    QSGVisualPartsModel *m = new QSGVisualPartsModel(
+    QQuickVisualDataModelParts *parts = static_cast<QQuickVisualDataModelParts *>(object());
+    QQuickVisualPartsModel *m = new QQuickVisualPartsModel(
             parts->model, QString::fromUtf8(name(id)), parts);
     parts->models.append(m);
     return QVariant::fromValue(static_cast<QObject *>(m));
 }
 
-QSGVisualDataModelParts::QSGVisualDataModelParts(QSGVisualDataModel *parent)
+QQuickVisualDataModelParts::QQuickVisualDataModelParts(QQuickVisualDataModel *parent)
 : QObject(parent), model(parent)
 {
-    new QSGVisualDataModelPartsMetaObject(this);
+    new QQuickVisualDataModelPartsMetaObject(this);
 }
 
 //---------------------------------------------------------------------------
 
-class QSGVisualDataModelCacheMetaType : public QDeclarativeRefCount
+class QQuickVisualDataModelCacheMetaType : public QDeclarativeRefCount
 {
 public:
-    QSGVisualDataModelCacheMetaType(QV8Engine *engine, QSGVisualDataModel *model, const QStringList &groupNames);
-    ~QSGVisualDataModelCacheMetaType();
+    QQuickVisualDataModelCacheMetaType(QV8Engine *engine, QQuickVisualDataModel *model, const QStringList &groupNames);
+    ~QQuickVisualDataModelCacheMetaType();
 
     int parseGroups(const QStringList &groupNames) const;
     int parseGroups(QV8Engine *engine, const v8::Local<v8::Value> &groupNames) const;
@@ -306,7 +306,7 @@ public:
             v8::Local<v8::String>, v8::Local<v8::Value> value, const v8::AccessorInfo &info);
     static v8::Handle<v8::Value> get_index(v8::Local<v8::String>, const v8::AccessorInfo &info);
 
-    QDeclarativeGuard<QSGVisualDataModel> model;
+    QDeclarativeGuard<QQuickVisualDataModel> model;
     const int groupCount;
     const int memberPropertyOffset;
     const int indexPropertyOffset;
@@ -316,11 +316,11 @@ public:
     v8::Persistent<v8::Function> constructor;
 };
 
-class QSGVisualDataModelCacheItem : public QV8ObjectResource
+class QQuickVisualDataModelCacheItem : public QV8ObjectResource
 {
     V8_RESOURCE_TYPE(VisualDataItemType)
 public:
-    QSGVisualDataModelCacheItem(QSGVisualDataModelCacheMetaType *metaType)
+    QQuickVisualDataModelCacheItem(QQuickVisualDataModelCacheMetaType *metaType)
         : QV8ObjectResource(metaType->v8Engine)
         , metaType(metaType)
         , object(0)
@@ -332,7 +332,7 @@ public:
         metaType->addref();
     }
 
-    ~QSGVisualDataModelCacheItem()
+    ~QQuickVisualDataModelCacheItem()
     {
         Q_ASSERT(scriptRef == 0);
         Q_ASSERT(objectRef == 0);
@@ -349,35 +349,35 @@ public:
 
     void Dispose();
 
-    QSGVisualDataModelCacheMetaType * const metaType;
+    QQuickVisualDataModelCacheMetaType * const metaType;
     QDeclarativeGuard<QObject> object;
-    QSGVisualDataModelAttached *attached;
+    QQuickVisualDataModelAttached *attached;
     int objectRef;
     int scriptRef;
     int groups;
     int index[Compositor::MaximumGroupCount];
 };
 
-class QSGVisualDataModelAttachedMetaObject : public QAbstractDynamicMetaObject
+class QQuickVisualDataModelAttachedMetaObject : public QAbstractDynamicMetaObject
 {
 public:
-    QSGVisualDataModelAttachedMetaObject(
-            QSGVisualDataModelAttached *attached, QSGVisualDataModelCacheMetaType *metaType);
-    ~QSGVisualDataModelAttachedMetaObject();
+    QQuickVisualDataModelAttachedMetaObject(
+            QQuickVisualDataModelAttached *attached, QQuickVisualDataModelCacheMetaType *metaType);
+    ~QQuickVisualDataModelAttachedMetaObject();
 
     int metaCall(QMetaObject::Call, int _id, void **);
 
 private:
-    QSGVisualDataModelAttached *attached;
-    QSGVisualDataModelCacheMetaType *metaType;
+    QQuickVisualDataModelAttached *attached;
+    QQuickVisualDataModelCacheMetaType *metaType;
 };
 
 //---------------------------------------------------------------------------
 
-QHash<QObject*, QSGVisualDataModelAttached*> QSGVisualDataModelAttached::attachedProperties;
+QHash<QObject*, QQuickVisualDataModelAttached*> QQuickVisualDataModelAttached::attachedProperties;
 
 /*!
-    \qmlclass VisualDataModel QSGVisualDataModel
+    \qmlclass VisualDataModel QQuickVisualDataModel
     \inqmlmodule QtQuick 2
     \ingroup qml-working-with-data
     \brief The VisualDataModel encapsulates a model and delegate
@@ -396,7 +396,7 @@ QHash<QObject*, QSGVisualDataModelAttached*> QSGVisualDataModelAttached::attache
     \snippet doc/src/snippets/declarative/visualdatamodel.qml 0
 */
 
-QSGVisualDataModelPrivate::QSGVisualDataModelPrivate(QDeclarativeContext *ctxt)
+QQuickVisualDataModelPrivate::QQuickVisualDataModelPrivate(QDeclarativeContext *ctxt)
     : m_adaptorModel(0)
     , m_delegate(0)
     , m_cacheMetaType(0)
@@ -415,9 +415,9 @@ QSGVisualDataModelPrivate::QSGVisualDataModelPrivate(QDeclarativeContext *ctxt)
 {
 }
 
-void QSGVisualDataModelPrivate::connectModel(QSGVisualAdaptorModel *model)
+void QQuickVisualDataModelPrivate::connectModel(QQuickVisualAdaptorModel *model)
 {
-    Q_Q(QSGVisualDataModel);
+    Q_Q(QQuickVisualDataModel);
 
     QObject::connect(model, SIGNAL(itemsInserted(int,int)), q, SLOT(_q_itemsInserted(int,int)));
     QObject::connect(model, SIGNAL(itemsRemoved(int,int)), q, SLOT(_q_itemsRemoved(int,int)));
@@ -426,38 +426,38 @@ void QSGVisualDataModelPrivate::connectModel(QSGVisualAdaptorModel *model)
     QObject::connect(model, SIGNAL(modelReset(int,int)), q, SLOT(_q_modelReset(int,int)));
 }
 
-void QSGVisualDataModelPrivate::init()
+void QQuickVisualDataModelPrivate::init()
 {
-    Q_Q(QSGVisualDataModel);
+    Q_Q(QQuickVisualDataModel);
     m_compositor.setRemoveGroups(Compositor::GroupMask & ~Compositor::PersistedFlag);
 
-    m_adaptorModel = new QSGVisualAdaptorModel;
+    m_adaptorModel = new QQuickVisualAdaptorModel;
     QObject::connect(m_adaptorModel, SIGNAL(rootIndexChanged()), q, SIGNAL(rootIndexChanged()));
 
-    m_items = new QSGVisualDataGroup(QStringLiteral("items"), q, Compositor::Default, q);
+    m_items = new QQuickVisualDataGroup(QStringLiteral("items"), q, Compositor::Default, q);
     m_items->setDefaultInclude(true);
-    m_persistedItems = new QSGVisualDataGroup(QStringLiteral("persistedItems"), q, Compositor::Persisted, q);
-    QSGVisualDataGroupPrivate::get(m_items)->emitters.insert(this);
+    m_persistedItems = new QQuickVisualDataGroup(QStringLiteral("persistedItems"), q, Compositor::Persisted, q);
+    QQuickVisualDataGroupPrivate::get(m_items)->emitters.insert(this);
 }
 
-QSGVisualDataModel::QSGVisualDataModel()
-: QSGVisualModel(*(new QSGVisualDataModelPrivate(0)))
+QQuickVisualDataModel::QQuickVisualDataModel()
+: QQuickVisualModel(*(new QQuickVisualDataModelPrivate(0)))
 {
-    Q_D(QSGVisualDataModel);
+    Q_D(QQuickVisualDataModel);
     d->init();
 }
 
-QSGVisualDataModel::QSGVisualDataModel(QDeclarativeContext *ctxt, QObject *parent)
-: QSGVisualModel(*(new QSGVisualDataModelPrivate(ctxt)), parent)
+QQuickVisualDataModel::QQuickVisualDataModel(QDeclarativeContext *ctxt, QObject *parent)
+: QQuickVisualModel(*(new QQuickVisualDataModelPrivate(ctxt)), parent)
 {
-    Q_D(QSGVisualDataModel);
+    Q_D(QQuickVisualDataModel);
     d->init();
 }
 
-QSGVisualDataModel::~QSGVisualDataModel()
+QQuickVisualDataModel::~QQuickVisualDataModel()
 {
-    Q_D(QSGVisualDataModel);
-    foreach (QSGVisualDataModelCacheItem *cacheItem, d->m_cache) {
+    Q_D(QQuickVisualDataModel);
+    foreach (QQuickVisualDataModelCacheItem *cacheItem, d->m_cache) {
         cacheItem->object = 0;
         cacheItem->objectRef = 0;
         if (!cacheItem->isReferenced())
@@ -470,22 +470,22 @@ QSGVisualDataModel::~QSGVisualDataModel()
 }
 
 
-void QSGVisualDataModel::classBegin()
+void QQuickVisualDataModel::classBegin()
 {
 }
 
-void QSGVisualDataModel::componentComplete()
+void QQuickVisualDataModel::componentComplete()
 {
-    Q_D(QSGVisualDataModel);
+    Q_D(QQuickVisualDataModel);
     d->m_complete = true;
 
     int defaultGroups = 0;
     QStringList groupNames;
     groupNames.append(QStringLiteral("items"));
     groupNames.append(QStringLiteral("persistedItems"));
-    if (QSGVisualDataGroupPrivate::get(d->m_items)->defaultInclude)
+    if (QQuickVisualDataGroupPrivate::get(d->m_items)->defaultInclude)
         defaultGroups |= Compositor::DefaultFlag;
-    if (QSGVisualDataGroupPrivate::get(d->m_persistedItems)->defaultInclude)
+    if (QQuickVisualDataGroupPrivate::get(d->m_persistedItems)->defaultInclude)
         defaultGroups |= Compositor::PersistedFlag;
     for (int i = 3; i < d->m_groupCount; ++i) {
         QString name = d->m_groups[i]->name();
@@ -494,14 +494,14 @@ void QSGVisualDataModel::componentComplete()
             --d->m_groupCount;
             --i;
         } else if (name.at(0).isUpper()) {
-            qmlInfo(d->m_groups[i]) << QSGVisualDataGroup::tr("Group names must start with a lower case letter");
+            qmlInfo(d->m_groups[i]) << QQuickVisualDataGroup::tr("Group names must start with a lower case letter");
             d->m_groups[i] = d->m_groups[d->m_groupCount - 1];
             --d->m_groupCount;
             --i;
         } else {
             groupNames.append(name);
 
-            QSGVisualDataGroupPrivate *group = QSGVisualDataGroupPrivate::get(d->m_groups[i]);
+            QQuickVisualDataGroupPrivate *group = QQuickVisualDataGroupPrivate::get(d->m_groups[i]);
             group->setModel(this, Compositor::Group(i));
             if (group->defaultInclude)
                 defaultGroups |= (1 << i);
@@ -510,7 +510,7 @@ void QSGVisualDataModel::componentComplete()
     if (!d->m_context)
         d->m_context = qmlContext(this);
 
-    d->m_cacheMetaType = new QSGVisualDataModelCacheMetaType(
+    d->m_cacheMetaType = new QQuickVisualDataModelCacheMetaType(
             QDeclarativeEnginePrivate::getV8Engine(d->m_context->engine()), this, groupNames);
 
     d->m_compositor.setGroupCount(d->m_groupCount);
@@ -518,7 +518,7 @@ void QSGVisualDataModel::componentComplete()
     d->updateFilterGroup();
 
     while (!d->m_pendingParts.isEmpty())
-        static_cast<QSGVisualPartsModel *>(d->m_pendingParts.first())->updateFilterGroup();
+        static_cast<QQuickVisualPartsModel *>(d->m_pendingParts.first())->updateFilterGroup();
 
     d->connectModel(d->m_adaptorModel);
     QVector<Compositor::Insert> inserts;
@@ -550,15 +550,15 @@ void QSGVisualDataModel::componentComplete()
 
     \sa {qmlmodels}{Data Models}
 */
-QVariant QSGVisualDataModel::model() const
+QVariant QQuickVisualDataModel::model() const
 {
-    Q_D(const QSGVisualDataModel);
+    Q_D(const QQuickVisualDataModel);
     return d->m_adaptorModel->model();
 }
 
-void QSGVisualDataModel::setModel(const QVariant &model)
+void QQuickVisualDataModel::setModel(const QVariant &model)
 {
-    Q_D(QSGVisualDataModel);
+    Q_D(QQuickVisualDataModel);
     d->m_adaptorModel->setModel(model, d->m_context ? d->m_context->engine() : qmlEngine(this));
     if (d->m_complete && d->m_adaptorModel->canFetchMore())
         QCoreApplication::postEvent(this, new QEvent(QEvent::UpdateRequest));
@@ -571,15 +571,15 @@ void QSGVisualDataModel::setModel(const QVariant &model)
     The index is exposed as an accessible \c index property.  Properties of the
     model are also available depending upon the type of \l {qmlmodels}{Data Model}.
 */
-QDeclarativeComponent *QSGVisualDataModel::delegate() const
+QDeclarativeComponent *QQuickVisualDataModel::delegate() const
 {
-    Q_D(const QSGVisualDataModel);
+    Q_D(const QQuickVisualDataModel);
     return d->m_delegate;
 }
 
-void QSGVisualDataModel::setDelegate(QDeclarativeComponent *delegate)
+void QQuickVisualDataModel::setDelegate(QDeclarativeComponent *delegate)
 {
-    Q_D(QSGVisualDataModel);
+    Q_D(QQuickVisualDataModel);
     if (d->m_transaction) {
         qmlInfo(this) << tr("The delegate of a VisualDataModel cannot be changed within onUpdated.");
         return;
@@ -589,13 +589,13 @@ void QSGVisualDataModel::setDelegate(QDeclarativeComponent *delegate)
     d->m_delegateValidated = false;
     if (wasValid && d->m_complete) {
         for (int i = 1; i < d->m_groupCount; ++i) {
-            QSGVisualDataGroupPrivate::get(d->m_groups[i])->changeSet.remove(
+            QQuickVisualDataGroupPrivate::get(d->m_groups[i])->changeSet.remove(
                     0, d->m_compositor.count(Compositor::Group(i)));
         }
     }
     if (d->m_complete && d->m_delegate) {
         for (int i = 1; i < d->m_groupCount; ++i) {
-            QSGVisualDataGroupPrivate::get(d->m_groups[i])->changeSet.insert(
+            QQuickVisualDataGroupPrivate::get(d->m_groups[i])->changeSet.insert(
                     0, d->m_compositor.count(Compositor::Group(i)));
         }
     }
@@ -631,15 +631,15 @@ void QSGVisualDataModel::setDelegate(QDeclarativeComponent *delegate)
 
     \sa modelIndex(), parentModelIndex()
 */
-QVariant QSGVisualDataModel::rootIndex() const
+QVariant QQuickVisualDataModel::rootIndex() const
 {
-    Q_D(const QSGVisualDataModel);
+    Q_D(const QQuickVisualDataModel);
     return d->m_adaptorModel->rootIndex();
 }
 
-void QSGVisualDataModel::setRootIndex(const QVariant &root)
+void QQuickVisualDataModel::setRootIndex(const QVariant &root)
 {
-    Q_D(QSGVisualDataModel);
+    Q_D(QQuickVisualDataModel);
     d->m_adaptorModel->setRootIndex(root);
 }
 
@@ -655,9 +655,9 @@ void QSGVisualDataModel::setRootIndex(const QVariant &root)
 
     \sa rootIndex
 */
-QVariant QSGVisualDataModel::modelIndex(int idx) const
+QVariant QQuickVisualDataModel::modelIndex(int idx) const
 {
-    Q_D(const QSGVisualDataModel);
+    Q_D(const QQuickVisualDataModel);
     return d->m_adaptorModel->modelIndex(idx);
 }
 
@@ -673,9 +673,9 @@ QVariant QSGVisualDataModel::modelIndex(int idx) const
 
     \sa rootIndex
 */
-QVariant QSGVisualDataModel::parentModelIndex() const
+QVariant QQuickVisualDataModel::parentModelIndex() const
 {
-    Q_D(const QSGVisualDataModel);
+    Q_D(const QQuickVisualDataModel);
     return d->m_adaptorModel->parentModelIndex();
 }
 
@@ -683,15 +683,15 @@ QVariant QSGVisualDataModel::parentModelIndex() const
     \qmlproperty int QtQuick2::VisualDataModel::count
 */
 
-int QSGVisualDataModel::count() const
+int QQuickVisualDataModel::count() const
 {
-    Q_D(const QSGVisualDataModel);
+    Q_D(const QQuickVisualDataModel);
     if (!d->m_delegate)
         return 0;
     return d->m_compositor.count(d->m_compositorGroup);
 }
 
-void QSGVisualDataModelPrivate::destroy(QObject *object)
+void QQuickVisualDataModelPrivate::destroy(QObject *object)
 {
     QObjectPrivate *p = QObjectPrivate::get(object);
     Q_ASSERT(p->declarativeData);
@@ -701,19 +701,19 @@ void QSGVisualDataModelPrivate::destroy(QObject *object)
     object->deleteLater();
 }
 
-QSGVisualDataModel::ReleaseFlags QSGVisualDataModelPrivate::release(QObject *object)
+QQuickVisualDataModel::ReleaseFlags QQuickVisualDataModelPrivate::release(QObject *object)
 {
-    QSGVisualDataModel::ReleaseFlags stat = 0;
+    QQuickVisualDataModel::ReleaseFlags stat = 0;
     if (!object)
         return stat;
 
     int cacheIndex = cacheIndexOf(object);
     if (cacheIndex != -1) {
-        QSGVisualDataModelCacheItem *cacheItem = m_cache.at(cacheIndex);
+        QQuickVisualDataModelCacheItem *cacheItem = m_cache.at(cacheIndex);
         if (cacheItem->releaseObject()) {
             destroy(object);
             cacheItem->object = 0;
-            stat |= QSGVisualModel::Destroyed;
+            stat |= QQuickVisualModel::Destroyed;
             if (!cacheItem->isReferenced()) {
                 m_compositor.clearFlags(Compositor::Cache, cacheIndex, 1, Compositor::CacheFlag);
                 m_cache.removeAt(cacheIndex);
@@ -721,7 +721,7 @@ QSGVisualDataModel::ReleaseFlags QSGVisualDataModelPrivate::release(QObject *obj
                 Q_ASSERT(m_cache.count() == m_compositor.count(Compositor::Cache));
             }
         } else {
-            stat |= QSGVisualDataModel::Referenced;
+            stat |= QQuickVisualDataModel::Referenced;
         }
     }
     return stat;
@@ -731,40 +731,40 @@ QSGVisualDataModel::ReleaseFlags QSGVisualDataModelPrivate::release(QObject *obj
   Returns ReleaseStatus flags.
 */
 
-QSGVisualDataModel::ReleaseFlags QSGVisualDataModel::release(QSGItem *item)
+QQuickVisualDataModel::ReleaseFlags QQuickVisualDataModel::release(QQuickItem *item)
 {
-    Q_D(QSGVisualDataModel);
-    QSGVisualModel::ReleaseFlags stat = d->release(item);
+    Q_D(QQuickVisualDataModel);
+    QQuickVisualModel::ReleaseFlags stat = d->release(item);
     if (stat & Destroyed)
         item->setParentItem(0);
     return stat;
 }
 
-void QSGVisualDataModelPrivate::group_append(
-        QDeclarativeListProperty<QSGVisualDataGroup> *property, QSGVisualDataGroup *group)
+void QQuickVisualDataModelPrivate::group_append(
+        QDeclarativeListProperty<QQuickVisualDataGroup> *property, QQuickVisualDataGroup *group)
 {
-    QSGVisualDataModelPrivate *d = static_cast<QSGVisualDataModelPrivate *>(property->data);
+    QQuickVisualDataModelPrivate *d = static_cast<QQuickVisualDataModelPrivate *>(property->data);
     if (d->m_complete)
         return;
     if (d->m_groupCount == 11) {
-        qmlInfo(d->q_func()) << QSGVisualDataModel::tr("The maximum number of supported VisualDataGroups is 8");
+        qmlInfo(d->q_func()) << QQuickVisualDataModel::tr("The maximum number of supported VisualDataGroups is 8");
         return;
     }
     d->m_groups[d->m_groupCount] = group;
     d->m_groupCount += 1;
 }
 
-int QSGVisualDataModelPrivate::group_count(
-        QDeclarativeListProperty<QSGVisualDataGroup> *property)
+int QQuickVisualDataModelPrivate::group_count(
+        QDeclarativeListProperty<QQuickVisualDataGroup> *property)
 {
-    QSGVisualDataModelPrivate *d = static_cast<QSGVisualDataModelPrivate *>(property->data);
+    QQuickVisualDataModelPrivate *d = static_cast<QQuickVisualDataModelPrivate *>(property->data);
     return d->m_groupCount - 1;
 }
 
-QSGVisualDataGroup *QSGVisualDataModelPrivate::group_at(
-        QDeclarativeListProperty<QSGVisualDataGroup> *property, int index)
+QQuickVisualDataGroup *QQuickVisualDataModelPrivate::group_at(
+        QDeclarativeListProperty<QQuickVisualDataGroup> *property, int index)
 {
-    QSGVisualDataModelPrivate *d = static_cast<QSGVisualDataModelPrivate *>(property->data);
+    QQuickVisualDataModelPrivate *d = static_cast<QQuickVisualDataModelPrivate *>(property->data);
     return index >= 0 && index < d->m_groupCount - 1
             ? d->m_groups[index - 1]
             : 0;
@@ -788,15 +788,15 @@ QSGVisualDataGroup *QSGVisualDataModelPrivate::group_at(
     \snippet doc/src/snippets/declarative/visualdatagroup.qml 0
 */
 
-QDeclarativeListProperty<QSGVisualDataGroup> QSGVisualDataModel::groups()
+QDeclarativeListProperty<QQuickVisualDataGroup> QQuickVisualDataModel::groups()
 {
-    Q_D(QSGVisualDataModel);
-    return QDeclarativeListProperty<QSGVisualDataGroup>(
+    Q_D(QQuickVisualDataModel);
+    return QDeclarativeListProperty<QQuickVisualDataGroup>(
             this,
             d,
-            QSGVisualDataModelPrivate::group_append,
-            QSGVisualDataModelPrivate::group_count,
-            QSGVisualDataModelPrivate::group_at);
+            QQuickVisualDataModelPrivate::group_append,
+            QQuickVisualDataModelPrivate::group_count,
+            QQuickVisualDataModelPrivate::group_at);
 }
 
 /*!
@@ -805,9 +805,9 @@ QDeclarativeListProperty<QSGVisualDataGroup> QSGVisualDataModel::groups()
     This property holds visual data model's default group to which all new items are added.
 */
 
-QSGVisualDataGroup *QSGVisualDataModel::items()
+QQuickVisualDataGroup *QQuickVisualDataModel::items()
 {
-    Q_D(QSGVisualDataModel);
+    Q_D(QQuickVisualDataModel);
     return d->m_items;
 }
 
@@ -828,9 +828,9 @@ QSGVisualDataGroup *QSGVisualDataModel::items()
     to this group.
 */
 
-QSGVisualDataGroup *QSGVisualDataModel::persistedItems()
+QQuickVisualDataGroup *QQuickVisualDataModel::persistedItems()
 {
-    Q_D(QSGVisualDataModel);
+    Q_D(QQuickVisualDataModel);
     return d->m_persistedItems;
 }
 
@@ -844,15 +844,15 @@ QSGVisualDataGroup *QSGVisualDataModel::persistedItems()
     By default this is the \l items group.
 */
 
-QString QSGVisualDataModel::filterGroup() const
+QString QQuickVisualDataModel::filterGroup() const
 {
-    Q_D(const QSGVisualDataModel);
+    Q_D(const QQuickVisualDataModel);
     return d->m_filterGroup;
 }
 
-void QSGVisualDataModel::setFilterGroup(const QString &group)
+void QQuickVisualDataModel::setFilterGroup(const QString &group)
 {
-    Q_D(QSGVisualDataModel);
+    Q_D(QQuickVisualDataModel);
 
     if (d->m_transaction) {
         qmlInfo(this) << tr("The group of a VisualDataModel cannot be changed within onChanged");
@@ -866,14 +866,14 @@ void QSGVisualDataModel::setFilterGroup(const QString &group)
     }
 }
 
-void QSGVisualDataModel::resetFilterGroup()
+void QQuickVisualDataModel::resetFilterGroup()
 {
     setFilterGroup(QStringLiteral("items"));
 }
 
-void QSGVisualDataModelPrivate::updateFilterGroup()
+void QQuickVisualDataModelPrivate::updateFilterGroup()
 {
-    Q_Q(QSGVisualDataModel);
+    Q_Q(QQuickVisualDataModel);
     if (!m_cacheMetaType)
         return;
 
@@ -886,7 +886,7 @@ void QSGVisualDataModelPrivate::updateFilterGroup()
         }
     }
 
-    QSGVisualDataGroupPrivate::get(m_groups[m_compositorGroup])->emitters.insert(this);
+    QQuickVisualDataGroupPrivate::get(m_groups[m_compositorGroup])->emitters.insert(this);
     if (m_compositorGroup != previousGroup) {
         QVector<QDeclarativeChangeSet::Remove> removes;
         QVector<QDeclarativeChangeSet::Insert> inserts;
@@ -900,7 +900,7 @@ void QSGVisualDataModelPrivate::updateFilterGroup()
             emit q->countChanged();
 
         if (m_parts) {
-            foreach (QSGVisualPartsModel *model, m_parts->models)
+            foreach (QQuickVisualPartsModel *model, m_parts->models)
                 model->updateFilterGroup(m_compositorGroup, changeSet);
         }
     }
@@ -934,35 +934,35 @@ void QSGVisualDataModelPrivate::updateFilterGroup()
     \sa Package
 */
 
-QObject *QSGVisualDataModel::parts()
+QObject *QQuickVisualDataModel::parts()
 {
-    Q_D(QSGVisualDataModel);
+    Q_D(QQuickVisualDataModel);
     if (!d->m_parts)
-        d->m_parts = new QSGVisualDataModelParts(this);
+        d->m_parts = new QQuickVisualDataModelParts(this);
     return d->m_parts;
 }
 
-void QSGVisualDataModelPrivate::emitCreatedPackage(Compositor::iterator at, QDeclarativePackage *package)
+void QQuickVisualDataModelPrivate::emitCreatedPackage(Compositor::iterator at, QDeclarativePackage *package)
 {
     for (int i = 1; i < m_groupCount; ++i)
-        QSGVisualDataGroupPrivate::get(m_groups[i])->createdPackage(at.index[i], package);
+        QQuickVisualDataGroupPrivate::get(m_groups[i])->createdPackage(at.index[i], package);
 }
 
-void QSGVisualDataModelPrivate::emitDestroyingPackage(QDeclarativePackage *package)
+void QQuickVisualDataModelPrivate::emitDestroyingPackage(QDeclarativePackage *package)
 {
     for (int i = 1; i < m_groupCount; ++i)
-        QSGVisualDataGroupPrivate::get(m_groups[i])->destroyingPackage(package);
+        QQuickVisualDataGroupPrivate::get(m_groups[i])->destroyingPackage(package);
 }
 
-QObject *QSGVisualDataModelPrivate::object(Compositor::Group group, int index, bool complete, bool reference)
+QObject *QQuickVisualDataModelPrivate::object(Compositor::Group group, int index, bool complete, bool reference)
 {
-    Q_Q(QSGVisualDataModel);
+    Q_Q(QQuickVisualDataModel);
 
     Compositor::iterator it = m_compositor.find(group, index);
-    QSGVisualDataModelCacheItem *cacheItem = it->inCache() ? m_cache.at(it.cacheIndex) : 0;
+    QQuickVisualDataModelCacheItem *cacheItem = it->inCache() ? m_cache.at(it.cacheIndex) : 0;
 
     if (!cacheItem) {
-        cacheItem = new QSGVisualDataModelCacheItem(m_cacheMetaType);
+        cacheItem = new QQuickVisualDataModelCacheItem(m_cacheMetaType);
         for (int i = 0; i < m_groupCount; ++i)
             cacheItem->index[i] = it.index[i];
         cacheItem->groups = it->flags & Compositor::GroupMask;
@@ -975,8 +975,8 @@ QObject *QSGVisualDataModelPrivate::object(Compositor::Group group, int index, b
         QDeclarativeContext *rootContext = new QDeclarativeContext(
                 creationContext ? creationContext : m_context.data());
         QDeclarativeContext *ctxt = rootContext;
-        if (m_adaptorModel->flags() & QSGVisualAdaptorModel::ProxiedObject) {
-            if (QSGVisualAdaptorModelProxyInterface *proxy = qobject_cast<QSGVisualAdaptorModelProxyInterface *>(data)) {
+        if (m_adaptorModel->flags() & QQuickVisualAdaptorModel::ProxiedObject) {
+            if (QQuickVisualAdaptorModelProxyInterface *proxy = qobject_cast<QQuickVisualAdaptorModelProxyInterface *>(data)) {
                 ctxt->setContextObject(proxy->proxiedObject());
                 ctxt = new QDeclarativeContext(ctxt, ctxt);
             }
@@ -997,15 +997,15 @@ QObject *QSGVisualDataModelPrivate::object(Compositor::Group group, int index, b
                 Q_ASSERT(m_cache.count() == m_compositor.count(Compositor::Cache));
             }
 
-            cacheItem->attached = QSGVisualDataModelAttached::properties(cacheItem->object);
+            cacheItem->attached = QQuickVisualDataModelAttached::properties(cacheItem->object);
             cacheItem->attached->m_cacheItem = cacheItem;
-            new QSGVisualDataModelAttachedMetaObject(cacheItem->attached, m_cacheMetaType);
+            new QQuickVisualDataModelAttachedMetaObject(cacheItem->attached, m_cacheMetaType);
             cacheItem->attached->emitChanges();
 
             if (QDeclarativePackage *package = qobject_cast<QDeclarativePackage *>(cacheItem->object)) {
                 emitCreatedPackage(it, package);
             } else if (!reference) {
-                if (QSGItem *item = qobject_cast<QSGItem *>(cacheItem->object))
+                if (QQuickItem *item = qobject_cast<QQuickItem *>(cacheItem->object))
                     emitCreatedItem(it, item);
             }
 
@@ -1028,57 +1028,57 @@ QObject *QSGVisualDataModelPrivate::object(Compositor::Group group, int index, b
     return cacheItem->object;
 }
 
-QSGItem *QSGVisualDataModel::item(int index, bool complete)
+QQuickItem *QQuickVisualDataModel::item(int index, bool complete)
 {
-    Q_D(QSGVisualDataModel);
+    Q_D(QQuickVisualDataModel);
     if (!d->m_delegate || index < 0 || index >= d->m_compositor.count(d->m_compositorGroup)) {
         qWarning() << "VisualDataModel::item: index out range" << index << d->m_compositor.count(d->m_compositorGroup);
         return 0;
     }
 
     QObject *object = d->object(d->m_compositorGroup, index, complete, true);
-    if (QSGItem *item = qobject_cast<QSGItem *>(object))
+    if (QQuickItem *item = qobject_cast<QQuickItem *>(object))
         return item;
     if (d->m_completePending)
         completeItem();
     d->release(object);
     if (!d->m_delegateValidated) {
         if (object)
-            qmlInfo(d->m_delegate) << QSGVisualDataModel::tr("Delegate component must be Item type.");
+            qmlInfo(d->m_delegate) << QQuickVisualDataModel::tr("Delegate component must be Item type.");
         d->m_delegateValidated = true;
     }
     return 0;
 }
 
-bool QSGVisualDataModel::completePending() const
+bool QQuickVisualDataModel::completePending() const
 {
-    Q_D(const QSGVisualDataModel);
+    Q_D(const QQuickVisualDataModel);
     return d->m_completePending;
 }
 
-void QSGVisualDataModel::completeItem()
+void QQuickVisualDataModel::completeItem()
 {
-    Q_D(QSGVisualDataModel);
+    Q_D(QQuickVisualDataModel);
     d->m_delegate->completeCreate();
     d->m_completePending = false;
 }
 
-QString QSGVisualDataModelPrivate::stringValue(Compositor::Group group, int index, const QString &name)
+QString QQuickVisualDataModelPrivate::stringValue(Compositor::Group group, int index, const QString &name)
 {
     Compositor::iterator it = m_compositor.find(group, index);
-    if (QSGVisualAdaptorModel *model = it.list<QSGVisualAdaptorModel>()) {
+    if (QQuickVisualAdaptorModel *model = it.list<QQuickVisualAdaptorModel>()) {
         return model->stringValue(it.modelIndex(), name);
     }
     return QString();
 }
 
-QString QSGVisualDataModel::stringValue(int index, const QString &name)
+QString QQuickVisualDataModel::stringValue(int index, const QString &name)
 {
-    Q_D(QSGVisualDataModel);
+    Q_D(QQuickVisualDataModel);
     return d->stringValue(d->m_compositorGroup, index, name);
 }
 
-int QSGVisualDataModelPrivate::cacheIndexOf(QObject *object) const
+int QQuickVisualDataModelPrivate::cacheIndexOf(QObject *object) const
 {
     for (int cacheIndex = 0; cacheIndex < m_cache.count(); ++cacheIndex) {
         if (m_cache.at(cacheIndex)->object == object)
@@ -1087,23 +1087,23 @@ int QSGVisualDataModelPrivate::cacheIndexOf(QObject *object) const
     return -1;
 }
 
-int QSGVisualDataModel::indexOf(QSGItem *item, QObject *) const
+int QQuickVisualDataModel::indexOf(QQuickItem *item, QObject *) const
 {
-    Q_D(const QSGVisualDataModel);
+    Q_D(const QQuickVisualDataModel);
     const int cacheIndex = d->cacheIndexOf(item);
     return cacheIndex != -1
             ? d->m_cache.at(cacheIndex)->index[d->m_compositorGroup]
             : -1;
 }
 
-void QSGVisualDataModel::setWatchedRoles(QList<QByteArray> roles)
+void QQuickVisualDataModel::setWatchedRoles(QList<QByteArray> roles)
 {
-    Q_D(QSGVisualDataModel);
+    Q_D(QQuickVisualDataModel);
     d->m_adaptorModel->replaceWatchedRoles(d->watchedRoles, roles);
     d->watchedRoles = roles;
 }
 
-void QSGVisualDataModelPrivate::addGroups(Compositor::Group group, int index, int count, int groupFlags)
+void QQuickVisualDataModelPrivate::addGroups(Compositor::Group group, int index, int count, int groupFlags)
 {
     QVector<Compositor::Insert> inserts;
     m_compositor.setFlags(group, index, count, groupFlags, &inserts);
@@ -1111,7 +1111,7 @@ void QSGVisualDataModelPrivate::addGroups(Compositor::Group group, int index, in
     emitChanges();
 }
 
-void QSGVisualDataModelPrivate::removeGroups(Compositor::Group group, int index, int count, int groupFlags)
+void QQuickVisualDataModelPrivate::removeGroups(Compositor::Group group, int index, int count, int groupFlags)
 {
     QVector<Compositor::Remove> removes;
     m_compositor.clearFlags(group, index, count, groupFlags, &removes);
@@ -1119,7 +1119,7 @@ void QSGVisualDataModelPrivate::removeGroups(Compositor::Group group, int index,
     emitChanges();
 }
 
-void QSGVisualDataModelPrivate::setGroups(Compositor::Group group, int index, int count, int groupFlags)
+void QQuickVisualDataModelPrivate::setGroups(Compositor::Group group, int index, int count, int groupFlags)
 {
     QVector<Compositor::Insert> inserts;
     m_compositor.setFlags(group, index, count, groupFlags, &inserts);
@@ -1133,15 +1133,15 @@ void QSGVisualDataModelPrivate::setGroups(Compositor::Group group, int index, in
     emitChanges();
 }
 
-bool QSGVisualDataModel::event(QEvent *e)
+bool QQuickVisualDataModel::event(QEvent *e)
 {
-    Q_D(QSGVisualDataModel);
+    Q_D(QQuickVisualDataModel);
     if (e->type() == QEvent::UpdateRequest)
         d->m_adaptorModel->fetchMore();
-    return QSGVisualModel::event(e);
+    return QQuickVisualModel::event(e);
 }
 
-void QSGVisualDataModelPrivate::itemsChanged(const QVector<Compositor::Change> &changes)
+void QQuickVisualDataModelPrivate::itemsChanged(const QVector<Compositor::Change> &changes)
 {
     if (!m_delegate)
         return;
@@ -1158,12 +1158,12 @@ void QSGVisualDataModelPrivate::itemsChanged(const QVector<Compositor::Change> &
     }
 
     for (int i = 1; i < m_groupCount; ++i)
-        QSGVisualDataGroupPrivate::get(m_groups[i])->changeSet.apply(translatedChanges.at(i));
+        QQuickVisualDataGroupPrivate::get(m_groups[i])->changeSet.apply(translatedChanges.at(i));
 }
 
-void QSGVisualDataModel::_q_itemsChanged(int index, int count)
+void QQuickVisualDataModel::_q_itemsChanged(int index, int count)
 {
-    Q_D(QSGVisualDataModel);
+    Q_D(QQuickVisualDataModel);
     if (count <= 0)
         return;
     QVector<Compositor::Change> changes;
@@ -1172,10 +1172,10 @@ void QSGVisualDataModel::_q_itemsChanged(int index, int count)
     d->emitChanges();
 }
 
-void QSGVisualDataModelPrivate::itemsInserted(
+void QQuickVisualDataModelPrivate::itemsInserted(
         const QVector<Compositor::Insert> &inserts,
         QVarLengthArray<QVector<QDeclarativeChangeSet::Insert>, Compositor::MaximumGroupCount> *translatedInserts,
-        QHash<int, QList<QSGVisualDataModelCacheItem *> > *movedItems)
+        QHash<int, QList<QQuickVisualDataModelCacheItem *> > *movedItems)
 {
     int cacheIndex = 0;
 
@@ -1185,7 +1185,7 @@ void QSGVisualDataModelPrivate::itemsInserted(
 
     foreach (const Compositor::Insert &insert, inserts) {
         for (; cacheIndex < insert.cacheIndex; ++cacheIndex) {
-            QSGVisualDataModelCacheItem *cacheItem = m_cache.at(cacheIndex);
+            QQuickVisualDataModelCacheItem *cacheItem = m_cache.at(cacheIndex);
             if (!cacheItem->groups)
                 continue;
             for (int i = 1; i < m_groupCount; ++i)
@@ -1203,13 +1203,13 @@ void QSGVisualDataModelPrivate::itemsInserted(
             continue;
 
         if (movedItems && insert.isMove()) {
-            QList<QSGVisualDataModelCacheItem *> items = movedItems->take(insert.moveId);
+            QList<QQuickVisualDataModelCacheItem *> items = movedItems->take(insert.moveId);
             Q_ASSERT(items.count() == insert.count);
             m_cache = m_cache.mid(0, insert.cacheIndex) + items + m_cache.mid(insert.cacheIndex);
         }
         if (insert.inGroup()) {
             for (int offset = 0; cacheIndex < insert.cacheIndex + insert.count; ++cacheIndex, ++offset) {
-                QSGVisualDataModelCacheItem *cacheItem = m_cache.at(cacheIndex);
+                QQuickVisualDataModelCacheItem *cacheItem = m_cache.at(cacheIndex);
                 cacheItem->groups |= insert.flags & Compositor::GroupMask;
                 for (int i = 1; i < m_groupCount; ++i) {
                     cacheItem->index[i] = cacheItem->groups & (1 << i)
@@ -1222,7 +1222,7 @@ void QSGVisualDataModelPrivate::itemsInserted(
         }
     }
     for (; cacheIndex < m_cache.count(); ++cacheIndex) {
-        QSGVisualDataModelCacheItem *cacheItem = m_cache.at(cacheIndex);
+        QQuickVisualDataModelCacheItem *cacheItem = m_cache.at(cacheIndex);
         if (!cacheItem->groups)
             continue;
         for (int i = 1; i < m_groupCount; ++i)
@@ -1230,7 +1230,7 @@ void QSGVisualDataModelPrivate::itemsInserted(
     }
 }
 
-void QSGVisualDataModelPrivate::itemsInserted(const QVector<Compositor::Insert> &inserts)
+void QQuickVisualDataModelPrivate::itemsInserted(const QVector<Compositor::Insert> &inserts)
 {
     QVarLengthArray<QVector<QDeclarativeChangeSet::Insert>, Compositor::MaximumGroupCount> translatedInserts(m_groupCount);
     itemsInserted(inserts, &translatedInserts);
@@ -1239,13 +1239,13 @@ void QSGVisualDataModelPrivate::itemsInserted(const QVector<Compositor::Insert>
         return;
 
     for (int i = 1; i < m_groupCount; ++i)
-        QSGVisualDataGroupPrivate::get(m_groups[i])->changeSet.apply(translatedInserts.at(i));
+        QQuickVisualDataGroupPrivate::get(m_groups[i])->changeSet.apply(translatedInserts.at(i));
 }
 
-void QSGVisualDataModel::_q_itemsInserted(int index, int count)
+void QQuickVisualDataModel::_q_itemsInserted(int index, int count)
 {
 
-    Q_D(QSGVisualDataModel);
+    Q_D(QQuickVisualDataModel);
     if (count <= 0)
         return;
     QVector<Compositor::Insert> inserts;
@@ -1254,10 +1254,10 @@ void QSGVisualDataModel::_q_itemsInserted(int index, int count)
     d->emitChanges();
 }
 
-void QSGVisualDataModelPrivate::itemsRemoved(
+void QQuickVisualDataModelPrivate::itemsRemoved(
         const QVector<Compositor::Remove> &removes,
         QVarLengthArray<QVector<QDeclarativeChangeSet::Remove>, Compositor::MaximumGroupCount> *translatedRemoves,
-        QHash<int, QList<QSGVisualDataModelCacheItem *> > *movedItems)
+        QHash<int, QList<QQuickVisualDataModelCacheItem *> > *movedItems)
 {
     int cacheIndex = 0;
     int removedCache = 0;
@@ -1268,7 +1268,7 @@ void QSGVisualDataModelPrivate::itemsRemoved(
 
     foreach (const Compositor::Remove &remove, removes) {
         for (; cacheIndex < remove.cacheIndex; ++cacheIndex) {
-            QSGVisualDataModelCacheItem *cacheItem = m_cache.at(cacheIndex);
+            QQuickVisualDataModelCacheItem *cacheItem = m_cache.at(cacheIndex);
             if (!cacheItem->groups)
                 continue;
             for (int i = 1; i < m_groupCount; ++i)
@@ -1287,17 +1287,17 @@ void QSGVisualDataModelPrivate::itemsRemoved(
 
         if (movedItems && remove.isMove()) {
             movedItems->insert(remove.moveId, m_cache.mid(remove.cacheIndex, remove.count));
-            QList<QSGVisualDataModelCacheItem *>::iterator begin = m_cache.begin() + remove.cacheIndex;
-            QList<QSGVisualDataModelCacheItem *>::iterator end = begin + remove.count;
+            QList<QQuickVisualDataModelCacheItem *>::iterator begin = m_cache.begin() + remove.cacheIndex;
+            QList<QQuickVisualDataModelCacheItem *>::iterator end = begin + remove.count;
             m_cache.erase(begin, end);
         } else {
             for (; cacheIndex < remove.cacheIndex + remove.count - removedCache; ++cacheIndex) {
-                QSGVisualDataModelCacheItem *cacheItem = m_cache.at(cacheIndex);
+                QQuickVisualDataModelCacheItem *cacheItem = m_cache.at(cacheIndex);
                 if (remove.inGroup(Compositor::Persisted) && cacheItem->objectRef == 0) {
                     destroy(cacheItem->object);
                     if (QDeclarativePackage *package = qobject_cast<QDeclarativePackage *>(cacheItem->object))
                         emitDestroyingPackage(package);
-                    else if (QSGItem *item = qobject_cast<QSGItem *>(cacheItem->object))
+                    else if (QQuickItem *item = qobject_cast<QQuickItem *>(cacheItem->object))
                         emitDestroyingItem(item);
                     cacheItem->object = 0;
                 }
@@ -1324,7 +1324,7 @@ void QSGVisualDataModelPrivate::itemsRemoved(
     }
 
     for (; cacheIndex < m_cache.count(); ++cacheIndex) {
-        QSGVisualDataModelCacheItem *cacheItem = m_cache.at(cacheIndex);
+        QQuickVisualDataModelCacheItem *cacheItem = m_cache.at(cacheIndex);
         if (!cacheItem->groups)
             continue;
         for (int i = 1; i < m_groupCount; ++i)
@@ -1332,7 +1332,7 @@ void QSGVisualDataModelPrivate::itemsRemoved(
     }
 }
 
-void QSGVisualDataModelPrivate::itemsRemoved(const QVector<Compositor::Remove> &removes)
+void QQuickVisualDataModelPrivate::itemsRemoved(const QVector<Compositor::Remove> &removes)
 {
     QVarLengthArray<QVector<QDeclarativeChangeSet::Remove>, Compositor::MaximumGroupCount> translatedRemoves(m_groupCount);
     itemsRemoved(removes, &translatedRemoves);
@@ -1341,12 +1341,12 @@ void QSGVisualDataModelPrivate::itemsRemoved(const QVector<Compositor::Remove> &
         return;
 
     for (int i = 1; i < m_groupCount; ++i)
-       QSGVisualDataGroupPrivate::get(m_groups[i])->changeSet.apply(translatedRemoves.at(i));
+       QQuickVisualDataGroupPrivate::get(m_groups[i])->changeSet.apply(translatedRemoves.at(i));
 }
 
-void QSGVisualDataModel::_q_itemsRemoved(int index, int count)
+void QQuickVisualDataModel::_q_itemsRemoved(int index, int count)
 {
-    Q_D(QSGVisualDataModel);
+    Q_D(QQuickVisualDataModel);
     if (count <= 0)
         return;
 
@@ -1356,10 +1356,10 @@ void QSGVisualDataModel::_q_itemsRemoved(int index, int count)
     d->emitChanges();
 }
 
-void QSGVisualDataModelPrivate::itemsMoved(
+void QQuickVisualDataModelPrivate::itemsMoved(
         const QVector<Compositor::Remove> &removes, const QVector<Compositor::Insert> &inserts)
 {
-    QHash<int, QList<QSGVisualDataModelCacheItem *> > movedItems;
+    QHash<int, QList<QQuickVisualDataModelCacheItem *> > movedItems;
 
     QVarLengthArray<QVector<QDeclarativeChangeSet::Remove>, Compositor::MaximumGroupCount> translatedRemoves(m_groupCount);
     itemsRemoved(removes, &translatedRemoves, &movedItems);
@@ -1372,15 +1372,15 @@ void QSGVisualDataModelPrivate::itemsMoved(
         return;
 
     for (int i = 1; i < m_groupCount; ++i) {
-        QSGVisualDataGroupPrivate::get(m_groups[i])->changeSet.apply(
+        QQuickVisualDataGroupPrivate::get(m_groups[i])->changeSet.apply(
                     translatedRemoves.at(i),
                     translatedInserts.at(i));
     }
 }
 
-void QSGVisualDataModel::_q_itemsMoved(int from, int to, int count)
+void QQuickVisualDataModel::_q_itemsMoved(int from, int to, int count)
 {
-    Q_D(QSGVisualDataModel);
+    Q_D(QQuickVisualDataModel);
     if (count <= 0)
         return;
 
@@ -1392,7 +1392,7 @@ void QSGVisualDataModel::_q_itemsMoved(int from, int to, int count)
 }
 
 template <typename T> v8::Local<v8::Array>
-QSGVisualDataModelPrivate::buildChangeList(const QVector<T> &changes)
+QQuickVisualDataModelPrivate::buildChangeList(const QVector<T> &changes)
 {
     v8::Local<v8::Array> indexes = v8::Array::New(changes.count());
     v8::Local<v8::String> indexKey = v8::String::New("index");
@@ -1409,15 +1409,15 @@ QSGVisualDataModelPrivate::buildChangeList(const QVector<T> &changes)
     return indexes;
 }
 
-void QSGVisualDataModelPrivate::emitModelUpdated(const QDeclarativeChangeSet &changeSet, bool reset)
+void QQuickVisualDataModelPrivate::emitModelUpdated(const QDeclarativeChangeSet &changeSet, bool reset)
 {
-    Q_Q(QSGVisualDataModel);
+    Q_Q(QQuickVisualDataModel);
     emit q->modelUpdated(changeSet, reset);
     if (changeSet.difference() != 0)
         emit q->countChanged();
 }
 
-void QSGVisualDataModelPrivate::emitChanges()
+void QQuickVisualDataModelPrivate::emitChanges()
 {
     if (m_transaction || !m_complete)
         return;
@@ -1425,23 +1425,23 @@ void QSGVisualDataModelPrivate::emitChanges()
     m_transaction = true;
     QV8Engine *engine = QDeclarativeEnginePrivate::getV8Engine(m_context->engine());
     for (int i = 1; i < m_groupCount; ++i)
-        QSGVisualDataGroupPrivate::get(m_groups[i])->emitChanges(engine);
+        QQuickVisualDataGroupPrivate::get(m_groups[i])->emitChanges(engine);
     m_transaction = false;
 
     const bool reset = m_reset;
     m_reset = false;
     for (int i = 1; i < m_groupCount; ++i)
-        QSGVisualDataGroupPrivate::get(m_groups[i])->emitModelUpdated(reset);
+        QQuickVisualDataGroupPrivate::get(m_groups[i])->emitModelUpdated(reset);
 
-    foreach (QSGVisualDataModelCacheItem *cacheItem, m_cache) {
+    foreach (QQuickVisualDataModelCacheItem *cacheItem, m_cache) {
         if (cacheItem->object)
             cacheItem->attached->emitChanges();
     }
 }
 
-void QSGVisualDataModel::_q_modelReset(int oldCount, int newCount)
+void QQuickVisualDataModel::_q_modelReset(int oldCount, int newCount)
 {
-    Q_D(QSGVisualDataModel);
+    Q_D(QQuickVisualDataModel);
     if (!d->m_delegate)
         return;
 
@@ -1456,27 +1456,27 @@ void QSGVisualDataModel::_q_modelReset(int oldCount, int newCount)
     d->emitChanges();
 }
 
-QSGVisualDataModelAttached *QSGVisualDataModel::qmlAttachedProperties(QObject *obj)
+QQuickVisualDataModelAttached *QQuickVisualDataModel::qmlAttachedProperties(QObject *obj)
 {
-    return QSGVisualDataModelAttached::properties(obj);
+    return QQuickVisualDataModelAttached::properties(obj);
 }
 
 //============================================================================
 
-QSGVisualDataModelCacheMetaType::QSGVisualDataModelCacheMetaType(
-        QV8Engine *engine, QSGVisualDataModel *model, const QStringList &groupNames)
+QQuickVisualDataModelCacheMetaType::QQuickVisualDataModelCacheMetaType(
+        QV8Engine *engine, QQuickVisualDataModel *model, const QStringList &groupNames)
     : model(model)
     , groupCount(groupNames.count() + 1)
-    , memberPropertyOffset(QSGVisualDataModelAttached::staticMetaObject.propertyCount())
-    , indexPropertyOffset(QSGVisualDataModelAttached::staticMetaObject.propertyCount() + groupNames.count())
+    , memberPropertyOffset(QQuickVisualDataModelAttached::staticMetaObject.propertyCount())
+    , indexPropertyOffset(QQuickVisualDataModelAttached::staticMetaObject.propertyCount() + groupNames.count())
     , v8Engine(engine)
     , metaObject(0)
     , groupNames(groupNames)
 {
     QMetaObjectBuilder builder;
     builder.setFlags(QMetaObjectBuilder::DynamicMetaObject);
-    builder.setClassName(QSGVisualDataModelAttached::staticMetaObject.className());
-    builder.setSuperClass(&QSGVisualDataModelAttached::staticMetaObject);
+    builder.setClassName(QQuickVisualDataModelAttached::staticMetaObject.className());
+    builder.setSuperClass(&QQuickVisualDataModelAttached::staticMetaObject);
 
     v8::HandleScope handleScope;
     v8::Context::Scope contextScope(engine->context());
@@ -1513,13 +1513,13 @@ QSGVisualDataModelCacheMetaType::QSGVisualDataModelCacheMetaType(
     constructor = qPersistentNew<v8::Function>(ft->GetFunction());
 }
 
-QSGVisualDataModelCacheMetaType::~QSGVisualDataModelCacheMetaType()
+QQuickVisualDataModelCacheMetaType::~QQuickVisualDataModelCacheMetaType()
 {
     qFree(metaObject);
     qPersistentDispose(constructor);
 }
 
-int QSGVisualDataModelCacheMetaType::parseGroups(const QStringList &groups) const
+int QQuickVisualDataModelCacheMetaType::parseGroups(const QStringList &groups) const
 {
     int groupFlags = 0;
     foreach (const QString &groupName, groups) {
@@ -1530,7 +1530,7 @@ int QSGVisualDataModelCacheMetaType::parseGroups(const QStringList &groups) cons
     return groupFlags;
 }
 
-int QSGVisualDataModelCacheMetaType::parseGroups(QV8Engine *engine, const v8::Local<v8::Value> &groups) const
+int QQuickVisualDataModelCacheMetaType::parseGroups(QV8Engine *engine, const v8::Local<v8::Value> &groups) const
 {
     int groupFlags = 0;
     if (groups->IsString()) {
@@ -1550,22 +1550,22 @@ int QSGVisualDataModelCacheMetaType::parseGroups(QV8Engine *engine, const v8::Lo
     return groupFlags;
 }
 
-v8::Handle<v8::Value> QSGVisualDataModelCacheMetaType::get_model(
+v8::Handle<v8::Value> QQuickVisualDataModelCacheMetaType::get_model(
         v8::Local<v8::String>, const v8::AccessorInfo &info)
 {
-    QSGVisualDataModelCacheItem *cacheItem = v8_resource_cast<QSGVisualDataModelCacheItem>(info.This());
+    QQuickVisualDataModelCacheItem *cacheItem = v8_resource_cast<QQuickVisualDataModelCacheItem>(info.This());
     if (!cacheItem)
         V8THROW_ERROR("Not a valid VisualData object");
     if (!cacheItem->metaType->model)
         return v8::Undefined();
     QObject *data = 0;
 
-    QSGVisualDataModelPrivate *model = QSGVisualDataModelPrivate::get(cacheItem->metaType->model);
+    QQuickVisualDataModelPrivate *model = QQuickVisualDataModelPrivate::get(cacheItem->metaType->model);
     for (int i = 1; i < cacheItem->metaType->groupCount; ++i) {
         if (cacheItem->groups & (1 << i)) {
             Compositor::iterator it = model->m_compositor.find(
                     Compositor::Group(i), cacheItem->index[i]);
-            if (QSGVisualAdaptorModel *list = it.list<QSGVisualAdaptorModel>())
+            if (QQuickVisualAdaptorModel *list = it.list<QQuickVisualAdaptorModel>())
                 data = list->data(it.modelIndex());
             break;
         }
@@ -1575,10 +1575,10 @@ v8::Handle<v8::Value> QSGVisualDataModelCacheMetaType::get_model(
     return cacheItem->engine->newQObject(data);
 }
 
-v8::Handle<v8::Value> QSGVisualDataModelCacheMetaType::get_groups(
+v8::Handle<v8::Value> QQuickVisualDataModelCacheMetaType::get_groups(
         v8::Local<v8::String>, const v8::AccessorInfo &info)
 {
-    QSGVisualDataModelCacheItem *cacheItem = v8_resource_cast<QSGVisualDataModelCacheItem>(info.This());
+    QQuickVisualDataModelCacheItem *cacheItem = v8_resource_cast<QQuickVisualDataModelCacheItem>(info.This());
     if (!cacheItem)
         V8THROW_ERROR("Not a valid VisualData object");
 
@@ -1591,16 +1591,16 @@ v8::Handle<v8::Value> QSGVisualDataModelCacheMetaType::get_groups(
     return cacheItem->engine->fromVariant(groups);
 }
 
-void QSGVisualDataModelCacheMetaType::set_groups(
+void QQuickVisualDataModelCacheMetaType::set_groups(
         v8::Local<v8::String>, v8::Local<v8::Value> value, const v8::AccessorInfo &info)
 {
-    QSGVisualDataModelCacheItem *cacheItem = v8_resource_cast<QSGVisualDataModelCacheItem>(info.This());
+    QQuickVisualDataModelCacheItem *cacheItem = v8_resource_cast<QQuickVisualDataModelCacheItem>(info.This());
     if (!cacheItem)
         V8THROW_ERROR_SETTER("Not a valid VisualData object");
 
     if (!cacheItem->metaType->model)
         return;
-    QSGVisualDataModelPrivate *model = QSGVisualDataModelPrivate::get(cacheItem->metaType->model);
+    QQuickVisualDataModelPrivate *model = QQuickVisualDataModelPrivate::get(cacheItem->metaType->model);
 
     const int groupFlags = model->m_cacheMetaType->parseGroups(cacheItem->engine, value);
     for (int i = 1; i < cacheItem->metaType->groupCount; ++i) {
@@ -1611,26 +1611,26 @@ void QSGVisualDataModelCacheMetaType::set_groups(
     }
 }
 
-v8::Handle<v8::Value> QSGVisualDataModelCacheMetaType::get_member(
+v8::Handle<v8::Value> QQuickVisualDataModelCacheMetaType::get_member(
         v8::Local<v8::String>, const v8::AccessorInfo &info)
 {
-    QSGVisualDataModelCacheItem *cacheItem = v8_resource_cast<QSGVisualDataModelCacheItem>(info.This());
+    QQuickVisualDataModelCacheItem *cacheItem = v8_resource_cast<QQuickVisualDataModelCacheItem>(info.This());
     if (!cacheItem)
         V8THROW_ERROR("Not a valid VisualData object");
 
     return v8::Boolean::New(cacheItem->groups & (1 << info.Data()->Int32Value()));
 }
 
-void QSGVisualDataModelCacheMetaType::set_member(
+void QQuickVisualDataModelCacheMetaType::set_member(
         v8::Local<v8::String>, v8::Local<v8::Value> value, const v8::AccessorInfo &info)
 {
-    QSGVisualDataModelCacheItem *cacheItem = v8_resource_cast<QSGVisualDataModelCacheItem>(info.This());
+    QQuickVisualDataModelCacheItem *cacheItem = v8_resource_cast<QQuickVisualDataModelCacheItem>(info.This());
     if (!cacheItem)
         V8THROW_ERROR_SETTER("Not a valid VisualData object");
 
     if (!cacheItem->metaType->model)
         return;
-    QSGVisualDataModelPrivate *model = QSGVisualDataModelPrivate::get(cacheItem->metaType->model);
+    QQuickVisualDataModelPrivate *model = QQuickVisualDataModelPrivate::get(cacheItem->metaType->model);
 
     Compositor::Group group = Compositor::Group(info.Data()->Int32Value());
     const bool member = value->BooleanValue();
@@ -1649,10 +1649,10 @@ void QSGVisualDataModelCacheMetaType::set_member(
     }
 }
 
-v8::Handle<v8::Value> QSGVisualDataModelCacheMetaType::get_index(
+v8::Handle<v8::Value> QQuickVisualDataModelCacheMetaType::get_index(
         v8::Local<v8::String>, const v8::AccessorInfo &info)
 {
-    QSGVisualDataModelCacheItem *cacheItem = v8_resource_cast<QSGVisualDataModelCacheItem>(info.This());
+    QQuickVisualDataModelCacheItem *cacheItem = v8_resource_cast<QQuickVisualDataModelCacheItem>(info.This());
     if (!cacheItem)
         V8THROW_ERROR("Not a valid VisualData object");
 
@@ -1662,14 +1662,14 @@ v8::Handle<v8::Value> QSGVisualDataModelCacheMetaType::get_index(
 
 //---------------------------------------------------------------------------
 
-void QSGVisualDataModelCacheItem::Dispose()
+void QQuickVisualDataModelCacheItem::Dispose()
 {
     --scriptRef;
     if (isReferenced())
         return;
 
     if (metaType->model) {
-        QSGVisualDataModelPrivate *model = QSGVisualDataModelPrivate::get(metaType->model);
+        QQuickVisualDataModelPrivate *model = QQuickVisualDataModelPrivate::get(metaType->model);
         const int cacheIndex = model->m_cache.indexOf(this);
         if (cacheIndex != -1) {
             model->m_compositor.clearFlags(Compositor::Cache, cacheIndex, 1, Compositor::CacheFlag);
@@ -1681,8 +1681,8 @@ void QSGVisualDataModelCacheItem::Dispose()
 
 //---------------------------------------------------------------------------
 
-QSGVisualDataModelAttachedMetaObject::QSGVisualDataModelAttachedMetaObject(
-        QSGVisualDataModelAttached *attached, QSGVisualDataModelCacheMetaType *metaType)
+QQuickVisualDataModelAttachedMetaObject::QQuickVisualDataModelAttachedMetaObject(
+        QQuickVisualDataModelAttached *attached, QQuickVisualDataModelCacheMetaType *metaType)
     : attached(attached)
     , metaType(metaType)
 {
@@ -1691,12 +1691,12 @@ QSGVisualDataModelAttachedMetaObject::QSGVisualDataModelAttachedMetaObject(
     QObjectPrivate::get(attached)->metaObject = this;
 }
 
-QSGVisualDataModelAttachedMetaObject::~QSGVisualDataModelAttachedMetaObject()
+QQuickVisualDataModelAttachedMetaObject::~QQuickVisualDataModelAttachedMetaObject()
 {
     metaType->release();
 }
 
-int QSGVisualDataModelAttachedMetaObject::metaCall(QMetaObject::Call call, int _id, void **arguments)
+int QQuickVisualDataModelAttachedMetaObject::metaCall(QMetaObject::Call call, int _id, void **arguments)
 {
     if (call == QMetaObject::ReadProperty) {
         if (_id >= metaType->indexPropertyOffset) {
@@ -1715,7 +1715,7 @@ int QSGVisualDataModelAttachedMetaObject::metaCall(QMetaObject::Call call, int _
             Compositor::Group group = Compositor::Group(_id - metaType->memberPropertyOffset + 1);
             const bool member = attached->m_cacheItem->groups & (1 << group);
             if (member != *static_cast<bool *>(arguments[0])) {
-                QSGVisualDataModelPrivate *model = QSGVisualDataModelPrivate::get(metaType->model);
+                QQuickVisualDataModelPrivate *model = QQuickVisualDataModelPrivate::get(metaType->model);
                 const int cacheIndex = model->m_cache.indexOf(attached->m_cacheItem);
                 if (member)
                     model->removeGroups(Compositor::Cache, cacheIndex, 1, (1 << group));
@@ -1736,7 +1736,7 @@ int QSGVisualDataModelAttachedMetaObject::metaCall(QMetaObject::Call call, int _
     It is attached to each instance of the delegate.
 */
 
-QSGVisualDataModel *QSGVisualDataModelAttached::model() const
+QQuickVisualDataModel *QQuickVisualDataModelAttached::model() const
 {
     return m_cacheItem ? m_cacheItem->metaType->model : 0;
 }
@@ -1749,7 +1749,7 @@ QSGVisualDataModel *QSGVisualDataModelAttached::model() const
     It is attached to each instance of the delegate.
 */
 
-QStringList QSGVisualDataModelAttached::groups() const
+QStringList QQuickVisualDataModelAttached::groups() const
 {
     QStringList groups;
 
@@ -1762,12 +1762,12 @@ QStringList QSGVisualDataModelAttached::groups() const
     return groups;
 }
 
-void QSGVisualDataModelAttached::setGroups(const QStringList &groups)
+void QQuickVisualDataModelAttached::setGroups(const QStringList &groups)
 {
     if (!m_cacheItem)
         return;
 
-    QSGVisualDataModelPrivate *model = QSGVisualDataModelPrivate::get(m_cacheItem->metaType->model);
+    QQuickVisualDataModelPrivate *model = QQuickVisualDataModelPrivate::get(m_cacheItem->metaType->model);
 
     const int cacheIndex = model->m_cache.indexOf(m_cacheItem);
     const int groupFlags = model->m_cacheMetaType->parseGroups(groups);
@@ -1812,7 +1812,7 @@ void QSGVisualDataModelAttached::setGroups(const QStringList &groups)
     It is attached to each instance of the delegate.
 */
 
-void QSGVisualDataModelAttached::emitChanges()
+void QQuickVisualDataModelAttached::emitChanges()
 {
     if (m_modelChanged) {
         m_modelChanged = false;
@@ -1847,22 +1847,22 @@ void QSGVisualDataModelAttached::emitChanges()
 
 //============================================================================
 
-void QSGVisualDataGroupPrivate::setModel(QSGVisualDataModel *m, Compositor::Group g)
+void QQuickVisualDataGroupPrivate::setModel(QQuickVisualDataModel *m, Compositor::Group g)
 {
     Q_ASSERT(!model);
     model = m;
     group = g;
 }
 
-void QSGVisualDataGroupPrivate::emitChanges(QV8Engine *engine)
+void QQuickVisualDataGroupPrivate::emitChanges(QV8Engine *engine)
 {
-    Q_Q(QSGVisualDataGroup);
+    Q_Q(QQuickVisualDataGroup);
     static int idx = signalIndex("changed(QDeclarativeV8Handle,QDeclarativeV8Handle)");
     if (isSignalConnected(idx)) {
         v8::HandleScope handleScope;
         v8::Context::Scope contextScope(engine->context());
-        v8::Local<v8::Array> removed  = QSGVisualDataModelPrivate::buildChangeList(changeSet.removes());
-        v8::Local<v8::Array> inserted = QSGVisualDataModelPrivate::buildChangeList(changeSet.inserts());
+        v8::Local<v8::Array> removed  = QQuickVisualDataModelPrivate::buildChangeList(changeSet.removes());
+        v8::Local<v8::Array> inserted = QQuickVisualDataModelPrivate::buildChangeList(changeSet.inserts());
         emit q->changed(
                 QDeclarativeV8Handle::fromHandle(removed), QDeclarativeV8Handle::fromHandle(inserted));
     }
@@ -1870,48 +1870,48 @@ void QSGVisualDataGroupPrivate::emitChanges(QV8Engine *engine)
         emit q->countChanged();
 }
 
-void QSGVisualDataGroupPrivate::emitModelUpdated(bool reset)
+void QQuickVisualDataGroupPrivate::emitModelUpdated(bool reset)
 {
-    for (QSGVisualDataGroupEmitterList::iterator it = emitters.begin(); it != emitters.end(); ++it)
+    for (QQuickVisualDataGroupEmitterList::iterator it = emitters.begin(); it != emitters.end(); ++it)
         it->emitModelUpdated(changeSet, reset);
     changeSet.clear();
 }
 
-void QSGVisualDataGroupPrivate::createdPackage(int index, QDeclarativePackage *package)
+void QQuickVisualDataGroupPrivate::createdPackage(int index, QDeclarativePackage *package)
 {
-    for (QSGVisualDataGroupEmitterList::iterator it = emitters.begin(); it != emitters.end(); ++it)
+    for (QQuickVisualDataGroupEmitterList::iterator it = emitters.begin(); it != emitters.end(); ++it)
         it->createdPackage(index, package);
 }
 
-void QSGVisualDataGroupPrivate::destroyingPackage(QDeclarativePackage *package)
+void QQuickVisualDataGroupPrivate::destroyingPackage(QDeclarativePackage *package)
 {
-    for (QSGVisualDataGroupEmitterList::iterator it = emitters.begin(); it != emitters.end(); ++it)
+    for (QQuickVisualDataGroupEmitterList::iterator it = emitters.begin(); it != emitters.end(); ++it)
         it->destroyingPackage(package);
 }
 
 /*!
-    \qmlclass VisualDataGroup QSGVisualDataGroup
+    \qmlclass VisualDataGroup QQuickVisualDataGroup
     \inqmlmodule QtQuick 2
     \ingroup qml-working-with-data
     \brief The VisualDataGroup encapsulates a filtered set of visual data items.
 
 */
 
-QSGVisualDataGroup::QSGVisualDataGroup(QObject *parent)
-    : QObject(*new QSGVisualDataGroupPrivate, parent)
+QQuickVisualDataGroup::QQuickVisualDataGroup(QObject *parent)
+    : QObject(*new QQuickVisualDataGroupPrivate, parent)
 {
 }
 
-QSGVisualDataGroup::QSGVisualDataGroup(
-        const QString &name, QSGVisualDataModel *model, int index, QObject *parent)
-    : QObject(*new QSGVisualDataGroupPrivate, parent)
+QQuickVisualDataGroup::QQuickVisualDataGroup(
+        const QString &name, QQuickVisualDataModel *model, int index, QObject *parent)
+    : QObject(*new QQuickVisualDataGroupPrivate, parent)
 {
-    Q_D(QSGVisualDataGroup);
+    Q_D(QQuickVisualDataGroup);
     d->name = name;
     d->setModel(model, Compositor::Group(index));
 }
 
-QSGVisualDataGroup::~QSGVisualDataGroup()
+QQuickVisualDataGroup::~QQuickVisualDataGroup()
 {
 }
 
@@ -1923,15 +1923,15 @@ QSGVisualDataGroup::~QSGVisualDataGroup()
     Each group in a model must have a unique name starting with a lower case letter.
 */
 
-QString QSGVisualDataGroup::name() const
+QString QQuickVisualDataGroup::name() const
 {
-    Q_D(const QSGVisualDataGroup);
+    Q_D(const QQuickVisualDataGroup);
     return d->name;
 }
 
-void QSGVisualDataGroup::setName(const QString &name)
+void QQuickVisualDataGroup::setName(const QString &name)
 {
-    Q_D(QSGVisualDataGroup);
+    Q_D(QQuickVisualDataGroup);
     if (d->model)
         return;
     if (d->name != name) {
@@ -1946,12 +1946,12 @@ void QSGVisualDataGroup::setName(const QString &name)
     This property holds the number of items in the group.
 */
 
-int QSGVisualDataGroup::count() const
+int QQuickVisualDataGroup::count() const
 {
-    Q_D(const QSGVisualDataGroup);
+    Q_D(const QQuickVisualDataGroup);
     if (!d->model)
         return 0;
-    return QSGVisualDataModelPrivate::get(d->model)->m_compositor.count(d->group);
+    return QQuickVisualDataModelPrivate::get(d->model)->m_compositor.count(d->group);
 }
 
 /*!
@@ -1960,23 +1960,23 @@ int QSGVisualDataGroup::count() const
     This property holds whether new items are assigned to this group by default.
 */
 
-bool QSGVisualDataGroup::defaultInclude() const
+bool QQuickVisualDataGroup::defaultInclude() const
 {
-    Q_D(const QSGVisualDataGroup);
+    Q_D(const QQuickVisualDataGroup);
     return d->defaultInclude;
 }
 
-void QSGVisualDataGroup::setDefaultInclude(bool include)
+void QQuickVisualDataGroup::setDefaultInclude(bool include)
 {
-    Q_D(QSGVisualDataGroup);
+    Q_D(QQuickVisualDataGroup);
     if (d->defaultInclude != include) {
         d->defaultInclude = include;
 
         if (d->model) {
             if (include)
-                QSGVisualDataModelPrivate::get(d->model)->m_compositor.setDefaultGroup(d->group);
+                QQuickVisualDataModelPrivate::get(d->model)->m_compositor.setDefaultGroup(d->group);
             else
-                QSGVisualDataModelPrivate::get(d->model)->m_compositor.clearDefaultGroup(d->group);
+                QQuickVisualDataModelPrivate::get(d->model)->m_compositor.clearDefaultGroup(d->group);
         }
         emit defaultIncludeChanged();
     }
@@ -2004,25 +2004,25 @@ void QSGVisualDataGroup::setDefaultInclude(bool include)
     \endlist
 */
 
-QDeclarativeV8Handle QSGVisualDataGroup::get(int index)
+QDeclarativeV8Handle QQuickVisualDataGroup::get(int index)
 {
-    Q_D(QSGVisualDataGroup);
+    Q_D(QQuickVisualDataGroup);
     if (!d->model)
         return QDeclarativeV8Handle::fromHandle(v8::Undefined());;
 
-    QSGVisualDataModelPrivate *model = QSGVisualDataModelPrivate::get(d->model);
+    QQuickVisualDataModelPrivate *model = QQuickVisualDataModelPrivate::get(d->model);
     if (index < 0 || index >= model->m_compositor.count(d->group)) {
         qmlInfo(this) << tr("get: index out of range");
         return QDeclarativeV8Handle::fromHandle(v8::Undefined());
     }
 
     Compositor::iterator it = model->m_compositor.find(d->group, index);
-    QSGVisualDataModelCacheItem *cacheItem = it->inCache()
+    QQuickVisualDataModelCacheItem *cacheItem = it->inCache()
             ? model->m_cache.at(it.cacheIndex)
             : 0;
 
     if (!cacheItem) {
-        cacheItem = new QSGVisualDataModelCacheItem(model->m_cacheMetaType);
+        cacheItem = new QQuickVisualDataModelCacheItem(model->m_cacheMetaType);
         for (int i = 0; i < model->m_groupCount; ++i)
             cacheItem->index[i] = it.index[i];
         cacheItem->groups = it->flags & Compositor::GroupMask;
@@ -2047,13 +2047,13 @@ QDeclarativeV8Handle QSGVisualDataGroup::get(int index)
     group remain instantiated when not referenced by any view.
 */
 
-QObject *QSGVisualDataGroup::create(int index)
+QObject *QQuickVisualDataGroup::create(int index)
 {
-    Q_D(QSGVisualDataGroup);
+    Q_D(QQuickVisualDataGroup);
     if (!d->model)
         return 0;
 
-    QSGVisualDataModelPrivate *model = QSGVisualDataModelPrivate::get(d->model);
+    QQuickVisualDataModelPrivate *model = QQuickVisualDataModelPrivate::get(d->model);
     if (index < 0 || index >= model->m_compositor.count(d->group)) {
         qmlInfo(this) << tr("create: index out of range");
         return 0;
@@ -2071,9 +2071,9 @@ QObject *QSGVisualDataGroup::create(int index)
     Removes \a count items starting at \a index from the group.
 */
 
-void QSGVisualDataGroup::remove(QDeclarativeV8Function *args)
+void QQuickVisualDataGroup::remove(QDeclarativeV8Function *args)
 {
-    Q_D(QSGVisualDataGroup);
+    Q_D(QQuickVisualDataGroup);
     if (!d->model)
         return;
     int index = -1;
@@ -2094,7 +2094,7 @@ void QSGVisualDataGroup::remove(QDeclarativeV8Function *args)
             count = v->Int32Value();
     }
 
-    QSGVisualDataModelPrivate *model = QSGVisualDataModelPrivate::get(d->model);
+    QQuickVisualDataModelPrivate *model = QQuickVisualDataModelPrivate::get(d->model);
     if (count < 0) {
         qmlInfo(this) << tr("remove: invalid count");
     } else if (index < 0 || index + count > model->m_compositor.count(d->group)) {
@@ -2104,7 +2104,7 @@ void QSGVisualDataGroup::remove(QDeclarativeV8Function *args)
     }
 }
 
-bool QSGVisualDataGroupPrivate::parseGroupArgs(
+bool QQuickVisualDataGroupPrivate::parseGroupArgs(
         QDeclarativeV8Function *args, int *index, int *count, int *groups) const
 {
     if (!model)
@@ -2128,7 +2128,7 @@ bool QSGVisualDataGroupPrivate::parseGroupArgs(
         v = (*args)[i];
     }
 
-    *groups = QSGVisualDataModelPrivate::get(model)->m_cacheMetaType->parseGroups(args->engine(), v);
+    *groups = QQuickVisualDataModelPrivate::get(model)->m_cacheMetaType->parseGroups(args->engine(), v);
 
     return true;
 }
@@ -2139,9 +2139,9 @@ bool QSGVisualDataGroupPrivate::parseGroupArgs(
     Adds \a count items starting at \a index to \a groups.
 */
 
-void QSGVisualDataGroup::addGroups(QDeclarativeV8Function *args)
+void QQuickVisualDataGroup::addGroups(QDeclarativeV8Function *args)
 {
-    Q_D(QSGVisualDataGroup);
+    Q_D(QQuickVisualDataGroup);
     int index = -1;
     int count = 1;
     int groups = 0;
@@ -2149,7 +2149,7 @@ void QSGVisualDataGroup::addGroups(QDeclarativeV8Function *args)
     if (!d->parseGroupArgs(args, &index, &count, &groups))
         return;
 
-    QSGVisualDataModelPrivate *model = QSGVisualDataModelPrivate::get(d->model);
+    QQuickVisualDataModelPrivate *model = QQuickVisualDataModelPrivate::get(d->model);
     if (count < 0) {
         qmlInfo(this) << tr("addGroups: invalid count");
     } else if (index < 0 || index + count > model->m_compositor.count(d->group)) {
@@ -2165,9 +2165,9 @@ void QSGVisualDataGroup::addGroups(QDeclarativeV8Function *args)
     Removes \a count items starting at \a index from \a groups.
 */
 
-void QSGVisualDataGroup::removeGroups(QDeclarativeV8Function *args)
+void QQuickVisualDataGroup::removeGroups(QDeclarativeV8Function *args)
 {
-    Q_D(QSGVisualDataGroup);
+    Q_D(QQuickVisualDataGroup);
     int index = -1;
     int count = 1;
     int groups = 0;
@@ -2175,7 +2175,7 @@ void QSGVisualDataGroup::removeGroups(QDeclarativeV8Function *args)
     if (!d->parseGroupArgs(args, &index, &count, &groups))
         return;
 
-    QSGVisualDataModelPrivate *model = QSGVisualDataModelPrivate::get(d->model);
+    QQuickVisualDataModelPrivate *model = QQuickVisualDataModelPrivate::get(d->model);
     if (count < 0) {
         qmlInfo(this) << tr("removeGroups: invalid count");
     } else if (index < 0 || index + count > model->m_compositor.count(d->group)) {
@@ -2191,9 +2191,9 @@ void QSGVisualDataGroup::removeGroups(QDeclarativeV8Function *args)
     Sets the \a groups \a count items starting at \a index belong to.
 */
 
-void QSGVisualDataGroup::setGroups(QDeclarativeV8Function *args)
+void QQuickVisualDataGroup::setGroups(QDeclarativeV8Function *args)
 {
-    Q_D(QSGVisualDataGroup);
+    Q_D(QQuickVisualDataGroup);
     int index = -1;
     int count = 1;
     int groups = 0;
@@ -2201,7 +2201,7 @@ void QSGVisualDataGroup::setGroups(QDeclarativeV8Function *args)
     if (!d->parseGroupArgs(args, &index, &count, &groups))
         return;
 
-    QSGVisualDataModelPrivate *model = QSGVisualDataModelPrivate::get(d->model);
+    QQuickVisualDataModelPrivate *model = QQuickVisualDataModelPrivate::get(d->model);
     if (count < 0) {
         qmlInfo(this) << tr("setGroups: invalid count");
     } else if (index < 0 || index + count > model->m_compositor.count(d->group)) {
@@ -2223,9 +2223,9 @@ void QSGVisualDataGroup::setGroups(QDeclarativeV8Function *args)
     Moves \a count at \a from in a group \a to a new position.
 */
 
-void QSGVisualDataGroup::move(QDeclarativeV8Function *args)
+void QQuickVisualDataGroup::move(QDeclarativeV8Function *args)
 {
-    Q_D(QSGVisualDataGroup);
+    Q_D(QQuickVisualDataGroup);
 
     if (args->Length() < 2)
         return;
@@ -2238,8 +2238,8 @@ void QSGVisualDataGroup::move(QDeclarativeV8Function *args)
 
     int i = 0;
     v8::Local<v8::Value> v = (*args)[i];
-    if (QSGVisualDataGroup *group = qobject_cast<QSGVisualDataGroup *>(args->engine()->toQObject(v))) {
-        QSGVisualDataGroupPrivate *g_d = QSGVisualDataGroupPrivate::get(group);
+    if (QQuickVisualDataGroup *group = qobject_cast<QQuickVisualDataGroup *>(args->engine()->toQObject(v))) {
+        QQuickVisualDataGroupPrivate *g_d = QQuickVisualDataGroupPrivate::get(group);
         if (g_d->model != d->model)
             return;
         fromGroup = g_d->group;
@@ -2254,8 +2254,8 @@ void QSGVisualDataGroup::move(QDeclarativeV8Function *args)
         return;
     v = (*args)[i];
 
-    if (QSGVisualDataGroup *group = qobject_cast<QSGVisualDataGroup *>(args->engine()->toQObject(v))) {
-        QSGVisualDataGroupPrivate *g_d = QSGVisualDataGroupPrivate::get(group);
+    if (QQuickVisualDataGroup *group = qobject_cast<QQuickVisualDataGroup *>(args->engine()->toQObject(v))) {
+        QQuickVisualDataGroupPrivate *g_d = QQuickVisualDataGroupPrivate::get(group);
         if (g_d->model != d->model)
             return;
         toGroup = g_d->group;
@@ -2275,7 +2275,7 @@ void QSGVisualDataGroup::move(QDeclarativeV8Function *args)
             count = v->Int32Value();
     }
 
-    QSGVisualDataModelPrivate *model = QSGVisualDataModelPrivate::get(d->model);
+    QQuickVisualDataModelPrivate *model = QQuickVisualDataModelPrivate::get(d->model);
 
     if (count < 0) {
         qmlInfo(this) << tr("move: invalid count");
@@ -2307,36 +2307,36 @@ void QSGVisualDataGroup::move(QDeclarativeV8Function *args)
 
 //============================================================================
 
-QSGVisualPartsModel::QSGVisualPartsModel(QSGVisualDataModel *model, const QString &part, QObject *parent)
-    : QSGVisualModel(*new QObjectPrivate, parent)
+QQuickVisualPartsModel::QQuickVisualPartsModel(QQuickVisualDataModel *model, const QString &part, QObject *parent)
+    : QQuickVisualModel(*new QObjectPrivate, parent)
     , m_model(model)
     , m_part(part)
     , m_compositorGroup(Compositor::Cache)
     , m_inheritGroup(true)
 {
-    QSGVisualDataModelPrivate *d = QSGVisualDataModelPrivate::get(m_model);
+    QQuickVisualDataModelPrivate *d = QQuickVisualDataModelPrivate::get(m_model);
     if (d->m_cacheMetaType) {
-        QSGVisualDataGroupPrivate::get(d->m_groups[1])->emitters.insert(this);
+        QQuickVisualDataGroupPrivate::get(d->m_groups[1])->emitters.insert(this);
         m_compositorGroup = Compositor::Default;
     } else {
         d->m_pendingParts.insert(this);
     }
 }
 
-QSGVisualPartsModel::~QSGVisualPartsModel()
+QQuickVisualPartsModel::~QQuickVisualPartsModel()
 {
 }
 
-QString QSGVisualPartsModel::filterGroup() const
+QString QQuickVisualPartsModel::filterGroup() const
 {
     if (m_inheritGroup)
         return m_model->filterGroup();
     return m_filterGroup;
 }
 
-void QSGVisualPartsModel::setFilterGroup(const QString &group)
+void QQuickVisualPartsModel::setFilterGroup(const QString &group)
 {
-    if (QSGVisualDataModelPrivate::get(m_model)->m_transaction) {
+    if (QQuickVisualDataModelPrivate::get(m_model)->m_transaction) {
         qmlInfo(this) << tr("The group of a VisualDataModel cannot be changed within onChanged");
         return;
     }
@@ -2350,7 +2350,7 @@ void QSGVisualPartsModel::setFilterGroup(const QString &group)
     }
 }
 
-void QSGVisualPartsModel::resetFilterGroup()
+void QQuickVisualPartsModel::resetFilterGroup()
 {
     if (!m_inheritGroup) {
         m_inheritGroup = true;
@@ -2359,9 +2359,9 @@ void QSGVisualPartsModel::resetFilterGroup()
     }
 }
 
-void QSGVisualPartsModel::updateFilterGroup()
+void QQuickVisualPartsModel::updateFilterGroup()
 {
-    QSGVisualDataModelPrivate *model = QSGVisualDataModelPrivate::get(m_model);
+    QQuickVisualDataModelPrivate *model = QQuickVisualDataModelPrivate::get(m_model);
     if (!model->m_cacheMetaType)
         return;
 
@@ -2370,7 +2370,7 @@ void QSGVisualPartsModel::updateFilterGroup()
 
     QDeclarativeListCompositor::Group previousGroup = model->m_compositorGroup;
     m_compositorGroup = Compositor::Default;
-    QSGVisualDataGroupPrivate::get(model->m_groups[Compositor::Default])->emitters.insert(this);
+    QQuickVisualDataGroupPrivate::get(model->m_groups[Compositor::Default])->emitters.insert(this);
     for (int i = 1; i < model->m_groupCount; ++i) {
         if (m_filterGroup == model->m_cacheMetaType->groupNames.at(i - 1)) {
             m_compositorGroup = Compositor::Group(i);
@@ -2378,7 +2378,7 @@ void QSGVisualPartsModel::updateFilterGroup()
         }
     }
 
-    QSGVisualDataGroupPrivate::get(model->m_groups[m_compositorGroup])->emitters.insert(this);
+    QQuickVisualDataGroupPrivate::get(model->m_groups[m_compositorGroup])->emitters.insert(this);
     if (m_compositorGroup != previousGroup) {
         QVector<QDeclarativeChangeSet::Remove> removes;
         QVector<QDeclarativeChangeSet::Insert> inserts;
@@ -2394,14 +2394,14 @@ void QSGVisualPartsModel::updateFilterGroup()
     }
 }
 
-void QSGVisualPartsModel::updateFilterGroup(
+void QQuickVisualPartsModel::updateFilterGroup(
         Compositor::Group group, const QDeclarativeChangeSet &changeSet)
 {
     if (!m_inheritGroup)
         return;
 
     m_compositorGroup = group;
-    QSGVisualDataGroupPrivate::get(QSGVisualDataModelPrivate::get(m_model)->m_groups[m_compositorGroup])->emitters.insert(this);
+    QQuickVisualDataGroupPrivate::get(QQuickVisualDataModelPrivate::get(m_model)->m_groups[m_compositorGroup])->emitters.insert(this);
 
     if (!changeSet.isEmpty())
         emit modelUpdated(changeSet, false);
@@ -2412,22 +2412,22 @@ void QSGVisualPartsModel::updateFilterGroup(
     emit filterGroupChanged();
 }
 
-int QSGVisualPartsModel::count() const
+int QQuickVisualPartsModel::count() const
 {
-    QSGVisualDataModelPrivate *model = QSGVisualDataModelPrivate::get(m_model);
+    QQuickVisualDataModelPrivate *model = QQuickVisualDataModelPrivate::get(m_model);
     return model->m_delegate
             ? model->m_compositor.count(m_compositorGroup)
             : 0;
 }
 
-bool QSGVisualPartsModel::isValid() const
+bool QQuickVisualPartsModel::isValid() const
 {
     return m_model->isValid();
 }
 
-QSGItem *QSGVisualPartsModel::item(int index, bool complete)
+QQuickItem *QQuickVisualPartsModel::item(int index, bool complete)
 {
-    QSGVisualDataModelPrivate *model = QSGVisualDataModelPrivate::get(m_model);
+    QQuickVisualDataModelPrivate *model = QQuickVisualDataModelPrivate::get(m_model);
 
     if (!model->m_delegate || index < 0 || index >= model->m_compositor.count(m_compositorGroup)) {
         qWarning() << "VisualDataModel::item: index out range" << index << model->m_compositor.count(m_compositorGroup);
@@ -2440,7 +2440,7 @@ QSGItem *QSGVisualPartsModel::item(int index, bool complete)
         QObject *part = package->part(m_part);
         if (!part)
             return 0;
-        if (QSGItem *item = qobject_cast<QSGItem *>(part)) {
+        if (QQuickItem *item = qobject_cast<QQuickItem *>(part)) {
             m_packaged.insertMulti(item, package);
             return item;
         }
@@ -2458,51 +2458,51 @@ QSGItem *QSGVisualPartsModel::item(int index, bool complete)
     return 0;
 }
 
-QSGVisualModel::ReleaseFlags QSGVisualPartsModel::release(QSGItem *item)
+QQuickVisualModel::ReleaseFlags QQuickVisualPartsModel::release(QQuickItem *item)
 {
-    QSGVisualModel::ReleaseFlags flags = 0;
+    QQuickVisualModel::ReleaseFlags flags = 0;
 
     QHash<QObject *, QDeclarativePackage *>::iterator it = m_packaged.find(item);
     if (it != m_packaged.end()) {
         QDeclarativePackage *package = *it;
-        QSGVisualDataModelPrivate *model = QSGVisualDataModelPrivate::get(m_model);
+        QQuickVisualDataModelPrivate *model = QQuickVisualDataModelPrivate::get(m_model);
         flags = model->release(package);
         m_packaged.erase(it);
         if (!m_packaged.contains(item))
             flags &= ~Referenced;
         if (flags & Destroyed)
-            QSGVisualDataModelPrivate::get(m_model)->emitDestroyingPackage(package);
+            QQuickVisualDataModelPrivate::get(m_model)->emitDestroyingPackage(package);
     }
     return flags;
 }
 
-bool QSGVisualPartsModel::completePending() const
+bool QQuickVisualPartsModel::completePending() const
 {
     return m_model->completePending();
 }
 
-void QSGVisualPartsModel::completeItem()
+void QQuickVisualPartsModel::completeItem()
 {
     m_model->completeItem();
 }
 
-QString QSGVisualPartsModel::stringValue(int index, const QString &role)
+QString QQuickVisualPartsModel::stringValue(int index, const QString &role)
 {
-    return QSGVisualDataModelPrivate::get(m_model)->stringValue(m_compositorGroup, index, role);
+    return QQuickVisualDataModelPrivate::get(m_model)->stringValue(m_compositorGroup, index, role);
 }
 
-void QSGVisualPartsModel::setWatchedRoles(QList<QByteArray> roles)
+void QQuickVisualPartsModel::setWatchedRoles(QList<QByteArray> roles)
 {
-    QSGVisualDataModelPrivate *model = QSGVisualDataModelPrivate::get(m_model);
+    QQuickVisualDataModelPrivate *model = QQuickVisualDataModelPrivate::get(m_model);
     model->m_adaptorModel->replaceWatchedRoles(m_watchedRoles, roles);
     m_watchedRoles = roles;
 }
 
-int QSGVisualPartsModel::indexOf(QSGItem *item, QObject *) const
+int QQuickVisualPartsModel::indexOf(QQuickItem *item, QObject *) const
 {
     QHash<QObject *, QDeclarativePackage *>::const_iterator it = m_packaged.find(item);
     if (it != m_packaged.end()) {
-        const QSGVisualDataModelPrivate *model = QSGVisualDataModelPrivate::get(m_model);
+        const QQuickVisualDataModelPrivate *model = QQuickVisualDataModelPrivate::get(m_model);
         const int cacheIndex = model->cacheIndexOf(*it);
         return cacheIndex != -1
                 ? model->m_cache.at(cacheIndex)->index[m_compositorGroup]
@@ -2511,21 +2511,21 @@ int QSGVisualPartsModel::indexOf(QSGItem *item, QObject *) const
     return -1;
 }
 
-void QSGVisualPartsModel::createdPackage(int index, QDeclarativePackage *package)
+void QQuickVisualPartsModel::createdPackage(int index, QDeclarativePackage *package)
 {
-    if (QSGItem *item = qobject_cast<QSGItem *>(package->part(m_part)))
+    if (QQuickItem *item = qobject_cast<QQuickItem *>(package->part(m_part)))
         emit createdItem(index, item);
 }
 
-void QSGVisualPartsModel::destroyingPackage(QDeclarativePackage *package)
+void QQuickVisualPartsModel::destroyingPackage(QDeclarativePackage *package)
 {
-    if (QSGItem *item = qobject_cast<QSGItem *>(package->part(m_part))) {
+    if (QQuickItem *item = qobject_cast<QQuickItem *>(package->part(m_part))) {
         Q_ASSERT(!m_packaged.contains(item));
         emit destroyingItem(item);
     }
 }
 
-void QSGVisualPartsModel::emitModelUpdated(const QDeclarativeChangeSet &changeSet, bool reset)
+void QQuickVisualPartsModel::emitModelUpdated(const QDeclarativeChangeSet &changeSet, bool reset)
 {
     emit modelUpdated(changeSet, reset);
     if (changeSet.difference() != 0)
@@ -2535,4 +2535,4 @@ void QSGVisualPartsModel::emitModelUpdated(const QDeclarativeChangeSet &changeSe
 
 QT_END_NAMESPACE
 
-#include <qsgvisualdatamodel.moc>
+#include <qquickvisualdatamodel.moc>
diff --git a/src/declarative/items/qsgvisualdatamodel_p.h b/src/declarative/items/qquickvisualdatamodel_p.h
index 896c51c22a..331255199e 100644
--- a/src/declarative/items/qsgvisualdatamodel_p.h
+++ b/src/declarative/items/qquickvisualdatamodel_p.h
@@ -40,11 +40,11 @@
 **
 ****************************************************************************/
 
-#ifndef QSGVISUALDATAMODEL_P_H
-#define QSGVISUALDATAMODEL_P_H
+#ifndef QQUICKVISUALDATAMODEL_P_H
+#define QQUICKVISUALDATAMODEL_P_H
 
 #include <private/qdeclarativelistcompositor_p.h>
-#include <private/qsgvisualitemmodel_p.h>
+#include <private/qquickvisualitemmodel_p.h>
 
 
 #include <QtCore/qabstractitemmodel.h>
@@ -65,30 +65,30 @@ class QDeclarativeChangeSet;
 class QDeclarativeComponent;
 class QDeclarativePackage;
 class QDeclarativeV8Function;
-class QSGVisualDataGroup;
-class QSGVisualDataModelAttached;
-class QSGVisualDataModelPrivate;
+class QQuickVisualDataGroup;
+class QQuickVisualDataModelAttached;
+class QQuickVisualDataModelPrivate;
 
 
-class Q_DECLARATIVE_EXPORT QSGVisualDataModel : public QSGVisualModel, public QDeclarativeParserStatus
+class Q_DECLARATIVE_EXPORT QQuickVisualDataModel : public QQuickVisualModel, public QDeclarativeParserStatus
 {
     Q_OBJECT
-    Q_DECLARE_PRIVATE(QSGVisualDataModel)
+    Q_DECLARE_PRIVATE(QQuickVisualDataModel)
 
     Q_PROPERTY(QVariant model READ model WRITE setModel)
     Q_PROPERTY(QDeclarativeComponent *delegate READ delegate WRITE setDelegate)
     Q_PROPERTY(QString filterOnGroup READ filterGroup WRITE setFilterGroup NOTIFY filterGroupChanged RESET resetFilterGroup)
-    Q_PROPERTY(QSGVisualDataGroup *items READ items CONSTANT)
-    Q_PROPERTY(QSGVisualDataGroup *persistedItems READ persistedItems CONSTANT)
-    Q_PROPERTY(QDeclarativeListProperty<QSGVisualDataGroup> groups READ groups CONSTANT)
+    Q_PROPERTY(QQuickVisualDataGroup *items READ items CONSTANT)
+    Q_PROPERTY(QQuickVisualDataGroup *persistedItems READ persistedItems CONSTANT)
+    Q_PROPERTY(QDeclarativeListProperty<QQuickVisualDataGroup> groups READ groups CONSTANT)
     Q_PROPERTY(QObject *parts READ parts CONSTANT)
     Q_PROPERTY(QVariant rootIndex READ rootIndex WRITE setRootIndex NOTIFY rootIndexChanged)
     Q_CLASSINFO("DefaultProperty", "delegate")
     Q_INTERFACES(QDeclarativeParserStatus)
 public:
-    QSGVisualDataModel();
-    QSGVisualDataModel(QDeclarativeContext *, QObject *parent=0);
-    virtual ~QSGVisualDataModel();
+    QQuickVisualDataModel();
+    QQuickVisualDataModel(QDeclarativeContext *, QObject *parent=0);
+    virtual ~QQuickVisualDataModel();
 
     void classBegin();
     void componentComplete();
@@ -107,27 +107,27 @@ public:
 
     int count() const;
     bool isValid() const { return delegate() != 0; }
-    QSGItem *item(int index, bool complete=true);
-    ReleaseFlags release(QSGItem *item);
+    QQuickItem *item(int index, bool complete=true);
+    ReleaseFlags release(QQuickItem *item);
     bool completePending() const;
     void completeItem();
     virtual QString stringValue(int index, const QString &role);
     virtual void setWatchedRoles(QList<QByteArray> roles);
 
-    int indexOf(QSGItem *item, QObject *objectContext) const;
+    int indexOf(QQuickItem *item, QObject *objectContext) const;
 
     QString filterGroup() const;
     void setFilterGroup(const QString &group);
     void resetFilterGroup();
 
-    QSGVisualDataGroup *items();
-    QSGVisualDataGroup *persistedItems();
-    QDeclarativeListProperty<QSGVisualDataGroup> groups();
+    QQuickVisualDataGroup *items();
+    QQuickVisualDataGroup *persistedItems();
+    QDeclarativeListProperty<QQuickVisualDataGroup> groups();
     QObject *parts();
 
     bool event(QEvent *);
 
-    static QSGVisualDataModelAttached *qmlAttachedProperties(QObject *obj);
+    static QQuickVisualDataModelAttached *qmlAttachedProperties(QObject *obj);
 
 Q_SIGNALS:
     void filterGroupChanged();
@@ -141,20 +141,20 @@ private Q_SLOTS:
     void _q_itemsMoved(int from, int to, int count);
     void _q_modelReset(int oldCount, int newCount);
 private:
-    Q_DISABLE_COPY(QSGVisualDataModel)
+    Q_DISABLE_COPY(QQuickVisualDataModel)
 };
 
-class QSGVisualDataGroupPrivate;
-class Q_AUTOTEST_EXPORT QSGVisualDataGroup : public QObject
+class QQuickVisualDataGroupPrivate;
+class Q_AUTOTEST_EXPORT QQuickVisualDataGroup : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(int count READ count NOTIFY countChanged)
     Q_PROPERTY(QString name READ name WRITE setName NOTIFY nameChanged)
     Q_PROPERTY(bool includeByDefault READ defaultInclude WRITE setDefaultInclude NOTIFY defaultIncludeChanged)
 public:
-    QSGVisualDataGroup(QObject *parent = 0);
-    QSGVisualDataGroup(const QString &name, QSGVisualDataModel *model, int compositorType, QObject *parent = 0);
-    ~QSGVisualDataGroup();
+    QQuickVisualDataGroup(QObject *parent = 0);
+    QQuickVisualDataGroup(const QString &name, QQuickVisualDataModel *model, int compositorType, QObject *parent = 0);
+    ~QQuickVisualDataGroup();
 
     QString name() const;
     void setName(const QString &name);
@@ -180,37 +180,37 @@ Q_SIGNALS:
     void defaultIncludeChanged();
     void changed(const QDeclarativeV8Handle &removed, const QDeclarativeV8Handle &inserted);
 private:
-    Q_DECLARE_PRIVATE(QSGVisualDataGroup)
+    Q_DECLARE_PRIVATE(QQuickVisualDataGroup)
 };
 
-class QSGVisualDataModelCacheItem;
-class QSGVisualDataModelAttachedMetaObject;
-class QSGVisualDataModelAttached : public QObject
+class QQuickVisualDataModelCacheItem;
+class QQuickVisualDataModelAttachedMetaObject;
+class QQuickVisualDataModelAttached : public QObject
 {
     Q_OBJECT
-    Q_PROPERTY(QSGVisualDataModel *model READ model NOTIFY modelChanged)
+    Q_PROPERTY(QQuickVisualDataModel *model READ model NOTIFY modelChanged)
     Q_PROPERTY(QStringList groups READ groups WRITE setGroups NOTIFY groupsChanged)
 public:
-    QSGVisualDataModelAttached(QObject *parent)
+    QQuickVisualDataModelAttached(QObject *parent)
         : QObject(parent)
         , m_cacheItem(0)
         , m_previousGroups(0)
         , m_modelChanged(false)
     {}
-    ~QSGVisualDataModelAttached() { attachedProperties.remove(parent()); }
+    ~QQuickVisualDataModelAttached() { attachedProperties.remove(parent()); }
 
-    QSGVisualDataModel *model() const;
+    QQuickVisualDataModel *model() const;
 
     QStringList groups() const;
     void setGroups(const QStringList &groups);
 
     void emitChanges();
 
-    static QSGVisualDataModelAttached *properties(QObject *obj)
+    static QQuickVisualDataModelAttached *properties(QObject *obj)
     {
-        QSGVisualDataModelAttached *rv = attachedProperties.value(obj);
+        QQuickVisualDataModelAttached *rv = attachedProperties.value(obj);
         if (!rv) {
-            rv = new QSGVisualDataModelAttached(obj);
+            rv = new QQuickVisualDataModelAttached(obj);
             attachedProperties.insert(obj, rv);
         }
         return rv;
@@ -221,22 +221,22 @@ Q_SIGNALS:
     void groupsChanged();
 
 public:
-    QSGVisualDataModelCacheItem *m_cacheItem;
+    QQuickVisualDataModelCacheItem *m_cacheItem;
     int m_previousGroups;
     int m_previousIndex[QDeclarativeListCompositor::MaximumGroupCount];
     bool m_modelChanged;
 
-    static QHash<QObject*, QSGVisualDataModelAttached*> attachedProperties;
+    static QHash<QObject*, QQuickVisualDataModelAttached*> attachedProperties;
 
-    friend class QSGVisualDataModelAttachedMetaObject;
+    friend class QQuickVisualDataModelAttachedMetaObject;
 };
 
 QT_END_NAMESPACE
 
-QML_DECLARE_TYPE(QSGVisualDataModel)
-QML_DECLARE_TYPEINFO(QSGVisualDataModel, QML_HAS_ATTACHED_PROPERTIES)
-QML_DECLARE_TYPE(QSGVisualDataGroup)
+QML_DECLARE_TYPE(QQuickVisualDataModel)
+QML_DECLARE_TYPEINFO(QQuickVisualDataModel, QML_HAS_ATTACHED_PROPERTIES)
+QML_DECLARE_TYPE(QQuickVisualDataGroup)
 
 QT_END_HEADER
 
-#endif // QSGVISUALDATAMODEL_P_H
+#endif // QQUICKVISUALDATAMODEL_P_H
diff --git a/src/declarative/items/qsgvisualitemmodel.cpp b/src/declarative/items/qquickvisualitemmodel.cpp
index 90d008e618..31d06f68c8 100644
--- a/src/declarative/items/qsgvisualitemmodel.cpp
+++ b/src/declarative/items/qquickvisualitemmodel.cpp
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#include "qsgvisualitemmodel_p.h"
-#include "qsgitem.h"
+#include "qquickvisualitemmodel_p.h"
+#include "qquickitem.h"
 
 #include <QtCore/qcoreapplication.h>
 #include <QtDeclarative/qdeclarativecontext.h>
@@ -55,33 +55,33 @@
 
 QT_BEGIN_NAMESPACE
 
-QHash<QObject*, QSGVisualItemModelAttached*> QSGVisualItemModelAttached::attachedProperties;
+QHash<QObject*, QQuickVisualItemModelAttached*> QQuickVisualItemModelAttached::attachedProperties;
 
 
-class QSGVisualItemModelPrivate : public QObjectPrivate
+class QQuickVisualItemModelPrivate : public QObjectPrivate
 {
-    Q_DECLARE_PUBLIC(QSGVisualItemModel)
+    Q_DECLARE_PUBLIC(QQuickVisualItemModel)
 public:
-    QSGVisualItemModelPrivate() : QObjectPrivate() {}
+    QQuickVisualItemModelPrivate() : QObjectPrivate() {}
 
-    static void children_append(QDeclarativeListProperty<QSGItem> *prop, QSGItem *item) {
+    static void children_append(QDeclarativeListProperty<QQuickItem> *prop, QQuickItem *item) {
         QDeclarative_setParent_noEvent(item, prop->object);
-        static_cast<QSGVisualItemModelPrivate *>(prop->data)->children.append(Item(item));
-        static_cast<QSGVisualItemModelPrivate *>(prop->data)->itemAppended();
-        static_cast<QSGVisualItemModelPrivate *>(prop->data)->emitChildrenChanged();
+        static_cast<QQuickVisualItemModelPrivate *>(prop->data)->children.append(Item(item));
+        static_cast<QQuickVisualItemModelPrivate *>(prop->data)->itemAppended();
+        static_cast<QQuickVisualItemModelPrivate *>(prop->data)->emitChildrenChanged();
     }
 
-    static int children_count(QDeclarativeListProperty<QSGItem> *prop) {
-        return static_cast<QSGVisualItemModelPrivate *>(prop->data)->children.count();
+    static int children_count(QDeclarativeListProperty<QQuickItem> *prop) {
+        return static_cast<QQuickVisualItemModelPrivate *>(prop->data)->children.count();
     }
 
-    static QSGItem *children_at(QDeclarativeListProperty<QSGItem> *prop, int index) {
-        return static_cast<QSGVisualItemModelPrivate *>(prop->data)->children.at(index).item;
+    static QQuickItem *children_at(QDeclarativeListProperty<QQuickItem> *prop, int index) {
+        return static_cast<QQuickVisualItemModelPrivate *>(prop->data)->children.at(index).item;
     }
 
     void itemAppended() {
-        Q_Q(QSGVisualItemModel);
-        QSGVisualItemModelAttached *attached = QSGVisualItemModelAttached::properties(children.last().item);
+        Q_Q(QQuickVisualItemModel);
+        QQuickVisualItemModelAttached *attached = QQuickVisualItemModelAttached::properties(children.last().item);
         attached->setIndex(children.count()-1);
         QDeclarativeChangeSet changeSet;
         changeSet.insert(children.count() - 1, 1);
@@ -90,11 +90,11 @@ public:
     }
 
     void emitChildrenChanged() {
-        Q_Q(QSGVisualItemModel);
+        Q_Q(QQuickVisualItemModel);
         emit q->childrenChanged();
     }
 
-    int indexOf(QSGItem *item) const {
+    int indexOf(QQuickItem *item) const {
         for (int i = 0; i < children.count(); ++i)
             if (children.at(i).item == item)
                 return i;
@@ -103,12 +103,12 @@ public:
 
     class Item {
     public:
-        Item(QSGItem *i) : item(i), ref(0) {}
+        Item(QQuickItem *i) : item(i), ref(0) {}
 
         void addRef() { ++ref; }
         bool deref() { return --ref == 0; }
 
-        QSGItem *item;
+        QQuickItem *item;
         int ref;
     };
 
@@ -117,7 +117,7 @@ public:
 
 
 /*!
-    \qmlclass VisualItemModel QSGVisualItemModel
+    \qmlclass VisualItemModel QQuickVisualItemModel
     \inqmlmodule QtQuick 2
     \ingroup qml-working-with-data
     \brief The VisualItemModel allows items to be provided to a view.
@@ -153,8 +153,8 @@ public:
 
     \sa {declarative/modelviews/visualitemmodel}{VisualItemModel example}
 */
-QSGVisualItemModel::QSGVisualItemModel(QObject *parent)
-    : QSGVisualModel(*(new QSGVisualItemModelPrivate), parent)
+QQuickVisualItemModel::QQuickVisualItemModel(QObject *parent)
+    : QQuickVisualModel(*(new QQuickVisualItemModelPrivate), parent)
 {
 }
 
@@ -165,10 +165,10 @@ QSGVisualItemModel::QSGVisualItemModel(QObject *parent)
     It is attached to each instance of the delegate.
 */
 
-QDeclarativeListProperty<QSGItem> QSGVisualItemModel::children()
+QDeclarativeListProperty<QQuickItem> QQuickVisualItemModel::children()
 {
-    Q_D(QSGVisualItemModel);
-    return QDeclarativeListProperty<QSGItem>(this, d, d->children_append,
+    Q_D(QQuickVisualItemModel);
+    return QDeclarativeListProperty<QQuickItem>(this, d, d->children_append,
                                                       d->children_count, d->children_at);
 }
 
@@ -177,28 +177,28 @@ QDeclarativeListProperty<QSGItem> QSGVisualItemModel::children()
 
     The number of items in the model.  This property is readonly.
 */
-int QSGVisualItemModel::count() const
+int QQuickVisualItemModel::count() const
 {
-    Q_D(const QSGVisualItemModel);
+    Q_D(const QQuickVisualItemModel);
     return d->children.count();
 }
 
-bool QSGVisualItemModel::isValid() const
+bool QQuickVisualItemModel::isValid() const
 {
     return true;
 }
 
-QSGItem *QSGVisualItemModel::item(int index, bool)
+QQuickItem *QQuickVisualItemModel::item(int index, bool)
 {
-    Q_D(QSGVisualItemModel);
-    QSGVisualItemModelPrivate::Item &item = d->children[index];
+    Q_D(QQuickVisualItemModel);
+    QQuickVisualItemModelPrivate::Item &item = d->children[index];
     item.addRef();
     return item.item;
 }
 
-QSGVisualModel::ReleaseFlags QSGVisualItemModel::release(QSGItem *item)
+QQuickVisualModel::ReleaseFlags QQuickVisualItemModel::release(QQuickItem *item)
 {
-    Q_D(QSGVisualItemModel);
+    Q_D(QQuickVisualItemModel);
     int idx = d->indexOf(item);
     if (idx >= 0) {
         if (d->children[idx].deref()) {
@@ -210,33 +210,33 @@ QSGVisualModel::ReleaseFlags QSGVisualItemModel::release(QSGItem *item)
     return 0;
 }
 
-bool QSGVisualItemModel::completePending() const
+bool QQuickVisualItemModel::completePending() const
 {
     return false;
 }
 
-void QSGVisualItemModel::completeItem()
+void QQuickVisualItemModel::completeItem()
 {
     // Nothing to do
 }
 
-QString QSGVisualItemModel::stringValue(int index, const QString &name)
+QString QQuickVisualItemModel::stringValue(int index, const QString &name)
 {
-    Q_D(QSGVisualItemModel);
+    Q_D(QQuickVisualItemModel);
     if (index < 0 || index >= d->children.count())
         return QString();
     return QDeclarativeEngine::contextForObject(d->children.at(index).item)->contextProperty(name).toString();
 }
 
-int QSGVisualItemModel::indexOf(QSGItem *item, QObject *) const
+int QQuickVisualItemModel::indexOf(QQuickItem *item, QObject *) const
 {
-    Q_D(const QSGVisualItemModel);
+    Q_D(const QQuickVisualItemModel);
     return d->indexOf(item);
 }
 
-QSGVisualItemModelAttached *QSGVisualItemModel::qmlAttachedProperties(QObject *obj)
+QQuickVisualItemModelAttached *QQuickVisualItemModel::qmlAttachedProperties(QObject *obj)
 {
-    return QSGVisualItemModelAttached::properties(obj);
+    return QQuickVisualItemModelAttached::properties(obj);
 }
 
 QT_END_NAMESPACE
diff --git a/src/declarative/items/qsgvisualitemmodel_p.h b/src/declarative/items/qquickvisualitemmodel_p.h
index 6e8606cc6b..9fc3d5767c 100644
--- a/src/declarative/items/qsgvisualitemmodel_p.h
+++ b/src/declarative/items/qquickvisualitemmodel_p.h
@@ -40,8 +40,8 @@
 **
 ****************************************************************************/
 
-#ifndef QSGVISUALITEMMODEL_P_H
-#define QSGVISUALITEMMODEL_P_H
+#ifndef QQUICKVISUALITEMMODEL_P_H
+#define QQUICKVISUALITEMMODEL_P_H
 
 #include <QtDeclarative/qdeclarative.h>
 #include <QtCore/qobject.h>
@@ -52,90 +52,90 @@ QT_BEGIN_NAMESPACE
 
 QT_MODULE(Declarative)
 
-class QSGItem;
+class QQuickItem;
 class QDeclarativeChangeSet;
 
-class Q_DECLARATIVE_EXPORT QSGVisualModel : public QObject
+class Q_DECLARATIVE_EXPORT QQuickVisualModel : public QObject
 {
     Q_OBJECT
 
     Q_PROPERTY(int count READ count NOTIFY countChanged)
 
 public:
-    virtual ~QSGVisualModel() {}
+    virtual ~QQuickVisualModel() {}
 
     enum ReleaseFlag { Referenced = 0x01, Destroyed = 0x02 };
     Q_DECLARE_FLAGS(ReleaseFlags, ReleaseFlag)
 
     virtual int count() const = 0;
     virtual bool isValid() const = 0;
-    virtual QSGItem *item(int index, bool complete=true) = 0;
-    virtual ReleaseFlags release(QSGItem *item) = 0;
+    virtual QQuickItem *item(int index, bool complete=true) = 0;
+    virtual ReleaseFlags release(QQuickItem *item) = 0;
     virtual bool completePending() const = 0;
     virtual void completeItem() = 0;
     virtual QString stringValue(int, const QString &) = 0;
     virtual void setWatchedRoles(QList<QByteArray> roles) = 0;
 
-    virtual int indexOf(QSGItem *item, QObject *objectContext) const = 0;
+    virtual int indexOf(QQuickItem *item, QObject *objectContext) const = 0;
 
 Q_SIGNALS:
     void countChanged();
     void modelUpdated(const QDeclarativeChangeSet &changeSet, bool reset);
-    void createdItem(int index, QSGItem *item);
-    void destroyingItem(QSGItem *item);
+    void createdItem(int index, QQuickItem *item);
+    void destroyingItem(QQuickItem *item);
 
 protected:
-    QSGVisualModel(QObjectPrivate &dd, QObject *parent = 0)
+    QQuickVisualModel(QObjectPrivate &dd, QObject *parent = 0)
         : QObject(dd, parent) {}
 
 private:
-    Q_DISABLE_COPY(QSGVisualModel)
+    Q_DISABLE_COPY(QQuickVisualModel)
 };
 
-class QSGVisualItemModelAttached;
-class QSGVisualItemModelPrivate;
-class Q_DECLARATIVE_EXPORT QSGVisualItemModel : public QSGVisualModel
+class QQuickVisualItemModelAttached;
+class QQuickVisualItemModelPrivate;
+class Q_DECLARATIVE_EXPORT QQuickVisualItemModel : public QQuickVisualModel
 {
     Q_OBJECT
-    Q_DECLARE_PRIVATE(QSGVisualItemModel)
+    Q_DECLARE_PRIVATE(QQuickVisualItemModel)
 
-    Q_PROPERTY(QDeclarativeListProperty<QSGItem> children READ children NOTIFY childrenChanged DESIGNABLE false)
+    Q_PROPERTY(QDeclarativeListProperty<QQuickItem> children READ children NOTIFY childrenChanged DESIGNABLE false)
     Q_CLASSINFO("DefaultProperty", "children")
 
 public:
-    QSGVisualItemModel(QObject *parent=0);
-    virtual ~QSGVisualItemModel() {}
+    QQuickVisualItemModel(QObject *parent=0);
+    virtual ~QQuickVisualItemModel() {}
 
     virtual int count() const;
     virtual bool isValid() const;
-    virtual QSGItem *item(int index, bool complete=true);
-    virtual ReleaseFlags release(QSGItem *item);
+    virtual QQuickItem *item(int index, bool complete=true);
+    virtual ReleaseFlags release(QQuickItem *item);
     virtual bool completePending() const;
     virtual void completeItem();
     virtual QString stringValue(int index, const QString &role);
     virtual void setWatchedRoles(QList<QByteArray>) {}
 
-    virtual int indexOf(QSGItem *item, QObject *objectContext) const;
+    virtual int indexOf(QQuickItem *item, QObject *objectContext) const;
 
-    QDeclarativeListProperty<QSGItem> children();
+    QDeclarativeListProperty<QQuickItem> children();
 
-    static QSGVisualItemModelAttached *qmlAttachedProperties(QObject *obj);
+    static QQuickVisualItemModelAttached *qmlAttachedProperties(QObject *obj);
 
 Q_SIGNALS:
     void childrenChanged();
 
 private:
-    Q_DISABLE_COPY(QSGVisualItemModel)
+    Q_DISABLE_COPY(QQuickVisualItemModel)
 };
 
-class QSGVisualItemModelAttached : public QObject
+class QQuickVisualItemModelAttached : public QObject
 {
     Q_OBJECT
 
 public:
-    QSGVisualItemModelAttached(QObject *parent)
+    QQuickVisualItemModelAttached(QObject *parent)
         : QObject(parent), m_index(0) {}
-    ~QSGVisualItemModelAttached() {
+    ~QQuickVisualItemModelAttached() {
         attachedProperties.remove(parent());
     }
 
@@ -148,10 +148,10 @@ public:
         }
     }
 
-    static QSGVisualItemModelAttached *properties(QObject *obj) {
-        QSGVisualItemModelAttached *rv = attachedProperties.value(obj);
+    static QQuickVisualItemModelAttached *properties(QObject *obj) {
+        QQuickVisualItemModelAttached *rv = attachedProperties.value(obj);
         if (!rv) {
-            rv = new QSGVisualItemModelAttached(obj);
+            rv = new QQuickVisualItemModelAttached(obj);
             attachedProperties.insert(obj, rv);
         }
         return rv;
@@ -163,16 +163,16 @@ Q_SIGNALS:
 public:
     int m_index;
 
-    static QHash<QObject*, QSGVisualItemModelAttached*> attachedProperties;
+    static QHash<QObject*, QQuickVisualItemModelAttached*> attachedProperties;
 };
 
 
 QT_END_NAMESPACE
 
-QML_DECLARE_TYPE(QSGVisualModel)
-QML_DECLARE_TYPE(QSGVisualItemModel)
-QML_DECLARE_TYPEINFO(QSGVisualItemModel, QML_HAS_ATTACHED_PROPERTIES)
+QML_DECLARE_TYPE(QQuickVisualModel)
+QML_DECLARE_TYPE(QQuickVisualItemModel)
+QML_DECLARE_TYPEINFO(QQuickVisualItemModel, QML_HAS_ATTACHED_PROPERTIES)
 
 QT_END_HEADER
 
-#endif // QSGVISUALITEMMODEL_P_H
+#endif // QQUICKVISUALITEMMODEL_P_H
diff --git a/src/declarative/items/qsgitemsmodule.cpp b/src/declarative/items/qsgitemsmodule.cpp
deleted file mode 100644
index bb471dd05a..0000000000
--- a/src/declarative/items/qsgitemsmodule.cpp
+++ /dev/null
@@ -1,228 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** 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 "qsgitemsmodule_p.h"
-
-#include "qsgitem.h"
-#include "qsgitem_p.h"
-#include "qsgevents_p_p.h"
-#include "qsgrectangle_p.h"
-#include "qsgfocusscope_p.h"
-#include "qsgtext_p.h"
-#include "qsgtextinput_p.h"
-#include "qsgtextedit_p.h"
-#include "qsgimage_p.h"
-#include "qsgborderimage_p.h"
-#include "qsgscalegrid_p_p.h"
-#include "qsgmousearea_p.h"
-#include "qsgpincharea_p.h"
-#include "qsgflickable_p.h"
-#include "qsgflickable_p_p.h"
-#include "qsglistview_p.h"
-#include "qsgvisualitemmodel_p.h"
-#include "qsgvisualdatamodel_p.h"
-#include "qsggridview_p.h"
-#include "qsgpathview_p.h"
-#include <private/qdeclarativepath_p.h>
-#include <private/qdeclarativepathinterpolator_p.h>
-#include "qsgpositioners_p.h"
-#include "qsgrepeater_p.h"
-#include "qsgloader_p.h"
-#include "qsganimatedimage_p.h"
-#include "qsgflipable_p.h"
-#include "qsgtranslate_p.h"
-#include "qsgstateoperations_p.h"
-#include "qsganimation_p.h"
-#include <private/qsgshadereffect_p.h>
-#include <private/qsgshadereffectsource_p.h>
-//#include <private/qsgpincharea_p.h>
-#include <private/qsgcanvasitem_p.h>
-#include <private/qsgcontext2d_p.h>
-#include "qsgsprite_p.h"
-#include "qsgspriteimage_p.h"
-#include "qsgdrag_p.h"
-#include "qsgdroparea_p.h"
-
-static QDeclarativePrivate::AutoParentResult qsgitem_autoParent(QObject *obj, QObject *parent)
-{
-    QSGItem *item = qobject_cast<QSGItem *>(obj);
-    if (!item)
-        return QDeclarativePrivate::IncompatibleObject;
-
-    QSGItem *parentItem = qobject_cast<QSGItem *>(parent);
-    if (!parentItem)
-        return QDeclarativePrivate::IncompatibleParent;
-
-    item->setParentItem(parentItem);
-    return QDeclarativePrivate::Parented;
-}
-
-static void qt_sgitems_defineModule(const char *uri, int major, int minor)
-{
-    QDeclarativePrivate::RegisterAutoParent autoparent = { 0, &qsgitem_autoParent };
-    QDeclarativePrivate::qmlregister(QDeclarativePrivate::AutoParentRegistration, &autoparent);
-
-#ifdef QT_NO_MOVIE
-    qmlRegisterTypeNotAvailable(uri,major,minor,"AnimatedImage", qApp->translate("QSGAnimatedImage","Qt was built without support for QMovie"));
-#else
-    qmlRegisterType<QSGAnimatedImage>(uri,major,minor,"AnimatedImage");
-#endif
-    qmlRegisterType<QSGBorderImage>(uri,major,minor,"BorderImage");
-    qmlRegisterType<QSGColumn>(uri,major,minor,"Column");
-    qmlRegisterType<QSGFlickable>(uri,major,minor,"Flickable");
-    qmlRegisterType<QSGFlipable>(uri,major,minor,"Flipable");
-    qmlRegisterType<QSGFlow>(uri,major,minor,"Flow");
-//    qmlRegisterType<QDeclarativeFocusPanel>(uri,major,minor,"FocusPanel");
-    qmlRegisterType<QSGFocusScope>(uri,major,minor,"FocusScope");
-    qmlRegisterType<QSGGradient>(uri,major,minor,"Gradient");
-    qmlRegisterType<QSGGradientStop>(uri,major,minor,"GradientStop");
-    qmlRegisterType<QSGGrid>(uri,major,minor,"Grid");
-    qmlRegisterType<QSGGridView>(uri,major,minor,"GridView");
-    qmlRegisterType<QSGImage>(uri,major,minor,"Image");
-    qmlRegisterType<QSGItem>(uri,major,minor,"Item");
-    qmlRegisterType<QSGListView>(uri,major,minor,"ListView");
-    qmlRegisterType<QSGLoader>(uri,major,minor,"Loader");
-    qmlRegisterType<QSGMouseArea>(uri,major,minor,"MouseArea");
-    qmlRegisterType<QDeclarativePath>(uri,major,minor,"Path");
-    qmlRegisterType<QDeclarativePathAttribute>(uri,major,minor,"PathAttribute");
-    qmlRegisterType<QDeclarativePathCubic>(uri,major,minor,"PathCubic");
-    qmlRegisterType<QDeclarativePathLine>(uri,major,minor,"PathLine");
-    qmlRegisterType<QDeclarativePathPercent>(uri,major,minor,"PathPercent");
-    qmlRegisterType<QDeclarativePathQuad>(uri,major,minor,"PathQuad");
-    qmlRegisterType<QDeclarativePathCatmullRomCurve>("QtQuick",2,0,"PathCurve");
-    qmlRegisterType<QDeclarativePathArc>("QtQuick",2,0,"PathArc");
-    qmlRegisterType<QDeclarativePathSvg>("QtQuick",2,0,"PathSvg");
-    qmlRegisterType<QSGPathView>(uri,major,minor,"PathView");
-    qmlRegisterUncreatableType<QSGBasePositioner>(uri,major,minor,"Positioner",
-                                                  QStringLiteral("Positioner is an abstract type that is only available as an attached property."));
-#ifndef QT_NO_VALIDATOR
-    qmlRegisterType<QIntValidator>(uri,major,minor,"IntValidator");
-    qmlRegisterType<QDoubleValidator>(uri,major,minor,"DoubleValidator");
-    qmlRegisterType<QRegExpValidator>(uri,major,minor,"RegExpValidator");
-#endif
-    qmlRegisterType<QSGRectangle>(uri,major,minor,"Rectangle");
-    qmlRegisterType<QSGRepeater>(uri,major,minor,"Repeater");
-    qmlRegisterType<QSGRow>(uri,major,minor,"Row");
-    qmlRegisterType<QSGTranslate>(uri,major,minor,"Translate");
-    qmlRegisterType<QSGRotation>(uri,major,minor,"Rotation");
-    qmlRegisterType<QSGScale>(uri,major,minor,"Scale");
-    qmlRegisterType<QSGText>(uri,major,minor,"Text");
-    qmlRegisterType<QSGTextEdit>(uri,major,minor,"TextEdit");
-    qmlRegisterType<QSGTextInput>(uri,major,minor,"TextInput");
-    qmlRegisterType<QSGViewSection>(uri,major,minor,"ViewSection");
-    qmlRegisterType<QSGVisualDataModel>(uri,major,minor,"VisualDataModel");
-    qmlRegisterType<QSGVisualDataGroup>(uri,major,minor,"VisualDataGroup");
-    qmlRegisterType<QSGVisualItemModel>(uri,major,minor,"VisualItemModel");
-
-    qmlRegisterType<QSGAnchors>();
-    qmlRegisterType<QSGKeyEvent>();
-    qmlRegisterType<QSGMouseEvent>();
-    qmlRegisterType<QSGTransform>();
-    qmlRegisterType<QDeclarativePathElement>();
-    qmlRegisterType<QDeclarativeCurve>();
-    qmlRegisterType<QSGScaleGrid>();
-    qmlRegisterType<QSGTextLine>();
-#ifndef QT_NO_VALIDATOR
-    qmlRegisterType<QValidator>();
-#endif
-    qmlRegisterType<QSGVisualModel>();
-    qmlRegisterType<QSGPen>();
-    qmlRegisterType<QSGFlickableVisibleArea>();
-    qRegisterMetaType<QSGAnchorLine>("QSGAnchorLine");
-
-    qmlRegisterUncreatableType<QSGKeyNavigationAttached>(uri,major,minor,"KeyNavigation",QSGKeyNavigationAttached::tr("KeyNavigation is only available via attached properties"));
-    qmlRegisterUncreatableType<QSGKeysAttached>(uri,major,minor,"Keys",QSGKeysAttached::tr("Keys is only available via attached properties"));
-    qmlRegisterUncreatableType<QSGLayoutMirroringAttached>(uri,major,minor,"LayoutMirroring", QSGLayoutMirroringAttached::tr("LayoutMirroring is only available via attached properties"));
-
-    qmlRegisterType<QSGPinchArea>(uri,major,minor,"PinchArea");
-    qmlRegisterType<QSGPinch>(uri,major,minor,"Pinch");
-    qmlRegisterType<QSGPinchEvent>();
-
-    qmlRegisterType<QSGShaderEffectItem>("QtQuick", 2, 0, "ShaderEffectItem"); // TODO: Remove after grace period.
-    qmlRegisterType<QSGShaderEffect>("QtQuick", 2, 0, "ShaderEffect");
-    qmlRegisterType<QSGShaderEffectSource>("QtQuick", 2, 0, "ShaderEffectSource");
-    qmlRegisterUncreatableType<QSGShaderEffectMesh>("QtQuick", 2, 0, "ShaderEffectMesh", QSGShaderEffectMesh::tr("Cannot create instance of abstract class ShaderEffectMesh."));
-    qmlRegisterType<QSGGridMesh>("QtQuick", 2, 0, "GridMesh");
-
-    qmlRegisterUncreatableType<QSGPaintedItem>("QtQuick", 2, 0, "PaintedItem", QSGPaintedItem::tr("Cannot create instance of abstract class PaintedItem"));
-
-    qmlRegisterType<QSGCanvasItem>("QtQuick", 2, 0, "Canvas");
-
-    qmlRegisterType<QSGSprite>("QtQuick", 2, 0, "Sprite");
-    qmlRegisterType<QSGSpriteImage>("QtQuick", 2, 0, "SpriteImage");
-
-    qmlRegisterType<QSGParentChange>(uri, major, minor,"ParentChange");
-    qmlRegisterType<QSGAnchorChanges>(uri, major, minor,"AnchorChanges");
-    qmlRegisterType<QSGAnchorSet>();
-    qmlRegisterType<QSGAnchorAnimation>(uri, major, minor,"AnchorAnimation");
-    qmlRegisterType<QSGParentAnimation>(uri, major, minor,"ParentAnimation");
-    qmlRegisterType<QSGPathAnimation>("QtQuick",2,0,"PathAnimation");
-    qmlRegisterType<QDeclarativePathInterpolator>("QtQuick",2,0,"PathInterpolator");
-
-    qmlRegisterType<QSGDropArea>("QtQuick", 2, 0, "DropArea");
-    qmlRegisterType<QSGDropEvent>();
-    qmlRegisterType<QSGDropAreaDrag>();
-    qmlRegisterUncreatableType<QSGDrag>("QtQuick", 2, 0, "Drag", QSGDragAttached::tr("Drag is only available via attached properties"));
-}
-
-void QSGItemsModule::defineModule()
-{
-    static bool initialized = false;
-    if (initialized)
-        return;
-    initialized = true;
-
-    // XXX todo -  Remove before final integration...
-    QByteArray mode = qgetenv("QMLSCENE_IMPORT_NAME");
-    QByteArray name = "QtQuick";
-    int majorVersion = 2;
-    int minorVersion = 0;
-    if (mode == "quick1") {
-        majorVersion = 1;
-    } else if (mode == "qt") {
-        name = "Qt";
-        majorVersion = 4;
-        minorVersion = 7;
-    }
-
-    qt_sgitems_defineModule(name, majorVersion, minorVersion);
-}
-
diff --git a/src/declarative/particles/qsgage.cpp b/src/declarative/particles/qsgage.cpp
index da7736a818..797dd14f35 100644
--- a/src/declarative/particles/qsgage.cpp
+++ b/src/declarative/particles/qsgage.cpp
@@ -76,7 +76,7 @@ QT_BEGIN_NAMESPACE
     Default value is true.
 */
 
-QSGAgeAffector::QSGAgeAffector(QSGItem *parent) :
+QSGAgeAffector::QSGAgeAffector(QQuickItem *parent) :
     QSGParticleAffector(parent), m_lifeLeft(0), m_advancePosition(true)
 {
 }
diff --git a/src/declarative/particles/qsgage_p.h b/src/declarative/particles/qsgage_p.h
index 676122086c..63ec8f7592 100644
--- a/src/declarative/particles/qsgage_p.h
+++ b/src/declarative/particles/qsgage_p.h
@@ -57,7 +57,7 @@ class QSGAgeAffector : public QSGParticleAffector
     Q_PROPERTY(bool advancePosition READ advancePosition WRITE setAdvancePosition NOTIFY advancePositionChanged)
 
 public:
-    explicit QSGAgeAffector(QSGItem *parent = 0);
+    explicit QSGAgeAffector(QQuickItem *parent = 0);
 
     int lifeLeft() const
     {
diff --git a/src/declarative/particles/qsgcustomaffector.cpp b/src/declarative/particles/qsgcustomaffector.cpp
index 9f8db2c74a..ffa86aae97 100644
--- a/src/declarative/particles/qsgcustomaffector.cpp
+++ b/src/declarative/particles/qsgcustomaffector.cpp
@@ -59,7 +59,7 @@ QT_BEGIN_NAMESPACE
     Note that JS is slower to execute, so it is not recommended to use this in
     high-volume particle systems.
 */
-QSGCustomAffector::QSGCustomAffector(QSGItem *parent) :
+QSGCustomAffector::QSGCustomAffector(QQuickItem *parent) :
     QSGParticleAffector(parent)
 {
 }
diff --git a/src/declarative/particles/qsgcustomaffector_p.h b/src/declarative/particles/qsgcustomaffector_p.h
index fc0735e971..679034e602 100644
--- a/src/declarative/particles/qsgcustomaffector_p.h
+++ b/src/declarative/particles/qsgcustomaffector_p.h
@@ -58,7 +58,7 @@ class QSGCustomAffector : public QSGParticleAffector
     Q_OBJECT
 
 public:
-    explicit QSGCustomAffector(QSGItem *parent = 0);
+    explicit QSGCustomAffector(QQuickItem *parent = 0);
     virtual void affectSystem(qreal dt);
 
 signals:
diff --git a/src/declarative/particles/qsgcustomparticle.cpp b/src/declarative/particles/qsgcustomparticle.cpp
index 89e465b58a..d00f6bbdda 100644
--- a/src/declarative/particles/qsgcustomparticle.cpp
+++ b/src/declarative/particles/qsgcustomparticle.cpp
@@ -40,7 +40,7 @@
 ****************************************************************************/
 
 #include "qsgcustomparticle_p.h"
-#include <private/qsgshadereffectmesh_p.h>
+#include <private/qquickshadereffectmesh_p.h>
 #include <cstdlib>
 
 QT_BEGIN_NAMESPACE
@@ -128,16 +128,16 @@ struct PlainVertices {
 
 */
 
-QSGCustomParticle::QSGCustomParticle(QSGItem* parent)
+QSGCustomParticle::QSGCustomParticle(QQuickItem* parent)
     : QSGParticlePainter(parent)
     , m_dirtyData(true)
     , m_material(0)
     , m_rootNode(0)
 {
-    setFlag(QSGItem::ItemHasContents);
+    setFlag(QQuickItem::ItemHasContents);
 }
 
-class QSGShaderEffectMaterialObject : public QObject, public QSGShaderEffectMaterial { };
+class QSGShaderEffectMaterialObject : public QObject, public QQuickShaderEffectMaterial { };
 
 QSGCustomParticle::~QSGCustomParticle()
 {
@@ -277,7 +277,7 @@ void QSGCustomParticle::setSource(const QVariant &var, int index)
     }
 
     QObject *obj = qVariantValue<QObject *>(var);
-    source.item = qobject_cast<QSGItem *>(obj);
+    source.item = qobject_cast<QQuickItem *>(obj);
     if (!source.item || !source.item->isTextureProvider()) {
         qWarning("ShaderEffect: source uniform [%s] is not assigned a valid texture provider: %s [%s]",
                  source.name.constData(), qPrintable(obj->objectName()), obj->metaObject()->className());
@@ -448,7 +448,7 @@ void QSGCustomParticle::prepareNextFrame(){
         buildData();
 }
 
-QSGShaderEffectNode* QSGCustomParticle::buildCustomNodes()
+QQuickShaderEffectNode* QSGCustomParticle::buildCustomNodes()
 {
 #ifdef QT_OPENGL_ES_2
     if (m_count * 4 > 0xffff) {
@@ -464,7 +464,7 @@ QSGShaderEffectNode* QSGCustomParticle::buildCustomNodes()
 
     updateProperties();
 
-    QSGShaderEffectProgram s = m_source;
+    QQuickShaderEffectProgram s = m_source;
     if (s.fragmentCode.isEmpty())
         s.fragmentCode = qt_particles_default_fragment_code;
     if (s.vertexCode.isEmpty())
@@ -480,7 +480,7 @@ QSGShaderEffectNode* QSGCustomParticle::buildCustomNodes()
         int gIdx = m_system->groupIds[str];
         int count = m_system->groupData[gIdx]->size();
 
-        QSGShaderEffectNode* node = new QSGShaderEffectNode();
+        QQuickShaderEffectNode* node = new QQuickShaderEffectNode();
         m_nodes.insert(gIdx, node);
 
         node->setMaterial(m_material);
@@ -520,7 +520,7 @@ QSGShaderEffectNode* QSGCustomParticle::buildCustomNodes()
             indices += 6;
         }
     }
-    foreach (QSGShaderEffectNode* node, m_nodes){
+    foreach (QQuickShaderEffectNode* node, m_nodes){
         if (node == *(m_nodes.begin()))
                 continue;
         (*(m_nodes.begin()))->appendChildNode(node);
@@ -541,7 +541,7 @@ void QSGCustomParticle::buildData()
     for (int i = 0; i < oldTextures.size(); ++i) {
         QSGTextureProvider *t = oldTextures.at(i).second;
         if (t)
-            foreach (QSGShaderEffectNode* node, m_nodes)
+            foreach (QQuickShaderEffectNode* node, m_nodes)
                 disconnect(t, SIGNAL(textureChanged()), node, SLOT(markDirtyTexture()));
     }
     for (int i = 0; i < m_sources.size(); ++i) {
@@ -549,7 +549,7 @@ void QSGCustomParticle::buildData()
         QSGTextureProvider *t = source.item->textureProvider();
         textures.append(qMakePair(source.name, t));
         if (t)
-            foreach (QSGShaderEffectNode* node, m_nodes)
+            foreach (QQuickShaderEffectNode* node, m_nodes)
                 connect(t, SIGNAL(textureChanged()), node, SLOT(markDirtyTexture()), Qt::DirectConnection);
     }
     for (QSet<QByteArray>::const_iterator it = m_source.uniformNames.begin();
@@ -560,7 +560,7 @@ void QSGCustomParticle::buildData()
     m_material->setUniforms(values);
     m_material->setTextureProviders(textures);
     m_dirtyData = false;
-    foreach (QSGShaderEffectNode* node, m_nodes)
+    foreach (QQuickShaderEffectNode* node, m_nodes)
         node->markDirty(QSGNode::DirtyMaterial);
 }
 
diff --git a/src/declarative/particles/qsgcustomparticle_p.h b/src/declarative/particles/qsgcustomparticle_p.h
index 99f63d5178..271cc0a2a3 100644
--- a/src/declarative/particles/qsgcustomparticle_p.h
+++ b/src/declarative/particles/qsgcustomparticle_p.h
@@ -42,7 +42,7 @@
 #ifndef CUSTOM_PARTICLE_H
 #define CUSTOM_PARTICLE_H
 #include "qsgparticlepainter_p.h"
-#include <private/qsgshadereffectnode_p.h>
+#include <private/qquickshadereffectnode_p.h>
 #include <QSignalMapper>
 
 QT_BEGIN_HEADER
@@ -64,7 +64,7 @@ class QSGCustomParticle : public QSGParticlePainter
     Q_PROPERTY(QByteArray vertexShader READ vertexShader WRITE setVertexShader NOTIFY vertexShaderChanged)
 
 public:
-    explicit QSGCustomParticle(QSGItem* parent=0);
+    explicit QSGCustomParticle(QQuickItem* parent=0);
     ~QSGCustomParticle();
 
     QByteArray fragmentShader() const { return m_source.fragmentCode; }
@@ -92,24 +92,24 @@ protected:
     void updateProperties();
     void lookThroughShaderCode(const QByteArray &code);
     virtual void componentComplete();
-    QSGShaderEffectNode *buildCustomNodes();
+    QQuickShaderEffectNode *buildCustomNodes();
     void performPendingResize();
 
 private:
     void buildData();
 
     bool m_dirtyData;
-    QSGShaderEffectProgram m_source;
+    QQuickShaderEffectProgram m_source;
     struct SourceData
     {
         QSignalMapper *mapper;
-        QPointer<QSGItem> item;
+        QPointer<QQuickItem> item;
         QByteArray name;
     };
     QVector<SourceData> m_sources;
     QSGShaderEffectMaterialObject *m_material;
-    QSGShaderEffectNode* m_rootNode;
-    QHash<int, QSGShaderEffectNode*> m_nodes;
+    QQuickShaderEffectNode* m_rootNode;
+    QHash<int, QQuickShaderEffectNode*> m_nodes;
     qreal m_lastTime;
 
 };
diff --git a/src/declarative/particles/qsgfriction.cpp b/src/declarative/particles/qsgfriction.cpp
index 44b08e3dc0..85a586b51c 100644
--- a/src/declarative/particles/qsgfriction.cpp
+++ b/src/declarative/particles/qsgfriction.cpp
@@ -59,7 +59,7 @@ static qreal sign(qreal a)
     return a >= 0 ? 1 : -1;
 }
 
-QSGFrictionAffector::QSGFrictionAffector(QSGItem *parent) :
+QSGFrictionAffector::QSGFrictionAffector(QQuickItem *parent) :
     QSGParticleAffector(parent), m_factor(0.0)
 {
 }
diff --git a/src/declarative/particles/qsgfriction_p.h b/src/declarative/particles/qsgfriction_p.h
index 699a205b3a..e2b3a0c26d 100644
--- a/src/declarative/particles/qsgfriction_p.h
+++ b/src/declarative/particles/qsgfriction_p.h
@@ -55,7 +55,7 @@ class QSGFrictionAffector : public QSGParticleAffector
     Q_OBJECT
     Q_PROPERTY(qreal factor READ factor WRITE setFactor NOTIFY factorChanged)
 public:
-    explicit QSGFrictionAffector(QSGItem *parent = 0);
+    explicit QSGFrictionAffector(QQuickItem *parent = 0);
 
     qreal factor() const
     {
diff --git a/src/declarative/particles/qsggravity.cpp b/src/declarative/particles/qsggravity.cpp
index dd47f66443..2967f7a307 100644
--- a/src/declarative/particles/qsggravity.cpp
+++ b/src/declarative/particles/qsggravity.cpp
@@ -70,7 +70,7 @@ const qreal CONV = 0.017453292520444443;
     Angle of acceleration.
 */
 
-QSGGravityAffector::QSGGravityAffector(QSGItem *parent) :
+QSGGravityAffector::QSGGravityAffector(QQuickItem *parent) :
     QSGParticleAffector(parent), m_acceleration(-10), m_angle(90), m_xAcc(0), m_yAcc(0)
 {
     connect(this, SIGNAL(accelerationChanged(qreal)),
diff --git a/src/declarative/particles/qsggravity_p.h b/src/declarative/particles/qsggravity_p.h
index f96df1ab3a..42bf144465 100644
--- a/src/declarative/particles/qsggravity_p.h
+++ b/src/declarative/particles/qsggravity_p.h
@@ -56,7 +56,7 @@ class QSGGravityAffector : public QSGParticleAffector
     Q_PROPERTY(qreal acceleration READ acceleration WRITE setAcceleration NOTIFY accelerationChanged)
     Q_PROPERTY(qreal angle READ angle WRITE setAngle NOTIFY angleChanged)
 public:
-    explicit QSGGravityAffector(QSGItem *parent = 0);
+    explicit QSGGravityAffector(QQuickItem *parent = 0);
     qreal acceleration() const
     {
         return m_acceleration;
diff --git a/src/declarative/particles/qsggroupgoal.cpp b/src/declarative/particles/qsggroupgoal.cpp
index f380101bd6..78fa7866bc 100644
--- a/src/declarative/particles/qsggroupgoal.cpp
+++ b/src/declarative/particles/qsggroupgoal.cpp
@@ -40,8 +40,8 @@
 ****************************************************************************/
 
 #include "qsggroupgoal_p.h"
-#include <private/qsgspriteengine_p.h>
-#include <private/qsgsprite_p.h>
+#include <private/qquickspriteengine_p.h>
+#include <private/qquicksprite_p.h>
 #include "qsgimageparticle_p.h"
 #include <QDebug>
 
@@ -74,7 +74,7 @@ QT_BEGIN_NAMESPACE
     Default is false.
 */
 
-QSGGroupGoalAffector::QSGGroupGoalAffector(QSGItem *parent) :
+QSGGroupGoalAffector::QSGGroupGoalAffector(QQuickItem *parent) :
     QSGParticleAffector(parent), m_jump(false)
 {
 }
@@ -90,7 +90,7 @@ void QSGGroupGoalAffector::setGoalState(QString arg)
 bool QSGGroupGoalAffector::affectParticle(QSGParticleData *d, qreal dt)
 {
     Q_UNUSED(dt);
-    QSGStochasticEngine *engine = m_system->stateEngine;
+    QQuickStochasticEngine *engine = m_system->stateEngine;
     bool notUsingEngine = false;
     if (!engine)
         notUsingEngine = true;
diff --git a/src/declarative/particles/qsggroupgoal_p.h b/src/declarative/particles/qsggroupgoal_p.h
index 6357c3f13a..59ccb7a73f 100644
--- a/src/declarative/particles/qsggroupgoal_p.h
+++ b/src/declarative/particles/qsggroupgoal_p.h
@@ -49,7 +49,7 @@ QT_BEGIN_NAMESPACE
 
 QT_MODULE(Declarative)
 
-class QSGStochasticEngine;
+class QQuickStochasticEngine;
 
 class QSGGroupGoalAffector : public QSGParticleAffector
 {
@@ -57,7 +57,7 @@ class QSGGroupGoalAffector : public QSGParticleAffector
     Q_PROPERTY(QString goalState READ goalState WRITE setGoalState NOTIFY goalStateChanged)
     Q_PROPERTY(bool jump READ jump WRITE setJump NOTIFY jumpChanged)
 public:
-    explicit QSGGroupGoalAffector(QSGItem *parent = 0);
+    explicit QSGGroupGoalAffector(QQuickItem *parent = 0);
 
     QString goalState() const
     {
diff --git a/src/declarative/particles/qsgimageparticle.cpp b/src/declarative/particles/qsgimageparticle.cpp
index 02b3a7a92a..7791db6042 100644
--- a/src/declarative/particles/qsgimageparticle.cpp
+++ b/src/declarative/particles/qsgimageparticle.cpp
@@ -47,8 +47,8 @@
 #include <QFile>
 #include "qsgimageparticle_p.h"
 #include "qsgparticleemitter_p.h"
-#include <private/qsgsprite_p.h>
-#include <private/qsgspriteengine_p.h>
+#include <private/qquicksprite_p.h>
+#include <private/qquickspriteengine_p.h>
 #include <QOpenGLFunctions>
 #include <qsgengine.h>
 #include <private/qsgtexture_p.h>
@@ -797,7 +797,7 @@ void fillUniformArrayFromImage(float* array, const QImage& img, int size)
 */
 
 
-QSGImageParticle::QSGImageParticle(QSGItem* parent)
+QSGImageParticle::QSGImageParticle(QQuickItem* parent)
     : QSGParticlePainter(parent)
     , m_color_variation(0.0)
     , m_rootNode(0)
@@ -834,9 +834,9 @@ QSGImageParticle::~QSGImageParticle()
 {
 }
 
-QDeclarativeListProperty<QSGSprite> QSGImageParticle::sprites()
+QDeclarativeListProperty<QQuickSprite> QSGImageParticle::sprites()
 {
-    return QDeclarativeListProperty<QSGSprite>(this, &m_sprites, spriteAppend, spriteCount, spriteAt, spriteClear);
+    return QDeclarativeListProperty<QQuickSprite>(this, &m_sprites, spriteAppend, spriteCount, spriteAt, spriteClear);
 }
 
 void QSGImageParticle::setImage(const QUrl &image)
@@ -1115,7 +1115,7 @@ void QSGImageParticle::createEngine()
     if (m_spriteEngine)
         delete m_spriteEngine;
     if (m_sprites.count())
-        m_spriteEngine = new QSGSpriteEngine(m_sprites, this);
+        m_spriteEngine = new QQuickSpriteEngine(m_sprites, this);
     else
         m_spriteEngine = 0;
     m_explicitAnimation = true;
diff --git a/src/declarative/particles/qsgimageparticle_p.h b/src/declarative/particles/qsgimageparticle_p.h
index 89796da356..0836e3e8ec 100644
--- a/src/declarative/particles/qsgimageparticle_p.h
+++ b/src/declarative/particles/qsgimageparticle_p.h
@@ -56,8 +56,8 @@ QT_MODULE(Declarative)
 class ImageMaterialData;
 class QSGGeometryNode;
 
-class QSGSprite;
-class QSGStochasticEngine;
+class QQuickSprite;
+class QQuickStochasticEngine;
 
 struct SimpleVertex {
     float x;
@@ -180,19 +180,19 @@ class QSGImageParticle : public QSGParticlePainter
     Q_PROPERTY(QSGDirection* xVector READ xVector WRITE setXVector NOTIFY xVectorChanged RESET resetDeformation)
     //yVector is the same, but top-left to bottom-left. The particle is always a parallelogram.
     Q_PROPERTY(QSGDirection* yVector READ yVector WRITE setYVector NOTIFY yVectorChanged RESET resetDeformation)
-    Q_PROPERTY(QDeclarativeListProperty<QSGSprite> sprites READ sprites)
+    Q_PROPERTY(QDeclarativeListProperty<QQuickSprite> sprites READ sprites)
     Q_PROPERTY(bool spritesInterpolate READ spritesInterpolate WRITE setSpritesInterpolate NOTIFY spritesInterpolateChanged)
 
     Q_PROPERTY(EntryEffect entryEffect READ entryEffect WRITE setEntryEffect NOTIFY entryEffectChanged)
     Q_PROPERTY(bool bloat READ bloat WRITE setBloat NOTIFY bloatChanged)//Just a debugging property to bypass optimizations
     Q_ENUMS(EntryEffect)
 public:
-    explicit QSGImageParticle(QSGItem *parent = 0);
+    explicit QSGImageParticle(QQuickItem *parent = 0);
     virtual ~QSGImageParticle();
 
 
-    QDeclarativeListProperty<QSGSprite> sprites();
-    QSGStochasticEngine* spriteEngine() {return m_spriteEngine;}
+    QDeclarativeListProperty<QQuickSprite> sprites();
+    QQuickStochasticEngine* spriteEngine() {return m_spriteEngine;}
 
     enum EntryEffect {
         None = 0,
@@ -381,8 +381,8 @@ private:
     QSGDirection* m_xVector;
     QSGDirection* m_yVector;
 
-    QList<QSGSprite*> m_sprites;
-    QSGSpriteEngine* m_spriteEngine;
+    QList<QQuickSprite*> m_sprites;
+    QQuickSpriteEngine* m_spriteEngine;
     bool m_spritesInterpolate;
 
     bool m_explicitColor;
diff --git a/src/declarative/particles/qsgitemparticle.cpp b/src/declarative/particles/qsgitemparticle.cpp
index 20bd18d146..3be40dcaa1 100644
--- a/src/declarative/particles/qsgitemparticle.cpp
+++ b/src/declarative/particles/qsgitemparticle.cpp
@@ -40,7 +40,7 @@
 ****************************************************************************/
 
 #include "qsgitemparticle_p.h"
-#include <private/qsgvisualitemmodel_p.h>
+#include <private/qquickvisualitemmodel_p.h>
 #include <qsgnode.h>
 #include <QTimer>
 #include <QDeclarativeComponent>
@@ -49,7 +49,7 @@
 QT_BEGIN_NAMESPACE
 
 /*!
-    \qmlclass ItemParticle QSGItemParticle
+    \qmlclass ItemParticle QQuickItemParticle
     \inqmlmodule QtQuick.Particles 2
     \inherits ParticlePainter
     \brief The ItemParticle element allows you to specify your own delegate to paint particles.
@@ -99,10 +99,10 @@ QT_BEGIN_NAMESPACE
     particle, and moved along with it.
 */
 
-QSGItemParticle::QSGItemParticle(QSGItem *parent) :
+QQuickItemParticle::QQuickItemParticle(QQuickItem *parent) :
     QSGParticlePainter(parent), m_fade(true), m_delegate(0)
 {
-    setFlag(QSGItem::ItemHasContents);
+    setFlag(QQuickItem::ItemHasContents);
     QTimer* manageDelegates = new QTimer(this);//TODO: don't leak
     connect(manageDelegates, SIGNAL(timeout()),
             this, SLOT(tick()));
@@ -112,18 +112,18 @@ QSGItemParticle::QSGItemParticle(QSGItem *parent) :
 }
 
 
-void QSGItemParticle::freeze(QSGItem* item)
+void QQuickItemParticle::freeze(QQuickItem* item)
 {
     m_stasis << item;
 }
 
 
-void QSGItemParticle::unfreeze(QSGItem* item)
+void QQuickItemParticle::unfreeze(QQuickItem* item)
 {
     m_stasis.remove(item);
 }
 
-void QSGItemParticle::take(QSGItem *item, bool prioritize)
+void QQuickItemParticle::take(QQuickItem *item, bool prioritize)
 {
     if (prioritize)
         m_pendingItems.push_front(item);
@@ -131,28 +131,28 @@ void QSGItemParticle::take(QSGItem *item, bool prioritize)
         m_pendingItems.push_back(item);
 }
 
-void QSGItemParticle::give(QSGItem *item)
+void QQuickItemParticle::give(QQuickItem *item)
 {
     //TODO: This
 }
 
-void QSGItemParticle::initialize(int gIdx, int pIdx)
+void QQuickItemParticle::initialize(int gIdx, int pIdx)
 {
     m_loadables << m_system->groupData[gIdx]->data[pIdx];//defer to other thread
 }
 
-void QSGItemParticle::commit(int, int)
+void QQuickItemParticle::commit(int, int)
 {
 }
 
-void QSGItemParticle::tick()
+void QQuickItemParticle::tick()
 {
-    foreach (QSGItem* item, m_deletables){
+    foreach (QQuickItem* item, m_deletables){
         if (m_fade)
             item->setOpacity(0.);
         item->setVisible(false);
-        QSGItemParticleAttached* mpa;
-        if ((mpa = qobject_cast<QSGItemParticleAttached*>(qmlAttachedPropertiesObject<QSGItemParticle>(item))))
+        QQuickItemParticleAttached* mpa;
+        if ((mpa = qobject_cast<QQuickItemParticleAttached*>(qmlAttachedPropertiesObject<QQuickItemParticle>(item))))
             mpa->detach();//reparent as well?
         //TODO: Delete iff we created it
         m_activeCount--;
@@ -170,12 +170,12 @@ void QSGItemParticle::tick()
             d->delegate = m_pendingItems.front();
             m_pendingItems.pop_front();
         }else if (m_delegate){
-            d->delegate = qobject_cast<QSGItem*>(m_delegate->create(qmlContext(this)));
+            d->delegate = qobject_cast<QQuickItem*>(m_delegate->create(qmlContext(this)));
         }
         if (d->delegate && d){//###Data can be zero if creating an item leads to a reset - this screws things up.
             d->delegate->setX(d->curX() - d->delegate->width()/2);//TODO: adjust for system?
             d->delegate->setY(d->curY() - d->delegate->height()/2);
-            QSGItemParticleAttached* mpa = qobject_cast<QSGItemParticleAttached*>(qmlAttachedPropertiesObject<QSGItemParticle>(d->delegate));
+            QQuickItemParticleAttached* mpa = qobject_cast<QQuickItemParticleAttached*>(qmlAttachedPropertiesObject<QQuickItemParticle>(d->delegate));
             if (mpa){
                 mpa->m_mp = this;
                 mpa->attach();
@@ -190,7 +190,7 @@ void QSGItemParticle::tick()
     m_loadables.clear();
 }
 
-void QSGItemParticle::reset()
+void QQuickItemParticle::reset()
 {
     QSGParticlePainter::reset();
     //TODO: Cleanup items?
@@ -199,7 +199,7 @@ void QSGItemParticle::reset()
 }
 
 
-QSGNode* QSGItemParticle::updatePaintNode(QSGNode* n, UpdatePaintNodeData* d)
+QSGNode* QQuickItemParticle::updatePaintNode(QSGNode* n, UpdatePaintNodeData* d)
 {
     //Dummy update just to get painting tick
     if (m_pleaseReset){
@@ -211,10 +211,10 @@ QSGNode* QSGItemParticle::updatePaintNode(QSGNode* n, UpdatePaintNodeData* d)
     update();//Get called again
     if (n)
         n->markDirty(QSGNode::DirtyMaterial);
-    return QSGItem::updatePaintNode(n,d);
+    return QQuickItem::updatePaintNode(n,d);
 }
 
-void QSGItemParticle::prepareNextFrame()
+void QQuickItemParticle::prepareNextFrame()
 {
     if (!m_system)
         return;
@@ -232,7 +232,7 @@ void QSGItemParticle::prepareNextFrame()
 
         for (int i=0; i<count; i++){
             QSGParticleData* data = m_system->groupData[gIdx]->data[i];
-            QSGItem* item = data->delegate;
+            QQuickItem* item = data->delegate;
             if (!item)
                 continue;
             qreal t = ((timeStamp/1000.0) - data->t) / data->lifeSpan;
@@ -260,9 +260,9 @@ void QSGItemParticle::prepareNextFrame()
     }
 }
 
-QSGItemParticleAttached *QSGItemParticle::qmlAttachedProperties(QObject *object)
+QQuickItemParticleAttached *QQuickItemParticle::qmlAttachedProperties(QObject *object)
 {
-    return new QSGItemParticleAttached(object);
+    return new QQuickItemParticleAttached(object);
 }
 
 QT_END_NAMESPACE
diff --git a/src/declarative/particles/qsgitemparticle_p.h b/src/declarative/particles/qsgitemparticle_p.h
index d18959525f..813f1ced79 100644
--- a/src/declarative/particles/qsgitemparticle_p.h
+++ b/src/declarative/particles/qsgitemparticle_p.h
@@ -49,22 +49,22 @@ QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE
 
 QT_MODULE(Declarative)
-class QSGVisualDataModel;
-class QSGItemParticleAttached;
+class QQuickVisualDataModel;
+class QQuickItemParticleAttached;
 
-class QSGItemParticle : public QSGParticlePainter
+class QQuickItemParticle : public QSGParticlePainter
 {
     Q_OBJECT
     Q_PROPERTY(bool fade READ fade WRITE setFade NOTIFY fadeChanged)
     Q_PROPERTY(QDeclarativeComponent* delegate READ delegate WRITE setDelegate NOTIFY delegateChanged)
 public:
-    explicit QSGItemParticle(QSGItem *parent = 0);
+    explicit QQuickItemParticle(QQuickItem *parent = 0);
 
     bool fade() const { return m_fade; }
 
     virtual QSGNode *updatePaintNode(QSGNode *, UpdatePaintNodeData *);
 
-    static QSGItemParticleAttached *qmlAttachedProperties(QObject *object);
+    static QQuickItemParticleAttached *qmlAttachedProperties(QObject *object);
     QDeclarativeComponent* delegate() const
     {
         return m_delegate;
@@ -77,10 +77,10 @@ signals:
 
 public slots:
     //TODO: Add a follow mode, where moving the delegate causes the logical particle to go with it?
-    void freeze(QSGItem* item);
-    void unfreeze(QSGItem* item);
-    void take(QSGItem* item,bool prioritize=false);//take by modelparticle
-    void give(QSGItem* item);//give from modelparticle
+    void freeze(QQuickItem* item);
+    void unfreeze(QQuickItem* item);
+    void take(QQuickItem* item,bool prioritize=false);//take by modelparticle
+    void give(QQuickItem* item);//give from modelparticle
 
     void setFade(bool arg){if (arg == m_fade) return; m_fade = arg; emit fadeChanged();}
     void setDelegate(QDeclarativeComponent* arg)
@@ -99,32 +99,32 @@ protected:
 private slots:
     void tick();
 private:
-    QList<QSGItem* > m_deletables;
+    QList<QQuickItem* > m_deletables;
     QList< QSGParticleData* > m_loadables;
     bool m_fade;
 
-    QList<QSGItem*> m_pendingItems;
+    QList<QQuickItem*> m_pendingItems;
     QList<int> m_available;
-    QSet<QSGItem*> m_stasis;
+    QSet<QQuickItem*> m_stasis;
     qreal m_lastT;
     int m_activeCount;
     QDeclarativeComponent* m_delegate;
 };
 
-class QSGItemParticleAttached : public QObject
+class QQuickItemParticleAttached : public QObject
 {
     Q_OBJECT
-    Q_PROPERTY(QSGItemParticle* particle READ particle CONSTANT);
+    Q_PROPERTY(QQuickItemParticle* particle READ particle CONSTANT);
 public:
-    QSGItemParticleAttached(QObject* parent)
+    QQuickItemParticleAttached(QObject* parent)
         : QObject(parent), m_mp(0)
     {;}
-    QSGItemParticle* particle() {return m_mp;}
+    QQuickItemParticle* particle() {return m_mp;}
     void detach(){emit detached();}
     void attach(){emit attached();}
 private:
-    QSGItemParticle* m_mp;
-    friend class QSGItemParticle;
+    QQuickItemParticle* m_mp;
+    friend class QQuickItemParticle;
 Q_SIGNALS:
     void detached();
     void attached();
@@ -132,7 +132,7 @@ Q_SIGNALS:
 
 QT_END_NAMESPACE
 
-QML_DECLARE_TYPEINFO(QSGItemParticle, QML_HAS_ATTACHED_PROPERTIES)
+QML_DECLARE_TYPEINFO(QQuickItemParticle, QML_HAS_ATTACHED_PROPERTIES)
 
 QT_END_HEADER
 #endif // ITEMPARTICLE_H
diff --git a/src/declarative/particles/qsgmove.cpp b/src/declarative/particles/qsgmove.cpp
index e885685d6d..9f13fad093 100644
--- a/src/declarative/particles/qsgmove.cpp
+++ b/src/declarative/particles/qsgmove.cpp
@@ -84,7 +84,7 @@ const qreal CONV = 0.017453292520444443;
     to the new one.
 */
 
-QSGMoveAffector::QSGMoveAffector(QSGItem *parent)
+QSGMoveAffector::QSGMoveAffector(QQuickItem *parent)
     : QSGParticleAffector(parent)
     , m_position(&m_nullVector)
     , m_speed(&m_nullVector)
diff --git a/src/declarative/particles/qsgmove_p.h b/src/declarative/particles/qsgmove_p.h
index 2f7fc831f5..4ff5239357 100644
--- a/src/declarative/particles/qsgmove_p.h
+++ b/src/declarative/particles/qsgmove_p.h
@@ -60,7 +60,7 @@ class QSGMoveAffector : public QSGParticleAffector
     Q_PROPERTY(QSGDirection *acceleration READ acceleration WRITE setAcceleration NOTIFY accelerationChanged RESET accelerationReset)
 
 public:
-    explicit QSGMoveAffector(QSGItem *parent = 0);
+    explicit QSGMoveAffector(QQuickItem *parent = 0);
     QSGDirection * position() const
     {
         return m_position;
diff --git a/src/declarative/particles/qsgparticleaffector.cpp b/src/declarative/particles/qsgparticleaffector.cpp
index 24bddea5f7..2758e93a5f 100644
--- a/src/declarative/particles/qsgparticleaffector.cpp
+++ b/src/declarative/particles/qsgparticleaffector.cpp
@@ -126,8 +126,8 @@ QT_BEGIN_NAMESPACE
 
     x,y is the particles current position.
 */
-QSGParticleAffector::QSGParticleAffector(QSGItem *parent) :
-    QSGItem(parent), m_needsReset(false), m_system(0), m_enabled(true)
+QSGParticleAffector::QSGParticleAffector(QQuickItem *parent) :
+    QQuickItem(parent), m_needsReset(false), m_system(0), m_enabled(true)
   , m_updateIntSet(false), m_shape(new QSGParticleExtruder(this))
 {
 }
@@ -143,7 +143,7 @@ void QSGParticleAffector::componentComplete()
 {
     if (!m_system && qobject_cast<QSGParticleSystem*>(parentItem()))
         setSystem(qobject_cast<QSGParticleSystem*>(parentItem()));
-    QSGItem::componentComplete();
+    QQuickItem::componentComplete();
 }
 
 bool QSGParticleAffector::activeGroup(int g) {
diff --git a/src/declarative/particles/qsgparticleaffector_p.h b/src/declarative/particles/qsgparticleaffector_p.h
index c46164de5c..bc6864e415 100644
--- a/src/declarative/particles/qsgparticleaffector_p.h
+++ b/src/declarative/particles/qsgparticleaffector_p.h
@@ -52,7 +52,7 @@ QT_BEGIN_NAMESPACE
 
 QT_MODULE(Declarative)
 
-class QSGParticleAffector : public QSGItem
+class QSGParticleAffector : public QQuickItem
 {
     Q_OBJECT
     Q_PROPERTY(QSGParticleSystem* system READ system WRITE setSystem NOTIFY systemChanged)
@@ -63,7 +63,7 @@ class QSGParticleAffector : public QSGItem
     Q_PROPERTY(QSGParticleExtruder* shape READ shape WRITE setShape NOTIFY shapeChanged)
 
 public:
-    explicit QSGParticleAffector(QSGItem *parent = 0);
+    explicit QSGParticleAffector(QQuickItem *parent = 0);
     virtual void affectSystem(qreal dt);
     virtual void reset(QSGParticleData*);//As some store their own data per particle?
     QSGParticleSystem* system() const
diff --git a/src/declarative/particles/qsgparticleemitter.cpp b/src/declarative/particles/qsgparticleemitter.cpp
index e453888b03..f9a35a1d8c 100644
--- a/src/declarative/particles/qsgparticleemitter.cpp
+++ b/src/declarative/particles/qsgparticleemitter.cpp
@@ -212,8 +212,8 @@ QT_BEGIN_NAMESPACE
     it back off.
 */
 
-QSGParticleEmitter::QSGParticleEmitter(QSGItem *parent) :
-    QSGItem(parent)
+QSGParticleEmitter::QSGParticleEmitter(QQuickItem *parent) :
+    QQuickItem(parent)
   , m_particlesPerSecond(10)
   , m_particleDuration(1000)
   , m_particleDurationVariation(0)
@@ -261,7 +261,7 @@ void QSGParticleEmitter::componentComplete()
 {
     if (!m_system && qobject_cast<QSGParticleSystem*>(parentItem()))
         setSystem(qobject_cast<QSGParticleSystem*>(parentItem()));
-    QSGItem::componentComplete();
+    QQuickItem::componentComplete();
 }
 
 void QSGParticleEmitter::setEnabled(bool arg)
diff --git a/src/declarative/particles/qsgparticleemitter_p.h b/src/declarative/particles/qsgparticleemitter_p.h
index 8a41cb607d..0099c69144 100644
--- a/src/declarative/particles/qsgparticleemitter_p.h
+++ b/src/declarative/particles/qsgparticleemitter_p.h
@@ -42,7 +42,7 @@
 #ifndef PARTICLEEMITTER_H
 #define PARTICLEEMITTER_H
 
-#include <QSGItem>
+#include <QQuickItem>
 #include <QDebug>
 #include "qsgparticlesystem_p.h"
 #include "qsgparticleextruder_p.h"
@@ -57,7 +57,7 @@ QT_BEGIN_NAMESPACE
 
 QT_MODULE(Declarative)
 
-class QSGParticleEmitter : public QSGItem
+class QSGParticleEmitter : public QQuickItem
 {
     Q_OBJECT
     Q_PROPERTY(QSGParticleSystem* system READ system WRITE setSystem NOTIFY systemChanged)
@@ -81,7 +81,7 @@ class QSGParticleEmitter : public QSGItem
 
     Q_ENUMS(Lifetime)
 public:
-    explicit QSGParticleEmitter(QSGItem *parent = 0);
+    explicit QSGParticleEmitter(QQuickItem *parent = 0);
     virtual ~QSGParticleEmitter();
     virtual void emitWindow(int timeStamp);
 
diff --git a/src/declarative/particles/qsgparticlegroup.cpp b/src/declarative/particles/qsgparticlegroup.cpp
index bcccf3c3df..c4eded93e6 100644
--- a/src/declarative/particles/qsgparticlegroup.cpp
+++ b/src/declarative/particles/qsgparticlegroup.cpp
@@ -90,7 +90,7 @@
 */
 
 QSGParticleGroup::QSGParticleGroup(QObject* parent)
-    : QSGStochasticState(parent)
+    : QQuickStochasticState(parent)
     , m_system(0)
 {
 
diff --git a/src/declarative/particles/qsgparticlegroup_p.h b/src/declarative/particles/qsgparticlegroup_p.h
index 26bed55785..f30539f686 100644
--- a/src/declarative/particles/qsgparticlegroup_p.h
+++ b/src/declarative/particles/qsgparticlegroup_p.h
@@ -40,13 +40,13 @@
 ****************************************************************************/
 #ifndef QSGPARTICLEGROUP
 #define QSGPARTICLEGROUP
-#include <private/qsgspriteengine_p.h>
+#include <private/qquickspriteengine_p.h>
 #include "qsgparticlesystem_p.h"
 #include "qdeclarativeparserstatus.h"
 
 QT_BEGIN_NAMESPACE
 
-class QSGParticleGroup : public QSGStochasticState, public QDeclarativeParserStatus
+class QSGParticleGroup : public QQuickStochasticState, public QDeclarativeParserStatus
 {
     Q_OBJECT
     //### Would setting limits per group be useful? Or clutter the API?
diff --git a/src/declarative/particles/qsgparticlepainter.cpp b/src/declarative/particles/qsgparticlepainter.cpp
index 4f6b18c973..c89e2ef560 100644
--- a/src/declarative/particles/qsgparticlepainter.cpp
+++ b/src/declarative/particles/qsgparticlepainter.cpp
@@ -63,8 +63,8 @@ QT_BEGIN_NAMESPACE
 
     If empty, it will paint the default particle group ("").
 */
-QSGParticlePainter::QSGParticlePainter(QSGItem *parent) :
-    QSGItem(parent),
+QSGParticlePainter::QSGParticlePainter(QQuickItem *parent) :
+    QQuickItem(parent),
     m_system(0), m_count(0), m_pleaseReset(true), m_sentinel(new QSGParticleData(0))
 {
 }
@@ -73,7 +73,7 @@ void QSGParticlePainter::componentComplete()
 {
     if (!m_system && qobject_cast<QSGParticleSystem*>(parentItem()))
         setSystem(qobject_cast<QSGParticleSystem*>(parentItem()));
-    QSGItem::componentComplete();
+    QQuickItem::componentComplete();
 }
 
 
diff --git a/src/declarative/particles/qsgparticlepainter_p.h b/src/declarative/particles/qsgparticlepainter_p.h
index 78e0127eac..32b7224df3 100644
--- a/src/declarative/particles/qsgparticlepainter_p.h
+++ b/src/declarative/particles/qsgparticlepainter_p.h
@@ -54,14 +54,14 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(Declarative)
 
 
-class QSGParticlePainter : public QSGItem
+class QSGParticlePainter : public QQuickItem
 {
     Q_OBJECT
     Q_PROPERTY(QSGParticleSystem* system READ system WRITE setSystem NOTIFY systemChanged)
     Q_PROPERTY(QStringList groups READ groups WRITE setGroups NOTIFY groupsChanged)
 
 public:
-    explicit QSGParticlePainter(QSGItem *parent = 0);
+    explicit QSGParticlePainter(QQuickItem *parent = 0);
     //Data Interface to system
     void load(QSGParticleData*);
     void reload(QSGParticleData*);
diff --git a/src/declarative/particles/qsgparticlesmodule.cpp b/src/declarative/particles/qsgparticlesmodule.cpp
index fe2dec9c48..9e73b82527 100644
--- a/src/declarative/particles/qsgparticlesmodule.cpp
+++ b/src/declarative/particles/qsgparticlesmodule.cpp
@@ -82,7 +82,7 @@ void QSGParticlesModule::defineModule()
 
     qmlRegisterType<QSGImageParticle>(uri, 2, 0, "ImageParticle");
     qmlRegisterType<QSGCustomParticle>(uri, 2, 0, "CustomParticle");
-    qmlRegisterType<QSGItemParticle>(uri, 2, 0, "ItemParticle");
+    qmlRegisterType<QQuickItemParticle>(uri, 2, 0, "ItemParticle");
 
     qmlRegisterType<QSGParticleEmitter>(uri, 2, 0, "Emitter");
     qmlRegisterType<QSGTrailEmitter>(uri, 2, 0, "TrailEmitter");
diff --git a/src/declarative/particles/qsgparticlesystem.cpp b/src/declarative/particles/qsgparticlesystem.cpp
index 1b01081a67..0523563843 100644
--- a/src/declarative/particles/qsgparticlesystem.cpp
+++ b/src/declarative/particles/qsgparticlesystem.cpp
@@ -44,8 +44,8 @@
 #include "qsgparticleemitter_p.h"
 #include "qsgparticleaffector_p.h"
 #include "qsgparticlepainter_p.h"
-#include <private/qsgspriteengine_p.h>
-#include <private/qsgsprite_p.h>
+#include <private/qquickspriteengine_p.h>
+#include <private/qquicksprite_p.h>
 #include "qsgv8particledata_p.h"
 #include "qsgparticlegroup_p.h"
 
@@ -616,8 +616,8 @@ void QSGParticleData::extendLife(float time)
     vy = evy;
 }
 
-QSGParticleSystem::QSGParticleSystem(QSGItem *parent) :
-    QSGItem(parent),
+QSGParticleSystem::QSGParticleSystem(QQuickItem *parent) :
+    QQuickItem(parent),
     stateEngine(0),
     m_running(true),
     particleCount(0),
@@ -756,7 +756,7 @@ void QSGParticleSystem::stateRedirect(QSGParticleGroup* group, QSGParticleSystem
 void QSGParticleSystem::componentComplete()
 
 {
-    QSGItem::componentComplete();
+    QQuickItem::componentComplete();
     m_componentComplete = true;
     m_animation = new QSGParticleSystemAnimation(this);
     reset();//restarts animation as well
@@ -925,12 +925,12 @@ void QSGParticleSystem::createEngine()
             }
         }
         m_groups = newList;
-        QList<QSGStochasticState*> states;
+        QList<QQuickStochasticState*> states;
         foreach (QSGParticleGroup* g, m_groups)
-            states << (QSGStochasticState*)g;
+            states << (QQuickStochasticState*)g;
 
         if (!stateEngine)
-            stateEngine = new QSGStochasticEngine(this);
+            stateEngine = new QQuickStochasticEngine(this);
         stateEngine->setCount(particleCount);
         stateEngine->m_states = states;
 
diff --git a/src/declarative/particles/qsgparticlesystem_p.h b/src/declarative/particles/qsgparticlesystem_p.h
index 37fcbac6a8..714b536e45 100644
--- a/src/declarative/particles/qsgparticlesystem_p.h
+++ b/src/declarative/particles/qsgparticlesystem_p.h
@@ -42,13 +42,13 @@
 #ifndef PARTICLESYSTEM_H
 #define PARTICLESYSTEM_H
 
-#include <QSGItem>
+#include <QQuickItem>
 #include <QElapsedTimer>
 #include <QVector>
 #include <QHash>
 #include <QPointer>
 #include <QSignalMapper>
-#include <private/qsgsprite_p.h>
+#include <private/qquicksprite_p.h>
 #include <QAbstractAnimation>
 #include <QtDeclarative/qdeclarative.h>
 #include <private/qv8engine_p.h> //For QDeclarativeV8Handle
@@ -65,8 +65,8 @@ class QSGParticleEmitter;
 class QSGParticlePainter;
 class QSGParticleData;
 class QSGParticleSystemAnimation;
-class QSGStochasticEngine;
-class QSGSprite;
+class QQuickStochasticEngine;
+class QQuickSprite;
 class QSGV8ParticleData;
 class QSGParticleGroup;
 class QSGImageParticle;
@@ -208,7 +208,7 @@ public:
     float animWidth;
     float animHeight;
     float r;
-    QSGItem* delegate;
+    QQuickItem* delegate;
     int modelIndex;
     float update;//Used by custom affectors
 
@@ -229,7 +229,7 @@ private:
     QSGV8ParticleData* v8Datum;
 };
 
-class Q_AUTOTEST_EXPORT QSGParticleSystem : public QSGItem
+class Q_AUTOTEST_EXPORT QSGParticleSystem : public QQuickItem
 {
     Q_OBJECT
     Q_PROPERTY(bool running READ isRunning WRITE setRunning NOTIFY runningChanged)
@@ -237,7 +237,7 @@ class Q_AUTOTEST_EXPORT QSGParticleSystem : public QSGItem
     Q_PROPERTY(bool empty READ isEmpty NOTIFY emptyChanged)
 
 public:
-    explicit QSGParticleSystem(QSGItem *parent = 0);
+    explicit QSGParticleSystem(QQuickItem *parent = 0);
     ~QSGParticleSystem();
 
     bool isRunning() const
@@ -296,7 +296,7 @@ public:
     QVector<QSGParticleData*> bySysIdx; //Another reference to the data (data owned by group), but by sysIdx
     QHash<QString, int> groupIds;
     QHash<int, QSGParticleGroupData*> groupData;
-    QSGStochasticEngine* stateEngine;
+    QQuickStochasticEngine* stateEngine;
 
     //Also only here for auto-test usage
     void updateCurrentTime( int currentTime );
diff --git a/src/declarative/particles/qsgpointattractor.cpp b/src/declarative/particles/qsgpointattractor.cpp
index 093e55b16c..8fb7551018 100644
--- a/src/declarative/particles/qsgpointattractor.cpp
+++ b/src/declarative/particles/qsgpointattractor.cpp
@@ -105,7 +105,7 @@ QT_BEGIN_NAMESPACE
 */
 
 
-QSGAttractorAffector::QSGAttractorAffector(QSGItem *parent) :
+QSGAttractorAffector::QSGAttractorAffector(QQuickItem *parent) :
     QSGParticleAffector(parent), m_strength(0.0), m_x(0), m_y(0)
   , m_physics(Velocity), m_proportionalToDistance(Linear)
 {
diff --git a/src/declarative/particles/qsgpointattractor_p.h b/src/declarative/particles/qsgpointattractor_p.h
index 75dd47e331..b7dcf62fc4 100644
--- a/src/declarative/particles/qsgpointattractor_p.h
+++ b/src/declarative/particles/qsgpointattractor_p.h
@@ -75,7 +75,7 @@ public:
         Acceleration
     };
 
-    explicit QSGAttractorAffector(QSGItem *parent = 0);
+    explicit QSGAttractorAffector(QQuickItem *parent = 0);
 
     qreal strength() const
     {
diff --git a/src/declarative/particles/qsgspritegoal.cpp b/src/declarative/particles/qsgspritegoal.cpp
index 260929f28f..4765eb2331 100644
--- a/src/declarative/particles/qsgspritegoal.cpp
+++ b/src/declarative/particles/qsgspritegoal.cpp
@@ -40,8 +40,8 @@
 ****************************************************************************/
 
 #include "qsgspritegoal_p.h"
-#include <private/qsgspriteengine_p.h>
-#include <private/qsgsprite_p.h>
+#include <private/qquickspriteengine_p.h>
+#include <private/qquicksprite_p.h>
 #include "qsgimageparticle_p.h"
 #include <QDebug>
 
@@ -79,7 +79,7 @@ QT_BEGIN_NAMESPACE
     deprecated, use GroupGoal instead
 */
 
-QSGSpriteGoalAffector::QSGSpriteGoalAffector(QSGItem *parent) :
+QSGSpriteGoalAffector::QSGSpriteGoalAffector(QQuickItem *parent) :
     QSGParticleAffector(parent),
     m_goalIdx(-1),
     m_lastEngine(0),
@@ -89,7 +89,7 @@ QSGSpriteGoalAffector::QSGSpriteGoalAffector(QSGItem *parent) :
 {
 }
 
-void QSGSpriteGoalAffector::updateStateIndex(QSGStochasticEngine* e)
+void QSGSpriteGoalAffector::updateStateIndex(QQuickStochasticEngine* e)
 {
     if (m_systemStates){
         m_goalIdx = m_system->groupIds[m_goalState];
@@ -120,7 +120,7 @@ void QSGSpriteGoalAffector::setGoalState(QString arg)
 bool QSGSpriteGoalAffector::affectParticle(QSGParticleData *d, qreal dt)
 {
     Q_UNUSED(dt);
-    QSGStochasticEngine *engine = 0;
+    QQuickStochasticEngine *engine = 0;
     if (!m_systemStates){
         //TODO: Affect all engines
         foreach (QSGParticlePainter *p, m_system->groupData[d->group]->painters)
diff --git a/src/declarative/particles/qsgspritegoal_p.h b/src/declarative/particles/qsgspritegoal_p.h
index 7f20b1ed8a..bdb86d7705 100644
--- a/src/declarative/particles/qsgspritegoal_p.h
+++ b/src/declarative/particles/qsgspritegoal_p.h
@@ -50,7 +50,7 @@ QT_BEGIN_NAMESPACE
 
 QT_MODULE(Declarative)
 
-class QSGStochasticEngine;
+class QQuickStochasticEngine;
 
 class QSGSpriteGoalAffector : public QSGParticleAffector
 {
@@ -59,7 +59,7 @@ class QSGSpriteGoalAffector : public QSGParticleAffector
     Q_PROPERTY(bool jump READ jump WRITE setJump NOTIFY jumpChanged)
     Q_PROPERTY(bool systemStates READ systemStates WRITE setSystemStates NOTIFY systemStatesChanged)
 public:
-    explicit QSGSpriteGoalAffector(QSGItem *parent = 0);
+    explicit QSGSpriteGoalAffector(QQuickItem *parent = 0);
 
     QString goalState() const
     {
@@ -108,10 +108,10 @@ void setSystemStates(bool arg)
 }
 
 private:
-    void updateStateIndex(QSGStochasticEngine* e);
+    void updateStateIndex(QQuickStochasticEngine* e);
     QString m_goalState;
     int m_goalIdx;
-    QSGStochasticEngine* m_lastEngine;
+    QQuickStochasticEngine* m_lastEngine;
     bool m_jump;
     bool m_systemStates;
 
diff --git a/src/declarative/particles/qsgtargetaffector.cpp b/src/declarative/particles/qsgtargetaffector.cpp
index d84bd4dada..86f325075e 100644
--- a/src/declarative/particles/qsgtargetaffector.cpp
+++ b/src/declarative/particles/qsgtargetaffector.cpp
@@ -42,7 +42,7 @@
 #include "qsgtargetaffector_p.h"
 #include <QDebug>
 
-QSGTargetAffector::QSGTargetAffector(QSGItem *parent) :
+QSGTargetAffector::QSGTargetAffector(QQuickItem *parent) :
     QSGParticleAffector(parent), m_targetX(0), m_targetY(0),
     m_targetWidth(0), m_targetHeight(0), m_defaultShape(new QSGParticleExtruder(this)),
     m_targetShape(m_defaultShape), m_targetTime(-1)
diff --git a/src/declarative/particles/qsgtargetaffector_p.h b/src/declarative/particles/qsgtargetaffector_p.h
index a869fe25d4..264ba30504 100644
--- a/src/declarative/particles/qsgtargetaffector_p.h
+++ b/src/declarative/particles/qsgtargetaffector_p.h
@@ -55,7 +55,7 @@ class QSGTargetAffector : public QSGParticleAffector
     Q_PROPERTY(int targetTime READ targetTime WRITE setTargetTime NOTIFY targetTimeChanged)
 
 public:
-    explicit QSGTargetAffector(QSGItem *parent = 0);
+    explicit QSGTargetAffector(QQuickItem *parent = 0);
 
     int targetX() const
     {
diff --git a/src/declarative/particles/qsgtargetdirection_p.h b/src/declarative/particles/qsgtargetdirection_p.h
index 75c3e08cdb..5a412ee870 100644
--- a/src/declarative/particles/qsgtargetdirection_p.h
+++ b/src/declarative/particles/qsgtargetdirection_p.h
@@ -48,14 +48,14 @@ QT_BEGIN_NAMESPACE
 
 QT_MODULE(Declarative)
 
-class QSGItem;
+class QQuickItem;
 class QSGTargetDirection : public QSGDirection
 {
     Q_OBJECT
     Q_PROPERTY(qreal targetX READ targetX WRITE setTargetX NOTIFY targetXChanged)
     Q_PROPERTY(qreal targetY READ targetY WRITE setTargetY NOTIFY targetYChanged)
     //If targetItem is set, X/Y are ignored. Aims at middle of item, use variation for variation
-    Q_PROPERTY(QSGItem* targetItem READ targetItem WRITE setTargetItem NOTIFY targetItemChanged)
+    Q_PROPERTY(QQuickItem* targetItem READ targetItem WRITE setTargetItem NOTIFY targetItemChanged)
 
     Q_PROPERTY(qreal targetVariation READ targetVariation WRITE setTargetVariation NOTIFY targetVariationChanged)
 
@@ -98,7 +98,7 @@ public:
         return m_magnitudeVariation;
     }
 
-    QSGItem* targetItem() const
+    QQuickItem* targetItem() const
     {
         return m_targetItem;
     }
@@ -117,7 +117,7 @@ signals:
 
     void magnitudeVariationChanged(qreal arg);
 
-    void targetItemChanged(QSGItem* arg);
+    void targetItemChanged(QQuickItem* arg);
 
 public slots:
     void setTargetX(qreal arg)
@@ -168,7 +168,7 @@ public slots:
         }
     }
 
-    void setTargetItem(QSGItem* arg)
+    void setTargetItem(QQuickItem* arg)
     {
         if (m_targetItem != arg) {
             m_targetItem = arg;
@@ -183,7 +183,7 @@ private:
     bool m_proportionalMagnitude;
     qreal m_magnitude;
     qreal m_magnitudeVariation;
-    QSGItem *m_targetItem;
+    QQuickItem *m_targetItem;
 };
 
 QT_END_NAMESPACE
diff --git a/src/declarative/particles/qsgtrailemitter.cpp b/src/declarative/particles/qsgtrailemitter.cpp
index 4298908c89..08818ec085 100644
--- a/src/declarative/particles/qsgtrailemitter.cpp
+++ b/src/declarative/particles/qsgtrailemitter.cpp
@@ -53,7 +53,7 @@ QT_BEGIN_NAMESPACE
     This element emits logical particles into the ParticleSystem, with the
     starting positions based on those of other logical particles.
 */
-QSGTrailEmitter::QSGTrailEmitter(QSGItem *parent) :
+QSGTrailEmitter::QSGTrailEmitter(QQuickItem *parent) :
     QSGParticleEmitter(parent)
   , m_particlesPerParticlePerSecond(0)
   , m_lastTimeStamp(0)
diff --git a/src/declarative/particles/qsgtrailemitter_p.h b/src/declarative/particles/qsgtrailemitter_p.h
index 255dd85cef..a629f56695 100644
--- a/src/declarative/particles/qsgtrailemitter_p.h
+++ b/src/declarative/particles/qsgtrailemitter_p.h
@@ -66,7 +66,7 @@ public:
     enum EmitSize {
         ParticleSize = -2//Anything less than 0 will do
     };
-    explicit QSGTrailEmitter(QSGItem *parent = 0);
+    explicit QSGTrailEmitter(QQuickItem *parent = 0);
     virtual void emitWindow(int timeStamp);
     virtual void reset();
 
diff --git a/src/declarative/particles/qsgturbulence.cpp b/src/declarative/particles/qsgturbulence.cpp
index 30d36cccb9..957f6f1f62 100644
--- a/src/declarative/particles/qsgturbulence.cpp
+++ b/src/declarative/particles/qsgturbulence.cpp
@@ -78,7 +78,7 @@ QT_BEGIN_NAMESPACE
     A default image will be used if none is provided.
 */
 
-QSGTurbulenceAffector::QSGTurbulenceAffector(QSGItem *parent) :
+QSGTurbulenceAffector::QSGTurbulenceAffector(QQuickItem *parent) :
     QSGParticleAffector(parent),
     m_strength(10), m_lastT(0), m_gridSize(0), m_field(0), m_vectorField(0), m_inited(false)
 {
diff --git a/src/declarative/particles/qsgturbulence_p.h b/src/declarative/particles/qsgturbulence_p.h
index ef3e9ec678..022bf3577b 100644
--- a/src/declarative/particles/qsgturbulence_p.h
+++ b/src/declarative/particles/qsgturbulence_p.h
@@ -59,7 +59,7 @@ class QSGTurbulenceAffector : public QSGParticleAffector
     Q_PROPERTY(qreal strength READ strength WRITE setStrength NOTIFY strengthChanged)
     Q_PROPERTY(QUrl noiseSource READ noiseSource WRITE setNoiseSource NOTIFY noiseSourceChanged)
     public:
-    explicit QSGTurbulenceAffector(QSGItem *parent = 0);
+    explicit QSGTurbulenceAffector(QQuickItem *parent = 0);
     ~QSGTurbulenceAffector();
     virtual void affectSystem(qreal dt);
 
diff --git a/src/declarative/particles/qsgv8particledata.cpp b/src/declarative/particles/qsgv8particledata.cpp
index 7e2d7ae443..a7a2e103a2 100644
--- a/src/declarative/particles/qsgv8particledata.cpp
+++ b/src/declarative/particles/qsgv8particledata.cpp
@@ -193,7 +193,7 @@ QT_BEGIN_NAMESPACE
 
 
 
-//### Particle data handles are not locked to within certain scopes like QSGContext2D, but there's no way to reload either...
+//### Particle data handles are not locked to within certain scopes like QQuickContext2D, but there's no way to reload either...
 class QV8ParticleDataResource : public QV8ObjectResource
 {
     V8_RESOURCE_TYPE(ParticleDataType)
diff --git a/src/declarative/particles/qsgwander.cpp b/src/declarative/particles/qsgwander.cpp
index d3e87fb241..2a861c2ce6 100644
--- a/src/declarative/particles/qsgwander.cpp
+++ b/src/declarative/particles/qsgwander.cpp
@@ -79,7 +79,7 @@ QT_BEGIN_NAMESPACE
     \endlist
 */
 
-QSGWanderAffector::QSGWanderAffector(QSGItem *parent) :
+QSGWanderAffector::QSGWanderAffector(QQuickItem *parent) :
     QSGParticleAffector(parent), m_xVariance(0), m_yVariance(0), m_pace(0)
     , m_affectedParameter(Velocity)
 {
diff --git a/src/declarative/particles/qsgwander_p.h b/src/declarative/particles/qsgwander_p.h
index 46ad6ea3a2..6447e2f49e 100644
--- a/src/declarative/particles/qsgwander_p.h
+++ b/src/declarative/particles/qsgwander_p.h
@@ -76,7 +76,7 @@ public:
         Acceleration
     };
 
-    explicit QSGWanderAffector(QSGItem *parent = 0);
+    explicit QSGWanderAffector(QQuickItem *parent = 0);
     ~QSGWanderAffector();
     virtual void reset(int systemIdx);
 
diff --git a/src/declarative/qml/qdeclarativeengine.cpp b/src/declarative/qml/qdeclarativeengine.cpp
index 3f12431767..4865a33461 100644
--- a/src/declarative/qml/qdeclarativeengine.cpp
+++ b/src/declarative/qml/qdeclarativeengine.cpp
@@ -83,7 +83,7 @@
 #include <private/qobject_p.h>
 
 #include <private/qdeclarativeutilmodule_p.h>
-#include <private/qsgitemsmodule_p.h>
+#include <private/qquickitemsmodule_p.h>
 #include <private/qsgparticlesmodule_p.h>
 
 #ifdef Q_OS_WIN // for %APPDATA%
@@ -344,7 +344,7 @@ QDeclarativeEnginePrivate::QDeclarativeEnginePrivate(QDeclarativeEngine *e)
         qt_QmlQtModule_registered = true;
         QDeclarativeUtilModule::defineModule();
         QDeclarativeEnginePrivate::defineModule();
-        QSGItemsModule::defineModule();
+        QQuickItemsModule::defineModule();
         QSGParticlesModule::defineModule();
         QDeclarativeValueTypeFactory::registerValueTypes();
     }
diff --git a/src/declarative/qml/v4/qv4bindings.cpp b/src/declarative/qml/v4/qv4bindings.cpp
index 2e8a360f36..0822321255 100644
--- a/src/declarative/qml/v4/qv4bindings.cpp
+++ b/src/declarative/qml/v4/qv4bindings.cpp
@@ -48,7 +48,7 @@
 
 #include <private/qdeclarativefastproperties_p.h>
 #include <private/qdeclarativedebugtrace_p.h>
-#include <private/qsganchors_p_p.h> // For AnchorLine
+#include <private/qquickanchors_p_p.h> // For AnchorLine
 
 #include <QtDeclarative/qdeclarativeinfo.h>
 #include <QtCore/qnumeric.h>
@@ -444,9 +444,9 @@ static bool testCompareVariants(const QVariant &qtscriptRaw, const QVariant &v4)
         QDeclarative1AnchorLine ra = qvariant_cast<QDeclarative1AnchorLine>(v4);
 
         return la == ra;
-    } else if (type == qMetaTypeId<QSGAnchorLine>()) {
-        QSGAnchorLine la = qvariant_cast<QSGAnchorLine>(qtscript);
-        QSGAnchorLine ra = qvariant_cast<QSGAnchorLine>(v4);
+    } else if (type == qMetaTypeId<QQuickAnchorLine>()) {
+        QQuickAnchorLine la = qvariant_cast<QQuickAnchorLine>(qtscript);
+        QQuickAnchorLine ra = qvariant_cast<QQuickAnchorLine>(v4);
 
         return la == ra;
     } else if (type == QMetaType::Double) {
@@ -529,8 +529,8 @@ static void testBindingResult(const QString &binding, int line, int column,
         default:
             if (resultType == qMetaTypeId<QDeclarative1AnchorLine>()) {
                 v4value = qVariantFromValue<QDeclarative1AnchorLine>(*(QDeclarative1AnchorLine *)result.typeDataPtr());
-            } else if (resultType == qMetaTypeId<QSGAnchorLine>()) {
-                v4value = qVariantFromValue<QSGAnchorLine>(*(QSGAnchorLine *)result.typeDataPtr());
+            } else if (resultType == qMetaTypeId<QQuickAnchorLine>()) {
+                v4value = qVariantFromValue<QQuickAnchorLine>(*(QQuickAnchorLine *)result.typeDataPtr());
             } else {
                 iserror = true;
                 v4Result = "Unknown V4 type";
diff --git a/src/declarative/qml/v4/qv4compiler.cpp b/src/declarative/qml/v4/qv4compiler.cpp
index ba739a9aab..a9d2338307 100644
--- a/src/declarative/qml/v4/qv4compiler.cpp
+++ b/src/declarative/qml/v4/qv4compiler.cpp
@@ -48,7 +48,7 @@
 #include <private/qdeclarativejsast_p.h>
 #include <private/qdeclarativefastproperties_p.h>
 #include <private/qdeclarativejsengine_p.h>
-#include <private/qsganchors_p_p.h> // For AnchorLine
+#include <private/qquickanchors_p_p.h> // For AnchorLine
 
 QT_BEGIN_NAMESPACE
 
@@ -341,7 +341,7 @@ void QV4CompilerPrivate::visitName(IR::Name *e)
         default:
             if (propTy == qMetaTypeId<QDeclarative1AnchorLine>()) {
                 regType = PODValueType;
-            } else if (propTy == qMetaTypeId<QSGAnchorLine>()) {
+            } else if (propTy == qMetaTypeId<QQuickAnchorLine>()) {
                 regType = PODValueType;
             } else if (QDeclarativeMetaType::isQObject(propTy)) {
                 regType = QObjectStarType;
@@ -940,7 +940,7 @@ void QV4CompilerPrivate::visitRet(IR::Ret *s)
             test.regType = qMetaTypeId<QDeclarative1AnchorLine>();
             break;
         case IR::SGAnchorLineType:
-            test.regType = qMetaTypeId<QSGAnchorLine>();
+            test.regType = qMetaTypeId<QQuickAnchorLine>();
             break;
         case IR::ObjectType:
             test.regType = QMetaType::QObjectStar;
diff --git a/src/declarative/qml/v4/qv4irbuilder.cpp b/src/declarative/qml/v4/qv4irbuilder.cpp
index 760c2bc23d..cfe77217fd 100644
--- a/src/declarative/qml/v4/qv4irbuilder.cpp
+++ b/src/declarative/qml/v4/qv4irbuilder.cpp
@@ -42,7 +42,7 @@
 #include "qv4irbuilder_p.h"
 #include "qv4compiler_p_p.h"
 
-#include <private/qsganchors_p_p.h> // For AnchorLine
+#include <private/qquickanchors_p_p.h> // For AnchorLine
 #include <private/qdeclarativetypenamecache_p.h>
 
 DEFINE_BOOL_CONFIG_OPTION(qmlVerboseCompiler, QML_VERBOSE_COMPILER)
@@ -72,7 +72,7 @@ static IR::Type irTypeFromVariantType(int t, QDeclarativeEnginePrivate *engine,
     default:
         if (t == qMetaTypeId<QDeclarative1AnchorLine>())
             return IR::AnchorLineType;
-        else if (t == qMetaTypeId<QSGAnchorLine>())
+        else if (t == qMetaTypeId<QQuickAnchorLine>())
             return IR::SGAnchorLineType;
         else if (const QMetaObject *m = engine->metaObjectForType(t)) {
             meta = m;
diff --git a/src/declarative/scenegraph/qsgadaptationlayer_p.h b/src/declarative/scenegraph/qsgadaptationlayer_p.h
index f1e9a89f43..0ad60913b3 100644
--- a/src/declarative/scenegraph/qsgadaptationlayer_p.h
+++ b/src/declarative/scenegraph/qsgadaptationlayer_p.h
@@ -44,7 +44,6 @@
 
 #include "qsgnode.h"
 #include "qsgtexture.h"
-#include <private/qsgtext_p.h>
 #include <QtCore/qobject.h>
 #include <QtCore/qrect.h>
 #include <QtGui/qbrush.h>
@@ -53,7 +52,8 @@
 #include <QtGui/qglyphrun.h>
 #include <QtCore/qurl.h>
 
-#include <private/qsgtext_p.h>
+// ### remove
+#include <private/qquicktext_p.h>
 
 QT_BEGIN_HEADER
 
@@ -109,7 +109,7 @@ public:
 
     virtual void setGlyphs(const QPointF &position, const QGlyphRun &glyphs) = 0;
     virtual void setColor(const QColor &color) = 0;
-    virtual void setStyle(QSGText::TextStyle style) = 0;
+    virtual void setStyle(QQuickText::TextStyle style) = 0;
     virtual void setStyleColor(const QColor &color) = 0;
     virtual QPointF baseLine() const = 0;
 
diff --git a/src/declarative/scenegraph/qsgcontext.cpp b/src/declarative/scenegraph/qsgcontext.cpp
index 9016b81278..466ae5919e 100644
--- a/src/declarative/scenegraph/qsgcontext.cpp
+++ b/src/declarative/scenegraph/qsgcontext.cpp
@@ -322,7 +322,7 @@ QSGGlyphNode *QSGContext::createGlyphNode()
     Factory function for the scene graph renderers.
 
     The renderers are used for the toplevel renderer and once for every
-    QSGShaderEffectSource used in the QML scene.
+    QQuickShaderEffectSource used in the QML scene.
  */
 QSGRenderer *QSGContext::createRenderer()
 {
diff --git a/src/declarative/scenegraph/qsgdefaultglyphnode_p.h b/src/declarative/scenegraph/qsgdefaultglyphnode_p.h
index 993eabcd3c..f9d163c425 100644
--- a/src/declarative/scenegraph/qsgdefaultglyphnode_p.h
+++ b/src/declarative/scenegraph/qsgdefaultglyphnode_p.h
@@ -64,7 +64,7 @@ public:
     virtual void setColor(const QColor &color);
 
     virtual void setPreferredAntialiasingMode(AntialiasingMode) { }
-    virtual void setStyle(QSGText::TextStyle) { }
+    virtual void setStyle(QQuickText::TextStyle) { }
     virtual void setStyleColor(const QColor &) { }
 
     virtual void update() { }
diff --git a/src/declarative/scenegraph/qsgdistancefieldglyphnode.cpp b/src/declarative/scenegraph/qsgdistancefieldglyphnode.cpp
index 3586c9daa2..5426c3b40a 100644
--- a/src/declarative/scenegraph/qsgdistancefieldglyphnode.cpp
+++ b/src/declarative/scenegraph/qsgdistancefieldglyphnode.cpp
@@ -51,7 +51,7 @@ QSGDistanceFieldGlyphNode::QSGDistanceFieldGlyphNode(QSGDistanceFieldGlyphCacheM
     , m_glyph_cacheManager(cacheManager)
     , m_glyph_cache(0)
     , m_geometry(QSGGeometry::defaultAttributes_TexturedPoint2D(), 0)
-    , m_style(QSGText::Normal)
+    , m_style(QQuickText::Normal)
     , m_antialiasingMode(GrayAntialiasing)
     , m_dirtyFont(false)
     , m_dirtyGeometry(false)
@@ -102,7 +102,7 @@ void QSGDistanceFieldGlyphNode::setGlyphs(const QPointF &position, const QGlyphR
     m_dirtyMaterial = true;
 }
 
-void QSGDistanceFieldGlyphNode::setStyle(QSGText::TextStyle style)
+void QSGDistanceFieldGlyphNode::setStyle(QQuickText::TextStyle style)
 {
     if (m_style == style)
         return;
@@ -255,7 +255,7 @@ void QSGDistanceFieldGlyphNode::updateMaterial()
 {
     delete m_material;
 
-    if (m_style == QSGText::Normal) {
+    if (m_style == QQuickText::Normal) {
         switch (m_antialiasingMode) {
         case HighQualitySubPixelAntialiasing:
             m_material = new QSGHiQSubPixelDistanceFieldTextMaterial;
@@ -270,11 +270,11 @@ void QSGDistanceFieldGlyphNode::updateMaterial()
         }
     } else {
         QSGDistanceFieldStyledTextMaterial *material;
-        if (m_style == QSGText::Outline) {
+        if (m_style == QQuickText::Outline) {
             material = new QSGDistanceFieldOutlineTextMaterial;
         } else {
             QSGDistanceFieldShiftedStyleTextMaterial *sMaterial = new QSGDistanceFieldShiftedStyleTextMaterial;
-            if (m_style == QSGText::Raised)
+            if (m_style == QQuickText::Raised)
                 sMaterial->setShift(QPointF(0.0, 1.0));
             else
                 sMaterial->setShift(QPointF(0.0, -1.0));
diff --git a/src/declarative/scenegraph/qsgdistancefieldglyphnode_p.h b/src/declarative/scenegraph/qsgdistancefieldglyphnode_p.h
index 9004549a3a..1d8bcea868 100644
--- a/src/declarative/scenegraph/qsgdistancefieldglyphnode_p.h
+++ b/src/declarative/scenegraph/qsgdistancefieldglyphnode_p.h
@@ -44,7 +44,8 @@
 
 #include <private/qsgadaptationlayer_p.h>
 #include "qsgtexture.h"
-#include <private/qsgtext_p.h>
+
+#include <private/qquicktext_p.h>
 
 QT_BEGIN_HEADER
 
@@ -67,7 +68,7 @@ public:
 
     virtual void setPreferredAntialiasingMode(AntialiasingMode mode);
 
-    virtual void setStyle(QSGText::TextStyle style);
+    virtual void setStyle(QQuickText::TextStyle style);
     virtual void setStyleColor(const QColor &color);
 
     virtual void update();
@@ -85,7 +86,7 @@ private:
     QSGDistanceFieldGlyphCacheManager *m_glyph_cacheManager;
     QSGDistanceFieldGlyphCache *m_glyph_cache;
     QSGGeometry m_geometry;
-    QSGText::TextStyle m_style;
+    QQuickText::TextStyle m_style;
     QColor m_styleColor;
     AntialiasingMode m_antialiasingMode;
 
diff --git a/src/declarative/scenegraph/util/qsgpainternode.cpp b/src/declarative/scenegraph/util/qsgpainternode.cpp
index fb35467ce2..3f07f20695 100644
--- a/src/declarative/scenegraph/util/qsgpainternode.cpp
+++ b/src/declarative/scenegraph/util/qsgpainternode.cpp
@@ -41,8 +41,8 @@
 
 #include "qsgpainternode_p.h"
 
-#include "qsgpainteditem.h"
-#include <private/qsgpainteditem_p.h>
+#include <private/qquickpainteditem_p.h>
+
 #include <private/qsgcontext_p.h>
 #include <private/qopenglextensions_p.h>
 #include <qopenglframebufferobject.h>
@@ -105,10 +105,10 @@ void QSGPainterTexture::bind()
     m_dirty_rect = QRect();
 }
 
-QSGPainterNode::QSGPainterNode(QSGPaintedItem *item)
+QSGPainterNode::QSGPainterNode(QQuickPaintedItem *item)
     : QSGGeometryNode()
-    , m_preferredRenderTarget(QSGPaintedItem::Image)
-    , m_actualRenderTarget(QSGPaintedItem::Image)
+    , m_preferredRenderTarget(QQuickPaintedItem::Image)
+    , m_actualRenderTarget(QQuickPaintedItem::Image)
     , m_item(item)
     , m_fbo(0)
     , m_multisampledFbo(0)
@@ -130,7 +130,7 @@ QSGPainterNode::QSGPainterNode(QSGPaintedItem *item)
     , m_dirtyRenderTarget(false)
     , m_dirtyTexture(false)
 {
-    m_context = static_cast<QSGPaintedItemPrivate *>(QObjectPrivate::get(item))->sceneGraphContext();
+    m_context = static_cast<QQuickPaintedItemPrivate *>(QObjectPrivate::get(item))->sceneGraphContext();
 
     setMaterial(&m_materialO);
     setOpaqueMaterial(&m_material);
@@ -150,7 +150,7 @@ void QSGPainterNode::paint()
     QRect dirtyRect = m_dirtyRect.isNull() ? QRect(0, 0, m_size.width(), m_size.height()) : m_dirtyRect;
 
     QPainter painter;
-    if (m_actualRenderTarget == QSGPaintedItem::Image)
+    if (m_actualRenderTarget == QQuickPaintedItem::Image)
         painter.begin(&m_image);
     else {
         if (!m_gl_device) {
@@ -188,7 +188,7 @@ void QSGPainterNode::paint()
     m_item->paint(&painter);
     painter.end();
 
-    if (m_actualRenderTarget == QSGPaintedItem::Image) {
+    if (m_actualRenderTarget == QQuickPaintedItem::Image) {
         m_texture->setImage(m_image);
         m_texture->setDirtyRect(dirtyRect);
     } else if (m_multisampledFbo) {
@@ -234,7 +234,7 @@ void QSGPainterNode::updateTexture()
 void QSGPainterNode::updateGeometry()
 {
     QRectF source;
-    if (m_actualRenderTarget == QSGPaintedItem::Image)
+    if (m_actualRenderTarget == QQuickPaintedItem::Image)
         source = QRectF(0, 0, 1, 1);
     else
         source = QRectF(0, 0, qreal(m_size.width()) / m_fboSize.width(), qreal(m_size.height()) / m_fboSize.height());
@@ -255,14 +255,14 @@ void QSGPainterNode::updateRenderTarget()
 
     m_dirtyContents = true;
 
-    QSGPaintedItem::RenderTarget oldTarget = m_actualRenderTarget;
-    if (m_preferredRenderTarget == QSGPaintedItem::Image) {
-        m_actualRenderTarget = QSGPaintedItem::Image;
+    QQuickPaintedItem::RenderTarget oldTarget = m_actualRenderTarget;
+    if (m_preferredRenderTarget == QQuickPaintedItem::Image) {
+        m_actualRenderTarget = QQuickPaintedItem::Image;
     } else {
         if (!m_multisamplingSupported && m_smoothPainting)
-            m_actualRenderTarget = QSGPaintedItem::Image;
+            m_actualRenderTarget = QQuickPaintedItem::Image;
         else
-            m_actualRenderTarget = QSGPaintedItem::FramebufferObject;
+            m_actualRenderTarget = QQuickPaintedItem::FramebufferObject;
     }
     if (oldTarget != m_actualRenderTarget) {
         m_image = QImage();
@@ -271,7 +271,7 @@ void QSGPainterNode::updateRenderTarget()
         m_fbo = m_multisampledFbo = 0;
     }
 
-    if (m_actualRenderTarget == QSGPaintedItem::FramebufferObject) {
+    if (m_actualRenderTarget == QQuickPaintedItem::FramebufferObject) {
         const QOpenGLContext *ctx = m_context->glContext();
         if (m_fbo && !m_dirtyGeometry && (!ctx->format().samples() || !m_multisamplingSupported))
             return;
@@ -309,7 +309,7 @@ void QSGPainterNode::updateRenderTarget()
     }
 
     QSGPainterTexture *texture = new QSGPainterTexture;
-    if (m_actualRenderTarget == QSGPaintedItem::Image) {
+    if (m_actualRenderTarget == QQuickPaintedItem::Image) {
         texture->setOwnsTexture(true);
         texture->setTextureSize(m_size);
     } else {
@@ -341,7 +341,7 @@ void QSGPainterNode::updateFBOSize()
     m_fboSize = QSize(fboWidth, fboHeight);
 }
 
-void QSGPainterNode::setPreferredRenderTarget(QSGPaintedItem::RenderTarget target)
+void QSGPainterNode::setPreferredRenderTarget(QQuickPaintedItem::RenderTarget target)
 {
     if (m_preferredRenderTarget == target)
         return;
@@ -446,7 +446,7 @@ void QSGPainterNode::setFastFBOResizing(bool dynamic)
 
 QImage QSGPainterNode::toImage() const
 {
-    if (m_actualRenderTarget == QSGPaintedItem::Image)
+    if (m_actualRenderTarget == QQuickPaintedItem::Image)
         return m_image;
     else
         return m_fbo->toImage();
diff --git a/src/declarative/scenegraph/util/qsgpainternode_p.h b/src/declarative/scenegraph/util/qsgpainternode_p.h
index e30dc7c30f..c838ed1a0c 100644
--- a/src/declarative/scenegraph/util/qsgpainternode_p.h
+++ b/src/declarative/scenegraph/util/qsgpainternode_p.h
@@ -45,7 +45,8 @@
 #include "qsgnode.h"
 #include "qsgtexturematerial.h"
 #include "qsgtexture_p.h"
-#include "qsgpainteditem.h"
+
+#include <qquickpainteditem.h>
 
 #include <QtGui/qcolor.h>
 
@@ -74,10 +75,10 @@ private:
 class Q_DECLARATIVE_EXPORT QSGPainterNode : public QSGGeometryNode
 {
 public:
-    QSGPainterNode(QSGPaintedItem *item);
+    QSGPainterNode(QQuickPaintedItem *item);
     virtual ~QSGPainterNode();
 
-    void setPreferredRenderTarget(QSGPaintedItem::RenderTarget target);
+    void setPreferredRenderTarget(QQuickPaintedItem::RenderTarget target);
 
     void setSize(const QSize &size);
     QSize size() const { return m_size; }
@@ -118,10 +119,10 @@ private:
 
     QSGContext *m_context;
 
-    QSGPaintedItem::RenderTarget m_preferredRenderTarget;
-    QSGPaintedItem::RenderTarget m_actualRenderTarget;
+    QQuickPaintedItem::RenderTarget m_preferredRenderTarget;
+    QQuickPaintedItem::RenderTarget m_actualRenderTarget;
 
-    QSGPaintedItem *m_item;
+    QQuickPaintedItem *m_item;
 
     QOpenGLFramebufferObject *m_fbo;
     QOpenGLFramebufferObject *m_multisampledFbo;
diff --git a/src/declarative/scenegraph/util/qsgtextureprovider.cpp b/src/declarative/scenegraph/util/qsgtextureprovider.cpp
index 5605f28602..10faf2e5d4 100644
--- a/src/declarative/scenegraph/util/qsgtextureprovider.cpp
+++ b/src/declarative/scenegraph/util/qsgtextureprovider.cpp
@@ -41,9 +41,6 @@
 
 #include "qsgtextureprovider_p.h"
 
-#include <private/qsgimage_p.h>
-#include <private/qsgshadereffectsource_p.h>
-
 #ifndef GL_CLAMP_TO_EDGE
 #define GL_CLAMP_TO_EDGE 0x812F
 #endif
diff --git a/src/declarative/util/qdeclarativepath_p.h b/src/declarative/util/qdeclarativepath_p.h
index e449e23085..537afb3b0b 100644
--- a/src/declarative/util/qdeclarativepath_p.h
+++ b/src/declarative/util/qdeclarativepath_p.h
@@ -426,7 +426,7 @@ private:
 private:
     Q_DISABLE_COPY(QDeclarativePath)
     Q_DECLARE_PRIVATE(QDeclarativePath)
-    friend class QSGPathAnimationUpdater;
+    friend class QQuickPathAnimationUpdater;
 
 public:
     QPainterPath createPath(const QPointF &startPoint, const QPointF &endPoint, const QStringList &attributes, qreal &pathLength, QList<AttributePoint> &attributePoints, bool *closed = 0);
diff --git a/src/imports/testlib/main.cpp b/src/imports/testlib/main.cpp
index a6fb992fed..daec00d38c 100644
--- a/src/imports/testlib/main.cpp
+++ b/src/imports/testlib/main.cpp
@@ -46,7 +46,7 @@
 #include "QtQuickTest/private/quicktestresult_p.h"
 #include "QtQuickTest/private/quicktestevent_p.h"
 #include "private/qtestoptions_p.h"
-#include "QtDeclarative/qsgitem.h"
+#include "QtDeclarative/qquickitem.h"
 #include <QtDeclarative/private/qdeclarativeengine_p.h>
 
 QML_DECLARE_TYPE(QuickTestResult)
diff --git a/src/plugins/qmltooling/qmldbg_inspector/abstractviewinspector.h b/src/plugins/qmltooling/qmldbg_inspector/abstractviewinspector.h
index 7d9ad955dc..2ac30bc005 100644
--- a/src/plugins/qmltooling/qmldbg_inspector/abstractviewinspector.h
+++ b/src/plugins/qmltooling/qmldbg_inspector/abstractviewinspector.h
@@ -64,7 +64,7 @@ class AbstractTool;
 class ToolBox;
 
 /*
- * The common code between QSGView and QDeclarativeView inspectors lives here,
+ * The common code between QQuickView and QDeclarativeView inspectors lives here,
  */
 class AbstractViewInspector : public QObject
 {
diff --git a/src/plugins/qmltooling/qmldbg_inspector/qdeclarativeinspectorplugin.cpp b/src/plugins/qmltooling/qmldbg_inspector/qdeclarativeinspectorplugin.cpp
index 82d8e7a75f..51dfda669a 100644
--- a/src/plugins/qmltooling/qmldbg_inspector/qdeclarativeinspectorplugin.cpp
+++ b/src/plugins/qmltooling/qmldbg_inspector/qdeclarativeinspectorplugin.cpp
@@ -46,7 +46,7 @@
 
 #include <QtCore/qplugin.h>
 #include <QtDeclarative/private/qdeclarativeinspectorservice_p.h>
-#include <QtDeclarative/QSGView>
+#include <QtDeclarative/QQuickView>
 
 namespace QmlJSDebugger {
 
@@ -71,7 +71,7 @@ void QDeclarativeInspectorPlugin::activate()
     QObject *firstView = views.first();
     if (QDeclarativeView *declarativeView = qobject_cast<QDeclarativeView*>(firstView))
         m_inspector = new QDeclarativeViewInspector(declarativeView, declarativeView);
-    else if (QSGView *sgView = qobject_cast<QSGView*>(firstView))
+    else if (QQuickView *sgView = qobject_cast<QQuickView*>(firstView))
         m_inspector = new SGViewInspector(sgView, sgView);
 }
 
diff --git a/src/plugins/qmltooling/qmldbg_inspector/sghighlight.cpp b/src/plugins/qmltooling/qmldbg_inspector/sghighlight.cpp
index 4488214a31..1af789d389 100644
--- a/src/plugins/qmltooling/qmldbg_inspector/sghighlight.cpp
+++ b/src/plugins/qmltooling/qmldbg_inspector/sghighlight.cpp
@@ -45,13 +45,13 @@
 
 namespace QmlJSDebugger {
 
-SGHighlight::SGHighlight(QSGItem *item, QSGItem *parent)
-    : QSGPaintedItem(parent)
+SGHighlight::SGHighlight(QQuickItem *item, QQuickItem *parent)
+    : QQuickPaintedItem(parent)
 {
     setItem(item);
 }
 
-void SGHighlight::setItem(QSGItem *item)
+void SGHighlight::setItem(QQuickItem *item)
 {
     if (m_item)
         m_item.data()->disconnect(this);
@@ -72,7 +72,7 @@ void SGHighlight::setItem(QSGItem *item)
 
 void SGHighlight::adjust()
 {
-    const QSGItem *item = m_item.data();
+    const QQuickItem *item = m_item.data();
     setSize(QSizeF(item->width(), item->height()));
     setPos(parentItem()->mapFromItem(item->parentItem(), item->pos()));
     setRotation(item->rotation());
diff --git a/src/plugins/qmltooling/qmldbg_inspector/sghighlight.h b/src/plugins/qmltooling/qmldbg_inspector/sghighlight.h
index f3e8edd442..8d5659cc5d 100644
--- a/src/plugins/qmltooling/qmldbg_inspector/sghighlight.h
+++ b/src/plugins/qmltooling/qmldbg_inspector/sghighlight.h
@@ -43,25 +43,25 @@
 #define SGHIGHLIGHT_H
 
 #include <QtCore/QWeakPointer>
-#include <QtDeclarative/QSGPaintedItem>
+#include <QtDeclarative/QQuickPaintedItem>
 
 namespace QmlJSDebugger {
 
-class SGHighlight : public QSGPaintedItem
+class SGHighlight : public QQuickPaintedItem
 {
     Q_OBJECT
 
 public:
-    SGHighlight(QSGItem *parent) : QSGPaintedItem(parent) {}
-    SGHighlight(QSGItem *item, QSGItem *parent);
+    SGHighlight(QQuickItem *parent) : QQuickPaintedItem(parent) {}
+    SGHighlight(QQuickItem *item, QQuickItem *parent);
 
-    void setItem(QSGItem *item);
+    void setItem(QQuickItem *item);
 
 private slots:
     void adjust();
 
 private:
-    QWeakPointer<QSGItem> m_item;
+    QWeakPointer<QQuickItem> m_item;
 };
 
 /**
@@ -70,7 +70,7 @@ private:
 class SGSelectionHighlight : public SGHighlight
 {
 public:
-    SGSelectionHighlight(QSGItem *item, QSGItem *parent)
+    SGSelectionHighlight(QQuickItem *item, QQuickItem *parent)
         : SGHighlight(item, parent)
     {}
 
@@ -83,7 +83,7 @@ public:
 class SGHoverHighlight : public SGHighlight
 {
 public:
-    SGHoverHighlight(QSGItem *parent)
+    SGHoverHighlight(QQuickItem *parent)
         : SGHighlight(parent)
     {
         setZ(1); // hover highlight on top of selection highlight
diff --git a/src/plugins/qmltooling/qmldbg_inspector/sgselectiontool.cpp b/src/plugins/qmltooling/qmldbg_inspector/sgselectiontool.cpp
index 653c059d53..bdfc28f5ec 100644
--- a/src/plugins/qmltooling/qmldbg_inspector/sgselectiontool.cpp
+++ b/src/plugins/qmltooling/qmldbg_inspector/sgselectiontool.cpp
@@ -46,8 +46,8 @@
 
 #include <QtWidgets/QMenu>
 #include <QtGui/QMouseEvent>
-#include <QtDeclarative/QSGView>
-#include <QtDeclarative/QSGItem>
+#include <QtDeclarative/QQuickView>
+#include <QtDeclarative/QQuickItem>
 
 namespace QmlJSDebugger {
 
@@ -65,17 +65,17 @@ void SGSelectionTool::leaveEvent(QEvent *)
 void SGSelectionTool::mousePressEvent(QMouseEvent *event)
 {
     if (event->button() == Qt::LeftButton) {
-        if (QSGItem *item = inspector()->topVisibleItemAt(event->pos()))
-            inspector()->setSelectedItems(QList<QSGItem*>() << item);
+        if (QQuickItem *item = inspector()->topVisibleItemAt(event->pos()))
+            inspector()->setSelectedItems(QList<QQuickItem*>() << item);
     } else if (event->button() == Qt::RightButton) {
-        QList<QSGItem*> items = inspector()->itemsAt(event->pos());
+        QList<QQuickItem*> items = inspector()->itemsAt(event->pos());
         createContextMenu(items, event->globalPos());
     }
 }
 
 void SGSelectionTool::hoverMoveEvent(QMouseEvent *event)
 {
-    QSGItem *item = inspector()->topVisibleItemAt(event->pos());
+    QQuickItem *item = inspector()->topVisibleItemAt(event->pos());
     if (!item) {
         m_hoverHighlight->setVisible(false);
     } else {
@@ -84,16 +84,16 @@ void SGSelectionTool::hoverMoveEvent(QMouseEvent *event)
     }
 }
 
-void SGSelectionTool::createContextMenu(const QList<QSGItem *> &items, QPoint pos)
+void SGSelectionTool::createContextMenu(const QList<QQuickItem *> &items, QPoint pos)
 {
     QMenu contextMenu;
     connect(&contextMenu, SIGNAL(hovered(QAction*)),
             this, SLOT(contextMenuElementHovered(QAction*)));
 
-    const QList<QSGItem*> selectedItems = inspector()->selectedItems();
+    const QList<QQuickItem*> selectedItems = inspector()->selectedItems();
     int shortcutKey = Qt::Key_1;
 
-    foreach (QSGItem *item, items) {
+    foreach (QQuickItem *item, items) {
         const QString title = inspector()->titleForItem(item);
         QAction *elementAction = contextMenu.addAction(title);
         elementAction->setData(QVariant::fromValue(item));
@@ -117,14 +117,14 @@ void SGSelectionTool::createContextMenu(const QList<QSGItem *> &items, QPoint po
 
 void SGSelectionTool::contextMenuElementHovered(QAction *action)
 {
-    if (QSGItem *item = action->data().value<QSGItem*>())
+    if (QQuickItem *item = action->data().value<QQuickItem*>())
         m_hoverHighlight->setItem(item);
 }
 
 void SGSelectionTool::contextMenuElementSelected()
 {
-    if (QSGItem *item = static_cast<QAction*>(sender())->data().value<QSGItem*>())
-        inspector()->setSelectedItems(QList<QSGItem*>() << item);
+    if (QQuickItem *item = static_cast<QAction*>(sender())->data().value<QQuickItem*>())
+        inspector()->setSelectedItems(QList<QQuickItem*>() << item);
 }
 
 SGViewInspector *SGSelectionTool::inspector() const
diff --git a/src/plugins/qmltooling/qmldbg_inspector/sgselectiontool.h b/src/plugins/qmltooling/qmldbg_inspector/sgselectiontool.h
index 9f2171f572..587701733d 100644
--- a/src/plugins/qmltooling/qmldbg_inspector/sgselectiontool.h
+++ b/src/plugins/qmltooling/qmldbg_inspector/sgselectiontool.h
@@ -48,7 +48,7 @@
 #include <QtCore/QPoint>
 
 QT_FORWARD_DECLARE_CLASS(QAction)
-QT_FORWARD_DECLARE_CLASS(QSGItem)
+QT_FORWARD_DECLARE_CLASS(QQuickItem)
 
 namespace QmlJSDebugger {
 
@@ -79,7 +79,7 @@ private slots:
     void contextMenuElementSelected();
 
 private:
-    void createContextMenu(const QList<QSGItem*> &items, QPoint pos);
+    void createContextMenu(const QList<QQuickItem*> &items, QPoint pos);
 
     SGViewInspector *inspector() const;
 
diff --git a/src/plugins/qmltooling/qmldbg_inspector/sgviewinspector.cpp b/src/plugins/qmltooling/qmldbg_inspector/sgviewinspector.cpp
index a6f405261d..89438b6559 100644
--- a/src/plugins/qmltooling/qmldbg_inspector/sgviewinspector.cpp
+++ b/src/plugins/qmltooling/qmldbg_inspector/sgviewinspector.cpp
@@ -45,10 +45,10 @@
 #include "sghighlight.h"
 #include "sgselectiontool.h"
 
-#include <QtDeclarative/private/qsgitem_p.h>
+#include <QtDeclarative/private/qquickitem_p.h>
 
-#include <QtDeclarative/QSGView>
-#include <QtDeclarative/QSGItem>
+#include <QtDeclarative/QQuickView>
+#include <QtDeclarative/QQuickItem>
 
 #include <cfloat>
 
@@ -57,20 +57,20 @@ namespace QmlJSDebugger {
 /*
  * Collects all the items at the given position, from top to bottom.
  */
-static void collectItemsAt(QSGItem *item, const QPointF &pos, QSGItem *overlay,
-                           QList<QSGItem *> &resultList)
+static void collectItemsAt(QQuickItem *item, const QPointF &pos, QQuickItem *overlay,
+                           QList<QQuickItem *> &resultList)
 {
     if (item == overlay)
         return;
 
-    if (item->flags() & QSGItem::ItemClipsChildrenToShape) {
+    if (item->flags() & QQuickItem::ItemClipsChildrenToShape) {
         if (!QRectF(0, 0, item->width(), item->height()).contains(pos))
             return;
     }
 
-    QList<QSGItem *> children = QSGItemPrivate::get(item)->paintOrderChildItems();
+    QList<QQuickItem *> children = QQuickItemPrivate::get(item)->paintOrderChildItems();
     for (int i = children.count() - 1; i >= 0; --i) {
-        QSGItem *child = children.at(i);
+        QQuickItem *child = children.at(i);
         collectItemsAt(child, item->mapToItem(child, pos), overlay, resultList);
     }
 
@@ -84,7 +84,7 @@ static void collectItemsAt(QSGItem *item, const QPointF &pos, QSGItem *overlay,
  * Returns the first visible item at the given position, or 0 when no such
  * child exists.
  */
-static QSGItem *itemAt(QSGItem *item, const QPointF &pos, QSGItem *overlay)
+static QQuickItem *itemAt(QQuickItem *item, const QPointF &pos, QQuickItem *overlay)
 {
     if (item == overlay)
         return 0;
@@ -92,19 +92,19 @@ static QSGItem *itemAt(QSGItem *item, const QPointF &pos, QSGItem *overlay)
     if (!item->isVisible() || item->opacity() == 0.0)
         return 0;
 
-    if (item->flags() & QSGItem::ItemClipsChildrenToShape) {
+    if (item->flags() & QQuickItem::ItemClipsChildrenToShape) {
         if (!QRectF(0, 0, item->width(), item->height()).contains(pos))
             return 0;
     }
 
-    QList<QSGItem *> children = QSGItemPrivate::get(item)->paintOrderChildItems();
+    QList<QQuickItem *> children = QQuickItemPrivate::get(item)->paintOrderChildItems();
     for (int i = children.count() - 1; i >= 0; --i) {
-        QSGItem *child = children.at(i);
-        if (QSGItem *betterCandidate = itemAt(child, item->mapToItem(child, pos), overlay))
+        QQuickItem *child = children.at(i);
+        if (QQuickItem *betterCandidate = itemAt(child, item->mapToItem(child, pos), overlay))
             return betterCandidate;
     }
 
-    if (!(item->flags() & QSGItem::ItemHasContents))
+    if (!(item->flags() & QQuickItem::ItemHasContents))
         return 0;
 
     if (!QRectF(0, 0, item->width(), item->height()).contains(pos))
@@ -114,10 +114,10 @@ static QSGItem *itemAt(QSGItem *item, const QPointF &pos, QSGItem *overlay)
 }
 
 
-SGViewInspector::SGViewInspector(QSGView *view, QObject *parent) :
+SGViewInspector::SGViewInspector(QQuickView *view, QObject *parent) :
     AbstractViewInspector(parent),
     m_view(view),
-    m_overlay(new QSGItem),
+    m_overlay(new QQuickItem),
     m_selectionTool(new SGSelectionTool(this)),
     m_designMode(true)
 {
@@ -128,7 +128,7 @@ SGViewInspector::SGViewInspector(QSGView *view, QObject *parent) :
     // Make sure mouse hover events are received
 //    m_view->setMouseTracking(true);
 
-    if (QSGItem *root = view->rootItem())
+    if (QQuickItem *root = view->rootItem())
         m_overlay->setParentItem(root);
 
     view->installEventFilter(this);
@@ -137,9 +137,9 @@ SGViewInspector::SGViewInspector(QSGView *view, QObject *parent) :
 
 void SGViewInspector::changeCurrentObjects(const QList<QObject*> &objects)
 {
-    QList<QSGItem*> items;
+    QList<QQuickItem*> items;
     foreach (QObject *obj, objects)
-        if (QSGItem *item = qobject_cast<QSGItem*>(obj))
+        if (QQuickItem *item = qobject_cast<QQuickItem*>(obj))
             items << item;
 
     syncSelectedItems(items);
@@ -157,8 +157,8 @@ void SGViewInspector::reparentQmlObject(QObject *object, QObject *newParent)
         return;
 
     object->setParent(newParent);
-    QSGItem *newParentItem = qobject_cast<QSGItem*>(newParent);
-    QSGItem *item = qobject_cast<QSGItem*>(object);
+    QQuickItem *newParentItem = qobject_cast<QQuickItem*>(newParent);
+    QQuickItem *item = qobject_cast<QQuickItem*>(object);
     if (newParentItem && item)
         item->setParentItem(newParentItem);
 }
@@ -212,48 +212,48 @@ QDeclarativeEngine *SGViewInspector::declarativeEngine() const
     return m_view->engine();
 }
 
-QSGItem *SGViewInspector::topVisibleItemAt(const QPointF &pos) const
+QQuickItem *SGViewInspector::topVisibleItemAt(const QPointF &pos) const
 {
-    QSGItem *root = m_view->rootItem();
+    QQuickItem *root = m_view->rootItem();
     return itemAt(root, root->mapFromScene(pos), m_overlay);
 }
 
-QList<QSGItem *> SGViewInspector::itemsAt(const QPointF &pos) const
+QList<QQuickItem *> SGViewInspector::itemsAt(const QPointF &pos) const
 {
-    QSGItem *root = m_view->rootItem();
-    QList<QSGItem *> resultList;
+    QQuickItem *root = m_view->rootItem();
+    QList<QQuickItem *> resultList;
     collectItemsAt(root, root->mapFromScene(pos), m_overlay, resultList);
     return resultList;
 }
 
-QList<QSGItem*> SGViewInspector::selectedItems() const
+QList<QQuickItem*> SGViewInspector::selectedItems() const
 {
-    QList<QSGItem *> selection;
-    foreach (const QWeakPointer<QSGItem> &selectedItem, m_selectedItems) {
+    QList<QQuickItem *> selection;
+    foreach (const QWeakPointer<QQuickItem> &selectedItem, m_selectedItems) {
         if (selectedItem)
             selection << selectedItem.data();
     }
     return selection;
 }
 
-void SGViewInspector::setSelectedItems(const QList<QSGItem *> &items)
+void SGViewInspector::setSelectedItems(const QList<QQuickItem *> &items)
 {
     if (!syncSelectedItems(items))
         return;
 
     QList<QObject*> objectList;
-    foreach (QSGItem *item, items)
+    foreach (QQuickItem *item, items)
         objectList << item;
 
     sendCurrentObjects(objectList);
 }
 
-bool SGViewInspector::syncSelectedItems(const QList<QSGItem *> &items)
+bool SGViewInspector::syncSelectedItems(const QList<QQuickItem *> &items)
 {
     bool selectionChanged = false;
 
     // Disconnect and remove items that are no longer selected
-    foreach (const QWeakPointer<QSGItem> &item, m_selectedItems) {
+    foreach (const QWeakPointer<QQuickItem> &item, m_selectedItems) {
         if (!item) // Don't see how this can happen due to handling of destroyed()
             continue;
         if (items.contains(item.data()))
@@ -266,7 +266,7 @@ bool SGViewInspector::syncSelectedItems(const QList<QSGItem *> &items)
     }
 
     // Connect and add newly selected items
-    foreach (QSGItem *item, items) {
+    foreach (QQuickItem *item, items) {
         if (m_selectedItems.contains(item))
             continue;
 
@@ -281,7 +281,7 @@ bool SGViewInspector::syncSelectedItems(const QList<QSGItem *> &items)
 
 void SGViewInspector::removeFromSelectedItems(QObject *object)
 {
-    if (QSGItem *item = qobject_cast<QSGItem*>(object)) {
+    if (QQuickItem *item = qobject_cast<QQuickItem*>(object)) {
         if (m_selectedItems.removeOne(item))
             delete m_highlightItems.take(item);
     }
@@ -298,7 +298,7 @@ bool SGViewInspector::eventFilter(QObject *obj, QEvent *event)
 bool SGViewInspector::mouseMoveEvent(QMouseEvent *event)
 {
     // TODO
-//    if (QSGItem *item = topVisibleItemAt(event->pos()))
+//    if (QQuickItem *item = topVisibleItemAt(event->pos()))
 //        m_view->setToolTip(titleForItem(item));
 //    else
 //        m_view->setToolTip(QString());
@@ -306,15 +306,15 @@ bool SGViewInspector::mouseMoveEvent(QMouseEvent *event)
     return AbstractViewInspector::mouseMoveEvent(event);
 }
 
-QString SGViewInspector::titleForItem(QSGItem *item) const
+QString SGViewInspector::titleForItem(QQuickItem *item) const
 {
     QString className = QLatin1String(item->metaObject()->className());
     QString objectStringId = idStringForObject(item);
 
     className.remove(QRegExp(QLatin1String("_QMLTYPE_\\d+")));
     className.remove(QRegExp(QLatin1String("_QML_\\d+")));
-    if (className.startsWith(QLatin1String("QSG")))
-        className = className.mid(3);
+    if (className.startsWith(QLatin1String("QQuick")))
+        className = className.mid(6);
 
     QString constructedName;
 
diff --git a/src/plugins/qmltooling/qmldbg_inspector/sgviewinspector.h b/src/plugins/qmltooling/qmldbg_inspector/sgviewinspector.h
index 38271aa2d7..788d6a0924 100644
--- a/src/plugins/qmltooling/qmldbg_inspector/sgviewinspector.h
+++ b/src/plugins/qmltooling/qmldbg_inspector/sgviewinspector.h
@@ -48,8 +48,8 @@
 #include <QtCore/QHash>
 
 QT_BEGIN_NAMESPACE
-class QSGView;
-class QSGItem;
+class QQuickView;
+class QQuickItem;
 QT_END_NAMESPACE
 
 namespace QmlJSDebugger {
@@ -61,7 +61,7 @@ class SGViewInspector : public AbstractViewInspector
 {
     Q_OBJECT
 public:
-    explicit SGViewInspector(QSGView *view, QObject *parent = 0);
+    explicit SGViewInspector(QQuickView *view, QObject *parent = 0);
 
     // AbstractViewInspector
     void changeCurrentObjects(const QList<QObject*> &objects);
@@ -72,16 +72,16 @@ public:
     void setWindowFlags(Qt::WindowFlags flags);
     QDeclarativeEngine *declarativeEngine() const;
 
-    QSGView *view() const { return m_view; }
-    QSGItem *overlay() const { return m_overlay; }
+    QQuickView *view() const { return m_view; }
+    QQuickItem *overlay() const { return m_overlay; }
 
-    QSGItem *topVisibleItemAt(const QPointF &pos) const;
-    QList<QSGItem *> itemsAt(const QPointF &pos) const;
+    QQuickItem *topVisibleItemAt(const QPointF &pos) const;
+    QList<QQuickItem *> itemsAt(const QPointF &pos) const;
 
-    QList<QSGItem *> selectedItems() const;
-    void setSelectedItems(const QList<QSGItem*> &items);
+    QList<QQuickItem *> selectedItems() const;
+    void setSelectedItems(const QList<QQuickItem*> &items);
 
-    QString titleForItem(QSGItem *item) const;
+    QString titleForItem(QQuickItem *item) const;
 
 protected:
     bool eventFilter(QObject *obj, QEvent *event);
@@ -92,15 +92,15 @@ private slots:
     void removeFromSelectedItems(QObject *);
 
 private:
-    bool syncSelectedItems(const QList<QSGItem*> &items);
+    bool syncSelectedItems(const QList<QQuickItem*> &items);
 
-    QSGView *m_view;
-    QSGItem *m_overlay;
+    QQuickView *m_view;
+    QQuickItem *m_overlay;
 
     SGSelectionTool *m_selectionTool;
 
-    QList<QWeakPointer<QSGItem> > m_selectedItems;
-    QHash<QSGItem*, SGSelectionHighlight*> m_highlightItems;
+    QList<QWeakPointer<QQuickItem> > m_selectedItems;
+    QHash<QQuickItem*, SGSelectionHighlight*> m_highlightItems;
 
     bool m_designMode;
 };
diff --git a/src/qmltest/quicktest.cpp b/src/qmltest/quicktest.cpp
index 150304028d..3c726d43d1 100644
--- a/src/qmltest/quicktest.cpp
+++ b/src/qmltest/quicktest.cpp
@@ -49,7 +49,7 @@
 #include <QtDeclarative/qdeclarativeengine.h>
 #include <QtDeclarative/qdeclarativecontext.h>
 #if defined(QML_VERSION) && QML_VERSION >= 0x020000
-#include <QtDeclarative/qsgview.h>
+#include <QtDeclarative/qquickview.h>
 #define QUICK_TEST_SCENEGRAPH 1
 #endif
 #include <QtDeclarative/qjsvalue.h>
@@ -175,7 +175,7 @@ int quick_test_main(int argc, char **argv, const char *name, quick_test_viewport
     // in turn with a QDeclarativeView.
 #ifdef QUICK_TEST_SCENEGRAPH
     if (qtQuick2) {
-        QSGView view;
+        QQuickView view;
         QTestRootObject rootobj;
         QEventLoop eventLoop;
         QObject::connect(view.engine(), SIGNAL(quit()),
@@ -199,7 +199,7 @@ int quick_test_main(int argc, char **argv, const char *name, quick_test_viewport
                 view.setSource(QUrl::fromLocalFile(path));
             if (QTest::printAvailableFunctions)
                 continue;
-            if (view.status() == QSGView::Error) {
+            if (view.status() == QQuickView::Error) {
                 // Error compiling the test - flag failure in the log and continue.
                 QList<QDeclarativeError> errors = view.errors();
                 QuickTestResult results;
diff --git a/src/qmltest/quicktestevent.cpp b/src/qmltest/quicktestevent.cpp
index 4e62d4a827..780d502f52 100644
--- a/src/qmltest/quicktestevent.cpp
+++ b/src/qmltest/quicktestevent.cpp
@@ -45,8 +45,8 @@
 #include <QtQuick1/qdeclarativeitem.h>
 #include <QtQuick1/qdeclarativeview.h>
 #if defined(QML_VERSION) && QML_VERSION >= 0x020000
-#include <QtDeclarative/qsgitem.h>
-#include <QtDeclarative/qsgcanvas.h>
+#include <QtDeclarative/qquickitem.h>
+#include <QtDeclarative/qquickcanvas.h>
 #define QUICK_TEST_SCENEGRAPH 1
 #endif
 #include <QtWidgets/qgraphicsscene.h>
@@ -119,7 +119,7 @@ namespace QtQuickTest
         QDeclarativeView *view = qobject_cast<QDeclarativeView *>(window);
         QWindow *eventWindow = window;
 #ifdef QUICK_TEST_SCENEGRAPH
-        QSGItem *sgitem = qobject_cast<QSGItem *>(item);
+        QQuickItem *sgitem = qobject_cast<QQuickItem *>(item);
         if (sgitem) {
             pos = sgitem->mapToScene(_pos).toPoint();
         } else
@@ -181,7 +181,7 @@ namespace QtQuickTest
         QDeclarativeView *view = qobject_cast<QDeclarativeView *>(window);
         QWindow *eventWindow = window;
 #ifdef QUICK_TEST_SCENEGRAPH
-        QSGItem *sgitem = qobject_cast<QSGItem *>(item);
+        QQuickItem *sgitem = qobject_cast<QQuickItem *>(item);
         if (sgitem) {
             pos = sgitem->mapToScene(_pos).toPoint();
         } else
@@ -291,7 +291,7 @@ bool QuickTestEvent::mouseMove
 QWindow *QuickTestEvent::eventWindow()
 {
 #ifdef QUICK_TEST_SCENEGRAPH
-    QSGItem *sgitem = qobject_cast<QSGItem *>(parent());
+    QQuickItem *sgitem = qobject_cast<QQuickItem *>(parent());
     if (sgitem)
         return sgitem->canvas();
 #endif