diff --git a/build.sh b/build.sh
index cbd8ae7977..9690b0ddcd 100755
--- a/build.sh
+++ b/build.sh
@@ -452,7 +452,9 @@ do
   OUT_DIR_ESM5=${ROOT_OUT_DIR}/${PACKAGE}/esm5
   NPM_DIR=${PWD}/dist/packages-dist/${PACKAGE}
   ESM2015_DIR=${NPM_DIR}/esm2015
+  FESM2015_DIR=${NPM_DIR}/fesm2015
   ESM5_DIR=${NPM_DIR}/esm5
+  FESM5_DIR=${NPM_DIR}/fesm5
   BUNDLES_DIR=${NPM_DIR}/bundles
 
   LICENSE_BANNER=${ROOT_DIR}/license-banner.txt
@@ -474,12 +476,16 @@ do
 
       (
         cd  ${SRC_DIR}
+        echo "======         Copy ESM2015 for ${PACKAGE}"
+        rsync -a --exclude="locale/**" --exclude="**/*.d.ts" --exclude="**/*.metadata.json" ${OUT_DIR}/ ${ESM2015_DIR}
+
         echo "======         Rollup ${PACKAGE}"
-        rollupIndex ${OUT_DIR} ${ESM2015_DIR} ${PACKAGE}
+        rollupIndex ${OUT_DIR} ${FESM2015_DIR} ${PACKAGE}
 
         echo "======         Produce ESM5 version"
         compilePackageES5 ${SRC_DIR} ${OUT_DIR_ESM5} ${PACKAGE}
-        rollupIndex ${OUT_DIR_ESM5} ${ESM5_DIR} ${PACKAGE}
+        rsync -a --exclude="locale/**" --exclude="**/*.d.ts" --exclude="**/*.metadata.json" ${OUT_DIR_ESM5}/ ${ESM5_DIR}
+        rollupIndex ${OUT_DIR_ESM5} ${FESM5_DIR} ${PACKAGE}
 
         echo "======         Run rollup conversions on ${PACKAGE}"
         runRollup ${SRC_DIR}
diff --git a/integration/_payload-limits.json b/integration/_payload-limits.json
index 9b651c3449..1d1237323d 100644
--- a/integration/_payload-limits.json
+++ b/integration/_payload-limits.json
@@ -2,9 +2,9 @@
   "cli-hello-world": {
     "master": {
       "uncompressed": {
-        "inline": 1447,
-        "main": 157654,
-        "polyfills": 59179
+        "inline": 1508,
+        "main": 156641,
+        "polyfills": 59483
       }
     }
   },
diff --git a/integration/cli-hello-world/package.json b/integration/cli-hello-world/package.json
index 9dfe9c205a..df910112c6 100644
--- a/integration/cli-hello-world/package.json
+++ b/integration/cli-hello-world/package.json
@@ -10,7 +10,7 @@
     "lint": "ng lint",
     "e2e": "ng e2e",
     "postinstall": "patch for https://github.com/angular/devkit/pull/524",
-    "postinstall": "sed -i.bak  's/]esm5/]f?esm5/' node_modules/@angular-devkit/build-optimizer/src/build-optimizer/build-ptimizer.js"
+    "postinstall": "sed -i.bak  's/]esm5/]f?esm5/' node_modules/@angular-devkit/build-optimizer/src/build-optimizer/build-optimizer.js"
   },
   "private": true,
   "dependencies": {
diff --git a/integration/hello_world__closure/closure.conf b/integration/hello_world__closure/closure.conf
index 7b1bc3c136..e71da5613f 100644
--- a/integration/hello_world__closure/closure.conf
+++ b/integration/hello_world__closure/closure.conf
@@ -16,14 +16,14 @@ node_modules/zone.js/dist/zone_externs.js
 --js node_modules/rxjs/**.js
 
 --js node_modules/@angular/core/package.json
---js node_modules/@angular/core/esm2015/core.js
+--js node_modules/@angular/core/fesm2015/core.js
 --js node_modules/@angular/core/src/testability/testability.externs.js
 
 --js node_modules/@angular/common/package.json
---js node_modules/@angular/common/esm2015/common.js
+--js node_modules/@angular/common/fesm2015/common.js
 
 --js node_modules/@angular/platform-browser/package.json
---js node_modules/@angular/platform-browser/esm2015/platform-browser.js
+--js node_modules/@angular/platform-browser/fesm2015/platform-browser.js
 
 --module_resolution=node
 --package_json_entry_names es2015
diff --git a/integration/i18n/closure.conf b/integration/i18n/closure.conf
index db6b8a772e..89c0cd7732 100644
--- a/integration/i18n/closure.conf
+++ b/integration/i18n/closure.conf
@@ -18,14 +18,14 @@ node_modules/zone.js/dist/zone_externs.js
 --package_json_entry_names es2015
 
 --js node_modules/@angular/core/package.json
---js node_modules/@angular/core/esm2015/core.js
+--js node_modules/@angular/core/fesm2015/core.js
 --js node_modules/@angular/core/src/testability/testability.externs.js
 
 --js node_modules/@angular/common/package.json
---js node_modules/@angular/common/esm2015/common.js
+--js node_modules/@angular/common/fesm2015/common.js
 
 --js node_modules/@angular/platform-browser/package.json
---js node_modules/@angular/platform-browser/esm2015/platform-browser.js
+--js node_modules/@angular/platform-browser/fesm2015/platform-browser.js
 
 --js built/**.js
 --entry_point=built/src/main
diff --git a/packages/animations/browser/package.json b/packages/animations/browser/package.json
index ecf1219d1b..de0a720c49 100644
--- a/packages/animations/browser/package.json
+++ b/packages/animations/browser/package.json
@@ -2,7 +2,11 @@
   "name": "@angular/animations/browser",
   "typings": "./browser.d.ts",
   "main": "../bundles/animations-browser.umd.js",
-  "module": "../esm5/browser.js",
-  "es2015": "../esm2015/browser.js",
+  "module": "../fesm5/browser.js",
+  "es2015": "../fesm2015/browser/browser.js",
+  "esm5": "../esm5/browser/browser.js",
+  "esm2015": "../esm2015/browser/browser.js",
+  "fesm5": "../fesm5/browser.js",
+  "fesm2015": "../fesm2015/browser.js",
   "sideEffects": false
 }
diff --git a/packages/animations/browser/rollup.config.js b/packages/animations/browser/rollup.config.js
index 019d1c62cd..3ffb6d5a6a 100644
--- a/packages/animations/browser/rollup.config.js
+++ b/packages/animations/browser/rollup.config.js
@@ -16,7 +16,7 @@ const globals = {
 };
 
 module.exports = {
-  entry: '../../../dist/packages-dist/animations/esm5/browser.js',
+  entry: '../../../dist/packages-dist/animations/fesm5/browser.js',
   dest: '../../../dist/packages-dist/animations/bundles/animations-browser.umd.js',
   format: 'umd',
   exports: 'named',
diff --git a/packages/animations/browser/testing/package.json b/packages/animations/browser/testing/package.json
index 78ab3c2f2d..44e87ea5c7 100644
--- a/packages/animations/browser/testing/package.json
+++ b/packages/animations/browser/testing/package.json
@@ -2,6 +2,10 @@
   "name": "@angular/animations/browser/testing",
   "typings": "./testing.d.ts",
   "main": "../../bundles/platform-browser-animations-testing.umd.js",
-  "module": "../../esm5/animations/testing.js",
-  "es2015": "../../esm2015/animations/testing.js"
+  "module": "../../fesm5/animations/testing.js",
+  "es2015": "../../fesm2015/animations/testing.js",
+  "esm5": "../../esm5/animations/testing.js",
+  "esm2015": "../../esm2015/animations/testing.js",
+  "fesm5": "../../fesm5/animations/testing.js",
+  "fesm2015": "../../fesm2015/animations/testing.js"
 }
diff --git a/packages/animations/browser/testing/rollup.config.js b/packages/animations/browser/testing/rollup.config.js
index a0d9187840..fd07726cd8 100644
--- a/packages/animations/browser/testing/rollup.config.js
+++ b/packages/animations/browser/testing/rollup.config.js
@@ -18,7 +18,7 @@ const globals = {
 };
 
 module.exports = {
-  entry: '../../../../dist/packages-dist/animations/esm5/browser/testing.js',
+  entry: '../../../../dist/packages-dist/animations/fesm5/browser/testing.js',
   dest: '../../../../dist/packages-dist/animations/bundles/animations-browser-testing.umd.js',
   format: 'umd',
   exports: 'named',
diff --git a/packages/animations/package.json b/packages/animations/package.json
index 67c5937ec2..8cadce486f 100644
--- a/packages/animations/package.json
+++ b/packages/animations/package.json
@@ -3,8 +3,12 @@
   "version": "0.0.0-PLACEHOLDER",
   "description": "Angular - animations integration with web-animationss",
   "main": "./bundles/animations.umd.js",
-  "module": "./esm5/animations.js",
-  "es2015": "./esm2015/animations.js",
+  "module": "./fesm5/animations.js",
+  "es2015": "./fesm2015/animations.js",
+  "esm5": "./esm5/animations.js",
+  "esm2015": "./esm2015/animations.js",
+  "fesm5": "./fesm5/animations.js",
+  "fesm2015": "./fesm2015/animations.js",
   "typings": "./animations.d.ts",
   "author": "angular",
   "license": "MIT",
diff --git a/packages/animations/rollup.config.js b/packages/animations/rollup.config.js
index 4a3f63967d..74facf9618 100644
--- a/packages/animations/rollup.config.js
+++ b/packages/animations/rollup.config.js
@@ -17,7 +17,7 @@ const globals = {
 };
 
 module.exports = {
-  entry: '../../dist/packages-dist/animations/esm5/animations.js',
+  entry: '../../dist/packages-dist/animations/fesm5/animations.js',
   dest: '../../dist/packages-dist/animations/bundles/animations.umd.js',
   format: 'umd',
   exports: 'named',
diff --git a/packages/common/http/package.json b/packages/common/http/package.json
index 0489daf013..1fcf26c686 100644
--- a/packages/common/http/package.json
+++ b/packages/common/http/package.json
@@ -2,7 +2,11 @@
   "name": "@angular/common/http",
   "typings": "./http.d.ts",
   "main": "../bundles/common-http.umd.js",
-  "module": "../esm5/http.js",
-  "es2015": "../esm2015/http.js",
+  "module": "../fesm5/http.js",
+  "es2015": "../fesm2015/http/http.js",
+  "esm5": "../esm5/http/http.js",
+  "esm2015": "../esm2015/http/http.js",
+  "fesm5": "../fesm5/http.js",
+  "fesm2015": "../fesm2015/http.js",
   "sideEffects": false
 }
diff --git a/packages/common/http/rollup.config.js b/packages/common/http/rollup.config.js
index 2a6a89cf88..3fca396dc2 100644
--- a/packages/common/http/rollup.config.js
+++ b/packages/common/http/rollup.config.js
@@ -22,7 +22,7 @@ const globals = {
 };
 
 module.exports = {
-  entry: '../../../dist/packages-dist/common/esm5/http.js',
+  entry: '../../../dist/packages-dist/common/fesm5/http.js',
   dest: '../../../dist/packages-dist/common/bundles/common-http.umd.js',
   format: 'umd',
   exports: 'named',
diff --git a/packages/common/http/testing/package.json b/packages/common/http/testing/package.json
index 4cac2fafac..4eb691bf3a 100644
--- a/packages/common/http/testing/package.json
+++ b/packages/common/http/testing/package.json
@@ -2,6 +2,10 @@
   "name": "@angular/common/http/testing",
   "typings": "./testing.d.ts",
   "main": "../../bundles/common-http-testing.umd.js",
-  "module": "../../esm5/http/testing.js",
-  "es2015": "../../esm2015/http/testing.js"
+  "module": "../../fesm5/http/testing.js",
+  "es2015": "../../fesm2015/http/testing.js",
+  "esm5": "../../esm5/http/testing.js",
+  "esm2015": "../../esm2015/http/testing.js",
+  "fesm5": "../../fesm5/http/testing.js",
+  "fesm2015": "../../fesm2015/http/testing.js"
 }
diff --git a/packages/common/http/testing/rollup.config.js b/packages/common/http/testing/rollup.config.js
index 00ce61eae5..a14bdda2f9 100644
--- a/packages/common/http/testing/rollup.config.js
+++ b/packages/common/http/testing/rollup.config.js
@@ -23,7 +23,7 @@ const globals = {
 };
 
 module.exports = {
-  entry: '../../../../dist/packages-dist/common/esm5/http/testing.js',
+  entry: '../../../../dist/packages-dist/common/fesm5/http/testing.js',
   dest: '../../../../dist/packages-dist/common/bundles/common-http-testing.umd.js',
   format: 'umd',
   exports: 'named',
diff --git a/packages/common/package.json b/packages/common/package.json
index 15f9a248a3..f7455482a5 100644
--- a/packages/common/package.json
+++ b/packages/common/package.json
@@ -3,8 +3,12 @@
   "version": "0.0.0-PLACEHOLDER",
   "description": "Angular - commonly needed directives and services",
   "main": "./bundles/common.umd.js",
-  "module": "./esm5/common.js",
-  "es2015": "./esm2015/common.js",
+  "module": "./fesm5/common.js",
+  "es2015": "./fesm2015/common.js",
+  "esm5": "./esm5/common.js",
+  "esm2015": "./esm2015/common.js",
+  "fesm5": "./fesm5/common.js",
+  "fesm2015": "./fesm2015/common.js",
   "typings": "./common.d.ts",
   "author": "angular",
   "license": "MIT",
diff --git a/packages/common/rollup.config.js b/packages/common/rollup.config.js
index 8fac9ce640..a8bac6f111 100644
--- a/packages/common/rollup.config.js
+++ b/packages/common/rollup.config.js
@@ -18,7 +18,7 @@ const globals = {
 };
 
 module.exports = {
-  entry: '../../dist/packages-dist/common/esm5/common.js',
+  entry: '../../dist/packages-dist/common/fesm5/common.js',
   dest: '../../dist/packages-dist/common/bundles/common.umd.js',
   format: 'umd',
   exports: 'named',
diff --git a/packages/common/testing/package.json b/packages/common/testing/package.json
index 0c22af255d..5efd08861c 100644
--- a/packages/common/testing/package.json
+++ b/packages/common/testing/package.json
@@ -2,6 +2,10 @@
   "name": "@angular/common/testing",
   "typings": "./testing.d.ts",
   "main": "../bundles/common-testing.umd.js",
-  "module": "../esm5/testing.js",
-  "es2015": "../esm2015/testing.js"
+  "module": "../fesm5/testing.js",
+  "es2015": "../fesm2015/testing/testing.js",
+  "esm5": "../esm5/testing/testing.js",
+  "esm2015": "../esm2015/testing/testing.js",
+  "fesm5": "../fesm5/testing.js",
+  "fesm2015": "../fesm2015/testing.js"
 }
diff --git a/packages/common/testing/rollup.config.js b/packages/common/testing/rollup.config.js
index cad6638ff5..d5ceec256e 100644
--- a/packages/common/testing/rollup.config.js
+++ b/packages/common/testing/rollup.config.js
@@ -18,7 +18,7 @@ const globals = {
 };
 
 module.exports = {
-  entry: '../../../dist/packages-dist/common/esm5/testing.js',
+  entry: '../../../dist/packages-dist/common/fesm5/testing.js',
   dest: '../../../dist/packages-dist/common/bundles/common-testing.umd.js',
   format: 'umd',
   exports: 'named',
diff --git a/packages/compiler/package.json b/packages/compiler/package.json
index 3ebb95d54e..bb7d8a1961 100644
--- a/packages/compiler/package.json
+++ b/packages/compiler/package.json
@@ -3,8 +3,12 @@
   "version": "0.0.0-PLACEHOLDER",
   "description": "Angular - the compiler library",
   "main": "./bundles/compiler.umd.js",
-  "module": "./esm5/compiler.js",
-  "es2015": "./esm2015/compiler.js",
+  "module": "./fesm5/compiler.js",
+  "es2015": "./fesm2015/compiler.js",
+  "esm5": "./esm5/compiler.js",
+  "esm2015": "./esm2015/compiler.js",
+  "fesm5": "./fesm5/compiler.js",
+  "fesm2015": "./fesm2015/compiler.js",
   "typings": "./compiler.d.ts",
   "author": "angular",
   "license": "MIT",
diff --git a/packages/compiler/rollup.config.js b/packages/compiler/rollup.config.js
index 9ee995b2ac..31a4a75c6d 100644
--- a/packages/compiler/rollup.config.js
+++ b/packages/compiler/rollup.config.js
@@ -16,7 +16,7 @@ const globals = {
 };
 
 module.exports = {
-  entry: '../../dist/packages-dist/compiler/esm5/compiler.js',
+  entry: '../../dist/packages-dist/compiler/fesm5/compiler.js',
   dest: '../../dist/packages-dist/compiler/bundles/compiler.umd.js',
   format: 'umd',
   exports: 'named',
diff --git a/packages/compiler/testing/package.json b/packages/compiler/testing/package.json
index 1ca17df62c..4064121bf6 100644
--- a/packages/compiler/testing/package.json
+++ b/packages/compiler/testing/package.json
@@ -2,6 +2,10 @@
   "name": "@angular/compiler/testing",
   "typings": "./testing.d.ts",
   "main": "../bundles/compiler-testing.umd.js",
-  "module": "../esm5/testing.js",
-  "es2015": "../esm2015/testing.js"
+  "module": "../fesm5/testing.js",
+  "es2015": "../fesm2015/testing/testing.js",
+  "esm5": "../esm5/testing/testing.js",
+  "esm2015": "../esm2015/testing/testing.js",
+  "fesm5": "../fesm5/testing.js",
+  "fesm2015": "../fesm2015/testing.js"
 }
diff --git a/packages/compiler/testing/rollup.config.js b/packages/compiler/testing/rollup.config.js
index 43b89f6e81..cb93c1a4fb 100644
--- a/packages/compiler/testing/rollup.config.js
+++ b/packages/compiler/testing/rollup.config.js
@@ -18,7 +18,7 @@ const globals = {
 };
 
 module.exports = {
-  entry: '../../../dist/packages-dist/compiler/esm5/testing.js',
+  entry: '../../../dist/packages-dist/compiler/fesm5/testing.js',
   dest: '../../../dist/packages-dist/compiler/bundles/compiler-testing.umd.js',
   format: 'umd',
   exports: 'named',
diff --git a/packages/core/package.json b/packages/core/package.json
index 7d10332ca3..e52f40d78b 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -3,8 +3,12 @@
   "version": "0.0.0-PLACEHOLDER",
   "description": "Angular - the core framework",
   "main": "./bundles/core.umd.js",
-  "module": "./esm5/core.js",
-  "es2015": "./esm2015/core.js",
+  "module": "./fesm5/core.js",
+  "es2015": "./fesm2015/core.js",
+  "esm5": "./esm5/core.js",
+  "esm2015": "./esm2015/core.js",
+  "fesm5": "./fesm5/core.js",
+  "fesm2015": "./fesm2015/core.js",
   "typings": "./core.d.ts",
   "author": "angular",
   "license": "MIT",
diff --git a/packages/core/rollup.config.js b/packages/core/rollup.config.js
index 35ee75f902..70a09e44d0 100644
--- a/packages/core/rollup.config.js
+++ b/packages/core/rollup.config.js
@@ -19,7 +19,7 @@ const globals = {
 };
 
 module.exports = {
-  entry: '../../dist/packages-dist/core/esm5/core.js',
+  entry: '../../dist/packages-dist/core/fesm5/core.js',
   dest: '../../dist/packages-dist/core/bundles/core.umd.js',
   format: 'umd',
   exports: 'named',
diff --git a/packages/core/testing/package.json b/packages/core/testing/package.json
index cb80445ac0..901fe793d4 100644
--- a/packages/core/testing/package.json
+++ b/packages/core/testing/package.json
@@ -2,6 +2,10 @@
   "name": "@angular/core/testing",
   "typings": "./testing.d.ts",
   "main": "../bundles/core-testing.umd.js",
-  "module": "../esm5/testing.js",
-  "es2015": "../esm2015/testing.js"
+  "module": "../fesm5/testing.js",
+  "es2015": "../fesm2015/testing/testing.js",
+  "esm5": "../esm5/testing/testing.js",
+  "esm2015": "../esm2015/testing/testing.js",
+  "fesm5": "../fesm5/testing.js",
+  "fesm2015": "../fesm2015/testing.js"
 }
diff --git a/packages/core/testing/rollup.config.js b/packages/core/testing/rollup.config.js
index 9443bae788..cf837981dc 100644
--- a/packages/core/testing/rollup.config.js
+++ b/packages/core/testing/rollup.config.js
@@ -16,7 +16,7 @@ const globals = {
 };
 
 module.exports = {
-  entry: '../../../dist/packages-dist/core/esm5/testing.js',
+  entry: '../../../dist/packages-dist/core/fesm5/testing.js',
   dest: '../../../dist/packages-dist/core/bundles/core-testing.umd.js',
   format: 'umd',
   exports: 'named',
diff --git a/packages/elements/package.json b/packages/elements/package.json
index beb341f34d..2674b778c0 100644
--- a/packages/elements/package.json
+++ b/packages/elements/package.json
@@ -3,8 +3,12 @@
   "version": "0.0.0-PLACEHOLDER",
   "description": "Angular - library for using Angular Components as Custom Elements",
   "main": "./bundles/elements.umd.js",
-  "module": "./esm5/elements.js",
-  "es2015": "./esm2015/elements.js",
+  "module": "./fesm5/elements.js",
+  "es2015": "./fesm2015/elements.js",
+  "esm5": "./esm5/elements.js",
+  "esm2015": "./esm2015/elements.js",
+  "fesm5": "../fesm5/testing.js",
+  "fesm2015": "../fesm2015/testing.js",
   "typings": "./elements.d.ts",
   "author": "angular",
   "license": "MIT",
diff --git a/packages/elements/rollup.config.js b/packages/elements/rollup.config.js
index 1aa8375c14..7d65049dcd 100644
--- a/packages/elements/rollup.config.js
+++ b/packages/elements/rollup.config.js
@@ -19,7 +19,7 @@ const globals = {
 };
 
 module.exports = {
-  entry: '../../dist/packages-dist/elements/esm5/elements.js',
+  entry: '../../dist/packages-dist/elements/fesm5/elements.js',
   dest: '../../dist/packages-dist/elements/bundles/elements.umd.js',
   format: 'umd',
   exports: 'named',
diff --git a/packages/forms/package.json b/packages/forms/package.json
index 84f1024e4c..da90b851cc 100644
--- a/packages/forms/package.json
+++ b/packages/forms/package.json
@@ -3,8 +3,12 @@
   "version": "0.0.0-PLACEHOLDER",
   "description": "Angular - directives and services for creating forms",
   "main": "./bundles/forms.umd.js",
-  "module": "./esm5/forms.js",
-  "es2015": "./esm2015/forms.js",
+  "module": "./fesm5/forms.js",
+  "es2015": "./fesm2015/forms.js",
+  "esm5": "./esm5/forms.js",
+  "esm2015": "./esm2015/forms.js",
+  "fesm5": "./fesm5/forms.js",
+  "fesm2015": "./fesm2015/forms.js",
   "typings": "./forms.d.ts",
   "author": "angular",
   "license": "MIT",
diff --git a/packages/forms/rollup.config.js b/packages/forms/rollup.config.js
index b57dcc50a0..8a2dd2543f 100644
--- a/packages/forms/rollup.config.js
+++ b/packages/forms/rollup.config.js
@@ -22,7 +22,7 @@ const globals = {
 };
 
 module.exports = {
-  entry: '../../dist/packages-dist/forms/esm5/forms.js',
+  entry: '../../dist/packages-dist/forms/fesm5/forms.js',
   dest: '../../dist/packages-dist/forms/bundles/forms.umd.js',
   format: 'umd',
   exports: 'named',
diff --git a/packages/http/package.json b/packages/http/package.json
index 033d6f21c4..46a157f3d2 100644
--- a/packages/http/package.json
+++ b/packages/http/package.json
@@ -3,8 +3,12 @@
   "version": "0.0.0-PLACEHOLDER",
   "description": "Angular - the http service",
   "main": "./bundles/http.umd.js",
-  "module": "./esm5/http.js",
-  "es2015": "./esm2015/http.js",
+  "module": "./fesm5/http.js",
+  "es2015": "./fesm2015/http.js",
+  "esm5": "./esm5/http.js",
+  "esm2015": "./esm2015/http.js",
+  "fesm5": "./fesm5/http.js",
+  "fesm2015": "./fesm2015/http.js",
   "typings": "./http.d.ts",
   "author": "angular",
   "license": "MIT",
diff --git a/packages/http/rollup.config.js b/packages/http/rollup.config.js
index ca9e1e22c7..8d78d34e6f 100644
--- a/packages/http/rollup.config.js
+++ b/packages/http/rollup.config.js
@@ -19,7 +19,7 @@ const globals = {
 };
 
 module.exports = {
-  entry: '../../dist/packages-dist/http/esm5/http.js',
+  entry: '../../dist/packages-dist/http/fesm5/http.js',
   dest: '../../dist/packages-dist/http/bundles/http.umd.js',
   format: 'umd',
   exports: 'named',
diff --git a/packages/http/testing/package.json b/packages/http/testing/package.json
index 30be866e5b..121dd490de 100644
--- a/packages/http/testing/package.json
+++ b/packages/http/testing/package.json
@@ -2,6 +2,10 @@
   "name": "@angular/http/testing",
   "typings": "./testing.d.ts",
   "main": "../bundles/http-testing.umd.js",
-  "module": "../esm5/testing.js",
-  "es2015": "../esm2015/testing.js"
+  "module": "../fesm5/testing.js",
+  "es2015": "../fesm2015/testing/testing.js",
+  "esm5": "../esm5/testing/testing.js",
+  "esm2015": "../esm2015/testing/testing.js",
+  "fesm5": "../fesm5/testing.js",
+  "fesm2015": "../fesm2015/testing.js"
 }
diff --git a/packages/http/testing/rollup.config.js b/packages/http/testing/rollup.config.js
index 71c3182c8e..b2a921f311 100644
--- a/packages/http/testing/rollup.config.js
+++ b/packages/http/testing/rollup.config.js
@@ -21,7 +21,7 @@ const globals = {
 };
 
 module.exports = {
-  entry: '../../../dist/packages-dist/http/esm5/testing.js',
+  entry: '../../../dist/packages-dist/http/fesm5/testing.js',
   dest: '../../../dist/packages-dist/http/bundles/http-testing.umd.js',
   format: 'umd',
   exports: 'named',
diff --git a/packages/language-service/package.json b/packages/language-service/package.json
index 27fd0ce4a9..06b29761e8 100644
--- a/packages/language-service/package.json
+++ b/packages/language-service/package.json
@@ -3,7 +3,7 @@
   "version": "0.0.0-PLACEHOLDER",
   "description": "Angular - language services",
   "main": "./bundles/language-service.umd.js",
-  "module": "./esm5/language-service.js",
+  "module": "./fesm5/language-service.js",
   "typings": "./language-service.d.ts",
   "author": "angular",
   "license": "MIT",
diff --git a/packages/language-service/rollup.config.js b/packages/language-service/rollup.config.js
index d561a23a55..011ea56e3f 100644
--- a/packages/language-service/rollup.config.js
+++ b/packages/language-service/rollup.config.js
@@ -32,7 +32,7 @@ function resolve(id, from) {
     var esm_suffix = esm_suffixes[packageName] || '';
     var loc = locations[packageName] || location;
     var r = loc !== location && (loc + esm_suffix + packageName + (match[3] || '/index') + '.js') ||
-        loc + packageName + '/esm5/' + packageName + '.js';
+        loc + packageName + '/fesm5/' + packageName + '.js';
     return r;
   }
   if (id && id.startsWith('rxjs/')) {
@@ -61,7 +61,7 @@ module.exports = function(provided) {
 `;
 
 module.exports = {
-  entry: '../../dist/packages-dist/language-service/esm5/language-service.js',
+  entry: '../../dist/packages-dist/language-service/fesm5/language-service.js',
   dest: '../../dist/packages-dist/language-service/bundles/language-service.umd.js',
   format: 'amd',
   amd: {
diff --git a/packages/platform-browser-dynamic/package.json b/packages/platform-browser-dynamic/package.json
index b22bcbbd98..bb057bf2c4 100644
--- a/packages/platform-browser-dynamic/package.json
+++ b/packages/platform-browser-dynamic/package.json
@@ -3,8 +3,12 @@
   "version": "0.0.0-PLACEHOLDER",
   "description": "Angular - library for using Angular in a web browser with JIT compilation",
   "main": "./bundles/platform-browser-dynamic.umd.js",
-  "module": "./esm5/platform-browser-dynamic.js",
-  "es2015": "./esm2015/platform-browser-dynamic.js",
+  "module": "./fesm5/platform-browser-dynamic.js",
+  "es2015": "./fesm2015/platform-browser-dynamic.js",
+  "esm5": "./esm5/platform-browser-dynamic.js",
+  "esm2015": "./esm2015/platform-browser-dynamic.js",
+  "fesm5": "./fesm5/platform-browser-dynamic.js",
+  "fesm2015": "./fesm2015/platform-browser-dynamic.js",
   "typings": "./platform-browser-dynamic.d.ts",
   "author": "angular",
   "license": "MIT",
diff --git a/packages/platform-browser-dynamic/rollup.config.js b/packages/platform-browser-dynamic/rollup.config.js
index c50a5f664c..7c7d2ae005 100644
--- a/packages/platform-browser-dynamic/rollup.config.js
+++ b/packages/platform-browser-dynamic/rollup.config.js
@@ -17,7 +17,7 @@ const globals = {
 };
 
 module.exports = {
-  entry: '../../dist/packages-dist/platform-browser-dynamic/esm5/platform-browser-dynamic.js',
+  entry: '../../dist/packages-dist/platform-browser-dynamic/fesm5/platform-browser-dynamic.js',
   dest: '../../dist/packages-dist/platform-browser-dynamic/bundles/platform-browser-dynamic.umd.js',
   format: 'umd',
   exports: 'named',
diff --git a/packages/platform-browser-dynamic/testing/package.json b/packages/platform-browser-dynamic/testing/package.json
index 7e2a4e1ae6..6ed154399e 100644
--- a/packages/platform-browser-dynamic/testing/package.json
+++ b/packages/platform-browser-dynamic/testing/package.json
@@ -2,6 +2,10 @@
   "name": "@angular/platform-browser-dynamic/testing",
   "typings": "./testing.d.ts",
   "main": "../bundles/platform-browser-dynamic-testing.umd.js",
-  "module": "../esm5/testing.js",
-  "es2015": "../esm2015/testing.js"
+  "module": "../fesm5/testing.js",
+  "es2015": "../fesm2015/testing/testing.js",
+  "esm5": "../esm5/testing/testing.js",
+  "esm2015": "../esm2015/testing/testing.js",
+  "fesm5": "../fesm5/testing.js",
+  "fesm2015": "../fesm2015/testing.js"
 }
diff --git a/packages/platform-browser-dynamic/testing/rollup.config.js b/packages/platform-browser-dynamic/testing/rollup.config.js
index c273beaeec..60e34047f4 100644
--- a/packages/platform-browser-dynamic/testing/rollup.config.js
+++ b/packages/platform-browser-dynamic/testing/rollup.config.js
@@ -21,7 +21,7 @@ const globals = {
 };
 
 module.exports = {
-  entry: '../../../dist/packages-dist/platform-browser-dynamic/esm5/testing.js',
+  entry: '../../../dist/packages-dist/platform-browser-dynamic/fesm5/testing.js',
   dest:
       '../../../dist/packages-dist/platform-browser-dynamic/bundles/platform-browser-dynamic-testing.umd.js',
   format: 'umd',
diff --git a/packages/platform-browser/animations/package.json b/packages/platform-browser/animations/package.json
index a9ba708df0..2f7ab859ab 100644
--- a/packages/platform-browser/animations/package.json
+++ b/packages/platform-browser/animations/package.json
@@ -2,7 +2,11 @@
   "name": "@angular/platform-browser/animations",
   "typings": "./animations.d.ts",
   "main": "../bundles/platform-browser-animations.umd.js",
-  "module": "../esm5/animations.js",
-  "es2015": "../esm2015/animations.js",
+  "module": "../fesm5/animations.js",
+  "es2015": "../fesm2015/animations/animations.js",
+  "esm5": "../esm5/animations/animations.js",
+  "esm2015": "../esm2015/animations/animations.js",
+  "fesm5": "../fesm5/animations.js",
+  "fesm2015": "../fesm2015/animations.js",
   "sideEffects": false
 }
diff --git a/packages/platform-browser/animations/rollup.config.js b/packages/platform-browser/animations/rollup.config.js
index f2dda0aaff..3faf536738 100644
--- a/packages/platform-browser/animations/rollup.config.js
+++ b/packages/platform-browser/animations/rollup.config.js
@@ -18,7 +18,7 @@ const globals = {
 };
 
 module.exports = {
-  entry: '../../../dist/packages-dist/platform-browser/esm5/animations.js',
+  entry: '../../../dist/packages-dist/platform-browser/fesm5/animations.js',
   dest: '../../../dist/packages-dist/platform-browser/bundles/platform-browser-animations.umd.js',
   format: 'umd',
   exports: 'named',
diff --git a/packages/platform-browser/package.json b/packages/platform-browser/package.json
index acd7061418..5af06e81b4 100644
--- a/packages/platform-browser/package.json
+++ b/packages/platform-browser/package.json
@@ -3,8 +3,12 @@
   "version": "0.0.0-PLACEHOLDER",
   "description": "Angular - library for using Angular in a web browser",
   "main": "./bundles/platform-browser.umd.js",
-  "module": "./esm5/platform-browser.js",
-  "es2015": "./esm2015/platform-browser.js",
+  "module": "./fesm5/platform-browser.js",
+  "es2015": "./fesm2015/platform-browser.js",
+  "esm5": "./esm5/platform-browser.js",
+  "esm2015": "./esm2015/platform-browser.js",
+  "fesm5": "./fesm5/platform-browser.js",
+  "fesm2015": "./fesm2015/platform-browser.js",
   "typings": "./platform-browser.d.ts",
   "author": "angular",
   "license": "MIT",
diff --git a/packages/platform-browser/rollup.config.js b/packages/platform-browser/rollup.config.js
index 95d5406e15..af01efe10f 100644
--- a/packages/platform-browser/rollup.config.js
+++ b/packages/platform-browser/rollup.config.js
@@ -15,7 +15,7 @@ const globals = {
 };
 
 module.exports = {
-  entry: '../../dist/packages-dist/platform-browser/esm5/platform-browser.js',
+  entry: '../../dist/packages-dist/platform-browser/fesm5/platform-browser.js',
   dest: '../../dist/packages-dist/platform-browser/bundles/platform-browser.umd.js',
   format: 'umd',
   exports: 'named',
diff --git a/packages/platform-browser/testing/package.json b/packages/platform-browser/testing/package.json
index 3b288588ed..794dff0c00 100644
--- a/packages/platform-browser/testing/package.json
+++ b/packages/platform-browser/testing/package.json
@@ -2,6 +2,10 @@
   "name": "@angular/platform-browser/testing",
   "typings": "./testing.d.ts",
   "main": "../bundles/platform-browser-testing.umd.js",
-  "module": "../esm5/testing.js",
-  "es2015": "../esm2015/testing.js"
+  "module": "../fesm5/testing.js",
+  "es2015": "../fesm2015/testing/testing.js",
+  "esm5": "../esm5/testing/testing.js",
+  "esm2015": "../esm2015/testing/testing.js",
+  "fesm5": "../fesm5/testing.js",
+  "fesm2015": "../fesm2015/testing.js"
 }
diff --git a/packages/platform-browser/testing/rollup.config.js b/packages/platform-browser/testing/rollup.config.js
index 208a912266..9409d2131c 100644
--- a/packages/platform-browser/testing/rollup.config.js
+++ b/packages/platform-browser/testing/rollup.config.js
@@ -16,7 +16,7 @@ const globals = {
 };
 
 module.exports = {
-  entry: '../../../dist/packages-dist/platform-browser/esm5/testing.js',
+  entry: '../../../dist/packages-dist/platform-browser/fesm5/testing.js',
   dest: '../../../dist/packages-dist/platform-browser/bundles/platform-browser-testing.umd.js',
   format: 'umd',
   exports: 'named',
diff --git a/packages/platform-server/package.json b/packages/platform-server/package.json
index f9a8b53162..f06178f06a 100644
--- a/packages/platform-server/package.json
+++ b/packages/platform-server/package.json
@@ -3,8 +3,12 @@
   "version": "0.0.0-PLACEHOLDER",
   "description": "Angular - library for using Angular in Node.js",
   "main": "./bundles/platform-server.umd.js",
-  "module": "./esm5/platform-server.js",
-  "es2015": "./esm2015/platform-server.js",
+  "module": "./fesm5/platform-server.js",
+  "es2015": "./fesm2015/platform-server.js",
+  "esm5": "./esm5/platform-server.js",
+  "esm2015": "./esm2015/platform-server.js",
+  "fesm5": "./fesm5/platform-server.js",
+  "fesm2015": "./fesm2015/platform-server.js",
   "typings": "./platform-server.d.ts",
   "author": "angular",
   "license": "MIT",
diff --git a/packages/platform-server/rollup.config.js b/packages/platform-server/rollup.config.js
index d27bf43ba3..a7939241bd 100644
--- a/packages/platform-server/rollup.config.js
+++ b/packages/platform-server/rollup.config.js
@@ -30,7 +30,7 @@ const globals = {
 };
 
 module.exports = {
-  entry: '../../dist/packages-dist/platform-server/esm5/platform-server.js',
+  entry: '../../dist/packages-dist/platform-server/fesm5/platform-server.js',
   dest: '../../dist/packages-dist/platform-server/bundles/platform-server.umd.js',
   format: 'umd',
   exports: 'named',
diff --git a/packages/platform-server/testing/package.json b/packages/platform-server/testing/package.json
index 62b1261183..bd74a173e9 100644
--- a/packages/platform-server/testing/package.json
+++ b/packages/platform-server/testing/package.json
@@ -2,6 +2,10 @@
   "name": "@angular/platform-server/testing",
   "typings": "./testing.d.ts",
   "main": "../bundles/platform-server-testing.umd.js",
-  "module": "../esm5/testing.js",
-  "es2015": "../esm2015/testing.js"
+  "module": "../fesm5/testing.js",
+  "es2015": "../fesm2015/testing/testing.js",
+  "esm5": "../esm5/testing/testing.js",
+  "esm2015": "../esm2015/testing/testing.js",
+  "fesm5": "../fesm5/testing.js",
+  "fesm2015": "../fesm2015/testing.js"
 }
diff --git a/packages/platform-server/testing/rollup.config.js b/packages/platform-server/testing/rollup.config.js
index 260aaf8f49..1dbe00b8b5 100644
--- a/packages/platform-server/testing/rollup.config.js
+++ b/packages/platform-server/testing/rollup.config.js
@@ -21,7 +21,7 @@ const globals = {
 };
 
 module.exports = {
-  entry: '../../../dist/packages-dist/platform-server/esm5/testing.js',
+  entry: '../../../dist/packages-dist/platform-server/fesm5/testing.js',
   dest: '../../../dist/packages-dist/platform-server/bundles/platform-server-testing.umd.js',
   format: 'umd',
   exports: 'named',
diff --git a/packages/platform-webworker-dynamic/package.json b/packages/platform-webworker-dynamic/package.json
index 7e38926762..9c9f837337 100644
--- a/packages/platform-webworker-dynamic/package.json
+++ b/packages/platform-webworker-dynamic/package.json
@@ -3,8 +3,12 @@
   "version": "0.0.0-PLACEHOLDER",
   "description": "Angular - library for using Angular in a web browser with web workers",
   "main": "./bundles/platform-webworker-dynamic.umd.js",
-  "module": "./esm5/platform-webworker-dynamic.js",
-  "es2015": "./esm2015/platform-webworker-dynamic.js",
+  "module": "./fesm5/platform-webworker-dynamic.js",
+  "es2015": "./fesm2015/platform-webworker-dynamic.js",
+  "esm5": "./esm5/platform-webworker-dynamic.js",
+  "esm2015": "./esm2015/platform-webworker-dynamic.js",
+  "fesm5": "./fesm5/platform-webworker-dynamic.js",
+  "fesm2015": "./fesm2015/platform-webworker-dynamic.js",
   "typings": "./platform-webworker-dynamic.d.ts",
   "author": "angular",
   "license": "MIT",
diff --git a/packages/platform-webworker-dynamic/rollup.config.js b/packages/platform-webworker-dynamic/rollup.config.js
index 2dffde4095..471ffbe3c9 100644
--- a/packages/platform-webworker-dynamic/rollup.config.js
+++ b/packages/platform-webworker-dynamic/rollup.config.js
@@ -19,7 +19,7 @@ const globals = {
 };
 
 module.exports = {
-  entry: '../../dist/packages-dist/platform-webworker-dynamic/esm5/platform-webworker-dynamic.js',
+  entry: '../../dist/packages-dist/platform-webworker-dynamic/fesm5/platform-webworker-dynamic.js',
   dest:
       '../../dist/packages-dist/platform-webworker-dynamic/bundles/platform-webworker-dynamic.umd.js',
   format: 'umd',
diff --git a/packages/platform-webworker/package.json b/packages/platform-webworker/package.json
index 5bf243c23b..2f47e81507 100644
--- a/packages/platform-webworker/package.json
+++ b/packages/platform-webworker/package.json
@@ -3,8 +3,12 @@
   "version": "0.0.0-PLACEHOLDER",
   "description": "Angular - library for using Angular in a web browser with web workers",
   "main": "./bundles/platform-webworker.umd.js",
-  "module": "./esm5/platform-webworker.js",
-  "es2015": "./esm2015/platform-webworker.js",
+  "module": "./fesm5/platform-webworker.js",
+  "es2015": "./fesm2015/platform-webworker.js",
+  "esm5": "./esm5/platform-webworker.js",
+  "esm2015": "./esm2015/platform-webworker.js",
+  "fesm5": "./fesm5/platform-webworker.js",
+  "fesm2015": "./fesm2015/platform-webworker.js",
   "typings": "./platform-webworker.d.ts",
   "author": "angular",
   "license": "MIT",
diff --git a/packages/platform-webworker/rollup.config.js b/packages/platform-webworker/rollup.config.js
index 4e6f06c34b..1448501ded 100644
--- a/packages/platform-webworker/rollup.config.js
+++ b/packages/platform-webworker/rollup.config.js
@@ -18,7 +18,7 @@ const globals = {
 };
 
 module.exports = {
-  entry: '../../dist/packages-dist/platform-webworker/esm5/platform-webworker.js',
+  entry: '../../dist/packages-dist/platform-webworker/fesm5/platform-webworker.js',
   dest: '../../dist/packages-dist/platform-webworker/bundles/platform-webworker.umd.js',
   format: 'umd',
   exports: 'named',
diff --git a/packages/router/package.json b/packages/router/package.json
index 6b601313dc..851305b4b1 100644
--- a/packages/router/package.json
+++ b/packages/router/package.json
@@ -3,8 +3,12 @@
   "version": "0.0.0-PLACEHOLDER",
   "description": "Angular - the routing library",
   "main": "./bundles/router.umd.js",
-  "module": "./esm5/router.js",
-  "es2015": "./esm2015/router.js",
+  "module": "./fesm5/router.js",
+  "es2015": "./fesm2015/router.js",
+  "esm5": "./esm5/router.js",
+  "esm2015": "./esm2015/router.js",
+  "fesm5": "./fesm5/router.js",
+  "fesm2015": "./fesm2015/router.js",
   "typings": "./router.d.ts",
   "keywords": [
     "angular",
diff --git a/packages/router/rollup.config.js b/packages/router/rollup.config.js
index 40cca57800..57a7f9728c 100644
--- a/packages/router/rollup.config.js
+++ b/packages/router/rollup.config.js
@@ -41,7 +41,7 @@ const globals = {
 };
 
 module.exports = {
-  entry: '../../dist/packages-dist/router/esm5/router.js',
+  entry: '../../dist/packages-dist/router/fesm5/router.js',
   dest: '../../dist/packages-dist/router/bundles/router.umd.js',
   format: 'umd',
   exports: 'named',
diff --git a/packages/router/testing/package.json b/packages/router/testing/package.json
index 84d5d64a69..4105d52785 100644
--- a/packages/router/testing/package.json
+++ b/packages/router/testing/package.json
@@ -2,6 +2,10 @@
   "name": "@angular/router/testing",
   "typings": "./testing.d.ts",
   "main": "../bundles/router-testing.umd.js",
-  "module": "../esm5/testing.js",
-  "es2015": "../esm2015/testing.js"
+  "module": "../fesm5/testing.js",
+  "es2015": "../fesm2015/testing/testing.js",
+  "esm5": "../esm5/testing/testing.js",
+  "esm2015": "../esm2015/testing/testing.js",
+  "fesm5": "../fesm5/testing.js",
+  "fesm2015": "../fesm2015/testing.js"
 }
diff --git a/packages/router/testing/rollup.config.js b/packages/router/testing/rollup.config.js
index 20c9f99ca3..2cddeb51a0 100644
--- a/packages/router/testing/rollup.config.js
+++ b/packages/router/testing/rollup.config.js
@@ -18,7 +18,7 @@ const globals = {
 };
 
 module.exports = {
-  entry: '../../../dist/packages-dist/router/esm5/testing.js',
+  entry: '../../../dist/packages-dist/router/fesm5/testing.js',
   dest: '../../../dist/packages-dist/router/bundles/router-testing.umd.js',
   format: 'umd',
   exports: 'named',
diff --git a/packages/router/upgrade/package.json b/packages/router/upgrade/package.json
index 08760c4e32..e3dcb7bf1f 100644
--- a/packages/router/upgrade/package.json
+++ b/packages/router/upgrade/package.json
@@ -2,7 +2,11 @@
   "name": "@angular/router/upgrade",
   "typings": "./upgrade.d.ts",
   "main": "../bundles/router-upgrade.umd.js",
-  "module": "../esm5/upgrade.js",
-  "es2015": "../esm2015/upgrade.js",
+  "module": "../fesm5/upgrade.js",
+  "es2015": "../fesm2015/upgrade/upgrade.js",
+  "esm5": "../esm5/upgrade/upgrade.js",
+  "esm2015": "../esm2015/upgrade/upgrade.js",
+  "fesm5": "../fesm5/upgrade.js",
+  "fesm2015": "../fesm2015/upgrade.js",
   "sideEffects": false
 }
diff --git a/packages/router/upgrade/rollup.config.js b/packages/router/upgrade/rollup.config.js
index 672c187693..135b0f9349 100644
--- a/packages/router/upgrade/rollup.config.js
+++ b/packages/router/upgrade/rollup.config.js
@@ -18,7 +18,7 @@ const globals = {
 
 
 module.exports = {
-  entry: '../../../dist/packages-dist/router/esm5/upgrade.js',
+  entry: '../../../dist/packages-dist/router/fesm5/upgrade.js',
   dest: '../../../dist/packages-dist/router/bundles/router-upgrade.umd.js',
   format: 'umd',
   exports: 'named',
diff --git a/packages/service-worker/config/package.json b/packages/service-worker/config/package.json
index 7ffdac8fe3..66d809c05b 100644
--- a/packages/service-worker/config/package.json
+++ b/packages/service-worker/config/package.json
@@ -2,6 +2,10 @@
   "name": "@angular/service-worker/config",
   "typings": "./index.d.ts",
   "main": "../bundles/service-worker-config.umd.js",
-  "module": "../esm5/config/index.js",
-  "es2015": "../esm15/config/index.js"
+  "module": "../fesm5/config/index.js",
+  "es2015": "../fesm15/config/index.js",
+  "esm5": "../esm5/config/index.js",
+  "esm2015": "../esm2015/config/index.js",
+  "fesm5": "../fesm5/config/index.js",
+  "fesm2015": "../fesm2015/config/index.js"
 }
diff --git a/packages/service-worker/config/rollup.config.js b/packages/service-worker/config/rollup.config.js
index 535074ba07..8aa5eb619c 100644
--- a/packages/service-worker/config/rollup.config.js
+++ b/packages/service-worker/config/rollup.config.js
@@ -12,7 +12,7 @@ const sourcemaps = require('rollup-plugin-sourcemaps');
 const globals = {};
 
 module.exports = {
-  entry: '../../../dist/packages-dist/service-worker/esm5/config.js',
+  entry: '../../../dist/packages-dist/service-worker/fesm5/config.js',
   dest: '../../../dist/packages-dist/service-worker/bundles/service-worker-config.umd.js',
   format: 'umd',
   exports: 'named',
diff --git a/packages/service-worker/package.json b/packages/service-worker/package.json
index d1e29d53cc..8197ffbda4 100644
--- a/packages/service-worker/package.json
+++ b/packages/service-worker/package.json
@@ -3,8 +3,12 @@
   "version": "0.0.0-PLACEHOLDER",
   "description": "Angular - service worker tooling!",
   "main": "./bundles/service-worker.umd.js",
-  "module": "./esm5/service-worker.js",
-  "es2015": "./esm2015/service-worker.js",
+  "module": "./fesm5/service-worker.js",
+  "es2015": "./fesm2015/service-worker.js",
+  "esm5": "./esm5/service-worker.js",
+  "esm2015": "./esm2015/service-worker.js",
+  "fesm5": "./fesm5/service-worker.js",
+  "fesm2015": "./fesm2015/service-worker.js",
   "typings": "./service-worker.d.ts",
   "author": "angular",
   "license": "MIT",
diff --git a/packages/service-worker/rollup.config.js b/packages/service-worker/rollup.config.js
index e152afa141..700c57d937 100644
--- a/packages/service-worker/rollup.config.js
+++ b/packages/service-worker/rollup.config.js
@@ -37,7 +37,7 @@ const globals = {
 };
 
 module.exports = {
-  entry: '../../dist/packages-dist/service-worker/esm5/service-worker.js',
+  entry: '../../dist/packages-dist/service-worker/fesm5/service-worker.js',
   dest: '../../dist/packages-dist/service-worker/bundles/service-worker.umd.js',
   format: 'umd',
   exports: 'named',
diff --git a/packages/upgrade/package.json b/packages/upgrade/package.json
index 51ea799c6a..22bbbca95f 100644
--- a/packages/upgrade/package.json
+++ b/packages/upgrade/package.json
@@ -3,8 +3,12 @@
   "version": "0.0.0-PLACEHOLDER",
   "description": "Angular - the library for easing update from v1 to v2",
   "main": "./bundles/upgrade.umd.js",
-  "module": "./esm5/upgrade.js",
-  "es2015": "./esm2015/upgrade.js",
+  "module": "./fesm5/upgrade.js",
+  "es2015": "./fesm2015/upgrade.js",
+  "esm5": "./esm5/upgrade.js",
+  "esm2015": "./esm2015/upgrade.js",
+  "fesm5": "./fesm5/upgrade.js",
+  "fesm2015": "./fesm2015/upgrade.js",
   "typings": "./upgrade.d.ts",
   "author": "angular",
   "license": "MIT",
diff --git a/packages/upgrade/rollup.config.js b/packages/upgrade/rollup.config.js
index 188220110b..730b467f65 100644
--- a/packages/upgrade/rollup.config.js
+++ b/packages/upgrade/rollup.config.js
@@ -23,7 +23,7 @@ const globals = {
 };
 
 module.exports = {
-  entry: '../../dist/packages-dist/upgrade/esm5/upgrade.js',
+  entry: '../../dist/packages-dist/upgrade/fesm5/upgrade.js',
   dest: '../../dist/packages-dist/upgrade/bundles/upgrade.umd.js',
   format: 'umd',
   exports: 'named',
diff --git a/packages/upgrade/static/package.json b/packages/upgrade/static/package.json
index 547f78f706..e2928067b7 100644
--- a/packages/upgrade/static/package.json
+++ b/packages/upgrade/static/package.json
@@ -2,7 +2,11 @@
   "name": "@angular/upgrade/static",
   "typings": "./static.d.ts",
   "main": "../bundles/upgrade-static.umd.js",
-  "module": "../esm5/static.js",
-  "es2015": "../esm2015/static.js",
+  "module": "../fesm5/static.js",
+  "es2015": "../fesm2015/static/static.js",
+  "esm5": "../esm5/static/static.js",
+  "esm2015": "../esm2015/static/static.js",
+  "fesm5": "../fesm5/static.js",
+  "fesm2015": "../fesm2015/static.js",
   "sideEffects": false
 }
diff --git a/packages/upgrade/static/rollup.config.js b/packages/upgrade/static/rollup.config.js
index 1eb6577bd9..844143c401 100644
--- a/packages/upgrade/static/rollup.config.js
+++ b/packages/upgrade/static/rollup.config.js
@@ -14,7 +14,7 @@ const globals = {
 };
 
 module.exports = {
-  entry: '../../../dist/packages-dist/upgrade/esm5/static.js',
+  entry: '../../../dist/packages-dist/upgrade/fesm5/static.js',
   dest: '../../../dist/packages-dist/upgrade/bundles/upgrade-static.umd.js',
   format: 'umd',
   exports: 'named',