diff --git a/tooling/generator.js b/tooling/generator.js
index 932e8401f4..c82b2af4c3 100644
--- a/tooling/generator.js
+++ b/tooling/generator.js
@@ -6,9 +6,13 @@ var _ = require('lodash'),
 module.exports = Generator;
 
 function Generator(options) {
-  this.name = _.kebabCase(options.name);
+  this.name = options.name;
   this.type = options.generator;
   this.appDirectory = options.appDirectory;
+
+  //templateVars
+  this.fileName = _.kebabCase(this.name);
+  this.jsClassName = _.capitalize(_.camelCase(this.name));
 }
 
 Generator.prototype.run = function(){
@@ -53,14 +57,8 @@ Generator.prototype.loadTemplates = function() {
 };
 
 Generator.prototype.renderTemplate = function(template) {
-  var templateVars = {
-    fileName: _.kebabCase(this.name),
-    directory: this.directory,
-    jsClassName: _.capitalize(_.camelCase(this.name))
-  }
-
   var templateContents = fs.readFileSync(template.path, 'utf8');
   var templateCompiler = _.template(templateContents);
-  var result = templateCompiler(templateVars);
+  var result = templateCompiler(this);
   return result;
 };
\ No newline at end of file
diff --git a/tooling/generators/page/page.tmpl.html b/tooling/generators/page/page.tmpl.html
index 322a178c3a..38d51863a8 100644
--- a/tooling/generators/page/page.tmpl.html
+++ b/tooling/generators/page/page.tmpl.html
@@ -5,8 +5,9 @@
   Ionic pages and navigation.
 -->
 <ion-navbar *navbar>
-  <ion-title><%= jsClassName %></ion-title>
+  <ion-title><%= name %></ion-title>
 </ion-navbar>
 
 <ion-content padding class="<%= fileName %>">
+  
 </ion-content>