diff --git a/modules/angular2/docs/cheatsheet/bootstrapping.md b/modules/angular2/docs/cheatsheet/bootstrapping.md
index 80568a4300..4ecd4d96ff 100644
--- a/modules/angular2/docs/cheatsheet/bootstrapping.md
+++ b/modules/angular2/docs/cheatsheet/bootstrapping.md
@@ -4,7 +4,7 @@ Bootstrapping
 @description
 {@target ts}`import {bootstrap} from 'angular2/platform/browser';`{@endtarget}
 {@target js}Available from the `ng.platform.browser` namespace{@endtarget}
-{@target dart}`import 'package:angular2/bootstrap.dart';`{@endtarget}
+{@target dart}`import 'package:angular2/platform/browser.dart';`{@endtarget}
 
 @cheatsheetItem
 syntax(ts dart):
diff --git a/modules/angular2/examples/compiler/ts/url_resolver/url_resolver.ts b/modules/angular2/examples/compiler/ts/url_resolver/url_resolver.ts
index db54d0da6c..c6f1820875 100644
--- a/modules/angular2/examples/compiler/ts/url_resolver/url_resolver.ts
+++ b/modules/angular2/examples/compiler/ts/url_resolver/url_resolver.ts
@@ -1,5 +1,5 @@
 import {provide} from 'angular2/core';
-import {bootstrap} from 'angular2/bootstrap';
+import {bootstrap} from 'angular2/platform/browser';
 import {UrlResolver} from 'angular2/compiler';
 
 var MyApp: any;
diff --git a/modules/angular2/examples/core/forms/ts/ng_validators/ng_validators.ts b/modules/angular2/examples/core/forms/ts/ng_validators/ng_validators.ts
index a9ba52f18a..45f4c932c9 100644
--- a/modules/angular2/examples/core/forms/ts/ng_validators/ng_validators.ts
+++ b/modules/angular2/examples/core/forms/ts/ng_validators/ng_validators.ts
@@ -1,4 +1,4 @@
-import {bootstrap} from 'angular2/bootstrap';
+import {bootstrap} from 'angular2/platform/browser';
 import {NG_VALIDATORS} from 'angular2/common';
 import {Provider} from 'angular2/core';
 
diff --git a/modules/angular2/examples/core/pipes/ts/async_pipe/async_pipe_example.ts b/modules/angular2/examples/core/pipes/ts/async_pipe/async_pipe_example.ts
index dae4e30a31..61d01794d3 100644
--- a/modules/angular2/examples/core/pipes/ts/async_pipe/async_pipe_example.ts
+++ b/modules/angular2/examples/core/pipes/ts/async_pipe/async_pipe_example.ts
@@ -1,5 +1,5 @@
 import {Component, provide} from 'angular2/core';
-import {bootstrap} from 'angular2/bootstrap';
+import {bootstrap} from 'angular2/platform/browser';
 import {Observable, Subscriber} from 'rxjs/Rx';
 
 // #docregion AsyncPipe
diff --git a/modules/angular2/examples/core/pipes/ts/date_pipe/date_pipe_example.ts b/modules/angular2/examples/core/pipes/ts/date_pipe/date_pipe_example.ts
index 5523dfdcc8..91c0bd42b1 100644
--- a/modules/angular2/examples/core/pipes/ts/date_pipe/date_pipe_example.ts
+++ b/modules/angular2/examples/core/pipes/ts/date_pipe/date_pipe_example.ts
@@ -1,5 +1,5 @@
 import {Component, provide} from 'angular2/core';
-import {bootstrap} from 'angular2/bootstrap';
+import {bootstrap} from 'angular2/platform/browser';
 
 // #docregion DatePipe
 @Component({
diff --git a/modules/angular2/examples/core/pipes/ts/json_pipe/json_pipe_example.ts b/modules/angular2/examples/core/pipes/ts/json_pipe/json_pipe_example.ts
index 8d9a626143..40175aa92a 100644
--- a/modules/angular2/examples/core/pipes/ts/json_pipe/json_pipe_example.ts
+++ b/modules/angular2/examples/core/pipes/ts/json_pipe/json_pipe_example.ts
@@ -1,5 +1,5 @@
 import {Component, provide} from 'angular2/core';
-import {bootstrap} from 'angular2/bootstrap';
+import {bootstrap} from 'angular2/platform/browser';
 
 // #docregion JsonPipe
 @Component({
diff --git a/modules/angular2/examples/core/pipes/ts/lowerupper_pipe/lowerupper_pipe_example.ts b/modules/angular2/examples/core/pipes/ts/lowerupper_pipe/lowerupper_pipe_example.ts
index 1ceeb458a0..1b5a8bb0b2 100644
--- a/modules/angular2/examples/core/pipes/ts/lowerupper_pipe/lowerupper_pipe_example.ts
+++ b/modules/angular2/examples/core/pipes/ts/lowerupper_pipe/lowerupper_pipe_example.ts
@@ -1,5 +1,5 @@
 import {Component, provide} from 'angular2/core';
-import {bootstrap} from 'angular2/bootstrap';
+import {bootstrap} from 'angular2/platform/browser';
 
 // #docregion LowerUpperPipe
 @Component({
diff --git a/modules/angular2/examples/core/pipes/ts/number_pipe/number_pipe_example.ts b/modules/angular2/examples/core/pipes/ts/number_pipe/number_pipe_example.ts
index 08f1b4efb0..17a1d70e8a 100644
--- a/modules/angular2/examples/core/pipes/ts/number_pipe/number_pipe_example.ts
+++ b/modules/angular2/examples/core/pipes/ts/number_pipe/number_pipe_example.ts
@@ -1,5 +1,5 @@
 import {Component, provide} from 'angular2/core';
-import {bootstrap} from 'angular2/bootstrap';
+import {bootstrap} from 'angular2/platform/browser';
 
 // #docregion NumberPipe
 @Component({
diff --git a/modules/angular2/examples/core/pipes/ts/slice_pipe/slice_pipe_example.ts b/modules/angular2/examples/core/pipes/ts/slice_pipe/slice_pipe_example.ts
index 2504b9da2f..325cf6ab61 100644
--- a/modules/angular2/examples/core/pipes/ts/slice_pipe/slice_pipe_example.ts
+++ b/modules/angular2/examples/core/pipes/ts/slice_pipe/slice_pipe_example.ts
@@ -1,5 +1,5 @@
 import {Component, provide} from 'angular2/core';
-import {bootstrap} from 'angular2/bootstrap';
+import {bootstrap} from 'angular2/platform/browser';
 
 // #docregion SlicePipe_string
 @Component({
diff --git a/modules/angular2/examples/core/ts/prod_mode/prod_mode_example.ts b/modules/angular2/examples/core/ts/prod_mode/prod_mode_example.ts
index 7dd75d6e5a..65bf150782 100644
--- a/modules/angular2/examples/core/ts/prod_mode/prod_mode_example.ts
+++ b/modules/angular2/examples/core/ts/prod_mode/prod_mode_example.ts
@@ -1,6 +1,6 @@
 // #docregion enableProdMode
 import {enableProdMode} from 'angular2/core';
-import {bootstrap} from 'angular2/bootstrap';
+import {bootstrap} from 'angular2/platform/browser';
 import {MyComponent} from './my_component';
 
 enableProdMode();
diff --git a/modules/angular2/examples/router/ts/can_activate/can_activate_example.ts b/modules/angular2/examples/router/ts/can_activate/can_activate_example.ts
index cd0ccc66e2..bfa02bf67a 100644
--- a/modules/angular2/examples/router/ts/can_activate/can_activate_example.ts
+++ b/modules/angular2/examples/router/ts/can_activate/can_activate_example.ts
@@ -1,5 +1,5 @@
 import {provide, Component} from 'angular2/core';
-import {bootstrap} from 'angular2/bootstrap';
+import {bootstrap} from 'angular2/platform/browser';
 import {
   CanActivate,
   RouteConfig,
diff --git a/modules/angular2/examples/router/ts/can_deactivate/can_deactivate_example.ts b/modules/angular2/examples/router/ts/can_deactivate/can_deactivate_example.ts
index 41de37b4b9..e330aff1fe 100644
--- a/modules/angular2/examples/router/ts/can_deactivate/can_deactivate_example.ts
+++ b/modules/angular2/examples/router/ts/can_deactivate/can_deactivate_example.ts
@@ -1,5 +1,5 @@
 import {provide, Component} from 'angular2/core';
-import {bootstrap} from 'angular2/bootstrap';
+import {bootstrap} from 'angular2/platform/browser';
 import {
   CanDeactivate,
   RouteConfig,
diff --git a/modules/angular2/examples/router/ts/on_activate/on_activate_example.ts b/modules/angular2/examples/router/ts/on_activate/on_activate_example.ts
index 2a04513912..f2a41f6027 100644
--- a/modules/angular2/examples/router/ts/on_activate/on_activate_example.ts
+++ b/modules/angular2/examples/router/ts/on_activate/on_activate_example.ts
@@ -1,5 +1,5 @@
 import {Component, provide} from 'angular2/core';
-import {bootstrap} from 'angular2/bootstrap';
+import {bootstrap} from 'angular2/platform/browser';
 import {
   OnActivate,
   ComponentInstruction,
diff --git a/modules/angular2/examples/router/ts/on_deactivate/on_deactivate_example.ts b/modules/angular2/examples/router/ts/on_deactivate/on_deactivate_example.ts
index 036a0a47a2..a4b4c15072 100644
--- a/modules/angular2/examples/router/ts/on_deactivate/on_deactivate_example.ts
+++ b/modules/angular2/examples/router/ts/on_deactivate/on_deactivate_example.ts
@@ -1,5 +1,5 @@
 import {Component, Injectable, provide} from 'angular2/core';
-import {bootstrap} from 'angular2/bootstrap';
+import {bootstrap} from 'angular2/platform/browser';
 import {
   OnDeactivate,
   ComponentInstruction,
diff --git a/modules/angular2/examples/router/ts/reuse/reuse_example.ts b/modules/angular2/examples/router/ts/reuse/reuse_example.ts
index 4e34e31d79..7a2b182611 100644
--- a/modules/angular2/examples/router/ts/reuse/reuse_example.ts
+++ b/modules/angular2/examples/router/ts/reuse/reuse_example.ts
@@ -1,5 +1,5 @@
 import {Component, provide} from 'angular2/core';
-import {bootstrap} from 'angular2/bootstrap';
+import {bootstrap} from 'angular2/platform/browser';
 import {
   CanActivate,
   RouteConfig,
diff --git a/modules/benchmarks/src/compiler/compiler_benchmark.ts b/modules/benchmarks/src/compiler/compiler_benchmark.ts
index 2778ea5d75..37b0e16119 100644
--- a/modules/benchmarks/src/compiler/compiler_benchmark.ts
+++ b/modules/benchmarks/src/compiler/compiler_benchmark.ts
@@ -1,4 +1,4 @@
-import {bootstrap} from 'angular2/bootstrap';
+import {bootstrap} from 'angular2/platform/browser';
 import {BrowserDomAdapter} from 'angular2/src/platform/browser/browser_adapter';
 import {DOM} from 'angular2/src/platform/dom/dom_adapter';
 import {PromiseWrapper} from 'angular2/src/facade/async';
diff --git a/modules/benchmarks/src/costs/index.ts b/modules/benchmarks/src/costs/index.ts
index b9b9e4181b..b6b64d4131 100644
--- a/modules/benchmarks/src/costs/index.ts
+++ b/modules/benchmarks/src/costs/index.ts
@@ -1,4 +1,4 @@
-import {bootstrap} from 'angular2/bootstrap';
+import {bootstrap} from 'angular2/platform/browser';
 import {Component, Directive, DynamicComponentLoader, ElementRef} from 'angular2/core';
 import {NgIf, NgFor} from 'angular2/common';
 import {ApplicationRef} from 'angular2/src/core/application_ref';
diff --git a/modules/benchmarks/src/largetable/largetable_benchmark.ts b/modules/benchmarks/src/largetable/largetable_benchmark.ts
index 26a1a96b6a..0580b9104b 100644
--- a/modules/benchmarks/src/largetable/largetable_benchmark.ts
+++ b/modules/benchmarks/src/largetable/largetable_benchmark.ts
@@ -7,7 +7,7 @@ import {
   windowProfile,
   windowProfileEnd
 } from 'angular2/src/testing/benchmark_util';
-import {bootstrap} from 'angular2/bootstrap';
+import {bootstrap} from 'angular2/platform/browser';
 import {Component, Directive, bind, provide} from 'angular2/core';
 import {NgFor, NgSwitch, NgSwitchWhen, NgSwitchDefault} from 'angular2/common';
 import {ApplicationRef} from 'angular2/src/core/application_ref';
diff --git a/modules/benchmarks/src/naive_infinite_scroll/index.ts b/modules/benchmarks/src/naive_infinite_scroll/index.ts
index a25ebcb190..d3b03a9dda 100644
--- a/modules/benchmarks/src/naive_infinite_scroll/index.ts
+++ b/modules/benchmarks/src/naive_infinite_scroll/index.ts
@@ -1,4 +1,4 @@
-import {bootstrap} from 'angular2/bootstrap';
+import {bootstrap} from 'angular2/platform/browser';
 
 import {App} from './app';
 
diff --git a/modules/benchmarks/src/static_tree/tree_benchmark.ts b/modules/benchmarks/src/static_tree/tree_benchmark.ts
index 6bab48314f..98b31def32 100644
--- a/modules/benchmarks/src/static_tree/tree_benchmark.ts
+++ b/modules/benchmarks/src/static_tree/tree_benchmark.ts
@@ -1,4 +1,4 @@
-import {bootstrap} from 'angular2/bootstrap';
+import {bootstrap} from 'angular2/platform/browser';
 import {NgIf} from 'angular2/common';
 import {
   Compiler,
diff --git a/modules/benchmarks/src/tree/tree_benchmark.ts b/modules/benchmarks/src/tree/tree_benchmark.ts
index 29bdcb15e0..6a4e3792bb 100644
--- a/modules/benchmarks/src/tree/tree_benchmark.ts
+++ b/modules/benchmarks/src/tree/tree_benchmark.ts
@@ -1,4 +1,4 @@
-import {bootstrap} from 'angular2/bootstrap';
+import {bootstrap} from 'angular2/platform/browser';
 import {
   Compiler,
   Component,
diff --git a/modules/payload_tests/hello_world/ts/webpack/index.ts b/modules/payload_tests/hello_world/ts/webpack/index.ts
index a0cfbe9e03..b350769c68 100644
--- a/modules/payload_tests/hello_world/ts/webpack/index.ts
+++ b/modules/payload_tests/hello_world/ts/webpack/index.ts
@@ -1,5 +1,5 @@
 import {Component} from 'angular2/core';
-import {bootstrap} from 'angular2/bootstrap';
+import {bootstrap} from 'angular2/platform/browser';
 
 @Component({
   selector: 'hello-app',
diff --git a/modules/playground/src/animate/index.ts b/modules/playground/src/animate/index.ts
index 0ab7020b9a..bfc26f3988 100644
--- a/modules/playground/src/animate/index.ts
+++ b/modules/playground/src/animate/index.ts
@@ -1,5 +1,5 @@
 import {AnimateApp} from './animate-app';
-import {bootstrap} from 'angular2/bootstrap';
+import {bootstrap} from 'angular2/platform/browser';
 
 export function main() {
   bootstrap(AnimateApp);
diff --git a/modules/playground/src/async/index.ts b/modules/playground/src/async/index.ts
index 2fc7be50ca..e93569604d 100644
--- a/modules/playground/src/async/index.ts
+++ b/modules/playground/src/async/index.ts
@@ -1,4 +1,4 @@
-import {bootstrap} from 'angular2/bootstrap';
+import {bootstrap} from 'angular2/platform/browser';
 import {Component} from 'angular2/core';
 import {NgIf} from 'angular2/common';
 import {TimerWrapper} from 'angular2/src/facade/async';
diff --git a/modules/playground/src/gestures/index.ts b/modules/playground/src/gestures/index.ts
index 5ffb99b6fa..69d0b48cdf 100644
--- a/modules/playground/src/gestures/index.ts
+++ b/modules/playground/src/gestures/index.ts
@@ -1,4 +1,4 @@
-import {bootstrap} from 'angular2/bootstrap';
+import {bootstrap} from 'angular2/platform/browser';
 import {Component} from 'angular2/core';
 
 @Component({selector: 'gestures-app', templateUrl: 'template.html'})
diff --git a/modules/playground/src/hash_routing/index.ts b/modules/playground/src/hash_routing/index.ts
index 62a0ffdf8d..94f24135bf 100644
--- a/modules/playground/src/hash_routing/index.ts
+++ b/modules/playground/src/hash_routing/index.ts
@@ -1,5 +1,5 @@
 import {Component, provide} from 'angular2/core';
-import {bootstrap} from 'angular2/bootstrap';
+import {bootstrap} from 'angular2/platform/browser';
 import {
   RouteConfig,
   Route,
diff --git a/modules/playground/src/hello_world/index.ts b/modules/playground/src/hello_world/index.ts
index 15c51412e4..37aef121f1 100644
--- a/modules/playground/src/hello_world/index.ts
+++ b/modules/playground/src/hello_world/index.ts
@@ -1,4 +1,4 @@
-import {bootstrap} from 'angular2/bootstrap';
+import {bootstrap} from 'angular2/platform/browser';
 import {Renderer, ElementRef, Component, Directive, Injectable} from 'angular2/core';
 
 export function main() {
diff --git a/modules/playground/src/http/index.ts b/modules/playground/src/http/index.ts
index 9b57c145ff..e01d156676 100644
--- a/modules/playground/src/http/index.ts
+++ b/modules/playground/src/http/index.ts
@@ -1,4 +1,4 @@
-import {bootstrap} from 'angular2/bootstrap';
+import {bootstrap} from 'angular2/platform/browser';
 import {HTTP_PROVIDERS} from 'angular2/http';
 import {HttpCmp} from './http_comp';
 
diff --git a/modules/playground/src/jsonp/index.ts b/modules/playground/src/jsonp/index.ts
index 6b686e481d..5eca8ae53a 100644
--- a/modules/playground/src/jsonp/index.ts
+++ b/modules/playground/src/jsonp/index.ts
@@ -1,4 +1,4 @@
-import {bootstrap} from 'angular2/bootstrap';
+import {bootstrap} from 'angular2/platform/browser';
 import {JSONP_PROVIDERS} from 'angular2/http';
 import {JsonpCmp} from './jsonp_comp';
 
diff --git a/modules/playground/src/key_events/index.ts b/modules/playground/src/key_events/index.ts
index 8ddc3ec08e..83356ad89c 100644
--- a/modules/playground/src/key_events/index.ts
+++ b/modules/playground/src/key_events/index.ts
@@ -1,4 +1,4 @@
-import {bootstrap} from 'angular2/bootstrap';
+import {bootstrap} from 'angular2/platform/browser';
 import {Component} from 'angular2/core';
 import {KeyEventsPlugin} from 'angular2/src/platform/dom/events/key_events';
 
diff --git a/modules/playground/src/model_driven_forms/index.ts b/modules/playground/src/model_driven_forms/index.ts
index 6f8c93128d..73a6a865dd 100644
--- a/modules/playground/src/model_driven_forms/index.ts
+++ b/modules/playground/src/model_driven_forms/index.ts
@@ -1,4 +1,4 @@
-import {bootstrap} from 'angular2/bootstrap';
+import {bootstrap} from 'angular2/platform/browser';
 import {
   FORM_DIRECTIVES,
   ControlGroup,
diff --git a/modules/playground/src/order_management/index.ts b/modules/playground/src/order_management/index.ts
index cbb9ccd58c..96a344703f 100644
--- a/modules/playground/src/order_management/index.ts
+++ b/modules/playground/src/order_management/index.ts
@@ -1,4 +1,4 @@
-import {bootstrap} from 'angular2/bootstrap';
+import {bootstrap} from 'angular2/platform/browser';
 import {
   Component,
   Directive,
diff --git a/modules/playground/src/person_management/index.ts b/modules/playground/src/person_management/index.ts
index 11ad1af65e..81419a7244 100644
--- a/modules/playground/src/person_management/index.ts
+++ b/modules/playground/src/person_management/index.ts
@@ -1,4 +1,4 @@
-import {bootstrap} from 'angular2/bootstrap';
+import {bootstrap} from 'angular2/platform/browser';
 import {Component, Directive, Host, forwardRef, Provider, Injectable} from 'angular2/core';
 import {NgIf, NgFor, FORM_DIRECTIVES} from 'angular2/common';
 
diff --git a/modules/playground/src/relative_assets/index.ts b/modules/playground/src/relative_assets/index.ts
index 460758944f..c6a9da1a3b 100644
--- a/modules/playground/src/relative_assets/index.ts
+++ b/modules/playground/src/relative_assets/index.ts
@@ -1,4 +1,4 @@
-import {bootstrap} from 'angular2/bootstrap';
+import {bootstrap} from 'angular2/platform/browser';
 
 import {Renderer, ElementRef, Component, Directive, Injectable} from 'angular2/core';
 import {MyCmp} from './my_cmp/my_cmp';
diff --git a/modules/playground/src/routing/index.ts b/modules/playground/src/routing/index.ts
index 11e06488b6..c745adeb23 100644
--- a/modules/playground/src/routing/index.ts
+++ b/modules/playground/src/routing/index.ts
@@ -1,6 +1,6 @@
 import {InboxApp} from './inbox-app';
 import {provide} from 'angular2/core';
-import {bootstrap} from 'angular2/bootstrap';
+import {bootstrap} from 'angular2/platform/browser';
 import {ROUTER_PROVIDERS, HashLocationStrategy, LocationStrategy} from 'angular2/router';
 
 export function main() {
diff --git a/modules/playground/src/sourcemap/index.ts b/modules/playground/src/sourcemap/index.ts
index 3d927ab89e..b6add7aec9 100644
--- a/modules/playground/src/sourcemap/index.ts
+++ b/modules/playground/src/sourcemap/index.ts
@@ -1,5 +1,5 @@
 import {BaseException, WrappedException} from 'angular2/src/facade/exceptions';
-import {bootstrap} from 'angular2/bootstrap';
+import {bootstrap} from 'angular2/platform/browser';
 import {Component} from 'angular2/core';
 
 @Component({
diff --git a/modules/playground/src/svg/index.ts b/modules/playground/src/svg/index.ts
index e87641bc8a..97315fecb0 100644
--- a/modules/playground/src/svg/index.ts
+++ b/modules/playground/src/svg/index.ts
@@ -1,4 +1,4 @@
-import {bootstrap} from 'angular2/bootstrap';
+import {bootstrap} from 'angular2/platform/browser';
 import {Component} from 'angular2/core';
 
 @Component({selector: '[svg-group]', template: `<svg:text x="20" y="20">Hello</svg:text>`})
diff --git a/modules/playground/src/template_driven_forms/index.ts b/modules/playground/src/template_driven_forms/index.ts
index a6d4982942..adaef4ebe8 100644
--- a/modules/playground/src/template_driven_forms/index.ts
+++ b/modules/playground/src/template_driven_forms/index.ts
@@ -1,4 +1,4 @@
-import {bootstrap} from 'angular2/bootstrap';
+import {bootstrap} from 'angular2/platform/browser';
 import {Component, Directive, Host, forwardRef, Provider} from 'angular2/core';
 import {
   ControlGroup,
diff --git a/modules/playground/src/todo/index.ts b/modules/playground/src/todo/index.ts
index 29fecae076..5e9780f6b0 100644
--- a/modules/playground/src/todo/index.ts
+++ b/modules/playground/src/todo/index.ts
@@ -1,4 +1,4 @@
-import {bootstrap} from 'angular2/bootstrap';
+import {bootstrap} from 'angular2/platform/browser';
 import {Component} from 'angular2/core';
 import {NgFor} from 'angular2/common';
 import {Store, Todo, TodoFactory} from './services/TodoStore';
diff --git a/modules/playground/src/web_workers/images/single_thread.ts b/modules/playground/src/web_workers/images/single_thread.ts
index 9f2c66b14c..94dab0f498 100644
--- a/modules/playground/src/web_workers/images/single_thread.ts
+++ b/modules/playground/src/web_workers/images/single_thread.ts
@@ -1,4 +1,4 @@
-import {bootstrap} from "angular2/bootstrap";
+import {bootstrap} from "angular2/platform/browser";
 import {ImageDemo} from "./index_common";
 
 export function main() {
diff --git a/modules/playground/src/zippy_component/index.ts b/modules/playground/src/zippy_component/index.ts
index 10e9acaf22..2f8c520d14 100644
--- a/modules/playground/src/zippy_component/index.ts
+++ b/modules/playground/src/zippy_component/index.ts
@@ -1,4 +1,4 @@
-import {bootstrap} from 'angular2/bootstrap';
+import {bootstrap} from 'angular2/platform/browser';
 import {Component} from 'angular2/core';
 import {Zippy} from './zippy';
 
diff --git a/modules_dart/payload/hello_world/web/index.dart b/modules_dart/payload/hello_world/web/index.dart
index 7f4c980d9f..66af3b2daa 100644
--- a/modules_dart/payload/hello_world/web/index.dart
+++ b/modules_dart/payload/hello_world/web/index.dart
@@ -1,6 +1,7 @@
 library hello_world.index;
 
-import "package:angular2/bootstrap.dart" show AngularEntrypoint, bootstrap;
+import "package:angular2/platform/browser.dart"
+    show AngularEntrypoint, bootstrap;
 import "package:angular2/angular2.dart"
     show Component, Directive, ElementRef, Injectable, Renderer;
 
diff --git a/modules_dart/transform/lib/src/transform/common/mirror_matcher.dart b/modules_dart/transform/lib/src/transform/common/mirror_matcher.dart
index 3eaf5a28c7..bca6c20e4d 100644
--- a/modules_dart/transform/lib/src/transform/common/mirror_matcher.dart
+++ b/modules_dart/transform/lib/src/transform/common/mirror_matcher.dart
@@ -3,11 +3,29 @@ library angular2.transform.common.mirror_matcher;
 import 'package:analyzer/src/generated/ast.dart';
 import 'package:angular2/src/transform/common/names.dart';
 
-const BOOTSTRAP_STATIC_URI = 'package:angular2/bootstrap_static.dart';
-const BOOTSTRAP_URI = 'package:angular2/bootstrap.dart';
-const REFLECTION_CAPABILITIES_URI =
+/// Files from which `bootstrap` is exported.
+///
+/// These files transitively imports dart:mirrors.
+/// They should be replaced with [BOOTSTRAP_STATIC_URI] in production apps.
+const _BOOTSTRAP_URIS = const <String>[
+  'package:angular2/bootstrap.dart',
+  'package:angular2/platform/browser.dart',
+];
+
+/// File from which `ReflectionCapabilities` is exported.
+///
+/// This file transitively imports dart:mirrors and should be removed from
+/// production apps. The Angular2 reflection framework should be initialized
+/// with generated code such that no reflection is necessary.
+const _REFLECTION_CAPABILITIES_URI =
     'package:angular2/src/core/reflection/reflection_capabilities.dart';
 
+/// File from which `bootstrapStatic` is exported.
+///
+/// This file does not transitively import dart:mirrors.
+/// It should be used in place of [_BOOTSTRAP_URIS] in production apps.
+const BOOTSTRAP_STATIC_URI = 'package:angular2/platform/browser_static.dart';
+
 /// Syntactially checks for code related to the use of `dart:mirrors`.
 ///
 /// Checks various [AstNode]s to determine if they are
@@ -20,10 +38,9 @@ class MirrorMatcher {
       '${node.constructorName.type.name}' == REFLECTION_CAPABILITIES_NAME;
 
   bool hasReflectionCapabilitiesUri(UriBasedDirective node) {
-    return node.uri.stringValue == REFLECTION_CAPABILITIES_URI;
+    return node.uri.stringValue == _REFLECTION_CAPABILITIES_URI;
   }
 
-  bool hasBootstrapUri(UriBasedDirective node) {
-    return node.uri.stringValue == BOOTSTRAP_URI;
-  }
+  bool hasBootstrapUri(UriBasedDirective node) =>
+      _BOOTSTRAP_URIS.contains(node.uri.stringValue);
 }
diff --git a/modules_dart/transform/test/transform/integration/directive_chain_files/index.dart b/modules_dart/transform/test/transform/integration/directive_chain_files/index.dart
index d37306e2ad..7acd07896f 100644
--- a/modules_dart/transform/test/transform/integration/directive_chain_files/index.dart
+++ b/modules_dart/transform/test/transform/integration/directive_chain_files/index.dart
@@ -1,6 +1,6 @@
 library web_foo;
 
-import 'package:angular2/bootstrap.dart';
+import 'package:angular2/platform/browser.dart';
 import 'package:angular2/src/core/reflection/reflection_capabilities.dart';
 import 'bar.dart';
 
diff --git a/modules_dart/transform/test/transform/integration/directive_dep_files/index.dart b/modules_dart/transform/test/transform/integration/directive_dep_files/index.dart
index d37306e2ad..7acd07896f 100644
--- a/modules_dart/transform/test/transform/integration/directive_dep_files/index.dart
+++ b/modules_dart/transform/test/transform/integration/directive_dep_files/index.dart
@@ -1,6 +1,6 @@
 library web_foo;
 
-import 'package:angular2/bootstrap.dart';
+import 'package:angular2/platform/browser.dart';
 import 'package:angular2/src/core/reflection/reflection_capabilities.dart';
 import 'bar.dart';
 
diff --git a/modules_dart/transform/test/transform/integration/event_getter_files/index.dart b/modules_dart/transform/test/transform/integration/event_getter_files/index.dart
index 069954df44..b1fa07c87f 100644
--- a/modules_dart/transform/test/transform/integration/event_getter_files/index.dart
+++ b/modules_dart/transform/test/transform/integration/event_getter_files/index.dart
@@ -1,6 +1,6 @@
 library web_foo;
 
-import 'package:angular2/bootstrap.dart';
+import 'package:angular2/platform/browser.dart';
 import 'package:angular2/src/core/reflection/reflection.dart';
 import 'package:angular2/src/core/reflection/reflection_capabilities.dart';
 import 'bar.dart';
diff --git a/modules_dart/transform/test/transform/integration/list_of_types_files/index.dart b/modules_dart/transform/test/transform/integration/list_of_types_files/index.dart
index d37306e2ad..7acd07896f 100644
--- a/modules_dart/transform/test/transform/integration/list_of_types_files/index.dart
+++ b/modules_dart/transform/test/transform/integration/list_of_types_files/index.dart
@@ -1,6 +1,6 @@
 library web_foo;
 
-import 'package:angular2/bootstrap.dart';
+import 'package:angular2/platform/browser.dart';
 import 'package:angular2/src/core/reflection/reflection_capabilities.dart';
 import 'bar.dart';
 
diff --git a/modules_dart/transform/test/transform/integration/simple_annotation_files/expected/index.template.dart b/modules_dart/transform/test/transform/integration/simple_annotation_files/expected/index.template.dart
index 51c164f7c9..a3966d1880 100644
--- a/modules_dart/transform/test/transform/integration/simple_annotation_files/expected/index.template.dart
+++ b/modules_dart/transform/test/transform/integration/simple_annotation_files/expected/index.template.dart
@@ -2,7 +2,7 @@ library web_foo.template.dart;
 
 import 'index.dart';
 import 'package:angular2/src/core/reflection/reflection.dart' as _ngRef;
-import 'package:angular2/bootstrap_static.dart' show bootstrapStatic;
+import 'package:angular2/platform/browser_static.dart' show bootstrapStatic;
 import 'package:angular2/src/core/reflection/reflection.dart';
 import 'bar.dart';
 import 'bar.template.dart' as i0;
diff --git a/modules_dart/transform/test/transform/integration/simple_annotation_files/index.dart b/modules_dart/transform/test/transform/integration/simple_annotation_files/index.dart
index 120b50dc02..a9ccef3f11 100644
--- a/modules_dart/transform/test/transform/integration/simple_annotation_files/index.dart
+++ b/modules_dart/transform/test/transform/integration/simple_annotation_files/index.dart
@@ -1,6 +1,6 @@
 library web_foo;
 
-import 'package:angular2/bootstrap.dart' show bootstrap;
+import 'package:angular2/platform/browser.dart' show bootstrap;
 import 'package:angular2/src/core/reflection/reflection.dart';
 import 'package:angular2/src/core/reflection/reflection_capabilities.dart';
 import 'bar.dart';
diff --git a/modules_dart/transform/test/transform/integration/synthetic_ctor_files/index.dart b/modules_dart/transform/test/transform/integration/synthetic_ctor_files/index.dart
index d37306e2ad..7acd07896f 100644
--- a/modules_dart/transform/test/transform/integration/synthetic_ctor_files/index.dart
+++ b/modules_dart/transform/test/transform/integration/synthetic_ctor_files/index.dart
@@ -1,6 +1,6 @@
 library web_foo;
 
-import 'package:angular2/bootstrap.dart';
+import 'package:angular2/platform/browser.dart';
 import 'package:angular2/src/core/reflection/reflection_capabilities.dart';
 import 'bar.dart';
 
diff --git a/modules_dart/transform/test/transform/integration/two_annotations_files/index.dart b/modules_dart/transform/test/transform/integration/two_annotations_files/index.dart
index d37306e2ad..7acd07896f 100644
--- a/modules_dart/transform/test/transform/integration/two_annotations_files/index.dart
+++ b/modules_dart/transform/test/transform/integration/two_annotations_files/index.dart
@@ -1,6 +1,6 @@
 library web_foo;
 
-import 'package:angular2/bootstrap.dart';
+import 'package:angular2/platform/browser.dart';
 import 'package:angular2/src/core/reflection/reflection_capabilities.dart';
 import 'bar.dart';
 
diff --git a/modules_dart/transform/test/transform/integration/two_deps_files/index.dart b/modules_dart/transform/test/transform/integration/two_deps_files/index.dart
index d37306e2ad..7acd07896f 100644
--- a/modules_dart/transform/test/transform/integration/two_deps_files/index.dart
+++ b/modules_dart/transform/test/transform/integration/two_deps_files/index.dart
@@ -1,6 +1,6 @@
 library web_foo;
 
-import 'package:angular2/bootstrap.dart';
+import 'package:angular2/platform/browser.dart';
 import 'package:angular2/src/core/reflection/reflection_capabilities.dart';
 import 'bar.dart';
 
diff --git a/modules_dart/transform/test/transform/reflection_remover/abstract_method_annotation_files/index.dart b/modules_dart/transform/test/transform/reflection_remover/abstract_method_annotation_files/index.dart
index 2af9244bbe..85896503b8 100644
--- a/modules_dart/transform/test/transform/reflection_remover/abstract_method_annotation_files/index.dart
+++ b/modules_dart/transform/test/transform/reflection_remover/abstract_method_annotation_files/index.dart
@@ -1,6 +1,6 @@
 library web_foo;
 
-import 'package:angular2/bootstrap.dart';
+import 'package:angular2/platform/browser.dart';
 
 abstract class TestBootstrapper {
   @AngularEntrypoint()
diff --git a/modules_dart/transform/test/transform/reflection_remover/all_tests.dart b/modules_dart/transform/test/transform/reflection_remover/all_tests.dart
index 018f28c82e..da76776db9 100644
--- a/modules_dart/transform/test/transform/reflection_remover/all_tests.dart
+++ b/modules_dart/transform/test/transform/reflection_remover/all_tests.dart
@@ -48,7 +48,8 @@ void allTests() {
       'should replace uses of mirrors with the debug implementation & '
       'insert calls to generated code in `MirrorMode.debug`.', () {
     var output = new Rewriter(code, codegen, entrypointMatcher,
-        mirrorMode: MirrorMode.debug).rewrite(parseCompilationUnit(code));
+            mirrorMode: MirrorMode.debug)
+        .rewrite(parseCompilationUnit(code));
     expect(output).toEqual(debug_mirrors.code);
   });
 
@@ -56,24 +57,38 @@ void allTests() {
       'should replace uses of mirrors with the verbose implementation '
       'in `MirrorMode.verbose`.', () {
     var output = new Rewriter(code, codegen, entrypointMatcher,
-        mirrorMode: MirrorMode.verbose).rewrite(parseCompilationUnit(code));
+            mirrorMode: MirrorMode.verbose)
+        .rewrite(parseCompilationUnit(code));
     expect(output).toEqual(verbose_mirrors.code);
   });
 
   it('should not initialize the reflector when `writeStaticInit` is `false`.',
       () {
-    var output = new Rewriter(code, codegen, entrypointMatcher,
-        writeStaticInit: false).rewrite(parseCompilationUnit(code));
+    var output =
+        new Rewriter(code, codegen, entrypointMatcher, writeStaticInit: false)
+            .rewrite(parseCompilationUnit(code));
     expect(output).toEqual(log_mirrors.code);
   });
 
   describe('`bootstrap` import and call', () {
+    // TODO(kegluneq): Remove when we remove angular2/bootstrap.dart
+    it('deprecated import should be rewritten to `bootstrapStatic`.', () {
+      final bootstrapCode =
+          readFile('reflection_remover/deprecated_bootstrap_files/index.dart')
+              .replaceAll('\r\n', '\n');
+      var output = new Rewriter(bootstrapCode, codegen, entrypointMatcher,
+              writeStaticInit: true)
+          .rewrite(parseCompilationUnit(bootstrapCode));
+      expect(output).toEqual(bootstrap_expected.code);
+    });
+
     it('should be rewritten to `bootstrapStatic`.', () {
       final bootstrapCode =
           readFile('reflection_remover/bootstrap_files/index.dart')
               .replaceAll('\r\n', '\n');
       var output = new Rewriter(bootstrapCode, codegen, entrypointMatcher,
-          writeStaticInit: true).rewrite(parseCompilationUnit(bootstrapCode));
+              writeStaticInit: true)
+          .rewrite(parseCompilationUnit(bootstrapCode));
       expect(output).toEqual(bootstrap_expected.code);
     });
 
@@ -81,7 +96,8 @@ void allTests() {
       final bootstrapCode =
           readFile('reflection_remover/deferred_bootstrap_files/index.dart');
       var output = new Rewriter(bootstrapCode, codegen, entrypointMatcher,
-          writeStaticInit: true).rewrite(parseCompilationUnit(bootstrapCode));
+              writeStaticInit: true)
+          .rewrite(parseCompilationUnit(bootstrapCode));
       expect(output).toEqual(deferred_bootstrap_expected.code);
     });
 
@@ -89,7 +105,8 @@ void allTests() {
       final bootstrapCode =
           readFile('reflection_remover/combinator_files/index.dart');
       var output = new Rewriter(bootstrapCode, codegen, entrypointMatcher,
-          writeStaticInit: true).rewrite(parseCompilationUnit(bootstrapCode));
+              writeStaticInit: true)
+          .rewrite(parseCompilationUnit(bootstrapCode));
       expect(output).toEqual(combinator_expected.code);
     });
   });
diff --git a/modules_dart/transform/test/transform/reflection_remover/arrow_annotation_files/index.dart b/modules_dart/transform/test/transform/reflection_remover/arrow_annotation_files/index.dart
index 83e2566605..fa922d389c 100644
--- a/modules_dart/transform/test/transform/reflection_remover/arrow_annotation_files/index.dart
+++ b/modules_dart/transform/test/transform/reflection_remover/arrow_annotation_files/index.dart
@@ -1,6 +1,6 @@
 library web_foo;
 
-import 'package:angular2/bootstrap.dart';
+import 'package:angular2/platform/browser.dart';
 import 'package:angular2/src/core/reflection/reflection.dart';
 import 'package:angular2/src/core/reflection/reflection_capabilities.dart';
 
diff --git a/modules_dart/transform/test/transform/reflection_remover/bootstrap_files/expected/index.dart b/modules_dart/transform/test/transform/reflection_remover/bootstrap_files/expected/index.dart
index ba476bfe9c..28b39d7fa6 100644
--- a/modules_dart/transform/test/transform/reflection_remover/bootstrap_files/expected/index.dart
+++ b/modules_dart/transform/test/transform/reflection_remover/bootstrap_files/expected/index.dart
@@ -11,7 +11,7 @@ library angular2.test.transform.reflection_remover.reflection_remover_files;
 var code = """
 library web_foo;
 
-import 'package:angular2/bootstrap_static.dart';import 'index.template.dart' as ngStaticInit;
+import 'package:angular2/platform/browser_static.dart';import 'index.template.dart' as ngStaticInit;
 
 void main() async {
   var appRef = await bootstrapStatic(MyComponent, null, () { ngStaticInit.initReflector(); });
diff --git a/modules_dart/transform/test/transform/reflection_remover/bootstrap_files/index.dart b/modules_dart/transform/test/transform/reflection_remover/bootstrap_files/index.dart
index 091b5e8466..ecd8bf7640 100644
--- a/modules_dart/transform/test/transform/reflection_remover/bootstrap_files/index.dart
+++ b/modules_dart/transform/test/transform/reflection_remover/bootstrap_files/index.dart
@@ -1,6 +1,6 @@
 library web_foo;
 
-import 'package:angular2/bootstrap.dart';
+import 'package:angular2/platform/browser.dart';
 
 void main() async {
   var appRef = await bootstrap(MyComponent);
diff --git a/modules_dart/transform/test/transform/reflection_remover/combinator_files/expected/index.dart b/modules_dart/transform/test/transform/reflection_remover/combinator_files/expected/index.dart
index e8c66a11f1..05c569e429 100644
--- a/modules_dart/transform/test/transform/reflection_remover/combinator_files/expected/index.dart
+++ b/modules_dart/transform/test/transform/reflection_remover/combinator_files/expected/index.dart
@@ -9,7 +9,7 @@ library angular2.test.transform.reflection_remover.combinator_files;
 // those we are removing.
 
 var code = """
-import 'package:angular2/bootstrap_static.dart' show bootstrapStatic, initReflector;import 'index.template.dart' as ngStaticInit;
+import 'package:angular2/platform/browser_static.dart' show bootstrapStatic, initReflector;import 'index.template.dart' as ngStaticInit;
 
 void main() {
   bootstrapStatic(MyComponent, null, () { ngStaticInit.initReflector(); });
diff --git a/modules_dart/transform/test/transform/reflection_remover/combinator_files/index.dart b/modules_dart/transform/test/transform/reflection_remover/combinator_files/index.dart
index e51e8e8263..b29269950a 100644
--- a/modules_dart/transform/test/transform/reflection_remover/combinator_files/index.dart
+++ b/modules_dart/transform/test/transform/reflection_remover/combinator_files/index.dart
@@ -1,4 +1,4 @@
-import 'package:angular2/bootstrap.dart' show bootstrap;
+import 'package:angular2/platform/browser.dart' show bootstrap;
 
 void main() {
   bootstrap(MyComponent);
diff --git a/modules_dart/transform/test/transform/reflection_remover/debug_files/expected/index.dart b/modules_dart/transform/test/transform/reflection_remover/debug_files/expected/index.dart
index a0c264cb24..553ad57437 100644
--- a/modules_dart/transform/test/transform/reflection_remover/debug_files/expected/index.dart
+++ b/modules_dart/transform/test/transform/reflection_remover/debug_files/expected/index.dart
@@ -11,7 +11,7 @@ library angular2.test.transform.debug_reflection_remover_files;
 var code = """
 library web_foo;
 
-import 'package:angular2/bootstrap.dart';import 'index.template.dart' as ngStaticInit;
+import 'package:angular2/platform/browser.dart';import 'index.template.dart' as ngStaticInit;
 import 'package:angular2/src/core/reflection/reflection.dart';
 import 'package:angular2/src/core/reflection/debug_reflection_capabilities.dart';
 
diff --git a/modules_dart/transform/test/transform/reflection_remover/debug_files/index.dart b/modules_dart/transform/test/transform/reflection_remover/debug_files/index.dart
index a377ea07f5..ff3d436729 100644
--- a/modules_dart/transform/test/transform/reflection_remover/debug_files/index.dart
+++ b/modules_dart/transform/test/transform/reflection_remover/debug_files/index.dart
@@ -1,6 +1,6 @@
 library web_foo;
 
-import 'package:angular2/bootstrap.dart';
+import 'package:angular2/platform/browser.dart';
 import 'package:angular2/src/core/reflection/reflection.dart';
 import 'package:angular2/src/core/reflection/reflection_capabilities.dart';
 
diff --git a/modules_dart/transform/test/transform/reflection_remover/debug_mirrors_files/expected/index.dart b/modules_dart/transform/test/transform/reflection_remover/debug_mirrors_files/expected/index.dart
index ccf13f7187..28310d757d 100644
--- a/modules_dart/transform/test/transform/reflection_remover/debug_mirrors_files/expected/index.dart
+++ b/modules_dart/transform/test/transform/reflection_remover/debug_mirrors_files/expected/index.dart
@@ -11,7 +11,7 @@ library angular2.test.transform.reflection_remover.debug_mirrors_files.expected;
 var code = """
 library web_foo;
 
-import 'package:angular2/bootstrap_static.dart';import 'index.template.dart' as ngStaticInit;
+import 'package:angular2/platform/browser_static.dart';import 'index.template.dart' as ngStaticInit;
 import 'package:angular2/src/core/reflection/reflection.dart';
 import 'package:angular2/src/core/reflection/debug_reflection_capabilities.dart';
 
diff --git a/modules_dart/transform/test/transform/reflection_remover/debug_mirrors_files/index.dart b/modules_dart/transform/test/transform/reflection_remover/debug_mirrors_files/index.dart
index a377ea07f5..ff3d436729 100644
--- a/modules_dart/transform/test/transform/reflection_remover/debug_mirrors_files/index.dart
+++ b/modules_dart/transform/test/transform/reflection_remover/debug_mirrors_files/index.dart
@@ -1,6 +1,6 @@
 library web_foo;
 
-import 'package:angular2/bootstrap.dart';
+import 'package:angular2/platform/browser.dart';
 import 'package:angular2/src/core/reflection/reflection.dart';
 import 'package:angular2/src/core/reflection/reflection_capabilities.dart';
 
diff --git a/modules_dart/transform/test/transform/reflection_remover/deferred_bootstrap_files/expected/index.dart b/modules_dart/transform/test/transform/reflection_remover/deferred_bootstrap_files/expected/index.dart
index c40be7aa15..58d583b018 100644
--- a/modules_dart/transform/test/transform/reflection_remover/deferred_bootstrap_files/expected/index.dart
+++ b/modules_dart/transform/test/transform/reflection_remover/deferred_bootstrap_files/expected/index.dart
@@ -9,7 +9,7 @@ library angular2.test.transform.reflection_remover.deferred_bootstrap_files;
 // those we are removing.
 
 var code = """
-import 'package:angular2/bootstrap_static.dart' deferred as ng;import 'index.template.dart' as ngStaticInit;
+import 'package:angular2/platform/browser_static.dart' deferred as ng;import 'index.template.dart' as ngStaticInit;
 
 void main() {
   ng.loadLibrary().then((_) {
diff --git a/modules_dart/transform/test/transform/reflection_remover/deferred_bootstrap_files/index.dart b/modules_dart/transform/test/transform/reflection_remover/deferred_bootstrap_files/index.dart
index 94c8dff4cc..7bbcb9fabe 100644
--- a/modules_dart/transform/test/transform/reflection_remover/deferred_bootstrap_files/index.dart
+++ b/modules_dart/transform/test/transform/reflection_remover/deferred_bootstrap_files/index.dart
@@ -1,4 +1,4 @@
-import 'package:angular2/bootstrap.dart' deferred as ng;
+import 'package:angular2/platform/browser.dart' deferred as ng;
 
 void main() {
   ng.loadLibrary().then((_) {
diff --git a/modules_dart/transform/test/transform/reflection_remover/deprecated_bootstrap_files/index.dart b/modules_dart/transform/test/transform/reflection_remover/deprecated_bootstrap_files/index.dart
new file mode 100644
index 0000000000..ecd8bf7640
--- /dev/null
+++ b/modules_dart/transform/test/transform/reflection_remover/deprecated_bootstrap_files/index.dart
@@ -0,0 +1,7 @@
+library web_foo;
+
+import 'package:angular2/platform/browser.dart';
+
+void main() async {
+  var appRef = await bootstrap(MyComponent);
+}
diff --git a/modules_dart/transform/test/transform/reflection_remover/function_annotation_files/expected/index.dart b/modules_dart/transform/test/transform/reflection_remover/function_annotation_files/expected/index.dart
index 0f0e4fadc6..dc5b150d30 100644
--- a/modules_dart/transform/test/transform/reflection_remover/function_annotation_files/expected/index.dart
+++ b/modules_dart/transform/test/transform/reflection_remover/function_annotation_files/expected/index.dart
@@ -11,7 +11,7 @@ library angular2.test.transform.reflection_remover.function_annotation_files;
 const code = """
 library web_foo;
 
-import 'package:angular2/bootstrap_static.dart';import 'index.template.dart' as ngStaticInit;
+import 'package:angular2/platform/browser_static.dart';import 'index.template.dart' as ngStaticInit;
 import 'package:angular2/src/core/reflection/reflection.dart';
 /*import 'package:angular2/src/core/reflection/reflection_capabilities.dart';*/
 
diff --git a/modules_dart/transform/test/transform/reflection_remover/function_annotation_files/index.dart b/modules_dart/transform/test/transform/reflection_remover/function_annotation_files/index.dart
index 82785f5d4c..cc1bce0d0e 100644
--- a/modules_dart/transform/test/transform/reflection_remover/function_annotation_files/index.dart
+++ b/modules_dart/transform/test/transform/reflection_remover/function_annotation_files/index.dart
@@ -1,6 +1,6 @@
 library web_foo;
 
-import 'package:angular2/bootstrap.dart';
+import 'package:angular2/platform/browser.dart';
 import 'package:angular2/src/core/reflection/reflection.dart';
 import 'package:angular2/src/core/reflection/reflection_capabilities.dart';
 
diff --git a/modules_dart/transform/test/transform/reflection_remover/index.dart b/modules_dart/transform/test/transform/reflection_remover/index.dart
index a377ea07f5..ff3d436729 100644
--- a/modules_dart/transform/test/transform/reflection_remover/index.dart
+++ b/modules_dart/transform/test/transform/reflection_remover/index.dart
@@ -1,6 +1,6 @@
 library web_foo;
 
-import 'package:angular2/bootstrap.dart';
+import 'package:angular2/platform/browser.dart';
 import 'package:angular2/src/core/reflection/reflection.dart';
 import 'package:angular2/src/core/reflection/reflection_capabilities.dart';
 
diff --git a/modules_dart/transform/test/transform/reflection_remover/log_mirrors_files/expected/index.dart b/modules_dart/transform/test/transform/reflection_remover/log_mirrors_files/expected/index.dart
index 14f6142e56..c157c41957 100644
--- a/modules_dart/transform/test/transform/reflection_remover/log_mirrors_files/expected/index.dart
+++ b/modules_dart/transform/test/transform/reflection_remover/log_mirrors_files/expected/index.dart
@@ -11,7 +11,7 @@ library angular2.test.transform.log_mirrors_files.expected;
 var code = """
 library web_foo;
 
-import 'package:angular2/bootstrap.dart';
+import 'package:angular2/platform/browser.dart';
 import 'package:angular2/src/core/reflection/reflection.dart';
 /*import 'package:angular2/src/core/reflection/reflection_capabilities.dart';*/
 
diff --git a/modules_dart/transform/test/transform/reflection_remover/log_mirrors_files/index.dart b/modules_dart/transform/test/transform/reflection_remover/log_mirrors_files/index.dart
index a377ea07f5..ff3d436729 100644
--- a/modules_dart/transform/test/transform/reflection_remover/log_mirrors_files/index.dart
+++ b/modules_dart/transform/test/transform/reflection_remover/log_mirrors_files/index.dart
@@ -1,6 +1,6 @@
 library web_foo;
 
-import 'package:angular2/bootstrap.dart';
+import 'package:angular2/platform/browser.dart';
 import 'package:angular2/src/core/reflection/reflection.dart';
 import 'package:angular2/src/core/reflection/reflection_capabilities.dart';
 
diff --git a/modules_dart/transform/test/transform/reflection_remover/method_annotation_files/expected/index.dart b/modules_dart/transform/test/transform/reflection_remover/method_annotation_files/expected/index.dart
index 417f804970..26e0026daf 100644
--- a/modules_dart/transform/test/transform/reflection_remover/method_annotation_files/expected/index.dart
+++ b/modules_dart/transform/test/transform/reflection_remover/method_annotation_files/expected/index.dart
@@ -11,7 +11,7 @@ library angular2.test.transform.reflection_remover.method_annotation_files;
 const code = """
 library web_foo;
 
-import 'package:angular2/bootstrap_static.dart';import 'index.template.dart' as ngStaticInit;
+import 'package:angular2/platform/browser_static.dart';import 'index.template.dart' as ngStaticInit;
 
 class TestBootstrapper {
   @AngularEntrypoint("Method entrypoint")
diff --git a/modules_dart/transform/test/transform/reflection_remover/method_annotation_files/index.dart b/modules_dart/transform/test/transform/reflection_remover/method_annotation_files/index.dart
index f7353bcc93..524dda1c24 100644
--- a/modules_dart/transform/test/transform/reflection_remover/method_annotation_files/index.dart
+++ b/modules_dart/transform/test/transform/reflection_remover/method_annotation_files/index.dart
@@ -1,6 +1,6 @@
 library web_foo;
 
-import 'package:angular2/bootstrap.dart';
+import 'package:angular2/platform/browser.dart';
 
 class TestBootstrapper {
   @AngularEntrypoint("Method entrypoint")
diff --git a/modules_dart/transform/test/transform/reflection_remover/native_annotation_files/index.dart b/modules_dart/transform/test/transform/reflection_remover/native_annotation_files/index.dart
index 255f39834b..c7a0b1ac63 100644
--- a/modules_dart/transform/test/transform/reflection_remover/native_annotation_files/index.dart
+++ b/modules_dart/transform/test/transform/reflection_remover/native_annotation_files/index.dart
@@ -1,6 +1,6 @@
 library web_foo;
 
-import 'package:angular2/bootstrap.dart';
+import 'package:angular2/platform/browser.dart';
 import 'package:angular2/src/core/reflection/reflection.dart';
 import 'package:angular2/src/core/reflection/reflection_capabilities.dart';
 
diff --git a/modules_dart/transform/test/transform/reflection_remover/reflection_remover_files/expected/index.dart b/modules_dart/transform/test/transform/reflection_remover/reflection_remover_files/expected/index.dart
index f346e1c3fc..b40f0cc4aa 100644
--- a/modules_dart/transform/test/transform/reflection_remover/reflection_remover_files/expected/index.dart
+++ b/modules_dart/transform/test/transform/reflection_remover/reflection_remover_files/expected/index.dart
@@ -11,7 +11,7 @@ library angular2.test.transform.reflection_remover.reflection_remover_files;
 var code = """
 library web_foo;
 
-import 'package:angular2/bootstrap_static.dart';import 'index.template.dart' as ngStaticInit;
+import 'package:angular2/platform/browser_static.dart';import 'index.template.dart' as ngStaticInit;
 import 'package:angular2/src/core/reflection/reflection.dart';
 /*import 'package:angular2/src/core/reflection/reflection_capabilities.dart';*/
 
diff --git a/modules_dart/transform/test/transform/reflection_remover/reflection_remover_files/index.dart b/modules_dart/transform/test/transform/reflection_remover/reflection_remover_files/index.dart
index a377ea07f5..ff3d436729 100644
--- a/modules_dart/transform/test/transform/reflection_remover/reflection_remover_files/index.dart
+++ b/modules_dart/transform/test/transform/reflection_remover/reflection_remover_files/index.dart
@@ -1,6 +1,6 @@
 library web_foo;
 
-import 'package:angular2/bootstrap.dart';
+import 'package:angular2/platform/browser.dart';
 import 'package:angular2/src/core/reflection/reflection.dart';
 import 'package:angular2/src/core/reflection/reflection_capabilities.dart';
 
diff --git a/modules_dart/transform/test/transform/reflection_remover/verbose_files/expected/index.dart b/modules_dart/transform/test/transform/reflection_remover/verbose_files/expected/index.dart
index 9ca2dd9c14..347c4d548b 100644
--- a/modules_dart/transform/test/transform/reflection_remover/verbose_files/expected/index.dart
+++ b/modules_dart/transform/test/transform/reflection_remover/verbose_files/expected/index.dart
@@ -11,7 +11,7 @@ library angular2.test.transform.reflection_remover.verbose_files.expected;
 var code = """
 library web_foo;
 
-import 'package:angular2/bootstrap_static.dart';import 'index.template.dart' as ngStaticInit;
+import 'package:angular2/platform/browser_static.dart';import 'index.template.dart' as ngStaticInit;
 import 'package:angular2/src/core/reflection/reflection.dart';
 import 'package:angular2/src/core/reflection/debug_reflection_capabilities.dart';