diff --git a/addons/storyshots/storyshots-core/stories/__snapshots__/storyshot.enzyme.test.js.snap b/addons/storyshots/storyshots-core/stories/__snapshots__/storyshot.enzyme.test.js.snap
index 75ec281cdcdc..2c7cbf790b68 100644
--- a/addons/storyshots/storyshots-core/stories/__snapshots__/storyshot.enzyme.test.js.snap
+++ b/addons/storyshots/storyshots-core/stories/__snapshots__/storyshot.enzyme.test.js.snap
@@ -246,7 +246,7 @@ exports[`Storyshots Welcome MDX to Storybook 1`] = `
               }
             }
           >
-            src/stories/index.js
+            src/stories/1-Button.stories.js
           </code>
         </InlineCode>
         .)
@@ -450,7 +450,7 @@ exports[`Storyshots Welcome to Storybook 1`] = `
               }
             }
           >
-            src/stories/index.js
+            src/stories/1-Button.stories.js
           </code>
         </InlineCode>
         .)
diff --git a/addons/storyshots/storyshots-core/stories/__snapshots__/storyshot.shallow.test.js.snap b/addons/storyshots/storyshots-core/stories/__snapshots__/storyshot.shallow.test.js.snap
index 445c7ba9a4fa..caccf51b2609 100644
--- a/addons/storyshots/storyshots-core/stories/__snapshots__/storyshot.shallow.test.js.snap
+++ b/addons/storyshots/storyshots-core/stories/__snapshots__/storyshot.shallow.test.js.snap
@@ -139,7 +139,7 @@ exports[`Storyshots Welcome MDX to Storybook 1`] = `
     </InlineCode>
      stories located at 
     <InlineCode>
-      src/stories/index.js
+      src/stories/1-Button.stories.js
     </InlineCode>
     .)
   </p>
@@ -213,7 +213,7 @@ exports[`Storyshots Welcome to Storybook 1`] = `
     </InlineCode>
      stories located at 
     <InlineCode>
-      src/stories/index.js
+      src/stories/1-Button.stories.js
     </InlineCode>
     .)
   </p>
diff --git a/addons/storyshots/storyshots-core/stories/__snapshots__/storyshot.shallowWithOptions.test.js.snap b/addons/storyshots/storyshots-core/stories/__snapshots__/storyshot.shallowWithOptions.test.js.snap
index 445c7ba9a4fa..caccf51b2609 100644
--- a/addons/storyshots/storyshots-core/stories/__snapshots__/storyshot.shallowWithOptions.test.js.snap
+++ b/addons/storyshots/storyshots-core/stories/__snapshots__/storyshot.shallowWithOptions.test.js.snap
@@ -139,7 +139,7 @@ exports[`Storyshots Welcome MDX to Storybook 1`] = `
     </InlineCode>
      stories located at 
     <InlineCode>
-      src/stories/index.js
+      src/stories/1-Button.stories.js
     </InlineCode>
     .)
   </p>
@@ -213,7 +213,7 @@ exports[`Storyshots Welcome to Storybook 1`] = `
     </InlineCode>
      stories located at 
     <InlineCode>
-      src/stories/index.js
+      src/stories/1-Button.stories.js
     </InlineCode>
     .)
   </p>
diff --git a/addons/storyshots/storyshots-core/stories/__snapshots__/storyshot.snapshotWithOptionsFunction.test.js.snap b/addons/storyshots/storyshots-core/stories/__snapshots__/storyshot.snapshotWithOptionsFunction.test.js.snap
index 30257648479e..8a70ef0ff961 100644
--- a/addons/storyshots/storyshots-core/stories/__snapshots__/storyshot.snapshotWithOptionsFunction.test.js.snap
+++ b/addons/storyshots/storyshots-core/stories/__snapshots__/storyshot.snapshotWithOptionsFunction.test.js.snap
@@ -213,7 +213,7 @@ exports[`Storyshots Welcome MDX to Storybook 1`] = `
         }
       }
     >
-      src/stories/index.js
+      src/stories/1-Button.stories.js
     </code>
     .)
   </p>
@@ -387,7 +387,7 @@ exports[`Storyshots Welcome to Storybook 1`] = `
         }
       }
     >
-      src/stories/index.js
+      src/stories/1-Button.stories.js
     </code>
     .)
   </p>
diff --git a/addons/storyshots/storyshots-core/stories/required_with_context/__snapshots__/Welcome.stories.foo b/addons/storyshots/storyshots-core/stories/required_with_context/__snapshots__/Welcome.stories.foo
index 4662f49c8761..9f31125b1177 100644
--- a/addons/storyshots/storyshots-core/stories/required_with_context/__snapshots__/Welcome.stories.foo
+++ b/addons/storyshots/storyshots-core/stories/required_with_context/__snapshots__/Welcome.stories.foo
@@ -117,7 +117,7 @@ exports[`Storyshots Welcome to Storybook 1`] = `
         }
       }
     >
-      src/stories/index.js
+      src/stories/1-Button.stories.js
     </code>
     .)
   </p>
diff --git a/addons/storyshots/storyshots-core/stories/required_with_context/__snapshots__/Welcome.stories.storyshot b/addons/storyshots/storyshots-core/stories/required_with_context/__snapshots__/Welcome.stories.storyshot
index 97712dfd14e0..357ca8ea27ac 100644
--- a/addons/storyshots/storyshots-core/stories/required_with_context/__snapshots__/Welcome.stories.storyshot
+++ b/addons/storyshots/storyshots-core/stories/required_with_context/__snapshots__/Welcome.stories.storyshot
@@ -117,7 +117,7 @@ exports[`Storyshots Welcome MDX to Storybook 1`] = `
         }
       }
     >
-      src/stories/index.js
+      src/stories/1-Button.stories.js
     </code>
     .)
   </p>
@@ -291,7 +291,7 @@ exports[`Storyshots Welcome to Storybook 1`] = `
         }
       }
     >
-      src/stories/index.js
+      src/stories/1-Button.stories.js
     </code>
     .)
   </p>
diff --git a/app/react/src/demo/Welcome.tsx b/app/react/src/demo/Welcome.tsx
index e941571d3240..67ba2904f23e 100644
--- a/app/react/src/demo/Welcome.tsx
+++ b/app/react/src/demo/Welcome.tsx
@@ -151,7 +151,7 @@ const Welcome: FunctionComponent<WelcomeProps> = ({ showApp }) => (
       You can also edit those components and see changes right away.
       <br />
       (Try editing the <InlineCode>Button</InlineCode> stories located at&nbsp;
-      <InlineCode>src/stories/index.js</InlineCode>
+      <InlineCode>src/stories/1-Button.stories.js</InlineCode>
       .)
     </p>
     <p>
diff --git a/examples/mithril-kitchen-sink/src/Welcome.js b/examples/mithril-kitchen-sink/src/Welcome.js
index 3826e784d534..7a3cff5b761c 100644
--- a/examples/mithril-kitchen-sink/src/Welcome.js
+++ b/examples/mithril-kitchen-sink/src/Welcome.js
@@ -109,7 +109,7 @@ const Welcome = {
         You can also edit those components and see changes right away.
         <br />
         (Try editing the <InlineCode>Button</InlineCode> stories located at&nbsp;
-        <InlineCode>src/stories/index.js</InlineCode>
+        <InlineCode>src/stories/1-Button.stories.js</InlineCode>
         .)
       </p>
       <p>
diff --git a/examples/preact-kitchen-sink/src/Welcome.js b/examples/preact-kitchen-sink/src/Welcome.js
index fc7649231ddd..c9c86cd43780 100644
--- a/examples/preact-kitchen-sink/src/Welcome.js
+++ b/examples/preact-kitchen-sink/src/Welcome.js
@@ -112,7 +112,7 @@ const Welcome = ({ showApp }) => (
       You can also edit those components and see changes right away.
       <br />
       (Try editing the <InlineCode>Button</InlineCode> stories located at&nbsp;
-      <InlineCode>src/stories/index.js</InlineCode>
+      <InlineCode>src/stories/1-Button.stories.js</InlineCode>
       .)
     </p>
     <p>
diff --git a/examples/preact-kitchen-sink/src/stories/__snapshots__/welcome.stories.storyshot b/examples/preact-kitchen-sink/src/stories/__snapshots__/welcome.stories.storyshot
index 9ab4da81238d..5d740bb097a3 100644
--- a/examples/preact-kitchen-sink/src/stories/__snapshots__/welcome.stories.storyshot
+++ b/examples/preact-kitchen-sink/src/stories/__snapshots__/welcome.stories.storyshot
@@ -128,7 +128,7 @@ exports[`Storyshots Welcome to Storybook 1`] = `
         }
       }
     >
-      src/stories/index.js
+      src/stories/1-Button.stories.js
     </code>
     .)
   </p>
diff --git a/lib/cli/generators/MITHRIL/template-csf/stories/Welcome.js b/lib/cli/generators/MITHRIL/template-csf/stories/Welcome.js
index 2c0f425a5f8c..51b005563ce5 100644
--- a/lib/cli/generators/MITHRIL/template-csf/stories/Welcome.js
+++ b/lib/cli/generators/MITHRIL/template-csf/stories/Welcome.js
@@ -150,7 +150,7 @@ const Welcome = {
         You can also edit those components and see changes right away.
         <br />
         (Try editing the <InlineCode>Button</InlineCode> stories located at&nbsp;
-        <InlineCode>src/stories/index.js</InlineCode>
+        <InlineCode>src/stories/1-Button.stories.js</InlineCode>
         .)
       </p>
       <p>
diff --git a/lib/cli/generators/PREACT/template-csf/stories/Welcome.js b/lib/cli/generators/PREACT/template-csf/stories/Welcome.js
index 3a8e289817f4..de792f888c55 100644
--- a/lib/cli/generators/PREACT/template-csf/stories/Welcome.js
+++ b/lib/cli/generators/PREACT/template-csf/stories/Welcome.js
@@ -101,7 +101,7 @@ const Welcome = ({ showApp }) => (
       You can also edit those components and see changes right away.
       <br />
       (Try editing the <InlineCode>Button</InlineCode> stories located at&nbsp;
-      <InlineCode>src/stories/index.js</InlineCode>
+      <InlineCode>src/stories/1-Button.stories.js</InlineCode>
       .)
     </p>
     <p>
diff --git a/lib/cli/generators/RAX/template-csf/stories/Welcome.js b/lib/cli/generators/RAX/template-csf/stories/Welcome.js
index 2c590d205b9a..340844748cd3 100644
--- a/lib/cli/generators/RAX/template-csf/stories/Welcome.js
+++ b/lib/cli/generators/RAX/template-csf/stories/Welcome.js
@@ -92,7 +92,7 @@ const Welcome = ({ showApp }) => (
     <P>
       Just like that, you can add your own components as stories. You can also edit those components
       and see changes right away. (Try editing the <InlineCode>Button</InlineCode> stories located
-      at <InlineCode>src/stories/index.js</InlineCode>
+      at <InlineCode>src/stories/1-Button.stories.js</InlineCode>
       .)
     </P>
     <P>