diff --git a/public/docs/_examples/homepage-hello-world/ts/index.1.html b/public/docs/_examples/homepage-hello-world/ts/index.1.html
index f5b05c3e55..ce0bdfbaf9 100644
--- a/public/docs/_examples/homepage-hello-world/ts/index.1.html
+++ b/public/docs/_examples/homepage-hello-world/ts/index.1.html
@@ -9,17 +9,17 @@
 
     <!-- 1. Load libraries -->
      <!-- Polyfill(s) for older browsers -->
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/es6-shim/0.35.0/es6-shim.min.js"></script>
+    <script src="https://npmcdn.com/core-js/client/shim.min.js"></script>
 
     <script src="https://npmcdn.com/zone.js@0.6.12"></script>
     <script src="https://npmcdn.com/reflect-metadata@0.1.3"></script>
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/systemjs/0.19.27/system.js"></script>
+    <script src="https://npmcdn.com/systemjs@0.19.27/dist/system.src.js"></script>
     <script src="https://npmcdn.com/typescript@1.8.10/lib/typescript.js"></script>
 
     <!-- 2. Configure SystemJS -->
     <script src="systemjs.config.js"></script>
     <script>
-      System.import('app').catch(function(err){ console.error(err);  });
+      System.import('app').catch(function(err){ console.error(err); });
     </script>
 
   </head>
diff --git a/public/docs/_examples/homepage-tabs/ts/index.1.html b/public/docs/_examples/homepage-tabs/ts/index.1.html
index 6a9ab2f9dd..c790439682 100644
--- a/public/docs/_examples/homepage-tabs/ts/index.1.html
+++ b/public/docs/_examples/homepage-tabs/ts/index.1.html
@@ -10,17 +10,17 @@
 
     <!-- 1. Load libraries -->
      <!-- Polyfill(s) for older browsers -->
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/es6-shim/0.35.0/es6-shim.min.js"></script>
+    <script src="https://npmcdn.com/core-js/client/shim.min.js"></script>
 
     <script src="https://npmcdn.com/zone.js@0.6.12"></script>
     <script src="https://npmcdn.com/reflect-metadata@0.1.3"></script>
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/systemjs/0.19.27/system.js"></script>
+    <script src="https://npmcdn.com/systemjs@0.19.27/dist/system.src.js"></script>
     <script src="https://npmcdn.com/typescript@1.8.10/lib/typescript.js"></script>
 
     <!-- 2. Configure SystemJS -->
     <script src="systemjs.config.js"></script>
     <script>
-      System.import('app').catch(function(err){ console.error(err);  });
+      System.import('app').catch(function(err){ console.error(err); });
     </script>
 
   </head>
diff --git a/public/docs/_examples/homepage-todo/ts/index.1.html b/public/docs/_examples/homepage-todo/ts/index.1.html
index f69158e29c..d926bbe323 100644
--- a/public/docs/_examples/homepage-todo/ts/index.1.html
+++ b/public/docs/_examples/homepage-todo/ts/index.1.html
@@ -10,17 +10,17 @@
 
     <!-- 1. Load libraries -->
      <!-- Polyfill(s) for older browsers -->
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/es6-shim/0.35.0/es6-shim.min.js"></script>
+    <script src="https://npmcdn.com/core-js/client/shim.min.js"></script>
 
     <script src="https://npmcdn.com/zone.js@0.6.12"></script>
     <script src="https://npmcdn.com/reflect-metadata@0.1.3"></script>
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/systemjs/0.19.27/system.js"></script>
+    <script src="https://npmcdn.com/systemjs@0.19.27/dist/system.src.js"></script>
     <script src="https://npmcdn.com/typescript@1.8.10/lib/typescript.js"></script>
 
     <!-- 2. Configure SystemJS -->
     <script src="systemjs.config.js"></script>
     <script>
-      System.import('app').catch(function(err){ console.error(err);  });
+      System.import('app').catch(function(err){ console.error(err); });
     </script>
 
   </head>
diff --git a/public/docs/_examples/karma.conf.js b/public/docs/_examples/karma.conf.js
index fe7c2d1652..b9bea32636 100644
--- a/public/docs/_examples/karma.conf.js
+++ b/public/docs/_examples/karma.conf.js
@@ -22,7 +22,7 @@ module.exports = function(config) {
     },
     files: [
       // Polyfills.
-      'node_modules/es6-shim/es6-shim.js',
+      'node_modules/code-js/client/shim.min.js',
 
       // Zone.js dependencies
       // Note - do not include zone.js itself here, it is already
diff --git a/public/docs/_examples/package.json b/public/docs/_examples/package.json
index c88ec62936..b89d74462e 100644
--- a/public/docs/_examples/package.json
+++ b/public/docs/_examples/package.json
@@ -38,7 +38,7 @@
     "rxjs": "5.0.0-beta.6",
     "zone.js": "^0.6.12",
 
-    "angular2-in-memory-web-api": "0.0.8",
+    "angular2-in-memory-web-api": "0.0.9",
     "bootstrap": "^3.3.6"
   },
   "devDependencies": {
diff --git a/public/docs/_examples/quickstart/ts/package.1.json b/public/docs/_examples/quickstart/ts/package.1.json
index 61458998db..5cac25cd60 100644
--- a/public/docs/_examples/quickstart/ts/package.1.json
+++ b/public/docs/_examples/quickstart/ts/package.1.json
@@ -27,7 +27,7 @@
     "rxjs": "5.0.0-beta.6",
     "zone.js": "^0.6.12",
 
-    "angular2-in-memory-web-api": "0.0.8",
+    "angular2-in-memory-web-api": "0.0.9",
     "bootstrap": "^3.3.6"
   },
   "devDependencies": {
diff --git a/public/docs/_examples/styleguide/package.1.json b/public/docs/_examples/styleguide/package.1.json
index 7129ac907a..f4c2fdaef5 100644
--- a/public/docs/_examples/styleguide/package.1.json
+++ b/public/docs/_examples/styleguide/package.1.json
@@ -11,8 +11,7 @@
   "dependencies": {
     "angular2": "2.0.0-beta.0",
     "systemjs": "0.19.6",
-    "es6-promise": "^3.0.2",
-    "es6-shim": "^0.35.0",
+    "core-js": "^2.4.0",
     "reflect-metadata": "0.1.2",
     "rxjs": "5.0.0-beta.0",
     "zone.js": "0.5.10"
diff --git a/public/docs/_examples/upgrade-adapter/ts/index-1-2-hybrid-bootstrap.html b/public/docs/_examples/upgrade-adapter/ts/index-1-2-hybrid-bootstrap.html
index 2e97762347..ff5481a40d 100644
--- a/public/docs/_examples/upgrade-adapter/ts/index-1-2-hybrid-bootstrap.html
+++ b/public/docs/_examples/upgrade-adapter/ts/index-1-2-hybrid-bootstrap.html
@@ -17,7 +17,7 @@
 
     <script src="systemjs.config.js"></script>
     <script>
-      System.import('app').catch(function(err){ console.error(err);  });
+      System.import('app').catch(function(err){ console.error(err); });
     </script>
     <script>
     System.import('app/1-2-hybrid-bootstrap/app.module')
diff --git a/public/docs/_examples/upgrade-adapter/ts/index-1-2-hybrid-shared-adapter-bootstrap.html b/public/docs/_examples/upgrade-adapter/ts/index-1-2-hybrid-shared-adapter-bootstrap.html
index 56854b73ea..14dfb6ebb4 100644
--- a/public/docs/_examples/upgrade-adapter/ts/index-1-2-hybrid-shared-adapter-bootstrap.html
+++ b/public/docs/_examples/upgrade-adapter/ts/index-1-2-hybrid-shared-adapter-bootstrap.html
@@ -17,7 +17,7 @@
 
     <script src="systemjs.config.js"></script>
     <script>
-      System.import('app').catch(function(err){ console.error(err);  });
+      System.import('app').catch(function(err){ console.error(err); });
     </script>
     <script>
       System.import('app/1-2-hybrid-shared-adapter-bootstrap/app.module')
diff --git a/public/docs/_examples/upgrade-adapter/ts/index-1-to-2-projection.html b/public/docs/_examples/upgrade-adapter/ts/index-1-to-2-projection.html
index 6023111974..03299b89e3 100644
--- a/public/docs/_examples/upgrade-adapter/ts/index-1-to-2-projection.html
+++ b/public/docs/_examples/upgrade-adapter/ts/index-1-to-2-projection.html
@@ -17,7 +17,7 @@
 
     <script src="systemjs.config.js"></script>
     <script>
-      System.import('app').catch(function(err){ console.error(err);  });
+      System.import('app').catch(function(err){ console.error(err); });
     </script>
     <script>
       System.import('app/1-to-2-projection/app.module')
diff --git a/public/docs/_examples/upgrade-adapter/ts/index-1-to-2-providers.html b/public/docs/_examples/upgrade-adapter/ts/index-1-to-2-providers.html
index bf21cdfb5a..266b8af6a0 100644
--- a/public/docs/_examples/upgrade-adapter/ts/index-1-to-2-providers.html
+++ b/public/docs/_examples/upgrade-adapter/ts/index-1-to-2-providers.html
@@ -17,7 +17,7 @@
 
     <script src="systemjs.config.js"></script>
     <script>
-      System.import('app').catch(function(err){ console.error(err);  });
+      System.import('app').catch(function(err){ console.error(err); });
     </script>
     <script>
       System.import('app/1-to-2-providers/app.module')
diff --git a/public/docs/_examples/upgrade-adapter/ts/index-2-to-1-providers.html b/public/docs/_examples/upgrade-adapter/ts/index-2-to-1-providers.html
index f135dfa0af..9ddd676460 100644
--- a/public/docs/_examples/upgrade-adapter/ts/index-2-to-1-providers.html
+++ b/public/docs/_examples/upgrade-adapter/ts/index-2-to-1-providers.html
@@ -17,7 +17,7 @@
 
     <script src="systemjs.config.js"></script>
     <script>
-      System.import('app').catch(function(err){ console.error(err);  });
+      System.import('app').catch(function(err){ console.error(err); });
     </script>
     <script>
       System.import('app/2-to-1-providers/app.module')
diff --git a/public/docs/_examples/upgrade-adapter/ts/index-2-to-1-transclusion.html b/public/docs/_examples/upgrade-adapter/ts/index-2-to-1-transclusion.html
index 75b5c90870..5f1a4de61c 100644
--- a/public/docs/_examples/upgrade-adapter/ts/index-2-to-1-transclusion.html
+++ b/public/docs/_examples/upgrade-adapter/ts/index-2-to-1-transclusion.html
@@ -17,7 +17,7 @@
 
     <script src="systemjs.config.js"></script>
     <script>
-      System.import('app').catch(function(err){ console.error(err);  });
+      System.import('app').catch(function(err){ console.error(err); });
     </script>
     <script>
       System.import('app/2-to-1-transclusion/app.module')
diff --git a/public/docs/_examples/upgrade-adapter/ts/index-downgrade-io.html b/public/docs/_examples/upgrade-adapter/ts/index-downgrade-io.html
index 2a9041d6c1..86544b0587 100644
--- a/public/docs/_examples/upgrade-adapter/ts/index-downgrade-io.html
+++ b/public/docs/_examples/upgrade-adapter/ts/index-downgrade-io.html
@@ -17,7 +17,7 @@
 
     <script src="systemjs.config.js"></script>
     <script>
-      System.import('app').catch(function(err){ console.error(err);  });
+      System.import('app').catch(function(err){ console.error(err); });
     </script>
     <script>
       System.import('app/downgrade-io/app.module')
diff --git a/public/docs/_examples/upgrade-adapter/ts/index-downgrade-static.html b/public/docs/_examples/upgrade-adapter/ts/index-downgrade-static.html
index 9da49f5699..5193b95c5f 100644
--- a/public/docs/_examples/upgrade-adapter/ts/index-downgrade-static.html
+++ b/public/docs/_examples/upgrade-adapter/ts/index-downgrade-static.html
@@ -17,7 +17,7 @@
 
     <script src="systemjs.config.js"></script>
     <script>
-      System.import('app').catch(function(err){ console.error(err);  });
+      System.import('app').catch(function(err){ console.error(err); });
     </script>
     <script>
       System.import('app/downgrade-static/app.module')
diff --git a/public/docs/_examples/upgrade-adapter/ts/index-upgrade-io.html b/public/docs/_examples/upgrade-adapter/ts/index-upgrade-io.html
index dd8a9aa57f..345cdbeaa6 100644
--- a/public/docs/_examples/upgrade-adapter/ts/index-upgrade-io.html
+++ b/public/docs/_examples/upgrade-adapter/ts/index-upgrade-io.html
@@ -17,7 +17,7 @@
 
     <script src="systemjs.config.js"></script>
     <script>
-      System.import('app').catch(function(err){ console.error(err);  });
+      System.import('app').catch(function(err){ console.error(err); });
     </script>
     <script>
       System.import('app/upgrade-io/app.module')
diff --git a/public/docs/_examples/upgrade-adapter/ts/index-upgrade-static.html b/public/docs/_examples/upgrade-adapter/ts/index-upgrade-static.html
index 649dba8588..3d60cbbff2 100644
--- a/public/docs/_examples/upgrade-adapter/ts/index-upgrade-static.html
+++ b/public/docs/_examples/upgrade-adapter/ts/index-upgrade-static.html
@@ -17,7 +17,7 @@
 
     <script src="systemjs.config.js"></script>
     <script>
-      System.import('app').catch(function(err){ console.error(err);  });
+      System.import('app').catch(function(err){ console.error(err); });
     </script>
     <script>
       System.import('app/upgrade-static/app.module')
diff --git a/public/docs/_examples/upgrade-phonecat/ts/ng2_components/package.1.json b/public/docs/_examples/upgrade-phonecat/ts/ng2_components/package.1.json
index 501da397e3..8b44d8c13c 100644
--- a/public/docs/_examples/upgrade-phonecat/ts/ng2_components/package.1.json
+++ b/public/docs/_examples/upgrade-phonecat/ts/ng2_components/package.1.json
@@ -16,7 +16,7 @@
     "@angular/router-deprecated":  "2.0.0-rc.1",
     "@angular/upgrade":  "2.0.0-rc.1",
 
-    "es6-shim": "^0.35.0",
+    "core-js": "^2.4.0",
     "reflect-metadata": "0.1.3",
     "rxjs": "5.0.0-beta.6",
     "zone.js": "0.6.12",
diff --git a/public/docs/_examples/upgrade-phonecat/ts/ng2_components/test/karma.conf.1.js b/public/docs/_examples/upgrade-phonecat/ts/ng2_components/test/karma.conf.1.js
index 286c590940..82ad80971b 100644
--- a/public/docs/_examples/upgrade-phonecat/ts/ng2_components/test/karma.conf.1.js
+++ b/public/docs/_examples/upgrade-phonecat/ts/ng2_components/test/karma.conf.1.js
@@ -12,7 +12,7 @@ module.exports = function(config){
       'app/bower_components/angular-animate/angular-animate.js',
       'app/bower_components/angular-mocks/angular-mocks.js',
       'node_modules/systemjs/dist/system-polyfills.js',
-      'node_modules/es6-shim/es6-shim.js',
+      'node_modules/core-js/client/shim.min.js',
       'node_modules/zone.js/dist/zone.js',
       'node_modules/reflect-metadata/Reflect.js',
       'node_modules/systemjs/dist/system.src.js',
diff --git a/public/docs/_examples/upgrade-phonecat/ts/ng2_final/package.1.json b/public/docs/_examples/upgrade-phonecat/ts/ng2_final/package.1.json
index 0f07a065d2..6dcaa62cbd 100644
--- a/public/docs/_examples/upgrade-phonecat/ts/ng2_final/package.1.json
+++ b/public/docs/_examples/upgrade-phonecat/ts/ng2_final/package.1.json
@@ -16,7 +16,7 @@
     "@angular/router-deprecated":  "2.0.0-rc.1",
     "@angular/upgrade":  "2.0.0-rc.1",
 
-    "es6-shim": "^0.35.0",
+    "core-js": "^2.4.0",
     "reflect-metadata": "0.1.3",
     "rxjs": "5.0.0-beta.6",
     "zone.js": "0.6.12",
diff --git a/public/docs/_examples/upgrade-phonecat/ts/ng2_final/test/karma.conf.1.js b/public/docs/_examples/upgrade-phonecat/ts/ng2_final/test/karma.conf.1.js
index 6ca5c40183..2a616cf55d 100644
--- a/public/docs/_examples/upgrade-phonecat/ts/ng2_final/test/karma.conf.1.js
+++ b/public/docs/_examples/upgrade-phonecat/ts/ng2_final/test/karma.conf.1.js
@@ -6,7 +6,7 @@ module.exports = function(config){
 
     files : [
       'node_modules/systemjs/dist/system-polyfills.js',
-      'node_modules/es6-shim/es6-shim.js',
+      'node_modules/core-js/client/shim.min.js',
       'node_modules/zone.js/dist/zone.js',
       'node_modules/reflect-metadata/Reflect.js',
       'node_modules/systemjs/dist/system.src.js',
diff --git a/public/docs/_examples/upgrade-phonecat/ts/ng2_initial/package.1.json b/public/docs/_examples/upgrade-phonecat/ts/ng2_initial/package.1.json
index 501da397e3..8b44d8c13c 100644
--- a/public/docs/_examples/upgrade-phonecat/ts/ng2_initial/package.1.json
+++ b/public/docs/_examples/upgrade-phonecat/ts/ng2_initial/package.1.json
@@ -16,7 +16,7 @@
     "@angular/router-deprecated":  "2.0.0-rc.1",
     "@angular/upgrade":  "2.0.0-rc.1",
 
-    "es6-shim": "^0.35.0",
+    "core-js": "^2.4.0",
     "reflect-metadata": "0.1.3",
     "rxjs": "5.0.0-beta.6",
     "zone.js": "0.6.12",
diff --git a/public/docs/_examples/upgrade-phonecat/ts/ng2_initial/test/karma.conf.1.js b/public/docs/_examples/upgrade-phonecat/ts/ng2_initial/test/karma.conf.1.js
index a03d582323..f4db40c3ab 100644
--- a/public/docs/_examples/upgrade-phonecat/ts/ng2_initial/test/karma.conf.1.js
+++ b/public/docs/_examples/upgrade-phonecat/ts/ng2_initial/test/karma.conf.1.js
@@ -14,7 +14,7 @@ module.exports = function(config){
       'node_modules/systemjs/dist/system-polyfills.js',
       'node_modules/systemjs/dist/system.src.js',
       // #docregion ng2
-      'node_modules/es6-shim/es6-shim.js',
+      'node_modules/core-js/client/shim.min.js',
       'node_modules/zone.js/dist/zone.js',
       'node_modules/reflect-metadata/Reflect.js',
       {pattern: 'node_modules/rxjs/**/*.js', included: false, watched: false},
diff --git a/public/docs/_examples/wallaby.js b/public/docs/_examples/wallaby.js
index 2f8c4371bc..7da9b779dd 100644
--- a/public/docs/_examples/wallaby.js
+++ b/public/docs/_examples/wallaby.js
@@ -10,7 +10,7 @@ module.exports = function () {
       {pattern: 'node_modules/systemjs/dist/system.js', instrument: false},
 
       // Polyfills
-      {pattern: 'node_modules/es6-shim/es6-shim.js', instrument: false},
+      {pattern: 'node_modules/code-js/client/shim.min.js', instrument: false},
       {pattern: 'node_modules/angular2/bundles/angular2-polyfills.js', instrument: false},
 
       // Zone.js dependencies
diff --git a/public/docs/ts/latest/guide/typescript-configuration.jade b/public/docs/ts/latest/guide/typescript-configuration.jade
index ad83e66967..affa2b2928 100644
--- a/public/docs/ts/latest/guide/typescript-configuration.jade
+++ b/public/docs/ts/latest/guide/typescript-configuration.jade
@@ -97,7 +97,7 @@ a(id="typings")
 :marked
   We identified three *typings* file in the QuickStart, the *d.ts* files for
   
-  * [es6-shim](https://github.com/paulmillr/es6-shim/blob/master/README.md)
+  * [core-js](https://github.com/zloirock/core-js/blob/master/README.md)
   that brings ES2015/ES6 capabilities to our ES5 browsers
   
   * [jasmine](http://jasmine.github.io/) typings for the Jasmine test framework
@@ -145,7 +145,7 @@ code-example(format="").
     .children
       .file ambient
         .children
-          .file es6-shim
+          .file core-js
           .children
             .file index.d.ts
           .file ...
@@ -155,7 +155,7 @@ code-example(format="").
     .children
       .file ambient
         .children
-          .file es6-shim
+          .file core-js
           .children
             .file index.d.ts
           .file ...            
@@ -163,7 +163,7 @@ code-example(format="").
      .file browser.d.ts
      .file main.d.ts
 :marked
-  The `es6-shim` typings are duplicated and the `browser.d.ts` and `main.d.ts` have overlapping content.
+  The `core-js` typings are duplicated and the `browser.d.ts` and `main.d.ts` have overlapping content.
   
   We must tell the compiler to ignore one or the other. 
   We removed the `main` set from consideration in the `exclude` section of our `tsconfig.json` file:
diff --git a/public/docs/ts/latest/quickstart.jade b/public/docs/ts/latest/quickstart.jade
index 346793f9c3..eb47c58e04 100644
--- a/public/docs/ts/latest/quickstart.jade
+++ b/public/docs/ts/latest/quickstart.jade
@@ -362,7 +362,7 @@ h2#index Step 4: Add #[code index.html]
       We loaded the following scripts
     +makeExcerpt('index.html', 'libraries')
     :marked
-      We begin with core-js's es6-shim which monkey patches the global context (window) with essential features of ES2015 (ES6).
+      We begin with `core-js`'s ES2015/ES6 shim which monkey patches the global context (window) with essential features of ES2015 (ES6).
       Next are the polyfills for Angular2, `zone.js` and `reflect-metadata`.
       Then the [SystemJS](#systemjs) library for module loading.
 
diff --git a/tools/plunker-builder/indexHtmlTranslator.js b/tools/plunker-builder/indexHtmlTranslator.js
index 98e184dada..321cadf915 100644
--- a/tools/plunker-builder/indexHtmlTranslator.js
+++ b/tools/plunker-builder/indexHtmlTranslator.js
@@ -33,15 +33,10 @@ var _rxData = [
   {
     pattern: 'basehref',
   },
-  {
-    pattern: 'script',
-    from: 'node_modules/es6-shim/es6-shim.min.js',
-    to:   'https://npmcdn.com/es6-shim@0.35.0/es6-shim.min.js'
-  },
   {
     pattern: 'script',
     from: 'node_modules/core-js/client/shim.min.js',
-    to:   'https://npmcdn.com/core-js@2.4.0/client/shim.min.js'
+    to:   'https://npmcdn.com/core-js/client/shim.min.js'
   },
   {
     pattern: 'script',