diff --git a/integration/bazel/src/BUILD.bazel b/integration/bazel/src/BUILD.bazel
index 6a716e868c..1cb689e5b3 100644
--- a/integration/bazel/src/BUILD.bazel
+++ b/integration/bazel/src/BUILD.bazel
@@ -37,9 +37,14 @@ ts_devserver(
 
 load("@build_bazel_rules_nodejs//:defs.bzl", "nodejs_binary", "rollup_bundle")
 
+filegroup(
+    name = "empty_node_modules",
+)
+
 rollup_bundle(
     name = "bundle",
     entry_point = "src/main",
+    node_modules = ":empty_node_modules",
     deps = ["//src"],
 )
 
diff --git a/integration/bazel/yarn.lock b/integration/bazel/yarn.lock
index 9f17e24dee..ea9cd9f0f0 100644
--- a/integration/bazel/yarn.lock
+++ b/integration/bazel/yarn.lock
@@ -2,24 +2,24 @@
 # yarn lockfile v1
 
 
-"@bazel/bazel-darwin_x64@0.18.0":
-  version "0.18.0"
-  resolved "https://registry.yarnpkg.com/@bazel/bazel-darwin_x64/-/bazel-darwin_x64-0.18.0.tgz#bab437605a702279d42f59caa4741bb327eb7dbc"
-  integrity sha512-um2OzgLL2Gd/W6joOpvrSTcqpnupliPNpwe/uE7sB0huBSJ/4Im0w2IlCTI6C7OfgMcbpUj4YxgUa9T6u6WY6w==
+"@bazel/bazel-darwin_x64@0.20.0":
+  version "0.20.0"
+  resolved "https://registry.yarnpkg.com/@bazel/bazel-darwin_x64/-/bazel-darwin_x64-0.20.0.tgz#648d61c32a3c5fccb7bf70b753071b6e54b11f21"
+  integrity sha512-zeoeVK504341GfnaxdaB4pFzQV0YOK1HLiYj3/ocamPFxAJRh9abvKB8iOpqD5Oal0j7VsINxnXCjovp9a4urA==
 
-"@bazel/bazel-linux_x64@0.18.0":
-  version "0.18.0"
-  resolved "https://registry.yarnpkg.com/@bazel/bazel-linux_x64/-/bazel-linux_x64-0.18.0.tgz#0c02b2404ec95c180e17615cc7079ee07df48a69"
-  integrity sha512-Rq8X8bL6SgQvbOHnfPhSgF6hp+f6Fbt2w6pRmBlFvV1J+CeUyrSrrRXfnnO1bjIuq05Ur3mV8ULA0qK6rtA5lQ==
+"@bazel/bazel-linux_x64@0.20.0":
+  version "0.20.0"
+  resolved "https://registry.yarnpkg.com/@bazel/bazel-linux_x64/-/bazel-linux_x64-0.20.0.tgz#2568628a0d0b85dcc69d0ab701b1d6e10551357d"
+  integrity sha512-PpHzoEqfXty8dc1/p1tVFXtbPyrE1n0N79QmYePjJ5mJMyW7uBF/zV4IajYY8+IpJEcDVq5v4BavSexOmVJRmA==
 
-"@bazel/bazel-win32_x64@0.18.0":
-  version "0.18.0"
-  resolved "https://registry.yarnpkg.com/@bazel/bazel-win32_x64/-/bazel-win32_x64-0.18.0.tgz#aa4575fb00066dcf59a6d464971774dea6a0bafd"
-  integrity sha512-U2TbfK8B7dc3JqXSFwj2oXCQrxEaSzCCUkAHjAOIGOKzx/HLKIKs+NJj9IQkLLr7BsMU+Qqzo8aqo11E+Vs+aA==
+"@bazel/bazel-win32_x64@0.20.0":
+  version "0.20.0"
+  resolved "https://registry.yarnpkg.com/@bazel/bazel-win32_x64/-/bazel-win32_x64-0.20.0.tgz#af7d041dae4c066e7aa8618949e2de1aad07495e"
+  integrity sha512-3bqHXFBvLnbvNzr1KCQ1zryTYvHMoQffaWVekbckgPyT2VPEj3abuB91+DrRYmZdPjcgPYnjnyanxZHDkKuF2g==
 
 "@bazel/bazel@file:../../node_modules/@bazel/bazel":
-  version "0.18.0"
+  version "0.20.0"
   optionalDependencies:
-    "@bazel/bazel-darwin_x64" "0.18.0"
-    "@bazel/bazel-linux_x64" "0.18.0"
-    "@bazel/bazel-win32_x64" "0.18.0"
+    "@bazel/bazel-darwin_x64" "0.20.0"
+    "@bazel/bazel-linux_x64" "0.20.0"
+    "@bazel/bazel-win32_x64" "0.20.0"
diff --git a/packages/animations/BUILD.bazel b/packages/animations/BUILD.bazel
index 1cd92b5aa8..3a7ebe7fa8 100644
--- a/packages/animations/BUILD.bazel
+++ b/packages/animations/BUILD.bazel
@@ -10,7 +10,6 @@ ng_module(
             "src/**/*.ts",
         ],
     ),
-    module_name = "@angular/animations",
     deps = [
         "//packages/core",
     ],
diff --git a/packages/animations/browser/BUILD.bazel b/packages/animations/browser/BUILD.bazel
index b3bb295b03..e2cba30158 100644
--- a/packages/animations/browser/BUILD.bazel
+++ b/packages/animations/browser/BUILD.bazel
@@ -12,7 +12,6 @@ ng_module(
             "src/**/*.ts",
         ],
     ),
-    module_name = "@angular/animations/browser",
     deps = [
         "//packages/animations",
         "//packages/core",
diff --git a/packages/animations/browser/testing/BUILD.bazel b/packages/animations/browser/testing/BUILD.bazel
index c8a98f45fb..f14f49c1d1 100644
--- a/packages/animations/browser/testing/BUILD.bazel
+++ b/packages/animations/browser/testing/BUILD.bazel
@@ -7,7 +7,6 @@ load("//tools:defaults.bzl", "ng_module")
 ng_module(
     name = "testing",
     srcs = glob(["**/*.ts"]),
-    module_name = "@angular/animations/browser/testing",
     deps = [
         "//packages/animations",
         "//packages/animations/browser",
diff --git a/packages/benchpress/BUILD.bazel b/packages/benchpress/BUILD.bazel
index 8049c9c67f..188f8910de 100644
--- a/packages/benchpress/BUILD.bazel
+++ b/packages/benchpress/BUILD.bazel
@@ -10,7 +10,6 @@ ts_library(
             "src/**/*.ts",
         ],
     ),
-    module_name = "@angular/benchpress",
     deps = [
         "//packages:types",
         "//packages/core",
diff --git a/packages/common/BUILD.bazel b/packages/common/BUILD.bazel
index 2200e2efd3..6a64e0d0f4 100644
--- a/packages/common/BUILD.bazel
+++ b/packages/common/BUILD.bazel
@@ -10,7 +10,6 @@ ng_module(
             "src/**/*.ts",
         ],
     ),
-    module_name = "@angular/common",
     deps = [
         "//packages/core",
         "@rxjs",
diff --git a/packages/common/http/BUILD.bazel b/packages/common/http/BUILD.bazel
index 0e5a0f002d..745c07801d 100644
--- a/packages/common/http/BUILD.bazel
+++ b/packages/common/http/BUILD.bazel
@@ -12,7 +12,6 @@ ng_module(
             "src/**/*.ts",
         ],
     ),
-    module_name = "@angular/common/http",
     deps = [
         "//packages/common",
         "//packages/core",
diff --git a/packages/common/http/testing/BUILD.bazel b/packages/common/http/testing/BUILD.bazel
index d206a79412..a851ea06f7 100644
--- a/packages/common/http/testing/BUILD.bazel
+++ b/packages/common/http/testing/BUILD.bazel
@@ -12,7 +12,6 @@ ng_module(
             "src/**/*.ts",
         ],
     ),
-    module_name = "@angular/common/http/testing",
     deps = [
         "//packages/common/http",
         "//packages/core",
diff --git a/packages/common/locales/BUILD.bazel b/packages/common/locales/BUILD.bazel
index 07be1c9fc1..1ab81ae5b1 100644
--- a/packages/common/locales/BUILD.bazel
+++ b/packages/common/locales/BUILD.bazel
@@ -8,7 +8,6 @@ ts_library(
         ["**/*.ts"],
         exclude = ["closure-locale.ts"],
     ),
-    module_name = "@angular/common/locales",
 )
 
 npm_package(
diff --git a/packages/common/testing/BUILD.bazel b/packages/common/testing/BUILD.bazel
index a10c80ec90..0a4c036836 100644
--- a/packages/common/testing/BUILD.bazel
+++ b/packages/common/testing/BUILD.bazel
@@ -7,7 +7,6 @@ load("//tools:defaults.bzl", "ng_module")
 ng_module(
     name = "testing",
     srcs = glob(["**/*.ts"]),
-    module_name = "@angular/common/testing",
     deps = [
         "//packages/common",
         "//packages/core",
diff --git a/packages/compiler-cli/BUILD.bazel b/packages/compiler-cli/BUILD.bazel
index 1ac89d3a37..43691c1bf0 100644
--- a/packages/compiler-cli/BUILD.bazel
+++ b/packages/compiler-cli/BUILD.bazel
@@ -20,7 +20,6 @@ ts_library(
             "src/integrationtest/**/*.ts",
         ],
     ),
-    module_name = "@angular/compiler-cli",
     tsconfig = ":tsconfig",
     deps = [
         "//packages/compiler",
diff --git a/packages/compiler-cli/src/ngcc/BUILD.bazel b/packages/compiler-cli/src/ngcc/BUILD.bazel
index 3457bfb246..6606098c1e 100644
--- a/packages/compiler-cli/src/ngcc/BUILD.bazel
+++ b/packages/compiler-cli/src/ngcc/BUILD.bazel
@@ -8,7 +8,6 @@ ts_library(
         "*.ts",
         "**/*.ts",
     ]),
-    module_name = "@angular/compiler-cli/src/ngcc",
     deps = [
         "//packages:types",
         "//packages/compiler",
diff --git a/packages/compiler-cli/src/ngtsc/annotations/BUILD.bazel b/packages/compiler-cli/src/ngtsc/annotations/BUILD.bazel
index dd014a1670..5cc3cdc8bc 100644
--- a/packages/compiler-cli/src/ngtsc/annotations/BUILD.bazel
+++ b/packages/compiler-cli/src/ngtsc/annotations/BUILD.bazel
@@ -8,7 +8,6 @@ ts_library(
         "index.ts",
         "src/**/*.ts",
     ]),
-    module_name = "@angular/compiler-cli/src/ngtsc/annotations",
     deps = [
         "//packages/compiler",
         "//packages/compiler-cli/src/ngtsc/diagnostics",
diff --git a/packages/compiler-cli/src/ngtsc/diagnostics/BUILD.bazel b/packages/compiler-cli/src/ngtsc/diagnostics/BUILD.bazel
index 97838673bc..2b0efabac8 100644
--- a/packages/compiler-cli/src/ngtsc/diagnostics/BUILD.bazel
+++ b/packages/compiler-cli/src/ngtsc/diagnostics/BUILD.bazel
@@ -8,7 +8,6 @@ ts_library(
         "index.ts",
         "src/**/*.ts",
     ]),
-    module_name = "@angular/compiler-cli/src/ngtsc/diagnostics",
     deps = [
         "//packages/compiler",
         "@ngdeps//typescript",
diff --git a/packages/compiler-cli/src/ngtsc/imports/BUILD.bazel b/packages/compiler-cli/src/ngtsc/imports/BUILD.bazel
index 16e733b198..7765082b2b 100644
--- a/packages/compiler-cli/src/ngtsc/imports/BUILD.bazel
+++ b/packages/compiler-cli/src/ngtsc/imports/BUILD.bazel
@@ -8,7 +8,6 @@ ts_library(
         "index.ts",
         "src/*.ts",
     ]),
-    module_name = "@angular/compiler-cli/src/ngtsc/imports",
     deps = [
         "//packages:types",
         "//packages/compiler",
diff --git a/packages/compiler-cli/src/ngtsc/reflection/BUILD.bazel b/packages/compiler-cli/src/ngtsc/reflection/BUILD.bazel
index 440d3398e0..6047781396 100644
--- a/packages/compiler-cli/src/ngtsc/reflection/BUILD.bazel
+++ b/packages/compiler-cli/src/ngtsc/reflection/BUILD.bazel
@@ -8,6 +8,5 @@ ts_library(
         "index.ts",
         "src/**/*.ts",
     ]),
-    module_name = "@angular/compiler-cli/src/ngtsc/reflection",
     deps = ["@ngdeps//typescript"],
 )
diff --git a/packages/compiler-cli/src/ngtsc/shims/BUILD.bazel b/packages/compiler-cli/src/ngtsc/shims/BUILD.bazel
index 1d29e79f50..7f8e78488e 100644
--- a/packages/compiler-cli/src/ngtsc/shims/BUILD.bazel
+++ b/packages/compiler-cli/src/ngtsc/shims/BUILD.bazel
@@ -8,7 +8,6 @@ ts_library(
         "index.ts",
         "src/**/*.ts",
     ]),
-    module_name = "@angular/compiler-cli/src/ngtsc/shims",
     deps = [
         "//packages/compiler",
         "//packages/compiler-cli/src/ngtsc/imports",
diff --git a/packages/compiler-cli/src/ngtsc/switch/BUILD.bazel b/packages/compiler-cli/src/ngtsc/switch/BUILD.bazel
index d57955dcec..e5f9ad5d80 100644
--- a/packages/compiler-cli/src/ngtsc/switch/BUILD.bazel
+++ b/packages/compiler-cli/src/ngtsc/switch/BUILD.bazel
@@ -8,7 +8,6 @@ ts_library(
         "index.ts",
         "src/**/*.ts",
     ]),
-    module_name = "@angular/compiler-cli/src/ngtsc/switch",
     deps = [
         "//packages/compiler",
         "@ngdeps//typescript",
diff --git a/packages/compiler-cli/src/ngtsc/transform/BUILD.bazel b/packages/compiler-cli/src/ngtsc/transform/BUILD.bazel
index 08fc17b114..e438e91560 100644
--- a/packages/compiler-cli/src/ngtsc/transform/BUILD.bazel
+++ b/packages/compiler-cli/src/ngtsc/transform/BUILD.bazel
@@ -8,7 +8,6 @@ ts_library(
         "index.ts",
         "src/**/*.ts",
     ]),
-    module_name = "@angular/compiler-cli/src/ngtsc/transform",
     deps = [
         "//packages/compiler",
         "//packages/compiler-cli/src/ngtsc/diagnostics",
diff --git a/packages/compiler-cli/src/ngtsc/translator/BUILD.bazel b/packages/compiler-cli/src/ngtsc/translator/BUILD.bazel
index e181b54f57..df6dd0884f 100644
--- a/packages/compiler-cli/src/ngtsc/translator/BUILD.bazel
+++ b/packages/compiler-cli/src/ngtsc/translator/BUILD.bazel
@@ -5,7 +5,6 @@ load("//tools:defaults.bzl", "ts_library")
 ts_library(
     name = "translator",
     srcs = glob(["**/*.ts"]),
-    module_name = "@angular/compiler-cli/src/ngtsc/translator",
     deps = [
         "//packages:types",
         "//packages/compiler",
diff --git a/packages/compiler-cli/src/ngtsc/typecheck/BUILD.bazel b/packages/compiler-cli/src/ngtsc/typecheck/BUILD.bazel
index 9b8dd51221..f76e8d5b0a 100644
--- a/packages/compiler-cli/src/ngtsc/typecheck/BUILD.bazel
+++ b/packages/compiler-cli/src/ngtsc/typecheck/BUILD.bazel
@@ -5,7 +5,6 @@ load("//tools:defaults.bzl", "ts_library")
 ts_library(
     name = "typecheck",
     srcs = glob(["**/*.ts"]),
-    module_name = "@angular/compiler-cli/src/ngtsc/typecheck",
     deps = [
         "//packages:types",
         "//packages/compiler",
diff --git a/packages/compiler-cli/src/ngtsc/util/BUILD.bazel b/packages/compiler-cli/src/ngtsc/util/BUILD.bazel
index 9deabafc08..1f63dd3f2e 100644
--- a/packages/compiler-cli/src/ngtsc/util/BUILD.bazel
+++ b/packages/compiler-cli/src/ngtsc/util/BUILD.bazel
@@ -8,7 +8,6 @@ ts_library(
         "index.ts",
         "src/**/*.ts",
     ]),
-    module_name = "@angular/compiler-cli/src/ngtsc/util",
     deps = [
         "//packages:types",
         "@ngdeps//@types/node",
diff --git a/packages/compiler/BUILD.bazel b/packages/compiler/BUILD.bazel
index 024344d9a4..5aa5564493 100644
--- a/packages/compiler/BUILD.bazel
+++ b/packages/compiler/BUILD.bazel
@@ -10,7 +10,6 @@ ts_library(
             "src/**/*.ts",
         ],
     ),
-    module_name = "@angular/compiler",
 )
 
 ng_package(
diff --git a/packages/compiler/testing/BUILD.bazel b/packages/compiler/testing/BUILD.bazel
index ae9c1a5446..f47ee11d51 100644
--- a/packages/compiler/testing/BUILD.bazel
+++ b/packages/compiler/testing/BUILD.bazel
@@ -10,7 +10,6 @@ ng_module(
         ["**/*.ts"],
         exclude = ["testing.ts"],
     ),
-    module_name = "@angular/compiler/testing",
     deps = [
         "//packages:types",
         "//packages/compiler",
diff --git a/packages/core/BUILD.bazel b/packages/core/BUILD.bazel
index d8047a2a6f..ac15b38b90 100644
--- a/packages/core/BUILD.bazel
+++ b/packages/core/BUILD.bazel
@@ -10,7 +10,6 @@ ng_module(
             "src/**/*.ts",
         ],
     ),
-    module_name = "@angular/core",
     deps = [
         "//packages:types",
         "//packages/core/src/compiler",
diff --git a/packages/core/src/compiler/BUILD.bazel b/packages/core/src/compiler/BUILD.bazel
index 6d96ffd7b9..eabb68ecff 100644
--- a/packages/core/src/compiler/BUILD.bazel
+++ b/packages/core/src/compiler/BUILD.bazel
@@ -13,7 +13,6 @@ ts_library(
             "**/*.ts",
         ],
     ),
-    module_name = "@angular/core/compiler",
     deps = [
         "//packages/core/src/util",
     ],
diff --git a/packages/core/src/di/interface/BUILD.bazel b/packages/core/src/di/interface/BUILD.bazel
index 79b06cb319..e92fad0fae 100644
--- a/packages/core/src/di/interface/BUILD.bazel
+++ b/packages/core/src/di/interface/BUILD.bazel
@@ -12,7 +12,6 @@ ts_library(
             "**/*.ts",
         ],
     ),
-    module_name = "@angular/core/di/interface",
     deps = [
         "//packages/core/src/interface",
         "//packages/core/src/util",
diff --git a/packages/core/src/interface/BUILD.bazel b/packages/core/src/interface/BUILD.bazel
index ccc87abff0..57391b768e 100644
--- a/packages/core/src/interface/BUILD.bazel
+++ b/packages/core/src/interface/BUILD.bazel
@@ -12,5 +12,4 @@ ts_library(
             "*.ts",
         ],
     ),
-    module_name = "@angular/core/interface",
 )
diff --git a/packages/core/src/reflection/BUILD.bazel b/packages/core/src/reflection/BUILD.bazel
index 77e9c65233..73d9f570cd 100644
--- a/packages/core/src/reflection/BUILD.bazel
+++ b/packages/core/src/reflection/BUILD.bazel
@@ -12,7 +12,6 @@ ts_library(
             "**/*.ts",
         ],
     ),
-    module_name = "@angular/core/reflection",
     deps = [
         "//packages/core/src/interface",
         "//packages/core/src/util",
diff --git a/packages/core/src/util/BUILD.bazel b/packages/core/src/util/BUILD.bazel
index b1ffe3cc0d..59e3930a63 100644
--- a/packages/core/src/util/BUILD.bazel
+++ b/packages/core/src/util/BUILD.bazel
@@ -12,7 +12,6 @@ ts_library(
             "**/*.ts",
         ],
     ),
-    module_name = "@angular/core/util",
     deps = [
         "//packages/core/src/interface",
         "@rxjs",
diff --git a/packages/core/testing/BUILD.bazel b/packages/core/testing/BUILD.bazel
index da2e08ffe7..8e20a93e78 100644
--- a/packages/core/testing/BUILD.bazel
+++ b/packages/core/testing/BUILD.bazel
@@ -9,7 +9,6 @@ ng_module(
     srcs = glob(
         ["**/*.ts"],
     ),
-    module_name = "@angular/core/testing",
     deps = [
         "//packages:types",
         "//packages/compiler",
diff --git a/packages/elements/BUILD.bazel b/packages/elements/BUILD.bazel
index c3a939128e..5e39ef5bab 100644
--- a/packages/elements/BUILD.bazel
+++ b/packages/elements/BUILD.bazel
@@ -10,7 +10,6 @@ ng_module(
             "src/**/*.ts",
         ],
     ),
-    module_name = "@angular/elements",
     deps = [
         "//packages/core",
         "//packages/platform-browser",
diff --git a/packages/forms/BUILD.bazel b/packages/forms/BUILD.bazel
index 05d5a41c6d..5ee2f385c5 100644
--- a/packages/forms/BUILD.bazel
+++ b/packages/forms/BUILD.bazel
@@ -10,7 +10,6 @@ ng_module(
             "src/**/*.ts",
         ],
     ),
-    module_name = "@angular/forms",
     deps = [
         "//packages/core",
         "//packages/platform-browser",
diff --git a/packages/http/BUILD.bazel b/packages/http/BUILD.bazel
index 506939a39c..23125871fb 100644
--- a/packages/http/BUILD.bazel
+++ b/packages/http/BUILD.bazel
@@ -10,7 +10,6 @@ ng_module(
             "src/**/*.ts",
         ],
     ),
-    module_name = "@angular/http",
     deps = [
         "//packages/core",
         "//packages/platform-browser",
diff --git a/packages/http/testing/BUILD.bazel b/packages/http/testing/BUILD.bazel
index 8b55de61f4..ba1d140b56 100644
--- a/packages/http/testing/BUILD.bazel
+++ b/packages/http/testing/BUILD.bazel
@@ -7,7 +7,6 @@ load("//tools:defaults.bzl", "ng_module")
 ng_module(
     name = "testing",
     srcs = glob(["**/*.ts"]),
-    module_name = "@angular/http/testing",
     deps = [
         "//packages/core",
         "//packages/http",
diff --git a/packages/language-service/BUILD.bazel b/packages/language-service/BUILD.bazel
index fbf1030277..4454b2a11c 100644
--- a/packages/language-service/BUILD.bazel
+++ b/packages/language-service/BUILD.bazel
@@ -10,7 +10,6 @@ ts_library(
             "src/**/*.ts",
         ],
     ),
-    module_name = "@angular/language-service",
     deps = [
         "//packages:types",
         "//packages/compiler",
diff --git a/packages/platform-browser-dynamic/BUILD.bazel b/packages/platform-browser-dynamic/BUILD.bazel
index 95f39f55fb..a1a42d4622 100644
--- a/packages/platform-browser-dynamic/BUILD.bazel
+++ b/packages/platform-browser-dynamic/BUILD.bazel
@@ -10,7 +10,6 @@ ng_module(
             "src/**/*.ts",
         ],
     ),
-    module_name = "@angular/platform-browser-dynamic",
     deps = [
         "//packages:types",
         "//packages/common",
diff --git a/packages/platform-browser-dynamic/testing/BUILD.bazel b/packages/platform-browser-dynamic/testing/BUILD.bazel
index eecbc31e88..2f824255bf 100644
--- a/packages/platform-browser-dynamic/testing/BUILD.bazel
+++ b/packages/platform-browser-dynamic/testing/BUILD.bazel
@@ -7,7 +7,6 @@ load("//tools:defaults.bzl", "ng_module")
 ng_module(
     name = "testing",
     srcs = glob(["**/*.ts"]),
-    module_name = "@angular/platform-browser-dynamic/testing",
     deps = [
         "//packages/compiler",
         "//packages/compiler/testing",
diff --git a/packages/platform-browser/BUILD.bazel b/packages/platform-browser/BUILD.bazel
index 10b8c56377..a9a9c74aa9 100644
--- a/packages/platform-browser/BUILD.bazel
+++ b/packages/platform-browser/BUILD.bazel
@@ -10,7 +10,6 @@ ng_module(
             "src/**/*.ts",
         ],
     ),
-    module_name = "@angular/platform-browser",
     deps = [
         "//packages:types",
         "//packages/common",
diff --git a/packages/platform-browser/animations/BUILD.bazel b/packages/platform-browser/animations/BUILD.bazel
index efb6d45469..624fe18a59 100644
--- a/packages/platform-browser/animations/BUILD.bazel
+++ b/packages/platform-browser/animations/BUILD.bazel
@@ -12,7 +12,6 @@ ng_module(
             "src/**/*.ts",
         ],
     ),
-    module_name = "@angular/platform-browser/animations",
     deps = [
         "//packages/animations",
         "//packages/animations/browser",
diff --git a/packages/platform-browser/testing/BUILD.bazel b/packages/platform-browser/testing/BUILD.bazel
index 8f6ce115f9..ad8a09cfa9 100644
--- a/packages/platform-browser/testing/BUILD.bazel
+++ b/packages/platform-browser/testing/BUILD.bazel
@@ -7,7 +7,6 @@ load("//tools:defaults.bzl", "ng_module")
 ng_module(
     name = "testing",
     srcs = glob(["**/*.ts"]),
-    module_name = "@angular/platform-browser/testing",
     deps = [
         "//packages/core",
         "//packages/core/testing",
diff --git a/packages/platform-server/BUILD.bazel b/packages/platform-server/BUILD.bazel
index 5a3fa5b476..c7a74c43ca 100644
--- a/packages/platform-server/BUILD.bazel
+++ b/packages/platform-server/BUILD.bazel
@@ -10,7 +10,6 @@ ng_module(
             "src/**/*.ts",
         ],
     ),
-    module_name = "@angular/platform-server",
     deps = [
         "//packages/animations/browser",
         "//packages/common",
diff --git a/packages/platform-server/testing/BUILD.bazel b/packages/platform-server/testing/BUILD.bazel
index 5a00c83396..a9a532a720 100644
--- a/packages/platform-server/testing/BUILD.bazel
+++ b/packages/platform-server/testing/BUILD.bazel
@@ -7,7 +7,6 @@ load("//tools:defaults.bzl", "ng_module")
 ng_module(
     name = "testing",
     srcs = glob(["**/*.ts"]),
-    module_name = "@angular/platform-server/testing",
     deps = [
         "//packages/core",
         "//packages/platform-browser-dynamic/testing",
diff --git a/packages/platform-webworker-dynamic/BUILD.bazel b/packages/platform-webworker-dynamic/BUILD.bazel
index dbd16fd4ef..5feac79de4 100644
--- a/packages/platform-webworker-dynamic/BUILD.bazel
+++ b/packages/platform-webworker-dynamic/BUILD.bazel
@@ -10,7 +10,6 @@ ng_module(
             "src/**/*.ts",
         ],
     ),
-    module_name = "@angular/platform-webworker-dynamic",
     deps = [
         "//packages:types",
         "//packages/common",
diff --git a/packages/platform-webworker/BUILD.bazel b/packages/platform-webworker/BUILD.bazel
index 207395b8ae..fcc14ecce8 100644
--- a/packages/platform-webworker/BUILD.bazel
+++ b/packages/platform-webworker/BUILD.bazel
@@ -10,7 +10,6 @@ ng_module(
             "src/**/*.ts",
         ],
     ),
-    module_name = "@angular/platform-webworker",
     deps = [
         "//packages:types",
         "//packages/common",
diff --git a/packages/router/BUILD.bazel b/packages/router/BUILD.bazel
index 9d01a2dd5d..d789660055 100644
--- a/packages/router/BUILD.bazel
+++ b/packages/router/BUILD.bazel
@@ -10,7 +10,6 @@ ng_module(
             "src/**/*.ts",
         ],
     ),
-    module_name = "@angular/router",
     deps = [
         "//packages/common",
         "//packages/core",
diff --git a/packages/router/testing/BUILD.bazel b/packages/router/testing/BUILD.bazel
index 51e0b17ee6..4590f3833e 100644
--- a/packages/router/testing/BUILD.bazel
+++ b/packages/router/testing/BUILD.bazel
@@ -7,7 +7,6 @@ load("//tools:defaults.bzl", "ng_module")
 ng_module(
     name = "testing",
     srcs = glob(["**/*.ts"]),
-    module_name = "@angular/router/testing",
     deps = [
         "//packages/common",
         "//packages/common/testing",
diff --git a/packages/router/upgrade/BUILD.bazel b/packages/router/upgrade/BUILD.bazel
index 8620441e26..eb0452285d 100644
--- a/packages/router/upgrade/BUILD.bazel
+++ b/packages/router/upgrade/BUILD.bazel
@@ -12,7 +12,6 @@ ng_module(
             "src/**/*.ts",
         ],
     ),
-    module_name = "@angular/router/upgrade",
     deps = [
         "//packages/common",
         "//packages/core",
diff --git a/packages/service-worker/BUILD.bazel b/packages/service-worker/BUILD.bazel
index 1c2876201b..4f2dab5485 100644
--- a/packages/service-worker/BUILD.bazel
+++ b/packages/service-worker/BUILD.bazel
@@ -10,7 +10,6 @@ ng_module(
             "src/**/*.ts",
         ],
     ),
-    module_name = "@angular/service-worker",
     deps = [
         "//packages/common",
         "//packages/core",
diff --git a/packages/service-worker/config/BUILD.bazel b/packages/service-worker/config/BUILD.bazel
index f96d578375..195e2bdbc3 100644
--- a/packages/service-worker/config/BUILD.bazel
+++ b/packages/service-worker/config/BUILD.bazel
@@ -10,6 +10,5 @@ ng_module(
         "*.ts",
         "src/**/*.ts",
     ]),
-    module_name = "@angular/service-worker/config",
     deps = ["//packages/core"],
 )
diff --git a/packages/service-worker/testing/BUILD.bazel b/packages/service-worker/testing/BUILD.bazel
index e35c353647..1888beac93 100644
--- a/packages/service-worker/testing/BUILD.bazel
+++ b/packages/service-worker/testing/BUILD.bazel
@@ -6,7 +6,6 @@ ng_module(
     name = "testing",
     testonly = True,
     srcs = glob(["**/*.ts"]),
-    module_name = "@angular/service-worker/testing",
     deps = [
         "//packages/core",
         "@rxjs",
diff --git a/packages/upgrade/BUILD.bazel b/packages/upgrade/BUILD.bazel
index 71318db97e..256aa43c4f 100644
--- a/packages/upgrade/BUILD.bazel
+++ b/packages/upgrade/BUILD.bazel
@@ -11,7 +11,6 @@ ng_module(
             "src/dynamic/**/*.ts",
         ],
     ),
-    module_name = "@angular/upgrade",
     deps = [
         "//packages/core",
         "//packages/platform-browser",
diff --git a/packages/upgrade/static/BUILD.bazel b/packages/upgrade/static/BUILD.bazel
index 62ce0857d0..2aac672fb9 100644
--- a/packages/upgrade/static/BUILD.bazel
+++ b/packages/upgrade/static/BUILD.bazel
@@ -15,7 +15,6 @@ ng_module(
             "src/static/**/*.ts",
         ],
     ),
-    module_name = "@angular/upgrade/static",
     deps = [
         "//packages/core",
         "//packages/platform-browser",
diff --git a/tools/defaults.bzl b/tools/defaults.bzl
index dfa3568639..8fc01d8049 100644
--- a/tools/defaults.bzl
+++ b/tools/defaults.bzl
@@ -44,7 +44,38 @@ PKG_GROUP_REPLACEMENTS = {
     ]""" % ",\n      ".join(["\"%s\"" % s for s in ANGULAR_SCOPED_PACKAGES]),
 }
 
-def ts_library(tsconfig = None, testonly = False, deps = [], **kwargs):
+def _default_module_name(testonly):
+    """ Provide better defaults for package names.
+
+    e.g. rather than angular/packages/core/testing we want @angular/core/testing
+
+    TODO(alexeagle): we ought to supply a default module name for every library in the repo.
+    But we short-circuit below in cases that are currently not working.
+    """
+    pkg = native.package_name()
+
+    if testonly:
+        # Some tests currently rely on the long-form package names
+        return None
+
+    if pkg.startswith("packages/bazel"):
+        # Avoid infinite recursion in the ViewEngine compiler. Error looks like:
+        #  Compiling Angular templates (ngc) //packages/bazel/test/ngc-wrapped/empty:empty failed (Exit 1)
+        # : RangeError: Maximum call stack size exceeded
+        #    at normalizeString (path.js:57:25)
+        #    at Object.normalize (path.js:1132:12)
+        #    at Object.join (path.js:1167:18)
+        #    at resolveModule (execroot/angular/bazel-out/host/bin/packages/bazel/src/ngc-wrapped/ngc-wrapped.runfiles/angular/packages/compiler-cli/src/metadata/bundler.js:582:50)
+        #    at MetadataBundler.exportAll (execroot/angular/bazel-out/host/bin/packages/bazel/src/ngc-wrapped/ngc-wrapped.runfiles/angular/packages/compiler-cli/src/metadata/bundler.js:119:42)
+        #    at MetadataBundler.exportAll (execroot/angular/bazel-out/host/bin/packages/bazel/src/ngc-wrapped/ngc-wrapped.runfiles/angular/packages/compiler-cli/src/metadata/bundler.js:121:52)
+        return None
+
+    if pkg.startswith("packages/"):
+        return "@angular/" + pkg[len("packages/"):]
+
+    return None
+
+def ts_library(tsconfig = None, testonly = False, deps = [], module_name = None, **kwargs):
     """Default values for ts_library"""
     deps = deps + ["@ngdeps//tslib"]
     if testonly:
@@ -57,15 +88,19 @@ def ts_library(tsconfig = None, testonly = False, deps = [], **kwargs):
         else:
             tsconfig = _DEFAULT_TSCONFIG_BUILD
 
+    if not module_name:
+        module_name = _default_module_name(testonly)
+
     _ts_library(
         tsconfig = tsconfig,
         testonly = testonly,
         deps = deps,
         node_modules = _DEFAULT_TS_TYPINGS,
+        module_name = module_name,
         **kwargs
     )
 
-def ng_module(name, tsconfig = None, entry_point = None, testonly = False, deps = [], **kwargs):
+def ng_module(name, tsconfig = None, entry_point = None, testonly = False, deps = [], module_name = None, **kwargs):
     """Default values for ng_module"""
     deps = deps + ["@ngdeps//tslib"]
     if testonly:
@@ -77,6 +112,8 @@ def ng_module(name, tsconfig = None, entry_point = None, testonly = False, deps
             tsconfig = _DEFAULT_TSCONFIG_TEST
         else:
             tsconfig = _DEFAULT_TSCONFIG_BUILD
+    if not module_name:
+        module_name = _default_module_name(testonly)
     if not entry_point:
         entry_point = "public_api.ts"
     _ng_module(
@@ -89,6 +126,7 @@ def ng_module(name, tsconfig = None, entry_point = None, testonly = False, deps
         compiler = _INTERNAL_NG_MODULE_COMPILER,
         ng_xi18n = _INTERNAL_NG_MODULE_XI18N,
         node_modules = _DEFAULT_TS_TYPINGS,
+        module_name = module_name,
         **kwargs
     )