Remove "abstract" prefix from the C++ classes

The QML type registration is still using Abstract-prefix to avoid
conflicts, until QTBUG-43581 & QTBUG-43582 have been resolved so that
the public types can be used for accessing attached properties and
enums.

Change-Id: I469712461f706a83c226e4017282ca1d6914c670
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>

56 files changed, 1015 insertions, 1015 deletions

diff --git a/src/controls/controls.pri b/src/controls/controls.pri
index aea9b06f..0205a03e 100644
--- a/src/controls/controls.pri
+++ b/src/controls/controls.pri
@@ -1,63 +1,63 @@
 INCLUDEPATH += $$PWD
 
 HEADERS += \
-    $$PWD/qquickabstractapplicationwindow_p.h \
-    $$PWD/qquickabstractbusyindicator_p.h \
-    $$PWD/qquickabstractbutton_p.h \
-    $$PWD/qquickabstractbutton_p_p.h \
-    $$PWD/qquickabstractcheckable_p.h \
-    $$PWD/qquickabstractcheckable_p_p.h \
-    $$PWD/qquickabstractcheckbox_p.h \
-    $$PWD/qquickabstractcontainer_p.h \
-    $$PWD/qquickabstractcontainer_p_p.h \
-    $$PWD/qquickabstractframe_p.h \
-    $$PWD/qquickabstractgroupbox_p.h \
-    $$PWD/qquickabstractlabel_p.h \
-    $$PWD/qquickabstractpageindicator_p.h \
-    $$PWD/qquickabstractprogressbar_p.h \
-    $$PWD/qquickabstractradiobutton_p.h \
-    $$PWD/qquickabstractscrollbar_p.h \
-    $$PWD/qquickabstractscrollindicator_p.h \
-    $$PWD/qquickabstractslider_p.h \
-    $$PWD/qquickabstractstackview_p.h \
-    $$PWD/qquickabstractstackview_p_p.h \
-    $$PWD/qquickabstractswitch_p.h \
-    $$PWD/qquickabstracttabbar_p.h \
-    $$PWD/qquickabstracttabbutton_p.h \
-    $$PWD/qquickabstracttabview_p.h \
-    $$PWD/qquickabstracttextarea_p.h \
-    $$PWD/qquickabstracttextfield_p.h \
-    $$PWD/qquickabstracttogglebutton_p.h \
-    $$PWD/qquickabstracttoolbar_p.h \
+    $$PWD/qquickapplicationwindow_p.h \
+    $$PWD/qquickbusyindicator_p.h \
+    $$PWD/qquickbutton_p.h \
+    $$PWD/qquickbutton_p_p.h \
+    $$PWD/qquickcheckable_p.h \
+    $$PWD/qquickcheckable_p_p.h \
+    $$PWD/qquickcheckbox_p.h \
+    $$PWD/qquickcontainer_p.h \
+    $$PWD/qquickcontainer_p_p.h \
     $$PWD/qquickcontrol_p.h \
     $$PWD/qquickcontrol_p_p.h \
-    $$PWD/qquickexclusivegroup_p.h
+    $$PWD/qquickexclusivegroup_p.h \
+    $$PWD/qquickframe_p.h \
+    $$PWD/qquickgroupbox_p.h \
+    $$PWD/qquicklabel_p.h \
+    $$PWD/qquickpageindicator_p.h \
+    $$PWD/qquickprogressbar_p.h \
+    $$PWD/qquickradiobutton_p.h \
+    $$PWD/qquickscrollbar_p.h \
+    $$PWD/qquickscrollindicator_p.h \
+    $$PWD/qquickslider_p.h \
+    $$PWD/qquickstackview_p.h \
+    $$PWD/qquickstackview_p_p.h \
+    $$PWD/qquickswitch_p.h \
+    $$PWD/qquicktabbar_p.h \
+    $$PWD/qquicktabbutton_p.h \
+    $$PWD/qquicktabview_p.h \
+    $$PWD/qquicktextarea_p.h \
+    $$PWD/qquicktextfield_p.h \
+    $$PWD/qquicktogglebutton_p.h \
+    $$PWD/qquicktoolbar_p.h
 
 SOURCES += \
-    $$PWD/qquickabstractapplicationwindow.cpp \
-    $$PWD/qquickabstractbusyindicator.cpp \
-    $$PWD/qquickabstractbutton.cpp \
-    $$PWD/qquickabstractcheckable.cpp \
-    $$PWD/qquickabstractcheckbox.cpp \
-    $$PWD/qquickabstractcontainer.cpp \
-    $$PWD/qquickabstractframe.cpp \
-    $$PWD/qquickabstractgroupbox.cpp \
-    $$PWD/qquickabstractlabel.cpp \
-    $$PWD/qquickabstractpageindicator.cpp \
-    $$PWD/qquickabstractprogressbar.cpp \
-    $$PWD/qquickabstractradiobutton.cpp \
-    $$PWD/qquickabstractscrollbar.cpp \
-    $$PWD/qquickabstractscrollindicator.cpp \
-    $$PWD/qquickabstractslider.cpp \
-    $$PWD/qquickabstractstackview.cpp \
-    $$PWD/qquickabstractstackview_p.cpp \
-    $$PWD/qquickabstractswitch.cpp \
-    $$PWD/qquickabstracttabbar.cpp \
-    $$PWD/qquickabstracttabbutton.cpp \
-    $$PWD/qquickabstracttabview.cpp \
-    $$PWD/qquickabstracttextarea.cpp \
-    $$PWD/qquickabstracttextfield.cpp \
-    $$PWD/qquickabstracttogglebutton.cpp \
-    $$PWD/qquickabstracttoolbar.cpp \
+    $$PWD/qquickapplicationwindow.cpp \
+    $$PWD/qquickbusyindicator.cpp \
+    $$PWD/qquickbutton.cpp \
+    $$PWD/qquickcheckable.cpp \
+    $$PWD/qquickcheckbox.cpp \
+    $$PWD/qquickcontainer.cpp \
     $$PWD/qquickcontrol.cpp \
-    $$PWD/qquickexclusivegroup.cpp
+    $$PWD/qquickexclusivegroup.cpp \
+    $$PWD/qquickframe.cpp \
+    $$PWD/qquickgroupbox.cpp \
+    $$PWD/qquicklabel.cpp \
+    $$PWD/qquickpageindicator.cpp \
+    $$PWD/qquickprogressbar.cpp \
+    $$PWD/qquickradiobutton.cpp \
+    $$PWD/qquickscrollbar.cpp \
+    $$PWD/qquickscrollindicator.cpp \
+    $$PWD/qquickslider.cpp \
+    $$PWD/qquickstackview.cpp \
+    $$PWD/qquickstackview_p.cpp \
+    $$PWD/qquickswitch.cpp \
+    $$PWD/qquicktabbar.cpp \
+    $$PWD/qquicktabbutton.cpp \
+    $$PWD/qquicktabview.cpp \
+    $$PWD/qquicktextarea.cpp \
+    $$PWD/qquicktextfield.cpp \
+    $$PWD/qquicktogglebutton.cpp \
+    $$PWD/qquicktoolbar.cpp
diff --git a/src/controls/qquickabstractradiobutton_p.h b/src/controls/qquickabstractradiobutton_p.h
deleted file mode 100644
index 9d027ee6..00000000
--- a/src/controls/qquickabstractradiobutton_p.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the Qt Quick Controls module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL3$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPLv3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or later 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 2.0 requirements will be
-** met: http://www.gnu.org/licenses/gpl-2.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QQUICKABSTRACTRADIOBUTTON_P_H
-#define QQUICKABSTRACTRADIOBUTTON_P_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include <QtQuickControls/private/qquickabstractcheckable_p.h>
-
-QT_BEGIN_NAMESPACE
-
-class Q_QUICKCONTROLS_EXPORT QQuickAbstractRadioButton : public QQuickAbstractCheckable
-{
-    Q_OBJECT
-
-public:
-    explicit QQuickAbstractRadioButton(QQuickItem *parent = Q_NULLPTR);
-};
-
-QT_END_NAMESPACE
-
-#endif // QQUICKABSTRACTRADIOBUTTON_P_H
diff --git a/src/controls/qquickabstracttogglebutton_p.h b/src/controls/qquickabstracttogglebutton_p.h
deleted file mode 100644
index 7b6bde6e..00000000
--- a/src/controls/qquickabstracttogglebutton_p.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the Qt Quick Controls module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL3$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPLv3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or later 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 2.0 requirements will be
-** met: http://www.gnu.org/licenses/gpl-2.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QQUICKABSTRACTTOGGLEBUTTON_P_H
-#define QQUICKABSTRACTTOGGLEBUTTON_P_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include <QtQuickControls/private/qquickabstractswitch_p.h>
-
-QT_BEGIN_NAMESPACE
-
-class Q_QUICKCONTROLS_EXPORT QQuickAbstractToggleButton : public QQuickAbstractSwitch
-{
-    Q_OBJECT
-
-public:
-    explicit QQuickAbstractToggleButton(QQuickItem *parent = Q_NULLPTR);
-};
-
-QT_END_NAMESPACE
-
-#endif // QQUICKABSTRACTTOGGLEBUTTON_P_H
diff --git a/src/controls/qquickabstractapplicationwindow.cpp b/src/controls/qquickapplicationwindow.cpp
index c5045e77..7a4809ab 100644
--- a/src/controls/qquickabstractapplicationwindow.cpp
+++ b/src/controls/qquickapplicationwindow.cpp
@@ -34,7 +34,7 @@
 **
 ****************************************************************************/
 
-#include "qquickabstractapplicationwindow_p.h"
+#include "qquickapplicationwindow_p.h"
 
 #include <QtQuick/private/qquickitem_p.h>
 #include <QtQuick/private/qquickitemchangelistener_p.h>
@@ -44,7 +44,7 @@ QT_BEGIN_NAMESPACE
 /*!
     \qmltype ApplicationWindow
     \inherits Window
-    \instantiates QQuickAbstractApplicationWindow
+    \instantiates QQuickApplicationWindow
     \inqmlmodule QtQuick.Controls
     \ingroup application
     \brief An application window.
@@ -52,12 +52,12 @@ QT_BEGIN_NAMESPACE
     TODO
 */
 
-class QQuickAbstractApplicationWindowPrivate : public QQuickItemChangeListener
+class QQuickApplicationWindowPrivate : public QQuickItemChangeListener
 {
-    Q_DECLARE_PUBLIC(QQuickAbstractApplicationWindow)
+    Q_DECLARE_PUBLIC(QQuickApplicationWindow)
 
 public:
-    QQuickAbstractApplicationWindowPrivate() : contentWidth(0), contentHeight(0), header(Q_NULLPTR), footer(Q_NULLPTR) { }
+    QQuickApplicationWindowPrivate() : contentWidth(0), contentHeight(0), header(Q_NULLPTR), footer(Q_NULLPTR) { }
 
     void relayout();
 
@@ -68,12 +68,12 @@ public:
     qreal contentHeight;
     QQuickItem *header;
     QQuickItem *footer;
-    QQuickAbstractApplicationWindow *q_ptr;
+    QQuickApplicationWindow *q_ptr;
 };
 
-void QQuickAbstractApplicationWindowPrivate::relayout()
+void QQuickApplicationWindowPrivate::relayout()
 {
-    Q_Q(QQuickAbstractApplicationWindow);
+    Q_Q(QQuickApplicationWindow);
     QQuickItem *content = q->contentItem();
     qreal hh = header ? header->height() : 0;
     qreal fh = footer ? footer->height() : 0;
@@ -87,27 +87,27 @@ void QQuickAbstractApplicationWindowPrivate::relayout()
         footer->setY(content->height());
 }
 
-void QQuickAbstractApplicationWindowPrivate::itemImplicitWidthChanged(QQuickItem *item)
+void QQuickApplicationWindowPrivate::itemImplicitWidthChanged(QQuickItem *item)
 {
     Q_UNUSED(item);
     relayout();
 }
 
-void QQuickAbstractApplicationWindowPrivate::itemImplicitHeightChanged(QQuickItem *item)
+void QQuickApplicationWindowPrivate::itemImplicitHeightChanged(QQuickItem *item)
 {
     Q_UNUSED(item);
     relayout();
 }
 
-QQuickAbstractApplicationWindow::QQuickAbstractApplicationWindow(QWindow *parent) :
-    QQuickWindowQmlImpl(parent), d_ptr(new QQuickAbstractApplicationWindowPrivate)
+QQuickApplicationWindow::QQuickApplicationWindow(QWindow *parent) :
+    QQuickWindowQmlImpl(parent), d_ptr(new QQuickApplicationWindowPrivate)
 {
     d_ptr->q_ptr = this;
 }
 
-QQuickAbstractApplicationWindow::~QQuickAbstractApplicationWindow()
+QQuickApplicationWindow::~QQuickApplicationWindow()
 {
-    Q_D(QQuickAbstractApplicationWindow);
+    Q_D(QQuickApplicationWindow);
     if (d->header)
         QQuickItemPrivate::get(d->header)->removeItemChangeListener(d, QQuickItemPrivate::ImplicitWidth | QQuickItemPrivate::ImplicitHeight);
     if (d->footer)
@@ -119,15 +119,15 @@ QQuickAbstractApplicationWindow::~QQuickAbstractApplicationWindow()
 
     TODO
 */
-QQuickItem *QQuickAbstractApplicationWindow::header() const
+QQuickItem *QQuickApplicationWindow::header() const
 {
-    Q_D(const QQuickAbstractApplicationWindow);
+    Q_D(const QQuickApplicationWindow);
     return d->header;
 }
 
-void QQuickAbstractApplicationWindow::setHeader(QQuickItem *header)
+void QQuickApplicationWindow::setHeader(QQuickItem *header)
 {
-    Q_D(QQuickAbstractApplicationWindow);
+    Q_D(QQuickApplicationWindow);
     if (d->header != header) {
         delete d->header;
         d->header = header;
@@ -147,15 +147,15 @@ void QQuickAbstractApplicationWindow::setHeader(QQuickItem *header)
 
     TODO
 */
-QQuickItem *QQuickAbstractApplicationWindow::footer() const
+QQuickItem *QQuickApplicationWindow::footer() const
 {
-    Q_D(const QQuickAbstractApplicationWindow);
+    Q_D(const QQuickApplicationWindow);
     return d->footer;
 }
 
-void QQuickAbstractApplicationWindow::setFooter(QQuickItem *footer)
+void QQuickApplicationWindow::setFooter(QQuickItem *footer)
 {
-    Q_D(QQuickAbstractApplicationWindow);
+    Q_D(QQuickApplicationWindow);
     if (d->footer != footer) {
         delete d->footer;
         d->footer = footer;
@@ -175,15 +175,15 @@ void QQuickAbstractApplicationWindow::setFooter(QQuickItem *footer)
 
     TODO
 */
-qreal QQuickAbstractApplicationWindow::contentWidth() const
+qreal QQuickApplicationWindow::contentWidth() const
 {
-    Q_D(const QQuickAbstractApplicationWindow);
+    Q_D(const QQuickApplicationWindow);
     return d->contentWidth;
 }
 
-void QQuickAbstractApplicationWindow::setContentWidth(qreal width)
+void QQuickApplicationWindow::setContentWidth(qreal width)
 {
-    Q_D(QQuickAbstractApplicationWindow);
+    Q_D(QQuickApplicationWindow);
     if (d->contentWidth != width) {
         d->contentWidth = width;
         emit contentWidthChanged();
@@ -195,26 +195,26 @@ void QQuickAbstractApplicationWindow::setContentWidth(qreal width)
 
     TODO
 */
-qreal QQuickAbstractApplicationWindow::contentHeight() const
+qreal QQuickApplicationWindow::contentHeight() const
 {
-    Q_D(const QQuickAbstractApplicationWindow);
+    Q_D(const QQuickApplicationWindow);
     return d->contentHeight;
 }
 
-void QQuickAbstractApplicationWindow::setContentHeight(qreal height)
+void QQuickApplicationWindow::setContentHeight(qreal height)
 {
-    Q_D(QQuickAbstractApplicationWindow);
+    Q_D(QQuickApplicationWindow);
     if (d->contentHeight != height) {
         d->contentHeight = height;
         emit contentHeightChanged();
     }
 }
 
-void QQuickAbstractApplicationWindow::resizeEvent(QResizeEvent *event)
+void QQuickApplicationWindow::resizeEvent(QResizeEvent *event)
 {
     QQuickWindowQmlImpl::resizeEvent(event);
 
-    Q_D(QQuickAbstractApplicationWindow);
+    Q_D(QQuickApplicationWindow);
     if (d->header) {
         QQuickItemPrivate *p = QQuickItemPrivate::get(d->header);
         if (!p->widthValid) {
diff --git a/src/controls/qquickabstractapplicationwindow_p.h b/src/controls/qquickapplicationwindow_p.h
index 4b378123..6d7522fe 100644
--- a/src/controls/qquickabstractapplicationwindow_p.h
+++ b/src/controls/qquickapplicationwindow_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QQUICKABSTRACTAPPLICATIONWINDOW_P_H
-#define QQUICKABSTRACTAPPLICATIONWINDOW_P_H
+#ifndef QQUICKAPPLICATIONWINDOW_P_H
+#define QQUICKAPPLICATIONWINDOW_P_H
 
 //
 //  W A R N I N G
@@ -53,9 +53,9 @@
 
 QT_BEGIN_NAMESPACE
 
-class QQuickAbstractApplicationWindowPrivate;
+class QQuickApplicationWindowPrivate;
 
-class Q_QUICKCONTROLS_EXPORT QQuickAbstractApplicationWindow : public QQuickWindowQmlImpl
+class Q_QUICKCONTROLS_EXPORT QQuickApplicationWindow : public QQuickWindowQmlImpl
 {
     Q_OBJECT
     Q_PROPERTY(QQuickItem *header READ header WRITE setHeader NOTIFY headerChanged FINAL)
@@ -64,8 +64,8 @@ class Q_QUICKCONTROLS_EXPORT QQuickAbstractApplicationWindow : public QQuickWind
     Q_PROPERTY(qreal contentHeight READ contentHeight WRITE setContentHeight NOTIFY contentHeightChanged FINAL)
 
 public:
-    explicit QQuickAbstractApplicationWindow(QWindow *parent = Q_NULLPTR);
-    ~QQuickAbstractApplicationWindow();
+    explicit QQuickApplicationWindow(QWindow *parent = Q_NULLPTR);
+    ~QQuickApplicationWindow();
 
     QQuickItem *header() const;
     void setHeader(QQuickItem *header);
@@ -89,11 +89,11 @@ protected:
     void resizeEvent(QResizeEvent *event) Q_DECL_OVERRIDE;
 
 private:
-    Q_DISABLE_COPY(QQuickAbstractApplicationWindow)
-    Q_DECLARE_PRIVATE(QQuickAbstractApplicationWindow)
-    QScopedPointer<QQuickAbstractApplicationWindowPrivate> d_ptr;
+    Q_DISABLE_COPY(QQuickApplicationWindow)
+    Q_DECLARE_PRIVATE(QQuickApplicationWindow)
+    QScopedPointer<QQuickApplicationWindowPrivate> d_ptr;
 };
 
 QT_END_NAMESPACE
 
-#endif // QQUICKABSTRACTAPPLICATIONWINDOW_P_H
+#endif // QQUICKAPPLICATIONWINDOW_P_H
diff --git a/src/controls/qquickabstractbusyindicator.cpp b/src/controls/qquickbusyindicator.cpp
index 4370668a..8e0faf0c 100644
--- a/src/controls/qquickabstractbusyindicator.cpp
+++ b/src/controls/qquickbusyindicator.cpp
@@ -34,7 +34,7 @@
 **
 ****************************************************************************/
 
-#include "qquickabstractbusyindicator_p.h"
+#include "qquickbusyindicator_p.h"
 #include "qquickcontrol_p_p.h"
 
 QT_BEGIN_NAMESPACE
@@ -42,7 +42,7 @@ QT_BEGIN_NAMESPACE
 /*!
     \qmltype BusyIndicator
     \inherits Control
-    \instantiates QQuickAbstractBusyIndicator
+    \instantiates QQuickBusyIndicator
     \inqmlmodule QtQuick.Controls
     \ingroup indicators
     \brief A busy indicator.
@@ -50,17 +50,17 @@ QT_BEGIN_NAMESPACE
     TODO
 */
 
-class QQuickAbstractBusyIndicatorPrivate : public QQuickControlPrivate
+class QQuickBusyIndicatorPrivate : public QQuickControlPrivate
 {
 public:
-    QQuickAbstractBusyIndicatorPrivate() : running(false), indicator(Q_NULLPTR) { }
+    QQuickBusyIndicatorPrivate() : running(false), indicator(Q_NULLPTR) { }
 
     bool running;
     QQuickItem *indicator;
 };
 
-QQuickAbstractBusyIndicator::QQuickAbstractBusyIndicator(QQuickItem *parent) :
-    QQuickControl(*(new QQuickAbstractBusyIndicatorPrivate), parent)
+QQuickBusyIndicator::QQuickBusyIndicator(QQuickItem *parent) :
+    QQuickControl(*(new QQuickBusyIndicatorPrivate), parent)
 {
 }
 
@@ -69,15 +69,15 @@ QQuickAbstractBusyIndicator::QQuickAbstractBusyIndicator(QQuickItem *parent) :
 
     TODO
 */
-bool QQuickAbstractBusyIndicator::isRunning() const
+bool QQuickBusyIndicator::isRunning() const
 {
-    Q_D(const QQuickAbstractBusyIndicator);
+    Q_D(const QQuickBusyIndicator);
     return d->running;
 }
 
-void QQuickAbstractBusyIndicator::setRunning(bool running)
+void QQuickBusyIndicator::setRunning(bool running)
 {
-    Q_D(QQuickAbstractBusyIndicator);
+    Q_D(QQuickBusyIndicator);
     if (d->running != running) {
         d->running = running;
         emit runningChanged();
@@ -89,15 +89,15 @@ void QQuickAbstractBusyIndicator::setRunning(bool running)
 
     TODO
 */
-QQuickItem *QQuickAbstractBusyIndicator::indicator() const
+QQuickItem *QQuickBusyIndicator::indicator() const
 {
-    Q_D(const QQuickAbstractBusyIndicator);
+    Q_D(const QQuickBusyIndicator);
     return d->indicator;
 }
 
-void QQuickAbstractBusyIndicator::setIndicator(QQuickItem *indicator)
+void QQuickBusyIndicator::setIndicator(QQuickItem *indicator)
 {
-    Q_D(QQuickAbstractBusyIndicator);
+    Q_D(QQuickBusyIndicator);
     if (d->indicator != indicator) {
         delete d->indicator;
         d->indicator = indicator;
diff --git a/src/controls/qquickabstractbusyindicator_p.h b/src/controls/qquickbusyindicator_p.h
index e9955c6e..b0fcbb4c 100644
--- a/src/controls/qquickabstractbusyindicator_p.h
+++ b/src/controls/qquickbusyindicator_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QQUICKABSTRACTBUSYINDICATOR_P_H
-#define QQUICKABSTRACTBUSYINDICATOR_P_H
+#ifndef QQUICKBUSYINDICATOR_P_H
+#define QQUICKBUSYINDICATOR_P_H
 
 //
 //  W A R N I N G
@@ -52,16 +52,16 @@
 
 QT_BEGIN_NAMESPACE
 
-class QQuickAbstractBusyIndicatorPrivate;
+class QQuickBusyIndicatorPrivate;
 
-class Q_QUICKCONTROLS_EXPORT QQuickAbstractBusyIndicator : public QQuickControl
+class Q_QUICKCONTROLS_EXPORT QQuickBusyIndicator : public QQuickControl
 {
     Q_OBJECT
     Q_PROPERTY(bool running READ isRunning WRITE setRunning NOTIFY runningChanged FINAL)
     Q_PROPERTY(QQuickItem *indicator READ indicator WRITE setIndicator NOTIFY indicatorChanged FINAL)
 
 public:
-    explicit QQuickAbstractBusyIndicator(QQuickItem *parent = Q_NULLPTR);
+    explicit QQuickBusyIndicator(QQuickItem *parent = Q_NULLPTR);
 
     bool isRunning() const;
     void setRunning(bool running);
@@ -74,10 +74,10 @@ Q_SIGNALS:
     void indicatorChanged();
 
 private:
-    Q_DISABLE_COPY(QQuickAbstractBusyIndicator)
-    Q_DECLARE_PRIVATE(QQuickAbstractBusyIndicator)
+    Q_DISABLE_COPY(QQuickBusyIndicator)
+    Q_DECLARE_PRIVATE(QQuickBusyIndicator)
 };
 
 QT_END_NAMESPACE
 
-#endif // QQUICKABSTRACTBUSYINDICATOR_P_H
+#endif // QQUICKBUSYINDICATOR_P_H
diff --git a/src/controls/qquickabstractbutton.cpp b/src/controls/qquickbutton.cpp
index 5b207520..805af923 100644
--- a/src/controls/qquickabstractbutton.cpp
+++ b/src/controls/qquickbutton.cpp
@@ -34,15 +34,15 @@
 **
 ****************************************************************************/
 
-#include "qquickabstractbutton_p.h"
-#include "qquickabstractbutton_p_p.h"
+#include "qquickbutton_p.h"
+#include "qquickbutton_p_p.h"
 
 QT_BEGIN_NAMESPACE
 
 /*!
     \qmltype Button
     \inherits Control
-    \instantiates QQuickAbstractButton
+    \instantiates QQuickButton
     \inqmlmodule QtQuick.Controls
     \ingroup buttons
     \brief A button control.
@@ -50,19 +50,19 @@ QT_BEGIN_NAMESPACE
     TODO
 */
 
-QQuickAbstractButtonPrivate::QQuickAbstractButtonPrivate() :
+QQuickButtonPrivate::QQuickButtonPrivate() :
     pressed(false), label(Q_NULLPTR)
 {
 }
 
-QQuickAbstractButton::QQuickAbstractButton(QQuickItem *parent) :
-    QQuickControl(*(new QQuickAbstractButtonPrivate), parent)
+QQuickButton::QQuickButton(QQuickItem *parent) :
+    QQuickControl(*(new QQuickButtonPrivate), parent)
 {
     setActiveFocusOnTab(true);
     setAcceptedMouseButtons(Qt::LeftButton);
 }
 
-QQuickAbstractButton::QQuickAbstractButton(QQuickAbstractButtonPrivate &dd, QQuickItem *parent) :
+QQuickButton::QQuickButton(QQuickButtonPrivate &dd, QQuickItem *parent) :
     QQuickControl(dd, parent)
 {
     setActiveFocusOnTab(true);
@@ -74,15 +74,15 @@ QQuickAbstractButton::QQuickAbstractButton(QQuickAbstractButtonPrivate &dd, QQui
 
     TODO
 */
-QString QQuickAbstractButton::text() const
+QString QQuickButton::text() const
 {
-    Q_D(const QQuickAbstractButton);
+    Q_D(const QQuickButton);
     return d->text;
 }
 
-void QQuickAbstractButton::setText(const QString &text)
+void QQuickButton::setText(const QString &text)
 {
-    Q_D(QQuickAbstractButton);
+    Q_D(QQuickButton);
     if (d->text != text) {
         d->text = text;
         emit textChanged();
@@ -94,15 +94,15 @@ void QQuickAbstractButton::setText(const QString &text)
 
     TODO
 */
-bool QQuickAbstractButton::isPressed() const
+bool QQuickButton::isPressed() const
 {
-    Q_D(const QQuickAbstractButton);
+    Q_D(const QQuickButton);
     return d->pressed;
 }
 
-void QQuickAbstractButton::setPressed(bool pressed)
+void QQuickButton::setPressed(bool pressed)
 {
-    Q_D(QQuickAbstractButton);
+    Q_D(QQuickButton);
     if (d->pressed != pressed) {
         d->pressed = pressed;
         emit pressedChanged();
@@ -114,15 +114,15 @@ void QQuickAbstractButton::setPressed(bool pressed)
 
     TODO
 */
-QQuickItem *QQuickAbstractButton::label() const
+QQuickItem *QQuickButton::label() const
 {
-    Q_D(const QQuickAbstractButton);
+    Q_D(const QQuickButton);
     return d->label;
 }
 
-void QQuickAbstractButton::setLabel(QQuickItem *label)
+void QQuickButton::setLabel(QQuickItem *label)
 {
-    Q_D(QQuickAbstractButton);
+    Q_D(QQuickButton);
     if (d->label != label) {
         delete d->label;
         d->label = label;
@@ -132,13 +132,13 @@ void QQuickAbstractButton::setLabel(QQuickItem *label)
     }
 }
 
-void QQuickAbstractButton::focusOutEvent(QFocusEvent *event)
+void QQuickButton::focusOutEvent(QFocusEvent *event)
 {
     QQuickControl::focusOutEvent(event);
     setPressed(false);
 }
 
-void QQuickAbstractButton::keyPressEvent(QKeyEvent *event)
+void QQuickButton::keyPressEvent(QKeyEvent *event)
 {
     QQuickControl::keyPressEvent(event);
     if (event->key() == Qt::Key_Space) {
@@ -147,7 +147,7 @@ void QQuickAbstractButton::keyPressEvent(QKeyEvent *event)
     }
 }
 
-void QQuickAbstractButton::keyReleaseEvent(QKeyEvent *event)
+void QQuickButton::keyReleaseEvent(QKeyEvent *event)
 {
     QQuickControl::keyReleaseEvent(event);
     if (event->key() == Qt::Key_Space) {
@@ -157,21 +157,21 @@ void QQuickAbstractButton::keyReleaseEvent(QKeyEvent *event)
     }
 }
 
-void QQuickAbstractButton::mousePressEvent(QMouseEvent *event)
+void QQuickButton::mousePressEvent(QMouseEvent *event)
 {
     QQuickControl::mousePressEvent(event);
     setPressed(true);
     event->accept();
 }
 
-void QQuickAbstractButton::mouseMoveEvent(QMouseEvent *event)
+void QQuickButton::mouseMoveEvent(QMouseEvent *event)
 {
     QQuickControl::mouseMoveEvent(event);
     setPressed(contains(event->pos()));
     event->accept();
 }
 
-void QQuickAbstractButton::mouseReleaseEvent(QMouseEvent *event)
+void QQuickButton::mouseReleaseEvent(QMouseEvent *event)
 {
     QQuickControl::mouseReleaseEvent(event);
     if (contains(event->pos()))
@@ -180,7 +180,7 @@ void QQuickAbstractButton::mouseReleaseEvent(QMouseEvent *event)
     event->accept();
 }
 
-void QQuickAbstractButton::mouseUngrabEvent()
+void QQuickButton::mouseUngrabEvent()
 {
     QQuickControl::mouseUngrabEvent();
     setPressed(false);
diff --git a/src/controls/qquickabstractbutton_p.h b/src/controls/qquickbutton_p.h
index 2bbfb5b8..4b30b4d3 100644
--- a/src/controls/qquickabstractbutton_p.h
+++ b/src/controls/qquickbutton_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QQUICKABSTRACTBUTTON_P_H
-#define QQUICKABSTRACTBUTTON_P_H
+#ifndef QQUICKBUTTON_P_H
+#define QQUICKBUTTON_P_H
 
 //
 //  W A R N I N G
@@ -52,9 +52,9 @@
 
 QT_BEGIN_NAMESPACE
 
-class QQuickAbstractButtonPrivate;
+class QQuickButtonPrivate;
 
-class Q_QUICKCONTROLS_EXPORT QQuickAbstractButton : public QQuickControl
+class Q_QUICKCONTROLS_EXPORT QQuickButton : public QQuickControl
 {
     Q_OBJECT
     Q_PROPERTY(QString text READ text WRITE setText NOTIFY textChanged FINAL)
@@ -62,7 +62,7 @@ class Q_QUICKCONTROLS_EXPORT QQuickAbstractButton : public QQuickControl
     Q_PROPERTY(QQuickItem *label READ label WRITE setLabel NOTIFY labelChanged FINAL)
 
 public:
-    explicit QQuickAbstractButton(QQuickItem *parent = Q_NULLPTR);
+    explicit QQuickButton(QQuickItem *parent = Q_NULLPTR);
 
     QString text() const;
     void setText(const QString &text);
@@ -80,7 +80,7 @@ Q_SIGNALS:
     void labelChanged();
 
 protected:
-    QQuickAbstractButton(QQuickAbstractButtonPrivate &dd, QQuickItem *parent);
+    QQuickButton(QQuickButtonPrivate &dd, QQuickItem *parent);
 
     void focusOutEvent(QFocusEvent *event) Q_DECL_OVERRIDE;
     void keyPressEvent(QKeyEvent *event) Q_DECL_OVERRIDE;
@@ -91,10 +91,10 @@ protected:
     void mouseUngrabEvent() Q_DECL_OVERRIDE;
 
 private:
-    Q_DISABLE_COPY(QQuickAbstractButton)
-    Q_DECLARE_PRIVATE(QQuickAbstractButton)
+    Q_DISABLE_COPY(QQuickButton)
+    Q_DECLARE_PRIVATE(QQuickButton)
 };
 
 QT_END_NAMESPACE
 
-#endif // QQUICKABSTRACTBUTTON_P_H
+#endif // QQUICKBUTTON_P_H
diff --git a/src/controls/qquickabstractbutton_p_p.h b/src/controls/qquickbutton_p_p.h
index 252a2863..ca67c224 100644
--- a/src/controls/qquickabstractbutton_p_p.h
+++ b/src/controls/qquickbutton_p_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QQUICKABSTRACTBUTTON_P_P_H
-#define QQUICKABSTRACTBUTTON_P_P_H
+#ifndef QQUICKBUTTON_P_P_H
+#define QQUICKBUTTON_P_P_H
 
 //
 //  W A R N I N G
@@ -52,12 +52,12 @@
 
 QT_BEGIN_NAMESPACE
 
-class QQuickAbstractButtonPrivate : public QQuickControlPrivate
+class QQuickButtonPrivate : public QQuickControlPrivate
 {
-    Q_DECLARE_PUBLIC(QQuickAbstractButton)
+    Q_DECLARE_PUBLIC(QQuickButton)
 
 public:
-    QQuickAbstractButtonPrivate();
+    QQuickButtonPrivate();
 
     QString text;
     bool pressed;
@@ -66,4 +66,4 @@ public:
 
 QT_END_NAMESPACE
 
-#endif // QQUICKABSTRACTBUTTON_P_P_H
+#endif // QQUICKBUTTON_P_P_H
diff --git a/src/controls/qquickabstractcheckable.cpp b/src/controls/qquickcheckable.cpp
index 3811ada4..c5526c0b 100644
--- a/src/controls/qquickabstractcheckable.cpp
+++ b/src/controls/qquickcheckable.cpp
@@ -34,32 +34,32 @@
 **
 ****************************************************************************/
 
-#include "qquickabstractcheckable_p.h"
-#include "qquickabstractcheckable_p_p.h"
+#include "qquickcheckable_p.h"
+#include "qquickcheckable_p_p.h"
 
 QT_BEGIN_NAMESPACE
 
 /*!
     \qmltype Checkable
     \inherits Button
-    \instantiates QQuickAbstractCheckable
+    \instantiates QQuickCheckable
     \inqmlmodule QtQuick.Controls
     \qmlabstract
     \internal
 */
 
-QQuickAbstractCheckablePrivate::QQuickAbstractCheckablePrivate() :
+QQuickCheckablePrivate::QQuickCheckablePrivate() :
     checked(false), exclusive(false), indicator(Q_NULLPTR), layoutDirection(Qt::LeftToRight)
 {
 }
 
-QQuickAbstractCheckable::QQuickAbstractCheckable(QQuickItem *parent) :
-    QQuickAbstractButton(*(new QQuickAbstractCheckablePrivate), parent)
+QQuickCheckable::QQuickCheckable(QQuickItem *parent) :
+    QQuickButton(*(new QQuickCheckablePrivate), parent)
 {
 }
 
-QQuickAbstractCheckable::QQuickAbstractCheckable(QQuickAbstractCheckablePrivate &dd, QQuickItem *parent) :
-    QQuickAbstractButton(dd, parent)
+QQuickCheckable::QQuickCheckable(QQuickCheckablePrivate &dd, QQuickItem *parent) :
+    QQuickButton(dd, parent)
 {
 }
 
@@ -68,30 +68,30 @@ QQuickAbstractCheckable::QQuickAbstractCheckable(QQuickAbstractCheckablePrivate
 
     TODO
 */
-bool QQuickAbstractCheckable::isChecked() const
+bool QQuickCheckable::isChecked() const
 {
-    Q_D(const QQuickAbstractCheckable);
+    Q_D(const QQuickCheckable);
     return d->checked;
 }
 
-void QQuickAbstractCheckable::setChecked(bool checked)
+void QQuickCheckable::setChecked(bool checked)
 {
-    Q_D(QQuickAbstractCheckable);
+    Q_D(QQuickCheckable);
     if (d->checked != checked) {
         d->checked = checked;
         emit checkedChanged();
     }
 }
 
-bool QQuickAbstractCheckable::isExclusive() const
+bool QQuickCheckable::isExclusive() const
 {
-    Q_D(const QQuickAbstractCheckable);
+    Q_D(const QQuickCheckable);
     return d->exclusive;
 }
 
-void QQuickAbstractCheckable::setExclusive(bool exclusive)
+void QQuickCheckable::setExclusive(bool exclusive)
 {
-    Q_D(QQuickAbstractCheckable);
+    Q_D(QQuickCheckable);
     d->exclusive = exclusive;
 }
 
@@ -100,15 +100,15 @@ void QQuickAbstractCheckable::setExclusive(bool exclusive)
 
     TODO
 */
-QQuickItem *QQuickAbstractCheckable::indicator() const
+QQuickItem *QQuickCheckable::indicator() const
 {
-    Q_D(const QQuickAbstractCheckable);
+    Q_D(const QQuickCheckable);
     return d->indicator;
 }
 
-void QQuickAbstractCheckable::setIndicator(QQuickItem *indicator)
+void QQuickCheckable::setIndicator(QQuickItem *indicator)
 {
-    Q_D(QQuickAbstractCheckable);
+    Q_D(QQuickCheckable);
     if (d->indicator != indicator) {
         delete d->indicator;
         d->indicator = indicator;
@@ -126,9 +126,9 @@ void QQuickAbstractCheckable::setIndicator(QQuickItem *indicator)
 
     TODO
 */
-Qt::LayoutDirection QQuickAbstractCheckable::layoutDirection() const
+Qt::LayoutDirection QQuickCheckable::layoutDirection() const
 {
-    Q_D(const QQuickAbstractCheckable);
+    Q_D(const QQuickCheckable);
     return d->layoutDirection;
 }
 
@@ -137,17 +137,17 @@ Qt::LayoutDirection QQuickAbstractCheckable::layoutDirection() const
 
     TODO
 */
-Qt::LayoutDirection QQuickAbstractCheckable::effectiveLayoutDirection() const
+Qt::LayoutDirection QQuickCheckable::effectiveLayoutDirection() const
 {
-    Q_D(const QQuickAbstractCheckable);
+    Q_D(const QQuickCheckable);
     if (isMirrored())
         return d->layoutDirection == Qt::RightToLeft ? Qt::LeftToRight : Qt::RightToLeft;
     return d->layoutDirection;
 }
 
-void QQuickAbstractCheckable::setLayoutDirection(Qt::LayoutDirection direction)
+void QQuickCheckable::setLayoutDirection(Qt::LayoutDirection direction)
 {
-    Q_D(QQuickAbstractCheckable);
+    Q_D(QQuickCheckable);
     if (d->layoutDirection != direction) {
         d->layoutDirection = direction;
         emit layoutDirectionChanged();
@@ -160,29 +160,29 @@ void QQuickAbstractCheckable::setLayoutDirection(Qt::LayoutDirection direction)
 
     TODO
 */
-void QQuickAbstractCheckable::toggle()
+void QQuickCheckable::toggle()
 {
-    Q_D(QQuickAbstractCheckable);
+    Q_D(QQuickCheckable);
     setChecked(!d->checked);
 }
 
-void QQuickAbstractCheckable::keyReleaseEvent(QKeyEvent *event)
+void QQuickCheckable::keyReleaseEvent(QKeyEvent *event)
 {
-    Q_D(QQuickAbstractCheckable);
-    QQuickAbstractButton::keyReleaseEvent(event);
+    Q_D(QQuickCheckable);
+    QQuickButton::keyReleaseEvent(event);
     if (event->key() == Qt::Key_Space)
         setChecked(d->exclusive || !d->checked);
 }
 
-void QQuickAbstractCheckable::mouseReleaseEvent(QMouseEvent *event)
+void QQuickCheckable::mouseReleaseEvent(QMouseEvent *event)
 {
-    Q_D(QQuickAbstractCheckable);
-    QQuickAbstractButton::mouseReleaseEvent(event);
+    Q_D(QQuickCheckable);
+    QQuickButton::mouseReleaseEvent(event);
     if (contains(event->pos()))
         setChecked(d->exclusive || !d->checked);
 }
 
-void QQuickAbstractCheckable::mirrorChange()
+void QQuickCheckable::mirrorChange()
 {
     emit effectiveLayoutDirectionChanged();
 }
diff --git a/src/controls/qquickabstractcheckable_p.h b/src/controls/qquickcheckable_p.h
index b470fd60..71629a49 100644
--- a/src/controls/qquickabstractcheckable_p.h
+++ b/src/controls/qquickcheckable_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QQUICKABSTRACTCHECKABLE_P_H
-#define QQUICKABSTRACTCHECKABLE_P_H
+#ifndef QQUICKCHECKABLE_P_H
+#define QQUICKCHECKABLE_P_H
 
 //
 //  W A R N I N G
@@ -48,13 +48,13 @@
 // We mean it.
 //
 
-#include <QtQuickControls/private/qquickabstractbutton_p.h>
+#include <QtQuickControls/private/qquickbutton_p.h>
 
 QT_BEGIN_NAMESPACE
 
-class QQuickAbstractCheckablePrivate;
+class QQuickCheckablePrivate;
 
-class Q_QUICKCONTROLS_EXPORT QQuickAbstractCheckable : public QQuickAbstractButton
+class Q_QUICKCONTROLS_EXPORT QQuickCheckable : public QQuickButton
 {
     Q_OBJECT
     Q_PROPERTY(bool checked READ isChecked WRITE setChecked NOTIFY checkedChanged FINAL)
@@ -63,7 +63,7 @@ class Q_QUICKCONTROLS_EXPORT QQuickAbstractCheckable : public QQuickAbstractButt
     Q_PROPERTY(Qt::LayoutDirection effectiveLayoutDirection READ effectiveLayoutDirection NOTIFY effectiveLayoutDirectionChanged FINAL)
 
 public:
-    explicit QQuickAbstractCheckable(QQuickItem *parent = Q_NULLPTR);
+    explicit QQuickCheckable(QQuickItem *parent = Q_NULLPTR);
 
     bool isChecked() const;
     void setChecked(bool checked);
@@ -88,7 +88,7 @@ Q_SIGNALS:
     void effectiveLayoutDirectionChanged();
 
 protected:
-    QQuickAbstractCheckable(QQuickAbstractCheckablePrivate &dd, QQuickItem *parent);
+    QQuickCheckable(QQuickCheckablePrivate &dd, QQuickItem *parent);
 
     void keyReleaseEvent(QKeyEvent *event) Q_DECL_OVERRIDE;
     void mouseReleaseEvent(QMouseEvent *event) Q_DECL_OVERRIDE;
@@ -96,10 +96,10 @@ protected:
     void mirrorChange() Q_DECL_OVERRIDE;
 
 private:
-    Q_DISABLE_COPY(QQuickAbstractCheckable)
-    Q_DECLARE_PRIVATE(QQuickAbstractCheckable)
+    Q_DISABLE_COPY(QQuickCheckable)
+    Q_DECLARE_PRIVATE(QQuickCheckable)
 };
 
 QT_END_NAMESPACE
 
-#endif // QQUICKABSTRACTCHECKABLE_P_H
+#endif // QQUICKCHECKABLE_P_H
diff --git a/src/controls/qquickabstractcheckable_p_p.h b/src/controls/qquickcheckable_p_p.h
index dcc44b8d..2e5b9e39 100644
--- a/src/controls/qquickabstractcheckable_p_p.h
+++ b/src/controls/qquickcheckable_p_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QQUICKABSTRACTCHECKABLE_P_P_H
-#define QQUICKABSTRACTCHECKABLE_P_P_H
+#ifndef QQUICKCHECKABLE_P_P_H
+#define QQUICKCHECKABLE_P_P_H
 
 //
 //  W A R N I N G
@@ -48,14 +48,14 @@
 // We mean it.
 //
 
-#include <QtQuickControls/private/qquickabstractbutton_p_p.h>
+#include <QtQuickControls/private/qquickbutton_p_p.h>
 
 QT_BEGIN_NAMESPACE
 
-class QQuickAbstractCheckablePrivate : public QQuickAbstractButtonPrivate
+class QQuickCheckablePrivate : public QQuickButtonPrivate
 {
 public:
-    QQuickAbstractCheckablePrivate();
+    QQuickCheckablePrivate();
 
     bool checked;
     bool exclusive;
@@ -65,4 +65,4 @@ public:
 
 QT_END_NAMESPACE
 
-#endif // QQUICKABSTRACTCHECKABLE_P_P_H
+#endif // QQUICKCHECKABLE_P_P_H
diff --git a/src/controls/qquickabstractcheckbox.cpp b/src/controls/qquickcheckbox.cpp
index 67d9efab..680b3b13 100644
--- a/src/controls/qquickabstractcheckbox.cpp
+++ b/src/controls/qquickcheckbox.cpp
@@ -34,14 +34,14 @@
 **
 ****************************************************************************/
 
-#include "qquickabstractcheckbox_p.h"
+#include "qquickcheckbox_p.h"
 
 QT_BEGIN_NAMESPACE
 
 /*!
     \qmltype CheckBox
     \inherits Checkable
-    \instantiates QQuickAbstractCheckBox
+    \instantiates QQuickCheckBox
     \inqmlmodule QtQuick.Controls
     \ingroup buttons
     \brief A check box control.
@@ -49,8 +49,8 @@ QT_BEGIN_NAMESPACE
     TODO
 */
 
-QQuickAbstractCheckBox::QQuickAbstractCheckBox(QQuickItem *parent) :
-    QQuickAbstractCheckable(parent)
+QQuickCheckBox::QQuickCheckBox(QQuickItem *parent) :
+    QQuickCheckable(parent)
 {
 }
 
diff --git a/src/controls/qquickabstractframe_p.h b/src/controls/qquickcheckbox_p.h
index 6c03660f..152695ba 100644
--- a/src/controls/qquickabstractframe_p.h
+++ b/src/controls/qquickcheckbox_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QQUICKABSTRACTFRAME_P_H
-#define QQUICKABSTRACTFRAME_P_H
+#ifndef QQUICKCHECKBOX_P_H
+#define QQUICKCHECKBOX_P_H
 
 //
 //  W A R N I N G
@@ -48,18 +48,18 @@
 // We mean it.
 //
 
-#include <QtQuickControls/private/qquickabstractcontainer_p.h>
+#include <QtQuickControls/private/qquickcheckable_p.h>
 
 QT_BEGIN_NAMESPACE
 
-class Q_QUICKCONTROLS_EXPORT QQuickAbstractFrame : public QQuickAbstractContainer
+class Q_QUICKCONTROLS_EXPORT QQuickCheckBox : public QQuickCheckable
 {
     Q_OBJECT
 
 public:
-    explicit QQuickAbstractFrame(QQuickItem *parent = Q_NULLPTR);
+    explicit QQuickCheckBox(QQuickItem *parent = Q_NULLPTR);
 };
 
 QT_END_NAMESPACE
 
-#endif // QQUICKABSTRACTFRAME_P_H
+#endif // QQUICKCHECKBOX_P_H
diff --git a/src/controls/qquickabstractcontainer.cpp b/src/controls/qquickcontainer.cpp
index 263ced7a..71b2a9a1 100644
--- a/src/controls/qquickabstractcontainer.cpp
+++ b/src/controls/qquickcontainer.cpp
@@ -34,31 +34,31 @@
 **
 ****************************************************************************/
 
-#include "qquickabstractcontainer_p.h"
-#include "qquickabstractcontainer_p_p.h"
+#include "qquickcontainer_p.h"
+#include "qquickcontainer_p_p.h"
 
 QT_BEGIN_NAMESPACE
 
 /*!
     \qmltype Container
     \inherits Control
-    \instantiates QQuickAbstractContainer
+    \instantiates QQuickContainer
     \inqmlmodule QtQuick.Controls
     \qmlabstract
     \internal
 */
 
-QQuickAbstractContainerPrivate::QQuickAbstractContainerPrivate() :
+QQuickContainerPrivate::QQuickContainerPrivate() :
     contentWidth(0), contentHeight(0), contentItem(Q_NULLPTR)
 {
 }
 
-QQuickAbstractContainer::QQuickAbstractContainer(QQuickItem *parent) :
-    QQuickControl(*(new QQuickAbstractContainerPrivate), parent)
+QQuickContainer::QQuickContainer(QQuickItem *parent) :
+    QQuickControl(*(new QQuickContainerPrivate), parent)
 {
 }
 
-QQuickAbstractContainer::QQuickAbstractContainer(QQuickAbstractContainerPrivate &dd, QQuickItem *parent) :
+QQuickContainer::QQuickContainer(QQuickContainerPrivate &dd, QQuickItem *parent) :
     QQuickControl(dd, parent)
 {
 }
@@ -68,15 +68,15 @@ QQuickAbstractContainer::QQuickAbstractContainer(QQuickAbstractContainerPrivate
 
     TODO
 */
-qreal QQuickAbstractContainer::contentWidth() const
+qreal QQuickContainer::contentWidth() const
 {
-    Q_D(const QQuickAbstractContainer);
+    Q_D(const QQuickContainer);
     return d->contentWidth;
 }
 
-void QQuickAbstractContainer::setContentWidth(qreal width)
+void QQuickContainer::setContentWidth(qreal width)
 {
-    Q_D(QQuickAbstractContainer);
+    Q_D(QQuickContainer);
     if (d->contentWidth != width) {
         d->contentWidth = width;
         emit contentWidthChanged();
@@ -88,15 +88,15 @@ void QQuickAbstractContainer::setContentWidth(qreal width)
 
     TODO
 */
-qreal QQuickAbstractContainer::contentHeight() const
+qreal QQuickContainer::contentHeight() const
 {
-    Q_D(const QQuickAbstractContainer);
+    Q_D(const QQuickContainer);
     return d->contentHeight;
 }
 
-void QQuickAbstractContainer::setContentHeight(qreal height)
+void QQuickContainer::setContentHeight(qreal height)
 {
-    Q_D(QQuickAbstractContainer);
+    Q_D(QQuickContainer);
     if (d->contentHeight != height) {
         d->contentHeight = height;
         emit contentHeightChanged();
@@ -108,15 +108,15 @@ void QQuickAbstractContainer::setContentHeight(qreal height)
 
     TODO
 */
-QQuickItem *QQuickAbstractContainer::contentItem() const
+QQuickItem *QQuickContainer::contentItem() const
 {
-    Q_D(const QQuickAbstractContainer);
+    Q_D(const QQuickContainer);
     return d->contentItem;
 }
 
-void QQuickAbstractContainer::setContentItem(QQuickItem *item)
+void QQuickContainer::setContentItem(QQuickItem *item)
 {
-    Q_D(QQuickAbstractContainer);
+    Q_D(QQuickContainer);
     if (d->contentItem != item) {
         contentItemChange(d->contentItem, item);
         delete d->contentItem;
@@ -129,7 +129,7 @@ void QQuickAbstractContainer::setContentItem(QQuickItem *item)
     }
 }
 
-void QQuickAbstractContainer::contentItemChange(QQuickItem *newItem, QQuickItem *oldItem)
+void QQuickContainer::contentItemChange(QQuickItem *newItem, QQuickItem *oldItem)
 {
     Q_UNUSED(newItem);
     Q_UNUSED(oldItem);
diff --git a/src/controls/qquickabstractcontainer_p.h b/src/controls/qquickcontainer_p.h
index 71bc5f5d..6e3e224a 100644
--- a/src/controls/qquickabstractcontainer_p.h
+++ b/src/controls/qquickcontainer_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QQUICKABSTRACTCONTAINER_P_H
-#define QQUICKABSTRACTCONTAINER_P_H
+#ifndef QQUICKCONTAINER_P_H
+#define QQUICKCONTAINER_P_H
 
 //
 //  W A R N I N G
@@ -52,9 +52,9 @@
 
 QT_BEGIN_NAMESPACE
 
-class QQuickAbstractContainerPrivate;
+class QQuickContainerPrivate;
 
-class Q_QUICKCONTROLS_EXPORT QQuickAbstractContainer : public QQuickControl
+class Q_QUICKCONTROLS_EXPORT QQuickContainer : public QQuickControl
 {
     Q_OBJECT
     Q_PROPERTY(qreal contentWidth READ contentWidth WRITE setContentWidth NOTIFY contentWidthChanged FINAL)
@@ -62,7 +62,7 @@ class Q_QUICKCONTROLS_EXPORT QQuickAbstractContainer : public QQuickControl
     Q_PROPERTY(QQuickItem *contentItem READ contentItem WRITE setContentItem NOTIFY contentItemChanged FINAL)
 
 public:
-    explicit QQuickAbstractContainer(QQuickItem *parent = Q_NULLPTR);
+    explicit QQuickContainer(QQuickItem *parent = Q_NULLPTR);
 
     qreal contentWidth() const;
     void setContentWidth(qreal width);
@@ -79,15 +79,15 @@ Q_SIGNALS:
     void contentItemChanged();
 
 protected:
-    QQuickAbstractContainer(QQuickAbstractContainerPrivate &dd, QQuickItem *parent);
+    QQuickContainer(QQuickContainerPrivate &dd, QQuickItem *parent);
 
     virtual void contentItemChange(QQuickItem *newItem, QQuickItem *oldItem);
 
 private:
-    Q_DISABLE_COPY(QQuickAbstractContainer)
-    Q_DECLARE_PRIVATE(QQuickAbstractContainer)
+    Q_DISABLE_COPY(QQuickContainer)
+    Q_DECLARE_PRIVATE(QQuickContainer)
 };
 
 QT_END_NAMESPACE
 
-#endif // QQUICKABSTRACTCONTAINER_P_H
+#endif // QQUICKCONTAINER_P_H
diff --git a/src/controls/qquickabstractcontainer_p_p.h b/src/controls/qquickcontainer_p_p.h
index 8e19277d..c0b52cec 100644
--- a/src/controls/qquickabstractcontainer_p_p.h
+++ b/src/controls/qquickcontainer_p_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QQUICKABSTRACTCONTAINER_P_P_H
-#define QQUICKABSTRACTCONTAINER_P_P_H
+#ifndef QQUICKCONTAINER_P_P_H
+#define QQUICKCONTAINER_P_P_H
 
 //
 //  W A R N I N G
@@ -52,10 +52,10 @@
 
 QT_BEGIN_NAMESPACE
 
-class Q_QUICKCONTROLS_EXPORT QQuickAbstractContainerPrivate : public QQuickControlPrivate
+class Q_QUICKCONTROLS_EXPORT QQuickContainerPrivate : public QQuickControlPrivate
 {
 public:
-    QQuickAbstractContainerPrivate();
+    QQuickContainerPrivate();
 
     qreal contentWidth;
     qreal contentHeight;
@@ -64,4 +64,4 @@ public:
 
 QT_END_NAMESPACE
 
-#endif // QQUICKABSTRACTCONTAINER_P_P_H
+#endif // QQUICKCONTAINER_P_P_H
diff --git a/src/controls/qquickabstractframe.cpp b/src/controls/qquickframe.cpp
index 9f8f2aa6..1a0f5f68 100644
--- a/src/controls/qquickabstractframe.cpp
+++ b/src/controls/qquickframe.cpp
@@ -34,14 +34,14 @@
 **
 ****************************************************************************/
 
-#include "qquickabstractframe_p.h"
+#include "qquickframe_p.h"
 
 QT_BEGIN_NAMESPACE
 
 /*!
     \qmltype Frame
     \inherits Container
-    \instantiates QQuickAbstractFrame
+    \instantiates QQuickFrame
     \inqmlmodule QtQuick.Controls
     \ingroup containers
     \brief A frame control.
@@ -49,8 +49,8 @@ QT_BEGIN_NAMESPACE
     TODO
 */
 
-QQuickAbstractFrame::QQuickAbstractFrame(QQuickItem *parent) :
-    QQuickAbstractContainer(parent)
+QQuickFrame::QQuickFrame(QQuickItem *parent) :
+    QQuickContainer(parent)
 {
 }
 
diff --git a/src/controls/qquickabstracttoolbar_p.h b/src/controls/qquickframe_p.h
index 154d4bd5..85bd72fc 100644
--- a/src/controls/qquickabstracttoolbar_p.h
+++ b/src/controls/qquickframe_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QQUICKABSTRACTTOOLBAR_P_H
-#define QQUICKABSTRACTTOOLBAR_P_H
+#ifndef QQUICKFRAME_P_H
+#define QQUICKFRAME_P_H
 
 //
 //  W A R N I N G
@@ -48,18 +48,18 @@
 // We mean it.
 //
 
-#include <QtQuickControls/private/qquickabstractcontainer_p.h>
+#include <QtQuickControls/private/qquickcontainer_p.h>
 
 QT_BEGIN_NAMESPACE
 
-class Q_QUICKCONTROLS_EXPORT QQuickAbstractToolBar : public QQuickAbstractContainer
+class Q_QUICKCONTROLS_EXPORT QQuickFrame : public QQuickContainer
 {
     Q_OBJECT
 
 public:
-    explicit QQuickAbstractToolBar(QQuickItem *parent = Q_NULLPTR);
+    explicit QQuickFrame(QQuickItem *parent = Q_NULLPTR);
 };
 
 QT_END_NAMESPACE
 
-#endif // QQUICKABSTRACTTOOLBAR_P_H
+#endif // QQUICKFRAME_P_H
diff --git a/src/controls/qquickabstractgroupbox.cpp b/src/controls/qquickgroupbox.cpp
index 8d2f9ec0..3937f6c1 100644
--- a/src/controls/qquickabstractgroupbox.cpp
+++ b/src/controls/qquickgroupbox.cpp
@@ -34,15 +34,15 @@
 **
 ****************************************************************************/
 
-#include "qquickabstractgroupbox_p.h"
-#include "qquickabstractcontainer_p_p.h"
+#include "qquickgroupbox_p.h"
+#include "qquickcontainer_p_p.h"
 
 QT_BEGIN_NAMESPACE
 
 /*!
     \qmltype GroupBox
     \inherits Container
-    \instantiates QQuickAbstractGroupBox
+    \instantiates QQuickGroupBox
     \inqmlmodule QtQuick.Controls
     \ingroup containers
     \brief A group box control.
@@ -50,18 +50,18 @@ QT_BEGIN_NAMESPACE
     TODO
 */
 
-class QQuickAbstractGroupBoxPrivate : public QQuickAbstractContainerPrivate
+class QQuickGroupBoxPrivate : public QQuickContainerPrivate
 {
 public:
-    QQuickAbstractGroupBoxPrivate() : label(Q_NULLPTR), frame(Q_NULLPTR) { }
+    QQuickGroupBoxPrivate() : label(Q_NULLPTR), frame(Q_NULLPTR) { }
 
     QString title;
     QQuickItem *label;
     QQuickItem *frame;
 };
 
-QQuickAbstractGroupBox::QQuickAbstractGroupBox(QQuickItem *parent) :
-    QQuickAbstractContainer(*(new QQuickAbstractGroupBoxPrivate), parent)
+QQuickGroupBox::QQuickGroupBox(QQuickItem *parent) :
+    QQuickContainer(*(new QQuickGroupBoxPrivate), parent)
 {
 }
 
@@ -70,15 +70,15 @@ QQuickAbstractGroupBox::QQuickAbstractGroupBox(QQuickItem *parent) :
 
     TODO
 */
-QString QQuickAbstractGroupBox::title() const
+QString QQuickGroupBox::title() const
 {
-    Q_D(const QQuickAbstractGroupBox);
+    Q_D(const QQuickGroupBox);
     return d->title;
 }
 
-void QQuickAbstractGroupBox::setTitle(const QString &title)
+void QQuickGroupBox::setTitle(const QString &title)
 {
-    Q_D(QQuickAbstractGroupBox);
+    Q_D(QQuickGroupBox);
     if (d->title != title) {
         d->title = title;
         emit titleChanged();
@@ -90,15 +90,15 @@ void QQuickAbstractGroupBox::setTitle(const QString &title)
 
     TODO
 */
-QQuickItem *QQuickAbstractGroupBox::label() const
+QQuickItem *QQuickGroupBox::label() const
 {
-    Q_D(const QQuickAbstractGroupBox);
+    Q_D(const QQuickGroupBox);
     return d->label;
 }
 
-void QQuickAbstractGroupBox::setLabel(QQuickItem *label)
+void QQuickGroupBox::setLabel(QQuickItem *label)
 {
-    Q_D(QQuickAbstractGroupBox);
+    Q_D(QQuickGroupBox);
     if (d->label != label) {
         delete d->label;
         d->label = label;
@@ -113,15 +113,15 @@ void QQuickAbstractGroupBox::setLabel(QQuickItem *label)
 
     TODO
 */
-QQuickItem *QQuickAbstractGroupBox::frame() const
+QQuickItem *QQuickGroupBox::frame() const
 {
-    Q_D(const QQuickAbstractGroupBox);
+    Q_D(const QQuickGroupBox);
     return d->frame;
 }
 
-void QQuickAbstractGroupBox::setFrame(QQuickItem *frame)
+void QQuickGroupBox::setFrame(QQuickItem *frame)
 {
-    Q_D(QQuickAbstractGroupBox);
+    Q_D(QQuickGroupBox);
     if (d->frame != frame) {
         delete d->frame;
         d->frame = frame;
diff --git a/src/controls/qquickabstractgroupbox_p.h b/src/controls/qquickgroupbox_p.h
index 5e77fb23..d2e65f63 100644
--- a/src/controls/qquickabstractgroupbox_p.h
+++ b/src/controls/qquickgroupbox_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QQUICKABSTRACTGROUPBOX_P_H
-#define QQUICKABSTRACTGROUPBOX_P_H
+#ifndef QQUICKGROUPBOX_P_H
+#define QQUICKGROUPBOX_P_H
 
 //
 //  W A R N I N G
@@ -48,13 +48,13 @@
 // We mean it.
 //
 
-#include <QtQuickControls/private/qquickabstractcontainer_p.h>
+#include <QtQuickControls/private/qquickcontainer_p.h>
 
 QT_BEGIN_NAMESPACE
 
-class QQuickAbstractGroupBoxPrivate;
+class QQuickGroupBoxPrivate;
 
-class Q_QUICKCONTROLS_EXPORT QQuickAbstractGroupBox : public QQuickAbstractContainer
+class Q_QUICKCONTROLS_EXPORT QQuickGroupBox : public QQuickContainer
 {
     Q_OBJECT
     Q_PROPERTY(QString title READ title WRITE setTitle NOTIFY titleChanged FINAL)
@@ -62,7 +62,7 @@ class Q_QUICKCONTROLS_EXPORT QQuickAbstractGroupBox : public QQuickAbstractConta
     Q_PROPERTY(QQuickItem *frame READ frame WRITE setFrame NOTIFY frameChanged FINAL)
 
 public:
-    explicit QQuickAbstractGroupBox(QQuickItem *parent = Q_NULLPTR);
+    explicit QQuickGroupBox(QQuickItem *parent = Q_NULLPTR);
 
     QString title() const;
     void setTitle(const QString &title);
@@ -79,10 +79,10 @@ Q_SIGNALS:
     void frameChanged();
 
 private:
-    Q_DISABLE_COPY(QQuickAbstractGroupBox)
-    Q_DECLARE_PRIVATE(QQuickAbstractGroupBox)
+    Q_DISABLE_COPY(QQuickGroupBox)
+    Q_DECLARE_PRIVATE(QQuickGroupBox)
 };
 
 QT_END_NAMESPACE
 
-#endif // QQUICKABSTRACTGROUPBOX_P_H
+#endif // QQUICKGROUPBOX_P_H
diff --git a/src/controls/qquickabstractlabel.cpp b/src/controls/qquicklabel.cpp
index 8e1df9cb..1536bb91 100644
--- a/src/controls/qquickabstractlabel.cpp
+++ b/src/controls/qquicklabel.cpp
@@ -34,7 +34,7 @@
 **
 ****************************************************************************/
 
-#include "qquickabstractlabel_p.h"
+#include "qquicklabel_p.h"
 
 #include <QtQuick/private/qquickitem_p.h>
 #include <QtQuick/private/qquicktext_p.h>
@@ -42,37 +42,37 @@
 
 QT_BEGIN_NAMESPACE
 
-class QQuickAbstractLabelPrivate
+class QQuickLabelPrivate
 {
-    Q_DECLARE_PUBLIC(QQuickAbstractLabel)
+    Q_DECLARE_PUBLIC(QQuickLabel)
 
 public:
-    QQuickAbstractLabelPrivate() : background(Q_NULLPTR) { }
+    QQuickLabelPrivate() : background(Q_NULLPTR) { }
 
     QQuickItem *background;
-    QQuickAbstractLabel *q_ptr;
+    QQuickLabel *q_ptr;
 };
 
-QQuickAbstractLabel::QQuickAbstractLabel(QQuickItem *parent) :
-    QQuickText(parent), d_ptr(new QQuickAbstractLabelPrivate)
+QQuickLabel::QQuickLabel(QQuickItem *parent) :
+    QQuickText(parent), d_ptr(new QQuickLabelPrivate)
 {
-    Q_D(QQuickAbstractLabel);
+    Q_D(QQuickLabel);
     d->q_ptr = this;
 }
 
-QQuickAbstractLabel::~QQuickAbstractLabel()
+QQuickLabel::~QQuickLabel()
 {
 }
 
-QQuickItem *QQuickAbstractLabel::background() const
+QQuickItem *QQuickLabel::background() const
 {
-    Q_D(const QQuickAbstractLabel);
+    Q_D(const QQuickLabel);
     return d->background;
 }
 
-void QQuickAbstractLabel::setBackground(QQuickItem *background)
+void QQuickLabel::setBackground(QQuickItem *background)
 {
-    Q_D(QQuickAbstractLabel);
+    Q_D(QQuickLabel);
     if (d->background != background) {
         delete d->background;
         d->background = background;
@@ -85,9 +85,9 @@ void QQuickAbstractLabel::setBackground(QQuickItem *background)
     }
 }
 
-void QQuickAbstractLabel::geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry)
+void QQuickLabel::geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry)
 {
-    Q_D(QQuickAbstractLabel);
+    Q_D(QQuickLabel);
     QQuickText::geometryChanged(newGeometry, oldGeometry);
     if (d->background) {
         QQuickItemPrivate *p = QQuickItemPrivate::get(d->background);
diff --git a/src/controls/qquickabstractlabel_p.h b/src/controls/qquicklabel_p.h
index d731550c..009372fd 100644
--- a/src/controls/qquickabstractlabel_p.h
+++ b/src/controls/qquicklabel_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QQUICKABSTRACTLABEL_P_H
-#define QQUICKABSTRACTLABEL_P_H
+#ifndef QQUICKLABEL_P_H
+#define QQUICKLABEL_P_H
 
 //
 //  W A R N I N G
@@ -53,16 +53,16 @@
 
 QT_BEGIN_NAMESPACE
 
-class QQuickAbstractLabelPrivate;
+class QQuickLabelPrivate;
 
-class Q_QUICKCONTROLS_EXPORT QQuickAbstractLabel : public QQuickText
+class Q_QUICKCONTROLS_EXPORT QQuickLabel : public QQuickText
 {
     Q_OBJECT
     Q_PROPERTY(QQuickItem *background READ background WRITE setBackground NOTIFY backgroundChanged FINAL)
 
 public:
-    explicit QQuickAbstractLabel(QQuickItem *parent = Q_NULLPTR);
-    ~QQuickAbstractLabel();
+    explicit QQuickLabel(QQuickItem *parent = Q_NULLPTR);
+    ~QQuickLabel();
 
     QQuickItem *background() const;
     void setBackground(QQuickItem *background);
@@ -74,11 +74,11 @@ protected:
     void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) Q_DECL_OVERRIDE;
 
 private:
-    Q_DISABLE_COPY(QQuickAbstractLabel)
-    Q_DECLARE_PRIVATE(QQuickAbstractLabel)
-    QScopedPointer<QQuickAbstractLabelPrivate> d_ptr;
+    Q_DISABLE_COPY(QQuickLabel)
+    Q_DECLARE_PRIVATE(QQuickLabel)
+    QScopedPointer<QQuickLabelPrivate> d_ptr;
 };
 
 QT_END_NAMESPACE
 
-#endif // QQUICKABSTRACTLABEL_P_H
+#endif // QQUICKLABEL_P_H
diff --git a/src/controls/qquickabstractpageindicator.cpp b/src/controls/qquickpageindicator.cpp
index ee3b98bd..58b5d66f 100644
--- a/src/controls/qquickabstractpageindicator.cpp
+++ b/src/controls/qquickpageindicator.cpp
@@ -34,15 +34,15 @@
 **
 ****************************************************************************/
 
-#include "qquickabstractpageindicator_p.h"
-#include "qquickabstractcontainer_p_p.h"
+#include "qquickpageindicator_p.h"
+#include "qquickcontainer_p_p.h"
 
 QT_BEGIN_NAMESPACE
 
 /*!
     \qmltype PageIndicator
     \inherits Control
-    \instantiates QQuickAbstractPageIndicator
+    \instantiates QQuickPageIndicator
     \inqmlmodule QtQuick.Controls
     \ingroup indicators
     \brief A page indicator.
@@ -50,17 +50,17 @@ QT_BEGIN_NAMESPACE
     TODO
 */
 
-class QQuickAbstractPageIndicatorPrivate : public QQuickAbstractContainerPrivate
+class QQuickPageIndicatorPrivate : public QQuickContainerPrivate
 {
 public:
-    QQuickAbstractPageIndicatorPrivate() : count(0), currentIndex(0) { }
+    QQuickPageIndicatorPrivate() : count(0), currentIndex(0) { }
 
     int count;
     int currentIndex;
 };
 
-QQuickAbstractPageIndicator::QQuickAbstractPageIndicator(QQuickItem *parent) :
-    QQuickAbstractContainer(*(new QQuickAbstractPageIndicatorPrivate), parent)
+QQuickPageIndicator::QQuickPageIndicator(QQuickItem *parent) :
+    QQuickContainer(*(new QQuickPageIndicatorPrivate), parent)
 {
 }
 
@@ -69,15 +69,15 @@ QQuickAbstractPageIndicator::QQuickAbstractPageIndicator(QQuickItem *parent) :
 
     TODO
 */
-int QQuickAbstractPageIndicator::count() const
+int QQuickPageIndicator::count() const
 {
-    Q_D(const QQuickAbstractPageIndicator);
+    Q_D(const QQuickPageIndicator);
     return d->count;
 }
 
-void QQuickAbstractPageIndicator::setCount(int count)
+void QQuickPageIndicator::setCount(int count)
 {
-    Q_D(QQuickAbstractPageIndicator);
+    Q_D(QQuickPageIndicator);
     if (d->count != count) {
         d->count = count;
         emit countChanged();
@@ -89,15 +89,15 @@ void QQuickAbstractPageIndicator::setCount(int count)
 
     TODO
 */
-int QQuickAbstractPageIndicator::currentIndex() const
+int QQuickPageIndicator::currentIndex() const
 {
-    Q_D(const QQuickAbstractPageIndicator);
+    Q_D(const QQuickPageIndicator);
     return d->currentIndex;
 }
 
-void QQuickAbstractPageIndicator::setCurrentIndex(int index)
+void QQuickPageIndicator::setCurrentIndex(int index)
 {
-    Q_D(QQuickAbstractPageIndicator);
+    Q_D(QQuickPageIndicator);
     if (d->currentIndex != index) {
         d->currentIndex = index;
         emit currentIndexChanged();
diff --git a/src/controls/qquickabstractpageindicator_p.h b/src/controls/qquickpageindicator_p.h
index 4198f644..dcf0d093 100644
--- a/src/controls/qquickabstractpageindicator_p.h
+++ b/src/controls/qquickpageindicator_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QQUICKABSTRACTPAGEINDICATOR_P_H
-#define QQUICKABSTRACTPAGEINDICATOR_P_H
+#ifndef QQUICKPAGEINDICATOR_P_H
+#define QQUICKPAGEINDICATOR_P_H
 
 //
 //  W A R N I N G
@@ -48,20 +48,20 @@
 // We mean it.
 //
 
-#include <QtQuickControls/private/qquickabstractcontainer_p.h>
+#include <QtQuickControls/private/qquickcontainer_p.h>
 
 QT_BEGIN_NAMESPACE
 
-class QQuickAbstractPageIndicatorPrivate;
+class QQuickPageIndicatorPrivate;
 
-class Q_QUICKCONTROLS_EXPORT QQuickAbstractPageIndicator : public QQuickAbstractContainer
+class Q_QUICKCONTROLS_EXPORT QQuickPageIndicator : public QQuickContainer
 {
     Q_OBJECT
     Q_PROPERTY(int count READ count WRITE setCount NOTIFY countChanged FINAL)
     Q_PROPERTY(int currentIndex READ currentIndex WRITE setCurrentIndex NOTIFY currentIndexChanged FINAL)
 
 public:
-    explicit QQuickAbstractPageIndicator(QQuickItem *parent = Q_NULLPTR);
+    explicit QQuickPageIndicator(QQuickItem *parent = Q_NULLPTR);
 
     int count() const;
     void setCount(int count);
@@ -74,10 +74,10 @@ Q_SIGNALS:
     void currentIndexChanged();
 
 private:
-    Q_DISABLE_COPY(QQuickAbstractPageIndicator)
-    Q_DECLARE_PRIVATE(QQuickAbstractPageIndicator)
+    Q_DISABLE_COPY(QQuickPageIndicator)
+    Q_DECLARE_PRIVATE(QQuickPageIndicator)
 };
 
 QT_END_NAMESPACE
 
-#endif // QQUICKABSTRACTPAGEINDICATOR_P_H
+#endif // QQUICKPAGEINDICATOR_P_H
diff --git a/src/controls/qquickabstractprogressbar.cpp b/src/controls/qquickprogressbar.cpp
index 7e38b167..5bd15091 100644
--- a/src/controls/qquickabstractprogressbar.cpp
+++ b/src/controls/qquickprogressbar.cpp
@@ -34,7 +34,7 @@
 **
 ****************************************************************************/
 
-#include "qquickabstractprogressbar_p.h"
+#include "qquickprogressbar_p.h"
 #include "qquickcontrol_p_p.h"
 
 QT_BEGIN_NAMESPACE
@@ -42,7 +42,7 @@ QT_BEGIN_NAMESPACE
 /*!
     \qmltype ProgressBar
     \inherits Control
-    \instantiates QQuickAbstractProgressBar
+    \instantiates QQuickProgressBar
     \inqmlmodule QtQuick.Controls
     \ingroup indicators
     \brief A progress bar.
@@ -50,10 +50,10 @@ QT_BEGIN_NAMESPACE
     TODO
 */
 
-class QQuickAbstractProgressBarPrivate : public QQuickControlPrivate
+class QQuickProgressBarPrivate : public QQuickControlPrivate
 {
 public:
-    QQuickAbstractProgressBarPrivate() : value(0), indeterminate(false),
+    QQuickProgressBarPrivate() : value(0), indeterminate(false),
         layoutDirection(Qt::LeftToRight), indicator(Q_NULLPTR) { }
 
     qreal value;
@@ -62,8 +62,8 @@ public:
     QQuickItem *indicator;
 };
 
-QQuickAbstractProgressBar::QQuickAbstractProgressBar(QQuickItem *parent) :
-    QQuickControl(*(new QQuickAbstractProgressBarPrivate), parent)
+QQuickProgressBar::QQuickProgressBar(QQuickItem *parent) :
+    QQuickControl(*(new QQuickProgressBarPrivate), parent)
 {
 }
 
@@ -72,15 +72,15 @@ QQuickAbstractProgressBar::QQuickAbstractProgressBar(QQuickItem *parent) :
 
     TODO
 */
-qreal QQuickAbstractProgressBar::value() const
+qreal QQuickProgressBar::value() const
 {
-    Q_D(const QQuickAbstractProgressBar);
+    Q_D(const QQuickProgressBar);
     return d->value;
 }
 
-void QQuickAbstractProgressBar::setValue(qreal value)
+void QQuickProgressBar::setValue(qreal value)
 {
-    Q_D(QQuickAbstractProgressBar);
+    Q_D(QQuickProgressBar);
     value = qBound(0.0, value, 1.0);
     if (!qFuzzyCompare(d->value, value)) {
         d->value = value;
@@ -94,9 +94,9 @@ void QQuickAbstractProgressBar::setValue(qreal value)
 
     TODO
 */
-qreal QQuickAbstractProgressBar::visualPosition() const
+qreal QQuickProgressBar::visualPosition() const
 {
-    Q_D(const QQuickAbstractProgressBar);
+    Q_D(const QQuickProgressBar);
     if (effectiveLayoutDirection() == Qt::RightToLeft)
         return 1.0 - d->value;
     return d->value;
@@ -107,15 +107,15 @@ qreal QQuickAbstractProgressBar::visualPosition() const
 
     TODO
 */
-bool QQuickAbstractProgressBar::isIndeterminate() const
+bool QQuickProgressBar::isIndeterminate() const
 {
-    Q_D(const QQuickAbstractProgressBar);
+    Q_D(const QQuickProgressBar);
     return d->indeterminate;
 }
 
-void QQuickAbstractProgressBar::setIndeterminate(bool indeterminate)
+void QQuickProgressBar::setIndeterminate(bool indeterminate)
 {
-    Q_D(QQuickAbstractProgressBar);
+    Q_D(QQuickProgressBar);
     if (d->indeterminate != indeterminate) {
         d->indeterminate = indeterminate;
         emit indeterminateChanged();
@@ -127,9 +127,9 @@ void QQuickAbstractProgressBar::setIndeterminate(bool indeterminate)
 
     TODO
 */
-Qt::LayoutDirection QQuickAbstractProgressBar::layoutDirection() const
+Qt::LayoutDirection QQuickProgressBar::layoutDirection() const
 {
-    Q_D(const QQuickAbstractProgressBar);
+    Q_D(const QQuickProgressBar);
     return d->layoutDirection;
 }
 
@@ -138,17 +138,17 @@ Qt::LayoutDirection QQuickAbstractProgressBar::layoutDirection() const
 
     TODO
 */
-Qt::LayoutDirection QQuickAbstractProgressBar::effectiveLayoutDirection() const
+Qt::LayoutDirection QQuickProgressBar::effectiveLayoutDirection() const
 {
-    Q_D(const QQuickAbstractProgressBar);
+    Q_D(const QQuickProgressBar);
     if (isMirrored())
         return d->layoutDirection == Qt::RightToLeft ? Qt::LeftToRight : Qt::RightToLeft;
     return d->layoutDirection;
 }
 
-void QQuickAbstractProgressBar::setLayoutDirection(Qt::LayoutDirection direction)
+void QQuickProgressBar::setLayoutDirection(Qt::LayoutDirection direction)
 {
-    Q_D(QQuickAbstractProgressBar);
+    Q_D(QQuickProgressBar);
     if (d->layoutDirection != direction) {
         d->layoutDirection = direction;
         emit layoutDirectionChanged();
@@ -161,15 +161,15 @@ void QQuickAbstractProgressBar::setLayoutDirection(Qt::LayoutDirection direction
 
     TODO
 */
-QQuickItem *QQuickAbstractProgressBar::indicator() const
+QQuickItem *QQuickProgressBar::indicator() const
 {
-    Q_D(const QQuickAbstractProgressBar);
+    Q_D(const QQuickProgressBar);
     return d->indicator;
 }
 
-void QQuickAbstractProgressBar::setIndicator(QQuickItem *indicator)
+void QQuickProgressBar::setIndicator(QQuickItem *indicator)
 {
-    Q_D(QQuickAbstractProgressBar);
+    Q_D(QQuickProgressBar);
     if (d->indicator != indicator) {
         delete d->indicator;
         d->indicator = indicator;
@@ -179,7 +179,7 @@ void QQuickAbstractProgressBar::setIndicator(QQuickItem *indicator)
     }
 }
 
-void QQuickAbstractProgressBar::mirrorChange()
+void QQuickProgressBar::mirrorChange()
 {
     emit effectiveLayoutDirectionChanged();
     emit visualPositionChanged();
diff --git a/src/controls/qquickabstractprogressbar_p.h b/src/controls/qquickprogressbar_p.h
index d8d3ac36..9b046890 100644
--- a/src/controls/qquickabstractprogressbar_p.h
+++ b/src/controls/qquickprogressbar_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QQUICKABSTRACTPROGRESSBAR_P_H
-#define QQUICKABSTRACTPROGRESSBAR_P_H
+#ifndef QQUICKPROGRESSBAR_P_H
+#define QQUICKPROGRESSBAR_P_H
 
 //
 //  W A R N I N G
@@ -52,9 +52,9 @@
 
 QT_BEGIN_NAMESPACE
 
-class QQuickAbstractProgressBarPrivate;
+class QQuickProgressBarPrivate;
 
-class Q_QUICKCONTROLS_EXPORT QQuickAbstractProgressBar : public QQuickControl
+class Q_QUICKCONTROLS_EXPORT QQuickProgressBar : public QQuickControl
 {
     Q_OBJECT
     Q_PROPERTY(qreal value READ value WRITE setValue NOTIFY valueChanged FINAL)
@@ -65,7 +65,7 @@ class Q_QUICKCONTROLS_EXPORT QQuickAbstractProgressBar : public QQuickControl
     Q_PROPERTY(QQuickItem *indicator READ indicator WRITE setIndicator NOTIFY indicatorChanged FINAL)
 
 public:
-    explicit QQuickAbstractProgressBar(QQuickItem *parent = Q_NULLPTR);
+    explicit QQuickProgressBar(QQuickItem *parent = Q_NULLPTR);
 
     qreal value() const;
     void setValue(qreal value);
@@ -94,10 +94,10 @@ protected:
     void mirrorChange() Q_DECL_OVERRIDE;
 
 private:
-    Q_DISABLE_COPY(QQuickAbstractProgressBar)
-    Q_DECLARE_PRIVATE(QQuickAbstractProgressBar)
+    Q_DISABLE_COPY(QQuickProgressBar)
+    Q_DECLARE_PRIVATE(QQuickProgressBar)
 };
 
 QT_END_NAMESPACE
 
-#endif // QQUICKABSTRACTPROGRESSBAR_P_H
+#endif // QQUICKPROGRESSBAR_P_H
diff --git a/src/controls/qquickabstractradiobutton.cpp b/src/controls/qquickradiobutton.cpp
index 75f47ac0..c42a0207 100644
--- a/src/controls/qquickabstractradiobutton.cpp
+++ b/src/controls/qquickradiobutton.cpp
@@ -34,14 +34,14 @@
 **
 ****************************************************************************/
 
-#include "qquickabstractradiobutton_p.h"
+#include "qquickradiobutton_p.h"
 
 QT_BEGIN_NAMESPACE
 
 /*!
     \qmltype RadioButton
     \inherits Checkable
-    \instantiates QQuickAbstractRadioButton
+    \instantiates QQuickRadioButton
     \inqmlmodule QtQuick.Controls
     \ingroup buttons
     \brief A radio button control.
@@ -51,8 +51,8 @@ QT_BEGIN_NAMESPACE
     \sa ExclusiveGroup
 */
 
-QQuickAbstractRadioButton::QQuickAbstractRadioButton(QQuickItem *parent) :
-    QQuickAbstractCheckable(parent)
+QQuickRadioButton::QQuickRadioButton(QQuickItem *parent) :
+    QQuickCheckable(parent)
 {
     setExclusive(true);
 }
diff --git a/src/controls/qquickabstractcheckbox_p.h b/src/controls/qquickradiobutton_p.h
index 6016143f..5c5f76d7 100644
--- a/src/controls/qquickabstractcheckbox_p.h
+++ b/src/controls/qquickradiobutton_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QQUICKABSTRACTCHECKBOX_P_H
-#define QQUICKABSTRACTCHECKBOX_P_H
+#ifndef QQUICKRADIOBUTTON_P_H
+#define QQUICKRADIOBUTTON_P_H
 
 //
 //  W A R N I N G
@@ -48,18 +48,18 @@
 // We mean it.
 //
 
-#include <QtQuickControls/private/qquickabstractcheckable_p.h>
+#include <QtQuickControls/private/qquickcheckable_p.h>
 
 QT_BEGIN_NAMESPACE
 
-class Q_QUICKCONTROLS_EXPORT QQuickAbstractCheckBox : public QQuickAbstractCheckable
+class Q_QUICKCONTROLS_EXPORT QQuickRadioButton : public QQuickCheckable
 {
     Q_OBJECT
 
 public:
-    explicit QQuickAbstractCheckBox(QQuickItem *parent = Q_NULLPTR);
+    explicit QQuickRadioButton(QQuickItem *parent = Q_NULLPTR);
 };
 
 QT_END_NAMESPACE
 
-#endif // QQUICKABSTRACTCHECKBOX_P_H
+#endif // QQUICKRADIOBUTTON_P_H
diff --git a/src/controls/qquickabstractscrollbar.cpp b/src/controls/qquickscrollbar.cpp
index e1036bd0..068d4525 100644
--- a/src/controls/qquickabstractscrollbar.cpp
+++ b/src/controls/qquickscrollbar.cpp
@@ -34,7 +34,7 @@
 **
 ****************************************************************************/
 
-#include "qquickabstractscrollbar_p.h"
+#include "qquickscrollbar_p.h"
 #include "qquickcontrol_p_p.h"
 
 #include <QtQuick/private/qquickflickable_p.h>
@@ -45,7 +45,7 @@ QT_BEGIN_NAMESPACE
 /*!
     \qmltype ScrollBar
     \inherits Control
-    \instantiates QQuickAbstractScrollBar
+    \instantiates QQuickScrollBar
     \inqmlmodule QtQuick.Controls
     \ingroup indicators
     \ingroup sliders
@@ -54,14 +54,14 @@ QT_BEGIN_NAMESPACE
     TODO
 */
 
-class QQuickAbstractScrollBarPrivate : public QQuickControlPrivate
+class QQuickScrollBarPrivate : public QQuickControlPrivate
 {
 public:
-    QQuickAbstractScrollBarPrivate() : size(0), position(0), offset(0),
+    QQuickScrollBarPrivate() : size(0), position(0), offset(0),
         active(false), pressed(false), moving(false),
         orientation(Qt::Vertical), handle(Q_NULLPTR) { }
 
-    static QQuickAbstractScrollBarPrivate *get(QQuickAbstractScrollBar *bar)
+    static QQuickScrollBarPrivate *get(QQuickScrollBar *bar)
     {
         return bar->d_func();
     }
@@ -76,14 +76,14 @@ public:
     QQuickItem *handle;
 };
 
-QQuickAbstractScrollBar::QQuickAbstractScrollBar(QQuickItem *parent) :
-    QQuickControl(*(new QQuickAbstractScrollBarPrivate), parent)
+QQuickScrollBar::QQuickScrollBar(QQuickItem *parent) :
+    QQuickControl(*(new QQuickScrollBarPrivate), parent)
 {
     setKeepMouseGrab(true);
     setAcceptedMouseButtons(Qt::LeftButton);
 }
 
-QQuickScrollBarAttached *QQuickAbstractScrollBar::qmlAttachedProperties(QObject *object)
+QQuickScrollBarAttached *QQuickScrollBar::qmlAttachedProperties(QObject *object)
 {
     QQuickFlickable *flickable = qobject_cast<QQuickFlickable *>(object);
     if (flickable)
@@ -98,15 +98,15 @@ QQuickScrollBarAttached *QQuickAbstractScrollBar::qmlAttachedProperties(QObject
 
     TODO
 */
-qreal QQuickAbstractScrollBar::size() const
+qreal QQuickScrollBar::size() const
 {
-    Q_D(const QQuickAbstractScrollBar);
+    Q_D(const QQuickScrollBar);
     return d->size;
 }
 
-void QQuickAbstractScrollBar::setSize(qreal size)
+void QQuickScrollBar::setSize(qreal size)
 {
-    Q_D(QQuickAbstractScrollBar);
+    Q_D(QQuickScrollBar);
     if (!qFuzzyCompare(d->size, size)) {
         d->size = size;
         emit sizeChanged();
@@ -118,15 +118,15 @@ void QQuickAbstractScrollBar::setSize(qreal size)
 
     TODO
 */
-qreal QQuickAbstractScrollBar::position() const
+qreal QQuickScrollBar::position() const
 {
-    Q_D(const QQuickAbstractScrollBar);
+    Q_D(const QQuickScrollBar);
     return d->position;
 }
 
-void QQuickAbstractScrollBar::setPosition(qreal position)
+void QQuickScrollBar::setPosition(qreal position)
 {
-    Q_D(QQuickAbstractScrollBar);
+    Q_D(QQuickScrollBar);
     if (!qFuzzyCompare(d->position, position)) {
         d->position = position;
         emit positionChanged();
@@ -138,15 +138,15 @@ void QQuickAbstractScrollBar::setPosition(qreal position)
 
     TODO
 */
-bool QQuickAbstractScrollBar::isActive() const
+bool QQuickScrollBar::isActive() const
 {
-    Q_D(const QQuickAbstractScrollBar);
+    Q_D(const QQuickScrollBar);
     return d->active;
 }
 
-void QQuickAbstractScrollBar::setActive(bool active)
+void QQuickScrollBar::setActive(bool active)
 {
-    Q_D(QQuickAbstractScrollBar);
+    Q_D(QQuickScrollBar);
     if (d->active != active) {
         d->active = active;
         emit activeChanged();
@@ -158,15 +158,15 @@ void QQuickAbstractScrollBar::setActive(bool active)
 
     TODO
 */
-bool QQuickAbstractScrollBar::isPressed() const
+bool QQuickScrollBar::isPressed() const
 {
-    Q_D(const QQuickAbstractScrollBar);
+    Q_D(const QQuickScrollBar);
     return d->pressed;
 }
 
-void QQuickAbstractScrollBar::setPressed(bool pressed)
+void QQuickScrollBar::setPressed(bool pressed)
 {
-    Q_D(QQuickAbstractScrollBar);
+    Q_D(QQuickScrollBar);
     if (d->pressed != pressed) {
         d->pressed = pressed;
         setActive(d->pressed || d->moving);
@@ -179,15 +179,15 @@ void QQuickAbstractScrollBar::setPressed(bool pressed)
 
     TODO
 */
-Qt::Orientation QQuickAbstractScrollBar::orientation() const
+Qt::Orientation QQuickScrollBar::orientation() const
 {
-    Q_D(const QQuickAbstractScrollBar);
+    Q_D(const QQuickScrollBar);
     return d->orientation;
 }
 
-void QQuickAbstractScrollBar::setOrientation(Qt::Orientation orientation)
+void QQuickScrollBar::setOrientation(Qt::Orientation orientation)
 {
-    Q_D(QQuickAbstractScrollBar);
+    Q_D(QQuickScrollBar);
     if (d->orientation != orientation) {
         d->orientation = orientation;
         emit orientationChanged();
@@ -199,15 +199,15 @@ void QQuickAbstractScrollBar::setOrientation(Qt::Orientation orientation)
 
     TODO
 */
-QQuickItem *QQuickAbstractScrollBar::handle() const
+QQuickItem *QQuickScrollBar::handle() const
 {
-    Q_D(const QQuickAbstractScrollBar);
+    Q_D(const QQuickScrollBar);
     return d->handle;
 }
 
-void QQuickAbstractScrollBar::setHandle(QQuickItem *handle)
+void QQuickScrollBar::setHandle(QQuickItem *handle)
 {
-    Q_D(QQuickAbstractScrollBar);
+    Q_D(QQuickScrollBar);
     if (d->handle != handle) {
         delete d->handle;
         d->handle = handle;
@@ -217,9 +217,9 @@ void QQuickAbstractScrollBar::setHandle(QQuickItem *handle)
     }
 }
 
-void QQuickAbstractScrollBar::mousePressEvent(QMouseEvent *event)
+void QQuickScrollBar::mousePressEvent(QMouseEvent *event)
 {
-    Q_D(QQuickAbstractScrollBar);
+    Q_D(QQuickScrollBar);
     QQuickControl::mousePressEvent(event);
     d->offset = positionAt(event->pos()) - d->position;
     if (d->offset < 0 || d->offset > d->size)
@@ -228,17 +228,17 @@ void QQuickAbstractScrollBar::mousePressEvent(QMouseEvent *event)
     event->accept();
 }
 
-void QQuickAbstractScrollBar::mouseMoveEvent(QMouseEvent *event)
+void QQuickScrollBar::mouseMoveEvent(QMouseEvent *event)
 {
-    Q_D(QQuickAbstractScrollBar);
+    Q_D(QQuickScrollBar);
     QQuickControl::mouseMoveEvent(event);
     setPosition(qBound(0.0, positionAt(event->pos()) - d->offset, 1.0 - d->size));
     event->accept();
 }
 
-void QQuickAbstractScrollBar::mouseReleaseEvent(QMouseEvent *event)
+void QQuickScrollBar::mouseReleaseEvent(QMouseEvent *event)
 {
-    Q_D(QQuickAbstractScrollBar);
+    Q_D(QQuickScrollBar);
     QQuickControl::mouseReleaseEvent(event);
     setPosition(qBound(0.0, positionAt(event->pos()) - d->offset, 1.0 - d->size));
     d->offset = 0.0;
@@ -246,9 +246,9 @@ void QQuickAbstractScrollBar::mouseReleaseEvent(QMouseEvent *event)
     event->accept();
 }
 
-qreal QQuickAbstractScrollBar::positionAt(const QPoint &point) const
+qreal QQuickScrollBar::positionAt(const QPoint &point) const
 {
-    Q_D(const QQuickAbstractScrollBar);
+    Q_D(const QQuickScrollBar);
     if (d->orientation == Qt::Horizontal)
         return point.x() / width();
     else
@@ -268,20 +268,20 @@ public:
     void itemGeometryChanged(QQuickItem *item, const QRectF &newGeometry, const QRectF &oldGeometry) Q_DECL_OVERRIDE;
 
     QQuickFlickable *flickable;
-    QQuickAbstractScrollBar *horizontal;
-    QQuickAbstractScrollBar *vertical;
+    QQuickScrollBar *horizontal;
+    QQuickScrollBar *vertical;
 };
 
 void QQuickScrollBarAttachedPrivate::activateHorizontal()
 {
-    QQuickAbstractScrollBarPrivate *p = QQuickAbstractScrollBarPrivate::get(horizontal);
+    QQuickScrollBarPrivate *p = QQuickScrollBarPrivate::get(horizontal);
     p->moving = flickable->isMovingHorizontally();
     horizontal->setActive(p->moving || p->pressed);
 }
 
 void QQuickScrollBarAttachedPrivate::activateVertical()
 {
-    QQuickAbstractScrollBarPrivate *p = QQuickAbstractScrollBarPrivate::get(vertical);
+    QQuickScrollBarPrivate *p = QQuickScrollBarPrivate::get(vertical);
     p->moving = flickable->isMovingVertically();
     vertical->setActive(p->moving || p->pressed);
 }
@@ -345,18 +345,18 @@ QQuickScrollBarAttached::QQuickScrollBarAttached(QQuickFlickable *flickable) :
     p->addItemChangeListener(d, QQuickItemPrivate::Geometry);
 }
 
-QQuickAbstractScrollBar *QQuickScrollBarAttached::horizontal() const
+QQuickScrollBar *QQuickScrollBarAttached::horizontal() const
 {
     Q_D(const QQuickScrollBarAttached);
     return d->horizontal;
 }
 
-void QQuickScrollBarAttached::setHorizontal(QQuickAbstractScrollBar *horizontal)
+void QQuickScrollBarAttached::setHorizontal(QQuickScrollBar *horizontal)
 {
     Q_D(QQuickScrollBarAttached);
     if (d->horizontal != horizontal) {
         if (d->horizontal) {
-            QObjectPrivate::disconnect(d->horizontal, &QQuickAbstractScrollBar::positionChanged, d, &QQuickScrollBarAttachedPrivate::scrollHorizontal);
+            QObjectPrivate::disconnect(d->horizontal, &QQuickScrollBar::positionChanged, d, &QQuickScrollBarAttachedPrivate::scrollHorizontal);
             QObjectPrivate::disconnect(d->flickable, &QQuickFlickable::movingHorizontallyChanged, d, &QQuickScrollBarAttachedPrivate::activateHorizontal);
 
             // TODO: export QQuickFlickableVisibleArea
@@ -372,7 +372,7 @@ void QQuickScrollBarAttached::setHorizontal(QQuickAbstractScrollBar *horizontal)
                 horizontal->setParentItem(d->flickable);
             horizontal->setOrientation(Qt::Horizontal);
 
-            QObjectPrivate::connect(horizontal, &QQuickAbstractScrollBar::positionChanged, d, &QQuickScrollBarAttachedPrivate::scrollHorizontal);
+            QObjectPrivate::connect(horizontal, &QQuickScrollBar::positionChanged, d, &QQuickScrollBarAttachedPrivate::scrollHorizontal);
             QObjectPrivate::connect(d->flickable, &QQuickFlickable::movingHorizontallyChanged, d, &QQuickScrollBarAttachedPrivate::activateHorizontal);
 
             // TODO: export QQuickFlickableVisibleArea
@@ -387,18 +387,18 @@ void QQuickScrollBarAttached::setHorizontal(QQuickAbstractScrollBar *horizontal)
     }
 }
 
-QQuickAbstractScrollBar *QQuickScrollBarAttached::vertical() const
+QQuickScrollBar *QQuickScrollBarAttached::vertical() const
 {
     Q_D(const QQuickScrollBarAttached);
     return d->vertical;
 }
 
-void QQuickScrollBarAttached::setVertical(QQuickAbstractScrollBar *vertical)
+void QQuickScrollBarAttached::setVertical(QQuickScrollBar *vertical)
 {
     Q_D(QQuickScrollBarAttached);
     if (d->vertical != vertical) {
         if (d->vertical) {
-            QObjectPrivate::disconnect(d->vertical, &QQuickAbstractScrollBar::positionChanged, d, &QQuickScrollBarAttachedPrivate::scrollVertical);
+            QObjectPrivate::disconnect(d->vertical, &QQuickScrollBar::positionChanged, d, &QQuickScrollBarAttachedPrivate::scrollVertical);
             QObjectPrivate::disconnect(d->flickable, &QQuickFlickable::movingVerticallyChanged, d, &QQuickScrollBarAttachedPrivate::activateVertical);
 
             // TODO: export QQuickFlickableVisibleArea
@@ -414,7 +414,7 @@ void QQuickScrollBarAttached::setVertical(QQuickAbstractScrollBar *vertical)
                 vertical->setParentItem(d->flickable);
             vertical->setOrientation(Qt::Vertical);
 
-            QObjectPrivate::connect(vertical, &QQuickAbstractScrollBar::positionChanged, d, &QQuickScrollBarAttachedPrivate::scrollVertical);
+            QObjectPrivate::connect(vertical, &QQuickScrollBar::positionChanged, d, &QQuickScrollBarAttachedPrivate::scrollVertical);
             QObjectPrivate::connect(d->flickable, &QQuickFlickable::movingVerticallyChanged, d, &QQuickScrollBarAttachedPrivate::activateVertical);
 
             // TODO: export QQuickFlickableVisibleArea
diff --git a/src/controls/qquickabstractscrollbar_p.h b/src/controls/qquickscrollbar_p.h
index ba0ce101..df21d02b 100644
--- a/src/controls/qquickabstractscrollbar_p.h
+++ b/src/controls/qquickscrollbar_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QQUICKABSTRACTSCROLLBAR_P_H
-#define QQUICKABSTRACTSCROLLBAR_P_H
+#ifndef QQUICKSCROLLBAR_P_H
+#define QQUICKSCROLLBAR_P_H
 
 //
 //  W A R N I N G
@@ -54,9 +54,9 @@ QT_BEGIN_NAMESPACE
 
 class QQuickFlickable;
 class QQuickScrollBarAttached;
-class QQuickAbstractScrollBarPrivate;
+class QQuickScrollBarPrivate;
 
-class Q_QUICKCONTROLS_EXPORT QQuickAbstractScrollBar : public QQuickControl
+class Q_QUICKCONTROLS_EXPORT QQuickScrollBar : public QQuickControl
 {
     Q_OBJECT
     Q_PROPERTY(qreal size READ size NOTIFY sizeChanged FINAL)
@@ -67,7 +67,7 @@ class Q_QUICKCONTROLS_EXPORT QQuickAbstractScrollBar : public QQuickControl
     Q_PROPERTY(QQuickItem *handle READ handle WRITE setHandle NOTIFY handleChanged FINAL)
 
 public:
-    explicit QQuickAbstractScrollBar(QQuickItem *parent = Q_NULLPTR);
+    explicit QQuickScrollBar(QQuickItem *parent = Q_NULLPTR);
 
     static QQuickScrollBarAttached *qmlAttachedProperties(QObject *object);
 
@@ -106,8 +106,8 @@ protected:
     virtual qreal positionAt(const QPoint &point) const;
 
 private:
-    Q_DISABLE_COPY(QQuickAbstractScrollBar)
-    Q_DECLARE_PRIVATE(QQuickAbstractScrollBar)
+    Q_DISABLE_COPY(QQuickScrollBar)
+    Q_DECLARE_PRIVATE(QQuickScrollBar)
 };
 
 class QQuickScrollBarAttachedPrivate;
@@ -115,17 +115,17 @@ class QQuickScrollBarAttachedPrivate;
 class Q_QUICKCONTROLS_EXPORT QQuickScrollBarAttached : public QObject
 {
     Q_OBJECT
-    Q_PROPERTY(QQuickAbstractScrollBar *horizontal READ horizontal WRITE setHorizontal NOTIFY horizontalChanged FINAL)
-    Q_PROPERTY(QQuickAbstractScrollBar *vertical READ vertical WRITE setVertical NOTIFY verticalChanged FINAL)
+    Q_PROPERTY(QQuickScrollBar *horizontal READ horizontal WRITE setHorizontal NOTIFY horizontalChanged FINAL)
+    Q_PROPERTY(QQuickScrollBar *vertical READ vertical WRITE setVertical NOTIFY verticalChanged FINAL)
 
 public:
     explicit QQuickScrollBarAttached(QQuickFlickable *flickable);
 
-    QQuickAbstractScrollBar *horizontal() const;
-    void setHorizontal(QQuickAbstractScrollBar *horizontal);
+    QQuickScrollBar *horizontal() const;
+    void setHorizontal(QQuickScrollBar *horizontal);
 
-    QQuickAbstractScrollBar *vertical() const;
-    void setVertical(QQuickAbstractScrollBar *vertical);
+    QQuickScrollBar *vertical() const;
+    void setVertical(QQuickScrollBar *vertical);
 
 Q_SIGNALS:
     void horizontalChanged();
@@ -138,6 +138,6 @@ private:
 
 QT_END_NAMESPACE
 
-QML_DECLARE_TYPEINFO(QQuickAbstractScrollBar, QML_HAS_ATTACHED_PROPERTIES)
+QML_DECLARE_TYPEINFO(QQuickScrollBar, QML_HAS_ATTACHED_PROPERTIES)
 
-#endif // QQUICKABSTRACTSCROLLBAR_P_H
+#endif // QQUICKSCROLLBAR_P_H
diff --git a/src/controls/qquickabstractscrollindicator.cpp b/src/controls/qquickscrollindicator.cpp
index 93d7917e..afd83022 100644
--- a/src/controls/qquickabstractscrollindicator.cpp
+++ b/src/controls/qquickscrollindicator.cpp
@@ -34,7 +34,7 @@
 **
 ****************************************************************************/
 
-#include "qquickabstractscrollindicator_p.h"
+#include "qquickscrollindicator_p.h"
 #include "qquickcontrol_p_p.h"
 
 #include <QtQuick/private/qquickflickable_p.h>
@@ -45,7 +45,7 @@ QT_BEGIN_NAMESPACE
 /*!
     \qmltype ScrollIndicator
     \inherits Control
-    \instantiates QQuickAbstractScrollIndicator
+    \instantiates QQuickScrollIndicator
     \inqmlmodule QtQuick.Controls
     \ingroup indicators
     \brief A scroll indicator.
@@ -53,10 +53,10 @@ QT_BEGIN_NAMESPACE
     TODO
 */
 
-class QQuickAbstractScrollIndicatorPrivate : public QQuickControlPrivate
+class QQuickScrollIndicatorPrivate : public QQuickControlPrivate
 {
 public:
-    QQuickAbstractScrollIndicatorPrivate() : size(0), position(0),
+    QQuickScrollIndicatorPrivate() : size(0), position(0),
         active(false), orientation(Qt::Vertical), indicator(Q_NULLPTR) { }
 
     qreal size;
@@ -66,12 +66,12 @@ public:
     QQuickItem *indicator;
 };
 
-QQuickAbstractScrollIndicator::QQuickAbstractScrollIndicator(QQuickItem *parent) :
-    QQuickControl(*(new QQuickAbstractScrollIndicatorPrivate), parent)
+QQuickScrollIndicator::QQuickScrollIndicator(QQuickItem *parent) :
+    QQuickControl(*(new QQuickScrollIndicatorPrivate), parent)
 {
 }
 
-QQuickScrollIndicatorAttached *QQuickAbstractScrollIndicator::qmlAttachedProperties(QObject *object)
+QQuickScrollIndicatorAttached *QQuickScrollIndicator::qmlAttachedProperties(QObject *object)
 {
     QQuickFlickable *flickable = qobject_cast<QQuickFlickable *>(object);
     if (flickable)
@@ -86,15 +86,15 @@ QQuickScrollIndicatorAttached *QQuickAbstractScrollIndicator::qmlAttachedPropert
 
     TODO
 */
-qreal QQuickAbstractScrollIndicator::size() const
+qreal QQuickScrollIndicator::size() const
 {
-    Q_D(const QQuickAbstractScrollIndicator);
+    Q_D(const QQuickScrollIndicator);
     return d->size;
 }
 
-void QQuickAbstractScrollIndicator::setSize(qreal size)
+void QQuickScrollIndicator::setSize(qreal size)
 {
-    Q_D(QQuickAbstractScrollIndicator);
+    Q_D(QQuickScrollIndicator);
     if (!qFuzzyCompare(d->size, size)) {
         d->size = size;
         emit sizeChanged();
@@ -106,15 +106,15 @@ void QQuickAbstractScrollIndicator::setSize(qreal size)
 
     TODO
 */
-qreal QQuickAbstractScrollIndicator::position() const
+qreal QQuickScrollIndicator::position() const
 {
-    Q_D(const QQuickAbstractScrollIndicator);
+    Q_D(const QQuickScrollIndicator);
     return d->position;
 }
 
-void QQuickAbstractScrollIndicator::setPosition(qreal position)
+void QQuickScrollIndicator::setPosition(qreal position)
 {
-    Q_D(QQuickAbstractScrollIndicator);
+    Q_D(QQuickScrollIndicator);
     if (!qFuzzyCompare(d->position, position)) {
         d->position = position;
         emit positionChanged();
@@ -126,15 +126,15 @@ void QQuickAbstractScrollIndicator::setPosition(qreal position)
 
     TODO
 */
-bool QQuickAbstractScrollIndicator::isActive() const
+bool QQuickScrollIndicator::isActive() const
 {
-    Q_D(const QQuickAbstractScrollIndicator);
+    Q_D(const QQuickScrollIndicator);
     return d->active;
 }
 
-void QQuickAbstractScrollIndicator::setActive(bool active)
+void QQuickScrollIndicator::setActive(bool active)
 {
-    Q_D(QQuickAbstractScrollIndicator);
+    Q_D(QQuickScrollIndicator);
     if (d->active != active) {
         d->active = active;
         emit activeChanged();
@@ -146,15 +146,15 @@ void QQuickAbstractScrollIndicator::setActive(bool active)
 
     TODO
 */
-Qt::Orientation QQuickAbstractScrollIndicator::orientation() const
+Qt::Orientation QQuickScrollIndicator::orientation() const
 {
-    Q_D(const QQuickAbstractScrollIndicator);
+    Q_D(const QQuickScrollIndicator);
     return d->orientation;
 }
 
-void QQuickAbstractScrollIndicator::setOrientation(Qt::Orientation orientation)
+void QQuickScrollIndicator::setOrientation(Qt::Orientation orientation)
 {
-    Q_D(QQuickAbstractScrollIndicator);
+    Q_D(QQuickScrollIndicator);
     if (d->orientation != orientation) {
         d->orientation = orientation;
         emit orientationChanged();
@@ -166,15 +166,15 @@ void QQuickAbstractScrollIndicator::setOrientation(Qt::Orientation orientation)
 
     TODO
 */
-QQuickItem *QQuickAbstractScrollIndicator::indicator() const
+QQuickItem *QQuickScrollIndicator::indicator() const
 {
-    Q_D(const QQuickAbstractScrollIndicator);
+    Q_D(const QQuickScrollIndicator);
     return d->indicator;
 }
 
-void QQuickAbstractScrollIndicator::setIndicator(QQuickItem *indicator)
+void QQuickScrollIndicator::setIndicator(QQuickItem *indicator)
 {
-    Q_D(QQuickAbstractScrollIndicator);
+    Q_D(QQuickScrollIndicator);
     if (d->indicator != indicator) {
         delete d->indicator;
         d->indicator = indicator;
@@ -195,8 +195,8 @@ public:
     void itemGeometryChanged(QQuickItem *item, const QRectF &newGeometry, const QRectF &oldGeometry) Q_DECL_OVERRIDE;
 
     QQuickFlickable *flickable;
-    QQuickAbstractScrollIndicator *horizontal;
-    QQuickAbstractScrollIndicator *vertical;
+    QQuickScrollIndicator *horizontal;
+    QQuickScrollIndicator *vertical;
 };
 
 void QQuickScrollIndicatorAttachedPrivate::activateHorizontal()
@@ -240,13 +240,13 @@ QQuickScrollIndicatorAttached::QQuickScrollIndicatorAttached(QQuickFlickable *fl
     p->addItemChangeListener(d, QQuickItemPrivate::Geometry);
 }
 
-QQuickAbstractScrollIndicator *QQuickScrollIndicatorAttached::horizontal() const
+QQuickScrollIndicator *QQuickScrollIndicatorAttached::horizontal() const
 {
     Q_D(const QQuickScrollIndicatorAttached);
     return d->horizontal;
 }
 
-void QQuickScrollIndicatorAttached::setHorizontal(QQuickAbstractScrollIndicator *horizontal)
+void QQuickScrollIndicatorAttached::setHorizontal(QQuickScrollIndicator *horizontal)
 {
     Q_D(QQuickScrollIndicatorAttached);
     if (d->horizontal != horizontal) {
@@ -280,13 +280,13 @@ void QQuickScrollIndicatorAttached::setHorizontal(QQuickAbstractScrollIndicator
     }
 }
 
-QQuickAbstractScrollIndicator *QQuickScrollIndicatorAttached::vertical() const
+QQuickScrollIndicator *QQuickScrollIndicatorAttached::vertical() const
 {
     Q_D(const QQuickScrollIndicatorAttached);
     return d->vertical;
 }
 
-void QQuickScrollIndicatorAttached::setVertical(QQuickAbstractScrollIndicator *vertical)
+void QQuickScrollIndicatorAttached::setVertical(QQuickScrollIndicator *vertical)
 {
     Q_D(QQuickScrollIndicatorAttached);
     if (d->vertical != vertical) {
diff --git a/src/controls/qquickabstractscrollindicator_p.h b/src/controls/qquickscrollindicator_p.h
index 2263a358..c8c8e946 100644
--- a/src/controls/qquickabstractscrollindicator_p.h
+++ b/src/controls/qquickscrollindicator_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QQUICKABSTRACTSCROLLINDICATOR_P_H
-#define QQUICKABSTRACTSCROLLINDICATOR_P_H
+#ifndef QQUICKSCROLLINDICATOR_P_H
+#define QQUICKSCROLLINDICATOR_P_H
 
 //
 //  W A R N I N G
@@ -54,9 +54,9 @@ QT_BEGIN_NAMESPACE
 
 class QQuickFlickable;
 class QQuickScrollIndicatorAttached;
-class QQuickAbstractScrollIndicatorPrivate;
+class QQuickScrollIndicatorPrivate;
 
-class Q_QUICKCONTROLS_EXPORT QQuickAbstractScrollIndicator : public QQuickControl
+class Q_QUICKCONTROLS_EXPORT QQuickScrollIndicator : public QQuickControl
 {
     Q_OBJECT
     Q_PROPERTY(qreal size READ size NOTIFY sizeChanged FINAL)
@@ -66,7 +66,7 @@ class Q_QUICKCONTROLS_EXPORT QQuickAbstractScrollIndicator : public QQuickContro
     Q_PROPERTY(QQuickItem *indicator READ indicator WRITE setIndicator NOTIFY indicatorChanged FINAL)
 
 public:
-    explicit QQuickAbstractScrollIndicator(QQuickItem *parent = Q_NULLPTR);
+    explicit QQuickScrollIndicator(QQuickItem *parent = Q_NULLPTR);
 
     static QQuickScrollIndicatorAttached *qmlAttachedProperties(QObject *object);
 
@@ -94,8 +94,8 @@ Q_SIGNALS:
     void indicatorChanged();
 
 private:
-    Q_DISABLE_COPY(QQuickAbstractScrollIndicator)
-    Q_DECLARE_PRIVATE(QQuickAbstractScrollIndicator)
+    Q_DISABLE_COPY(QQuickScrollIndicator)
+    Q_DECLARE_PRIVATE(QQuickScrollIndicator)
 };
 
 class QQuickScrollIndicatorAttachedPrivate;
@@ -103,17 +103,17 @@ class QQuickScrollIndicatorAttachedPrivate;
 class Q_QUICKCONTROLS_EXPORT QQuickScrollIndicatorAttached : public QObject
 {
     Q_OBJECT
-    Q_PROPERTY(QQuickAbstractScrollIndicator *horizontal READ horizontal WRITE setHorizontal NOTIFY horizontalChanged FINAL)
-    Q_PROPERTY(QQuickAbstractScrollIndicator *vertical READ vertical WRITE setVertical NOTIFY verticalChanged FINAL)
+    Q_PROPERTY(QQuickScrollIndicator *horizontal READ horizontal WRITE setHorizontal NOTIFY horizontalChanged FINAL)
+    Q_PROPERTY(QQuickScrollIndicator *vertical READ vertical WRITE setVertical NOTIFY verticalChanged FINAL)
 
 public:
     explicit QQuickScrollIndicatorAttached(QQuickFlickable *flickable);
 
-    QQuickAbstractScrollIndicator *horizontal() const;
-    void setHorizontal(QQuickAbstractScrollIndicator *horizontal);
+    QQuickScrollIndicator *horizontal() const;
+    void setHorizontal(QQuickScrollIndicator *horizontal);
 
-    QQuickAbstractScrollIndicator *vertical() const;
-    void setVertical(QQuickAbstractScrollIndicator *vertical);
+    QQuickScrollIndicator *vertical() const;
+    void setVertical(QQuickScrollIndicator *vertical);
 
 Q_SIGNALS:
     void horizontalChanged();
@@ -126,6 +126,6 @@ private:
 
 QT_END_NAMESPACE
 
-QML_DECLARE_TYPEINFO(QQuickAbstractScrollIndicator, QML_HAS_ATTACHED_PROPERTIES)
+QML_DECLARE_TYPEINFO(QQuickScrollIndicator, QML_HAS_ATTACHED_PROPERTIES)
 
-#endif // QQUICKABSTRACTSCROLLINDICATOR_P_H
+#endif // QQUICKSCROLLINDICATOR_P_H
diff --git a/src/controls/qquickabstractslider.cpp b/src/controls/qquickslider.cpp
index 52fa11af..a55b5c9d 100644
--- a/src/controls/qquickabstractslider.cpp
+++ b/src/controls/qquickslider.cpp
@@ -34,7 +34,7 @@
 **
 ****************************************************************************/
 
-#include "qquickabstractslider_p.h"
+#include "qquickslider_p.h"
 #include "qquickcontrol_p_p.h"
 
 #include <QtQuick/private/qquickwindow_p.h>
@@ -44,7 +44,7 @@ QT_BEGIN_NAMESPACE
 /*!
     \qmltype Slider
     \inherits Control
-    \instantiates QQuickAbstractSlider
+    \instantiates QQuickSlider
     \inqmlmodule QtQuick.Controls
     \ingroup sliders
     \brief A slider control.
@@ -52,14 +52,14 @@ QT_BEGIN_NAMESPACE
     TODO
 */
 
-class QQuickAbstractSliderPrivate : public QQuickControlPrivate
+class QQuickSliderPrivate : public QQuickControlPrivate
 {
-    Q_DECLARE_PUBLIC(QQuickAbstractSlider)
+    Q_DECLARE_PUBLIC(QQuickSlider)
 
 public:
-    QQuickAbstractSliderPrivate() : value(0), position(0), stepSize(0),
+    QQuickSliderPrivate() : value(0), position(0), stepSize(0),
         pressed(false), orientation(Qt::Horizontal), layoutDirection(Qt::LeftToRight),
-        snapMode(QQuickAbstractSlider::NoSnap), handle(Q_NULLPTR), track(Q_NULLPTR) { }
+        snapMode(QQuickSlider::NoSnap), handle(Q_NULLPTR), track(Q_NULLPTR) { }
 
     qreal snapPosition(qreal position) const;
     qreal positionAt(const QPoint &point) const;
@@ -71,21 +71,21 @@ public:
     QPoint pressPoint;
     Qt::Orientation orientation;
     Qt::LayoutDirection layoutDirection;
-    QQuickAbstractSlider::SnapMode snapMode;
+    QQuickSlider::SnapMode snapMode;
     QQuickItem *handle;
     QQuickItem *track;
 };
 
-qreal QQuickAbstractSliderPrivate::snapPosition(qreal position) const
+qreal QQuickSliderPrivate::snapPosition(qreal position) const
 {
     if (qFuzzyIsNull(stepSize))
         return position;
     return qRound(position / stepSize) * stepSize;
 }
 
-qreal QQuickAbstractSliderPrivate::positionAt(const QPoint &point) const
+qreal QQuickSliderPrivate::positionAt(const QPoint &point) const
 {
-    Q_Q(const QQuickAbstractSlider);
+    Q_Q(const QQuickSlider);
     if (orientation == Qt::Horizontal) {
         const qreal hw = handle ? handle->width() : 0;
         const qreal offset = hw / 2;
@@ -106,8 +106,8 @@ qreal QQuickAbstractSliderPrivate::positionAt(const QPoint &point) const
     return 0;
 }
 
-QQuickAbstractSlider::QQuickAbstractSlider(QQuickItem *parent) :
-    QQuickControl(*(new QQuickAbstractSliderPrivate), parent)
+QQuickSlider::QQuickSlider(QQuickItem *parent) :
+    QQuickControl(*(new QQuickSliderPrivate), parent)
 {
     setActiveFocusOnTab(true);
     setAcceptedMouseButtons(Qt::LeftButton);
@@ -118,15 +118,15 @@ QQuickAbstractSlider::QQuickAbstractSlider(QQuickItem *parent) :
 
     TODO
 */
-qreal QQuickAbstractSlider::value() const
+qreal QQuickSlider::value() const
 {
-    Q_D(const QQuickAbstractSlider);
+    Q_D(const QQuickSlider);
     return d->value;
 }
 
-void QQuickAbstractSlider::setValue(qreal value)
+void QQuickSlider::setValue(qreal value)
 {
-    Q_D(QQuickAbstractSlider);
+    Q_D(QQuickSlider);
     value = qBound(0.0, value, 1.0);
     if (!qFuzzyCompare(d->value, value)) {
         d->value = value;
@@ -140,9 +140,9 @@ void QQuickAbstractSlider::setValue(qreal value)
 
     TODO
 */
-qreal QQuickAbstractSlider::position() const
+qreal QQuickSlider::position() const
 {
-    Q_D(const QQuickAbstractSlider);
+    Q_D(const QQuickSlider);
     return d->position;
 }
 
@@ -151,17 +151,17 @@ qreal QQuickAbstractSlider::position() const
 
     TODO
 */
-qreal QQuickAbstractSlider::visualPosition() const
+qreal QQuickSlider::visualPosition() const
 {
-    Q_D(const QQuickAbstractSlider);
+    Q_D(const QQuickSlider);
     if (d->orientation == Qt::Vertical || effectiveLayoutDirection() == Qt::RightToLeft)
         return 1.0 - d->position;
     return d->position;
 }
 
-void QQuickAbstractSlider::setPosition(qreal position)
+void QQuickSlider::setPosition(qreal position)
 {
-    Q_D(QQuickAbstractSlider);
+    Q_D(QQuickSlider);
     position = qBound(0.0, position, 1.0);
     if (!qFuzzyCompare(d->position, position)) {
         d->position = position;
@@ -175,15 +175,15 @@ void QQuickAbstractSlider::setPosition(qreal position)
 
     TODO
 */
-qreal QQuickAbstractSlider::stepSize() const
+qreal QQuickSlider::stepSize() const
 {
-    Q_D(const QQuickAbstractSlider);
+    Q_D(const QQuickSlider);
     return d->stepSize;
 }
 
-void QQuickAbstractSlider::setStepSize(qreal step)
+void QQuickSlider::setStepSize(qreal step)
 {
-    Q_D(QQuickAbstractSlider);
+    Q_D(QQuickSlider);
     if (!qFuzzyCompare(d->stepSize, step)) {
         d->stepSize = step;
         emit stepSizeChanged();
@@ -195,15 +195,15 @@ void QQuickAbstractSlider::setStepSize(qreal step)
 
     TODO
 */
-QQuickAbstractSlider::SnapMode QQuickAbstractSlider::snapMode() const
+QQuickSlider::SnapMode QQuickSlider::snapMode() const
 {
-    Q_D(const QQuickAbstractSlider);
+    Q_D(const QQuickSlider);
     return d->snapMode;
 }
 
-void QQuickAbstractSlider::setSnapMode(SnapMode mode)
+void QQuickSlider::setSnapMode(SnapMode mode)
 {
-    Q_D(QQuickAbstractSlider);
+    Q_D(QQuickSlider);
     if (d->snapMode != mode) {
         d->snapMode = mode;
         emit snapModeChanged();
@@ -215,15 +215,15 @@ void QQuickAbstractSlider::setSnapMode(SnapMode mode)
 
     TODO
 */
-bool QQuickAbstractSlider::isPressed() const
+bool QQuickSlider::isPressed() const
 {
-    Q_D(const QQuickAbstractSlider);
+    Q_D(const QQuickSlider);
     return d->pressed;
 }
 
-void QQuickAbstractSlider::setPressed(bool pressed)
+void QQuickSlider::setPressed(bool pressed)
 {
-    Q_D(QQuickAbstractSlider);
+    Q_D(QQuickSlider);
     if (d->pressed != pressed) {
         d->pressed = pressed;
         emit pressedChanged();
@@ -235,15 +235,15 @@ void QQuickAbstractSlider::setPressed(bool pressed)
 
     TODO
 */
-Qt::Orientation QQuickAbstractSlider::orientation() const
+Qt::Orientation QQuickSlider::orientation() const
 {
-    Q_D(const QQuickAbstractSlider);
+    Q_D(const QQuickSlider);
     return d->orientation;
 }
 
-void QQuickAbstractSlider::setOrientation(Qt::Orientation orientation)
+void QQuickSlider::setOrientation(Qt::Orientation orientation)
 {
-    Q_D(QQuickAbstractSlider);
+    Q_D(QQuickSlider);
     if (d->orientation != orientation) {
         d->orientation = orientation;
         emit orientationChanged();
@@ -255,9 +255,9 @@ void QQuickAbstractSlider::setOrientation(Qt::Orientation orientation)
 
     TODO
 */
-Qt::LayoutDirection QQuickAbstractSlider::layoutDirection() const
+Qt::LayoutDirection QQuickSlider::layoutDirection() const
 {
-    Q_D(const QQuickAbstractSlider);
+    Q_D(const QQuickSlider);
     return d->layoutDirection;
 }
 
@@ -266,17 +266,17 @@ Qt::LayoutDirection QQuickAbstractSlider::layoutDirection() const
 
     TODO
 */
-Qt::LayoutDirection QQuickAbstractSlider::effectiveLayoutDirection() const
+Qt::LayoutDirection QQuickSlider::effectiveLayoutDirection() const
 {
-    Q_D(const QQuickAbstractSlider);
+    Q_D(const QQuickSlider);
     if (isMirrored())
         return d->layoutDirection == Qt::RightToLeft ? Qt::LeftToRight : Qt::RightToLeft;
     return d->layoutDirection;
 }
 
-void QQuickAbstractSlider::setLayoutDirection(Qt::LayoutDirection direction)
+void QQuickSlider::setLayoutDirection(Qt::LayoutDirection direction)
 {
-    Q_D(QQuickAbstractSlider);
+    Q_D(QQuickSlider);
     if (d->layoutDirection != direction) {
         d->layoutDirection = direction;
         emit layoutDirectionChanged();
@@ -289,15 +289,15 @@ void QQuickAbstractSlider::setLayoutDirection(Qt::LayoutDirection direction)
 
     TODO
 */
-QQuickItem *QQuickAbstractSlider::handle() const
+QQuickItem *QQuickSlider::handle() const
 {
-    Q_D(const QQuickAbstractSlider);
+    Q_D(const QQuickSlider);
     return d->handle;
 }
 
-void QQuickAbstractSlider::setHandle(QQuickItem *handle)
+void QQuickSlider::setHandle(QQuickItem *handle)
 {
-    Q_D(QQuickAbstractSlider);
+    Q_D(QQuickSlider);
     if (d->handle != handle) {
         delete d->handle;
         d->handle = handle;
@@ -312,15 +312,15 @@ void QQuickAbstractSlider::setHandle(QQuickItem *handle)
 
     TODO
 */
-QQuickItem *QQuickAbstractSlider::track() const
+QQuickItem *QQuickSlider::track() const
 {
-    Q_D(const QQuickAbstractSlider);
+    Q_D(const QQuickSlider);
     return d->track;
 }
 
-void QQuickAbstractSlider::setTrack(QQuickItem *track)
+void QQuickSlider::setTrack(QQuickItem *track)
 {
-    Q_D(QQuickAbstractSlider);
+    Q_D(QQuickSlider);
     if (d->track != track) {
         delete d->track;
         d->track = track;
@@ -335,9 +335,9 @@ void QQuickAbstractSlider::setTrack(QQuickItem *track)
 
     TODO
 */
-void QQuickAbstractSlider::increase()
+void QQuickSlider::increase()
 {
-    Q_D(QQuickAbstractSlider);
+    Q_D(QQuickSlider);
     qreal step = qFuzzyIsNull(d->stepSize) ? 0.1 : d->stepSize;
     setValue(d->value + step);
 }
@@ -347,16 +347,16 @@ void QQuickAbstractSlider::increase()
 
     TODO
 */
-void QQuickAbstractSlider::decrease()
+void QQuickSlider::decrease()
 {
-    Q_D(QQuickAbstractSlider);
+    Q_D(QQuickSlider);
     qreal step = qFuzzyIsNull(d->stepSize) ? 0.1 : d->stepSize;
     setValue(d->value - step);
 }
 
-void QQuickAbstractSlider::keyPressEvent(QKeyEvent *event)
+void QQuickSlider::keyPressEvent(QKeyEvent *event)
 {
-    Q_D(QQuickAbstractSlider);
+    Q_D(QQuickSlider);
     QQuickControl::keyPressEvent(event);
     if (d->orientation == Qt::Horizontal) {
         if (event->key() == Qt::Key_Left) {
@@ -387,24 +387,24 @@ void QQuickAbstractSlider::keyPressEvent(QKeyEvent *event)
     }
 }
 
-void QQuickAbstractSlider::keyReleaseEvent(QKeyEvent *event)
+void QQuickSlider::keyReleaseEvent(QKeyEvent *event)
 {
     QQuickControl::keyReleaseEvent(event);
     setPressed(false);
 }
 
-void QQuickAbstractSlider::mousePressEvent(QMouseEvent *event)
+void QQuickSlider::mousePressEvent(QMouseEvent *event)
 {
-    Q_D(QQuickAbstractSlider);
+    Q_D(QQuickSlider);
     QQuickControl::mousePressEvent(event);
     d->pressPoint = event->pos();
     setPressed(true);
     event->accept();
 }
 
-void QQuickAbstractSlider::mouseMoveEvent(QMouseEvent *event)
+void QQuickSlider::mouseMoveEvent(QMouseEvent *event)
 {
-    Q_D(QQuickAbstractSlider);
+    Q_D(QQuickSlider);
     QQuickControl::mouseMoveEvent(event);
     if (!keepMouseGrab()) {
         if (d->orientation == Qt::Horizontal)
@@ -421,9 +421,9 @@ void QQuickAbstractSlider::mouseMoveEvent(QMouseEvent *event)
     event->accept();
 }
 
-void QQuickAbstractSlider::mouseReleaseEvent(QMouseEvent *event)
+void QQuickSlider::mouseReleaseEvent(QMouseEvent *event)
 {
-    Q_D(QQuickAbstractSlider);
+    Q_D(QQuickSlider);
     QQuickControl::mouseReleaseEvent(event);
     d->pressPoint = QPoint();
     if (keepMouseGrab()) {
@@ -437,15 +437,15 @@ void QQuickAbstractSlider::mouseReleaseEvent(QMouseEvent *event)
     event->accept();
 }
 
-void QQuickAbstractSlider::mouseUngrabEvent()
+void QQuickSlider::mouseUngrabEvent()
 {
-    Q_D(QQuickAbstractSlider);
+    Q_D(QQuickSlider);
     QQuickControl::mouseUngrabEvent();
     d->pressPoint = QPoint();
     setPressed(false);
 }
 
-void QQuickAbstractSlider::mirrorChange()
+void QQuickSlider::mirrorChange()
 {
     emit effectiveLayoutDirectionChanged();
     emit visualPositionChanged();
diff --git a/src/controls/qquickabstractslider_p.h b/src/controls/qquickslider_p.h
index 5481c184..8215565d 100644
--- a/src/controls/qquickabstractslider_p.h
+++ b/src/controls/qquickslider_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QQUICKABSTRACTSLIDER_P_H
-#define QQUICKABSTRACTSLIDER_P_H
+#ifndef QQUICKSLIDER_P_H
+#define QQUICKSLIDER_P_H
 
 //
 //  W A R N I N G
@@ -52,9 +52,9 @@
 
 QT_BEGIN_NAMESPACE
 
-class QQuickAbstractSliderPrivate;
+class QQuickSliderPrivate;
 
-class Q_QUICKCONTROLS_EXPORT QQuickAbstractSlider : public QQuickControl
+class Q_QUICKCONTROLS_EXPORT QQuickSlider : public QQuickControl
 {
     Q_OBJECT
     Q_PROPERTY(qreal value READ value WRITE setValue NOTIFY valueChanged FINAL)
@@ -70,7 +70,7 @@ class Q_QUICKCONTROLS_EXPORT QQuickAbstractSlider : public QQuickControl
     Q_PROPERTY(QQuickItem *track READ track WRITE setTrack NOTIFY trackChanged FINAL)
 
 public:
-    explicit QQuickAbstractSlider(QQuickItem *parent = Q_NULLPTR);
+    explicit QQuickSlider(QQuickItem *parent = Q_NULLPTR);
 
     qreal value() const;
     void setValue(qreal value);
@@ -135,10 +135,10 @@ protected:
     void mirrorChange() Q_DECL_OVERRIDE;
 
 private:
-    Q_DISABLE_COPY(QQuickAbstractSlider)
-    Q_DECLARE_PRIVATE(QQuickAbstractSlider)
+    Q_DISABLE_COPY(QQuickSlider)
+    Q_DECLARE_PRIVATE(QQuickSlider)
 };
 
 QT_END_NAMESPACE
 
-#endif // QQUICKABSTRACTSLIDER_P_H
+#endif // QQUICKSLIDER_P_H
diff --git a/src/controls/qquickabstractstackview.cpp b/src/controls/qquickstackview.cpp
index e5496697..c8a7589a 100644
--- a/src/controls/qquickabstractstackview.cpp
+++ b/src/controls/qquickstackview.cpp
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#include "qquickabstractstackview_p.h"
-#include "qquickabstractstackview_p_p.h"
+#include "qquickstackview_p.h"
+#include "qquickstackview_p_p.h"
 
 #include <QtQml/qjsvalue.h>
 #include <QtQml/qqmlengine.h>
@@ -45,7 +45,7 @@ QT_BEGIN_NAMESPACE
 /*!
     \qmltype StackView
     \inherits Container
-    \instantiates QQuickAbstractStackView
+    \instantiates QQuickStackView
     \inqmlmodule QtQuick.Controls
     \ingroup navigation
     \brief A stack view control.
@@ -53,15 +53,15 @@ QT_BEGIN_NAMESPACE
     TODO
 */
 
-QQuickAbstractStackView::QQuickAbstractStackView(QQuickItem *parent) :
-    QQuickAbstractContainer(*(new QQuickAbstractStackViewPrivate), parent)
+QQuickStackView::QQuickStackView(QQuickItem *parent) :
+    QQuickContainer(*(new QQuickStackViewPrivate), parent)
 {
     setFlag(ItemIsFocusScope);
 }
 
-QQuickAbstractStackView::~QQuickAbstractStackView()
+QQuickStackView::~QQuickStackView()
 {
-    Q_D(QQuickAbstractStackView);
+    Q_D(QQuickStackView);
     if (d->transitioner) {
         d->transitioner->setChangeListener(Q_NULLPTR);
         delete d->transitioner;
@@ -69,7 +69,7 @@ QQuickAbstractStackView::~QQuickAbstractStackView()
     qDeleteAll(d->elements);
 }
 
-QQuickStackAttached *QQuickAbstractStackView::qmlAttachedProperties(QObject *object)
+QQuickStackAttached *QQuickStackView::qmlAttachedProperties(QObject *object)
 {
     QQuickItem *item = qobject_cast<QQuickItem *>(object);
     if (!item) {
@@ -84,9 +84,9 @@ QQuickStackAttached *QQuickAbstractStackView::qmlAttachedProperties(QObject *obj
     \readonly
     This property holds whether a transition is running.
 */
-bool QQuickAbstractStackView::busy() const
+bool QQuickStackView::busy() const
 {
-    Q_D(const QQuickAbstractStackView);
+    Q_D(const QQuickStackView);
     return d->transitioner && !d->transitioner->runningJobs.isEmpty();
 }
 
@@ -95,9 +95,9 @@ bool QQuickAbstractStackView::busy() const
     \readonly
     This property holds the number of items currently pushed onto the stack.
 */
-int QQuickAbstractStackView::depth() const
+int QQuickStackView::depth() const
 {
-    Q_D(const QQuickAbstractStackView);
+    Q_D(const QQuickStackView);
     return d->elements.count();
 }
 
@@ -106,9 +106,9 @@ int QQuickAbstractStackView::depth() const
     \readonly
     This property holds the current top-most item in the stack.
 */
-QQuickItem *QQuickAbstractStackView::currentItem() const
+QQuickItem *QQuickStackView::currentItem() const
 {
-    Q_D(const QQuickAbstractStackView);
+    Q_D(const QQuickStackView);
     return d->currentItem;
 }
 
@@ -121,9 +121,9 @@ QQuickItem *QQuickAbstractStackView::currentItem() const
 
     TODO
 */
-QQuickItem *QQuickAbstractStackView::get(int index, LoadBehavior behavior)
+QQuickItem *QQuickStackView::get(int index, LoadBehavior behavior)
 {
-    Q_D(QQuickAbstractStackView);
+    Q_D(QQuickStackView);
     QQuickStackElement *element = d->elements.value(index);
     if (element) {
         if (behavior == ForceLoad)
@@ -142,9 +142,9 @@ QQuickItem *QQuickAbstractStackView::get(int index, LoadBehavior behavior)
 
     TODO
 */
-QQuickItem *QQuickAbstractStackView::find(const QJSValue &callback, LoadBehavior behavior)
+QQuickItem *QQuickStackView::find(const QJSValue &callback, LoadBehavior behavior)
 {
-    Q_D(QQuickAbstractStackView);
+    Q_D(QQuickStackView);
     QJSValue func(callback);
     QQmlEngine *engine = qmlEngine(this);
     if (!engine || !func.isCallable()) // TODO: warning?
@@ -169,9 +169,9 @@ QQuickItem *QQuickAbstractStackView::find(const QJSValue &callback, LoadBehavior
 
     TODO
 */
-void QQuickAbstractStackView::push(QQmlV4Function *args)
+void QQuickStackView::push(QQmlV4Function *args)
 {
-    Q_D(QQuickAbstractStackView);
+    Q_D(QQuickStackView);
     if (args->length() <= 0) {
         qmlInfo(this) << "push: missing arguments";
         args->setReturnValue(QV4::Encode::null());
@@ -217,9 +217,9 @@ void QQuickAbstractStackView::push(QQmlV4Function *args)
 
     TODO
 */
-void QQuickAbstractStackView::pop(QQmlV4Function *args)
+void QQuickStackView::pop(QQmlV4Function *args)
 {
-    Q_D(QQuickAbstractStackView);
+    Q_D(QQuickStackView);
     int argc = args->length();
     if (d->elements.count() <= 1 || argc > 2) {
         if (argc > 2)
@@ -279,9 +279,9 @@ void QQuickAbstractStackView::pop(QQmlV4Function *args)
 
     TODO
 */
-void QQuickAbstractStackView::replace(QQmlV4Function *args)
+void QQuickStackView::replace(QQmlV4Function *args)
 {
-    Q_D(QQuickAbstractStackView);
+    Q_D(QQuickStackView);
     if (args->length() <= 0) {
         qmlInfo(this) << "replace: missing arguments";
         args->setReturnValue(QV4::Encode::null());
@@ -336,9 +336,9 @@ void QQuickAbstractStackView::replace(QQmlV4Function *args)
 
     TODO
 */
-void QQuickAbstractStackView::clear()
+void QQuickStackView::clear()
 {
-    Q_D(QQuickAbstractStackView);
+    Q_D(QQuickStackView);
     d->setCurrentItem(Q_NULLPTR);
     qDeleteAll(d->elements);
     d->elements.clear();
@@ -352,15 +352,15 @@ void QQuickAbstractStackView::clear()
 
     \sa push()
 */
-QVariant QQuickAbstractStackView::initialItem() const
+QVariant QQuickStackView::initialItem() const
 {
-    Q_D(const QQuickAbstractStackView);
+    Q_D(const QQuickStackView);
     return d->initialItem;
 }
 
-void QQuickAbstractStackView::setInitialItem(const QVariant &item)
+void QQuickStackView::setInitialItem(const QVariant &item)
 {
-    Q_D(QQuickAbstractStackView);
+    Q_D(QQuickStackView);
     d->initialItem = item;
 }
 
@@ -369,17 +369,17 @@ void QQuickAbstractStackView::setInitialItem(const QVariant &item)
 
     TODO
 */
-QQuickTransition *QQuickAbstractStackView::popEnter() const
+QQuickTransition *QQuickStackView::popEnter() const
 {
-    Q_D(const QQuickAbstractStackView);
+    Q_D(const QQuickStackView);
     if (d->transitioner)
         return d->transitioner->removeDisplacedTransition;
     return Q_NULLPTR;
 }
 
-void QQuickAbstractStackView::setPopEnter(QQuickTransition *enter)
+void QQuickStackView::setPopEnter(QQuickTransition *enter)
 {
-    Q_D(QQuickAbstractStackView);
+    Q_D(QQuickStackView);
     d->ensureTransitioner();
     if (d->transitioner->removeDisplacedTransition != enter) {
         d->transitioner->removeDisplacedTransition = enter;
@@ -392,17 +392,17 @@ void QQuickAbstractStackView::setPopEnter(QQuickTransition *enter)
 
     TODO
 */
-QQuickTransition *QQuickAbstractStackView::popExit() const
+QQuickTransition *QQuickStackView::popExit() const
 {
-    Q_D(const QQuickAbstractStackView);
+    Q_D(const QQuickStackView);
     if (d->transitioner)
         return d->transitioner->removeTransition;
     return Q_NULLPTR;
 }
 
-void QQuickAbstractStackView::setPopExit(QQuickTransition *exit)
+void QQuickStackView::setPopExit(QQuickTransition *exit)
 {
-    Q_D(QQuickAbstractStackView);
+    Q_D(QQuickStackView);
     d->ensureTransitioner();
     if (d->transitioner->removeTransition != exit) {
         d->transitioner->removeTransition = exit;
@@ -415,17 +415,17 @@ void QQuickAbstractStackView::setPopExit(QQuickTransition *exit)
 
     TODO
 */
-QQuickTransition *QQuickAbstractStackView::pushEnter() const
+QQuickTransition *QQuickStackView::pushEnter() const
 {
-    Q_D(const QQuickAbstractStackView);
+    Q_D(const QQuickStackView);
     if (d->transitioner)
         return d->transitioner->addTransition;
     return Q_NULLPTR;
 }
 
-void QQuickAbstractStackView::setPushEnter(QQuickTransition *enter)
+void QQuickStackView::setPushEnter(QQuickTransition *enter)
 {
-    Q_D(QQuickAbstractStackView);
+    Q_D(QQuickStackView);
     d->ensureTransitioner();
     if (d->transitioner->addTransition != enter) {
         d->transitioner->addTransition = enter;
@@ -438,17 +438,17 @@ void QQuickAbstractStackView::setPushEnter(QQuickTransition *enter)
 
     TODO
 */
-QQuickTransition *QQuickAbstractStackView::pushExit() const
+QQuickTransition *QQuickStackView::pushExit() const
 {
-    Q_D(const QQuickAbstractStackView);
+    Q_D(const QQuickStackView);
     if (d->transitioner)
         return d->transitioner->addDisplacedTransition;
     return Q_NULLPTR;
 }
 
-void QQuickAbstractStackView::setPushExit(QQuickTransition *exit)
+void QQuickStackView::setPushExit(QQuickTransition *exit)
 {
-    Q_D(QQuickAbstractStackView);
+    Q_D(QQuickStackView);
     d->ensureTransitioner();
     if (d->transitioner->addDisplacedTransition != exit) {
         d->transitioner->addDisplacedTransition = exit;
@@ -456,11 +456,11 @@ void QQuickAbstractStackView::setPushExit(QQuickTransition *exit)
     }
 }
 
-void QQuickAbstractStackView::componentComplete()
+void QQuickStackView::componentComplete()
 {
-    QQuickAbstractContainer::componentComplete();
+    QQuickContainer::componentComplete();
 
-    Q_D(QQuickAbstractStackView);
+    Q_D(QQuickStackView);
     QQuickStackElement *element = Q_NULLPTR;
     if (QObject *o = d->initialItem.value<QObject *>())
         element = QQuickStackElement::fromObject(o, this);
@@ -472,11 +472,11 @@ void QQuickAbstractStackView::componentComplete()
     }
 }
 
-void QQuickAbstractStackView::geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry)
+void QQuickStackView::geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry)
 {
-    QQuickAbstractContainer::geometryChanged(newGeometry, oldGeometry);
+    QQuickContainer::geometryChanged(newGeometry, oldGeometry);
 
-    Q_D(QQuickAbstractStackView);
+    Q_D(QQuickStackView);
     foreach (QQuickStackElement *element, d->elements) {
         if (element->item) {
             QQuickItemPrivate *p = QQuickItemPrivate::get(element->item);
@@ -496,9 +496,9 @@ void QQuickStackAttachedPrivate::init()
 {
     QQuickItem *item = qobject_cast<QQuickItem *>(parent);
     if (item) {
-        QQuickAbstractStackView *view = qobject_cast<QQuickAbstractStackView *>(item->parentItem());
+        QQuickStackView *view = qobject_cast<QQuickStackView *>(item->parentItem());
         if (view) {
-            element = QQuickAbstractStackViewPrivate::get(view)->findElement(item);
+            element = QQuickStackViewPrivate::get(view)->findElement(item);
             if (element)
                 initialized = true;
         }
@@ -509,13 +509,13 @@ void QQuickStackAttachedPrivate::reset()
 {
     Q_Q(QQuickStackAttached);
     int oldIndex = element ? element->index : -1;
-    QQuickAbstractStackView::Status oldStatus = element ? element->status : QQuickAbstractStackView::Inactive;
+    QQuickStackView::Status oldStatus = element ? element->status : QQuickStackView::Inactive;
 
     element = Q_NULLPTR;
 
     if (oldIndex != -1)
         emit q->indexChanged();
-    if (oldStatus != QQuickAbstractStackView::Inactive)
+    if (oldStatus != QQuickStackView::Inactive)
         emit q->statusChanged();
 }
 
@@ -542,12 +542,12 @@ int QQuickStackAttached::index() const
 
     TODO
 */
-QQuickAbstractStackView::Status QQuickStackAttached::status() const
+QQuickStackView::Status QQuickStackAttached::status() const
 {
     Q_D(const QQuickStackAttached);
     if (!d->initialized)
         const_cast<QQuickStackAttachedPrivate *>(d)->init();
-    return d->element ? d->element->status : QQuickAbstractStackView::Inactive;
+    return d->element ? d->element->status : QQuickStackView::Inactive;
 }
 
 QT_END_NAMESPACE
diff --git a/src/controls/qquickabstractstackview_p.cpp b/src/controls/qquickstackview_p.cpp
index 76061461..f2dfff52 100644
--- a/src/controls/qquickabstractstackview_p.cpp
+++ b/src/controls/qquickstackview_p.cpp
@@ -34,7 +34,7 @@
 **
 ****************************************************************************/
 
-#include "qquickabstractstackview_p_p.h"
+#include "qquickstackview_p_p.h"
 
 #include <QtQml/qqmllist.h>
 #include <QtQml/qqmlengine.h>
@@ -49,7 +49,7 @@ QT_BEGIN_NAMESPACE
 
 static QQuickStackAttached *attachedStackObject(QQuickItem *item)
 {
-    return qobject_cast<QQuickStackAttached *>(qmlAttachedPropertiesObject<QQuickAbstractStackView>(item, false));
+    return qobject_cast<QQuickStackAttached *>(qmlAttachedPropertiesObject<QQuickStackView>(item, false));
 }
 
 class QQuickStackIncubator : public QQmlIncubator
@@ -67,7 +67,7 @@ private:
 QQuickStackElement::QQuickStackElement() : QQuickItemViewTransitionableItem(Q_NULLPTR),
     index(-1), removal(false), ownItem(false), ownComponent(false),
     context(Q_NULLPTR), component(Q_NULLPTR), incubator(Q_NULLPTR), view(Q_NULLPTR),
-    status(QQuickAbstractStackView::Inactive)
+    status(QQuickStackView::Inactive)
 {
 }
 
@@ -97,7 +97,7 @@ QQuickStackElement::~QQuickStackElement()
     delete incubator;
 }
 
-QQuickStackElement *QQuickStackElement::fromString(const QString &str, QQuickAbstractStackView *view)
+QQuickStackElement *QQuickStackElement::fromString(const QString &str, QQuickStackView *view)
 {
     QQuickStackElement *element = new QQuickStackElement;
     element->component = new QQmlComponent(qmlEngine(view), QUrl(str), view);
@@ -105,7 +105,7 @@ QQuickStackElement *QQuickStackElement::fromString(const QString &str, QQuickAbs
     return element;
 }
 
-QQuickStackElement *QQuickStackElement::fromObject(QObject *object, QQuickAbstractStackView *view)
+QQuickStackElement *QQuickStackElement::fromObject(QObject *object, QQuickStackView *view)
 {
     QQuickStackElement *element = new QQuickStackElement;
     element->component = qobject_cast<QQmlComponent *>(object);
@@ -122,7 +122,7 @@ QQuickStackElement *QQuickStackElement::fromObject(QObject *object, QQuickAbstra
     return element;
 }
 
-bool QQuickStackElement::load(QQuickAbstractStackView *parent)
+bool QQuickStackElement::load(QQuickStackView *parent)
 {
     view = parent;
     if (!item) {
@@ -186,7 +186,7 @@ void QQuickStackElement::setIndex(int value)
     }
 }
 
-void QQuickStackElement::setStatus(QQuickAbstractStackView::Status value)
+void QQuickStackElement::setStatus(QQuickStackView::Status value)
 {
     if (status != value) {
         status = value;
@@ -225,13 +225,13 @@ void QQuickStackElement::itemDestroyed(QQuickItem *)
     item = Q_NULLPTR;
 }
 
-QQuickAbstractStackViewPrivate::QQuickAbstractStackViewPrivate() : currentItem(Q_NULLPTR), transitioner(Q_NULLPTR)
+QQuickStackViewPrivate::QQuickStackViewPrivate() : currentItem(Q_NULLPTR), transitioner(Q_NULLPTR)
 {
 }
 
-void QQuickAbstractStackViewPrivate::setCurrentItem(QQuickItem *item)
+void QQuickStackViewPrivate::setCurrentItem(QQuickItem *item)
 {
-    Q_Q(QQuickAbstractStackView);
+    Q_Q(QQuickStackView);
     if (currentItem != item) {
         currentItem = item;
         if (item)
@@ -254,7 +254,7 @@ static bool initProperties(QQuickStackElement *element, const QV4::Value &props,
     return false;
 }
 
-QList<QQuickStackElement *> QQuickAbstractStackViewPrivate::parseElements(QQmlV4Function *args, int from)
+QList<QQuickStackElement *> QQuickStackViewPrivate::parseElements(QQmlV4Function *args, int from)
 {
     QV4::ExecutionEngine *v4 = args->v4engine();
     QV4::Scope scope(v4);
@@ -293,7 +293,7 @@ QList<QQuickStackElement *> QQuickAbstractStackViewPrivate::parseElements(QQmlV4
     return elements;
 }
 
-QQuickStackElement *QQuickAbstractStackViewPrivate::findElement(QQuickItem *item) const
+QQuickStackElement *QQuickStackViewPrivate::findElement(QQuickItem *item) const
 {
     if (item) {
         foreach (QQuickStackElement *e, elements) {
@@ -304,16 +304,16 @@ QQuickStackElement *QQuickAbstractStackViewPrivate::findElement(QQuickItem *item
     return Q_NULLPTR;
 }
 
-QQuickStackElement *QQuickAbstractStackViewPrivate::findElement(const QV4::Value &value) const
+QQuickStackElement *QQuickStackViewPrivate::findElement(const QV4::Value &value) const
 {
     if (const QV4::QObjectWrapper *o = value.as<QV4::QObjectWrapper>())
         return findElement(qobject_cast<QQuickItem *>(o->object()));
     return Q_NULLPTR;
 }
 
-QQuickStackElement *QQuickAbstractStackViewPrivate::createElement(const QV4::Value &value)
+QQuickStackElement *QQuickStackViewPrivate::createElement(const QV4::Value &value)
 {
-    Q_Q(QQuickAbstractStackView);
+    Q_Q(QQuickStackView);
     if (QV4::String *s = value.asString())
         return QQuickStackElement::fromString(s->toQString(), q);
     if (const QV4::QObjectWrapper *o = value.as<QV4::QObjectWrapper>())
@@ -321,9 +321,9 @@ QQuickStackElement *QQuickAbstractStackViewPrivate::createElement(const QV4::Val
     return Q_NULLPTR;
 }
 
-bool QQuickAbstractStackViewPrivate::pushElements(const QList<QQuickStackElement *> &elems)
+bool QQuickStackViewPrivate::pushElements(const QList<QQuickStackElement *> &elems)
 {
-    Q_Q(QQuickAbstractStackView);
+    Q_Q(QQuickStackView);
     if (!elems.isEmpty()) {
         foreach (QQuickStackElement *e, elems) {
             e->setIndex(elements.count());
@@ -334,16 +334,16 @@ bool QQuickAbstractStackViewPrivate::pushElements(const QList<QQuickStackElement
     return false;
 }
 
-bool QQuickAbstractStackViewPrivate::pushElement(QQuickStackElement *element)
+bool QQuickStackViewPrivate::pushElement(QQuickStackElement *element)
 {
     if (element)
         return pushElements(QList<QQuickStackElement *>() << element);
     return false;
 }
 
-bool QQuickAbstractStackViewPrivate::popElements(QQuickStackElement *element)
+bool QQuickStackViewPrivate::popElements(QQuickStackElement *element)
 {
-    Q_Q(QQuickAbstractStackView);
+    Q_Q(QQuickStackView);
     if (elements.count() > 1) {
         while (elements.count() > 1 && elements.top() != element) {
             delete elements.pop();
@@ -354,7 +354,7 @@ bool QQuickAbstractStackViewPrivate::popElements(QQuickStackElement *element)
     return elements.top()->load(q);
 }
 
-bool QQuickAbstractStackViewPrivate::replaceElements(QQuickStackElement *target, const QList<QQuickStackElement *> &elems)
+bool QQuickStackViewPrivate::replaceElements(QQuickStackElement *target, const QList<QQuickStackElement *> &elems)
 {
     if (target) {
         while (!elements.isEmpty()) {
@@ -367,7 +367,7 @@ bool QQuickAbstractStackViewPrivate::replaceElements(QQuickStackElement *target,
     return pushElements(elems);
 }
 
-void QQuickAbstractStackViewPrivate::ensureTransitioner()
+void QQuickStackViewPrivate::ensureTransitioner()
 {
     if (!transitioner) {
         transitioner = new QQuickItemViewTransitioner;
@@ -375,15 +375,15 @@ void QQuickAbstractStackViewPrivate::ensureTransitioner()
     }
 }
 
-void QQuickAbstractStackViewPrivate::popTransition(QQuickStackElement *enter, QQuickStackElement *exit, const QRectF &viewBounds, bool immediate)
+void QQuickStackViewPrivate::popTransition(QQuickStackElement *enter, QQuickStackElement *exit, const QRectF &viewBounds, bool immediate)
 {
-    Q_Q(QQuickAbstractStackView);
+    Q_Q(QQuickStackView);
     if (exit) {
-        exit->setStatus(QQuickAbstractStackView::Deactivating);
+        exit->setStatus(QQuickStackView::Deactivating);
         exit->transitionNextReposition(transitioner, QQuickItemViewTransitioner::RemoveTransition, true);
     }
     if (enter) {
-        enter->setStatus(QQuickAbstractStackView::Activating);
+        enter->setStatus(QQuickStackView::Activating);
         enter->transitionNextReposition(transitioner, QQuickItemViewTransitioner::RemoveTransition, false);
     }
 
@@ -407,15 +407,15 @@ void QQuickAbstractStackViewPrivate::popTransition(QQuickStackElement *enter, QQ
         transitioner->resetTargetLists();
 }
 
-void QQuickAbstractStackViewPrivate::pushTransition(QQuickStackElement *enter, QQuickStackElement *exit, const QRectF &viewBounds, bool immediate)
+void QQuickStackViewPrivate::pushTransition(QQuickStackElement *enter, QQuickStackElement *exit, const QRectF &viewBounds, bool immediate)
 {
-    Q_Q(QQuickAbstractStackView);
+    Q_Q(QQuickStackView);
     if (enter) {
-        enter->setStatus(QQuickAbstractStackView::Activating);
+        enter->setStatus(QQuickStackView::Activating);
         enter->transitionNextReposition(transitioner, QQuickItemViewTransitioner::AddTransition, true);
     }
     if (exit) {
-        exit->setStatus(QQuickAbstractStackView::Deactivating);
+        exit->setStatus(QQuickStackView::Deactivating);
         exit->transitionNextReposition(transitioner, QQuickItemViewTransitioner::AddTransition, false);
     }
 
@@ -439,16 +439,16 @@ void QQuickAbstractStackViewPrivate::pushTransition(QQuickStackElement *enter, Q
         transitioner->resetTargetLists();
 }
 
-void QQuickAbstractStackViewPrivate::replaceTransition(QQuickStackElement *enter, QQuickStackElement *exit, const QRectF &viewBounds, bool immediate)
+void QQuickStackViewPrivate::replaceTransition(QQuickStackElement *enter, QQuickStackElement *exit, const QRectF &viewBounds, bool immediate)
 {
-    Q_Q(QQuickAbstractStackView);
+    Q_Q(QQuickStackView);
     if (enter) {
-        enter->setStatus(QQuickAbstractStackView::Activating);
+        enter->setStatus(QQuickStackView::Activating);
         enter->transitionNextReposition(transitioner, QQuickItemViewTransitioner::AddTransition, true);
     }
     if (exit) {
         exit->removal = true;
-        exit->setStatus(QQuickAbstractStackView::Deactivating);
+        exit->setStatus(QQuickStackView::Deactivating);
         exit->transitionNextReposition(transitioner, QQuickItemViewTransitioner::AddTransition, false);
     }
 
@@ -472,7 +472,7 @@ void QQuickAbstractStackViewPrivate::replaceTransition(QQuickStackElement *enter
         transitioner->resetTargetLists();
 }
 
-void QQuickAbstractStackViewPrivate::completeTransition(QQuickStackElement *element, QQuickTransition *transition)
+void QQuickStackViewPrivate::completeTransition(QQuickStackElement *element, QQuickTransition *transition)
 {
     if (transition) {
         // TODO: add a proper way to complete a transition
@@ -486,15 +486,15 @@ void QQuickAbstractStackViewPrivate::completeTransition(QQuickStackElement *elem
     }
 }
 
-void QQuickAbstractStackViewPrivate::viewItemTransitionFinished(QQuickItemViewTransitionableItem *transitionable)
+void QQuickStackViewPrivate::viewItemTransitionFinished(QQuickItemViewTransitionableItem *transitionable)
 {
-    Q_Q(QQuickAbstractStackView);
+    Q_Q(QQuickStackView);
 
     QQuickStackElement *element = static_cast<QQuickStackElement *>(transitionable);
-    if (element->status == QQuickAbstractStackView::Activating) {
-        element->setStatus(QQuickAbstractStackView::Active);
-    } else if (element->status == QQuickAbstractStackView::Deactivating) {
-        element->setStatus(QQuickAbstractStackView::Inactive);
+    if (element->status == QQuickStackView::Activating) {
+        element->setStatus(QQuickStackView::Active);
+    } else if (element->status == QQuickStackView::Deactivating) {
+        element->setStatus(QQuickStackView::Inactive);
         element->item->setVisible(false);
         if (element->removal || element->isPendingRemoval())
             delete element;
diff --git a/src/controls/qquickabstractstackview_p.h b/src/controls/qquickstackview_p.h
index d15a7be4..377af3c8 100644
--- a/src/controls/qquickabstractstackview_p.h
+++ b/src/controls/qquickstackview_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QQUICKABSTRACTSTACKVIEW_P_H
-#define QQUICKABSTRACTSTACKVIEW_P_H
+#ifndef QQUICKSTACKVIEW_P_H
+#define QQUICKSTACKVIEW_P_H
 
 //
 //  W A R N I N G
@@ -48,7 +48,7 @@
 // We mean it.
 //
 
-#include <QtQuickControls/private/qquickabstractcontainer_p.h>
+#include <QtQuickControls/private/qquickcontainer_p.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -56,9 +56,9 @@ class QQmlV4Function;
 class QQuickTransition;
 class QQuickStackElement;
 class QQuickStackAttached;
-class QQuickAbstractStackViewPrivate;
+class QQuickStackViewPrivate;
 
-class Q_QUICKCONTROLS_EXPORT QQuickAbstractStackView : public QQuickAbstractContainer
+class Q_QUICKCONTROLS_EXPORT QQuickStackView : public QQuickContainer
 {
     Q_OBJECT
     Q_PROPERTY(bool busy READ busy NOTIFY busyChanged FINAL)
@@ -71,8 +71,8 @@ class Q_QUICKCONTROLS_EXPORT QQuickAbstractStackView : public QQuickAbstractCont
     Q_PROPERTY(QQuickTransition *pushExit READ pushExit WRITE setPushExit NOTIFY pushExitChanged FINAL)
 
 public:
-    explicit QQuickAbstractStackView(QQuickItem *parent = Q_NULLPTR);
-    ~QQuickAbstractStackView();
+    explicit QQuickStackView(QQuickItem *parent = Q_NULLPTR);
+    ~QQuickStackView();
 
     static QQuickStackAttached *qmlAttachedProperties(QObject *object);
 
@@ -139,8 +139,8 @@ protected:
     void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) Q_DECL_OVERRIDE;
 
 private:
-    Q_DISABLE_COPY(QQuickAbstractStackView)
-    Q_DECLARE_PRIVATE(QQuickAbstractStackView)
+    Q_DISABLE_COPY(QQuickStackView)
+    Q_DECLARE_PRIVATE(QQuickStackView)
 };
 
 class QQuickStackAttachedPrivate;
@@ -149,13 +149,13 @@ class Q_QUICKCONTROLS_EXPORT QQuickStackAttached : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(int index READ index NOTIFY indexChanged FINAL)
-    Q_PROPERTY(QQuickAbstractStackView::Status status READ status NOTIFY statusChanged FINAL)
+    Q_PROPERTY(QQuickStackView::Status status READ status NOTIFY statusChanged FINAL)
 
 public:
     explicit QQuickStackAttached(QQuickItem *parent = Q_NULLPTR);
 
     int index() const;
-    QQuickAbstractStackView::Status status() const;
+    QQuickStackView::Status status() const;
 
 Q_SIGNALS:
     void indexChanged();
@@ -168,7 +168,7 @@ private:
 
 QT_END_NAMESPACE
 
-QML_DECLARE_TYPEINFO(QQuickAbstractStackView, QML_HAS_ATTACHED_PROPERTIES)
-QML_DECLARE_TYPE(QQuickAbstractStackView)
+QML_DECLARE_TYPEINFO(QQuickStackView, QML_HAS_ATTACHED_PROPERTIES)
+QML_DECLARE_TYPE(QQuickStackView)
 
-#endif // QQUICKABSTRACTSTACKVIEW_P_H
+#endif // QQUICKSTACKVIEW_P_H
diff --git a/src/controls/qquickabstractstackview_p_p.h b/src/controls/qquickstackview_p_p.h
index 5cda34f9..6a07e972 100644
--- a/src/controls/qquickabstractstackview_p_p.h
+++ b/src/controls/qquickstackview_p_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QQUICKABSTRACTSTACKVIEW_P_P_H
-#define QQUICKABSTRACTSTACKVIEW_P_P_H
+#ifndef QQUICKSTACKVIEW_P_P_H
+#define QQUICKSTACKVIEW_P_P_H
 
 //
 //  W A R N I N G
@@ -48,8 +48,8 @@
 // We mean it.
 //
 
-#include <QtQuickControls/private/qquickabstractstackview_p.h>
-#include <QtQuickControls/private/qquickabstractcontainer_p_p.h>
+#include <QtQuickControls/private/qquickstackview_p.h>
+#include <QtQuickControls/private/qquickcontainer_p_p.h>
 #include <QtQuick/private/qquickitemviewtransition_p.h>
 #include <QtQuick/private/qquickitemchangelistener_p.h>
 #include <QtQml/private/qv4persistent_p.h>
@@ -67,15 +67,15 @@ class QQuickStackElement : public QQuickItemViewTransitionableItem, public QQuic
 public:
     ~QQuickStackElement();
 
-    static QQuickStackElement *fromString(const QString &str, QQuickAbstractStackView *view);
-    static QQuickStackElement *fromObject(QObject *object, QQuickAbstractStackView *view);
+    static QQuickStackElement *fromString(const QString &str, QQuickStackView *view);
+    static QQuickStackElement *fromObject(QObject *object, QQuickStackView *view);
 
-    bool load(QQuickAbstractStackView *parent);
+    bool load(QQuickStackView *parent);
     void initItem(QObject *object);
     void initProperties();
 
     void setIndex(int index);
-    void setStatus(QQuickAbstractStackView::Status status);
+    void setStatus(QQuickStackView::Status status);
 
     void transitionNextReposition(QQuickItemViewTransitioner *transitioner, QQuickItemViewTransitioner::TransitionType type, bool asTarget);
     bool prepareTransition(QQuickItemViewTransitioner *transitioner, const QRectF &viewBounds);
@@ -90,21 +90,21 @@ public:
     QQmlContext *context;
     QQmlComponent *component;
     QQmlIncubator *incubator;
-    QQuickAbstractStackView *view;
+    QQuickStackView *view;
     QPointer<QQuickItem> originalParent;
-    QQuickAbstractStackView::Status status;
+    QQuickStackView::Status status;
     QV4::PersistentValue properties;
     QV4::PersistentValue qmlGlobal;
 };
 
-class QQuickAbstractStackViewPrivate : public QQuickAbstractContainerPrivate, public QQuickItemViewTransitionChangeListener
+class QQuickStackViewPrivate : public QQuickContainerPrivate, public QQuickItemViewTransitionChangeListener
 {
-    Q_DECLARE_PUBLIC(QQuickAbstractStackView)
+    Q_DECLARE_PUBLIC(QQuickStackView)
 
 public:
-    QQuickAbstractStackViewPrivate();
+    QQuickStackViewPrivate();
 
-    static QQuickAbstractStackViewPrivate *get(QQuickAbstractStackView *view)
+    static QQuickStackViewPrivate *get(QQuickStackView *view)
     {
         return view->d_func();
     }
@@ -155,4 +155,4 @@ public:
 
 QT_END_NAMESPACE
 
-#endif // QQUICKABSTRACTSTACKVIEW_P_P_H
+#endif // QQUICKSTACKVIEW_P_P_H
diff --git a/src/controls/qquickabstractswitch.cpp b/src/controls/qquickswitch.cpp
index 0251a887..8f970c9b 100644
--- a/src/controls/qquickabstractswitch.cpp
+++ b/src/controls/qquickswitch.cpp
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#include "qquickabstractswitch_p.h"
-#include "qquickabstractcheckable_p_p.h"
+#include "qquickswitch_p.h"
+#include "qquickcheckable_p_p.h"
 
 #include <QtQuick/private/qquickwindow_p.h>
 
@@ -44,7 +44,7 @@ QT_BEGIN_NAMESPACE
 /*!
     \qmltype Switch
     \inherits Checkable
-    \instantiates QQuickAbstractSwitch
+    \instantiates QQuickSwitch
     \inqmlmodule QtQuick.Controls
     \ingroup buttons
     \brief A switch control.
@@ -52,12 +52,12 @@ QT_BEGIN_NAMESPACE
     TODO
 */
 
-class QQuickAbstractSwitchPrivate : public QQuickAbstractCheckablePrivate
+class QQuickSwitchPrivate : public QQuickCheckablePrivate
 {
-    Q_DECLARE_PUBLIC(QQuickAbstractSwitch)
+    Q_DECLARE_PUBLIC(QQuickSwitch)
 
 public:
-    QQuickAbstractSwitchPrivate() : position(0) { }
+    QQuickSwitchPrivate() : position(0) { }
 
     void updatePosition();
 
@@ -65,17 +65,17 @@ public:
     QPoint pressPoint;
 };
 
-void QQuickAbstractSwitchPrivate::updatePosition()
+void QQuickSwitchPrivate::updatePosition()
 {
-    Q_Q(QQuickAbstractSwitch);
+    Q_Q(QQuickSwitch);
     q->setPosition(checked ? 1.0 : 0.0);
 }
 
-QQuickAbstractSwitch::QQuickAbstractSwitch(QQuickItem *parent) :
-    QQuickAbstractCheckable(*(new QQuickAbstractSwitchPrivate), parent)
+QQuickSwitch::QQuickSwitch(QQuickItem *parent) :
+    QQuickCheckable(*(new QQuickSwitchPrivate), parent)
 {
     setFiltersChildMouseEvents(true);
-    QObjectPrivate::connect(this, &QQuickAbstractCheckable::checkedChanged, d_func(), &QQuickAbstractSwitchPrivate::updatePosition);
+    QObjectPrivate::connect(this, &QQuickCheckable::checkedChanged, d_func(), &QQuickSwitchPrivate::updatePosition);
 }
 
 /*!
@@ -83,15 +83,15 @@ QQuickAbstractSwitch::QQuickAbstractSwitch(QQuickItem *parent) :
 
     TODO
 */
-qreal QQuickAbstractSwitch::position() const
+qreal QQuickSwitch::position() const
 {
-    Q_D(const QQuickAbstractSwitch);
+    Q_D(const QQuickSwitch);
     return d->position;
 }
 
-void QQuickAbstractSwitch::setPosition(qreal position)
+void QQuickSwitch::setPosition(qreal position)
 {
-    Q_D(QQuickAbstractSwitch);
+    Q_D(QQuickSwitch);
     position = qBound(0.0, position, 1.0);
     if (d->position != position) {
         d->position = position;
@@ -105,21 +105,21 @@ void QQuickAbstractSwitch::setPosition(qreal position)
 
     TODO
 */
-qreal QQuickAbstractSwitch::visualPosition() const
+qreal QQuickSwitch::visualPosition() const
 {
-    Q_D(const QQuickAbstractSwitch);
+    Q_D(const QQuickSwitch);
     if (isMirrored())
         return 1.0 - d->position;
     return d->position;
 }
 
-void QQuickAbstractSwitch::mirrorChange()
+void QQuickSwitch::mirrorChange()
 {
-    QQuickAbstractCheckable::mirrorChange();
+    QQuickCheckable::mirrorChange();
     emit visualPositionChanged();
 }
 
-bool QQuickAbstractSwitch::childMouseEventFilter(QQuickItem *child, QEvent *event)
+bool QQuickSwitch::childMouseEventFilter(QQuickItem *child, QEvent *event)
 {
     if (child == indicator()) {
         switch (event->type()) {
@@ -138,9 +138,9 @@ bool QQuickAbstractSwitch::childMouseEventFilter(QQuickItem *child, QEvent *even
     return false;
 }
 
-bool QQuickAbstractSwitch::handleMousePressEvent(QQuickItem *child, QMouseEvent *event)
+bool QQuickSwitch::handleMousePressEvent(QQuickItem *child, QMouseEvent *event)
 {
-    Q_D(QQuickAbstractSwitch);
+    Q_D(QQuickSwitch);
     Q_UNUSED(child);
     d->pressPoint = event->pos();
     setPressed(true);
@@ -148,9 +148,9 @@ bool QQuickAbstractSwitch::handleMousePressEvent(QQuickItem *child, QMouseEvent
     return true;
 }
 
-bool QQuickAbstractSwitch::handleMouseMoveEvent(QQuickItem *child, QMouseEvent *event)
+bool QQuickSwitch::handleMouseMoveEvent(QQuickItem *child, QMouseEvent *event)
 {
-    Q_D(QQuickAbstractSwitch);
+    Q_D(QQuickSwitch);
     if (!child->keepMouseGrab())
         child->setKeepMouseGrab(QQuickWindowPrivate::dragOverThreshold(event->pos().x() - d->pressPoint.x(), Qt::XAxis, event));
     if (child->keepMouseGrab()) {
@@ -160,9 +160,9 @@ bool QQuickAbstractSwitch::handleMouseMoveEvent(QQuickItem *child, QMouseEvent *
     return true;
 }
 
-bool QQuickAbstractSwitch::handleMouseReleaseEvent(QQuickItem *child, QMouseEvent *event)
+bool QQuickSwitch::handleMouseReleaseEvent(QQuickItem *child, QMouseEvent *event)
 {
-    Q_D(QQuickAbstractSwitch);
+    Q_D(QQuickSwitch);
     d->pressPoint = QPoint();
     setPressed(false);
     if (child->keepMouseGrab()) {
@@ -177,9 +177,9 @@ bool QQuickAbstractSwitch::handleMouseReleaseEvent(QQuickItem *child, QMouseEven
     return true;
 }
 
-bool QQuickAbstractSwitch::handleMouseUngrabEvent(QQuickItem *child)
+bool QQuickSwitch::handleMouseUngrabEvent(QQuickItem *child)
 {
-    Q_D(QQuickAbstractSwitch);
+    Q_D(QQuickSwitch);
     Q_UNUSED(child);
     d->pressPoint = QPoint();
     setChecked(position() > 0.5);
@@ -188,7 +188,7 @@ bool QQuickAbstractSwitch::handleMouseUngrabEvent(QQuickItem *child)
     return true;
 }
 
-qreal QQuickAbstractSwitch::positionAt(const QPoint &point) const
+qreal QQuickSwitch::positionAt(const QPoint &point) const
 {
     qreal pos = point.x() / indicator()->width();
     if (isMirrored())
diff --git a/src/controls/qquickabstractswitch_p.h b/src/controls/qquickswitch_p.h
index 1ca7a196..9c930967 100644
--- a/src/controls/qquickabstractswitch_p.h
+++ b/src/controls/qquickswitch_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QQUICKABSTRACTSWITCH_P_H
-#define QQUICKABSTRACTSWITCH_P_H
+#ifndef QQUICKSWITCH_P_H
+#define QQUICKSWITCH_P_H
 
 //
 //  W A R N I N G
@@ -48,20 +48,20 @@
 // We mean it.
 //
 
-#include <QtQuickControls/private/qquickabstractcheckable_p.h>
+#include <QtQuickControls/private/qquickcheckable_p.h>
 
 QT_BEGIN_NAMESPACE
 
-class QQuickAbstractSwitchPrivate;
+class QQuickSwitchPrivate;
 
-class Q_QUICKCONTROLS_EXPORT QQuickAbstractSwitch : public QQuickAbstractCheckable
+class Q_QUICKCONTROLS_EXPORT QQuickSwitch : public QQuickCheckable
 {
     Q_OBJECT
     Q_PROPERTY(qreal position READ position WRITE setPosition NOTIFY positionChanged FINAL)
     Q_PROPERTY(qreal visualPosition READ visualPosition NOTIFY visualPositionChanged FINAL)
 
 public:
-    explicit QQuickAbstractSwitch(QQuickItem *parent = Q_NULLPTR);
+    explicit QQuickSwitch(QQuickItem *parent = Q_NULLPTR);
 
     qreal position() const;
     void setPosition(qreal position);
@@ -84,10 +84,10 @@ protected:
     virtual qreal positionAt(const QPoint &point) const;
 
 private:
-    Q_DISABLE_COPY(QQuickAbstractSwitch)
-    Q_DECLARE_PRIVATE(QQuickAbstractSwitch)
+    Q_DISABLE_COPY(QQuickSwitch)
+    Q_DECLARE_PRIVATE(QQuickSwitch)
 };
 
 QT_END_NAMESPACE
 
-#endif // QQUICKABSTRACTSWITCH_P_H
+#endif // QQUICKSWITCH_P_H
diff --git a/src/controls/qquickabstracttabbar.cpp b/src/controls/qquicktabbar.cpp
index 2917a3b7..340c2701 100644
--- a/src/controls/qquickabstracttabbar.cpp
+++ b/src/controls/qquicktabbar.cpp
@@ -34,15 +34,15 @@
 **
 ****************************************************************************/
 
-#include "qquickabstracttabbar_p.h"
-#include "qquickabstractcontainer_p_p.h"
+#include "qquicktabbar_p.h"
+#include "qquickcontainer_p_p.h"
 
 QT_BEGIN_NAMESPACE
 
 /*!
     \qmltype TabBar
     \inherits Container
-    \instantiates QQuickAbstractTabBar
+    \instantiates QQuickTabBar
     \inqmlmodule QtQuick.Controls
     \ingroup tabs
     \brief A tab bar control.
@@ -50,16 +50,16 @@ QT_BEGIN_NAMESPACE
     TODO
 */
 
-class QQuickAbstractTabBarPrivate : public QQuickAbstractContainerPrivate
+class QQuickTabBarPrivate : public QQuickContainerPrivate
 {
 public:
-    QQuickAbstractTabBarPrivate() : currentIndex(0) { }
+    QQuickTabBarPrivate() : currentIndex(0) { }
 
     int currentIndex;
 };
 
-QQuickAbstractTabBar::QQuickAbstractTabBar(QQuickItem *parent) :
-    QQuickAbstractContainer(*(new QQuickAbstractTabBarPrivate), parent)
+QQuickTabBar::QQuickTabBar(QQuickItem *parent) :
+    QQuickContainer(*(new QQuickTabBarPrivate), parent)
 {
     setFlag(ItemIsFocusScope);
     setActiveFocusOnTab(true);
@@ -70,15 +70,15 @@ QQuickAbstractTabBar::QQuickAbstractTabBar(QQuickItem *parent) :
 
     TODO
 */
-int QQuickAbstractTabBar::currentIndex() const
+int QQuickTabBar::currentIndex() const
 {
-    Q_D(const QQuickAbstractTabBar);
+    Q_D(const QQuickTabBar);
     return d->currentIndex;
 }
 
-void QQuickAbstractTabBar::setCurrentIndex(int index)
+void QQuickTabBar::setCurrentIndex(int index)
 {
-    Q_D(QQuickAbstractTabBar);
+    Q_D(QQuickTabBar);
     if (d->currentIndex != index) {
         d->currentIndex = index;
         emit currentIndexChanged(index);
diff --git a/src/controls/qquickabstracttabbar_p.h b/src/controls/qquicktabbar_p.h
index 1781986f..aee165a9 100644
--- a/src/controls/qquickabstracttabbar_p.h
+++ b/src/controls/qquicktabbar_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QQUICKABSTRACTTABBAR_P_H
-#define QQUICKABSTRACTTABBAR_P_H
+#ifndef QQUICKTABBAR_P_H
+#define QQUICKTABBAR_P_H
 
 //
 //  W A R N I N G
@@ -48,19 +48,19 @@
 // We mean it.
 //
 
-#include <QtQuickControls/private/qquickabstractcontainer_p.h>
+#include <QtQuickControls/private/qquickcontainer_p.h>
 
 QT_BEGIN_NAMESPACE
 
-class QQuickAbstractTabBarPrivate;
+class QQuickTabBarPrivate;
 
-class Q_QUICKCONTROLS_EXPORT QQuickAbstractTabBar : public QQuickAbstractContainer
+class Q_QUICKCONTROLS_EXPORT QQuickTabBar : public QQuickContainer
 {
     Q_OBJECT
     Q_PROPERTY(int currentIndex READ currentIndex WRITE setCurrentIndex NOTIFY currentIndexChanged FINAL)
 
 public:
-    explicit QQuickAbstractTabBar(QQuickItem *parent = Q_NULLPTR);
+    explicit QQuickTabBar(QQuickItem *parent = Q_NULLPTR);
 
     int currentIndex() const;
 
@@ -71,11 +71,11 @@ Q_SIGNALS:
     void currentIndexChanged(int index);
 
 private:
-    Q_DISABLE_COPY(QQuickAbstractTabBar)
-    Q_DECLARE_PRIVATE(QQuickAbstractTabBar)
-    friend class QQuickAbstractTabView;
+    Q_DISABLE_COPY(QQuickTabBar)
+    Q_DECLARE_PRIVATE(QQuickTabBar)
+    friend class QQuickTabView;
 };
 
 QT_END_NAMESPACE
 
-#endif // QQUICKABSTRACTTABBAR_P_H
+#endif // QQUICKTABBAR_P_H
diff --git a/src/controls/qquickabstracttabbutton.cpp b/src/controls/qquicktabbutton.cpp
index df2b2c92..62a556af 100644
--- a/src/controls/qquickabstracttabbutton.cpp
+++ b/src/controls/qquicktabbutton.cpp
@@ -34,14 +34,14 @@
 **
 ****************************************************************************/
 
-#include "qquickabstracttabbutton_p.h"
+#include "qquicktabbutton_p.h"
 
 QT_BEGIN_NAMESPACE
 
 /*!
     \qmltype TabButton
     \inherits Checkable
-    \instantiates QQuickAbstractTabButton
+    \instantiates QQuickTabButton
     \inqmlmodule QtQuick.Controls
     \ingroup tabs
     \brief A tab button control.
@@ -49,8 +49,8 @@ QT_BEGIN_NAMESPACE
     TODO
 */
 
-QQuickAbstractTabButton::QQuickAbstractTabButton(QQuickItem *parent) :
-    QQuickAbstractCheckable(parent)
+QQuickTabButton::QQuickTabButton(QQuickItem *parent) :
+    QQuickCheckable(parent)
 {
     setExclusive(true);
 }
diff --git a/src/controls/qquickabstracttabbutton_p.h b/src/controls/qquicktabbutton_p.h
index 8aa5b75e..e62d8f63 100644
--- a/src/controls/qquickabstracttabbutton_p.h
+++ b/src/controls/qquicktabbutton_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QQUICKABSTRACTTABBUTTON_P_H
-#define QQUICKABSTRACTTABBUTTON_P_H
+#ifndef QQUICKTABBUTTON_P_H
+#define QQUICKTABBUTTON_P_H
 
 //
 //  W A R N I N G
@@ -48,18 +48,18 @@
 // We mean it.
 //
 
-#include <QtQuickControls/private/qquickabstractcheckable_p.h>
+#include <QtQuickControls/private/qquickcheckable_p.h>
 
 QT_BEGIN_NAMESPACE
 
-class Q_QUICKCONTROLS_EXPORT QQuickAbstractTabButton : public QQuickAbstractCheckable
+class Q_QUICKCONTROLS_EXPORT QQuickTabButton : public QQuickCheckable
 {
     Q_OBJECT
 
 public:
-    explicit QQuickAbstractTabButton(QQuickItem *parent = Q_NULLPTR);
+    explicit QQuickTabButton(QQuickItem *parent = Q_NULLPTR);
 };
 
 QT_END_NAMESPACE
 
-#endif // QQUICKABSTRACTTABBUTTON_P_H
+#endif // QQUICKTABBUTTON_P_H
diff --git a/src/controls/qquickabstracttabview.cpp b/src/controls/qquicktabview.cpp
index 8a0aa7ac..3a79a725 100644
--- a/src/controls/qquickabstracttabview.cpp
+++ b/src/controls/qquicktabview.cpp
@@ -34,16 +34,16 @@
 **
 ****************************************************************************/
 
-#include "qquickabstracttabview_p.h"
-#include "qquickabstracttabbar_p.h"
-#include "qquickabstractcontainer_p_p.h"
+#include "qquicktabview_p.h"
+#include "qquicktabbar_p.h"
+#include "qquickcontainer_p_p.h"
 
 QT_BEGIN_NAMESPACE
 
 /*!
     \qmltype TabView
     \inherits Container
-    \instantiates QQuickAbstractTabView
+    \instantiates QQuickTabView
     \inqmlmodule QtQuick.Controls
     \ingroup tabs
     \brief A tab view control.
@@ -51,17 +51,17 @@ QT_BEGIN_NAMESPACE
     TODO
 */
 
-class QQuickAbstractTabViewPrivate : public QQuickAbstractContainerPrivate
+class QQuickTabViewPrivate : public QQuickContainerPrivate
 {
 public:
-    QQuickAbstractTabViewPrivate() : currentIndex(0), bar(Q_NULLPTR) { }
+    QQuickTabViewPrivate() : currentIndex(0), bar(Q_NULLPTR) { }
 
     int currentIndex;
-    QQuickAbstractTabBar *bar;
+    QQuickTabBar *bar;
 };
 
-QQuickAbstractTabView::QQuickAbstractTabView(QQuickItem *parent) :
-    QQuickAbstractContainer(*(new QQuickAbstractTabViewPrivate), parent)
+QQuickTabView::QQuickTabView(QQuickItem *parent) :
+    QQuickContainer(*(new QQuickTabViewPrivate), parent)
 {
     setFlag(ItemIsFocusScope);
     setActiveFocusOnTab(true);
@@ -72,15 +72,15 @@ QQuickAbstractTabView::QQuickAbstractTabView(QQuickItem *parent) :
 
     TODO
 */
-int QQuickAbstractTabView::currentIndex() const
+int QQuickTabView::currentIndex() const
 {
-    Q_D(const QQuickAbstractTabView);
+    Q_D(const QQuickTabView);
     return d->currentIndex;
 }
 
-void QQuickAbstractTabView::setCurrentIndex(int index)
+void QQuickTabView::setCurrentIndex(int index)
 {
-    Q_D(QQuickAbstractTabView);
+    Q_D(QQuickTabView);
     if (d->currentIndex != index) {
         d->currentIndex = index;
         emit currentIndexChanged(index);
@@ -92,26 +92,26 @@ void QQuickAbstractTabView::setCurrentIndex(int index)
 
     TODO
 */
-QQuickAbstractTabBar *QQuickAbstractTabView::tabBar() const
+QQuickTabBar *QQuickTabView::tabBar() const
 {
-    Q_D(const QQuickAbstractTabView);
+    Q_D(const QQuickTabView);
     return d->bar;
 }
 
-void QQuickAbstractTabView::setTabBar(QQuickAbstractTabBar *bar)
+void QQuickTabView::setTabBar(QQuickTabBar *bar)
 {
-    Q_D(QQuickAbstractTabView);
+    Q_D(QQuickTabView);
     if (d->bar != bar) {
         if (d->bar) {
-            disconnect(this, &QQuickAbstractTabView::currentIndexChanged, d->bar, &QQuickAbstractTabBar::setCurrentIndex);
-            disconnect(d->bar, &QQuickAbstractTabBar::currentIndexChanged, this, &QQuickAbstractTabView::setCurrentIndex);
+            disconnect(this, &QQuickTabView::currentIndexChanged, d->bar, &QQuickTabBar::setCurrentIndex);
+            disconnect(d->bar, &QQuickTabBar::currentIndexChanged, this, &QQuickTabView::setCurrentIndex);
             if (d->bar->parentItem() == this)
                 delete d->bar;
         }
         d->bar = bar;
         if (bar) {
-            connect(this, &QQuickAbstractTabView::currentIndexChanged, d->bar, &QQuickAbstractTabBar::setCurrentIndex);
-            connect(bar, &QQuickAbstractTabBar::currentIndexChanged, this, &QQuickAbstractTabView::setCurrentIndex);
+            connect(this, &QQuickTabView::currentIndexChanged, d->bar, &QQuickTabBar::setCurrentIndex);
+            connect(bar, &QQuickTabBar::currentIndexChanged, this, &QQuickTabView::setCurrentIndex);
             if (!bar->parentItem())
                 bar->setParentItem(this);
 
@@ -127,9 +127,9 @@ void QQuickAbstractTabView::setTabBar(QQuickAbstractTabBar *bar)
     }
 }
 
-void QQuickAbstractTabView::geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry)
+void QQuickTabView::geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry)
 {
-    Q_D(QQuickAbstractTabView);
+    Q_D(QQuickTabView);
     QQuickControl::geometryChanged(newGeometry, oldGeometry);
     if (d->bar) {
         QQuickItemPrivate *p = QQuickItemPrivate::get(d->bar);
@@ -220,12 +220,12 @@ void QQuickTabAttached::setVisible(bool visible)
 
     TODO
 */
-QQuickAbstractTabView *QQuickTabAttached::view() const
+QQuickTabView *QQuickTabAttached::view() const
 {
     return m_view;
 }
 
-void QQuickTabAttached::setView(QQuickAbstractTabView *view)
+void QQuickTabAttached::setView(QQuickTabView *view)
 {
     if (m_view != view) {
         m_view = view;
diff --git a/src/controls/qquickabstracttabview_p.h b/src/controls/qquicktabview_p.h
index a068529d..2b2b00b2 100644
--- a/src/controls/qquickabstracttabview_p.h
+++ b/src/controls/qquicktabview_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QQUICKABSTRACTTABVIEW_P_H
-#define QQUICKABSTRACTTABVIEW_P_H
+#ifndef QQUICKTABVIEW_P_H
+#define QQUICKTABVIEW_P_H
 
 //
 //  W A R N I N G
@@ -48,26 +48,26 @@
 // We mean it.
 //
 
-#include <QtQuickControls/private/qquickabstractcontainer_p.h>
+#include <QtQuickControls/private/qquickcontainer_p.h>
 
 QT_BEGIN_NAMESPACE
 
-class QQuickAbstractTabBar;
-class QQuickAbstractTabViewPrivate;
+class QQuickTabBar;
+class QQuickTabViewPrivate;
 
-class Q_QUICKCONTROLS_EXPORT QQuickAbstractTabView : public QQuickAbstractContainer
+class Q_QUICKCONTROLS_EXPORT QQuickTabView : public QQuickContainer
 {
     Q_OBJECT
     Q_PROPERTY(int currentIndex READ currentIndex WRITE setCurrentIndex NOTIFY currentIndexChanged FINAL)
-    Q_PROPERTY(QQuickAbstractTabBar *tabBar READ tabBar WRITE setTabBar NOTIFY tabBarChanged FINAL)
+    Q_PROPERTY(QQuickTabBar *tabBar READ tabBar WRITE setTabBar NOTIFY tabBarChanged FINAL)
 
 public:
-    explicit QQuickAbstractTabView(QQuickItem *parent = Q_NULLPTR);
+    explicit QQuickTabView(QQuickItem *parent = Q_NULLPTR);
 
     int currentIndex() const;
 
-    QQuickAbstractTabBar *tabBar() const;
-    void setTabBar(QQuickAbstractTabBar *bar);
+    QQuickTabBar *tabBar() const;
+    void setTabBar(QQuickTabBar *bar);
 
 public Q_SLOTS:
     void setCurrentIndex(int index);
@@ -80,8 +80,8 @@ protected:
     void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) Q_DECL_OVERRIDE;
 
 private:
-    Q_DISABLE_COPY(QQuickAbstractTabView)
-    Q_DECLARE_PRIVATE(QQuickAbstractTabView)
+    Q_DISABLE_COPY(QQuickTabView)
+    Q_DECLARE_PRIVATE(QQuickTabView)
 };
 
 class Q_QUICKCONTROLS_EXPORT QQuickTabAttached : public QObject
@@ -90,7 +90,7 @@ class Q_QUICKCONTROLS_EXPORT QQuickTabAttached : public QObject
     Q_PROPERTY(int index READ index WRITE setIndex NOTIFY indexChanged FINAL)
     Q_PROPERTY(QString title READ title WRITE setTitle NOTIFY titleChanged FINAL)
     Q_PROPERTY(bool visible READ isVisible WRITE setVisible NOTIFY visibleChanged FINAL)
-    Q_PROPERTY(QQuickAbstractTabView *view READ view WRITE setView NOTIFY viewChanged FINAL)
+    Q_PROPERTY(QQuickTabView *view READ view WRITE setView NOTIFY viewChanged FINAL)
 
 public:
     explicit QQuickTabAttached(QObject *parent = Q_NULLPTR);
@@ -106,8 +106,8 @@ public:
     bool isVisible() const;
     void setVisible(bool visible);
 
-    QQuickAbstractTabView *view() const;
-    void setView(QQuickAbstractTabView *view);
+    QQuickTabView *view() const;
+    void setView(QQuickTabView *view);
 
 Q_SIGNALS:
     void indexChanged();
@@ -119,11 +119,11 @@ private:
     int m_index;
     bool m_visible;
     QString m_title;
-    QQuickAbstractTabView *m_view;
+    QQuickTabView *m_view;
 };
 
 QT_END_NAMESPACE
 
 QML_DECLARE_TYPEINFO(QQuickTabAttached, QML_HAS_ATTACHED_PROPERTIES)
 
-#endif // QQUICKABSTRACTTABVIEW_P_H
+#endif // QQUICKTABVIEW_P_H
diff --git a/src/controls/qquickabstracttextarea.cpp b/src/controls/qquicktextarea.cpp
index f2ab95bf..92c2d268 100644
--- a/src/controls/qquickabstracttextarea.cpp
+++ b/src/controls/qquicktextarea.cpp
@@ -34,7 +34,7 @@
 **
 ****************************************************************************/
 
-#include "qquickabstracttextarea_p.h"
+#include "qquicktextarea_p.h"
 
 #include <QtQuick/private/qquickitem_p.h>
 #include <QtQuick/private/qquicktext_p.h>
@@ -42,38 +42,38 @@
 
 QT_BEGIN_NAMESPACE
 
-class QQuickAbstractTextAreaPrivate
+class QQuickTextAreaPrivate
 {
-    Q_DECLARE_PUBLIC(QQuickAbstractTextArea)
+    Q_DECLARE_PUBLIC(QQuickTextArea)
 
 public:
-    QQuickAbstractTextAreaPrivate() : background(Q_NULLPTR), placeholder(Q_NULLPTR) { }
+    QQuickTextAreaPrivate() : background(Q_NULLPTR), placeholder(Q_NULLPTR) { }
 
     QQuickItem *background;
     QQuickText *placeholder;
-    QQuickAbstractTextArea *q_ptr;
+    QQuickTextArea *q_ptr;
 };
 
-QQuickAbstractTextArea::QQuickAbstractTextArea(QQuickItem *parent) :
-    QQuickTextEdit(parent), d_ptr(new QQuickAbstractTextAreaPrivate)
+QQuickTextArea::QQuickTextArea(QQuickItem *parent) :
+    QQuickTextEdit(parent), d_ptr(new QQuickTextAreaPrivate)
 {
-    Q_D(QQuickAbstractTextArea);
+    Q_D(QQuickTextArea);
     d->q_ptr = this;
 }
 
-QQuickAbstractTextArea::~QQuickAbstractTextArea()
+QQuickTextArea::~QQuickTextArea()
 {
 }
 
-QQuickItem *QQuickAbstractTextArea::background() const
+QQuickItem *QQuickTextArea::background() const
 {
-    Q_D(const QQuickAbstractTextArea);
+    Q_D(const QQuickTextArea);
     return d->background;
 }
 
-void QQuickAbstractTextArea::setBackground(QQuickItem *background)
+void QQuickTextArea::setBackground(QQuickItem *background)
 {
-    Q_D(QQuickAbstractTextArea);
+    Q_D(QQuickTextArea);
     if (d->background != background) {
         delete d->background;
         d->background = background;
@@ -86,15 +86,15 @@ void QQuickAbstractTextArea::setBackground(QQuickItem *background)
     }
 }
 
-QQuickText *QQuickAbstractTextArea::placeholder() const
+QQuickText *QQuickTextArea::placeholder() const
 {
-    Q_D(const QQuickAbstractTextArea);
+    Q_D(const QQuickTextArea);
     return d->placeholder;
 }
 
-void QQuickAbstractTextArea::setPlaceholder(QQuickText *placeholder)
+void QQuickTextArea::setPlaceholder(QQuickText *placeholder)
 {
-    Q_D(QQuickAbstractTextArea);
+    Q_D(QQuickTextArea);
     if (d->placeholder != placeholder) {
         delete d->placeholder;
         d->placeholder = placeholder;
@@ -104,9 +104,9 @@ void QQuickAbstractTextArea::setPlaceholder(QQuickText *placeholder)
     }
 }
 
-void QQuickAbstractTextArea::geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry)
+void QQuickTextArea::geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry)
 {
-    Q_D(QQuickAbstractTextArea);
+    Q_D(QQuickTextArea);
     QQuickTextEdit::geometryChanged(newGeometry, oldGeometry);
     if (d->background) {
         QQuickItemPrivate *p = QQuickItemPrivate::get(d->background);
@@ -121,7 +121,7 @@ void QQuickAbstractTextArea::geometryChanged(const QRectF &newGeometry, const QR
     }
 }
 
-QSGNode *QQuickAbstractTextArea::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *data)
+QSGNode *QQuickTextArea::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *data)
 {
     QQuickDefaultClipNode *clipNode = static_cast<QQuickDefaultClipNode *>(oldNode);
     if (!clipNode)
diff --git a/src/controls/qquickabstracttextarea_p.h b/src/controls/qquicktextarea_p.h
index 24e76d29..ee51525b 100644
--- a/src/controls/qquickabstracttextarea_p.h
+++ b/src/controls/qquicktextarea_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QQUICKABSTRACTTEXTAREA_P_H
-#define QQUICKABSTRACTTEXTAREA_P_H
+#ifndef QQUICKTEXTAREA_P_H
+#define QQUICKTEXTAREA_P_H
 
 //
 //  W A R N I N G
@@ -54,17 +54,17 @@
 QT_BEGIN_NAMESPACE
 
 class QQuickText;
-class QQuickAbstractTextAreaPrivate;
+class QQuickTextAreaPrivate;
 
-class Q_QUICKCONTROLS_EXPORT QQuickAbstractTextArea : public QQuickTextEdit
+class Q_QUICKCONTROLS_EXPORT QQuickTextArea : public QQuickTextEdit
 {
     Q_OBJECT
     Q_PROPERTY(QQuickItem *background READ background WRITE setBackground NOTIFY backgroundChanged FINAL)
     Q_PROPERTY(QQuickText *placeholder READ placeholder WRITE setPlaceholder NOTIFY placeholderChanged FINAL)
 
 public:
-    explicit QQuickAbstractTextArea(QQuickItem *parent = Q_NULLPTR);
-    ~QQuickAbstractTextArea();
+    explicit QQuickTextArea(QQuickItem *parent = Q_NULLPTR);
+    ~QQuickTextArea();
 
     QQuickItem *background() const;
     void setBackground(QQuickItem *background);
@@ -81,11 +81,11 @@ protected:
     QSGNode *updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *data) Q_DECL_OVERRIDE;
 
 private:
-    Q_DISABLE_COPY(QQuickAbstractTextArea)
-    Q_DECLARE_PRIVATE(QQuickAbstractTextArea)
-    QScopedPointer<QQuickAbstractTextAreaPrivate> d_ptr;
+    Q_DISABLE_COPY(QQuickTextArea)
+    Q_DECLARE_PRIVATE(QQuickTextArea)
+    QScopedPointer<QQuickTextAreaPrivate> d_ptr;
 };
 
 QT_END_NAMESPACE
 
-#endif // QQUICKABSTRACTTEXTAREA_P_H
+#endif // QQUICKTEXTAREA_P_H
diff --git a/src/controls/qquickabstracttextfield.cpp b/src/controls/qquicktextfield.cpp
index b7b35a5d..0d85fa05 100644
--- a/src/controls/qquickabstracttextfield.cpp
+++ b/src/controls/qquicktextfield.cpp
@@ -34,7 +34,7 @@
 **
 ****************************************************************************/
 
-#include "qquickabstracttextfield_p.h"
+#include "qquicktextfield_p.h"
 
 #include <QtQuick/private/qquickitem_p.h>
 #include <QtQuick/private/qquicktext_p.h>
@@ -42,38 +42,38 @@
 
 QT_BEGIN_NAMESPACE
 
-class QQuickAbstractTextFieldPrivate
+class QQuickTextFieldPrivate
 {
-    Q_DECLARE_PUBLIC(QQuickAbstractTextField)
+    Q_DECLARE_PUBLIC(QQuickTextField)
 
 public:
-    QQuickAbstractTextFieldPrivate() : background(Q_NULLPTR), placeholder(Q_NULLPTR) { }
+    QQuickTextFieldPrivate() : background(Q_NULLPTR), placeholder(Q_NULLPTR) { }
 
     QQuickItem *background;
     QQuickText *placeholder;
-    QQuickAbstractTextField *q_ptr;
+    QQuickTextField *q_ptr;
 };
 
-QQuickAbstractTextField::QQuickAbstractTextField(QQuickItem *parent) :
-    QQuickTextInput(parent), d_ptr(new QQuickAbstractTextFieldPrivate)
+QQuickTextField::QQuickTextField(QQuickItem *parent) :
+    QQuickTextInput(parent), d_ptr(new QQuickTextFieldPrivate)
 {
-    Q_D(QQuickAbstractTextField);
+    Q_D(QQuickTextField);
     d->q_ptr = this;
 }
 
-QQuickAbstractTextField::~QQuickAbstractTextField()
+QQuickTextField::~QQuickTextField()
 {
 }
 
-QQuickItem *QQuickAbstractTextField::background() const
+QQuickItem *QQuickTextField::background() const
 {
-    Q_D(const QQuickAbstractTextField);
+    Q_D(const QQuickTextField);
     return d->background;
 }
 
-void QQuickAbstractTextField::setBackground(QQuickItem *background)
+void QQuickTextField::setBackground(QQuickItem *background)
 {
-    Q_D(QQuickAbstractTextField);
+    Q_D(QQuickTextField);
     if (d->background != background) {
         delete d->background;
         d->background = background;
@@ -86,15 +86,15 @@ void QQuickAbstractTextField::setBackground(QQuickItem *background)
     }
 }
 
-QQuickText *QQuickAbstractTextField::placeholder() const
+QQuickText *QQuickTextField::placeholder() const
 {
-    Q_D(const QQuickAbstractTextField);
+    Q_D(const QQuickTextField);
     return d->placeholder;
 }
 
-void QQuickAbstractTextField::setPlaceholder(QQuickText *placeholder)
+void QQuickTextField::setPlaceholder(QQuickText *placeholder)
 {
-    Q_D(QQuickAbstractTextField);
+    Q_D(QQuickTextField);
     if (d->placeholder != placeholder) {
         delete d->placeholder;
         d->placeholder = placeholder;
@@ -104,9 +104,9 @@ void QQuickAbstractTextField::setPlaceholder(QQuickText *placeholder)
     }
 }
 
-void QQuickAbstractTextField::geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry)
+void QQuickTextField::geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry)
 {
-    Q_D(QQuickAbstractTextField);
+    Q_D(QQuickTextField);
     QQuickTextInput::geometryChanged(newGeometry, oldGeometry);
     if (d->background) {
         QQuickItemPrivate *p = QQuickItemPrivate::get(d->background);
@@ -121,7 +121,7 @@ void QQuickAbstractTextField::geometryChanged(const QRectF &newGeometry, const Q
     }
 }
 
-QSGNode *QQuickAbstractTextField::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *data)
+QSGNode *QQuickTextField::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *data)
 {
     QQuickDefaultClipNode *clipNode = static_cast<QQuickDefaultClipNode *>(oldNode);
     if (!clipNode)
diff --git a/src/controls/qquickabstracttextfield_p.h b/src/controls/qquicktextfield_p.h
index 248c6a55..899e9054 100644
--- a/src/controls/qquickabstracttextfield_p.h
+++ b/src/controls/qquicktextfield_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QQUICKABSTRACTTEXTFIELD_P_H
-#define QQUICKABSTRACTTEXTFIELD_P_H
+#ifndef QQUICKTEXTFIELD_P_H
+#define QQUICKTEXTFIELD_P_H
 
 //
 //  W A R N I N G
@@ -54,17 +54,17 @@
 QT_BEGIN_NAMESPACE
 
 class QQuickText;
-class QQuickAbstractTextFieldPrivate;
+class QQuickTextFieldPrivate;
 
-class Q_QUICKCONTROLS_EXPORT QQuickAbstractTextField : public QQuickTextInput
+class Q_QUICKCONTROLS_EXPORT QQuickTextField : public QQuickTextInput
 {
     Q_OBJECT
     Q_PROPERTY(QQuickItem *background READ background WRITE setBackground NOTIFY backgroundChanged FINAL)
     Q_PROPERTY(QQuickText *placeholder READ placeholder WRITE setPlaceholder NOTIFY placeholderChanged FINAL)
 
 public:
-    explicit QQuickAbstractTextField(QQuickItem *parent = Q_NULLPTR);
-    ~QQuickAbstractTextField();
+    explicit QQuickTextField(QQuickItem *parent = Q_NULLPTR);
+    ~QQuickTextField();
 
     QQuickItem *background() const;
     void setBackground(QQuickItem *background);
@@ -81,11 +81,11 @@ protected:
     QSGNode *updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *data) Q_DECL_OVERRIDE;
 
 private:
-    Q_DISABLE_COPY(QQuickAbstractTextField)
-    Q_DECLARE_PRIVATE(QQuickAbstractTextField)
-    QScopedPointer<QQuickAbstractTextFieldPrivate> d_ptr;
+    Q_DISABLE_COPY(QQuickTextField)
+    Q_DECLARE_PRIVATE(QQuickTextField)
+    QScopedPointer<QQuickTextFieldPrivate> d_ptr;
 };
 
 QT_END_NAMESPACE
 
-#endif // QQUICKABSTRACTTEXTFIELD_P_H
+#endif // QQUICKTEXTFIELD_P_H
diff --git a/src/controls/qquickabstracttogglebutton.cpp b/src/controls/qquicktogglebutton.cpp
index 663817e0..40ea2e02 100644
--- a/src/controls/qquickabstracttogglebutton.cpp
+++ b/src/controls/qquicktogglebutton.cpp
@@ -34,14 +34,14 @@
 **
 ****************************************************************************/
 
-#include "qquickabstracttogglebutton_p.h"
+#include "qquicktogglebutton_p.h"
 
 QT_BEGIN_NAMESPACE
 
 /*!
     \qmltype ToggleButton
     \inherits Checkable
-    \instantiates QQuickAbstractToggleButton
+    \instantiates QQuickToggleButton
     \inqmlmodule QtQuick.Controls
     \ingroup buttons
     \brief A toggle button control.
@@ -49,8 +49,8 @@ QT_BEGIN_NAMESPACE
     TODO
 */
 
-QQuickAbstractToggleButton::QQuickAbstractToggleButton(QQuickItem *parent) :
-    QQuickAbstractSwitch(parent)
+QQuickToggleButton::QQuickToggleButton(QQuickItem *parent) :
+    QQuickSwitch(parent)
 {
 }
 
diff --git a/src/controls/qquicktogglebutton_p.h b/src/controls/qquicktogglebutton_p.h
new file mode 100644
index 00000000..a315033e
--- /dev/null
+++ b/src/controls/qquicktogglebutton_p.h
@@ -0,0 +1,65 @@
+/****************************************************************************
+**
+** Copyright (C) 2015 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the Qt Quick Controls module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL3$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPLv3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or later 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 2.0 requirements will be
+** met: http://www.gnu.org/licenses/gpl-2.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QQUICKTOGGLEBUTTON_P_H
+#define QQUICKTOGGLEBUTTON_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include <QtQuickControls/private/qquickswitch_p.h>
+
+QT_BEGIN_NAMESPACE
+
+class Q_QUICKCONTROLS_EXPORT QQuickToggleButton : public QQuickSwitch
+{
+    Q_OBJECT
+
+public:
+    explicit QQuickToggleButton(QQuickItem *parent = Q_NULLPTR);
+};
+
+QT_END_NAMESPACE
+
+#endif // QQUICKTOGGLEBUTTON_P_H
diff --git a/src/controls/qquickabstracttoolbar.cpp b/src/controls/qquicktoolbar.cpp
index 29119be0..90959ba9 100644
--- a/src/controls/qquickabstracttoolbar.cpp
+++ b/src/controls/qquicktoolbar.cpp
@@ -34,14 +34,14 @@
 **
 ****************************************************************************/
 
-#include "qquickabstracttoolbar_p.h"
+#include "qquicktoolbar_p.h"
 
 QT_BEGIN_NAMESPACE
 
 /*!
     \qmltype ToolBar
     \inherits Container
-    \instantiates QQuickAbstractToolBar
+    \instantiates QQuickToolBar
     \inqmlmodule QtQuick.Controls
     \ingroup containers
     \brief A tool bar control.
@@ -49,8 +49,8 @@ QT_BEGIN_NAMESPACE
     TODO
 */
 
-QQuickAbstractToolBar::QQuickAbstractToolBar(QQuickItem *parent) :
-    QQuickAbstractContainer(parent)
+QQuickToolBar::QQuickToolBar(QQuickItem *parent) :
+    QQuickContainer(parent)
 {
 }
 
diff --git a/src/controls/qquicktoolbar_p.h b/src/controls/qquicktoolbar_p.h
new file mode 100644
index 00000000..50352186
--- /dev/null
+++ b/src/controls/qquicktoolbar_p.h
@@ -0,0 +1,65 @@
+/****************************************************************************
+**
+** Copyright (C) 2015 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the Qt Quick Controls module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL3$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPLv3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or later 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 2.0 requirements will be
+** met: http://www.gnu.org/licenses/gpl-2.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QQUICKTOOLBAR_P_H
+#define QQUICKTOOLBAR_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include <QtQuickControls/private/qquickcontainer_p.h>
+
+QT_BEGIN_NAMESPACE
+
+class Q_QUICKCONTROLS_EXPORT QQuickToolBar : public QQuickContainer
+{
+    Q_OBJECT
+
+public:
+    explicit QQuickToolBar(QQuickItem *parent = Q_NULLPTR);
+};
+
+QT_END_NAMESPACE
+
+#endif // QQUICKTOOLBAR_P_H