diff --git a/gulpfile.js b/gulpfile.js
index c65276755a..e61ba8076e 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -1176,10 +1176,12 @@ gulp.task('!bundles.js.umd', ['build.js.dev'], function() {
   }
 
   return q.all([
-    webpack(webPackConf([__dirname + '/tools/build/webpack/angular2.umd.js'], 'angular2', 'dev')),
-    webpack(webPackConf([__dirname + '/tools/build/webpack/angular2.umd.js'], 'angular2', 'prod')),
-    webpack(webPackConf([__dirname + '/tools/build/webpack/angular2-testing.umd.js'],
-                        'angular2-testing', 'dev'))
+    webpack(webPackConf([__dirname + '/tools/build/webpack/angular2-all.umd.js'], 'angular2-all',
+                        'dev')),
+    webpack(webPackConf([__dirname + '/tools/build/webpack/angular2-all.umd.js'], 'angular2-all',
+                        'prod')),
+    webpack(webPackConf([__dirname + '/tools/build/webpack/angular2-all-testing.umd.js'],
+                        'angular2-all-testing', 'dev'))
   ]);
 });
 
@@ -1188,7 +1190,7 @@ gulp.task('bundles.js.umd.min', ['!bundles.js.umd', '!bundle.ng.polyfills'], fun
   var uglify = require('gulp-uglify');
 
   // minify production bundles
-  return gulp.src(['dist/js/bundle/angular2-polyfills.js', 'dist/js/bundle/angular2.umd.js'])
+  return gulp.src(['dist/js/bundle/angular2-polyfills.js', 'dist/js/bundle/angular2-all.umd.js'])
       .pipe(uglify())
       .pipe(rename({extname: '.min.js'}))
       .pipe(gulp.dest('dist/js/bundle'));
diff --git a/modules/angular2/docs/bundles/overview.md b/modules/angular2/docs/bundles/overview.md
index 6c36cc97d8..25dd4b9d46 100644
--- a/modules/angular2/docs/bundles/overview.md
+++ b/modules/angular2/docs/bundles/overview.md
@@ -29,10 +29,10 @@ ES5 users and AngularJS 1.x users interested in the `ngUpgrade` path can take ad
 
 filename    | list of barrels   | dev/prod | minified? 
 ------------|-------------------|----------|-------------|--------------|-------------
-`angular2.umd.js` | `angular2/core`, `angular2/common`, `angular2/compiler`, `angular2/platform/browser`, `angular2/platform/common_dom`, `angular2/http`, `angular2/router`, `angular2/instrumentation`, `angular2/upgrade`| prod | no
-`angular2.umd.min.js` | `angular2/core`, `angular2/common`, `angular2/compiler`, `angular2/platform/browser`, `angular2/platform/common_dom`, `angular2/http`, `angular2/router`, `angular2/instrumentation`, `angular2/upgrade` | prod | yes
-`angular2.umd.dev.js` | `angular2/core`, `angular2/common`, `angular2/compiler`, `angular2/platform/browser`, `angular2/platform/common_dom`, `angular2/http`, `angular2/router`, `angular2/instrumentation`, `angular2/upgrade` | dev | no
-`angular2-testing.umd.dev.js` | `angular2/core`, `angular2/common`, `angular2/compiler`, `angular2/platform/browser`, `angular2/platform/common_dom`, `angular2/http`, `angular2/router`, `angular2/instrumentation`, `angular2/upgrade`, `angular2/testing`, `angular2/http/testing`, `angular2/router/testing` | dev | no
+`angular2-all.umd.js` | `angular2/core`, `angular2/common`, `angular2/compiler`, `angular2/platform/browser`, `angular2/platform/common_dom`, `angular2/http`, `angular2/router`, `angular2/instrumentation`, `angular2/upgrade`| prod | no
+`angular2-all.umd.min.js` | `angular2/core`, `angular2/common`, `angular2/compiler`, `angular2/platform/browser`, `angular2/platform/common_dom`, `angular2/http`, `angular2/router`, `angular2/instrumentation`, `angular2/upgrade` | prod | yes
+`angular2-all.umd.dev.js` | `angular2/core`, `angular2/common`, `angular2/compiler`, `angular2/platform/browser`, `angular2/platform/common_dom`, `angular2/http`, `angular2/router`, `angular2/instrumentation`, `angular2/upgrade` | dev | no
+`angular2-all-testing.umd.dev.js` | `angular2/core`, `angular2/common`, `angular2/compiler`, `angular2/platform/browser`, `angular2/platform/common_dom`, `angular2/http`, `angular2/router`, `angular2/instrumentation`, `angular2/upgrade`, `angular2/testing`, `angular2/http/testing`, `angular2/router/testing` | dev | no
 
 **Warning**: bundles in the `UMD` format are _not_ "additive". A single application should use only one bundle from the above list.
 
diff --git a/tools/build/webpack/angular2-testing.umd.js b/tools/build/webpack/angular2-all-testing.umd.js
similarity index 91%
rename from tools/build/webpack/angular2-testing.umd.js
rename to tools/build/webpack/angular2-all-testing.umd.js
index d1a2388c70..fad83ecb24 100644
--- a/tools/build/webpack/angular2-testing.umd.js
+++ b/tools/build/webpack/angular2-all-testing.umd.js
@@ -12,7 +12,7 @@ exports.router = require('angular2/router');
 exports.router_link_dsl = require('angular2/router/router_link_dsl.js');
 exports.instrumentation = require('angular2/instrumentation');
 exports.upgrade = require('angular2/upgrade');
-// this is the only difference as compared to the angular2.umd.js bundle
+// this is the only difference as compared to the angular2-all.umd.js bundle
 exports.testing = require('angular2/testing');
 exports.http.testing = require('angular2/http/testing');
 exports.router.testing = require('angular2/router/testing');
diff --git a/tools/build/webpack/angular2.umd.js b/tools/build/webpack/angular2-all.umd.js
similarity index 100%
rename from tools/build/webpack/angular2.umd.js
rename to tools/build/webpack/angular2-all.umd.js