diff --git a/src/description/__snapshots__/conditional-description.stories.storyshot b/src/description/__snapshots__/conditional-description.stories.storyshot
index 8ad980a5..18a24f63 100644
--- a/src/description/__snapshots__/conditional-description.stories.storyshot
+++ b/src/description/__snapshots__/conditional-description.stories.storyshot
@@ -1,6 +1,6 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`Storyshots Description/ConditionalDescription Conditional Description 1`] = `
+exports[`Storyshots Description/Conditional Description Conditional Description 1`] = `
 <dl
   className="description-list--single description-list"
 >
@@ -19,7 +19,7 @@ exports[`Storyshots Description/ConditionalDescription Conditional Description 1
 </dl>
 `;
 
-exports[`Storyshots Description/ConditionalDescription With A Date 1`] = `
+exports[`Storyshots Description/Conditional Description With A Date 1`] = `
 <dl
   className="description-list--single description-list"
 >
@@ -41,21 +41,21 @@ exports[`Storyshots Description/ConditionalDescription With A Date 1`] = `
 </dl>
 `;
 
-exports[`Storyshots Description/ConditionalDescription With False Condition 1`] = `null`;
+exports[`Storyshots Description/Conditional Description With False Condition 1`] = `null`;
 
-exports[`Storyshots Description/ConditionalDescription With Falsy Condition 1`] = `null`;
+exports[`Storyshots Description/Conditional Description With Falsy Condition 1`] = `null`;
 
-exports[`Storyshots Description/ConditionalDescription With Falsy Nested Value 1`] = `null`;
+exports[`Storyshots Description/Conditional Description With Falsy Nested Value 1`] = `null`;
 
-exports[`Storyshots Description/ConditionalDescription With Falsy Nested Value And Condition 1`] = `null`;
+exports[`Storyshots Description/Conditional Description With Falsy Nested Value And Condition 1`] = `null`;
 
-exports[`Storyshots Description/ConditionalDescription With Falsy Value 1`] = `null`;
+exports[`Storyshots Description/Conditional Description With Falsy Value 1`] = `null`;
 
-exports[`Storyshots Description/ConditionalDescription With Not A Date 1`] = `null`;
+exports[`Storyshots Description/Conditional Description With Not A Date 1`] = `null`;
 
-exports[`Storyshots Description/ConditionalDescription With Not A Time 1`] = `null`;
+exports[`Storyshots Description/Conditional Description With Not A Time 1`] = `null`;
 
-exports[`Storyshots Description/ConditionalDescription With True Condition 1`] = `
+exports[`Storyshots Description/Conditional Description With True Condition 1`] = `
 <dl
   className="description-list--single description-list"
 >
@@ -74,4 +74,4 @@ exports[`Storyshots Description/ConditionalDescription With True Condition 1`] =
 </dl>
 `;
 
-exports[`Storyshots Description/ConditionalDescription Without Value 1`] = `null`;
+exports[`Storyshots Description/Conditional Description Without Value 1`] = `null`;
diff --git a/src/description/__snapshots__/description-list.stories.storyshot b/src/description/__snapshots__/description-list.stories.storyshot
index 9290942f..ff681f57 100644
--- a/src/description/__snapshots__/description-list.stories.storyshot
+++ b/src/description/__snapshots__/description-list.stories.storyshot
@@ -1,6 +1,6 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`Storyshots Description/DescriptionList Description List 1`] = `
+exports[`Storyshots Description/Description List Description List 1`] = `
 <dl
   className="description-list"
 >
@@ -19,7 +19,7 @@ exports[`Storyshots Description/DescriptionList Description List 1`] = `
 </dl>
 `;
 
-exports[`Storyshots Description/DescriptionList List 1`] = `
+exports[`Storyshots Description/Description List List 1`] = `
 <dl
   className="description-list"
 >
@@ -74,7 +74,7 @@ exports[`Storyshots Description/DescriptionList List 1`] = `
 </dl>
 `;
 
-exports[`Storyshots Description/DescriptionList List With Multiple Descriptions 1`] = `
+exports[`Storyshots Description/Description List List With Multiple Descriptions 1`] = `
 <dl
   className="description-list"
 >
diff --git a/src/description/conditional-description.stories.tsx b/src/description/conditional-description.stories.tsx
index d9e9504c..3c1a1665 100644
--- a/src/description/conditional-description.stories.tsx
+++ b/src/description/conditional-description.stories.tsx
@@ -6,7 +6,7 @@ import {ConditionalDescription} from './conditional-description';
 
 export default {
   component: ConditionalDescription,
-  title: 'Description/ConditionalDescription',
+  title: 'Description/Conditional Description',
 };
 
 export const conditionalDescription = () => (
diff --git a/src/description/description-list.stories.tsx b/src/description/description-list.stories.tsx
index 6ea0d36b..525e8d44 100644
--- a/src/description/description-list.stories.tsx
+++ b/src/description/description-list.stories.tsx
@@ -5,7 +5,7 @@ import {Description} from './description';
 
 export default {
   component: DescriptionList,
-  title: 'Description/DescriptionList',
+  title: 'Description/Description List',
 };
 
 export const descriptionList = () => (
diff --git a/src/outline/__snapshots__/section-heading.stories.storyshot b/src/outline/__snapshots__/section-heading.stories.storyshot
index d4fd3557..95e88add 100644
--- a/src/outline/__snapshots__/section-heading.stories.storyshot
+++ b/src/outline/__snapshots__/section-heading.stories.storyshot
@@ -1,6 +1,6 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`Storyshots Outline/SectionHeading With A Heading 1`] = `
+exports[`Storyshots Outline/Section Heading With A Heading 1`] = `
 <h1
   className="h1"
   id="o:1s:1-level-1"
@@ -13,7 +13,7 @@ exports[`Storyshots Outline/SectionHeading With A Heading 1`] = `
 </h1>
 `;
 
-exports[`Storyshots Outline/SectionHeading With Style Roots 1`] = `
+exports[`Storyshots Outline/Section Heading With Style Roots 1`] = `
 Array [
   <h1
     className="h1"
@@ -50,7 +50,7 @@ Array [
 ]
 `;
 
-exports[`Storyshots Outline/SectionHeading With Three Levels Of Nesting 1`] = `
+exports[`Storyshots Outline/Section Heading With Three Levels Of Nesting 1`] = `
 Array [
   <h1
     className="h1"
@@ -85,7 +85,7 @@ Array [
 ]
 `;
 
-exports[`Storyshots Outline/SectionHeading With Two Sibling Headings 1`] = `
+exports[`Storyshots Outline/Section Heading With Two Sibling Headings 1`] = `
 Array [
   <h1
     className="h1"
diff --git a/src/outline/section-heading.stories.tsx b/src/outline/section-heading.stories.tsx
index 1584c505..1b712f6e 100644
--- a/src/outline/section-heading.stories.tsx
+++ b/src/outline/section-heading.stories.tsx
@@ -5,7 +5,7 @@ import {SectionHeading} from './section-heading';
 
 export default {
   component: Section,
-  title: 'Outline/SectionHeading',
+  title: 'Outline/Section Heading',
 };
 
 export const withAHeading = () => (
diff --git a/src/renderers/any-renderer/__snapshots__/any-renderer.stories.storyshot b/src/renderers/any-renderer/__snapshots__/any-renderer.stories.storyshot
index ba891793..87d2f2a8 100644
--- a/src/renderers/any-renderer/__snapshots__/any-renderer.stories.storyshot
+++ b/src/renderers/any-renderer/__snapshots__/any-renderer.stories.storyshot
@@ -1,12 +1,12 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`Storyshots Renderers/AnyRenderer Any Renderer 1`] = `
+exports[`Storyshots Renderers/Any Renderer Any Renderer 1`] = `
 <span>
    - 
 </span>
 `;
 
-exports[`Storyshots Renderers/AnyRenderer Array 1`] = `
+exports[`Storyshots Renderers/Any Renderer Array 1`] = `
 <pre
   className="code code__pre"
 >
@@ -23,7 +23,7 @@ exports[`Storyshots Renderers/AnyRenderer Array 1`] = `
 </pre>
 `;
 
-exports[`Storyshots Renderers/AnyRenderer Boolean False 1`] = `
+exports[`Storyshots Renderers/Any Renderer Boolean False 1`] = `
 <span
   className="magic-boolean"
 >
@@ -31,7 +31,7 @@ exports[`Storyshots Renderers/AnyRenderer Boolean False 1`] = `
 </span>
 `;
 
-exports[`Storyshots Renderers/AnyRenderer Boolean True 1`] = `
+exports[`Storyshots Renderers/Any Renderer Boolean True 1`] = `
 <span
   className="magic-boolean"
 >
@@ -39,7 +39,7 @@ exports[`Storyshots Renderers/AnyRenderer Boolean True 1`] = `
 </span>
 `;
 
-exports[`Storyshots Renderers/AnyRenderer Date 1`] = `
+exports[`Storyshots Renderers/Any Renderer Date 1`] = `
 <time
   dateTime={"2020-01-01T00:00:00.000Z"}
   title="2020-01-01T00:00:00+00:00"
@@ -48,7 +48,7 @@ exports[`Storyshots Renderers/AnyRenderer Date 1`] = `
 </time>
 `;
 
-exports[`Storyshots Renderers/AnyRenderer Date String 1`] = `
+exports[`Storyshots Renderers/Any Renderer Date String 1`] = `
 <time
   dateTime={"2020-01-01T00:00:00.000Z"}
   title="2020-01-01T00:00:00+00:00"
@@ -57,9 +57,9 @@ exports[`Storyshots Renderers/AnyRenderer Date String 1`] = `
 </time>
 `;
 
-exports[`Storyshots Renderers/AnyRenderer Number 1`] = `"5"`;
+exports[`Storyshots Renderers/Any Renderer Number 1`] = `"5"`;
 
-exports[`Storyshots Renderers/AnyRenderer Obj 1`] = `
+exports[`Storyshots Renderers/Any Renderer Obj 1`] = `
 <pre
   className="code code__pre"
 >
@@ -82,15 +82,15 @@ exports[`Storyshots Renderers/AnyRenderer Obj 1`] = `
 </pre>
 `;
 
-exports[`Storyshots Renderers/AnyRenderer React Node 1`] = `
+exports[`Storyshots Renderers/Any Renderer React Node 1`] = `
 <p>
   foo
 </p>
 `;
 
-exports[`Storyshots Renderers/AnyRenderer String 1`] = `"foo"`;
+exports[`Storyshots Renderers/Any Renderer String 1`] = `"foo"`;
 
-exports[`Storyshots Renderers/AnyRenderer With Overrides 1`] = `
+exports[`Storyshots Renderers/Any Renderer With Overrides 1`] = `
 <table>
   <tr>
     <th>
@@ -144,7 +144,7 @@ exports[`Storyshots Renderers/AnyRenderer With Overrides 1`] = `
 </table>
 `;
 
-exports[`Storyshots Renderers/AnyRenderer With Overrides From Context 1`] = `
+exports[`Storyshots Renderers/Any Renderer With Overrides From Context 1`] = `
 <table>
   <tr>
     <th>
diff --git a/src/renderers/any-renderer/any-renderer.stories.tsx b/src/renderers/any-renderer/any-renderer.stories.tsx
index 3f943cbf..4f4fac1f 100644
--- a/src/renderers/any-renderer/any-renderer.stories.tsx
+++ b/src/renderers/any-renderer/any-renderer.stories.tsx
@@ -4,7 +4,7 @@ import {AnyRenderer, AnyRendererContext} from './any-renderer';
 
 export default {
   component: AnyRenderer,
-  title: 'Renderers/AnyRenderer',
+  title: 'Renderers/Any Renderer',
 };
 
 export const anyRenderer = () => <AnyRenderer value={null} />;
diff --git a/src/renderers/boolean-renderer/__snapshots__/boolean-renderer.stories.storyshot b/src/renderers/boolean-renderer/__snapshots__/boolean-renderer.stories.storyshot
index 6340e7a1..907a8730 100644
--- a/src/renderers/boolean-renderer/__snapshots__/boolean-renderer.stories.storyshot
+++ b/src/renderers/boolean-renderer/__snapshots__/boolean-renderer.stories.storyshot
@@ -1,6 +1,6 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`Storyshots Renderers/BooleanRenderer Boolean Renderer 1`] = `
+exports[`Storyshots Renderers/Boolean Renderer Boolean Renderer 1`] = `
 <span
   className="magic-boolean"
 >
@@ -8,7 +8,7 @@ exports[`Storyshots Renderers/BooleanRenderer Boolean Renderer 1`] = `
 </span>
 `;
 
-exports[`Storyshots Renderers/BooleanRenderer Falsy 1`] = `
+exports[`Storyshots Renderers/Boolean Renderer Falsy 1`] = `
 <span
   className="magic-boolean"
 >
@@ -16,7 +16,7 @@ exports[`Storyshots Renderers/BooleanRenderer Falsy 1`] = `
 </span>
 `;
 
-exports[`Storyshots Renderers/BooleanRenderer Truthy 1`] = `
+exports[`Storyshots Renderers/Boolean Renderer Truthy 1`] = `
 <span
   className="magic-boolean"
 >
@@ -24,7 +24,7 @@ exports[`Storyshots Renderers/BooleanRenderer Truthy 1`] = `
 </span>
 `;
 
-exports[`Storyshots Renderers/BooleanRenderer With Context Overrides 1`] = `
+exports[`Storyshots Renderers/Boolean Renderer With Context Overrides 1`] = `
 <span
   className="magic-boolean"
 >
@@ -32,7 +32,7 @@ exports[`Storyshots Renderers/BooleanRenderer With Context Overrides 1`] = `
 </span>
 `;
 
-exports[`Storyshots Renderers/BooleanRenderer With Overrides 1`] = `
+exports[`Storyshots Renderers/Boolean Renderer With Overrides 1`] = `
 <span
   className="magic-boolean"
 >
diff --git a/src/renderers/boolean-renderer/boolean-renderer.stories.tsx b/src/renderers/boolean-renderer/boolean-renderer.stories.tsx
index fb295245..6ca4dad6 100644
--- a/src/renderers/boolean-renderer/boolean-renderer.stories.tsx
+++ b/src/renderers/boolean-renderer/boolean-renderer.stories.tsx
@@ -4,7 +4,7 @@ import {BooleanRendererContext, BooleanRenderer} from './boolean-renderer';
 
 export default {
   component: BooleanRenderer,
-  title: 'Renderers/BooleanRenderer',
+  title: 'Renderers/Boolean Renderer',
 };
 
 export const booleanRenderer = () => <BooleanRenderer value={true} />;
diff --git a/src/renderers/date-renderer/__snapshots__/date-renderer.stories.storyshot b/src/renderers/date-renderer/__snapshots__/date-renderer.stories.storyshot
index 2853a261..5f25224c 100644
--- a/src/renderers/date-renderer/__snapshots__/date-renderer.stories.storyshot
+++ b/src/renderers/date-renderer/__snapshots__/date-renderer.stories.storyshot
@@ -1,6 +1,6 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`Storyshots Renderers/DateRenderer Date Range 1`] = `
+exports[`Storyshots Renderers/Date Renderer Date Range 1`] = `
 <time
   dateTime={"2020-06-10T00:00:00.000Z"}
   title="2020-06-10T00:00:00+00:00"
@@ -9,7 +9,7 @@ exports[`Storyshots Renderers/DateRenderer Date Range 1`] = `
 </time>
 `;
 
-exports[`Storyshots Renderers/DateRenderer Date Renderer 1`] = `
+exports[`Storyshots Renderers/Date Renderer Date Renderer 1`] = `
 <time
   dateTime={"2020-06-01T00:00:00.000Z"}
   title="2020-06-01T00:00:00+00:00"
@@ -18,13 +18,13 @@ exports[`Storyshots Renderers/DateRenderer Date Renderer 1`] = `
 </time>
 `;
 
-exports[`Storyshots Renderers/DateRenderer Invalid Date String 1`] = `
+exports[`Storyshots Renderers/Date Renderer Invalid Date String 1`] = `
 <span>
    - 
 </span>
 `;
 
-exports[`Storyshots Renderers/DateRenderer Relative 1`] = `
+exports[`Storyshots Renderers/Date Renderer Relative 1`] = `
 <time
   dateTime={"2020-06-01T00:00:00.000Z"}
   title="2020-06-01T00:00:00+00:00"
@@ -33,7 +33,7 @@ exports[`Storyshots Renderers/DateRenderer Relative 1`] = `
 </time>
 `;
 
-exports[`Storyshots Renderers/DateRenderer Relative Negative 1`] = `
+exports[`Storyshots Renderers/Date Renderer Relative Negative 1`] = `
 <time
   dateTime={"2020-06-10T00:00:00.000Z"}
   title="2020-06-10T00:00:00+00:00"
@@ -42,13 +42,13 @@ exports[`Storyshots Renderers/DateRenderer Relative Negative 1`] = `
 </time>
 `;
 
-exports[`Storyshots Renderers/DateRenderer Relative Negative Is Null 1`] = `
+exports[`Storyshots Renderers/Date Renderer Relative Negative Is Null 1`] = `
 <span>
    - 
 </span>
 `;
 
-exports[`Storyshots Renderers/DateRenderer Time Since 1`] = `
+exports[`Storyshots Renderers/Date Renderer Time Since 1`] = `
 <time
   dateTime={"2020-06-01T00:00:00.000Z"}
   title="2020-06-01T00:00:00+00:00"
@@ -57,7 +57,7 @@ exports[`Storyshots Renderers/DateRenderer Time Since 1`] = `
 </time>
 `;
 
-exports[`Storyshots Renderers/DateRenderer Using Date String 1`] = `
+exports[`Storyshots Renderers/Date Renderer Using Date String 1`] = `
 <time
   dateTime={"2020-06-01T00:00:00.000Z"}
   title="2020-06-01T00:00:00+00:00"
@@ -66,7 +66,7 @@ exports[`Storyshots Renderers/DateRenderer Using Date String 1`] = `
 </time>
 `;
 
-exports[`Storyshots Renderers/DateRenderer Using Epoch 1`] = `
+exports[`Storyshots Renderers/Date Renderer Using Epoch 1`] = `
 <time
   dateTime={"2020-06-01T00:00:00.000Z"}
   title="2020-06-01T00:00:00+00:00"
@@ -75,7 +75,7 @@ exports[`Storyshots Renderers/DateRenderer Using Epoch 1`] = `
 </time>
 `;
 
-exports[`Storyshots Renderers/DateRenderer With Overrides 1`] = `
+exports[`Storyshots Renderers/Date Renderer With Overrides 1`] = `
 <time
   dateTime={"2020-06-01T00:00:00.000Z"}
   title="2020-06-01T00:00:00+00:00"
@@ -84,7 +84,7 @@ exports[`Storyshots Renderers/DateRenderer With Overrides 1`] = `
 </time>
 `;
 
-exports[`Storyshots Renderers/DateRenderer With Overrides From Context 1`] = `
+exports[`Storyshots Renderers/Date Renderer With Overrides From Context 1`] = `
 <time
   dateTime={"2020-06-01T00:00:00.000Z"}
   title="2020-06-01T00:00:00+00:00"
diff --git a/src/renderers/date-renderer/date-renderer.stories.tsx b/src/renderers/date-renderer/date-renderer.stories.tsx
index 8927370e..b777dce9 100644
--- a/src/renderers/date-renderer/date-renderer.stories.tsx
+++ b/src/renderers/date-renderer/date-renderer.stories.tsx
@@ -4,7 +4,7 @@ import {DateRenderer, DateRendererContext} from './date-renderer';
 
 export default {
   component: DateRenderer,
-  title: 'Renderers/DateRenderer',
+  title: 'Renderers/Date Renderer',
 };
 
 const dateString = '2020-06-01';
diff --git a/src/renderers/maybe-renderer/__snapshots__/maybe-renderer.stories.storyshot b/src/renderers/maybe-renderer/__snapshots__/maybe-renderer.stories.storyshot
index c94e7e21..30a506aa 100644
--- a/src/renderers/maybe-renderer/__snapshots__/maybe-renderer.stories.storyshot
+++ b/src/renderers/maybe-renderer/__snapshots__/maybe-renderer.stories.storyshot
@@ -1,6 +1,6 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`Storyshots Renderers/MaybeRenderer Falsy 1`] = `
+exports[`Storyshots Renderers/Maybe Renderer Falsy 1`] = `
 <span
   className="magic-boolean"
 >
@@ -8,19 +8,19 @@ exports[`Storyshots Renderers/MaybeRenderer Falsy 1`] = `
 </span>
 `;
 
-exports[`Storyshots Renderers/MaybeRenderer Maybe Renderer 1`] = `
+exports[`Storyshots Renderers/Maybe Renderer Maybe Renderer 1`] = `
 <span>
    - 
 </span>
 `;
 
-exports[`Storyshots Renderers/MaybeRenderer Pass Through Props 1`] = `
+exports[`Storyshots Renderers/Maybe Renderer Pass Through Props 1`] = `
 <span>
    - 
 </span>
 `;
 
-exports[`Storyshots Renderers/MaybeRenderer Truthy 1`] = `
+exports[`Storyshots Renderers/Maybe Renderer Truthy 1`] = `
 <span
   className="magic-boolean"
 >
diff --git a/src/renderers/maybe-renderer/maybe-renderer.stories.tsx b/src/renderers/maybe-renderer/maybe-renderer.stories.tsx
index 37c44850..3acced1e 100644
--- a/src/renderers/maybe-renderer/maybe-renderer.stories.tsx
+++ b/src/renderers/maybe-renderer/maybe-renderer.stories.tsx
@@ -7,7 +7,7 @@ import {MaybeRenderer} from './maybe-renderer';
 
 export default {
   component: MaybeRenderer,
-  title: 'Renderers/MaybeRenderer',
+  title: 'Renderers/Maybe Renderer',
 };
 
 export const maybeRenderer = () => (
diff --git a/src/renderers/null-renderer/__snapshots__/null-renderer.stories.storyshot b/src/renderers/null-renderer/__snapshots__/null-renderer.stories.storyshot
index e2f6feaa..a8f13dad 100644
--- a/src/renderers/null-renderer/__snapshots__/null-renderer.stories.storyshot
+++ b/src/renderers/null-renderer/__snapshots__/null-renderer.stories.storyshot
@@ -1,11 +1,11 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`Storyshots Renderers/NullRenderer Null Renderer 1`] = `
+exports[`Storyshots Renderers/Null Renderer Null Renderer 1`] = `
 <span>
    - 
 </span>
 `;
 
-exports[`Storyshots Renderers/NullRenderer With Override 1`] = `"nada"`;
+exports[`Storyshots Renderers/Null Renderer With Override 1`] = `"nada"`;
 
-exports[`Storyshots Renderers/NullRenderer With Override From Context 1`] = `"bupkis"`;
+exports[`Storyshots Renderers/Null Renderer With Override From Context 1`] = `"bupkis"`;
diff --git a/src/renderers/null-renderer/null-renderer.stories.tsx b/src/renderers/null-renderer/null-renderer.stories.tsx
index 7eecf689..bd46b8b4 100644
--- a/src/renderers/null-renderer/null-renderer.stories.tsx
+++ b/src/renderers/null-renderer/null-renderer.stories.tsx
@@ -4,7 +4,7 @@ import {NullRenderer, NullRendererContext} from './null-renderer';
 
 export default {
   component: NullRenderer,
-  title: 'Renderers/NullRenderer',
+  title: 'Renderers/Null Renderer',
 };
 
 export const nullRenderer = () => <NullRenderer value={null} />;
diff --git a/src/renderers/object-renderer/__snapshots__/object-renderer.stories.storyshot b/src/renderers/object-renderer/__snapshots__/object-renderer.stories.storyshot
index a32c4f78..56a5ca19 100644
--- a/src/renderers/object-renderer/__snapshots__/object-renderer.stories.storyshot
+++ b/src/renderers/object-renderer/__snapshots__/object-renderer.stories.storyshot
@@ -1,6 +1,6 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`Storyshots Renderers/ObjectRenderer Object Renderer 1`] = `
+exports[`Storyshots Renderers/Object Renderer Object Renderer 1`] = `
 <pre
   className="code code__pre"
 >
@@ -17,7 +17,7 @@ exports[`Storyshots Renderers/ObjectRenderer Object Renderer 1`] = `
 </pre>
 `;
 
-exports[`Storyshots Renderers/ObjectRenderer With Array 1`] = `
+exports[`Storyshots Renderers/Object Renderer With Array 1`] = `
 <pre
   className="code code__pre"
 >
diff --git a/src/renderers/object-renderer/object-renderer.stories.tsx b/src/renderers/object-renderer/object-renderer.stories.tsx
index 5a346a7e..866acbed 100644
--- a/src/renderers/object-renderer/object-renderer.stories.tsx
+++ b/src/renderers/object-renderer/object-renderer.stories.tsx
@@ -4,7 +4,7 @@ import {ObjectRenderer} from './object-renderer';
 
 export default {
   component: ObjectRenderer,
-  title: 'Renderers/ObjectRenderer',
+  title: 'Renderers/Object Renderer',
 };
 
 export const objectRenderer = () => (
diff --git a/src/simple-error-boundary/__snapshots__/simple-error-boundary.stories.storyshot b/src/simple-error-boundary/__snapshots__/simple-error-boundary.stories.storyshot
index 16c549e4..3328bafe 100644
--- a/src/simple-error-boundary/__snapshots__/simple-error-boundary.stories.storyshot
+++ b/src/simple-error-boundary/__snapshots__/simple-error-boundary.stories.storyshot
@@ -1,6 +1,6 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`Storyshots ErrorBoundaries/SimpleErrorBoundary Json Parse Error 1`] = `
+exports[`Storyshots Error Boundaries/Simple Error Boundary Json Parse Error 1`] = `
 <div
   className="fade alert alert-danger show"
   role="alert"
@@ -9,7 +9,7 @@ exports[`Storyshots ErrorBoundaries/SimpleErrorBoundary Json Parse Error 1`] = `
 </div>
 `;
 
-exports[`Storyshots ErrorBoundaries/SimpleErrorBoundary No Stack 1`] = `
+exports[`Storyshots Error Boundaries/Simple Error Boundary No Stack 1`] = `
 <div
   className="fade alert alert-info show"
   role="alert"
@@ -18,7 +18,7 @@ exports[`Storyshots ErrorBoundaries/SimpleErrorBoundary No Stack 1`] = `
 </div>
 `;
 
-exports[`Storyshots ErrorBoundaries/SimpleErrorBoundary Simple Error Boundary 1`] = `
+exports[`Storyshots Error Boundaries/Simple Error Boundary Simple Error Boundary 1`] = `
 <div
   className="fade alert alert-danger show"
   role="alert"
@@ -27,7 +27,7 @@ exports[`Storyshots ErrorBoundaries/SimpleErrorBoundary Simple Error Boundary 1`
 </div>
 `;
 
-exports[`Storyshots ErrorBoundaries/SimpleErrorBoundary Warning Not Danger 1`] = `
+exports[`Storyshots Error Boundaries/Simple Error Boundary Warning Not Danger 1`] = `
 <div
   className="fade alert alert-warning show"
   role="alert"
diff --git a/src/simple-error-boundary/simple-error-boundary.stories.tsx b/src/simple-error-boundary/simple-error-boundary.stories.tsx
index b8c6d6d5..e69a5422 100644
--- a/src/simple-error-boundary/simple-error-boundary.stories.tsx
+++ b/src/simple-error-boundary/simple-error-boundary.stories.tsx
@@ -11,7 +11,7 @@ const BadJsonParse = () => <Code>{JSON.parse('{invalid')}</Code>;
 
 export default {
   component: SimpleErrorBoundary,
-  title: 'ErrorBoundaries/SimpleErrorBoundary',
+  title: 'Error Boundaries/Simple Error Boundary',
 };
 
 /*
diff --git a/src/stringify/__snapshots__/fancy-stringify.stories.storyshot b/src/stringify/__snapshots__/fancy-stringify.stories.storyshot
index ed5f2d90..bc8ae80c 100644
--- a/src/stringify/__snapshots__/fancy-stringify.stories.storyshot
+++ b/src/stringify/__snapshots__/fancy-stringify.stories.storyshot
@@ -1,6 +1,6 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`Storyshots Components/FancyStringify Fancy Stringify 1`] = `
+exports[`Storyshots Components/Fancy Stringify Fancy Stringify 1`] = `
 <pre>
    
   <details
diff --git a/src/stringify/fancy-stringify.stories.tsx b/src/stringify/fancy-stringify.stories.tsx
index dc1238ed..914c7b44 100644
--- a/src/stringify/fancy-stringify.stories.tsx
+++ b/src/stringify/fancy-stringify.stories.tsx
@@ -6,7 +6,7 @@ import {FancyStringify} from './fancy-stringify';
 
 export default {
   component: FancyStringify,
-  title: 'Components/FancyStringify',
+  title: 'Components/Fancy Stringify',
 };
 
 const data = {
diff --git a/src/template-specializations/array-table/__snapshots__/array-table.stories.storyshot b/src/template-specializations/array-table/__snapshots__/array-table.stories.storyshot
index e66074ec..3d1b643d 100644
--- a/src/template-specializations/array-table/__snapshots__/array-table.stories.storyshot
+++ b/src/template-specializations/array-table/__snapshots__/array-table.stories.storyshot
@@ -1,6 +1,6 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`Storyshots Template Specialization/ArrayTable Array Table 1`] = `
+exports[`Storyshots Template Specialization/Array Table Array Table 1`] = `
 <table
   className="clc-table table"
   data={
@@ -2055,7 +2055,7 @@ exports[`Storyshots Template Specialization/ArrayTable Array Table 1`] = `
 </table>
 `;
 
-exports[`Storyshots Template Specialization/ArrayTable Duplicate Fields 1`] = `
+exports[`Storyshots Template Specialization/Array Table Duplicate Fields 1`] = `
 <table
   className="clc-table table"
   data={
@@ -4418,7 +4418,7 @@ exports[`Storyshots Template Specialization/ArrayTable Duplicate Fields 1`] = `
 </table>
 `;
 
-exports[`Storyshots Template Specialization/ArrayTable Nested Data 1`] = `
+exports[`Storyshots Template Specialization/Array Table Nested Data 1`] = `
 <table
   className="clc-table table"
   data={
@@ -6573,7 +6573,7 @@ exports[`Storyshots Template Specialization/ArrayTable Nested Data 1`] = `
 </table>
 `;
 
-exports[`Storyshots Template Specialization/ArrayTable Out Of Order 1`] = `
+exports[`Storyshots Template Specialization/Array Table Out Of Order 1`] = `
 <table
   className="clc-table table"
   data={
diff --git a/src/template-specializations/array-table/array-table.stories.tsx b/src/template-specializations/array-table/array-table.stories.tsx
index 3868668f..6a59a4e4 100644
--- a/src/template-specializations/array-table/array-table.stories.tsx
+++ b/src/template-specializations/array-table/array-table.stories.tsx
@@ -6,7 +6,7 @@ import {ArrayTable} from './array-table';
 
 export default {
   component: ArrayTable,
-  title: 'Template Specialization/ArrayTable',
+  title: 'Template Specialization/Array Table',
 };
 
 export const arrayTable = () => (
diff --git a/src/template-specializations/connection-table/__snapshots__/connection-table.stories.storyshot b/src/template-specializations/connection-table/__snapshots__/connection-table.stories.storyshot
index de22839d..19b6b74d 100644
--- a/src/template-specializations/connection-table/__snapshots__/connection-table.stories.storyshot
+++ b/src/template-specializations/connection-table/__snapshots__/connection-table.stories.storyshot
@@ -1,6 +1,6 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`Storyshots Template Specialization/ConnectionTable Connection Table 1`] = `
+exports[`Storyshots Template Specialization/Connection Table Connection Table 1`] = `
 <table
   className="clc-table table"
   connection={
@@ -2213,7 +2213,7 @@ exports[`Storyshots Template Specialization/ConnectionTable Connection Table 1`]
 </table>
 `;
 
-exports[`Storyshots Template Specialization/ConnectionTable Duplicate Fields 1`] = `
+exports[`Storyshots Template Specialization/Connection Table Duplicate Fields 1`] = `
 <table
   className="clc-table table"
   connection={
@@ -4734,7 +4734,7 @@ exports[`Storyshots Template Specialization/ConnectionTable Duplicate Fields 1`]
 </table>
 `;
 
-exports[`Storyshots Template Specialization/ConnectionTable Nested Data 1`] = `
+exports[`Storyshots Template Specialization/Connection Table Nested Data 1`] = `
 <table
   className="clc-table table"
   connection={
@@ -7047,7 +7047,7 @@ exports[`Storyshots Template Specialization/ConnectionTable Nested Data 1`] = `
 </table>
 `;
 
-exports[`Storyshots Template Specialization/ConnectionTable Out Of Order 1`] = `
+exports[`Storyshots Template Specialization/Connection Table Out Of Order 1`] = `
 <table
   className="clc-table table"
   connection={
diff --git a/src/template-specializations/connection-table/connection-table.stories.tsx b/src/template-specializations/connection-table/connection-table.stories.tsx
index 525d223e..dab0cdae 100644
--- a/src/template-specializations/connection-table/connection-table.stories.tsx
+++ b/src/template-specializations/connection-table/connection-table.stories.tsx
@@ -7,7 +7,7 @@ import {ConnectionTable} from './connection-table';
 
 export default {
   component: ConnectionTable,
-  title: 'Template Specialization/ConnectionTable',
+  title: 'Template Specialization/Connection Table',
 };
 
 export const connectionTable = () => (
diff --git a/src/template-specializations/object-description/__snapshots__/object-description.stories.storyshot b/src/template-specializations/object-description/__snapshots__/object-description.stories.storyshot
index 8911c379..1648efa0 100644
--- a/src/template-specializations/object-description/__snapshots__/object-description.stories.storyshot
+++ b/src/template-specializations/object-description/__snapshots__/object-description.stories.storyshot
@@ -1,6 +1,6 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`Storyshots Template Specialization/ObjectDescription Duplicate Fields 1`] = `
+exports[`Storyshots Template Specialization/Object Description Duplicate Fields 1`] = `
 <dl
   className="description-list"
 >
@@ -62,7 +62,7 @@ exports[`Storyshots Template Specialization/ObjectDescription Duplicate Fields 1
 </dl>
 `;
 
-exports[`Storyshots Template Specialization/ObjectDescription Nested Data 1`] = `
+exports[`Storyshots Template Specialization/Object Description Nested Data 1`] = `
 <dl
   className="description-list"
 >
@@ -114,7 +114,7 @@ exports[`Storyshots Template Specialization/ObjectDescription Nested Data 1`] =
 </dl>
 `;
 
-exports[`Storyshots Template Specialization/ObjectDescription Object Description 1`] = `
+exports[`Storyshots Template Specialization/Object Description Object Description 1`] = `
 <dl
   className="description-list"
 >
@@ -166,7 +166,7 @@ exports[`Storyshots Template Specialization/ObjectDescription Object Description
 </dl>
 `;
 
-exports[`Storyshots Template Specialization/ObjectDescription Out Of Order 1`] = `
+exports[`Storyshots Template Specialization/Object Description Out Of Order 1`] = `
 <dl
   className="description-list"
 >
diff --git a/src/template-specializations/object-description/object-description.stories.tsx b/src/template-specializations/object-description/object-description.stories.tsx
index 807e1604..424796e3 100644
--- a/src/template-specializations/object-description/object-description.stories.tsx
+++ b/src/template-specializations/object-description/object-description.stories.tsx
@@ -6,7 +6,7 @@ import {ObjectDescription} from './object-description';
 
 export default {
   component: ObjectDescription,
-  title: 'Template Specialization/ObjectDescription',
+  title: 'Template Specialization/Object Description',
 };
 
 export const objectDescription = () => (
diff --git a/src/templates/array-template/__snapshots__/array-template.stories.storyshot b/src/templates/array-template/__snapshots__/array-template.stories.storyshot
index 46f18703..2a2c952b 100644
--- a/src/templates/array-template/__snapshots__/array-template.stories.storyshot
+++ b/src/templates/array-template/__snapshots__/array-template.stories.storyshot
@@ -1,6 +1,6 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`Storyshots Templates/ArrayTemplate Array Template 1`] = `
+exports[`Storyshots Templates/Array Template Array Template 1`] = `
 <ul>
   <li>
     <ul>
@@ -150,7 +150,7 @@ exports[`Storyshots Templates/ArrayTemplate Array Template 1`] = `
 </ul>
 `;
 
-exports[`Storyshots Templates/ArrayTemplate Duplicate Fields 1`] = `
+exports[`Storyshots Templates/Array Template Duplicate Fields 1`] = `
 <ul>
   <li>
     <ul>
@@ -325,7 +325,7 @@ exports[`Storyshots Templates/ArrayTemplate Duplicate Fields 1`] = `
 </ul>
 `;
 
-exports[`Storyshots Templates/ArrayTemplate Nested Data 1`] = `
+exports[`Storyshots Templates/Array Template Nested Data 1`] = `
 <ul>
   <li>
     <ul>
@@ -475,7 +475,7 @@ exports[`Storyshots Templates/ArrayTemplate Nested Data 1`] = `
 </ul>
 `;
 
-exports[`Storyshots Templates/ArrayTemplate Out Of Order 1`] = `
+exports[`Storyshots Templates/Array Template Out Of Order 1`] = `
 <ul>
   <li>
     <ul>
diff --git a/src/templates/array-template/array-template.stories.tsx b/src/templates/array-template/array-template.stories.tsx
index 3fe3eb7f..f3ad4072 100644
--- a/src/templates/array-template/array-template.stories.tsx
+++ b/src/templates/array-template/array-template.stories.tsx
@@ -7,7 +7,7 @@ import {FieldWrapper, ItemWrapper, Wrapper} from './support';
 
 export default {
   component: ArrayTemplate,
-  title: 'Templates/ArrayTemplate',
+  title: 'Templates/Array Template',
 };
 
 export const arrayTemplate = () => (
diff --git a/src/templates/connection-template/__snapshots__/connection-template.stories.storyshot b/src/templates/connection-template/__snapshots__/connection-template.stories.storyshot
index 714117a8..119ed300 100644
--- a/src/templates/connection-template/__snapshots__/connection-template.stories.storyshot
+++ b/src/templates/connection-template/__snapshots__/connection-template.stories.storyshot
@@ -1,6 +1,6 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`Storyshots Templates/ConnectionTemplate Connection Template 1`] = `
+exports[`Storyshots Templates/Connection Template Connection Template 1`] = `
 <ul>
   <li>
     <ul>
@@ -150,7 +150,7 @@ exports[`Storyshots Templates/ConnectionTemplate Connection Template 1`] = `
 </ul>
 `;
 
-exports[`Storyshots Templates/ConnectionTemplate Duplicate Fields 1`] = `
+exports[`Storyshots Templates/Connection Template Duplicate Fields 1`] = `
 <ul>
   <li>
     <ul>
@@ -325,7 +325,7 @@ exports[`Storyshots Templates/ConnectionTemplate Duplicate Fields 1`] = `
 </ul>
 `;
 
-exports[`Storyshots Templates/ConnectionTemplate Nested Data 1`] = `
+exports[`Storyshots Templates/Connection Template Nested Data 1`] = `
 <ul>
   <li>
     <ul>
@@ -475,7 +475,7 @@ exports[`Storyshots Templates/ConnectionTemplate Nested Data 1`] = `
 </ul>
 `;
 
-exports[`Storyshots Templates/ConnectionTemplate Out Of Order 1`] = `
+exports[`Storyshots Templates/Connection Template Out Of Order 1`] = `
 <ul>
   <li>
     <ul>
diff --git a/src/templates/connection-template/connection-template.stories.tsx b/src/templates/connection-template/connection-template.stories.tsx
index 1c7961b2..9a9c464f 100644
--- a/src/templates/connection-template/connection-template.stories.tsx
+++ b/src/templates/connection-template/connection-template.stories.tsx
@@ -7,7 +7,7 @@ import {FieldWrapper, ItemWrapper, toConnection, Wrapper} from './support';
 
 export default {
   component: ConnectionTemplate,
-  title: 'Templates/ConnectionTemplate',
+  title: 'Templates/Connection Template',
 };
 
 export const connectionTemplate = () => (
diff --git a/src/templates/object-template/__snapshots__/object-template.stories.storyshot b/src/templates/object-template/__snapshots__/object-template.stories.storyshot
index 1f757816..cbaae87b 100644
--- a/src/templates/object-template/__snapshots__/object-template.stories.storyshot
+++ b/src/templates/object-template/__snapshots__/object-template.stories.storyshot
@@ -1,6 +1,6 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`Storyshots Templates/ObjectTemplate Duplicate Fields 1`] = `
+exports[`Storyshots Templates/Object Template Duplicate Fields 1`] = `
 <dl
   className="description-list"
 >
@@ -62,7 +62,7 @@ exports[`Storyshots Templates/ObjectTemplate Duplicate Fields 1`] = `
 </dl>
 `;
 
-exports[`Storyshots Templates/ObjectTemplate Nested Data 1`] = `
+exports[`Storyshots Templates/Object Template Nested Data 1`] = `
 <dl
   className="description-list"
 >
@@ -114,7 +114,7 @@ exports[`Storyshots Templates/ObjectTemplate Nested Data 1`] = `
 </dl>
 `;
 
-exports[`Storyshots Templates/ObjectTemplate Object Template 1`] = `
+exports[`Storyshots Templates/Object Template Object Template 1`] = `
 <dl
   className="description-list"
 >
@@ -166,7 +166,7 @@ exports[`Storyshots Templates/ObjectTemplate Object Template 1`] = `
 </dl>
 `;
 
-exports[`Storyshots Templates/ObjectTemplate Out Of Order 1`] = `
+exports[`Storyshots Templates/Object Template Out Of Order 1`] = `
 <dl
   className="description-list"
 >
diff --git a/src/templates/object-template/object-template.stories.tsx b/src/templates/object-template/object-template.stories.tsx
index 451e3218..d0ca8075 100644
--- a/src/templates/object-template/object-template.stories.tsx
+++ b/src/templates/object-template/object-template.stories.tsx
@@ -7,7 +7,7 @@ import {ItemWrapper, Wrapper} from './support';
 
 export default {
   component: ObjectTemplate,
-  title: 'Templates/ObjectTemplate',
+  title: 'Templates/Object Template',
 };
 
 export const objectTemplate = () => (