diff --git a/packages/metro-bundler/src/Bundler/__tests__/Bundle-test.js b/packages/metro-bundler/src/Bundler/__tests__/Bundle-test.js
index 4e132b51..50033ad6 100644
--- a/packages/metro-bundler/src/Bundler/__tests__/Bundle-test.js
+++ b/packages/metro-bundler/src/Bundler/__tests__/Bundle-test.js
@@ -6,7 +6,7 @@
  * LICENSE file in the root directory of this source tree. An additional grant
  * of patent rights can be found in the PATENTS file in the same directory.
  *
- * @emails oncall+javascript_tools
+ * @emails oncall+javascript_foundation
  * @format
  */
 
diff --git a/packages/metro-bundler/src/Bundler/__tests__/Bundler-test.js b/packages/metro-bundler/src/Bundler/__tests__/Bundler-test.js
index 2ebb40a2..23b831e5 100644
--- a/packages/metro-bundler/src/Bundler/__tests__/Bundler-test.js
+++ b/packages/metro-bundler/src/Bundler/__tests__/Bundler-test.js
@@ -6,7 +6,7 @@
  * LICENSE file in the root directory of this source tree. An additional grant
  * of patent rights can be found in the PATENTS file in the same directory.
  *
- * @emails oncall+javascript_tools
+ * @emails oncall+javascript_foundation
  * @format
  */
 
diff --git a/packages/metro-bundler/src/DeltaBundler/__tests__/DeltaCalculator-test.js b/packages/metro-bundler/src/DeltaBundler/__tests__/DeltaCalculator-test.js
index 0fa14749..9ff78168 100644
--- a/packages/metro-bundler/src/DeltaBundler/__tests__/DeltaCalculator-test.js
+++ b/packages/metro-bundler/src/DeltaBundler/__tests__/DeltaCalculator-test.js
@@ -6,7 +6,7 @@
  * LICENSE file in the root directory of this source tree. An additional grant
  * of patent rights can be found in the PATENTS file in the same directory.
  *
- * @emails oncall+javascript_tools
+ * @emails oncall+javascript_foundation
  * @format
  */
 
diff --git a/packages/metro-bundler/src/DeltaBundler/__tests__/DeltaPatcher-test.js b/packages/metro-bundler/src/DeltaBundler/__tests__/DeltaPatcher-test.js
index afb97bc4..511917ac 100644
--- a/packages/metro-bundler/src/DeltaBundler/__tests__/DeltaPatcher-test.js
+++ b/packages/metro-bundler/src/DeltaBundler/__tests__/DeltaPatcher-test.js
@@ -6,7 +6,7 @@
  * LICENSE file in the root directory of this source tree. An additional grant
  * of patent rights can be found in the PATENTS file in the same directory.
  *
- * @emails oncall+javascript_tools
+ * @emails oncall+javascript_foundation
  * @format
  */
 
diff --git a/packages/metro-bundler/src/JSTransformer/__tests__/Transformer-test.js b/packages/metro-bundler/src/JSTransformer/__tests__/Transformer-test.js
index cf226470..b83f0a46 100644
--- a/packages/metro-bundler/src/JSTransformer/__tests__/Transformer-test.js
+++ b/packages/metro-bundler/src/JSTransformer/__tests__/Transformer-test.js
@@ -6,7 +6,7 @@
  * LICENSE file in the root directory of this source tree. An additional grant
  * of patent rights can be found in the PATENTS file in the same directory.
  *
- * @emails oncall+javascript_tools
+ * @emails oncall+javascript_foundation
  * @format
  */
 'use strict';
diff --git a/packages/metro-bundler/src/JSTransformer/worker/__tests__/extract-dependencies-test.js b/packages/metro-bundler/src/JSTransformer/worker/__tests__/extract-dependencies-test.js
index fdec5a1f..e021f6ce 100644
--- a/packages/metro-bundler/src/JSTransformer/worker/__tests__/extract-dependencies-test.js
+++ b/packages/metro-bundler/src/JSTransformer/worker/__tests__/extract-dependencies-test.js
@@ -7,7 +7,7 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  *
  * @format
- * @emails oncall+javascript_tools
+ * @emails oncall+javascript_foundation
  */
 
 'use strict';
diff --git a/packages/metro-bundler/src/ModuleGraph/output/__tests__/dependencies-dot.js b/packages/metro-bundler/src/ModuleGraph/output/__tests__/dependencies-dot.js
index a3eebfc4..27fabafd 100644
--- a/packages/metro-bundler/src/ModuleGraph/output/__tests__/dependencies-dot.js
+++ b/packages/metro-bundler/src/ModuleGraph/output/__tests__/dependencies-dot.js
@@ -6,7 +6,7 @@
  * LICENSE file in the root directory of this source tree. An additional grant
  * of patent rights can be found in the PATENTS file in the same directory.
  *
- * @emails oncall+javascript_tools
+ * @emails oncall+javascript_foundation
  * @flow
  * @format
  */
diff --git a/packages/metro-bundler/src/ModuleGraph/output/__tests__/indexed-ram-bundle-test.js b/packages/metro-bundler/src/ModuleGraph/output/__tests__/indexed-ram-bundle-test.js
index c1e36e72..c5b2d6d8 100644
--- a/packages/metro-bundler/src/ModuleGraph/output/__tests__/indexed-ram-bundle-test.js
+++ b/packages/metro-bundler/src/ModuleGraph/output/__tests__/indexed-ram-bundle-test.js
@@ -6,7 +6,7 @@
  * LICENSE file in the root directory of this source tree. An additional grant
  * of patent rights can be found in the PATENTS file in the same directory.
  *
- * @emails oncall+javascript_tools
+ * @emails oncall+javascript_foundation
  * @flow
  * @format
  */
diff --git a/packages/metro-bundler/src/ModuleGraph/output/__tests__/multiple-files-ram-bundle-test.js b/packages/metro-bundler/src/ModuleGraph/output/__tests__/multiple-files-ram-bundle-test.js
index 8251522e..2cbe51fa 100644
--- a/packages/metro-bundler/src/ModuleGraph/output/__tests__/multiple-files-ram-bundle-test.js
+++ b/packages/metro-bundler/src/ModuleGraph/output/__tests__/multiple-files-ram-bundle-test.js
@@ -6,7 +6,7 @@
  * LICENSE file in the root directory of this source tree. An additional grant
  * of patent rights can be found in the PATENTS file in the same directory.
  *
- * @emails oncall+javascript_tools
+ * @emails oncall+javascript_foundation
  * @flow
  * @format
  */
diff --git a/packages/metro-bundler/src/ModuleGraph/output/__tests__/util-test.js b/packages/metro-bundler/src/ModuleGraph/output/__tests__/util-test.js
index 89799b0f..2ae0432a 100644
--- a/packages/metro-bundler/src/ModuleGraph/output/__tests__/util-test.js
+++ b/packages/metro-bundler/src/ModuleGraph/output/__tests__/util-test.js
@@ -6,7 +6,7 @@
  * LICENSE file in the root directory of this source tree. An additional grant
  * of patent rights can be found in the PATENTS file in the same directory.
  *
- * @emails oncall+javascript_tools
+ * @emails oncall+javascript_foundation
  * @format
  */
 
diff --git a/packages/metro-bundler/src/ModuleGraph/worker/__tests__/collect-dependencies-test.js b/packages/metro-bundler/src/ModuleGraph/worker/__tests__/collect-dependencies-test.js
index 638159dc..3c49f941 100644
--- a/packages/metro-bundler/src/ModuleGraph/worker/__tests__/collect-dependencies-test.js
+++ b/packages/metro-bundler/src/ModuleGraph/worker/__tests__/collect-dependencies-test.js
@@ -7,7 +7,7 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  *
  * @format
- * @emails oncall+javascript_tools
+ * @emails oncall+javascript_foundation
  */
 
 'use strict';
diff --git a/packages/metro-bundler/src/ModuleGraph/worker/__tests__/optimize-module-test.js b/packages/metro-bundler/src/ModuleGraph/worker/__tests__/optimize-module-test.js
index aa431355..9e8a1c65 100644
--- a/packages/metro-bundler/src/ModuleGraph/worker/__tests__/optimize-module-test.js
+++ b/packages/metro-bundler/src/ModuleGraph/worker/__tests__/optimize-module-test.js
@@ -7,7 +7,7 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  *
  * @format
- * @emails oncall+javascript_tools
+ * @emails oncall+javascript_foundation
  */
 
 'use strict';
diff --git a/packages/metro-bundler/src/ModuleGraph/worker/__tests__/transform-module-test.js b/packages/metro-bundler/src/ModuleGraph/worker/__tests__/transform-module-test.js
index 6c45d62d..607a3075 100644
--- a/packages/metro-bundler/src/ModuleGraph/worker/__tests__/transform-module-test.js
+++ b/packages/metro-bundler/src/ModuleGraph/worker/__tests__/transform-module-test.js
@@ -7,7 +7,7 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  *
  * @format
- * @emails oncall+javascript_tools
+ * @emails oncall+javascript_foundation
  */
 
 'use strict';
diff --git a/packages/metro-bundler/src/ModuleGraph/worker/__tests__/wrap-worker-fn-test.js b/packages/metro-bundler/src/ModuleGraph/worker/__tests__/wrap-worker-fn-test.js
index 130f8d6b..1989e630 100644
--- a/packages/metro-bundler/src/ModuleGraph/worker/__tests__/wrap-worker-fn-test.js
+++ b/packages/metro-bundler/src/ModuleGraph/worker/__tests__/wrap-worker-fn-test.js
@@ -7,7 +7,7 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  *
  * @format
- * @emails oncall+javascript_tools
+ * @emails oncall+javascript_foundation
  */
 
 'use strict';
diff --git a/packages/metro-bundler/src/Resolver/__tests__/Resolver-test.js b/packages/metro-bundler/src/Resolver/__tests__/Resolver-test.js
index 04e1cbfb..dcec1471 100644
--- a/packages/metro-bundler/src/Resolver/__tests__/Resolver-test.js
+++ b/packages/metro-bundler/src/Resolver/__tests__/Resolver-test.js
@@ -6,7 +6,7 @@
  * LICENSE file in the root directory of this source tree. An additional grant
  * of patent rights can be found in the PATENTS file in the same directory.
  *
- * @emails oncall+javascript_tools
+ * @emails oncall+javascript_foundation
  * @format
  */
 
diff --git a/packages/metro-bundler/src/Server/__tests__/Server-test.js b/packages/metro-bundler/src/Server/__tests__/Server-test.js
index be602f55..e1e08cc1 100644
--- a/packages/metro-bundler/src/Server/__tests__/Server-test.js
+++ b/packages/metro-bundler/src/Server/__tests__/Server-test.js
@@ -6,7 +6,7 @@
  * LICENSE file in the root directory of this source tree. An additional grant
  * of patent rights can be found in the PATENTS file in the same directory.
  *
- * @emails oncall+javascript_tools
+ * @emails oncall+javascript_foundation
  */
 
 'use strict';
diff --git a/packages/metro-bundler/src/node-haste/__tests__/DependencyGraph-test.js b/packages/metro-bundler/src/node-haste/__tests__/DependencyGraph-test.js
index c2431455..3ba7ef4b 100644
--- a/packages/metro-bundler/src/node-haste/__tests__/DependencyGraph-test.js
+++ b/packages/metro-bundler/src/node-haste/__tests__/DependencyGraph-test.js
@@ -6,7 +6,7 @@
  * LICENSE file in the root directory of this source tree. An additional grant
  * of patent rights can be found in the PATENTS file in the same directory.
  *
- * @emails oncall+javascript_tools
+ * @emails oncall+javascript_foundation
  * @format
  */