diff --git a/scripts/templates/component/html.tmpl b/scripts/templates/component/html.tmpl
index 0bde9e97fb..0c30d46698 100644
--- a/scripts/templates/component/html.tmpl
+++ b/scripts/templates/component/html.tmpl
@@ -1,9 +1,4 @@
-<!--
-  Generated template for the $CLASSNAME component.
-
-  See https://angular.io/docs/ts/latest/api/core/index/ComponentMetadata-class.html
-  for more info on Angular 2 Components.
--->
+<!-- Generated template for the $CLASSNAME component -->
 <div>
   {{text}}
 </div>
diff --git a/scripts/templates/component/module.ts.tmpl b/scripts/templates/component/module.ts.tmpl
index 5c45472319..592f0590b7 100644
--- a/scripts/templates/component/module.ts.tmpl
+++ b/scripts/templates/component/module.ts.tmpl
@@ -1,13 +1,13 @@
 import { NgModule } from '@angular/core';
-import { $CLASSNAMEComponent } from './$FILENAME';
+import { $CLASSNAME } from './$FILENAME';
 import { IonicModule } from 'ionic-angular';
 
 @NgModule({
   declarations: [
-    $CLASSNAMEComponent,
+    $CLASSNAME,
   ],
   imports: [
-    IonicModule.forChild($CLASSNAMEComponent)
+    IonicModule.forChild($CLASSNAME),
   ]
 })
-export class $CLASSNAMEComponentModule {}
+export class $CLASSNAMEModule {}
diff --git a/scripts/templates/component/ts.tmpl b/scripts/templates/component/ts.tmpl
index dc9ec6efb9..080975b222 100644
--- a/scripts/templates/component/ts.tmpl
+++ b/scripts/templates/component/ts.tmpl
@@ -1,16 +1,16 @@
 import { Component } from '@angular/core';
 
-/*
-  Generated class for the $CLASSNAME component.
-
-  See https://angular.io/docs/ts/latest/api/core/index/ComponentMetadata-class.html
-  for more info on Angular 2 Components.
-*/
+/**
+ * Generated class for the $CLASSNAME component.
+ *
+ * See https://angular.io/docs/ts/latest/api/core/index/ComponentMetadata-class.html
+ * for more info on Angular Components.
+ */
 @Component({
   selector: '$FILENAME',
   templateUrl: '$FILENAME.html'
 })
-export class $CLASSNAMEComponent {
+export class $CLASSNAME {
 
   text: string;