diff --git a/addons/info/src/components/__snapshots__/PropTable.test.js.snap b/addons/info/src/components/__snapshots__/PropTable.test.js.snap
index f5265c8e823..d527b2a29c7 100644
--- a/addons/info/src/components/__snapshots__/PropTable.test.js.snap
+++ b/addons/info/src/components/__snapshots__/PropTable.test.js.snap
@@ -26,47 +26,47 @@ Array [
 `;
 
 exports[`PropTable multiLineText should include all propTypes by default 1`] = `
-<ForwardRef>
+<Table>
   <thead>
     <tr>
-      <ForwardRef
+      <Th
         bordered={true}
       >
         property
-      </ForwardRef>
-      <ForwardRef
+      </Th>
+      <Th
         bordered={true}
       >
         propType
-      </ForwardRef>
-      <ForwardRef
+      </Th>
+      <Th
         bordered={true}
       >
         required
-      </ForwardRef>
-      <ForwardRef
+      </Th>
+      <Th
         bordered={true}
       >
         default
-      </ForwardRef>
-      <ForwardRef
+      </Th>
+      <Th
         bordered={true}
       >
         description
-      </ForwardRef>
+      </Th>
     </tr>
   </thead>
   <tbody>
     <tr
       key="foo"
     >
-      <ForwardRef
+      <Td
         bordered={true}
         code={true}
       >
         foo
-      </ForwardRef>
-      <ForwardRef
+      </Td>
+      <Td
         bordered={true}
         code={true}
       >
@@ -78,21 +78,21 @@ exports[`PropTable multiLineText should include all propTypes by default 1`] = `
             }
           }
         />
-      </ForwardRef>
-      <ForwardRef
+      </Td>
+      <Td
         bordered={true}
       >
         -
-      </ForwardRef>
-      <ForwardRef
+      </Td>
+      <Td
         bordered={true}
       >
         -
-      </ForwardRef>
-      <ForwardRef
+      </Td>
+      <Td
         bordered={true}
       />
     </tr>
   </tbody>
-</ForwardRef>
+</Table>
 `;
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 cab592e96c4..f640ab984f5 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
@@ -11,7 +11,7 @@ exports[`Storyshots Another Button with some emoji 1`] = `
   margin: 10px;
 }
 
-<ForwardRef
+<Button
   onClick={[Function]}
 >
   <Styled(button)
@@ -29,7 +29,7 @@ exports[`Storyshots Another Button with some emoji 1`] = `
       </span>
     </button>
   </Styled(button)>
-</ForwardRef>
+</Button>
 `;
 
 exports[`Storyshots Another Button with text 1`] = `
@@ -43,7 +43,7 @@ exports[`Storyshots Another Button with text 1`] = `
   margin: 10px;
 }
 
-<ForwardRef
+<Button
   onClick={[Function]}
 >
   <Styled(button)
@@ -56,7 +56,7 @@ exports[`Storyshots Another Button with text 1`] = `
       Hello Button
     </button>
   </Styled(button)>
-</ForwardRef>
+</Button>
 `;
 
 exports[`Storyshots Async with 5ms timeout simulating async operation 1`] = `
@@ -76,7 +76,7 @@ exports[`Storyshots Button with some emoji 1`] = `
   margin: 10px;
 }
 
-<ForwardRef
+<Button
   onClick={[Function]}
 >
   <Styled(button)
@@ -94,7 +94,7 @@ exports[`Storyshots Button with some emoji 1`] = `
       </span>
     </button>
   </Styled(button)>
-</ForwardRef>
+</Button>
 `;
 
 exports[`Storyshots Button with text 1`] = `
@@ -108,7 +108,7 @@ exports[`Storyshots Button with text 1`] = `
   margin: 10px;
 }
 
-<ForwardRef
+<Button
   onClick={[Function]}
 >
   <Styled(button)
@@ -121,7 +121,7 @@ exports[`Storyshots Button with text 1`] = `
       Hello Button
     </button>
   </Styled(button)>
-</ForwardRef>
+</Button>
 `;
 
 exports[`Storyshots Welcome to Storybook 1`] = `