diff --git a/addon/ng2/blueprints/component/files/__path__/__name__.ts b/addon/ng2/blueprints/component/files/__path__/__name__.ts
index d20bdb6ba757..fc5d2d151034 100644
--- a/addon/ng2/blueprints/component/files/__path__/__name__.ts
+++ b/addon/ng2/blueprints/component/files/__path__/__name__.ts
@@ -2,12 +2,10 @@ import {Component} from 'angular2/core';
 
 
 @Component({
+  moduleId: __moduleName,
   selector: '<%= dasherizedModuleName %>',
-  templateUrl: 'app<%= dynamicPath %>/<%= dasherizedModuleName %>/<%= dasherizedModuleName %>.html',
-  styleUrls: ['app<%= dynamicPath %>/<%= dasherizedModuleName %>/<%= dasherizedModuleName %>.css'],
-  providers: [],
-  directives: [],
-  pipes: []
+  templateUrl: '<%= dasherizedModuleName %>.html',
+  styleUrls: ['<%= dasherizedModuleName %>.css']
 })
 export class <%= classifiedModuleName %> {
 
diff --git a/addon/ng2/blueprints/directive/files/__path__/__name__.ts b/addon/ng2/blueprints/directive/files/__path__/__name__.ts
index bcbc6d6e779a..5d0b537f1779 100644
--- a/addon/ng2/blueprints/directive/files/__path__/__name__.ts
+++ b/addon/ng2/blueprints/directive/files/__path__/__name__.ts
@@ -4,8 +4,7 @@ import {Directive} from 'angular2/core';
 @Directive({
   selector: '<%= dasherizedModuleName %>',
   providers: [],
-  host: {},
-  
+  host: {}
 })
 export class <%= classifiedModuleName %> {
 
diff --git a/addon/ng2/blueprints/ng2/files/src/client/app/__name__.ts b/addon/ng2/blueprints/ng2/files/src/client/app/__name__.ts
index d4c097fdde3f..d555e9ec827a 100644
--- a/addon/ng2/blueprints/ng2/files/src/client/app/__name__.ts
+++ b/addon/ng2/blueprints/ng2/files/src/client/app/__name__.ts
@@ -2,9 +2,10 @@ import {Component} from 'angular2/core';
 import {RouteConfig, ROUTER_DIRECTIVES, ROUTER_PROVIDERS} from 'angular2/router';
 
 @Component({
+  moduleId: __moduleName,
   selector: '<%= htmlComponentName %>-app',
   providers: [ROUTER_PROVIDERS],
-  templateUrl: 'app/<%= htmlComponentName %>.html',
+  templateUrl: '<%= htmlComponentName %>.html',
   directives: [ROUTER_DIRECTIVES],
   pipes: []
 })
diff --git a/addon/ng2/blueprints/ng2/files/src/client/typings.d.ts b/addon/ng2/blueprints/ng2/files/src/client/typings.d.ts
index 86a6cbabf250..f642f36b93bd 100644
--- a/addon/ng2/blueprints/ng2/files/src/client/typings.d.ts
+++ b/addon/ng2/blueprints/ng2/files/src/client/typings.d.ts
@@ -1 +1,3 @@
 /// <reference path="../../typings/browser.d.ts" />
+
+declare var __moduleName: string;
diff --git a/addon/ng2/blueprints/ng2/index.js b/addon/ng2/blueprints/ng2/index.js
index c38eb51ea90d..6e07e900e1dd 100644
--- a/addon/ng2/blueprints/ng2/index.js
+++ b/addon/ng2/blueprints/ng2/index.js
@@ -15,3 +15,4 @@ module.exports = {
   //   // Perform extra work here.
   // }
 };
+