diff --git a/src/plugins/qmldesigner/designercore/instances/puppetcreator.cpp b/src/plugins/qmldesigner/designercore/instances/puppetcreator.cpp
index 43cc0f5f249..8ab932e8b10 100644
--- a/src/plugins/qmldesigner/designercore/instances/puppetcreator.cpp
+++ b/src/plugins/qmldesigner/designercore/instances/puppetcreator.cpp
@@ -142,7 +142,7 @@ bool PuppetCreator::useOnlyFallbackPuppet() const
 #ifndef QMLDESIGNER_TEST
     if (!m_kit || !m_kit->isValid())
         qWarning() << "Invalid kit for QML puppet";
-    return m_designerSettings.value(DesignerSettingsKey::USE_ONLY_FALLBACK_PUPPET
+    return m_designerSettings.value(DesignerSettingsKey::USE_DEFAULT_PUPPET
                                     ).toBool() || m_kit == nullptr || !m_kit->isValid();
 #else
     return true;
@@ -390,7 +390,7 @@ QString PuppetCreator::qmlPuppetFallbackDirectory(const DesignerSettings &settin
 {
 #ifndef QMLDESIGNER_TEST
     QString puppetFallbackDirectory = settings.value(
-        DesignerSettingsKey::PUPPET_FALLBACK_DIRECTORY).toString();
+        DesignerSettingsKey::PUPPET_DEFAULT_DIRECTORY).toString();
     if (puppetFallbackDirectory.isEmpty() || !QFileInfo::exists(puppetFallbackDirectory))
         return defaultPuppetFallbackDirectory();
     return puppetFallbackDirectory;
diff --git a/src/plugins/qmldesigner/designersettings.cpp b/src/plugins/qmldesigner/designersettings.cpp
index d1e8a3a569b..899f3f5e5e4 100644
--- a/src/plugins/qmldesigner/designersettings.cpp
+++ b/src/plugins/qmldesigner/designersettings.cpp
@@ -60,9 +60,9 @@ void DesignerSettings::fromSettings(QSettings *settings)
     restoreValue(settings, DesignerSettingsKey::SHOW_DEBUGVIEW, false);
     restoreValue(settings, DesignerSettingsKey::ENABLE_DEBUGVIEW, false);
     restoreValue(settings, DesignerSettingsKey::ALWAYS_SAFE_IN_CRUMBLEBAR, false);
-    restoreValue(settings, DesignerSettingsKey::USE_ONLY_FALLBACK_PUPPET, true);
+    restoreValue(settings, DesignerSettingsKey::USE_DEFAULT_PUPPET, true);
     restoreValue(settings, DesignerSettingsKey::TYPE_OF_QSTR_FUNCTION, 0);
-    restoreValue(settings, DesignerSettingsKey::PUPPET_FALLBACK_DIRECTORY);
+    restoreValue(settings, DesignerSettingsKey::PUPPET_DEFAULT_DIRECTORY);
     restoreValue(settings, DesignerSettingsKey::PUPPET_TOPLEVEL_BUILD_DIRECTORY);
     restoreValue(settings, DesignerSettingsKey::CONTROLS_STYLE);
     restoreValue(settings, DesignerSettingsKey::SHOW_PROPERTYEDITOR_WARNINGS, false);
diff --git a/src/plugins/qmldesigner/designersettings.h b/src/plugins/qmldesigner/designersettings.h
index 8a29de676d5..924b5690195 100644
--- a/src/plugins/qmldesigner/designersettings.h
+++ b/src/plugins/qmldesigner/designersettings.h
@@ -49,9 +49,9 @@ const char WARNING_FOR_DESIGNER_FEATURES_IN_EDITOR[] = "WarnAboutQtQuickDesigner
 const char SHOW_DEBUGVIEW[] = "ShowQtQuickDesignerDebugView";
 const char ENABLE_DEBUGVIEW[] = "EnableQtQuickDesignerDebugView";
 const char ALWAYS_SAFE_IN_CRUMBLEBAR[] = "AlwaysSafeInCrumbleBar";
-const char USE_ONLY_FALLBACK_PUPPET[] = "UseOnlyFallbackPuppet";
+const char USE_DEFAULT_PUPPET[] = "UseDefaultPuppet";
 const char PUPPET_TOPLEVEL_BUILD_DIRECTORY[] = "PuppetToplevelBuildDirectory";
-const char PUPPET_FALLBACK_DIRECTORY[] = "PuppetFallbackDirectory";
+const char PUPPET_DEFAULT_DIRECTORY[] = "PuppetDefaultDirectory";
 const char CONTROLS_STYLE[] = "ControlsStyle";
 const char TYPE_OF_QSTR_FUNCTION[] = "TypeOfQsTrFunction";
 const char SHOW_PROPERTYEDITOR_WARNINGS[] = "ShowPropertyEditorWarnings";
diff --git a/src/plugins/qmldesigner/settingspage.cpp b/src/plugins/qmldesigner/settingspage.cpp
index 041efd809bb..e9bd2d1cb46 100644
--- a/src/plugins/qmldesigner/settingspage.cpp
+++ b/src/plugins/qmldesigner/settingspage.cpp
@@ -111,7 +111,7 @@ DesignerSettings SettingsPageWidget::settings() const
         m_ui.designerShowDebuggerCheckBox->isChecked());
     settings.insert(DesignerSettingsKey::ENABLE_DEBUGVIEW,
         m_ui.designerEnableDebuggerCheckBox->isChecked());
-    settings.insert(DesignerSettingsKey::USE_ONLY_FALLBACK_PUPPET,
+    settings.insert(DesignerSettingsKey::USE_DEFAULT_PUPPET,
         m_ui.useDefaultPuppetRadioButton->isChecked());
 
     int typeOfQsTrFunction;
@@ -141,11 +141,11 @@ DesignerSettings SettingsPageWidget::settings() const
 
     if (oldFallbackPuppetPath != newFallbackPuppetPath && QFileInfo::exists(newFallbackPuppetPath)) {
         if (newFallbackPuppetPath == PuppetCreator::defaultPuppetFallbackDirectory())
-            settings.insert(DesignerSettingsKey::PUPPET_FALLBACK_DIRECTORY, QString());
+            settings.insert(DesignerSettingsKey::PUPPET_DEFAULT_DIRECTORY, QString());
         else
-            settings.insert(DesignerSettingsKey::PUPPET_FALLBACK_DIRECTORY, newFallbackPuppetPath);
+            settings.insert(DesignerSettingsKey::PUPPET_DEFAULT_DIRECTORY, newFallbackPuppetPath);
     } else if (!QFileInfo::exists(oldFallbackPuppetPath) || !QFileInfo::exists(newFallbackPuppetPath)){
-        settings.insert(DesignerSettingsKey::PUPPET_FALLBACK_DIRECTORY, QString());
+        settings.insert(DesignerSettingsKey::PUPPET_DEFAULT_DIRECTORY, QString());
     }
 
     if (!m_ui.puppetBuildPathLineEdit->path().isEmpty() &&
@@ -188,9 +188,9 @@ void SettingsPageWidget::setSettings(const DesignerSettings &settings)
     m_ui.designerEnableDebuggerCheckBox->setChecked(settings.value(
         DesignerSettingsKey::ENABLE_DEBUGVIEW).toBool());
     m_ui.useDefaultPuppetRadioButton->setChecked(settings.value(
-        DesignerSettingsKey::USE_ONLY_FALLBACK_PUPPET).toBool());
+        DesignerSettingsKey::USE_DEFAULT_PUPPET).toBool());
     m_ui.useQtRelatedPuppetRadioButton->setChecked(!settings.value(
-        DesignerSettingsKey::USE_ONLY_FALLBACK_PUPPET).toBool());
+        DesignerSettingsKey::USE_DEFAULT_PUPPET).toBool());
     m_ui.useQsTrFunctionRadioButton->setChecked(settings.value(
         DesignerSettingsKey::TYPE_OF_QSTR_FUNCTION).toInt() == 0);
     m_ui.useQsTrIdFunctionRadioButton->setChecked(settings.value(
@@ -201,7 +201,7 @@ void SettingsPageWidget::setSettings(const DesignerSettings &settings)
         DesignerSettingsKey::CONTROLS_STYLE).toString());
 
     QString puppetFallbackDirectory = settings.value(
-        DesignerSettingsKey::PUPPET_FALLBACK_DIRECTORY,
+        DesignerSettingsKey::PUPPET_DEFAULT_DIRECTORY,
         PuppetCreator::defaultPuppetFallbackDirectory()).toString();
     m_ui.fallbackPuppetPathLineEdit->setPath(puppetFallbackDirectory);
 
@@ -256,7 +256,7 @@ void SettingsPage::apply()
     DesignerSettings newSettings(m_widget->settings());
 
     QList<QByteArray> restartNecessaryKeys;
-    restartNecessaryKeys << DesignerSettingsKey::PUPPET_FALLBACK_DIRECTORY
+    restartNecessaryKeys << DesignerSettingsKey::PUPPET_DEFAULT_DIRECTORY
                          << DesignerSettingsKey::PUPPET_TOPLEVEL_BUILD_DIRECTORY
                          << DesignerSettingsKey::ENABLE_MODEL_EXCEPTION_OUTPUT
                          << DesignerSettingsKey::PUPPET_KILL_TIMEOUT