diff --git a/scripts/templates/page/module.ts.tmpl b/scripts/templates/page/module.ts.tmpl
index d0336e9a28..f68bb096ec 100644
--- a/scripts/templates/page/module.ts.tmpl
+++ b/scripts/templates/page/module.ts.tmpl
@@ -7,7 +7,7 @@ import { IonicModule } from 'ionic-angular';
     $CLASSNAME,
   ],
   imports: [
-    IonicModule.forChild($CLASSNAME)
+    IonicModule.forChild($CLASSNAME),
   ],
   entryComponents: [
     $CLASSNAME,
diff --git a/scripts/templates/tabs/module.ts.tmpl b/scripts/templates/tabs/module.ts.tmpl
index 8a642bf1f6..f68bb096ec 100644
--- a/scripts/templates/tabs/module.ts.tmpl
+++ b/scripts/templates/tabs/module.ts.tmpl
@@ -1,17 +1,17 @@
 import { NgModule } from '@angular/core';
-import { $CLASSNAMEPage } from './$FILENAME';
+import { $CLASSNAME } from './$FILENAME';
 import { IonicModule } from 'ionic-angular';
 
 @NgModule({
   declarations: [
-    $CLASSNAMEPage,
+    $CLASSNAME,
   ],
   imports: [
-    IonicModule.forChild($CLASSNAMEPage)
+    IonicModule.forChild($CLASSNAME),
   ],
   entryComponents: [
-    $CLASSNAMEPage
+    $CLASSNAME,
   ],
   providers: []
 })
-export class $CLASSNAMEPageModule {}
\ No newline at end of file
+export class $CLASSNAMEModule {}
diff --git a/scripts/templates/tabs/spec.ts.tmpl b/scripts/templates/tabs/spec.ts.tmpl
index 4044cbd706..c6bd0fd920 100644
--- a/scripts/templates/tabs/spec.ts.tmpl
+++ b/scripts/templates/tabs/spec.ts.tmpl
@@ -1,5 +1,4 @@
-
-describe('$CLASSNAMEPage', () => {
+describe('$CLASSNAME', () => {
   it('should do something', () => {
     expect(true).toEqual(true);
   });
diff --git a/scripts/templates/tabs/ts.tmpl b/scripts/templates/tabs/ts.tmpl
index d9d1e1e261..93e53b0fdf 100755
--- a/scripts/templates/tabs/ts.tmpl
+++ b/scripts/templates/tabs/ts.tmpl
@@ -1,22 +1,21 @@
 import { Component } from '@angular/core';
-import { NavController } from 'ionic-angular';
+import { DeepLink, NavController } from 'ionic-angular';
 
-/*
-  Generated class for the $CLASSNAME tabs.
-
-  See https://angular.io/docs/ts/latest/guide/dependency-injection.html
-  for more info on providers and Angular 2 DI.
-*/
+/**
+ * Generated class for the $CLASSNAME tabs.
+ *
+ * See https://angular.io/docs/ts/latest/guide/dependency-injection.html for
+ * more info on providers and Angular DI.
+ */
 @Component({
   selector: 'page-$FILENAME',
   templateUrl: '$FILENAME.html'
 })
-export class $CLASSNAMEPage {
+@DeepLink()
+export class $CLASSNAME {
 
 $TAB_VARIABLES
 
-  constructor(public navCtrl: NavController) {
+  constructor(public navCtrl: NavController) {}
 
-  }
-
-}
\ No newline at end of file
+}