166 files changed, 511 insertions, 516 deletions

diff --git a/src/imports/calendar/CalendarView.qml b/src/imports/calendar/CalendarView.qml
index 425f4588..bc245ce2 100644
--- a/src/imports/calendar/CalendarView.qml
+++ b/src/imports/calendar/CalendarView.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import QtQuick 2.6
-import QtQuick.Controls 2.0
+import Qt.labs.controls 1.0
 import Qt.labs.calendar 1.0
 
 AbstractCalendarView {
diff --git a/src/imports/calendar/DayOfWeekRow.qml b/src/imports/calendar/DayOfWeekRow.qml
index 7f8763d0..6146b688 100644
--- a/src/imports/calendar/DayOfWeekRow.qml
+++ b/src/imports/calendar/DayOfWeekRow.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import QtQuick 2.6
-import QtQuick.Controls 2.0
+import Qt.labs.controls 1.0
 import Qt.labs.calendar 1.0
 
 AbstractDayOfWeekRow {
diff --git a/src/imports/calendar/WeekNumberColumn.qml b/src/imports/calendar/WeekNumberColumn.qml
index 27d70636..d5552956 100644
--- a/src/imports/calendar/WeekNumberColumn.qml
+++ b/src/imports/calendar/WeekNumberColumn.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import QtQuick 2.6
-import QtQuick.Controls 2.0
+import Qt.labs.controls 1.0
 import Qt.labs.calendar 1.0
 
 AbstractWeekNumberColumn {
diff --git a/src/imports/controls/ApplicationWindow.qml b/src/imports/controls/ApplicationWindow.qml
index 350843da..cb918b84 100644
--- a/src/imports/controls/ApplicationWindow.qml
+++ b/src/imports/controls/ApplicationWindow.qml
@@ -3,7 +3,7 @@
 ** 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.
+** This file is part of the Qt Labs Controls module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL3$
 ** Commercial License Usage
@@ -36,7 +36,7 @@
 
 import QtQuick 2.6
 import QtQuick.Window 2.2
-import QtQuick.Controls 2.0
+import Qt.labs.controls 1.0
 import Qt.labs.templates 1.0 as T
 
 T.ApplicationWindow {
diff --git a/src/imports/controls/BusyIndicator.qml b/src/imports/controls/BusyIndicator.qml
index e9a57931..60c8df54 100644
--- a/src/imports/controls/BusyIndicator.qml
+++ b/src/imports/controls/BusyIndicator.qml
@@ -3,7 +3,7 @@
 ** 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.
+** This file is part of the Qt Labs Controls module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL3$
 ** Commercial License Usage
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import QtQuick 2.6
-import QtQuick.Controls 2.0
+import Qt.labs.controls 1.0
 import Qt.labs.templates 1.0 as T
 
 T.BusyIndicator {
diff --git a/src/imports/controls/Button.qml b/src/imports/controls/Button.qml
index f475ffe9..ae5f446c 100644
--- a/src/imports/controls/Button.qml
+++ b/src/imports/controls/Button.qml
@@ -3,7 +3,7 @@
 ** 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.
+** This file is part of the Qt Labs Controls module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL3$
 ** Commercial License Usage
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import QtQuick 2.6
-import QtQuick.Controls 2.0
+import Qt.labs.controls 1.0
 import Qt.labs.templates 1.0 as T
 
 T.Button {
diff --git a/src/imports/controls/CheckBox.qml b/src/imports/controls/CheckBox.qml
index ae851ce9..a24e73ae 100644
--- a/src/imports/controls/CheckBox.qml
+++ b/src/imports/controls/CheckBox.qml
@@ -3,7 +3,7 @@
 ** 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.
+** This file is part of the Qt Labs Controls module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL3$
 ** Commercial License Usage
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import QtQuick 2.6
-import QtQuick.Controls 2.0
+import Qt.labs.controls 1.0
 import Qt.labs.templates 1.0 as T
 
 T.CheckBox {
diff --git a/src/imports/controls/Dial.qml b/src/imports/controls/Dial.qml
index 312ac4dc..378a9339 100644
--- a/src/imports/controls/Dial.qml
+++ b/src/imports/controls/Dial.qml
@@ -3,7 +3,7 @@
 ** 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.
+** This file is part of the Qt Labs Controls module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL3$
 ** Commercial License Usage
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import QtQuick 2.6
-import QtQuick.Controls 2.0
+import Qt.labs.controls 1.0
 import Qt.labs.templates 1.0 as T
 
 T.Dial {
diff --git a/src/imports/controls/Drawer.qml b/src/imports/controls/Drawer.qml
index 85f38163..5cf0994a 100644
--- a/src/imports/controls/Drawer.qml
+++ b/src/imports/controls/Drawer.qml
@@ -3,7 +3,7 @@
 ** 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.
+** This file is part of the Qt Labs Controls module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL3$
 ** Commercial License Usage
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import QtQuick 2.6
-import QtQuick.Controls 2.0
+import Qt.labs.controls 1.0
 import Qt.labs.templates 1.0 as T
 
 T.Drawer {
diff --git a/src/imports/controls/Frame.qml b/src/imports/controls/Frame.qml
index fe59e908..2d72acb5 100644
--- a/src/imports/controls/Frame.qml
+++ b/src/imports/controls/Frame.qml
@@ -3,7 +3,7 @@
 ** 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.
+** This file is part of the Qt Labs Controls module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL3$
 ** Commercial License Usage
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import QtQuick 2.6
-import QtQuick.Controls 2.0
+import Qt.labs.controls 1.0
 import Qt.labs.templates 1.0 as T
 
 T.Frame {
diff --git a/src/imports/controls/GroupBox.qml b/src/imports/controls/GroupBox.qml
index d178d86b..c7e93c63 100644
--- a/src/imports/controls/GroupBox.qml
+++ b/src/imports/controls/GroupBox.qml
@@ -3,7 +3,7 @@
 ** 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.
+** This file is part of the Qt Labs Controls module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL3$
 ** Commercial License Usage
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import QtQuick 2.6
-import QtQuick.Controls 2.0
+import Qt.labs.controls 1.0
 import Qt.labs.templates 1.0 as T
 
 T.GroupBox {
diff --git a/src/imports/controls/Label.qml b/src/imports/controls/Label.qml
index 2098e74b..82b2c629 100644
--- a/src/imports/controls/Label.qml
+++ b/src/imports/controls/Label.qml
@@ -3,7 +3,7 @@
 ** 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.
+** This file is part of the Qt Labs Controls module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL3$
 ** Commercial License Usage
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import QtQuick 2.6
-import QtQuick.Controls 2.0
+import Qt.labs.controls 1.0
 import Qt.labs.templates 1.0 as T
 
 T.Label {
diff --git a/src/imports/controls/PageIndicator.qml b/src/imports/controls/PageIndicator.qml
index 86b4356f..445c51d3 100644
--- a/src/imports/controls/PageIndicator.qml
+++ b/src/imports/controls/PageIndicator.qml
@@ -3,7 +3,7 @@
 ** 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.
+** This file is part of the Qt Labs Controls module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL3$
 ** Commercial License Usage
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import QtQuick 2.6
-import QtQuick.Controls 2.0
+import Qt.labs.controls 1.0
 import Qt.labs.templates 1.0 as T
 
 T.PageIndicator {
diff --git a/src/imports/controls/ProgressBar.qml b/src/imports/controls/ProgressBar.qml
index c496dab7..6fb5f515 100644
--- a/src/imports/controls/ProgressBar.qml
+++ b/src/imports/controls/ProgressBar.qml
@@ -3,7 +3,7 @@
 ** 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.
+** This file is part of the Qt Labs Controls module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL3$
 ** Commercial License Usage
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import QtQuick 2.6
-import QtQuick.Controls 2.0
+import Qt.labs.controls 1.0
 import Qt.labs.templates 1.0 as T
 
 T.ProgressBar {
diff --git a/src/imports/controls/RadioButton.qml b/src/imports/controls/RadioButton.qml
index 197c05b3..0c4d0edd 100644
--- a/src/imports/controls/RadioButton.qml
+++ b/src/imports/controls/RadioButton.qml
@@ -3,7 +3,7 @@
 ** 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.
+** This file is part of the Qt Labs Controls module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL3$
 ** Commercial License Usage
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import QtQuick 2.6
-import QtQuick.Controls 2.0
+import Qt.labs.controls 1.0
 import Qt.labs.templates 1.0 as T
 
 T.RadioButton {
diff --git a/src/imports/controls/ScrollBar.qml b/src/imports/controls/ScrollBar.qml
index 8b22b0c2..d1a45a71 100644
--- a/src/imports/controls/ScrollBar.qml
+++ b/src/imports/controls/ScrollBar.qml
@@ -3,7 +3,7 @@
 ** 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.
+** This file is part of the Qt Labs Controls module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL3$
 ** Commercial License Usage
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import QtQuick 2.6
-import QtQuick.Controls 2.0
+import Qt.labs.controls 1.0
 import Qt.labs.templates 1.0 as T
 
 T.ScrollBar {
diff --git a/src/imports/controls/ScrollIndicator.qml b/src/imports/controls/ScrollIndicator.qml
index 87bb8872..8c4fc1d5 100644
--- a/src/imports/controls/ScrollIndicator.qml
+++ b/src/imports/controls/ScrollIndicator.qml
@@ -3,7 +3,7 @@
 ** 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.
+** This file is part of the Qt Labs Controls module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL3$
 ** Commercial License Usage
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import QtQuick 2.6
-import QtQuick.Controls 2.0
+import Qt.labs.controls 1.0
 import Qt.labs.templates 1.0 as T
 
 T.ScrollIndicator {
diff --git a/src/imports/controls/Slider.qml b/src/imports/controls/Slider.qml
index 6a53ab64..c1309d5a 100644
--- a/src/imports/controls/Slider.qml
+++ b/src/imports/controls/Slider.qml
@@ -3,7 +3,7 @@
 ** 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.
+** This file is part of the Qt Labs Controls module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL3$
 ** Commercial License Usage
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import QtQuick 2.6
-import QtQuick.Controls 2.0
+import Qt.labs.controls 1.0
 import Qt.labs.templates 1.0 as T
 
 T.Slider {
diff --git a/src/imports/controls/StackView.qml b/src/imports/controls/StackView.qml
index 99b1b871..1288f8a4 100644
--- a/src/imports/controls/StackView.qml
+++ b/src/imports/controls/StackView.qml
@@ -3,7 +3,7 @@
 ** 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.
+** This file is part of the Qt Labs Controls module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL3$
 ** Commercial License Usage
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import QtQuick 2.4
-import QtQuick.Controls 2.0
+import Qt.labs.controls 1.0
 import Qt.labs.templates 1.0 as T
 
 T.StackView {
diff --git a/src/imports/controls/SwipeView.qml b/src/imports/controls/SwipeView.qml
index ad5504a8..52248961 100644
--- a/src/imports/controls/SwipeView.qml
+++ b/src/imports/controls/SwipeView.qml
@@ -3,7 +3,7 @@
 ** 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.
+** This file is part of the Qt Labs Controls module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL3$
 ** Commercial License Usage
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import QtQuick 2.6
-import QtQuick.Controls 2.0
+import Qt.labs.controls 1.0
 import Qt.labs.templates 1.0 as T
 
 T.SwipeView {
diff --git a/src/imports/controls/Switch.qml b/src/imports/controls/Switch.qml
index 75925d8a..2768c2c7 100644
--- a/src/imports/controls/Switch.qml
+++ b/src/imports/controls/Switch.qml
@@ -3,7 +3,7 @@
 ** 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.
+** This file is part of the Qt Labs Controls module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL3$
 ** Commercial License Usage
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import QtQuick 2.6
-import QtQuick.Controls 2.0
+import Qt.labs.controls 1.0
 import Qt.labs.templates 1.0 as T
 
 T.Switch {
diff --git a/src/imports/controls/TabBar.qml b/src/imports/controls/TabBar.qml
index b0cfcf65..28d6a5db 100644
--- a/src/imports/controls/TabBar.qml
+++ b/src/imports/controls/TabBar.qml
@@ -3,7 +3,7 @@
 ** 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.
+** This file is part of the Qt Labs Controls module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL3$
 ** Commercial License Usage
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import QtQuick 2.6
-import QtQuick.Controls 2.0
+import Qt.labs.controls 1.0
 import Qt.labs.templates 1.0 as T
 
 T.TabBar {
diff --git a/src/imports/controls/TabButton.qml b/src/imports/controls/TabButton.qml
index 9a6a75ca..8bd05114 100644
--- a/src/imports/controls/TabButton.qml
+++ b/src/imports/controls/TabButton.qml
@@ -3,7 +3,7 @@
 ** 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.
+** This file is part of the Qt Labs Controls module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL3$
 ** Commercial License Usage
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import QtQuick 2.6
-import QtQuick.Controls 2.0
+import Qt.labs.controls 1.0
 import Qt.labs.templates 1.0 as T
 
 T.TabButton {
diff --git a/src/imports/controls/TextArea.qml b/src/imports/controls/TextArea.qml
index fbdbc482..e6a50336 100644
--- a/src/imports/controls/TextArea.qml
+++ b/src/imports/controls/TextArea.qml
@@ -3,7 +3,7 @@
 ** 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.
+** This file is part of the Qt Labs Controls module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL3$
 ** Commercial License Usage
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import QtQuick 2.6
-import QtQuick.Controls 2.0
+import Qt.labs.controls 1.0
 import Qt.labs.templates 1.0 as T
 
 T.TextArea {
diff --git a/src/imports/controls/TextField.qml b/src/imports/controls/TextField.qml
index 19f19b24..7a00591f 100644
--- a/src/imports/controls/TextField.qml
+++ b/src/imports/controls/TextField.qml
@@ -3,7 +3,7 @@
 ** 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.
+** This file is part of the Qt Labs Controls module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL3$
 ** Commercial License Usage
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import QtQuick 2.6
-import QtQuick.Controls 2.0
+import Qt.labs.controls 1.0
 import Qt.labs.templates 1.0 as T
 
 T.TextField {
diff --git a/src/imports/controls/ToolBar.qml b/src/imports/controls/ToolBar.qml
index 577a7b8f..be1b5d7a 100644
--- a/src/imports/controls/ToolBar.qml
+++ b/src/imports/controls/ToolBar.qml
@@ -3,7 +3,7 @@
 ** 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.
+** This file is part of the Qt Labs Controls module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL3$
 ** Commercial License Usage
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import QtQuick 2.6
-import QtQuick.Controls 2.0
+import Qt.labs.controls 1.0
 import Qt.labs.templates 1.0 as T
 
 T.ToolBar {
diff --git a/src/imports/controls/ToolButton.qml b/src/imports/controls/ToolButton.qml
index 7fd41ec7..06fdd763 100644
--- a/src/imports/controls/ToolButton.qml
+++ b/src/imports/controls/ToolButton.qml
@@ -3,7 +3,7 @@
 ** 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.
+** This file is part of the Qt Labs Controls module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL3$
 ** Commercial License Usage
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import QtQuick 2.6
-import QtQuick.Controls 2.0
+import Qt.labs.controls 1.0
 import Qt.labs.templates 1.0 as T
 
 T.ToolButton {
diff --git a/src/imports/controls/Tumbler.qml b/src/imports/controls/Tumbler.qml
index 940130fb..51230e98 100644
--- a/src/imports/controls/Tumbler.qml
+++ b/src/imports/controls/Tumbler.qml
@@ -3,7 +3,7 @@
 ** 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.
+** This file is part of the Qt Labs Controls module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL3$
 ** Commercial License Usage
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import QtQuick 2.6
-import QtQuick.Controls 2.0
+import Qt.labs.controls 1.0
 import Qt.labs.templates 1.0 as T
 
 T.Tumbler {
diff --git a/src/imports/controls/controls.pro b/src/imports/controls/controls.pro
index b03aeb08..14e085dd 100644
--- a/src/imports/controls/controls.pro
+++ b/src/imports/controls/controls.pro
@@ -1,20 +1,20 @@
-TARGET  = qtquickcontrols2plugin
-TARGETPATH = QtQuick/Controls.2
-IMPORT_VERSION = 2.0
+TARGET  = qtlabscontrolsplugin
+TARGETPATH = Qt/labs/controls
+IMPORT_VERSION = 1.0
 
 QT += qml quick
 QT += core-private gui-private qml-private quick-private labstemplates-private
 
-QMAKE_DOCS = $$PWD/doc/qtquickcontrols2.qdocconf
+QMAKE_DOCS = $$PWD/doc/qtlabscontrols.qdocconf
 
 OTHER_FILES += \
     qmldir
 
 SOURCES += \
-    $$PWD/qtquickcontrols2plugin.cpp
+    $$PWD/qtlabscontrolsplugin.cpp
 
 RESOURCES += \
-    $$PWD/qtquickcontrols2plugin.qrc
+    $$PWD/qtlabscontrolsplugin.qrc
 
 OTHER_FILES += \
     $$PWD/theme.json
diff --git a/src/imports/controls/designer/BusyIndicatorSpecifics.qml b/src/imports/controls/designer/BusyIndicatorSpecifics.qml
index 6cdc22f9..679377f4 100644
--- a/src/imports/controls/designer/BusyIndicatorSpecifics.qml
+++ b/src/imports/controls/designer/BusyIndicatorSpecifics.qml
@@ -3,7 +3,7 @@
 ** 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.
+** This file is part of the Qt Labs Controls module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL3$
 ** Commercial License Usage
diff --git a/src/imports/controls/designer/ButtonSpecifics.qml b/src/imports/controls/designer/ButtonSpecifics.qml
index ee3324e0..2014abf0 100644
--- a/src/imports/controls/designer/ButtonSpecifics.qml
+++ b/src/imports/controls/designer/ButtonSpecifics.qml
@@ -3,7 +3,7 @@
 ** 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.
+** This file is part of the Qt Labs Controls module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL3$
 ** Commercial License Usage
diff --git a/src/imports/controls/designer/CheckBoxSpecifics.qml b/src/imports/controls/designer/CheckBoxSpecifics.qml
index 7d8c18cf..3082d1f1 100644
--- a/src/imports/controls/designer/CheckBoxSpecifics.qml
+++ b/src/imports/controls/designer/CheckBoxSpecifics.qml
@@ -3,7 +3,7 @@
 ** 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.
+** This file is part of the Qt Labs Controls module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL3$
 ** Commercial License Usage
diff --git a/src/imports/controls/designer/ControlSection.qml b/src/imports/controls/designer/ControlSection.qml
index 441bd16f..e026d620 100644
--- a/src/imports/controls/designer/ControlSection.qml
+++ b/src/imports/controls/designer/ControlSection.qml
@@ -3,7 +3,7 @@
 ** 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.
+** This file is part of the Qt Labs Controls module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL3$
 ** Commercial License Usage
diff --git a/src/imports/controls/designer/ControlSpecifics.qml b/src/imports/controls/designer/ControlSpecifics.qml
index 6eb68d87..80e01cf2 100644
--- a/src/imports/controls/designer/ControlSpecifics.qml
+++ b/src/imports/controls/designer/ControlSpecifics.qml
@@ -3,7 +3,7 @@
 ** 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.
+** This file is part of the Qt Labs Controls module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL3$
 ** Commercial License Usage
diff --git a/src/imports/controls/designer/FrameSpecifics.qml b/src/imports/controls/designer/FrameSpecifics.qml
index 6eb68d87..80e01cf2 100644
--- a/src/imports/controls/designer/FrameSpecifics.qml
+++ b/src/imports/controls/designer/FrameSpecifics.qml
@@ -3,7 +3,7 @@
 ** 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.
+** This file is part of the Qt Labs Controls module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL3$
 ** Commercial License Usage
diff --git a/src/imports/controls/designer/GroupBoxSpecifics.qml b/src/imports/controls/designer/GroupBoxSpecifics.qml
index 16f705f9..6e70adfa 100644
--- a/src/imports/controls/designer/GroupBoxSpecifics.qml
+++ b/src/imports/controls/designer/GroupBoxSpecifics.qml
@@ -3,7 +3,7 @@
 ** 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.
+** This file is part of the Qt Labs Controls module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL3$
 ** Commercial License Usage
diff --git a/src/imports/controls/designer/LabelSpecifics.qml b/src/imports/controls/designer/LabelSpecifics.qml
index 50661185..adee2fac 100644
--- a/src/imports/controls/designer/LabelSpecifics.qml
+++ b/src/imports/controls/designer/LabelSpecifics.qml
@@ -3,7 +3,7 @@
 ** 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.
+** This file is part of the Qt Labs Controls module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL3$
 ** Commercial License Usage
diff --git a/src/imports/controls/designer/PaddingSection.qml b/src/imports/controls/designer/PaddingSection.qml
index 8a83e277..b2c9feb9 100644
--- a/src/imports/controls/designer/PaddingSection.qml
+++ b/src/imports/controls/designer/PaddingSection.qml
@@ -3,7 +3,7 @@
 ** 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.
+** This file is part of the Qt Labs Controls module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL3$
 ** Commercial License Usage
diff --git a/src/imports/controls/designer/PageIndicatorSpecifics.qml b/src/imports/controls/designer/PageIndicatorSpecifics.qml
index cd07354c..0c2e4638 100644
--- a/src/imports/controls/designer/PageIndicatorSpecifics.qml
+++ b/src/imports/controls/designer/PageIndicatorSpecifics.qml
@@ -3,7 +3,7 @@
 ** 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.
+** This file is part of the Qt Labs Controls module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL3$
 ** Commercial License Usage
diff --git a/src/imports/controls/designer/ProgressBarSpecifics.qml b/src/imports/controls/designer/ProgressBarSpecifics.qml
index 9c4cc3ab..a5ad9809 100644
--- a/src/imports/controls/designer/ProgressBarSpecifics.qml
+++ b/src/imports/controls/designer/ProgressBarSpecifics.qml
@@ -3,7 +3,7 @@
 ** 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.
+** This file is part of the Qt Labs Controls module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL3$
 ** Commercial License Usage
diff --git a/src/imports/controls/designer/RadioButtonSpecifics.qml b/src/imports/controls/designer/RadioButtonSpecifics.qml
index 98da1a91..285b660a 100644
--- a/src/imports/controls/designer/RadioButtonSpecifics.qml
+++ b/src/imports/controls/designer/RadioButtonSpecifics.qml
@@ -3,7 +3,7 @@
 ** 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.
+** This file is part of the Qt Labs Controls module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL3$
 ** Commercial License Usage
diff --git a/src/imports/controls/designer/SliderSpecifics.qml b/src/imports/controls/designer/SliderSpecifics.qml
index 814037bf..535ae830 100644
--- a/src/imports/controls/designer/SliderSpecifics.qml
+++ b/src/imports/controls/designer/SliderSpecifics.qml
@@ -3,7 +3,7 @@
 ** 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.
+** This file is part of the Qt Labs Controls module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL3$
 ** Commercial License Usage
diff --git a/src/imports/controls/designer/SwitchSpecifics.qml b/src/imports/controls/designer/SwitchSpecifics.qml
index 7b632eb6..63fdb4bf 100644
--- a/src/imports/controls/designer/SwitchSpecifics.qml
+++ b/src/imports/controls/designer/SwitchSpecifics.qml
@@ -3,7 +3,7 @@
 ** 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.
+** This file is part of the Qt Labs Controls module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL3$
 ** Commercial License Usage
diff --git a/src/imports/controls/designer/TextAreaSpecifics.qml b/src/imports/controls/designer/TextAreaSpecifics.qml
index 50661185..adee2fac 100644
--- a/src/imports/controls/designer/TextAreaSpecifics.qml
+++ b/src/imports/controls/designer/TextAreaSpecifics.qml
@@ -3,7 +3,7 @@
 ** 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.
+** This file is part of the Qt Labs Controls module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL3$
 ** Commercial License Usage
diff --git a/src/imports/controls/designer/TextFieldSpecifics.qml b/src/imports/controls/designer/TextFieldSpecifics.qml
index 950afdf8..ab3e2b5e 100644
--- a/src/imports/controls/designer/TextFieldSpecifics.qml
+++ b/src/imports/controls/designer/TextFieldSpecifics.qml
@@ -3,7 +3,7 @@
 ** 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.
+** This file is part of the Qt Labs Controls module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL3$
 ** Commercial License Usage
diff --git a/src/imports/controls/designer/ToolBarSpecifics.qml b/src/imports/controls/designer/ToolBarSpecifics.qml
index 6eb68d87..80e01cf2 100644
--- a/src/imports/controls/designer/ToolBarSpecifics.qml
+++ b/src/imports/controls/designer/ToolBarSpecifics.qml
@@ -3,7 +3,7 @@
 ** 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.
+** This file is part of the Qt Labs Controls module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL3$
 ** Commercial License Usage
diff --git a/src/imports/controls/designer/ToolButtonSpecifics.qml b/src/imports/controls/designer/ToolButtonSpecifics.qml
index 860b8582..fab18b5b 100644
--- a/src/imports/controls/designer/ToolButtonSpecifics.qml
+++ b/src/imports/controls/designer/ToolButtonSpecifics.qml
@@ -3,7 +3,7 @@
 ** 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.
+** This file is part of the Qt Labs Controls module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL3$
 ** Commercial License Usage
diff --git a/src/imports/controls/designer/designer.pri b/src/imports/controls/designer/designer.pri
index 8a14bc69..9b7847b1 100644
--- a/src/imports/controls/designer/designer.pri
+++ b/src/imports/controls/designer/designer.pri
@@ -1,5 +1,5 @@
 QML_FILES += \
-    $$PWD/qtquickcontrols2.metainfo
+    $$PWD/qtlabscontrols.metainfo
 
 QML_FILES += \
     $$PWD/BusyIndicatorSpecifics.qml \
diff --git a/src/imports/controls/designer/qtquickcontrols2.metainfo b/src/imports/controls/designer/qtlabscontrols.metainfo
index 40439833..0d82159b 100644
--- a/src/imports/controls/designer/qtquickcontrols2.metainfo
+++ b/src/imports/controls/designer/qtlabscontrols.metainfo
@@ -1,57 +1,57 @@
 MetaInfo {
     Type {
-        name: "QtQuick.Controls.BusyIndicator"
+        name: "Qt.labs.controls.BusyIndicator"
         icon: "images/todo16.png"
 
         ItemLibraryEntry {
             name: "Busy Indicator"
-            category: "Qt Quick - Controls"
+            category: "Qt Labs - Controls"
             libraryIcon: "images/todo.png"
             version: "2.0"
-            requiredImport: "QtQuick.Controls"
+            requiredImport: "Qt.labs.controls"
         }
     }
 
     Type {
-        name: "QtQuick.Controls.Button"
+        name: "Qt.labs.controls.Button"
         icon: "images/todo16.png"
 
         ItemLibraryEntry {
             name: "Button"
-            category: "Qt Quick - Controls"
+            category: "Qt Labs - Controls"
             libraryIcon: "images/todo.png"
             version: "2.0"
-            requiredImport: "QtQuick.Controls"
+            requiredImport: "Qt.labs.controls"
 
             Property { name: "text"; type: "binding"; value: "qsTr('Button')" }
         }
     }
 
     Type {
-        name: "QtQuick.Controls.CheckBox"
+        name: "Qt.labs.controls.CheckBox"
         icon: "images/todo16.png"
 
         ItemLibraryEntry {
             name: "Check Box"
-            category: "Qt Quick - Controls"
+            category: "Qt Labs - Controls"
             libraryIcon: "images/todo.png"
             version: "2.0"
-            requiredImport: "QtQuick.Controls"
+            requiredImport: "Qt.labs.controls"
 
             Property { name: "text"; type: "binding"; value: "qsTr('Check Box')" }
         }
     }
 
     Type {
-        name: "QtQuick.Controls.Frame"
+        name: "Qt.labs.controls.Frame"
         icon: "images/todo16.png"
 
         ItemLibraryEntry {
             name: "Frame"
-            category: "Qt Quick - Controls"
+            category: "Qt Labs - Controls"
             libraryIcon: "images/todo.png"
             version: "2.0"
-            requiredImport: "QtQuick.Controls"
+            requiredImport: "Qt.labs.controls"
 
             Property { name: "width"; type: "int"; value: 200 }
             Property { name: "height"; type: "int"; value: 200 }
@@ -59,15 +59,15 @@ MetaInfo {
     }
 
     Type {
-        name: "QtQuick.Controls.GroupBox"
+        name: "Qt.labs.controls.GroupBox"
         icon: "images/todo16.png"
 
         ItemLibraryEntry {
             name: "Group Box"
-            category: "Qt Quick - Controls"
+            category: "Qt Labs - Controls"
             libraryIcon: "images/todo.png"
             version: "2.0"
-            requiredImport: "QtQuick.Controls"
+            requiredImport: "Qt.labs.controls"
 
             Property { name: "width"; type: "int"; value: 200 }
             Property { name: "height"; type: "int"; value: 200 }
@@ -76,150 +76,150 @@ MetaInfo {
     }
 
     Type {
-        name: "QtQuick.Controls.Label"
+        name: "Qt.labs.controls.Label"
         icon: "images/todo16.png"
 
         ItemLibraryEntry {
             name: "Label"
-            category: "Qt Quick - Controls"
+            category: "Qt Labs - Controls"
             libraryIcon: "images/todo.png"
             version: "2.0"
-            requiredImport: "QtQuick.Controls"
+            requiredImport: "Qt.labs.controls"
 
             Property { name: "text"; type: "binding"; value: "qsTr('Label')" }
         }
     }
 
     Type {
-        name: "QtQuick.Controls.PageIndicator"
+        name: "Qt.labs.controls.PageIndicator"
         icon: "images/todo16.png"
 
         ItemLibraryEntry {
             name: "Page Indicator"
-            category: "Qt Quick - Controls"
+            category: "Qt Labs - Controls"
             libraryIcon: "images/todo.png"
             version: "2.0"
-            requiredImport: "QtQuick.Controls"
+            requiredImport: "Qt.labs.controls"
 
             Property { name: "count"; type: "int"; value: 3 }
         }
     }
 
     Type {
-        name: "QtQuick.Controls.ProgressBar"
+        name: "Qt.labs.controls.ProgressBar"
         icon: "images/todo16.png"
 
         ItemLibraryEntry {
             name: "Progress Bar"
-            category: "Qt Quick - Controls"
+            category: "Qt Labs - Controls"
             libraryIcon: "images/todo.png"
             version: "2.0"
-            requiredImport: "QtQuick.Controls"
+            requiredImport: "Qt.labs.controls"
 
             Property { name: "value"; type: "real"; value: 0.5 }
         }
     }
 
     Type {
-        name: "QtQuick.Controls.RadioButton"
+        name: "Qt.labs.controls.RadioButton"
         icon: "images/todo16.png"
 
         ItemLibraryEntry {
             name: "Radio Button"
-            category: "Qt Quick - Controls"
+            category: "Qt Labs - Controls"
             libraryIcon: "images/todo.png"
             version: "2.0"
-            requiredImport: "QtQuick.Controls"
+            requiredImport: "Qt.labs.controls"
 
             Property { name: "text"; type: "binding"; value: "qsTr('Radio Button')" }
         }
     }
 
     Type {
-        name: "QtQuick.Controls.Slider"
+        name: "Qt.labs.controls.Slider"
         icon: "images/todo16.png"
 
         ItemLibraryEntry {
             name: "Slider"
-            category: "Qt Quick - Controls"
+            category: "Qt Labs - Controls"
             libraryIcon: "images/todo.png"
             version: "2.0"
-            requiredImport: "QtQuick.Controls"
+            requiredImport: "Qt.labs.controls"
 
             Property { name: "value"; type: "real"; value: 0.5 }
         }
     }
 
     Type {
-        name: "QtQuick.Controls.Switch"
+        name: "Qt.labs.controls.Switch"
         icon: "images/todo16.png"
 
         ItemLibraryEntry {
             name: "Switch"
-            category: "Qt Quick - Controls"
+            category: "Qt Labs - Controls"
             libraryIcon: "images/todo.png"
             version: "2.0"
-            requiredImport: "QtQuick.Controls"
+            requiredImport: "Qt.labs.controls"
 
             Property { name: "text"; type: "binding"; value: "qsTr('Switch')" }
         }
     }
 
     Type {
-        name: "QtQuick.Controls.TextArea"
+        name: "Qt.labs.controls.TextArea"
         icon: "images/todo16.png"
 
         ItemLibraryEntry {
             name: "Text Area"
-            category: "Qt Quick - Controls"
+            category: "Qt Labs - Controls"
             libraryIcon: "images/todo.png"
             version: "2.0"
-            requiredImport: "QtQuick.Controls"
+            requiredImport: "Qt.labs.controls"
 
             Property { name: "text"; type: "binding"; value: "qsTr('Text Area')" }
         }
     }
 
     Type {
-        name: "QtQuick.Controls.TextField"
+        name: "Qt.labs.controls.TextField"
         icon: "images/todo16.png"
 
         ItemLibraryEntry {
             name: "Text Field"
-            category: "Qt Quick - Controls"
+            category: "Qt Labs - Controls"
             libraryIcon: "images/todo.png"
             version: "2.0"
-            requiredImport: "QtQuick.Controls"
+            requiredImport: "Qt.labs.controls"
 
             Property { name: "text"; type: "binding"; value: "qsTr('Text Field')" }
         }
     }
 
     Type {
-        name: "QtQuick.Controls.ToolButton"
+        name: "Qt.labs.controls.ToolButton"
         icon: "images/todo16.png"
 
         ItemLibraryEntry {
             name: "Tool Button"
-            category: "Qt Quick - Controls"
+            category: "Qt Labs - Controls"
             libraryIcon: "images/todo.png"
             version: "2.0"
-            requiredImport: "QtQuick.Controls"
+            requiredImport: "Qt.labs.controls"
 
             Property { name: "text"; type: "binding"; value: "qsTr('Tool Button')" }
         }
     }
 
     Type {
-        name: "QtQuick.Controls.ToolBar"
+        name: "Qt.labs.controls.ToolBar"
         icon: "images/todo16.png"
 
         ItemLibraryEntry {
             name: "Tool Bar"
-            category: "Qt Quick - Controls"
+            category: "Qt Labs - Controls"
             libraryIcon: "images/todo.png"
             version: "2.0"
-            requiredImport: "QtQuick.Controls"
+            requiredImport: "Qt.labs.controls"
 
             Property { name: "width"; type: "int"; value: 360 }
         }
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-busyindicator-background.png b/src/imports/controls/doc/images/qtlabscontrols-busyindicator-background.png
index 84cd2ed9..84cd2ed9 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-busyindicator-background.png
+++ b/src/imports/controls/doc/images/qtlabscontrols-busyindicator-background.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-busyindicator-indicator.png b/src/imports/controls/doc/images/qtlabscontrols-busyindicator-indicator.png
index 87db05a1..87db05a1 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-busyindicator-indicator.png
+++ b/src/imports/controls/doc/images/qtlabscontrols-busyindicator-indicator.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-busyindicator.gif b/src/imports/controls/doc/images/qtlabscontrols-busyindicator.gif
index 46633c34..46633c34 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-busyindicator.gif
+++ b/src/imports/controls/doc/images/qtlabscontrols-busyindicator.gif
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-button-background.png b/src/imports/controls/doc/images/qtlabscontrols-button-background.png
index f8e9342c..f8e9342c 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-button-background.png
+++ b/src/imports/controls/doc/images/qtlabscontrols-button-background.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-button-disabled.png b/src/imports/controls/doc/images/qtlabscontrols-button-disabled.png
index 9b9d1eb3..9b9d1eb3 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-button-disabled.png
+++ b/src/imports/controls/doc/images/qtlabscontrols-button-disabled.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-button-focused.png b/src/imports/controls/doc/images/qtlabscontrols-button-focused.png
index 172bf9fe..172bf9fe 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-button-focused.png
+++ b/src/imports/controls/doc/images/qtlabscontrols-button-focused.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-button-label.png b/src/imports/controls/doc/images/qtlabscontrols-button-label.png
index 6875fc06..6875fc06 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-button-label.png
+++ b/src/imports/controls/doc/images/qtlabscontrols-button-label.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-button-normal.png b/src/imports/controls/doc/images/qtlabscontrols-button-normal.png
index f59669a2..f59669a2 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-button-normal.png
+++ b/src/imports/controls/doc/images/qtlabscontrols-button-normal.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-button-pressed.png b/src/imports/controls/doc/images/qtlabscontrols-button-pressed.png
index c9b14992..c9b14992 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-button-pressed.png
+++ b/src/imports/controls/doc/images/qtlabscontrols-button-pressed.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-button.gif b/src/imports/controls/doc/images/qtlabscontrols-button.gif
index 9f08f458..9f08f458 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-button.gif
+++ b/src/imports/controls/doc/images/qtlabscontrols-button.gif
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-checkbox-background.png b/src/imports/controls/doc/images/qtlabscontrols-checkbox-background.png
index 81198821..81198821 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-checkbox-background.png
+++ b/src/imports/controls/doc/images/qtlabscontrols-checkbox-background.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-checkbox-checked.png b/src/imports/controls/doc/images/qtlabscontrols-checkbox-checked.png
index f44428e0..f44428e0 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-checkbox-checked.png
+++ b/src/imports/controls/doc/images/qtlabscontrols-checkbox-checked.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-checkbox-disabled.png b/src/imports/controls/doc/images/qtlabscontrols-checkbox-disabled.png
index ca31061a..ca31061a 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-checkbox-disabled.png
+++ b/src/imports/controls/doc/images/qtlabscontrols-checkbox-disabled.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-checkbox-focused.png b/src/imports/controls/doc/images/qtlabscontrols-checkbox-focused.png
index 7847fb9b..7847fb9b 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-checkbox-focused.png
+++ b/src/imports/controls/doc/images/qtlabscontrols-checkbox-focused.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-checkbox-indicator.png b/src/imports/controls/doc/images/qtlabscontrols-checkbox-indicator.png
index 7c6148b6..7c6148b6 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-checkbox-indicator.png
+++ b/src/imports/controls/doc/images/qtlabscontrols-checkbox-indicator.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-checkbox-label.png b/src/imports/controls/doc/images/qtlabscontrols-checkbox-label.png
index 5bef6df5..5bef6df5 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-checkbox-label.png
+++ b/src/imports/controls/doc/images/qtlabscontrols-checkbox-label.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-checkbox-normal.png b/src/imports/controls/doc/images/qtlabscontrols-checkbox-normal.png
index 790ebc93..790ebc93 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-checkbox-normal.png
+++ b/src/imports/controls/doc/images/qtlabscontrols-checkbox-normal.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-dial-background.png b/src/imports/controls/doc/images/qtlabscontrols-dial-background.png
index 38fad583..38fad583 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-dial-background.png
+++ b/src/imports/controls/doc/images/qtlabscontrols-dial-background.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-dial-handle.png b/src/imports/controls/doc/images/qtlabscontrols-dial-handle.png
index e6fd8cdc..e6fd8cdc 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-dial-handle.png
+++ b/src/imports/controls/doc/images/qtlabscontrols-dial-handle.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-frame-background.png b/src/imports/controls/doc/images/qtlabscontrols-frame-background.png
index e09960fc..e09960fc 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-frame-background.png
+++ b/src/imports/controls/doc/images/qtlabscontrols-frame-background.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-frame-frame.png b/src/imports/controls/doc/images/qtlabscontrols-frame-frame.png
index bfdf9c1b..bfdf9c1b 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-frame-frame.png
+++ b/src/imports/controls/doc/images/qtlabscontrols-frame-frame.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-groupbox-background.png b/src/imports/controls/doc/images/qtlabscontrols-groupbox-background.png
index 36e9aa0f..36e9aa0f 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-groupbox-background.png
+++ b/src/imports/controls/doc/images/qtlabscontrols-groupbox-background.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-groupbox-frame.png b/src/imports/controls/doc/images/qtlabscontrols-groupbox-frame.png
index 11b075d7..11b075d7 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-groupbox-frame.png
+++ b/src/imports/controls/doc/images/qtlabscontrols-groupbox-frame.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-groupbox-label.png b/src/imports/controls/doc/images/qtlabscontrols-groupbox-label.png
index 67ccb4c1..67ccb4c1 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-groupbox-label.png
+++ b/src/imports/controls/doc/images/qtlabscontrols-groupbox-label.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-progressbar-background.png b/src/imports/controls/doc/images/qtlabscontrols-progressbar-background.png
index 0fd77835..0fd77835 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-progressbar-background.png
+++ b/src/imports/controls/doc/images/qtlabscontrols-progressbar-background.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-progressbar-disabled.png b/src/imports/controls/doc/images/qtlabscontrols-progressbar-disabled.png
index 4baf5c83..4baf5c83 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-progressbar-disabled.png
+++ b/src/imports/controls/doc/images/qtlabscontrols-progressbar-disabled.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-progressbar-indicator.png b/src/imports/controls/doc/images/qtlabscontrols-progressbar-indicator.png
index 02e888ed..02e888ed 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-progressbar-indicator.png
+++ b/src/imports/controls/doc/images/qtlabscontrols-progressbar-indicator.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-progressbar-normal.png b/src/imports/controls/doc/images/qtlabscontrols-progressbar-normal.png
index 783d721d..783d721d 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-progressbar-normal.png
+++ b/src/imports/controls/doc/images/qtlabscontrols-progressbar-normal.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-radiobutton-background.png b/src/imports/controls/doc/images/qtlabscontrols-radiobutton-background.png
index 3ee9590e..3ee9590e 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-radiobutton-background.png
+++ b/src/imports/controls/doc/images/qtlabscontrols-radiobutton-background.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-radiobutton-checked.png b/src/imports/controls/doc/images/qtlabscontrols-radiobutton-checked.png
index 9f71b6b6..9f71b6b6 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-radiobutton-checked.png
+++ b/src/imports/controls/doc/images/qtlabscontrols-radiobutton-checked.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-radiobutton-disabled.png b/src/imports/controls/doc/images/qtlabscontrols-radiobutton-disabled.png
index f7fbcb7c..f7fbcb7c 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-radiobutton-disabled.png
+++ b/src/imports/controls/doc/images/qtlabscontrols-radiobutton-disabled.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-radiobutton-focused.png b/src/imports/controls/doc/images/qtlabscontrols-radiobutton-focused.png
index dfb8d51e..dfb8d51e 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-radiobutton-focused.png
+++ b/src/imports/controls/doc/images/qtlabscontrols-radiobutton-focused.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-radiobutton-indicator.png b/src/imports/controls/doc/images/qtlabscontrols-radiobutton-indicator.png
index f9e91709..f9e91709 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-radiobutton-indicator.png
+++ b/src/imports/controls/doc/images/qtlabscontrols-radiobutton-indicator.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-radiobutton-label.png b/src/imports/controls/doc/images/qtlabscontrols-radiobutton-label.png
index 16c0ee08..16c0ee08 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-radiobutton-label.png
+++ b/src/imports/controls/doc/images/qtlabscontrols-radiobutton-label.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-radiobutton-normal.png b/src/imports/controls/doc/images/qtlabscontrols-radiobutton-normal.png
index 5a2d4bca..5a2d4bca 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-radiobutton-normal.png
+++ b/src/imports/controls/doc/images/qtlabscontrols-radiobutton-normal.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-scrollbar-background.png b/src/imports/controls/doc/images/qtlabscontrols-scrollbar-background.png
index 770f546c..770f546c 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-scrollbar-background.png
+++ b/src/imports/controls/doc/images/qtlabscontrols-scrollbar-background.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-scrollbar-handle.png b/src/imports/controls/doc/images/qtlabscontrols-scrollbar-handle.png
index aafa90a7..aafa90a7 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-scrollbar-handle.png
+++ b/src/imports/controls/doc/images/qtlabscontrols-scrollbar-handle.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-scrollindicator-background.png b/src/imports/controls/doc/images/qtlabscontrols-scrollindicator-background.png
index e8947aa0..e8947aa0 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-scrollindicator-background.png
+++ b/src/imports/controls/doc/images/qtlabscontrols-scrollindicator-background.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-scrollindicator-indicator.png b/src/imports/controls/doc/images/qtlabscontrols-scrollindicator-indicator.png
index 9d969f16..9d969f16 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-scrollindicator-indicator.png
+++ b/src/imports/controls/doc/images/qtlabscontrols-scrollindicator-indicator.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-slider-background.png b/src/imports/controls/doc/images/qtlabscontrols-slider-background.png
index 35fb12ca..35fb12ca 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-slider-background.png
+++ b/src/imports/controls/doc/images/qtlabscontrols-slider-background.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-slider-disabled.png b/src/imports/controls/doc/images/qtlabscontrols-slider-disabled.png
index 7d4584f8..7d4584f8 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-slider-disabled.png
+++ b/src/imports/controls/doc/images/qtlabscontrols-slider-disabled.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-slider-focused.png b/src/imports/controls/doc/images/qtlabscontrols-slider-focused.png
index 7f9ad18b..7f9ad18b 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-slider-focused.png
+++ b/src/imports/controls/doc/images/qtlabscontrols-slider-focused.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-slider-handle.png b/src/imports/controls/doc/images/qtlabscontrols-slider-handle.png
index 7878e0f8..7878e0f8 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-slider-handle.png
+++ b/src/imports/controls/doc/images/qtlabscontrols-slider-handle.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-slider-normal.png b/src/imports/controls/doc/images/qtlabscontrols-slider-normal.png
index dac102de..dac102de 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-slider-normal.png
+++ b/src/imports/controls/doc/images/qtlabscontrols-slider-normal.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-slider-track.png b/src/imports/controls/doc/images/qtlabscontrols-slider-track.png
index 868fa420..868fa420 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-slider-track.png
+++ b/src/imports/controls/doc/images/qtlabscontrols-slider-track.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-slider.gif b/src/imports/controls/doc/images/qtlabscontrols-slider.gif
index 59c94796..59c94796 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-slider.gif
+++ b/src/imports/controls/doc/images/qtlabscontrols-slider.gif
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-switch-background.png b/src/imports/controls/doc/images/qtlabscontrols-switch-background.png
index bfa24fe6..bfa24fe6 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-switch-background.png
+++ b/src/imports/controls/doc/images/qtlabscontrols-switch-background.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-switch-checked.png b/src/imports/controls/doc/images/qtlabscontrols-switch-checked.png
index fadf851a..fadf851a 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-switch-checked.png
+++ b/src/imports/controls/doc/images/qtlabscontrols-switch-checked.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-switch-disabled.png b/src/imports/controls/doc/images/qtlabscontrols-switch-disabled.png
index 328ff6a9..328ff6a9 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-switch-disabled.png
+++ b/src/imports/controls/doc/images/qtlabscontrols-switch-disabled.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-switch-focused.png b/src/imports/controls/doc/images/qtlabscontrols-switch-focused.png
index 795868b8..795868b8 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-switch-focused.png
+++ b/src/imports/controls/doc/images/qtlabscontrols-switch-focused.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-switch-indicator.png b/src/imports/controls/doc/images/qtlabscontrols-switch-indicator.png
index 5fc9c83b..5fc9c83b 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-switch-indicator.png
+++ b/src/imports/controls/doc/images/qtlabscontrols-switch-indicator.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-switch-label.png b/src/imports/controls/doc/images/qtlabscontrols-switch-label.png
index 57deabc6..57deabc6 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-switch-label.png
+++ b/src/imports/controls/doc/images/qtlabscontrols-switch-label.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-switch-normal.png b/src/imports/controls/doc/images/qtlabscontrols-switch-normal.png
index a162e898..a162e898 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-switch-normal.png
+++ b/src/imports/controls/doc/images/qtlabscontrols-switch-normal.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-switch.gif b/src/imports/controls/doc/images/qtlabscontrols-switch.gif
index b2e1b548..b2e1b548 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-switch.gif
+++ b/src/imports/controls/doc/images/qtlabscontrols-switch.gif
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-textfield-background.png b/src/imports/controls/doc/images/qtlabscontrols-textfield-background.png
index a2908200..a2908200 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-textfield-background.png
+++ b/src/imports/controls/doc/images/qtlabscontrols-textfield-background.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-textfield-disabled.png b/src/imports/controls/doc/images/qtlabscontrols-textfield-disabled.png
index bb5b779e..bb5b779e 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-textfield-disabled.png
+++ b/src/imports/controls/doc/images/qtlabscontrols-textfield-disabled.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-textfield-focused.png b/src/imports/controls/doc/images/qtlabscontrols-textfield-focused.png
index 5d8592c1..5d8592c1 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-textfield-focused.png
+++ b/src/imports/controls/doc/images/qtlabscontrols-textfield-focused.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-textfield-normal.png b/src/imports/controls/doc/images/qtlabscontrols-textfield-normal.png
index 26ad9c11..26ad9c11 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-textfield-normal.png
+++ b/src/imports/controls/doc/images/qtlabscontrols-textfield-normal.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-textfield-placeholder.png b/src/imports/controls/doc/images/qtlabscontrols-textfield-placeholder.png
index b040315f..b040315f 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-textfield-placeholder.png
+++ b/src/imports/controls/doc/images/qtlabscontrols-textfield-placeholder.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-togglebutton-background.png b/src/imports/controls/doc/images/qtlabscontrols-togglebutton-background.png
index 8f390b49..8f390b49 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-togglebutton-background.png
+++ b/src/imports/controls/doc/images/qtlabscontrols-togglebutton-background.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-togglebutton-checked.png b/src/imports/controls/doc/images/qtlabscontrols-togglebutton-checked.png
index fa883751..fa883751 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-togglebutton-checked.png
+++ b/src/imports/controls/doc/images/qtlabscontrols-togglebutton-checked.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-togglebutton-disabled.png b/src/imports/controls/doc/images/qtlabscontrols-togglebutton-disabled.png
index 794692b0..794692b0 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-togglebutton-disabled.png
+++ b/src/imports/controls/doc/images/qtlabscontrols-togglebutton-disabled.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-togglebutton-focused.png b/src/imports/controls/doc/images/qtlabscontrols-togglebutton-focused.png
index f52e4686..f52e4686 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-togglebutton-focused.png
+++ b/src/imports/controls/doc/images/qtlabscontrols-togglebutton-focused.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-togglebutton-indicator.png b/src/imports/controls/doc/images/qtlabscontrols-togglebutton-indicator.png
index 97e06e2c..97e06e2c 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-togglebutton-indicator.png
+++ b/src/imports/controls/doc/images/qtlabscontrols-togglebutton-indicator.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-togglebutton-label.png b/src/imports/controls/doc/images/qtlabscontrols-togglebutton-label.png
index 3eb3ba35..3eb3ba35 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-togglebutton-label.png
+++ b/src/imports/controls/doc/images/qtlabscontrols-togglebutton-label.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-togglebutton-normal.png b/src/imports/controls/doc/images/qtlabscontrols-togglebutton-normal.png
index b066c565..b066c565 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-togglebutton-normal.png
+++ b/src/imports/controls/doc/images/qtlabscontrols-togglebutton-normal.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-toolbar-background.png b/src/imports/controls/doc/images/qtlabscontrols-toolbar-background.png
index 28d4fd98..28d4fd98 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-toolbar-background.png
+++ b/src/imports/controls/doc/images/qtlabscontrols-toolbar-background.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-toolbar-frame.png b/src/imports/controls/doc/images/qtlabscontrols-toolbar-frame.png
index 28d4fd98..28d4fd98 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-toolbar-frame.png
+++ b/src/imports/controls/doc/images/qtlabscontrols-toolbar-frame.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-toolbutton-background.png b/src/imports/controls/doc/images/qtlabscontrols-toolbutton-background.png
index fd105fee..fd105fee 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-toolbutton-background.png
+++ b/src/imports/controls/doc/images/qtlabscontrols-toolbutton-background.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-toolbutton-label.png b/src/imports/controls/doc/images/qtlabscontrols-toolbutton-label.png
index 7aae8dc8..7aae8dc8 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-toolbutton-label.png
+++ b/src/imports/controls/doc/images/qtlabscontrols-toolbutton-label.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-tumbler-background.png b/src/imports/controls/doc/images/qtlabscontrols-tumbler-background.png
index aa736615..aa736615 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-tumbler-background.png
+++ b/src/imports/controls/doc/images/qtlabscontrols-tumbler-background.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-tumbler-contentItem.png b/src/imports/controls/doc/images/qtlabscontrols-tumbler-contentItem.png
index aa736615..aa736615 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-tumbler-contentItem.png
+++ b/src/imports/controls/doc/images/qtlabscontrols-tumbler-contentItem.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-tumbler-delegate.png b/src/imports/controls/doc/images/qtlabscontrols-tumbler-delegate.png
index 77c51efd..77c51efd 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-tumbler-delegate.png
+++ b/src/imports/controls/doc/images/qtlabscontrols-tumbler-delegate.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-tumbler-wrap.gif b/src/imports/controls/doc/images/qtlabscontrols-tumbler-wrap.gif
index 2a7e435d..2a7e435d 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-tumbler-wrap.gif
+++ b/src/imports/controls/doc/images/qtlabscontrols-tumbler-wrap.gif
diff --git a/src/imports/controls/doc/qtlabscontrols.qdocconf b/src/imports/controls/doc/qtlabscontrols.qdocconf
new file mode 100644
index 00000000..ae3f2a75
--- /dev/null
+++ b/src/imports/controls/doc/qtlabscontrols.qdocconf
@@ -0,0 +1,52 @@
+include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf)
+
+project                 = QtLabsControls
+description             = Qt Labs Controls Reference Documentation
+version                 = $QT_VERSION
+
+qhp.projects            = QtLabsControls
+
+qhp.QtLabsControls.file          = qtlabscontrols.qhp
+qhp.QtLabsControls.namespace     = org.qt-project.qtlabscontrols.$QT_VERSION_TAG
+qhp.QtLabsControls.virtualFolder = qtlabscontrols
+qhp.QtLabsControls.indexTitle    = Qt Labs Controls
+qhp.QtLabsControls.indexRoot     =
+
+qhp.QtLabsControls.filterAttributes                  = qtlabscontrols $QT_VERSION qtrefdoc
+qhp.QtLabsControls.customFilters.Qt.name             = QtLabsControls $QT_VERSION
+qhp.QtLabsControls.customFilters.Qt.filterAttributes = qtlabscontrols $QT_VERSION
+
+qhp.QtLabsControls.subprojects = qtlabscontrolsqmltypes
+
+qhp.QtLabsControls.subprojects.qtlabscontrolsqmltypes.title      = Controls QML Types
+qhp.QtLabsControls.subprojects.qtlabscontrolsqmltypes.indexTitle = Qt Labs Controls QML Types
+qhp.QtLabsControls.subprojects.qtlabscontrolsqmltypes.selectors  = qmlclass
+qhp.QtLabsControls.subprojects.qtlabscontrolsqmltypes.sortPages  = true
+
+depends = qtcore qtgui qtdoc qtqml qtquick qtquicklayouts qtquickdialogs qtquickcontrols
+
+# Specify the install path under QT_INSTALL_EXAMPLES
+# Note: paths passed to \example command must contain the parent directory, e.g.
+# \example controls/tabs
+exampledirs += ../../../../examples/quick \
+               ../ \
+               ../../../templates \
+               ../../calendar \
+               ../../../../tests/auto/controls/data \
+               ../../../../tests/auto/snippets/data \
+               snippets
+
+examplesinstallpath = quick
+
+headerdirs += ../../../templates \
+              ../../calendar \
+
+sourcedirs += ../../../templates \
+              ../../calendar
+
+imagedirs += images
+
+navigation.landingpage  = "Qt Labs Controls"
+navigation.qmltypespage = "Qt Labs Controls QML Types"
+
+tagfile                 = qtlabscontrols.tags
diff --git a/src/imports/controls/doc/qtquickcontrols2.qdocconf b/src/imports/controls/doc/qtquickcontrols2.qdocconf
deleted file mode 100644
index db9d8e1b..00000000
--- a/src/imports/controls/doc/qtquickcontrols2.qdocconf
+++ /dev/null
@@ -1,57 +0,0 @@
-include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf)
-
-project                 = QtQuickControls2
-description             = Qt Quick Controls 2 Reference Documentation
-version                 = $QT_VERSION
-
-qhp.projects            = QtQuickControls2
-
-qhp.QtQuickControls2.file          = qtquickcontrols2.qhp
-qhp.QtQuickControls2.namespace     = org.qt-project.qtquickcontrols2.$QT_VERSION_TAG
-qhp.QtQuickControls2.virtualFolder = qtquickcontrols2
-qhp.QtQuickControls2.indexTitle    = Qt Quick Controls 2
-qhp.QtQuickControls2.indexRoot     =
-
-qhp.QtQuickControls2.filterAttributes                  = qtquickcontrols2 $QT_VERSION qtrefdoc
-qhp.QtQuickControls2.customFilters.Qt.name             = QtQuickControls2 $QT_VERSION
-qhp.QtQuickControls2.customFilters.Qt.filterAttributes = qtquickcontrols2 $QT_VERSION
-
-qhp.QtQuickControls2.subprojects = qtquickcontrols2qmltypes
-
-qhp.QtQuickControls2.subprojects.qtquickcontrols2qmltypes.title      = Controls 2 QML Types
-qhp.QtQuickControls2.subprojects.qtquickcontrols2qmltypes.indexTitle = Qt Quick Controls 2 QML Types
-qhp.QtQuickControls2.subprojects.qtquickcontrols2qmltypes.selectors  = qmlclass
-qhp.QtQuickControls2.subprojects.qtquickcontrols2qmltypes.sortPages  = true
-
-depends = qtcore qtgui qtdoc qtqml qtquick qtquicklayouts qtquickdialogs qtquickcontrols
-
-# Specify the install path under QT_INSTALL_EXAMPLES
-# Note: paths passed to \example command must contain the parent directory, e.g.
-# \example controls/tabs
-exampledirs += ../../../../examples/quick \
-               ../ \
-               ../../../templates \
-               ../../calendar \
-               ../../../../tests/auto/controls/data \
-               ../../../../tests/auto/snippets/data \
-               snippets
-
-examplesinstallpath = quick
-
-headerdirs += ../../../templates \
-              ../../calendar \
-
-sourcedirs += ../../../templates \
-              ../../calendar
-
-imagedirs += images
-
-navigation.landingpage  = "Qt Quick Controls 2"
-navigation.qmltypespage = "Qt Quick Controls 2 QML Types"
-
-tagfile                 = qtquickcontrols2.tags
-
-# Specify a QML module suffix, applied to html filenames, to avoid
-# clashes with Qt Quick Controls 1 documentation.
-outputsuffixes = QML
-outputsuffixes.QML = 2
diff --git a/src/imports/controls/doc/snippets/basic-example.qml b/src/imports/controls/doc/snippets/basic-example.qml
index 62ab2466..11fee906 100644
--- a/src/imports/controls/doc/snippets/basic-example.qml
+++ b/src/imports/controls/doc/snippets/basic-example.qml
@@ -27,7 +27,7 @@
 
 //! [0]
 import QtQuick 2.6
-import QtQuick.Controls 2.0
+import Qt.labs.controls 1.0
 
 ApplicationWindow {
     title: "My Application"
diff --git a/src/imports/controls/doc/src/calendar/qtlabscalendar-index.qdoc b/src/imports/controls/doc/src/calendar/qtlabscalendar-index.qdoc
index dedfad4c..02e92bf0 100644
--- a/src/imports/controls/doc/src/calendar/qtlabscalendar-index.qdoc
+++ b/src/imports/controls/doc/src/calendar/qtlabscalendar-index.qdoc
@@ -44,6 +44,6 @@
     \list
       \li \l{Qt Quick}
       \li \l{Qt Quick Layouts}
-      \li \l{Qt Quick Controls 2}
+      \li \l{Qt Labs Controls}
     \endlist
 */
diff --git a/src/imports/controls/doc/src/calendar/qtlabscalendar.qdoc b/src/imports/controls/doc/src/calendar/qtlabscalendar.qdoc
index b363195a..f483ae91 100644
--- a/src/imports/controls/doc/src/calendar/qtlabscalendar.qdoc
+++ b/src/imports/controls/doc/src/calendar/qtlabscalendar.qdoc
@@ -33,7 +33,7 @@
 
     The \l{Qt Labs Calendar} module provides QML types for creating
     calendars. These QML types work in conjunction with \l{Qt Quick} and
-    \l{Qt Quick Controls 2}.
+    \l{Qt Labs Controls}.
 
     The QML types can be imported into your application using the
     following import statement in your .qml file:
@@ -49,7 +49,7 @@
     \section1 Related Information
 
     \list
-        \li \l {Qt Quick Controls 2 QML Types}
+        \li \l {Qt Labs Controls QML Types}
     \endlist
 
     \noautolist
diff --git a/src/imports/controls/doc/src/qtquickcontrols2-customize.qdoc b/src/imports/controls/doc/src/qtlabscontrols-customize.qdoc
index 7b4176f5..5f48f418 100644
--- a/src/imports/controls/doc/src/qtquickcontrols2-customize.qdoc
+++ b/src/imports/controls/doc/src/qtlabscontrols-customize.qdoc
@@ -26,11 +26,11 @@
 ****************************************************************************/
 
 /*!
-    \page qtquickcontrols2-customize.html
-    \title Customizing Qt Quick Controls 2
+    \page qtlabscontrols-customize.html
+    \title Customizing Qt Labs Controls
     \brief A set of UI controls to create user interfaces in Qt Quick
 
-    Qt Quick Controls consist of a hierarchy (tree) of items. In order to
+    Qt Labs Controls consist of a hierarchy (tree) of items. In order to
     provide a custom look and feel, the default QML implementation of each
     item can be replaced with a custom one. The following snippets present
     the default implementations of various items. These can be used as a
@@ -43,13 +43,13 @@
 
         \section3 Background
 
-            \image qtquickcontrols2-busyindicator-background.png
+            \image qtlabscontrols-busyindicator-background.png
 
             BusyIndicator has no background item by default.
 
         \section3 Indicator
 
-            \image qtquickcontrols2-busyindicator-indicator.png
+            \image qtlabscontrols-busyindicator-indicator.png
 
             \snippet BusyIndicator.qml indicator
 
@@ -61,13 +61,13 @@
 
         \section3 Background
 
-            \image qtquickcontrols2-button-background.png
+            \image qtlabscontrols-button-background.png
 
             \snippet Button.qml background
 
         \section3 Label
 
-            \image qtquickcontrols2-button-label.png
+            \image qtlabscontrols-button-label.png
 
             \snippet Button.qml label
 
@@ -79,19 +79,19 @@
 
         \section3 Background
 
-            \image qtquickcontrols2-checkbox-background.png
+            \image qtlabscontrols-checkbox-background.png
 
             CheckBox has no background item by default.
 
         \section3 Label
 
-            \image qtquickcontrols2-checkbox-label.png
+            \image qtlabscontrols-checkbox-label.png
 
             \snippet CheckBox.qml label
 
         \section3 Indicator
 
-            \image qtquickcontrols2-checkbox-indicator.png
+            \image qtlabscontrols-checkbox-indicator.png
 
             \snippet CheckBox.qml indicator
 
@@ -102,13 +102,13 @@
 
         \section3 Background
 
-            \image qtquickcontrols2-dial-background.png
+            \image qtlabscontrols-dial-background.png
 
             \snippet Dial.qml background
 
         \section3 Indicator
 
-            \image qtquickcontrols2-dial-handle.png
+            \image qtlabscontrols-dial-handle.png
 
             \snippet Dial.qml handle
 
@@ -120,13 +120,13 @@
 
         \section3 Background
 
-            \image qtquickcontrols2-frame-background.png
+            \image qtlabscontrols-frame-background.png
 
             Frame has no background item by default.
 
         \section3 Frame
 
-            \image qtquickcontrols2-frame-frame.png
+            \image qtlabscontrols-frame-frame.png
 
             \snippet Frame.qml frame
 
@@ -138,19 +138,19 @@
 
         \section3 Background
 
-            \image qtquickcontrols2-groupbox-background.png
+            \image qtlabscontrols-groupbox-background.png
 
             GroupBox has no background item by default.
 
         \section3 Frame
 
-            \image qtquickcontrols2-groupbox-frame.png
+            \image qtlabscontrols-groupbox-frame.png
 
             \snippet GroupBox.qml frame
 
         \section3 Label
 
-            \image qtquickcontrols2-groupbox-label.png
+            \image qtlabscontrols-groupbox-label.png
 
             \snippet GroupBox.qml label
 
@@ -172,13 +172,13 @@
 
         \section3 Background
 
-            \image qtquickcontrols2-progressbar-background.png
+            \image qtlabscontrols-progressbar-background.png
 
             \snippet ProgressBar.qml background
 
         \section3 Indicator
 
-            \image qtquickcontrols2-progressbar-indicator.png
+            \image qtlabscontrols-progressbar-indicator.png
 
             \snippet ProgressBar.qml indicator
 
@@ -190,19 +190,19 @@
 
         \section3 Background
 
-            \image qtquickcontrols2-radiobutton-background.png
+            \image qtlabscontrols-radiobutton-background.png
 
             RadioButton has no background item by default.
 
         \section3 Label
 
-            \image qtquickcontrols2-radiobutton-label.png
+            \image qtlabscontrols-radiobutton-label.png
 
             \snippet RadioButton.qml label
 
         \section3 Indicator
 
-            \image qtquickcontrols2-radiobutton-indicator.png
+            \image qtlabscontrols-radiobutton-indicator.png
 
             \snippet RadioButton.qml indicator
 
@@ -214,13 +214,13 @@
 
         \section3 Background
 
-            \image qtquickcontrols2-scrollbar-background.png
+            \image qtlabscontrols-scrollbar-background.png
 
             ScrollBar has no background item by default.
 
         \section3 Handle
 
-            \image qtquickcontrols2-scrollbar-handle.png
+            \image qtlabscontrols-scrollbar-handle.png
 
             \snippet ScrollBar.qml handle
 
@@ -232,13 +232,13 @@
 
         \section3 Background
 
-            \image qtquickcontrols2-scrollindicator-background.png
+            \image qtlabscontrols-scrollindicator-background.png
 
             ScrollIndicator has no background item by default.
 
         \section3 Indicator
 
-            \image qtquickcontrols2-scrollindicator-indicator.png
+            \image qtlabscontrols-scrollindicator-indicator.png
 
             \snippet ScrollIndicator.qml indicator
 
@@ -250,19 +250,19 @@
 
         \section3 Background
 
-            \image qtquickcontrols2-slider-background.png
+            \image qtlabscontrols-slider-background.png
 
             Slider has no background item by default.
 
         \section3 Track
 
-            \image qtquickcontrols2-slider-track.png
+            \image qtlabscontrols-slider-track.png
 
             \snippet Slider.qml track
 
         \section3 Handle
 
-            \image qtquickcontrols2-slider-handle.png
+            \image qtlabscontrols-slider-handle.png
 
             \snippet Slider.qml handle
 
@@ -279,19 +279,19 @@
 
         \section3 Background
 
-            \image qtquickcontrols2-switch-background.png
+            \image qtlabscontrols-switch-background.png
 
             Switch has no background item by default.
 
         \section3 Label
 
-            \image qtquickcontrols2-switch-label.png
+            \image qtlabscontrols-switch-label.png
 
             \snippet Switch.qml label
 
         \section3 Indicator
 
-            \image qtquickcontrols2-switch-indicator.png
+            \image qtlabscontrols-switch-indicator.png
 
             \snippet Switch.qml indicator
 
@@ -318,13 +318,13 @@
 
         \section3 Background
 
-            \image qtquickcontrols2-textfield-background.png
+            \image qtlabscontrols-textfield-background.png
 
             \snippet TextField.qml background
 
         \section3 Placeholder
 
-            \image qtquickcontrols2-textfield-placeholder.png
+            \image qtlabscontrols-textfield-placeholder.png
 
             \snippet TextField.qml placeholder
 
@@ -336,13 +336,13 @@
 
         \section3 Background
 
-            \image qtquickcontrols2-toolbar-background.png
+            \image qtlabscontrols-toolbar-background.png
 
             \snippet ToolBar.qml background
 
         \section3 Frame
 
-            \image qtquickcontrols2-toolbar-frame.png
+            \image qtlabscontrols-toolbar-frame.png
 
             ToolBar has no frame item by default.
 
@@ -354,13 +354,13 @@
 
         \section3 Background
 
-            \image qtquickcontrols2-toolbutton-background.png
+            \image qtlabscontrols-toolbutton-background.png
 
             \snippet ToolButton.qml background
 
         \section3 Label
 
-            \image qtquickcontrols2-toolbutton-label.png
+            \image qtlabscontrols-toolbutton-label.png
 
             \snippet ToolButton.qml label
 
@@ -373,19 +373,19 @@
 
         \section3 Background
 
-            \image qtquickcontrols2-tumbler-background.png
+            \image qtlabscontrols-tumbler-background.png
 
             Tumbler has no background item by default.
 
         \section3 Content Item
 
-            \image qtquickcontrols2-tumbler-contentItem.png
+            \image qtlabscontrols-tumbler-contentItem.png
 
             \snippet Tumbler.qml contentItem
 
         \section3 Delegate
 
-            \image qtquickcontrols2-tumbler-delegate.png
+            \image qtlabscontrols-tumbler-delegate.png
 
             \snippet Tumbler.qml delegate
 */
diff --git a/src/imports/controls/doc/src/qtquickcontrols2-index.qdoc b/src/imports/controls/doc/src/qtlabscontrols-index.qdoc
index ab8b9aaa..e24b269a 100644
--- a/src/imports/controls/doc/src/qtquickcontrols2-index.qdoc
+++ b/src/imports/controls/doc/src/qtlabscontrols-index.qdoc
@@ -26,18 +26,18 @@
 ****************************************************************************/
 
 /*!
-    \page qtquickcontrols2-index.html
-    \title Qt Quick Controls 2
+    \page qtlabscontrols-index.html
+    \title Qt Labs Controls
 
     \brief Provides a set of UI controls for Qt Quick.
 
-    Qt Quick Controls 2 provides a set of controls that can be used
+    Qt Labs Controls provides a set of controls that can be used
     to build complete interfaces in Qt Quick.
 
     \section1 QML Types
 
-    \section2 QtQuick.Controls Module
-    \generatelist {qmltypesbymodule QtQuick.Controls}
+    \section2 Qt.labs.controls Module
+    \generatelist {qmltypesbymodule Qt.labs.controls}
 
     \section2 Qt.labs.calendar Module
     \generatelist {qmltypesbymodule Qt.labs.calendar}
@@ -51,7 +51,7 @@
     or platform-independent style.
 
     On embedded systems, where the hardware has limited resources, this approach
-    can be inefficient. Qt Quick Controls 2 were designed to solve this problem,
+    can be inefficient. Qt Labs Controls were designed to solve this problem,
     using
     \l {https://blog.qt.io/blog/2015/03/31/qt-quick-controls-for-embedded/}{benchmarks}
     to guide the development.
@@ -72,7 +72,7 @@
     create their own complete style can copy the folder and start tweaking.
     Read more about implementing a style plugin \l {TODO}{here}.
 
-    In Qt Quick Controls 2, styles no longer provide components that are
+    In Qt Labs Controls, styles no longer provide components that are
     dynamically instantiated by controls, but controls themselves consist of
     item delegates that can be replaced. In effect, this means that delegates
     are Qt Quick items that are instantiated on the spot, as properties of the
@@ -108,7 +108,7 @@
     }
     \endqml
 
-    The API of Qt Quick Controls 2 aims to be clean and simple. Common
+    The API of Qt Labs Controls aims to be clean and simple. Common
     operations are easy, and more advanced ones are liberally documented with
     snippets that can be copied into your code.
 
@@ -118,7 +118,7 @@
     \header
         \li
         \li Qt Quick Controls
-        \li Qt Quick Controls 2
+        \li Qt Labs Controls
     \row
         \li Stylable delegates
         \li Yes
@@ -153,7 +153,7 @@
 
     \section2 Porting Qt Quick Controls Code
 
-    The API of Qt Quick Controls 2 is very similar to Qt Quick Controls, but it
+    The API of Qt Labs Controls is very similar to Qt Quick Controls, but it
     does come with some changes necessary to facilitate the improvements. The
     majority of changes are to do with styling; all of a control's delegates
     are now accessible in the control itself, instead of in a separate style
@@ -171,7 +171,7 @@
     }
     \endcode
 
-    To style a button in Qt Quick Controls 2:
+    To style a button in Qt Labs Controls:
 
     \qml
     Button {
@@ -184,7 +184,7 @@
     \section3 Preparing for Migration
 
     With this in mind, a good way to prepare for a migration to Qt Quick
-    Controls 2 is to place each control that you have a custom style for in its
+    Labs is to place each control that you have a custom style for in its
     own QML file. For example, the Qt Quick Controls button above could be moved to a
     file named Button.qml, and used in the following manner:
 
@@ -204,84 +204,84 @@
     \table
     \header
         \li Qt Quick Controls
-        \li Qt Quick Controls 2
+        \li Qt Labs Controls
     \row
         \li \l [QtQuickControls] {Action}
         \li No equivalent; see \l [QtQuick] {Shortcut} instead.
     \row
         \li \l [QtQuickControls] {ApplicationWindow}
-        \li \l [QtQuickControls2] {ApplicationWindow}
+        \li \l [QtLabsControls] {ApplicationWindow}
     \row
         \li \l [QtQuickControls] {BusyIndicator}
-        \li \l [QtQuickControls2] {BusyIndicator}
+        \li \l [QtLabsControls] {BusyIndicator}
     \row
         \li \l [QtQuickControls] {Button}
-        \li \l [QtQuickControls2] {Button}
+        \li \l [QtLabsControls] {Button}
     \row
         \li \l [QtQuickControls] {Calendar}
         \li No equivalent; see \l [QML] {CalendarView} instead.
     \row
         \li \l [QtQuickControls] {CheckBox}
-        \li \l [QtQuickControls2] {CheckBox}
+        \li \l [QtLabsControls] {CheckBox}
     \row
         \li \l [QtQuickControls] {ExclusiveGroup}
-        \li \l [QtQuickControls2] {ExclusiveGroup}
+        \li \l [QtLabsControls] {ExclusiveGroup}
     \row
         \li \l [QtQuickControls] {GroupBox}
 
-        \li \l [QtQuickControls2] {GroupBox}, or \l [QtQuickControls2] {Frame}
+        \li \l [QtLabsControls] {GroupBox}, or \l [QtLabsControls] {Frame}
             if a title is not required.
 
     \row
         \li \l [QtQuickControls] {Label}
-        \li \l [QtQuickControls2] {Label}
+        \li \l [QtLabsControls] {Label}
     \row
         \li \l [QtQuickControls] {ProgressBar}
-        \li \l [QtQuickControls2] {ProgressBar}
+        \li \l [QtLabsControls] {ProgressBar}
     \row
         \li \l [QtQuickControls] {RadioButton}
-        \li \l [QtQuickControls2] {RadioButton}
+        \li \l [QtLabsControls] {RadioButton}
     \row
         \li \l [QtQuickControls] {ScrollView}
-        \li \l [QtQuickControls2] {ScrollBar},
-            \l [QtQuickControls2] {ScrollIndicator}
+        \li \l [QtLabsControls] {ScrollBar},
+            \l [QtLabsControls] {ScrollIndicator}
     \row
         \li \l [QtQuickControls] {Slider}
-        \li \l [QtQuickControls2] {Slider}
+        \li \l [QtLabsControls] {Slider}
     \row
         \li \l [QtQuickControls] {SpinBox}
-        \li No equivalent; see \l [QtQuickControls2] {Tumbler} instead.
+        \li No equivalent; see \l [QtLabsControls] {Tumbler} instead.
     \row
         \li \l [QtQuickControls] {Stack},
             \l [QtQuickControls] {StackView},
             \l [QtQuickControls] {StackViewDelegate}
-        \li \l [QtQuickControls2] {StackView}
+        \li \l [QtLabsControls] {StackView}
     \row
         \li \l [QtQuickControls] {StatusBar}
         \li No equivalent
     \row
         \li \l [QtQuickControls] {Switch}
-        \li \l [QtQuickControls2] {Switch}
+        \li \l [QtLabsControls] {Switch}
     \row
         \li \l [QtQuickControls] {Tab},
             \l [QtQuickControls] {TabView}
-        \li \l [QtQuickControls2] {TabBar} in combination with, for example,
-            \l [QtQuickControls2] {SwipeView}.
+        \li \l [QtLabsControls] {TabBar} in combination with, for example,
+            \l [QtLabsControls] {SwipeView}.
     \row
         \li \l [QtQuickControls] {TableView}
         \li No equivalent
     \row
         \li \l [QtQuickControls] {TextArea}
-        \li \l [QtQuickControls2] {TextArea}
+        \li \l [QtLabsControls] {TextArea}
     \row
         \li \l [QtQuickControls] {TextField}
-        \li \l [QtQuickControls2] {TextField}
+        \li \l [QtLabsControls] {TextField}
     \row
         \li \l [QtQuickControls] {ToolBar}
-        \li \l [QtQuickControls2] {ToolBar}
+        \li \l [QtLabsControls] {ToolBar}
     \row
         \li \l [QtQuickControls] {ToolButton}
-        \li \l [QtQuickControls2] {ToolButton}
+        \li \l [QtLabsControls] {ToolButton}
     \row
         \li \l [QtQuickControls] {TreeView}
         \li No equivalent
@@ -299,7 +299,7 @@
     C++ application, doing this means you can only set window properties from
     C++.
 
-    With Qt Quick Controls 2, declare an ApplicationWindow as the root item of
+    With Qt Labs Controls, declare an ApplicationWindow as the root item of
     your application and launch it by using QQmlApplicationEngine instead.
     This ensures that you can control top level window properties from QML.
 
@@ -327,7 +327,7 @@
     available to the context of the current QML engine. See QQmlContext for
     more information.
 
-    \section2 Deploying Qt Quick Controls 2
+    \section2 Deploying Qt Labs Controls
 
     TODO
 
@@ -337,6 +337,6 @@
       \li \l{Qt Quick}
       \li \l{Qt Quick Layouts}
       \li \l{Qt Labs Calendar}
-      \li \l{Qt Quick Controls 2 QML Types}{Qt Quick Controls 2 QML Types}
+      \li \l{Qt Labs Controls QML Types}{Qt Labs Controls QML Types}
     \endlist
 */
diff --git a/src/imports/controls/doc/src/qtquickcontrols2.qdoc b/src/imports/controls/doc/src/qtlabscontrols.qdoc
index a02ab439..1ddfc967 100644
--- a/src/imports/controls/doc/src/qtquickcontrols2.qdoc
+++ b/src/imports/controls/doc/src/qtlabscontrols.qdoc
@@ -26,20 +26,20 @@
 ****************************************************************************/
 
 /*!
-    \qmlmodule QtQuick.Controls 2.0
-    \title Qt Quick Controls 2 QML Types
+    \qmlmodule Qt.labs.controls 1.0
+    \title Qt Labs Controls QML Types
     \ingroup qmlmodules
-    \brief Provides QML types for user interfaces (Qt Quick Controls 2).
+    \brief Provides QML types for user interfaces (Qt Labs Controls).
 
-    \l{Qt Quick Controls 2} provides QML types for creating user interfaces.
+    \l{Qt Labs Controls} provides QML types for creating user interfaces.
     These QML types work in conjunction with \l{Qt Quick} and
     \l{Qt Quick Layouts}.
 
-    Qt Quick Controls 2 QML types can be imported into your application
+    Qt Labs Controls QML types can be imported into your application
     using the following import statement in your .qml file:
 
     \badcode
-    import QtQuick.Controls 2.0
+    import Qt.labs.controls 1.0
     \endcode
 
     The CalendarView and related QML types can be imported using the
@@ -51,8 +51,8 @@
 
     \section1 QML Types
 
-    \section2 QtQuick.Controls Module
-    \generatelist {qmltypesbymodule QtQuick.Controls}
+    \section2 Qt.labs.controls Module
+    \generatelist {qmltypesbymodule Qt.labs.controls}
 
     \section2 Qt.labs.calendar Module
     \generatelist {qmltypesbymodule Qt.labs.calendar}
diff --git a/src/imports/controls/qmldir b/src/imports/controls/qmldir
index 38828356..9a3ca0ef 100644
--- a/src/imports/controls/qmldir
+++ b/src/imports/controls/qmldir
@@ -1,4 +1,4 @@
-module QtQuick.Controls
-plugin qtquickcontrols2plugin
-classname QtQuickControls2Plugin
+module Qt.labs.controls
+plugin qtlabscontrolsplugin
+classname QtLabsControlsPlugin
 depends QtQuick.Templates 2.0
diff --git a/src/imports/controls/qquicktheme.cpp b/src/imports/controls/qquicktheme.cpp
index 3cfbc689..395d60d7 100644
--- a/src/imports/controls/qquicktheme.cpp
+++ b/src/imports/controls/qquicktheme.cpp
@@ -3,7 +3,7 @@
 ** 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.
+** This file is part of the Qt Labs Controls module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL3$
 ** Commercial License Usage
@@ -51,7 +51,7 @@ QT_BEGIN_NAMESPACE
     \qmltype Theme
     \inherits QtObject
     \instantiates QQuickThemeAttached
-    \inqmlmodule QtQuick.Controls
+    \inqmlmodule Qt.labs.controls
     \ingroup utilities
     \brief A theme interface.
 
@@ -59,46 +59,46 @@ QT_BEGIN_NAMESPACE
 */
 
 /*!
-    \qmlattachedproperty color QtQuick.Controls::Theme::accentColor
+    \qmlattachedproperty color Qt.labs.controls::Theme::accentColor
 */
 
 /*!
-    \qmlattachedproperty color QtQuick.Controls::Theme::backgroundColor
+    \qmlattachedproperty color Qt.labs.controls::Theme::backgroundColor
 */
 
 /*!
-    \qmlattachedproperty color QtQuick.Controls::Theme::disabledColor
+    \qmlattachedproperty color Qt.labs.controls::Theme::disabledColor
 */
 
 /*!
-    \qmlattachedproperty color QtQuick.Controls::Theme::focusColor
+    \qmlattachedproperty color Qt.labs.controls::Theme::focusColor
 */
 
 /*!
-    \qmlattachedproperty color QtQuick.Controls::Theme::frameColor
+    \qmlattachedproperty color Qt.labs.controls::Theme::frameColor
 */
 
 /*!
-    \qmlattachedproperty color QtQuick.Controls::Theme::pressColor
+    \qmlattachedproperty color Qt.labs.controls::Theme::pressColor
 */
 
 /*!
-    \qmlattachedproperty color QtQuick.Controls::Theme::selectedTextColor
+    \qmlattachedproperty color Qt.labs.controls::Theme::selectedTextColor
 */
 
 /*!
-    \qmlattachedproperty color QtQuick.Controls::Theme::selectionColor
+    \qmlattachedproperty color Qt.labs.controls::Theme::selectionColor
 */
 
 /*!
-    \qmlattachedproperty color QtQuick.Controls::Theme::shadowColor
+    \qmlattachedproperty color Qt.labs.controls::Theme::shadowColor
 */
 
 /*!
-    \qmlattachedproperty color QtQuick.Controls::Theme::textColor
+    \qmlattachedproperty color Qt.labs.controls::Theme::textColor
 */
 
-Q_GLOBAL_STATIC_WITH_ARGS(QQuickThemeData, globalThemeData, (QString::fromLatin1(":/qtquickcontrols/theme.json")))
+Q_GLOBAL_STATIC_WITH_ARGS(QQuickThemeData, globalThemeData, (QString::fromLatin1(":/qtlabscontrols/theme.json")))
 
 static QQuickThemeAttached *themeInstance(QQmlEngine *engine)
 {
diff --git a/src/imports/controls/qquicktheme_p.h b/src/imports/controls/qquicktheme_p.h
index bdb6592a..02ad5619 100644
--- a/src/imports/controls/qquicktheme_p.h
+++ b/src/imports/controls/qquicktheme_p.h
@@ -3,7 +3,7 @@
 ** 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.
+** This file is part of the Qt Labs Controls module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL3$
 ** Commercial License Usage
diff --git a/src/imports/controls/qquickthemedata.cpp b/src/imports/controls/qquickthemedata.cpp
index df924860..e5624412 100644
--- a/src/imports/controls/qquickthemedata.cpp
+++ b/src/imports/controls/qquickthemedata.cpp
@@ -3,7 +3,7 @@
 ** 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.
+** This file is part of the Qt Labs Controls module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL3$
 ** Commercial License Usage
@@ -64,13 +64,13 @@ bool QQuickThemeData::load(const QString &filePath)
     QFile file(filePath);
     if (!file.open(QFile::ReadOnly | QFile::Text)) {
         qDebug() << file.error();
-        qWarning() << "QQuickTheme: failed to open ':/qtquickcontrols/theme.json': " << qPrintable(file.errorString());
+        qWarning() << "QQuickTheme: failed to open ':/qtlabscontrols/theme.json': " << qPrintable(file.errorString());
         return false;
     } else {
         QJsonParseError error;
         doc = QJsonDocument::fromJson(file.readAll(), &error);
         if (error.error != QJsonParseError::NoError) {
-            qWarning() << "QQuickTheme: failed to parse ':/qtquickcontrols/theme.json': " << qPrintable(error.errorString());
+            qWarning() << "QQuickTheme: failed to parse ':/qtlabscontrols/theme.json': " << qPrintable(error.errorString());
             return false;
         }
     }
diff --git a/src/imports/controls/qquickthemedata_p.h b/src/imports/controls/qquickthemedata_p.h
index 1e0b40bb..6154aa2a 100644
--- a/src/imports/controls/qquickthemedata_p.h
+++ b/src/imports/controls/qquickthemedata_p.h
@@ -3,7 +3,7 @@
 ** 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.
+** This file is part of the Qt Labs Controls module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL3$
 ** Commercial License Usage
diff --git a/src/imports/controls/qtquickcontrols2plugin.cpp b/src/imports/controls/qtlabscontrolsplugin.cpp
index ce8bce86..d1d88be2 100644
--- a/src/imports/controls/qtquickcontrols2plugin.cpp
+++ b/src/imports/controls/qtlabscontrolsplugin.cpp
@@ -3,7 +3,7 @@
 ** 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.
+** This file is part of the Qt Labs Controls module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL3$
 ** Commercial License Usage
@@ -44,12 +44,12 @@
 
 void initResources()
 {
-    Q_INIT_RESOURCE(qtquickcontrols2plugin);
+    Q_INIT_RESOURCE(qtlabscontrolsplugin);
 }
 
 QT_BEGIN_NAMESPACE
 
-class QtQuickControls2Plugin: public QQmlExtensionPlugin
+class QtLabsControlsPlugin: public QQmlExtensionPlugin
 {
     Q_OBJECT
     Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface/1.0")
@@ -59,44 +59,44 @@ public:
     void initializeEngine(QQmlEngine *engine, const char *uri);
 };
 
-void QtQuickControls2Plugin::registerTypes(const char *uri)
+void QtLabsControlsPlugin::registerTypes(const char *uri)
 {
-    qmlRegisterUncreatableType<QQuickThemeAttached>(uri, 2, 0, "Theme", "Theme is an attached property");
+    qmlRegisterUncreatableType<QQuickThemeAttached>(uri, 1, 0, "Theme", "Theme is an attached property");
 
-    qmlRegisterType<QQuickExclusiveGroup>(uri, 2, 0, "ExclusiveGroup");
+    qmlRegisterType<QQuickExclusiveGroup>(uri, 1, 0, "ExclusiveGroup");
     qmlRegisterType<QQuickExclusiveGroupAttached>();
 
     // TODO: read the style from application manifest file
     QFileSelector selector;
     QString base = baseUrl().toString();
-    qmlRegisterType(selector.select(QUrl(base + QStringLiteral("/ApplicationWindow.qml"))), uri, 2, 0, "ApplicationWindow");
-    qmlRegisterType(selector.select(QUrl(base + QStringLiteral("/BusyIndicator.qml"))), uri, 2, 0, "BusyIndicator");
-    qmlRegisterType(selector.select(QUrl(base + QStringLiteral("/Button.qml"))), uri, 2, 0, "Button");
-    qmlRegisterType(selector.select(QUrl(base + QStringLiteral("/CheckBox.qml"))), uri, 2, 0, "CheckBox");
-    qmlRegisterType(selector.select(QUrl(base + QStringLiteral("/Dial.qml"))), uri, 2, 0, "Dial");
-    qmlRegisterType(selector.select(QUrl(base + QStringLiteral("/Drawer.qml"))), uri, 2, 0, "Drawer");
-    qmlRegisterType(selector.select(QUrl(base + QStringLiteral("/Frame.qml"))), uri, 2, 0, "Frame");
-    qmlRegisterType(selector.select(QUrl(base + QStringLiteral("/GroupBox.qml"))), uri, 2, 0, "GroupBox");
-    qmlRegisterType(selector.select(QUrl(base + QStringLiteral("/Label.qml"))), uri, 2, 0, "Label");
-    qmlRegisterType(selector.select(QUrl(base + QStringLiteral("/PageIndicator.qml"))), uri, 2, 0, "PageIndicator");
-    qmlRegisterType(selector.select(QUrl(base + QStringLiteral("/ProgressBar.qml"))), uri, 2, 0, "ProgressBar");
-    qmlRegisterType(selector.select(QUrl(base + QStringLiteral("/RadioButton.qml"))), uri, 2, 0, "RadioButton");
-    qmlRegisterType(selector.select(QUrl(base + QStringLiteral("/ScrollBar.qml"))), uri, 2, 0, "ScrollBar");
-    qmlRegisterType(selector.select(QUrl(base + QStringLiteral("/ScrollIndicator.qml"))), uri, 2, 0, "ScrollIndicator");
-    qmlRegisterType(selector.select(QUrl(base + QStringLiteral("/Slider.qml"))), uri, 2, 0, "Slider");
-    qmlRegisterType(selector.select(QUrl(base + QStringLiteral("/StackView.qml"))), uri, 2, 0, "StackView");
-    qmlRegisterType(selector.select(QUrl(base + QStringLiteral("/SwipeView.qml"))), uri, 2, 0, "SwipeView");
-    qmlRegisterType(selector.select(QUrl(base + QStringLiteral("/Switch.qml"))), uri, 2, 0, "Switch");
-    qmlRegisterType(selector.select(QUrl(base + QStringLiteral("/TabBar.qml"))), uri, 2, 0, "TabBar");
-    qmlRegisterType(selector.select(QUrl(base + QStringLiteral("/TabButton.qml"))), uri, 2, 0, "TabButton");
-    qmlRegisterType(selector.select(QUrl(base + QStringLiteral("/TextArea.qml"))), uri, 2, 0, "TextArea");
-    qmlRegisterType(selector.select(QUrl(base + QStringLiteral("/TextField.qml"))), uri, 2, 0, "TextField");
-    qmlRegisterType(selector.select(QUrl(base + QStringLiteral("/ToolBar.qml"))), uri, 2, 0, "ToolBar");
-    qmlRegisterType(selector.select(QUrl(base + QStringLiteral("/ToolButton.qml"))), uri, 2, 0, "ToolButton");
-    qmlRegisterType(selector.select(QUrl(base + QStringLiteral("/Tumbler.qml"))), uri, 2, 0, "Tumbler");
+    qmlRegisterType(selector.select(QUrl(base + QStringLiteral("/ApplicationWindow.qml"))), uri, 1, 0, "ApplicationWindow");
+    qmlRegisterType(selector.select(QUrl(base + QStringLiteral("/BusyIndicator.qml"))), uri, 1, 0, "BusyIndicator");
+    qmlRegisterType(selector.select(QUrl(base + QStringLiteral("/Button.qml"))), uri, 1, 0, "Button");
+    qmlRegisterType(selector.select(QUrl(base + QStringLiteral("/CheckBox.qml"))), uri, 1, 0, "CheckBox");
+    qmlRegisterType(selector.select(QUrl(base + QStringLiteral("/Dial.qml"))), uri, 1, 0, "Dial");
+    qmlRegisterType(selector.select(QUrl(base + QStringLiteral("/Drawer.qml"))), uri, 1, 0, "Drawer");
+    qmlRegisterType(selector.select(QUrl(base + QStringLiteral("/Frame.qml"))), uri, 1, 0, "Frame");
+    qmlRegisterType(selector.select(QUrl(base + QStringLiteral("/GroupBox.qml"))), uri, 1, 0, "GroupBox");
+    qmlRegisterType(selector.select(QUrl(base + QStringLiteral("/Label.qml"))), uri, 1, 0, "Label");
+    qmlRegisterType(selector.select(QUrl(base + QStringLiteral("/PageIndicator.qml"))), uri, 1, 0, "PageIndicator");
+    qmlRegisterType(selector.select(QUrl(base + QStringLiteral("/ProgressBar.qml"))), uri, 1, 0, "ProgressBar");
+    qmlRegisterType(selector.select(QUrl(base + QStringLiteral("/RadioButton.qml"))), uri, 1, 0, "RadioButton");
+    qmlRegisterType(selector.select(QUrl(base + QStringLiteral("/ScrollBar.qml"))), uri, 1, 0, "ScrollBar");
+    qmlRegisterType(selector.select(QUrl(base + QStringLiteral("/ScrollIndicator.qml"))), uri, 1, 0, "ScrollIndicator");
+    qmlRegisterType(selector.select(QUrl(base + QStringLiteral("/Slider.qml"))), uri, 1, 0, "Slider");
+    qmlRegisterType(selector.select(QUrl(base + QStringLiteral("/StackView.qml"))), uri, 1, 0, "StackView");
+    qmlRegisterType(selector.select(QUrl(base + QStringLiteral("/SwipeView.qml"))), uri, 1, 0, "SwipeView");
+    qmlRegisterType(selector.select(QUrl(base + QStringLiteral("/Switch.qml"))), uri, 1, 0, "Switch");
+    qmlRegisterType(selector.select(QUrl(base + QStringLiteral("/TabBar.qml"))), uri, 1, 0, "TabBar");
+    qmlRegisterType(selector.select(QUrl(base + QStringLiteral("/TabButton.qml"))), uri, 1, 0, "TabButton");
+    qmlRegisterType(selector.select(QUrl(base + QStringLiteral("/TextArea.qml"))), uri, 1, 0, "TextArea");
+    qmlRegisterType(selector.select(QUrl(base + QStringLiteral("/TextField.qml"))), uri, 1, 0, "TextField");
+    qmlRegisterType(selector.select(QUrl(base + QStringLiteral("/ToolBar.qml"))), uri, 1, 0, "ToolBar");
+    qmlRegisterType(selector.select(QUrl(base + QStringLiteral("/ToolButton.qml"))), uri, 1, 0, "ToolButton");
+    qmlRegisterType(selector.select(QUrl(base + QStringLiteral("/Tumbler.qml"))), uri, 1, 0, "Tumbler");
 }
 
-void QtQuickControls2Plugin::initializeEngine(QQmlEngine *engine, const char *uri)
+void QtLabsControlsPlugin::initializeEngine(QQmlEngine *engine, const char *uri)
 {
     Q_UNUSED(engine);
     Q_UNUSED(uri);
@@ -105,4 +105,4 @@ void QtQuickControls2Plugin::initializeEngine(QQmlEngine *engine, const char *ur
 
 QT_END_NAMESPACE
 
-#include "qtquickcontrols2plugin.moc"
+#include "qtlabscontrolsplugin.moc"
diff --git a/src/imports/controls/qtquickcontrols2plugin.qrc b/src/imports/controls/qtlabscontrolsplugin.qrc
index 64ba7018..b71ec91c 100644
--- a/src/imports/controls/qtquickcontrols2plugin.qrc
+++ b/src/imports/controls/qtlabscontrolsplugin.qrc
@@ -1,5 +1,5 @@
 <!DOCTYPE RCC><RCC version="1.0">
-<qresource prefix="/qtquickcontrols">
+<qresource prefix="/qtlabscontrols">
     <file>theme.json</file>
 </qresource>
 <qresource>
diff --git a/src/templates/qquickabstractbutton.cpp b/src/templates/qquickabstractbutton.cpp
index 50f82e45..d431dc78 100644
--- a/src/templates/qquickabstractbutton.cpp
+++ b/src/templates/qquickabstractbutton.cpp
@@ -43,25 +43,25 @@ QT_BEGIN_NAMESPACE
     \qmltype AbstractButton
     \inherits Control
     \instantiates QQuickAbstractButton
-    \inqmlmodule QtQuick.Controls
+    \inqmlmodule Qt.labs.controls
     \qmlabstract
     \internal
 */
 
 /*!
-    \qmlsignal QtQuick.Controls::AbstractButton::pressed()
+    \qmlsignal Qt.labs.controls::AbstractButton::pressed()
 
     This signal is emitted when the button is interactively pressed by the user.
 */
 
 /*!
-    \qmlsignal QtQuick.Controls::AbstractButton::released()
+    \qmlsignal Qt.labs.controls::AbstractButton::released()
 
     This signal is emitted when the button is interactively released by the user.
 */
 
 /*!
-    \qmlsignal QtQuick.Controls::AbstractButton::canceled()
+    \qmlsignal Qt.labs.controls::AbstractButton::canceled()
 
     This signal is emitted when the button loses mouse grab
     while being pressed, or when it would emit the \l released
@@ -69,7 +69,7 @@ QT_BEGIN_NAMESPACE
 */
 
 /*!
-    \qmlsignal QtQuick.Controls::AbstractButton::clicked()
+    \qmlsignal Qt.labs.controls::AbstractButton::clicked()
 
     This signal is emitted when the button is clicked.
 */
@@ -95,7 +95,7 @@ QQuickAbstractButton::QQuickAbstractButton(QQuickAbstractButtonPrivate &dd, QQui
 }
 
 /*!
-    \qmlproperty string QtQuick.Controls::AbstractButton::text
+    \qmlproperty string Qt.labs.controls::AbstractButton::text
 
     This property holds a textual description of the button.
 
@@ -121,7 +121,7 @@ void QQuickAbstractButton::setText(const QString &text)
 }
 
 /*!
-    \qmlproperty bool QtQuick.Controls::AbstractButton::pressed
+    \qmlproperty bool Qt.labs.controls::AbstractButton::pressed
 
     This property holds whether the button is pressed.
 */
@@ -142,7 +142,7 @@ void QQuickAbstractButton::setPressed(bool isPressed)
 }
 
 /*!
-    \qmlproperty Item QtQuick.Controls::AbstractButton::label
+    \qmlproperty Item Qt.labs.controls::AbstractButton::label
 
     This property holds the label item.
 
diff --git a/src/templates/qquickapplicationwindow.cpp b/src/templates/qquickapplicationwindow.cpp
index c9a7ffcd..1ff67be6 100644
--- a/src/templates/qquickapplicationwindow.cpp
+++ b/src/templates/qquickapplicationwindow.cpp
@@ -45,7 +45,7 @@ QT_BEGIN_NAMESPACE
     \qmltype ApplicationWindow
     \inherits Window
     \instantiates QQuickApplicationWindow
-    \inqmlmodule QtQuick.Controls
+    \inqmlmodule Qt.labs.controls
     \ingroup application
     \brief Provides a top-level application window.
 
@@ -130,7 +130,7 @@ QQuickApplicationWindow::~QQuickApplicationWindow()
 }
 
 /*!
-    \qmlproperty Item QtQuick.Controls::ApplicationWindow::header
+    \qmlproperty Item Qt.labs.controls::ApplicationWindow::header
 
     A header item for the window, for example a title bar, menu or tool-bar.
     By default this property is empty, no header will be shown.
@@ -163,7 +163,7 @@ void QQuickApplicationWindow::setHeader(QQuickItem *header)
 }
 
 /*!
-    \qmlproperty Item QtQuick.Controls::ApplicationWindow::footer
+    \qmlproperty Item Qt.labs.controls::ApplicationWindow::footer
 
     A footer item for the window, for example a status bar or menu.
     By default this property is empty, no footer will be shown.
diff --git a/src/templates/qquickbusyindicator.cpp b/src/templates/qquickbusyindicator.cpp
index fb8f56d1..2c8f1f83 100644
--- a/src/templates/qquickbusyindicator.cpp
+++ b/src/templates/qquickbusyindicator.cpp
@@ -43,11 +43,11 @@ QT_BEGIN_NAMESPACE
     \qmltype BusyIndicator
     \inherits Control
     \instantiates QQuickBusyIndicator
-    \inqmlmodule QtQuick.Controls
+    \inqmlmodule Qt.labs.controls
     \ingroup indicators
     \brief A busy indicator.
 
-    \image qtquickcontrols2-busyindicator.gif
+    \image qtlabscontrols-busyindicator.gif
 
     The busy indicator should be used to indicate activity while content is
     being loaded or the UI is blocked waiting for a resource to become available.
@@ -83,7 +83,7 @@ QQuickBusyIndicator::QQuickBusyIndicator(QQuickItem *parent) :
 }
 
 /*!
-    \qmlproperty bool QtQuick.Controls::BusyIndicator::running
+    \qmlproperty bool Qt.labs.controls::BusyIndicator::running
 
     This property holds whether the busy indicator is currently indicating
     activity.
@@ -109,7 +109,7 @@ void QQuickBusyIndicator::setRunning(bool running)
 }
 
 /*!
-    \qmlproperty Item QtQuick.Controls::BusyIndicator::indicator
+    \qmlproperty Item Qt.labs.controls::BusyIndicator::indicator
 
     This property holds the \l[QML]{Item}, which graphically implements the busy indicator.
 */
diff --git a/src/templates/qquickbutton.cpp b/src/templates/qquickbutton.cpp
index 4e3e5010..77638dfe 100644
--- a/src/templates/qquickbutton.cpp
+++ b/src/templates/qquickbutton.cpp
@@ -43,11 +43,11 @@ QT_BEGIN_NAMESPACE
     \qmltype Button
     \inherits AbstractButton
     \instantiates QQuickButton
-    \inqmlmodule QtQuick.Controls
+    \inqmlmodule Qt.labs.controls
     \ingroup buttons
     \brief A button control.
 
-    \image qtquickcontrols2-button.gif
+    \image qtlabscontrols-button.gif
 
     Button presents a push-button control that can be pushed or clicked by
     the user. Buttons are normally used to perform an action, or to answer
@@ -55,13 +55,13 @@ QT_BEGIN_NAMESPACE
     \e Yes, \e No, and \e Help.
 
     \table
-    \row \li \image qtquickcontrols2-button-normal.png
+    \row \li \image qtlabscontrols-button-normal.png
          \li A button in its normal state.
-    \row \li \image qtquickcontrols2-button-pressed.png
+    \row \li \image qtlabscontrols-button-pressed.png
          \li A button that is pressed.
-    \row \li \image qtquickcontrols2-button-focused.png
+    \row \li \image qtlabscontrols-button-focused.png
          \li A button that has active focus.
-    \row \li \image qtquickcontrols2-button-disabled.png
+    \row \li \image qtlabscontrols-button-disabled.png
          \li A button that is disabled.
     \endtable
 
diff --git a/src/templates/qquickcheckable.cpp b/src/templates/qquickcheckable.cpp
index faff0073..7465c901 100644
--- a/src/templates/qquickcheckable.cpp
+++ b/src/templates/qquickcheckable.cpp
@@ -43,7 +43,7 @@ QT_BEGIN_NAMESPACE
     \qmltype Checkable
     \inherits AbstractButton
     \instantiates QQuickCheckable
-    \inqmlmodule QtQuick.Controls
+    \inqmlmodule Qt.labs.controls
     \qmlabstract
     \internal
 */
@@ -64,7 +64,7 @@ QQuickCheckable::QQuickCheckable(QQuickCheckablePrivate &dd, QQuickItem *parent)
 }
 
 /*!
-    \qmlproperty bool QtQuick.Controls::Checkable::checked
+    \qmlproperty bool Qt.labs.controls::Checkable::checked
 
     This property holds whether the control is checked.
 */
@@ -97,7 +97,7 @@ void QQuickCheckable::setExclusive(bool exclusive)
 }
 
 /*!
-    \qmlproperty Item QtQuick.Controls::Checkable::indicator
+    \qmlproperty Item Qt.labs.controls::Checkable::indicator
 
     This property holds the indicator item.
 */
@@ -123,7 +123,7 @@ void QQuickCheckable::setIndicator(QQuickItem *indicator)
 }
 
 /*!
-    \qmlmethod void QtQuick.Controls::Checkable::toggle()
+    \qmlmethod void Qt.labs.controls::Checkable::toggle()
 
     Toggles the checked state of the control.
 */
diff --git a/src/templates/qquickcheckbox.cpp b/src/templates/qquickcheckbox.cpp
index 29e0dccd..84f7076e 100644
--- a/src/templates/qquickcheckbox.cpp
+++ b/src/templates/qquickcheckbox.cpp
@@ -42,7 +42,7 @@ QT_BEGIN_NAMESPACE
     \qmltype CheckBox
     \inherits Checkable
     \instantiates QQuickCheckBox
-    \inqmlmodule QtQuick.Controls
+    \inqmlmodule Qt.labs.controls
     \ingroup buttons
     \brief A check box control.
 
@@ -51,13 +51,13 @@ QT_BEGIN_NAMESPACE
     options from a set of options.
 
     \table
-    \row \li \image qtquickcontrols2-checkbox-normal.png
+    \row \li \image qtlabscontrols-checkbox-normal.png
          \li A check box in its normal state.
-    \row \li \image qtquickcontrols2-checkbox-checked.png
+    \row \li \image qtlabscontrols-checkbox-checked.png
          \li A check box that is checked.
-    \row \li \image qtquickcontrols2-checkbox-focused.png
+    \row \li \image qtlabscontrols-checkbox-focused.png
          \li A check box that has active focus.
-    \row \li \image qtquickcontrols2-checkbox-disabled.png
+    \row \li \image qtlabscontrols-checkbox-disabled.png
          \li A check box that is disabled.
     \endtable
 
diff --git a/src/templates/qquickcontainer.cpp b/src/templates/qquickcontainer.cpp
index 4fe8a9d2..d747e55e 100644
--- a/src/templates/qquickcontainer.cpp
+++ b/src/templates/qquickcontainer.cpp
@@ -43,7 +43,7 @@ QT_BEGIN_NAMESPACE
     \qmltype Container
     \inherits Control
     \instantiates QQuickContainer
-    \inqmlmodule QtQuick.Controls
+    \inqmlmodule Qt.labs.controls
     \qmlabstract
     \internal
 */
@@ -247,7 +247,7 @@ QQuickContainer::~QQuickContainer()
 }
 
 /*!
-    \qmlproperty int QtQuick.Controls::Container::count
+    \qmlproperty int Qt.labs.controls::Container::count
     \readonly
 
     This property holds the number of items.
@@ -259,7 +259,7 @@ int QQuickContainer::count() const
 }
 
 /*!
-    \qmlmethod Item QtQuick.Controls::Container::itemAt(int index)
+    \qmlmethod Item Qt.labs.controls::Container::itemAt(int index)
 
     Returns the item at \a index, or \c null if it does not exist.
 */
@@ -270,7 +270,7 @@ QQuickItem *QQuickContainer::itemAt(int index) const
 }
 
 /*!
-    \qmlmethod void QtQuick.Controls::Container::addItem(Item item)
+    \qmlmethod void Qt.labs.controls::Container::addItem(Item item)
 
     Adds an \a item.
 */
@@ -281,7 +281,7 @@ void QQuickContainer::addItem(QQuickItem *item)
 }
 
 /*!
-    \qmlmethod void QtQuick.Controls::Container::insertItem(int index, Item item)
+    \qmlmethod void Qt.labs.controls::Container::insertItem(int index, Item item)
 
     Inserts an \a item at \a index.
 */
@@ -306,7 +306,7 @@ void QQuickContainer::insertItem(int index, QQuickItem *item)
 }
 
 /*!
-    \qmlmethod void QtQuick.Controls::Container::moveItem(int from, int to)
+    \qmlmethod void Qt.labs.controls::Container::moveItem(int from, int to)
 
     Moves an item \a from one index \a to another.
 */
@@ -324,7 +324,7 @@ void QQuickContainer::moveItem(int from, int to)
 }
 
 /*!
-    \qmlmethod void QtQuick.Controls::Container::removeItem(int index)
+    \qmlmethod void Qt.labs.controls::Container::removeItem(int index)
 
     Removes an item at \a index.
 
@@ -343,7 +343,7 @@ void QQuickContainer::removeItem(int index)
 }
 
 /*!
-    \qmlproperty model QtQuick.Controls::Container::contentModel
+    \qmlproperty model Qt.labs.controls::Container::contentModel
     \readonly
 
     This property holds the content model of items.
@@ -355,7 +355,7 @@ QVariant QQuickContainer::contentModel() const
 }
 
 /*!
-    \qmlproperty list<Object> QtQuick.Controls::Container::contentData
+    \qmlproperty list<Object> Qt.labs.controls::Container::contentData
     \default
 
     This property holds the list of content data.
@@ -373,7 +373,7 @@ QQmlListProperty<QObject> QQuickContainer::contentData()
 }
 
 /*!
-    \qmlproperty list<Item> QtQuick.Controls::Container::contentChildren
+    \qmlproperty list<Item> Qt.labs.controls::Container::contentChildren
 
     This property holds the list of content children.
 
@@ -390,7 +390,7 @@ QQmlListProperty<QQuickItem> QQuickContainer::contentChildren()
 }
 
 /*!
-    \qmlproperty int QtQuick.Controls::Container::currentIndex
+    \qmlproperty int Qt.labs.controls::Container::currentIndex
 
     TODO
 */
@@ -411,7 +411,7 @@ void QQuickContainer::setCurrentIndex(int index)
 }
 
 /*!
-    \qmlproperty Item QtQuick.Controls::Container::currentItem
+    \qmlproperty Item Qt.labs.controls::Container::currentItem
 
     TODO
 */
diff --git a/src/templates/qquickcontrol.cpp b/src/templates/qquickcontrol.cpp
index bd45f47b..06a11b13 100644
--- a/src/templates/qquickcontrol.cpp
+++ b/src/templates/qquickcontrol.cpp
@@ -55,7 +55,7 @@ QT_BEGIN_NAMESPACE
     \qmltype Control
     \inherits Item
     \instantiates QQuickControl
-    \inqmlmodule QtQuick.Controls
+    \inqmlmodule Qt.labs.controls
     \brief A user interface control.
 
     Control is the base type of user interface controls.
@@ -335,7 +335,7 @@ void QQuickControl::resetFont()
 }
 
 /*!
-    \qmlproperty real QtQuick.Controls::Control::availableWidth
+    \qmlproperty real Qt.labs.controls::Control::availableWidth
 
     This property holds the width available after deducting horizontal padding.
 
@@ -347,7 +347,7 @@ qreal QQuickControl::availableWidth() const
 }
 
 /*!
-    \qmlproperty real QtQuick.Controls::Control::availableHeight
+    \qmlproperty real Qt.labs.controls::Control::availableHeight
 
     This property holds the height available after deducting vertical padding.
 
@@ -359,7 +359,7 @@ qreal QQuickControl::availableHeight() const
 }
 
 /*!
-    \qmlproperty real QtQuick.Controls::Control::padding
+    \qmlproperty real Qt.labs.controls::Control::padding
 
     This property holds the default padding.
 
@@ -401,7 +401,7 @@ void QQuickControl::resetPadding()
 }
 
 /*!
-    \qmlproperty real QtQuick.Controls::Control::topPadding
+    \qmlproperty real Qt.labs.controls::Control::topPadding
 
     This property holds the top padding.
 
@@ -428,7 +428,7 @@ void QQuickControl::resetTopPadding()
 }
 
 /*!
-    \qmlproperty real QtQuick.Controls::Control::leftPadding
+    \qmlproperty real Qt.labs.controls::Control::leftPadding
 
     This property holds the left padding.
 
@@ -455,7 +455,7 @@ void QQuickControl::resetLeftPadding()
 }
 
 /*!
-    \qmlproperty real QtQuick.Controls::Control::rightPadding
+    \qmlproperty real Qt.labs.controls::Control::rightPadding
 
     This property holds the right padding.
 
@@ -482,7 +482,7 @@ void QQuickControl::resetRightPadding()
 }
 
 /*!
-    \qmlproperty real QtQuick.Controls::Control::bottomPadding
+    \qmlproperty real Qt.labs.controls::Control::bottomPadding
 
     This property holds the bottom padding.
 
@@ -509,7 +509,7 @@ void QQuickControl::resetBottomPadding()
 }
 
 /*!
-    \qmlproperty real QtQuick.Controls::Control::spacing
+    \qmlproperty real Qt.labs.controls::Control::spacing
 
     This property holds the spacing.
 */
@@ -534,7 +534,7 @@ void QQuickControl::resetSpacing()
 }
 
 /*!
-    \qmlproperty enumeration QtQuick.Controls::Control::layoutDirection
+    \qmlproperty enumeration Qt.labs.controls::Control::layoutDirection
 
     This property holds the layout direction of the control.
 
@@ -555,7 +555,7 @@ Qt::LayoutDirection QQuickControl::layoutDirection() const
 }
 
 /*!
-    \qmlproperty enumeration QtQuick.Controls::Control::effectiveLayoutDirection
+    \qmlproperty enumeration Qt.labs.controls::Control::effectiveLayoutDirection
     \readonly
 
     This property holds the effective layout direction of the control.
@@ -585,7 +585,7 @@ void QQuickControl::setLayoutDirection(Qt::LayoutDirection direction)
 }
 
 /*!
-    \qmlproperty bool QtQuick.Controls::Control::mirrored
+    \qmlproperty bool Qt.labs.controls::Control::mirrored
     \readonly
 
     This property holds whether the control is mirrored.
@@ -601,7 +601,7 @@ bool QQuickControl::isMirrored() const
 }
 
 /*!
-    \qmlproperty Item QtQuick.Controls::Control::background
+    \qmlproperty Item Qt.labs.controls::Control::background
 
     This property holds the background item.
 
@@ -633,7 +633,7 @@ void QQuickControl::setBackground(QQuickItem *background)
 }
 
 /*!
-    \qmlproperty Item QtQuick.Controls::Control::contentItem
+    \qmlproperty Item Qt.labs.controls::Control::contentItem
 
     TODO
 */
diff --git a/src/templates/qquickdial.cpp b/src/templates/qquickdial.cpp
index c1c0cc20..f2f54a50 100644
--- a/src/templates/qquickdial.cpp
+++ b/src/templates/qquickdial.cpp
@@ -46,7 +46,7 @@ QT_BEGIN_NAMESPACE
     \qmltype Dial
     \inherits Control
     \instantiates QQuickDial
-    \inqmlmodule QtQuick.Controls
+    \inqmlmodule Qt.labs.controls
     \ingroup sliders
     \brief A circular dial that is rotated to set a value.
 
@@ -168,7 +168,7 @@ QQuickDial::QQuickDial(QQuickItem *parent) :
 }
 
 /*!
-    \qmlproperty real QtQuick.Controls::Dial::from
+    \qmlproperty real Qt.labs.controls::Dial::from
 
     This property holds the starting value for the range. The default value is \c 0.0.
 
@@ -194,7 +194,7 @@ void QQuickDial::setFrom(qreal from)
 }
 
 /*!
-    \qmlproperty real QtQuick.Controls::Dial::to
+    \qmlproperty real Qt.labs.controls::Dial::to
 
     This property holds the end value for the range. The default value is
     \c 1.0.
@@ -221,7 +221,7 @@ void QQuickDial::setTo(qreal to)
 }
 
 /*!
-    \qmlproperty real QtQuick.Controls::Dial::value
+    \qmlproperty real Qt.labs.controls::Dial::value
 
     This property holds the value in the range \c from - \c to. The default
     value is \c 0.0.
@@ -252,7 +252,7 @@ void QQuickDial::setValue(qreal value)
 }
 
 /*!
-    \qmlproperty real QtQuick.Controls::Dial::position
+    \qmlproperty real Qt.labs.controls::Dial::position
 
     This property holds the logical position of the handle.
 
@@ -270,7 +270,7 @@ qreal QQuickDial::position() const
 }
 
 /*!
-    \qmlproperty real QtQuick.Controls::Dial::angle \readonly
+    \qmlproperty real Qt.labs.controls::Dial::angle \readonly
 
     This property holds the angle of the handle.
 
@@ -286,7 +286,7 @@ qreal QQuickDial::angle() const
 }
 
 /*!
-    \qmlproperty real QtQuick.Controls::Dial::stepSize
+    \qmlproperty real Qt.labs.controls::Dial::stepSize
 
     This property holds the step size. The default value is \c 0.0.
 
@@ -308,7 +308,7 @@ void QQuickDial::setStepSize(qreal step)
 }
 
 /*!
-    \qmlproperty enumeration QtQuick.Controls::Dial::snapMode
+    \qmlproperty enumeration Qt.labs.controls::Dial::snapMode
 
     This property holds the snap mode.
 
@@ -340,7 +340,7 @@ void QQuickDial::setSnapMode(SnapMode mode)
 }
 
 /*!
-    \qmlproperty bool QtQuick.Controls::Dial::pressed
+    \qmlproperty bool Qt.labs.controls::Dial::pressed
 
     This property holds whether the dial is pressed.
 
@@ -374,7 +374,7 @@ void QQuickDial::setPressed(bool pressed)
 }
 
 /*!
-    \qmlmethod void QtQuick.Controls::Dial::increase()
+    \qmlmethod void Qt.labs.controls::Dial::increase()
 
     Increases the value by \l stepSize, or \c 0.1 if stepSize is not defined.
 
@@ -388,7 +388,7 @@ void QQuickDial::increase()
 }
 
 /*!
-    \qmlmethod void QtQuick.Controls::Dial::decrease()
+    \qmlmethod void Qt.labs.controls::Dial::decrease()
 
     Decreases the value by \l stepSize, or \c 0.1 if stepSize is not defined.
 
@@ -402,7 +402,7 @@ void QQuickDial::decrease()
 }
 
 /*!
-    \qmlproperty component QtQuick.Controls::Dial::handle
+    \qmlproperty component Qt.labs.controls::Dial::handle
 
     This property holds the handle of the dial.
 
diff --git a/src/templates/qquickexclusivegroup.cpp b/src/templates/qquickexclusivegroup.cpp
index 8ac6d3b4..aa3cbf16 100644
--- a/src/templates/qquickexclusivegroup.cpp
+++ b/src/templates/qquickexclusivegroup.cpp
@@ -46,7 +46,7 @@ QT_BEGIN_NAMESPACE
     \qmltype ExclusiveGroup
     \inherits QtObject
     \instantiates QQuickExclusiveGroup
-    \inqmlmodule QtQuick.Controls
+    \inqmlmodule Qt.labs.controls
     \ingroup utilities
     \brief An exclusive group of checkable controls.
 
@@ -221,7 +221,7 @@ QQuickExclusiveGroupAttached *QQuickExclusiveGroup::qmlAttachedProperties(QObjec
 }
 
 /*!
-    \qmlproperty QtObject QtQuick.Controls::ExclusiveGroup::current
+    \qmlproperty QtObject Qt.labs.controls::ExclusiveGroup::current
 
     This property holds the currently selected object or \c null if there is none.
 
@@ -247,7 +247,7 @@ void QQuickExclusiveGroup::setCurrent(QObject *current)
 }
 
 /*!
-    \qmlproperty list<Object> QtQuick.Controls::ExclusiveGroup::checkables
+    \qmlproperty list<Object> Qt.labs.controls::ExclusiveGroup::checkables
     \default
 
     This property holds the list of checkables.
@@ -284,7 +284,7 @@ QQmlListProperty<QObject> QQuickExclusiveGroup::checkables()
 }
 
 /*!
-    \qmlmethod void QtQuick.Controls::ExclusiveGroup::addCheckable(QtObject object)
+    \qmlmethod void Qt.labs.controls::ExclusiveGroup::addCheckable(QtObject object)
 
     Adds an \a object to the exclusive group.
 
@@ -316,7 +316,7 @@ void QQuickExclusiveGroup::addCheckable(QObject *object)
 }
 
 /*!
-    \qmlmethod void QtQuick.Controls::ExclusiveGroup::removeCheckable(QtObject object)
+    \qmlmethod void Qt.labs.controls::ExclusiveGroup::removeCheckable(QtObject object)
 
     Removes an \a object from the exclusive group.
 
@@ -359,7 +359,7 @@ QQuickExclusiveGroupAttached::QQuickExclusiveGroupAttached(QObject *parent) :
 }
 
 /*!
-    \qmlattachedproperty ExclusiveGroup QtQuick.Controls::ExclusiveGroup::group
+    \qmlattachedproperty ExclusiveGroup Qt.labs.controls::ExclusiveGroup::group
 
     This property attaches a checkable control or object to an exclusive group.
 
diff --git a/src/templates/qquickframe.cpp b/src/templates/qquickframe.cpp
index 824b7b56..743514c1 100644
--- a/src/templates/qquickframe.cpp
+++ b/src/templates/qquickframe.cpp
@@ -43,7 +43,7 @@ QT_BEGIN_NAMESPACE
     \qmltype Frame
     \inherits Control
     \instantiates QQuickFrame
-    \inqmlmodule QtQuick.Controls
+    \inqmlmodule Qt.labs.controls
     \ingroup containers
     \brief A frame control.
 
@@ -87,7 +87,7 @@ QQuickFrame::QQuickFrame(QQuickFramePrivate &dd, QQuickItem *parent) :
 }
 
 /*!
-    \qmlproperty real QtQuick.Controls::Frame::contentWidth
+    \qmlproperty real Qt.labs.controls::Frame::contentWidth
 
     This property holds the content width. It is used for calculating the
     total implicit width of the frame.
@@ -111,7 +111,7 @@ void QQuickFrame::setContentWidth(qreal width)
 }
 
 /*!
-    \qmlproperty real QtQuick.Controls::Frame::contentHeight
+    \qmlproperty real Qt.labs.controls::Frame::contentHeight
 
     This property holds the content height. It is used for calculating the
     total implicit height of the frame.
@@ -135,7 +135,7 @@ void QQuickFrame::setContentHeight(qreal height)
 }
 
 /*!
-    \qmlproperty Item QtQuick.Controls::Frame::frame
+    \qmlproperty Item Qt.labs.controls::Frame::frame
 
     This property holds the visual frame item.
 
@@ -160,7 +160,7 @@ void QQuickFrame::setFrame(QQuickItem *frame)
 }
 
 /*!
-    \qmlproperty list<Object> QtQuick.Controls::Frame::contentData
+    \qmlproperty list<Object> Qt.labs.controls::Frame::contentData
     \default
 
     This property holds the list of content data.
@@ -178,7 +178,7 @@ QQmlListProperty<QObject> QQuickFrame::contentData()
 }
 
 /*!
-    \qmlproperty list<Item> QtQuick.Controls::Frame::contentChildren
+    \qmlproperty list<Item> Qt.labs.controls::Frame::contentChildren
 
     This property holds the list of content children.
 
diff --git a/src/templates/qquickgroupbox.cpp b/src/templates/qquickgroupbox.cpp
index 735b7e05..30cede12 100644
--- a/src/templates/qquickgroupbox.cpp
+++ b/src/templates/qquickgroupbox.cpp
@@ -43,7 +43,7 @@ QT_BEGIN_NAMESPACE
     \qmltype GroupBox
     \inherits Frame
     \instantiates QQuickGroupBox
-    \inqmlmodule QtQuick.Controls
+    \inqmlmodule Qt.labs.controls
     \ingroup containers
     \brief A group box control.
 
@@ -88,7 +88,7 @@ QQuickGroupBox::QQuickGroupBox(QQuickItem *parent) :
 }
 
 /*!
-    \qmlproperty string QtQuick.Controls::GroupBox::title
+    \qmlproperty string Qt.labs.controls::GroupBox::title
 
     This property holds the title.
 */
@@ -108,7 +108,7 @@ void QQuickGroupBox::setTitle(const QString &title)
 }
 
 /*!
-    \qmlproperty Item QtQuick.Controls::GroupBox::label
+    \qmlproperty Item Qt.labs.controls::GroupBox::label
 
     This property holds the label item that visualizes \l title.
 
diff --git a/src/templates/qquickpageindicator.cpp b/src/templates/qquickpageindicator.cpp
index 3f5d9c9e..c3660cf4 100644
--- a/src/templates/qquickpageindicator.cpp
+++ b/src/templates/qquickpageindicator.cpp
@@ -43,7 +43,7 @@ QT_BEGIN_NAMESPACE
     \qmltype PageIndicator
     \inherits Control
     \instantiates QQuickPageIndicator
-    \inqmlmodule QtQuick.Controls
+    \inqmlmodule Qt.labs.controls
     \ingroup indicators
     \brief A page indicator control.
 
@@ -122,7 +122,7 @@ QQuickPageIndicator::QQuickPageIndicator(QQuickItem *parent) :
 }
 
 /*!
-    \qmlproperty int QtQuick.Controls::PageIndicator::count
+    \qmlproperty int Qt.labs.controls::PageIndicator::count
 
     This property holds the number of pages.
 */
@@ -142,7 +142,7 @@ void QQuickPageIndicator::setCount(int count)
 }
 
 /*!
-    \qmlproperty int QtQuick.Controls::PageIndicator::currentIndex
+    \qmlproperty int Qt.labs.controls::PageIndicator::currentIndex
 
     This property holds the index of the current page.
 */
@@ -162,7 +162,7 @@ void QQuickPageIndicator::setCurrentIndex(int index)
 }
 
 /*!
-    \qmlproperty bool QtQuick.Controls::PageIndicator::interactive
+    \qmlproperty bool Qt.labs.controls::PageIndicator::interactive
 
     This property holds whether the control is interactive. An interactive page indicator
     reacts to presses and automatically changes the \l {currentIndex}{current index}
@@ -187,7 +187,7 @@ void QQuickPageIndicator::setInteractive(bool interactive)
 }
 
 /*!
-    \qmlproperty Component QtQuick.Controls::PageIndicator::delegate
+    \qmlproperty Component Qt.labs.controls::PageIndicator::delegate
 
     This property holds a delegate that presents a page.
 
@@ -215,7 +215,7 @@ void QQuickPageIndicator::setDelegate(QQmlComponent *delegate)
 }
 
 /*!
-    \qmlproperty color QtQuick.Controls::PageIndicator::color
+    \qmlproperty color Qt.labs.controls::PageIndicator::color
 
     This property holds the color of the indicator.
 
diff --git a/src/templates/qquickprogressbar.cpp b/src/templates/qquickprogressbar.cpp
index 5ce7894b..a0dc2779 100644
--- a/src/templates/qquickprogressbar.cpp
+++ b/src/templates/qquickprogressbar.cpp
@@ -43,16 +43,16 @@ QT_BEGIN_NAMESPACE
     \qmltype ProgressBar
     \inherits Control
     \instantiates QQuickProgressBar
-    \inqmlmodule QtQuick.Controls
+    \inqmlmodule Qt.labs.controls
     \ingroup indicators
     \brief A progress bar control.
 
     ProgressBar indicates the progress of an operation.
 
     \table
-    \row \li \image qtquickcontrols2-progressbar-normal.png
+    \row \li \image qtlabscontrols-progressbar-normal.png
          \li A progress bar in its normal state.
-    \row \li \image qtquickcontrols2-progressbar-disabled.png
+    \row \li \image qtlabscontrols-progressbar-disabled.png
          \li A progress bar that is disabled.
     \endtable
 
@@ -84,7 +84,7 @@ QQuickProgressBar::QQuickProgressBar(QQuickItem *parent) :
 }
 
 /*!
-    \qmlproperty real QtQuick.Controls::ProgressBar::from
+    \qmlproperty real Qt.labs.controls::ProgressBar::from
 
     This property holds the starting value for the progress. The default value is \c 0.0.
 
@@ -110,7 +110,7 @@ void QQuickProgressBar::setFrom(qreal from)
 }
 
 /*!
-    \qmlproperty real QtQuick.Controls::ProgressBar::to
+    \qmlproperty real Qt.labs.controls::ProgressBar::to
 
     This property holds the end value for the progress. The default value is \c 1.0.
 
@@ -136,7 +136,7 @@ void QQuickProgressBar::setTo(qreal to)
 }
 
 /*!
-    \qmlproperty real QtQuick.Controls::ProgressBar::value
+    \qmlproperty real Qt.labs.controls::ProgressBar::value
 
     This property holds the progress value. The default value is \c 0.0.
 
@@ -163,7 +163,7 @@ void QQuickProgressBar::setValue(qreal value)
 }
 
 /*!
-    \qmlproperty real QtQuick.Controls::ProgressBar::position
+    \qmlproperty real Qt.labs.controls::ProgressBar::position
     \readonly
 
     This property holds the logical position of the progress.
@@ -183,7 +183,7 @@ qreal QQuickProgressBar::position() const
 }
 
 /*!
-    \qmlproperty real QtQuick.Controls::ProgressBar::visualPosition
+    \qmlproperty real Qt.labs.controls::ProgressBar::visualPosition
     \readonly
 
     This property holds the visual position of the progress.
@@ -203,7 +203,7 @@ qreal QQuickProgressBar::visualPosition() const
 }
 
 /*!
-    \qmlproperty bool QtQuick.Controls::ProgressBar::indeterminate
+    \qmlproperty bool Qt.labs.controls::ProgressBar::indeterminate
 
     This property holds whether the progress bar is in an indeterminate mode.
 */
@@ -223,7 +223,7 @@ void QQuickProgressBar::setIndeterminate(bool indeterminate)
 }
 
 /*!
-    \qmlproperty Item QtQuick.Controls::ProgressBar::indicator
+    \qmlproperty Item Qt.labs.controls::ProgressBar::indicator
 
     This property holds the indicator item.
 
diff --git a/src/templates/qquickradiobutton.cpp b/src/templates/qquickradiobutton.cpp
index 6a2ca887..70aed7e2 100644
--- a/src/templates/qquickradiobutton.cpp
+++ b/src/templates/qquickradiobutton.cpp
@@ -42,7 +42,7 @@ QT_BEGIN_NAMESPACE
     \qmltype RadioButton
     \inherits Checkable
     \instantiates QQuickRadioButton
-    \inqmlmodule QtQuick.Controls
+    \inqmlmodule Qt.labs.controls
     \ingroup buttons
     \brief A radio button control.
 
@@ -51,13 +51,13 @@ QT_BEGIN_NAMESPACE
     from a set of options.
 
     \table
-    \row \li \image qtquickcontrols2-radiobutton-normal.png
+    \row \li \image qtlabscontrols-radiobutton-normal.png
          \li A radio button in its normal state.
-    \row \li \image qtquickcontrols2-radiobutton-checked.png
+    \row \li \image qtlabscontrols-radiobutton-checked.png
          \li A radio button that is checked.
-    \row \li \image qtquickcontrols2-radiobutton-focused.png
+    \row \li \image qtlabscontrols-radiobutton-focused.png
          \li A radio button that has active focus.
-    \row \li \image qtquickcontrols2-radiobutton-disabled.png
+    \row \li \image qtlabscontrols-radiobutton-disabled.png
          \li A radio button that is disabled.
     \endtable
 
diff --git a/src/templates/qquickscrollbar.cpp b/src/templates/qquickscrollbar.cpp
index 8f194911..e21b613b 100644
--- a/src/templates/qquickscrollbar.cpp
+++ b/src/templates/qquickscrollbar.cpp
@@ -46,7 +46,7 @@ QT_BEGIN_NAMESPACE
     \qmltype ScrollBar
     \inherits Control
     \instantiates QQuickScrollBar
-    \inqmlmodule QtQuick.Controls
+    \inqmlmodule Qt.labs.controls
     \ingroup indicators
     \ingroup sliders
     \brief An interactive scroll bar control.
@@ -119,7 +119,7 @@ QQuickScrollBarAttached *QQuickScrollBar::qmlAttachedProperties(QObject *object)
 }
 
 /*!
-    \qmlproperty real QtQuick.Controls::ScrollBar::size
+    \qmlproperty real Qt.labs.controls::ScrollBar::size
 
     This property holds the size of the scroll bar, scaled to \c {0.0 - 1.0}.
 
@@ -141,7 +141,7 @@ void QQuickScrollBar::setSize(qreal size)
 }
 
 /*!
-    \qmlproperty real QtQuick.Controls::ScrollBar::position
+    \qmlproperty real Qt.labs.controls::ScrollBar::position
 
     This property holds the position of the scroll bar, scaled to \c {0.0 - 1.0}.
 
@@ -163,7 +163,7 @@ void QQuickScrollBar::setPosition(qreal position)
 }
 
 /*!
-    \qmlproperty bool QtQuick.Controls::ScrollBar::active
+    \qmlproperty bool Qt.labs.controls::ScrollBar::active
 
     This property holds whether the scroll bar is active ie. when its \l pressed
     or the attached Flickable is \l {Flickable::moving}{moving}.
@@ -184,7 +184,7 @@ void QQuickScrollBar::setActive(bool active)
 }
 
 /*!
-    \qmlproperty bool QtQuick.Controls::ScrollBar::pressed
+    \qmlproperty bool Qt.labs.controls::ScrollBar::pressed
 
     This property holds whether the scroll bar is pressed.
 */
@@ -206,7 +206,7 @@ void QQuickScrollBar::setPressed(bool pressed)
 }
 
 /*!
-    \qmlproperty enumeration QtQuick.Controls::ScrollBar::orientation
+    \qmlproperty enumeration Qt.labs.controls::ScrollBar::orientation
 
     This property holds the orientation of the scroll bar.
 
@@ -232,7 +232,7 @@ void QQuickScrollBar::setOrientation(Qt::Orientation orientation)
 }
 
 /*!
-    \qmlproperty Item QtQuick.Controls::ScrollBar::handle
+    \qmlproperty Item Qt.labs.controls::ScrollBar::handle
 
     This property holds the handle item.
 
@@ -383,7 +383,7 @@ QQuickScrollBarAttached::QQuickScrollBarAttached(QQuickFlickable *flickable) :
 }
 
 /*!
-    \qmlattachedproperty ScrollBar QtQuick.Controls::ScrollBar::horizontal
+    \qmlattachedproperty ScrollBar Qt.labs.controls::ScrollBar::horizontal
 
     This property attaches a horizontal scroll bar to a \l Flickable.
 
@@ -437,7 +437,7 @@ void QQuickScrollBarAttached::setHorizontal(QQuickScrollBar *horizontal)
 }
 
 /*!
-    \qmlattachedproperty ScrollBar QtQuick.Controls::ScrollBar::vertical
+    \qmlattachedproperty ScrollBar Qt.labs.controls::ScrollBar::vertical
 
     This property attaches a vertical scroll bar to a \l Flickable.
 
diff --git a/src/templates/qquickscrollindicator.cpp b/src/templates/qquickscrollindicator.cpp
index 201513c1..a1979798 100644
--- a/src/templates/qquickscrollindicator.cpp
+++ b/src/templates/qquickscrollindicator.cpp
@@ -46,7 +46,7 @@ QT_BEGIN_NAMESPACE
     \qmltype ScrollIndicator
     \inherits Control
     \instantiates QQuickScrollIndicator
-    \inqmlmodule QtQuick.Controls
+    \inqmlmodule Qt.labs.controls
     \ingroup indicators
     \brief A non-interactive scroll indicator control.
 
@@ -107,7 +107,7 @@ QQuickScrollIndicatorAttached *QQuickScrollIndicator::qmlAttachedProperties(QObj
 }
 
 /*!
-    \qmlproperty real QtQuick.Controls::ScrollIndicator::size
+    \qmlproperty real Qt.labs.controls::ScrollIndicator::size
 
     This property holds the size of the indicator, scaled to \c {0.0 - 1.0}.
 
@@ -129,7 +129,7 @@ void QQuickScrollIndicator::setSize(qreal size)
 }
 
 /*!
-    \qmlproperty real QtQuick.Controls::ScrollIndicator::position
+    \qmlproperty real Qt.labs.controls::ScrollIndicator::position
 
     This property holds the position of the indicator, scaled to \c {0.0 - 1.0}.
 
@@ -151,7 +151,7 @@ void QQuickScrollIndicator::setPosition(qreal position)
 }
 
 /*!
-    \qmlproperty bool QtQuick.Controls::ScrollIndicator::active
+    \qmlproperty bool Qt.labs.controls::ScrollIndicator::active
 
     This property holds whether the indicator is active, that is, when the
     attached Flickable is \l {Flickable::moving}{moving}.
@@ -172,7 +172,7 @@ void QQuickScrollIndicator::setActive(bool active)
 }
 
 /*!
-    \qmlproperty enumeration QtQuick.Controls::ScrollIndicator::orientation
+    \qmlproperty enumeration Qt.labs.controls::ScrollIndicator::orientation
 
     This property holds the orientation of the indicator.
 
@@ -198,7 +198,7 @@ void QQuickScrollIndicator::setOrientation(Qt::Orientation orientation)
 }
 
 /*!
-    \qmlproperty Item QtQuick.Controls::ScrollIndicator::indicator
+    \qmlproperty Item Qt.labs.controls::ScrollIndicator::indicator
 
     This property holds the indicator item.
 
@@ -280,7 +280,7 @@ QQuickScrollIndicatorAttached::QQuickScrollIndicatorAttached(QQuickFlickable *fl
 }
 
 /*!
-    \qmlattachedproperty ScrollIndicator QtQuick.Controls::ScrollIndicator::horizontal
+    \qmlattachedproperty ScrollIndicator Qt.labs.controls::ScrollIndicator::horizontal
 
     This property attaches a horizontal scroll indicator to a \l Flickable.
 
@@ -332,7 +332,7 @@ void QQuickScrollIndicatorAttached::setHorizontal(QQuickScrollIndicator *horizon
 }
 
 /*!
-    \qmlattachedproperty ScrollIndicator QtQuick.Controls::ScrollIndicator::vertical
+    \qmlattachedproperty ScrollIndicator Qt.labs.controls::ScrollIndicator::vertical
 
     This property attaches a vertical scroll indicator to a \l Flickable.
 
diff --git a/src/templates/qquickslider.cpp b/src/templates/qquickslider.cpp
index ecd8a4ea..dcac1799 100644
--- a/src/templates/qquickslider.cpp
+++ b/src/templates/qquickslider.cpp
@@ -45,20 +45,20 @@ QT_BEGIN_NAMESPACE
     \qmltype Slider
     \inherits Control
     \instantiates QQuickSlider
-    \inqmlmodule QtQuick.Controls
+    \inqmlmodule Qt.labs.controls
     \ingroup sliders
     \brief A slider control.
 
-    \image qtquickcontrols2-slider.gif
+    \image qtlabscontrols-slider.gif
 
     Slider is used to select a value by sliding a handle along a track.
 
     \table
-    \row \li \image qtquickcontrols2-slider-normal.png
+    \row \li \image qtlabscontrols-slider-normal.png
          \li A slider in its normal state.
-    \row \li \image qtquickcontrols2-slider-focused.png
+    \row \li \image qtlabscontrols-slider-focused.png
          \li A slider that has active focus.
-    \row \li \image qtquickcontrols2-slider-disabled.png
+    \row \li \image qtlabscontrols-slider-disabled.png
          \li A slider that is disabled.
     \endtable
 
@@ -162,7 +162,7 @@ QQuickSlider::QQuickSlider(QQuickItem *parent) :
 }
 
 /*!
-    \qmlproperty real QtQuick.Controls::Slider::from
+    \qmlproperty real Qt.labs.controls::Slider::from
 
     This property holds the starting value for the range. The default value is \c 0.0.
 
@@ -188,7 +188,7 @@ void QQuickSlider::setFrom(qreal from)
 }
 
 /*!
-    \qmlproperty real QtQuick.Controls::Slider::to
+    \qmlproperty real Qt.labs.controls::Slider::to
 
     This property holds the end value for the range. The default value is \c 1.0.
 
@@ -214,7 +214,7 @@ void QQuickSlider::setTo(qreal to)
 }
 
 /*!
-    \qmlproperty real QtQuick.Controls::Slider::value
+    \qmlproperty real Qt.labs.controls::Slider::value
 
     This property holds the value in the range \c from - \c to. The default value is \c 0.0.
 
@@ -244,7 +244,7 @@ void QQuickSlider::setValue(qreal value)
 }
 
 /*!
-    \qmlproperty real QtQuick.Controls::Slider::position
+    \qmlproperty real Qt.labs.controls::Slider::position
 
     This property holds the logical position of the handle.
 
@@ -262,7 +262,7 @@ qreal QQuickSlider::position() const
 }
 
 /*!
-    \qmlproperty real QtQuick.Controls::Slider::visualPosition
+    \qmlproperty real Qt.labs.controls::Slider::visualPosition
     \readonly
 
     This property holds the visual position of the handle.
@@ -283,7 +283,7 @@ qreal QQuickSlider::visualPosition() const
 }
 
 /*!
-    \qmlproperty real QtQuick.Controls::Slider::stepSize
+    \qmlproperty real Qt.labs.controls::Slider::stepSize
 
     This property holds the step size. The default value is \c 0.0.
 
@@ -305,7 +305,7 @@ void QQuickSlider::setStepSize(qreal step)
 }
 
 /*!
-    \qmlproperty enumeration QtQuick.Controls::Slider::snapMode
+    \qmlproperty enumeration Qt.labs.controls::Slider::snapMode
 
     This property holds the snap mode.
 
@@ -334,7 +334,7 @@ void QQuickSlider::setSnapMode(SnapMode mode)
 }
 
 /*!
-    \qmlproperty bool QtQuick.Controls::Slider::pressed
+    \qmlproperty bool Qt.labs.controls::Slider::pressed
 
     This property holds whether the slider is pressed.
 */
@@ -355,7 +355,7 @@ void QQuickSlider::setPressed(bool pressed)
 }
 
 /*!
-    \qmlproperty enumeration QtQuick.Controls::Slider::orientation
+    \qmlproperty enumeration Qt.labs.controls::Slider::orientation
 
     This property holds the orientation.
 
@@ -381,7 +381,7 @@ void QQuickSlider::setOrientation(Qt::Orientation orientation)
 }
 
 /*!
-    \qmlproperty Item QtQuick.Controls::Slider::handle
+    \qmlproperty Item Qt.labs.controls::Slider::handle
 
     This property holds the handle item.
 
@@ -406,7 +406,7 @@ void QQuickSlider::setHandle(QQuickItem *handle)
 }
 
 /*!
-    \qmlproperty Item QtQuick.Controls::Slider::track
+    \qmlproperty Item Qt.labs.controls::Slider::track
 
     This property holds the track item.
 
@@ -431,7 +431,7 @@ void QQuickSlider::setTrack(QQuickItem *track)
 }
 
 /*!
-    \qmlmethod void QtQuick.Controls::Slider::increase()
+    \qmlmethod void Qt.labs.controls::Slider::increase()
 
     Increases the value by \l stepSize or \c 0.1 if stepSize is not defined.
 
@@ -445,7 +445,7 @@ void QQuickSlider::increase()
 }
 
 /*!
-    \qmlmethod void QtQuick.Controls::Slider::decrease()
+    \qmlmethod void Qt.labs.controls::Slider::decrease()
 
     Decreases the value by \l stepSize or \c 0.1 if stepSize is not defined.
 
diff --git a/src/templates/qquickstackview.cpp b/src/templates/qquickstackview.cpp
index 2e7def03..d428aec5 100644
--- a/src/templates/qquickstackview.cpp
+++ b/src/templates/qquickstackview.cpp
@@ -47,7 +47,7 @@ QT_BEGIN_NAMESPACE
     \qmltype StackView
     \inherits Control
     \instantiates QQuickStackView
-    \inqmlmodule QtQuick.Controls
+    \inqmlmodule Qt.labs.controls
     \ingroup navigation
     \brief Provides a stack-based navigation model.
 
@@ -284,7 +284,7 @@ QQuickStackAttached *QQuickStackView::qmlAttachedProperties(QObject *object)
 }
 
 /*!
-    \qmlproperty bool QtQuick.Controls::StackView::busy
+    \qmlproperty bool Qt.labs.controls::StackView::busy
     \readonly
     This property holds whether a transition is running.
 */
@@ -295,7 +295,7 @@ bool QQuickStackView::busy() const
 }
 
 /*!
-    \qmlproperty int QtQuick.Controls::StackView::depth
+    \qmlproperty int Qt.labs.controls::StackView::depth
     \readonly
     This property holds the number of items currently pushed onto the stack.
 */
@@ -306,7 +306,7 @@ int QQuickStackView::depth() const
 }
 
 /*!
-    \qmlproperty Item QtQuick.Controls::StackView::currentItem
+    \qmlproperty Item Qt.labs.controls::StackView::currentItem
     \readonly
     This property holds the current top-most item in the stack.
 */
@@ -317,7 +317,7 @@ QQuickItem *QQuickStackView::currentItem() const
 }
 
 /*!
-    \qmlmethod Item QtQuick.Controls::StackView::get(index, behavior = DontLoad)
+    \qmlmethod Item Qt.labs.controls::StackView::get(index, behavior = DontLoad)
 
     Supported behavior values:
     \list
@@ -340,7 +340,7 @@ QQuickItem *QQuickStackView::get(int index, LoadBehavior behavior)
 }
 
 /*!
-    \qmlmethod Item QtQuick.Controls::StackView::find(callback, behavior = DontLoad)
+    \qmlmethod Item Qt.labs.controls::StackView::find(callback, behavior = DontLoad)
 
     Supported behavior values:
     \list
@@ -373,7 +373,7 @@ QQuickItem *QQuickStackView::find(const QJSValue &callback, LoadBehavior behavio
 }
 
 /*!
-    \qmlmethod Item QtQuick.Controls::StackView::push(item, properties, operation)
+    \qmlmethod Item Qt.labs.controls::StackView::push(item, properties, operation)
 
     TODO
 */
@@ -421,7 +421,7 @@ void QQuickStackView::push(QQmlV4Function *args)
 }
 
 /*!
-    \qmlmethod Item QtQuick.Controls::StackView::pop(item = null, operation = Transition)
+    \qmlmethod Item Qt.labs.controls::StackView::pop(item = null, operation = Transition)
 
     TODO
 */
@@ -483,7 +483,7 @@ void QQuickStackView::pop(QQmlV4Function *args)
 }
 
 /*!
-    \qmlmethod Item QtQuick.Controls::StackView::replace(item, properties, operation = Transition)
+    \qmlmethod Item Qt.labs.controls::StackView::replace(item, properties, operation = Transition)
 
     TODO
 */
@@ -540,7 +540,7 @@ void QQuickStackView::replace(QQmlV4Function *args)
 }
 
 /*!
-    \qmlmethod Item QtQuick.Controls::StackView::clear()
+    \qmlmethod Item Qt.labs.controls::StackView::clear()
 
     TODO
 */
@@ -554,7 +554,7 @@ void QQuickStackView::clear()
 }
 
 /*!
-    \qmlproperty var QtQuick.Controls::StackView::initialItem
+    \qmlproperty var Qt.labs.controls::StackView::initialItem
 
     This property holds the initial item.
 
@@ -573,7 +573,7 @@ void QQuickStackView::setInitialItem(const QVariant &item)
 }
 
 /*!
-    \qmlproperty Transition QtQuick.Controls::StackView::popEnter
+    \qmlproperty Transition Qt.labs.controls::StackView::popEnter
 
     TODO
 */
@@ -596,7 +596,7 @@ void QQuickStackView::setPopEnter(QQuickTransition *enter)
 }
 
 /*!
-    \qmlproperty Transition QtQuick.Controls::StackView::popExit
+    \qmlproperty Transition Qt.labs.controls::StackView::popExit
 
     TODO
 */
@@ -619,7 +619,7 @@ void QQuickStackView::setPopExit(QQuickTransition *exit)
 }
 
 /*!
-    \qmlproperty Transition QtQuick.Controls::StackView::pushEnter
+    \qmlproperty Transition Qt.labs.controls::StackView::pushEnter
 
     TODO
 */
@@ -642,7 +642,7 @@ void QQuickStackView::setPushEnter(QQuickTransition *enter)
 }
 
 /*!
-    \qmlproperty Transition QtQuick.Controls::StackView::pushExit
+    \qmlproperty Transition Qt.labs.controls::StackView::pushExit
 
     TODO
 */
@@ -742,7 +742,7 @@ QQuickStackAttached::QQuickStackAttached(QQuickItem *parent) :
 }
 
 /*!
-    \qmlattachedproperty int QtQuick.Controls::StackView::index
+    \qmlattachedproperty int Qt.labs.controls::StackView::index
 
     TODO
 */
@@ -755,7 +755,7 @@ int QQuickStackAttached::index() const
 }
 
 /*!
-    \qmlattachedproperty StackView QtQuick.Controls::StackView::view
+    \qmlattachedproperty StackView Qt.labs.controls::StackView::view
 
     TODO
 */
@@ -768,7 +768,7 @@ QQuickStackView *QQuickStackAttached::view() const
 }
 
 /*!
-    \qmlattachedproperty enumeration QtQuick.Controls::StackView::status
+    \qmlattachedproperty enumeration Qt.labs.controls::StackView::status
 
     TODO
 */
diff --git a/src/templates/qquickswipeview.cpp b/src/templates/qquickswipeview.cpp
index 29fdb849..bc48a170 100644
--- a/src/templates/qquickswipeview.cpp
+++ b/src/templates/qquickswipeview.cpp
@@ -44,7 +44,7 @@ QT_BEGIN_NAMESPACE
     \qmltype SwipeView
     \inherits Container
     \instantiates QQuickSwipeView
-    \inqmlmodule QtQuick.Controls
+    \inqmlmodule Qt.labs.controls
     \ingroup navigation
     \brief A swipe view control.
 
@@ -149,7 +149,7 @@ void QQuickSwipeView::contentItemChange(QQuickItem *newItem, QQuickItem *oldItem
 }
 
 /*!
-    \qmlattachedproperty int QtQuick.Controls::SwipeView::index
+    \qmlattachedproperty int Qt.labs.controls::SwipeView::index
 
     This attached property holds the index of each child item in the SwipeView.
 
@@ -157,7 +157,7 @@ void QQuickSwipeView::contentItemChange(QQuickItem *newItem, QQuickItem *oldItem
 */
 
 /*!
-    \qmlattachedproperty bool QtQuick.Controls::SwipeView::isCurrentItem
+    \qmlattachedproperty bool Qt.labs.controls::SwipeView::isCurrentItem
 
     This attached property is \c true if this child is the current item.
 
@@ -165,7 +165,7 @@ void QQuickSwipeView::contentItemChange(QQuickItem *newItem, QQuickItem *oldItem
 */
 
 /*!
-    \qmlattachedproperty SwipeView QtQuick.Controls::SwipeView::view
+    \qmlattachedproperty SwipeView Qt.labs.controls::SwipeView::view
 
     This attached property holds the view that manages this child item.
 
diff --git a/src/templates/qquickswitch.cpp b/src/templates/qquickswitch.cpp
index 0ce43dc7..2a89d5c7 100644
--- a/src/templates/qquickswitch.cpp
+++ b/src/templates/qquickswitch.cpp
@@ -45,23 +45,23 @@ QT_BEGIN_NAMESPACE
     \qmltype Switch
     \inherits Checkable
     \instantiates QQuickSwitch
-    \inqmlmodule QtQuick.Controls
+    \inqmlmodule Qt.labs.controls
     \ingroup buttons
     \brief A switch control.
 
-    \image qtquickcontrols2-switch.gif
+    \image qtlabscontrols-switch.gif
 
     Switch is an option button that can be dragged or toggled on (checked) or
     off (unchecked). Switches are typically used to select between two states.
 
     \table
-    \row \li \image qtquickcontrols2-switch-normal.png
+    \row \li \image qtlabscontrols-switch-normal.png
          \li A switch in its normal state.
-    \row \li \image qtquickcontrols2-switch-checked.png
+    \row \li \image qtlabscontrols-switch-checked.png
          \li A switch that is checked.
-    \row \li \image qtquickcontrols2-switch-focused.png
+    \row \li \image qtlabscontrols-switch-focused.png
          \li A switch that has active focus.
-    \row \li \image qtquickcontrols2-switch-disabled.png
+    \row \li \image qtlabscontrols-switch-disabled.png
          \li A switch that is disabled.
     \endtable
 
@@ -107,7 +107,7 @@ QQuickSwitch::QQuickSwitch(QQuickItem *parent) :
 }
 
 /*!
-    \qmlproperty real QtQuick.Controls::Switch::position
+    \qmlproperty real Qt.labs.controls::Switch::position
 
     This property holds the logical position of the thumb indicator.
 
@@ -136,7 +136,7 @@ void QQuickSwitch::setPosition(qreal position)
 }
 
 /*!
-    \qmlproperty real QtQuick.Controls::Switch::visualPosition
+    \qmlproperty real Qt.labs.controls::Switch::visualPosition
 
     This property holds the visual position of the thumb indicator.
 
diff --git a/src/templates/qquicktabbar.cpp b/src/templates/qquicktabbar.cpp
index c07aa919..91adf9f4 100644
--- a/src/templates/qquicktabbar.cpp
+++ b/src/templates/qquicktabbar.cpp
@@ -44,7 +44,7 @@ QT_BEGIN_NAMESPACE
     \qmltype TabBar
     \inherits Container
     \instantiates QQuickTabBar
-    \inqmlmodule QtQuick.Controls
+    \inqmlmodule Qt.labs.controls
     \ingroup tabs
     \brief A tab bar control.
 
diff --git a/src/templates/qquicktabbutton.cpp b/src/templates/qquicktabbutton.cpp
index 0dc02b83..b6254c04 100644
--- a/src/templates/qquicktabbutton.cpp
+++ b/src/templates/qquicktabbutton.cpp
@@ -42,7 +42,7 @@ QT_BEGIN_NAMESPACE
     \qmltype TabButton
     \inherits Checkable
     \instantiates QQuickTabButton
-    \inqmlmodule QtQuick.Controls
+    \inqmlmodule Qt.labs.controls
     \ingroup tabs
     \brief A tab button control.
 
diff --git a/src/templates/qquicktextarea.cpp b/src/templates/qquicktextarea.cpp
index 4063260e..5ea1d911 100644
--- a/src/templates/qquicktextarea.cpp
+++ b/src/templates/qquicktextarea.cpp
@@ -54,7 +54,7 @@ QT_BEGIN_NAMESPACE
     \qmltype TextArea
     \inherits TextEdit
     \instantiates QQuickTextArea
-    \inqmlmodule QtQuick.Controls
+    \inqmlmodule Qt.labs.controls
     \ingroup editors
     \brief A multi line text input control.
 
@@ -168,7 +168,7 @@ void QQuickTextArea::setFont(const QFont &font)
 }
 
 /*!
-    \qmlproperty Item QtQuick.Controls::TextArea::background
+    \qmlproperty Item Qt.labs.controls::TextArea::background
 
     This property holds the background item.
 
@@ -202,7 +202,7 @@ void QQuickTextArea::setBackground(QQuickItem *background)
 }
 
 /*!
-    \qmlproperty Text QtQuick.Controls::TextArea::placeholder
+    \qmlproperty Text Qt.labs.controls::TextArea::placeholder
 
     This property holds the placeholder text item.
 
diff --git a/src/templates/qquicktextfield.cpp b/src/templates/qquicktextfield.cpp
index a16b3c14..07de1c5c 100644
--- a/src/templates/qquicktextfield.cpp
+++ b/src/templates/qquicktextfield.cpp
@@ -55,7 +55,7 @@ QT_BEGIN_NAMESPACE
     \qmltype TextField
     \inherits TextInput
     \instantiates QQuickTextField
-    \inqmlmodule QtQuick.Controls
+    \inqmlmodule Qt.labs.controls
     \ingroup editors
     \brief A single line text input control.
 
@@ -63,11 +63,11 @@ QT_BEGIN_NAMESPACE
     with a \l placeholder text functionality, and adds decoration.
 
     \table
-    \row \li \image qtquickcontrols2-textfield-normal.png
+    \row \li \image qtlabscontrols-textfield-normal.png
          \li A text field in its normal state.
-    \row \li \image qtquickcontrols2-textfield-focused.png
+    \row \li \image qtlabscontrols-textfield-focused.png
          \li A text field that has active focus.
-    \row \li \image qtquickcontrols2-textfield-disabled.png
+    \row \li \image qtlabscontrols-textfield-disabled.png
          \li A text field that is disabled.
     \endtable
 
@@ -81,7 +81,7 @@ QT_BEGIN_NAMESPACE
 */
 
 /*!
-    \qmlsignal QtQuick.Controls::TextField::pressAndHold(MouseEvent mouse)
+    \qmlsignal Qt.labs.controls::TextField::pressAndHold(MouseEvent mouse)
 
     This signal is emitted when there is a long press (the delay depends on the platform plugin).
     The \l {MouseEvent}{mouse} parameter provides information about the press, including the x and y
@@ -200,7 +200,7 @@ void QQuickTextField::setFont(const QFont &font)
 }
 
 /*!
-    \qmlproperty Item QtQuick.Controls::TextField::background
+    \qmlproperty Item Qt.labs.controls::TextField::background
 
     This property holds the background item.
 
@@ -234,7 +234,7 @@ void QQuickTextField::setBackground(QQuickItem *background)
 }
 
 /*!
-    \qmlproperty Text QtQuick.Controls::TextField::placeholder
+    \qmlproperty Text Qt.labs.controls::TextField::placeholder
 
     This property holds the placeholder text item.
 
diff --git a/src/templates/qquicktoolbar.cpp b/src/templates/qquicktoolbar.cpp
index 7fdc98ae..256a6856 100644
--- a/src/templates/qquicktoolbar.cpp
+++ b/src/templates/qquicktoolbar.cpp
@@ -42,7 +42,7 @@ QT_BEGIN_NAMESPACE
     \qmltype ToolBar
     \inherits Frame
     \instantiates QQuickToolBar
-    \inqmlmodule QtQuick.Controls
+    \inqmlmodule Qt.labs.controls
     \ingroup containers
     \brief A tool bar control.
 
diff --git a/src/templates/qquicktoolbutton.cpp b/src/templates/qquicktoolbutton.cpp
index a26d9c7b..c1b7b9dd 100644
--- a/src/templates/qquicktoolbutton.cpp
+++ b/src/templates/qquicktoolbutton.cpp
@@ -42,7 +42,7 @@ QT_BEGIN_NAMESPACE
     \qmltype ToolButton
     \inherits Button
     \instantiates QQuickToolButton
-    \inqmlmodule QtQuick.Controls
+    \inqmlmodule Qt.labs.controls
     \ingroup buttons
     \brief A tool button control.
 
diff --git a/src/templates/qquicktumbler.cpp b/src/templates/qquicktumbler.cpp
index 38664cbd..cf1aac9b 100644
--- a/src/templates/qquicktumbler.cpp
+++ b/src/templates/qquicktumbler.cpp
@@ -45,7 +45,7 @@ QT_BEGIN_NAMESPACE
     \qmltype Tumbler
     \inherits Control
     \instantiates QQuickTumbler
-    \inqmlmodule QtQuick.Controls
+    \inqmlmodule Qt.labs.controls
     \ingroup containers
     \brief A spinnable wheel of items that can be selected.
 
@@ -64,7 +64,7 @@ QT_BEGIN_NAMESPACE
 
     \snippet tst_tumbler.qml contentItem
 
-    \image qtquickcontrols2-tumbler-wrap.gif
+    \image qtlabscontrols-tumbler-wrap.gif
 */
 
 class QQuickTumblerPrivate : public QQuickControlPrivate, public QQuickItemChangeListener
@@ -194,7 +194,7 @@ QQuickTumbler::~QQuickTumbler()
 }
 
 /*!
-    \qmlproperty variant QtQuick.Controls::Tumbler::model
+    \qmlproperty variant Qt.labs.controls::Tumbler::model
 
     This property holds the model that provides data for this tumbler.
 */
@@ -214,7 +214,7 @@ void QQuickTumbler::setModel(const QVariant &model)
 }
 
 /*!
-    \qmlproperty int QtQuick.Controls::Tumbler::count
+    \qmlproperty int Qt.labs.controls::Tumbler::count
 
     This property holds the number of items in the model.
 */
@@ -225,7 +225,7 @@ int QQuickTumbler::count() const
 }
 
 /*!
-    \qmlproperty int QtQuick.Controls::Tumbler::currentIndex
+    \qmlproperty int Qt.labs.controls::Tumbler::currentIndex
 
     This property holds the index of the current item.
 */
@@ -242,7 +242,7 @@ void QQuickTumbler::setCurrentIndex(int currentIndex)
 }
 
 /*!
-    \qmlproperty Item QtQuick.Controls::Tumbler::currentItem
+    \qmlproperty Item Qt.labs.controls::Tumbler::currentItem
 
     This property holds the item at the current index.
 */
@@ -253,7 +253,7 @@ QQuickItem *QQuickTumbler::currentItem() const
 }
 
 /*!
-    \qmlproperty component QtQuick.Controls::Tumbler::delegate
+    \qmlproperty component Qt.labs.controls::Tumbler::delegate
 
     This property holds the delegate used to display each item.
 */
@@ -273,7 +273,7 @@ void QQuickTumbler::setDelegate(QQmlComponent *delegate)
 }
 
 /*!
-    \qmlproperty int QtQuick.Controls::Tumbler::visibleItemCount
+    \qmlproperty int Qt.labs.controls::Tumbler::visibleItemCount
 
     This property holds the number of items visible in the tumbler. It must be
     an odd number, as the current item is always vertically centered.