Rename "Default" style to "Basic"

[ChangeLog][Styles] The Default style was renamed to Basic to account
for the introduction of the platform styles (macOS, Windows), which
will be used by default (where possible) when no style is specified.

Fixes: QTBUG-85984
Task-number: QTBUG-68814
Task-number: QTBUG-86403
Change-Id: I22b3199c8662e4ee5d55a1be1a51c9856ac62376
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>

173 files changed, 463 insertions, 467 deletions

diff --git a/.gitignore b/.gitignore
index 52b333ca64..9bd5ea4ab3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,7 +30,7 @@
 
 /tests/auto/accessibility/tst_accessibility
 /tests/auto/calendar/tst_calendar
-/tests/auto/controls/default/tst_default
+/tests/auto/controls/basic/tst_basic
 /tests/auto/controls/fusion/tst_fusion
 /tests/auto/controls/imagine/tst_imagine
 /tests/auto/controls/material/tst_material
diff --git a/examples/quickcontrols2/chattutorial/doc/src/qtquickcontrols2-chattutorial.qdoc b/examples/quickcontrols2/chattutorial/doc/src/qtquickcontrols2-chattutorial.qdoc
index 4c00d45686..ec90074edc 100644
--- a/examples/quickcontrols2/chattutorial/doc/src/qtquickcontrols2-chattutorial.qdoc
+++ b/examples/quickcontrols2/chattutorial/doc/src/qtquickcontrols2-chattutorial.qdoc
@@ -748,10 +748,10 @@ text field to make way for future input.
 
 Styles in Qt Quick Controls are designed to work on any platform. In this
 chapter, we'll do some minor visual tweaks to make sure our application
-looks good when run with the \l {Default Style}{Default},
+looks good when run with the \l {Basic Style}{Basic},
 \l {Material Style}{Material}, and \l {Universal Style}{Universal} styles.
 
-So far, we've just been testing the application with the Default style. If we
+So far, we've just been testing the application with the Basic style. If we
 run it with the \l {Material Style}, for example, we'll immediately see some issues.
 Here is the Contacts page:
 
@@ -788,7 +788,8 @@ Instead, it is better to rely on Qt Quick Controls's built-in support for
 \l {Using File Selectors with Qt Quick Controls}{style-based file selectors}.
 To do this, we must move the ToolBar out into its own file. We'll call it
 \c ChatToolBar.qml. This will be the \e "default" version of the file, which
-means that it will be used when the \l {Default Style}{Default style} is in
+means that it will be used when the \l {Basic Style}{Basic style} (which is the
+style that is used when none is specified) is in
 use. Here's the new file:
 
 \quotefromfile chattutorial/chapter5-styling/ChatToolBar.qml
@@ -841,7 +842,7 @@ Let's try out the Universal style:
 No issues there. For a relatively simple application such as this one, there
 should be very few adjustments necessary when switching styles.
 
-Now let's try each style's dark theme. The Default style has no dark theme, as
+Now let's try each style's dark theme. The Basic style has no dark theme, as
 it would add a slight overhead to a style that is designed to be as performant
 as possible. We'll test out the Material style first, so add an entry to
 \c qtquickcontrols2.conf that tells it to use its dark theme:
diff --git a/examples/quickcontrols2/gallery/gallery.cpp b/examples/quickcontrols2/gallery/gallery.cpp
index 629e69f937..5c7dc18835 100644
--- a/examples/quickcontrols2/gallery/gallery.cpp
+++ b/examples/quickcontrols2/gallery/gallery.cpp
@@ -73,7 +73,7 @@ int main(int argc, char *argv[])
 
     QQmlApplicationEngine engine;
 
-    const QStringList builtInStyles = { QLatin1String("Default"), QLatin1String("Fusion"),
+    const QStringList builtInStyles = { QLatin1String("Basic"), QLatin1String("Fusion"),
         QLatin1String("Imagine"), QLatin1String("Material"), QLatin1String("Universal") };
     engine.rootContext()->setContextProperty("builtInStyles", builtInStyles);
 
diff --git a/examples/quickcontrols2/gallery/gallery.qml b/examples/quickcontrols2/gallery/gallery.qml
index f53ce735c5..98551196c2 100644
--- a/examples/quickcontrols2/gallery/gallery.qml
+++ b/examples/quickcontrols2/gallery/gallery.qml
@@ -75,7 +75,7 @@ ApplicationWindow {
 
     Settings {
         id: settings
-        property string style: "Default"
+        property string style: "Basic"
     }
 
     Shortcut {
diff --git a/src/imports/CMakeLists.txt b/src/imports/CMakeLists.txt
index e6210be91c..1d9b781445 100644
--- a/src/imports/CMakeLists.txt
+++ b/src/imports/CMakeLists.txt
@@ -5,8 +5,8 @@ add_subdirectory(controlsimpl)
 add_subdirectory(platform)
 add_subdirectory(templates)
 add_subdirectory(nativestyle)
-add_subdirectory(controls/default)
-add_subdirectory(controls/default/impl)
+add_subdirectory(controls/basic)
+add_subdirectory(controls/basic/impl)
 add_subdirectory(controls/fusion)
 add_subdirectory(controls/fusion/impl)
 add_subdirectory(controls/imagine)
diff --git a/src/imports/controls/default/.prev_CMakeLists.txt b/src/imports/controls/basic/.prev_CMakeLists.txt
index 9a37f29c67..c9a1182765 100644
--- a/src/imports/controls/default/.prev_CMakeLists.txt
+++ b/src/imports/controls/basic/.prev_CMakeLists.txt
@@ -1,18 +1,18 @@
-# Generated from default.pro.
+# Generated from basic.pro.
 
 #####################################################################
-## qtquickcontrols2defaultstyleplugin Plugin:
+## qtquickcontrols2basicstyleplugin Plugin:
 #####################################################################
 
-qt_add_qml_module(qtquickcontrols2defaultstyleplugin
-    URI "QtQuick.Controls.Default"
+qt_add_qml_module(qtquickcontrols2basicstyleplugin
+    URI "QtQuick.Controls.Basic"
     VERSION "${CMAKE_PROJECT_VERSION}"
-    CLASSNAME QtQuickControls2DefaultStylePlugin
+    CLASSNAME QtQuickControls2BasicStylePlugin
     GENERATE_QMLTYPES
     SOURCES
-        qquickdefaultstyle.cpp qquickdefaultstyle_p.h
-        qquickdefaulttheme.cpp qquickdefaulttheme_p.h
-        qtquickcontrols2defaultstyleplugin.cpp
+        qquickbasicstyle.cpp qquickbasicstyle_p.h
+        qquickbasictheme.cpp qquickbasictheme_p.h
+        qtquickcontrols2basicstyleplugin.cpp
     DEFINES
         QT_NO_CAST_FROM_ASCII
         QT_NO_CAST_TO_ASCII
@@ -31,7 +31,7 @@ qt_add_qml_module(qtquickcontrols2defaultstyleplugin
 )
 
 # Resources:
-set(qtquickcontrols2defaultstyleplugin_resource_files
+set(qtquickcontrols2basicstyleplugin_resource_files
     "images/arrow-indicator.png"
     "images/arrow-indicator@2x.png"
     "images/arrow-indicator@3x.png"
@@ -54,20 +54,20 @@ set(qtquickcontrols2defaultstyleplugin_resource_files
     "images/drop-indicator@4x.png"
 )
 
-qt_add_resource(qtquickcontrols2defaultstyleplugin "qtquickcontrols2defaultstyleplugin"
+qt_add_resource(qtquickcontrols2basicstyleplugin "qtquickcontrols2basicstyleplugin"
     PREFIX
-        "/qt-project.org/imports/QtQuick/Controls/Default"
+        "/qt-project.org/imports/QtQuick/Controls/Basic"
     FILES
-        ${qtquickcontrols2defaultstyleplugin_resource_files}
+        ${qtquickcontrols2basicstyleplugin_resource_files}
 )
 
 
-#### Keys ignored in scope 1:.:.:default.pro:<TRUE>:
+#### Keys ignored in scope 1:.:.:basic.pro:<TRUE>:
 # OTHER_FILES = "qmldir" "$$QML_FILES"
-# QML_IMPORT_NAME = "QtQuick.Controls.Default"
+# QML_IMPORT_NAME = "QtQuick.Controls.Basic"
 # QML_IMPORT_VERSION = "$$QT_VERSION"
-# TARGETPATH = "QtQuick/Controls/Default"
-# _REQUIREMENTS = "qtConfig(quickcontrols2-default)"
+# TARGETPATH = "QtQuick/Controls/Basic"
+# _REQUIREMENTS = "qtConfig(quickcontrols2-basic)"
 
 set(qml_files
     "AbstractButton.qml"
@@ -300,7 +300,7 @@ set_source_files_properties(VerticalHeaderView.qml PROPERTIES
     QT_QML_SOURCE_VERSION "2.15;6.0"
 )
 
-qt6_target_qml_files(qtquickcontrols2defaultstyleplugin
+qt6_target_qml_files(qtquickcontrols2basicstyleplugin
     FILES
         ${qml_files}
 )
diff --git a/src/imports/controls/default/AbstractButton.qml b/src/imports/controls/basic/AbstractButton.qml
index a4855c2197..a4855c2197 100644
--- a/src/imports/controls/default/AbstractButton.qml
+++ b/src/imports/controls/basic/AbstractButton.qml
diff --git a/src/imports/controls/default/Action.qml b/src/imports/controls/basic/Action.qml
index bb66fc8fb5..bb66fc8fb5 100644
--- a/src/imports/controls/default/Action.qml
+++ b/src/imports/controls/basic/Action.qml
diff --git a/src/imports/controls/default/ActionGroup.qml b/src/imports/controls/basic/ActionGroup.qml
index 70170f0e4e..70170f0e4e 100644
--- a/src/imports/controls/default/ActionGroup.qml
+++ b/src/imports/controls/basic/ActionGroup.qml
diff --git a/src/imports/controls/default/ApplicationWindow.qml b/src/imports/controls/basic/ApplicationWindow.qml
index b383139b8b..b383139b8b 100644
--- a/src/imports/controls/default/ApplicationWindow.qml
+++ b/src/imports/controls/basic/ApplicationWindow.qml
diff --git a/src/imports/controls/default/BusyIndicator.qml b/src/imports/controls/basic/BusyIndicator.qml
index 5db2a083db..1dc2b5bdbb 100644
--- a/src/imports/controls/default/BusyIndicator.qml
+++ b/src/imports/controls/basic/BusyIndicator.qml
@@ -36,7 +36,7 @@
 
 import QtQuick
 import QtQuick.Controls
-import QtQuick.Controls.Default.impl
+import QtQuick.Controls.Basic.impl
 import QtQuick.Templates as T
 
 T.BusyIndicator {
diff --git a/src/imports/controls/default/Button.qml b/src/imports/controls/basic/Button.qml
index 06d4e93fdf..06d4e93fdf 100644
--- a/src/imports/controls/default/Button.qml
+++ b/src/imports/controls/basic/Button.qml
diff --git a/src/imports/controls/default/ButtonGroup.qml b/src/imports/controls/basic/ButtonGroup.qml
index fadc538a49..fadc538a49 100644
--- a/src/imports/controls/default/ButtonGroup.qml
+++ b/src/imports/controls/basic/ButtonGroup.qml
diff --git a/src/imports/controls/default/CMakeLists.txt b/src/imports/controls/basic/CMakeLists.txt
index f7ce5d10d8..9e2252d424 100644
--- a/src/imports/controls/default/CMakeLists.txt
+++ b/src/imports/controls/basic/CMakeLists.txt
@@ -1,18 +1,18 @@
-# Generated from default.pro.
+# Generated from basic.pro.
 
 #####################################################################
-## qtquickcontrols2defaultstyleplugin Plugin:
+## qtquickcontrols2basicstyleplugin Plugin:
 #####################################################################
 
-qt_add_qml_module(qtquickcontrols2defaultstyleplugin
-    URI "QtQuick.Controls.Default"
+qt_add_qml_module(qtquickcontrols2basicstyleplugin
+    URI "QtQuick.Controls.Basic"
     VERSION "6.0" # special case
-    CLASSNAME QtQuickControls2DefaultStylePlugin
+    CLASSNAME QtQuickControls2BasicStylePlugin
     GENERATE_QMLTYPES
     SOURCES
-        qquickdefaultstyle.cpp qquickdefaultstyle_p.h
-        qquickdefaulttheme.cpp qquickdefaulttheme_p.h
-        qtquickcontrols2defaultstyleplugin.cpp
+        qquickbasicstyle.cpp qquickbasicstyle_p.h
+        qquickbasictheme.cpp qquickbasictheme_p.h
+        qtquickcontrols2basicstyleplugin.cpp
     DEFINES
         QT_NO_CAST_FROM_ASCII
         QT_NO_CAST_TO_ASCII
@@ -31,7 +31,7 @@ qt_add_qml_module(qtquickcontrols2defaultstyleplugin
 )
 
 # Resources:
-set(qtquickcontrols2defaultstyleplugin_resource_files
+set(qtquickcontrols2basicstyleplugin_resource_files
     "images/arrow-indicator.png"
     "images/arrow-indicator@2x.png"
     "images/arrow-indicator@3x.png"
@@ -54,20 +54,20 @@ set(qtquickcontrols2defaultstyleplugin_resource_files
     "images/drop-indicator@4x.png"
 )
 
-qt_add_resource(qtquickcontrols2defaultstyleplugin "qtquickcontrols2defaultstyleplugin"
+qt_add_resource(qtquickcontrols2basicstyleplugin "qtquickcontrols2basicstyleplugin"
     PREFIX
-        "/qt-project.org/imports/QtQuick/Controls/Default"
+        "/qt-project.org/imports/QtQuick/Controls/Basic"
     FILES
-        ${qtquickcontrols2defaultstyleplugin_resource_files}
+        ${qtquickcontrols2basicstyleplugin_resource_files}
 )
 
 
-#### Keys ignored in scope 1:.:.:default.pro:<TRUE>:
+#### Keys ignored in scope 1:.:.:basic.pro:<TRUE>:
 # OTHER_FILES = "qmldir" "$$QML_FILES"
-# QML_IMPORT_NAME = "QtQuick.Controls.Default"
+# QML_IMPORT_NAME = "QtQuick.Controls.Basic"
 # QML_IMPORT_VERSION = "$$QT_VERSION"
-# TARGETPATH = "QtQuick/Controls/Default"
-# _REQUIREMENTS = "qtConfig(quickcontrols2-default)"
+# TARGETPATH = "QtQuick/Controls/Basic"
+# _REQUIREMENTS = "qtConfig(quickcontrols2-basic)"
 
 set(qml_files
     "AbstractButton.qml"
@@ -300,7 +300,7 @@ set_source_files_properties(VerticalHeaderView.qml PROPERTIES
     QT_QML_SOURCE_VERSION "2.15;6.0"
 )
 
-qt6_target_qml_files(qtquickcontrols2defaultstyleplugin
+qt6_target_qml_files(qtquickcontrols2basicstyleplugin
     FILES
         ${qml_files}
 )
diff --git a/src/imports/controls/default/CheckBox.qml b/src/imports/controls/basic/CheckBox.qml
index d9c92a56be..7d29ff3445 100644
--- a/src/imports/controls/default/CheckBox.qml
+++ b/src/imports/controls/basic/CheckBox.qml
@@ -68,7 +68,7 @@ T.CheckBox {
             y: (parent.height - height) / 2
             defaultColor: "#353637"
             color: control.palette.text
-            source: "qrc:/qt-project.org/imports/QtQuick/Controls/Default/images/check.png"
+            source: "qrc:/qt-project.org/imports/QtQuick/Controls/Basic/images/check.png"
             visible: control.checkState === Qt.Checked
         }
 
diff --git a/src/imports/controls/default/CheckDelegate.qml b/src/imports/controls/basic/CheckDelegate.qml
index 3153bb3e0f..25eb3c0658 100644
--- a/src/imports/controls/default/CheckDelegate.qml
+++ b/src/imports/controls/basic/CheckDelegate.qml
@@ -87,7 +87,7 @@ T.CheckDelegate {
             y: (parent.height - height) / 2
             defaultColor: "#353637"
             color: control.palette.text
-            source: "qrc:/qt-project.org/imports/QtQuick/Controls/Default/images/check.png"
+            source: "qrc:/qt-project.org/imports/QtQuick/Controls/Basic/images/check.png"
             visible: control.checkState === Qt.Checked
         }
 
diff --git a/src/imports/controls/default/ComboBox.qml b/src/imports/controls/basic/ComboBox.qml
index e1e6016492..935befd3b4 100644
--- a/src/imports/controls/default/ComboBox.qml
+++ b/src/imports/controls/basic/ComboBox.qml
@@ -67,7 +67,7 @@ T.ComboBox {
         y: control.topPadding + (control.availableHeight - height) / 2
         color: control.palette.dark
         defaultColor: "#353637"
-        source: "qrc:/qt-project.org/imports/QtQuick/Controls/Default/images/double-arrow.png"
+        source: "qrc:/qt-project.org/imports/QtQuick/Controls/Basic/images/double-arrow.png"
         opacity: enabled ? 1 : 0.3
     }
 
diff --git a/src/imports/controls/default/Container.qml b/src/imports/controls/basic/Container.qml
index 939190755c..939190755c 100644
--- a/src/imports/controls/default/Container.qml
+++ b/src/imports/controls/basic/Container.qml
diff --git a/src/imports/controls/default/Control.qml b/src/imports/controls/basic/Control.qml
index 7a68a43166..7a68a43166 100644
--- a/src/imports/controls/default/Control.qml
+++ b/src/imports/controls/basic/Control.qml
diff --git a/src/imports/controls/default/DelayButton.qml b/src/imports/controls/basic/DelayButton.qml
index 3dbed315a2..3dbed315a2 100644
--- a/src/imports/controls/default/DelayButton.qml
+++ b/src/imports/controls/basic/DelayButton.qml
diff --git a/src/imports/controls/default/Dial.qml b/src/imports/controls/basic/Dial.qml
index 80f2bfb06b..979d364400 100644
--- a/src/imports/controls/default/Dial.qml
+++ b/src/imports/controls/basic/Dial.qml
@@ -37,7 +37,7 @@
 import QtQuick
 import QtQuick.Controls
 import QtQuick.Controls.impl
-import QtQuick.Controls.Default.impl
+import QtQuick.Controls.Basic.impl
 import QtQuick.Templates as T
 
 T.Dial {
@@ -63,7 +63,7 @@ T.Dial {
         height: 10
         defaultColor: "#353637"
         color: control.visualFocus ? control.palette.highlight : control.palette.dark
-        source: "qrc:/qt-project.org/imports/QtQuick/Controls/Default/images/dial-indicator.png"
+        source: "qrc:/qt-project.org/imports/QtQuick/Controls/Basic/images/dial-indicator.png"
         antialiasing: true
         opacity: control.enabled ? 1 : 0.3
         transform: [
diff --git a/src/imports/controls/default/Dialog.qml b/src/imports/controls/basic/Dialog.qml
index 254a6dcb4a..254a6dcb4a 100644
--- a/src/imports/controls/default/Dialog.qml
+++ b/src/imports/controls/basic/Dialog.qml
diff --git a/src/imports/controls/default/DialogButtonBox.qml b/src/imports/controls/basic/DialogButtonBox.qml
index e4cdbd14de..e4cdbd14de 100644
--- a/src/imports/controls/default/DialogButtonBox.qml
+++ b/src/imports/controls/basic/DialogButtonBox.qml
diff --git a/src/imports/controls/default/Drawer.qml b/src/imports/controls/basic/Drawer.qml
index 719e5e1cef..719e5e1cef 100644
--- a/src/imports/controls/default/Drawer.qml
+++ b/src/imports/controls/basic/Drawer.qml
diff --git a/src/imports/controls/default/Frame.qml b/src/imports/controls/basic/Frame.qml
index 9696b5c96a..9696b5c96a 100644
--- a/src/imports/controls/default/Frame.qml
+++ b/src/imports/controls/basic/Frame.qml
diff --git a/src/imports/controls/default/GroupBox.qml b/src/imports/controls/basic/GroupBox.qml
index d6244113dd..d6244113dd 100644
--- a/src/imports/controls/default/GroupBox.qml
+++ b/src/imports/controls/basic/GroupBox.qml
diff --git a/src/imports/controls/default/HorizontalHeaderView.qml b/src/imports/controls/basic/HorizontalHeaderView.qml
index 093c868b32..093c868b32 100644
--- a/src/imports/controls/default/HorizontalHeaderView.qml
+++ b/src/imports/controls/basic/HorizontalHeaderView.qml
diff --git a/src/imports/controls/default/ItemDelegate.qml b/src/imports/controls/basic/ItemDelegate.qml
index 1183eb2b08..1183eb2b08 100644
--- a/src/imports/controls/default/ItemDelegate.qml
+++ b/src/imports/controls/basic/ItemDelegate.qml
diff --git a/src/imports/controls/default/Label.qml b/src/imports/controls/basic/Label.qml
index 6d0aca41ba..6d0aca41ba 100644
--- a/src/imports/controls/default/Label.qml
+++ b/src/imports/controls/basic/Label.qml
diff --git a/src/imports/controls/default/Menu.qml b/src/imports/controls/basic/Menu.qml
index 91384e4fea..91384e4fea 100644
--- a/src/imports/controls/default/Menu.qml
+++ b/src/imports/controls/basic/Menu.qml
diff --git a/src/imports/controls/default/MenuBar.qml b/src/imports/controls/basic/MenuBar.qml
index 9745a52deb..9745a52deb 100644
--- a/src/imports/controls/default/MenuBar.qml
+++ b/src/imports/controls/basic/MenuBar.qml
diff --git a/src/imports/controls/default/MenuBarItem.qml b/src/imports/controls/basic/MenuBarItem.qml
index b2771a3c0e..b2771a3c0e 100644
--- a/src/imports/controls/default/MenuBarItem.qml
+++ b/src/imports/controls/basic/MenuBarItem.qml
diff --git a/src/imports/controls/default/MenuItem.qml b/src/imports/controls/basic/MenuItem.qml
index fc2d434f78..143e4df3b8 100644
--- a/src/imports/controls/default/MenuItem.qml
+++ b/src/imports/controls/basic/MenuItem.qml
@@ -77,7 +77,7 @@ T.MenuItem {
         y: control.topPadding + (control.availableHeight - height) / 2
 
         visible: control.checked
-        source: control.checkable ? "qrc:/qt-project.org/imports/QtQuick/Controls/Default/images/check.png" : ""
+        source: control.checkable ? "qrc:/qt-project.org/imports/QtQuick/Controls/Basic/images/check.png" : ""
         color: control.palette.windowText
         defaultColor: "#353637"
     }
@@ -88,7 +88,7 @@ T.MenuItem {
 
         visible: control.subMenu
         mirror: control.mirrored
-        source: control.subMenu ? "qrc:/qt-project.org/imports/QtQuick/Controls/Default/images/arrow-indicator.png" : ""
+        source: control.subMenu ? "qrc:/qt-project.org/imports/QtQuick/Controls/Basic/images/arrow-indicator.png" : ""
         color: control.palette.windowText
         defaultColor: "#353637"
     }
diff --git a/src/imports/controls/default/MenuSeparator.qml b/src/imports/controls/basic/MenuSeparator.qml
index d503aecd34..d503aecd34 100644
--- a/src/imports/controls/default/MenuSeparator.qml
+++ b/src/imports/controls/basic/MenuSeparator.qml
diff --git a/src/imports/controls/default/Page.qml b/src/imports/controls/basic/Page.qml
index 2fec37f02e..2fec37f02e 100644
--- a/src/imports/controls/default/Page.qml
+++ b/src/imports/controls/basic/Page.qml
diff --git a/src/imports/controls/default/PageIndicator.qml b/src/imports/controls/basic/PageIndicator.qml
index 3942f54f4d..3942f54f4d 100644
--- a/src/imports/controls/default/PageIndicator.qml
+++ b/src/imports/controls/basic/PageIndicator.qml
diff --git a/src/imports/controls/default/Pane.qml b/src/imports/controls/basic/Pane.qml
index 221819d4ed..221819d4ed 100644
--- a/src/imports/controls/default/Pane.qml
+++ b/src/imports/controls/basic/Pane.qml
diff --git a/src/imports/controls/default/Popup.qml b/src/imports/controls/basic/Popup.qml
index 713721076d..713721076d 100644
--- a/src/imports/controls/default/Popup.qml
+++ b/src/imports/controls/basic/Popup.qml
diff --git a/src/imports/controls/default/ProgressBar.qml b/src/imports/controls/basic/ProgressBar.qml
index 56739f4f8f..d8a1453c2f 100644
--- a/src/imports/controls/default/ProgressBar.qml
+++ b/src/imports/controls/basic/ProgressBar.qml
@@ -37,7 +37,7 @@
 import QtQuick
 import QtQuick.Templates as T
 import QtQuick.Controls
-import QtQuick.Controls.Default.impl
+import QtQuick.Controls.Basic.impl
 
 T.ProgressBar {
     id: control
diff --git a/src/imports/controls/default/RadioButton.qml b/src/imports/controls/basic/RadioButton.qml
index 02b2f627ec..02b2f627ec 100644
--- a/src/imports/controls/default/RadioButton.qml
+++ b/src/imports/controls/basic/RadioButton.qml
diff --git a/src/imports/controls/default/RadioDelegate.qml b/src/imports/controls/basic/RadioDelegate.qml
index dc99836373..dc99836373 100644
--- a/src/imports/controls/default/RadioDelegate.qml
+++ b/src/imports/controls/basic/RadioDelegate.qml
diff --git a/src/imports/controls/default/RangeSlider.qml b/src/imports/controls/basic/RangeSlider.qml
index 1132a78b03..1132a78b03 100644
--- a/src/imports/controls/default/RangeSlider.qml
+++ b/src/imports/controls/basic/RangeSlider.qml
diff --git a/src/imports/controls/default/RoundButton.qml b/src/imports/controls/basic/RoundButton.qml
index 9445ecdf83..9445ecdf83 100644
--- a/src/imports/controls/default/RoundButton.qml
+++ b/src/imports/controls/basic/RoundButton.qml
diff --git a/src/imports/controls/default/ScrollBar.qml b/src/imports/controls/basic/ScrollBar.qml
index 1652ea814a..1652ea814a 100644
--- a/src/imports/controls/default/ScrollBar.qml
+++ b/src/imports/controls/basic/ScrollBar.qml
diff --git a/src/imports/controls/default/ScrollIndicator.qml b/src/imports/controls/basic/ScrollIndicator.qml
index 4f3ece0c49..4f3ece0c49 100644
--- a/src/imports/controls/default/ScrollIndicator.qml
+++ b/src/imports/controls/basic/ScrollIndicator.qml
diff --git a/src/imports/controls/default/ScrollView.qml b/src/imports/controls/basic/ScrollView.qml
index 76094c6cca..76094c6cca 100644
--- a/src/imports/controls/default/ScrollView.qml
+++ b/src/imports/controls/basic/ScrollView.qml
diff --git a/src/imports/controls/default/Slider.qml b/src/imports/controls/basic/Slider.qml
index cdd72b767d..cdd72b767d 100644
--- a/src/imports/controls/default/Slider.qml
+++ b/src/imports/controls/basic/Slider.qml
diff --git a/src/imports/controls/default/SpinBox.qml b/src/imports/controls/basic/SpinBox.qml
index 46eca36ed7..46eca36ed7 100644
--- a/src/imports/controls/default/SpinBox.qml
+++ b/src/imports/controls/basic/SpinBox.qml
diff --git a/src/imports/controls/default/SplitView.qml b/src/imports/controls/basic/SplitView.qml
index 020d07ea8a..020d07ea8a 100644
--- a/src/imports/controls/default/SplitView.qml
+++ b/src/imports/controls/basic/SplitView.qml
diff --git a/src/imports/controls/default/StackView.qml b/src/imports/controls/basic/StackView.qml
index 3b388e46ea..3b388e46ea 100644
--- a/src/imports/controls/default/StackView.qml
+++ b/src/imports/controls/basic/StackView.qml
diff --git a/src/imports/controls/default/SwipeDelegate.qml b/src/imports/controls/basic/SwipeDelegate.qml
index ff56f6f00f..ff56f6f00f 100644
--- a/src/imports/controls/default/SwipeDelegate.qml
+++ b/src/imports/controls/basic/SwipeDelegate.qml
diff --git a/src/imports/controls/default/SwipeView.qml b/src/imports/controls/basic/SwipeView.qml
index 7fb8d449ad..7fb8d449ad 100644
--- a/src/imports/controls/default/SwipeView.qml
+++ b/src/imports/controls/basic/SwipeView.qml
diff --git a/src/imports/controls/default/Switch.qml b/src/imports/controls/basic/Switch.qml
index 12420bedc4..12420bedc4 100644
--- a/src/imports/controls/default/Switch.qml
+++ b/src/imports/controls/basic/Switch.qml
diff --git a/src/imports/controls/default/SwitchDelegate.qml b/src/imports/controls/basic/SwitchDelegate.qml
index e2a9f7b5e9..e2a9f7b5e9 100644
--- a/src/imports/controls/default/SwitchDelegate.qml
+++ b/src/imports/controls/basic/SwitchDelegate.qml
diff --git a/src/imports/controls/default/TabBar.qml b/src/imports/controls/basic/TabBar.qml
index f1b11ac297..f1b11ac297 100644
--- a/src/imports/controls/default/TabBar.qml
+++ b/src/imports/controls/basic/TabBar.qml
diff --git a/src/imports/controls/default/TabButton.qml b/src/imports/controls/basic/TabButton.qml
index 0935d46361..0935d46361 100644
--- a/src/imports/controls/default/TabButton.qml
+++ b/src/imports/controls/basic/TabButton.qml
diff --git a/src/imports/controls/default/TextArea.qml b/src/imports/controls/basic/TextArea.qml
index e6a1509e43..e6a1509e43 100644
--- a/src/imports/controls/default/TextArea.qml
+++ b/src/imports/controls/basic/TextArea.qml
diff --git a/src/imports/controls/default/TextField.qml b/src/imports/controls/basic/TextField.qml
index 2c69d35163..2c69d35163 100644
--- a/src/imports/controls/default/TextField.qml
+++ b/src/imports/controls/basic/TextField.qml
diff --git a/src/imports/controls/default/ToolBar.qml b/src/imports/controls/basic/ToolBar.qml
index 6f5e54e68e..6f5e54e68e 100644
--- a/src/imports/controls/default/ToolBar.qml
+++ b/src/imports/controls/basic/ToolBar.qml
diff --git a/src/imports/controls/default/ToolButton.qml b/src/imports/controls/basic/ToolButton.qml
index 63b40233d4..63b40233d4 100644
--- a/src/imports/controls/default/ToolButton.qml
+++ b/src/imports/controls/basic/ToolButton.qml
diff --git a/src/imports/controls/default/ToolSeparator.qml b/src/imports/controls/basic/ToolSeparator.qml
index e6d6a7f7f4..e6d6a7f7f4 100644
--- a/src/imports/controls/default/ToolSeparator.qml
+++ b/src/imports/controls/basic/ToolSeparator.qml
diff --git a/src/imports/controls/default/ToolTip.qml b/src/imports/controls/basic/ToolTip.qml
index 933b74003c..933b74003c 100644
--- a/src/imports/controls/default/ToolTip.qml
+++ b/src/imports/controls/basic/ToolTip.qml
diff --git a/src/imports/controls/default/Tumbler.qml b/src/imports/controls/basic/Tumbler.qml
index 89f7f056bf..89f7f056bf 100644
--- a/src/imports/controls/default/Tumbler.qml
+++ b/src/imports/controls/basic/Tumbler.qml
diff --git a/src/imports/controls/default/VerticalHeaderView.qml b/src/imports/controls/basic/VerticalHeaderView.qml
index 21e39c3983..21e39c3983 100644
--- a/src/imports/controls/default/VerticalHeaderView.qml
+++ b/src/imports/controls/basic/VerticalHeaderView.qml
diff --git a/src/imports/controls/default/default.pri b/src/imports/controls/basic/basic.pri
index e7147af426..337f7f3620 100644
--- a/src/imports/controls/default/default.pri
+++ b/src/imports/controls/basic/basic.pri
@@ -1,10 +1,10 @@
 HEADERS += \
-    $$PWD/qquickdefaultstyle_p.h \
-    $$PWD/qquickdefaulttheme_p.h
+    $$PWD/qquickbasicstyle_p.h \
+    $$PWD/qquickbasictheme_p.h
 
 SOURCES += \
-    $$PWD/qquickdefaultstyle.cpp \
-    $$PWD/qquickdefaulttheme.cpp
+    $$PWD/qquickbasicstyle.cpp \
+    $$PWD/qquickbasictheme.cpp
 
 QML_FILES += \
     $$PWD/AbstractButton.qml \
diff --git a/src/imports/controls/default/default.pro b/src/imports/controls/basic/basic.pro
index 5ecaafceac..3c2993a6ff 100644
--- a/src/imports/controls/default/default.pro
+++ b/src/imports/controls/basic/basic.pro
@@ -1,7 +1,7 @@
-TARGET = qtquickcontrols2defaultstyleplugin
-TARGETPATH = QtQuick/Controls/Default
+TARGET = qtquickcontrols2basicstyleplugin
+TARGETPATH = QtQuick/Controls/Basic
 
-QML_IMPORT_NAME = QtQuick.Controls.Default
+QML_IMPORT_NAME = QtQuick.Controls.Basic
 QML_IMPORT_VERSION = $$QT_VERSION
 
 QT += qml quick
@@ -9,19 +9,19 @@ QT_PRIVATE += core-private gui-private qml-private quick-private quicktemplates2
 
 DEFINES += QT_NO_CAST_TO_ASCII QT_NO_CAST_FROM_ASCII
 
-include(default.pri)
+include(basic.pri)
 
 OTHER_FILES += \
     qmldir \
     $$QML_FILES
 
 SOURCES += \
-    $$PWD/qtquickcontrols2defaultstyleplugin.cpp
+    $$PWD/qtquickcontrols2basicstyleplugin.cpp
 
 RESOURCES += \
-    $$PWD/qtquickcontrols2defaultstyleplugin.qrc
+    $$PWD/qtquickcontrols2basicstyleplugin.qrc
 
 CONFIG += qmltypes no_cxx_module install_qml_files builtin_resources qtquickcompiler
 load(qml_plugin)
 
-requires(qtConfig(quickcontrols2-default))
+requires(qtConfig(quickcontrols2-basic))
diff --git a/src/imports/controls/default/dependencies.json b/src/imports/controls/basic/dependencies.json
index 7802900441..7802900441 100644
--- a/src/imports/controls/default/dependencies.json
+++ b/src/imports/controls/basic/dependencies.json
diff --git a/src/imports/controls/default/images/arrow-indicator.png b/src/imports/controls/basic/images/arrow-indicator.png
index d833d52c40..d833d52c40 100644
--- a/src/imports/controls/default/images/arrow-indicator.png
+++ b/src/imports/controls/basic/images/arrow-indicator.png
diff --git a/src/imports/controls/default/images/arrow-indicator@2x.png b/src/imports/controls/basic/images/arrow-indicator@2x.png
index 55c7940a51..55c7940a51 100644
--- a/src/imports/controls/default/images/arrow-indicator@2x.png
+++ b/src/imports/controls/basic/images/arrow-indicator@2x.png
diff --git a/src/imports/controls/default/images/arrow-indicator@3x.png b/src/imports/controls/basic/images/arrow-indicator@3x.png
index c7067c5cd0..c7067c5cd0 100644
--- a/src/imports/controls/default/images/arrow-indicator@3x.png
+++ b/src/imports/controls/basic/images/arrow-indicator@3x.png
diff --git a/src/imports/controls/default/images/arrow-indicator@4x.png b/src/imports/controls/basic/images/arrow-indicator@4x.png
index 4c5cf3515a..4c5cf3515a 100644
--- a/src/imports/controls/default/images/arrow-indicator@4x.png
+++ b/src/imports/controls/basic/images/arrow-indicator@4x.png
diff --git a/src/imports/controls/default/images/check.png b/src/imports/controls/basic/images/check.png
index 479a84428d..479a84428d 100644
--- a/src/imports/controls/default/images/check.png
+++ b/src/imports/controls/basic/images/check.png
diff --git a/src/imports/controls/default/images/check@2x.png b/src/imports/controls/basic/images/check@2x.png
index 79663c0b03..79663c0b03 100644
--- a/src/imports/controls/default/images/check@2x.png
+++ b/src/imports/controls/basic/images/check@2x.png
diff --git a/src/imports/controls/default/images/check@3x.png b/src/imports/controls/basic/images/check@3x.png
index fd0135abe2..fd0135abe2 100644
--- a/src/imports/controls/default/images/check@3x.png
+++ b/src/imports/controls/basic/images/check@3x.png
diff --git a/src/imports/controls/default/images/check@4x.png b/src/imports/controls/basic/images/check@4x.png
index e7e0b64044..e7e0b64044 100644
--- a/src/imports/controls/default/images/check@4x.png
+++ b/src/imports/controls/basic/images/check@4x.png
diff --git a/src/imports/controls/default/images/dial-indicator.png b/src/imports/controls/basic/images/dial-indicator.png
index 92357c51d4..92357c51d4 100644
--- a/src/imports/controls/default/images/dial-indicator.png
+++ b/src/imports/controls/basic/images/dial-indicator.png
diff --git a/src/imports/controls/default/images/dial-indicator@2x.png b/src/imports/controls/basic/images/dial-indicator@2x.png
index f436443b0a..f436443b0a 100644
--- a/src/imports/controls/default/images/dial-indicator@2x.png
+++ b/src/imports/controls/basic/images/dial-indicator@2x.png
diff --git a/src/imports/controls/default/images/dial-indicator@3x.png b/src/imports/controls/basic/images/dial-indicator@3x.png
index d883045bcb..d883045bcb 100644
--- a/src/imports/controls/default/images/dial-indicator@3x.png
+++ b/src/imports/controls/basic/images/dial-indicator@3x.png
diff --git a/src/imports/controls/default/images/dial-indicator@4x.png b/src/imports/controls/basic/images/dial-indicator@4x.png
index 794777128b..794777128b 100644
--- a/src/imports/controls/default/images/dial-indicator@4x.png
+++ b/src/imports/controls/basic/images/dial-indicator@4x.png
diff --git a/src/imports/controls/default/images/double-arrow.png b/src/imports/controls/basic/images/double-arrow.png
index 3ecd7f89f3..3ecd7f89f3 100644
--- a/src/imports/controls/default/images/double-arrow.png
+++ b/src/imports/controls/basic/images/double-arrow.png
diff --git a/src/imports/controls/default/images/double-arrow@2x.png b/src/imports/controls/basic/images/double-arrow@2x.png
index eeb03e2847..eeb03e2847 100644
--- a/src/imports/controls/default/images/double-arrow@2x.png
+++ b/src/imports/controls/basic/images/double-arrow@2x.png
diff --git a/src/imports/controls/default/images/double-arrow@3x.png b/src/imports/controls/basic/images/double-arrow@3x.png
index f0662d2026..f0662d2026 100644
--- a/src/imports/controls/default/images/double-arrow@3x.png
+++ b/src/imports/controls/basic/images/double-arrow@3x.png
diff --git a/src/imports/controls/default/images/double-arrow@4x.png b/src/imports/controls/basic/images/double-arrow@4x.png
index 10891e9133..10891e9133 100644
--- a/src/imports/controls/default/images/double-arrow@4x.png
+++ b/src/imports/controls/basic/images/double-arrow@4x.png
diff --git a/src/imports/controls/default/images/drop-indicator.png b/src/imports/controls/basic/images/drop-indicator.png
index 80c1d958e3..80c1d958e3 100644
--- a/src/imports/controls/default/images/drop-indicator.png
+++ b/src/imports/controls/basic/images/drop-indicator.png
diff --git a/src/imports/controls/default/images/drop-indicator@2x.png b/src/imports/controls/basic/images/drop-indicator@2x.png
index 6e0f228c54..6e0f228c54 100644
--- a/src/imports/controls/default/images/drop-indicator@2x.png
+++ b/src/imports/controls/basic/images/drop-indicator@2x.png
diff --git a/src/imports/controls/default/images/drop-indicator@3x.png b/src/imports/controls/basic/images/drop-indicator@3x.png
index 199752fbf8..199752fbf8 100644
--- a/src/imports/controls/default/images/drop-indicator@3x.png
+++ b/src/imports/controls/basic/images/drop-indicator@3x.png
diff --git a/src/imports/controls/default/images/drop-indicator@4x.png b/src/imports/controls/basic/images/drop-indicator@4x.png
index 58311fbe2a..58311fbe2a 100644
--- a/src/imports/controls/default/images/drop-indicator@4x.png
+++ b/src/imports/controls/basic/images/drop-indicator@4x.png
diff --git a/src/imports/controls/default/impl/CMakeLists.txt b/src/imports/controls/basic/impl/CMakeLists.txt
index e6258d1374..08bffb5dac 100644
--- a/src/imports/controls/default/impl/CMakeLists.txt
+++ b/src/imports/controls/basic/impl/CMakeLists.txt
@@ -1,20 +1,20 @@
-# Generated from default-impl.pro.
+# Generated from basic-impl.pro.
 
 #####################################################################
-## qtquickcontrols2defaultstyleimplplugin Plugin:
+## qtquickcontrols2basicstyleimplplugin Plugin:
 #####################################################################
 
-qt_add_qml_module(qtquickcontrols2defaultstyleimplplugin
-    URI "QtQuick.Controls.Default.impl"
+qt_add_qml_module(qtquickcontrols2basicstyleimplplugin
+    URI "QtQuick.Controls.Basic.impl"
     VERSION "${CMAKE_PROJECT_VERSION}"
-    CLASSNAME QtQuickControls2DefaultStyleImplPlugin
+    CLASSNAME QtQuickControls2BasicStyleImplPlugin
     SKIP_TYPE_REGISTRATION
     GENERATE_QMLTYPES
     SOURCES
-        qquickdefaultbusyindicator.cpp qquickdefaultbusyindicator_p.h
-        qquickdefaultdial.cpp qquickdefaultdial_p.h
-        qquickdefaultprogressbar.cpp qquickdefaultprogressbar_p.h
-        qtquickcontrols2defaultstyleimplplugin.cpp
+        qquickbasicbusyindicator.cpp qquickbasicbusyindicator_p.h
+        qquickbasicdial.cpp qquickbasicdial_p.h
+        qquickbasicprogressbar.cpp qquickbasicprogressbar_p.h
+        qtquickcontrols2basicstyleimplplugin.cpp
     DEFINES
         QT_NO_CAST_FROM_ASCII
         QT_NO_CAST_TO_ASCII
@@ -32,10 +32,10 @@ qt_add_qml_module(qtquickcontrols2defaultstyleimplplugin
         Qt::Quick
 )
 
-#### Keys ignored in scope 1:.:.:default-impl.pro:<TRUE>:
+#### Keys ignored in scope 1:.:.:basic-impl.pro:<TRUE>:
 # OTHER_FILES = "qmldir"
-# QML_IMPORT_NAME = "QtQuick.Controls.Default.impl"
+# QML_IMPORT_NAME = "QtQuick.Controls.Basic.impl"
 # QML_IMPORT_VERSION = "$$QT_VERSION"
 # QT_FOR_CONFIG = "quickcontrols2-private"
-# TARGETPATH = "QtQuick/Controls/Default/impl"
-# _REQUIREMENTS = "qtConfig(quickcontrols2-default)"
+# TARGETPATH = "QtQuick/Controls/Basic/impl"
+# _REQUIREMENTS = "qtConfig(quickcontrols2-basic)"
diff --git a/src/imports/controls/basic/impl/basic-impl.pro b/src/imports/controls/basic/impl/basic-impl.pro
new file mode 100644
index 0000000000..ba60b08158
--- /dev/null
+++ b/src/imports/controls/basic/impl/basic-impl.pro
@@ -0,0 +1,30 @@
+TARGET = qtquickcontrols2basicstyleimplplugin
+TARGETPATH = QtQuick/Controls/Basic/impl
+
+QML_IMPORT_NAME = QtQuick.Controls.Basic.impl
+QML_IMPORT_VERSION = $$QT_VERSION
+
+QT += qml quick
+QT_PRIVATE += core-private gui qml-private quick-private quicktemplates2-private quickcontrols2impl-private
+QT_FOR_CONFIG = quickcontrols2-private
+
+DEFINES += QT_NO_CAST_TO_ASCII QT_NO_CAST_FROM_ASCII
+
+OTHER_FILES += \
+    qmldir
+
+HEADERS += \
+    $$PWD/qquickbasicbusyindicator_p.h \
+    $$PWD/qquickbasicdial_p.h \
+    $$PWD/qquickbasicprogressbar_p.h
+
+SOURCES += \
+    $$PWD/qquickbasicbusyindicator.cpp \
+    $$PWD/qquickbasicdial.cpp \
+    $$PWD/qquickbasicprogressbar.cpp \
+    $$PWD/qtquickcontrols2basicstyleimplplugin.cpp
+
+CONFIG += qmltypes install_qmltypes no_cxx_module
+load(qml_plugin)
+
+requires(qtConfig(quickcontrols2-basic))
diff --git a/src/imports/controls/basic/impl/qmldir b/src/imports/controls/basic/impl/qmldir
new file mode 100644
index 0000000000..a5fabe7f9f
--- /dev/null
+++ b/src/imports/controls/basic/impl/qmldir
@@ -0,0 +1,3 @@
+module QtQuick.Controls.Basic.impl
+plugin qtquickcontrols2basicstyleimplplugin
+classname QtQuickControls2BasicStyleImplPlugin
diff --git a/src/imports/controls/default/impl/qquickdefaultbusyindicator.cpp b/src/imports/controls/basic/impl/qquickbasicbusyindicator.cpp
index 880d869bdf..7fb3b024cd 100644
--- a/src/imports/controls/default/impl/qquickdefaultbusyindicator.cpp
+++ b/src/imports/controls/basic/impl/qquickbasicbusyindicator.cpp
@@ -34,7 +34,7 @@
 **
 ****************************************************************************/
 
-#include "qquickdefaultbusyindicator_p.h"
+#include "qquickbasicbusyindicator_p.h"
 
 #include <QtQuick/private/qquickitem_p.h>
 #include <QtQuick/private/qsgadaptationlayer_p.h>
@@ -51,10 +51,10 @@ static QPointF moveCircle(const QPointF &pos, qreal rotation, qreal distance)
     return pos - QTransform().rotate(rotation).map(QPointF(0, distance));
 }
 
-class QQuickDefaultBusyIndicatorNode : public QQuickAnimatedNode
+class QQuickBasicBusyIndicatorNode : public QQuickAnimatedNode
 {
 public:
-    QQuickDefaultBusyIndicatorNode(QQuickDefaultBusyIndicator *item);
+    QQuickBasicBusyIndicatorNode(QQuickBasicBusyIndicator *item);
 
     void updateCurrentTime(int time) override;
     void sync(QQuickItem *item) override;
@@ -64,7 +64,7 @@ private:
     QColor m_fill;
 };
 
-QQuickDefaultBusyIndicatorNode::QQuickDefaultBusyIndicatorNode(QQuickDefaultBusyIndicator *item)
+QQuickBasicBusyIndicatorNode::QQuickBasicBusyIndicatorNode(QQuickBasicBusyIndicator *item)
     : QQuickAnimatedNode(item)
 {
     setLoopCount(Infinite);
@@ -82,7 +82,7 @@ QQuickDefaultBusyIndicatorNode::QQuickDefaultBusyIndicatorNode(QQuickDefaultBusy
     }
 }
 
-void QQuickDefaultBusyIndicatorNode::updateCurrentTime(int time)
+void QQuickBasicBusyIndicatorNode::updateCurrentTime(int time)
 {
     const qreal percentageComplete = time / qreal(TotalDuration);
     const qreal firstPhaseProgress = percentageComplete <= 0.5 ? percentageComplete * 2 : 0;
@@ -104,7 +104,7 @@ void QQuickDefaultBusyIndicatorNode::updateCurrentTime(int time)
     }
 }
 
-void QQuickDefaultBusyIndicatorNode::sync(QQuickItem *item)
+void QQuickBasicBusyIndicatorNode::sync(QQuickItem *item)
 {
     const qreal w = item->width();
     const qreal h = item->height();
@@ -113,8 +113,8 @@ void QQuickDefaultBusyIndicatorNode::sync(QQuickItem *item)
     const qreal dy = (h - sz) / 2;
     const int circleRadius = sz / 12;
 
-    m_pen = static_cast<QQuickDefaultBusyIndicator *>(item)->pen();
-    m_fill = static_cast<QQuickDefaultBusyIndicator *>(item)->fill();
+    m_pen = static_cast<QQuickBasicBusyIndicator *>(item)->pen();
+    m_fill = static_cast<QQuickBasicBusyIndicator *>(item)->fill();
 
     QSGTransformNode *transformNode = static_cast<QSGTransformNode *>(firstChild());
     for (int i = 0; i < CircleCount; ++i) {
@@ -137,18 +137,18 @@ void QQuickDefaultBusyIndicatorNode::sync(QQuickItem *item)
     }
 }
 
-QQuickDefaultBusyIndicator::QQuickDefaultBusyIndicator(QQuickItem *parent) :
+QQuickBasicBusyIndicator::QQuickBasicBusyIndicator(QQuickItem *parent) :
     QQuickItem(parent)
 {
     setFlag(ItemHasContents);
 }
 
-QColor QQuickDefaultBusyIndicator::pen() const
+QColor QQuickBasicBusyIndicator::pen() const
 {
     return m_pen;
 }
 
-void QQuickDefaultBusyIndicator::setPen(const QColor &pen)
+void QQuickBasicBusyIndicator::setPen(const QColor &pen)
 {
     if (pen == m_pen)
         return;
@@ -157,12 +157,12 @@ void QQuickDefaultBusyIndicator::setPen(const QColor &pen)
     update();
 }
 
-QColor QQuickDefaultBusyIndicator::fill() const
+QColor QQuickBasicBusyIndicator::fill() const
 {
     return m_fill;
 }
 
-void QQuickDefaultBusyIndicator::setFill(const QColor &fill)
+void QQuickBasicBusyIndicator::setFill(const QColor &fill)
 {
     if (fill == m_fill)
         return;
@@ -171,23 +171,23 @@ void QQuickDefaultBusyIndicator::setFill(const QColor &fill)
     update();
 }
 
-bool QQuickDefaultBusyIndicator::isRunning() const
+bool QQuickBasicBusyIndicator::isRunning() const
 {
     return isVisible();
 }
 
-void QQuickDefaultBusyIndicator::setRunning(bool running)
+void QQuickBasicBusyIndicator::setRunning(bool running)
 {
     if (running)
         setVisible(true);
 }
 
-int QQuickDefaultBusyIndicator::elapsed() const
+int QQuickBasicBusyIndicator::elapsed() const
 {
     return m_elapsed;
 }
 
-void QQuickDefaultBusyIndicator::itemChange(QQuickItem::ItemChange change, const QQuickItem::ItemChangeData &data)
+void QQuickBasicBusyIndicator::itemChange(QQuickItem::ItemChange change, const QQuickItem::ItemChangeData &data)
 {
     QQuickItem::itemChange(change, data);
     switch (change) {
@@ -203,12 +203,12 @@ void QQuickDefaultBusyIndicator::itemChange(QQuickItem::ItemChange change, const
     }
 }
 
-QSGNode *QQuickDefaultBusyIndicator::updatePaintNode(QSGNode *oldNode, QQuickItem::UpdatePaintNodeData *)
+QSGNode *QQuickBasicBusyIndicator::updatePaintNode(QSGNode *oldNode, QQuickItem::UpdatePaintNodeData *)
 {
-    QQuickDefaultBusyIndicatorNode *node = static_cast<QQuickDefaultBusyIndicatorNode *>(oldNode);
+    QQuickBasicBusyIndicatorNode *node = static_cast<QQuickBasicBusyIndicatorNode *>(oldNode);
     if (isRunning() && width() > 0 && height() > 0) {
         if (!node) {
-            node = new QQuickDefaultBusyIndicatorNode(this);
+            node = new QQuickBasicBusyIndicatorNode(this);
             node->start();
         }
         node->sync(this);
diff --git a/src/imports/controls/default/impl/qquickdefaultbusyindicator_p.h b/src/imports/controls/basic/impl/qquickbasicbusyindicator_p.h
index 5cd60ff517..7eea665675 100644
--- a/src/imports/controls/default/impl/qquickdefaultbusyindicator_p.h
+++ b/src/imports/controls/basic/impl/qquickbasicbusyindicator_p.h
@@ -53,7 +53,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class QQuickDefaultBusyIndicator : public QQuickItem
+class QQuickBasicBusyIndicator : public QQuickItem
 {
     Q_OBJECT
     Q_PROPERTY(QColor pen READ pen WRITE setPen FINAL)
@@ -63,7 +63,7 @@ class QQuickDefaultBusyIndicator : public QQuickItem
     QML_ADDED_IN_VERSION(2, 0)
 
 public:
-    explicit QQuickDefaultBusyIndicator(QQuickItem *parent = nullptr);
+    explicit QQuickBasicBusyIndicator(QQuickItem *parent = nullptr);
 
     QColor pen() const;
     void setPen(const QColor &pen);
@@ -88,6 +88,6 @@ private:
 
 QT_END_NAMESPACE
 
-QML_DECLARE_TYPE(QQuickDefaultBusyIndicator)
+QML_DECLARE_TYPE(QQuickBasicBusyIndicator)
 
 #endif // QQUICKDEFAULTBUSYINDICATOR_P_H
diff --git a/src/imports/controls/default/impl/qquickdefaultdial.cpp b/src/imports/controls/basic/impl/qquickbasicdial.cpp
index 1653def7e2..223e804215 100644
--- a/src/imports/controls/default/impl/qquickdefaultdial.cpp
+++ b/src/imports/controls/basic/impl/qquickbasicdial.cpp
@@ -34,7 +34,7 @@
 **
 ****************************************************************************/
 
-#include "qquickdefaultdial_p.h"
+#include "qquickbasicdial_p.h"
 
 #include <QtCore/qmath.h>
 #include <QtGui/qpainter.h>
@@ -42,17 +42,17 @@
 
 QT_BEGIN_NAMESPACE
 
-QQuickDefaultDial::QQuickDefaultDial(QQuickItem *parent) :
+QQuickBasicDial::QQuickBasicDial(QQuickItem *parent) :
     QQuickPaintedItem(parent)
 {
 }
 
-qreal QQuickDefaultDial::progress() const
+qreal QQuickBasicDial::progress() const
 {
     return m_progress;
 }
 
-void QQuickDefaultDial::setProgress(qreal progress)
+void QQuickBasicDial::setProgress(qreal progress)
 {
     if (progress == m_progress)
         return;
@@ -61,12 +61,12 @@ void QQuickDefaultDial::setProgress(qreal progress)
     update();
 }
 
-QColor QQuickDefaultDial::color() const
+QColor QQuickBasicDial::color() const
 {
     return m_color;
 }
 
-void QQuickDefaultDial::setColor(const QColor &color)
+void QQuickBasicDial::setColor(const QColor &color)
 {
     if (color == m_color)
         return;
@@ -75,7 +75,7 @@ void QQuickDefaultDial::setColor(const QColor &color)
     update();
 }
 
-void QQuickDefaultDial::paint(QPainter *painter)
+void QQuickBasicDial::paint(QPainter *painter)
 {
     if (width() <= 0 || height() <= 0)
         return;
diff --git a/src/imports/controls/default/impl/qquickdefaultdial_p.h b/src/imports/controls/basic/impl/qquickbasicdial_p.h
index 7cdc5e9a89..bd9bbb7201 100644
--- a/src/imports/controls/default/impl/qquickdefaultdial_p.h
+++ b/src/imports/controls/basic/impl/qquickbasicdial_p.h
@@ -53,7 +53,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class QQuickDefaultDial : public QQuickPaintedItem
+class QQuickBasicDial : public QQuickPaintedItem
 {
     Q_OBJECT
     Q_PROPERTY(qreal progress READ progress WRITE setProgress FINAL)
@@ -62,7 +62,7 @@ class QQuickDefaultDial : public QQuickPaintedItem
     QML_ADDED_IN_VERSION(2, 0)
 
 public:
-    explicit QQuickDefaultDial(QQuickItem *parent = nullptr);
+    explicit QQuickBasicDial(QQuickItem *parent = nullptr);
 
     qreal progress() const;
     void setProgress(qreal progress);
diff --git a/src/imports/controls/default/impl/qquickdefaultprogressbar.cpp b/src/imports/controls/basic/impl/qquickbasicprogressbar.cpp
index fcaada9478..717082af47 100644
--- a/src/imports/controls/default/impl/qquickdefaultprogressbar.cpp
+++ b/src/imports/controls/basic/impl/qquickbasicprogressbar.cpp
@@ -34,7 +34,7 @@
 **
 ****************************************************************************/
 
-#include "qquickdefaultprogressbar_p.h"
+#include "qquickbasicprogressbar_p.h"
 
 #include <QtCore/qeasingcurve.h>
 #include <QtQuick/private/qquickitem_p.h>
@@ -68,10 +68,10 @@ static inline qreal blockEndX(int blockIndex, qreal availableWidth)
     return availableWidth - blockStartX(Blocks - 1 - blockIndex) - BlockWidth;
 }
 
-class QQuickDefaultProgressBarNode : public QQuickAnimatedNode
+class QQuickBasicProgressBarNode : public QQuickAnimatedNode
 {
 public:
-    QQuickDefaultProgressBarNode(QQuickDefaultProgressBar *item);
+    QQuickBasicProgressBarNode(QQuickBasicProgressBar *item);
 
     void updateCurrentTime(int time) override;
     void sync(QQuickItem *item) override;
@@ -81,7 +81,7 @@ private:
     qreal m_pixelsPerSecond = 0;
 };
 
-QQuickDefaultProgressBarNode::QQuickDefaultProgressBarNode(QQuickDefaultProgressBar *item)
+QQuickBasicProgressBarNode::QQuickBasicProgressBarNode(QQuickBasicProgressBar *item)
     : QQuickAnimatedNode(item),
       m_pixelsPerSecond(item->width())
 {
@@ -89,7 +89,7 @@ QQuickDefaultProgressBarNode::QQuickDefaultProgressBarNode(QQuickDefaultProgress
     setDuration(TotalDuration);
 }
 
-void QQuickDefaultProgressBarNode::updateCurrentTime(int time)
+void QQuickBasicProgressBarNode::updateCurrentTime(int time)
 {
     QSGTransformNode *transformNode = static_cast<QSGTransformNode*>(firstChild());
     for (int i = 0; i < Blocks; ++i) {
@@ -142,9 +142,9 @@ void QQuickDefaultProgressBarNode::updateCurrentTime(int time)
     }
 }
 
-void QQuickDefaultProgressBarNode::sync(QQuickItem *item)
+void QQuickBasicProgressBarNode::sync(QQuickItem *item)
 {
-    QQuickDefaultProgressBar *bar = static_cast<QQuickDefaultProgressBar *>(item);
+    QQuickBasicProgressBar *bar = static_cast<QQuickBasicProgressBar *>(item);
     if (m_indeterminate != bar->isIndeterminate()) {
         m_indeterminate = bar->isIndeterminate();
         if (m_indeterminate)
@@ -207,18 +207,18 @@ void QQuickDefaultProgressBarNode::sync(QQuickItem *item)
     }
 }
 
-QQuickDefaultProgressBar::QQuickDefaultProgressBar(QQuickItem *parent) :
+QQuickBasicProgressBar::QQuickBasicProgressBar(QQuickItem *parent) :
     QQuickItem(parent)
 {
     setFlag(ItemHasContents);
 }
 
-qreal QQuickDefaultProgressBar::progress() const
+qreal QQuickBasicProgressBar::progress() const
 {
     return m_progress;
 }
 
-void QQuickDefaultProgressBar::setProgress(qreal progress)
+void QQuickBasicProgressBar::setProgress(qreal progress)
 {
     if (progress == m_progress)
         return;
@@ -227,12 +227,12 @@ void QQuickDefaultProgressBar::setProgress(qreal progress)
     update();
 }
 
-bool QQuickDefaultProgressBar::isIndeterminate() const
+bool QQuickBasicProgressBar::isIndeterminate() const
 {
     return m_indeterminate;
 }
 
-void QQuickDefaultProgressBar::setIndeterminate(bool indeterminate)
+void QQuickBasicProgressBar::setIndeterminate(bool indeterminate)
 {
     if (indeterminate == m_indeterminate)
         return;
@@ -242,12 +242,12 @@ void QQuickDefaultProgressBar::setIndeterminate(bool indeterminate)
     update();
 }
 
-QColor QQuickDefaultProgressBar::color() const
+QColor QQuickBasicProgressBar::color() const
 {
     return m_color;
 }
 
-void QQuickDefaultProgressBar::setColor(const QColor &color)
+void QQuickBasicProgressBar::setColor(const QColor &color)
 {
     if (color == m_color)
         return;
@@ -256,19 +256,19 @@ void QQuickDefaultProgressBar::setColor(const QColor &color)
     update();
 }
 
-void QQuickDefaultProgressBar::itemChange(QQuickItem::ItemChange change, const QQuickItem::ItemChangeData &data)
+void QQuickBasicProgressBar::itemChange(QQuickItem::ItemChange change, const QQuickItem::ItemChangeData &data)
 {
     QQuickItem::itemChange(change, data);
     if (change == ItemVisibleHasChanged)
         update();
 }
 
-QSGNode *QQuickDefaultProgressBar::updatePaintNode(QSGNode *oldNode, QQuickItem::UpdatePaintNodeData *)
+QSGNode *QQuickBasicProgressBar::updatePaintNode(QSGNode *oldNode, QQuickItem::UpdatePaintNodeData *)
 {
-    QQuickDefaultProgressBarNode *node = static_cast<QQuickDefaultProgressBarNode *>(oldNode);
+    QQuickBasicProgressBarNode *node = static_cast<QQuickBasicProgressBarNode *>(oldNode);
     if (isVisible() && width() > 0 && height() > 0) {
         if (!node)
-            node = new QQuickDefaultProgressBarNode(this);
+            node = new QQuickBasicProgressBarNode(this);
         node->sync(this);
     } else {
         delete node;
diff --git a/src/imports/controls/default/impl/qquickdefaultprogressbar_p.h b/src/imports/controls/basic/impl/qquickbasicprogressbar_p.h
index 3e4955c4db..1d853ecb41 100644
--- a/src/imports/controls/default/impl/qquickdefaultprogressbar_p.h
+++ b/src/imports/controls/basic/impl/qquickbasicprogressbar_p.h
@@ -53,7 +53,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class QQuickDefaultProgressBar : public QQuickItem
+class QQuickBasicProgressBar : public QQuickItem
 {
     Q_OBJECT
     Q_PROPERTY(bool indeterminate READ isIndeterminate WRITE setIndeterminate FINAL)
@@ -63,7 +63,7 @@ class QQuickDefaultProgressBar : public QQuickItem
     QML_ADDED_IN_VERSION(2, 0)
 
 public:
-    explicit QQuickDefaultProgressBar(QQuickItem *parent = nullptr);
+    explicit QQuickBasicProgressBar(QQuickItem *parent = nullptr);
 
     bool isIndeterminate() const;
     void setIndeterminate(bool indeterminate);
@@ -86,6 +86,6 @@ private:
 
 QT_END_NAMESPACE
 
-QML_DECLARE_TYPE(QQuickDefaultProgressBar)
+QML_DECLARE_TYPE(QQuickBasicProgressBar)
 
 #endif // QQUICKDEFAULTPROGRESSBAR_P_H
diff --git a/src/imports/controls/default/impl/qtquickcontrols2defaultstyleimplplugin.cpp b/src/imports/controls/basic/impl/qtquickcontrols2basicstyleimplplugin.cpp
index 734d32de61..8a8bba46f5 100644
--- a/src/imports/controls/default/impl/qtquickcontrols2defaultstyleimplplugin.cpp
+++ b/src/imports/controls/basic/impl/qtquickcontrols2basicstyleimplplugin.cpp
@@ -38,20 +38,20 @@
 
 QT_BEGIN_NAMESPACE
 
-class QtQuickControls2DefaultStyleImplPlugin : public QQmlEngineExtensionPlugin
+class QtQuickControls2BasicStyleImplPlugin : public QQmlEngineExtensionPlugin
 {
     Q_OBJECT
     Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid)
 
 public:
-    QtQuickControls2DefaultStyleImplPlugin(QObject *parent = nullptr);
+    QtQuickControls2BasicStyleImplPlugin(QObject *parent = nullptr);
 };
 
-QtQuickControls2DefaultStyleImplPlugin::QtQuickControls2DefaultStyleImplPlugin(QObject *parent)
+QtQuickControls2BasicStyleImplPlugin::QtQuickControls2BasicStyleImplPlugin(QObject *parent)
     : QQmlEngineExtensionPlugin(parent)
 {
 }
 
 QT_END_NAMESPACE
 
-#include "qtquickcontrols2defaultstyleimplplugin.moc"
+#include "qtquickcontrols2basicstyleimplplugin.moc"
diff --git a/src/imports/controls/default/qmldir b/src/imports/controls/basic/qmldir
index 4b4645befd..136db062fc 100644
--- a/src/imports/controls/default/qmldir
+++ b/src/imports/controls/basic/qmldir
@@ -1,6 +1,6 @@
-module QtQuick.Controls.Default
-plugin qtquickcontrols2defaultstyleplugin
-classname QtQuickControls2DefaultStylePlugin
+module QtQuick.Controls.Basic
+plugin qtquickcontrols2basicstyleplugin
+classname QtQuickControls2BasicStylePlugin
 
 # QtQuick.Controls 2.0 (originally introduced in Qt 5.7)
 AbstractButton 2.0 AbstractButton.qml
diff --git a/src/imports/controls/default/qquickdefaultstyle.cpp b/src/imports/controls/basic/qquickbasicstyle.cpp
index 15c5979852..9dcb7c74a8 100644
--- a/src/imports/controls/default/qquickdefaultstyle.cpp
+++ b/src/imports/controls/basic/qquickbasicstyle.cpp
@@ -34,211 +34,211 @@
 **
 ****************************************************************************/
 
-#include "qquickdefaultstyle_p.h"
+#include "qquickbasicstyle_p.h"
 
 QT_BEGIN_NAMESPACE
 
-QQuickDefaultStyle::QQuickDefaultStyle(QObject *parent) :
+QQuickBasicStyle::QQuickBasicStyle(QObject *parent) :
     QObject(parent)
 {
 }
 
-QColor QQuickDefaultStyle::backgroundColor() const
+QColor QQuickBasicStyle::backgroundColor() const
 {
     return QColor::fromRgba(0xFFFFFFFF);
 }
 
-QColor QQuickDefaultStyle::overlayModalColor() const
+QColor QQuickBasicStyle::overlayModalColor() const
 {
     return QColor::fromRgba(0x7F28282A);
 }
 
-QColor QQuickDefaultStyle::overlayDimColor() const
+QColor QQuickBasicStyle::overlayDimColor() const
 {
     return QColor::fromRgba(0x1F28282A);
 }
 
-QColor QQuickDefaultStyle::textColor() const
+QColor QQuickBasicStyle::textColor() const
 {
     return QColor::fromRgba(0xFF353637);
 }
 
-QColor QQuickDefaultStyle::textDarkColor() const
+QColor QQuickBasicStyle::textDarkColor() const
 {
     return QColor::fromRgba(0xFF26282A);
 }
 
-QColor QQuickDefaultStyle::textLightColor() const
+QColor QQuickBasicStyle::textLightColor() const
 {
     return QColor::fromRgba(0xFFFFFFFF);
 }
 
-QColor QQuickDefaultStyle::textLinkColor() const
+QColor QQuickBasicStyle::textLinkColor() const
 {
     return QColor::fromRgba(0xFF45A7D7);
 }
 
-QColor QQuickDefaultStyle::textSelectionColor() const
+QColor QQuickBasicStyle::textSelectionColor() const
 {
     return QColor::fromRgba(0xFFFDDD5C);
 }
 
-QColor QQuickDefaultStyle::textDisabledColor() const
+QColor QQuickBasicStyle::textDisabledColor() const
 {
     return QColor::fromRgba(0xFFBDBEBF);
 }
 
-QColor QQuickDefaultStyle::textDisabledLightColor() const
+QColor QQuickBasicStyle::textDisabledLightColor() const
 {
     return QColor::fromRgba(0xFFC2C2C2);
 }
 
-QColor QQuickDefaultStyle::textPlaceholderColor() const
+QColor QQuickBasicStyle::textPlaceholderColor() const
 {
     return QColor::fromRgba(0xFF777777);
 }
 
-QColor QQuickDefaultStyle::focusColor() const
+QColor QQuickBasicStyle::focusColor() const
 {
     return QColor::fromRgba(0xFF0066FF);
 }
 
-QColor QQuickDefaultStyle::focusLightColor() const
+QColor QQuickBasicStyle::focusLightColor() const
 {
     return QColor::fromRgba(0xFFF0F6FF);
 }
 
-QColor QQuickDefaultStyle::focusPressedColor() const
+QColor QQuickBasicStyle::focusPressedColor() const
 {
     return QColor::fromRgba(0xFFCCE0FF);
 }
 
-QColor QQuickDefaultStyle::buttonColor() const
+QColor QQuickBasicStyle::buttonColor() const
 {
     return QColor::fromRgba(0xFFE0E0E0);
 }
 
-QColor QQuickDefaultStyle::buttonPressedColor() const
+QColor QQuickBasicStyle::buttonPressedColor() const
 {
     return QColor::fromRgba(0xFFD0D0D0);
 }
 
-QColor QQuickDefaultStyle::buttonCheckedColor() const
+QColor QQuickBasicStyle::buttonCheckedColor() const
 {
     return QColor::fromRgba(0xFF353637);
 }
 
-QColor QQuickDefaultStyle::buttonCheckedPressedColor() const
+QColor QQuickBasicStyle::buttonCheckedPressedColor() const
 {
     return QColor::fromRgba(0xFF585A5C);
 }
 
-QColor QQuickDefaultStyle::buttonCheckedFocusColor() const
+QColor QQuickBasicStyle::buttonCheckedFocusColor() const
 {
     return QColor::fromRgba(0xFF599BFF);
 }
 
-QColor QQuickDefaultStyle::toolButtonColor() const
+QColor QQuickBasicStyle::toolButtonColor() const
 {
     return QColor::fromRgba(0x33333333);
 }
 
-QColor QQuickDefaultStyle::tabButtonColor() const
+QColor QQuickBasicStyle::tabButtonColor() const
 {
     return QColor::fromRgba(0xFF353637);
 }
 
-QColor QQuickDefaultStyle::tabButtonPressedColor() const
+QColor QQuickBasicStyle::tabButtonPressedColor() const
 {
     return QColor::fromRgba(0xFF585A5C);
 }
 
-QColor QQuickDefaultStyle::tabButtonCheckedPressedColor() const
+QColor QQuickBasicStyle::tabButtonCheckedPressedColor() const
 {
     return QColor::fromRgba(0xFFE4E4E4);
 }
 
-QColor QQuickDefaultStyle::delegateColor() const
+QColor QQuickBasicStyle::delegateColor() const
 {
     return QColor::fromRgba(0xFFEEEEEE);
 }
 
-QColor QQuickDefaultStyle::delegatePressedColor() const
+QColor QQuickBasicStyle::delegatePressedColor() const
 {
     return QColor::fromRgba(0xFFBDBEBF);
 }
 
-QColor QQuickDefaultStyle::delegateFocusColor() const
+QColor QQuickBasicStyle::delegateFocusColor() const
 {
     return QColor::fromRgba(0xFFE5EFFF);
 }
 
-QColor QQuickDefaultStyle::indicatorPressedColor() const
+QColor QQuickBasicStyle::indicatorPressedColor() const
 {
     return QColor::fromRgba(0xFFF6F6F6);
 }
 
-QColor QQuickDefaultStyle::indicatorDisabledColor() const
+QColor QQuickBasicStyle::indicatorDisabledColor() const
 {
     return QColor::fromRgba(0xFFFDFDFD);
 }
 
-QColor QQuickDefaultStyle::indicatorFrameColor() const
+QColor QQuickBasicStyle::indicatorFrameColor() const
 {
     return QColor::fromRgba(0xFF909090);
 }
 
-QColor QQuickDefaultStyle::indicatorFramePressedColor() const
+QColor QQuickBasicStyle::indicatorFramePressedColor() const
 {
     return QColor::fromRgba(0xFF808080);
 }
 
-QColor QQuickDefaultStyle::indicatorFrameDisabledColor() const
+QColor QQuickBasicStyle::indicatorFrameDisabledColor() const
 {
     return QColor::fromRgba(0xFFD6D6D6);
 }
 
-QColor QQuickDefaultStyle::frameDarkColor() const
+QColor QQuickBasicStyle::frameDarkColor() const
 {
     return QColor::fromRgba(0xFF353637);
 }
 
-QColor QQuickDefaultStyle::frameLightColor() const
+QColor QQuickBasicStyle::frameLightColor() const
 {
     return QColor::fromRgba(0xFFBDBEBF);
 }
 
-QColor QQuickDefaultStyle::scrollBarColor() const
+QColor QQuickBasicStyle::scrollBarColor() const
 {
     return QColor::fromRgba(0xFFBDBEBF);
 }
 
-QColor QQuickDefaultStyle::scrollBarPressedColor() const
+QColor QQuickBasicStyle::scrollBarPressedColor() const
 {
     return QColor::fromRgba(0xFF28282A);
 }
 
-QColor QQuickDefaultStyle::progressBarColor() const
+QColor QQuickBasicStyle::progressBarColor() const
 {
     return QColor::fromRgba(0xFFE4E4E4);
 }
 
-QColor QQuickDefaultStyle::pageIndicatorColor() const
+QColor QQuickBasicStyle::pageIndicatorColor() const
 {
     return QColor::fromRgba(0xFF28282A);
 }
 
-QColor QQuickDefaultStyle::separatorColor() const
+QColor QQuickBasicStyle::separatorColor() const
 {
     return QColor::fromRgba(0xFFCCCCCC);
 }
 
-QColor QQuickDefaultStyle::disabledDarkColor() const
+QColor QQuickBasicStyle::disabledDarkColor() const
 {
     return QColor::fromRgba(0xFF353637);
 }
 
-QColor QQuickDefaultStyle::disabledLightColor() const
+QColor QQuickBasicStyle::disabledLightColor() const
 {
     return QColor::fromRgba(0xFFBDBEBF);
 }
diff --git a/src/imports/controls/default/qquickdefaultstyle_p.h b/src/imports/controls/basic/qquickbasicstyle_p.h
index fa4e77a8ce..3f3d84b8f3 100644
--- a/src/imports/controls/default/qquickdefaultstyle_p.h
+++ b/src/imports/controls/basic/qquickbasicstyle_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QQUICKDEFAULTSTYLE_P_H
-#define QQUICKDEFAULTSTYLE_P_H
+#ifndef QQUICKBASICSTYLE_P_H
+#define QQUICKBASICSTYLE_P_H
 
 //
 //  W A R N I N G
@@ -54,7 +54,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class QQuickDefaultStyle : public QObject
+class QQuickBasicStyle : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(QColor backgroundColor READ backgroundColor CONSTANT FINAL)
@@ -97,12 +97,12 @@ class QQuickDefaultStyle : public QObject
     Q_PROPERTY(QColor separatorColor READ separatorColor CONSTANT FINAL)
     Q_PROPERTY(QColor disabledDarkColor READ disabledDarkColor CONSTANT FINAL)
     Q_PROPERTY(QColor disabledLightColor READ disabledLightColor CONSTANT FINAL)
-    QML_NAMED_ELEMENT(Default)
+    QML_NAMED_ELEMENT(Basic)
     QML_SINGLETON
     QML_ADDED_IN_VERSION(2, 1)
 
 public:
-    explicit QQuickDefaultStyle(QObject *parent = nullptr);
+    explicit QQuickBasicStyle(QObject *parent = nullptr);
 
     QColor backgroundColor() const;
     QColor overlayModalColor() const;
@@ -148,4 +148,4 @@ public:
 
 QT_END_NAMESPACE
 
-#endif // QQUICKDEFAULTSTYLE_P_H
+#endif // QQUICKBASICSTYLE_P_H
diff --git a/src/imports/controls/default/qquickdefaulttheme.cpp b/src/imports/controls/basic/qquickbasictheme.cpp
index 26fb2a2f47..1f876e3d5b 100644
--- a/src/imports/controls/default/qquickdefaulttheme.cpp
+++ b/src/imports/controls/basic/qquickbasictheme.cpp
@@ -34,13 +34,13 @@
 **
 ****************************************************************************/
 
-#include "qquickdefaulttheme_p.h"
+#include "qquickbasictheme_p.h"
 
 #include <QtQuickTemplates2/private/qquicktheme_p.h>
 
 QT_BEGIN_NAMESPACE
 
-void QQuickDefaultTheme::initialize(QQuickTheme *theme)
+void QQuickBasicTheme::initialize(QQuickTheme *theme)
 {
     QPalette systemPalette;
 
diff --git a/src/imports/controls/default/qquickdefaulttheme_p.h b/src/imports/controls/basic/qquickbasictheme_p.h
index 3a7311c778..a0a299535a 100644
--- a/src/imports/controls/default/qquickdefaulttheme_p.h
+++ b/src/imports/controls/basic/qquickbasictheme_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QQUICKDEFAULTTHEME_P_H
-#define QQUICKDEFAULTTHEME_P_H
+#ifndef QQUICKBASICTHEME_P_H
+#define QQUICKBASICTHEME_P_H
 
 //
 //  W A R N I N G
@@ -54,7 +54,7 @@ QT_BEGIN_NAMESPACE
 
 class QQuickTheme;
 
-class QQuickDefaultTheme
+class QQuickBasicTheme
 {
 public:
     static void initialize(QQuickTheme *theme);
@@ -62,4 +62,4 @@ public:
 
 QT_END_NAMESPACE
 
-#endif // QQUICKDEFAULTTHEME_P_H
+#endif // QQUICKBASICTHEME_P_H
diff --git a/src/imports/controls/default/qtquickcontrols2defaultstyleplugin.cpp b/src/imports/controls/basic/qtquickcontrols2basicstyleplugin.cpp
index c7259a29fa..cf5adf1c8c 100644
--- a/src/imports/controls/default/qtquickcontrols2defaultstyleplugin.cpp
+++ b/src/imports/controls/basic/qtquickcontrols2basicstyleplugin.cpp
@@ -34,42 +34,42 @@
 **
 ****************************************************************************/
 
-#include "qquickdefaultstyle_p.h"
-#include "qquickdefaulttheme_p.h"
+#include "qquickbasicstyle_p.h"
+#include "qquickbasictheme_p.h"
 
 #include <QtQuickControls2/private/qquickstyleplugin_p.h>
 #include <QtQuickTemplates2/private/qquicktheme_p.h>
 
 QT_BEGIN_NAMESPACE
 
-class QtQuickControls2DefaultStylePlugin: public QQuickStylePlugin
+class QtQuickControls2BasicStylePlugin: public QQuickStylePlugin
 {
     Q_OBJECT
     Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid)
 
 public:
-    QtQuickControls2DefaultStylePlugin(QObject *parent = nullptr);
+    QtQuickControls2BasicStylePlugin(QObject *parent = nullptr);
 
     QString name() const override;
     void initializeTheme(QQuickTheme *theme) override;
 
-    QQuickDefaultTheme theme;
+    QQuickBasicTheme theme;
 };
 
-QtQuickControls2DefaultStylePlugin::QtQuickControls2DefaultStylePlugin(QObject *parent) : QQuickStylePlugin(parent)
+QtQuickControls2BasicStylePlugin::QtQuickControls2BasicStylePlugin(QObject *parent) : QQuickStylePlugin(parent)
 {
 }
 
-QString QtQuickControls2DefaultStylePlugin::name() const
+QString QtQuickControls2BasicStylePlugin::name() const
 {
-    return QStringLiteral("Default");
+    return QStringLiteral("Basic");
 }
 
-void QtQuickControls2DefaultStylePlugin::initializeTheme(QQuickTheme *theme)
+void QtQuickControls2BasicStylePlugin::initializeTheme(QQuickTheme *theme)
 {
     this->theme.initialize(theme);
 }
 
 QT_END_NAMESPACE
 
-#include "qtquickcontrols2defaultstyleplugin.moc"
+#include "qtquickcontrols2basicstyleplugin.moc"
diff --git a/src/imports/controls/default/qtquickcontrols2defaultstyleplugin.qrc b/src/imports/controls/basic/qtquickcontrols2basicstyleplugin.qrc
index a6058dd1e9..27fd6ac2d4 100644
--- a/src/imports/controls/default/qtquickcontrols2defaultstyleplugin.qrc
+++ b/src/imports/controls/basic/qtquickcontrols2basicstyleplugin.qrc
@@ -1,5 +1,5 @@
 <RCC>
-    <qresource prefix="/qt-project.org/imports/QtQuick/Controls/Default">
+    <qresource prefix="/qt-project.org/imports/QtQuick/Controls/Basic">
         <file>images/arrow-indicator.png</file>
         <file>images/arrow-indicator@2x.png</file>
         <file>images/arrow-indicator@3x.png</file>
diff --git a/src/imports/controls/default/impl/default-impl.pro b/src/imports/controls/default/impl/default-impl.pro
deleted file mode 100644
index e26ae9ff32..0000000000
--- a/src/imports/controls/default/impl/default-impl.pro
+++ /dev/null
@@ -1,30 +0,0 @@
-TARGET = qtquickcontrols2defaultstyleimplplugin
-TARGETPATH = QtQuick/Controls/Default/impl
-
-QML_IMPORT_NAME = QtQuick.Controls.Default.impl
-QML_IMPORT_VERSION = $$QT_VERSION
-
-QT += qml quick
-QT_PRIVATE += core-private gui qml-private quick-private quicktemplates2-private quickcontrols2impl-private
-QT_FOR_CONFIG = quickcontrols2-private
-
-DEFINES += QT_NO_CAST_TO_ASCII QT_NO_CAST_FROM_ASCII
-
-OTHER_FILES += \
-    qmldir
-
-HEADERS += \
-    $$PWD/qquickdefaultbusyindicator_p.h \
-    $$PWD/qquickdefaultdial_p.h \
-    $$PWD/qquickdefaultprogressbar_p.h
-
-SOURCES += \
-    $$PWD/qquickdefaultbusyindicator.cpp \
-    $$PWD/qquickdefaultdial.cpp \
-    $$PWD/qquickdefaultprogressbar.cpp \
-    $$PWD/qtquickcontrols2defaultstyleimplplugin.cpp
-
-CONFIG += qmltypes install_qmltypes no_cxx_module
-load(qml_plugin)
-
-requires(qtConfig(quickcontrols2-default))
diff --git a/src/imports/controls/default/impl/qmldir b/src/imports/controls/default/impl/qmldir
deleted file mode 100644
index a653f1c0f6..0000000000
--- a/src/imports/controls/default/impl/qmldir
+++ /dev/null
@@ -1,3 +0,0 @@
-module QtQuick.Controls.Default.impl
-plugin qtquickcontrols2defaultstyleimplplugin
-classname QtQuickControls2DefaultStyleImplPlugin
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-default-thumbnail.png b/src/imports/controls/doc/images/qtquickcontrols2-basic-thumbnail.png
index e971a7aaec..e971a7aaec 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-default-thumbnail.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-basic-thumbnail.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-default.png b/src/imports/controls/doc/images/qtquickcontrols2-basic.png
index 099db17038..099db17038 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-default.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-basic.png
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-button-icononly.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-button-icononly.qml
index 36d1f84818..d74000052b 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-button-icononly.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-button-icononly.qml
@@ -29,6 +29,6 @@ import QtQuick
 import QtQuick.Controls
 
 Button {
-    icon.source: "qrc:/qt-project.org/imports/QtQuick/Controls/Default/images/check.png"
+    icon.source: "qrc:/qt-project.org/imports/QtQuick/Controls/Basic/images/check.png"
     display: Button.IconOnly
 }
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-button-textbesideicon.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-button-textbesideicon.qml
index 3fe434e4a0..3e2aa619d0 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-button-textbesideicon.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-button-textbesideicon.qml
@@ -30,6 +30,6 @@ import QtQuick.Controls
 
 Button {
     text: "Button"
-    icon.source: "qrc:/qt-project.org/imports/QtQuick/Controls/Default/images/check.png"
+    icon.source: "qrc:/qt-project.org/imports/QtQuick/Controls/Basic/images/check.png"
     display: Button.TextBesideIcon
 }
diff --git a/src/imports/controls/doc/src/qtquickcontrols2-default.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-basic.qdoc
index 779f3241c4..ee8d3ce4dd 100644
--- a/src/imports/controls/doc/src/qtquickcontrols2-default.qdoc
+++ b/src/imports/controls/doc/src/qtquickcontrols2-basic.qdoc
@@ -26,23 +26,23 @@
 ****************************************************************************/
 
 /*!
-    \page qtquickcontrols2-default.html
-    \title Default Style
+    \page qtquickcontrols2-basic.html
+    \title Basic Style
 
-    The Default style is a basic all-round style.
+    The Basic style is a basic all-round style.
 
-    The Default style is a simple and light-weight style that offers the maximum
+    The Basic style is a simple and light-weight style that offers the maximum
     performance for Qt Quick Controls. It is built with a minimal amount of Qt
     Quick primitives, and keeps animations and transitions to the minimum.
 
-    \image qtquickcontrols2-default.png
+    \image qtquickcontrols2-basic.png
 
     The style is selected by default when running Qt Quick Controls applications.
     It is built into the module's resources, so by default it is shipped with
     any application that depends on the Qt Quick Controls module
 
-    \note The Default style is used as a fallback for other styles. If a style
-    does not implement a certain control, the Default style implementation of
+    \note The Basic style is used as a fallback for other styles. If a style
+    does not implement a certain control, the Basic style implementation of
     that control is selected.
 
     \b {See also} \l {Material Style}, \l {Universal Style}
diff --git a/src/imports/controls/doc/src/qtquickcontrols2-configuration.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-configuration.qdoc
index 7790ddc54f..e714985215 100644
--- a/src/imports/controls/doc/src/qtquickcontrols2-configuration.qdoc
+++ b/src/imports/controls/doc/src/qtquickcontrols2-configuration.qdoc
@@ -77,7 +77,7 @@
             \li \c FallbackStyle
             \li Specifies the style to use for controls that are not implemented.
                 The style must be one of the \l {Available Styles}{built-in styles}.
-                By default, the \l {Default Style}{Default} style is used.
+                By default, the \l {Basic Style}{Basic} style is used.
     \endtable
 
     \section1 Imagine Section
@@ -108,7 +108,7 @@
     be defined in two alternative ways:
 
     \code
-    [Default]
+    [Basic]
     Font\Family=Open Sans
     Font\PixelSize=20
 
diff --git a/src/imports/controls/doc/src/qtquickcontrols2-customize.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-customize.qdoc
index 484cc5b2af..e1ddd1e352 100644
--- a/src/imports/controls/doc/src/qtquickcontrols2-customize.qdoc
+++ b/src/imports/controls/doc/src/qtquickcontrols2-customize.qdoc
@@ -44,7 +44,7 @@
 
     The first way to create this button is to simply define it in-place,
     wherever it is needed. For example, perhaps you're not satisfied with the
-    default style's Button having square corners. To make them rounded, you
+    Basic style's Button having square corners. To make them rounded, you
     can override the \l {Control::}{background} item and set the radius
     property of Rectangle:
 
@@ -54,11 +54,11 @@
     button in several places. It involves moving the code into its own QML file
     within your project.
 
-    For this approach, we'll copy the background code from the default style's
+    For this approach, we'll copy the background code from the Basic style's
     \c Button.qml. This file can be found in the following path in your Qt
     installation:
 
-    \c {$QTDIR/qml/QtQuick/Controls/Default/Button.qml}
+    \c {$QTDIR/qml/QtQuick/Controls/Basic/Button.qml}
 
     After doing that, we'll simply add the following line:
 
@@ -158,7 +158,7 @@
         \e mystyle or \e MYSTYLE is not supported.
     \endlist
 
-    By default, the styling system uses the Default style as a fallback for
+    By default, the styling system uses the Basic style as a fallback for
     controls that aren't implemented. To customize or extend any other built-in
     style, it is possible to specify a different fallback style using
     \l[QtQuickControls2]{QQuickStyle}.
@@ -413,8 +413,8 @@
     }
     \endcode
 
-    We then copy \c Button.qml from the Default style in
-    \c {$QTDIR/qml/QtQuick/Controls/Default/} into a new \c myproject folder in our
+    We then copy \c Button.qml from the Basic style in
+    \c {$QTDIR/qml/QtQuick/Controls/Basic/} into a new \c myproject folder in our
     project directory. Add the newly copied \c Button.qml to \c qml.qrc, which is
     the resource file that contains our QML files.
 
@@ -497,7 +497,7 @@
 
     \section1 Customization Reference
 
-    The following snippets present examples where the default style's controls
+    The following snippets present examples where the Basic style's controls
     have been customized using the same approach as the
     \l {Customizing a Control} section. The code can be used as a starting
     point to implement a custom look and feel.
diff --git a/src/imports/controls/doc/src/qtquickcontrols2-fusion.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-fusion.qdoc
index 135cae7196..a99e56fd7c 100644
--- a/src/imports/controls/doc/src/qtquickcontrols2-fusion.qdoc
+++ b/src/imports/controls/doc/src/qtquickcontrols2-fusion.qdoc
@@ -83,7 +83,7 @@
                 \image qtquickcontrols2-fusion-violet.png
     \endtable
 
-    \b {See also} \l {Default Style}, \l {Material Style}, \l {Universal Style}
+    \b {See also} \l {Basic Style}, \l {Material Style}, \l {Universal Style}
 
     \section1 Related Information
 
diff --git a/src/imports/controls/doc/src/qtquickcontrols2-material.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-material.qdoc
index a146843aac..f08c5ec3ba 100644
--- a/src/imports/controls/doc/src/qtquickcontrols2-material.qdoc
+++ b/src/imports/controls/doc/src/qtquickcontrols2-material.qdoc
@@ -220,7 +220,7 @@
     \value Material.ShadeA400
     \value Material.ShadeA700
 
-    \b {See also} \l {Default Style}, \l {Universal Style}
+    \b {See also} \l {Basic Style}, \l {Universal Style}
 
     \section2 Variants
 
diff --git a/src/imports/controls/doc/src/qtquickcontrols2-styles.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-styles.qdoc
index ddf41771b0..29e735402c 100644
--- a/src/imports/controls/doc/src/qtquickcontrols2-styles.qdoc
+++ b/src/imports/controls/doc/src/qtquickcontrols2-styles.qdoc
@@ -33,10 +33,10 @@
 
     Qt Quick Controls comes with a selection of styles.
 
-    \section2 Default Style
+    \section2 Basic Style
 
-    \image qtquickcontrols2-default-thumbnail.png
-    The \l {Default Style} is a simple and light-weight all-round style that offers
+    \image qtquickcontrols2-basic-thumbnail.png
+    The \l {Basic Style} is a simple and light-weight all-round style that offers
     the maximum performance for Qt Quick Controls.
 
     \section2 Fusion Style
@@ -58,14 +58,14 @@
     The \l {Material Style} offers an appealing design based on the
     \l {https://www.google.com/design/spec/material-design/introduction.html}
     {Google Material Design Guidelines}, but requires more system resources than
-    the Default style.
+    the Basic style.
 
     \section2 Universal Style
 
     \image qtquickcontrols2-universal-thumbnail.png
     The \l {Universal Style} offers an appealing design based on the
     \l {https://dev.windows.com/design}{Microsoft Universal Design Guidelines},
-    but requires more system resources than the Default style.
+    but requires more system resources than the Basic style.
 
     \section1 Using Styles in Qt Quick Controls
 
@@ -141,7 +141,7 @@
 
     \section1 Related Information
     \list
-    \li \l {Default Style}
+    \li \l {Basic Style}
     \li \l {Fusion Style}
     \li \l {Imagine Style}
     \li \l {Material Style}
diff --git a/src/imports/controls/doc/src/qtquickcontrols2-universal.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-universal.qdoc
index 1e67dd7549..7226705068 100644
--- a/src/imports/controls/doc/src/qtquickcontrols2-universal.qdoc
+++ b/src/imports/controls/doc/src/qtquickcontrols2-universal.qdoc
@@ -172,7 +172,7 @@
     \value Universal.Mauve \stylecolor {#76608A} {}
     \value Universal.Taupe \stylecolor {#87794E} {}
 
-    \b {See also} \l {Default Style}, \l {Material Style}
+    \b {See also} \l {Basic Style}, \l {Material Style}
 
     \section1 Attached Property Documentation
 
diff --git a/src/imports/controls/fusion/.prev_CMakeLists.txt b/src/imports/controls/fusion/.prev_CMakeLists.txt
index b9d5e58b18..c5c31515d3 100644
--- a/src/imports/controls/fusion/.prev_CMakeLists.txt
+++ b/src/imports/controls/fusion/.prev_CMakeLists.txt
@@ -9,7 +9,7 @@ qt_add_qml_module(qtquickcontrols2fusionstyleplugin
     VERSION "${CMAKE_PROJECT_VERSION}"
     CLASSNAME QtQuickControls2FusionStylePlugin
     IMPORTS
-        QtQuick.Controls.Default/auto
+        QtQuick.Controls.Basic/auto
     GENERATE_QMLTYPES
     SOURCES
         qquickfusionstyle.cpp qquickfusionstyle_p.h
diff --git a/src/imports/controls/fusion/CMakeLists.txt b/src/imports/controls/fusion/CMakeLists.txt
index 9d93aa8974..72a40cfbc6 100644
--- a/src/imports/controls/fusion/CMakeLists.txt
+++ b/src/imports/controls/fusion/CMakeLists.txt
@@ -10,7 +10,7 @@ qt_add_qml_module(qtquickcontrols2fusionstyleplugin
     VERSION "6.0" # special case
     CLASSNAME QtQuickControls2FusionStylePlugin
     IMPORTS
-        QtQuick.Controls.Default/auto
+        QtQuick.Controls.Basic/auto
     GENERATE_QMLTYPES
     SOURCES
         qquickfusionstyle.cpp qquickfusionstyle_p.h
diff --git a/src/imports/controls/fusion/qmldir b/src/imports/controls/fusion/qmldir
index c08f1e4a92..5579a4b564 100644
--- a/src/imports/controls/fusion/qmldir
+++ b/src/imports/controls/fusion/qmldir
@@ -1,7 +1,7 @@
 module QtQuick.Controls.Fusion
 plugin qtquickcontrols2fusionstyleplugin
 classname QtQuickControls2FusionStylePlugin
-import QtQuick.Controls.Default auto
+import QtQuick.Controls.Basic auto
 
 # QtQuick.Controls 2.0 (originally introduced in Qt 5.7)
 ApplicationWindow 2.0 ApplicationWindow.qml
diff --git a/src/imports/controls/imagine/.prev_CMakeLists.txt b/src/imports/controls/imagine/.prev_CMakeLists.txt
index b1e1a9594f..8d08bcca63 100644
--- a/src/imports/controls/imagine/.prev_CMakeLists.txt
+++ b/src/imports/controls/imagine/.prev_CMakeLists.txt
@@ -9,7 +9,7 @@ qt_add_qml_module(qtquickcontrols2imaginestyleplugin
     VERSION "${CMAKE_PROJECT_VERSION}"
     CLASSNAME QtQuickControls2ImagineStylePlugin
     IMPORTS
-        QtQuick.Controls.Default/auto
+        QtQuick.Controls.Basic/auto
     GENERATE_QMLTYPES
     SOURCES
         qquickimaginestyle.cpp qquickimaginestyle_p.h
diff --git a/src/imports/controls/imagine/CMakeLists.txt b/src/imports/controls/imagine/CMakeLists.txt
index ce9b98cb60..cb4726e941 100644
--- a/src/imports/controls/imagine/CMakeLists.txt
+++ b/src/imports/controls/imagine/CMakeLists.txt
@@ -9,7 +9,7 @@ qt_add_qml_module(qtquickcontrols2imaginestyleplugin
     VERSION "6.0" # special case
     CLASSNAME QtQuickControls2ImagineStylePlugin
     IMPORTS
-        QtQuick.Controls.Default/auto
+        QtQuick.Controls.Basic/auto
     GENERATE_QMLTYPES
     SOURCES
         qquickimaginestyle.cpp qquickimaginestyle_p.h
diff --git a/src/imports/controls/imagine/qmldir b/src/imports/controls/imagine/qmldir
index 65165bf437..e39f3d1895 100644
--- a/src/imports/controls/imagine/qmldir
+++ b/src/imports/controls/imagine/qmldir
@@ -1,7 +1,7 @@
 module QtQuick.Controls.Imagine
 plugin qtquickcontrols2imaginestyleplugin
 classname QtQuickControls2ImagineStylePlugin
-import QtQuick.Controls.Default auto
+import QtQuick.Controls.Basic auto
 
 # QtQuick.Controls 2.0 (originally introduced in Qt 5.7)
 ApplicationWindow 2.0 ApplicationWindow.qml
diff --git a/src/imports/controls/material/.prev_CMakeLists.txt b/src/imports/controls/material/.prev_CMakeLists.txt
index 123c89dce6..3f82f1e4e6 100644
--- a/src/imports/controls/material/.prev_CMakeLists.txt
+++ b/src/imports/controls/material/.prev_CMakeLists.txt
@@ -9,7 +9,7 @@ qt_add_qml_module(qtquickcontrols2materialstyleplugin
     VERSION "${CMAKE_PROJECT_VERSION}"
     CLASSNAME QtQuickControls2MaterialStylePlugin
     IMPORTS
-        QtQuick.Controls.Default/auto
+        QtQuick.Controls.Basic/auto
     GENERATE_QMLTYPES
     SOURCES
         qquickmaterialstyle.cpp qquickmaterialstyle_p.h
diff --git a/src/imports/controls/material/CMakeLists.txt b/src/imports/controls/material/CMakeLists.txt
index 71030fe69b..7bc30a96cc 100644
--- a/src/imports/controls/material/CMakeLists.txt
+++ b/src/imports/controls/material/CMakeLists.txt
@@ -10,7 +10,7 @@ qt_add_qml_module(qtquickcontrols2materialstyleplugin
     VERSION "6.0" # special case
     CLASSNAME QtQuickControls2MaterialStylePlugin
     IMPORTS
-        QtQuick.Controls.Default/auto
+        QtQuick.Controls.Basic/auto
     GENERATE_QMLTYPES
     SOURCES
         qquickmaterialstyle.cpp qquickmaterialstyle_p.h
diff --git a/src/imports/controls/material/qmldir b/src/imports/controls/material/qmldir
index ae8a26fb50..82199ec01a 100644
--- a/src/imports/controls/material/qmldir
+++ b/src/imports/controls/material/qmldir
@@ -1,7 +1,7 @@
 module QtQuick.Controls.Material
 plugin qtquickcontrols2materialstyleplugin
 classname QtQuickControls2MaterialStylePlugin
-import QtQuick.Controls.Default auto
+import QtQuick.Controls.Basic auto
 
 # QtQuick.Controls 2.0 (originally introduced in Qt 5.7)
 ApplicationWindow 2.0 ApplicationWindow.qml
diff --git a/src/imports/controls/qtquickcontrols2plugin.cpp b/src/imports/controls/qtquickcontrols2plugin.cpp
index 85c51e4f5c..88fce5ca9b 100644
--- a/src/imports/controls/qtquickcontrols2plugin.cpp
+++ b/src/imports/controls/qtquickcontrols2plugin.cpp
@@ -122,10 +122,10 @@ void QtQuickControls2Plugin::registerTypes(const char *uri)
 
     createTheme(styleName);
 
-    // If the style is Default, we don't need to register the fallback because the Default style
+    // If the style is Basic, we don't need to register the fallback because the Basic style
     // provides all controls. Also, if we didn't return early here, we can get an infinite import loop
-    // when the style is set to Default.
-    if (styleName != fallbackStyleName && styleName != QLatin1String("Default")) {
+    // when the style is set to Basic.
+    if (styleName != fallbackStyleName && styleName != QLatin1String("Basic")) {
         registeredFallbackStyleUri = ::fallbackStyleUri();
         qCDebug(lcQtQuickControlsStylePlugin) << "calling qmlRegisterModuleImport() to register fallback style with"
             << " uri \"" << qtQuickControlsUri << "\" moduleMajor" << QQmlModuleImportModuleAny
diff --git a/src/imports/controls/universal/.prev_CMakeLists.txt b/src/imports/controls/universal/.prev_CMakeLists.txt
index df0232e773..f668d6832d 100644
--- a/src/imports/controls/universal/.prev_CMakeLists.txt
+++ b/src/imports/controls/universal/.prev_CMakeLists.txt
@@ -9,7 +9,7 @@ qt_add_qml_module(qtquickcontrols2universalstyleplugin
     VERSION "${CMAKE_PROJECT_VERSION}"
     CLASSNAME QtQuickControls2UniversalStylePlugin
     IMPORTS
-        QtQuick.Controls.Default/auto
+        QtQuick.Controls.Basic/auto
     GENERATE_QMLTYPES
     SOURCES
         qquickuniversalstyle.cpp qquickuniversalstyle_p.h
diff --git a/src/imports/controls/universal/CMakeLists.txt b/src/imports/controls/universal/CMakeLists.txt
index f97a92e90f..67ccab9b9c 100644
--- a/src/imports/controls/universal/CMakeLists.txt
+++ b/src/imports/controls/universal/CMakeLists.txt
@@ -10,7 +10,7 @@ qt_add_qml_module(qtquickcontrols2universalstyleplugin
     VERSION "6.0" # special case
     CLASSNAME QtQuickControls2UniversalStylePlugin
     IMPORTS
-        QtQuick.Controls.Default/auto
+        QtQuick.Controls.Basic/auto
     GENERATE_QMLTYPES
     SOURCES
         qquickuniversalstyle.cpp qquickuniversalstyle_p.h
diff --git a/src/imports/controls/universal/qmldir b/src/imports/controls/universal/qmldir
index 5891244ae8..e864bd7614 100644
--- a/src/imports/controls/universal/qmldir
+++ b/src/imports/controls/universal/qmldir
@@ -1,7 +1,7 @@
 module QtQuick.Controls.Universal
 plugin qtquickcontrols2universalstyleplugin
 classname QtQuickControls2UniversalStylePlugin
-import QtQuick.Controls.Default auto
+import QtQuick.Controls.Basic auto
 
 # QtQuick.Controls 2.0 (originally introduced in Qt 5.7)
 ApplicationWindow 2.0 ApplicationWindow.qml
diff --git a/src/imports/imports.pro b/src/imports/imports.pro
index bd690feaf0..f46e0b6cba 100644
--- a/src/imports/imports.pro
+++ b/src/imports/imports.pro
@@ -7,8 +7,8 @@ SUBDIRS += \
     nativestyle
 
 SUBDIRS += \
-    controls/default/default.pro \
-    controls/default/impl/default-impl.pro \
+    controls/basic/basic.pro \
+    controls/basic/impl/basic-impl.pro \
     controls/fusion/fusion.pro \
     controls/fusion/impl/fusion-impl.pro \
     controls/imagine/imagine.pro \
diff --git a/src/quickcontrols2/configure.cmake b/src/quickcontrols2/configure.cmake
index c17574eb35..f996cf2884 100644
--- a/src/quickcontrols2/configure.cmake
+++ b/src/quickcontrols2/configure.cmake
@@ -14,49 +14,49 @@
 
 #### Features
 
-qt_feature("quickcontrols2-default" PRIVATE
-    LABEL "Default"
+qt_feature("quickcontrols2-basic" PRIVATE
+    LABEL "Basic"
 )
 qt_feature("quickcontrols2-fusion" PRIVATE
     SECTION "Quick Controls 2"
     LABEL "Fusion"
     PURPOSE "Provides the platform agnostic desktop-oriented Fusion style."
-    CONDITION QT_FEATURE_quickcontrols2_default
+    CONDITION QT_FEATURE_quickcontrols2_basic
 )
 qt_feature("quickcontrols2-imagine" PRIVATE
     SECTION "Quick Controls 2"
     LABEL "Imagine"
     PURPOSE "Provides a style based on configurable image assets."
-    CONDITION QT_FEATURE_quickcontrols2_default
+    CONDITION QT_FEATURE_quickcontrols2_basic
 )
 qt_feature("quickcontrols2-material" PRIVATE
     SECTION "Quick Controls 2"
     LABEL "Material"
     PURPOSE "Provides a style based on the Material Design guidelines."
-    CONDITION QT_FEATURE_quickcontrols2_default
+    CONDITION QT_FEATURE_quickcontrols2_basic
 )
 qt_feature("quickcontrols2-universal" PRIVATE
     SECTION "Quick Controls 2"
     LABEL "Universal"
     PURPOSE "Provides a style based on the Universal Design guidelines."
-    CONDITION QT_FEATURE_quickcontrols2_default
+    CONDITION QT_FEATURE_quickcontrols2_basic
 )
 qt_feature("quickcontrols2-macos" PRIVATE
     SECTION "Quick Controls 2"
     LABEL "macOS"
     PURPOSE "Provides a native macOS desktop style."
-    CONDITION QT_FEATURE_quickcontrols2_default
+    CONDITION QT_FEATURE_quickcontrols2_basic
 )
 qt_feature("quickcontrols2-windows" PRIVATE
     SECTION "Quick Controls 2"
     LABEL "Windows"
     PURPOSE "Provides a native Windows desktop style."
-    CONDITION QT_FEATURE_quickcontrols2_default
+    CONDITION QT_FEATURE_quickcontrols2_basic
 )
 qt_configure_add_summary_section(NAME "Qt Quick Controls 2")
 qt_configure_add_summary_entry(
     TYPE "featureList"
-    ARGS "quickcontrols2-default quickcontrols2-fusion quickcontrols2-imagine quickcontrols2-material quickcontrols2-universal quickcontrols2-macos quickcontrols2-windows"
+    ARGS "quickcontrols2-basic quickcontrols2-fusion quickcontrols2-imagine quickcontrols2-material quickcontrols2-universal quickcontrols2-macos quickcontrols2-windows"
     MESSAGE "Styles"
 )
 qt_configure_end_summary_section() # end of "Qt Quick Controls 2" section
diff --git a/src/quickcontrols2/configure.json b/src/quickcontrols2/configure.json
index 490b9cdf4e..ffefe17ad1 100644
--- a/src/quickcontrols2/configure.json
+++ b/src/quickcontrols2/configure.json
@@ -13,50 +13,50 @@
     },
 
     "features": {
-        "quickcontrols2-default": {
-            "label": "Default",
+        "quickcontrols2-basic": {
+            "label": "Basic",
             "output": [ "privateFeature" ]
         },
         "quickcontrols2-fusion": {
             "label": "Fusion",
             "purpose": "Provides the platform agnostic desktop-oriented Fusion style.",
             "section": "Quick Controls 2",
-            "condition": "features.quickcontrols2-default",
+            "condition": "features.quickcontrols2-basic",
             "output": [ "privateFeature" ]
         },
         "quickcontrols2-imagine": {
             "label": "Imagine",
             "purpose": "Provides a style based on configurable image assets.",
             "section": "Quick Controls 2",
-            "condition": "features.quickcontrols2-default",
+            "condition": "features.quickcontrols2-basic",
             "output": [ "privateFeature" ]
         },
         "quickcontrols2-material": {
             "label": "Material",
             "purpose": "Provides a style based on the Material Design guidelines.",
             "section": "Quick Controls 2",
-            "condition": "features.quickcontrols2-default",
+            "condition": "features.quickcontrols2-basic",
             "output": [ "privateFeature" ]
         },
         "quickcontrols2-universal": {
             "label": "Universal",
             "purpose": "Provides a style based on the Universal Design guidelines.",
             "section": "Quick Controls 2",
-            "condition": "features.quickcontrols2-default",
+            "condition": "features.quickcontrols2-basic",
             "output": [ "privateFeature" ]
         },
         "quickcontrols2-macos": {
             "label": "macOS",
             "purpose": "Provides a native macOS desktop style.",
             "section": "Quick Controls 2",
-            "condition": "features.quickcontrols2-default",
+            "condition": "features.quickcontrols2-basic",
             "output": [ "privateFeature" ]
         },
         "quickcontrols2-windows": {
             "label": "Windows",
             "purpose": "Provides a native Windows desktop style.",
             "section": "Quick Controls 2",
-            "condition": "features.quickcontrols2-default",
+            "condition": "features.quickcontrols2-basic",
             "output": [ "privateFeature" ]
         }
     },
@@ -68,7 +68,7 @@
                 {
                     "message": "Styles",
                     "type": "featureList",
-                    "args": "quickcontrols2-default quickcontrols2-fusion quickcontrols2-imagine quickcontrols2-material quickcontrols2-universal quickcontrols2-macos quickcontrols2-windows"
+                    "args": "quickcontrols2-basic quickcontrols2-fusion quickcontrols2-imagine quickcontrols2-material quickcontrols2-universal quickcontrols2-macos quickcontrols2-windows"
                 }
             ]
         }
diff --git a/src/quickcontrols2/qquickstyle.cpp b/src/quickcontrols2/qquickstyle.cpp
index ec0b5e4880..d5ded6c27d 100644
--- a/src/quickcontrols2/qquickstyle.cpp
+++ b/src/quickcontrols2/qquickstyle.cpp
@@ -93,7 +93,7 @@ Q_LOGGING_CATEGORY(lcQtQuickControlsStyle, "qt.quick.controls.style")
 
     To create your own custom style, see \l {Creating a Custom Style}. Custom
     styles do not need to implement all controls. By default, the styling
-    system uses the \l {Default style} as a fallback for controls that a custom
+    system uses the \l {Basic style} as a fallback for controls that a custom
     style does not provide. It is possible to specify a different fallback
     style to customize or extend one of the built-in styles.
 
@@ -238,7 +238,7 @@ Q_GLOBAL_STATIC(QQuickStyleSpec, styleSpec)
 
 QString QQuickStylePrivate::effectiveStyleName(const QString &styleName)
 {
-    return !styleName.isEmpty() ? styleName : QLatin1String("Default");
+    return !styleName.isEmpty() ? styleName : QLatin1String("Basic");
 }
 
 QString QQuickStylePrivate::fallbackStyle()
@@ -383,7 +383,7 @@ bool QQuickStylePrivate::isDarkSystemTheme()
 QStringList QQuickStylePrivate::builtInStyles()
 {
     return {
-        QLatin1String("Default"),
+        QLatin1String("Basic"),
         QLatin1String("Fusion"),
         QLatin1String("Imagine"),
 #ifdef Q_OS_MACOS
diff --git a/tests/auto/controls/CMakeLists.txt b/tests/auto/controls/CMakeLists.txt
index 57cb9480e8..9e80b76580 100644
--- a/tests/auto/controls/CMakeLists.txt
+++ b/tests/auto/controls/CMakeLists.txt
@@ -1,6 +1,6 @@
 # Generated from controls.pro.
 
-add_subdirectory(default)
+add_subdirectory(basic)
 add_subdirectory(fusion)
 add_subdirectory(imagine)
 add_subdirectory(material)
diff --git a/tests/auto/controls/default/CMakeLists.txt b/tests/auto/controls/basic/CMakeLists.txt
index 9a4f6cbdd3..f19a133f03 100644
--- a/tests/auto/controls/default/CMakeLists.txt
+++ b/tests/auto/controls/basic/CMakeLists.txt
@@ -1,7 +1,7 @@
-# Generated from default.pro.
+# Generated from basic.pro.
 
 #####################################################################
-## tst_default Test:
+## tst_basic Test:
 #####################################################################
 
 # Collect test data
@@ -10,11 +10,11 @@ file(GLOB_RECURSE test_data_glob
     ${CMAKE_CURRENT_SOURCE_DIR}/../data/tst_*)
 list(APPEND test_data ${test_data_glob})
 
-qt_add_test(tst_default
+qt_add_test(tst_basic
     GUI
     QMLTEST
     SOURCES
-        tst_default.cpp
+        tst_basic.cpp
     DEFINES
         TST_CONTROLS_DATA=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../tests/auto/controls/data\\\"
     PUBLIC_LIBRARIES
@@ -22,6 +22,6 @@ qt_add_test(tst_default
     TESTDATA ${test_data}
 )
 
-#### Keys ignored in scope 1:.:.:default.pro:<TRUE>:
+#### Keys ignored in scope 1:.:.:basic.pro:<TRUE>:
 # OTHER_FILES = "$$PWD/../data/*.qml"
 # TEMPLATE = "app"
diff --git a/tests/auto/controls/default/default.pro b/tests/auto/controls/basic/basic.pro
index 290edc5fb4..f50dc03633 100644
--- a/tests/auto/controls/default/default.pro
+++ b/tests/auto/controls/basic/basic.pro
@@ -1,11 +1,11 @@
 TEMPLATE = app
-TARGET = tst_default
+TARGET = tst_basic
 CONFIG += qmltestcase
 
 DEFINES += TST_CONTROLS_DATA=\\\"$$QQC2_SOURCE_TREE/tests/auto/controls/data\\\"
 
 SOURCES += \
-    $$PWD/tst_default.cpp
+    $$PWD/tst_basic.cpp
 
 OTHER_FILES += \
     $$PWD/../data/*.qml
diff --git a/tests/auto/controls/default/dependencies.qml b/tests/auto/controls/basic/dependencies.qml
index f7d87422b5..f7d87422b5 100644
--- a/tests/auto/controls/default/dependencies.qml
+++ b/tests/auto/controls/basic/dependencies.qml
diff --git a/tests/auto/controls/default/tst_default.cpp b/tests/auto/controls/basic/tst_basic.cpp
index 4c575ce651..24b27cf6ab 100644
--- a/tests/auto/controls/default/tst_default.cpp
+++ b/tests/auto/controls/basic/tst_basic.cpp
@@ -40,5 +40,5 @@ int main(int argc, char *argv[])
 {
     QTEST_SET_MAIN_SOURCE_PATH
     qputenv("QML_NO_TOUCH_COMPRESSION", "1");
-    return quick_test_main(argc, argv, "tst_controls::Default", TST_CONTROLS_DATA);
+    return quick_test_main(argc, argv, "tst_controls::Basic", TST_CONTROLS_DATA);
 }
diff --git a/tests/auto/controls/controls.pro b/tests/auto/controls/controls.pro
index fd852c4bb6..af3fb8be32 100644
--- a/tests/auto/controls/controls.pro
+++ b/tests/auto/controls/controls.pro
@@ -1,6 +1,6 @@
 TEMPLATE = subdirs
 SUBDIRS += \
-    default \
+    basic \
     fusion \
     imagine \
     material \
diff --git a/tests/auto/controls/data/tst_button.qml b/tests/auto/controls/data/tst_button.qml
index f27e5bcb99..dbfacff048 100644
--- a/tests/auto/controls/data/tst_button.qml
+++ b/tests/auto/controls/data/tst_button.qml
@@ -467,11 +467,11 @@ TestCase {
         var control = createTemporaryObject(button, testCase, {
             text: "Button",
             display: data.display,
-            "icon.source": "qrc:/qt-project.org/imports/QtQuick/Controls/Default/images/check.png",
+            "icon.source": "qrc:/qt-project.org/imports/QtQuick/Controls/Basic/images/check.png",
             "LayoutMirroring.enabled": !!data.mirrored
         })
         verify(control)
-        compare(control.icon.source, "qrc:/qt-project.org/imports/QtQuick/Controls/Default/images/check.png")
+        compare(control.icon.source, "qrc:/qt-project.org/imports/QtQuick/Controls/Basic/images/check.png")
 
         var iconImage = findChild(control.contentItem, "image")
         var textLabel = findChild(control.contentItem, "label")
diff --git a/tests/auto/controls/data/tst_checkdelegate.qml b/tests/auto/controls/data/tst_checkdelegate.qml
index e51377870a..70f1ae9dbf 100644
--- a/tests/auto/controls/data/tst_checkdelegate.qml
+++ b/tests/auto/controls/data/tst_checkdelegate.qml
@@ -126,11 +126,11 @@ TestCase {
             text: "CheckDelegate",
             display: data.display,
             width: 400,
-            "icon.source": "qrc:/qt-project.org/imports/QtQuick/Controls/Default/images/check.png",
+            "icon.source": "qrc:/qt-project.org/imports/QtQuick/Controls/Basic/images/check.png",
             "LayoutMirroring.enabled": !!data.mirrored
         })
         verify(control)
-        compare(control.icon.source, "qrc:/qt-project.org/imports/QtQuick/Controls/Default/images/check.png")
+        compare(control.icon.source, "qrc:/qt-project.org/imports/QtQuick/Controls/Basic/images/check.png")
 
         var iconImage = findChild(control.contentItem, "image")
         var textLabel = findChild(control.contentItem, "label")
diff --git a/tests/auto/controls/data/tst_dialogbuttonbox.qml b/tests/auto/controls/data/tst_dialogbuttonbox.qml
index 16a5fe5e5a..706bf10dc1 100644
--- a/tests/auto/controls/data/tst_dialogbuttonbox.qml
+++ b/tests/auto/controls/data/tst_dialogbuttonbox.qml
@@ -298,7 +298,7 @@ TestCase {
 
     Component {
         id: dialogComponent
-        // Based on the Default style, where a single button fills
+        // Based on the Basic style, where a single button fills
         // half the dialog's width and is aligned to the right.
         Dialog {
             id: control
diff --git a/tests/auto/controls/data/tst_itemdelegate.qml b/tests/auto/controls/data/tst_itemdelegate.qml
index 6a4b29b459..7fa4e9e493 100644
--- a/tests/auto/controls/data/tst_itemdelegate.qml
+++ b/tests/auto/controls/data/tst_itemdelegate.qml
@@ -118,11 +118,11 @@ TestCase {
             text: "ItemDelegate",
             display: data.display,
             width: 400,
-            "icon.source": "qrc:/qt-project.org/imports/QtQuick/Controls/Default/images/check.png",
+            "icon.source": "qrc:/qt-project.org/imports/QtQuick/Controls/Basic/images/check.png",
             "LayoutMirroring.enabled": !!data.mirrored
         })
         verify(control)
-        compare(control.icon.source, "qrc:/qt-project.org/imports/QtQuick/Controls/Default/images/check.png")
+        compare(control.icon.source, "qrc:/qt-project.org/imports/QtQuick/Controls/Basic/images/check.png")
 
         var iconImage = findChild(control.contentItem, "image")
         var textLabel = findChild(control.contentItem, "label")
diff --git a/tests/auto/controls/data/tst_menuitem.qml b/tests/auto/controls/data/tst_menuitem.qml
index be84ae90ec..713c030efd 100644
--- a/tests/auto/controls/data/tst_menuitem.qml
+++ b/tests/auto/controls/data/tst_menuitem.qml
@@ -119,11 +119,11 @@ TestCase {
         var control = createTemporaryObject(menuItem, testCase, {
             text: "MenuItem",
             display: data.display,
-            "icon.source": "qrc:/qt-project.org/imports/QtQuick/Controls/Default/images/check.png",
+            "icon.source": "qrc:/qt-project.org/imports/QtQuick/Controls/Basic/images/check.png",
             "LayoutMirroring.enabled": !!data.mirrored
         })
         verify(control)
-        compare(control.icon.source, "qrc:/qt-project.org/imports/QtQuick/Controls/Default/images/check.png")
+        compare(control.icon.source, "qrc:/qt-project.org/imports/QtQuick/Controls/Basic/images/check.png")
 
         var padding = data.mirrored ? control.contentItem.rightPadding : control.contentItem.leftPadding
         var iconImage = findChild(control.contentItem, "image")
diff --git a/tests/auto/controls/data/tst_radiodelegate.qml b/tests/auto/controls/data/tst_radiodelegate.qml
index 9a4e28120a..87984b2c15 100644
--- a/tests/auto/controls/data/tst_radiodelegate.qml
+++ b/tests/auto/controls/data/tst_radiodelegate.qml
@@ -126,11 +126,11 @@ TestCase {
             text: "RadioDelegate",
             display: data.display,
             width: 400,
-            "icon.source": "qrc:/qt-project.org/imports/QtQuick/Controls/Default/images/check.png",
+            "icon.source": "qrc:/qt-project.org/imports/QtQuick/Controls/Basic/images/check.png",
             "LayoutMirroring.enabled": !!data.mirrored
         })
         verify(control)
-        compare(control.icon.source, "qrc:/qt-project.org/imports/QtQuick/Controls/Default/images/check.png")
+        compare(control.icon.source, "qrc:/qt-project.org/imports/QtQuick/Controls/Basic/images/check.png")
 
         var iconImage = findChild(control.contentItem, "image")
         var textLabel = findChild(control.contentItem, "label")
diff --git a/tests/auto/controls/data/tst_roundbutton.qml b/tests/auto/controls/data/tst_roundbutton.qml
index c683d4579a..d7a8832ca2 100644
--- a/tests/auto/controls/data/tst_roundbutton.qml
+++ b/tests/auto/controls/data/tst_roundbutton.qml
@@ -122,11 +122,11 @@ TestCase {
         var control = createTemporaryObject(roundButton, testCase, {
             text: "RoundButton",
             display: data.display,
-            "icon.source": "qrc:/qt-project.org/imports/QtQuick/Controls/Default/images/check.png",
+            "icon.source": "qrc:/qt-project.org/imports/QtQuick/Controls/Basic/images/check.png",
             "LayoutMirroring.enabled": !!data.mirrored
         })
         verify(control)
-        compare(control.icon.source, "qrc:/qt-project.org/imports/QtQuick/Controls/Default/images/check.png")
+        compare(control.icon.source, "qrc:/qt-project.org/imports/QtQuick/Controls/Basic/images/check.png")
 
         var iconImage = findChild(control.contentItem, "image")
         var textLabel = findChild(control.contentItem, "label")
diff --git a/tests/auto/controls/data/tst_swipedelegate.qml b/tests/auto/controls/data/tst_swipedelegate.qml
index 9827306628..6788e67ac0 100644
--- a/tests/auto/controls/data/tst_swipedelegate.qml
+++ b/tests/auto/controls/data/tst_swipedelegate.qml
@@ -1672,11 +1672,11 @@ TestCase {
             text: "SwipeDelegate",
             display: data.display,
             width: 400,
-            "icon.source": "qrc:/qt-project.org/imports/QtQuick/Controls/Default/images/check.png",
+            "icon.source": "qrc:/qt-project.org/imports/QtQuick/Controls/Basic/images/check.png",
             "LayoutMirroring.enabled": !!data.mirrored
         })
         verify(control)
-        compare(control.icon.source, "qrc:/qt-project.org/imports/QtQuick/Controls/Default/images/check.png")
+        compare(control.icon.source, "qrc:/qt-project.org/imports/QtQuick/Controls/Basic/images/check.png")
 
         var iconImage = findChild(control.contentItem, "image")
         var textLabel = findChild(control.contentItem, "label")
diff --git a/tests/auto/controls/data/tst_switchdelegate.qml b/tests/auto/controls/data/tst_switchdelegate.qml
index 4cf90bb60c..fabd627992 100644
--- a/tests/auto/controls/data/tst_switchdelegate.qml
+++ b/tests/auto/controls/data/tst_switchdelegate.qml
@@ -560,11 +560,11 @@ TestCase {
             text: "SwitchDelegate",
             display: data.display,
             width: 400,
-            "icon.source": "qrc:/qt-project.org/imports/QtQuick/Controls/Default/images/check.png",
+            "icon.source": "qrc:/qt-project.org/imports/QtQuick/Controls/Basic/images/check.png",
             "LayoutMirroring.enabled": !!data.mirrored
         })
         verify(control)
-        compare(control.icon.source, "qrc:/qt-project.org/imports/QtQuick/Controls/Default/images/check.png")
+        compare(control.icon.source, "qrc:/qt-project.org/imports/QtQuick/Controls/Basic/images/check.png")
 
         var iconImage = findChild(control.contentItem, "image")
         var textLabel = findChild(control.contentItem, "label")
diff --git a/tests/auto/controls/data/tst_tabbutton.qml b/tests/auto/controls/data/tst_tabbutton.qml
index c399c0143b..3f8092099b 100644
--- a/tests/auto/controls/data/tst_tabbutton.qml
+++ b/tests/auto/controls/data/tst_tabbutton.qml
@@ -134,11 +134,11 @@ TestCase {
         var control = createTemporaryObject(tabButton, testCase, {
             text: "TabButton",
             display: data.display,
-            "icon.source": "qrc:/qt-project.org/imports/QtQuick/Controls/Default/images/check.png",
+            "icon.source": "qrc:/qt-project.org/imports/QtQuick/Controls/Basic/images/check.png",
             "LayoutMirroring.enabled": !!data.mirrored
         })
         verify(control)
-        compare(control.icon.source, "qrc:/qt-project.org/imports/QtQuick/Controls/Default/images/check.png")
+        compare(control.icon.source, "qrc:/qt-project.org/imports/QtQuick/Controls/Basic/images/check.png")
 
         var iconImage = findChild(control.contentItem, "image")
         var textLabel = findChild(control.contentItem, "label")
diff --git a/tests/auto/controls/data/tst_toolbutton.qml b/tests/auto/controls/data/tst_toolbutton.qml
index ca044a8972..a7acd05ae4 100644
--- a/tests/auto/controls/data/tst_toolbutton.qml
+++ b/tests/auto/controls/data/tst_toolbutton.qml
@@ -199,11 +199,11 @@ TestCase {
         var control = createTemporaryObject(toolButton, testCase, {
             text: "ToolButton",
             display: data.display,
-            "icon.source": "qrc:/qt-project.org/imports/QtQuick/Controls/Default/images/check.png",
+            "icon.source": "qrc:/qt-project.org/imports/QtQuick/Controls/Basic/images/check.png",
             "LayoutMirroring.enabled": !!data.mirrored
         })
         verify(control)
-        compare(control.icon.source, "qrc:/qt-project.org/imports/QtQuick/Controls/Default/images/check.png")
+        compare(control.icon.source, "qrc:/qt-project.org/imports/QtQuick/Controls/Basic/images/check.png")
 
         var iconImage = findChild(control.contentItem, "image")
         var textLabel = findChild(control.contentItem, "label")
diff --git a/tests/auto/font/tst_font.cpp b/tests/auto/font/tst_font.cpp
index 2bee1dce90..0794e761e2 100644
--- a/tests/auto/font/tst_font.cpp
+++ b/tests/auto/font/tst_font.cpp
@@ -300,7 +300,7 @@ void tst_font::defaultFont()
     QQmlComponent component(&engine);
     component.setData(QString("import QtQuick.Controls; %1 { }").arg(control).toUtf8(), QUrl());
 
-    // The call to setData() above causes QQuickDefaultTheme to be set as the current theme,
+    // The call to setData() above causes QQuickBasicTheme to be set as the current theme,
     // so we must make sure we only set our theme afterwards.
     QQuickThemePrivate::instance.reset(new TestFontTheme);
 
diff --git a/tests/auto/palette/qtquickcontrols2.conf b/tests/auto/palette/qtquickcontrols2.conf
index 2ffc7eccf6..c5de6b36dd 100644
--- a/tests/auto/palette/qtquickcontrols2.conf
+++ b/tests/auto/palette/qtquickcontrols2.conf
@@ -1,5 +1,5 @@
-[Default]
+[Basic]
 Palette\Base=#efefef
 
-[Default\Palette]
+[Basic\Palette]
 Text=#101010
diff --git a/tests/auto/palette/tst_palette.cpp b/tests/auto/palette/tst_palette.cpp
index 814d5a11ac..c42b17a3c8 100644
--- a/tests/auto/palette/tst_palette.cpp
+++ b/tests/auto/palette/tst_palette.cpp
@@ -294,7 +294,7 @@ void tst_palette::defaultPalette()
     QQmlComponent component(&engine);
     component.setData(QString("import QtQuick.Controls; %1 { }").arg(control).toUtf8(), QUrl());
 
-    // The call to setData() above causes QQuickDefaultTheme to be set as the current theme,
+    // The call to setData() above causes QQuickBasicTheme to be set as the current theme,
     // so we must make sure we only set our theme afterwards.
     std::unique_ptr<QQuickTheme> oldTheme(QQuickThemePrivate::instance.take());
     QQuickThemePrivate::instance.reset(new TestTheme);
diff --git a/tests/auto/qquickiconlabel/data/colorChanges.qml b/tests/auto/qquickiconlabel/data/colorChanges.qml
index 5771e1edce..cd69508eaf 100644
--- a/tests/auto/qquickiconlabel/data/colorChanges.qml
+++ b/tests/auto/qquickiconlabel/data/colorChanges.qml
@@ -56,7 +56,7 @@ AbstractButton {
     id: button
     width: 200
     height: 200
-    icon.source: "qrc:/qt-project.org/imports/QtQuick/Controls/Default/images/check.png"
+    icon.source: "qrc:/qt-project.org/imports/QtQuick/Controls/Basic/images/check.png"
     icon.color: enabled ? "transparent" : "red"
 
     IconLabel {
diff --git a/tests/auto/qquickiconlabel/data/iconlabel.qml b/tests/auto/qquickiconlabel/data/iconlabel.qml
index 772b89bd7e..94f36a7b7e 100644
--- a/tests/auto/qquickiconlabel/data/iconlabel.qml
+++ b/tests/auto/qquickiconlabel/data/iconlabel.qml
@@ -57,7 +57,7 @@ AbstractButton {
     width: 200
     height: 200
     text: "Some text"
-    icon.source: "qrc:/qt-project.org/imports/QtQuick/Controls/Default/images/check.png"
+    icon.source: "qrc:/qt-project.org/imports/QtQuick/Controls/Basic/images/check.png"
 
     IconLabel {
         icon: button.icon
diff --git a/tests/auto/qquickiconlabel/data/spacingWithOnlyIcon.qml b/tests/auto/qquickiconlabel/data/spacingWithOnlyIcon.qml
index 7921babbb0..c00ffbb807 100644
--- a/tests/auto/qquickiconlabel/data/spacingWithOnlyIcon.qml
+++ b/tests/auto/qquickiconlabel/data/spacingWithOnlyIcon.qml
@@ -56,7 +56,7 @@ AbstractButton {
     id: button
     width: 200
     height: 200
-    icon.source: "qrc:/qt-project.org/imports/QtQuick/Controls/Default/images/check.png"
+    icon.source: "qrc:/qt-project.org/imports/QtQuick/Controls/Basic/images/check.png"
 
     IconLabel {
         spacing: 10
diff --git a/tests/auto/qquickstyle/data/default.conf b/tests/auto/qquickstyle/data/basic.conf
index 12ca5d8fe9..17ef59ee02 100644
--- a/tests/auto/qquickstyle/data/default.conf
+++ b/tests/auto/qquickstyle/data/basic.conf
@@ -1,6 +1,6 @@
 [Controls]
-Style=Default
+Style=Basic
 
-[Default]
+[Basic]
 Font\PixelSize=3
 Palette\WindowText=#ff0000
diff --git a/tests/auto/qquickstyle/tst_qquickstyle.cpp b/tests/auto/qquickstyle/tst_qquickstyle.cpp
index c9b7fdbd6a..f133b617c8 100644
--- a/tests/auto/qquickstyle/tst_qquickstyle.cpp
+++ b/tests/auto/qquickstyle/tst_qquickstyle.cpp
@@ -109,21 +109,19 @@ void tst_QQuickStyle::configurationFile_data()
 {
     QTest::addColumn<QString>("fileName");
     QTest::addColumn<QString>("expectedStyle");
-    QTest::addColumn<QString>("expectedPath");
-
-    QTest::newRow("Default") << "default.conf" << "Default" << "";
-    QTest::newRow("Fusion") << "fusion.conf" << "Fusion" << "";
-    QTest::newRow("Imagine") << "imagine.conf" << "Imagine" << "";
-    QTest::newRow("Material") << "material.conf" << "Material" << "";
-    QTest::newRow("Universal") << "universal.conf" << "Universal" << "";
-    QTest::newRow("Custom") << "custom.conf" << "Custom" << ":/";
+
+    QTest::newRow("Basic") << "basic.conf" << "Basic";
+    QTest::newRow("Fusion") << "fusion.conf" << "Fusion";
+    QTest::newRow("Imagine") << "imagine.conf" << "Imagine";
+    QTest::newRow("Material") << "material.conf" << "Material";
+    QTest::newRow("Universal") << "universal.conf" << "Universal";
+    QTest::newRow("Custom") << "custom.conf" << "Custom";
 }
 
 void tst_QQuickStyle::configurationFile()
 {
     QFETCH(QString, fileName);
     QFETCH(QString, expectedStyle);
-    QFETCH(QString, expectedPath);
 
     qputenv("QT_QUICK_CONTROLS_CONF", testFile(fileName).toLocal8Bit());
 
diff --git a/tests/auto/sanity/BLACKLIST b/tests/auto/sanity/BLACKLIST
index d6d4b0d922..214c6e7c3e 100644
--- a/tests/auto/sanity/BLACKLIST
+++ b/tests/auto/sanity/BLACKLIST
@@ -2,9 +2,9 @@
 *
 [attachedObjects:material/SwitchDelegate.qml]
 *
-[ids:default/HorizontalHeaderView.qml]
+[ids:basic/HorizontalHeaderView.qml]
 *
-[ids:default/VerticalHeaderView.qml]
+[ids:basic/VerticalHeaderView.qml]
 *
 [ids:fusion/HorizontalHeaderView.qml]
 *
diff --git a/tests/auto/sanity/tst_sanity.cpp b/tests/auto/sanity/tst_sanity.cpp
index 5dc0676c6d..f299365a12 100644
--- a/tests/auto/sanity/tst_sanity.cpp
+++ b/tests/auto/sanity/tst_sanity.cpp
@@ -175,12 +175,12 @@ void tst_Sanity::initTestCase()
 
     // Then, collect the files from each installed style directory.
     const QVector<QPair<QString, QString>> styleRelativePaths = {
-        { "controls/default", "QtQuick/Controls/Default" },
+        { "controls/basic", "QtQuick/Controls/Basic" },
         { "controls/fusion", "QtQuick/Controls/Fusion" },
         { "controls/material", "QtQuick/Controls/Material" },
         { "controls/universal", "QtQuick/Controls/Universal" },
     };
-    for (const auto stylePathPair : styleRelativePaths) {
+    for (const auto &stylePathPair : styleRelativePaths) {
         forEachControl(&engine, stylePathPair.first, stylePathPair.second, QStringList(),
                 [&](const QString &relativePath, const QUrl &absoluteUrl) {
              installedQmlFiles.insert(relativePath, absoluteUrl.toLocalFile());
@@ -377,7 +377,6 @@ void tst_Sanity::attachedObjects()
     if (styleHelper.updateStyle(style))
         qt_qobjects->clear();
 
-    // Turn e.g. "Default/Button.qml" into "default/Button.qml".
     QString styleRelativePath = tagStr;
     styleRelativePath[0] = styleRelativePath.at(0).toLower();
     // Get the absolute path to the installed file.
@@ -438,67 +437,67 @@ void tst_Sanity::attachedObjects_data()
     // such as DialogButtonBox, which is loaded by Dialog.
     // So now we list all controls and the attached types we expect them to use.
 
-    QTest::newRow("Default/AbstractButton.qml") << ignoredNames << StringPairSet {};
-    QTest::newRow("Default/Action.qml") << ignoredNames << StringPairSet {};
-    QTest::newRow("Default/ActionGroup.qml") << ignoredNames << StringPairSet {};
-    QTest::newRow("Default/ApplicationWindow.qml") << ignoredNames << StringPairSet {};
-    QTest::newRow("Default/BusyIndicator.qml") << ignoredNames << StringPairSet {};
-    QTest::newRow("Default/Button.qml") << ignoredNames << StringPairSet {};
-    QTest::newRow("Default/ButtonGroup.qml") << ignoredNames << StringPairSet {};
-    QTest::newRow("Default/CheckBox.qml") << ignoredNames << StringPairSet {};
-    QTest::newRow("Default/CheckDelegate.qml") << ignoredNames << StringPairSet {};
-    QTest::newRow("Default/ComboBox.qml") << ignoredNames << StringPairSet {};
-    QTest::newRow("Default/Container.qml") << ignoredNames << StringPairSet {};
-    QTest::newRow("Default/Control.qml") << ignoredNames << StringPairSet {};
-    QTest::newRow("Default/DelayButton.qml") << ignoredNames << StringPairSet {};
-    QTest::newRow("Default/Dial.qml") << ignoredNames << StringPairSet {};
-    QTest::newRow("Default/Dialog.qml") << ignoredNames << StringPairSet {{ "QQuickOverlayAttached", "Dialog_QMLTYPE" }};
-    QTest::newRow("Default/DialogButtonBox.qml") << ignoredNames << StringPairSet {};
-    QTest::newRow("Default/Drawer.qml") << ignoredNames << StringPairSet {{ "QQuickOverlayAttached", "Drawer_QMLTYPE" }};
-    QTest::newRow("Default/Frame.qml") << ignoredNames << StringPairSet {};
-    QTest::newRow("Default/GroupBox.qml") << ignoredNames << StringPairSet {};
-    QTest::newRow("Default/HorizontalHeaderView.qml") << ignoredNames << StringPairSet {};
-    QTest::newRow("Default/ItemDelegate.qml") << ignoredNames << StringPairSet {};
-    QTest::newRow("Default/Label.qml") << ignoredNames << StringPairSet {};
-    QTest::newRow("Default/Menu.qml") << ignoredNames << StringPairSet {
+    QTest::newRow("Basic/AbstractButton.qml") << ignoredNames << StringPairSet {};
+    QTest::newRow("Basic/Action.qml") << ignoredNames << StringPairSet {};
+    QTest::newRow("Basic/ActionGroup.qml") << ignoredNames << StringPairSet {};
+    QTest::newRow("Basic/ApplicationWindow.qml") << ignoredNames << StringPairSet {};
+    QTest::newRow("Basic/BusyIndicator.qml") << ignoredNames << StringPairSet {};
+    QTest::newRow("Basic/Button.qml") << ignoredNames << StringPairSet {};
+    QTest::newRow("Basic/ButtonGroup.qml") << ignoredNames << StringPairSet {};
+    QTest::newRow("Basic/CheckBox.qml") << ignoredNames << StringPairSet {};
+    QTest::newRow("Basic/CheckDelegate.qml") << ignoredNames << StringPairSet {};
+    QTest::newRow("Basic/ComboBox.qml") << ignoredNames << StringPairSet {};
+    QTest::newRow("Basic/Container.qml") << ignoredNames << StringPairSet {};
+    QTest::newRow("Basic/Control.qml") << ignoredNames << StringPairSet {};
+    QTest::newRow("Basic/DelayButton.qml") << ignoredNames << StringPairSet {};
+    QTest::newRow("Basic/Dial.qml") << ignoredNames << StringPairSet {};
+    QTest::newRow("Basic/Dialog.qml") << ignoredNames << StringPairSet {{ "QQuickOverlayAttached", "Dialog_QMLTYPE" }};
+    QTest::newRow("Basic/DialogButtonBox.qml") << ignoredNames << StringPairSet {};
+    QTest::newRow("Basic/Drawer.qml") << ignoredNames << StringPairSet {{ "QQuickOverlayAttached", "Drawer_QMLTYPE" }};
+    QTest::newRow("Basic/Frame.qml") << ignoredNames << StringPairSet {};
+    QTest::newRow("Basic/GroupBox.qml") << ignoredNames << StringPairSet {};
+    QTest::newRow("Basic/HorizontalHeaderView.qml") << ignoredNames << StringPairSet {};
+    QTest::newRow("Basic/ItemDelegate.qml") << ignoredNames << StringPairSet {};
+    QTest::newRow("Basic/Label.qml") << ignoredNames << StringPairSet {};
+    QTest::newRow("Basic/Menu.qml") << ignoredNames << StringPairSet {
         { "QQuickOverlayAttached", "Menu_QMLTYPE" },
         { "QQuickScrollIndicatorAttached", "QQuickListView" },
         { "QQuickWindowAttached", "QQuickListView" }
     };
-    QTest::newRow("Default/MenuBar.qml") << ignoredNames << StringPairSet {};
-    QTest::newRow("Default/MenuBarItem.qml") << ignoredNames << StringPairSet {};
-    QTest::newRow("Default/MenuItem.qml") << ignoredNames << StringPairSet {};
-    QTest::newRow("Default/MenuSeparator.qml") << ignoredNames << StringPairSet {};
-    QTest::newRow("Default/Page.qml") << ignoredNames << StringPairSet {};
-    QTest::newRow("Default/PageIndicator.qml") << ignoredNames << StringPairSet {};
-    QTest::newRow("Default/Pane.qml") << ignoredNames << StringPairSet {};
-    QTest::newRow("Default/Popup.qml") << ignoredNames << StringPairSet {{ "QQuickOverlayAttached", "Popup_QMLTYPE" }};
-    QTest::newRow("Default/ProgressBar.qml") << ignoredNames << StringPairSet {};
-    QTest::newRow("Default/RadioButton.qml") << ignoredNames << StringPairSet {};
-    QTest::newRow("Default/RadioDelegate.qml") << ignoredNames << StringPairSet {};
-    QTest::newRow("Default/RangeSlider.qml") << ignoredNames << StringPairSet {};
-    QTest::newRow("Default/RoundButton.qml") << ignoredNames << StringPairSet {};
-    QTest::newRow("Default/ScrollBar.qml") << ignoredNames << StringPairSet {};
-    QTest::newRow("Default/ScrollIndicator.qml") << ignoredNames << StringPairSet {};
-    QTest::newRow("Default/ScrollView.qml") << ignoredNames << StringPairSet {{ "QQuickScrollBarAttached", "ScrollView_QMLTYPE" }};
-    QTest::newRow("Default/Slider.qml") << ignoredNames << StringPairSet {};
-    QTest::newRow("Default/SpinBox.qml") << ignoredNames << StringPairSet {};
-    QTest::newRow("Default/SplitView.qml") << ignoredNames << StringPairSet {};
-    QTest::newRow("Default/StackView.qml") << ignoredNames << StringPairSet {};
-    QTest::newRow("Default/SwipeDelegate.qml") << ignoredNames << StringPairSet {};
-    QTest::newRow("Default/SwipeView.qml") << ignoredNames << StringPairSet {};
-    QTest::newRow("Default/Switch.qml") << ignoredNames << StringPairSet {};
-    QTest::newRow("Default/SwitchDelegate.qml") << ignoredNames << StringPairSet {};
-    QTest::newRow("Default/TabBar.qml") << ignoredNames << StringPairSet {};
-    QTest::newRow("Default/TabButton.qml") << ignoredNames << StringPairSet {};
-    QTest::newRow("Default/TextArea.qml") << ignoredNames << StringPairSet {};
-    QTest::newRow("Default/TextField.qml") << ignoredNames << StringPairSet {};
-    QTest::newRow("Default/ToolBar.qml") << ignoredNames << StringPairSet {};
-    QTest::newRow("Default/ToolButton.qml") << ignoredNames << StringPairSet {};
-    QTest::newRow("Default/ToolSeparator.qml") << ignoredNames << StringPairSet {};
-    QTest::newRow("Default/ToolTip.qml") << ignoredNames << StringPairSet {};
-    QTest::newRow("Default/Tumbler.qml") << ignoredNames << StringPairSet {};
-    QTest::newRow("Default/VerticalHeaderView.qml") << ignoredNames << StringPairSet {};
+    QTest::newRow("Basic/MenuBar.qml") << ignoredNames << StringPairSet {};
+    QTest::newRow("Basic/MenuBarItem.qml") << ignoredNames << StringPairSet {};
+    QTest::newRow("Basic/MenuItem.qml") << ignoredNames << StringPairSet {};
+    QTest::newRow("Basic/MenuSeparator.qml") << ignoredNames << StringPairSet {};
+    QTest::newRow("Basic/Page.qml") << ignoredNames << StringPairSet {};
+    QTest::newRow("Basic/PageIndicator.qml") << ignoredNames << StringPairSet {};
+    QTest::newRow("Basic/Pane.qml") << ignoredNames << StringPairSet {};
+    QTest::newRow("Basic/Popup.qml") << ignoredNames << StringPairSet {{ "QQuickOverlayAttached", "Popup_QMLTYPE" }};
+    QTest::newRow("Basic/ProgressBar.qml") << ignoredNames << StringPairSet {};
+    QTest::newRow("Basic/RadioButton.qml") << ignoredNames << StringPairSet {};
+    QTest::newRow("Basic/RadioDelegate.qml") << ignoredNames << StringPairSet {};
+    QTest::newRow("Basic/RangeSlider.qml") << ignoredNames << StringPairSet {};
+    QTest::newRow("Basic/RoundButton.qml") << ignoredNames << StringPairSet {};
+    QTest::newRow("Basic/ScrollBar.qml") << ignoredNames << StringPairSet {};
+    QTest::newRow("Basic/ScrollIndicator.qml") << ignoredNames << StringPairSet {};
+    QTest::newRow("Basic/ScrollView.qml") << ignoredNames << StringPairSet {{ "QQuickScrollBarAttached", "ScrollView_QMLTYPE" }};
+    QTest::newRow("Basic/Slider.qml") << ignoredNames << StringPairSet {};
+    QTest::newRow("Basic/SpinBox.qml") << ignoredNames << StringPairSet {};
+    QTest::newRow("Basic/SplitView.qml") << ignoredNames << StringPairSet {};
+    QTest::newRow("Basic/StackView.qml") << ignoredNames << StringPairSet {};
+    QTest::newRow("Basic/SwipeDelegate.qml") << ignoredNames << StringPairSet {};
+    QTest::newRow("Basic/SwipeView.qml") << ignoredNames << StringPairSet {};
+    QTest::newRow("Basic/Switch.qml") << ignoredNames << StringPairSet {};
+    QTest::newRow("Basic/SwitchDelegate.qml") << ignoredNames << StringPairSet {};
+    QTest::newRow("Basic/TabBar.qml") << ignoredNames << StringPairSet {};
+    QTest::newRow("Basic/TabButton.qml") << ignoredNames << StringPairSet {};
+    QTest::newRow("Basic/TextArea.qml") << ignoredNames << StringPairSet {};
+    QTest::newRow("Basic/TextField.qml") << ignoredNames << StringPairSet {};
+    QTest::newRow("Basic/ToolBar.qml") << ignoredNames << StringPairSet {};
+    QTest::newRow("Basic/ToolButton.qml") << ignoredNames << StringPairSet {};
+    QTest::newRow("Basic/ToolSeparator.qml") << ignoredNames << StringPairSet {};
+    QTest::newRow("Basic/ToolTip.qml") << ignoredNames << StringPairSet {};
+    QTest::newRow("Basic/Tumbler.qml") << ignoredNames << StringPairSet {};
+    QTest::newRow("Basic/VerticalHeaderView.qml") << ignoredNames << StringPairSet {};
     QTest::newRow("Fusion/ApplicationWindow.qml") << ignoredNames << StringPairSet {};
     QTest::newRow("Fusion/BusyIndicator.qml") << ignoredNames << StringPairSet {};
     QTest::newRow("Fusion/Button.qml") << ignoredNames << StringPairSet {};
diff --git a/tests/auto/snippets/tst_snippets.cpp b/tests/auto/snippets/tst_snippets.cpp
index 1c420edbb3..17ae6aa614 100644
--- a/tests/auto/snippets/tst_snippets.cpp
+++ b/tests/auto/snippets/tst_snippets.cpp
@@ -114,7 +114,7 @@ void tst_Snippets::verify()
 
     if (takeScreenshots) {
         const QString currentDataTag = QLatin1String(QTest::currentDataTag());
-        static const QString applicationStyle = QQuickStyle::name().isEmpty() ? "Default" : QQuickStyle::name();
+        static const QString applicationStyle = QQuickStyle::name().isEmpty() ? "Basic" : QQuickStyle::name();
         static const QStringList builtInStyles = QQuickStylePrivate::builtInStyles();
 
         bool isStyledSnippet = false;
diff --git a/tests/auto/styleimports/data/importDefaultStyleWithoutControls.qml b/tests/auto/styleimports/data/importBasicStyleWithoutControls.qml
index 421d49adaf..40e026661e 100644
--- a/tests/auto/styleimports/data/importDefaultStyleWithoutControls.qml
+++ b/tests/auto/styleimports/data/importBasicStyleWithoutControls.qml
@@ -48,7 +48,7 @@
 **
 ****************************************************************************/
 
-import QtQuick.Controls.Default
+import QtQuick.Controls.Basic
 
 ApplicationWindow {
     title: "Test Application Window"
diff --git a/tests/auto/styleimports/tst_styleimports.cpp b/tests/auto/styleimports/tst_styleimports.cpp
index fa524098a6..408f06c3c2 100644
--- a/tests/auto/styleimports/tst_styleimports.cpp
+++ b/tests/auto/styleimports/tst_styleimports.cpp
@@ -85,56 +85,56 @@ void tst_StyleImports::select_data()
     QTest::addColumn<QString>("fallback");
     QTest::addColumn<QString>("expected");
 
-    // Action.qml exists in the "data" style and the Default style.
-    QTest::newRow("control=Action,style=empty,fallback=empty") << "Action.qml" << "" << "" << "Default";
-    QTest::newRow("control=Action,style=fs,fallback=empty") << "Action.qml" << "FileSystemStyle" << "" << "Default";
-    QTest::newRow("control=Action,style=qrc,fallback=empty") << "Action.qml" << "ResourceStyle" << "" << "Default";
-    QTest::newRow("control=Action,style=nosuch,fallback=empty") << "Action.qml" << "NoSuchStyle" << "" << "Default";
+    // Action.qml exists in the "data" style and the Basic style.
+    QTest::newRow("control=Action,style=empty,fallback=empty") << "Action.qml" << "" << "" << "Basic";
+    QTest::newRow("control=Action,style=fs,fallback=empty") << "Action.qml" << "FileSystemStyle" << "" << "Basic";
+    QTest::newRow("control=Action,style=qrc,fallback=empty") << "Action.qml" << "ResourceStyle" << "" << "Basic";
+    QTest::newRow("control=Action,style=nosuch,fallback=empty") << "Action.qml" << "NoSuchStyle" << "" << "Basic";
     QTest::newRow("control=Action,style=data,fallback=empty") << "Action.qml" << "data" << "" << "data";
 
     QTest::newRow("control=Action,style=empty,fallback=mat") << "Action.qml" << "" << "Material" << "";
-    QTest::newRow("control=Action,style=fs,fallback=mat") << "Action.qml" << "FileSystemStyle" << "Material" << "Default";
-    QTest::newRow("control=Action,style=qrc,fallback=mat") << "Action.qml" << "ResourceStyle" << "Material" << "Default";
-    QTest::newRow("control=Action,style=nosuch,fallback=mat") << "Action.qml" << "NoSuchStyle" << "Material" << "Default";
+    QTest::newRow("control=Action,style=fs,fallback=mat") << "Action.qml" << "FileSystemStyle" << "Material" << "Basic";
+    QTest::newRow("control=Action,style=qrc,fallback=mat") << "Action.qml" << "ResourceStyle" << "Material" << "Basic";
+    QTest::newRow("control=Action,style=nosuch,fallback=mat") << "Action.qml" << "NoSuchStyle" << "Material" << "Basic";
     QTest::newRow("control=Action,style=data,fallback=mat") << "Action.qml" << "data" << "Material" << "data";
 
-    // ScrollView.qml only exists in the Default style.
-    QTest::newRow("control=ScrollView,style=empty,fallback=empty") << "ScrollView.qml" << "" << "" << "Default";
-    QTest::newRow("control=ScrollView,style=fs,fallback=empty") << "ScrollView.qml" << "FileSystemStyle" << "" << "Default";
-    QTest::newRow("control=ScrollView,style=qrc,fallback=empty") << "ScrollView.qml" << "ResourceStyle" << "" << "Default";
-    QTest::newRow("control=ScrollView,style=nosuch,fallback=empty") << "ScrollView.qml" << "NoSuchStyle" << "" << "Default";
-    QTest::newRow("control=ScrollView,style=data,fallback=empty") << "ScrollView.qml" << "data" << "" << "Default";
-
-    QTest::newRow("control=ScrollView,style=empty,fallback=mat") << "ScrollView.qml" << "" << "Material" << "Default";
-    QTest::newRow("control=ScrollView,style=fs,fallback=mat") << "ScrollView.qml" << "FileSystemStyle" << "Material" << "Default";
-    QTest::newRow("control=ScrollView,style=qrc,fallback=mat") << "ScrollView.qml" << "ResourceStyle" << "Material" << "Default";
-    QTest::newRow("control=ScrollView,style=nosuch,fallback=mat") << "ScrollView.qml" << "NoSuchStyle" << "Material" << "Default";
-    QTest::newRow("control=ScrollView,style=data,fallback=mat") << "ScrollView.qml" << "data" << "Material" << "Default";
-
-    // Label.qml exists in the "data", Default and Material styles.
-    QTest::newRow("control=Label,style=none,fallback=none") << "Label.qml" << "" << "" << "Default";
-    QTest::newRow("control=Label,style=fs,fallback=none") << "Label.qml" << "FileSystemStyle" << "" << "Default";
-    QTest::newRow("control=Label,style=qrc,fallback=none") << "Label.qml" << "ResourceStyle" << "" << "Default";
-    QTest::newRow("control=Label,style=nosuch,fallback=none") << "Label.qml" << "NoSuchStyle" << "" << "Default";
+    // ScrollView.qml only exists in the Basic style.
+    QTest::newRow("control=ScrollView,style=empty,fallback=empty") << "ScrollView.qml" << "" << "" << "Basic";
+    QTest::newRow("control=ScrollView,style=fs,fallback=empty") << "ScrollView.qml" << "FileSystemStyle" << "" << "Basic";
+    QTest::newRow("control=ScrollView,style=qrc,fallback=empty") << "ScrollView.qml" << "ResourceStyle" << "" << "Basic";
+    QTest::newRow("control=ScrollView,style=nosuch,fallback=empty") << "ScrollView.qml" << "NoSuchStyle" << "" << "Basic";
+    QTest::newRow("control=ScrollView,style=data,fallback=empty") << "ScrollView.qml" << "data" << "" << "Basic";
+
+    QTest::newRow("control=ScrollView,style=empty,fallback=mat") << "ScrollView.qml" << "" << "Material" << "Basic";
+    QTest::newRow("control=ScrollView,style=fs,fallback=mat") << "ScrollView.qml" << "FileSystemStyle" << "Material" << "Basic";
+    QTest::newRow("control=ScrollView,style=qrc,fallback=mat") << "ScrollView.qml" << "ResourceStyle" << "Material" << "Basic";
+    QTest::newRow("control=ScrollView,style=nosuch,fallback=mat") << "ScrollView.qml" << "NoSuchStyle" << "Material" << "Basic";
+    QTest::newRow("control=ScrollView,style=data,fallback=mat") << "ScrollView.qml" << "data" << "Material" << "Basic";
+
+    // Label.qml exists in the "data", Basic and Material styles.
+    QTest::newRow("control=Label,style=none,fallback=none") << "Label.qml" << "" << "" << "Basic";
+    QTest::newRow("control=Label,style=fs,fallback=none") << "Label.qml" << "FileSystemStyle" << "" << "Basic";
+    QTest::newRow("control=Label,style=qrc,fallback=none") << "Label.qml" << "ResourceStyle" << "" << "Basic";
+    QTest::newRow("control=Label,style=nosuch,fallback=none") << "Label.qml" << "NoSuchStyle" << "" << "Basic";
     QTest::newRow("control=Label,style=data,fallback=none") << "Label.qml" << "data" << "" << "data";
 
-    QTest::newRow("control=Label,style=none,fallback=mat") << "Label.qml" << "" << "Material" << "Default";
-    QTest::newRow("control=Label,style=fs,fallback=mat") << "Label.qml" << "FileSystemStyle" << "Material" << "Default";
-    QTest::newRow("control=Label,style=qrc,fallback=mat") << "Label.qml" << "ResourceStyle" << "Material" << "Default";
-    QTest::newRow("control=Label,style=nosuch,fallback=mat") << "Label.qml" << "NoSuchStyle" << "Material" << "Default";
+    QTest::newRow("control=Label,style=none,fallback=mat") << "Label.qml" << "" << "Material" << "Basic";
+    QTest::newRow("control=Label,style=fs,fallback=mat") << "Label.qml" << "FileSystemStyle" << "Material" << "Basic";
+    QTest::newRow("control=Label,style=qrc,fallback=mat") << "Label.qml" << "ResourceStyle" << "Material" << "Basic";
+    QTest::newRow("control=Label,style=nosuch,fallback=mat") << "Label.qml" << "NoSuchStyle" << "Material" << "Basic";
     QTest::newRow("control=Label,style=data,fallback=mat") << "Label.qml" << "data" << "Material" << "data";
 
     // Button.qml exists in all styles including the fs and qrc styles
-    QTest::newRow("control=Button,style=none,fallback=none") << "Button.qml" << "" << "" << "Default";
+    QTest::newRow("control=Button,style=none,fallback=none") << "Button.qml" << "" << "" << "Basic";
     QTest::newRow("control=Button,style=fs,fallback=none") << "Button.qml" << "FileSystemStyle" << "" << "FileSystemStyle";
     QTest::newRow("control=Button,style=qrc,fallback=none") << "Button.qml" << "ResourceStyle" << "" << "ResourceStyle";
-    QTest::newRow("control=Button,style=nosuch,fallback=none") << "Button.qml" << "NoSuchStyle" << "" << "Default";
+    QTest::newRow("control=Button,style=nosuch,fallback=none") << "Button.qml" << "NoSuchStyle" << "" << "Basic";
     QTest::newRow("control=Button,style=data,fallback=none") << "Button.qml" << "data" << "" << "data";
 
-    QTest::newRow("control=Button,style=none,fallback=mat") << "Button.qml" << "" << "Material" << "Default";
+    QTest::newRow("control=Button,style=none,fallback=mat") << "Button.qml" << "" << "Material" << "Basic";
     QTest::newRow("control=Button,style=fs,fallback=mat") << "Button.qml" << "FileSystemStyle" << "Material" << "FileSystemStyle";
     QTest::newRow("control=Button,style=qrc,fallback=mat") << "Button.qml" << "ResourceStyle" << "Material" << "ResourceStyle";
-    QTest::newRow("control=Button,style=nosuch,fallback=mat") << "Button.qml" << "NoSuchStyle" << "Material" << "Default";
+    QTest::newRow("control=Button,style=nosuch,fallback=mat") << "Button.qml" << "NoSuchStyle" << "Material" << "Basic";
     QTest::newRow("control=Button,style=data,fallback=mat") << "Button.qml" << "data" << "Material" << "data";
 }
 
@@ -227,12 +227,12 @@ void tst_StyleImports::importStyleWithoutControls()
     bool success = false;
 
     // Account for extra warnings for fallback styles.
-    QTest::ignoreMessage(QtWarningMsg, QRegularExpression("QtQuick.Controls must be imported before importing.*Default"));
+    QTest::ignoreMessage(QtWarningMsg, QRegularExpression("QtQuick.Controls must be imported before importing.*Basic"));
     if (style == QLatin1String("macOS"))
         QTest::ignoreMessage(QtWarningMsg, QRegularExpression("QtQuick.Controls must be imported before importing.*Fusion"));
 
     // Account for the warning for the current style.
-    if (style != QLatin1String("Default"))
+    if (style != QLatin1String("Basic"))
         QTest::ignoreMessage(QtWarningMsg, QRegularExpression("QtQuick.Controls must be imported before importing.*" + style));
 
     QObject::connect(&engine, &QQmlApplicationEngine::objectCreated,
diff --git a/tests/benchmarks/creationtime/tst_creationtime.cpp b/tests/benchmarks/creationtime/tst_creationtime.cpp
index d186dc8312..87869bcaab 100644
--- a/tests/benchmarks/creationtime/tst_creationtime.cpp
+++ b/tests/benchmarks/creationtime/tst_creationtime.cpp
@@ -51,8 +51,8 @@ private slots:
     void initTestCase();
     void init();
 
-    void defaultStyle();
-    void defaultStyle_data();
+    void basicStyle();
+    void basicStyle_data();
 
     void fusion();
     void fusion_data();
@@ -102,16 +102,16 @@ static void doBenchmark(QQuickStyleHelper &styleHelper, const QUrl &url)
     qDeleteAll(objects);
 }
 
-void tst_CreationTime::defaultStyle()
+void tst_CreationTime::basicStyle()
 {
     QFETCH(QUrl, url);
     doBenchmark(styleHelper, url);
 }
 
-void tst_CreationTime::defaultStyle_data()
+void tst_CreationTime::basicStyle_data()
 {
     QTest::addColumn<QUrl>("url");
-    addTestRowForEachControl(styleHelper.engine.data(), "controls/default", "QtQuick/Controls/Default", QStringList() << "ApplicationWindow");
+    addTestRowForEachControl(styleHelper.engine.data(), "controls/basic", "QtQuick/Controls/Basic", QStringList() << "ApplicationWindow");
 }
 
 void tst_CreationTime::fusion()
diff --git a/tests/benchmarks/objectcount/tst_objectcount.cpp b/tests/benchmarks/objectcount/tst_objectcount.cpp
index 626bb57280..cd8b4aee29 100644
--- a/tests/benchmarks/objectcount/tst_objectcount.cpp
+++ b/tests/benchmarks/objectcount/tst_objectcount.cpp
@@ -93,7 +93,7 @@ void tst_ObjectCount::cleanup()
 
 static void initTestRows(QQmlEngine *engine)
 {
-    addTestRowForEachControl(engine, "controls/default", "QtQuick/Controls/Default");
+    addTestRowForEachControl(engine, "controls/basic", "QtQuick/Controls/Basic");
     addTestRowForEachControl(engine, "controls/fusion", "QtQuick/Controls/Fusion", QStringList() << "ButtonPanel" << "CheckIndicator" << "RadioIndicator" << "SliderGroove" << "SliderHandle" << "SwitchIndicator");
     addTestRowForEachControl(engine, "controls/imagine", "QtQuick/Controls/Imagine");
     addTestRowForEachControl(engine, "controls/material", "QtQuick/Controls/Material", QStringList() << "Ripple" << "SliderHandle" << "CheckIndicator" << "RadioIndicator" << "SwitchIndicator" << "BoxShadow" << "ElevationEffect" << "CursorDelegate");
diff --git a/tests/manual/dialogs/qtquickcontrols2.conf b/tests/manual/dialogs/qtquickcontrols2.conf
index 7ac318079d..53f380bfc9 100644
--- a/tests/manual/dialogs/qtquickcontrols2.conf
+++ b/tests/manual/dialogs/qtquickcontrols2.conf
@@ -1,5 +1,5 @@
 [Controls]
-Style=Default
+Style=Basic
 ;Style=Fusion
 ;Style=Imagine
 ;Style=Material
diff --git a/tests/manual/nativestyle/CustomCheckBoxes.qml b/tests/manual/nativestyle/CustomCheckBoxes.qml
index ce3a554381..00dc7378f4 100644
--- a/tests/manual/nativestyle/CustomCheckBoxes.qml
+++ b/tests/manual/nativestyle/CustomCheckBoxes.qml
@@ -76,7 +76,7 @@ ControlContainer {
                     defaultColor: "#353637"
                     scale: 0.5
                     color: "green"
-                    source: "qrc:/qt-project.org/imports/QtQuick/Controls/Default/images/check.png"
+                    source: "qrc:/qt-project.org/imports/QtQuick/Controls/Basic/images/check.png"
                     visible: customIndicator.checkState === Qt.Checked
                 }
 
@@ -119,7 +119,7 @@ ControlContainer {
                     defaultColor: "#353637"
                     scale: 0.5
                     color: "green"
-                    source: "qrc:/qt-project.org/imports/QtQuick/Controls/Default/images/check.png"
+                    source: "qrc:/qt-project.org/imports/QtQuick/Controls/Basic/images/check.png"
                     visible: allCustom.checkState === Qt.Checked
                 }
 
diff --git a/tests/manual/nativestyle/CustomComboBoxes.qml b/tests/manual/nativestyle/CustomComboBoxes.qml
index bd793e28dd..a51cca9401 100644
--- a/tests/manual/nativestyle/CustomComboBoxes.qml
+++ b/tests/manual/nativestyle/CustomComboBoxes.qml
@@ -61,7 +61,7 @@ ControlContainer {
                 y: control.topPadding + (control.availableHeight - height) / 2
                 color: control.palette.dark
                 defaultColor: "#353637"
-                source: "qrc:/qt-project.org/imports/QtQuick/Controls/Default/images/double-arrow.png"
+                source: "qrc:/qt-project.org/imports/QtQuick/Controls/Basic/images/double-arrow.png"
                 opacity: enabled ? 1 : 0.3
             }
         }
@@ -100,7 +100,7 @@ ControlContainer {
                 y: control2.topPadding + (control2.availableHeight - height) / 2
                 color: control2.palette.dark
                 defaultColor: "#353637"
-                source: "qrc:/qt-project.org/imports/QtQuick/Controls/Default/images/double-arrow.png"
+                source: "qrc:/qt-project.org/imports/QtQuick/Controls/Basic/images/double-arrow.png"
                 opacity: enabled ? 1 : 0.3
             }
         }
diff --git a/tests/manual/nativestyle/CustomDials.qml b/tests/manual/nativestyle/CustomDials.qml
index cc16e96fee..b0df77b603 100644
--- a/tests/manual/nativestyle/CustomDials.qml
+++ b/tests/manual/nativestyle/CustomDials.qml
@@ -36,7 +36,7 @@
 
 import QtQuick
 import QtQuick.Controls
-import QtQuick.Controls.Default.impl
+import QtQuick.Controls.Basic.impl
 import QtQuick.Layouts
 
 ControlContainer {
@@ -68,7 +68,7 @@ ControlContainer {
                 width: 14
                 height: 10
                 color: "green"
-                source: "qrc:/qt-project.org/imports/QtQuick/Controls/Default/images/dial-indicator.png"
+                source: "qrc:/qt-project.org/imports/QtQuick/Controls/Basic/images/dial-indicator.png"
                 antialiasing: true
                 opacity: dial1.enabled ? 1 : 0.3
                 transform: [
diff --git a/tests/manual/nativestyle/CustomProgressBars.qml b/tests/manual/nativestyle/CustomProgressBars.qml
index b7617f927e..6ace8f20bc 100644
--- a/tests/manual/nativestyle/CustomProgressBars.qml
+++ b/tests/manual/nativestyle/CustomProgressBars.qml
@@ -37,7 +37,7 @@
 import QtQuick
 import QtQuick.Controls
 import QtQuick.Layouts
-import QtQuick.Controls.Default.impl
+import QtQuick.Controls.Basic.impl
 
 ControlContainer {
     id: container
diff --git a/tests/manual/nativestyle/main.cpp b/tests/manual/nativestyle/main.cpp
index 4925efa8bb..b064dd96c9 100644
--- a/tests/manual/nativestyle/main.cpp
+++ b/tests/manual/nativestyle/main.cpp
@@ -42,10 +42,8 @@ int main(int argc, char *argv[])
 {
     QGuiApplication app(argc, argv);
 
-    // Todo: rename the "default" style to e.g "simple"
-    // and use "default" as a phony style name instad
-    // to mean "get me the default style on the current
-    // platform".
+    // TODO: when no style is specified, default to the appropriate native
+    // platform style if available, otherwise use Basic: QTBUG-86403
     const QString style = qEnvironmentVariable("DESKTOPGALLERY_STYLE");
     if (!style.isEmpty())
         QQuickStyle::setStyle(style);
diff --git a/tests/manual/styles-cover-flow/styles-cover-flow.qml b/tests/manual/styles-cover-flow/styles-cover-flow.qml
index ec9630cddc..0f400c0d5e 100644
--- a/tests/manual/styles-cover-flow/styles-cover-flow.qml
+++ b/tests/manual/styles-cover-flow/styles-cover-flow.qml
@@ -74,7 +74,7 @@ Window {
         anchors.leftMargin: 130
         anchors.rightMargin: 130
         model: ListModel {
-            ListElement { source: "qtquickcontrols2-default.png"; dark: false }
+            ListElement { source: "qtquickcontrols2-basic.png"; dark: false }
             ListElement { source: "qtquickcontrols2-fusion.png"; dark: false }
             ListElement { source: "qtquickcontrols2-universal-light.png"; dark: false }
             ListElement { source: "qtquickcontrols2-universal-dark.png"; dark: true }