40 files changed, 41 insertions, 41 deletions
diff --git a/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-busyindicator.qml b/tests/manual/quickcontrols/gifs/data/qtquickcontrols-busyindicator.qml
index 1463a48e42..1463a48e42 100644
--- a/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-busyindicator.qml
+++ b/tests/manual/quickcontrols/gifs/data/qtquickcontrols-busyindicator.qml
diff --git a/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-button-flat.qml b/tests/manual/quickcontrols/gifs/data/qtquickcontrols-button-flat.qml
index c08885ccf7..c08885ccf7 100644
--- a/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-button-flat.qml
+++ b/tests/manual/quickcontrols/gifs/data/qtquickcontrols-button-flat.qml
diff --git a/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-button-highlighted.qml b/tests/manual/quickcontrols/gifs/data/qtquickcontrols-button-highlighted.qml
index 7d6baef42a..7d6baef42a 100644
--- a/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-button-highlighted.qml
+++ b/tests/manual/quickcontrols/gifs/data/qtquickcontrols-button-highlighted.qml
diff --git a/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-button.qml b/tests/manual/quickcontrols/gifs/data/qtquickcontrols-button.qml
index 895a143762..895a143762 100644
--- a/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-button.qml
+++ b/tests/manual/quickcontrols/gifs/data/qtquickcontrols-button.qml
diff --git a/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-checkbox-tristate.qml b/tests/manual/quickcontrols/gifs/data/qtquickcontrols-checkbox-tristate.qml
index 55d9bc28e3..55d9bc28e3 100644
--- a/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-checkbox-tristate.qml
+++ b/tests/manual/quickcontrols/gifs/data/qtquickcontrols-checkbox-tristate.qml
diff --git a/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-checkbox.qml b/tests/manual/quickcontrols/gifs/data/qtquickcontrols-checkbox.qml
index 867bb6142e..867bb6142e 100644
--- a/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-checkbox.qml
+++ b/tests/manual/quickcontrols/gifs/data/qtquickcontrols-checkbox.qml
diff --git a/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-checkdelegate-tristate.qml b/tests/manual/quickcontrols/gifs/data/qtquickcontrols-checkdelegate-tristate.qml
index 3dfec43cf5..3dfec43cf5 100644
--- a/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-checkdelegate-tristate.qml
+++ b/tests/manual/quickcontrols/gifs/data/qtquickcontrols-checkdelegate-tristate.qml
diff --git a/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-checkdelegate.qml b/tests/manual/quickcontrols/gifs/data/qtquickcontrols-checkdelegate.qml
index 274f7580e9..274f7580e9 100644
--- a/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-checkdelegate.qml
+++ b/tests/manual/quickcontrols/gifs/data/qtquickcontrols-checkdelegate.qml
diff --git a/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-combobox.qml b/tests/manual/quickcontrols/gifs/data/qtquickcontrols-combobox.qml
index 0982ff0bf0..0982ff0bf0 100644
--- a/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-combobox.qml
+++ b/tests/manual/quickcontrols/gifs/data/qtquickcontrols-combobox.qml
diff --git a/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-delaybutton.qml b/tests/manual/quickcontrols/gifs/data/qtquickcontrols-delaybutton.qml
index e044dc7744..e044dc7744 100644
--- a/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-delaybutton.qml
+++ b/tests/manual/quickcontrols/gifs/data/qtquickcontrols-delaybutton.qml
diff --git a/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-dial-no-wrap.qml b/tests/manual/quickcontrols/gifs/data/qtquickcontrols-dial-no-wrap.qml
index 13641e17f4..13641e17f4 100644
--- a/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-dial-no-wrap.qml
+++ b/tests/manual/quickcontrols/gifs/data/qtquickcontrols-dial-no-wrap.qml
diff --git a/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-dial-wrap.qml b/tests/manual/quickcontrols/gifs/data/qtquickcontrols-dial-wrap.qml
index 3a47350a4f..3a47350a4f 100644
--- a/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-dial-wrap.qml
+++ b/tests/manual/quickcontrols/gifs/data/qtquickcontrols-dial-wrap.qml
diff --git a/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-drawer.qml b/tests/manual/quickcontrols/gifs/data/qtquickcontrols-drawer.qml
index 2cf05730af..2cf05730af 100644
--- a/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-drawer.qml
+++ b/tests/manual/quickcontrols/gifs/data/qtquickcontrols-drawer.qml
diff --git a/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-itemdelegate.qml b/tests/manual/quickcontrols/gifs/data/qtquickcontrols-itemdelegate.qml
index b4c7f29ec8..b4c7f29ec8 100644
--- a/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-itemdelegate.qml
+++ b/tests/manual/quickcontrols/gifs/data/qtquickcontrols-itemdelegate.qml
diff --git a/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-menu.qml b/tests/manual/quickcontrols/gifs/data/qtquickcontrols-menu.qml
index f39cc8f7c5..f39cc8f7c5 100644
--- a/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-menu.qml
+++ b/tests/manual/quickcontrols/gifs/data/qtquickcontrols-menu.qml
diff --git a/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-progressbar-indeterminate.qml b/tests/manual/quickcontrols/gifs/data/qtquickcontrols-progressbar-indeterminate.qml
index 818c1a28ec..818c1a28ec 100644
--- a/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-progressbar-indeterminate.qml
+++ b/tests/manual/quickcontrols/gifs/data/qtquickcontrols-progressbar-indeterminate.qml
diff --git a/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-progressbar.qml b/tests/manual/quickcontrols/gifs/data/qtquickcontrols-progressbar.qml
index 2faca20388..2faca20388 100644
--- a/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-progressbar.qml
+++ b/tests/manual/quickcontrols/gifs/data/qtquickcontrols-progressbar.qml
diff --git a/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-radiobutton.qml b/tests/manual/quickcontrols/gifs/data/qtquickcontrols-radiobutton.qml
index 7e4c391673..7e4c391673 100644
--- a/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-radiobutton.qml
+++ b/tests/manual/quickcontrols/gifs/data/qtquickcontrols-radiobutton.qml
diff --git a/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-radiodelegate.qml b/tests/manual/quickcontrols/gifs/data/qtquickcontrols-radiodelegate.qml
index 7569c8d7b2..7569c8d7b2 100644
--- a/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-radiodelegate.qml
+++ b/tests/manual/quickcontrols/gifs/data/qtquickcontrols-radiodelegate.qml
diff --git a/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-rangeslider.qml b/tests/manual/quickcontrols/gifs/data/qtquickcontrols-rangeslider.qml
index 6c7f548f48..6c7f548f48 100644
--- a/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-rangeslider.qml
+++ b/tests/manual/quickcontrols/gifs/data/qtquickcontrols-rangeslider.qml
diff --git a/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-scrollbar-snap.qml b/tests/manual/quickcontrols/gifs/data/qtquickcontrols-scrollbar-snap.qml
index 06c8bd96d5..06c8bd96d5 100644
--- a/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-scrollbar-snap.qml
+++ b/tests/manual/quickcontrols/gifs/data/qtquickcontrols-scrollbar-snap.qml
diff --git a/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-scrollbar.qml b/tests/manual/quickcontrols/gifs/data/qtquickcontrols-scrollbar.qml
index 63afabbefe..63afabbefe 100644
--- a/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-scrollbar.qml
+++ b/tests/manual/quickcontrols/gifs/data/qtquickcontrols-scrollbar.qml
diff --git a/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-scrollindicator.qml b/tests/manual/quickcontrols/gifs/data/qtquickcontrols-scrollindicator.qml
index f2f12bbe91..f2f12bbe91 100644
--- a/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-scrollindicator.qml
+++ b/tests/manual/quickcontrols/gifs/data/qtquickcontrols-scrollindicator.qml
diff --git a/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-slider-snap.qml b/tests/manual/quickcontrols/gifs/data/qtquickcontrols-slider-snap.qml
index ae5d8cf6cb..ae5d8cf6cb 100644
--- a/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-slider-snap.qml
+++ b/tests/manual/quickcontrols/gifs/data/qtquickcontrols-slider-snap.qml
diff --git a/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-slider.qml b/tests/manual/quickcontrols/gifs/data/qtquickcontrols-slider.qml
index 134341ccfa..134341ccfa 100644
--- a/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-slider.qml
+++ b/tests/manual/quickcontrols/gifs/data/qtquickcontrols-slider.qml
diff --git a/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-stackview-pop.qml b/tests/manual/quickcontrols/gifs/data/qtquickcontrols-stackview-pop.qml
index 64c44063a6..64c44063a6 100644
--- a/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-stackview-pop.qml
+++ b/tests/manual/quickcontrols/gifs/data/qtquickcontrols-stackview-pop.qml
diff --git a/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-stackview-push.qml b/tests/manual/quickcontrols/gifs/data/qtquickcontrols-stackview-push.qml
index 523c482de8..523c482de8 100644
--- a/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-stackview-push.qml
+++ b/tests/manual/quickcontrols/gifs/data/qtquickcontrols-stackview-push.qml
diff --git a/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-stackview-replace.qml b/tests/manual/quickcontrols/gifs/data/qtquickcontrols-stackview-replace.qml
index f1ba010b93..f1ba010b93 100644
--- a/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-stackview-replace.qml
+++ b/tests/manual/quickcontrols/gifs/data/qtquickcontrols-stackview-replace.qml
diff --git a/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-stackview-unwind.qml b/tests/manual/quickcontrols/gifs/data/qtquickcontrols-stackview-unwind.qml
index 4631dce66a..4631dce66a 100644
--- a/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-stackview-unwind.qml
+++ b/tests/manual/quickcontrols/gifs/data/qtquickcontrols-stackview-unwind.qml
diff --git a/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-swipedelegate-behind.qml b/tests/manual/quickcontrols/gifs/data/qtquickcontrols-swipedelegate-behind.qml
index 9a059e8c3d..9a059e8c3d 100644
--- a/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-swipedelegate-behind.qml
+++ b/tests/manual/quickcontrols/gifs/data/qtquickcontrols-swipedelegate-behind.qml
diff --git a/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-swipedelegate-leading-trailing.qml b/tests/manual/quickcontrols/gifs/data/qtquickcontrols-swipedelegate-leading-trailing.qml
index 7e09e7bcc6..7e09e7bcc6 100644
--- a/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-swipedelegate-leading-trailing.qml
+++ b/tests/manual/quickcontrols/gifs/data/qtquickcontrols-swipedelegate-leading-trailing.qml
diff --git a/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-swipedelegate.qml b/tests/manual/quickcontrols/gifs/data/qtquickcontrols-swipedelegate.qml
index a203f6fe83..a203f6fe83 100644
--- a/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-swipedelegate.qml
+++ b/tests/manual/quickcontrols/gifs/data/qtquickcontrols-swipedelegate.qml
diff --git a/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-swipeview.qml b/tests/manual/quickcontrols/gifs/data/qtquickcontrols-swipeview.qml
index dcdc8832c9..dcdc8832c9 100644
--- a/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-swipeview.qml
+++ b/tests/manual/quickcontrols/gifs/data/qtquickcontrols-swipeview.qml
diff --git a/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-switch.qml b/tests/manual/quickcontrols/gifs/data/qtquickcontrols-switch.qml
index 7099def2fc..7099def2fc 100644
--- a/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-switch.qml
+++ b/tests/manual/quickcontrols/gifs/data/qtquickcontrols-switch.qml
diff --git a/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-switchdelegate.qml b/tests/manual/quickcontrols/gifs/data/qtquickcontrols-switchdelegate.qml
index 123c4aec00..123c4aec00 100644
--- a/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-switchdelegate.qml
+++ b/tests/manual/quickcontrols/gifs/data/qtquickcontrols-switchdelegate.qml
diff --git a/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-tabbar.qml b/tests/manual/quickcontrols/gifs/data/qtquickcontrols-tabbar.qml
index 2a2da93f87..2a2da93f87 100644
--- a/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-tabbar.qml
+++ b/tests/manual/quickcontrols/gifs/data/qtquickcontrols-tabbar.qml
diff --git a/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-tumbler-wrap.qml b/tests/manual/quickcontrols/gifs/data/qtquickcontrols-tumbler-wrap.qml
index 1d6832bbc2..1d6832bbc2 100644
--- a/tests/manual/quickcontrols/gifs/data/qtquickcontrols2-tumbler-wrap.qml
+++ b/tests/manual/quickcontrols/gifs/data/qtquickcontrols-tumbler-wrap.qml
diff --git a/tests/manual/quickcontrols/gifs/tst_gifs.cpp b/tests/manual/quickcontrols/gifs/tst_gifs.cpp
index 2c8dd2e596..72f7039374 100644
--- a/tests/manual/quickcontrols/gifs/tst_gifs.cpp
+++ b/tests/manual/quickcontrols/gifs/tst_gifs.cpp
@@ -115,7 +115,7 @@ void tst_Gifs::tumblerWrap()
     gifRecorder.setDataDirPath(dataDirPath);
     gifRecorder.setOutputDir(outputDir);
     gifRecorder.setRecordingDuration(5);
-    gifRecorder.setQmlFileName("qtquickcontrols2-tumbler-wrap.qml");
+    gifRecorder.setQmlFileName("qtquickcontrols-tumbler-wrap.qml");
 
     gifRecorder.start();
 
@@ -189,7 +189,7 @@ void tst_Gifs::slider()
     gifRecorder.setOutputDir(outputDir);
     gifRecorder.setRecordingDuration(5);
     gifRecorder.setHighQuality(true);
-    gifRecorder.setQmlFileName("qtquickcontrols2-slider.qml");
+    gifRecorder.setQmlFileName("qtquickcontrols-slider.qml");
 
     gifRecorder.start();
 
@@ -223,9 +223,9 @@ void tst_Gifs::sliderSnap_data()
 {
     QTest::addColumn<QString>("gifBaseName");
     QTest::addColumn<int>("snapMode");
-    QTest::newRow("NoSnap") << "qtquickcontrols2-slider-nosnap" << 0;
-    QTest::newRow("SnapAlways") << "qtquickcontrols2-slider-snapalways" << 1;
-    QTest::newRow("SnapOnRelease") << "qtquickcontrols2-slider-snaponrelease" << 2;
+    QTest::newRow("NoSnap") << "qtquickcontrols-slider-nosnap" << 0;
+    QTest::newRow("SnapAlways") << "qtquickcontrols-slider-snapalways" << 1;
+    QTest::newRow("SnapOnRelease") << "qtquickcontrols-slider-snaponrelease" << 2;
 }
 
 void tst_Gifs::sliderSnap()
@@ -238,7 +238,7 @@ void tst_Gifs::sliderSnap()
     gifRecorder.setOutputDir(outputDir);
     gifRecorder.setRecordingDuration(8);
     gifRecorder.setHighQuality(true);
-    gifRecorder.setQmlFileName("qtquickcontrols2-slider-snap.qml");
+    gifRecorder.setQmlFileName("qtquickcontrols-slider-snap.qml");
     gifRecorder.setOutputFileBaseName(gifBaseName);
 
     gifRecorder.start();
@@ -278,7 +278,7 @@ void tst_Gifs::rangeSlider()
     gifRecorder.setOutputDir(outputDir);
     gifRecorder.setRecordingDuration(7);
     gifRecorder.setHighQuality(true);
-    gifRecorder.setQmlFileName("qtquickcontrols2-rangeslider.qml");
+    gifRecorder.setQmlFileName("qtquickcontrols-rangeslider.qml");
 
     gifRecorder.start();
 
@@ -327,7 +327,7 @@ void tst_Gifs::busyIndicator()
     gifRecorder.setOutputDir(outputDir);
     gifRecorder.setRecordingDuration(6);
     gifRecorder.setHighQuality(true);
-    gifRecorder.setQmlFileName("qtquickcontrols2-busyindicator.qml");
+    gifRecorder.setQmlFileName("qtquickcontrols-busyindicator.qml");
 
     gifRecorder.start();
 
@@ -354,7 +354,7 @@ void tst_Gifs::switchGif()
     gifRecorder.setDataDirPath(dataDirPath);
     gifRecorder.setOutputDir(outputDir);
     gifRecorder.setRecordingDuration(3);
-    gifRecorder.setQmlFileName("qtquickcontrols2-switch.qml");
+    gifRecorder.setQmlFileName("qtquickcontrols-switch.qml");
     gifRecorder.setHighQuality(true);
 
     gifRecorder.start();
@@ -369,9 +369,9 @@ void tst_Gifs::switchGif()
 void tst_Gifs::button_data()
 {
     QTest::addColumn<QString>("qmlFileName");
-    QTest::newRow("button") << QString::fromLatin1("qtquickcontrols2-button.qml");
-    QTest::newRow("button-flat") << QString::fromLatin1("qtquickcontrols2-button-flat.qml");
-    QTest::newRow("button-highlighted") << QString::fromLatin1("qtquickcontrols2-button-highlighted.qml");
+    QTest::newRow("button") << QString::fromLatin1("qtquickcontrols-button.qml");
+    QTest::newRow("button-flat") << QString::fromLatin1("qtquickcontrols-button-flat.qml");
+    QTest::newRow("button-highlighted") << QString::fromLatin1("qtquickcontrols-button-highlighted.qml");
 }
 
 void tst_Gifs::button()
@@ -397,7 +397,7 @@ void tst_Gifs::button()
 
 void tst_Gifs::tabBar()
 {
-    const QString qmlFileName = QStringLiteral("qtquickcontrols2-tabbar.qml");
+    const QString qmlFileName = QStringLiteral("qtquickcontrols-tabbar.qml");
 
     GifRecorder gifRecorder;
     gifRecorder.setDataDirPath(dataDirPath);
@@ -426,7 +426,7 @@ void tst_Gifs::tabBar()
 
 void tst_Gifs::menu()
 {
-    const QString qmlFileName = QStringLiteral("qtquickcontrols2-menu.qml");
+    const QString qmlFileName = QStringLiteral("qtquickcontrols-menu.qml");
 
     GifRecorder gifRecorder;
     gifRecorder.setDataDirPath(dataDirPath);
@@ -463,7 +463,7 @@ void tst_Gifs::swipeView()
     gifRecorder.setDataDirPath(dataDirPath);
     gifRecorder.setOutputDir(outputDir);
     gifRecorder.setRecordingDuration(8);
-    gifRecorder.setQmlFileName(QStringLiteral("qtquickcontrols2-swipeview.qml"));
+    gifRecorder.setQmlFileName(QStringLiteral("qtquickcontrols-swipeview.qml"));
     gifRecorder.setHighQuality(true);
 
     gifRecorder.start();
@@ -485,8 +485,8 @@ void tst_Gifs::swipeView()
 void tst_Gifs::swipeDelegate_data()
 {
     QTest::addColumn<QString>("qmlFileName");
-    QTest::newRow("qtquickcontrols2-swipedelegate.qml") << QString::fromLatin1("qtquickcontrols2-swipedelegate.qml");
-    QTest::newRow("qtquickcontrols2-swipedelegate-leading-trailing.qml") << QString::fromLatin1("qtquickcontrols2-swipedelegate-leading-trailing.qml");
+    QTest::newRow("qtquickcontrols-swipedelegate.qml") << QString::fromLatin1("qtquickcontrols-swipedelegate.qml");
+    QTest::newRow("qtquickcontrols-swipedelegate-leading-trailing.qml") << QString::fromLatin1("qtquickcontrols-swipedelegate-leading-trailing.qml");
 }
 
 void tst_Gifs::swipeDelegate()
@@ -538,7 +538,7 @@ void tst_Gifs::swipeDelegateBehind()
     gifRecorder.setDataDirPath(dataDirPath);
     gifRecorder.setOutputDir(outputDir);
     gifRecorder.setRecordingDuration(14);
-    gifRecorder.setQmlFileName(QStringLiteral("qtquickcontrols2-swipedelegate-behind.qml"));
+    gifRecorder.setQmlFileName(QStringLiteral("qtquickcontrols-swipedelegate-behind.qml"));
     gifRecorder.setHighQuality(true);
 
     gifRecorder.start();
@@ -595,7 +595,7 @@ void tst_Gifs::delegates()
     gifRecorder.setDataDirPath(dataDirPath);
     gifRecorder.setOutputDir(outputDir);
     gifRecorder.setRecordingDuration(duration);
-    gifRecorder.setQmlFileName(QString::fromLatin1("qtquickcontrols2-%1.qml").arg(name));
+    gifRecorder.setQmlFileName(QString::fromLatin1("qtquickcontrols-%1.qml").arg(name));
     gifRecorder.setHighQuality(true);
 
     gifRecorder.start();
@@ -631,7 +631,7 @@ void tst_Gifs::dial()
     gifRecorder.setDataDirPath(dataDirPath);
     gifRecorder.setOutputDir(outputDir);
     gifRecorder.setRecordingDuration(10);
-    gifRecorder.setQmlFileName(QString::fromLatin1("qtquickcontrols2-dial-%1.qml").arg(name));
+    gifRecorder.setQmlFileName(QString::fromLatin1("qtquickcontrols-dial-%1.qml").arg(name));
     gifRecorder.setHighQuality(false);
 
     gifRecorder.start();
@@ -692,7 +692,7 @@ void tst_Gifs::checkables()
     gifRecorder.setDataDirPath(dataDirPath);
     gifRecorder.setOutputDir(outputDir);
     gifRecorder.setRecordingDuration(6);
-    gifRecorder.setQmlFileName(QString::fromLatin1("qtquickcontrols2-%1.qml").arg(name));
+    gifRecorder.setQmlFileName(QString::fromLatin1("qtquickcontrols-%1.qml").arg(name));
 
     gifRecorder.start();
 
@@ -718,7 +718,7 @@ void tst_Gifs::comboBox()
     gifRecorder.setDataDirPath(dataDirPath);
     gifRecorder.setOutputDir(outputDir);
     gifRecorder.setRecordingDuration(6);
-    gifRecorder.setQmlFileName(QStringLiteral("qtquickcontrols2-combobox.qml"));
+    gifRecorder.setQmlFileName(QStringLiteral("qtquickcontrols-combobox.qml"));
 
     gifRecorder.start();
 
@@ -771,7 +771,7 @@ void tst_Gifs::triState()
     gifRecorder.setDataDirPath(dataDirPath);
     gifRecorder.setOutputDir(outputDir);
     gifRecorder.setRecordingDuration(6);
-    gifRecorder.setQmlFileName(QString::fromLatin1("qtquickcontrols2-%1.qml").arg(name));
+    gifRecorder.setQmlFileName(QString::fromLatin1("qtquickcontrols-%1.qml").arg(name));
 
     gifRecorder.start();
 
@@ -806,7 +806,7 @@ void tst_Gifs::scrollBar()
     gifRecorder.setDataDirPath(dataDirPath);
     gifRecorder.setOutputDir(outputDir);
     gifRecorder.setRecordingDuration(6);
-    gifRecorder.setQmlFileName("qtquickcontrols2-scrollbar.qml");
+    gifRecorder.setQmlFileName("qtquickcontrols-scrollbar.qml");
 
     gifRecorder.start();
 
@@ -837,9 +837,9 @@ void tst_Gifs::scrollBarSnap_data()
 {
     QTest::addColumn<QString>("gifBaseName");
     QTest::addColumn<int>("snapMode");
-    QTest::newRow("NoSnap") << "qtquickcontrols2-scrollbar-nosnap" << 0;
-    QTest::newRow("SnapAlways") << "qtquickcontrols2-scrollbar-snapalways" << 1;
-    QTest::newRow("SnapOnRelease") << "qtquickcontrols2-scrollbar-snaponrelease" << 2;
+    QTest::newRow("NoSnap") << "qtquickcontrols-scrollbar-nosnap" << 0;
+    QTest::newRow("SnapAlways") << "qtquickcontrols-scrollbar-snapalways" << 1;
+    QTest::newRow("SnapOnRelease") << "qtquickcontrols-scrollbar-snaponrelease" << 2;
 }
 
 void tst_Gifs::scrollBarSnap()
@@ -852,7 +852,7 @@ void tst_Gifs::scrollBarSnap()
     gifRecorder.setOutputDir(outputDir);
     gifRecorder.setRecordingDuration(8);
     gifRecorder.setHighQuality(true);
-    gifRecorder.setQmlFileName("qtquickcontrols2-scrollbar-snap.qml");
+    gifRecorder.setQmlFileName("qtquickcontrols-scrollbar-snap.qml");
     gifRecorder.setOutputFileBaseName(gifBaseName);
 
     gifRecorder.start();
@@ -889,7 +889,7 @@ void tst_Gifs::scrollIndicator()
     gifRecorder.setDataDirPath(dataDirPath);
     gifRecorder.setOutputDir(outputDir);
     gifRecorder.setRecordingDuration(6);
-    gifRecorder.setQmlFileName("qtquickcontrols2-scrollindicator.qml");
+    gifRecorder.setQmlFileName("qtquickcontrols-scrollindicator.qml");
 
     gifRecorder.start();
 
@@ -929,7 +929,7 @@ void tst_Gifs::progressBar()
     gifRecorder.setDataDirPath(dataDirPath);
     gifRecorder.setOutputDir(outputDir);
     gifRecorder.setRecordingDuration(4);
-    gifRecorder.setQmlFileName(QString::fromLatin1("qtquickcontrols2-progressbar%1").arg(
+    gifRecorder.setQmlFileName(QString::fromLatin1("qtquickcontrols-progressbar%1").arg(
         indeterminate ? QLatin1String("-indeterminate.qml") : QLatin1String(".qml")));
 
     gifRecorder.start();
@@ -957,7 +957,7 @@ void tst_Gifs::stackView()
     gifRecorder.setOutputDir(outputDir);
     gifRecorder.setRecordingDuration(duration);
     gifRecorder.setHighQuality(true);
-    gifRecorder.setQmlFileName(QString::fromLatin1("qtquickcontrols2-stackview-%1.qml").arg(name));
+    gifRecorder.setQmlFileName(QString::fromLatin1("qtquickcontrols-stackview-%1.qml").arg(name));
 
     gifRecorder.start();
     gifRecorder.waitForFinish();
@@ -970,7 +970,7 @@ void tst_Gifs::drawer()
     gifRecorder.setOutputDir(outputDir);
     gifRecorder.setRecordingDuration(4);
     gifRecorder.setHighQuality(true);
-    gifRecorder.setQmlFileName("qtquickcontrols2-drawer.qml");
+    gifRecorder.setQmlFileName("qtquickcontrols-drawer.qml");
 
     gifRecorder.start();
 
@@ -994,7 +994,7 @@ void tst_Gifs::delayButton()
     gifRecorder.setDataDirPath(dataDirPath);
     gifRecorder.setOutputDir(outputDir);
     gifRecorder.setRecordingDuration(9);
-    gifRecorder.setQmlFileName("qtquickcontrols2-delaybutton.qml");
+    gifRecorder.setQmlFileName("qtquickcontrols-delaybutton.qml");
 
     gifRecorder.start();
 
diff --git a/tests/manual/quickcontrols/nativestyle/CMakeLists.txt b/tests/manual/quickcontrols/nativestyle/CMakeLists.txt
index 0f4e30bd53..0ae9935bcd 100644
--- a/tests/manual/quickcontrols/nativestyle/CMakeLists.txt
+++ b/tests/manual/quickcontrols/nativestyle/CMakeLists.txt
@@ -20,7 +20,7 @@ if(NOT DEFINED INSTALL_EXAMPLESDIR)
   set(INSTALL_EXAMPLESDIR "examples")
 endif()
 
-set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quickcontrols2/desktopgallery")
+set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quickcontrols/desktopgallery")
 
 find_package(Qt6 COMPONENTS Core)
 find_package(Qt6 COMPONENTS Gui)
diff --git a/tests/manual/quickcontrols/styles-cover-flow/styles-cover-flow.qml b/tests/manual/quickcontrols/styles-cover-flow/styles-cover-flow.qml
index 04a483f6a7..051732ec6b 100644
--- a/tests/manual/quickcontrols/styles-cover-flow/styles-cover-flow.qml
+++ b/tests/manual/quickcontrols/styles-cover-flow/styles-cover-flow.qml
@@ -27,13 +27,13 @@ Window {
         anchors.leftMargin: 130
         anchors.rightMargin: 130
         model: ListModel {
-            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 }
-            ListElement { source: "qtquickcontrols2-material-dark.png"; dark: true }
-            ListElement { source: "qtquickcontrols2-imagine.png"; dark: false }
-            ListElement { source: "qtquickcontrols2-material-light.png"; dark: false }
+            ListElement { source: "qtquickcontrols-basic.png"; dark: false }
+            ListElement { source: "qtquickcontrols-fusion.png"; dark: false }
+            ListElement { source: "qtquickcontrols-universal-light.png"; dark: false }
+            ListElement { source: "qtquickcontrols-universal-dark.png"; dark: true }
+            ListElement { source: "qtquickcontrols-material-dark.png"; dark: true }
+            ListElement { source: "qtquickcontrols-imagine.png"; dark: false }
+            ListElement { source: "qtquickcontrols-material-light.png"; dark: false }
         }
 
         highlightRangeMode: PathView.StrictlyEnforceRange