diff --git a/packages/cli/fakeStorybookAddons.js b/packages/cli/fakeStorybookAddons.js
index e7cadf37..1a076274 100644
--- a/packages/cli/fakeStorybookAddons.js
+++ b/packages/cli/fakeStorybookAddons.js
@@ -1,4 +1,7 @@
-const makeDecorator = () => story => story();
+// Questionmark is here to get around module replacement and load original module
+const originalAddons = require('@storybook/addons?');
+
+const makeDecorator = originalAddons.makeDecorator;
 const getChannel = () => ({
   addListener: () => {},
   addPeerListener: () => {},
@@ -12,7 +15,7 @@ const getChannel = () => ({
   removeListener: () => {},
   on: () => {},
   off: () => {},
-})
+});
 
 const addons = {
   makeDecorator,
diff --git a/packages/cli/src/steps/analyze/getStoriesMetadata.ts b/packages/cli/src/steps/analyze/getStoriesMetadata.ts
index 9f2855a0..fd9c6b7d 100644
--- a/packages/cli/src/steps/analyze/getStoriesMetadata.ts
+++ b/packages/cli/src/steps/analyze/getStoriesMetadata.ts
@@ -6,11 +6,11 @@ export function getStoriesMetadata(
   componentModules: Map<string, Record<string, any>>
 ): Record<string, any> {
   return stories.reduce((acc, s) => {
-    const module = componentModules.get(s.fileName);
+    const module = componentModules.get(s.name);
     const metadata = module
       ? {
           title: (module.default && module.default.title) || camelCaseToSpaces(s.name),
-          fileName: s.fileName,
+          fileName: s.name,
           storyItems: Object.entries(module)
             .filter(([exportName]) => exportName !== 'default')
             .map(([exportName, storyFn]) => ({
diff --git a/packages/cli/src/steps/analyze/index.tsx b/packages/cli/src/steps/analyze/index.tsx
index 05e368c0..67f9fece 100644
--- a/packages/cli/src/steps/analyze/index.tsx
+++ b/packages/cli/src/steps/analyze/index.tsx
@@ -45,7 +45,7 @@ async function action({ stepOutputs }: StepRunnerActionOptions<DependencyStepOut
   const stories = getStepOutputStories(stepOutputs);
 
   stories.forEach(s =>
-    s.files.forEach(fileName => {
+    (s.files || []).forEach(fileName => {
       const foundFile = getStepOutputFiles(stepOutputs)
         .filter(file => JS_REGEXP.test(file.name))
         .find(file => file.name === fileName);
diff --git a/packages/cli/src/steps/compile/index.tsx b/packages/cli/src/steps/compile/index.tsx
index b03838bf..3f1b2dc4 100644
--- a/packages/cli/src/steps/compile/index.tsx
+++ b/packages/cli/src/steps/compile/index.tsx
@@ -95,7 +95,7 @@ async function action({
       name: sf.name,
       namespace,
       filePath: sf.filePath,
-      files: assets[sf.fileName],
+      files: assets[sf.name],
     })
   );
 
diff --git a/packages/cli/src/steps/scan/getExtendedStorybookFiles.ts b/packages/cli/src/steps/scan/getExtendedStorybookFiles.ts
index 89bcf931..9545e9c2 100644
--- a/packages/cli/src/steps/scan/getExtendedStorybookFiles.ts
+++ b/packages/cli/src/steps/scan/getExtendedStorybookFiles.ts
@@ -23,7 +23,7 @@ const getEntrypointsFromFiles = (
 
       const fileName = matchResult[1];
       return {
-        name: fileName,
+        name: filePath.replace(/\//g, '__'),
         filePath,
         gitPath: gitPath || filePath,
         fileName,
diff --git a/packages/cli/src/utils/componentExtractLoader.spec.ts b/packages/cli/src/utils/componentExtractLoader.spec.ts
index 4843dd60..e4e9d659 100644
--- a/packages/cli/src/utils/componentExtractLoader.spec.ts
+++ b/packages/cli/src/utils/componentExtractLoader.spec.ts
@@ -10,7 +10,12 @@ beforeEach(() => {
     cacheable: jest.fn(),
     context: '/home/MyAccount/project/Abc',
     resourcePath: '/home/MyAccount/project/Abc/Abc.jsx',
-    query: '?MyComponent',
+    _module: {
+      issuer: {
+        name: 'MyComponent',
+      },
+    },
+    query: '?MyComponentQuery',
   };
   pitch = _pitch.bind(self);
 });
diff --git a/packages/cli/src/utils/componentExtractLoader.ts b/packages/cli/src/utils/componentExtractLoader.ts
index 9fab5c83..c8677d95 100644
--- a/packages/cli/src/utils/componentExtractLoader.ts
+++ b/packages/cli/src/utils/componentExtractLoader.ts
@@ -11,7 +11,9 @@ export function pitch(remainingRequest) {
   if (this.cacheable) this.cacheable();
   if (!this.query) throw new Error('query parameter is missing');
 
-  const moduleName = JSON.stringify(this.query.substr(1));
+  // eslint-disable-next-line no-underscore-dangle
+  const moduleName = JSON.stringify(this._module.issuer.name);
+
   const componentHubFn = 'registerComponent';
   const requirePath = JSON.stringify(`-!${newRequestPath}`);
   const result = `
diff --git a/packages/cli/src/utils/getWebpackConfig.ts b/packages/cli/src/utils/getWebpackConfig.ts
index 21ae6d87..468a645f 100644
--- a/packages/cli/src/utils/getWebpackConfig.ts
+++ b/packages/cli/src/utils/getWebpackConfig.ts
@@ -28,7 +28,7 @@ export async function getWebpackConfig({
   const entrypoints = storyFiles.reduce(
     (prev, storyFile) => ({
       ...prev,
-      [storyFile.fileName]: [
+      [storyFile.name]: [
         storyFile.entrypoint,
         pathUtils.resolve(__dirname, '../storybook/getGlobals.js'),
         ...(decoratorFile ? [decoratorFile] : []),
diff --git a/packages/integration-tests-storybook-6_1_x/test/__snapshots__/bundle.integration.ts.snap b/packages/integration-tests-storybook-6_1_x/test/__snapshots__/bundle.integration.ts.snap
index 0e815c1c..4aabad04 100644
--- a/packages/integration-tests-storybook-6_1_x/test/__snapshots__/bundle.integration.ts.snap
+++ b/packages/integration-tests-storybook-6_1_x/test/__snapshots__/bundle.integration.ts.snap
@@ -23,34 +23,34 @@ exports[`run bundle command 2`] = `
   \\"outputFilePath\\": \\"files/vendors.js\\"
  },
  {
-  \\"name\\": \\"Button.stories.js\\",
+  \\"name\\": \\"runtime~src__Button.stories.js.js\\",
   \\"namespace\\": \\"default\\",
-  \\"outputFilePath\\": \\"files/Button.stories.js\\"
+  \\"outputFilePath\\": \\"files/runtime~src__Button.stories.js.js\\"
  },
  {
-  \\"name\\": \\"Header.stories.js\\",
+  \\"name\\": \\"runtime~src__Header.stories.js.js\\",
   \\"namespace\\": \\"default\\",
-  \\"outputFilePath\\": \\"files/Header.stories.js\\"
+  \\"outputFilePath\\": \\"files/runtime~src__Header.stories.js.js\\"
  },
  {
-  \\"name\\": \\"Page.stories.js\\",
+  \\"name\\": \\"runtime~src__Page.stories.js.js\\",
   \\"namespace\\": \\"default\\",
-  \\"outputFilePath\\": \\"files/Page.stories.js\\"
+  \\"outputFilePath\\": \\"files/runtime~src__Page.stories.js.js\\"
  },
  {
-  \\"name\\": \\"runtime~Button.stories.js\\",
+  \\"name\\": \\"src__Button.stories.js.js\\",
   \\"namespace\\": \\"default\\",
-  \\"outputFilePath\\": \\"files/runtime~Button.stories.js\\"
+  \\"outputFilePath\\": \\"files/src__Button.stories.js.js\\"
  },
  {
-  \\"name\\": \\"runtime~Header.stories.js\\",
+  \\"name\\": \\"src__Header.stories.js.js\\",
   \\"namespace\\": \\"default\\",
-  \\"outputFilePath\\": \\"files/runtime~Header.stories.js\\"
+  \\"outputFilePath\\": \\"files/src__Header.stories.js.js\\"
  },
  {
-  \\"name\\": \\"runtime~Page.stories.js\\",
+  \\"name\\": \\"src__Page.stories.js.js\\",
   \\"namespace\\": \\"default\\",
-  \\"outputFilePath\\": \\"files/runtime~Page.stories.js\\"
+  \\"outputFilePath\\": \\"files/src__Page.stories.js.js\\"
  },
  {
   \\"name\\": \\"vendors.js.LICENSE.txt\\",
@@ -63,34 +63,34 @@ exports[`run bundle command 2`] = `
   \\"outputFilePath\\": \\"files/vendors.js.map\\"
  },
  {
-  \\"name\\": \\"Button.stories.js.map\\",
+  \\"name\\": \\"runtime~src__Button.stories.js.js.map\\",
   \\"namespace\\": \\"default\\",
-  \\"outputFilePath\\": \\"files/Button.stories.js.map\\"
+  \\"outputFilePath\\": \\"files/runtime~src__Button.stories.js.js.map\\"
  },
  {
-  \\"name\\": \\"Header.stories.js.map\\",
+  \\"name\\": \\"runtime~src__Header.stories.js.js.map\\",
   \\"namespace\\": \\"default\\",
-  \\"outputFilePath\\": \\"files/Header.stories.js.map\\"
+  \\"outputFilePath\\": \\"files/runtime~src__Header.stories.js.js.map\\"
  },
  {
-  \\"name\\": \\"Page.stories.js.map\\",
+  \\"name\\": \\"runtime~src__Page.stories.js.js.map\\",
   \\"namespace\\": \\"default\\",
-  \\"outputFilePath\\": \\"files/Page.stories.js.map\\"
+  \\"outputFilePath\\": \\"files/runtime~src__Page.stories.js.js.map\\"
  },
  {
-  \\"name\\": \\"runtime~Button.stories.js.map\\",
+  \\"name\\": \\"src__Button.stories.js.js.map\\",
   \\"namespace\\": \\"default\\",
-  \\"outputFilePath\\": \\"files/runtime~Button.stories.js.map\\"
+  \\"outputFilePath\\": \\"files/src__Button.stories.js.js.map\\"
  },
  {
-  \\"name\\": \\"runtime~Header.stories.js.map\\",
+  \\"name\\": \\"src__Header.stories.js.js.map\\",
   \\"namespace\\": \\"default\\",
-  \\"outputFilePath\\": \\"files/runtime~Header.stories.js.map\\"
+  \\"outputFilePath\\": \\"files/src__Header.stories.js.js.map\\"
  },
  {
-  \\"name\\": \\"runtime~Page.stories.js.map\\",
+  \\"name\\": \\"src__Page.stories.js.js.map\\",
   \\"namespace\\": \\"default\\",
-  \\"outputFilePath\\": \\"files/runtime~Page.stories.js.map\\"
+  \\"outputFilePath\\": \\"files/src__Page.stories.js.js.map\\"
  },
  {
   \\"name\\": \\"iframe.html\\",
@@ -144,16 +144,16 @@ exports[`run bundle command 3`] = `
    }
   ],
   \\"gitPath\\": \\"packages/integration-tests-storybook-6_1_x/src/Button.stories.js\\",
-  \\"name\\": \\"Button.stories\\",
+  \\"name\\": \\"src__Button.stories.js\\",
   \\"namespace\\": \\"default\\",
   \\"filePath\\": \\"src/Button.stories.js\\",
   \\"files\\": [
-   \\"runtime~Button.stories.js\\",
-   \\"runtime~Button.stories.js.map\\",
+   \\"runtime~src__Button.stories.js.js\\",
+   \\"runtime~src__Button.stories.js.js.map\\",
    \\"vendors.js\\",
    \\"vendors.js.map\\",
-   \\"Button.stories.js\\",
-   \\"Button.stories.js.map\\"
+   \\"src__Button.stories.js.js\\",
+   \\"src__Button.stories.js.js.map\\"
   ]
  },
  {
@@ -180,16 +180,16 @@ exports[`run bundle command 3`] = `
    }
   ],
   \\"gitPath\\": \\"packages/integration-tests-storybook-6_1_x/src/Header.stories.js\\",
-  \\"name\\": \\"Header.stories\\",
+  \\"name\\": \\"src__Header.stories.js\\",
   \\"namespace\\": \\"default\\",
   \\"filePath\\": \\"src/Header.stories.js\\",
   \\"files\\": [
-   \\"runtime~Header.stories.js\\",
-   \\"runtime~Header.stories.js.map\\",
+   \\"runtime~src__Header.stories.js.js\\",
+   \\"runtime~src__Header.stories.js.js.map\\",
    \\"vendors.js\\",
    \\"vendors.js.map\\",
-   \\"Header.stories.js\\",
-   \\"Header.stories.js.map\\"
+   \\"src__Header.stories.js.js\\",
+   \\"src__Header.stories.js.js.map\\"
   ]
  },
  {
@@ -220,16 +220,16 @@ exports[`run bundle command 3`] = `
    }
   ],
   \\"gitPath\\": \\"packages/integration-tests-storybook-6_1_x/src/Page.stories.js\\",
-  \\"name\\": \\"Page.stories\\",
+  \\"name\\": \\"src__Page.stories.js\\",
   \\"namespace\\": \\"default\\",
   \\"filePath\\": \\"src/Page.stories.js\\",
   \\"files\\": [
-   \\"runtime~Page.stories.js\\",
-   \\"runtime~Page.stories.js.map\\",
+   \\"runtime~src__Page.stories.js.js\\",
+   \\"runtime~src__Page.stories.js.js.map\\",
    \\"vendors.js\\",
    \\"vendors.js.map\\",
-   \\"Page.stories.js\\",
-   \\"Page.stories.js.map\\"
+   \\"src__Page.stories.js.js\\",
+   \\"src__Page.stories.js.js.map\\"
   ]
  }
 ]"
diff --git a/packages/integration-tests-storybook-6_2_x/test/__snapshots__/bundle.integration.ts.snap b/packages/integration-tests-storybook-6_2_x/test/__snapshots__/bundle.integration.ts.snap
index fdc7f588..bbc30302 100644
--- a/packages/integration-tests-storybook-6_2_x/test/__snapshots__/bundle.integration.ts.snap
+++ b/packages/integration-tests-storybook-6_2_x/test/__snapshots__/bundle.integration.ts.snap
@@ -23,34 +23,34 @@ exports[`run bundle command 2`] = `
   \\"outputFilePath\\": \\"files/vendors.js\\"
  },
  {
-  \\"name\\": \\"Button.stories.js\\",
+  \\"name\\": \\"runtime~src__Button.stories.js.js\\",
   \\"namespace\\": \\"default\\",
-  \\"outputFilePath\\": \\"files/Button.stories.js\\"
+  \\"outputFilePath\\": \\"files/runtime~src__Button.stories.js.js\\"
  },
  {
-  \\"name\\": \\"Header.stories.js\\",
+  \\"name\\": \\"runtime~src__Header.stories.js.js\\",
   \\"namespace\\": \\"default\\",
-  \\"outputFilePath\\": \\"files/Header.stories.js\\"
+  \\"outputFilePath\\": \\"files/runtime~src__Header.stories.js.js\\"
  },
  {
-  \\"name\\": \\"Page.stories.js\\",
+  \\"name\\": \\"runtime~src__Page.stories.js.js\\",
   \\"namespace\\": \\"default\\",
-  \\"outputFilePath\\": \\"files/Page.stories.js\\"
+  \\"outputFilePath\\": \\"files/runtime~src__Page.stories.js.js\\"
  },
  {
-  \\"name\\": \\"runtime~Button.stories.js\\",
+  \\"name\\": \\"src__Button.stories.js.js\\",
   \\"namespace\\": \\"default\\",
-  \\"outputFilePath\\": \\"files/runtime~Button.stories.js\\"
+  \\"outputFilePath\\": \\"files/src__Button.stories.js.js\\"
  },
  {
-  \\"name\\": \\"runtime~Header.stories.js\\",
+  \\"name\\": \\"src__Header.stories.js.js\\",
   \\"namespace\\": \\"default\\",
-  \\"outputFilePath\\": \\"files/runtime~Header.stories.js\\"
+  \\"outputFilePath\\": \\"files/src__Header.stories.js.js\\"
  },
  {
-  \\"name\\": \\"runtime~Page.stories.js\\",
+  \\"name\\": \\"src__Page.stories.js.js\\",
   \\"namespace\\": \\"default\\",
-  \\"outputFilePath\\": \\"files/runtime~Page.stories.js\\"
+  \\"outputFilePath\\": \\"files/src__Page.stories.js.js\\"
  },
  {
   \\"name\\": \\"vendors.js.LICENSE.txt\\",
@@ -114,14 +114,14 @@ exports[`run bundle command 3`] = `
    }
   ],
   \\"gitPath\\": \\"packages/integration-tests-storybook-6_2_x/src/Button.stories.js\\",
-  \\"name\\": \\"Button.stories\\",
+  \\"name\\": \\"src__Button.stories.js\\",
   \\"namespace\\": \\"default\\",
   \\"filePath\\": \\"src/Button.stories.js\\",
   \\"files\\": [
-   \\"runtime~Button.stories.js\\",
+   \\"runtime~src__Button.stories.js.js\\",
    \\"vendors.js\\",
    \\"vendors.js.map\\",
-   \\"Button.stories.js\\"
+   \\"src__Button.stories.js.js\\"
   ]
  },
  {
@@ -148,14 +148,14 @@ exports[`run bundle command 3`] = `
    }
   ],
   \\"gitPath\\": \\"packages/integration-tests-storybook-6_2_x/src/Header.stories.js\\",
-  \\"name\\": \\"Header.stories\\",
+  \\"name\\": \\"src__Header.stories.js\\",
   \\"namespace\\": \\"default\\",
   \\"filePath\\": \\"src/Header.stories.js\\",
   \\"files\\": [
-   \\"runtime~Header.stories.js\\",
+   \\"runtime~src__Header.stories.js.js\\",
    \\"vendors.js\\",
    \\"vendors.js.map\\",
-   \\"Header.stories.js\\"
+   \\"src__Header.stories.js.js\\"
   ]
  },
  {
@@ -186,14 +186,14 @@ exports[`run bundle command 3`] = `
    }
   ],
   \\"gitPath\\": \\"packages/integration-tests-storybook-6_2_x/src/Page.stories.js\\",
-  \\"name\\": \\"Page.stories\\",
+  \\"name\\": \\"src__Page.stories.js\\",
   \\"namespace\\": \\"default\\",
   \\"filePath\\": \\"src/Page.stories.js\\",
   \\"files\\": [
-   \\"runtime~Page.stories.js\\",
+   \\"runtime~src__Page.stories.js.js\\",
    \\"vendors.js\\",
    \\"vendors.js.map\\",
-   \\"Page.stories.js\\"
+   \\"src__Page.stories.js.js\\"
   ]
  }
 ]"
diff --git a/packages/integration-tests-storybook-6_3_x/test/__snapshots__/bundle.integration.ts.snap b/packages/integration-tests-storybook-6_3_x/test/__snapshots__/bundle.integration.ts.snap
index 704c9380..5846a98f 100644
--- a/packages/integration-tests-storybook-6_3_x/test/__snapshots__/bundle.integration.ts.snap
+++ b/packages/integration-tests-storybook-6_3_x/test/__snapshots__/bundle.integration.ts.snap
@@ -23,34 +23,34 @@ exports[`run bundle command 2`] = `
   \\"outputFilePath\\": \\"files/vendors.js\\"
  },
  {
-  \\"name\\": \\"Button.stories.js\\",
+  \\"name\\": \\"runtime~src__Button.stories.js.js\\",
   \\"namespace\\": \\"default\\",
-  \\"outputFilePath\\": \\"files/Button.stories.js\\"
+  \\"outputFilePath\\": \\"files/runtime~src__Button.stories.js.js\\"
  },
  {
-  \\"name\\": \\"Header.stories.js\\",
+  \\"name\\": \\"runtime~src__Header.stories.js.js\\",
   \\"namespace\\": \\"default\\",
-  \\"outputFilePath\\": \\"files/Header.stories.js\\"
+  \\"outputFilePath\\": \\"files/runtime~src__Header.stories.js.js\\"
  },
  {
-  \\"name\\": \\"Page.stories.js\\",
+  \\"name\\": \\"runtime~src__Page.stories.js.js\\",
   \\"namespace\\": \\"default\\",
-  \\"outputFilePath\\": \\"files/Page.stories.js\\"
+  \\"outputFilePath\\": \\"files/runtime~src__Page.stories.js.js\\"
  },
  {
-  \\"name\\": \\"runtime~Button.stories.js\\",
+  \\"name\\": \\"src__Button.stories.js.js\\",
   \\"namespace\\": \\"default\\",
-  \\"outputFilePath\\": \\"files/runtime~Button.stories.js\\"
+  \\"outputFilePath\\": \\"files/src__Button.stories.js.js\\"
  },
  {
-  \\"name\\": \\"runtime~Header.stories.js\\",
+  \\"name\\": \\"src__Header.stories.js.js\\",
   \\"namespace\\": \\"default\\",
-  \\"outputFilePath\\": \\"files/runtime~Header.stories.js\\"
+  \\"outputFilePath\\": \\"files/src__Header.stories.js.js\\"
  },
  {
-  \\"name\\": \\"runtime~Page.stories.js\\",
+  \\"name\\": \\"src__Page.stories.js.js\\",
   \\"namespace\\": \\"default\\",
-  \\"outputFilePath\\": \\"files/runtime~Page.stories.js\\"
+  \\"outputFilePath\\": \\"files/src__Page.stories.js.js\\"
  },
  {
   \\"name\\": \\"vendors.js.LICENSE.txt\\",
@@ -114,14 +114,14 @@ exports[`run bundle command 3`] = `
    }
   ],
   \\"gitPath\\": \\"packages/integration-tests-storybook-6_3_x/src/Button.stories.js\\",
-  \\"name\\": \\"Button.stories\\",
+  \\"name\\": \\"src__Button.stories.js\\",
   \\"namespace\\": \\"default\\",
   \\"filePath\\": \\"src/Button.stories.js\\",
   \\"files\\": [
-   \\"runtime~Button.stories.js\\",
+   \\"runtime~src__Button.stories.js.js\\",
    \\"vendors.js\\",
    \\"vendors.js.map\\",
-   \\"Button.stories.js\\"
+   \\"src__Button.stories.js.js\\"
   ]
  },
  {
@@ -148,14 +148,14 @@ exports[`run bundle command 3`] = `
    }
   ],
   \\"gitPath\\": \\"packages/integration-tests-storybook-6_3_x/src/Header.stories.js\\",
-  \\"name\\": \\"Header.stories\\",
+  \\"name\\": \\"src__Header.stories.js\\",
   \\"namespace\\": \\"default\\",
   \\"filePath\\": \\"src/Header.stories.js\\",
   \\"files\\": [
-   \\"runtime~Header.stories.js\\",
+   \\"runtime~src__Header.stories.js.js\\",
    \\"vendors.js\\",
    \\"vendors.js.map\\",
-   \\"Header.stories.js\\"
+   \\"src__Header.stories.js.js\\"
   ]
  },
  {
@@ -186,14 +186,14 @@ exports[`run bundle command 3`] = `
    }
   ],
   \\"gitPath\\": \\"packages/integration-tests-storybook-6_3_x/src/Page.stories.js\\",
-  \\"name\\": \\"Page.stories\\",
+  \\"name\\": \\"src__Page.stories.js\\",
   \\"namespace\\": \\"default\\",
   \\"filePath\\": \\"src/Page.stories.js\\",
   \\"files\\": [
-   \\"runtime~Page.stories.js\\",
+   \\"runtime~src__Page.stories.js.js\\",
    \\"vendors.js\\",
    \\"vendors.js.map\\",
-   \\"Page.stories.js\\"
+   \\"src__Page.stories.js.js\\"
   ]
  }
 ]"
diff --git a/packages/integration-tests/test/__snapshots__/bundle.integration.ts.snap b/packages/integration-tests/test/__snapshots__/bundle.integration.ts.snap
index 71945ef9..f75ecac8 100644
--- a/packages/integration-tests/test/__snapshots__/bundle.integration.ts.snap
+++ b/packages/integration-tests/test/__snapshots__/bundle.integration.ts.snap
@@ -28,54 +28,54 @@ exports[`run bundle command 2`] = `
   \\"outputFilePath\\": \\"files/vendors.js\\"
  },
  {
-  \\"name\\": \\"App.bojagi.css\\",
+  \\"name\\": \\"src__App.bojagi.js.css\\",
   \\"namespace\\": \\"default\\",
-  \\"outputFilePath\\": \\"files/App.bojagi.css\\"
+  \\"outputFilePath\\": \\"files/src__App.bojagi.js.css\\"
  },
  {
-  \\"name\\": \\"App.bojagi.js\\",
+  \\"name\\": \\"src__App.bojagi.js.js\\",
   \\"namespace\\": \\"default\\",
-  \\"outputFilePath\\": \\"files/App.bojagi.js\\"
+  \\"outputFilePath\\": \\"files/src__App.bojagi.js.js\\"
  },
  {
-  \\"name\\": \\"Box.bojagi.js\\",
+  \\"name\\": \\"src__components__Box.bojagi.js.js\\",
   \\"namespace\\": \\"default\\",
-  \\"outputFilePath\\": \\"files/Box.bojagi.js\\"
+  \\"outputFilePath\\": \\"files/src__components__Box.bojagi.js.js\\"
  },
  {
-  \\"name\\": \\"BoxWithButtons.bojagi.js\\",
+  \\"name\\": \\"src__components__BoxWithButtons.bojagi.js.js\\",
   \\"namespace\\": \\"default\\",
-  \\"outputFilePath\\": \\"files/BoxWithButtons.bojagi.js\\"
+  \\"outputFilePath\\": \\"files/src__components__BoxWithButtons.bojagi.js.js\\"
  },
  {
-  \\"name\\": \\"Button.bojagi.js\\",
+  \\"name\\": \\"src__components__Button.bojagi.js.js\\",
   \\"namespace\\": \\"default\\",
-  \\"outputFilePath\\": \\"files/Button.bojagi.js\\"
+  \\"outputFilePath\\": \\"files/src__components__Button.bojagi.js.js\\"
  },
  {
-  \\"name\\": \\"Empty.bojagi.js\\",
+  \\"name\\": \\"src__components__Empty.bojagi.js.js\\",
   \\"namespace\\": \\"default\\",
-  \\"outputFilePath\\": \\"files/Empty.bojagi.js\\"
+  \\"outputFilePath\\": \\"files/src__components__Empty.bojagi.js.js\\"
  },
  {
-  \\"name\\": \\"Hooks.bojagi.js\\",
+  \\"name\\": \\"src__components__Hooks.bojagi.js.js\\",
   \\"namespace\\": \\"default\\",
-  \\"outputFilePath\\": \\"files/Hooks.bojagi.js\\"
+  \\"outputFilePath\\": \\"files/src__components__Hooks.bojagi.js.js\\"
  },
  {
-  \\"name\\": \\"Lazy.bojagi.js\\",
+  \\"name\\": \\"src__components__Lazy.bojagi.js.js\\",
   \\"namespace\\": \\"default\\",
-  \\"outputFilePath\\": \\"files/Lazy.bojagi.js\\"
+  \\"outputFilePath\\": \\"files/src__components__Lazy.bojagi.js.js\\"
  },
  {
-  \\"name\\": \\"Logo.bojagi.js\\",
+  \\"name\\": \\"src__components__Logo.bojagi.js.js\\",
   \\"namespace\\": \\"default\\",
-  \\"outputFilePath\\": \\"files/Logo.bojagi.js\\"
+  \\"outputFilePath\\": \\"files/src__components__Logo.bojagi.js.js\\"
  },
  {
-  \\"name\\": \\"PingPong.bojagi.js\\",
+  \\"name\\": \\"src__components__PingPong.bojagi.js.js\\",
   \\"namespace\\": \\"default\\",
-  \\"outputFilePath\\": \\"files/PingPong.bojagi.js\\"
+  \\"outputFilePath\\": \\"files/src__components__PingPong.bojagi.js.js\\"
  },
  {
   \\"name\\": \\"10.js\\",
@@ -118,7 +118,7 @@ exports[`run bundle command 2`] = `
 exports[`run bundle command 3`] = `
 "[
  {
-  \\"title\\": \\"App.bojagi\\",
+  \\"title\\": \\"Src__App.bojagi.js\\",
   \\"fileName\\": \\"App.bojagi\\",
   \\"storyItems\\": [
    {
@@ -137,17 +137,17 @@ exports[`run bundle command 3`] = `
    }
   ],
   \\"gitPath\\": \\"packages/integration-tests/src/App.bojagi.js\\",
-  \\"name\\": \\"App.bojagi\\",
+  \\"name\\": \\"src__App.bojagi.js\\",
   \\"namespace\\": \\"default\\",
   \\"filePath\\": \\"src/App.bojagi.js\\",
   \\"files\\": [
    \\"vendors.js\\",
-   \\"App.bojagi.css\\",
-   \\"App.bojagi.js\\"
+   \\"src__App.bojagi.js.css\\",
+   \\"src__App.bojagi.js.js\\"
   ]
  },
  {
-  \\"title\\": \\"Box.bojagi\\",
+  \\"title\\": \\"Src__components__Box.bojagi.js\\",
   \\"fileName\\": \\"Box.bojagi\\",
   \\"storyItems\\": [
    {
@@ -182,16 +182,16 @@ exports[`run bundle command 3`] = `
    }
   ],
   \\"gitPath\\": \\"packages/integration-tests/src/components/Box.bojagi.js\\",
-  \\"name\\": \\"Box.bojagi\\",
+  \\"name\\": \\"src__components__Box.bojagi.js\\",
   \\"namespace\\": \\"default\\",
   \\"filePath\\": \\"src/components/Box.bojagi.js\\",
   \\"files\\": [
    \\"vendors.js\\",
-   \\"Box.bojagi.js\\"
+   \\"src__components__Box.bojagi.js.js\\"
   ]
  },
  {
-  \\"title\\": \\"Box With Buttons.bojagi\\",
+  \\"title\\": \\"Src__components__Box With Buttons.bojagi.js\\",
   \\"fileName\\": \\"BoxWithButtons.bojagi\\",
   \\"storyItems\\": [
    {
@@ -210,16 +210,16 @@ exports[`run bundle command 3`] = `
    }
   ],
   \\"gitPath\\": \\"packages/integration-tests/src/components/BoxWithButtons.bojagi.js\\",
-  \\"name\\": \\"BoxWithButtons.bojagi\\",
+  \\"name\\": \\"src__components__BoxWithButtons.bojagi.js\\",
   \\"namespace\\": \\"default\\",
   \\"filePath\\": \\"src/components/BoxWithButtons.bojagi.js\\",
   \\"files\\": [
    \\"vendors.js\\",
-   \\"BoxWithButtons.bojagi.js\\"
+   \\"src__components__BoxWithButtons.bojagi.js.js\\"
   ]
  },
  {
-  \\"title\\": \\"Button.bojagi\\",
+  \\"title\\": \\"Src__components__Button.bojagi.js\\",
   \\"fileName\\": \\"Button.bojagi\\",
   \\"storyItems\\": [
    {
@@ -242,16 +242,16 @@ exports[`run bundle command 3`] = `
    }
   ],
   \\"gitPath\\": \\"packages/integration-tests/src/components/Button.bojagi.js\\",
-  \\"name\\": \\"Button.bojagi\\",
+  \\"name\\": \\"src__components__Button.bojagi.js\\",
   \\"namespace\\": \\"default\\",
   \\"filePath\\": \\"src/components/Button.bojagi.js\\",
   \\"files\\": [
    \\"vendors.js\\",
-   \\"Button.bojagi.js\\"
+   \\"src__components__Button.bojagi.js.js\\"
   ]
  },
  {
-  \\"title\\": \\"Hooks.bojagi\\",
+  \\"title\\": \\"Src__components__Hooks.bojagi.js\\",
   \\"fileName\\": \\"Hooks.bojagi\\",
   \\"storyItems\\": [
    {
@@ -266,16 +266,16 @@ exports[`run bundle command 3`] = `
    }
   ],
   \\"gitPath\\": \\"packages/integration-tests/src/components/Hooks.bojagi.js\\",
-  \\"name\\": \\"Hooks.bojagi\\",
+  \\"name\\": \\"src__components__Hooks.bojagi.js\\",
   \\"namespace\\": \\"default\\",
   \\"filePath\\": \\"src/components/Hooks.bojagi.js\\",
   \\"files\\": [
    \\"vendors.js\\",
-   \\"Hooks.bojagi.js\\"
+   \\"src__components__Hooks.bojagi.js.js\\"
   ]
  },
  {
-  \\"title\\": \\"Lazy.bojagi\\",
+  \\"title\\": \\"Src__components__Lazy.bojagi.js\\",
   \\"fileName\\": \\"Lazy.bojagi\\",
   \\"storyItems\\": [
    {
@@ -294,16 +294,16 @@ exports[`run bundle command 3`] = `
    }
   ],
   \\"gitPath\\": \\"packages/integration-tests/src/components/Lazy.bojagi.js\\",
-  \\"name\\": \\"Lazy.bojagi\\",
+  \\"name\\": \\"src__components__Lazy.bojagi.js\\",
   \\"namespace\\": \\"default\\",
   \\"filePath\\": \\"src/components/Lazy.bojagi.js\\",
   \\"files\\": [
    \\"vendors.js\\",
-   \\"Lazy.bojagi.js\\"
+   \\"src__components__Lazy.bojagi.js.js\\"
   ]
  },
  {
-  \\"title\\": \\"Logo.bojagi\\",
+  \\"title\\": \\"Src__components__Logo.bojagi.js\\",
   \\"fileName\\": \\"Logo.bojagi\\",
   \\"storyItems\\": [
    {
@@ -322,16 +322,16 @@ exports[`run bundle command 3`] = `
    }
   ],
   \\"gitPath\\": \\"packages/integration-tests/src/components/Logo.bojagi.js\\",
-  \\"name\\": \\"Logo.bojagi\\",
+  \\"name\\": \\"src__components__Logo.bojagi.js\\",
   \\"namespace\\": \\"default\\",
   \\"filePath\\": \\"src/components/Logo.bojagi.js\\",
   \\"files\\": [
    \\"vendors.js\\",
-   \\"Logo.bojagi.js\\"
+   \\"src__components__Logo.bojagi.js.js\\"
   ]
  },
  {
-  \\"title\\": \\"Ping Pong.bojagi\\",
+  \\"title\\": \\"Src__components__Ping Pong.bojagi.js\\",
   \\"fileName\\": \\"PingPong.bojagi\\",
   \\"storyItems\\": [
    {
@@ -358,12 +358,12 @@ exports[`run bundle command 3`] = `
    }
   ],
   \\"gitPath\\": \\"packages/integration-tests/src/components/PingPong.bojagi.js\\",
-  \\"name\\": \\"PingPong.bojagi\\",
+  \\"name\\": \\"src__components__PingPong.bojagi.js\\",
   \\"namespace\\": \\"default\\",
   \\"filePath\\": \\"src/components/PingPong.bojagi.js\\",
   \\"files\\": [
    \\"vendors.js\\",
-   \\"PingPong.bojagi.js\\"
+   \\"src__components__PingPong.bojagi.js.js\\"
   ]
  }
 ]"