diff --git a/tensorflow/tools/compatibility/BUILD b/tensorflow/tools/compatibility/BUILD
index 1740eae3219..6db6669a547 100644
--- a/tensorflow/tools/compatibility/BUILD
+++ b/tensorflow/tools/compatibility/BUILD
@@ -74,13 +74,23 @@ py_library(
     srcs_version = "PY2AND3",
 )
 
+py_library(
+    name = "all_renames_v2",
+    srcs = ["all_renames_v2.py"],
+    visibility = [
+        "//tensorflow:__pkg__",
+        "//tensorflow:__subpackages__",
+    ],
+    deps = [":renames_v2"],
+)
+
 py_library(
     name = "tf_upgrade_v2_lib",
     srcs = ["tf_upgrade_v2.py"],
     srcs_version = "PY2AND3",
     deps = [
+        ":all_renames_v2",
         ":ast_edits",
-        ":renames_v2",
         ":reorders_v2",
         "@six_archive//:six",
     ],
@@ -187,6 +197,7 @@ py_test(
 
 exports_files(
     [
+        "all_renames_v2.py",
         "ast_edits.py",
         "tf_upgrade.py",
         "renames_v2.py",
diff --git a/tensorflow/tools/compatibility/all_renames_v2.py b/tensorflow/tools/compatibility/all_renames_v2.py
new file mode 100644
index 00000000000..164182077ff
--- /dev/null
+++ b/tensorflow/tools/compatibility/all_renames_v2.py
@@ -0,0 +1,475 @@
+# Copyright 2019 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
+"""Provides a list of renames between TensorFlow 1.* and 2.0."""
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
+from tensorflow.tools.compatibility import renames_v2
+
+# pylint: disable=line-too-long
+
+# Add additional renames not in renames_v2.py here.
+# IMPORTANT: For the renames in here, if you also need to add to
+# function_reorders or function_keyword_renames in tf_upgrade_v2.py,
+# use the OLD function name.
+# These renames happen after the arguments have been processed.
+manual_symbol_renames = {
+    "tf.batch_to_space_nd":
+        "tf.batch_to_space",
+    "tf.batch_gather":
+        "tf.compat.v1.batch_gather",
+    "tf.space_to_batch_nd":
+        "tf.space_to_batch",
+    "tf.nn.space_to_batch":
+        "tf.space_to_batch",
+    "tf.estimator.inputs":
+        "tf.compat.v1.estimator.inputs",
+    "tf.extract_image_patches":
+        "tf.image.extract_image_patches",
+    "tf.gfile.Copy":
+        "tf.io.gfile.copy",
+    "tf.gfile.DeleteRecursively":
+        "tf.io.gfile.rmtree",
+    "tf.gfile.Exists":
+        "tf.io.gfile.exists",
+    "tf.gfile.Glob":
+        "tf.io.gfile.glob",
+    "tf.gfile.GFile":
+        "tf.io.gfile.GFile",
+    "tf.gfile.IsDirectory":
+        "tf.io.gfile.isdir",
+    "tf.gfile.ListDirectory":
+        "tf.io.gfile.listdir",
+    "tf.gfile.MakeDirs":
+        "tf.io.gfile.makedirs",
+    "tf.gfile.MkDir":
+        "tf.io.gfile.mkdir",
+    "tf.gfile.Open":
+        "tf.io.gfile.GFile",
+    "tf.gfile.Remove":
+        "tf.io.gfile.remove",
+    "tf.gfile.Rename":
+        "tf.io.gfile.rename",
+    "tf.gfile.Stat":
+        "tf.io.gfile.stat",
+    "tf.gfile.Walk":
+        "tf.io.gfile.walk",
+    "tf.contrib.data.AUTOTUNE":
+        "tf.data.experimental.AUTOTUNE",
+    "tf.contrib.data.Counter":
+        "tf.data.experimental.Counter",
+    "tf.contrib.data.CheckpointInputPipelineHook":
+        "tf.data.experimental.CheckpointInputPipelineHook",
+    "tf.contrib.data.CsvDataset":
+        "tf.data.experimental.CsvDataset",
+    "tf.contrib.data.Optional":
+        "tf.data.experimental.Optional",
+    "tf.contrib.data.RandomDataset":
+        "tf.data.experimental.RandomDataset",
+    "tf.contrib.data.Reducer":
+        "tf.data.experimental.Reducer",
+    "tf.contrib.data.SqlDataset":
+        "tf.data.experimental.SqlDataset",
+    "tf.contrib.data.StatsAggregator":
+        "tf.data.experimental.StatsAggregator",
+    "tf.contrib.data.TFRecordWriter":
+        "tf.data.experimental.TFRecordWriter",
+    "tf.contrib.data.assert_element_shape":
+        "tf.data.experimental.assert_element_shape",
+    "tf.contrib.data.bucket_by_sequence_length":
+        "tf.data.experimental.bucket_by_sequence_length",
+    "tf.contrib.data.choose_from_datasets":
+        "tf.data.experimental.choose_from_datasets",
+    "tf.contrib.data.copy_to_device":
+        "tf.data.experimental.copy_to_device",
+    "tf.contrib.data.dense_to_sparse_batch":
+        "tf.data.experimental.dense_to_sparse_batch",
+    "tf.contrib.data.enumerate_dataset":
+        "tf.data.experimental.enumerate_dataset",
+    "tf.contrib.data.get_next_as_optional":
+        "tf.data.experimental.get_next_as_optional",
+    "tf.contrib.data.get_single_element":
+        "tf.data.experimental.get_single_element",
+    "tf.contrib.data.group_by_reducer":
+        "tf.data.experimental.group_by_reducer",
+    "tf.contrib.data.group_by_window":
+        "tf.data.experimental.group_by_window",
+    "tf.contrib.data.ignore_errors":
+        "tf.data.experimental.ignore_errors",
+    "tf.contrib.data.latency_stats":
+        "tf.data.experimental.latency_stats",
+    "tf.contrib.data.make_batched_features_dataset":
+        "tf.data.experimental.make_batched_features_dataset",
+    "tf.contrib.data.make_csv_dataset":
+        "tf.data.experimental.make_csv_dataset",
+    "tf.contrib.data.make_saveable_from_iterator":
+        "tf.data.experimental.make_saveable_from_iterator",
+    "tf.contrib.data.map_and_batch":
+        "tf.data.experimental.map_and_batch",
+    "tf.contrib.data.parallel_interleave":
+        "tf.data.experimental.parallel_interleave",
+    "tf.contrib.data.parse_example_dataset":
+        "tf.data.experimental.parse_example_dataset",
+    "tf.contrib.data.prefetch_to_device":
+        "tf.data.experimental.prefetch_to_device",
+    "tf.contrib.data.rejection_resample":
+        "tf.data.experimental.rejection_resample",
+    "tf.contrib.data.sample_from_datasets":
+        "tf.data.experimental.sample_from_datasets",
+    "tf.contrib.data.scan":
+        "tf.data.experimental.scan",
+    "tf.contrib.data.set_stats_aggregator":
+        "tf.data.experimental.set_stats_aggregator",
+    "tf.contrib.data.shuffle_and_repeat":
+        "tf.data.experimental.shuffle_and_repeat",
+    "tf.contrib.data.unbatch":
+        "tf.data.experimental.unbatch",
+    "tf.contrib.data.unique":
+        "tf.data.experimental.unique",
+    "tf.contrib.distribute.CrossDeviceOps":
+        "tf.distribute.CrossDeviceOps",
+    "tf.contrib.distribute.ReductionToOneDeviceCrossDeviceOps":
+        "tf.distribute.ReductionToOneDevice",
+    "tf.contrib.estimator.make_early_stopping_hook":
+        "tf.estimator.experimental.make_early_stopping_hook",
+    "tf.contrib.estimator.stop_if_higher_hook":
+        "tf.estimator.experimental.stop_if_higher_hook",
+    "tf.contrib.estimator.stop_if_lower_hook":
+        "tf.estimator.experimental.stop_if_lower_hook",
+    "tf.contrib.estimator.stop_if_no_decrease_hook":
+        "tf.estimator.experimental.stop_if_no_decrease_hook",
+    "tf.contrib.estimator.stop_if_no_increase_hook":
+        "tf.estimator.experimental.stop_if_no_increase_hook",
+    "tf.contrib.framework.CriticalSection":
+        "tf.CriticalSection",
+    "tf.contrib.framework.is_tensor":
+        "tf.is_tensor",
+    "tf.contrib.framework.nest.assert_same_structure":
+        "tf.nest.assert_same_structure",
+    "tf.contrib.framework.nest.flatten":
+        "tf.nest.flatten",
+    "tf.contrib.framework.nest.is_sequence":
+        "tf.nest.is_nested",
+    "tf.contrib.framework.nest.map_structure":
+        "tf.nest.map_structure",
+    "tf.contrib.framework.nest.pack_sequence_as":
+        "tf.nest.pack_sequence_as",
+    "tf.contrib.batching.batch_function":
+        "tf.nondifferentiable_batch_function",
+    "tf.contrib.util.constant_value":
+        "tf.get_static_value",
+    "tf.contrib.saved_model.load_keras_model":
+        "tf.keras.experimental.load_from_saved_model",
+    "tf.contrib.saved_model.save_keras_model":
+        "tf.keras.experimental.export_saved_model",
+    "tf.contrib.rnn.RNNCell":
+        "tf.compat.v1.nn.rnn_cell.RNNCell",
+    "tf.contrib.rnn.LSTMStateTuple":
+        "tf.nn.rnn_cell.LSTMStateTuple",
+    "tf.contrib.rnn.BasicLSTMCell":
+        "tf.compat.v1.nn.rnn_cell.BasicLSTMCell",
+    "tf.contrib.rnn.BasicRNNCell":
+        "tf.compat.v1.nn.rnn_cell.BasicRNNCell",
+    "tf.contrib.rnn.GRUCell":
+        "tf.compat.v1.nn.rnn_cell.GRUCell",
+    "tf.contrib.rnn.LSTMCell":
+        "tf.compat.v1.nn.rnn_cell.LSTMCell",
+    "tf.contrib.rnn.MultiRNNCell":
+        "tf.compat.v1.nn.rnn_cell.MultiRNNCell",
+    "tf.contrib.rnn.static_rnn":
+        "tf.compat.v1.nn.static_rnn",
+    "tf.contrib.rnn.static_state_saving_rnn":
+        "tf.compat.v1.nn.static_state_saving_rnn",
+    "tf.contrib.rnn.static_bidirectional_rnn":
+        "tf.compat.v1.nn.static_bidirectional_rnn",
+    "tf.contrib.framework.sort":
+        "tf.sort",
+    "tf.contrib.framework.argsort":
+        "tf.argsort",
+    "tf.contrib.summary.audio":
+        "tf.compat.v2.summary.audio",
+    "tf.contrib.summary.histogram":
+        "tf.compat.v2.summary.histogram",
+    "tf.contrib.summary.image":
+        "tf.compat.v2.summary.image",
+    "tf.contrib.summary.initialize":
+        "tf.compat.v1.summary.initialize",
+    "tf.contrib.summary.scalar":
+        "tf.compat.v2.summary.scalar",
+    "tf.count_nonzero":
+        "tf.math.count_nonzero",
+    "tf.manip.batch_to_space_nd":
+        "tf.batch_to_space",
+    "tf.quantize_v2":
+        "tf.quantization.quantize",
+    "tf.sparse_add":
+        "tf.sparse.add",
+    "tf.sparse_concat":
+        "tf.sparse.concat",
+    "tf.sparse_split":
+        "tf.sparse.split",
+    "tf.sparse_matmul":
+        "tf.linalg.matmul",
+    "tf.sparse_reduce_sum":
+        "tf.sparse.reduce_sum",
+    "tf.sparse_reduce_max":
+        "tf.sparse.reduce_max",
+    "tf.random.stateless_multinomial":
+        "tf.random.stateless_categorical",
+    "tf.substr":
+        "tf.strings.substr",
+    # TODO(b/129398290)
+    "tf.string_split":
+        "tf.compat.v1.string_split",
+    "tf.string_to_hash_bucket":
+        "tf.strings.to_hash_bucket",
+    "tf.string_to_number":
+        "tf.strings.to_number",
+    "tf.multinomial":
+        "tf.random.categorical",
+    "tf.random.multinomial":
+        "tf.random.categorical",
+    "tf.reduce_join":
+        "tf.strings.reduce_join",
+    "tf.load_file_system_library":
+        "tf.load_library",
+    "tf.bincount":
+        "tf.math.bincount",
+    "tf.confusion_matrix":
+        "tf.math.confusion_matrix",
+    "tf.train.confusion_matrix":
+        "tf.math.confusion_matrix",
+    "tf.train.sdca_fprint":
+        "tf.raw_ops.SdcaFprint",
+    "tf.train.sdca_optimizer":
+        "tf.raw_ops.SdcaOptimizer",
+    "tf.train.sdca_shrink_l1":
+        "tf.raw_ops.SdcaShrinkL1",
+    "tf.decode_csv":
+        "tf.io.decode_csv",
+    "tf.data.Iterator":
+        "tf.compat.v1.data.Iterator",
+    "tf.parse_example":
+        "tf.io.parse_example",
+    "tf.parse_single_example":
+        "tf.io.parse_single_example",
+    "tf.nn.fused_batch_norm":
+        "tf.compat.v1.nn.fused_batch_norm",
+    "tf.nn.softmax_cross_entropy_with_logits_v2":
+        "tf.nn.softmax_cross_entropy_with_logits",
+    "tf.nn.sigmoid_cross_entropy_with_logits":
+        "tf.nn.sigmoid_cross_entropy_with_logits",
+    "tf.losses.Reduction.MEAN":
+        "tf.compat.v1.losses.Reduction.MEAN",
+    "tf.losses.Reduction.SUM_BY_NONZERO_WEIGHTS":
+        "tf.compat.v1.losses.Reduction.SUM_BY_NONZERO_WEIGHTS",
+    "tf.losses.Reduction.SUM_OVER_NONZERO_WEIGHTS":
+        "tf.compat.v1.losses.Reduction.SUM_OVER_NONZERO_WEIGHTS",
+    "tf.lite.constants.FLOAT":
+        "tf.float32",
+    "tf.lite.constants.INT32":
+        "tf.int32",
+    "tf.lite.constants.INT64":
+        "tf.int64",
+    "tf.lite.constants.STRING":
+        "tf.string",
+    "tf.lite.constants.QUANTIZED_UINT8":
+        "tf.uint8",
+    "tf.arg_max":
+        "tf.argmax",
+    "tf.arg_min":
+        "tf.argmin",
+    # tf.nn.ctc_loss is still available in 2.0 but behavior
+    # changed significantly.
+    "tf.nn.ctc_loss":
+        "tf.compat.v1.nn.ctc_loss",
+    # tf.saved_model.load in 1.x has no equivalent in 2.x, but there is a
+    # symbol with the same name.
+    "tf.saved_model.load":
+        "tf.compat.v1.saved_model.load",
+    "tf.saved_model.load_v2":
+        "tf.compat.v2.saved_model.load",
+    "tf.image.resize_images":
+        "tf.image.resize",
+    "tf.random_poisson":
+        "tf.random.poisson",
+    "tf.debugging.assert_greater":
+        "tf.compat.v1.debugging.assert_greater",
+    "tf.debugging.assert_greater_equal":
+        "tf.compat.v1.debugging.assert_greater_equal",
+    "tf.debugging.assert_integer":
+        "tf.compat.v1.debugging.assert_integer",
+    "tf.debugging.assert_less":
+        "tf.compat.v1.debugging.assert_less",
+    "tf.debugging.assert_less_equal":
+        "tf.compat.v1.debugging.assert_less_equal",
+    "tf.debugging.assert_near":
+        "tf.compat.v1.debugging.assert_near",
+    "tf.debugging.assert_negative":
+        "tf.compat.v1.debugging.assert_negative",
+    "tf.debugging.assert_non_negative":
+        "tf.compat.v1.debugging.assert_non_negative",
+    "tf.debugging.assert_non_positive":
+        "tf.compat.v1.debugging.assert_non_positive",
+    "tf.debugging.assert_none_equal":
+        "tf.compat.v1.debugging.assert_none_equal",
+    "tf.debugging.assert_type":
+        "tf.compat.v1.debugging.assert_type",
+    "tf.debugging.assert_positive":
+        "tf.compat.v1.debugging.assert_positive",
+    "tf.debugging.assert_equal":
+        "tf.compat.v1.debugging.assert_equal",
+    "tf.debugging.assert_scalar":
+        "tf.compat.v1.debugging.assert_scalar",
+    "tf.assert_equal":
+        "tf.compat.v1.assert_equal",
+    "tf.assert_less":
+        "tf.compat.v1.assert_less",
+    "tf.assert_greater":
+        "tf.compat.v1.assert_greater",
+    "tf.debugging.assert_rank":
+        "tf.compat.v1.debugging.assert_rank",
+    "tf.debugging.assert_rank_at_least":
+        "tf.compat.v1.debugging.assert_rank_at_least",
+    "tf.debugging.assert_rank_in":
+        "tf.compat.v1.debugging.assert_rank_in",
+    "tf.errors.exception_type_from_error_code":
+        "tf.compat.v1.errors.exception_type_from_error_code",
+    "tf.errors.error_code_from_exception_type":
+        "tf.compat.v1.errors.error_code_from_exception_type",
+    "tf.errors.raise_exception_on_not_ok_status":
+        "tf.compat.v1.errors.raise_exception_on_not_ok_status",
+    "tf.assert_rank":
+        "tf.compat.v1.assert_rank",
+    "tf.nn.max_pool":
+        "tf.nn.max_pool2d",
+    "tf.nn.avg_pool":
+        "tf.nn.avg_pool2d",
+    "tf.keras.initializers.zeros":
+        "tf.compat.v1.keras.initializers.zeros",
+    "tf.keras.initializers.Zeros":
+        "tf.compat.v1.keras.initializers.Zeros",
+    "tf.keras.initializers.ones":
+        "tf.compat.v1.keras.initializers.ones",
+    "tf.keras.initializers.Ones":
+        "tf.compat.v1.keras.initializers.Ones",
+    "tf.keras.initializers.constant":
+        "tf.compat.v1.keras.initializers.constant",
+    "tf.keras.initializers.Constant":
+        "tf.compat.v1.keras.initializers.Constant",
+    "tf.keras.initializers.VarianceScaling":
+        "tf.compat.v1.keras.initializers.VarianceScaling",
+    "tf.keras.initializers.Orthogonal":
+        "tf.compat.v1.keras.initializers.Orthogonal",
+    "tf.keras.initializers.orthogonal":
+        "tf.compat.v1.keras.initializers.orthogonal",
+    "tf.keras.initializers.Identity":
+        "tf.compat.v1.keras.initializers.Identity",
+    "tf.keras.initializers.identity":
+        "tf.compat.v1.keras.initializers.identity",
+    "tf.keras.initializers.glorot_uniform":
+        "tf.compat.v1.keras.initializers.glorot_uniform",
+    "tf.keras.initializers.glorot_normal":
+        "tf.compat.v1.keras.initializers.glorot_normal",
+    "tf.keras.initializers.lecun_normal":
+        "tf.compat.v1.keras.initializers.lecun_normal",
+    "tf.keras.initializers.lecun_uniform":
+        "tf.compat.v1.keras.initializers.lecun_uniform",
+    "tf.keras.initializers.he_normal":
+        "tf.compat.v1.keras.initializers.he_normal",
+    "tf.keras.initializers.he_uniform":
+        "tf.compat.v1.keras.initializers.he_uniform",
+    "tf.keras.initializers.TruncatedNormal":
+        "tf.compat.v1.keras.initializers.TruncatedNormal",
+    "tf.keras.initializers.truncated_normal":
+        "tf.compat.v1.keras.initializers.truncated_normal",
+    "tf.keras.initializers.RandomUniform":
+        "tf.compat.v1.keras.initializers.RandomUniform",
+    "tf.keras.initializers.uniform":
+        "tf.compat.v1.keras.initializers.uniform",
+    "tf.keras.initializers.random_uniform":
+        "tf.compat.v1.keras.initializers.random_uniform",
+    "tf.keras.initializers.RandomNormal":
+        "tf.compat.v1.keras.initializers.RandomNormal",
+    "tf.keras.initializers.normal":
+        "tf.compat.v1.keras.initializers.normal",
+    "tf.keras.initializers.random_normal":
+        "tf.compat.v1.keras.initializers.random_normal",
+    "tf.zeros_initializer":
+        "tf.compat.v1.zeros_initializer",
+    "tf.initializers.zeros":
+        "tf.compat.v1.initializers.zeros",
+    "tf.ones_initializer":
+        "tf.compat.v1.ones_initializer",
+    "tf.initializers.ones":
+        "tf.compat.v1.initializers.ones",
+    "tf.constant_initializer":
+        "tf.compat.v1.constant_initializer",
+    "tf.initializers.constant":
+        "tf.compat.v1.initializers.constant",
+    "tf.random_uniform_initializer":
+        "tf.compat.v1.random_uniform_initializer",
+    "tf.initializers.random_uniform":
+        "tf.compat.v1.initializers.random_uniform",
+    "tf.random_normal_initializer":
+        "tf.compat.v1.random_normal_initializer",
+    "tf.initializers.random_normal":
+        "tf.compat.v1.initializers.random_normal",
+    "tf.truncated_normal_initializer":
+        "tf.compat.v1.truncated_normal_initializer",
+    "tf.initializers.truncated_normal":
+        "tf.compat.v1.initializers.truncated_normal",
+    "tf.variance_scaling_initializer":
+        "tf.compat.v1.variance_scaling_initializer",
+    "tf.initializers.variance_scaling":
+        "tf.compat.v1.initializers.variance_scaling",
+    "tf.orthogonal_initializer":
+        "tf.compat.v1.orthogonal_initializer",
+    "tf.initializers.orthogonal":
+        "tf.compat.v1.initializers.orthogonal",
+    "tf.glorot_uniform_initializer":
+        "tf.compat.v1.glorot_uniform_initializer",
+    "tf.initializers.glorot_uniform":
+        "tf.compat.v1.initializers.glorot_uniform",
+    "tf.glorot_normal_initializer":
+        "tf.compat.v1.glorot_normal_initializer",
+    "tf.initializers.glorot_normal":
+        "tf.compat.v1.initializers.glorot_normal",
+    "tf.initializers.identity":
+        "tf.compat.v1.initializers.identity",
+    "tf.initializers.lecun_normal":
+        "tf.compat.v1.initializers.lecun_normal",
+    "tf.initializers.lecun_uniform":
+        "tf.compat.v1.initializers.lecun_uniform",
+    "tf.initializers.he_normal":
+        "tf.compat.v1.initializers.he_normal",
+    "tf.initializers.he_uniform":
+        "tf.compat.v1.initializers.he_uniform",
+    "tf.data.experimental.map_and_batch_with_legacy_function":
+        "tf.compat.v1.data.experimental.map_and_batch_with_legacy_function",
+    "tf.nn.conv2d_backprop_input":
+        "tf.nn.conv2d_transpose",
+    "tf.test.compute_gradient":
+        "tf.compat.v1.test.compute_gradient",
+    "tf.xla.experimental.compile":
+        "tf.xla.experimental.compile",
+    "tf.xla.experimental.jit_scope":
+        "tf.xla.experimental.jit_scope",
+}
+# pylint: enable=line-too-long
+
+symbol_renames = renames_v2.renames
+symbol_renames.update(manual_symbol_renames)
diff --git a/tensorflow/tools/compatibility/tf_upgrade_v2.py b/tensorflow/tools/compatibility/tf_upgrade_v2.py
index 9ebe70f5c47..0ced60b7df1 100644
--- a/tensorflow/tools/compatibility/tf_upgrade_v2.py
+++ b/tensorflow/tools/compatibility/tf_upgrade_v2.py
@@ -25,8 +25,8 @@ import sys
 
 import pasta
 
+from tensorflow.tools.compatibility import all_renames_v2
 from tensorflow.tools.compatibility import ast_edits
-from tensorflow.tools.compatibility import renames_v2
 from tensorflow.tools.compatibility import reorders_v2
 
 # These pylint warnings are a mistake.
@@ -450,463 +450,9 @@ class TFAPIChangeSpec(ast_edits.APIChangeSpec):
         },
     }
 
-    # pylint: disable=line-too-long
-    # Add additional renames not in renames_v2.py here.
-    # IMPORTANT: For the renames in here, if you also need to add to
-    # function_reorders or function_keyword_renames, use the OLD function name.
-    # These renames happen after the arguments have been processed.
-    self.manual_symbol_renames = {
-        "tf.batch_to_space_nd":
-            "tf.batch_to_space",
-        "tf.batch_gather":
-            "tf.compat.v1.batch_gather",
-        "tf.space_to_batch_nd":
-            "tf.space_to_batch",
-        "tf.nn.space_to_batch":
-            "tf.space_to_batch",
-        "tf.estimator.inputs":
-            "tf.compat.v1.estimator.inputs",
-        "tf.extract_image_patches":
-            "tf.image.extract_image_patches",
-        "tf.gfile.Copy":
-            "tf.io.gfile.copy",
-        "tf.gfile.DeleteRecursively":
-            "tf.io.gfile.rmtree",
-        "tf.gfile.Exists":
-            "tf.io.gfile.exists",
-        "tf.gfile.Glob":
-            "tf.io.gfile.glob",
-        "tf.gfile.GFile":
-            "tf.io.gfile.GFile",
-        "tf.gfile.IsDirectory":
-            "tf.io.gfile.isdir",
-        "tf.gfile.ListDirectory":
-            "tf.io.gfile.listdir",
-        "tf.gfile.MakeDirs":
-            "tf.io.gfile.makedirs",
-        "tf.gfile.MkDir":
-            "tf.io.gfile.mkdir",
-        "tf.gfile.Open":
-            "tf.io.gfile.GFile",
-        "tf.gfile.Remove":
-            "tf.io.gfile.remove",
-        "tf.gfile.Rename":
-            "tf.io.gfile.rename",
-        "tf.gfile.Stat":
-            "tf.io.gfile.stat",
-        "tf.gfile.Walk":
-            "tf.io.gfile.walk",
-        "tf.contrib.data.AUTOTUNE":
-            "tf.data.experimental.AUTOTUNE",
-        "tf.contrib.data.Counter":
-            "tf.data.experimental.Counter",
-        "tf.contrib.data.CheckpointInputPipelineHook":
-            "tf.data.experimental.CheckpointInputPipelineHook",
-        "tf.contrib.data.CsvDataset":
-            "tf.data.experimental.CsvDataset",
-        "tf.contrib.data.Optional":
-            "tf.data.experimental.Optional",
-        "tf.contrib.data.RandomDataset":
-            "tf.data.experimental.RandomDataset",
-        "tf.contrib.data.Reducer":
-            "tf.data.experimental.Reducer",
-        "tf.contrib.data.SqlDataset":
-            "tf.data.experimental.SqlDataset",
-        "tf.contrib.data.StatsAggregator":
-            "tf.data.experimental.StatsAggregator",
-        "tf.contrib.data.TFRecordWriter":
-            "tf.data.experimental.TFRecordWriter",
-        "tf.contrib.data.assert_element_shape":
-            "tf.data.experimental.assert_element_shape",
-        "tf.contrib.data.bucket_by_sequence_length":
-            "tf.data.experimental.bucket_by_sequence_length",
-        "tf.contrib.data.choose_from_datasets":
-            "tf.data.experimental.choose_from_datasets",
-        "tf.contrib.data.copy_to_device":
-            "tf.data.experimental.copy_to_device",
-        "tf.contrib.data.dense_to_sparse_batch":
-            "tf.data.experimental.dense_to_sparse_batch",
-        "tf.contrib.data.enumerate_dataset":
-            "tf.data.experimental.enumerate_dataset",
-        "tf.contrib.data.get_next_as_optional":
-            "tf.data.experimental.get_next_as_optional",
-        "tf.contrib.data.get_single_element":
-            "tf.data.experimental.get_single_element",
-        "tf.contrib.data.group_by_reducer":
-            "tf.data.experimental.group_by_reducer",
-        "tf.contrib.data.group_by_window":
-            "tf.data.experimental.group_by_window",
-        "tf.contrib.data.ignore_errors":
-            "tf.data.experimental.ignore_errors",
-        "tf.contrib.data.latency_stats":
-            "tf.data.experimental.latency_stats",
-        "tf.contrib.data.make_batched_features_dataset":
-            "tf.data.experimental.make_batched_features_dataset",
-        "tf.contrib.data.make_csv_dataset":
-            "tf.data.experimental.make_csv_dataset",
-        "tf.contrib.data.make_saveable_from_iterator":
-            "tf.data.experimental.make_saveable_from_iterator",
-        "tf.contrib.data.map_and_batch":
-            "tf.data.experimental.map_and_batch",
-        "tf.contrib.data.parallel_interleave":
-            "tf.data.experimental.parallel_interleave",
-        "tf.contrib.data.parse_example_dataset":
-            "tf.data.experimental.parse_example_dataset",
-        "tf.contrib.data.prefetch_to_device":
-            "tf.data.experimental.prefetch_to_device",
-        "tf.contrib.data.rejection_resample":
-            "tf.data.experimental.rejection_resample",
-        "tf.contrib.data.sample_from_datasets":
-            "tf.data.experimental.sample_from_datasets",
-        "tf.contrib.data.scan":
-            "tf.data.experimental.scan",
-        "tf.contrib.data.set_stats_aggregator":
-            "tf.data.experimental.set_stats_aggregator",
-        "tf.contrib.data.shuffle_and_repeat":
-            "tf.data.experimental.shuffle_and_repeat",
-        "tf.contrib.data.unbatch":
-            "tf.data.experimental.unbatch",
-        "tf.contrib.data.unique":
-            "tf.data.experimental.unique",
-        "tf.contrib.distribute.CrossDeviceOps":
-            "tf.distribute.CrossDeviceOps",
-        "tf.contrib.distribute.ReductionToOneDeviceCrossDeviceOps":
-            "tf.distribute.ReductionToOneDevice",
-        "tf.contrib.estimator.make_early_stopping_hook":
-            "tf.estimator.experimental.make_early_stopping_hook",
-        "tf.contrib.estimator.stop_if_higher_hook":
-            "tf.estimator.experimental.stop_if_higher_hook",
-        "tf.contrib.estimator.stop_if_lower_hook":
-            "tf.estimator.experimental.stop_if_lower_hook",
-        "tf.contrib.estimator.stop_if_no_decrease_hook":
-            "tf.estimator.experimental.stop_if_no_decrease_hook",
-        "tf.contrib.estimator.stop_if_no_increase_hook":
-            "tf.estimator.experimental.stop_if_no_increase_hook",
-        "tf.contrib.framework.CriticalSection":
-            "tf.CriticalSection",
-        "tf.contrib.framework.is_tensor":
-            "tf.is_tensor",
-        "tf.contrib.framework.nest.assert_same_structure":
-            "tf.nest.assert_same_structure",
-        "tf.contrib.framework.nest.flatten":
-            "tf.nest.flatten",
-        "tf.contrib.framework.nest.is_sequence":
-            "tf.nest.is_nested",
-        "tf.contrib.framework.nest.map_structure":
-            "tf.nest.map_structure",
-        "tf.contrib.framework.nest.pack_sequence_as":
-            "tf.nest.pack_sequence_as",
-        "tf.contrib.batching.batch_function":
-            "tf.nondifferentiable_batch_function",
-        "tf.contrib.util.constant_value":
-            "tf.get_static_value",
-        "tf.contrib.saved_model.load_keras_model":
-            "tf.keras.experimental.load_from_saved_model",
-        "tf.contrib.saved_model.save_keras_model":
-            "tf.keras.experimental.export_saved_model",
-        "tf.contrib.rnn.RNNCell":
-            "tf.compat.v1.nn.rnn_cell.RNNCell",
-        "tf.contrib.rnn.LSTMStateTuple":
-            "tf.nn.rnn_cell.LSTMStateTuple",
-        "tf.contrib.rnn.BasicLSTMCell":
-            "tf.compat.v1.nn.rnn_cell.BasicLSTMCell",
-        "tf.contrib.rnn.BasicRNNCell":
-            "tf.compat.v1.nn.rnn_cell.BasicRNNCell",
-        "tf.contrib.rnn.GRUCell":
-            "tf.compat.v1.nn.rnn_cell.GRUCell",
-        "tf.contrib.rnn.LSTMCell":
-            "tf.compat.v1.nn.rnn_cell.LSTMCell",
-        "tf.contrib.rnn.MultiRNNCell":
-            "tf.compat.v1.nn.rnn_cell.MultiRNNCell",
-        "tf.contrib.rnn.static_rnn":
-            "tf.compat.v1.nn.static_rnn",
-        "tf.contrib.rnn.static_state_saving_rnn":
-            "tf.compat.v1.nn.static_state_saving_rnn",
-        "tf.contrib.rnn.static_bidirectional_rnn":
-            "tf.compat.v1.nn.static_bidirectional_rnn",
-        "tf.contrib.framework.sort":
-            "tf.sort",
-        "tf.contrib.framework.argsort":
-            "tf.argsort",
-        "tf.contrib.summary.audio":
-            "tf.compat.v2.summary.audio",
-        "tf.contrib.summary.histogram":
-            "tf.compat.v2.summary.histogram",
-        "tf.contrib.summary.image":
-            "tf.compat.v2.summary.image",
-        "tf.contrib.summary.initialize":
-            "tf.compat.v1.summary.initialize",
-        "tf.contrib.summary.scalar":
-            "tf.compat.v2.summary.scalar",
-        "tf.count_nonzero":
-            "tf.math.count_nonzero",
-        "tf.manip.batch_to_space_nd":
-            "tf.batch_to_space",
-        "tf.quantize_v2":
-            "tf.quantization.quantize",
-        "tf.sparse_add":
-            "tf.sparse.add",
-        "tf.sparse_concat":
-            "tf.sparse.concat",
-        "tf.sparse_split":
-            "tf.sparse.split",
-        "tf.sparse_matmul":
-            "tf.linalg.matmul",
-        "tf.sparse_reduce_sum":
-            "tf.sparse.reduce_sum",
-        "tf.sparse_reduce_max":
-            "tf.sparse.reduce_max",
-        "tf.random.stateless_multinomial":
-            "tf.random.stateless_categorical",
-        "tf.substr":
-            "tf.strings.substr",
-        # TODO(b/129398290)
-        "tf.string_split":
-            "tf.compat.v1.string_split",
-        "tf.string_to_hash_bucket":
-            "tf.strings.to_hash_bucket",
-        "tf.string_to_number":
-            "tf.strings.to_number",
-        "tf.multinomial":
-            "tf.random.categorical",
-        "tf.random.multinomial":
-            "tf.random.categorical",
-        "tf.reduce_join":
-            "tf.strings.reduce_join",
-        "tf.load_file_system_library":
-            "tf.load_library",
-        "tf.bincount":
-            "tf.math.bincount",
-        "tf.confusion_matrix":
-            "tf.math.confusion_matrix",
-        "tf.train.confusion_matrix":
-            "tf.math.confusion_matrix",
-        "tf.train.sdca_fprint":
-            "tf.raw_ops.SdcaFprint",
-        "tf.train.sdca_optimizer":
-            "tf.raw_ops.SdcaOptimizer",
-        "tf.train.sdca_shrink_l1":
-            "tf.raw_ops.SdcaShrinkL1",
-        "tf.decode_csv":
-            "tf.io.decode_csv",
-        "tf.data.Iterator":
-            "tf.compat.v1.data.Iterator",
-        "tf.parse_example":
-            "tf.io.parse_example",
-        "tf.parse_single_example":
-            "tf.io.parse_single_example",
-        "tf.nn.fused_batch_norm":
-            "tf.compat.v1.nn.fused_batch_norm",
-        "tf.nn.softmax_cross_entropy_with_logits_v2":
-            "tf.nn.softmax_cross_entropy_with_logits",
-        "tf.nn.sigmoid_cross_entropy_with_logits":
-            "tf.nn.sigmoid_cross_entropy_with_logits",
-        "tf.losses.Reduction.MEAN":
-            "tf.compat.v1.losses.Reduction.MEAN",
-        "tf.losses.Reduction.SUM_BY_NONZERO_WEIGHTS":
-            "tf.compat.v1.losses.Reduction.SUM_BY_NONZERO_WEIGHTS",
-        "tf.losses.Reduction.SUM_OVER_NONZERO_WEIGHTS":
-            "tf.compat.v1.losses.Reduction.SUM_OVER_NONZERO_WEIGHTS",
-        "tf.lite.constants.FLOAT":
-            "tf.float32",
-        "tf.lite.constants.INT32":
-            "tf.int32",
-        "tf.lite.constants.INT64":
-            "tf.int64",
-        "tf.lite.constants.STRING":
-            "tf.string",
-        "tf.lite.constants.QUANTIZED_UINT8":
-            "tf.uint8",
-        "tf.arg_max":
-            "tf.argmax",
-        "tf.arg_min":
-            "tf.argmin",
-        # tf.nn.ctc_loss is still available in 2.0 but behavior
-        # changed significantly.
-        "tf.nn.ctc_loss":
-            "tf.compat.v1.nn.ctc_loss",
-        # tf.saved_model.load in 1.x has no equivalent in 2.x, but there is a
-        # symbol with the same name.
-        "tf.saved_model.load":
-            "tf.compat.v1.saved_model.load",
-        "tf.saved_model.load_v2":
-            "tf.compat.v2.saved_model.load",
-        "tf.image.resize_images":
-            "tf.image.resize",
-        "tf.random_poisson":
-            "tf.random.poisson",
-        "tf.debugging.assert_greater":
-            "tf.compat.v1.debugging.assert_greater",
-        "tf.debugging.assert_greater_equal":
-            "tf.compat.v1.debugging.assert_greater_equal",
-        "tf.debugging.assert_integer":
-            "tf.compat.v1.debugging.assert_integer",
-        "tf.debugging.assert_less":
-            "tf.compat.v1.debugging.assert_less",
-        "tf.debugging.assert_less_equal":
-            "tf.compat.v1.debugging.assert_less_equal",
-        "tf.debugging.assert_near":
-            "tf.compat.v1.debugging.assert_near",
-        "tf.debugging.assert_negative":
-            "tf.compat.v1.debugging.assert_negative",
-        "tf.debugging.assert_non_negative":
-            "tf.compat.v1.debugging.assert_non_negative",
-        "tf.debugging.assert_non_positive":
-            "tf.compat.v1.debugging.assert_non_positive",
-        "tf.debugging.assert_none_equal":
-            "tf.compat.v1.debugging.assert_none_equal",
-        "tf.debugging.assert_type":
-            "tf.compat.v1.debugging.assert_type",
-        "tf.debugging.assert_positive":
-            "tf.compat.v1.debugging.assert_positive",
-        "tf.debugging.assert_equal":
-            "tf.compat.v1.debugging.assert_equal",
-        "tf.debugging.assert_scalar":
-            "tf.compat.v1.debugging.assert_scalar",
-        "tf.assert_equal":
-            "tf.compat.v1.assert_equal",
-        "tf.assert_less":
-            "tf.compat.v1.assert_less",
-        "tf.assert_greater":
-            "tf.compat.v1.assert_greater",
-        "tf.debugging.assert_rank":
-            "tf.compat.v1.debugging.assert_rank",
-        "tf.debugging.assert_rank_at_least":
-            "tf.compat.v1.debugging.assert_rank_at_least",
-        "tf.debugging.assert_rank_in":
-            "tf.compat.v1.debugging.assert_rank_in",
-        "tf.errors.exception_type_from_error_code":
-            "tf.compat.v1.errors.exception_type_from_error_code",
-        "tf.errors.error_code_from_exception_type":
-            "tf.compat.v1.errors.error_code_from_exception_type",
-        "tf.errors.raise_exception_on_not_ok_status":
-            "tf.compat.v1.errors.raise_exception_on_not_ok_status",
-        "tf.assert_rank":
-            "tf.compat.v1.assert_rank",
-        "tf.nn.max_pool":
-            "tf.nn.max_pool2d",
-        "tf.nn.avg_pool":
-            "tf.nn.avg_pool2d",
-        "tf.keras.initializers.zeros":
-            "tf.compat.v1.keras.initializers.zeros",
-        "tf.keras.initializers.Zeros":
-            "tf.compat.v1.keras.initializers.Zeros",
-        "tf.keras.initializers.ones":
-            "tf.compat.v1.keras.initializers.ones",
-        "tf.keras.initializers.Ones":
-            "tf.compat.v1.keras.initializers.Ones",
-        "tf.keras.initializers.constant":
-            "tf.compat.v1.keras.initializers.constant",
-        "tf.keras.initializers.Constant":
-            "tf.compat.v1.keras.initializers.Constant",
-        "tf.keras.initializers.VarianceScaling":
-            "tf.compat.v1.keras.initializers.VarianceScaling",
-        "tf.keras.initializers.Orthogonal":
-            "tf.compat.v1.keras.initializers.Orthogonal",
-        "tf.keras.initializers.orthogonal":
-            "tf.compat.v1.keras.initializers.orthogonal",
-        "tf.keras.initializers.Identity":
-            "tf.compat.v1.keras.initializers.Identity",
-        "tf.keras.initializers.identity":
-            "tf.compat.v1.keras.initializers.identity",
-        "tf.keras.initializers.glorot_uniform":
-            "tf.compat.v1.keras.initializers.glorot_uniform",
-        "tf.keras.initializers.glorot_normal":
-            "tf.compat.v1.keras.initializers.glorot_normal",
-        "tf.keras.initializers.lecun_normal":
-            "tf.compat.v1.keras.initializers.lecun_normal",
-        "tf.keras.initializers.lecun_uniform":
-            "tf.compat.v1.keras.initializers.lecun_uniform",
-        "tf.keras.initializers.he_normal":
-            "tf.compat.v1.keras.initializers.he_normal",
-        "tf.keras.initializers.he_uniform":
-            "tf.compat.v1.keras.initializers.he_uniform",
-        "tf.keras.initializers.TruncatedNormal":
-            "tf.compat.v1.keras.initializers.TruncatedNormal",
-        "tf.keras.initializers.truncated_normal":
-            "tf.compat.v1.keras.initializers.truncated_normal",
-        "tf.keras.initializers.RandomUniform":
-            "tf.compat.v1.keras.initializers.RandomUniform",
-        "tf.keras.initializers.uniform":
-            "tf.compat.v1.keras.initializers.uniform",
-        "tf.keras.initializers.random_uniform":
-            "tf.compat.v1.keras.initializers.random_uniform",
-        "tf.keras.initializers.RandomNormal":
-            "tf.compat.v1.keras.initializers.RandomNormal",
-        "tf.keras.initializers.normal":
-            "tf.compat.v1.keras.initializers.normal",
-        "tf.keras.initializers.random_normal":
-            "tf.compat.v1.keras.initializers.random_normal",
-        "tf.zeros_initializer":
-            "tf.compat.v1.zeros_initializer",
-        "tf.initializers.zeros":
-            "tf.compat.v1.initializers.zeros",
-        "tf.ones_initializer":
-            "tf.compat.v1.ones_initializer",
-        "tf.initializers.ones":
-            "tf.compat.v1.initializers.ones",
-        "tf.constant_initializer":
-            "tf.compat.v1.constant_initializer",
-        "tf.initializers.constant":
-            "tf.compat.v1.initializers.constant",
-        "tf.random_uniform_initializer":
-            "tf.compat.v1.random_uniform_initializer",
-        "tf.initializers.random_uniform":
-            "tf.compat.v1.initializers.random_uniform",
-        "tf.random_normal_initializer":
-            "tf.compat.v1.random_normal_initializer",
-        "tf.initializers.random_normal":
-            "tf.compat.v1.initializers.random_normal",
-        "tf.truncated_normal_initializer":
-            "tf.compat.v1.truncated_normal_initializer",
-        "tf.initializers.truncated_normal":
-            "tf.compat.v1.initializers.truncated_normal",
-        "tf.variance_scaling_initializer":
-            "tf.compat.v1.variance_scaling_initializer",
-        "tf.initializers.variance_scaling":
-            "tf.compat.v1.initializers.variance_scaling",
-        "tf.orthogonal_initializer":
-            "tf.compat.v1.orthogonal_initializer",
-        "tf.initializers.orthogonal":
-            "tf.compat.v1.initializers.orthogonal",
-        "tf.glorot_uniform_initializer":
-            "tf.compat.v1.glorot_uniform_initializer",
-        "tf.initializers.glorot_uniform":
-            "tf.compat.v1.initializers.glorot_uniform",
-        "tf.glorot_normal_initializer":
-            "tf.compat.v1.glorot_normal_initializer",
-        "tf.initializers.glorot_normal":
-            "tf.compat.v1.initializers.glorot_normal",
-        "tf.initializers.identity":
-            "tf.compat.v1.initializers.identity",
-        "tf.initializers.lecun_normal":
-            "tf.compat.v1.initializers.lecun_normal",
-        "tf.initializers.lecun_uniform":
-            "tf.compat.v1.initializers.lecun_uniform",
-        "tf.initializers.he_normal":
-            "tf.compat.v1.initializers.he_normal",
-        "tf.initializers.he_uniform":
-            "tf.compat.v1.initializers.he_uniform",
-        "tf.data.experimental.map_and_batch_with_legacy_function":
-            "tf.compat.v1.data.experimental.map_and_batch_with_legacy_function",
-        "tf.nn.conv2d_backprop_input":
-            "tf.nn.conv2d_transpose",
-        "tf.test.compute_gradient":
-            "tf.compat.v1.test.compute_gradient",
-        "tf.xla.experimental.compile":
-            "tf.xla.experimental.compile",
-        "tf.xla.experimental.jit_scope":
-            "tf.xla.experimental.jit_scope",
-    }
-    # pylint: enable=line-too-long
-
     # Mapping from function to the new name of the function
-    self.symbol_renames = renames_v2.renames
-    self.symbol_renames.update(self.manual_symbol_renames)
-    self.symbol_renames = {
-        name: new_name
-        for name, new_name in self.symbol_renames.items()
-    }
+    # Add additional renames not in renames_v2.py to all_renames_v2.py.
+    self.symbol_renames = all_renames_v2.symbol_renames
 
     # Variables that should be changed to functions.
     self.change_to_function = {}
diff --git a/tensorflow/tools/compatibility/update/BUILD b/tensorflow/tools/compatibility/update/BUILD
index 75bb0cfd2b7..593603cd039 100644
--- a/tensorflow/tools/compatibility/update/BUILD
+++ b/tensorflow/tools/compatibility/update/BUILD
@@ -12,7 +12,7 @@ py_binary(
         "//tensorflow/python:no_contrib",
         "//tensorflow/tools/common:public_api",
         "//tensorflow/tools/common:traverse",
-        "//tensorflow/tools/compatibility:tf_upgrade_v2_lib",
+        "//tensorflow/tools/compatibility:all_renames_v2",
     ],
 )
 
diff --git a/tensorflow/tools/compatibility/update/generate_v2_renames_map.py b/tensorflow/tools/compatibility/update/generate_v2_renames_map.py
index 16b4284eb27..0a65458e346 100644
--- a/tensorflow/tools/compatibility/update/generate_v2_renames_map.py
+++ b/tensorflow/tools/compatibility/update/generate_v2_renames_map.py
@@ -32,7 +32,7 @@ from tensorflow.python.util import tf_decorator
 from tensorflow.python.util import tf_export
 from tensorflow.tools.common import public_api
 from tensorflow.tools.common import traverse
-from tensorflow.tools.compatibility import tf_upgrade_v2
+from tensorflow.tools.compatibility import all_renames_v2
 
 
 _OUTPUT_FILE_PATH = 'third_party/tensorflow/tools/compatibility/renames_v2.py'
@@ -170,7 +170,7 @@ def update_renames_v2(output_file_path):
   constant_renames = collect_constant_renames()
   all_renames = function_renames.union(constant_renames)
   manual_renames = set(
-      tf_upgrade_v2.TFAPIChangeSpec().manual_symbol_renames.keys())
+      all_renames_v2.manual_symbol_renames.keys())
 
   # List of rename lines to write to output file in the form:
   #   'tf.deprecated_name': 'tf.canonical_name'