diff --git a/scripts/e2e/e2e.template.dev.html b/scripts/e2e/e2e.template.dev.html
index 8c61c1c4719..49ab8419a39 100644
--- a/scripts/e2e/e2e.template.dev.html
+++ b/scripts/e2e/e2e.template.dev.html
@@ -72,7 +72,7 @@
 
 	<script>
     System.import('@angular/platform-browser-dynamic').then(function(platformBrowserDynamic) {
-      System.import('app-module.js').then(function(appModule) {
+      System.import('app.module.js').then(function(appModule) {
         platformBrowserDynamic.platformBrowserDynamic().bootstrapModule(appModule.AppModule);
       }, console.error.bind(console));
     }, console.error.bind(console));
diff --git a/scripts/e2e/entry.ts b/scripts/e2e/entry.ts
index b225ca5be1b..0860070d782 100644
--- a/scripts/e2e/entry.ts
+++ b/scripts/e2e/entry.ts
@@ -1,4 +1,4 @@
 import { platformBrowser } from '@angular/platform-browser';
-import { AppModuleNgFactory } from './app-module.ngfactory';
+import { AppModuleNgFactory } from './app.module.ngfactory';
 
 platformBrowser().bootstrapModuleFactory(AppModuleNgFactory);
diff --git a/scripts/gulp/tasks/e2e.dev.ts b/scripts/gulp/tasks/e2e.dev.ts
index cce64f65a90..78cf3164c7c 100644
--- a/scripts/gulp/tasks/e2e.dev.ts
+++ b/scripts/gulp/tasks/e2e.dev.ts
@@ -59,7 +59,7 @@ task('e2e.build', function () {
     .on('error', function (error) {
       console.log(error.message);
     })
-    .pipe(gulpif(/app-module.js$/, createIndexHTML()))
+    .pipe(gulpif(/app.module.js$/, createIndexHTML()))
     .pipe(gulpif(/e2e.js$/, createPlatformTests()));
 
   var testFiles = src([
diff --git a/scripts/gulp/tasks/e2e.prod.ts b/scripts/gulp/tasks/e2e.prod.ts
index b335b246f9b..e98e8220179 100644
--- a/scripts/gulp/tasks/e2e.prod.ts
+++ b/scripts/gulp/tasks/e2e.prod.ts
@@ -36,7 +36,7 @@ task('e2e.copySource', (done: Function) => {
   const buildConfig = require('../../build/config');
 
   const stream = src([`${SRC_ROOT}/**/*`, `!${SRC_ROOT}/**/*.spec.ts`])
-    .pipe(gulpif(/app-module.ts$/, createIndexHTML()))
+    .pipe(gulpif(/app.module.ts$/, createIndexHTML()))
     .pipe(gulpif(/e2e.ts$/, createPlatformTests()))
     .pipe(dest(DIST_E2E_ROOT));
 
@@ -101,10 +101,10 @@ task('e2e.compileTests', (done: Function) => {
 });
 
 function buildE2ETests(folderInfo: any, done: Function) {
-  let includeGlob = ['./components/*/test/*/app-module.ts', './components/*/test/*/entry.ts'];
+  let includeGlob = ['./components/*/test/*/app.module.ts', './components/*/test/*/entry.ts'];
   if (folderInfo.componentName && folderInfo.componentTest) {
     includeGlob = [
-      `./components/${folderInfo.componentName}/test/${folderInfo.componentTest}/app-module.ts`,
+      `./components/${folderInfo.componentName}/test/${folderInfo.componentTest}/app.module.ts`,
       `./components/${folderInfo.componentName}/test/${folderInfo.componentTest}/entry.ts`,
     ];
   }
@@ -198,7 +198,7 @@ task('e2e.watchProd', ['e2e.copyExternalDependencies', 'e2e.sass', 'e2e.fonts'],
   let e2eTestPath = SRC_COMPONENTS_ROOT;
 
   if (folderInfo.componentName && folderInfo.componentTest) {
-    e2eTestPath = join(SRC_COMPONENTS_ROOT, folderInfo.componentName, 'test', folderInfo.componentTest, 'app-module.ts');
+    e2eTestPath = join(SRC_COMPONENTS_ROOT, folderInfo.componentName, 'test', folderInfo.componentTest, 'app.module.ts');
   }
 
   try {
diff --git a/src/components/action-sheet/test/basic/app-module.ts b/src/components/action-sheet/test/basic/app.module.ts
similarity index 100%
rename from src/components/action-sheet/test/basic/app-module.ts
rename to src/components/action-sheet/test/basic/app.module.ts
diff --git a/src/components/alert/test/basic/app-module.ts b/src/components/alert/test/basic/app.module.ts
similarity index 100%
rename from src/components/alert/test/basic/app-module.ts
rename to src/components/alert/test/basic/app.module.ts
diff --git a/src/components/alert/test/dismiss/app-module.ts b/src/components/alert/test/dismiss/app.module.ts
similarity index 100%
rename from src/components/alert/test/dismiss/app-module.ts
rename to src/components/alert/test/dismiss/app.module.ts
diff --git a/src/components/app/test/animations/app-module.ts b/src/components/app/test/animations/app.module.ts
similarity index 100%
rename from src/components/app/test/animations/app-module.ts
rename to src/components/app/test/animations/app.module.ts
diff --git a/src/components/app/test/cordova/app-module.ts b/src/components/app/test/cordova/app.module.ts
similarity index 100%
rename from src/components/app/test/cordova/app-module.ts
rename to src/components/app/test/cordova/app.module.ts
diff --git a/src/components/app/test/gesture-collision/app-module.ts b/src/components/app/test/gesture-collision/app.module.ts
similarity index 100%
rename from src/components/app/test/gesture-collision/app-module.ts
rename to src/components/app/test/gesture-collision/app.module.ts
diff --git a/src/components/app/test/gestures/app-module.ts b/src/components/app/test/gestures/app.module.ts
similarity index 100%
rename from src/components/app/test/gestures/app-module.ts
rename to src/components/app/test/gestures/app.module.ts
diff --git a/src/components/app/test/typography/app-module.ts b/src/components/app/test/typography/app.module.ts
similarity index 100%
rename from src/components/app/test/typography/app-module.ts
rename to src/components/app/test/typography/app.module.ts
diff --git a/src/components/badge/test/basic/app-module.ts b/src/components/badge/test/basic/app.module.ts
similarity index 100%
rename from src/components/badge/test/basic/app-module.ts
rename to src/components/badge/test/basic/app.module.ts
diff --git a/src/components/button/test/anchors/app-module.ts b/src/components/button/test/anchors/app.module.ts
similarity index 100%
rename from src/components/button/test/anchors/app-module.ts
rename to src/components/button/test/anchors/app.module.ts
diff --git a/src/components/button/test/attributes/app-module.ts b/src/components/button/test/attributes/app.module.ts
similarity index 100%
rename from src/components/button/test/attributes/app-module.ts
rename to src/components/button/test/attributes/app.module.ts
diff --git a/src/components/button/test/basic/app-module.ts b/src/components/button/test/basic/app.module.ts
similarity index 100%
rename from src/components/button/test/basic/app-module.ts
rename to src/components/button/test/basic/app.module.ts
diff --git a/src/components/button/test/block/app-module.ts b/src/components/button/test/block/app.module.ts
similarity index 100%
rename from src/components/button/test/block/app-module.ts
rename to src/components/button/test/block/app.module.ts
diff --git a/src/components/button/test/clear/app-module.ts b/src/components/button/test/clear/app.module.ts
similarity index 100%
rename from src/components/button/test/clear/app-module.ts
rename to src/components/button/test/clear/app.module.ts
diff --git a/src/components/button/test/decorator/app-module.ts b/src/components/button/test/decorator/app.module.ts
similarity index 100%
rename from src/components/button/test/decorator/app-module.ts
rename to src/components/button/test/decorator/app.module.ts
diff --git a/src/components/button/test/dynamic/app-module.ts b/src/components/button/test/dynamic/app.module.ts
similarity index 100%
rename from src/components/button/test/dynamic/app-module.ts
rename to src/components/button/test/dynamic/app.module.ts
diff --git a/src/components/button/test/full/app-module.ts b/src/components/button/test/full/app.module.ts
similarity index 100%
rename from src/components/button/test/full/app-module.ts
rename to src/components/button/test/full/app.module.ts
diff --git a/src/components/button/test/icons/app-module.ts b/src/components/button/test/icons/app.module.ts
similarity index 100%
rename from src/components/button/test/icons/app-module.ts
rename to src/components/button/test/icons/app.module.ts
diff --git a/src/components/button/test/outline/app-module.ts b/src/components/button/test/outline/app.module.ts
similarity index 100%
rename from src/components/button/test/outline/app-module.ts
rename to src/components/button/test/outline/app.module.ts
diff --git a/src/components/button/test/raised/app-module.ts b/src/components/button/test/raised/app.module.ts
similarity index 100%
rename from src/components/button/test/raised/app-module.ts
rename to src/components/button/test/raised/app.module.ts
diff --git a/src/components/button/test/round/app-module.ts b/src/components/button/test/round/app.module.ts
similarity index 100%
rename from src/components/button/test/round/app-module.ts
rename to src/components/button/test/round/app.module.ts
diff --git a/src/components/button/test/sizes/app-module.ts b/src/components/button/test/sizes/app.module.ts
similarity index 100%
rename from src/components/button/test/sizes/app-module.ts
rename to src/components/button/test/sizes/app.module.ts
diff --git a/src/components/card/test/advanced/app-module.ts b/src/components/card/test/advanced/app.module.ts
similarity index 100%
rename from src/components/card/test/advanced/app-module.ts
rename to src/components/card/test/advanced/app.module.ts
diff --git a/src/components/card/test/basic/app-module.ts b/src/components/card/test/basic/app.module.ts
similarity index 100%
rename from src/components/card/test/basic/app-module.ts
rename to src/components/card/test/basic/app.module.ts
diff --git a/src/components/card/test/colors/app-module.ts b/src/components/card/test/colors/app.module.ts
similarity index 100%
rename from src/components/card/test/colors/app-module.ts
rename to src/components/card/test/colors/app.module.ts
diff --git a/src/components/card/test/images/app-module.ts b/src/components/card/test/images/app.module.ts
similarity index 100%
rename from src/components/card/test/images/app-module.ts
rename to src/components/card/test/images/app.module.ts
diff --git a/src/components/card/test/list/app-module.ts b/src/components/card/test/list/app.module.ts
similarity index 100%
rename from src/components/card/test/list/app-module.ts
rename to src/components/card/test/list/app.module.ts
diff --git a/src/components/card/test/map/app-module.ts b/src/components/card/test/map/app.module.ts
similarity index 100%
rename from src/components/card/test/map/app-module.ts
rename to src/components/card/test/map/app.module.ts
diff --git a/src/components/card/test/social/app-module.ts b/src/components/card/test/social/app.module.ts
similarity index 100%
rename from src/components/card/test/social/app-module.ts
rename to src/components/card/test/social/app.module.ts
diff --git a/src/components/checkbox/test/basic/app-module.ts b/src/components/checkbox/test/basic/app.module.ts
similarity index 100%
rename from src/components/checkbox/test/basic/app-module.ts
rename to src/components/checkbox/test/basic/app.module.ts
diff --git a/src/components/chip/test/basic/app-module.ts b/src/components/chip/test/basic/app.module.ts
similarity index 100%
rename from src/components/chip/test/basic/app-module.ts
rename to src/components/chip/test/basic/app.module.ts
diff --git a/src/components/content/test/basic/app-module.ts b/src/components/content/test/basic/app.module.ts
similarity index 100%
rename from src/components/content/test/basic/app-module.ts
rename to src/components/content/test/basic/app.module.ts
diff --git a/src/components/content/test/fullscreen/app-module.ts b/src/components/content/test/fullscreen/app.module.ts
similarity index 100%
rename from src/components/content/test/fullscreen/app-module.ts
rename to src/components/content/test/fullscreen/app.module.ts
diff --git a/src/components/content/test/header-scroll/app-module.ts b/src/components/content/test/header-scroll/app.module.ts
similarity index 100%
rename from src/components/content/test/header-scroll/app-module.ts
rename to src/components/content/test/header-scroll/app.module.ts
diff --git a/src/components/content/test/no-bounce/app-module.ts b/src/components/content/test/no-bounce/app.module.ts
similarity index 100%
rename from src/components/content/test/no-bounce/app-module.ts
rename to src/components/content/test/no-bounce/app.module.ts
diff --git a/src/components/datetime/test/basic/app-module.ts b/src/components/datetime/test/basic/app.module.ts
similarity index 100%
rename from src/components/datetime/test/basic/app-module.ts
rename to src/components/datetime/test/basic/app.module.ts
diff --git a/src/components/datetime/test/form/app-module.ts b/src/components/datetime/test/form/app.module.ts
similarity index 100%
rename from src/components/datetime/test/form/app-module.ts
rename to src/components/datetime/test/form/app.module.ts
diff --git a/src/components/datetime/test/labels/app-module.ts b/src/components/datetime/test/labels/app.module.ts
similarity index 100%
rename from src/components/datetime/test/labels/app-module.ts
rename to src/components/datetime/test/labels/app.module.ts
diff --git a/src/components/fab/test/basic/app-module.ts b/src/components/fab/test/basic/app.module.ts
similarity index 100%
rename from src/components/fab/test/basic/app-module.ts
rename to src/components/fab/test/basic/app.module.ts
diff --git a/src/components/grid/test/alignment/app-module.ts b/src/components/grid/test/alignment/app.module.ts
similarity index 100%
rename from src/components/grid/test/alignment/app-module.ts
rename to src/components/grid/test/alignment/app.module.ts
diff --git a/src/components/grid/test/basic/app-module.ts b/src/components/grid/test/basic/app.module.ts
similarity index 100%
rename from src/components/grid/test/basic/app-module.ts
rename to src/components/grid/test/basic/app.module.ts
diff --git a/src/components/grid/test/full/app-module.ts b/src/components/grid/test/full/app.module.ts
similarity index 100%
rename from src/components/grid/test/full/app-module.ts
rename to src/components/grid/test/full/app.module.ts
diff --git a/src/components/icon/test/basic/app-module.ts b/src/components/icon/test/basic/app-module.ts
deleted file mode 100644
index def52a70a45..00000000000
--- a/src/components/icon/test/basic/app-module.ts
+++ /dev/null
@@ -1,55 +0,0 @@
-import { Component, NgModule } from '@angular/core';
-import { IonicApp, IonicModule } from '../../../..';
-
-@Component({
-  templateUrl: 'main.html'
-})
-export class E2EPage {
-  homeIcon = 'home';
-  isActive = false;
-  iconIndex = 0;
-  icons = [
-    'home',
-    'star',
-    'ios-alert',
-    'ios-alert-outline',
-    'md-alert',
-    'logo-apple'
-  ];
-  btnIcon: string;
-  dynamicColor: string = 'danger';
-
-  constructor() {
-    this.btnIcon = this.icons[0];
-  }
-
-  updateIcon() {
-    this.iconIndex++;
-    if (this.iconIndex >= this.icons.length) {
-      this.iconIndex = 0;
-    }
-    this.btnIcon = this.icons[this.iconIndex];
-  }
-}
-
-@Component({
-  template: '<ion-nav [root]="rootPage"></ion-nav>'
-})
-export class E2EApp {
-  rootPage = E2EPage;
-}
-
-@NgModule({
-  declarations: [
-    E2EApp,
-    E2EPage
-  ],
-  imports: [
-    IonicModule.forRoot(E2EApp)
-  ],
-  bootstrap: [IonicApp],
-  entryComponents: [
-    E2EPage
-  ]
-})
-export class AppModule {}
diff --git a/src/components/img/test/basic/app-module.ts b/src/components/img/test/basic/app.module.ts
similarity index 100%
rename from src/components/img/test/basic/app-module.ts
rename to src/components/img/test/basic/app.module.ts
diff --git a/src/components/img/test/cards/app-module.ts b/src/components/img/test/cards/app.module.ts
similarity index 100%
rename from src/components/img/test/cards/app-module.ts
rename to src/components/img/test/cards/app.module.ts
diff --git a/src/components/img/test/lazy-load/app-module.ts b/src/components/img/test/lazy-load/app.module.ts
similarity index 100%
rename from src/components/img/test/lazy-load/app-module.ts
rename to src/components/img/test/lazy-load/app.module.ts
diff --git a/src/components/img/test/list/app-module.ts b/src/components/img/test/list/app.module.ts
similarity index 100%
rename from src/components/img/test/list/app-module.ts
rename to src/components/img/test/list/app.module.ts
diff --git a/src/components/infinite-scroll/test/basic/app-module.ts b/src/components/infinite-scroll/test/basic/app.module.ts
similarity index 100%
rename from src/components/infinite-scroll/test/basic/app-module.ts
rename to src/components/infinite-scroll/test/basic/app.module.ts
diff --git a/src/components/infinite-scroll/test/short-list/app-module.ts b/src/components/infinite-scroll/test/short-list/app.module.ts
similarity index 100%
rename from src/components/infinite-scroll/test/short-list/app-module.ts
rename to src/components/infinite-scroll/test/short-list/app.module.ts
diff --git a/src/components/input/test/clear-after-edit/app-module.ts b/src/components/input/test/clear-after-edit/app.module.ts
similarity index 100%
rename from src/components/input/test/clear-after-edit/app-module.ts
rename to src/components/input/test/clear-after-edit/app.module.ts
diff --git a/src/components/input/test/clear-input/app-module.ts b/src/components/input/test/clear-input/app.module.ts
similarity index 100%
rename from src/components/input/test/clear-input/app-module.ts
rename to src/components/input/test/clear-input/app.module.ts
diff --git a/src/components/input/test/events/app-module.ts b/src/components/input/test/events/app.module.ts
similarity index 100%
rename from src/components/input/test/events/app-module.ts
rename to src/components/input/test/events/app.module.ts
diff --git a/src/components/input/test/fixed-inline-labels/app-module.ts b/src/components/input/test/fixed-inline-labels/app.module.ts
similarity index 100%
rename from src/components/input/test/fixed-inline-labels/app-module.ts
rename to src/components/input/test/fixed-inline-labels/app.module.ts
diff --git a/src/components/input/test/floating-labels/app-module.ts b/src/components/input/test/floating-labels/app.module.ts
similarity index 100%
rename from src/components/input/test/floating-labels/app-module.ts
rename to src/components/input/test/floating-labels/app.module.ts
diff --git a/src/components/input/test/footer-inputs/app-module.ts b/src/components/input/test/footer-inputs/app.module.ts
similarity index 100%
rename from src/components/input/test/footer-inputs/app-module.ts
rename to src/components/input/test/footer-inputs/app.module.ts
diff --git a/src/components/input/test/form-inputs/app-module.ts b/src/components/input/test/form-inputs/app.module.ts
similarity index 100%
rename from src/components/input/test/form-inputs/app-module.ts
rename to src/components/input/test/form-inputs/app.module.ts
diff --git a/src/components/input/test/highlight/app-module.ts b/src/components/input/test/highlight/app.module.ts
similarity index 100%
rename from src/components/input/test/highlight/app-module.ts
rename to src/components/input/test/highlight/app.module.ts
diff --git a/src/components/input/test/inline-labels/app-module.ts b/src/components/input/test/inline-labels/app.module.ts
similarity index 100%
rename from src/components/input/test/inline-labels/app-module.ts
rename to src/components/input/test/inline-labels/app.module.ts
diff --git a/src/components/input/test/input-focus/app-module.ts b/src/components/input/test/input-focus/app.module.ts
similarity index 100%
rename from src/components/input/test/input-focus/app-module.ts
rename to src/components/input/test/input-focus/app.module.ts
diff --git a/src/components/input/test/inset-inputs/app-module.ts b/src/components/input/test/inset-inputs/app.module.ts
similarity index 100%
rename from src/components/input/test/inset-inputs/app-module.ts
rename to src/components/input/test/inset-inputs/app.module.ts
diff --git a/src/components/input/test/placeholder-labels/app-module.ts b/src/components/input/test/placeholder-labels/app.module.ts
similarity index 100%
rename from src/components/input/test/placeholder-labels/app-module.ts
rename to src/components/input/test/placeholder-labels/app.module.ts
diff --git a/src/components/input/test/stacked-labels/app-module.ts b/src/components/input/test/stacked-labels/app.module.ts
similarity index 100%
rename from src/components/input/test/stacked-labels/app-module.ts
rename to src/components/input/test/stacked-labels/app.module.ts
diff --git a/src/components/item/test/buttons/app-module.ts b/src/components/item/test/buttons/app.module.ts
similarity index 100%
rename from src/components/item/test/buttons/app-module.ts
rename to src/components/item/test/buttons/app.module.ts
diff --git a/src/components/item/test/colors/app-module.ts b/src/components/item/test/colors/app.module.ts
similarity index 100%
rename from src/components/item/test/colors/app-module.ts
rename to src/components/item/test/colors/app.module.ts
diff --git a/src/components/item/test/dividers/app-module.ts b/src/components/item/test/dividers/app.module.ts
similarity index 100%
rename from src/components/item/test/dividers/app-module.ts
rename to src/components/item/test/dividers/app.module.ts
diff --git a/src/components/item/test/groups/app-module.ts b/src/components/item/test/groups/app.module.ts
similarity index 100%
rename from src/components/item/test/groups/app-module.ts
rename to src/components/item/test/groups/app.module.ts
diff --git a/src/components/item/test/icons/app-module.ts b/src/components/item/test/icons/app.module.ts
similarity index 100%
rename from src/components/item/test/icons/app-module.ts
rename to src/components/item/test/icons/app.module.ts
diff --git a/src/components/item/test/images/app-module.ts b/src/components/item/test/images/app.module.ts
similarity index 100%
rename from src/components/item/test/images/app-module.ts
rename to src/components/item/test/images/app.module.ts
diff --git a/src/components/item/test/inputs/app-module.ts b/src/components/item/test/inputs/app.module.ts
similarity index 100%
rename from src/components/item/test/inputs/app-module.ts
rename to src/components/item/test/inputs/app.module.ts
diff --git a/src/components/item/test/media/app-module.ts b/src/components/item/test/media/app.module.ts
similarity index 100%
rename from src/components/item/test/media/app-module.ts
rename to src/components/item/test/media/app.module.ts
diff --git a/src/components/item/test/reorder/app-module.ts b/src/components/item/test/reorder/app.module.ts
similarity index 100%
rename from src/components/item/test/reorder/app-module.ts
rename to src/components/item/test/reorder/app.module.ts
diff --git a/src/components/item/test/sliding/app-module.ts b/src/components/item/test/sliding/app.module.ts
similarity index 100%
rename from src/components/item/test/sliding/app-module.ts
rename to src/components/item/test/sliding/app.module.ts
diff --git a/src/components/item/test/text/app-module.ts b/src/components/item/test/text/app.module.ts
similarity index 100%
rename from src/components/item/test/text/app-module.ts
rename to src/components/item/test/text/app.module.ts
diff --git a/src/components/list/test/chat-list/app-module.ts b/src/components/list/test/chat-list/app.module.ts
similarity index 100%
rename from src/components/list/test/chat-list/app-module.ts
rename to src/components/list/test/chat-list/app.module.ts
diff --git a/src/components/list/test/header-scenarios/app-module.ts b/src/components/list/test/header-scenarios/app.module.ts
similarity index 100%
rename from src/components/list/test/header-scenarios/app-module.ts
rename to src/components/list/test/header-scenarios/app.module.ts
diff --git a/src/components/list/test/headers/app-module.ts b/src/components/list/test/headers/app.module.ts
similarity index 100%
rename from src/components/list/test/headers/app-module.ts
rename to src/components/list/test/headers/app.module.ts
diff --git a/src/components/list/test/inset/app-module.ts b/src/components/list/test/inset/app.module.ts
similarity index 100%
rename from src/components/list/test/inset/app-module.ts
rename to src/components/list/test/inset/app.module.ts
diff --git a/src/components/list/test/no-lines/app-module.ts b/src/components/list/test/no-lines/app.module.ts
similarity index 100%
rename from src/components/list/test/no-lines/app-module.ts
rename to src/components/list/test/no-lines/app.module.ts
diff --git a/src/components/list/test/repeat-headers/app-module.ts b/src/components/list/test/repeat-headers/app.module.ts
similarity index 100%
rename from src/components/list/test/repeat-headers/app-module.ts
rename to src/components/list/test/repeat-headers/app.module.ts
diff --git a/src/components/list/test/sticky/app-module.ts b/src/components/list/test/sticky/app.module.ts
similarity index 100%
rename from src/components/list/test/sticky/app-module.ts
rename to src/components/list/test/sticky/app.module.ts
diff --git a/src/components/loading/test/basic/app-module.ts b/src/components/loading/test/basic/app.module.ts
similarity index 100%
rename from src/components/loading/test/basic/app-module.ts
rename to src/components/loading/test/basic/app.module.ts
diff --git a/src/components/loading/test/tabs/app-module.ts b/src/components/loading/test/tabs/app.module.ts
similarity index 100%
rename from src/components/loading/test/tabs/app-module.ts
rename to src/components/loading/test/tabs/app.module.ts
diff --git a/src/components/menu/test/basic/app-module.ts b/src/components/menu/test/basic/app.module.ts
similarity index 100%
rename from src/components/menu/test/basic/app-module.ts
rename to src/components/menu/test/basic/app.module.ts
diff --git a/src/components/menu/test/disable-swipe/app-module.ts b/src/components/menu/test/disable-swipe/app.module.ts
similarity index 100%
rename from src/components/menu/test/disable-swipe/app-module.ts
rename to src/components/menu/test/disable-swipe/app.module.ts
diff --git a/src/components/menu/test/enable-disable/app-module.ts b/src/components/menu/test/enable-disable/app.module.ts
similarity index 100%
rename from src/components/menu/test/enable-disable/app-module.ts
rename to src/components/menu/test/enable-disable/app.module.ts
diff --git a/src/components/menu/test/multiple/app-module.ts b/src/components/menu/test/multiple/app.module.ts
similarity index 100%
rename from src/components/menu/test/multiple/app-module.ts
rename to src/components/menu/test/multiple/app.module.ts
diff --git a/src/components/menu/test/overlay/app-module.ts b/src/components/menu/test/overlay/app.module.ts
similarity index 100%
rename from src/components/menu/test/overlay/app-module.ts
rename to src/components/menu/test/overlay/app.module.ts
diff --git a/src/components/menu/test/push/app-module.ts b/src/components/menu/test/push/app.module.ts
similarity index 100%
rename from src/components/menu/test/push/app-module.ts
rename to src/components/menu/test/push/app.module.ts
diff --git a/src/components/menu/test/reveal/app-module.ts b/src/components/menu/test/reveal/app.module.ts
similarity index 100%
rename from src/components/menu/test/reveal/app-module.ts
rename to src/components/menu/test/reveal/app.module.ts
diff --git a/src/components/modal/test/basic/app-module.ts b/src/components/modal/test/basic/app.module.ts
similarity index 100%
rename from src/components/modal/test/basic/app-module.ts
rename to src/components/modal/test/basic/app.module.ts
diff --git a/src/components/nav/test/basic/app-module.ts b/src/components/nav/test/basic/app.module.ts
similarity index 100%
rename from src/components/nav/test/basic/app-module.ts
rename to src/components/nav/test/basic/app.module.ts
diff --git a/src/components/nav/test/child-navs/app-module.ts b/src/components/nav/test/child-navs/app.module.ts
similarity index 100%
rename from src/components/nav/test/child-navs/app-module.ts
rename to src/components/nav/test/child-navs/app.module.ts
diff --git a/src/components/nav/test/init-async/app-module.ts b/src/components/nav/test/init-async/app.module.ts
similarity index 100%
rename from src/components/nav/test/init-async/app-module.ts
rename to src/components/nav/test/init-async/app.module.ts
diff --git a/src/components/nav/test/insert-views/app-module.ts b/src/components/nav/test/insert-views/app.module.ts
similarity index 100%
rename from src/components/nav/test/insert-views/app-module.ts
rename to src/components/nav/test/insert-views/app.module.ts
diff --git a/src/components/nav/test/memory/app-module.ts b/src/components/nav/test/memory/app.module.ts
similarity index 100%
rename from src/components/nav/test/memory/app-module.ts
rename to src/components/nav/test/memory/app.module.ts
diff --git a/src/components/nav/test/nav-push-pop/app-module.ts b/src/components/nav/test/nav-push-pop/app.module.ts
similarity index 100%
rename from src/components/nav/test/nav-push-pop/app-module.ts
rename to src/components/nav/test/nav-push-pop/app.module.ts
diff --git a/src/components/nav/test/worst-case/app-module.ts b/src/components/nav/test/worst-case/app.module.ts
similarity index 100%
rename from src/components/nav/test/worst-case/app-module.ts
rename to src/components/nav/test/worst-case/app.module.ts
diff --git a/src/components/picker/test/basic/app-module.ts b/src/components/picker/test/basic/app.module.ts
similarity index 100%
rename from src/components/picker/test/basic/app-module.ts
rename to src/components/picker/test/basic/app.module.ts
diff --git a/src/components/popover/test/basic/app-module.ts b/src/components/popover/test/basic/app.module.ts
similarity index 100%
rename from src/components/popover/test/basic/app-module.ts
rename to src/components/popover/test/basic/app.module.ts
diff --git a/src/components/radio/test/basic/app-module.ts b/src/components/radio/test/basic/app.module.ts
similarity index 100%
rename from src/components/radio/test/basic/app-module.ts
rename to src/components/radio/test/basic/app.module.ts
diff --git a/src/components/range/test/basic/app-module.ts b/src/components/range/test/basic/app.module.ts
similarity index 100%
rename from src/components/range/test/basic/app-module.ts
rename to src/components/range/test/basic/app.module.ts
diff --git a/src/components/refresher/test/basic/app-module.ts b/src/components/refresher/test/basic/app.module.ts
similarity index 100%
rename from src/components/refresher/test/basic/app-module.ts
rename to src/components/refresher/test/basic/app.module.ts
diff --git a/src/components/scroll/test/basic/app-module.ts b/src/components/scroll/test/basic/app.module.ts
similarity index 100%
rename from src/components/scroll/test/basic/app-module.ts
rename to src/components/scroll/test/basic/app.module.ts
diff --git a/src/components/searchbar/test/basic/app-module.ts b/src/components/searchbar/test/basic/app.module.ts
similarity index 100%
rename from src/components/searchbar/test/basic/app-module.ts
rename to src/components/searchbar/test/basic/app.module.ts
diff --git a/src/components/searchbar/test/nav/app-module.ts b/src/components/searchbar/test/nav/app.module.ts
similarity index 100%
rename from src/components/searchbar/test/nav/app-module.ts
rename to src/components/searchbar/test/nav/app.module.ts
diff --git a/src/components/searchbar/test/toolbar/app-module.ts b/src/components/searchbar/test/toolbar/app.module.ts
similarity index 100%
rename from src/components/searchbar/test/toolbar/app-module.ts
rename to src/components/searchbar/test/toolbar/app.module.ts
diff --git a/src/components/segment/test/basic/app-module.ts b/src/components/segment/test/basic/app.module.ts
similarity index 100%
rename from src/components/segment/test/basic/app-module.ts
rename to src/components/segment/test/basic/app.module.ts
diff --git a/src/components/segment/test/nav/app-module.ts b/src/components/segment/test/nav/app.module.ts
similarity index 100%
rename from src/components/segment/test/nav/app-module.ts
rename to src/components/segment/test/nav/app.module.ts
diff --git a/src/components/segment/test/swipe/app-module.ts b/src/components/segment/test/swipe/app.module.ts
similarity index 100%
rename from src/components/segment/test/swipe/app-module.ts
rename to src/components/segment/test/swipe/app.module.ts
diff --git a/src/components/select/test/multiple-value/app-module.ts b/src/components/select/test/multiple-value/app.module.ts
similarity index 100%
rename from src/components/select/test/multiple-value/app-module.ts
rename to src/components/select/test/multiple-value/app.module.ts
diff --git a/src/components/select/test/single-value/app-module.ts b/src/components/select/test/single-value/app.module.ts
similarity index 100%
rename from src/components/select/test/single-value/app-module.ts
rename to src/components/select/test/single-value/app.module.ts
diff --git a/src/components/show-hide-when/test/basic/app-module.ts b/src/components/show-hide-when/test/basic/app.module.ts
similarity index 100%
rename from src/components/show-hide-when/test/basic/app-module.ts
rename to src/components/show-hide-when/test/basic/app.module.ts
diff --git a/src/components/slides/test/basic/app-module.ts b/src/components/slides/test/basic/app.module.ts
similarity index 100%
rename from src/components/slides/test/basic/app-module.ts
rename to src/components/slides/test/basic/app.module.ts
diff --git a/src/components/slides/test/control/app-module.ts b/src/components/slides/test/control/app.module.ts
similarity index 100%
rename from src/components/slides/test/control/app-module.ts
rename to src/components/slides/test/control/app.module.ts
diff --git a/src/components/slides/test/controller/app-module.ts b/src/components/slides/test/controller/app.module.ts
similarity index 100%
rename from src/components/slides/test/controller/app-module.ts
rename to src/components/slides/test/controller/app.module.ts
diff --git a/src/components/slides/test/images/app-module.ts b/src/components/slides/test/images/app.module.ts
similarity index 100%
rename from src/components/slides/test/images/app-module.ts
rename to src/components/slides/test/images/app.module.ts
diff --git a/src/components/slides/test/intro/app-module.ts b/src/components/slides/test/intro/app.module.ts
similarity index 100%
rename from src/components/slides/test/intro/app-module.ts
rename to src/components/slides/test/intro/app.module.ts
diff --git a/src/components/slides/test/loop/app-module.ts b/src/components/slides/test/loop/app.module.ts
similarity index 100%
rename from src/components/slides/test/loop/app-module.ts
rename to src/components/slides/test/loop/app.module.ts
diff --git a/src/components/slides/test/options/app-module.ts b/src/components/slides/test/options/app.module.ts
similarity index 100%
rename from src/components/slides/test/options/app-module.ts
rename to src/components/slides/test/options/app.module.ts
diff --git a/src/components/slides/test/scroll/app-module.ts b/src/components/slides/test/scroll/app.module.ts
similarity index 100%
rename from src/components/slides/test/scroll/app-module.ts
rename to src/components/slides/test/scroll/app.module.ts
diff --git a/src/components/spinner/test/basic/app-module.ts b/src/components/spinner/test/basic/app.module.ts
similarity index 100%
rename from src/components/spinner/test/basic/app-module.ts
rename to src/components/spinner/test/basic/app.module.ts
diff --git a/src/components/spinner/test/colors/app-module.ts b/src/components/spinner/test/colors/app.module.ts
similarity index 100%
rename from src/components/spinner/test/colors/app-module.ts
rename to src/components/spinner/test/colors/app.module.ts
diff --git a/src/components/tabs/test/advanced/app-module.ts b/src/components/tabs/test/advanced/app.module.ts
similarity index 100%
rename from src/components/tabs/test/advanced/app-module.ts
rename to src/components/tabs/test/advanced/app.module.ts
diff --git a/src/components/tabs/test/badges/app-module.ts b/src/components/tabs/test/badges/app.module.ts
similarity index 100%
rename from src/components/tabs/test/badges/app-module.ts
rename to src/components/tabs/test/badges/app.module.ts
diff --git a/src/components/tabs/test/basic/app-module.ts b/src/components/tabs/test/basic/app.module.ts
similarity index 100%
rename from src/components/tabs/test/basic/app-module.ts
rename to src/components/tabs/test/basic/app.module.ts
diff --git a/src/components/tabs/test/colors/app-module.ts b/src/components/tabs/test/colors/app.module.ts
similarity index 100%
rename from src/components/tabs/test/colors/app-module.ts
rename to src/components/tabs/test/colors/app.module.ts
diff --git a/src/components/tabs/test/events/app-module.ts b/src/components/tabs/test/events/app.module.ts
similarity index 100%
rename from src/components/tabs/test/events/app-module.ts
rename to src/components/tabs/test/events/app.module.ts
diff --git a/src/components/tabs/test/ghost/app-module.ts b/src/components/tabs/test/ghost/app.module.ts
similarity index 100%
rename from src/components/tabs/test/ghost/app-module.ts
rename to src/components/tabs/test/ghost/app.module.ts
diff --git a/src/components/tabs/test/lifecyles/app-module.ts b/src/components/tabs/test/lifecyles/app.module.ts
similarity index 100%
rename from src/components/tabs/test/lifecyles/app-module.ts
rename to src/components/tabs/test/lifecyles/app.module.ts
diff --git a/src/components/tabs/test/tab-bar-scenarios/app-module.ts b/src/components/tabs/test/tab-bar-scenarios/app.module.ts
similarity index 100%
rename from src/components/tabs/test/tab-bar-scenarios/app-module.ts
rename to src/components/tabs/test/tab-bar-scenarios/app.module.ts
diff --git a/src/components/tabs/test/top/app-module.ts b/src/components/tabs/test/top/app.module.ts
similarity index 100%
rename from src/components/tabs/test/top/app-module.ts
rename to src/components/tabs/test/top/app.module.ts
diff --git a/src/components/toast/test/basic/app-module.ts b/src/components/toast/test/basic/app.module.ts
similarity index 100%
rename from src/components/toast/test/basic/app-module.ts
rename to src/components/toast/test/basic/app.module.ts
diff --git a/src/components/toggle/test/basic/app-module.ts b/src/components/toggle/test/basic/app.module.ts
similarity index 100%
rename from src/components/toggle/test/basic/app-module.ts
rename to src/components/toggle/test/basic/app.module.ts
diff --git a/src/components/toolbar/test/basic/app-module.ts b/src/components/toolbar/test/basic/app.module.ts
similarity index 100%
rename from src/components/toolbar/test/basic/app-module.ts
rename to src/components/toolbar/test/basic/app.module.ts
diff --git a/src/components/toolbar/test/colors/app-module.ts b/src/components/toolbar/test/colors/app.module.ts
similarity index 100%
rename from src/components/toolbar/test/colors/app-module.ts
rename to src/components/toolbar/test/colors/app.module.ts
diff --git a/src/components/toolbar/test/scenarios/app-module.ts b/src/components/toolbar/test/scenarios/app.module.ts
similarity index 100%
rename from src/components/toolbar/test/scenarios/app-module.ts
rename to src/components/toolbar/test/scenarios/app.module.ts
diff --git a/src/components/typography/test/basic/app-module.ts b/src/components/typography/test/basic/app.module.ts
similarity index 100%
rename from src/components/typography/test/basic/app-module.ts
rename to src/components/typography/test/basic/app.module.ts
diff --git a/src/components/virtual-scroll/test/basic/app-module.ts b/src/components/virtual-scroll/test/basic/app.module.ts
similarity index 100%
rename from src/components/virtual-scroll/test/basic/app-module.ts
rename to src/components/virtual-scroll/test/basic/app.module.ts
diff --git a/src/components/virtual-scroll/test/cards/app-module.ts b/src/components/virtual-scroll/test/cards/app.module.ts
similarity index 100%
rename from src/components/virtual-scroll/test/cards/app-module.ts
rename to src/components/virtual-scroll/test/cards/app.module.ts
diff --git a/src/components/virtual-scroll/test/image-gallery/app-module.ts b/src/components/virtual-scroll/test/image-gallery/app.module.ts
similarity index 100%
rename from src/components/virtual-scroll/test/image-gallery/app-module.ts
rename to src/components/virtual-scroll/test/image-gallery/app.module.ts
diff --git a/src/components/virtual-scroll/test/list/app-module.ts b/src/components/virtual-scroll/test/list/app.module.ts
similarity index 100%
rename from src/components/virtual-scroll/test/list/app-module.ts
rename to src/components/virtual-scroll/test/list/app.module.ts
diff --git a/src/components/virtual-scroll/test/media/app-module.ts b/src/components/virtual-scroll/test/media/app.module.ts
similarity index 100%
rename from src/components/virtual-scroll/test/media/app-module.ts
rename to src/components/virtual-scroll/test/media/app.module.ts
diff --git a/src/components/virtual-scroll/test/sliding-item/app-module.ts b/src/components/virtual-scroll/test/sliding-item/app.module.ts
similarity index 100%
rename from src/components/virtual-scroll/test/sliding-item/app-module.ts
rename to src/components/virtual-scroll/test/sliding-item/app.module.ts
diff --git a/src/components/virtual-scroll/test/variable-size/app-module.ts b/src/components/virtual-scroll/test/variable-size/app.module.ts
similarity index 100%
rename from src/components/virtual-scroll/test/variable-size/app-module.ts
rename to src/components/virtual-scroll/test/variable-size/app.module.ts