diff --git a/addon/ng2/blueprints/component/files/__path__/__name__.component.spec.ts b/addon/ng2/blueprints/component/files/__path__/__name__.component.spec.ts
index ab45686fda33..648c5d48cd04 100644
--- a/addon/ng2/blueprints/component/files/__path__/__name__.component.spec.ts
+++ b/addon/ng2/blueprints/component/files/__path__/__name__.component.spec.ts
@@ -10,7 +10,7 @@ import {
   ComponentFixture,
   TestComponentBuilder
 } from 'angular2/testing';
-import {<%= classifiedModuleName %>Component} from './<%= dasherizedModuleName %>.component';
+import { <%= classifiedModuleName %>Component } from './<%= dasherizedModuleName %>.component';
 
 describe('Component: <%= classifiedModuleName %>', () => {
   beforeEachProviders(() => [<%= classifiedModuleName %>Component]);
diff --git a/addon/ng2/blueprints/component/files/__path__/__name__.component.ts b/addon/ng2/blueprints/component/files/__path__/__name__.component.ts
index 468d4b9de2c3..48646194894e 100644
--- a/addon/ng2/blueprints/component/files/__path__/__name__.component.ts
+++ b/addon/ng2/blueprints/component/files/__path__/__name__.component.ts
@@ -1,4 +1,4 @@
-import {Component, OnInit} from 'angular2/core';
+import { Component, OnInit } from 'angular2/core';
 
 @Component({
   moduleId: __moduleName,
diff --git a/addon/ng2/blueprints/component/files/__path__/index.ts b/addon/ng2/blueprints/component/files/__path__/index.ts
index 40f21b7c040c..876f94aebd5f 100644
--- a/addon/ng2/blueprints/component/files/__path__/index.ts
+++ b/addon/ng2/blueprints/component/files/__path__/index.ts
@@ -1,2 +1 @@
-export {<%= classifiedModuleName %>Component} from './<%= dasherizedModuleName %>.component';
-
+export { <%= classifiedModuleName %>Component } from './<%= dasherizedModuleName %>.component';
diff --git a/addon/ng2/blueprints/directive/files/__path__/__name__.directive.spec.ts b/addon/ng2/blueprints/directive/files/__path__/__name__.directive.spec.ts
index c70070807e14..0963b22c720b 100644
--- a/addon/ng2/blueprints/directive/files/__path__/__name__.directive.spec.ts
+++ b/addon/ng2/blueprints/directive/files/__path__/__name__.directive.spec.ts
@@ -10,8 +10,8 @@ import {
   ComponentFixture,
   TestComponentBuilder
 } from 'angular2/testing';
-import {provide, Component} from 'angular2/core';
-import {<%= classifiedModuleName %>} from './<%= dasherizedModuleName %>.directive';
+import { provide, Component } from 'angular2/core';
+import { <%= classifiedModuleName %> } from './<%= dasherizedModuleName %>.directive';
 
 @Component({
   selector: 'test-component',
diff --git a/addon/ng2/blueprints/directive/files/__path__/__name__.directive.ts b/addon/ng2/blueprints/directive/files/__path__/__name__.directive.ts
index 9857b0ca6ff7..3bf4346ae8b3 100644
--- a/addon/ng2/blueprints/directive/files/__path__/__name__.directive.ts
+++ b/addon/ng2/blueprints/directive/files/__path__/__name__.directive.ts
@@ -1,4 +1,4 @@
-import {Directive} from 'angular2/core';
+import { Directive } from 'angular2/core';
 
 @Directive({
   selector: '[<%= rawEntityName %>]'
diff --git a/addon/ng2/blueprints/ng2/files/__path__/app/__name__.component.spec.ts b/addon/ng2/blueprints/ng2/files/__path__/app/__name__.component.spec.ts
index 7e8b4ce21b78..c6e239e92044 100644
--- a/addon/ng2/blueprints/ng2/files/__path__/app/__name__.component.spec.ts
+++ b/addon/ng2/blueprints/ng2/files/__path__/app/__name__.component.spec.ts
@@ -10,7 +10,7 @@ import {
   ComponentFixture,
   TestComponentBuilder
 } from 'angular2/testing';
-import {<%= jsComponentName %>AppComponent} from '../app/<%= htmlComponentName %>.component';
+import { <%= jsComponentName %>AppComponent } from '../app/<%= htmlComponentName %>.component';
 
 beforeEachProviders(() => [<%= jsComponentName %>AppComponent]);
 
diff --git a/addon/ng2/blueprints/ng2/files/__path__/app/__name__.component.ts b/addon/ng2/blueprints/ng2/files/__path__/app/__name__.component.ts
index 1845d68b3b81..02d4e738237b 100644
--- a/addon/ng2/blueprints/ng2/files/__path__/app/__name__.component.ts
+++ b/addon/ng2/blueprints/ng2/files/__path__/app/__name__.component.ts
@@ -1,4 +1,4 @@
-import {Component} from 'angular2/core';
+import { Component } from 'angular2/core';
 
 @Component({
   moduleId: __moduleName,
diff --git a/addon/ng2/blueprints/ng2/files/__path__/main.ts b/addon/ng2/blueprints/ng2/files/__path__/main.ts
index 7ac3d9caf220..35e9962ff7aa 100644
--- a/addon/ng2/blueprints/ng2/files/__path__/main.ts
+++ b/addon/ng2/blueprints/ng2/files/__path__/main.ts
@@ -1,7 +1,7 @@
-import {bootstrap} from 'angular2/platform/browser';
-import {enableProdMode} from 'angular2/core';
-import {environment} from './app/environment';
-import {<%= jsComponentName %>AppComponent} from './app/<%= htmlComponentName %>.component';
+import { bootstrap } from 'angular2/platform/browser';
+import { enableProdMode } from 'angular2/core';
+import { environment } from './app/environment';
+import { <%= jsComponentName %>AppComponent } from './app/<%= htmlComponentName %>.component';
 
 if (environment.production) {
   enableProdMode();
diff --git a/addon/ng2/blueprints/pipe/files/__path__/__name__.pipe.spec.ts b/addon/ng2/blueprints/pipe/files/__path__/__name__.pipe.spec.ts
index 0b04dd99ef8f..8e3facc8701d 100644
--- a/addon/ng2/blueprints/pipe/files/__path__/__name__.pipe.spec.ts
+++ b/addon/ng2/blueprints/pipe/files/__path__/__name__.pipe.spec.ts
@@ -8,8 +8,8 @@ import {
   TestComponentBuilder,
   beforeEachProviders
 } from 'angular2/testing';
-import {provide} from 'angular2/core';
-import {<%= classifiedModuleName %>} from './<%= dasherizedModuleName %>.pipe';
+import { provide } from 'angular2/core';
+import { <%= classifiedModuleName %> } from './<%= dasherizedModuleName %>.pipe';
 
 describe('<%= classifiedModuleName %> Pipe', () => {
   beforeEachProviders(() => [<%= classifiedModuleName%>]);
diff --git a/addon/ng2/blueprints/pipe/files/__path__/__name__.pipe.ts b/addon/ng2/blueprints/pipe/files/__path__/__name__.pipe.ts
index 83f1389e262f..fd78a4b15e65 100644
--- a/addon/ng2/blueprints/pipe/files/__path__/__name__.pipe.ts
+++ b/addon/ng2/blueprints/pipe/files/__path__/__name__.pipe.ts
@@ -1,4 +1,4 @@
-import {Pipe, PipeTransform} from 'angular2/core';
+import { Pipe, PipeTransform } from 'angular2/core';
 
 @Pipe({
   name: '<%= camelizedModuleName %>'
diff --git a/addon/ng2/blueprints/pipe/files/__path__/index.ts b/addon/ng2/blueprints/pipe/files/__path__/index.ts
index 1380a23dc3f5..7722395a535f 100644
--- a/addon/ng2/blueprints/pipe/files/__path__/index.ts
+++ b/addon/ng2/blueprints/pipe/files/__path__/index.ts
@@ -1 +1 @@
-export {<%= classifiedModuleName %>} from './<%= dasherizedModuleName %>.pipe';
\ No newline at end of file
+export { <%= classifiedModuleName %> } from './<%= dasherizedModuleName %>.pipe';
\ No newline at end of file
diff --git a/addon/ng2/blueprints/route/index.js b/addon/ng2/blueprints/route/index.js
index 971e6bb5d766..23718475584d 100644
--- a/addon/ng2/blueprints/route/index.js
+++ b/addon/ng2/blueprints/route/index.js
@@ -33,7 +33,7 @@ function _insertImport(content, symbolName, fileName) {
           + content.substr(m.index + m[0].length);
   }
 
-  const importTemplate = `import {${symbolName}} from '${fileName}';`;
+  const importTemplate = `import { ${symbolName} } from '${fileName}';`;
   // Find the last import and add an import to it.
   content = content.replace(/(import.+)\n(?!import)/m, function (f, m1) {
     return `${m1}\n${importTemplate}\n`;
diff --git a/addon/ng2/blueprints/service/files/__path__/__name__.service.spec.ts b/addon/ng2/blueprints/service/files/__path__/__name__.service.spec.ts
index e2c629499d21..2b5328da0cd9 100644
--- a/addon/ng2/blueprints/service/files/__path__/__name__.service.spec.ts
+++ b/addon/ng2/blueprints/service/files/__path__/__name__.service.spec.ts
@@ -8,8 +8,8 @@ import {
   expect,
   inject
 } from 'angular2/testing';
-import {provide} from 'angular2/core';
-import {<%= classifiedModuleName %>Service} from './<%= dasherizedModuleName %>.service';
+import { provide } from 'angular2/core';
+import { <%= classifiedModuleName %>Service } from './<%= dasherizedModuleName %>.service';
 
 describe('<%= classifiedModuleName %> Service', () => {
 
diff --git a/addon/ng2/blueprints/service/files/__path__/__name__.service.ts b/addon/ng2/blueprints/service/files/__path__/__name__.service.ts
index 2c95b60e6a76..f030bfaee189 100644
--- a/addon/ng2/blueprints/service/files/__path__/__name__.service.ts
+++ b/addon/ng2/blueprints/service/files/__path__/__name__.service.ts
@@ -1,4 +1,4 @@
-import {Injectable} from 'angular2/core';
+import { Injectable } from 'angular2/core';
 
 @Injectable()
 export class <%= classifiedModuleName %>Service {