diff --git a/packages/dev/buildTools/src/packageMapping.ts b/packages/dev/buildTools/src/packageMapping.ts
index 18f2872dfa9..36838bac7fe 100644
--- a/packages/dev/buildTools/src/packageMapping.ts
+++ b/packages/dev/buildTools/src/packageMapping.ts
@@ -11,6 +11,7 @@ export type DevPackageName =
     | "loaders"
     | "serializers"
     | "inspector"
+    | "inspector-v2"
     | "post-processes"
     | "procedural-textures"
     | "node-editor"
@@ -33,6 +34,7 @@ export type UMDPackageName =
     | "babylonjs-materials"
     | "babylonjs-procedural-textures"
     | "babylonjs-inspector"
+    | "babylonjs-inspector-v2"
     | "babylonjs-node-editor"
     | "babylonjs-node-geometry-editor"
     | "babylonjs-node-render-graph-editor"
@@ -124,6 +126,11 @@ export const umdPackageMapping: { [key in UMDPackageName]: { baseDir: string; ba
         baseFilename: "babylon.inspector",
         isBundle: true,
     },
+    "babylonjs-inspector-v2": {
+        baseDir: "inspector",
+        baseFilename: "babylon.inspector-v2",
+        isBundle: true,
+    },
     "babylonjs-node-editor": {
         baseDir: "nodeEditor",
         baseFilename: "babylon.nodeEditor",
@@ -197,6 +204,7 @@ const packageMapping: {
         loaders: "babylonjs-loaders",
         serializers: "babylonjs-serializers",
         inspector: "babylonjs-inspector",
+        "inspector-v2": "babylonjs-inspector-v2",
         "node-editor": (_filePath?: string) => {
             // if (filePath && filePath.indexOf("sharedUiComponents") !== -1) {
             //     return "babylonjs-shared-ui-components";
@@ -244,6 +252,7 @@ const packageMapping: {
         loaders: "@babylonjs/loaders",
         serializers: "@babylonjs/serializers",
         inspector: "@babylonjs/inspector",
+        "inspector-v2": "@babylonjs/inspector",
         "node-editor": "@babylonjs/node-editor",
         "node-geometry-editor": "@babylonjs/node-geometry-editor",
         "node-render-graph-editor": "@babylonjs/node-render-graph-editor",
@@ -266,6 +275,7 @@ const packageMapping: {
         loaders: "@babylonjs/esm",
         serializers: "@babylonjs/esm",
         inspector: "@babylonjs/esm",
+        "inspector-v2": "@babylonjs/esm",
         "node-editor": "@babylonjs/esm",
         "node-geometry-editor": "@babylonjs/esm",
         "node-render-graph-editor": "@babylonjs/esm",
@@ -333,6 +343,18 @@ const packageMapping: {
             }
             return "INSPECTOR";
         },
+        "inspector-v2": (filePath?: string) => {
+            filePath = filePath?.replaceAll("\\", "/");
+            if (filePath) {
+                if (filePath.includes("shared-ui-components/") || filePath.includes("/sharedUiComponents/")) {
+                    // was .endsWith
+                    return "INSPECTOR.SharedUIComponents";
+                } else if (filePath.includes("babylonjs-gltf2interface")) {
+                    return "BABYLON.GLTF2";
+                }
+            }
+            return "INSPECTOR";
+        },
         "node-editor": (filePath?: string) => {
             filePath = filePath?.replaceAll("\\", "/");
             if (filePath) {
diff --git a/packages/dev/buildTools/src/prepareSnapshot.ts b/packages/dev/buildTools/src/prepareSnapshot.ts
index 5ea05d72879..69adf29a8e9 100644
--- a/packages/dev/buildTools/src/prepareSnapshot.ts
+++ b/packages/dev/buildTools/src/prepareSnapshot.ts
@@ -12,7 +12,7 @@ export const prepareSnapshot = () => {
     Object.keys(umdPackageMapping).forEach((packageName) => {
         const metadata = umdPackageMapping[packageName as UMDPackageName];
         const corePath = path.join(baseDirectory, "packages", "public", "umd", packageName);
-        const coreUmd = globSync(`${corePath}/*+(.js|.d.ts|.map)`);
+        const coreUmd = globSync(`${corePath}/*+(.js|.d.ts|.map)`).filter((file) => path.basename(file) !== "webpack.config.js");
         for (const file of coreUmd) {
             copyFile(file, path.join(snapshotDirectory, metadata.baseDir, path.basename(file)), true);
         }
diff --git a/packages/public/umd/babylonjs-inspector-v2/src/index.ts b/packages/public/umd/babylonjs-inspector-v2/src/index.ts
index 33f7bde2186..55c112efbdc 100644
--- a/packages/public/umd/babylonjs-inspector-v2/src/index.ts
+++ b/packages/public/umd/babylonjs-inspector-v2/src/index.ts
@@ -1,3 +1,3 @@
-import * as inspector from "inspector/legacy/legacy";
+import * as inspector from "inspector-v2/legacy/legacy";
 export { inspector };
 export default inspector;
diff --git a/packages/public/umd/babylonjs-inspector-v2/tsconfig.build.json b/packages/public/umd/babylonjs-inspector-v2/tsconfig.build.json
index 5abbf6c41b5..9023baeb210 100644
--- a/packages/public/umd/babylonjs-inspector-v2/tsconfig.build.json
+++ b/packages/public/umd/babylonjs-inspector-v2/tsconfig.build.json
@@ -4,10 +4,7 @@
     "compilerOptions": {
         "outDir": "./dist",
         "rootDir": "./src",
-        "declaration": false,
-        "paths": {
-            "inspector/*": ["dev/inspector-v2/dist/*"]
-        }
+        "declaration": false
     },
     "include": ["./src/**/*"]
 }
diff --git a/packages/public/umd/babylonjs-inspector-v2/tsconfig.json b/packages/public/umd/babylonjs-inspector-v2/tsconfig.json
index 2af8890e518..7126d6b4ebe 100644
--- a/packages/public/umd/babylonjs-inspector-v2/tsconfig.json
+++ b/packages/public/umd/babylonjs-inspector-v2/tsconfig.json
@@ -1,8 +1,3 @@
 {
-    "extends": "../../../../tsconfig.json",
-    "compilerOptions": {
-        "paths": {
-            "inspector/*": ["dev/inspector-v2/src/*"]
-        }
-    }
+    "extends": "../../../../tsconfig.json"
 }
diff --git a/packages/public/umd/babylonjs-inspector-v2/webpack.config.js b/packages/public/umd/babylonjs-inspector-v2/webpack.config.js
index 272aebc47c5..d58b18f65f4 100644
--- a/packages/public/umd/babylonjs-inspector-v2/webpack.config.js
+++ b/packages/public/umd/babylonjs-inspector-v2/webpack.config.js
@@ -5,8 +5,7 @@ module.exports = (env) => {
     const commonConfig = commonConfigGenerator({
         mode: env.production ? "production" : "development",
         devPackageAliasPath: `../../../dev/inspector-v2/dist`,
-        devPackageName: "inspector",
-        overrideFilename: "babylon.inspector-v2",
+        devPackageName: "inspector-v2",
         namespace: "INSPECTOR",
         outputPath: path.resolve(__dirname),
         maxMode: true,