Global rename of py2tf to autograph

PiperOrigin-RevId: 190515509

95 files changed, 346 insertions, 349 deletions

diff --git a/tensorflow/BUILD b/tensorflow/BUILD
index c75bf8abab..b073adfee9 100644
--- a/tensorflow/BUILD
+++ b/tensorflow/BUILD
@@ -448,6 +448,12 @@ filegroup(
         "//tensorflow/contrib:all_files",
         "//tensorflow/contrib/all_reduce:all_files",
         "//tensorflow/contrib/android:all_files",
+        "//tensorflow/contrib/autograph:all_files",
+        "//tensorflow/contrib/autograph/converters:all_files",
+        "//tensorflow/contrib/autograph/impl:all_files",
+        "//tensorflow/contrib/autograph/pyct:all_files",
+        "//tensorflow/contrib/autograph/pyct/static_analysis:all_files",
+        "//tensorflow/contrib/autograph/utils:all_files",
         "//tensorflow/contrib/batching:all_files",
         "//tensorflow/contrib/bayesflow:all_files",
         "//tensorflow/contrib/boosted_trees:all_files",
@@ -541,12 +547,6 @@ filegroup(
         "//tensorflow/contrib/opt:all_files",
         "//tensorflow/contrib/periodic_resample:all_files",
         "//tensorflow/contrib/predictor:all_files",
-        "//tensorflow/contrib/py2tf:all_files",
-        "//tensorflow/contrib/py2tf/converters:all_files",
-        "//tensorflow/contrib/py2tf/impl:all_files",
-        "//tensorflow/contrib/py2tf/pyct:all_files",
-        "//tensorflow/contrib/py2tf/pyct/static_analysis:all_files",
-        "//tensorflow/contrib/py2tf/utils:all_files",
         "//tensorflow/contrib/quantize:all_files",
         "//tensorflow/contrib/receptive_field:all_files",
         "//tensorflow/contrib/reduce_slice_ops:all_files",
diff --git a/tensorflow/contrib/BUILD b/tensorflow/contrib/BUILD
index 2d7bbc016f..bdbd738906 100644
--- a/tensorflow/contrib/BUILD
+++ b/tensorflow/contrib/BUILD
@@ -79,7 +79,7 @@ py_library(
         "//tensorflow/contrib/predictor",
         "//tensorflow/contrib/quantization:quantization_py",
         "//tensorflow/contrib/quantize:quantize_graph",
-        "//tensorflow/contrib/py2tf",
+        "//tensorflow/contrib/autograph",
         "//tensorflow/contrib/receptive_field:receptive_field_py",
         "//tensorflow/contrib/reduce_slice_ops:reduce_slice_ops_py",
         "//tensorflow/contrib/remote_fused_graph/pylib:remote_fused_graph_ops_py",
diff --git a/tensorflow/contrib/py2tf/BUILD b/tensorflow/contrib/autograph/BUILD
index d91220f6dd..30dd846893 100644
--- a/tensorflow/contrib/py2tf/BUILD
+++ b/tensorflow/contrib/autograph/BUILD
@@ -15,16 +15,16 @@ filegroup(
 )
 
 py_library(
-    name = "py2tf",
+    name = "autograph",
     srcs = [
         "__init__.py",
     ],
     srcs_version = "PY2AND3",
     visibility = ["//visibility:public"],
     deps = [
-        "//tensorflow/contrib/py2tf/impl",
-        "//tensorflow/contrib/py2tf/pyct",
-        "//tensorflow/contrib/py2tf/utils",
+        "//tensorflow/contrib/autograph/impl",
+        "//tensorflow/contrib/autograph/pyct",
+        "//tensorflow/contrib/autograph/utils",
         "@gast_archive//:gast",
         "@six_archive//:six",
     ],
diff --git a/tensorflow/contrib/py2tf/README.md b/tensorflow/contrib/autograph/README.md
index cd50675ad5..7e84f237dc 100644
--- a/tensorflow/contrib/py2tf/README.md
+++ b/tensorflow/contrib/autograph/README.md
@@ -1,4 +1,4 @@
-# Py2TF
+# Autograph
 
 A compiler for generating TensorFlow numeric and control flow ops from Python
 code.
diff --git a/tensorflow/contrib/py2tf/__init__.py b/tensorflow/contrib/autograph/__init__.py
index a4b62a0976..a39f44b21a 100644
--- a/tensorflow/contrib/py2tf/__init__.py
+++ b/tensorflow/contrib/autograph/__init__.py
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # ==============================================================================
-"""Py2TF compiles Python code into equivalent TensorFlow code.
+"""Autograph compiles Python code into equivalent TensorFlow code.
 
 Equivalent here means that they have the same effect when executed.
 """
@@ -21,19 +21,19 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
-from tensorflow.contrib.py2tf import utils
-from tensorflow.contrib.py2tf.impl.api import convert
-from tensorflow.contrib.py2tf.impl.api import converted_call
-from tensorflow.contrib.py2tf.impl.api import do_not_convert
-from tensorflow.contrib.py2tf.impl.api import RunMode
-from tensorflow.contrib.py2tf.impl.api import to_code
-from tensorflow.contrib.py2tf.impl.api import to_graph
-from tensorflow.contrib.py2tf.pyct.transformer import PyFlowParseError
+from tensorflow.contrib.autograph import utils
+from tensorflow.contrib.autograph.impl.api import convert
+from tensorflow.contrib.autograph.impl.api import converted_call
+from tensorflow.contrib.autograph.impl.api import do_not_convert
+from tensorflow.contrib.autograph.impl.api import RunMode
+from tensorflow.contrib.autograph.impl.api import to_code
+from tensorflow.contrib.autograph.impl.api import to_graph
+from tensorflow.contrib.autograph.pyct.transformer import AutographParseError
 from tensorflow.python.util.all_util import remove_undocumented
 
 _allowed_symbols = [
     'utils', 'convert', 'converted_call', 'do_not_convert', 'RunMode',
-    'to_code', 'to_graph', 'PyFlowParseError'
+    'to_code', 'to_graph', 'AutographParseError'
 ]
 
 remove_undocumented(__name__, _allowed_symbols)
diff --git a/tensorflow/contrib/py2tf/converters/BUILD b/tensorflow/contrib/autograph/converters/BUILD
index f624c42686..608bd82722 100644
--- a/tensorflow/contrib/py2tf/converters/BUILD
+++ b/tensorflow/contrib/autograph/converters/BUILD
@@ -49,9 +49,9 @@ py_library(
     visibility = ["//tensorflow:__subpackages__"],
     deps = [
         ":converters",
-        "//tensorflow/contrib/py2tf/pyct",
-        "//tensorflow/contrib/py2tf/pyct/static_analysis",
-        "//tensorflow/contrib/py2tf/utils",
+        "//tensorflow/contrib/autograph/pyct",
+        "//tensorflow/contrib/autograph/pyct/static_analysis",
+        "//tensorflow/contrib/autograph/utils",
         "@gast_archive//:gast",
         "@six_archive//:six",
     ],
@@ -89,11 +89,12 @@ py_test(
 
 py_test(
     name = "call_trees_test",
+    size = "large",
     srcs = ["call_trees_test.py"],
     srcs_version = "PY2AND3",
     deps = [
         ":test_lib",
-        "//tensorflow/contrib/py2tf/impl",
+        "//tensorflow/contrib/autograph/impl",
         "//tensorflow/python:client_testlib",
     ],
 )
@@ -143,7 +144,7 @@ py_test(
     srcs = ["name_scopes_test.py"],
     deps = [
         ":test_lib",
-        "//tensorflow/contrib/py2tf/pyct",
+        "//tensorflow/contrib/autograph/pyct",
         "//tensorflow/python:client_testlib",
     ],
 )
@@ -199,7 +200,7 @@ py_test(
     srcs_version = "PY2AND3",
     deps = [
         ":test_lib",
-        "//tensorflow/contrib/py2tf/pyct",
+        "//tensorflow/contrib/autograph/pyct",
         "//tensorflow/python:client_testlib",
     ],
 )
@@ -210,7 +211,7 @@ py_test(
     srcs_version = "PY2AND3",
     deps = [
         ":test_lib",
-        "//tensorflow/contrib/py2tf/pyct",
+        "//tensorflow/contrib/autograph/pyct",
         "//tensorflow/python:client_testlib",
     ],
 )
diff --git a/tensorflow/contrib/py2tf/converters/__init__.py b/tensorflow/contrib/autograph/converters/__init__.py
index ca10896ee5..e4e8eda42f 100644
--- a/tensorflow/contrib/py2tf/converters/__init__.py
+++ b/tensorflow/contrib/autograph/converters/__init__.py
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # ==============================================================================
-"""Code converters used by Py2TF."""
+"""Code converters used by Autograph."""
 
 from __future__ import absolute_import
 from __future__ import division
diff --git a/tensorflow/contrib/py2tf/converters/asserts.py b/tensorflow/contrib/autograph/converters/asserts.py
index 5b9b8e772b..f011a97ade 100644
--- a/tensorflow/contrib/py2tf/converters/asserts.py
+++ b/tensorflow/contrib/autograph/converters/asserts.py
@@ -20,8 +20,8 @@ from __future__ import print_function
 
 import gast
 
-from tensorflow.contrib.py2tf.pyct import templates
-from tensorflow.contrib.py2tf.pyct import transformer
+from tensorflow.contrib.autograph.pyct import templates
+from tensorflow.contrib.autograph.pyct import transformer
 
 
 class AssertsTransformer(transformer.Base):
diff --git a/tensorflow/contrib/py2tf/converters/asserts_test.py b/tensorflow/contrib/autograph/converters/asserts_test.py
index 6611f2777a..cc913febe8 100644
--- a/tensorflow/contrib/py2tf/converters/asserts_test.py
+++ b/tensorflow/contrib/autograph/converters/asserts_test.py
@@ -20,8 +20,8 @@ from __future__ import print_function
 
 import gast
 
-from tensorflow.contrib.py2tf.converters import asserts
-from tensorflow.contrib.py2tf.converters import converter_test_base
+from tensorflow.contrib.autograph.converters import asserts
+from tensorflow.contrib.autograph.converters import converter_test_base
 from tensorflow.python.platform import test
 
 
diff --git a/tensorflow/contrib/py2tf/converters/break_statements.py b/tensorflow/contrib/autograph/converters/break_statements.py
index bfb709c5e3..721bc0ccd0 100644
--- a/tensorflow/contrib/py2tf/converters/break_statements.py
+++ b/tensorflow/contrib/autograph/converters/break_statements.py
@@ -20,10 +20,10 @@ from __future__ import print_function
 
 import gast
 
-from tensorflow.contrib.py2tf.pyct import anno
-from tensorflow.contrib.py2tf.pyct import templates
-from tensorflow.contrib.py2tf.pyct import transformer
-from tensorflow.contrib.py2tf.pyct.static_analysis.annos import NodeAnno
+from tensorflow.contrib.autograph.pyct import anno
+from tensorflow.contrib.autograph.pyct import templates
+from tensorflow.contrib.autograph.pyct import transformer
+from tensorflow.contrib.autograph.pyct.static_analysis.annos import NodeAnno
 
 
 class BreakCanonicalizationTransformer(transformer.Base):
diff --git a/tensorflow/contrib/py2tf/converters/break_statements_test.py b/tensorflow/contrib/autograph/converters/break_statements_test.py
index 095fcdff07..dd4914a022 100644
--- a/tensorflow/contrib/py2tf/converters/break_statements_test.py
+++ b/tensorflow/contrib/autograph/converters/break_statements_test.py
@@ -18,8 +18,8 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
-from tensorflow.contrib.py2tf.converters import break_statements
-from tensorflow.contrib.py2tf.converters import converter_test_base
+from tensorflow.contrib.autograph.converters import break_statements
+from tensorflow.contrib.autograph.converters import converter_test_base
 from tensorflow.python.platform import test
 
 
diff --git a/tensorflow/contrib/py2tf/converters/builtin_functions.py b/tensorflow/contrib/autograph/converters/builtin_functions.py
index f1129ef153..0349ce29ce 100644
--- a/tensorflow/contrib/py2tf/converters/builtin_functions.py
+++ b/tensorflow/contrib/autograph/converters/builtin_functions.py
@@ -20,8 +20,8 @@ from __future__ import print_function
 
 import gast
 
-from tensorflow.contrib.py2tf.pyct import templates
-from tensorflow.contrib.py2tf.pyct import transformer
+from tensorflow.contrib.autograph.pyct import templates
+from tensorflow.contrib.autograph.pyct import transformer
 
 
 class BuiltinFunctionTransformer(transformer.Base):
@@ -38,13 +38,13 @@ class BuiltinFunctionTransformer(transformer.Base):
 
   def _convert_builtin(self, node):
     template = """
-      py2tf_utils.dynamic_builtin(func, args)
+      autograph_utils.dynamic_builtin(func, args)
     """
     return templates.replace(template, func=node.func, args=node.args)[0].value
 
   def _convert_print(self, node):
     template = """
-      py2tf_utils.dynamic_print(args)
+      autograph_utils.dynamic_print(args)
     """
     return templates.replace(template, args=node.args)[0].value
 
diff --git a/tensorflow/contrib/py2tf/converters/builtin_functions_test.py b/tensorflow/contrib/autograph/converters/builtin_functions_test.py
index eb60a1d8ae..ac7e756c47 100644
--- a/tensorflow/contrib/py2tf/converters/builtin_functions_test.py
+++ b/tensorflow/contrib/autograph/converters/builtin_functions_test.py
@@ -22,8 +22,8 @@ import sys
 
 import six
 
-from tensorflow.contrib.py2tf.converters import builtin_functions
-from tensorflow.contrib.py2tf.converters import converter_test_base
+from tensorflow.contrib.autograph.converters import builtin_functions
+from tensorflow.contrib.autograph.converters import converter_test_base
 from tensorflow.python.framework import constant_op
 from tensorflow.python.ops import array_ops
 from tensorflow.python.ops import logging_ops
diff --git a/tensorflow/contrib/py2tf/converters/call_trees.py b/tensorflow/contrib/autograph/converters/call_trees.py
index f498b814bf..61f6bfd7e7 100644
--- a/tensorflow/contrib/py2tf/converters/call_trees.py
+++ b/tensorflow/contrib/autograph/converters/call_trees.py
@@ -27,12 +27,12 @@ import types
 
 import gast
 
-from tensorflow.contrib.py2tf.pyct import anno
-from tensorflow.contrib.py2tf.pyct import ast_util
-from tensorflow.contrib.py2tf.pyct import inspect_utils
-from tensorflow.contrib.py2tf.pyct import parser
-from tensorflow.contrib.py2tf.pyct import templates
-from tensorflow.contrib.py2tf.pyct import transformer
+from tensorflow.contrib.autograph.pyct import anno
+from tensorflow.contrib.autograph.pyct import ast_util
+from tensorflow.contrib.autograph.pyct import inspect_utils
+from tensorflow.contrib.autograph.pyct import parser
+from tensorflow.contrib.autograph.pyct import templates
+from tensorflow.contrib.autograph.pyct import transformer
 from tensorflow.python.util import tf_inspect
 
 
@@ -199,7 +199,7 @@ class CallTreeTransformer(transformer.Base):
   def _wrap_to_py_func_no_return(self, node):
     # TODO(mdan): Properly handle varargs, etc.
     template = """
-      py2tf_utils.wrap_py_func(func, None, (args,), kwargs, True)
+      autograph_utils.wrap_py_func(func, None, (args,), kwargs, True)
     """
     return templates.replace(
         template,
@@ -210,7 +210,7 @@ class CallTreeTransformer(transformer.Base):
   def _wrap_to_py_func_single_return(self, node, dtype):
     # TODO(mdan): Properly handle varargs, etc.
     template = """
-      py2tf_utils.wrap_py_func(func, dtype, (args,), kwargs, False)
+      autograph_utils.wrap_py_func(func, dtype, (args,), kwargs, False)
     """
     return templates.replace_as_expression(
         template,
@@ -238,10 +238,9 @@ class CallTreeTransformer(transformer.Base):
     # Before we could convert all the time though, we'd need a reasonable
     # caching mechanism.
     template = """
-      py2tf_api.converted_call(func, True, False, {}, args)
+      autograph_api.converted_call(func, True, False, {}, args)
     """
-    call_expr = templates.replace(
-        template, func=node.func, args=node.args)
+    call_expr = templates.replace(template, func=node.func, args=node.args)
     new_call = call_expr[0].value
     # TODO(mdan): Improve the template mechanism to better support this.
     new_call.keywords = node.keywords
diff --git a/tensorflow/contrib/py2tf/converters/call_trees_test.py b/tensorflow/contrib/autograph/converters/call_trees_test.py
index 1106432da6..c666dcb73b 100644
--- a/tensorflow/contrib/py2tf/converters/call_trees_test.py
+++ b/tensorflow/contrib/autograph/converters/call_trees_test.py
@@ -20,8 +20,8 @@ from __future__ import print_function
 
 import numpy as np
 
-from tensorflow.contrib.py2tf.converters import call_trees
-from tensorflow.contrib.py2tf.converters import converter_test_base
+from tensorflow.contrib.autograph.converters import call_trees
+from tensorflow.contrib.autograph.converters import converter_test_base
 from tensorflow.python.framework import constant_op
 from tensorflow.python.framework import dtypes
 from tensorflow.python.framework import ops
diff --git a/tensorflow/contrib/py2tf/converters/continue_statements.py b/tensorflow/contrib/autograph/converters/continue_statements.py
index 4069a678b1..4299a8a9d5 100644
--- a/tensorflow/contrib/py2tf/converters/continue_statements.py
+++ b/tensorflow/contrib/autograph/converters/continue_statements.py
@@ -18,10 +18,10 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
-from tensorflow.contrib.py2tf.pyct import anno
-from tensorflow.contrib.py2tf.pyct import templates
-from tensorflow.contrib.py2tf.pyct import transformer
-from tensorflow.contrib.py2tf.pyct.static_analysis.annos import NodeAnno
+from tensorflow.contrib.autograph.pyct import anno
+from tensorflow.contrib.autograph.pyct import templates
+from tensorflow.contrib.autograph.pyct import transformer
+from tensorflow.contrib.autograph.pyct.static_analysis.annos import NodeAnno
 
 
 class ContinueCanonicalizationTransformer(transformer.Base):
diff --git a/tensorflow/contrib/py2tf/converters/continue_statements_test.py b/tensorflow/contrib/autograph/converters/continue_statements_test.py
index a598dcd1ae..bcbb316d74 100644
--- a/tensorflow/contrib/py2tf/converters/continue_statements_test.py
+++ b/tensorflow/contrib/autograph/converters/continue_statements_test.py
@@ -18,8 +18,8 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
-from tensorflow.contrib.py2tf.converters import continue_statements
-from tensorflow.contrib.py2tf.converters import converter_test_base
+from tensorflow.contrib.autograph.converters import continue_statements
+from tensorflow.contrib.autograph.converters import converter_test_base
 from tensorflow.python.platform import test
 
 
diff --git a/tensorflow/contrib/py2tf/converters/control_flow.py b/tensorflow/contrib/autograph/converters/control_flow.py
index 762c26f0c7..49d932026f 100644
--- a/tensorflow/contrib/py2tf/converters/control_flow.py
+++ b/tensorflow/contrib/autograph/converters/control_flow.py
@@ -20,11 +20,11 @@ from __future__ import print_function
 
 import gast
 
-from tensorflow.contrib.py2tf.pyct import anno
-from tensorflow.contrib.py2tf.pyct import ast_util
-from tensorflow.contrib.py2tf.pyct import templates
-from tensorflow.contrib.py2tf.pyct import transformer
-from tensorflow.contrib.py2tf.pyct.static_analysis.annos import NodeAnno
+from tensorflow.contrib.autograph.pyct import anno
+from tensorflow.contrib.autograph.pyct import ast_util
+from tensorflow.contrib.autograph.pyct import templates
+from tensorflow.contrib.autograph.pyct import transformer
+from tensorflow.contrib.autograph.pyct.static_analysis.annos import NodeAnno
 
 
 class SymbolNamer(object):
@@ -82,7 +82,7 @@ class ControlFlowTransformer(transformer.Base):
   def _create_cond_expr(self, results, test, body_name, orelse_name):
     if results is not None:
       template = """
-        results = py2tf_utils.run_cond(test, body_name, orelse_name)
+        results = autograph_utils.run_cond(test, body_name, orelse_name)
       """
       return templates.replace(
           template,
@@ -92,7 +92,7 @@ class ControlFlowTransformer(transformer.Base):
           orelse_name=orelse_name)
     else:
       template = """
-        py2tf_utils.run_cond(test, body_name, orelse_name)
+        autograph_utils.run_cond(test, body_name, orelse_name)
       """
       return templates.replace(
           template, test=test, body_name=body_name, orelse_name=orelse_name)
@@ -204,7 +204,7 @@ class ControlFlowTransformer(transformer.Base):
       def body_name(state_ssf):
         body
         return state_ssf,
-      state_ast_tuple = py2tf_utils.run_while(test_name, body_name, [state])
+      state_ast_tuple = autograph_utils.run_while(test_name, body_name, [state])
     """
     node = templates.replace(
         template,
diff --git a/tensorflow/contrib/py2tf/converters/control_flow_test.py b/tensorflow/contrib/autograph/converters/control_flow_test.py
index b785b284a7..86fed51f27 100644
--- a/tensorflow/contrib/py2tf/converters/control_flow_test.py
+++ b/tensorflow/contrib/autograph/converters/control_flow_test.py
@@ -18,8 +18,8 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
-from tensorflow.contrib.py2tf.converters import control_flow
-from tensorflow.contrib.py2tf.converters import converter_test_base
+from tensorflow.contrib.autograph.converters import control_flow
+from tensorflow.contrib.autograph.converters import converter_test_base
 from tensorflow.python.framework import constant_op
 from tensorflow.python.ops import control_flow_ops
 from tensorflow.python.platform import test
diff --git a/tensorflow/contrib/py2tf/converters/converter_test_base.py b/tensorflow/contrib/autograph/converters/converter_test_base.py
index 8c08c5492a..3ea2cfd668 100644
--- a/tensorflow/contrib/py2tf/converters/converter_test_base.py
+++ b/tensorflow/contrib/autograph/converters/converter_test_base.py
@@ -21,15 +21,15 @@ from __future__ import print_function
 import contextlib
 import imp
 
-from tensorflow.contrib.py2tf import utils
-from tensorflow.contrib.py2tf.pyct import compiler
-from tensorflow.contrib.py2tf.pyct import context
-from tensorflow.contrib.py2tf.pyct import parser
-from tensorflow.contrib.py2tf.pyct import pretty_printer
-from tensorflow.contrib.py2tf.pyct import qual_names
-from tensorflow.contrib.py2tf.pyct.static_analysis import activity
-from tensorflow.contrib.py2tf.pyct.static_analysis import live_values
-from tensorflow.contrib.py2tf.pyct.static_analysis import type_info
+from tensorflow.contrib.autograph import utils
+from tensorflow.contrib.autograph.pyct import compiler
+from tensorflow.contrib.autograph.pyct import context
+from tensorflow.contrib.autograph.pyct import parser
+from tensorflow.contrib.autograph.pyct import pretty_printer
+from tensorflow.contrib.autograph.pyct import qual_names
+from tensorflow.contrib.autograph.pyct.static_analysis import activity
+from tensorflow.contrib.autograph.pyct.static_analysis import live_values
+from tensorflow.contrib.autograph.pyct.static_analysis import type_info
 from tensorflow.python.platform import test
 
 
@@ -75,8 +75,8 @@ class TestCase(test.TestCase):
     try:
       result, source = compiler.ast_to_object(node)
       result.tf = self.make_fake_mod('fake_tf', *symbols)
-      result.py2tf_utils = utils
-      result.py2tf_api = self.make_fake_mod('fake_api', converted_call)
+      result.autograph_utils = utils
+      result.autograph_api = self.make_fake_mod('fake_api', converted_call)
       yield result
     except Exception:  # pylint:disable=broad-except
       if source is None:
diff --git a/tensorflow/contrib/py2tf/converters/decorators.py b/tensorflow/contrib/autograph/converters/decorators.py
index 68bf241ef3..92445f3174 100644
--- a/tensorflow/contrib/py2tf/converters/decorators.py
+++ b/tensorflow/contrib/autograph/converters/decorators.py
@@ -24,8 +24,8 @@ from __future__ import print_function
 
 import gast
 
-from tensorflow.contrib.py2tf.pyct import anno
-from tensorflow.contrib.py2tf.pyct import pretty_printer
+from tensorflow.contrib.autograph.pyct import anno
+from tensorflow.contrib.autograph.pyct import pretty_printer
 
 
 class DecoratorsTransformer(gast.NodeTransformer):
diff --git a/tensorflow/contrib/py2tf/converters/decorators_test.py b/tensorflow/contrib/autograph/converters/decorators_test.py
index c75e546174..e67ab1cd6a 100644
--- a/tensorflow/contrib/py2tf/converters/decorators_test.py
+++ b/tensorflow/contrib/autograph/converters/decorators_test.py
@@ -20,9 +20,9 @@ from __future__ import print_function
 
 from functools import wraps
 
-from tensorflow.contrib.py2tf.converters import converter_test_base
-from tensorflow.contrib.py2tf.converters import decorators
-from tensorflow.contrib.py2tf.pyct import compiler
+from tensorflow.contrib.autograph.converters import converter_test_base
+from tensorflow.contrib.autograph.converters import decorators
+from tensorflow.contrib.autograph.pyct import compiler
 from tensorflow.python.platform import test
 
 
diff --git a/tensorflow/contrib/py2tf/converters/for_loops.py b/tensorflow/contrib/autograph/converters/for_loops.py
index 8d28b149a8..4999c47bdc 100644
--- a/tensorflow/contrib/py2tf/converters/for_loops.py
+++ b/tensorflow/contrib/autograph/converters/for_loops.py
@@ -22,10 +22,10 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
-from tensorflow.contrib.py2tf.pyct import anno
-from tensorflow.contrib.py2tf.pyct import templates
-from tensorflow.contrib.py2tf.pyct import transformer
-from tensorflow.contrib.py2tf.pyct.static_analysis.annos import NodeAnno
+from tensorflow.contrib.autograph.pyct import anno
+from tensorflow.contrib.autograph.pyct import templates
+from tensorflow.contrib.autograph.pyct import transformer
+from tensorflow.contrib.autograph.pyct.static_analysis.annos import NodeAnno
 
 
 class ForLoopCanonicalizationTransformer(transformer.Base):
@@ -45,12 +45,12 @@ class ForLoopCanonicalizationTransformer(transformer.Base):
     if anno.hasanno(node, 'extra_cond'):
       template = """
         i = 0
-        smart_loop_iter = py2tf_utils.dynamic_dataset(loop_iter)
-        cont, target = py2tf_utils.dynamic_for_cond(i, smart_loop_iter)
+        smart_loop_iter = autograph_utils.dynamic_dataset(loop_iter)
+        cont, target = autograph_utils.dynamic_for_cond(i, smart_loop_iter)
         while cont and extra_cond:
           body
           i += 1
-          cont, target = py2tf_utils.dynamic_for_cond(i, smart_loop_iter)
+          cont, target = autograph_utils.dynamic_for_cond(i, smart_loop_iter)
       """
       return templates.replace(
           template,
@@ -64,12 +64,12 @@ class ForLoopCanonicalizationTransformer(transformer.Base):
     else:
       template = """
         i = 0
-        smart_loop_iter = py2tf_utils.dynamic_dataset(loop_iter)
-        cont, target = py2tf_utils.dynamic_for_cond(i, smart_loop_iter)
+        smart_loop_iter = autograph_utils.dynamic_dataset(loop_iter)
+        cont, target = autograph_utils.dynamic_for_cond(i, smart_loop_iter)
         while cont:
           body
           i += 1
-          cont, target = py2tf_utils.dynamic_for_cond(i, smart_loop_iter)
+          cont, target = autograph_utils.dynamic_for_cond(i, smart_loop_iter)
       """
       repl = templates.replace(
           template,
diff --git a/tensorflow/contrib/py2tf/converters/for_loops_test.py b/tensorflow/contrib/autograph/converters/for_loops_test.py
index b6e3e8c8d8..943f52de55 100644
--- a/tensorflow/contrib/py2tf/converters/for_loops_test.py
+++ b/tensorflow/contrib/autograph/converters/for_loops_test.py
@@ -18,8 +18,8 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
-from tensorflow.contrib.py2tf.converters import converter_test_base
-from tensorflow.contrib.py2tf.converters import for_loops
+from tensorflow.contrib.autograph.converters import converter_test_base
+from tensorflow.contrib.autograph.converters import for_loops
 from tensorflow.python.platform import test
 
 
diff --git a/tensorflow/contrib/py2tf/converters/ifexp.py b/tensorflow/contrib/autograph/converters/ifexp.py
index 5fd6f348af..aff94d2b79 100644
--- a/tensorflow/contrib/py2tf/converters/ifexp.py
+++ b/tensorflow/contrib/autograph/converters/ifexp.py
@@ -18,8 +18,8 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
-from tensorflow.contrib.py2tf.pyct import templates
-from tensorflow.contrib.py2tf.pyct import transformer
+from tensorflow.contrib.autograph.pyct import templates
+from tensorflow.contrib.autograph.pyct import transformer
 
 
 class IfExp(transformer.Base):
@@ -27,7 +27,7 @@ class IfExp(transformer.Base):
 
   def visit_IfExp(self, node):
     template = """
-        py2tf_utils.run_cond(test, lambda: body, lambda: orelse)
+        autograph_utils.run_cond(test, lambda: body, lambda: orelse)
     """
     desugared_ifexp = templates.replace_as_expression(
         template, test=node.test, body=node.body, orelse=node.orelse)
diff --git a/tensorflow/contrib/py2tf/converters/ifexp_test.py b/tensorflow/contrib/autograph/converters/ifexp_test.py
index 9c357ef35b..ac6849dcb4 100644
--- a/tensorflow/contrib/py2tf/converters/ifexp_test.py
+++ b/tensorflow/contrib/autograph/converters/ifexp_test.py
@@ -18,9 +18,9 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
-from tensorflow.contrib.py2tf import utils
-from tensorflow.contrib.py2tf.converters import converter_test_base
-from tensorflow.contrib.py2tf.converters import ifexp
+from tensorflow.contrib.autograph import utils
+from tensorflow.contrib.autograph.converters import converter_test_base
+from tensorflow.contrib.autograph.converters import ifexp
 from tensorflow.python.platform import test
 
 
@@ -38,7 +38,7 @@ class IfExpTest(converter_test_base.TestCase):
       return 1 if x else 0
 
     with self.compiled_fn(test_fn) as result:
-      result.py2tf_util = utils
+      result.autograph_util = utils
       for x in [0, 1]:
         self.assertEqual(test_fn(x), result.test_fn(x))
 
@@ -52,7 +52,7 @@ class IfExpTest(converter_test_base.TestCase):
       return y
 
     with self.compiled_fn(test_fn) as result:
-      result.py2tf_util = utils
+      result.autograph_util = utils
       result.f = f
       for x in [-2, 2]:
         self.assertEqual(test_fn(x), result.test_fn(x))
@@ -63,7 +63,7 @@ class IfExpTest(converter_test_base.TestCase):
       return x * x if x > 0 else x
 
     with self.compiled_fn(test_fn) as result:
-      result.py2tf_util = utils
+      result.autograph_util = utils
       for x in [-2, 2]:
         self.assertEqual(test_fn(x), result.test_fn(x))
 
@@ -73,7 +73,7 @@ class IfExpTest(converter_test_base.TestCase):
       return x * x if x > 0 else x if x else 1
 
     with self.compiled_fn(test_fn) as result:
-      result.py2tf_util = utils
+      result.autograph_util = utils
       for x in [-2, 0, 2]:
         self.assertEqual(test_fn(x), result.test_fn(x))
 
@@ -85,7 +85,7 @@ class IfExpTest(converter_test_base.TestCase):
       return -x
 
     with self.compiled_fn(test_fn) as result:
-      result.py2tf_util = utils
+      result.autograph_util = utils
       for x in [-2, 2, 5]:
         self.assertEqual(test_fn(x), result.test_fn(x))
 
@@ -97,7 +97,7 @@ class IfExpTest(converter_test_base.TestCase):
       return x
 
     with self.compiled_fn(test_fn) as result:
-      result.py2tf_util = utils
+      result.autograph_util = utils
       for x in [-2, 2, 5]:
         self.assertEqual(test_fn(x), result.test_fn(x))
 
diff --git a/tensorflow/contrib/py2tf/converters/list_comprehension.py b/tensorflow/contrib/autograph/converters/list_comprehension.py
index e874483110..d7f2920151 100644
--- a/tensorflow/contrib/py2tf/converters/list_comprehension.py
+++ b/tensorflow/contrib/autograph/converters/list_comprehension.py
@@ -31,9 +31,9 @@ from __future__ import print_function
 
 import gast
 
-from tensorflow.contrib.py2tf.pyct import parser
-from tensorflow.contrib.py2tf.pyct import templates
-from tensorflow.contrib.py2tf.pyct import transformer
+from tensorflow.contrib.autograph.pyct import parser
+from tensorflow.contrib.autograph.pyct import templates
+from tensorflow.contrib.autograph.pyct import transformer
 
 
 class ListCompCanonicalizationTransformer(transformer.Base):
diff --git a/tensorflow/contrib/py2tf/converters/list_comprehension_test.py b/tensorflow/contrib/autograph/converters/list_comprehension_test.py
index 025fac11e4..4758671f5e 100644
--- a/tensorflow/contrib/py2tf/converters/list_comprehension_test.py
+++ b/tensorflow/contrib/autograph/converters/list_comprehension_test.py
@@ -18,8 +18,8 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
-from tensorflow.contrib.py2tf.converters import converter_test_base
-from tensorflow.contrib.py2tf.converters import list_comprehension
+from tensorflow.contrib.autograph.converters import converter_test_base
+from tensorflow.contrib.autograph.converters import list_comprehension
 from tensorflow.python.platform import test
 
 
diff --git a/tensorflow/contrib/py2tf/converters/lists.py b/tensorflow/contrib/autograph/converters/lists.py
index 3e62037a50..234a0a7487 100644
--- a/tensorflow/contrib/py2tf/converters/lists.py
+++ b/tensorflow/contrib/autograph/converters/lists.py
@@ -32,9 +32,9 @@ from __future__ import print_function
 
 import gast
 
-from tensorflow.contrib.py2tf.pyct import anno
-from tensorflow.contrib.py2tf.pyct import templates
-from tensorflow.contrib.py2tf.pyct import transformer
+from tensorflow.contrib.autograph.pyct import anno
+from tensorflow.contrib.autograph.pyct import templates
+from tensorflow.contrib.autograph.pyct import transformer
 from tensorflow.python.framework import dtypes
 
 
@@ -74,7 +74,7 @@ class ListTransformer(transformer.Base):
 
       if qn.qn[-1] == 'append' and (len(call_node.args) == 1):
         template = """
-          target = py2tf_utils.dynamic_list_append(target, element)
+          target = autograph_utils.dynamic_list_append(target, element)
         """
         node = templates.replace(
             template,
diff --git a/tensorflow/contrib/py2tf/converters/lists_test.py b/tensorflow/contrib/autograph/converters/lists_test.py
index 671a1cc7b1..749ba14347 100644
--- a/tensorflow/contrib/py2tf/converters/lists_test.py
+++ b/tensorflow/contrib/autograph/converters/lists_test.py
@@ -18,9 +18,9 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
-from tensorflow.contrib.py2tf import utils
-from tensorflow.contrib.py2tf.converters import converter_test_base
-from tensorflow.contrib.py2tf.converters import lists
+from tensorflow.contrib.autograph import utils
+from tensorflow.contrib.autograph.converters import converter_test_base
+from tensorflow.contrib.autograph.converters import lists
 from tensorflow.python.framework import dtypes
 from tensorflow.python.ops import tensor_array_ops
 from tensorflow.python.platform import test
diff --git a/tensorflow/contrib/py2tf/converters/logical_expressions.py b/tensorflow/contrib/autograph/converters/logical_expressions.py
index e0abf74ebc..3a795a315a 100644
--- a/tensorflow/contrib/py2tf/converters/logical_expressions.py
+++ b/tensorflow/contrib/autograph/converters/logical_expressions.py
@@ -23,10 +23,10 @@ from __future__ import print_function
 
 import gast
 
-from tensorflow.contrib.py2tf.pyct import anno
-from tensorflow.contrib.py2tf.pyct import parser
-from tensorflow.contrib.py2tf.pyct import templates
-from tensorflow.contrib.py2tf.pyct import transformer
+from tensorflow.contrib.autograph.pyct import anno
+from tensorflow.contrib.autograph.pyct import parser
+from tensorflow.contrib.autograph.pyct import templates
+from tensorflow.contrib.autograph.pyct import transformer
 
 
 # TODO(mdan): Properly extrack boolean ops according to lazy eval rules.
@@ -57,8 +57,8 @@ class LogicalExpressionTransformer(transformer.Base):
         gast.NotEq: 'tf.not_equal',
         gast.Or: 'tf.logical_or',
         gast.USub: 'tf.negative',
-        gast.Is: 'py2tf_utils.dynamic_is',
-        gast.IsNot: 'py2tf_utils.dynamic_is_not'
+        gast.Is: 'autograph_utils.dynamic_is',
+        gast.IsNot: 'autograph_utils.dynamic_is_not'
     }
 
   def _expect_simple_symbol(self, operand):
diff --git a/tensorflow/contrib/py2tf/converters/logical_expressions_test.py b/tensorflow/contrib/autograph/converters/logical_expressions_test.py
index eb28c309a4..2814060c4d 100644
--- a/tensorflow/contrib/py2tf/converters/logical_expressions_test.py
+++ b/tensorflow/contrib/autograph/converters/logical_expressions_test.py
@@ -18,8 +18,8 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
-from tensorflow.contrib.py2tf.converters import converter_test_base
-from tensorflow.contrib.py2tf.converters import logical_expressions
+from tensorflow.contrib.autograph.converters import converter_test_base
+from tensorflow.contrib.autograph.converters import logical_expressions
 from tensorflow.python.ops import math_ops
 from tensorflow.python.platform import test
 
diff --git a/tensorflow/contrib/py2tf/converters/name_scopes.py b/tensorflow/contrib/autograph/converters/name_scopes.py
index c702823fcf..2a3f474360 100644
--- a/tensorflow/contrib/py2tf/converters/name_scopes.py
+++ b/tensorflow/contrib/autograph/converters/name_scopes.py
@@ -21,8 +21,8 @@ from __future__ import print_function
 
 import gast
 
-from tensorflow.contrib.py2tf.pyct import templates
-from tensorflow.contrib.py2tf.pyct import transformer
+from tensorflow.contrib.autograph.pyct import templates
+from tensorflow.contrib.autograph.pyct import transformer
 
 
 class FunctionNameScopeTransformer(transformer.Base):
diff --git a/tensorflow/contrib/py2tf/converters/name_scopes_test.py b/tensorflow/contrib/autograph/converters/name_scopes_test.py
index a8ca341602..61e5db2af8 100644
--- a/tensorflow/contrib/py2tf/converters/name_scopes_test.py
+++ b/tensorflow/contrib/autograph/converters/name_scopes_test.py
@@ -18,8 +18,8 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
-from tensorflow.contrib.py2tf.converters import converter_test_base
-from tensorflow.contrib.py2tf.converters import name_scopes
+from tensorflow.contrib.autograph.converters import converter_test_base
+from tensorflow.contrib.autograph.converters import name_scopes
 from tensorflow.python.framework import constant_op
 from tensorflow.python.framework import ops
 from tensorflow.python.platform import test
diff --git a/tensorflow/contrib/py2tf/converters/side_effect_guards.py b/tensorflow/contrib/autograph/converters/side_effect_guards.py
index 30976b3ec6..1c1293d2c4 100644
--- a/tensorflow/contrib/py2tf/converters/side_effect_guards.py
+++ b/tensorflow/contrib/autograph/converters/side_effect_guards.py
@@ -36,12 +36,12 @@ from __future__ import print_function
 
 import gast
 
-from tensorflow.contrib.py2tf.pyct import anno
-from tensorflow.contrib.py2tf.pyct import ast_util
-from tensorflow.contrib.py2tf.pyct import qual_names
-from tensorflow.contrib.py2tf.pyct import templates
-from tensorflow.contrib.py2tf.pyct import transformer
-from tensorflow.contrib.py2tf.pyct.static_analysis.annos import NodeAnno
+from tensorflow.contrib.autograph.pyct import anno
+from tensorflow.contrib.autograph.pyct import ast_util
+from tensorflow.contrib.autograph.pyct import qual_names
+from tensorflow.contrib.autograph.pyct import templates
+from tensorflow.contrib.autograph.pyct import transformer
+from tensorflow.contrib.autograph.pyct.static_analysis.annos import NodeAnno
 
 
 class SymbolNamer(object):
@@ -160,8 +160,8 @@ class SideEffectGuardTransformer(transformer.Base):
               [alias_map.get(s, s).ast() for s in guarded_args], None)
 
         template = """
-          with py2tf_utils.control_dependency_on_returns(call):
-            aliased_guarded_args = py2tf_utils.alias_tensors(guarded_args)
+          with autograph_utils.control_dependency_on_returns(call):
+            aliased_guarded_args = autograph_utils.alias_tensors(guarded_args)
         """
         control_deps_guard = templates.replace(
             template,
@@ -172,7 +172,7 @@ class SideEffectGuardTransformer(transformer.Base):
         alias_map = {}
 
         template = """
-          with py2tf_utils.control_dependency_on_returns(call):
+          with autograph_utils.control_dependency_on_returns(call):
             pass
         """
         control_deps_guard = templates.replace(template, call=node.value)[-1]
diff --git a/tensorflow/contrib/py2tf/converters/side_effect_guards_test.py b/tensorflow/contrib/autograph/converters/side_effect_guards_test.py
index 463db2e770..ce0ce33243 100644
--- a/tensorflow/contrib/py2tf/converters/side_effect_guards_test.py
+++ b/tensorflow/contrib/autograph/converters/side_effect_guards_test.py
@@ -18,8 +18,8 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
-from tensorflow.contrib.py2tf.converters import converter_test_base
-from tensorflow.contrib.py2tf.converters import side_effect_guards
+from tensorflow.contrib.autograph.converters import converter_test_base
+from tensorflow.contrib.autograph.converters import side_effect_guards
 from tensorflow.python.framework import constant_op
 from tensorflow.python.framework import errors_impl
 from tensorflow.python.framework import ops
diff --git a/tensorflow/contrib/py2tf/converters/single_return.py b/tensorflow/contrib/autograph/converters/single_return.py
index 1194b98f5e..bcc9ca9dfe 100644
--- a/tensorflow/contrib/py2tf/converters/single_return.py
+++ b/tensorflow/contrib/autograph/converters/single_return.py
@@ -20,11 +20,11 @@ from __future__ import print_function
 
 import gast
 
-from tensorflow.contrib.py2tf.pyct import anno
-from tensorflow.contrib.py2tf.pyct import ast_util
-from tensorflow.contrib.py2tf.pyct import templates
-from tensorflow.contrib.py2tf.pyct import transformer
-from tensorflow.contrib.py2tf.pyct.static_analysis.annos import NodeAnno
+from tensorflow.contrib.autograph.pyct import anno
+from tensorflow.contrib.autograph.pyct import ast_util
+from tensorflow.contrib.autograph.pyct import templates
+from tensorflow.contrib.autograph.pyct import transformer
+from tensorflow.contrib.autograph.pyct.static_analysis.annos import NodeAnno
 
 
 # TODO(mdan): Move this logic into transformer_base.
@@ -232,7 +232,7 @@ class DetectReturnInUnsupportedControlFlow(gast.NodeVisitor):
   def visit_Return(self, node):
     if self.cant_return:
       raise ValueError(
-          'Pyflow currently does not support `return` statements in loops. '
+          '`return` statements are not supported in loops. '
           'Try assigning to a variable in the while loop, and returning '
           'outside of the loop')
 
diff --git a/tensorflow/contrib/py2tf/converters/single_return_test.py b/tensorflow/contrib/autograph/converters/single_return_test.py
index 2ea7a9d6d3..d483005a09 100644
--- a/tensorflow/contrib/py2tf/converters/single_return_test.py
+++ b/tensorflow/contrib/autograph/converters/single_return_test.py
@@ -18,8 +18,8 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
-from tensorflow.contrib.py2tf.converters import converter_test_base
-from tensorflow.contrib.py2tf.converters import single_return
+from tensorflow.contrib.autograph.converters import converter_test_base
+from tensorflow.contrib.autograph.converters import single_return
 from tensorflow.python.framework.ops import name_scope
 from tensorflow.python.platform import test
 
diff --git a/tensorflow/contrib/py2tf/impl/BUILD b/tensorflow/contrib/autograph/impl/BUILD
index cc49d71b78..e468176da1 100644
--- a/tensorflow/contrib/py2tf/impl/BUILD
+++ b/tensorflow/contrib/autograph/impl/BUILD
@@ -25,10 +25,10 @@ py_library(
     srcs_version = "PY2AND3",
     visibility = ["//tensorflow:__subpackages__"],
     deps = [
-        "//tensorflow/contrib/py2tf/converters",
-        "//tensorflow/contrib/py2tf/pyct",
-        "//tensorflow/contrib/py2tf/pyct/static_analysis",
-        "//tensorflow/contrib/py2tf/utils",
+        "//tensorflow/contrib/autograph/converters",
+        "//tensorflow/contrib/autograph/pyct",
+        "//tensorflow/contrib/autograph/pyct/static_analysis",
+        "//tensorflow/contrib/autograph/utils",
         "@gast_archive//:gast",
         "@six_archive//:six",
     ],
@@ -40,7 +40,7 @@ py_test(
     srcs_version = "PY2AND3",
     deps = [
         ":impl",
-        "//tensorflow/contrib/py2tf/utils",
+        "//tensorflow/contrib/autograph/utils",
         "//tensorflow/python:client_testlib",
         "//third_party/py/numpy",
     ],
diff --git a/tensorflow/contrib/py2tf/impl/api.py b/tensorflow/contrib/autograph/impl/api.py
index a9e8ea2043..1c4fcaa622 100644
--- a/tensorflow/contrib/py2tf/impl/api.py
+++ b/tensorflow/contrib/autograph/impl/api.py
@@ -27,13 +27,13 @@ import gast
 import six
 # pylint:enable=g-bad-import-order
 
-from tensorflow.contrib.py2tf.impl import config
-from tensorflow.contrib.py2tf.impl import conversion
-from tensorflow.contrib.py2tf.pyct import compiler
-from tensorflow.contrib.py2tf.pyct import inspect_utils
-from tensorflow.contrib.py2tf.pyct import parser
-from tensorflow.contrib.py2tf.utils import builtins
-from tensorflow.contrib.py2tf.utils import py_func
+from tensorflow.contrib.autograph.impl import config
+from tensorflow.contrib.autograph.impl import conversion
+from tensorflow.contrib.autograph.pyct import compiler
+from tensorflow.contrib.autograph.pyct import inspect_utils
+from tensorflow.contrib.autograph.pyct import parser
+from tensorflow.contrib.autograph.utils import builtins
+from tensorflow.contrib.autograph.utils import py_func
 from tensorflow.python.platform import tf_logging as logging
 from tensorflow.python.util import tf_inspect
 
@@ -89,7 +89,7 @@ def do_not_convert(run_as=RunMode.GRAPH, return_dtypes=None):
   Args:
     run_as: RunMode value. Whether to run the function as-is, or wrap it into
         a py_func.
-    return_dtypes: See py2tf.utils.py_func.wrap_py_func. Setting to None or
+    return_dtypes: See autograph.utils.py_func.wrap_py_func. Setting to None or
         empty list or tuple will create a dummy return value that can be used
         to set control dependencies.
 
diff --git a/tensorflow/contrib/py2tf/impl/api_test.py b/tensorflow/contrib/autograph/impl/api_test.py
index a7b1aba852..ee2d301d75 100644
--- a/tensorflow/contrib/py2tf/impl/api_test.py
+++ b/tensorflow/contrib/autograph/impl/api_test.py
@@ -20,11 +20,11 @@ from __future__ import print_function
 
 import numpy as np
 
-from tensorflow.contrib.py2tf import utils
-from tensorflow.contrib.py2tf.impl import api
-from tensorflow.contrib.py2tf.impl import config
-from tensorflow.contrib.py2tf.pyct import parser
-from tensorflow.contrib.py2tf.utils import py_func
+from tensorflow.contrib.autograph import utils
+from tensorflow.contrib.autograph.impl import api
+from tensorflow.contrib.autograph.impl import config
+from tensorflow.contrib.autograph.pyct import parser
+from tensorflow.contrib.autograph.utils import py_func
 from tensorflow.python.framework import constant_op
 from tensorflow.python.platform import test
 
@@ -37,10 +37,8 @@ class ApiTest(test.TestCase):
   def setUp(self):
     config.COMPILED_IMPORT_STATEMENTS = (
         'from __future__ import print_function',
-        'from tensorflow.contrib.py2tf import utils as '
-        'py2tf_utils',
-        'tf = py2tf_utils.fake_tf()'
-    )
+        'from tensorflow.contrib.autograph import utils as '
+        'autograph_utils', 'tf = autograph_utils.fake_tf()')
 
   def test_decorator_recurses(self):
 
@@ -200,7 +198,7 @@ class ApiTest(test.TestCase):
     compiled_code = api.to_code(test_fn)
 
     # Just check for some key words and that it is parseable Python code.
-    self.assertRegexpMatches(compiled_code, 'py2tf_utils\\.run_while')
+    self.assertRegexpMatches(compiled_code, 'autograph_utils\\.run_while')
     self.assertIsNotNone(parser.parse_str(compiled_code))
 
 
diff --git a/tensorflow/contrib/py2tf/impl/config.py b/tensorflow/contrib/autograph/impl/config.py
index bdbc6663dd..543c1486e6 100644
--- a/tensorflow/contrib/py2tf/impl/config.py
+++ b/tensorflow/contrib/autograph/impl/config.py
@@ -18,7 +18,7 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
-from tensorflow.contrib.py2tf import utils
+from tensorflow.contrib.autograph import utils
 
 
 PYTHON_LITERALS = {
@@ -35,16 +35,16 @@ DEFAULT_UNCOMPILED_MODULES = set((
     # All of tensorflow's subpackages. Unlike the root tf module, they don't
     # have well-known names. Not refering to the module directly to avoid
     # circular imports.
-    (utils.__name__[:-len('.contrib.py2tf.utils')],),
+    (
+        utils.__name__[:-len('.contrib.autograph.utils')],),
 ))
 
 NO_SIDE_EFFECT_CONSTRUCTORS = set(('tensorflow',))
 
 # TODO(mdan): Also allow controlling the generated names (for testability).
 COMPILED_IMPORT_STATEMENTS = (
-    'from __future__ import print_function',
-    'import tensorflow as tf',
-    'from tensorflow.contrib.py2tf.impl import api as '
-    'py2tf_api',
-    'from tensorflow.contrib.py2tf import utils as '
-    'py2tf_utils')
+    'from __future__ import print_function', 'import tensorflow as tf',
+    'from tensorflow.contrib.autograph.impl import api as '
+    'autograph_api',
+    'from tensorflow.contrib.autograph import utils as '
+    'autograph_utils')
diff --git a/tensorflow/contrib/py2tf/impl/conversion.py b/tensorflow/contrib/autograph/impl/conversion.py
index 37b24ab55f..62a49cd92d 100644
--- a/tensorflow/contrib/py2tf/impl/conversion.py
+++ b/tensorflow/contrib/autograph/impl/conversion.py
@@ -20,31 +20,31 @@ from __future__ import print_function
 
 import gast
 
-from tensorflow.contrib.py2tf import utils
-from tensorflow.contrib.py2tf.converters import asserts
-from tensorflow.contrib.py2tf.converters import break_statements
-from tensorflow.contrib.py2tf.converters import builtin_functions
-from tensorflow.contrib.py2tf.converters import call_trees
-from tensorflow.contrib.py2tf.converters import continue_statements
-from tensorflow.contrib.py2tf.converters import control_flow
-from tensorflow.contrib.py2tf.converters import decorators
-from tensorflow.contrib.py2tf.converters import for_loops
-from tensorflow.contrib.py2tf.converters import ifexp
-from tensorflow.contrib.py2tf.converters import lists
-from tensorflow.contrib.py2tf.converters import logical_expressions
-from tensorflow.contrib.py2tf.converters import name_scopes
-from tensorflow.contrib.py2tf.converters import side_effect_guards
-from tensorflow.contrib.py2tf.converters import single_return
-from tensorflow.contrib.py2tf.impl import config
-from tensorflow.contrib.py2tf.impl import naming
-from tensorflow.contrib.py2tf.pyct import context
-from tensorflow.contrib.py2tf.pyct import inspect_utils
-from tensorflow.contrib.py2tf.pyct import parser
-from tensorflow.contrib.py2tf.pyct import qual_names
-from tensorflow.contrib.py2tf.pyct.static_analysis import activity
-from tensorflow.contrib.py2tf.pyct.static_analysis import live_values
-from tensorflow.contrib.py2tf.pyct.static_analysis import type_info
-from tensorflow.contrib.py2tf.utils import type_hints
+from tensorflow.contrib.autograph import utils
+from tensorflow.contrib.autograph.converters import asserts
+from tensorflow.contrib.autograph.converters import break_statements
+from tensorflow.contrib.autograph.converters import builtin_functions
+from tensorflow.contrib.autograph.converters import call_trees
+from tensorflow.contrib.autograph.converters import continue_statements
+from tensorflow.contrib.autograph.converters import control_flow
+from tensorflow.contrib.autograph.converters import decorators
+from tensorflow.contrib.autograph.converters import for_loops
+from tensorflow.contrib.autograph.converters import ifexp
+from tensorflow.contrib.autograph.converters import lists
+from tensorflow.contrib.autograph.converters import logical_expressions
+from tensorflow.contrib.autograph.converters import name_scopes
+from tensorflow.contrib.autograph.converters import side_effect_guards
+from tensorflow.contrib.autograph.converters import single_return
+from tensorflow.contrib.autograph.impl import config
+from tensorflow.contrib.autograph.impl import naming
+from tensorflow.contrib.autograph.pyct import context
+from tensorflow.contrib.autograph.pyct import inspect_utils
+from tensorflow.contrib.autograph.pyct import parser
+from tensorflow.contrib.autograph.pyct import qual_names
+from tensorflow.contrib.autograph.pyct.static_analysis import activity
+from tensorflow.contrib.autograph.pyct.static_analysis import live_values
+from tensorflow.contrib.autograph.pyct.static_analysis import type_info
+from tensorflow.contrib.autograph.utils import type_hints
 from tensorflow.python.util import tf_inspect
 
 
@@ -213,19 +213,19 @@ def class_to_graph(c, conversion_map):
 def _add_self_references(namespace, api_module):
   """Self refs are only required for analysis and are not used directly."""
   # Manually add the utils namespace which may be used from generated code.
-  if 'py2tf_util' not in namespace:
-    namespace['py2tf_utils'] = utils
-  elif namespace['py2tf_utils'] != utils:
+  if 'autograph_util' not in namespace:
+    namespace['autograph_utils'] = utils
+  elif namespace['autograph_utils'] != utils:
     raise ValueError(
-        'The module name "py2tf_utils" is reserved and may not be used.')
+        'The module name "autograph_utils" is reserved and may not be used.')
 
   # We also make reference to the api module for dynamic conversion, but
   # to avoid circular references we don't import it here.
-  if 'py2tf_api' not in namespace:
-    namespace['py2tf_api'] = api_module
-  elif namespace['py2tf_api'] != api_module:
+  if 'autograph_api' not in namespace:
+    namespace['autograph_api'] = api_module
+  elif namespace['autograph_api'] != api_module:
     raise ValueError(
-        'The module name "py2tf_api" is reserved and may not be used.')
+        'The module name "autograph_api" is reserved and may not be used.')
 
 
 def function_to_graph(f, conversion_map, arg_values, arg_types,
diff --git a/tensorflow/contrib/py2tf/impl/conversion_test.py b/tensorflow/contrib/autograph/impl/conversion_test.py
index 9ff256aace..7066739eb8 100644
--- a/tensorflow/contrib/py2tf/impl/conversion_test.py
+++ b/tensorflow/contrib/autograph/impl/conversion_test.py
@@ -20,8 +20,8 @@ from __future__ import print_function
 
 import gast
 
-from tensorflow.contrib.py2tf import utils
-from tensorflow.contrib.py2tf.impl import conversion
+from tensorflow.contrib.autograph import utils
+from tensorflow.contrib.autograph.impl import conversion
 from tensorflow.python.framework import constant_op
 from tensorflow.python.platform import test
 
diff --git a/tensorflow/contrib/py2tf/impl/naming.py b/tensorflow/contrib/autograph/impl/naming.py
index 51326091de..1facaa0ca0 100644
--- a/tensorflow/contrib/py2tf/impl/naming.py
+++ b/tensorflow/contrib/autograph/impl/naming.py
@@ -18,7 +18,7 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
-from tensorflow.contrib.py2tf.pyct import qual_names
+from tensorflow.contrib.autograph.pyct import qual_names
 
 
 class Namer(object):
diff --git a/tensorflow/contrib/py2tf/impl/naming_test.py b/tensorflow/contrib/autograph/impl/naming_test.py
index beb4e54937..73fc089465 100644
--- a/tensorflow/contrib/py2tf/impl/naming_test.py
+++ b/tensorflow/contrib/autograph/impl/naming_test.py
@@ -18,7 +18,7 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
-from tensorflow.contrib.py2tf.impl import naming
+from tensorflow.contrib.autograph.impl import naming
 from tensorflow.python.platform import test
 
 
diff --git a/tensorflow/contrib/py2tf/pyct/BUILD b/tensorflow/contrib/autograph/pyct/BUILD
index edec5f7712..edec5f7712 100644
--- a/tensorflow/contrib/py2tf/pyct/BUILD
+++ b/tensorflow/contrib/autograph/pyct/BUILD
diff --git a/tensorflow/contrib/py2tf/pyct/__init__.py b/tensorflow/contrib/autograph/pyct/__init__.py
index d787e56bbe..d787e56bbe 100644
--- a/tensorflow/contrib/py2tf/pyct/__init__.py
+++ b/tensorflow/contrib/autograph/pyct/__init__.py
diff --git a/tensorflow/contrib/py2tf/pyct/anno.py b/tensorflow/contrib/autograph/pyct/anno.py
index cc4a7edf02..cc4a7edf02 100644
--- a/tensorflow/contrib/py2tf/pyct/anno.py
+++ b/tensorflow/contrib/autograph/pyct/anno.py
diff --git a/tensorflow/contrib/py2tf/pyct/anno_test.py b/tensorflow/contrib/autograph/pyct/anno_test.py
index 6c29918fdf..1d4d9d119e 100644
--- a/tensorflow/contrib/py2tf/pyct/anno_test.py
+++ b/tensorflow/contrib/autograph/pyct/anno_test.py
@@ -20,7 +20,7 @@ from __future__ import print_function
 
 import ast
 
-from tensorflow.contrib.py2tf.pyct import anno
+from tensorflow.contrib.autograph.pyct import anno
 from tensorflow.python.platform import test
 
 
diff --git a/tensorflow/contrib/py2tf/pyct/ast_util.py b/tensorflow/contrib/autograph/pyct/ast_util.py
index 6f7e656c26..5a41b5e4a9 100644
--- a/tensorflow/contrib/py2tf/pyct/ast_util.py
+++ b/tensorflow/contrib/autograph/pyct/ast_util.py
@@ -22,7 +22,7 @@ import ast
 
 import gast
 
-from tensorflow.contrib.py2tf.pyct import anno
+from tensorflow.contrib.autograph.pyct import anno
 
 
 class CleanCopier(gast.NodeVisitor):
diff --git a/tensorflow/contrib/py2tf/pyct/ast_util_test.py b/tensorflow/contrib/autograph/pyct/ast_util_test.py
index 8d123679e3..8faf92c705 100644
--- a/tensorflow/contrib/py2tf/pyct/ast_util_test.py
+++ b/tensorflow/contrib/autograph/pyct/ast_util_test.py
@@ -20,10 +20,10 @@ from __future__ import print_function
 
 import ast
 
-from tensorflow.contrib.py2tf.pyct import ast_util
-from tensorflow.contrib.py2tf.pyct import compiler
-from tensorflow.contrib.py2tf.pyct import parser
-from tensorflow.contrib.py2tf.pyct import qual_names
+from tensorflow.contrib.autograph.pyct import ast_util
+from tensorflow.contrib.autograph.pyct import compiler
+from tensorflow.contrib.autograph.pyct import parser
+from tensorflow.contrib.autograph.pyct import qual_names
 from tensorflow.python.platform import test
 
 
diff --git a/tensorflow/contrib/py2tf/pyct/compiler.py b/tensorflow/contrib/autograph/pyct/compiler.py
index 24c4517afa..24c4517afa 100644
--- a/tensorflow/contrib/py2tf/pyct/compiler.py
+++ b/tensorflow/contrib/autograph/pyct/compiler.py
diff --git a/tensorflow/contrib/py2tf/pyct/compiler_test.py b/tensorflow/contrib/autograph/pyct/compiler_test.py
index 243f4c8153..98cdc1506b 100644
--- a/tensorflow/contrib/py2tf/pyct/compiler_test.py
+++ b/tensorflow/contrib/autograph/pyct/compiler_test.py
@@ -22,8 +22,8 @@ import textwrap
 
 import gast
 
-from tensorflow.contrib.py2tf.pyct import compiler
-from tensorflow.contrib.py2tf.pyct import parser
+from tensorflow.contrib.autograph.pyct import compiler
+from tensorflow.contrib.autograph.pyct import parser
 from tensorflow.python.platform import test
 from tensorflow.python.util import tf_inspect
 
diff --git a/tensorflow/contrib/py2tf/pyct/context.py b/tensorflow/contrib/autograph/pyct/context.py
index b34015cfd2..b34015cfd2 100644
--- a/tensorflow/contrib/py2tf/pyct/context.py
+++ b/tensorflow/contrib/autograph/pyct/context.py
diff --git a/tensorflow/contrib/py2tf/pyct/inspect_utils.py b/tensorflow/contrib/autograph/pyct/inspect_utils.py
index d19c6ed75e..d19c6ed75e 100644
--- a/tensorflow/contrib/py2tf/pyct/inspect_utils.py
+++ b/tensorflow/contrib/autograph/pyct/inspect_utils.py
diff --git a/tensorflow/contrib/py2tf/pyct/inspect_utils_test.py b/tensorflow/contrib/autograph/pyct/inspect_utils_test.py
index 5528ac851f..ddca6f963b 100644
--- a/tensorflow/contrib/py2tf/pyct/inspect_utils_test.py
+++ b/tensorflow/contrib/autograph/pyct/inspect_utils_test.py
@@ -22,7 +22,7 @@ from functools import wraps
 
 import six
 
-from tensorflow.contrib.py2tf.pyct import inspect_utils
+from tensorflow.contrib.autograph.pyct import inspect_utils
 from tensorflow.python.platform import test
 
 
diff --git a/tensorflow/contrib/py2tf/pyct/parser.py b/tensorflow/contrib/autograph/pyct/parser.py
index c961efa892..c961efa892 100644
--- a/tensorflow/contrib/py2tf/pyct/parser.py
+++ b/tensorflow/contrib/autograph/pyct/parser.py
diff --git a/tensorflow/contrib/py2tf/pyct/parser_test.py b/tensorflow/contrib/autograph/pyct/parser_test.py
index c58ffc7e0c..007a4c6fb0 100644
--- a/tensorflow/contrib/py2tf/pyct/parser_test.py
+++ b/tensorflow/contrib/autograph/pyct/parser_test.py
@@ -20,7 +20,7 @@ from __future__ import print_function
 
 import textwrap
 
-from tensorflow.contrib.py2tf.pyct import parser
+from tensorflow.contrib.autograph.pyct import parser
 from tensorflow.python.platform import test
 
 
diff --git a/tensorflow/contrib/py2tf/pyct/pretty_printer.py b/tensorflow/contrib/autograph/pyct/pretty_printer.py
index bacc1e4a77..bacc1e4a77 100644
--- a/tensorflow/contrib/py2tf/pyct/pretty_printer.py
+++ b/tensorflow/contrib/autograph/pyct/pretty_printer.py
diff --git a/tensorflow/contrib/py2tf/pyct/pretty_printer_test.py b/tensorflow/contrib/autograph/pyct/pretty_printer_test.py
index 81e3f47b80..0cb48f3576 100644
--- a/tensorflow/contrib/py2tf/pyct/pretty_printer_test.py
+++ b/tensorflow/contrib/autograph/pyct/pretty_printer_test.py
@@ -20,7 +20,7 @@ from __future__ import print_function
 
 import ast
 
-from tensorflow.contrib.py2tf.pyct import pretty_printer
+from tensorflow.contrib.autograph.pyct import pretty_printer
 from tensorflow.python.platform import test
 
 
diff --git a/tensorflow/contrib/py2tf/pyct/qual_names.py b/tensorflow/contrib/autograph/pyct/qual_names.py
index 7dec13db92..4d5764a974 100644
--- a/tensorflow/contrib/py2tf/pyct/qual_names.py
+++ b/tensorflow/contrib/autograph/pyct/qual_names.py
@@ -29,7 +29,7 @@ import collections
 
 import gast
 
-from tensorflow.contrib.py2tf.pyct import anno
+from tensorflow.contrib.autograph.pyct import anno
 
 
 class Symbol(collections.namedtuple('Symbol', ['name'])):
diff --git a/tensorflow/contrib/py2tf/pyct/qual_names_test.py b/tensorflow/contrib/autograph/pyct/qual_names_test.py
index 6583fa243b..103bd25aa3 100644
--- a/tensorflow/contrib/py2tf/pyct/qual_names_test.py
+++ b/tensorflow/contrib/autograph/pyct/qual_names_test.py
@@ -20,11 +20,11 @@ from __future__ import print_function
 
 import textwrap
 
-from tensorflow.contrib.py2tf.pyct import anno
-from tensorflow.contrib.py2tf.pyct import parser
-from tensorflow.contrib.py2tf.pyct import qual_names
-from tensorflow.contrib.py2tf.pyct.qual_names import QN
-from tensorflow.contrib.py2tf.pyct.qual_names import resolve
+from tensorflow.contrib.autograph.pyct import anno
+from tensorflow.contrib.autograph.pyct import parser
+from tensorflow.contrib.autograph.pyct import qual_names
+from tensorflow.contrib.autograph.pyct.qual_names import QN
+from tensorflow.contrib.autograph.pyct.qual_names import resolve
 from tensorflow.python.platform import test
 
 
diff --git a/tensorflow/contrib/py2tf/pyct/static_analysis/BUILD b/tensorflow/contrib/autograph/pyct/static_analysis/BUILD
index 2799b56a00..d192bc7aab 100644
--- a/tensorflow/contrib/py2tf/pyct/static_analysis/BUILD
+++ b/tensorflow/contrib/autograph/pyct/static_analysis/BUILD
@@ -25,7 +25,7 @@ py_library(
     srcs_version = "PY2AND3",
     visibility = ["//visibility:public"],
     deps = [
-        "//tensorflow/contrib/py2tf/pyct",
+        "//tensorflow/contrib/autograph/pyct",
         "@gast_archive//:gast",
     ],
 )
@@ -36,7 +36,7 @@ py_test(
     srcs_version = "PY2AND3",
     deps = [
         ":static_analysis",
-        "//tensorflow/contrib/py2tf/pyct",
+        "//tensorflow/contrib/autograph/pyct",
         "//tensorflow/python:client_testlib",
         "@gast_archive//:gast",
     ],
@@ -48,7 +48,7 @@ py_test(
     srcs_version = "PY2AND3",
     deps = [
         ":static_analysis",
-        "//tensorflow/contrib/py2tf/pyct",
+        "//tensorflow/contrib/autograph/pyct",
         "//tensorflow/python:client_testlib",
     ],
 )
@@ -59,8 +59,8 @@ py_test(
     srcs_version = "PY2AND3",
     deps = [
         ":static_analysis",
-        "//tensorflow/contrib/py2tf/pyct",
-        "//tensorflow/contrib/py2tf/utils",
+        "//tensorflow/contrib/autograph/pyct",
+        "//tensorflow/contrib/autograph/utils",
         "//tensorflow/python:client_testlib",
     ],
 )
diff --git a/tensorflow/contrib/py2tf/pyct/static_analysis/__init__.py b/tensorflow/contrib/autograph/pyct/static_analysis/__init__.py
index c325e19f28..c325e19f28 100644
--- a/tensorflow/contrib/py2tf/pyct/static_analysis/__init__.py
+++ b/tensorflow/contrib/autograph/pyct/static_analysis/__init__.py
diff --git a/tensorflow/contrib/py2tf/pyct/static_analysis/activity.py b/tensorflow/contrib/autograph/pyct/static_analysis/activity.py
index 716672a53b..da6a2f6f05 100644
--- a/tensorflow/contrib/py2tf/pyct/static_analysis/activity.py
+++ b/tensorflow/contrib/autograph/pyct/static_analysis/activity.py
@@ -22,10 +22,10 @@ import copy
 
 import gast
 
-from tensorflow.contrib.py2tf.pyct import anno
-from tensorflow.contrib.py2tf.pyct import transformer
-from tensorflow.contrib.py2tf.pyct.qual_names import QN
-from tensorflow.contrib.py2tf.pyct.static_analysis.annos import NodeAnno
+from tensorflow.contrib.autograph.pyct import anno
+from tensorflow.contrib.autograph.pyct import transformer
+from tensorflow.contrib.autograph.pyct.qual_names import QN
+from tensorflow.contrib.autograph.pyct.static_analysis.annos import NodeAnno
 
 # TODO(mdan): Add support for PY3 (e.g. Param vs arg).
 
diff --git a/tensorflow/contrib/py2tf/pyct/static_analysis/activity_test.py b/tensorflow/contrib/autograph/pyct/static_analysis/activity_test.py
index b16d15b39d..37c28872bb 100644
--- a/tensorflow/contrib/py2tf/pyct/static_analysis/activity_test.py
+++ b/tensorflow/contrib/autograph/pyct/static_analysis/activity_test.py
@@ -20,13 +20,13 @@ from __future__ import print_function
 
 import gast
 
-from tensorflow.contrib.py2tf.pyct import anno
-from tensorflow.contrib.py2tf.pyct import context
-from tensorflow.contrib.py2tf.pyct import parser
-from tensorflow.contrib.py2tf.pyct import qual_names
-from tensorflow.contrib.py2tf.pyct.qual_names import QN
-from tensorflow.contrib.py2tf.pyct.static_analysis import activity
-from tensorflow.contrib.py2tf.pyct.static_analysis.annos import NodeAnno
+from tensorflow.contrib.autograph.pyct import anno
+from tensorflow.contrib.autograph.pyct import context
+from tensorflow.contrib.autograph.pyct import parser
+from tensorflow.contrib.autograph.pyct import qual_names
+from tensorflow.contrib.autograph.pyct.qual_names import QN
+from tensorflow.contrib.autograph.pyct.static_analysis import activity
+from tensorflow.contrib.autograph.pyct.static_analysis.annos import NodeAnno
 from tensorflow.python.platform import test
 
 
diff --git a/tensorflow/contrib/py2tf/pyct/static_analysis/annos.py b/tensorflow/contrib/autograph/pyct/static_analysis/annos.py
index 5254b83ca7..5254b83ca7 100644
--- a/tensorflow/contrib/py2tf/pyct/static_analysis/annos.py
+++ b/tensorflow/contrib/autograph/pyct/static_analysis/annos.py
diff --git a/tensorflow/contrib/py2tf/pyct/static_analysis/live_values.py b/tensorflow/contrib/autograph/pyct/static_analysis/live_values.py
index ac5697900a..5f813355e6 100644
--- a/tensorflow/contrib/py2tf/pyct/static_analysis/live_values.py
+++ b/tensorflow/contrib/autograph/pyct/static_analysis/live_values.py
@@ -25,9 +25,9 @@ from __future__ import print_function
 
 import gast
 
-from tensorflow.contrib.py2tf.pyct import anno
-from tensorflow.contrib.py2tf.pyct import transformer
-from tensorflow.contrib.py2tf.pyct.static_analysis.annos import NodeAnno
+from tensorflow.contrib.autograph.pyct import anno
+from tensorflow.contrib.autograph.pyct import transformer
+from tensorflow.contrib.autograph.pyct.static_analysis.annos import NodeAnno
 
 
 class LiveValueResolver(transformer.Base):
diff --git a/tensorflow/contrib/py2tf/pyct/static_analysis/live_values_test.py b/tensorflow/contrib/autograph/pyct/static_analysis/live_values_test.py
index a56dff824e..b66439624e 100644
--- a/tensorflow/contrib/py2tf/pyct/static_analysis/live_values_test.py
+++ b/tensorflow/contrib/autograph/pyct/static_analysis/live_values_test.py
@@ -18,13 +18,13 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
-from tensorflow.contrib.py2tf.pyct import anno
-from tensorflow.contrib.py2tf.pyct import context
-from tensorflow.contrib.py2tf.pyct import parser
-from tensorflow.contrib.py2tf.pyct import qual_names
-from tensorflow.contrib.py2tf.pyct.static_analysis import activity
-from tensorflow.contrib.py2tf.pyct.static_analysis import live_values
-from tensorflow.contrib.py2tf.pyct.static_analysis import type_info
+from tensorflow.contrib.autograph.pyct import anno
+from tensorflow.contrib.autograph.pyct import context
+from tensorflow.contrib.autograph.pyct import parser
+from tensorflow.contrib.autograph.pyct import qual_names
+from tensorflow.contrib.autograph.pyct.static_analysis import activity
+from tensorflow.contrib.autograph.pyct.static_analysis import live_values
+from tensorflow.contrib.autograph.pyct.static_analysis import type_info
 from tensorflow.python.framework import constant_op
 from tensorflow.python.platform import test
 
diff --git a/tensorflow/contrib/py2tf/pyct/static_analysis/type_info.py b/tensorflow/contrib/autograph/pyct/static_analysis/type_info.py
index a969adbeca..203aa3c3d1 100644
--- a/tensorflow/contrib/py2tf/pyct/static_analysis/type_info.py
+++ b/tensorflow/contrib/autograph/pyct/static_analysis/type_info.py
@@ -43,8 +43,8 @@ from __future__ import print_function
 
 import gast
 
-from tensorflow.contrib.py2tf.pyct import anno
-from tensorflow.contrib.py2tf.pyct import transformer
+from tensorflow.contrib.autograph.pyct import anno
+from tensorflow.contrib.autograph.pyct import transformer
 from tensorflow.python.util import tf_inspect
 
 
diff --git a/tensorflow/contrib/py2tf/pyct/static_analysis/type_info_test.py b/tensorflow/contrib/autograph/pyct/static_analysis/type_info_test.py
index 8a8956197d..c0de4a6043 100644
--- a/tensorflow/contrib/py2tf/pyct/static_analysis/type_info_test.py
+++ b/tensorflow/contrib/autograph/pyct/static_analysis/type_info_test.py
@@ -18,14 +18,14 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
-from tensorflow.contrib.py2tf import utils
-from tensorflow.contrib.py2tf.pyct import anno
-from tensorflow.contrib.py2tf.pyct import context
-from tensorflow.contrib.py2tf.pyct import parser
-from tensorflow.contrib.py2tf.pyct import qual_names
-from tensorflow.contrib.py2tf.pyct.static_analysis import activity
-from tensorflow.contrib.py2tf.pyct.static_analysis import live_values
-from tensorflow.contrib.py2tf.pyct.static_analysis import type_info
+from tensorflow.contrib.autograph import utils
+from tensorflow.contrib.autograph.pyct import anno
+from tensorflow.contrib.autograph.pyct import context
+from tensorflow.contrib.autograph.pyct import parser
+from tensorflow.contrib.autograph.pyct import qual_names
+from tensorflow.contrib.autograph.pyct.static_analysis import activity
+from tensorflow.contrib.autograph.pyct.static_analysis import live_values
+from tensorflow.contrib.autograph.pyct.static_analysis import type_info
 from tensorflow.python.client import session
 from tensorflow.python.platform import test
 from tensorflow.python.training import training
diff --git a/tensorflow/contrib/py2tf/pyct/templates.py b/tensorflow/contrib/autograph/pyct/templates.py
index 590be68234..fb99e0d4e5 100644
--- a/tensorflow/contrib/py2tf/pyct/templates.py
+++ b/tensorflow/contrib/autograph/pyct/templates.py
@@ -26,9 +26,9 @@ import textwrap
 
 import gast
 
-from tensorflow.contrib.py2tf.pyct import ast_util
-from tensorflow.contrib.py2tf.pyct import parser
-from tensorflow.contrib.py2tf.pyct import qual_names
+from tensorflow.contrib.autograph.pyct import ast_util
+from tensorflow.contrib.autograph.pyct import parser
+from tensorflow.contrib.autograph.pyct import qual_names
 
 
 class ReplaceTransformer(gast.NodeTransformer):
diff --git a/tensorflow/contrib/py2tf/pyct/templates_test.py b/tensorflow/contrib/autograph/pyct/templates_test.py
index af939caf32..a01f8bf04c 100644
--- a/tensorflow/contrib/py2tf/pyct/templates_test.py
+++ b/tensorflow/contrib/autograph/pyct/templates_test.py
@@ -22,9 +22,9 @@ import imp
 
 import gast
 
-from tensorflow.contrib.py2tf.pyct import compiler
-from tensorflow.contrib.py2tf.pyct import parser
-from tensorflow.contrib.py2tf.pyct import templates
+from tensorflow.contrib.autograph.pyct import compiler
+from tensorflow.contrib.autograph.pyct import parser
+from tensorflow.contrib.autograph.pyct import templates
 from tensorflow.python.platform import test
 
 
diff --git a/tensorflow/contrib/py2tf/pyct/transformer.py b/tensorflow/contrib/autograph/pyct/transformer.py
index 31ef7e1c05..35f114b6e1 100644
--- a/tensorflow/contrib/py2tf/pyct/transformer.py
+++ b/tensorflow/contrib/autograph/pyct/transformer.py
@@ -23,12 +23,12 @@ import sys
 import gast
 import six
 
-from tensorflow.contrib.py2tf.pyct import anno
-from tensorflow.contrib.py2tf.pyct import compiler
-from tensorflow.contrib.py2tf.pyct import pretty_printer
+from tensorflow.contrib.autograph.pyct import anno
+from tensorflow.contrib.autograph.pyct import compiler
+from tensorflow.contrib.autograph.pyct import pretty_printer
 
 
-class PyFlowParseError(SyntaxError):
+class AutographParseError(SyntaxError):
   pass
 
 
@@ -77,8 +77,8 @@ class Base(gast.NodeTransformer):
         line = source_code.splitlines()[self._lineno - 1]
       else:
         line = '<no source available>'
-      six.reraise(PyFlowParseError,
-                  PyFlowParseError(
+      six.reraise(AutographParseError,
+                  AutographParseError(
                       msg,
                       (source_file, self._lineno, self._col_offset + 1, line)),
                   sys.exc_info()[2])
diff --git a/tensorflow/contrib/py2tf/utils/BUILD b/tensorflow/contrib/autograph/utils/BUILD
index b53fbb5c18..b53fbb5c18 100644
--- a/tensorflow/contrib/py2tf/utils/BUILD
+++ b/tensorflow/contrib/autograph/utils/BUILD
diff --git a/tensorflow/contrib/autograph/utils/__init__.py b/tensorflow/contrib/autograph/utils/__init__.py
new file mode 100644
index 0000000000..22898b17e9
--- /dev/null
+++ b/tensorflow/contrib/autograph/utils/__init__.py
@@ -0,0 +1,36 @@
+# Copyright 2016 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.
+# ==============================================================================
+"""Utility module that contains APIs usable in the generated code."""
+
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
+from tensorflow.contrib.autograph.utils.builtins import dynamic_builtin
+from tensorflow.contrib.autograph.utils.builtins import dynamic_dataset
+from tensorflow.contrib.autograph.utils.builtins import dynamic_for_cond
+from tensorflow.contrib.autograph.utils.builtins import dynamic_print
+from tensorflow.contrib.autograph.utils.builtins import dynamic_range
+from tensorflow.contrib.autograph.utils.context_managers import control_dependency_on_returns
+from tensorflow.contrib.autograph.utils.misc import alias_tensors
+from tensorflow.contrib.autograph.utils.multiple_dispatch import dynamic_is
+from tensorflow.contrib.autograph.utils.multiple_dispatch import dynamic_is_not
+from tensorflow.contrib.autograph.utils.multiple_dispatch import run_cond
+from tensorflow.contrib.autograph.utils.multiple_dispatch import run_while
+from tensorflow.contrib.autograph.utils.py_func import wrap_py_func
+from tensorflow.contrib.autograph.utils.tensor_list import dynamic_list_append
+from tensorflow.contrib.autograph.utils.testing import fake_tf
+from tensorflow.contrib.autograph.utils.type_check import is_tensor
+from tensorflow.contrib.autograph.utils.type_hints import set_element_type
diff --git a/tensorflow/contrib/py2tf/utils/builtins.py b/tensorflow/contrib/autograph/utils/builtins.py
index 251b4ed8ee..4ab32ee47d 100644
--- a/tensorflow/contrib/py2tf/utils/builtins.py
+++ b/tensorflow/contrib/autograph/utils/builtins.py
@@ -20,8 +20,8 @@ from __future__ import print_function
 
 import six
 
-from tensorflow.contrib.py2tf.utils import py_func
-from tensorflow.contrib.py2tf.utils import type_check
+from tensorflow.contrib.autograph.utils import py_func
+from tensorflow.contrib.autograph.utils import type_check
 from tensorflow.python.data.ops import dataset_ops
 from tensorflow.python.framework import tensor_util
 from tensorflow.python.ops import array_ops
diff --git a/tensorflow/contrib/py2tf/utils/builtins_test.py b/tensorflow/contrib/autograph/utils/builtins_test.py
index 59b3573d38..d9f7913d89 100644
--- a/tensorflow/contrib/py2tf/utils/builtins_test.py
+++ b/tensorflow/contrib/autograph/utils/builtins_test.py
@@ -22,7 +22,7 @@ import sys
 
 import six
 
-from tensorflow.contrib.py2tf.utils import builtins
+from tensorflow.contrib.autograph.utils import builtins
 from tensorflow.python.framework import constant_op
 from tensorflow.python.platform import test
 
diff --git a/tensorflow/contrib/py2tf/utils/context_managers.py b/tensorflow/contrib/autograph/utils/context_managers.py
index 3d150a9581..3d150a9581 100644
--- a/tensorflow/contrib/py2tf/utils/context_managers.py
+++ b/tensorflow/contrib/autograph/utils/context_managers.py
diff --git a/tensorflow/contrib/py2tf/utils/context_managers_test.py b/tensorflow/contrib/autograph/utils/context_managers_test.py
index 404f6e44e5..42e27724b9 100644
--- a/tensorflow/contrib/py2tf/utils/context_managers_test.py
+++ b/tensorflow/contrib/autograph/utils/context_managers_test.py
@@ -18,7 +18,7 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
-from tensorflow.contrib.py2tf.utils import context_managers
+from tensorflow.contrib.autograph.utils import context_managers
 from tensorflow.python.framework import constant_op
 from tensorflow.python.framework import dtypes
 from tensorflow.python.ops import tensor_array_ops
diff --git a/tensorflow/contrib/py2tf/utils/misc.py b/tensorflow/contrib/autograph/utils/misc.py
index 1b06caf0bd..1b06caf0bd 100644
--- a/tensorflow/contrib/py2tf/utils/misc.py
+++ b/tensorflow/contrib/autograph/utils/misc.py
diff --git a/tensorflow/contrib/py2tf/utils/misc_test.py b/tensorflow/contrib/autograph/utils/misc_test.py
index 8aedd4cd64..71e358c33e 100644
--- a/tensorflow/contrib/py2tf/utils/misc_test.py
+++ b/tensorflow/contrib/autograph/utils/misc_test.py
@@ -18,7 +18,7 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
-from tensorflow.contrib.py2tf.utils.misc import alias_tensors
+from tensorflow.contrib.autograph.utils.misc import alias_tensors
 from tensorflow.python.framework.constant_op import constant
 from tensorflow.python.ops.variables import Variable
 from tensorflow.python.platform import test
diff --git a/tensorflow/contrib/py2tf/utils/multiple_dispatch.py b/tensorflow/contrib/autograph/utils/multiple_dispatch.py
index 427a936c35..b756ccfaee 100644
--- a/tensorflow/contrib/py2tf/utils/multiple_dispatch.py
+++ b/tensorflow/contrib/autograph/utils/multiple_dispatch.py
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # ==============================================================================
-"""Utilities for type-dependent behavior used in py2tf-generated code."""
+"""Utilities for type-dependent behavior used in autograph-generated code."""
 
 from __future__ import absolute_import
 from __future__ import division
@@ -20,7 +20,7 @@ from __future__ import print_function
 
 import six
 
-from tensorflow.contrib.py2tf.utils.type_check import is_tensor
+from tensorflow.contrib.autograph.utils.type_check import is_tensor
 from tensorflow.python.ops import control_flow_ops
 
 
diff --git a/tensorflow/contrib/py2tf/utils/multiple_dispatch_test.py b/tensorflow/contrib/autograph/utils/multiple_dispatch_test.py
index 75e8fdd5ed..8c7daa6ded 100644
--- a/tensorflow/contrib/py2tf/utils/multiple_dispatch_test.py
+++ b/tensorflow/contrib/autograph/utils/multiple_dispatch_test.py
@@ -20,7 +20,7 @@ from __future__ import print_function
 
 import numpy as np
 
-from tensorflow.contrib.py2tf.utils import multiple_dispatch
+from tensorflow.contrib.autograph.utils import multiple_dispatch
 from tensorflow.python.client.session import Session
 from tensorflow.python.framework.constant_op import constant
 from tensorflow.python.platform import test
diff --git a/tensorflow/contrib/py2tf/utils/py_func.py b/tensorflow/contrib/autograph/utils/py_func.py
index 34f2a8b70b..11ebfb2e49 100644
--- a/tensorflow/contrib/py2tf/utils/py_func.py
+++ b/tensorflow/contrib/autograph/utils/py_func.py
@@ -118,9 +118,8 @@ def wrap_py_func(f, return_dtypes, args, kwargs=None, use_dummy_return=False):
       assert isinstance(return_dtypes, dtypes.DType)
 
   def f_wrapper(*tensor_args):
-    f_args = tuple(
-        tensor_args[tensor_args_idx[i]] if arg_is_tensor[i] else a
-        for i, a in enumerate(args))
+    f_args = tuple(tensor_args[tensor_args_idx[i]] if arg_is_tensor[i] else a
+                   for i, a in enumerate(args))
     f_kwargs = {
         k: tensor_args[tensor_args_idx[k]] if kwarg_is_tensor[k] else kwargs[k]
         for i, k in enumerate(kwarg_keys)
diff --git a/tensorflow/contrib/py2tf/utils/py_func_test.py b/tensorflow/contrib/autograph/utils/py_func_test.py
index 3b7a35365a..2468263142 100644
--- a/tensorflow/contrib/py2tf/utils/py_func_test.py
+++ b/tensorflow/contrib/autograph/utils/py_func_test.py
@@ -18,7 +18,7 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
-from tensorflow.contrib.py2tf.utils import py_func
+from tensorflow.contrib.autograph.utils import py_func
 from tensorflow.python.framework import constant_op
 from tensorflow.python.framework import dtypes
 from tensorflow.python.platform import test
diff --git a/tensorflow/contrib/py2tf/utils/tensor_list.py b/tensorflow/contrib/autograph/utils/tensor_list.py
index 2556f41289..2556f41289 100644
--- a/tensorflow/contrib/py2tf/utils/tensor_list.py
+++ b/tensorflow/contrib/autograph/utils/tensor_list.py
diff --git a/tensorflow/contrib/py2tf/utils/tensor_list_test.py b/tensorflow/contrib/autograph/utils/tensor_list_test.py
index 110e4d105e..d58489eb68 100644
--- a/tensorflow/contrib/py2tf/utils/tensor_list_test.py
+++ b/tensorflow/contrib/autograph/utils/tensor_list_test.py
@@ -12,13 +12,13 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # ==============================================================================
-"""Tests for PyFlow list."""
+"""Tests for Autograph lists."""
 
 from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
-from tensorflow.contrib.py2tf.utils import tensor_list as tl
+from tensorflow.contrib.autograph.utils import tensor_list as tl
 from tensorflow.python.client.session import Session
 from tensorflow.python.eager import context
 from tensorflow.python.framework import dtypes
diff --git a/tensorflow/contrib/py2tf/utils/testing.py b/tensorflow/contrib/autograph/utils/testing.py
index cb4785d0dc..cb4785d0dc 100644
--- a/tensorflow/contrib/py2tf/utils/testing.py
+++ b/tensorflow/contrib/autograph/utils/testing.py
diff --git a/tensorflow/contrib/py2tf/utils/type_check.py b/tensorflow/contrib/autograph/utils/type_check.py
index b9b2b451a4..8748abc47b 100644
--- a/tensorflow/contrib/py2tf/utils/type_check.py
+++ b/tensorflow/contrib/autograph/utils/type_check.py
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # ==============================================================================
-"""Utilities used in py2tf-generated code."""
+"""Utilities used in autograph-generated code."""
 
 from __future__ import absolute_import
 from __future__ import division
diff --git a/tensorflow/contrib/py2tf/utils/type_check_test.py b/tensorflow/contrib/autograph/utils/type_check_test.py
index 7d0428e9cc..3b67b7194c 100644
--- a/tensorflow/contrib/py2tf/utils/type_check_test.py
+++ b/tensorflow/contrib/autograph/utils/type_check_test.py
@@ -20,7 +20,7 @@ from __future__ import print_function
 
 import numpy
 
-from tensorflow.contrib.py2tf.utils import type_check
+from tensorflow.contrib.autograph.utils import type_check
 from tensorflow.python.framework import constant_op
 from tensorflow.python.framework import test_util
 from tensorflow.python.platform import test
diff --git a/tensorflow/contrib/py2tf/utils/type_hints.py b/tensorflow/contrib/autograph/utils/type_hints.py
index aeb9e54561..aeb9e54561 100644
--- a/tensorflow/contrib/py2tf/utils/type_hints.py
+++ b/tensorflow/contrib/autograph/utils/type_hints.py
diff --git a/tensorflow/contrib/py2tf/utils/__init__.py b/tensorflow/contrib/py2tf/utils/__init__.py
deleted file mode 100644
index 4e6003c852..0000000000
--- a/tensorflow/contrib/py2tf/utils/__init__.py
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 2016 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.
-# ==============================================================================
-"""Utility module that contains APIs usable in the generated code."""
-
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-
-from tensorflow.contrib.py2tf.utils.builtins import dynamic_builtin
-from tensorflow.contrib.py2tf.utils.builtins import dynamic_dataset
-from tensorflow.contrib.py2tf.utils.builtins import dynamic_for_cond
-from tensorflow.contrib.py2tf.utils.builtins import dynamic_print
-from tensorflow.contrib.py2tf.utils.builtins import dynamic_range
-from tensorflow.contrib.py2tf.utils.context_managers import control_dependency_on_returns
-from tensorflow.contrib.py2tf.utils.misc import alias_tensors
-from tensorflow.contrib.py2tf.utils.multiple_dispatch import dynamic_is
-from tensorflow.contrib.py2tf.utils.multiple_dispatch import dynamic_is_not
-from tensorflow.contrib.py2tf.utils.multiple_dispatch import run_cond
-from tensorflow.contrib.py2tf.utils.multiple_dispatch import run_while
-from tensorflow.contrib.py2tf.utils.py_func import wrap_py_func
-from tensorflow.contrib.py2tf.utils.tensor_list import dynamic_list_append
-from tensorflow.contrib.py2tf.utils.testing import fake_tf
-from tensorflow.contrib.py2tf.utils.type_check import is_tensor
-from tensorflow.contrib.py2tf.utils.type_hints import set_element_type
diff --git a/tensorflow/tools/pip_package/BUILD b/tensorflow/tools/pip_package/BUILD
index 8a80d6443b..e01306f953 100644
--- a/tensorflow/tools/pip_package/BUILD
+++ b/tensorflow/tools/pip_package/BUILD
@@ -164,12 +164,12 @@ sh_binary(
             "//tensorflow/contrib/lite/toco/python:toco_from_protos",
             "//tensorflow/contrib/nn:nn_py",
             "//tensorflow/contrib/predictor:predictor_pip",
-            "//tensorflow/contrib/py2tf:py2tf",
-            "//tensorflow/contrib/py2tf/converters:converters",
-            "//tensorflow/contrib/py2tf/converters:test_lib",
-            "//tensorflow/contrib/py2tf/impl:impl",
-            "//tensorflow/contrib/py2tf/pyct:pyct",
-            "//tensorflow/contrib/py2tf/pyct/static_analysis:static_analysis",
+            "//tensorflow/contrib/autograph:autograph",
+            "//tensorflow/contrib/autograph/converters:converters",
+            "//tensorflow/contrib/autograph/converters:test_lib",
+            "//tensorflow/contrib/autograph/impl:impl",
+            "//tensorflow/contrib/autograph/pyct:pyct",
+            "//tensorflow/contrib/autograph/pyct/static_analysis:static_analysis",
             "//tensorflow/contrib/receptive_field:receptive_field_pip",
             "//tensorflow/contrib/session_bundle:session_bundle_pip",
             "//tensorflow/contrib/signal:signal_py",