diff --git a/addon/ng2/blueprints/component/files/src/app/components/__name__/__name__.ts b/addon/ng2/blueprints/component/files/src/app/components/__name__/__name__.ts
index 0a3c510a0569..bea0720ce449 100644
--- a/addon/ng2/blueprints/component/files/src/app/components/__name__/__name__.ts
+++ b/addon/ng2/blueprints/component/files/src/app/components/__name__/__name__.ts
@@ -1,4 +1,4 @@
-import {Component} from 'angular2/angular2';
+import {Component} from 'angular2/core';
 
 
 @Component({
@@ -13,4 +13,4 @@ export class <%= classifiedModuleName %> {
 
   constructor() {}
 
-}
\ No newline at end of file
+}
diff --git a/addon/ng2/blueprints/ng2/files/karma-test-shim.js b/addon/ng2/blueprints/ng2/files/karma-test-shim.js
index 126a1dc555e9..b11d12c8bf38 100644
--- a/addon/ng2/blueprints/ng2/files/karma-test-shim.js
+++ b/addon/ng2/blueprints/ng2/files/karma-test-shim.js
@@ -20,7 +20,7 @@ System.config({
   }
 });
 
-System.import('angular2/src/core/dom/browser_adapter').then(function(browser_adapter) {
+System.import('angular2/platform/browser').then(function(browser_adapter) {
   // TODO: once beta is out we should change this code to use a "test platform"
   browser_adapter.BrowserDomAdapter.makeCurrent();
 }).then(function() {
@@ -37,7 +37,7 @@ System.import('angular2/src/core/dom/browser_adapter').then(function(browser_ada
 });
 
 function onlyAppFiles(filePath) {
-  return /^\/base\/dist\/app\/(?!spec)([a-z0-9-_]+)\.js$/.test(filePath);
+  return /^\/base\/dist\/app\/(?!spec)([a-z0-9-_\/]+)\.js$/.test(filePath);
 }
 
 function onlySpecFiles(path) {
diff --git a/addon/ng2/blueprints/ng2/files/package.json b/addon/ng2/blueprints/ng2/files/package.json
index b4c916fd400f..641a00f2a37f 100644
--- a/addon/ng2/blueprints/ng2/files/package.json
+++ b/addon/ng2/blueprints/ng2/files/package.json
@@ -4,7 +4,7 @@
   "license": "Apache-2.0",
   "dependencies": {
     "systemjs": "0.19.4",
-    "angular2": "2.0.0-alpha.46"
+    "angular2": "2.0.0-alpha.47"
   },
   "devDependencies": {
     "angular-cli": "0.0.*",
diff --git a/addon/ng2/blueprints/ng2/files/src/app.ts b/addon/ng2/blueprints/ng2/files/src/app.ts
index 133f85c32810..0a7079b6d2e0 100644
--- a/addon/ng2/blueprints/ng2/files/src/app.ts
+++ b/addon/ng2/blueprints/ng2/files/src/app.ts
@@ -1,4 +1,7 @@
-import {bootstrap} from 'angular2/angular2';
+/// <reference path="node_modules/angular2/manual_typings/globals-es6.d.ts"/> 
+// this should be remove after fixing https://github.com/angular/angular/issues/5596
+
+import {bootstrap} from 'angular2/platform/browser';
 import {<%= jsComponentName %>App} from './app/<%= htmlComponentName %>';
 
 
diff --git a/addon/ng2/blueprints/ng2/files/src/app/__name__.ts b/addon/ng2/blueprints/ng2/files/src/app/__name__.ts
index e2deb86571d7..86601ac047f9 100644
--- a/addon/ng2/blueprints/ng2/files/src/app/__name__.ts
+++ b/addon/ng2/blueprints/ng2/files/src/app/__name__.ts
@@ -1,4 +1,4 @@
-import {Component} from 'angular2/angular2';
+import {Component} from 'angular2/core';
 
 
 @Component({
diff --git a/addon/ng2/blueprints/pipe/files/src/app/pipes/__name__/__name__.spec.ts b/addon/ng2/blueprints/pipe/files/src/app/pipes/__name__/__name__.spec.ts
index b967042fc2b3..f8a60a6e98e7 100644
--- a/addon/ng2/blueprints/pipe/files/src/app/pipes/__name__/__name__.spec.ts
+++ b/addon/ng2/blueprints/pipe/files/src/app/pipes/__name__/__name__.spec.ts
@@ -15,11 +15,11 @@ import {<%= classifiedModuleName %>} from './<%= dasherizedModuleName %>';
 
 describe('<%= classifiedModuleName %> Pipe', () => {
 
-  beforeEachProviders(() => []);
+  beforeEachProviders(() => [<%= classifiedModuleName%>]);
 
 
-  it('should ...', inject([<%= classifiedModuleName %>], (pipe:<%= classifiedModuleName %>) => {
-      expect(pipe.transform(true)).toBe(false);
+  it('should transform the input', inject([<%= classifiedModuleName %>], (pipe:<%= classifiedModuleName %>) => {
+      expect(pipe.transform(true)).toBe(null);
   }));
 
 });
diff --git a/addon/ng2/blueprints/pipe/files/src/app/pipes/__name__/__name__.ts b/addon/ng2/blueprints/pipe/files/src/app/pipes/__name__/__name__.ts
index 61c56077c0b1..bfa36af21b0a 100644
--- a/addon/ng2/blueprints/pipe/files/src/app/pipes/__name__/__name__.ts
+++ b/addon/ng2/blueprints/pipe/files/src/app/pipes/__name__/__name__.ts
@@ -1,4 +1,4 @@
-import {Pipe} from 'angular2/angular2';
+import {Pipe} from 'angular2/core';
 
 
 @Pipe({
@@ -7,7 +7,7 @@ import {Pipe} from 'angular2/angular2';
 export class <%= classifiedModuleName %> {
 
   transform(value, args?) {
-    return value;
+    return null;
   }
 
-}
\ No newline at end of file
+}
diff --git a/addon/ng2/blueprints/service/files/src/app/services/__name__/__name__.spec.ts b/addon/ng2/blueprints/service/files/src/app/services/__name__/__name__.spec.ts
index 2d735fd2689c..3d3eec4b4763 100644
--- a/addon/ng2/blueprints/service/files/src/app/services/__name__/__name__.spec.ts
+++ b/addon/ng2/blueprints/service/files/src/app/services/__name__/__name__.spec.ts
@@ -15,7 +15,7 @@ import {<%= classifiedModuleName %>} from './<%= dasherizedModuleName %>';
 
 describe('<%= classifiedModuleName %> Service', () => {
 
-  beforeEachProviders(() => []);
+  beforeEachProviders(() => [<%= classifiedModuleName %>]);
 
 
   it('should ...', inject([<%= classifiedModuleName %>], (service:<%= classifiedModuleName %>) => {
diff --git a/addon/ng2/blueprints/service/files/src/app/services/__name__/__name__.ts b/addon/ng2/blueprints/service/files/src/app/services/__name__/__name__.ts
index 8a3f4193bc44..b6affa0cde77 100644
--- a/addon/ng2/blueprints/service/files/src/app/services/__name__/__name__.ts
+++ b/addon/ng2/blueprints/service/files/src/app/services/__name__/__name__.ts
@@ -1,4 +1,4 @@
-import {Injectable} from 'angular2/angular2';
+import {Injectable} from 'angular2/core';
 
 
 @Injectable()
@@ -6,4 +6,4 @@ export class <%= classifiedModuleName %> {
 
   constructor() {}
 
-}
\ No newline at end of file
+}