diff --git a/examples/angular-cli/src/stories/__snapshots__/addon-actions.stories.storyshot b/examples/angular-cli/src/stories/__snapshots__/addon-actions.stories.storyshot
index e26575399fe..9f6613568a3 100644
--- a/examples/angular-cli/src/stories/__snapshots__/addon-actions.stories.storyshot
+++ b/examples/angular-cli/src/stories/__snapshots__/addon-actions.stories.storyshot
@@ -1,12 +1,12 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`Storyshots Addon Actions Action and method 1`] = `
-<app-root
+<storybook-storyshot-root
   cfr={[Function CodegenComponentFactoryResolver]}
   data={[Function Object]}
   target={[Function ViewContainerRef_]}
 >
-  <button-component
+  <storybook-button-component
     _nghost-c4=""
   >
     
@@ -18,17 +18,17 @@ exports[`Storyshots Addon Actions Action and method 1`] = `
     </button>
     
     
-  </button-component>
-</app-root>
+  </storybook-button-component>
+</storybook-storyshot-root>
 `;
 
 exports[`Storyshots Addon Actions Action only 1`] = `
-<app-root
+<storybook-storyshot-root
   cfr={[Function CodegenComponentFactoryResolver]}
   data={[Function Object]}
   target={[Function ViewContainerRef_]}
 >
-  <button-component
+  <storybook-button-component
     _nghost-c3=""
   >
     
@@ -40,6 +40,6 @@ exports[`Storyshots Addon Actions Action only 1`] = `
     </button>
     
     
-  </button-component>
-</app-root>
+  </storybook-button-component>
+</storybook-storyshot-root>
 `;
diff --git a/examples/angular-cli/src/stories/__snapshots__/addon-knobs.stories.storyshot b/examples/angular-cli/src/stories/__snapshots__/addon-knobs.stories.storyshot
index cedc4feb53b..9afeb5350b7 100644
--- a/examples/angular-cli/src/stories/__snapshots__/addon-knobs.stories.storyshot
+++ b/examples/angular-cli/src/stories/__snapshots__/addon-knobs.stories.storyshot
@@ -1,12 +1,12 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`Storyshots Addon Knobs All knobs 1`] = `
-<app-root
+<storybook-storyshot-root
   cfr={[Function CodegenComponentFactoryResolver]}
   data={[Function Object]}
   target={[Function ViewContainerRef_]}
 >
-  <simple-knobs-component>
+  <storybook-simple-knobs-component>
     
       
     <div
@@ -80,17 +80,17 @@ exports[`Storyshots Addon Knobs All knobs 1`] = `
     </div>
     
     
-  </simple-knobs-component>
-</app-root>
+  </storybook-simple-knobs-component>
+</storybook-storyshot-root>
 `;
 
 exports[`Storyshots Addon Knobs Simple 1`] = `
-<app-root
+<storybook-storyshot-root
   cfr={[Function CodegenComponentFactoryResolver]}
   data={[Function Object]}
   target={[Function ViewContainerRef_]}
 >
-  <simple-knobs-component>
+  <storybook-simple-knobs-component>
     
       
     <div>
@@ -103,6 +103,6 @@ exports[`Storyshots Addon Knobs Simple 1`] = `
     </div>
     
     
-  </simple-knobs-component>
-</app-root>
+  </storybook-simple-knobs-component>
+</storybook-storyshot-root>
 `;
diff --git a/examples/angular-cli/src/stories/__snapshots__/addon-links.stories.storyshot b/examples/angular-cli/src/stories/__snapshots__/addon-links.stories.storyshot
index c22268469bf..b1b709a1369 100644
--- a/examples/angular-cli/src/stories/__snapshots__/addon-links.stories.storyshot
+++ b/examples/angular-cli/src/stories/__snapshots__/addon-links.stories.storyshot
@@ -1,12 +1,12 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`Storyshots Another Button button with link to another story 1`] = `
-<app-root
+<storybook-storyshot-root
   cfr={[Function CodegenComponentFactoryResolver]}
   data={[Function Object]}
   target={[Function ViewContainerRef_]}
 >
-  <button-component
+  <storybook-button-component
     _nghost-c5=""
   >
     
@@ -18,6 +18,6 @@ exports[`Storyshots Another Button button with link to another story 1`] = `
     </button>
     
     
-  </button-component>
-</app-root>
+  </storybook-button-component>
+</storybook-storyshot-root>
 `;
diff --git a/examples/angular-cli/src/stories/__snapshots__/addon-notes.stories.storyshot b/examples/angular-cli/src/stories/__snapshots__/addon-notes.stories.storyshot
index df9e22bb61e..df6bfc07f11 100644
--- a/examples/angular-cli/src/stories/__snapshots__/addon-notes.stories.storyshot
+++ b/examples/angular-cli/src/stories/__snapshots__/addon-notes.stories.storyshot
@@ -1,12 +1,12 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`Storyshots Addon Notes Note with HTML 1`] = `
-<app-root
+<storybook-storyshot-root
   cfr={[Function CodegenComponentFactoryResolver]}
   data={[Function Object]}
   target={[Function ViewContainerRef_]}
 >
-  <button-component
+  <storybook-button-component
     _nghost-c7=""
   >
     
@@ -18,17 +18,17 @@ exports[`Storyshots Addon Notes Note with HTML 1`] = `
     </button>
     
     
-  </button-component>
-</app-root>
+  </storybook-button-component>
+</storybook-storyshot-root>
 `;
 
 exports[`Storyshots Addon Notes Simple note 1`] = `
-<app-root
+<storybook-storyshot-root
   cfr={[Function CodegenComponentFactoryResolver]}
   data={[Function Object]}
   target={[Function ViewContainerRef_]}
 >
-  <button-component
+  <storybook-button-component
     _nghost-c6=""
   >
     
@@ -40,6 +40,6 @@ exports[`Storyshots Addon Notes Simple note 1`] = `
     </button>
     
     
-  </button-component>
-</app-root>
+  </storybook-button-component>
+</storybook-storyshot-root>
 `;
diff --git a/examples/angular-cli/src/stories/__snapshots__/app.component.stories.storyshot b/examples/angular-cli/src/stories/__snapshots__/app.component.stories.storyshot
index 2b6d704b77a..088761db49a 100644
--- a/examples/angular-cli/src/stories/__snapshots__/app.component.stories.storyshot
+++ b/examples/angular-cli/src/stories/__snapshots__/app.component.stories.storyshot
@@ -1,12 +1,12 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`Storyshots App Component Component with separate template 1`] = `
-<app-root
+<storybook-storyshot-root
   cfr={[Function CodegenComponentFactoryResolver]}
   data={[Function Object]}
   target={[Function ViewContainerRef_]}
 >
-  <app-root>
+  <storybook-app-root>
     
   
     <div
@@ -90,6 +90,6 @@ exports[`Storyshots App Component Component with separate template 1`] = `
     
   
   
-  </app-root>
-</app-root>
+  </storybook-app-root>
+</storybook-storyshot-root>
 `;
diff --git a/examples/angular-cli/src/stories/__snapshots__/custom-metadata.stories.storyshot b/examples/angular-cli/src/stories/__snapshots__/custom-metadata.stories.storyshot
index d3f4bf8f958..8f945df5923 100644
--- a/examples/angular-cli/src/stories/__snapshots__/custom-metadata.stories.storyshot
+++ b/examples/angular-cli/src/stories/__snapshots__/custom-metadata.stories.storyshot
@@ -1,40 +1,40 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`Storyshots Custom Pipe Default 1`] = `
-<app-root
+<storybook-storyshot-root
   cfr={[Function CodegenComponentFactoryResolver]}
   data={[Function Object]}
   target={[Function ViewContainerRef_]}
 >
-  <name>
+  <storybook-name>
     <h1>
       CustomPipe: foobar
     </h1>
-  </name>
-</app-root>
+  </storybook-name>
+</storybook-storyshot-root>
 `;
 
 exports[`Storyshots Custom Pipe/With Knobs NameComponent 1`] = `
-<app-root
+<storybook-storyshot-root
   cfr={[Function CodegenComponentFactoryResolver]}
   data={[Function Object]}
   target={[Function ViewContainerRef_]}
 >
-  <name>
+  <storybook-name>
     <h1>
       CustomPipe: foobar
     </h1>
-  </name>
-</app-root>
+  </storybook-name>
+</storybook-storyshot-root>
 `;
 
 exports[`Storyshots Custom ngModule metadata simple 1`] = `
-<app-root
+<storybook-storyshot-root
   cfr={[Function CodegenComponentFactoryResolver]}
   data={[Function Object]}
   target={[Function ViewContainerRef_]}
 >
-  <simple-service-component>
+  <storybook-simple-service-component>
     
       
     <p>
@@ -51,17 +51,17 @@ exports[`Storyshots Custom ngModule metadata simple 1`] = `
     </ul>
     
     
-  </simple-service-component>
-</app-root>
+  </storybook-simple-service-component>
+</storybook-storyshot-root>
 `;
 
 exports[`Storyshots Custom ngModule metadata with knobs 1`] = `
-<app-root
+<storybook-storyshot-root
   cfr={[Function CodegenComponentFactoryResolver]}
   data={[Function Object]}
   target={[Function ViewContainerRef_]}
 >
-  <simple-service-component>
+  <storybook-simple-service-component>
     
       
     <p>
@@ -78,6 +78,6 @@ exports[`Storyshots Custom ngModule metadata with knobs 1`] = `
     </ul>
     
     
-  </simple-service-component>
-</app-root>
+  </storybook-simple-service-component>
+</storybook-storyshot-root>
 `;
diff --git a/examples/angular-cli/src/stories/__snapshots__/index.storyshot b/examples/angular-cli/src/stories/__snapshots__/index.storyshot
index 2544eccd052..d628736b6cf 100644
--- a/examples/angular-cli/src/stories/__snapshots__/index.storyshot
+++ b/examples/angular-cli/src/stories/__snapshots__/index.storyshot
@@ -1,12 +1,12 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`Storyshots Button with some emoji 1`] = `
-<app-root
+<storybook-storyshot-root
   cfr={[Function CodegenComponentFactoryResolver]}
   data={[Function Object]}
   target={[Function ViewContainerRef_]}
 >
-  <button-component
+  <storybook-button-component
     _nghost-c2=""
   >
     
@@ -18,17 +18,17 @@ exports[`Storyshots Button with some emoji 1`] = `
     </button>
     
     
-  </button-component>
-</app-root>
+  </storybook-button-component>
+</storybook-storyshot-root>
 `;
 
 exports[`Storyshots Button with text 1`] = `
-<app-root
+<storybook-storyshot-root
   cfr={[Function CodegenComponentFactoryResolver]}
   data={[Function Object]}
   target={[Function ViewContainerRef_]}
 >
-  <button-component
+  <storybook-button-component
     _nghost-c1=""
   >
     
@@ -40,17 +40,17 @@ exports[`Storyshots Button with text 1`] = `
     </button>
     
     
-  </button-component>
-</app-root>
+  </storybook-button-component>
+</storybook-storyshot-root>
 `;
 
 exports[`Storyshots Welcome to Storybook 1`] = `
-<app-root
+<storybook-storyshot-root
   cfr={[Function CodegenComponentFactoryResolver]}
   data={[Function Object]}
   target={[Function ViewContainerRef_]}
 >
-  <welcome-component
+  <storybook-welcome-component
     _nghost-c0=""
   >
     
@@ -115,7 +115,8 @@ exports[`Storyshots Welcome to Storybook 1`] = `
         >
           stories
         </a>
-         for a component called 
+         for a component called
+            
         <span
           _ngcontent-c0=""
           class="inline-code"
@@ -212,7 +213,8 @@ exports[`Storyshots Welcome to Storybook 1`] = `
         >
           .storybook/webpack.config.js
         </span>
-         to add webpack loaders and plugins you are using in this project.
+        
+            to add webpack loaders and plugins you are using in this project.
           
       </p>
       
@@ -220,6 +222,6 @@ exports[`Storyshots Welcome to Storybook 1`] = `
     </main>
     
     
-  </welcome-component>
-</app-root>
+  </storybook-welcome-component>
+</storybook-storyshot-root>
 `;
diff --git a/examples/angular-cli/src/stories/component-with-di/__snapshots__/di.component.stories.storyshot b/examples/angular-cli/src/stories/component-with-di/__snapshots__/di.component.stories.storyshot
index b517ff0d36a..e31179b53c6 100644
--- a/examples/angular-cli/src/stories/component-with-di/__snapshots__/di.component.stories.storyshot
+++ b/examples/angular-cli/src/stories/component-with-di/__snapshots__/di.component.stories.storyshot
@@ -1,12 +1,12 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`Storyshots Component dependencies inputs and inject dependencies 1`] = `
-<app-root
+<storybook-storyshot-root
   cfr={[Function CodegenComponentFactoryResolver]}
   data={[Function Object]}
   target={[Function ViewContainerRef_]}
 >
-  <di-component>
+  <storybook-di-component>
     <div>
       
     
@@ -41,17 +41,17 @@ exports[`Storyshots Component dependencies inputs and inject dependencies 1`] =
     </div>
     
   
-  </di-component>
-</app-root>
+  </storybook-di-component>
+</storybook-storyshot-root>
 `;
 
 exports[`Storyshots Component dependencies inputs and inject dependencies with knobs 1`] = `
-<app-root
+<storybook-storyshot-root
   cfr={[Function CodegenComponentFactoryResolver]}
   data={[Function Object]}
   target={[Function ViewContainerRef_]}
 >
-  <di-component>
+  <storybook-di-component>
     <div>
       
     
@@ -86,6 +86,6 @@ exports[`Storyshots Component dependencies inputs and inject dependencies with k
     </div>
     
   
-  </di-component>
-</app-root>
+  </storybook-di-component>
+</storybook-storyshot-root>
 `;
diff --git a/examples/angular-cli/src/stories/customControlValueAccessor/__snapshots__/custom-cva-component.stories.storyshot b/examples/angular-cli/src/stories/customControlValueAccessor/__snapshots__/custom-cva-component.stories.storyshot
index 37e35e803b5..aaf0c3adcf4 100644
--- a/examples/angular-cli/src/stories/customControlValueAccessor/__snapshots__/custom-cva-component.stories.storyshot
+++ b/examples/angular-cli/src/stories/customControlValueAccessor/__snapshots__/custom-cva-component.stories.storyshot
@@ -1,12 +1,12 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`Storyshots ngModel custom ControlValueAccessor 1`] = `
-<app-root
+<storybook-storyshot-root
   cfr={[Function CodegenComponentFactoryResolver]}
   data={[Function Object]}
   target={[Function ViewContainerRef_]}
 >
-  <custom-cva-component>
+  <storybook-custom-cva-component>
     
       
     <div>
@@ -19,6 +19,6 @@ exports[`Storyshots ngModel custom ControlValueAccessor 1`] = `
     />
     
     
-  </custom-cva-component>
-</app-root>
+  </storybook-custom-cva-component>
+</storybook-storyshot-root>
 `;