diff --git a/scripts/templates/page/spec.ts.tmpl b/scripts/templates/page/spec.ts.tmpl
index 2a21a514a9f..4044cbd706e 100644
--- a/scripts/templates/page/spec.ts.tmpl
+++ b/scripts/templates/page/spec.ts.tmpl
@@ -1,5 +1,5 @@
 
-describe('$CLASSNAME', () => {
+describe('$CLASSNAMEPage', () => {
   it('should do something', () => {
     expect(true).toEqual(true);
   });
diff --git a/scripts/templates/page/ts.tmpl b/scripts/templates/page/ts.tmpl
index 5791872c2ff..da3d73ad272 100644
--- a/scripts/templates/page/ts.tmpl
+++ b/scripts/templates/page/ts.tmpl
@@ -16,7 +16,7 @@ export class $CLASSNAMEPage {
   constructor(public navCtrl: NavController) {}
 
   ionViewDidLoad() {
-    console.log('Hello $CLASSNAME Page');
+    console.log('Hello $CLASSNAMEPage Page');
   }
 
 }
diff --git a/scripts/templates/tabs/spec.ts.tmpl b/scripts/templates/tabs/spec.ts.tmpl
index 2a21a514a9f..4044cbd706e 100644
--- a/scripts/templates/tabs/spec.ts.tmpl
+++ b/scripts/templates/tabs/spec.ts.tmpl
@@ -1,5 +1,5 @@
 
-describe('$CLASSNAME', () => {
+describe('$CLASSNAMEPage', () => {
   it('should do something', () => {
     expect(true).toEqual(true);
   });
diff --git a/scripts/templates/tabs/ts.tmpl b/scripts/templates/tabs/ts.tmpl
index c2e1926a68f..e29f736e4db 100755
--- a/scripts/templates/tabs/ts.tmpl
+++ b/scripts/templates/tabs/ts.tmpl
@@ -12,7 +12,7 @@ $TAB_IMPORTS
   selector: 'page-$FILENAME',
   templateUrl: '$FILENAME.html'
 })
-export class $CLASSNAME {
+export class $CLASSNAMEPage {
 
 $TAB_VARIABLES