diff --git a/scripts/templates/component/ts.tmpl b/scripts/templates/component/ts.tmpl
index 20231d5f25..dc9ec6efb9 100644
--- a/scripts/templates/component/ts.tmpl
+++ b/scripts/templates/component/ts.tmpl
@@ -10,7 +10,7 @@ import { Component } from '@angular/core';
   selector: '$FILENAME',
   templateUrl: '$FILENAME.html'
 })
-export class $CLASSNAME {
+export class $CLASSNAMEComponent {
 
   text: string;
 
diff --git a/scripts/templates/page/ts.tmpl b/scripts/templates/page/ts.tmpl
index 022748c431..5791872c2f 100644
--- a/scripts/templates/page/ts.tmpl
+++ b/scripts/templates/page/ts.tmpl
@@ -11,7 +11,7 @@ import { NavController } from 'ionic-angular';
   selector: 'page-$FILENAME',
   templateUrl: '$FILENAME.html'
 })
-export class $CLASSNAME {
+export class $CLASSNAMEPage {
 
   constructor(public navCtrl: NavController) {}