diff --git a/src/private/plugin.cpp b/src/private/plugin.cpp
index 9210ca3f1428e42f37fbf6e55e5970173b0c4e01..17b2b09b7ac6df5962fc4ad3fe2cf60dc45ee4f4 100644
--- a/src/private/plugin.cpp
+++ b/src/private/plugin.cpp
@@ -39,9 +39,9 @@
 **
 ****************************************************************************/
 
-#include "qrangemodel_p.h"
-#include "qwheelarea_p.h"
-#include "qstyleitem_p.h"
+#include "qquickrangemodel_p.h"
+#include "qquickwheelarea_p.h"
+#include "qquickstyleitem_p.h"
 #include "qquicktooltip_p.h"
 
 #include <qqml.h>
@@ -67,9 +67,9 @@ public:
 
 void QtQuickControlsPrivatePlugin::registerTypes(const char *uri)
 {
-    qmlRegisterType<QRangeModel>(uri, 1, 0, "RangeModel");
-    qmlRegisterType<QWheelArea>(uri, 1, 0, "WheelArea");
-    qmlRegisterType<QStyleItem>(uri, 1, 0, "StyleItem");
+    qmlRegisterType<QQuickRangeModel>(uri, 1, 0, "RangeModel");
+    qmlRegisterType<QQuickWheelArea>(uri, 1, 0, "WheelArea");
+    qmlRegisterType<QQuickStyleItem>(uri, 1, 0, "StyleItem");
     qmlRegisterSingletonType<QQuickTooltip>(uri, 1, 0, "Tooltip", registerTooltipModule);
 }
 
diff --git a/src/private/private.pro b/src/private/private.pro
index 7a330103546b80b93b6d2d21ebca6e423f46f2d0..09d9bacf09338d95768a13f5108a4623076db89d 100644
--- a/src/private/private.pro
+++ b/src/private/private.pro
@@ -5,17 +5,17 @@ QT += qml quick widgets gui-private core-private
 
 HEADERS += \
     $$PWD/qquicktooltip_p.h \
-    $$PWD/qrangemodel_p.h \
-    $$PWD/qrangemodel_p_p.h \
-    $$PWD/qwheelarea_p.h \
-    $$PWD/qstyleitem_p.h
+    $$PWD/qquickrangemodel_p.h \
+    $$PWD/qquickrangemodel_p_p.h \
+    $$PWD/qquickwheelarea_p.h \
+    $$PWD/qquickstyleitem_p.h
 
 SOURCES += \
     $$PWD/plugin.cpp \
     $$PWD/qquicktooltip.cpp \
-    $$PWD/qstyleitem.cpp \
-    $$PWD/qrangemodel.cpp\
-    $$PWD/qwheelarea.cpp
+    $$PWD/qquickstyleitem.cpp \
+    $$PWD/qquickrangemodel.cpp \
+    $$PWD/qquickwheelarea.cpp
 
 # private qml files
 QML_FILES += \
diff --git a/src/private/qrangemodel.cpp b/src/private/qquickrangemodel.cpp
similarity index 79%
rename from src/private/qrangemodel.cpp
rename to src/private/qquickrangemodel.cpp
index 987026f5528dfef012ede60b8db380628bf36514..ee1ade32ca096c9d00cac0387a0183b6bb152828 100644
--- a/src/private/qrangemodel.cpp
+++ b/src/private/qquickrangemodel.cpp
@@ -43,28 +43,28 @@
     With this class, the user sets a value range and a position range, which
     represent the valid values/positions the model can assume. It is worth telling
     that the value property always has priority over the position property. A nice use
-    case, would be a Slider implementation with the help of QRangeModel. If the user sets
+    case, would be a Slider implementation with the help of QQuickRangeModel. If the user sets
     a value range to [0,100], a position range to [50,100] and sets the value
     to 80, the equivalent position would be 90. After that, if the user decides to
     resize the slider, the value would be the same, but the knob position would
     be updated due to the new position range.
 */
 
-#include "qrangemodel_p.h"
-#include "qrangemodel_p_p.h"
+#include "qquickrangemodel_p.h"
+#include "qquickrangemodel_p_p.h"
 
 QT_BEGIN_NAMESPACE
 
-QRangeModelPrivate::QRangeModelPrivate(QRangeModel *qq)
+QQuickRangeModelPrivate::QQuickRangeModelPrivate(QQuickRangeModel *qq)
     : q_ptr(qq)
 {
 }
 
-QRangeModelPrivate::~QRangeModelPrivate()
+QQuickRangeModelPrivate::~QQuickRangeModelPrivate()
 {
 }
 
-void QRangeModelPrivate::init()
+void QQuickRangeModelPrivate::init()
 {
     minimum = 0;
     maximum = 99;
@@ -78,12 +78,12 @@ void QRangeModelPrivate::init()
 
 /*!
     Calculates the position that is going to be seen outside by the component
-    that is using QRangeModel. It takes into account the \l stepSize,
+    that is using QQuickRangeModel. It takes into account the \l stepSize,
     \l positionAtMinimum, \l positionAtMaximum properties
     and \a position that is passed as parameter.
 */
 
-qreal QRangeModelPrivate::publicPosition(qreal position) const
+qreal QQuickRangeModelPrivate::publicPosition(qreal position) const
 {
     // Calculate the equivalent stepSize for the position property.
     const qreal min = effectivePosAtMin();
@@ -119,12 +119,12 @@ qreal QRangeModelPrivate::publicPosition(qreal position) const
 
 /*!
     Calculates the value that is going to be seen outside by the component
-    that is using QRangeModel. It takes into account the \l stepSize,
+    that is using QQuickRangeModel. It takes into account the \l stepSize,
     \l minimumValue, \l maximumValue properties
     and \a value that is passed as parameter.
 */
 
-qreal QRangeModelPrivate::publicValue(qreal value) const
+qreal QQuickRangeModelPrivate::publicValue(qreal value) const
 {
     // It is important to do value-within-range check this
     // late (as opposed to during setPosition()). The reason is
@@ -152,9 +152,9 @@ qreal QRangeModelPrivate::publicValue(qreal value) const
     has changed.
 */
 
-void QRangeModelPrivate::emitValueAndPositionIfChanged(const qreal oldValue, const qreal oldPosition)
+void QQuickRangeModelPrivate::emitValueAndPositionIfChanged(const qreal oldValue, const qreal oldPosition)
 {
-    Q_Q(QRangeModel);
+    Q_Q(QQuickRangeModel);
 
     // Effective value and position might have changed even in cases when e.g. d->value is
     // unchanged. This will be the case when operating with values outside range:
@@ -167,33 +167,33 @@ void QRangeModelPrivate::emitValueAndPositionIfChanged(const qreal oldValue, con
 }
 
 /*!
-    Constructs a QRangeModel with \a parent
+    Constructs a QQuickRangeModel with \a parent
 */
 
-QRangeModel::QRangeModel(QObject *parent)
-    : QObject(parent), d_ptr(new QRangeModelPrivate(this))
+QQuickRangeModel::QQuickRangeModel(QObject *parent)
+    : QObject(parent), d_ptr(new QQuickRangeModelPrivate(this))
 {
-    Q_D(QRangeModel);
+    Q_D(QQuickRangeModel);
     d->init();
 }
 
 /*!
     \internal
-    Constructs a QRangeModel with private class pointer \a dd and \a parent
+    Constructs a QQuickRangeModel with private class pointer \a dd and \a parent
 */
 
-QRangeModel::QRangeModel(QRangeModelPrivate &dd, QObject *parent)
+QQuickRangeModel::QQuickRangeModel(QQuickRangeModelPrivate &dd, QObject *parent)
     : QObject(parent), d_ptr(&dd)
 {
-    Q_D(QRangeModel);
+    Q_D(QQuickRangeModel);
     d->init();
 }
 
 /*!
-    Destroys the QRangeModel
+    Destroys the QQuickRangeModel
 */
 
-QRangeModel::~QRangeModel()
+QQuickRangeModel::~QQuickRangeModel()
 {
     delete d_ptr;
     d_ptr = 0;
@@ -205,9 +205,9 @@ QRangeModel::~QRangeModel()
     Such range is represented by \l positionAtMinimum and \l positionAtMaximum
 */
 
-void QRangeModel::setPositionRange(qreal min, qreal max)
+void QQuickRangeModel::setPositionRange(qreal min, qreal max)
 {
-    Q_D(QRangeModel);
+    Q_D(QQuickRangeModel);
 
     bool emitPosAtMinChanged = !qFuzzyCompare(min, d->posatmin);
     bool emitPosAtMaxChanged = !qFuzzyCompare(max, d->posatmax);
@@ -240,9 +240,9 @@ void QRangeModel::setPositionRange(qreal min, qreal max)
     Such range is represented by \l minimumValue and \l maximumValue
 */
 
-void QRangeModel::setRange(qreal min, qreal max)
+void QQuickRangeModel::setRange(qreal min, qreal max)
 {
-    Q_D(QRangeModel);
+    Q_D(QQuickRangeModel);
 
     bool emitMinimumChanged = !qFuzzyCompare(min, d->minimum);
     bool emitMaximumChanged = !qFuzzyCompare(max, d->maximum);
@@ -268,56 +268,56 @@ void QRangeModel::setRange(qreal min, qreal max)
 }
 
 /*!
-    \property QRangeModel::minimumValue
+    \property QQuickRangeModel::minimumValue
     \brief the minimum value that \l value can assume
 
     This property's default value is 0
 */
 
-void QRangeModel::setMinimum(qreal min)
+void QQuickRangeModel::setMinimum(qreal min)
 {
-    Q_D(const QRangeModel);
+    Q_D(const QQuickRangeModel);
     setRange(min, d->maximum);
 }
 
-qreal QRangeModel::minimum() const
+qreal QQuickRangeModel::minimum() const
 {
-    Q_D(const QRangeModel);
+    Q_D(const QQuickRangeModel);
     return d->minimum;
 }
 
 /*!
-    \property QRangeModel::maximumValue
+    \property QQuickRangeModel::maximumValue
     \brief the maximum value that \l value can assume
 
     This property's default value is 99
 */
 
-void QRangeModel::setMaximum(qreal max)
+void QQuickRangeModel::setMaximum(qreal max)
 {
-    Q_D(const QRangeModel);
+    Q_D(const QQuickRangeModel);
     // if the new maximum value is smaller than
     // minimum, update minimum too
     setRange(qMin(d->minimum, max), max);
 }
 
-qreal QRangeModel::maximum() const
+qreal QQuickRangeModel::maximum() const
 {
-    Q_D(const QRangeModel);
+    Q_D(const QQuickRangeModel);
     return d->maximum;
 }
 
 /*!
-    \property QRangeModel::stepSize
+    \property QQuickRangeModel::stepSize
     \brief the value that is added to the \l value and \l position property
 
     Example: If a user sets a range of [0,100] and stepSize
     to 30, the valid values that are going to be seen externally would be: 0, 30, 60, 90, 100.
 */
 
-void QRangeModel::setStepSize(qreal stepSize)
+void QQuickRangeModel::setStepSize(qreal stepSize)
 {
-    Q_D(QRangeModel);
+    Q_D(QQuickRangeModel);
 
     stepSize = qMax(qreal(0.0), stepSize);
     if (qFuzzyCompare(stepSize, d->stepSize))
@@ -331,9 +331,9 @@ void QRangeModel::setStepSize(qreal stepSize)
     d->emitValueAndPositionIfChanged(oldValue, oldPosition);
 }
 
-qreal QRangeModel::stepSize() const
+qreal QQuickRangeModel::stepSize() const
 {
-    Q_D(const QRangeModel);
+    Q_D(const QQuickRangeModel);
     return d->stepSize;
 }
 
@@ -343,16 +343,16 @@ qreal QRangeModel::stepSize() const
     Such calculation is based on the parameter \a value (which is valid externally).
 */
 
-qreal QRangeModel::positionForValue(qreal value) const
+qreal QQuickRangeModel::positionForValue(qreal value) const
 {
-    Q_D(const QRangeModel);
+    Q_D(const QQuickRangeModel);
 
     const qreal unconstrainedPosition = d->equivalentPosition(value);
     return d->publicPosition(unconstrainedPosition);
 }
 
 /*!
-    \property QRangeModel::position
+    \property QQuickRangeModel::position
     \brief the current position of the model
 
     Represents a valid external position, based on the \l positionAtMinimum,
@@ -361,18 +361,18 @@ qreal QRangeModel::positionForValue(qreal value) const
     since it can become valid if the user changes the position range later.
 */
 
-qreal QRangeModel::position() const
+qreal QQuickRangeModel::position() const
 {
-    Q_D(const QRangeModel);
+    Q_D(const QQuickRangeModel);
 
     // Return the internal position but observe boundaries and
     // stepSize restrictions.
     return d->publicPosition(d->pos);
 }
 
-void QRangeModel::setPosition(qreal newPosition)
+void QQuickRangeModel::setPosition(qreal newPosition)
 {
-    Q_D(QRangeModel);
+    Q_D(QQuickRangeModel);
 
     if (qFuzzyCompare(newPosition, d->pos))
         return;
@@ -387,40 +387,40 @@ void QRangeModel::setPosition(qreal newPosition)
 }
 
 /*!
-    \property QRangeModel::positionAtMinimum
+    \property QQuickRangeModel::positionAtMinimum
     \brief the minimum value that \l position can assume
 
     This property's default value is 0
 */
 
-void QRangeModel::setPositionAtMinimum(qreal min)
+void QQuickRangeModel::setPositionAtMinimum(qreal min)
 {
-    Q_D(QRangeModel);
+    Q_D(QQuickRangeModel);
     setPositionRange(min, d->posatmax);
 }
 
-qreal QRangeModel::positionAtMinimum() const
+qreal QQuickRangeModel::positionAtMinimum() const
 {
-    Q_D(const QRangeModel);
+    Q_D(const QQuickRangeModel);
     return d->posatmin;
 }
 
 /*!
-    \property QRangeModel::positionAtMaximum
+    \property QQuickRangeModel::positionAtMaximum
     \brief the maximum value that \l position can assume
 
     This property's default value is 0
 */
 
-void QRangeModel::setPositionAtMaximum(qreal max)
+void QQuickRangeModel::setPositionAtMaximum(qreal max)
 {
-    Q_D(QRangeModel);
+    Q_D(QQuickRangeModel);
     setPositionRange(d->posatmin, max);
 }
 
-qreal QRangeModel::positionAtMaximum() const
+qreal QQuickRangeModel::positionAtMaximum() const
 {
-    Q_D(const QRangeModel);
+    Q_D(const QQuickRangeModel);
     return d->posatmax;
 }
 
@@ -430,16 +430,16 @@ qreal QRangeModel::positionAtMaximum() const
     Such calculation is based on the parameter \a position (which is valid externally).
 */
 
-qreal QRangeModel::valueForPosition(qreal position) const
+qreal QQuickRangeModel::valueForPosition(qreal position) const
 {
-    Q_D(const QRangeModel);
+    Q_D(const QQuickRangeModel);
 
     const qreal unconstrainedValue = d->equivalentValue(position);
     return d->publicValue(unconstrainedValue);
 }
 
 /*!
-    \property QRangeModel::value
+    \property QQuickRangeModel::value
     \brief the current value of the model
 
     Represents a valid external value, based on the \l minimumValue,
@@ -448,18 +448,18 @@ qreal QRangeModel::valueForPosition(qreal position) const
     since it can become valid if the user changes the range later.
 */
 
-qreal QRangeModel::value() const
+qreal QQuickRangeModel::value() const
 {
-    Q_D(const QRangeModel);
+    Q_D(const QQuickRangeModel);
 
     // Return internal value but observe boundaries and
     // stepSize restrictions
     return d->publicValue(d->value);
 }
 
-void QRangeModel::setValue(qreal newValue)
+void QQuickRangeModel::setValue(qreal newValue)
 {
-    Q_D(QRangeModel);
+    Q_D(QQuickRangeModel);
 
     if (qFuzzyCompare(newValue, d->value))
         return;
@@ -474,7 +474,7 @@ void QRangeModel::setValue(qreal newValue)
 }
 
 /*!
-    \property QRangeModel::inverted
+    \property QQuickRangeModel::inverted
     \brief the model is inverted or not
 
     The model can be represented with an inverted behavior, e.g. when \l value assumes
@@ -482,9 +482,9 @@ void QRangeModel::setValue(qreal newValue)
     minimum (represented by \l positionAtMinimum).
 */
 
-void QRangeModel::setInverted(bool inverted)
+void QQuickRangeModel::setInverted(bool inverted)
 {
-    Q_D(QRangeModel);
+    Q_D(QQuickRangeModel);
     if (inverted == d->inverted)
         return;
 
@@ -495,9 +495,9 @@ void QRangeModel::setInverted(bool inverted)
     setPosition(d->equivalentPosition(d->value));
 }
 
-bool QRangeModel::inverted() const
+bool QQuickRangeModel::inverted() const
 {
-    Q_D(const QRangeModel);
+    Q_D(const QQuickRangeModel);
     return d->inverted;
 }
 
@@ -505,9 +505,9 @@ bool QRangeModel::inverted() const
     Sets the \l value to \l minimumValue.
 */
 
-void QRangeModel::toMinimum()
+void QQuickRangeModel::toMinimum()
 {
-    Q_D(const QRangeModel);
+    Q_D(const QQuickRangeModel);
     setValue(d->minimum);
 }
 
@@ -515,9 +515,9 @@ void QRangeModel::toMinimum()
     Sets the \l value to \l maximumValue.
 */
 
-void QRangeModel::toMaximum()
+void QQuickRangeModel::toMaximum()
 {
-    Q_D(const QRangeModel);
+    Q_D(const QQuickRangeModel);
     setValue(d->maximum);
 }
 
diff --git a/src/private/qrangemodel_p.h b/src/private/qquickrangemodel_p.h
similarity index 89%
rename from src/private/qrangemodel_p.h
rename to src/private/qquickrangemodel_p.h
index 7a2ac60666d7275026df9bb1c2bbf49b2c40af33..a15843d709e256101973e141e2e4d371d0c3272b 100644
--- a/src/private/qrangemodel_p.h
+++ b/src/private/qquickrangemodel_p.h
@@ -39,17 +39,17 @@
 **
 ****************************************************************************/
 
-#ifndef QRANGEMODEL_P_H
-#define QRANGEMODEL_P_H
+#ifndef QQUICKRANGEMODEL_P_H
+#define QQUICKRANGEMODEL_P_H
 
 #include <QtCore/qobject.h>
 #include <QtQml/qqml.h>
 
 QT_BEGIN_NAMESPACE
 
-class QRangeModelPrivate;
+class QQuickRangeModelPrivate;
 
-class QRangeModel : public QObject
+class QQuickRangeModel : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(qreal value READ value WRITE setValue NOTIFY valueChanged USER true)
@@ -62,8 +62,8 @@ class QRangeModel : public QObject
     Q_PROPERTY(bool inverted READ inverted WRITE setInverted NOTIFY invertedChanged)
 
 public:
-    QRangeModel(QObject *parent = 0);
-    virtual ~QRangeModel();
+    QQuickRangeModel(QObject *parent = 0);
+    virtual ~QQuickRangeModel();
 
     void setRange(qreal min, qreal max);
     void setPositionRange(qreal min, qreal max);
@@ -112,17 +112,17 @@ Q_SIGNALS:
     void positionAtMaximumChanged(qreal max);
 
 protected:
-    QRangeModel(QRangeModelPrivate &dd, QObject *parent);
-    QRangeModelPrivate* d_ptr;
+    QQuickRangeModel(QQuickRangeModelPrivate &dd, QObject *parent);
+    QQuickRangeModelPrivate* d_ptr;
 
 private:
-    Q_DISABLE_COPY(QRangeModel)
-    Q_DECLARE_PRIVATE(QRangeModel)
+    Q_DISABLE_COPY(QQuickRangeModel)
+    Q_DECLARE_PRIVATE(QQuickRangeModel)
 
 };
 
 QT_END_NAMESPACE
 
-QML_DECLARE_TYPE(QRangeModel)
+QML_DECLARE_TYPE(QQuickRangeModel)
 
-#endif // QRANGEMODEL_P_H
+#endif // QQUICKRANGEMODEL_P_H
diff --git a/src/private/qrangemodel_p_p.h b/src/private/qquickrangemodel_p_p.h
similarity index 91%
rename from src/private/qrangemodel_p_p.h
rename to src/private/qquickrangemodel_p_p.h
index d0a35b4e3cb69f8e2c4f2dc199640db32a658ee7..9ddf16c2b6d0e7624a87702d93ef011bf0d09615 100644
--- a/src/private/qrangemodel_p_p.h
+++ b/src/private/qquickrangemodel_p_p.h
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#ifndef QRANGEMODEL_P_P_H
-#define QRANGEMODEL_P_P_H
+#ifndef QQUICKRANGEMODEL_P_P_H
+#define QQUICKRANGEMODEL_P_P_H
 
 //
 //  W A R N I N G
@@ -53,16 +53,16 @@
 // We mean it.
 //
 
-#include "qrangemodel_p.h"
+#include "qquickrangemodel_p.h"
 
 QT_BEGIN_NAMESPACE
 
-class QRangeModelPrivate
+class QQuickRangeModelPrivate
 {
-    Q_DECLARE_PUBLIC(QRangeModel)
+    Q_DECLARE_PUBLIC(QQuickRangeModel)
 public:
-    QRangeModelPrivate(QRangeModel *qq);
-    virtual ~QRangeModelPrivate();
+    QQuickRangeModelPrivate(QQuickRangeModel *qq);
+    virtual ~QQuickRangeModelPrivate();
 
     void init();
 
@@ -71,7 +71,7 @@ public:
 
     uint inverted : 1;
 
-    QRangeModel *q_ptr;
+    QQuickRangeModel *q_ptr;
 
     inline qreal effectivePosAtMin() const {
         return inverted ? posatmax : posatmin;
@@ -108,4 +108,4 @@ public:
 
 QT_END_NAMESPACE
 
-#endif // QRANGEMODEL_P_P_H
+#endif // QQUICKRANGEMODEL_P_P_H
diff --git a/src/private/qstyleitem.cpp b/src/private/qquickstyleitem.cpp
similarity index 97%
rename from src/private/qstyleitem.cpp
rename to src/private/qquickstyleitem.cpp
index b72ff40767a64a99bf4dcc79003267731464ddeb..7c38794db8608c03753754e0c68a9bad113eb327 100644
--- a/src/private/qstyleitem.cpp
+++ b/src/private/qquickstyleitem.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include "qstyleitem_p.h"
+#include "qquickstyleitem_p.h"
 
 #include <qstringbuilder.h>
 #include <qpainter.h>
@@ -95,10 +95,10 @@ CGContextRef qt_mac_cg_context(const QPaintDevice *pdev)
 
 #endif
 
-class QStyleNode : public QSGSimpleTextureNode
+class QQuickStyleNode : public QSGSimpleTextureNode
 {
 public:
-    ~QStyleNode()
+    ~QQuickStyleNode()
     {
         delete texture();
     }
@@ -110,7 +110,7 @@ public:
     }
 };
 
-QStyleItem::QStyleItem(QQuickItem *parent)
+QQuickStyleItem::QQuickStyleItem(QQuickItem *parent)
     : QQuickItem(parent),
     m_styleoption(0),
     m_itemType(Undefined),
@@ -176,13 +176,13 @@ QStyleItem::QStyleItem(QQuickItem *parent)
     connect(this, SIGNAL(widthChanged()), this, SLOT(updateRect()));
 }
 
-QStyleItem::~QStyleItem()
+QQuickStyleItem::~QQuickStyleItem()
 {
     delete m_styleoption;
     m_styleoption = 0;
 }
 
-void QStyleItem::initStyleOption()
+void QQuickStyleItem::initStyleOption()
 {
     QString type = elementType();
     if (m_styleoption)
@@ -613,7 +613,7 @@ void QStyleItem::initStyleOption()
  *   QFusionStyle = "fusion"
  */
 
-QString QStyleItem::style() const
+QString QQuickStyleItem::style() const
 {
     QString style = qApp->style()->metaObject()->className();
     style = style.toLower();
@@ -624,7 +624,7 @@ QString QStyleItem::style() const
     return style;
 }
 
-QString QStyleItem::hitTest(int px, int py)
+QString QQuickStyleItem::hitTest(int px, int py)
 {
     QStyle::SubControl subcontrol = QStyle::SC_All;
     switch (m_itemType) {
@@ -673,7 +673,7 @@ QString QStyleItem::hitTest(int px, int py)
     return "none";
 }
 
-QSize QStyleItem::sizeFromContents(int width, int height)
+QSize QQuickStyleItem::sizeFromContents(int width, int height)
 {
     initStyleOption();
 
@@ -809,7 +809,7 @@ QSize QStyleItem::sizeFromContents(int width, int height)
     }    return size;
 }
 
-void QStyleItem::setContentWidth(int arg)
+void QQuickStyleItem::setContentWidth(int arg)
 {
     if (m_contentWidth != arg) {
         m_contentWidth = arg;
@@ -817,7 +817,7 @@ void QStyleItem::setContentWidth(int arg)
     }
 }
 
-void QStyleItem::setContentHeight(int arg)
+void QQuickStyleItem::setContentHeight(int arg)
 {
     if (m_contentHeight != arg) {
         m_contentHeight = arg;
@@ -825,19 +825,19 @@ void QStyleItem::setContentHeight(int arg)
     }
 }
 
-void QStyleItem::updateSizeHint()
+void QQuickStyleItem::updateSizeHint()
 {
     QSize implicitSize = sizeFromContents(m_contentWidth, m_contentHeight);
     setImplicitSize(implicitSize.width(), implicitSize.height());
 }
 
-void QStyleItem::updateRect()
+void QQuickStyleItem::updateRect()
 {
     initStyleOption();
     m_styleoption->rect.setWidth(width());
 }
 
-int QStyleItem::pixelMetric(const QString &metric)
+int QQuickStyleItem::pixelMetric(const QString &metric)
 {
 
     if (metric == "scrollbarExtent")
@@ -883,7 +883,7 @@ int QStyleItem::pixelMetric(const QString &metric)
     return 0;
 }
 
-QVariant QStyleItem::styleHint(const QString &metric)
+QVariant QQuickStyleItem::styleHint(const QString &metric)
 {
     initStyleOption();
     if (metric == "comboboxpopup") {
@@ -910,7 +910,7 @@ QVariant QStyleItem::styleHint(const QString &metric)
     // Add SH_Menu_SpaceActivatesItem, SH_Menu_SubMenuPopupDelay
 }
 
-void QStyleItem::setHints(const QStringList &str)
+void QQuickStyleItem::setHints(const QStringList &str)
 {
     if (m_hints != str) {
         m_hints = str;
@@ -929,7 +929,7 @@ void QStyleItem::setHints(const QStringList &str)
 }
 
 
-void QStyleItem::setElementType(const QString &str)
+void QQuickStyleItem::setElementType(const QString &str)
 {
     if (m_type == str)
         return;
@@ -1016,7 +1016,7 @@ void QStyleItem::setElementType(const QString &str)
     updateSizeHint();
 }
 
-QRectF QStyleItem::subControlRect(const QString &subcontrolString)
+QRectF QQuickStyleItem::subControlRect(const QString &subcontrolString)
 {
     QStyle::SubControl subcontrol = QStyle::SC_None;
     initStyleOption();
@@ -1074,7 +1074,7 @@ QRectF QStyleItem::subControlRect(const QString &subcontrolString)
     return QRectF();
 }
 
-void QStyleItem::paint(QPainter *painter)
+void QQuickStyleItem::paint(QPainter *painter)
 {
     initStyleOption();
     if (QStyleOptionMenuItem *opt = qstyleoption_cast<QStyleOptionMenuItem*>(m_styleoption))
@@ -1317,30 +1317,30 @@ void QStyleItem::paint(QPainter *painter)
     }
 }
 
-qreal QStyleItem::textWidth(const QString &text)
+qreal QQuickStyleItem::textWidth(const QString &text)
 {
     QFontMetricsF fm = QFontMetricsF(m_styleoption->fontMetrics);
     return fm.boundingRect(text).width();
 }
 
-qreal QStyleItem::textHeight(const QString &text)
+qreal QQuickStyleItem::textHeight(const QString &text)
 {
     QFontMetricsF fm = QFontMetricsF(m_styleoption->fontMetrics);
     return text.isEmpty() ? fm.height() :
                             fm.boundingRect(text).height();
 }
 
-QString QStyleItem::elidedText(const QString &text, int elideMode, int width)
+QString QQuickStyleItem::elidedText(const QString &text, int elideMode, int width)
 {
     return m_styleoption->fontMetrics.elidedText(text, Qt::TextElideMode(elideMode), width);
 }
 
-bool QStyleItem::hasThemeIcon(const QString &icon) const
+bool QQuickStyleItem::hasThemeIcon(const QString &icon) const
 {
     return QIcon::hasThemeIcon(icon);
 }
 
-bool QStyleItem::event(QEvent *ev)
+bool QQuickStyleItem::event(QEvent *ev)
 {
     if (ev->type() == QEvent::StyleAnimationUpdate) {
         polish();
@@ -1349,23 +1349,23 @@ bool QStyleItem::event(QEvent *ev)
     return QQuickItem::event(ev);
 }
 
-QSGNode *QStyleItem::updatePaintNode(QSGNode *node, UpdatePaintNodeData *)
+QSGNode *QQuickStyleItem::updatePaintNode(QSGNode *node, UpdatePaintNodeData *)
 {
     if (m_image.isNull()) {
         delete node;
         return 0;
     }
 
-    QStyleNode *styleNode = static_cast<QStyleNode *>(node);
+    QQuickStyleNode *styleNode = static_cast<QQuickStyleNode *>(node);
     if (!styleNode)
-        styleNode = new QStyleNode;
+        styleNode = new QQuickStyleNode;
 
     styleNode->setTexture(window()->createTextureFromImage(m_image));
     styleNode->setRect(boundingRect());
     return styleNode;
 }
 
-void QStyleItem::updatePolish()
+void QQuickStyleItem::updatePolish()
 {
     if (width() >= 1 && height() >= 1) { // Note these are reals so 1 pixel is minimum
         float devicePixelRatio = window() ? window()->devicePixelRatio() : qApp->devicePixelRatio();
diff --git a/src/private/qstyleitem_p.h b/src/private/qquickstyleitem_p.h
similarity index 97%
rename from src/private/qstyleitem_p.h
rename to src/private/qquickstyleitem_p.h
index 3abb463545a447cae70a4d14dcdacead35536ee1..31d6a3a79fc52ffc0a0c171a9473f9e8844d7b51 100644
--- a/src/private/qstyleitem_p.h
+++ b/src/private/qquickstyleitem_p.h
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#ifndef QSTYLEITEM_P_H
-#define QSTYLEITEM_P_H
+#ifndef QQUICKSTYLEITEM_P_H
+#define QQUICKSTYLEITEM_P_H
 
 #include <QtGui/qimage.h>
 #include <QtQuick/qquickitem.h>
@@ -50,7 +50,7 @@ QT_BEGIN_NAMESPACE
 class QWidget;
 class QStyleOption;
 
-class QStyleItem: public QQuickItem
+class QQuickStyleItem: public QQuickItem
 {
     Q_OBJECT
 
@@ -82,8 +82,8 @@ class QStyleItem: public QQuickItem
     Q_PROPERTY( int contentHeight READ contentHeight() WRITE setContentHeight NOTIFY contentHeightChanged)
 
 public:
-    QStyleItem(QQuickItem *parent = 0);
-    ~QStyleItem();
+    QQuickStyleItem(QQuickItem *parent = 0);
+    ~QQuickStyleItem();
 
     enum Type {
         Undefined,
@@ -255,4 +255,4 @@ protected:
 
 QT_END_NAMESPACE
 
-#endif // QSTYLEITEM_P_H
+#endif // QQUICKSTYLEITEM_P_H
diff --git a/src/private/qwheelarea.cpp b/src/private/qquickwheelarea.cpp
similarity index 81%
rename from src/private/qwheelarea.cpp
rename to src/private/qquickwheelarea.cpp
index db3b517147ff791c3afbeb1ea548ffe1f3077b25..101e22bf033266f4e04c2392e7561f8624cc4cb1 100644
--- a/src/private/qwheelarea.cpp
+++ b/src/private/qquickwheelarea.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include "qwheelarea_p.h"
+#include "qquickwheelarea_p.h"
 
 QT_BEGIN_NAMESPACE
 
@@ -56,7 +56,7 @@ static const qreal pixelDeltaAdjustment = 0.5;
 // comes originally from QTextEdit, which sets 20px steps by default.
 static const qreal defaultScrollSpeed = 20.0;
 
-QWheelArea::QWheelArea(QQuickItem *parent)
+QQuickWheelArea::QQuickWheelArea(QQuickItem *parent)
     : QQuickItem(parent),
       m_horizontalMinimumValue(0),
       m_horizontalMaximumValue(0),
@@ -71,12 +71,12 @@ QWheelArea::QWheelArea(QQuickItem *parent)
 
 }
 
-QWheelArea::~QWheelArea()
+QQuickWheelArea::~QQuickWheelArea()
 {
 
 }
 
-void QWheelArea::wheelEvent(QWheelEvent *we)
+void QQuickWheelArea::wheelEvent(QWheelEvent *we)
 {
     QPoint numPixels = we->pixelDelta();
     QPoint numDegrees = we->angleDelta() / 8;
@@ -92,47 +92,47 @@ void QWheelArea::wheelEvent(QWheelEvent *we)
     we->accept();
 }
 
-void QWheelArea::setHorizontalMinimumValue(qreal value)
+void QQuickWheelArea::setHorizontalMinimumValue(qreal value)
 {
     m_horizontalMinimumValue = value;
 }
 
-qreal QWheelArea::horizontalMinimumValue() const
+qreal QQuickWheelArea::horizontalMinimumValue() const
 {
     return m_horizontalMinimumValue;
 }
 
-void QWheelArea::setHorizontalMaximumValue(qreal value)
+void QQuickWheelArea::setHorizontalMaximumValue(qreal value)
 {
     m_horizontalMaximumValue = value;
 }
 
-qreal QWheelArea::horizontalMaximumValue() const
+qreal QQuickWheelArea::horizontalMaximumValue() const
 {
     return m_horizontalMaximumValue;
 }
 
-void QWheelArea::setVerticalMinimumValue(qreal value)
+void QQuickWheelArea::setVerticalMinimumValue(qreal value)
 {
     m_verticalMinimumValue = value;
 }
 
-qreal QWheelArea::verticalMinimumValue() const
+qreal QQuickWheelArea::verticalMinimumValue() const
 {
     return m_verticalMinimumValue;
 }
 
-void QWheelArea::setVerticalMaximumValue(qreal value)
+void QQuickWheelArea::setVerticalMaximumValue(qreal value)
 {
     m_verticalMaximumValue = value;
 }
 
-qreal QWheelArea::verticalMaximumValue() const
+qreal QQuickWheelArea::verticalMaximumValue() const
 {
     return m_verticalMaximumValue;
 }
 
-void QWheelArea::setHorizontalValue(qreal value)
+void QQuickWheelArea::setHorizontalValue(qreal value)
 {
     value = qBound<qreal>(m_horizontalMinimumValue, value, m_horizontalMaximumValue);
 
@@ -142,12 +142,12 @@ void QWheelArea::setHorizontalValue(qreal value)
     }
 }
 
-qreal QWheelArea::horizontalValue() const
+qreal QQuickWheelArea::horizontalValue() const
 {
     return m_horizontalValue;
 }
 
-void QWheelArea::setVerticalValue(qreal value)
+void QQuickWheelArea::setVerticalValue(qreal value)
 {
     value = qBound<qreal>(m_verticalMinimumValue, value, m_verticalMaximumValue);
 
@@ -157,12 +157,12 @@ void QWheelArea::setVerticalValue(qreal value)
     }
 }
 
-qreal QWheelArea::verticalValue() const
+qreal QQuickWheelArea::verticalValue() const
 {
     return m_verticalValue;
 }
 
-void QWheelArea::setVerticalDelta(qreal value)
+void QQuickWheelArea::setVerticalDelta(qreal value)
 {
     m_verticalDelta = value;
     setVerticalValue(m_verticalValue - m_verticalDelta);
@@ -170,12 +170,12 @@ void QWheelArea::setVerticalDelta(qreal value)
     emit verticalWheelMoved();
 }
 
-qreal QWheelArea::verticalDelta() const
+qreal QQuickWheelArea::verticalDelta() const
 {
     return m_verticalDelta;
 }
 
-void QWheelArea::setHorizontalDelta(qreal value)
+void QQuickWheelArea::setHorizontalDelta(qreal value)
 {
     m_horizontalDelta = value;
     setHorizontalValue(m_horizontalValue - m_horizontalDelta);
@@ -183,12 +183,12 @@ void QWheelArea::setHorizontalDelta(qreal value)
     emit horizontalWheelMoved();
 }
 
-qreal QWheelArea::horizontalDelta() const
+qreal QQuickWheelArea::horizontalDelta() const
 {
     return m_horizontalDelta;
 }
 
-void QWheelArea::setScrollSpeed(qreal value)
+void QQuickWheelArea::setScrollSpeed(qreal value)
 {
     if (value != m_scrollSpeed) {
         m_scrollSpeed = value;
@@ -196,7 +196,7 @@ void QWheelArea::setScrollSpeed(qreal value)
     }
 }
 
-qreal QWheelArea::scrollSpeed() const
+qreal QQuickWheelArea::scrollSpeed() const
 {
     return m_scrollSpeed;
 }
diff --git a/src/private/qwheelarea_p.h b/src/private/qquickwheelarea_p.h
similarity index 93%
rename from src/private/qwheelarea_p.h
rename to src/private/qquickwheelarea_p.h
index ac5568164a770fc1a0882241bf986ab2547263cf..057ad56de04808225f8f33a417bdfdd367291287 100644
--- a/src/private/qwheelarea_p.h
+++ b/src/private/qquickwheelarea_p.h
@@ -39,15 +39,15 @@
 **
 ****************************************************************************/
 
-#ifndef QWHEELAREA_P_H
-#define QWHEELAREA_P_H
+#ifndef QQUICKWHEELAREA_P_H
+#define QQUICKWHEELAREA_P_H
 
 #include <QtGui/qevent.h>
 #include <QtQuick/qquickitem.h>
 
 QT_BEGIN_NAMESPACE
 
-class QWheelArea : public QQuickItem
+class QQuickWheelArea : public QQuickItem
 {
     Q_OBJECT
     Q_PROPERTY(qreal verticalDelta READ verticalDelta WRITE setVerticalDelta NOTIFY verticalWheelMoved)
@@ -61,8 +61,8 @@ class QWheelArea : public QQuickItem
     Q_PROPERTY(qreal scrollSpeed READ scrollSpeed WRITE setScrollSpeed NOTIFY scrollSpeedChanged)
 
 public:
-    QWheelArea(QQuickItem *parent = 0);
-    virtual ~QWheelArea();
+    QQuickWheelArea(QQuickItem *parent = 0);
+    virtual ~QQuickWheelArea();
 
     void setHorizontalMinimumValue(qreal value);
     qreal horizontalMinimumValue() const;
@@ -111,11 +111,11 @@ private:
     qreal m_horizontalDelta;
     qreal m_scrollSpeed;
 
-    Q_DISABLE_COPY(QWheelArea)
+    Q_DISABLE_COPY(QQuickWheelArea)
 };
 
 QT_END_NAMESPACE
 
-QML_DECLARE_TYPE(QWheelArea)
+QML_DECLARE_TYPE(QQuickWheelArea)
 
-#endif // QWHEELAREA_P_H
+#endif // QQUICKWHEELAREA_P_H