diff --git a/examples/cra-kitchen-sink/src/stories/__snapshots__/addon-actions.stories.storyshot b/examples/cra-kitchen-sink/src/stories/__snapshots__/addon-actions.stories.storyshot
new file mode 100644
index 00000000000..fc9ac6baeee
--- /dev/null
+++ b/examples/cra-kitchen-sink/src/stories/__snapshots__/addon-actions.stories.storyshot
@@ -0,0 +1,41 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Storyshots Addons|Actions Circular Payload 1`] = `
+<button
+  class="css-1yjiefr"
+>
+  Circular Payload
+</button>
+`;
+
+exports[`Storyshots Addons|Actions Decorated Action 1`] = `
+<button
+  class="css-1yjiefr"
+>
+  First Argument
+</button>
+`;
+
+exports[`Storyshots Addons|Actions Function Name 1`] = `
+<button
+  class="css-1yjiefr"
+>
+  Action.name: fnName
+</button>
+`;
+
+exports[`Storyshots Addons|Actions Hello World 1`] = `
+<button
+  class="css-1yjiefr"
+>
+  Hello World
+</button>
+`;
+
+exports[`Storyshots Addons|Actions Reserved keyword as name 1`] = `
+<button
+  class="css-1yjiefr"
+>
+  Delete
+</button>
+`;
diff --git a/examples/official-storybook/stories/__snapshots__/addon-backgrounds.stories.storyshot b/examples/official-storybook/stories/__snapshots__/addon-backgrounds.stories.storyshot
index 47cb40abe1b..1d884b6c1c4 100644
--- a/examples/official-storybook/stories/__snapshots__/addon-backgrounds.stories.storyshot
+++ b/examples/official-storybook/stories/__snapshots__/addon-backgrounds.stories.storyshot
@@ -1,6 +1,6 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`Storyshots Addon Backgrounds story 1 1`] = `
+exports[`Storyshots Addons|Backgrounds story 1 1`] = `
 <div
   style="overflow:scroll;position:fixed;top:0;bottom:0;right:0;left:0;transition:background 0.25s ease-in-out;background-position:center;background-size:cover;background:transparent"
 >
@@ -10,7 +10,7 @@ exports[`Storyshots Addon Backgrounds story 1 1`] = `
 </div>
 `;
 
-exports[`Storyshots Addon Backgrounds story 2 1`] = `
+exports[`Storyshots Addons|Backgrounds story 2 1`] = `
 <div
   style="overflow:scroll;position:fixed;top:0;bottom:0;right:0;left:0;transition:background 0.25s ease-in-out;background-position:center;background-size:cover;background:transparent"
 >
diff --git a/examples/official-storybook/stories/__snapshots__/addon-jest.stories.storyshot b/examples/official-storybook/stories/__snapshots__/addon-jest.stories.storyshot
index 652ddaa6b0a..906dfc2bbc4 100644
--- a/examples/official-storybook/stories/__snapshots__/addon-jest.stories.storyshot
+++ b/examples/official-storybook/stories/__snapshots__/addon-jest.stories.storyshot
@@ -1,6 +1,6 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`Storyshots Addon jest withTests 1`] = `
+exports[`Storyshots Addons|jest withTests 1`] = `
 <div>
   <p>
     Hello
diff --git a/examples/official-storybook/stories/__snapshots__/addon-knobs.stories.storyshot b/examples/official-storybook/stories/__snapshots__/addon-knobs.stories.storyshot
index 7ff7c24426e..0bf3a0717c7 100644
--- a/examples/official-storybook/stories/__snapshots__/addon-knobs.stories.storyshot
+++ b/examples/official-storybook/stories/__snapshots__/addon-knobs.stories.storyshot
@@ -1,6 +1,6 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`Storyshots Addon Knobs.withKnobs triggers actions via button 1`] = `
+exports[`Storyshots Addons|Knobs.withKnobs triggers actions via button 1`] = `
 <div>
   <p>
     Hit the knob load button and it should trigger an async load after a short delay
@@ -11,7 +11,7 @@ exports[`Storyshots Addon Knobs.withKnobs triggers actions via button 1`] = `
 </div>
 `;
 
-exports[`Storyshots Addon Knobs.withKnobs tweaks static values 1`] = `
+exports[`Storyshots Addons|Knobs.withKnobs tweaks static values 1`] = `
 <div
   style="background-color:#ffff00;border:3px solid #ff00ff;padding:10px"
 >
@@ -51,7 +51,7 @@ exports[`Storyshots Addon Knobs.withKnobs tweaks static values 1`] = `
 </div>
 `;
 
-exports[`Storyshots Addon Knobs.withKnobsOptions triggers actions via button with debounce delay 1`] = `
+exports[`Storyshots Addons|Knobs.withKnobsOptions triggers actions via button with debounce delay 1`] = `
 <div>
   <p>
     Hit the knob load button and it should trigger an async load after a short delay
@@ -62,7 +62,7 @@ exports[`Storyshots Addon Knobs.withKnobsOptions triggers actions via button wit
 </div>
 `;
 
-exports[`Storyshots Addon Knobs.withKnobsOptions tweaks static values with debounce delay 1`] = `
+exports[`Storyshots Addons|Knobs.withKnobsOptions tweaks static values with debounce delay 1`] = `
 <div
   style="background-color:#ffff00;border:3px solid #ff00ff;padding:10px"
 >
diff --git a/examples/official-storybook/stories/__snapshots__/addon-links.stories.storyshot b/examples/official-storybook/stories/__snapshots__/addon-links.stories.storyshot
index b95a4d1e1ca..b02867dfb0f 100644
--- a/examples/official-storybook/stories/__snapshots__/addon-links.stories.storyshot
+++ b/examples/official-storybook/stories/__snapshots__/addon-links.stories.storyshot
@@ -1,24 +1,24 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`Storyshots Addon Links.Button First 1`] = `
+exports[`Storyshots Addons|Links.Button First 1`] = `
 <button>
   Go to "Second"
 </button>
 `;
 
-exports[`Storyshots Addon Links.Button Second 1`] = `
+exports[`Storyshots Addons|Links.Button Second 1`] = `
 <button>
   Go to "First"
 </button>
 `;
 
-exports[`Storyshots Addon Links.Href log 1`] = `
+exports[`Storyshots Addons|Links.Href log 1`] = `
 <span>
   See action logger
 </span>
 `;
 
-exports[`Storyshots Addon Links.Link First 1`] = `
+exports[`Storyshots Addons|Links.Link First 1`] = `
 <a
   href="/"
 >
@@ -26,7 +26,7 @@ exports[`Storyshots Addon Links.Link First 1`] = `
 </a>
 `;
 
-exports[`Storyshots Addon Links.Link Second 1`] = `
+exports[`Storyshots Addons|Links.Link Second 1`] = `
 <a
   href="/"
 >
@@ -34,7 +34,7 @@ exports[`Storyshots Addon Links.Link Second 1`] = `
 </a>
 `;
 
-exports[`Storyshots Addon Links.Select First 1`] = `
+exports[`Storyshots Addons|Links.Select First 1`] = `
 <a
   href="/"
 >
@@ -42,7 +42,7 @@ exports[`Storyshots Addon Links.Select First 1`] = `
 </a>
 `;
 
-exports[`Storyshots Addon Links.Select Index 1`] = `
+exports[`Storyshots Addons|Links.Select Index 1`] = `
 <select>
   <option
     selected=""
@@ -61,7 +61,7 @@ exports[`Storyshots Addon Links.Select Index 1`] = `
 </select>
 `;
 
-exports[`Storyshots Addon Links.Select Second 1`] = `
+exports[`Storyshots Addons|Links.Select Second 1`] = `
 <a
   href="/"
 >
@@ -69,7 +69,7 @@ exports[`Storyshots Addon Links.Select Second 1`] = `
 </a>
 `;
 
-exports[`Storyshots Addon Links.Select Third 1`] = `
+exports[`Storyshots Addons|Links.Select Third 1`] = `
 <a
   href="/"
 >
diff --git a/examples/official-storybook/stories/__snapshots__/addon-notes.stories.storyshot b/examples/official-storybook/stories/__snapshots__/addon-notes.stories.storyshot
index 9c221f6c80a..c63bb34386e 100644
--- a/examples/official-storybook/stories/__snapshots__/addon-notes.stories.storyshot
+++ b/examples/official-storybook/stories/__snapshots__/addon-notes.stories.storyshot
@@ -1,18 +1,18 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`Storyshots Addon Notes using deprecated API 1`] = `
+exports[`Storyshots Addons|Notes using deprecated API 1`] = `
 <button>
   😀 😎 👍 💯
 </button>
 `;
 
-exports[`Storyshots Addon Notes withNotes 1`] = `
+exports[`Storyshots Addons|Notes withNotes 1`] = `
 <button>
   Button with notes - check the notes panel for details
 </button>
 `;
 
-exports[`Storyshots Addon Notes withNotes rendering imported markdown 1`] = `
+exports[`Storyshots Addons|Notes withNotes rendering imported markdown 1`] = `
 <button>
   Button with notes - check the notes panel for details
 </button>