diff --git a/src/components/alert/test/basic/app/app.component.ts b/src/components/alert/test/basic/app/app.component.ts
index 2334bff782..e84bb7d13a 100644
--- a/src/components/alert/test/basic/app/app.component.ts
+++ b/src/components/alert/test/basic/app/app.component.ts
@@ -4,6 +4,6 @@ import { PageOne } from '../pages/page-one/page-one';
 @Component({
   template: '<ion-nav [root]="root"></ion-nav>'
 })
-export class E2EApp {
+export class AppComponent {
   root = PageOne;
 }
diff --git a/src/components/alert/test/basic/app/app.module.ts b/src/components/alert/test/basic/app/app.module.ts
index 7249f00c76..c2bb850b8f 100644
--- a/src/components/alert/test/basic/app/app.module.ts
+++ b/src/components/alert/test/basic/app/app.module.ts
@@ -2,16 +2,16 @@ import { NgModule } from '@angular/core';
 import { BrowserModule } from '@angular/platform-browser';
 import { IonicApp, IonicModule } from '../../../../..';
 
-import { E2EApp } from './app.component';
+import { AppComponent } from './app.component';
 import { PageOneModule } from '../pages/page-one/page-one.module';
 
 @NgModule({
   declarations: [
-    E2EApp
+    AppComponent
   ],
   imports: [
     BrowserModule,
-    IonicModule.forRoot(E2EApp, {}),
+    IonicModule.forRoot(AppComponent, {}),
     PageOneModule
   ],
   bootstrap: [IonicApp]
diff --git a/src/components/alert/test/dismiss/app.module.ts b/src/components/alert/test/dismiss/app.module.ts
index 269b4d25a4..c901155b36 100644
--- a/src/components/alert/test/dismiss/app.module.ts
+++ b/src/components/alert/test/dismiss/app.module.ts
@@ -170,19 +170,19 @@ export class AnotherPage {
 @Component({
   template: '<ion-nav [root]="root"></ion-nav>'
 })
-export class E2EApp {
+export class AppComponent {
   root = E2EPage;
 }
 
 @NgModule({
   declarations: [
-    E2EApp,
+    AppComponent,
     E2EPage,
     AnotherPage
   ],
   imports: [
     BrowserModule,
-    IonicModule.forRoot(E2EApp)
+    IonicModule.forRoot(AppComponent)
   ],
   bootstrap: [IonicApp],
   entryComponents: [
diff --git a/src/components/app/test/animations/app.module.ts b/src/components/app/test/animations/app.module.ts
index cf3ea8a865..be57850263 100644
--- a/src/components/app/test/animations/app.module.ts
+++ b/src/components/app/test/animations/app.module.ts
@@ -57,19 +57,19 @@ export class E2EPage {
 @Component({
   template: '<ion-nav [root]="root"></ion-nav>'
 })
-export class E2EApp {
+export class AppComponent {
   root = E2EPage;
 }
 
 
 @NgModule({
   declarations: [
-    E2EApp,
+    AppComponent,
     E2EPage
   ],
   imports: [
     BrowserModule,
-    IonicModule.forRoot(E2EApp)
+    IonicModule.forRoot(AppComponent)
   ],
   bootstrap: [IonicApp],
   entryComponents: [
diff --git a/src/components/app/test/cordova/app/app.component.ts b/src/components/app/test/cordova/app/app.component.ts
index 33bf2d6cff..b9b1d96411 100644
--- a/src/components/app/test/cordova/app/app.component.ts
+++ b/src/components/app/test/cordova/app/app.component.ts
@@ -5,6 +5,6 @@ import { PageOne } from '../pages/page-one/page-one';
 @Component({
   templateUrl: `./app.component.html`
 })
-export class E2EApp {
+export class AppComponent {
   root = PageOne;
 }
diff --git a/src/components/app/test/cordova/app/app.module.ts b/src/components/app/test/cordova/app/app.module.ts
index f224094c51..8495b5aa1b 100644
--- a/src/components/app/test/cordova/app/app.module.ts
+++ b/src/components/app/test/cordova/app/app.module.ts
@@ -2,16 +2,16 @@ import { NgModule } from '@angular/core';
 import { BrowserModule } from '@angular/platform-browser';
 import { IonicApp, IonicModule } from '../../../../..';
 
-import { E2EApp } from './app.component';
+import { AppComponent } from './app.component';
 import { PageOneModule } from '../pages/page-one/page-one.module';
 
 @NgModule({
   declarations: [
-    E2EApp,
+    AppComponent,
   ],
   imports: [
     BrowserModule,
-    IonicModule.forRoot(E2EApp, { statusbarPadding: true }),
+    IonicModule.forRoot(AppComponent, { statusbarPadding: true }),
     PageOneModule
   ],
   bootstrap: [IonicApp],
diff --git a/src/components/app/test/gestures/app.module.ts b/src/components/app/test/gestures/app.module.ts
index 1a8e1a956f..ff9cc77272 100644
--- a/src/components/app/test/gestures/app.module.ts
+++ b/src/components/app/test/gestures/app.module.ts
@@ -17,19 +17,19 @@ export class E2EPage {
 @Component({
   template: '<ion-nav [root]="root"></ion-nav>'
 })
-export class E2EApp {
+export class AppComponent {
   root = E2EPage;
 }
 
 
 @NgModule({
   declarations: [
-    E2EApp,
+    AppComponent,
     E2EPage
   ],
   imports: [
     BrowserModule,
-    IonicModule.forRoot(E2EApp)
+    IonicModule.forRoot(AppComponent)
   ],
   bootstrap: [IonicApp],
   entryComponents: [
diff --git a/src/components/app/test/typography/app.module.ts b/src/components/app/test/typography/app.module.ts
index 79721a80b8..524f4fbd56 100644
--- a/src/components/app/test/typography/app.module.ts
+++ b/src/components/app/test/typography/app.module.ts
@@ -6,7 +6,7 @@ import { IonicApp, IonicModule, App } from '../../../..';
 @Component({
   templateUrl: 'main.html'
 })
-export class E2EApp {
+export class AppComponent {
   constructor(app: App) {
     app.setTitle('Basic Buttons');
   }
@@ -14,11 +14,11 @@ export class E2EApp {
 
 @NgModule({
   declarations: [
-    E2EApp
+    AppComponent
   ],
   imports: [
     BrowserModule,
-    IonicModule.forRoot(E2EApp)
+    IonicModule.forRoot(AppComponent)
   ],
   bootstrap: [IonicApp]
 })
diff --git a/src/components/button/test/raised/app.module.ts b/src/components/button/test/raised/app.module.ts
index 414b660941..20982bd470 100644
--- a/src/components/button/test/raised/app.module.ts
+++ b/src/components/button/test/raised/app.module.ts
@@ -11,18 +11,18 @@ export class E2EPage {}
 @Component({
   template: '<ion-nav [root]="rootPage"></ion-nav>'
 })
-export class E2EApp {
+export class AppComponent {
   rootPage = E2EPage;
 }
 
 @NgModule({
   declarations: [
-    E2EApp,
+    AppComponent,
     E2EPage
   ],
   imports: [
     BrowserModule,
-    IonicModule.forRoot(E2EApp)
+    IonicModule.forRoot(AppComponent)
   ],
   bootstrap: [IonicApp],
   entryComponents: [
diff --git a/src/components/card/test/map/app.module.ts b/src/components/card/test/map/app.module.ts
index 414b660941..20982bd470 100644
--- a/src/components/card/test/map/app.module.ts
+++ b/src/components/card/test/map/app.module.ts
@@ -11,18 +11,18 @@ export class E2EPage {}
 @Component({
   template: '<ion-nav [root]="rootPage"></ion-nav>'
 })
-export class E2EApp {
+export class AppComponent {
   rootPage = E2EPage;
 }
 
 @NgModule({
   declarations: [
-    E2EApp,
+    AppComponent,
     E2EPage
   ],
   imports: [
     BrowserModule,
-    IonicModule.forRoot(E2EApp)
+    IonicModule.forRoot(AppComponent)
   ],
   bootstrap: [IonicApp],
   entryComponents: [
diff --git a/src/components/card/test/social/app.module.ts b/src/components/card/test/social/app.module.ts
index 414b660941..20982bd470 100644
--- a/src/components/card/test/social/app.module.ts
+++ b/src/components/card/test/social/app.module.ts
@@ -11,18 +11,18 @@ export class E2EPage {}
 @Component({
   template: '<ion-nav [root]="rootPage"></ion-nav>'
 })
-export class E2EApp {
+export class AppComponent {
   rootPage = E2EPage;
 }
 
 @NgModule({
   declarations: [
-    E2EApp,
+    AppComponent,
     E2EPage
   ],
   imports: [
     BrowserModule,
-    IonicModule.forRoot(E2EApp)
+    IonicModule.forRoot(AppComponent)
   ],
   bootstrap: [IonicApp],
   entryComponents: [
diff --git a/src/components/content/test/header-scroll/app.module.ts b/src/components/content/test/header-scroll/app.module.ts
index e05c9e9c72..cd19a1ef3a 100644
--- a/src/components/content/test/header-scroll/app.module.ts
+++ b/src/components/content/test/header-scroll/app.module.ts
@@ -22,22 +22,22 @@ export class E2EPage {
 @Component({
   template: '<ion-nav [root]="root"></ion-nav>'
 })
-export class E2EApp {
+export class AppComponent {
   root = E2EPage;
 }
 
 @NgModule({
   declarations: [
-    E2EApp,
+    AppComponent,
     E2EPage,
   ],
   imports: [
     BrowserModule,
-    IonicModule.forRoot(E2EApp)
+    IonicModule.forRoot(AppComponent)
   ],
   bootstrap: [IonicApp],
   entryComponents: [
-    E2EApp,
+    AppComponent,
     E2EPage,
   ]
 })
diff --git a/src/components/content/test/no-bounce/app.module.ts b/src/components/content/test/no-bounce/app.module.ts
index f9d98fceb2..201654b7e6 100644
--- a/src/components/content/test/no-bounce/app.module.ts
+++ b/src/components/content/test/no-bounce/app.module.ts
@@ -12,22 +12,22 @@ export class E2EPage {}
 @Component({
   template: '<ion-nav [root]="root"></ion-nav>'
 })
-export class E2EApp {
+export class AppComponent {
   root = E2EPage;
 }
 
 @NgModule({
   declarations: [
-    E2EApp,
+    AppComponent,
     E2EPage,
   ],
   imports: [
     BrowserModule,
-    IonicModule.forRoot(E2EApp)
+    IonicModule.forRoot(AppComponent)
   ],
   bootstrap: [IonicApp],
   entryComponents: [
-    E2EApp,
+    AppComponent,
     E2EPage,
   ]
 })
diff --git a/src/components/datetime/test/form/app.module.ts b/src/components/datetime/test/form/app.module.ts
index a9f90b19cc..1f96cb4389 100644
--- a/src/components/datetime/test/form/app.module.ts
+++ b/src/components/datetime/test/form/app.module.ts
@@ -29,18 +29,18 @@ export class E2EPage {
 @Component({
   template: '<ion-nav [root]="root"></ion-nav>'
 })
-export class E2EApp {
+export class AppComponent {
   root = E2EPage;
 }
 
 @NgModule({
   declarations: [
-    E2EApp,
+    AppComponent,
     E2EPage
   ],
   imports: [
     BrowserModule,
-    IonicModule.forRoot(E2EApp)
+    IonicModule.forRoot(AppComponent)
   ],
   bootstrap: [IonicApp],
   entryComponents: [
diff --git a/src/components/grid/test/alignment/app.module.ts b/src/components/grid/test/alignment/app.module.ts
index 65c5590623..03a5e33fa5 100644
--- a/src/components/grid/test/alignment/app.module.ts
+++ b/src/components/grid/test/alignment/app.module.ts
@@ -12,23 +12,23 @@ export class E2EPage {}
 @Component({
   template: '<ion-nav [root]="rootPage"></ion-nav>'
 })
-export class E2EApp {
+export class AppComponent {
   rootPage = E2EPage;
 }
 
 
 @NgModule({
   declarations: [
-    E2EApp,
+    AppComponent,
     E2EPage
   ],
   imports: [
     BrowserModule,
-    IonicModule.forRoot(E2EApp)
+    IonicModule.forRoot(AppComponent)
   ],
   bootstrap: [IonicApp],
   entryComponents: [
-    E2EApp,
+    AppComponent,
     E2EPage
   ]
 })
diff --git a/src/components/grid/test/card/app.module.ts b/src/components/grid/test/card/app.module.ts
index 4eb4b81762..201a0ff52f 100644
--- a/src/components/grid/test/card/app.module.ts
+++ b/src/components/grid/test/card/app.module.ts
@@ -19,21 +19,21 @@ export class Page1 {
 @Component({
   template: '<ion-nav [root]="rootPage"></ion-nav>'
 })
-export class E2EApp {
+export class AppComponent {
   rootPage = Page1;
 }
 
 @NgModule({
   declarations: [
-    E2EApp,
+    AppComponent,
     Page1
   ],
   imports: [
-    IonicModule.forRoot(E2EApp)
+    IonicModule.forRoot(AppComponent)
   ],
   bootstrap: [IonicApp],
   entryComponents: [
-    E2EApp,
+    AppComponent,
     Page1
   ]
 })
diff --git a/src/components/grid/test/full/app.module.ts b/src/components/grid/test/full/app.module.ts
index 2f28702124..75d0edffa0 100644
--- a/src/components/grid/test/full/app.module.ts
+++ b/src/components/grid/test/full/app.module.ts
@@ -11,23 +11,23 @@ export class E2EPage {}
 @Component({
   template: '<ion-nav [root]="rootPage"></ion-nav>'
 })
-export class E2EApp {
+export class AppComponent {
   rootPage = E2EPage;
 }
 
 @NgModule({
   declarations: [
-    E2EApp,
+    AppComponent,
     E2EPage
   ],
   imports: [
     BrowserModule,
-    IonicModule.forRoot(E2EApp)
+    IonicModule.forRoot(AppComponent)
   ],
   bootstrap: [IonicApp],
   entryComponents: [
     E2EPage,
-    E2EApp
+    AppComponent
   ]
 })
 export class AppModule {}
diff --git a/src/components/grid/test/responsive/app.module.ts b/src/components/grid/test/responsive/app.module.ts
index 2fb9814a79..5df27a4c60 100644
--- a/src/components/grid/test/responsive/app.module.ts
+++ b/src/components/grid/test/responsive/app.module.ts
@@ -13,21 +13,21 @@ export class Page1 {
 @Component({
   template: '<ion-nav [root]="rootPage"></ion-nav>'
 })
-export class E2EApp {
+export class AppComponent {
   rootPage = Page1;
 }
 
 @NgModule({
   declarations: [
-    E2EApp,
+    AppComponent,
     Page1
   ],
   imports: [
-    IonicModule.forRoot(E2EApp)
+    IonicModule.forRoot(AppComponent)
   ],
   bootstrap: [IonicApp],
   entryComponents: [
-    E2EApp,
+    AppComponent,
     Page1
   ]
 })
diff --git a/src/components/img/test/cards/app.module.ts b/src/components/img/test/cards/app.module.ts
index b5000f3f56..6687e9b8aa 100644
--- a/src/components/img/test/cards/app.module.ts
+++ b/src/components/img/test/cards/app.module.ts
@@ -19,23 +19,23 @@ export class E2EPage {
 @Component({
   template: '<ion-nav [root]="root"></ion-nav>'
 })
-export class E2EApp {
+export class AppComponent {
   root = E2EPage;
 }
 
 
 @NgModule({
   declarations: [
-    E2EApp,
+    AppComponent,
     E2EPage
   ],
   imports: [
     BrowserModule,
-    IonicModule.forRoot(E2EApp)
+    IonicModule.forRoot(AppComponent)
   ],
   bootstrap: [IonicApp],
   entryComponents: [
-    E2EApp,
+    AppComponent,
     E2EPage
   ]
 })
diff --git a/src/components/img/test/lazy-load/app.module.ts b/src/components/img/test/lazy-load/app.module.ts
index ec7a3d06eb..73a837eeb5 100644
--- a/src/components/img/test/lazy-load/app.module.ts
+++ b/src/components/img/test/lazy-load/app.module.ts
@@ -14,23 +14,23 @@ export class E2EPage {
 @Component({
   template: '<ion-nav [root]="root"></ion-nav>'
 })
-export class E2EApp {
+export class AppComponent {
   root = E2EPage;
 }
 
 
 @NgModule({
   declarations: [
-    E2EApp,
+    AppComponent,
     E2EPage
   ],
   imports: [
     BrowserModule,
-    IonicModule.forRoot(E2EApp)
+    IonicModule.forRoot(AppComponent)
   ],
   bootstrap: [IonicApp],
   entryComponents: [
-    E2EApp,
+    AppComponent,
     E2EPage
   ]
 })
diff --git a/src/components/img/test/list/app.module.ts b/src/components/img/test/list/app.module.ts
index 1a5d2043f8..43d75545d9 100644
--- a/src/components/img/test/list/app.module.ts
+++ b/src/components/img/test/list/app.module.ts
@@ -44,23 +44,23 @@ function getRandomImg(): string {
 @Component({
   template: '<ion-nav [root]="root"></ion-nav>'
 })
-export class E2EApp {
+export class AppComponent {
   root = E2EPage;
 }
 
 
 @NgModule({
   declarations: [
-    E2EApp,
+    AppComponent,
     E2EPage
   ],
   imports: [
     BrowserModule,
-    IonicModule.forRoot(E2EApp)
+    IonicModule.forRoot(AppComponent)
   ],
   bootstrap: [IonicApp],
   entryComponents: [
-    E2EApp,
+    AppComponent,
     E2EPage
   ]
 })
diff --git a/src/components/infinite-scroll/test/basic/app.module.ts b/src/components/infinite-scroll/test/basic/app.module.ts
index 8ba0675a4e..4c091e20c5 100644
--- a/src/components/infinite-scroll/test/basic/app.module.ts
+++ b/src/components/infinite-scroll/test/basic/app.module.ts
@@ -55,23 +55,23 @@ export class E2EPage2 {
 @Component({
   template: '<ion-nav [root]="root"></ion-nav>'
 })
-export class E2EApp {
+export class AppComponent {
   root = E2EPage1;
 }
 
 @NgModule({
   declarations: [
-    E2EApp,
+    AppComponent,
     E2EPage1,
     E2EPage2
   ],
   imports: [
     BrowserModule,
-    IonicModule.forRoot(E2EApp)
+    IonicModule.forRoot(AppComponent)
   ],
   bootstrap: [IonicApp],
   entryComponents: [
-    E2EApp,
+    AppComponent,
     E2EPage1,
     E2EPage2
   ]
diff --git a/src/components/infinite-scroll/test/short-list/app.module.ts b/src/components/infinite-scroll/test/short-list/app.module.ts
index 69b4f768a3..df16bac150 100644
--- a/src/components/infinite-scroll/test/short-list/app.module.ts
+++ b/src/components/infinite-scroll/test/short-list/app.module.ts
@@ -37,18 +37,18 @@ export class E2EPage {
 @Component({
   template: '<ion-nav [root]="rootPage"></ion-nav>'
 })
-export class E2EApp {
+export class AppComponent {
   rootPage = E2EPage;
 }
 
 @NgModule({
   declarations: [
-    E2EApp,
+    AppComponent,
     E2EPage
   ],
   imports: [
     BrowserModule,
-    IonicModule.forRoot(E2EApp)
+    IonicModule.forRoot(AppComponent)
   ],
   bootstrap: [IonicApp],
   entryComponents: [
diff --git a/src/components/input/test/events/app/app.module.ts b/src/components/input/test/events/app/app.module.ts
index 66d6a3950d..ca2bdc1886 100644
--- a/src/components/input/test/events/app/app.module.ts
+++ b/src/components/input/test/events/app/app.module.ts
@@ -7,18 +7,18 @@ import { RootPage } from '../pages/root-page/root-page';
 @Component({
   template: '<ion-nav [root]="rootPage"></ion-nav>'
 })
-export class E2EApp {
+export class AppComponent {
   rootPage = RootPage;
 }
 
 @NgModule({
   declarations: [
-    E2EApp,
+    AppComponent,
     RootPage
   ],
   imports: [
     BrowserModule,
-    IonicModule.forRoot(E2EApp)
+    IonicModule.forRoot(AppComponent)
   ],
   bootstrap: [IonicApp],
   entryComponents: [
diff --git a/src/components/input/test/fixed-inline-labels/app/app.module.ts b/src/components/input/test/fixed-inline-labels/app/app.module.ts
index a12bc6035d..bbf8e0f769 100644
--- a/src/components/input/test/fixed-inline-labels/app/app.module.ts
+++ b/src/components/input/test/fixed-inline-labels/app/app.module.ts
@@ -7,18 +7,18 @@ import { RootPage } from '../pages/root-page/root-page';
 @Component({
   template: '<ion-nav [root]="root"></ion-nav>'
 })
-export class E2EApp {
+export class AppComponent {
   root = RootPage;
 }
 
 @NgModule({
   declarations: [
-    E2EApp,
+    AppComponent,
     RootPage
   ],
   imports: [
     BrowserModule,
-    IonicModule.forRoot(E2EApp)
+    IonicModule.forRoot(AppComponent)
   ],
   bootstrap: [IonicApp],
   entryComponents: [
diff --git a/src/components/input/test/floating-labels/app/app.module.ts b/src/components/input/test/floating-labels/app/app.module.ts
index b3427e9ee7..3e5fb63209 100644
--- a/src/components/input/test/floating-labels/app/app.module.ts
+++ b/src/components/input/test/floating-labels/app/app.module.ts
@@ -7,18 +7,18 @@ import { RootPage } from '../pages/root-page/root-page';
 @Component({
   template: '<ion-nav [root]="rootPage"></ion-nav>'
 })
-export class E2EApp {
+export class AppComponent {
   rootPage = RootPage;
 }
 
 @NgModule({
   declarations: [
-    E2EApp,
+    AppComponent,
     RootPage
   ],
   imports: [
     BrowserModule,
-    IonicModule.forRoot(E2EApp)
+    IonicModule.forRoot(AppComponent)
   ],
   bootstrap: [IonicApp],
   entryComponents: [
diff --git a/src/components/input/test/footer-inputs/app/app.module.ts b/src/components/input/test/footer-inputs/app/app.module.ts
index 66d6a3950d..ca2bdc1886 100644
--- a/src/components/input/test/footer-inputs/app/app.module.ts
+++ b/src/components/input/test/footer-inputs/app/app.module.ts
@@ -7,18 +7,18 @@ import { RootPage } from '../pages/root-page/root-page';
 @Component({
   template: '<ion-nav [root]="rootPage"></ion-nav>'
 })
-export class E2EApp {
+export class AppComponent {
   rootPage = RootPage;
 }
 
 @NgModule({
   declarations: [
-    E2EApp,
+    AppComponent,
     RootPage
   ],
   imports: [
     BrowserModule,
-    IonicModule.forRoot(E2EApp)
+    IonicModule.forRoot(AppComponent)
   ],
   bootstrap: [IonicApp],
   entryComponents: [
diff --git a/src/components/input/test/form-inputs/app/app.module.ts b/src/components/input/test/form-inputs/app/app.module.ts
index 12e205bd1b..91edc82841 100644
--- a/src/components/input/test/form-inputs/app/app.module.ts
+++ b/src/components/input/test/form-inputs/app/app.module.ts
@@ -7,18 +7,18 @@ import { RootPage } from '../pages/root-page/root-page';
 @Component({
   template: '<ion-nav [root]="root"></ion-nav>'
 })
-export class E2EApp {
+export class AppComponent {
   root = RootPage;
 }
 
 @NgModule({
   declarations: [
-    E2EApp,
+    AppComponent,
     RootPage
   ],
   imports: [
     BrowserModule,
-    IonicModule.forRoot(E2EApp)
+    IonicModule.forRoot(AppComponent)
   ],
   bootstrap: [IonicApp],
   entryComponents: [
diff --git a/src/components/input/test/highlight/app/app.module.ts b/src/components/input/test/highlight/app/app.module.ts
index 2bca994a45..7b3247e989 100644
--- a/src/components/input/test/highlight/app/app.module.ts
+++ b/src/components/input/test/highlight/app/app.module.ts
@@ -7,22 +7,22 @@ import { RootPage } from '../pages/root-page/root-page';
 @Component({
   template: '<ion-nav [root]="root"></ion-nav>'
 })
-export class E2EApp {
+export class AppComponent {
   root = RootPage;
 }
 
 @NgModule({
   declarations: [
-    E2EApp,
+    AppComponent,
     RootPage
   ],
   imports: [
     BrowserModule,
-    IonicModule.forRoot(E2EApp)
+    IonicModule.forRoot(AppComponent)
   ],
   bootstrap: [IonicApp],
   entryComponents: [
-    E2EApp,
+    AppComponent,
     RootPage
   ]
 })
diff --git a/src/components/input/test/inline-labels/app/app.module.ts b/src/components/input/test/inline-labels/app/app.module.ts
index 66d6a3950d..ca2bdc1886 100644
--- a/src/components/input/test/inline-labels/app/app.module.ts
+++ b/src/components/input/test/inline-labels/app/app.module.ts
@@ -7,18 +7,18 @@ import { RootPage } from '../pages/root-page/root-page';
 @Component({
   template: '<ion-nav [root]="rootPage"></ion-nav>'
 })
-export class E2EApp {
+export class AppComponent {
   rootPage = RootPage;
 }
 
 @NgModule({
   declarations: [
-    E2EApp,
+    AppComponent,
     RootPage
   ],
   imports: [
     BrowserModule,
-    IonicModule.forRoot(E2EApp)
+    IonicModule.forRoot(AppComponent)
   ],
   bootstrap: [IonicApp],
   entryComponents: [
diff --git a/src/components/input/test/input-focus/app/app.module.ts b/src/components/input/test/input-focus/app/app.module.ts
index d1bee608f6..146932809f 100644
--- a/src/components/input/test/input-focus/app/app.module.ts
+++ b/src/components/input/test/input-focus/app/app.module.ts
@@ -7,18 +7,18 @@ import { RootPage } from '../pages/root-page/root-page';
 @Component({
   template: '<ion-nav [root]="rootPage"></ion-nav>'
 })
-export class E2EApp {
+export class AppComponent {
   rootPage = RootPage;
 }
 
 @NgModule({
   declarations: [
-    E2EApp,
+    AppComponent,
     RootPage
   ],
   imports: [
     BrowserModule,
-    IonicModule.forRoot(E2EApp, {
+    IonicModule.forRoot(AppComponent, {
       inputCloning: true,
       scrollAssist: true
     })
diff --git a/src/components/input/test/inset-inputs/app/app.module.ts b/src/components/input/test/inset-inputs/app/app.module.ts
index 608fd42f33..5fe591a3ea 100644
--- a/src/components/input/test/inset-inputs/app/app.module.ts
+++ b/src/components/input/test/inset-inputs/app/app.module.ts
@@ -7,22 +7,22 @@ import { RootPage } from '../pages/root-page/root-page';
 @Component({
   template: '<ion-nav [root]="rootPage"></ion-nav>'
 })
-export class E2EApp {
+export class AppComponent {
   rootPage = RootPage;
 }
 
 @NgModule({
   declarations: [
-    E2EApp,
+    AppComponent,
     RootPage
   ],
   imports: [
     BrowserModule,
-    IonicModule.forRoot(E2EApp)
+    IonicModule.forRoot(AppComponent)
   ],
   bootstrap: [IonicApp],
   entryComponents: [
-    E2EApp,
+    AppComponent,
     RootPage
   ]
 })
diff --git a/src/components/input/test/placeholder-labels/app/app.module.ts b/src/components/input/test/placeholder-labels/app/app.module.ts
index 608fd42f33..5fe591a3ea 100644
--- a/src/components/input/test/placeholder-labels/app/app.module.ts
+++ b/src/components/input/test/placeholder-labels/app/app.module.ts
@@ -7,22 +7,22 @@ import { RootPage } from '../pages/root-page/root-page';
 @Component({
   template: '<ion-nav [root]="rootPage"></ion-nav>'
 })
-export class E2EApp {
+export class AppComponent {
   rootPage = RootPage;
 }
 
 @NgModule({
   declarations: [
-    E2EApp,
+    AppComponent,
     RootPage
   ],
   imports: [
     BrowserModule,
-    IonicModule.forRoot(E2EApp)
+    IonicModule.forRoot(AppComponent)
   ],
   bootstrap: [IonicApp],
   entryComponents: [
-    E2EApp,
+    AppComponent,
     RootPage
   ]
 })
diff --git a/src/components/input/test/stacked-labels/app/app.module.ts b/src/components/input/test/stacked-labels/app/app.module.ts
index 2bca994a45..7b3247e989 100644
--- a/src/components/input/test/stacked-labels/app/app.module.ts
+++ b/src/components/input/test/stacked-labels/app/app.module.ts
@@ -7,22 +7,22 @@ import { RootPage } from '../pages/root-page/root-page';
 @Component({
   template: '<ion-nav [root]="root"></ion-nav>'
 })
-export class E2EApp {
+export class AppComponent {
   root = RootPage;
 }
 
 @NgModule({
   declarations: [
-    E2EApp,
+    AppComponent,
     RootPage
   ],
   imports: [
     BrowserModule,
-    IonicModule.forRoot(E2EApp)
+    IonicModule.forRoot(AppComponent)
   ],
   bootstrap: [IonicApp],
   entryComponents: [
-    E2EApp,
+    AppComponent,
     RootPage
   ]
 })
diff --git a/src/components/item/test/buttons/app/app.module.ts b/src/components/item/test/buttons/app/app.module.ts
index 608fd42f33..5fe591a3ea 100644
--- a/src/components/item/test/buttons/app/app.module.ts
+++ b/src/components/item/test/buttons/app/app.module.ts
@@ -7,22 +7,22 @@ import { RootPage } from '../pages/root-page/root-page';
 @Component({
   template: '<ion-nav [root]="rootPage"></ion-nav>'
 })
-export class E2EApp {
+export class AppComponent {
   rootPage = RootPage;
 }
 
 @NgModule({
   declarations: [
-    E2EApp,
+    AppComponent,
     RootPage
   ],
   imports: [
     BrowserModule,
-    IonicModule.forRoot(E2EApp)
+    IonicModule.forRoot(AppComponent)
   ],
   bootstrap: [IonicApp],
   entryComponents: [
-    E2EApp,
+    AppComponent,
     RootPage
   ]
 })
diff --git a/src/components/item/test/colors/app/app.module.ts b/src/components/item/test/colors/app/app.module.ts
index 608fd42f33..5fe591a3ea 100644
--- a/src/components/item/test/colors/app/app.module.ts
+++ b/src/components/item/test/colors/app/app.module.ts
@@ -7,22 +7,22 @@ import { RootPage } from '../pages/root-page/root-page';
 @Component({
   template: '<ion-nav [root]="rootPage"></ion-nav>'
 })
-export class E2EApp {
+export class AppComponent {
   rootPage = RootPage;
 }
 
 @NgModule({
   declarations: [
-    E2EApp,
+    AppComponent,
     RootPage
   ],
   imports: [
     BrowserModule,
-    IonicModule.forRoot(E2EApp)
+    IonicModule.forRoot(AppComponent)
   ],
   bootstrap: [IonicApp],
   entryComponents: [
-    E2EApp,
+    AppComponent,
     RootPage
   ]
 })
diff --git a/src/components/item/test/dividers/app/app.module.ts b/src/components/item/test/dividers/app/app.module.ts
index 608fd42f33..5fe591a3ea 100644
--- a/src/components/item/test/dividers/app/app.module.ts
+++ b/src/components/item/test/dividers/app/app.module.ts
@@ -7,22 +7,22 @@ import { RootPage } from '../pages/root-page/root-page';
 @Component({
   template: '<ion-nav [root]="rootPage"></ion-nav>'
 })
-export class E2EApp {
+export class AppComponent {
   rootPage = RootPage;
 }
 
 @NgModule({
   declarations: [
-    E2EApp,
+    AppComponent,
     RootPage
   ],
   imports: [
     BrowserModule,
-    IonicModule.forRoot(E2EApp)
+    IonicModule.forRoot(AppComponent)
   ],
   bootstrap: [IonicApp],
   entryComponents: [
-    E2EApp,
+    AppComponent,
     RootPage
   ]
 })
diff --git a/src/components/item/test/icons/app/app.module.ts b/src/components/item/test/icons/app/app.module.ts
index 608fd42f33..5fe591a3ea 100644
--- a/src/components/item/test/icons/app/app.module.ts
+++ b/src/components/item/test/icons/app/app.module.ts
@@ -7,22 +7,22 @@ import { RootPage } from '../pages/root-page/root-page';
 @Component({
   template: '<ion-nav [root]="rootPage"></ion-nav>'
 })
-export class E2EApp {
+export class AppComponent {
   rootPage = RootPage;
 }
 
 @NgModule({
   declarations: [
-    E2EApp,
+    AppComponent,
     RootPage
   ],
   imports: [
     BrowserModule,
-    IonicModule.forRoot(E2EApp)
+    IonicModule.forRoot(AppComponent)
   ],
   bootstrap: [IonicApp],
   entryComponents: [
-    E2EApp,
+    AppComponent,
     RootPage
   ]
 })
diff --git a/src/components/item/test/images/app/app.module.ts b/src/components/item/test/images/app/app.module.ts
index 608fd42f33..5fe591a3ea 100644
--- a/src/components/item/test/images/app/app.module.ts
+++ b/src/components/item/test/images/app/app.module.ts
@@ -7,22 +7,22 @@ import { RootPage } from '../pages/root-page/root-page';
 @Component({
   template: '<ion-nav [root]="rootPage"></ion-nav>'
 })
-export class E2EApp {
+export class AppComponent {
   rootPage = RootPage;
 }
 
 @NgModule({
   declarations: [
-    E2EApp,
+    AppComponent,
     RootPage
   ],
   imports: [
     BrowserModule,
-    IonicModule.forRoot(E2EApp)
+    IonicModule.forRoot(AppComponent)
   ],
   bootstrap: [IonicApp],
   entryComponents: [
-    E2EApp,
+    AppComponent,
     RootPage
   ]
 })
diff --git a/src/components/item/test/inputs/app/app.module.ts b/src/components/item/test/inputs/app/app.module.ts
index 186823e2ee..b87e5fbaa3 100644
--- a/src/components/item/test/inputs/app/app.module.ts
+++ b/src/components/item/test/inputs/app/app.module.ts
@@ -8,22 +8,22 @@ import { RootPage } from '../pages/root-page/root-page';
 @Component({
   template: '<ion-nav [root]="rootPage"></ion-nav>'
 })
-export class E2EApp {
+export class AppComponent {
   rootPage = RootPage;
 }
 
 @NgModule({
   declarations: [
-    E2EApp,
+    AppComponent,
     RootPage
   ],
   imports: [
     BrowserModule,
-    IonicModule.forRoot(E2EApp)
+    IonicModule.forRoot(AppComponent)
   ],
   bootstrap: [IonicApp],
   entryComponents: [
-    E2EApp,
+    AppComponent,
     RootPage
   ]
 })
diff --git a/src/components/item/test/media/app/app.module.ts b/src/components/item/test/media/app/app.module.ts
index 186823e2ee..b87e5fbaa3 100644
--- a/src/components/item/test/media/app/app.module.ts
+++ b/src/components/item/test/media/app/app.module.ts
@@ -8,22 +8,22 @@ import { RootPage } from '../pages/root-page/root-page';
 @Component({
   template: '<ion-nav [root]="rootPage"></ion-nav>'
 })
-export class E2EApp {
+export class AppComponent {
   rootPage = RootPage;
 }
 
 @NgModule({
   declarations: [
-    E2EApp,
+    AppComponent,
     RootPage
   ],
   imports: [
     BrowserModule,
-    IonicModule.forRoot(E2EApp)
+    IonicModule.forRoot(AppComponent)
   ],
   bootstrap: [IonicApp],
   entryComponents: [
-    E2EApp,
+    AppComponent,
     RootPage
   ]
 })
diff --git a/src/components/item/test/reorder/app/app.module.ts b/src/components/item/test/reorder/app/app.module.ts
index 2bca994a45..7b3247e989 100644
--- a/src/components/item/test/reorder/app/app.module.ts
+++ b/src/components/item/test/reorder/app/app.module.ts
@@ -7,22 +7,22 @@ import { RootPage } from '../pages/root-page/root-page';
 @Component({
   template: '<ion-nav [root]="root"></ion-nav>'
 })
-export class E2EApp {
+export class AppComponent {
   root = RootPage;
 }
 
 @NgModule({
   declarations: [
-    E2EApp,
+    AppComponent,
     RootPage
   ],
   imports: [
     BrowserModule,
-    IonicModule.forRoot(E2EApp)
+    IonicModule.forRoot(AppComponent)
   ],
   bootstrap: [IonicApp],
   entryComponents: [
-    E2EApp,
+    AppComponent,
     RootPage
   ]
 })
diff --git a/src/components/item/test/text/app/app.component.ts b/src/components/item/test/text/app/app.component.ts
index 5942ba7d45..483f78cdd1 100644
--- a/src/components/item/test/text/app/app.component.ts
+++ b/src/components/item/test/text/app/app.component.ts
@@ -5,6 +5,6 @@ import { RootPage } from '../pages/root-page/root-page';
 @Component({
   template: '<ion-nav [root]="rootPage"></ion-nav>'
 })
-export class E2EApp {
+export class AppComponent {
   rootPage = RootPage;
 }
diff --git a/src/components/item/test/text/app/app.module.ts b/src/components/item/test/text/app/app.module.ts
index c8aaeb4bd4..0866dcfdae 100644
--- a/src/components/item/test/text/app/app.module.ts
+++ b/src/components/item/test/text/app/app.module.ts
@@ -2,21 +2,21 @@ import { NgModule } from '@angular/core';
 import { BrowserModule } from '@angular/platform-browser';
 import { IonicApp, IonicModule } from '../../../../..';
 
-import { E2EApp } from './app.component';
+import { AppComponent } from './app.component';
 import { RootPageModule } from '../pages/root-page/root-page.module';
 
 @NgModule({
   declarations: [
-    E2EApp
+    AppComponent
   ],
   imports: [
     BrowserModule,
     RootPageModule,
-    IonicModule.forRoot(E2EApp)
+    IonicModule.forRoot(AppComponent)
   ],
   bootstrap: [IonicApp],
   entryComponents: [
-    E2EApp
+    AppComponent
   ]
 })
 export class AppModule {}
diff --git a/src/components/list/test/chat-list/app.module.ts b/src/components/list/test/chat-list/app.module.ts
index 403854bb54..6a6c8a4876 100644
--- a/src/components/list/test/chat-list/app.module.ts
+++ b/src/components/list/test/chat-list/app.module.ts
@@ -16,22 +16,22 @@ export class E2EPage {
 @Component({
   template: '<ion-nav [root]="root"></ion-nav>'
 })
-export class E2EApp {
+export class AppComponent {
   root = E2EPage;
 }
 
 @NgModule({
   declarations: [
-    E2EApp,
+    AppComponent,
     E2EPage
   ],
   imports: [
     BrowserModule,
-    IonicModule.forRoot(E2EApp)
+    IonicModule.forRoot(AppComponent)
   ],
   bootstrap: [IonicApp],
   entryComponents: [
-    E2EApp,
+    AppComponent,
     E2EPage
   ]
 })
diff --git a/src/components/list/test/header-scenarios/app/app.component.ts b/src/components/list/test/header-scenarios/app/app.component.ts
index fc804cf72c..3fe9080927 100644
--- a/src/components/list/test/header-scenarios/app/app.component.ts
+++ b/src/components/list/test/header-scenarios/app/app.component.ts
@@ -5,6 +5,6 @@ import { E2EPage } from '../pages/main/main';
 @Component({
   template: '<ion-nav [root]="root"></ion-nav>'
 })
-export class E2EApp {
+export class AppComponent {
   root = E2EPage;
 }
diff --git a/src/components/list/test/header-scenarios/app/app.module.ts b/src/components/list/test/header-scenarios/app/app.module.ts
index d3d08f6f82..6055a4ef7e 100644
--- a/src/components/list/test/header-scenarios/app/app.module.ts
+++ b/src/components/list/test/header-scenarios/app/app.module.ts
@@ -2,21 +2,21 @@ import { NgModule } from '@angular/core';
 import { BrowserModule } from '@angular/platform-browser';
 import { IonicApp, IonicModule } from '../../../../..';
 
-import { E2EApp } from './app.component';
+import { AppComponent } from './app.component';
 import { E2EPageModule } from '../pages/main/main.module';
 
 @NgModule({
   declarations: [
-    E2EApp
+    AppComponent
   ],
   imports: [
     BrowserModule,
     E2EPageModule,
-    IonicModule.forRoot(E2EApp)
+    IonicModule.forRoot(AppComponent)
   ],
   bootstrap: [IonicApp],
   entryComponents: [
-    E2EApp
+    AppComponent
   ]
 })
 export class AppModule {}
diff --git a/src/components/list/test/repeat-headers/app.module.ts b/src/components/list/test/repeat-headers/app.module.ts
index c917efe6b7..cc183ee950 100644
--- a/src/components/list/test/repeat-headers/app.module.ts
+++ b/src/components/list/test/repeat-headers/app.module.ts
@@ -17,22 +17,22 @@ export class E2EPage {
 @Component({
   template: '<ion-nav [root]="rootPage"></ion-nav>'
 })
-export class E2EApp {
+export class AppComponent {
   rootPage = E2EPage;
 }
 
 @NgModule({
   declarations: [
-    E2EApp,
+    AppComponent,
     E2EPage
   ],
   imports: [
     BrowserModule,
-    IonicModule.forRoot(E2EApp)
+    IonicModule.forRoot(AppComponent)
   ],
   bootstrap: [IonicApp],
   entryComponents: [
-    E2EApp,
+    AppComponent,
     E2EPage
   ]
 })
diff --git a/src/components/list/test/sticky/app.module.ts b/src/components/list/test/sticky/app.module.ts
index 1ca37e2621..32d68af22a 100644
--- a/src/components/list/test/sticky/app.module.ts
+++ b/src/components/list/test/sticky/app.module.ts
@@ -32,22 +32,22 @@ export class E2EPage {
 @Component({
   template: '<ion-nav [root]="rootPage"></ion-nav>'
 })
-export class E2EApp {
+export class AppComponent {
   rootPage = E2EPage;
 }
 
 @NgModule({
   declarations: [
-    E2EApp,
+    AppComponent,
     E2EPage
   ],
   imports: [
     BrowserModule,
-    IonicModule.forRoot(E2EApp)
+    IonicModule.forRoot(AppComponent)
   ],
   bootstrap: [IonicApp],
   entryComponents: [
-    E2EApp,
+    AppComponent,
     E2EPage
   ]
 })
diff --git a/src/components/menu/test/disable-swipe/app.module.ts b/src/components/menu/test/disable-swipe/app.module.ts
index 3400c5c681..96e015cadb 100644
--- a/src/components/menu/test/disable-swipe/app.module.ts
+++ b/src/components/menu/test/disable-swipe/app.module.ts
@@ -29,22 +29,22 @@ export class Page1 {
 @Component({
   templateUrl: 'main.html'
 })
-export class E2EApp {
+export class AppComponent {
   root = Page1;
 }
 
 @NgModule({
   declarations: [
-    E2EApp,
+    AppComponent,
     Page1
   ],
   imports: [
     BrowserModule,
-    IonicModule.forRoot(E2EApp)
+    IonicModule.forRoot(AppComponent)
   ],
   bootstrap: [IonicApp],
   entryComponents: [
-    E2EApp,
+    AppComponent,
     Page1
   ]
 })
diff --git a/src/components/menu/test/enable-disable/app.module.ts b/src/components/menu/test/enable-disable/app.module.ts
index 5b855af438..b1e6304360 100644
--- a/src/components/menu/test/enable-disable/app.module.ts
+++ b/src/components/menu/test/enable-disable/app.module.ts
@@ -19,7 +19,7 @@ export class Page2 {
 @Component({
   templateUrl: 'main.html'
 })
-export class E2EApp {
+export class AppComponent {
   @ViewChild(Nav) nav: Nav;
 
   activeMenu: string;
@@ -49,17 +49,17 @@ export class E2EApp {
 
 @NgModule({
   declarations: [
-    E2EApp,
+    AppComponent,
     Page1,
     Page2
   ],
   imports: [
     BrowserModule,
-    IonicModule.forRoot(E2EApp)
+    IonicModule.forRoot(AppComponent)
   ],
   bootstrap: [IonicApp],
   entryComponents: [
-    E2EApp,
+    AppComponent,
     Page1,
     Page2
   ]
diff --git a/src/components/menu/test/multiple/app.module.ts b/src/components/menu/test/multiple/app.module.ts
index c5030a4a64..59f28191d5 100644
--- a/src/components/menu/test/multiple/app.module.ts
+++ b/src/components/menu/test/multiple/app.module.ts
@@ -27,22 +27,22 @@ export class Page1 {
 @Component({
   templateUrl: 'main.html'
 })
-export class E2EApp {
+export class AppComponent {
   rootPage = Page1;
 }
 
 @NgModule({
   declarations: [
-    E2EApp,
+    AppComponent,
     Page1
   ],
   imports: [
     BrowserModule,
-    IonicModule.forRoot(E2EApp)
+    IonicModule.forRoot(AppComponent)
   ],
   bootstrap: [IonicApp],
   entryComponents: [
-    E2EApp,
+    AppComponent,
     Page1
   ]
 })
diff --git a/src/components/menu/test/overlay/app.module.ts b/src/components/menu/test/overlay/app.module.ts
index 34ed855833..e49268830d 100644
--- a/src/components/menu/test/overlay/app.module.ts
+++ b/src/components/menu/test/overlay/app.module.ts
@@ -10,7 +10,7 @@ export class Page1 {}
 @Component({
   templateUrl: 'main.html'
 })
-export class E2EApp {
+export class AppComponent {
   @ViewChild(Nav) nav: Nav;
 
   rootView = Page1;
@@ -37,16 +37,16 @@ export class E2EApp {
 
 @NgModule({
   declarations: [
-    E2EApp,
+    AppComponent,
     Page1
   ],
   imports: [
     BrowserModule,
-    IonicModule.forRoot(E2EApp)
+    IonicModule.forRoot(AppComponent)
   ],
   bootstrap: [IonicApp],
   entryComponents: [
-    E2EApp,
+    AppComponent,
     Page1
   ]
 })
diff --git a/src/components/menu/test/push/app.module.ts b/src/components/menu/test/push/app.module.ts
index 34ed855833..e49268830d 100644
--- a/src/components/menu/test/push/app.module.ts
+++ b/src/components/menu/test/push/app.module.ts
@@ -10,7 +10,7 @@ export class Page1 {}
 @Component({
   templateUrl: 'main.html'
 })
-export class E2EApp {
+export class AppComponent {
   @ViewChild(Nav) nav: Nav;
 
   rootView = Page1;
@@ -37,16 +37,16 @@ export class E2EApp {
 
 @NgModule({
   declarations: [
-    E2EApp,
+    AppComponent,
     Page1
   ],
   imports: [
     BrowserModule,
-    IonicModule.forRoot(E2EApp)
+    IonicModule.forRoot(AppComponent)
   ],
   bootstrap: [IonicApp],
   entryComponents: [
-    E2EApp,
+    AppComponent,
     Page1
   ]
 })
diff --git a/src/components/menu/test/reveal/app.module.ts b/src/components/menu/test/reveal/app.module.ts
index 70b4c875cd..9c6a4dab45 100644
--- a/src/components/menu/test/reveal/app.module.ts
+++ b/src/components/menu/test/reveal/app.module.ts
@@ -10,7 +10,7 @@ export class Page1 {}
 @Component({
   templateUrl: 'main.html'
 })
-export class E2EApp {
+export class AppComponent {
   @ViewChild(Nav) nav: Nav;
 
   rootView = Page1;
@@ -27,16 +27,16 @@ export class E2EApp {
 
 @NgModule({
   declarations: [
-    E2EApp,
+    AppComponent,
     Page1
   ],
   imports: [
     BrowserModule,
-    IonicModule.forRoot(E2EApp)
+    IonicModule.forRoot(AppComponent)
   ],
   bootstrap: [IonicApp],
   entryComponents: [
-    E2EApp,
+    AppComponent,
     Page1
   ]
 })
diff --git a/src/components/nav/test/init-async/app.module.ts b/src/components/nav/test/init-async/app.module.ts
index 560e817894..a6cd582668 100644
--- a/src/components/nav/test/init-async/app.module.ts
+++ b/src/components/nav/test/init-async/app.module.ts
@@ -16,7 +16,7 @@ export class AsyncPage {}
 @Component({
   template: `<ion-nav [root]="root"></ion-nav>`
 })
-export class E2EApp {
+export class AppComponent {
   root: AsyncPage;
 
   constructor() {
@@ -29,16 +29,16 @@ export class E2EApp {
 
 @NgModule({
   declarations: [
-    E2EApp,
+    AppComponent,
     AsyncPage
   ],
   imports: [
     BrowserModule,
-    IonicModule.forRoot(E2EApp)
+    IonicModule.forRoot(AppComponent)
   ],
   bootstrap: [IonicApp],
   entryComponents: [
-    E2EApp,
+    AppComponent,
     AsyncPage
   ]
 })
diff --git a/src/components/nav/test/insert-views/app.module.ts b/src/components/nav/test/insert-views/app.module.ts
index 8bae0bd304..2b8397ba7e 100644
--- a/src/components/nav/test/insert-views/app.module.ts
+++ b/src/components/nav/test/insert-views/app.module.ts
@@ -101,24 +101,24 @@ export class InsertPage {
 @Component({
   template: `<ion-nav [root]="root"></ion-nav>`
 })
-export class E2EApp {
+export class AppComponent {
   root = FirstPage;
 }
 
 @NgModule({
   declarations: [
-    E2EApp,
+    AppComponent,
     FirstPage,
     SecondPage,
     InsertPage
   ],
   imports: [
     BrowserModule,
-    IonicModule.forRoot(E2EApp)
+    IonicModule.forRoot(AppComponent)
   ],
   bootstrap: [IonicApp],
   entryComponents: [
-    E2EApp,
+    AppComponent,
     FirstPage,
     SecondPage,
     InsertPage
diff --git a/src/components/nav/test/memory/app.module.ts b/src/components/nav/test/memory/app.module.ts
index 5e749f6f6c..ef021f74c1 100644
--- a/src/components/nav/test/memory/app.module.ts
+++ b/src/components/nav/test/memory/app.module.ts
@@ -78,23 +78,23 @@ export class Page2 {
 @Component({
   template: `<ion-nav [root]="root"></ion-nav>`
 })
-export class E2EApp {
+export class AppComponent {
   root = Page1;
 }
 
 @NgModule({
   declarations: [
-    E2EApp,
+    AppComponent,
     Page1,
     Page2
   ],
   imports: [
     BrowserModule,
-    IonicModule.forRoot(E2EApp)
+    IonicModule.forRoot(AppComponent)
   ],
   bootstrap: [IonicApp],
   entryComponents: [
-    E2EApp,
+    AppComponent,
     Page1,
     Page2
   ]
diff --git a/src/components/nav/test/nav-push-pop/app.module.ts b/src/components/nav/test/nav-push-pop/app.module.ts
index 8bcbea5e99..39408ac06b 100644
--- a/src/components/nav/test/nav-push-pop/app.module.ts
+++ b/src/components/nav/test/nav-push-pop/app.module.ts
@@ -41,23 +41,23 @@ export class E2EPage {
 @Component({
   template: '<ion-nav [root]="root"></ion-nav>'
 })
-export class E2EApp {
+export class AppComponent {
   root = E2EPage;
 }
 
 @NgModule({
   declarations: [
-    E2EApp,
+    AppComponent,
     E2EPage,
     SecondPage
   ],
   imports: [
     BrowserModule,
-    IonicModule.forRoot(E2EApp)
+    IonicModule.forRoot(AppComponent)
   ],
   bootstrap: [IonicApp],
   entryComponents: [
-    E2EApp,
+    AppComponent,
     E2EPage,
     SecondPage
   ]
diff --git a/src/components/nav/test/worst-case/app.module.ts b/src/components/nav/test/worst-case/app.module.ts
index 865ae49195..1671b56479 100644
--- a/src/components/nav/test/worst-case/app.module.ts
+++ b/src/components/nav/test/worst-case/app.module.ts
@@ -284,7 +284,7 @@ export class Results {
 @Component({
   template: `<ion-nav [root]="root"></ion-nav>`
 })
-export class E2EApp {
+export class AppComponent {
   root: any = Page1;
   constructor() {
     setTimeout(() => this.root = Page2, 100);
@@ -293,7 +293,7 @@ export class E2EApp {
 
 @NgModule({
   declarations: [
-    E2EApp,
+    AppComponent,
     Page1,
     Page2,
     Page3,
@@ -306,11 +306,11 @@ export class E2EApp {
   ],
   imports: [
     BrowserModule,
-    IonicModule.forRoot(E2EApp)
+    IonicModule.forRoot(AppComponent)
   ],
   bootstrap: [IonicApp],
   entryComponents: [
-    E2EApp,
+    AppComponent,
     Page1,
     Page2,
     Page3,
diff --git a/src/components/range/test/basic/app/app.module.ts b/src/components/range/test/basic/app/app.module.ts
index 62d76e6098..63200ca53f 100644
--- a/src/components/range/test/basic/app/app.module.ts
+++ b/src/components/range/test/basic/app/app.module.ts
@@ -7,22 +7,22 @@ import { RootPage } from '../pages/root-page/root-page';
 @Component({
   templateUrl: 'main.html'
 })
-export class E2EApp {
+export class AppComponent {
   rootPage = RootPage;
 }
 
 @NgModule({
   declarations: [
-    E2EApp,
+    AppComponent,
     RootPage
   ],
   imports: [
     BrowserModule,
-    IonicModule.forRoot(E2EApp)
+    IonicModule.forRoot(AppComponent)
   ],
   bootstrap: [IonicApp],
   entryComponents: [
-    E2EApp,
+    AppComponent,
     RootPage
   ]
 })
diff --git a/src/components/refresher/test/basic/app.module.ts b/src/components/refresher/test/basic/app.module.ts
index babc2ee3e1..caa5d0189f 100644
--- a/src/components/refresher/test/basic/app.module.ts
+++ b/src/components/refresher/test/basic/app.module.ts
@@ -90,22 +90,22 @@ const data = [
 @Component({
   template: '<ion-nav [root]="rootPage"></ion-nav>'
 })
-export class E2EApp {
+export class AppComponent {
   rootPage = Page1;
 }
 
 @NgModule({
   declarations: [
-    E2EApp,
+    AppComponent,
     Page1
   ],
   imports: [
     BrowserModule,
-    IonicModule.forRoot(E2EApp)
+    IonicModule.forRoot(AppComponent)
   ],
   bootstrap: [IonicApp],
   entryComponents: [
-    E2EApp,
+    AppComponent,
     Page1
   ]
 })
diff --git a/src/components/refresher/test/navigation/app.module.ts b/src/components/refresher/test/navigation/app.module.ts
index e24a25d42e..bde5f1c19c 100644
--- a/src/components/refresher/test/navigation/app.module.ts
+++ b/src/components/refresher/test/navigation/app.module.ts
@@ -99,22 +99,22 @@ export class Page2 {
 @Component({
   template: '<ion-nav [root]="rootPage"></ion-nav>'
 })
-export class E2EApp {
+export class AppComponent {
   rootPage = Page1;
 }
 
 @NgModule({
   declarations: [
-    E2EApp,
+    AppComponent,
     Page1,
     Page2
   ],
   imports: [
-    IonicModule.forRoot(E2EApp)
+    IonicModule.forRoot(AppComponent)
   ],
   bootstrap: [IonicApp],
   entryComponents: [
-    E2EApp,
+    AppComponent,
     Page1,
     Page2
   ]
diff --git a/src/components/scroll/test/basic/app.module.ts b/src/components/scroll/test/basic/app.module.ts
index ecb66838cb..f4d2971969 100644
--- a/src/components/scroll/test/basic/app.module.ts
+++ b/src/components/scroll/test/basic/app.module.ts
@@ -6,7 +6,7 @@ import { IonicApp, IonicModule } from '../../../..';
 @Component({
   templateUrl: 'main.html'
 })
-export class E2EApp {
+export class AppComponent {
   doRefresh() {
     console.log('DOREFRESH');
   }
@@ -14,15 +14,15 @@ export class E2EApp {
 
 @NgModule({
   declarations: [
-    E2EApp
+    AppComponent
   ],
   imports: [
     BrowserModule,
-    IonicModule.forRoot(E2EApp)
+    IonicModule.forRoot(AppComponent)
   ],
   bootstrap: [IonicApp],
   entryComponents: [
-    E2EApp
+    AppComponent
   ]
 })
 export class AppModule {}
diff --git a/src/components/segment/test/swipe/app/app.component.ts b/src/components/segment/test/swipe/app/app.component.ts
index e3687a6be9..8288e69b09 100644
--- a/src/components/segment/test/swipe/app/app.component.ts
+++ b/src/components/segment/test/swipe/app/app.component.ts
@@ -3,6 +3,6 @@ import {E2EPage} from '../pages/e2e-page/e2e-page';
 @Component({
   template: `<ion-nav [root]="root"></ion-nav>`
 })
-export class E2EApp {
+export class AppComponent {
   root = E2EPage;
 }
diff --git a/src/components/segment/test/swipe/app/app.module.ts b/src/components/segment/test/swipe/app/app.module.ts
index 5e9a508927..93848bbc29 100644
--- a/src/components/segment/test/swipe/app/app.module.ts
+++ b/src/components/segment/test/swipe/app/app.module.ts
@@ -2,20 +2,20 @@ import {  NgModule } from '@angular/core';
 import { BrowserModule } from '@angular/platform-browser';
 import { IonicApp, IonicModule } from '../../../../..';
 
-import {E2EApp} from './app.component';
+import {AppComponent} from './app.component';
 import {E2EPage} from '../pages/e2e-page/e2e-page';
 @NgModule({
   declarations: [
-    E2EApp,
+    AppComponent,
     E2EPage
   ],
   imports: [
     BrowserModule,
-    IonicModule.forRoot(E2EApp)
+    IonicModule.forRoot(AppComponent)
   ],
   bootstrap: [IonicApp],
   entryComponents: [
-    E2EApp,
+    AppComponent,
     E2EPage
   ]
 })
diff --git a/src/components/show-hide-when/test/basic/app.module.ts b/src/components/show-hide-when/test/basic/app.module.ts
index f6a64ced1c..494117b8da 100644
--- a/src/components/show-hide-when/test/basic/app.module.ts
+++ b/src/components/show-hide-when/test/basic/app.module.ts
@@ -14,22 +14,22 @@ export class E2EPage {
 @Component({
   template: '<ion-nav [root]="root"></ion-nav>'
 })
-export class E2EApp {
+export class AppComponent {
   root = E2EPage;
 }
 
 @NgModule({
   declarations: [
-    E2EApp,
+    AppComponent,
     E2EPage
   ],
   imports: [
     BrowserModule,
-    IonicModule.forRoot(E2EApp)
+    IonicModule.forRoot(AppComponent)
   ],
   bootstrap: [IonicApp],
   entryComponents: [
-    E2EApp,
+    AppComponent,
     E2EPage
   ]
 })
diff --git a/src/components/slides/test/basic/app.module.ts b/src/components/slides/test/basic/app.module.ts
index 33651f39ca..c480b5430e 100644
--- a/src/components/slides/test/basic/app.module.ts
+++ b/src/components/slides/test/basic/app.module.ts
@@ -26,22 +26,22 @@ export class E2EPage {
 @Component({
   template: '<ion-nav [root]="root"></ion-nav>'
 })
-export class E2EApp {
+export class AppComponent {
   root = E2EPage;
 }
 
 @NgModule({
   declarations: [
-    E2EApp,
+    AppComponent,
     E2EPage
   ],
   imports: [
     BrowserModule,
-    IonicModule.forRoot(E2EApp)
+    IonicModule.forRoot(AppComponent)
   ],
   bootstrap: [IonicApp],
   entryComponents: [
-    E2EApp,
+    AppComponent,
     E2EPage
   ]
 })
diff --git a/src/components/slides/test/control/app.module.ts b/src/components/slides/test/control/app.module.ts
index 9155cae756..fa91ab3f66 100644
--- a/src/components/slides/test/control/app.module.ts
+++ b/src/components/slides/test/control/app.module.ts
@@ -15,22 +15,22 @@ export class MyPage {
 @Component({
   template: `<ion-nav [root]="root"></ion-nav>`
 })
-export class E2EApp {
+export class AppComponent {
   root: any = MyPage;
 }
 
 @NgModule({
   declarations: [
-    E2EApp,
+    AppComponent,
     MyPage
   ],
   imports: [
     BrowserModule,
-    IonicModule.forRoot(E2EApp)
+    IonicModule.forRoot(AppComponent)
   ],
   bootstrap: [IonicApp],
   entryComponents: [
-    E2EApp,
+    AppComponent,
     MyPage
   ]
 })
diff --git a/src/components/slides/test/controller/app.module.ts b/src/components/slides/test/controller/app.module.ts
index a41a8756a5..85963772a0 100644
--- a/src/components/slides/test/controller/app.module.ts
+++ b/src/components/slides/test/controller/app.module.ts
@@ -46,22 +46,22 @@ export class MyPage {
 @Component({
   template: `<ion-nav [root]="root"></ion-nav>`
 })
-export class E2EApp {
+export class AppComponent {
   root: any = MyPage;
 }
 
 @NgModule({
   declarations: [
-    E2EApp,
+    AppComponent,
     MyPage
   ],
   imports: [
     BrowserModule,
-    IonicModule.forRoot(E2EApp)
+    IonicModule.forRoot(AppComponent)
   ],
   bootstrap: [IonicApp],
   entryComponents: [
-    E2EApp,
+    AppComponent,
     MyPage
   ]
 })
diff --git a/src/components/slides/test/images/app.module.ts b/src/components/slides/test/images/app.module.ts
index 932c750614..eb0a88b16e 100644
--- a/src/components/slides/test/images/app.module.ts
+++ b/src/components/slides/test/images/app.module.ts
@@ -43,22 +43,22 @@ export class E2EPage {
 @Component({
   template: '<ion-nav [root]="root"></ion-nav>'
 })
-export class E2EApp {
+export class AppComponent {
   root = E2EPage;
 }
 
 @NgModule({
   declarations: [
-    E2EApp,
+    AppComponent,
     E2EPage
   ],
   imports: [
     BrowserModule,
-    IonicModule.forRoot(E2EApp)
+    IonicModule.forRoot(AppComponent)
   ],
   bootstrap: [IonicApp],
   entryComponents: [
-    E2EApp,
+    AppComponent,
     E2EPage
   ]
 })
diff --git a/src/components/slides/test/intro/app.module.ts b/src/components/slides/test/intro/app.module.ts
index 91cd0b4839..ea1cd13974 100644
--- a/src/components/slides/test/intro/app.module.ts
+++ b/src/components/slides/test/intro/app.module.ts
@@ -61,23 +61,23 @@ export class MainPage {}
 @Component({
   template: '<ion-nav [root]="root"></ion-nav>'
 })
-export class E2EApp {
+export class AppComponent {
   root = IntroPage;
 }
 
 @NgModule({
   declarations: [
-    E2EApp,
+    AppComponent,
     IntroPage,
     MainPage
   ],
   imports: [
     BrowserModule,
-    IonicModule.forRoot(E2EApp)
+    IonicModule.forRoot(AppComponent)
   ],
   bootstrap: [IonicApp],
   entryComponents: [
-    E2EApp,
+    AppComponent,
     IntroPage,
     MainPage
   ]
diff --git a/src/components/slides/test/loop/app.module.ts b/src/components/slides/test/loop/app.module.ts
index c3b7c0e23a..d1ce12c398 100644
--- a/src/components/slides/test/loop/app.module.ts
+++ b/src/components/slides/test/loop/app.module.ts
@@ -48,22 +48,22 @@ export class E2EPage {
 @Component({
   template: '<ion-nav [root]="root"></ion-nav>'
 })
-export class E2EApp {
+export class AppComponent {
   root = E2EPage;
 }
 
 @NgModule({
   declarations: [
-    E2EApp,
+    AppComponent,
     E2EPage
   ],
   imports: [
     BrowserModule,
-    IonicModule.forRoot(E2EApp)
+    IonicModule.forRoot(AppComponent)
   ],
   bootstrap: [IonicApp],
   entryComponents: [
-    E2EApp,
+    AppComponent,
     E2EPage
   ]
 })
diff --git a/src/components/slides/test/options/app.module.ts b/src/components/slides/test/options/app.module.ts
index 4ec2d2edd8..bbd9268d35 100644
--- a/src/components/slides/test/options/app.module.ts
+++ b/src/components/slides/test/options/app.module.ts
@@ -31,22 +31,22 @@ export class E2EPage {
 @Component({
   template: '<ion-nav [root]="root"></ion-nav>'
 })
-export class E2EApp {
+export class AppComponent {
   root = E2EPage;
 }
 
 @NgModule({
   declarations: [
-    E2EApp,
+    AppComponent,
     E2EPage
   ],
   imports: [
     BrowserModule,
-    IonicModule.forRoot(E2EApp)
+    IonicModule.forRoot(AppComponent)
   ],
   bootstrap: [IonicApp],
   entryComponents: [
-    E2EApp,
+    AppComponent,
     E2EPage
   ]
 })
diff --git a/src/components/slides/test/scroll/app.module.ts b/src/components/slides/test/scroll/app.module.ts
index da7409420d..bcd7366ac4 100644
--- a/src/components/slides/test/scroll/app.module.ts
+++ b/src/components/slides/test/scroll/app.module.ts
@@ -11,22 +11,22 @@ export class E2EPage {}
 @Component({
   template: '<ion-nav [root]="root"></ion-nav>'
 })
-export class E2EApp {
+export class AppComponent {
   root = E2EPage;
 }
 
 @NgModule({
   declarations: [
-    E2EApp,
+    AppComponent,
     E2EPage
   ],
   imports: [
     BrowserModule,
-    IonicModule.forRoot(E2EApp)
+    IonicModule.forRoot(AppComponent)
   ],
   bootstrap: [IonicApp],
   entryComponents: [
-    E2EApp,
+    AppComponent,
     E2EPage
   ]
 })
diff --git a/src/components/spinner/test/basic/app.module.ts b/src/components/spinner/test/basic/app.module.ts
index 93d74f80a5..9e4641fb0b 100644
--- a/src/components/spinner/test/basic/app.module.ts
+++ b/src/components/spinner/test/basic/app.module.ts
@@ -18,22 +18,22 @@ export class E2EPage {
 @Component({
   template: '<ion-nav [root]="root"></ion-nav>'
 })
-export class E2EApp {
+export class AppComponent {
   root = E2EPage;
 }
 
 @NgModule({
   declarations: [
-    E2EApp,
+    AppComponent,
     E2EPage
   ],
   imports: [
     BrowserModule,
-    IonicModule.forRoot(E2EApp)
+    IonicModule.forRoot(AppComponent)
   ],
   bootstrap: [IonicApp],
   entryComponents: [
-    E2EApp,
+    AppComponent,
     E2EPage
   ]
 })
diff --git a/src/components/spinner/test/colors/app.module.ts b/src/components/spinner/test/colors/app.module.ts
index 93d74f80a5..9e4641fb0b 100644
--- a/src/components/spinner/test/colors/app.module.ts
+++ b/src/components/spinner/test/colors/app.module.ts
@@ -18,22 +18,22 @@ export class E2EPage {
 @Component({
   template: '<ion-nav [root]="root"></ion-nav>'
 })
-export class E2EApp {
+export class AppComponent {
   root = E2EPage;
 }
 
 @NgModule({
   declarations: [
-    E2EApp,
+    AppComponent,
     E2EPage
   ],
   imports: [
     BrowserModule,
-    IonicModule.forRoot(E2EApp)
+    IonicModule.forRoot(AppComponent)
   ],
   bootstrap: [IonicApp],
   entryComponents: [
-    E2EApp,
+    AppComponent,
     E2EPage
   ]
 })
diff --git a/src/components/split-pane/test/basic/app.module.ts b/src/components/split-pane/test/basic/app.module.ts
index 843d1c22d4..8cf1505d90 100644
--- a/src/components/split-pane/test/basic/app.module.ts
+++ b/src/components/split-pane/test/basic/app.module.ts
@@ -87,7 +87,7 @@ export class E2EPage {
 @Component({
   templateUrl: 'main.html'
 })
-export class E2EApp {
+export class AppComponent {
   root = E2EPage;
   root2 = SidePage;
 
@@ -98,19 +98,19 @@ export class E2EApp {
 
 @NgModule({
   declarations: [
-    E2EApp,
+    AppComponent,
     E2EPage,
     E2EPage2,
     SidePage,
   ],
   imports: [
-    IonicModule.forRoot(E2EApp, {
+    IonicModule.forRoot(AppComponent, {
       swipeBackEnabled: true
     })
   ],
   bootstrap: [IonicApp],
   entryComponents: [
-    E2EApp,
+    AppComponent,
     E2EPage,
     E2EPage2,
     SidePage,
diff --git a/src/components/split-pane/test/menus/app.module.ts b/src/components/split-pane/test/menus/app.module.ts
index 3447cb9d50..e9f72cbd27 100644
--- a/src/components/split-pane/test/menus/app.module.ts
+++ b/src/components/split-pane/test/menus/app.module.ts
@@ -72,7 +72,7 @@ export class E2EPage {
 @Component({
   templateUrl: 'main.html'
 })
-export class E2EApp {
+export class AppComponent {
   root = E2EPage;
 
   splitPaneChanged(splitPane: SplitPane) {
@@ -82,18 +82,18 @@ export class E2EApp {
 
 @NgModule({
   declarations: [
-    E2EApp,
+    AppComponent,
     E2EPage,
     E2EPage2,
   ],
   imports: [
-    IonicModule.forRoot(E2EApp, {
+    IonicModule.forRoot(AppComponent, {
       swipeBackEnabled: true
     })
   ],
   bootstrap: [IonicApp],
   entryComponents: [
-    E2EApp,
+    AppComponent,
     E2EPage,
     E2EPage2,
   ]
diff --git a/src/components/split-pane/test/nested/app.module.ts b/src/components/split-pane/test/nested/app.module.ts
index 50bd1d6116..cb426385da 100644
--- a/src/components/split-pane/test/nested/app.module.ts
+++ b/src/components/split-pane/test/nested/app.module.ts
@@ -129,14 +129,14 @@ export class E2EPage {
 @Component({
   templateUrl: 'main.html'
 })
-export class E2EApp {
+export class AppComponent {
   root = E2EPage;
   root2 = SidePage;
 }
 
 @NgModule({
   declarations: [
-    E2EApp,
+    AppComponent,
     E2EPage,
     SidePage,
     E2ENested,
@@ -144,13 +144,13 @@ export class E2EApp {
     E2ENested3
   ],
   imports: [
-    IonicModule.forRoot(E2EApp, {
+    IonicModule.forRoot(AppComponent, {
       swipeBackEnabled: true
     })
   ],
   bootstrap: [IonicApp],
   entryComponents: [
-    E2EApp,
+    AppComponent,
     E2EPage,
     SidePage,
     E2ENested,
diff --git a/src/components/split-pane/test/tabs/app.module.ts b/src/components/split-pane/test/tabs/app.module.ts
index c437dfe3de..298c64da19 100644
--- a/src/components/split-pane/test/tabs/app.module.ts
+++ b/src/components/split-pane/test/tabs/app.module.ts
@@ -71,25 +71,25 @@ export class E2EPage {
 @Component({
   templateUrl: 'main.html'
 })
-export class E2EApp {
+export class AppComponent {
   root = E2EPage;
   root2 = SidePage;
 }
 
 @NgModule({
   declarations: [
-    E2EApp,
+    AppComponent,
     E2EPage,
     SidePage,
   ],
   imports: [
-    IonicModule.forRoot(E2EApp, {
+    IonicModule.forRoot(AppComponent, {
       swipeBackEnabled: true
     })
   ],
   bootstrap: [IonicApp],
   entryComponents: [
-    E2EApp,
+    AppComponent,
     E2EPage,
     SidePage,
   ]
diff --git a/src/components/tabs/test/events/app.module.ts b/src/components/tabs/test/events/app.module.ts
index 779af7af3f..3fdfe6106e 100644
--- a/src/components/tabs/test/events/app.module.ts
+++ b/src/components/tabs/test/events/app.module.ts
@@ -76,26 +76,26 @@ export class TabsPage {
 @Component({
   template: `<ion-nav [root]="root"></ion-nav>`
 })
-export class E2EApp {
+export class AppComponent {
   root = TabsPage;
 }
 
 @NgModule({
   declarations: [
-    E2EApp,
+    AppComponent,
     Tab1,
     Tab2,
     TabsPage
   ],
   imports: [
     BrowserModule,
-    IonicModule.forRoot(E2EApp, {
+    IonicModule.forRoot(AppComponent, {
       tabsHighlight: true,
     })
   ],
   bootstrap: [IonicApp],
   entryComponents: [
-    E2EApp,
+    AppComponent,
     Tab1,
     Tab2,
     TabsPage
diff --git a/src/components/tabs/test/lifecyles/app.module.ts b/src/components/tabs/test/lifecyles/app.module.ts
index 6f6759f0f3..734498c4d3 100644
--- a/src/components/tabs/test/lifecyles/app.module.ts
+++ b/src/components/tabs/test/lifecyles/app.module.ts
@@ -105,25 +105,25 @@ export class TabsPage {
 @Component({
   template: `<ion-nav [root]="root"></ion-nav>`
 })
-export class E2EApp {
+export class AppComponent {
   root = TabsPage;
 }
 
 @NgModule({
   declarations: [
-    E2EApp,
+    AppComponent,
     Tab1,
     TabsPage
   ],
   imports: [
     BrowserModule,
-    IonicModule.forRoot(E2EApp, {
+    IonicModule.forRoot(AppComponent, {
       tabsHighlight: true,
     })
   ],
   bootstrap: [IonicApp],
   entryComponents: [
-    E2EApp,
+    AppComponent,
     Tab1,
     TabsPage
   ]
diff --git a/src/components/tabs/test/tab-bar-scenarios/app/app.module.ts b/src/components/tabs/test/tab-bar-scenarios/app/app.module.ts
index 0ab2f55f55..59d5acd811 100644
--- a/src/components/tabs/test/tab-bar-scenarios/app/app.module.ts
+++ b/src/components/tabs/test/tab-bar-scenarios/app/app.module.ts
@@ -26,22 +26,22 @@ import { RootPage } from '../pages/root-page/root-page';
     `
   ]
 })
-export class E2EApp {
+export class AppComponent {
   root = RootPage;
 }
 
 @NgModule({
   declarations: [
-    E2EApp,
+    AppComponent,
     RootPage
   ],
   imports: [
     BrowserModule,
-    IonicModule.forRoot(E2EApp)
+    IonicModule.forRoot(AppComponent)
   ],
   bootstrap: [IonicApp],
   entryComponents: [
-    E2EApp,
+    AppComponent,
     RootPage
   ]
 })
diff --git a/src/components/tabs/test/top/app.module.ts b/src/components/tabs/test/top/app.module.ts
index 0f80182863..f99f2cae3d 100644
--- a/src/components/tabs/test/top/app.module.ts
+++ b/src/components/tabs/test/top/app.module.ts
@@ -115,13 +115,13 @@ export class TabsPage {
 @Component({
   template: `<ion-nav [root]="root"></ion-nav>`
 })
-export class E2EApp {
+export class AppComponent {
   root = TabsPage;
 }
 
 @NgModule({
   declarations: [
-    E2EApp,
+    AppComponent,
     Tab1,
     Tab2,
     Tab3,
@@ -129,13 +129,13 @@ export class E2EApp {
   ],
   imports: [
     BrowserModule,
-    IonicModule.forRoot(E2EApp, {
+    IonicModule.forRoot(AppComponent, {
       tabsPlacement: 'top'
     })
   ],
   bootstrap: [IonicApp],
   entryComponents: [
-    E2EApp,
+    AppComponent,
     Tab1,
     Tab2,
     Tab3,
diff --git a/src/components/toggle/test/basic/app/app.module.ts b/src/components/toggle/test/basic/app/app.module.ts
index 2bca994a45..7b3247e989 100644
--- a/src/components/toggle/test/basic/app/app.module.ts
+++ b/src/components/toggle/test/basic/app/app.module.ts
@@ -7,22 +7,22 @@ import { RootPage } from '../pages/root-page/root-page';
 @Component({
   template: '<ion-nav [root]="root"></ion-nav>'
 })
-export class E2EApp {
+export class AppComponent {
   root = RootPage;
 }
 
 @NgModule({
   declarations: [
-    E2EApp,
+    AppComponent,
     RootPage
   ],
   imports: [
     BrowserModule,
-    IonicModule.forRoot(E2EApp)
+    IonicModule.forRoot(AppComponent)
   ],
   bootstrap: [IonicApp],
   entryComponents: [
-    E2EApp,
+    AppComponent,
     RootPage
   ]
 })
diff --git a/src/components/toolbar/test/basic/app/app.module.ts b/src/components/toolbar/test/basic/app/app.module.ts
index 8da432ed93..2e81e35ab4 100644
--- a/src/components/toolbar/test/basic/app/app.module.ts
+++ b/src/components/toolbar/test/basic/app/app.module.ts
@@ -7,22 +7,22 @@ import { RootPage } from '../pages/root-page/root-page';
 @Component({
   template: '<ion-nav [root]="rootPage"></ion-nav>'
 })
-export class E2EApp {
+export class AppComponent {
   rootPage = RootPage;
 }
 
 @NgModule({
   declarations: [
-    E2EApp,
+    AppComponent,
     RootPage
   ],
   imports: [
     BrowserModule,
-    IonicModule.forRoot(E2EApp)
+    IonicModule.forRoot(AppComponent)
   ],
   bootstrap: [IonicApp],
   entryComponents: [
-    E2EApp,
+    AppComponent,
     RootPage
   ]
 })
diff --git a/src/components/typography/test/basic/app/app.module.ts b/src/components/typography/test/basic/app/app.module.ts
index 2bca994a45..7b3247e989 100644
--- a/src/components/typography/test/basic/app/app.module.ts
+++ b/src/components/typography/test/basic/app/app.module.ts
@@ -7,22 +7,22 @@ import { RootPage } from '../pages/root-page/root-page';
 @Component({
   template: '<ion-nav [root]="root"></ion-nav>'
 })
-export class E2EApp {
+export class AppComponent {
   root = RootPage;
 }
 
 @NgModule({
   declarations: [
-    E2EApp,
+    AppComponent,
     RootPage
   ],
   imports: [
     BrowserModule,
-    IonicModule.forRoot(E2EApp)
+    IonicModule.forRoot(AppComponent)
   ],
   bootstrap: [IonicApp],
   entryComponents: [
-    E2EApp,
+    AppComponent,
     RootPage
   ]
 })
diff --git a/src/components/virtual-scroll/test/basic/app.module.ts b/src/components/virtual-scroll/test/basic/app.module.ts
index bc3b9e66fe..9f2a145de6 100644
--- a/src/components/virtual-scroll/test/basic/app.module.ts
+++ b/src/components/virtual-scroll/test/basic/app.module.ts
@@ -54,23 +54,23 @@ export class E2EPage {
 @Component({
   template: '<ion-nav [root]="root"></ion-nav>'
 })
-export class E2EApp {
+export class AppComponent {
   root = E2EPage;
 }
 
 
 @NgModule({
   declarations: [
-    E2EApp,
+    AppComponent,
     E2EPage
   ],
   imports: [
     BrowserModule,
-    IonicModule.forRoot(E2EApp)
+    IonicModule.forRoot(AppComponent)
   ],
   bootstrap: [IonicApp],
   entryComponents: [
-    E2EApp,
+    AppComponent,
     E2EPage
   ]
 })
diff --git a/src/components/virtual-scroll/test/cards/app.module.ts b/src/components/virtual-scroll/test/cards/app.module.ts
index d83277e4fd..ecff4814ef 100644
--- a/src/components/virtual-scroll/test/cards/app.module.ts
+++ b/src/components/virtual-scroll/test/cards/app.module.ts
@@ -31,23 +31,23 @@ export class E2EPage {
 @Component({
   template: '<ion-nav [root]="root"></ion-nav>',
 })
-export class E2EApp {
+export class AppComponent {
   root = E2EPage;
 }
 
 
 @NgModule({
   declarations: [
-    E2EApp,
+    AppComponent,
     E2EPage
   ],
   imports: [
     BrowserModule,
-    IonicModule.forRoot(E2EApp)
+    IonicModule.forRoot(AppComponent)
   ],
   bootstrap: [IonicApp],
   entryComponents: [
-    E2EApp,
+    AppComponent,
     E2EPage
   ]
 })
diff --git a/src/components/virtual-scroll/test/image-gallery/app.module.ts b/src/components/virtual-scroll/test/image-gallery/app.module.ts
index 330a7d7926..bc5ce02545 100644
--- a/src/components/virtual-scroll/test/image-gallery/app.module.ts
+++ b/src/components/virtual-scroll/test/image-gallery/app.module.ts
@@ -77,23 +77,23 @@ export class E2EPage {
 @Component({
   template: '<ion-nav [root]="root"></ion-nav>',
 })
-export class E2EApp {
+export class AppComponent {
   root = E2EPage;
 }
 
 
 @NgModule({
   declarations: [
-    E2EApp,
+    AppComponent,
     E2EPage
   ],
   imports: [
     BrowserModule,
-    IonicModule.forRoot(E2EApp)
+    IonicModule.forRoot(AppComponent)
   ],
   bootstrap: [IonicApp],
   entryComponents: [
-    E2EApp,
+    AppComponent,
     E2EPage
   ]
 })
diff --git a/src/components/virtual-scroll/test/list/app.module.ts b/src/components/virtual-scroll/test/list/app.module.ts
index 541ecaabfb..4159e21813 100644
--- a/src/components/virtual-scroll/test/list/app.module.ts
+++ b/src/components/virtual-scroll/test/list/app.module.ts
@@ -106,23 +106,23 @@ const gifs = [
 @Component({
   template: '<ion-nav [root]="root"></ion-nav>'
 })
-export class E2EApp {
+export class AppComponent {
   root = E2EPage;
 }
 
 
 @NgModule({
   declarations: [
-    E2EApp,
+    AppComponent,
     E2EPage
   ],
   imports: [
     BrowserModule,
-    IonicModule.forRoot(E2EApp)
+    IonicModule.forRoot(AppComponent)
   ],
   bootstrap: [IonicApp],
   entryComponents: [
-    E2EApp,
+    AppComponent,
     E2EPage
   ]
 })
diff --git a/src/components/virtual-scroll/test/media/app/app.module.ts b/src/components/virtual-scroll/test/media/app/app.module.ts
index be8ec28c5b..529bc4b190 100644
--- a/src/components/virtual-scroll/test/media/app/app.module.ts
+++ b/src/components/virtual-scroll/test/media/app/app.module.ts
@@ -7,23 +7,23 @@ import { RootPage } from '../pages/root-page/root-page';
 @Component({
   template: '<ion-nav [root]="root"></ion-nav>'
 })
-export class E2EApp {
+export class AppComponent {
   root = RootPage;
 }
 
 
 @NgModule({
   declarations: [
-    E2EApp,
+    AppComponent,
     RootPage
   ],
   imports: [
     BrowserModule,
-    IonicModule.forRoot(E2EApp)
+    IonicModule.forRoot(AppComponent)
   ],
   bootstrap: [IonicApp],
   entryComponents: [
-    E2EApp,
+    AppComponent,
     RootPage
   ]
 })
diff --git a/src/components/virtual-scroll/test/sliding-item/app.module.ts b/src/components/virtual-scroll/test/sliding-item/app.module.ts
index 2582030146..bdcdd00fd0 100644
--- a/src/components/virtual-scroll/test/sliding-item/app.module.ts
+++ b/src/components/virtual-scroll/test/sliding-item/app.module.ts
@@ -50,23 +50,23 @@ export class E2EPage {
 @Component({
   template: '<ion-nav [root]="root"></ion-nav>'
 })
-export class E2EApp {
+export class AppComponent {
   root = E2EPage;
 }
 
 
 @NgModule({
   declarations: [
-    E2EApp,
+    AppComponent,
     E2EPage
   ],
   imports: [
     BrowserModule,
-    IonicModule.forRoot(E2EApp)
+    IonicModule.forRoot(AppComponent)
   ],
   bootstrap: [IonicApp],
   entryComponents: [
-    E2EApp,
+    AppComponent,
     E2EPage
   ]
 })
diff --git a/src/components/virtual-scroll/test/variable-size/app.module.ts b/src/components/virtual-scroll/test/variable-size/app.module.ts
index 690d74d9dc..49eaf4272d 100644
--- a/src/components/virtual-scroll/test/variable-size/app.module.ts
+++ b/src/components/virtual-scroll/test/variable-size/app.module.ts
@@ -35,23 +35,23 @@ export class E2EPage {
 @Component({
   template: '<ion-nav [root]="root"></ion-nav>',
 })
-export class E2EApp {
+export class AppComponent {
   root = E2EPage;
 }
 
 
 @NgModule({
   declarations: [
-    E2EApp,
+    AppComponent,
     E2EPage
   ],
   imports: [
     BrowserModule,
-    IonicModule.forRoot(E2EApp)
+    IonicModule.forRoot(AppComponent)
   ],
   bootstrap: [IonicApp],
   entryComponents: [
-    E2EApp,
+    AppComponent,
     E2EPage
   ]
 })