diff --git a/share/qtcreator/qmldesigner/studio_templates/projects/application-3d/wizard.json b/share/qtcreator/qmldesigner/studio_templates/projects/application-3d/wizard.json
index 2a2e1bd53d0..d5b1fef1e45 100644
--- a/share/qtcreator/qmldesigner/studio_templates/projects/application-3d/wizard.json
+++ b/share/qtcreator/qmldesigner/studio_templates/projects/application-3d/wizard.json
@@ -382,22 +382,6 @@
                 {
                     "source": "../shared-plugin/name/designer/plugin.metainfo",
                     "target": "%{ProjectDirectory}/imports/%{ImportModuleName}/designer/plugin.metainfo"
-                },
-                {
-                    "source": "../shared-plugin/name/JsonData.qml.tpl",
-                    "target": "%{ProjectDirectory}/imports/%{ImportModuleName}/JsonData.qml"
-                },
-                {
-                    "source": "../shared-plugin/name/DataStore.qml.tpl",
-                    "target": "%{ProjectDirectory}/imports/%{ImportModuleName}/DataStore.qml"
-                },
-                {
-                    "source": "../shared-plugin/name/models.json.tpl",
-                    "target": "%{ProjectDirectory}/imports/%{ImportModuleName}/models.json"
-                },
-                {
-                    "source": "../shared-plugin/name/data.json.tpl",
-                    "target": "%{ProjectDirectory}/imports/%{ImportModuleName}/data.json"
                 }
             ]
         }
diff --git a/share/qtcreator/qmldesigner/studio_templates/projects/application/wizard.json b/share/qtcreator/qmldesigner/studio_templates/projects/application/wizard.json
index 24434e00762..0708838a5ae 100644
--- a/share/qtcreator/qmldesigner/studio_templates/projects/application/wizard.json
+++ b/share/qtcreator/qmldesigner/studio_templates/projects/application/wizard.json
@@ -395,22 +395,6 @@
                 {
                     "source": "../shared-plugin/name/designer/plugin.metainfo",
                     "target": "%{ProjectDirectory}/imports/%{ImportModuleName}/designer/plugin.metainfo"
-                },
-                {
-                    "source": "../shared-plugin/name/JsonData.qml.tpl",
-                    "target": "%{ProjectDirectory}/imports/%{ImportModuleName}/JsonData.qml"
-                },
-                {
-                    "source": "../shared-plugin/name/DataStore.qml.tpl",
-                    "target": "%{ProjectDirectory}/imports/%{ImportModuleName}/DataStore.qml"
-                },
-                {
-                    "source": "../shared-plugin/name/models.json.tpl",
-                    "target": "%{ProjectDirectory}/imports/%{ImportModuleName}/models.json"
-                },
-                {
-                    "source": "../shared-plugin/name/data.json.tpl",
-                    "target": "%{ProjectDirectory}/imports/%{ImportModuleName}/data.json"
                 }
             ]
         }
diff --git a/share/qtcreator/qmldesigner/studio_templates/projects/desktop-launcher/wizard.json b/share/qtcreator/qmldesigner/studio_templates/projects/desktop-launcher/wizard.json
index 2f590855690..913eb0bf28b 100644
--- a/share/qtcreator/qmldesigner/studio_templates/projects/desktop-launcher/wizard.json
+++ b/share/qtcreator/qmldesigner/studio_templates/projects/desktop-launcher/wizard.json
@@ -382,22 +382,6 @@
                 {
                     "source": "../shared-plugin/name/designer/plugin.metainfo",
                     "target": "%{ProjectDirectory}/imports/%{ImportModuleName}/designer/plugin.metainfo"
-                },
-                {
-                    "source": "../shared-plugin/name/JsonData.qml.tpl",
-                    "target": "%{ProjectDirectory}/imports/%{ImportModuleName}/JsonData.qml"
-                },
-                {
-                    "source": "../shared-plugin/name/DataStore.qml.tpl",
-                    "target": "%{ProjectDirectory}/imports/%{ImportModuleName}/DataStore.qml"
-                },
-                {
-                    "source": "../shared-plugin/name/models.json.tpl",
-                    "target": "%{ProjectDirectory}/imports/%{ImportModuleName}/models.json"
-                },
-                {
-                    "source": "../shared-plugin/name/data.json.tpl",
-                    "target": "%{ProjectDirectory}/imports/%{ImportModuleName}/data.json"
                 }
             ]
         }
diff --git a/share/qtcreator/qmldesigner/studio_templates/projects/mobile-scroll/wizard.json b/share/qtcreator/qmldesigner/studio_templates/projects/mobile-scroll/wizard.json
index 008e3eb9952..944b6b6289c 100644
--- a/share/qtcreator/qmldesigner/studio_templates/projects/mobile-scroll/wizard.json
+++ b/share/qtcreator/qmldesigner/studio_templates/projects/mobile-scroll/wizard.json
@@ -341,22 +341,6 @@
                 {
                     "source": "../shared-plugin/name/designer/plugin.metainfo",
                     "target": "%{ProjectDirectory}/imports/%{ImportModuleName}/designer/plugin.metainfo"
-                },
-                {
-                    "source": "../shared-plugin/name/JsonData.qml.tpl",
-                    "target": "%{ProjectDirectory}/imports/%{ImportModuleName}/JsonData.qml"
-                },
-                {
-                    "source": "../shared-plugin/name/DataStore.qml.tpl",
-                    "target": "%{ProjectDirectory}/imports/%{ImportModuleName}/DataStore.qml"
-                },
-                {
-                    "source": "../shared-plugin/name/models.json.tpl",
-                    "target": "%{ProjectDirectory}/imports/%{ImportModuleName}/models.json"
-                },
-                {
-                    "source": "../shared-plugin/name/data.json.tpl",
-                    "target": "%{ProjectDirectory}/imports/%{ImportModuleName}/data.json"
                 }
             ]
         }
diff --git a/share/qtcreator/qmldesigner/studio_templates/projects/mobile-stack/wizard.json b/share/qtcreator/qmldesigner/studio_templates/projects/mobile-stack/wizard.json
index e385b58ff8f..c8733770e07 100644
--- a/share/qtcreator/qmldesigner/studio_templates/projects/mobile-stack/wizard.json
+++ b/share/qtcreator/qmldesigner/studio_templates/projects/mobile-stack/wizard.json
@@ -343,22 +343,6 @@
                 {
                     "source": "../shared-plugin/name/designer/plugin.metainfo",
                     "target": "%{ProjectDirectory}/imports/%{ImportModuleName}/designer/plugin.metainfo"
-                },
-                {
-                    "source": "../shared-plugin/name/JsonData.qml.tpl",
-                    "target": "%{ProjectDirectory}/imports/%{ImportModuleName}/JsonData.qml"
-                },
-                {
-                    "source": "../shared-plugin/name/DataStore.qml.tpl",
-                    "target": "%{ProjectDirectory}/imports/%{ImportModuleName}/DataStore.qml"
-                },
-                {
-                    "source": "../shared-plugin/name/models.json.tpl",
-                    "target": "%{ProjectDirectory}/imports/%{ImportModuleName}/models.json"
-                },
-                {
-                    "source": "../shared-plugin/name/data.json.tpl",
-                    "target": "%{ProjectDirectory}/imports/%{ImportModuleName}/data.json"
                 }
             ]
         }
diff --git a/share/qtcreator/qmldesigner/studio_templates/projects/mobile-swipe/wizard.json b/share/qtcreator/qmldesigner/studio_templates/projects/mobile-swipe/wizard.json
index 47fe3bd4e3d..295c85aa63a 100644
--- a/share/qtcreator/qmldesigner/studio_templates/projects/mobile-swipe/wizard.json
+++ b/share/qtcreator/qmldesigner/studio_templates/projects/mobile-swipe/wizard.json
@@ -343,22 +343,6 @@
                 {
                     "source": "../shared-plugin/name/designer/plugin.metainfo",
                     "target": "%{ProjectDirectory}/imports/%{ImportModuleName}/designer/plugin.metainfo"
-                },
-                {
-                    "source": "../shared-plugin/name/JsonData.qml.tpl",
-                    "target": "%{ProjectDirectory}/imports/%{ImportModuleName}/JsonData.qml"
-                },
-                {
-                    "source": "../shared-plugin/name/DataStore.qml.tpl",
-                    "target": "%{ProjectDirectory}/imports/%{ImportModuleName}/DataStore.qml"
-                },
-                {
-                    "source": "../shared-plugin/name/models.json.tpl",
-                    "target": "%{ProjectDirectory}/imports/%{ImportModuleName}/models.json"
-                },
-                {
-                    "source": "../shared-plugin/name/data.json.tpl",
-                    "target": "%{ProjectDirectory}/imports/%{ImportModuleName}/data.json"
                 }
             ]
         }
diff --git a/share/qtcreator/qmldesigner/studio_templates/projects/shared-plugin/name/CMakeLists.importmodule.txt.tpl b/share/qtcreator/qmldesigner/studio_templates/projects/shared-plugin/name/CMakeLists.importmodule.txt.tpl
index 3b74123f7b0..e3cc78f3421 100644
--- a/share/qtcreator/qmldesigner/studio_templates/projects/shared-plugin/name/CMakeLists.importmodule.txt.tpl
+++ b/share/qtcreator/qmldesigner/studio_templates/projects/shared-plugin/name/CMakeLists.importmodule.txt.tpl
@@ -13,12 +13,7 @@ qt6_add_qml_module(%{ImportModuleName}
     RESOURCE_PREFIX "/qt/qml"
         QML_FILES
         Constants.qml
-        DataStore.qml
         DirectoryFontLoader.qml
         EventListModel.qml
         EventListSimulator.qml
-        JsonData.qml
-    RESOURCES
-        data.json
-        models.json
 )
diff --git a/share/qtcreator/qmldesigner/studio_templates/projects/shared-plugin/name/importmodule.qmldir.tpl b/share/qtcreator/qmldesigner/studio_templates/projects/shared-plugin/name/importmodule.qmldir.tpl
index a0ec2f17cfc..c0050290386 100644
--- a/share/qtcreator/qmldesigner/studio_templates/projects/shared-plugin/name/importmodule.qmldir.tpl
+++ b/share/qtcreator/qmldesigner/studio_templates/projects/shared-plugin/name/importmodule.qmldir.tpl
@@ -1,5 +1,4 @@
 Module %{ImportModuleName}
-singleton DataStore 1.0 DataStore.qml
 singleton Constants 1.0 Constants.qml
 EventListSimulator 1.0 EventListSimulator.qml
 EventListModel 1.0 EventListModel.qml
diff --git a/share/qtcreator/qmldesigner/studio_templates/projects/shared-plugin/name/qmldir b/share/qtcreator/qmldesigner/studio_templates/projects/shared-plugin/name/qmldir
index b5924a433cc..3ba5adcc643 100644
--- a/share/qtcreator/qmldesigner/studio_templates/projects/shared-plugin/name/qmldir
+++ b/share/qtcreator/qmldesigner/studio_templates/projects/shared-plugin/name/qmldir
@@ -1,5 +1,4 @@
 singleton Constants 1.0 Constants.qml
-singleton DataStore 1.0 DataStore.qml
 EventListModel 1.0 EventListModel.qml
 EventListSimulator 1.0 EventListSimulator.qml
 DirectoryFontLoader 1.0 DirectoryFontLoader.qml
diff --git a/share/qtcreator/templates/wizards/projects/qtquickapplication/wizard.json b/share/qtcreator/templates/wizards/projects/qtquickapplication/wizard.json
index ec2164d4f26..2e885c2bb63 100644
--- a/share/qtcreator/templates/wizards/projects/qtquickapplication/wizard.json
+++ b/share/qtcreator/templates/wizards/projects/qtquickapplication/wizard.json
@@ -261,22 +261,6 @@
                     "source": "%{QdsWizardPath}/shared-plugin/name/designer/plugin.metainfo",
                     "target": "%{ProjectDirectory}/imports/%{ImportModuleName}/designer/plugin.metainfo",
                     "condition": "%{QdsProjectStyle}"
-                },
-                {
-                    "source": "../shared-plugin/name/JsonData.qml.tpl",
-                    "target": "%{ProjectDirectory}/imports/%{ImportModuleName}/JsonData.qml"
-                },
-                {
-                    "source": "../shared-plugin/name/DataStore.qml.tpl",
-                    "target": "%{ProjectDirectory}/imports/%{ImportModuleName}/DataStore.qml"
-                },
-                {
-                    "source": "../shared-plugin/name/models.json.tpl",
-                    "target": "%{ProjectDirectory}/imports/%{ImportModuleName}/models.json"
-                },
-                {
-                    "source": "../shared-plugin/name/data.json.tpl",
-                    "target": "%{ProjectDirectory}/imports/%{ImportModuleName}/data.json"
                 }
             ]
         }
diff --git a/src/plugins/qmldesigner/components/collectioneditor/collectioneditorutils.cpp b/src/plugins/qmldesigner/components/collectioneditor/collectioneditorutils.cpp
index 33867228d56..18734fdba75 100644
--- a/src/plugins/qmldesigner/components/collectioneditor/collectioneditorutils.cpp
+++ b/src/plugins/qmldesigner/components/collectioneditor/collectioneditorutils.cpp
@@ -7,14 +7,14 @@
 #include "nodemetainfo.h"
 #include "propertymetainfo.h"
 
-#include <variant>
-
 #include <coreplugin/icore.h>
-#include <utils/qtcassert.h>
-
 #include <projectexplorer/project.h>
 #include <projectexplorer/projectexplorer.h>
 #include <projectexplorer/projectmanager.h>
+#include <qmljs/qmljsmodelmanagerinterface.h>
+#include <utils/qtcassert.h>
+
+#include <variant>
 
 #include <QColor>
 #include <QJsonArray>
@@ -290,6 +290,12 @@ bool ensureDataStoreExists(bool &justCreated)
 
     if (qmlDirSaver.finalize()) {
         justCreated = true;
+
+        // Force code model reset to notice changes to existing module
+        auto modelManager = QmlJS::ModelManagerInterface::instance();
+        if (modelManager)
+            modelManager->resetCodeModel();
+
         return true;
     }