diff --git a/flow-client/package-lock.json b/flow-client/package-lock.json
index 854b28b7fc0..a2d43aa1b26 100644
--- a/flow-client/package-lock.json
+++ b/flow-client/package-lock.json
@@ -1,11 +1,11 @@
 {
-  "name": "@vaadin/flow-deps",
+  "name": "@vaadin/flow-client",
   "version": "0.0.1",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
-      "name": "@vaadin/flow-deps",
+      "name": "@vaadin/flow-client",
       "version": "0.0.1",
       "license": "Apache-2.0",
       "dependencies": {
diff --git a/flow-client/package.json b/flow-client/package.json
index 043b79af3ba..eb0e0249c19 100644
--- a/flow-client/package.json
+++ b/flow-client/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "@vaadin/flow-deps",
+  "name": "@vaadin/flow-client",
   "description": "Flow client package",
   "version": "0.0.1",
   "main": "src/main/resources/META-INF/frontend/Flow",
diff --git a/flow-polymer2lit/package.json b/flow-polymer2lit/package.json
index 4a982f1bc79..09718cfd3e5 100644
--- a/flow-polymer2lit/package.json
+++ b/flow-polymer2lit/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "flow-polymer2lit",
+  "name": "@vaadin/flow-polymer2lit",
   "version": "0.0.1",
   "description": "A migration tool for Polymer to Lit for selected cases",
   "author": "Vaadin Ltd",
diff --git a/flow-server/src/main/resources/com/vaadin/flow/server/frontend/dependencies/default/package.json b/flow-server/src/main/resources/com/vaadin/flow/server/frontend/dependencies/default/package.json
index 2ee0e86ae9f..8176189d747 100644
--- a/flow-server/src/main/resources/com/vaadin/flow/server/frontend/dependencies/default/package.json
+++ b/flow-server/src/main/resources/com/vaadin/flow/server/frontend/dependencies/default/package.json
@@ -1,13 +1,6 @@
 {
-  "name": "flow-default-dependencies",
-  "version": "1.0.0",
-  "description": "",
-  "main": "index.js",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
-  "author": "Artur Signell",
-  "license": "Apache-2.0",
+  "private": true,
+  "description": "A list of default Flow dependencies",
   "dependencies": {
     "@polymer/polymer": "3.5.1",
     "@vaadin/common-frontend": "0.0.19",
diff --git a/flow-server/src/main/resources/com/vaadin/flow/server/frontend/dependencies/react-router/package.json b/flow-server/src/main/resources/com/vaadin/flow/server/frontend/dependencies/react-router/package.json
index 8fad1757196..9ea5b30bfa9 100644
--- a/flow-server/src/main/resources/com/vaadin/flow/server/frontend/dependencies/react-router/package.json
+++ b/flow-server/src/main/resources/com/vaadin/flow/server/frontend/dependencies/react-router/package.json
@@ -1,13 +1,6 @@
 {
-  "name": "flow-default-react-router-dependencies",
-  "version": "1.0.0",
-  "description": "",
-  "main": "index.js",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
-  "author": "",
-  "license": "Apache-2.0",
+  "private": true,
+  "description": "A list of Flow dependencies when using React router",
   "dependencies": {
     "react": "18.3.1",
     "react-dom": "18.3.1",
diff --git a/flow-server/src/main/resources/com/vaadin/flow/server/frontend/dependencies/vaadin-router/package.json b/flow-server/src/main/resources/com/vaadin/flow/server/frontend/dependencies/vaadin-router/package.json
index c482b368572..7297ed1c30d 100644
--- a/flow-server/src/main/resources/com/vaadin/flow/server/frontend/dependencies/vaadin-router/package.json
+++ b/flow-server/src/main/resources/com/vaadin/flow/server/frontend/dependencies/vaadin-router/package.json
@@ -1,13 +1,6 @@
 {
-  "name": "flow-vaadin-router-dependencies",
-  "version": "1.0.0",
-  "description": "",
-  "main": "index.js",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
-  "author": "",
-  "license": "Apache-2.0",
+  "private": true,
+  "description": "A list of Flow dependencies when using Vaadin router for Web Components",
   "dependencies": {
     "@vaadin/router": "1.7.5"
   },
diff --git a/flow-server/src/main/resources/com/vaadin/flow/server/frontend/dependencies/vite/package.json b/flow-server/src/main/resources/com/vaadin/flow/server/frontend/dependencies/vite/package.json
index a7d6fd38392..6354d6d1631 100644
--- a/flow-server/src/main/resources/com/vaadin/flow/server/frontend/dependencies/vite/package.json
+++ b/flow-server/src/main/resources/com/vaadin/flow/server/frontend/dependencies/vite/package.json
@@ -1,7 +1,6 @@
 {
-  "name": "flow-vite-dependencies",
-  "version": "1.0.0",
-  "description": "",
+  "private": true,
+  "description": "A ",
   "main": "index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
diff --git a/flow-server/src/main/resources/plugins/react-function-location-plugin/package.json b/flow-server/src/main/resources/plugins/react-function-location-plugin/package.json
index b61584c180c..66384803cb6 100644
--- a/flow-server/src/main/resources/plugins/react-function-location-plugin/package.json
+++ b/flow-server/src/main/resources/plugins/react-function-location-plugin/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "react-function-location-plugin",
+  "name": "@vaadin/react-function-location-plugin",
   "version": "1.0.0",
   "description": "A Vite plugin for gather development information about source location of React functions",
   "main": "react-function-location-plugin.js",
diff --git a/flow-server/src/test/resources/com/vaadin/flow/server/frontend/dependencies/hilla/components/lit/package.json b/flow-server/src/test/resources/com/vaadin/flow/server/frontend/dependencies/hilla/components/lit/package.json
index 9d32cc16d00..998b1945c1d 100644
--- a/flow-server/src/test/resources/com/vaadin/flow/server/frontend/dependencies/hilla/components/lit/package.json
+++ b/flow-server/src/test/resources/com/vaadin/flow/server/frontend/dependencies/hilla/components/lit/package.json
@@ -1,13 +1,6 @@
 {
-  "name": "hilla-components-dependencies",
-  "version": "1.0.0",
+  "private": true,
   "description": "A list of Hilla Lit components that are added by Flow automatically to package.json",
-  "main": "index.js",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
-  "author": "",
-  "license": "Apache-2.0",
   "dependencies": {
     "@vaadin/hilla-lit-form": "24.4.0-alpha2"
   },
diff --git a/flow-server/src/test/resources/com/vaadin/flow/server/frontend/dependencies/hilla/components/no-deps/package.json b/flow-server/src/test/resources/com/vaadin/flow/server/frontend/dependencies/hilla/components/no-deps/package.json
index dd40b053922..f2ec579ca83 100644
--- a/flow-server/src/test/resources/com/vaadin/flow/server/frontend/dependencies/hilla/components/no-deps/package.json
+++ b/flow-server/src/test/resources/com/vaadin/flow/server/frontend/dependencies/hilla/components/no-deps/package.json
@@ -1,11 +1,4 @@
 {
-  "name": "hilla-components-dependencies",
-  "version": "1.0.0",
-  "description": "A list of Hilla React components that are added by Flow automatically to package.json",
-  "main": "index.js",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
-  "author": "",
-  "license": "Apache-2.0"
+  "private": true,
+  "description": "A list of Hilla React components that are added by Flow automatically to package.json"
 }
diff --git a/flow-server/src/test/resources/com/vaadin/flow/server/frontend/dependencies/hilla/components/react/package.json b/flow-server/src/test/resources/com/vaadin/flow/server/frontend/dependencies/hilla/components/react/package.json
index 2a7269d76ec..7371c0c0399 100644
--- a/flow-server/src/test/resources/com/vaadin/flow/server/frontend/dependencies/hilla/components/react/package.json
+++ b/flow-server/src/test/resources/com/vaadin/flow/server/frontend/dependencies/hilla/components/react/package.json
@@ -1,13 +1,6 @@
 {
-  "name": "hilla-components-dependencies",
-  "version": "1.0.0",
+  "private": true,
   "description": "A list of Hilla React components that are added by Flow automatically to package.json",
-  "main": "index.js",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
-  "author": "",
-  "license": "Apache-2.0",
   "dependencies": {
     "@vaadin/hilla-react-auth": "24.4.0-alpha2",
     "@vaadin/hilla-react-crud": "24.4.0-alpha2",
diff --git a/flow-server/src/test/resources/versions/no_vaadin_package.json b/flow-server/src/test/resources/versions/no_vaadin_package.json
index 1dedb049e7e..b09035ab8d4 100644
--- a/flow-server/src/test/resources/versions/no_vaadin_package.json
+++ b/flow-server/src/test/resources/versions/no_vaadin_package.json
@@ -1,5 +1,5 @@
 {
-  "name": "no-name",
+  "private": true,
   "license": "UNLICENSED",
   "dependencies": {
     "@polymer/iron-list": "3.0.0",
diff --git a/flow-server/src/test/resources/versions/package.json b/flow-server/src/test/resources/versions/package.json
index 4c1ddcfd0a2..8653a92c859 100644
--- a/flow-server/src/test/resources/versions/package.json
+++ b/flow-server/src/test/resources/versions/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "no-name",
+  "private": true,
   "license": "UNLICENSED",
   "vaadin": {
     "dependencies": {
diff --git a/flow-server/src/test/resources/versions/user_package.json b/flow-server/src/test/resources/versions/user_package.json
index 85cffaa90b0..b060d22a91f 100644
--- a/flow-server/src/test/resources/versions/user_package.json
+++ b/flow-server/src/test/resources/versions/user_package.json
@@ -1,5 +1,5 @@
 {
-  "name": "no-name",
+  "private": true,
   "license": "UNLICENSED",
   "vaadin": {
     "dependencies": {
diff --git a/flow-tests/test-frontend/vite-basics/package.json b/flow-tests/test-frontend/vite-basics/package.json
index 8d4b3bb354d..f1e9fddc65b 100644
--- a/flow-tests/test-frontend/vite-basics/package.json
+++ b/flow-tests/test-frontend/vite-basics/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "no-name",
+  "private": true,
   "license": "UNLICENSED",
   "type": "module",
   "scripts": {
@@ -7,9 +7,9 @@
   },
   "dependencies": {
     "@polymer/polymer": "3.5.1",
-    "@testscope/all": "../vite-test-assets/packages/@testscope/all",
-    "@testscope/button": "../vite-test-assets/packages/@testscope/button",
-    "@testscope/map": "../vite-test-assets/packages/@testscope/map",
+    "@vaadin/testscope-all": "../vite-test-assets/packages/@vaadin/testscope-all",
+    "@vaadin/testscope-button": "../vite-test-assets/packages/@vaadin/testscope-button",
+    "@vaadin/testscope-map": "../vite-test-assets/packages/@vaadin/testscope-map",
     "@types/react": "18.2.50",
     "@types/react-dom": "18.2.18",
     "@vaadin/bundles": "../vite-test-assets/packages/@vaadin/bundles",
@@ -21,8 +21,8 @@
     "construct-style-sheets-polyfill": "3.1.0",
     "copy-to-clipboard": "^3.3.1",
     "lit": "3.1.2",
-    "package-outside-npm": "file:../vite-test-assets/packages/package-outside-npm",
-    "package2-outside-npm": "../vite-test-assets/packages/package2-outside-npm",
+    "@vaadin/test-package-outside-npm": "file:../vite-test-assets/packages/@vaadin/test-package-outside-npm",
+    "@vaadin/test-package2-outside-npm": "../vite-test-assets/packages/@vaadin/test-package2-outside-npm",
     "react": "18.2.0",
     "react-dom": "18.2.0",
     "react-router-dom": "6.22.3"
@@ -48,12 +48,12 @@
     "@types/react": "18.2.75"
   },
   "overrides": {
-    "@testscope/all": "$@testscope/all",
-    "@testscope/button": "$@testscope/button",
+    "@vaadin/testscope-all": "$@vaadin/testscope-all",
+    "@vaadin/testscope-button": "$@vaadin/testscope-button",
     "@vaadin/bundles": "$@vaadin/bundles",
     "copy-to-clipboard": "$copy-to-clipboard",
-    "package-outside-npm": "$package-outside-npm",
-    "package2-outside-npm": "$package2-outside-npm",
+    "@vaadin/test-package-outside-npm": "$@vaadin/test-package-outside-npm",
+    "@vaadin/test-package2-outside-npm": "$@vaadin/test-package2-outside-npm",
     "glob": "$glob",
     "rollup-plugin-brotli": "$rollup-plugin-brotli",
     "typescript": "$typescript",
diff --git a/flow-tests/test-frontend/vite-basics/src/main/frontend/testscopebuttonloader.js b/flow-tests/test-frontend/vite-basics/src/main/frontend/testscopebuttonloader.js
index 53d888216ca..f9e7a176059 100644
--- a/flow-tests/test-frontend/vite-basics/src/main/frontend/testscopebuttonloader.js
+++ b/flow-tests/test-frontend/vite-basics/src/main/frontend/testscopebuttonloader.js
@@ -1,4 +1,4 @@
-import '@testscope/all';
+import '@vaadin/testscope-all';
 
-import { Button } from '@testscope/button';
+import { Button } from '@vaadin/testscope-button';
 window.BundleButtonClass = Button;
\ No newline at end of file
diff --git a/flow-tests/test-frontend/vite-basics/src/main/frontend/testscopemaploader.js b/flow-tests/test-frontend/vite-basics/src/main/frontend/testscopemaploader.js
index 6692f5e54dc..dc2ac2b53e4 100644
--- a/flow-tests/test-frontend/vite-basics/src/main/frontend/testscopemaploader.js
+++ b/flow-tests/test-frontend/vite-basics/src/main/frontend/testscopemaploader.js
@@ -1,4 +1,4 @@
-import '@testscope/all';
+import '@vaadin/testscope-all';
 
-import { Map } from '@testscope/map';
+import { Map } from '@vaadin/testscope-map';
 window.BundleMapClass = Map;
\ No newline at end of file
diff --git a/flow-tests/test-frontend/vite-basics/src/main/java/com/vaadin/viteapp/views/empty/MainView.java b/flow-tests/test-frontend/vite-basics/src/main/java/com/vaadin/viteapp/views/empty/MainView.java
index 86e56451a80..295b80aaf7a 100644
--- a/flow-tests/test-frontend/vite-basics/src/main/java/com/vaadin/viteapp/views/empty/MainView.java
+++ b/flow-tests/test-frontend/vite-basics/src/main/java/com/vaadin/viteapp/views/empty/MainView.java
@@ -13,8 +13,8 @@
 
 @Route("")
 @JsModule("./jsonloader.js")
-@JsModule("package-outside-npm/index.js")
-@JsModule("package2-outside-npm/index.js")
+@JsModule("@vaadin/test-package-outside-npm/index.js")
+@JsModule("@vaadin/test-package2-outside-npm/index.js")
 @JsModule("./testscopebuttonloader.js")
 @JsModule("./testscopemaploader.js")
 @JsModule("./importdir.js")
diff --git a/flow-tests/test-frontend/vite-basics/src/test/java/com/vaadin/viteapp/BundlesIT.java b/flow-tests/test-frontend/vite-basics/src/test/java/com/vaadin/viteapp/BundlesIT.java
index 4fec7024ece..ad993c5f218 100644
--- a/flow-tests/test-frontend/vite-basics/src/test/java/com/vaadin/viteapp/BundlesIT.java
+++ b/flow-tests/test-frontend/vite-basics/src/test/java/com/vaadin/viteapp/BundlesIT.java
@@ -41,9 +41,9 @@ public void optimizeDepsExcludesBundles() {
 
     @Test
     public void optimizeDepsExcludeBundleContents() {
-        Assert.assertTrue(isExcluded("@testscope/all"));
-        Assert.assertTrue(isExcluded("@testscope/button"));
-        Assert.assertTrue(isExcluded("@testscope/map"));
+        Assert.assertTrue(isExcluded("@vaadin/testscope-all"));
+        Assert.assertTrue(isExcluded("@vaadin/testscope-button"));
+        Assert.assertTrue(isExcluded("@vaadin/testscope-map"));
     }
 
     private boolean isExcluded(String dependency) {
diff --git a/flow-tests/test-frontend/vite-context-path/package.json b/flow-tests/test-frontend/vite-context-path/package.json
index 002ff3725ae..610f3faf033 100644
--- a/flow-tests/test-frontend/vite-context-path/package.json
+++ b/flow-tests/test-frontend/vite-context-path/package.json
@@ -1,12 +1,12 @@
 {
-  "name": "no-name",
+  "private": true,
   "license": "UNLICENSED",
   "type": "module",
   "dependencies": {
     "@polymer/polymer": "3.5.1",
-    "@testscope/all": "../vite-test-assets/packages/@testscope/all",
-    "@testscope/button": "../vite-test-assets/packages/@testscope/button",
-    "@testscope/map": "../vite-test-assets/packages/@testscope/map",
+    "@vaadin/testscope-all": "../vite-test-assets/packages/@vaadin/testscope-all",
+    "@vaadin/testscope-button": "../vite-test-assets/packages/@vaadin/testscope-button",
+    "@vaadin/testscope-map": "../vite-test-assets/packages/@vaadin/testscope-map",
     "@types/react": "18.2.50",
     "@types/react-dom": "18.2.18",
     "@vaadin/bundles": "../vite-test-assets/packages/@vaadin/bundles-old",
diff --git a/flow-tests/test-frontend/vite-context-path/src/main/java/com/vaadin/viteapp/views/empty/MainView.java b/flow-tests/test-frontend/vite-context-path/src/main/java/com/vaadin/viteapp/views/empty/MainView.java
index d4ebdaebd43..ce71fb86099 100644
--- a/flow-tests/test-frontend/vite-context-path/src/main/java/com/vaadin/viteapp/views/empty/MainView.java
+++ b/flow-tests/test-frontend/vite-context-path/src/main/java/com/vaadin/viteapp/views/empty/MainView.java
@@ -7,7 +7,7 @@
 import com.vaadin.flow.router.Route;
 
 @Route("")
-@JsModule("@testscope/all")
+@JsModule("@vaadin/testscope-all")
 public class MainView extends Div {
     public MainView() {
         add(new H2("Hello world!"), new HtmlComponent("testscope-button"),
diff --git a/flow-tests/test-frontend/vite-context-path/src/test/java/com/vaadin/viteapp/BundlesIT.java b/flow-tests/test-frontend/vite-context-path/src/test/java/com/vaadin/viteapp/BundlesIT.java
index a731a332bce..0459c5b3d50 100644
--- a/flow-tests/test-frontend/vite-context-path/src/test/java/com/vaadin/viteapp/BundlesIT.java
+++ b/flow-tests/test-frontend/vite-context-path/src/test/java/com/vaadin/viteapp/BundlesIT.java
@@ -23,8 +23,8 @@ public void bundlesIsNotUsedWhenHasVersionMismatch() {
 
     @Test
     public void optimizeDepsNotExcludeBundleContents() {
-        Assert.assertFalse(isExcluded("@testscope/all"));
-        Assert.assertFalse(isExcluded("@testscope/button"));
+        Assert.assertFalse(isExcluded("@vaadin/testscope-all"));
+        Assert.assertFalse(isExcluded("@vaadin/testscope-button"));
     }
 
     private boolean isExcluded(String dependency) {
diff --git a/flow-tests/test-frontend/vite-production/package.json b/flow-tests/test-frontend/vite-production/package.json
index 85c91283123..1b0407cbc3d 100644
--- a/flow-tests/test-frontend/vite-production/package.json
+++ b/flow-tests/test-frontend/vite-production/package.json
@@ -1,12 +1,12 @@
 {
-  "name": "no-name",
+  "private": true,
   "license": "UNLICENSED",
   "type": "module",
   "dependencies": {
     "@polymer/polymer": "3.5.1",
-    "@testscope/all": "../vite-test-assets/packages/@testscope/all",
-    "@testscope/button": "../vite-test-assets/packages/@testscope/button",
-    "@testscope/map": "../vite-test-assets/packages/@testscope/map",
+    "@vaadin/testscope-all": "../vite-test-assets/packages/@vaadin/testscope-all",
+    "@vaadin/testscope-button": "../vite-test-assets/packages/@vaadin/testscope-button",
+    "@vaadin/testscope-map": "../vite-test-assets/packages/@vaadin/testscope-map",
     "@vaadin/bundles": "../vite-test-assets/packages/@vaadin/bundles",
     "@vaadin/common-frontend": "0.0.19",
     "@vaadin/polymer-legacy-adapter": "24.3.2",
@@ -15,8 +15,8 @@
     "@vaadin/vaadin-themable-mixin": "24.3.2",
     "construct-style-sheets-polyfill": "3.1.0",
     "lit": "3.1.2",
-    "package-outside-npm": "file:../vite-test-assets/packages/package-outside-npm",
-    "package2-outside-npm": "../vite-test-assets/packages/package2-outside-npm",
+    "@vaadin/test-package-outside-npm": "file:../vite-test-assets/packages/@vaadin/test-package-outside-npm",
+    "@vaadin/test-package2-outside-npm": "../vite-test-assets/packages/@vaadin/test-package2-outside-npm",
     "react": "18.2.0",
     "react-dom": "18.2.0",
     "react-router-dom": "6.22.3"
diff --git a/flow-tests/test-frontend/vite-production/src/main/java/com/vaadin/viteapp/views/empty/MainView.java b/flow-tests/test-frontend/vite-production/src/main/java/com/vaadin/viteapp/views/empty/MainView.java
index 5dd028b33f6..1b3a59bd69b 100644
--- a/flow-tests/test-frontend/vite-production/src/main/java/com/vaadin/viteapp/views/empty/MainView.java
+++ b/flow-tests/test-frontend/vite-production/src/main/java/com/vaadin/viteapp/views/empty/MainView.java
@@ -11,10 +11,10 @@
 import com.vaadin.flow.router.Route;
 
 @Route("")
-@JsModule("@testscope/button")
-@JsModule("@testscope/map")
-@JsModule("package-outside-npm/index.js")
-@JsModule("package2-outside-npm/index.js")
+@JsModule("@vaadin/testscope-button")
+@JsModule("@vaadin/testscope-map")
+@JsModule("@vaadin/test-package-outside-npm/index.js")
+@JsModule("@vaadin/test-package2-outside-npm/index.js")
 @JsModule("./toplevelawait-main.js")
 @CssImport("./image.css")
 public class MainView extends Div {
diff --git a/flow-tests/test-frontend/vite-test-assets/packages/@testscope/all/all.js b/flow-tests/test-frontend/vite-test-assets/packages/@testscope/all/all.js
deleted file mode 100644
index 0241c0cdb17..00000000000
--- a/flow-tests/test-frontend/vite-test-assets/packages/@testscope/all/all.js
+++ /dev/null
@@ -1,2 +0,0 @@
-import '@testscope/button';
-import '@testscope/map';
diff --git a/flow-tests/test-frontend/vite-test-assets/packages/@vaadin/bundles-old/package.json b/flow-tests/test-frontend/vite-test-assets/packages/@vaadin/bundles-old/package.json
index f000950be45..956eeffbece 100644
--- a/flow-tests/test-frontend/vite-test-assets/packages/@vaadin/bundles-old/package.json
+++ b/flow-tests/test-frontend/vite-test-assets/packages/@vaadin/bundles-old/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "@test/bundles",
+  "name": "@vaadin/bundles-old",
   "version": "0.1.0",
   "description": "",
   "type": "module",
diff --git a/flow-tests/test-frontend/vite-test-assets/packages/@vaadin/bundles-old/vaadin-bundle.json b/flow-tests/test-frontend/vite-test-assets/packages/@vaadin/bundles-old/vaadin-bundle.json
index 1a59fc7b44b..d83744325c3 100644
--- a/flow-tests/test-frontend/vite-test-assets/packages/@vaadin/bundles-old/vaadin-bundle.json
+++ b/flow-tests/test-frontend/vite-test-assets/packages/@vaadin/bundles-old/vaadin-bundle.json
@@ -1,6 +1,6 @@
 {
   "packages": {
-    "@testscope/all": {
+    "@vaadin/testscope-all": {
       "version": "0.1.0",
       "exposes": {
         "./all.js": {
@@ -9,19 +9,19 @@
         ".": {
           "exports": [
             {
-              "source": "@testscope/all/all.js"
+              "source": "@vaadin/testscope-all/all.js"
             }
           ]
         }
       }
     },
-    "@testscope/button": {
+    "@vaadin/testscope-button": {
       "version": "1.0.0-alpha1",
       "exposes": {
         "./testscope-button.js": {
           "exports": [
             {
-              "source": "@testscope/button/src/testscope-button.js"
+              "source": "@vaadin/testscope-button/src/testscope-button.js"
             }
           ]
         },
@@ -33,19 +33,19 @@
         ".": {
           "exports": [
             {
-              "source": "@testscope/button/testscope-button.js"
+              "source": "@vaadin/testscope-button/testscope-button.js"
             }
           ]
         }
       }
     },
-    "@testscope/map": {
+    "@vaadin/testscope-map": {
       "version": "1.0.0-alpha1",
       "exposes": {
         "./testscope-map.js": {
           "exports": [
             {
-              "source": "@testscope/map/src/testscope-map.js"
+              "source": "@vaadin/testscope-map/src/testscope-map.js"
             }
           ]
         },
@@ -62,7 +62,7 @@
         ".": {
           "exports": [
             {
-              "source": "@testscope/map/testscope-map.js"
+              "source": "@vaadin/testscope-map/testscope-map.js"
             }
           ]
         }
diff --git a/flow-tests/test-frontend/vite-test-assets/packages/@vaadin/bundles/vaadin-bundle.json b/flow-tests/test-frontend/vite-test-assets/packages/@vaadin/bundles/vaadin-bundle.json
index f1206a40ded..4bf7e8a2dcd 100644
--- a/flow-tests/test-frontend/vite-test-assets/packages/@vaadin/bundles/vaadin-bundle.json
+++ b/flow-tests/test-frontend/vite-test-assets/packages/@vaadin/bundles/vaadin-bundle.json
@@ -1,6 +1,6 @@
 {
   "packages": {
-    "@testscope/all": {
+    "@vaadin/testscope-all": {
       "version": "1.0.0",
       "exposes": {
         "./all.js": {
@@ -9,19 +9,19 @@
         ".": {
           "exports": [
             {
-              "source": "@testscope/all/all.js"
+              "source": "@vaadin/testscope-all/all.js"
             }
           ]
         }
       }
     },
-    "@testscope/button": {
+    "@vaadin/testscope-button": {
       "version": "1.0.0",
       "exposes": {
         "./testscope-button.js": {
           "exports": [
             {
-              "source": "@testscope/button/src/testscope-button.js"
+              "source": "@vaadin/testscope-button/src/testscope-button.js"
             }
           ]
         },
@@ -33,19 +33,19 @@
         ".": {
           "exports": [
             {
-              "source": "@testscope/button/testscope-button.js"
+              "source": "@vaadin/testscope-button/testscope-button.js"
             }
           ]
         }
       }
     },
-    "@testscope/map": {
+    "@vaadin/testscope-map": {
       "version": "1.0.0",
       "exposes": {
         "./testscope-map.js": {
           "exports": [
             {
-              "source": "@testscope/map/src/testscope-map.js"
+              "source": "@vaadin/testscope-map/src/testscope-map.js"
             }
           ]
         },
@@ -62,7 +62,7 @@
         ".": {
           "exports": [
             {
-              "source": "@testscope/map/testscope-map.js"
+              "source": "@vaadin/testscope-map/testscope-map.js"
             }
           ]
         }
diff --git a/flow-tests/test-frontend/vite-test-assets/packages/@vaadin/bundles/vaadin.js b/flow-tests/test-frontend/vite-test-assets/packages/@vaadin/bundles/vaadin.js
index 8e5d13a688f..9f88304679e 100644
--- a/flow-tests/test-frontend/vite-test-assets/packages/@vaadin/bundles/vaadin.js
+++ b/flow-tests/test-frontend/vite-test-assets/packages/@vaadin/bundles/vaadin.js
@@ -29,28 +29,28 @@ function internalImport(module) {
   return moduleMap[module]();
 }
 
-defineModule("./node_modules/@testscope/all", async () => {
+defineModule("./node_modules/@vaadin/testscope-all", async () => {
   // re-export from package alias
-  return internalImport("./node_modules/@testscope/all/all.js");
+  return internalImport("./node_modules/@vaadin/testscope-all/all.js");
 });
 
-defineModule("./node_modules/@testscope/all/all.js", async () => {
+defineModule("./node_modules/@vaadin/testscope-all/all.js", async () => {
   // imports package for side effects, empty export
-  await internalImport("./node_modules/@testscope/button");
+  await internalImport("./node_modules/@vaadin/testscope-button");
   return {};
 });
 
-defineModule("./node_modules/@testscope/button", async () => {
+defineModule("./node_modules/@vaadin/testscope-button", async () => {
   // re-export from package alias
-  return internalImport("./node_modules/@testscope/button/testscope-button.js");
+  return internalImport("./node_modules/@vaadin/testscope-button/testscope-button.js");
 });
 
-defineModule("./node_modules/@testscope/button/testscope-button.js", async () => {
+defineModule("./node_modules/@vaadin/testscope-button/testscope-button.js", async () => {
   // re-export from another module
-  return internalImport("./node_modules/@testscope/button/src/testscope-button.js");
+  return internalImport("./node_modules/@vaadin/testscope-button/src/testscope-button.js");
 });
 
-defineModule("./node_modules/@testscope/button/src/testscope-button.js", async () => {
+defineModule("./node_modules/@vaadin/testscope-button/src/testscope-button.js", async () => {
   class Button extends HTMLElement {
     static get is() {
       return 'testscope-button';
@@ -73,7 +73,7 @@ defineModule("./node_modules/@testscope/button/src/testscope-button.js", async (
   return { Button };
 });
 
-defineModule("./node_modules/@testscope/map/src/lib.js", async () => {
+defineModule("./node_modules/@vaadin/testscope-map/src/lib.js", async () => {
   return {
     default: {
       MAP: 'map',
@@ -81,21 +81,21 @@ defineModule("./node_modules/@testscope/map/src/lib.js", async () => {
   };
 });
 
-defineModule("./node_modules/@testscope/map", async () => {
+defineModule("./node_modules/@vaadin/testscope-map", async () => {
   // re-export from package alias
-  return internalImport("./node_modules/@testscope/map/testscope-map.js");
+  return internalImport("./node_modules/@vaadin/testscope-map/testscope-map.js");
 });
 
-defineModule("./node_modules/@testscope/map/testscope-map.js", async () => {
+defineModule("./node_modules/@vaadin/testscope-map/testscope-map.js", async () => {
   // re-export from another module
-  return internalImport("./node_modules/@testscope/map/src/testscope-map.js");
+  return internalImport("./node_modules/@vaadin/testscope-map/src/testscope-map.js");
 });
 
-defineModule("./node_modules/@testscope/map/src/testscope-map.js", async () => {
+defineModule("./node_modules/@vaadin/testscope-map/src/testscope-map.js", async () => {
   // Async import instead of `internalImport` is necessary to verify imports
   // of default library export through the bundle resolver and response.
   // See https://github.com/vaadin/flow/issues/14355
-  const {default: lib} = await import('@testscope/map/src/lib.js');
+  const {default: lib} = await import('@vaadin/testscope-map/src/lib.js');
 
   class Map extends HTMLElement {
     static get is() {
diff --git a/flow-tests/test-frontend/vite-test-assets/packages/package-outside-npm/.gitignore b/flow-tests/test-frontend/vite-test-assets/packages/@vaadin/test-package-outside-npm/.gitignore
similarity index 100%
rename from flow-tests/test-frontend/vite-test-assets/packages/package-outside-npm/.gitignore
rename to flow-tests/test-frontend/vite-test-assets/packages/@vaadin/test-package-outside-npm/.gitignore
diff --git a/flow-tests/test-frontend/vite-test-assets/packages/@vaadin/test-package-outside-npm/index.js b/flow-tests/test-frontend/vite-test-assets/packages/@vaadin/test-package-outside-npm/index.js
new file mode 100644
index 00000000000..e5d410fe135
--- /dev/null
+++ b/flow-tests/test-frontend/vite-test-assets/packages/@vaadin/test-package-outside-npm/index.js
@@ -0,0 +1,3 @@
+import { packageTransitive } from '@vaadin/test-package-transitive';
+
+window.packageOutsideNpm = packageTransitive;
diff --git a/flow-tests/test-frontend/vite-test-assets/packages/@vaadin/test-package-outside-npm/node_modules/@vaadin/test-package-transitive b/flow-tests/test-frontend/vite-test-assets/packages/@vaadin/test-package-outside-npm/node_modules/@vaadin/test-package-transitive
new file mode 120000
index 00000000000..1e982404041
--- /dev/null
+++ b/flow-tests/test-frontend/vite-test-assets/packages/@vaadin/test-package-outside-npm/node_modules/@vaadin/test-package-transitive
@@ -0,0 +1 @@
+../../../test-package-transitive/
\ No newline at end of file
diff --git a/flow-tests/test-frontend/vite-test-assets/packages/package-outside-npm/package.json b/flow-tests/test-frontend/vite-test-assets/packages/@vaadin/test-package-outside-npm/package.json
similarity index 54%
rename from flow-tests/test-frontend/vite-test-assets/packages/package-outside-npm/package.json
rename to flow-tests/test-frontend/vite-test-assets/packages/@vaadin/test-package-outside-npm/package.json
index 5a104a97388..bcc748d4734 100644
--- a/flow-tests/test-frontend/vite-test-assets/packages/package-outside-npm/package.json
+++ b/flow-tests/test-frontend/vite-test-assets/packages/@vaadin/test-package-outside-npm/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "package-outside-npm",
+  "name": "@vaadin/test-package-outside-npm",
   "version": "1.0.0",
   "description": "",
   "main": "index.js",
@@ -7,10 +7,10 @@
   "type": "module",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
-    "postinstall": "node -e \"fs.writeFileSync('package-outside-npm', 'hello')\""
+    "postinstall": "node -e \"fs.writeFileSync('@vaadin/test-package-outside-npm', 'hello')\""
   },
   "dependencies": {
-    "package-transitive": "file:../package-transitive"
+    "@vaadin/test-package-transitive": "file:../test-package-transitive"
   },
   "author": "",
   "license": "Apache-2.0"
diff --git a/flow-tests/test-frontend/vite-test-assets/packages/package-transitive/index.js b/flow-tests/test-frontend/vite-test-assets/packages/@vaadin/test-package-transitive/index.js
similarity index 100%
rename from flow-tests/test-frontend/vite-test-assets/packages/package-transitive/index.js
rename to flow-tests/test-frontend/vite-test-assets/packages/@vaadin/test-package-transitive/index.js
diff --git a/flow-tests/test-frontend/vite-test-assets/packages/package-transitive/package.json b/flow-tests/test-frontend/vite-test-assets/packages/@vaadin/test-package-transitive/package.json
similarity index 62%
rename from flow-tests/test-frontend/vite-test-assets/packages/package-transitive/package.json
rename to flow-tests/test-frontend/vite-test-assets/packages/@vaadin/test-package-transitive/package.json
index a6df84d4611..9f1beeca942 100644
--- a/flow-tests/test-frontend/vite-test-assets/packages/package-transitive/package.json
+++ b/flow-tests/test-frontend/vite-test-assets/packages/@vaadin/test-package-transitive/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "package-transitive",
+  "name": "@vaadin/test-package-transitive",
   "version": "1.0.0",
   "description": "",
   "main": "index.js",
@@ -7,7 +7,7 @@
   "type": "module",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
-    "postinstall": "node -e \"fs.writeFileSync('package-transitive', 'hello')\""
+    "postinstall": "node -e \"fs.writeFileSync('@vaadin/test-package-transitive', 'hello')\""
   },
   "author": "",
   "license": "Apache-2.0"
diff --git a/flow-tests/test-frontend/vite-test-assets/packages/package2-outside-npm/.gitignore b/flow-tests/test-frontend/vite-test-assets/packages/@vaadin/test-package2-outside-npm/.gitignore
similarity index 100%
rename from flow-tests/test-frontend/vite-test-assets/packages/package2-outside-npm/.gitignore
rename to flow-tests/test-frontend/vite-test-assets/packages/@vaadin/test-package2-outside-npm/.gitignore
diff --git a/flow-tests/test-frontend/vite-test-assets/packages/@vaadin/test-package2-outside-npm/index.js b/flow-tests/test-frontend/vite-test-assets/packages/@vaadin/test-package2-outside-npm/index.js
new file mode 100644
index 00000000000..a95e9124105
--- /dev/null
+++ b/flow-tests/test-frontend/vite-test-assets/packages/@vaadin/test-package2-outside-npm/index.js
@@ -0,0 +1,3 @@
+import { packageTransitive } from '@vaadin/test-package-transitive';
+
+window.package2OutsideNpm = packageTransitive;
diff --git a/flow-tests/test-frontend/vite-test-assets/packages/@vaadin/test-package2-outside-npm/node_modules/@vaadin/test-package-transitive b/flow-tests/test-frontend/vite-test-assets/packages/@vaadin/test-package2-outside-npm/node_modules/@vaadin/test-package-transitive
new file mode 120000
index 00000000000..1e982404041
--- /dev/null
+++ b/flow-tests/test-frontend/vite-test-assets/packages/@vaadin/test-package2-outside-npm/node_modules/@vaadin/test-package-transitive
@@ -0,0 +1 @@
+../../../test-package-transitive/
\ No newline at end of file
diff --git a/flow-tests/test-frontend/vite-test-assets/packages/package2-outside-npm/package.json b/flow-tests/test-frontend/vite-test-assets/packages/@vaadin/test-package2-outside-npm/package.json
similarity index 54%
rename from flow-tests/test-frontend/vite-test-assets/packages/package2-outside-npm/package.json
rename to flow-tests/test-frontend/vite-test-assets/packages/@vaadin/test-package2-outside-npm/package.json
index eaa7e167108..7f1418af0d7 100644
--- a/flow-tests/test-frontend/vite-test-assets/packages/package2-outside-npm/package.json
+++ b/flow-tests/test-frontend/vite-test-assets/packages/@vaadin/test-package2-outside-npm/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "package2-outside-npm",
+  "name": "@vaadin/test-package2-outside-npm",
   "version": "1.0.0",
   "description": "",
   "main": "index.js",
@@ -7,10 +7,10 @@
   "type": "module",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
-    "postinstall": "node -e \"fs.writeFileSync('package2-outside-npm', 'hello')\""
+    "postinstall": "node -e \"fs.writeFileSync('@vaadin/test-package2-outside-npm', 'hello')\""
   },
   "dependencies": {
-    "package-transitive": "file:../package-transitive"
+    "@vaadin/test-package-transitive": "file:../test-package-transitive"
   },
   "author": "",
   "license": "Apache-2.0"
diff --git a/flow-tests/test-frontend/vite-test-assets/packages/@vaadin/testscope-all/all.js b/flow-tests/test-frontend/vite-test-assets/packages/@vaadin/testscope-all/all.js
new file mode 100644
index 00000000000..6e167948e5d
--- /dev/null
+++ b/flow-tests/test-frontend/vite-test-assets/packages/@vaadin/testscope-all/all.js
@@ -0,0 +1,2 @@
+import '@vaadin/testscope-button';
+import '@vaadin/testscope-map';
diff --git a/flow-tests/test-frontend/vite-test-assets/packages/@testscope/all/package.json b/flow-tests/test-frontend/vite-test-assets/packages/@vaadin/testscope-all/package.json
similarity index 87%
rename from flow-tests/test-frontend/vite-test-assets/packages/@testscope/all/package.json
rename to flow-tests/test-frontend/vite-test-assets/packages/@vaadin/testscope-all/package.json
index 08e9c942cb6..9cfb5eab75b 100644
--- a/flow-tests/test-frontend/vite-test-assets/packages/@testscope/all/package.json
+++ b/flow-tests/test-frontend/vite-test-assets/packages/@vaadin/testscope-all/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "@testscope/all",
+  "name": "@vaadin/testscope-all",
   "version": "1.0.0",
   "description": "",
   "type": "module",
diff --git a/flow-tests/test-frontend/vite-test-assets/packages/@testscope/button/package.json b/flow-tests/test-frontend/vite-test-assets/packages/@vaadin/testscope-button/package.json
similarity index 87%
rename from flow-tests/test-frontend/vite-test-assets/packages/@testscope/button/package.json
rename to flow-tests/test-frontend/vite-test-assets/packages/@vaadin/testscope-button/package.json
index 0bc6158d337..421991d7a4e 100644
--- a/flow-tests/test-frontend/vite-test-assets/packages/@testscope/button/package.json
+++ b/flow-tests/test-frontend/vite-test-assets/packages/@vaadin/testscope-button/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "@testscope/button",
+  "name": "@vaadin/testscope-button",
   "version": "1.0.0",
   "description": "",
   "type": "module",
diff --git a/flow-tests/test-frontend/vite-test-assets/packages/@testscope/button/src/testscope-button.js b/flow-tests/test-frontend/vite-test-assets/packages/@vaadin/testscope-button/src/testscope-button.js
similarity index 100%
rename from flow-tests/test-frontend/vite-test-assets/packages/@testscope/button/src/testscope-button.js
rename to flow-tests/test-frontend/vite-test-assets/packages/@vaadin/testscope-button/src/testscope-button.js
diff --git a/flow-tests/test-frontend/vite-test-assets/packages/@testscope/button/testscope-button.js b/flow-tests/test-frontend/vite-test-assets/packages/@vaadin/testscope-button/testscope-button.js
similarity index 100%
rename from flow-tests/test-frontend/vite-test-assets/packages/@testscope/button/testscope-button.js
rename to flow-tests/test-frontend/vite-test-assets/packages/@vaadin/testscope-button/testscope-button.js
diff --git a/flow-tests/test-frontend/vite-test-assets/packages/@testscope/map/package.json b/flow-tests/test-frontend/vite-test-assets/packages/@vaadin/testscope-map/package.json
similarity index 88%
rename from flow-tests/test-frontend/vite-test-assets/packages/@testscope/map/package.json
rename to flow-tests/test-frontend/vite-test-assets/packages/@vaadin/testscope-map/package.json
index 96b48a9e728..fb72394768b 100644
--- a/flow-tests/test-frontend/vite-test-assets/packages/@testscope/map/package.json
+++ b/flow-tests/test-frontend/vite-test-assets/packages/@vaadin/testscope-map/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "@testscope/map",
+  "name": "@vaadin/testscope-map",
   "version": "1.0.0",
   "description": "",
   "type": "module",
diff --git a/flow-tests/test-frontend/vite-test-assets/packages/@testscope/map/src/lib.js b/flow-tests/test-frontend/vite-test-assets/packages/@vaadin/testscope-map/src/lib.js
similarity index 100%
rename from flow-tests/test-frontend/vite-test-assets/packages/@testscope/map/src/lib.js
rename to flow-tests/test-frontend/vite-test-assets/packages/@vaadin/testscope-map/src/lib.js
diff --git a/flow-tests/test-frontend/vite-test-assets/packages/@testscope/map/src/testscope-map.js b/flow-tests/test-frontend/vite-test-assets/packages/@vaadin/testscope-map/src/testscope-map.js
similarity index 82%
rename from flow-tests/test-frontend/vite-test-assets/packages/@testscope/map/src/testscope-map.js
rename to flow-tests/test-frontend/vite-test-assets/packages/@vaadin/testscope-map/src/testscope-map.js
index aa5ec07ebeb..dece78d6a40 100644
--- a/flow-tests/test-frontend/vite-test-assets/packages/@testscope/map/src/testscope-map.js
+++ b/flow-tests/test-frontend/vite-test-assets/packages/@vaadin/testscope-map/src/testscope-map.js
@@ -1,4 +1,4 @@
-import { default as lib } from '@testscope/map/src/lib.js';
+import { default as lib } from '@vaadin/testscope-map/src/lib.js';
 
 export class Map extends HTMLElement {
   static get is() {
diff --git a/flow-tests/test-frontend/vite-test-assets/packages/@testscope/map/testscope-map.js b/flow-tests/test-frontend/vite-test-assets/packages/@vaadin/testscope-map/testscope-map.js
similarity index 100%
rename from flow-tests/test-frontend/vite-test-assets/packages/@testscope/map/testscope-map.js
rename to flow-tests/test-frontend/vite-test-assets/packages/@vaadin/testscope-map/testscope-map.js
diff --git a/flow-tests/test-frontend/vite-test-assets/packages/package-outside-npm/index.js b/flow-tests/test-frontend/vite-test-assets/packages/package-outside-npm/index.js
deleted file mode 100644
index 0f134d65d98..00000000000
--- a/flow-tests/test-frontend/vite-test-assets/packages/package-outside-npm/index.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import { packageTransitive } from 'package-transitive';
-
-window.packageOutsideNpm = packageTransitive;
diff --git a/flow-tests/test-frontend/vite-test-assets/packages/package-outside-npm/node_modules/package-transitive b/flow-tests/test-frontend/vite-test-assets/packages/package-outside-npm/node_modules/package-transitive
deleted file mode 120000
index f6369cff9b0..00000000000
--- a/flow-tests/test-frontend/vite-test-assets/packages/package-outside-npm/node_modules/package-transitive
+++ /dev/null
@@ -1 +0,0 @@
-../../package-transitive
\ No newline at end of file
diff --git a/flow-tests/test-frontend/vite-test-assets/packages/package2-outside-npm/index.js b/flow-tests/test-frontend/vite-test-assets/packages/package2-outside-npm/index.js
deleted file mode 100644
index 2a303063438..00000000000
--- a/flow-tests/test-frontend/vite-test-assets/packages/package2-outside-npm/index.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import { packageTransitive } from 'package-transitive';
-
-window.package2OutsideNpm = packageTransitive;
diff --git a/flow-tests/test-frontend/vite-test-assets/packages/package2-outside-npm/node_modules/package-transitive b/flow-tests/test-frontend/vite-test-assets/packages/package2-outside-npm/node_modules/package-transitive
deleted file mode 120000
index f6369cff9b0..00000000000
--- a/flow-tests/test-frontend/vite-test-assets/packages/package2-outside-npm/node_modules/package-transitive
+++ /dev/null
@@ -1 +0,0 @@
-../../package-transitive
\ No newline at end of file