diff --git a/tensorflow/core/api_def/python_api/api_def_FFT.pbtxt b/tensorflow/core/api_def/python_api/api_def_FFT.pbtxt
index 7f4a2add4e7..33f87caa38c 100644
--- a/tensorflow/core/api_def/python_api/api_def_FFT.pbtxt
+++ b/tensorflow/core/api_def/python_api/api_def_FFT.pbtxt
@@ -1,7 +1,11 @@
 op {
   graph_op_name: "FFT"
+  endpoint {
+    name: "signal.fft"
+  }
   endpoint {
     name: "spectral.fft"
+    deprecation_version: 2
   }
   endpoint {
     name: "fft"
diff --git a/tensorflow/core/api_def/python_api/api_def_FFT2D.pbtxt b/tensorflow/core/api_def/python_api/api_def_FFT2D.pbtxt
index 9ed1341dfe2..2273a757898 100644
--- a/tensorflow/core/api_def/python_api/api_def_FFT2D.pbtxt
+++ b/tensorflow/core/api_def/python_api/api_def_FFT2D.pbtxt
@@ -1,9 +1,14 @@
 op {
   graph_op_name: "FFT2D"
+  endpoint {
+    name: "signal.fft2d"
+  }
   endpoint {
     name: "spectral.fft2d"
+    deprecation_version: 2
   }
   endpoint {
     name: "fft2d"
+    deprecation_version: 2
   }
 }
diff --git a/tensorflow/core/api_def/python_api/api_def_FFT3D.pbtxt b/tensorflow/core/api_def/python_api/api_def_FFT3D.pbtxt
index 5a4e1d6adf9..6a43b86e3d3 100644
--- a/tensorflow/core/api_def/python_api/api_def_FFT3D.pbtxt
+++ b/tensorflow/core/api_def/python_api/api_def_FFT3D.pbtxt
@@ -1,9 +1,14 @@
 op {
   graph_op_name: "FFT3D"
+  endpoint {
+    name: "signal.fft3d"
+  }
   endpoint {
     name: "spectral.fft3d"
+    deprecation_version: 2
   }
   endpoint {
     name: "fft3d"
+    deprecation_version: 2
   }
 }
diff --git a/tensorflow/core/api_def/python_api/api_def_IFFT.pbtxt b/tensorflow/core/api_def/python_api/api_def_IFFT.pbtxt
index 0124721e1cb..68ef4833949 100644
--- a/tensorflow/core/api_def/python_api/api_def_IFFT.pbtxt
+++ b/tensorflow/core/api_def/python_api/api_def_IFFT.pbtxt
@@ -1,7 +1,11 @@
 op {
   graph_op_name: "IFFT"
+  endpoint {
+    name: "signal.ifft"
+  }
   endpoint {
     name: "spectral.ifft"
+    deprecation_version: 2
   }
   endpoint {
     name: "ifft"
diff --git a/tensorflow/core/api_def/python_api/api_def_IFFT2D.pbtxt b/tensorflow/core/api_def/python_api/api_def_IFFT2D.pbtxt
index d6b36a314b8..47fb6fa191f 100644
--- a/tensorflow/core/api_def/python_api/api_def_IFFT2D.pbtxt
+++ b/tensorflow/core/api_def/python_api/api_def_IFFT2D.pbtxt
@@ -1,9 +1,14 @@
 op {
   graph_op_name: "IFFT2D"
+  endpoint {
+    name: "signal.ifft2d"
+  }
   endpoint {
     name: "spectral.ifft2d"
+    deprecation_version: 2
   }
   endpoint {
     name: "ifft2d"
+    deprecation_version: 2
   }
 }
diff --git a/tensorflow/core/api_def/python_api/api_def_IFFT3D.pbtxt b/tensorflow/core/api_def/python_api/api_def_IFFT3D.pbtxt
index 6def5b36da1..aff598314b2 100644
--- a/tensorflow/core/api_def/python_api/api_def_IFFT3D.pbtxt
+++ b/tensorflow/core/api_def/python_api/api_def_IFFT3D.pbtxt
@@ -1,9 +1,14 @@
 op {
   graph_op_name: "IFFT3D"
+  endpoint {
+    name: "signal.ifft3d"
+  }
   endpoint {
     name: "spectral.ifft3d"
+    deprecation_version: 2
   }
   endpoint {
     name: "ifft3d"
+    deprecation_version: 2
   }
 }
diff --git a/tensorflow/python/tools/api/generator/api_init_files.bzl b/tensorflow/python/tools/api/generator/api_init_files.bzl
index 17122a77ebf..5699d86e6d5 100644
--- a/tensorflow/python/tools/api/generator/api_init_files.bzl
+++ b/tensorflow/python/tools/api/generator/api_init_files.bzl
@@ -71,12 +71,12 @@ TENSORFLOW_API_INIT_FILES = [
     "profiler/__init__.py",
     "quantization/__init__.py",
     "random/__init__.py",
-    "strings/__init__.py",
     "saved_model/__init__.py",
     "sets/__init__.py",
     "signal/__init__.py",
     "sparse/__init__.py",
     "spectral/__init__.py",
+    "strings/__init__.py",
     "summary/__init__.py",
     "sysconfig/__init__.py",
     "test/__init__.py",
diff --git a/tensorflow/python/tools/api/generator/api_init_files_v1.bzl b/tensorflow/python/tools/api/generator/api_init_files_v1.bzl
index d44c53abcbe..89c817f6090 100644
--- a/tensorflow/python/tools/api/generator/api_init_files_v1.bzl
+++ b/tensorflow/python/tools/api/generator/api_init_files_v1.bzl
@@ -77,7 +77,6 @@ TENSORFLOW_API_INIT_FILES_V1 = [
     "quantization/__init__.py",
     "random/__init__.py",
     "resource_loader/__init__.py",
-    "signal/__init__.py",
     "strings/__init__.py",
     "saved_model/__init__.py",
     "saved_model/builder/__init__.py",
@@ -90,6 +89,7 @@ TENSORFLOW_API_INIT_FILES_V1 = [
     "saved_model/tag_constants/__init__.py",
     "saved_model/utils/__init__.py",
     "sets/__init__.py",
+    "signal/__init__.py",
     "sparse/__init__.py",
     "spectral/__init__.py",
     "summary/__init__.py",
diff --git a/tensorflow/tools/api/golden/v1/tensorflow.signal.pbtxt b/tensorflow/tools/api/golden/v1/tensorflow.signal.pbtxt
index 558cbc4cfd6..2c50c41f186 100644
--- a/tensorflow/tools/api/golden/v1/tensorflow.signal.pbtxt
+++ b/tensorflow/tools/api/golden/v1/tensorflow.signal.pbtxt
@@ -1,5 +1,17 @@
 path: "tensorflow.signal"
 tf_module {
+  member_method {
+    name: "fft"
+    argspec: "args=[\'input\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "fft2d"
+    argspec: "args=[\'input\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "fft3d"
+    argspec: "args=[\'input\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
   member_method {
     name: "frame"
     argspec: "args=[\'signal\', \'frame_length\', \'frame_step\', \'pad_end\', \'pad_value\', \'axis\', \'name\'], varargs=None, keywords=None, defaults=[\'False\', \'0\', \'-1\', \'None\'], "
@@ -12,6 +24,18 @@ tf_module {
     name: "hann_window"
     argspec: "args=[\'window_length\', \'periodic\', \'dtype\', \'name\'], varargs=None, keywords=None, defaults=[\'True\', \"<dtype: \'float32\'>\", \'None\'], "
   }
+  member_method {
+    name: "ifft"
+    argspec: "args=[\'input\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "ifft2d"
+    argspec: "args=[\'input\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "ifft3d"
+    argspec: "args=[\'input\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
   member_method {
     name: "inverse_stft"
     argspec: "args=[\'stfts\', \'frame_length\', \'frame_step\', \'fft_length\', \'window_fn\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'<function hann_window instance>\', \'None\'], "
diff --git a/tensorflow/tools/api/golden/v2/tensorflow.pbtxt b/tensorflow/tools/api/golden/v2/tensorflow.pbtxt
index 90b77bfd863..5293262e7f8 100644
--- a/tensorflow/tools/api/golden/v2/tensorflow.pbtxt
+++ b/tensorflow/tools/api/golden/v2/tensorflow.pbtxt
@@ -716,14 +716,6 @@ tf_module {
     name: "eye"
     argspec: "args=[\'num_rows\', \'num_columns\', \'batch_shape\', \'dtype\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \"<dtype: \'float32\'>\", \'None\'], "
   }
-  member_method {
-    name: "fft2d"
-    argspec: "args=[\'input\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "fft3d"
-    argspec: "args=[\'input\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
   member_method {
     name: "fill"
     argspec: "args=[\'dims\', \'value\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
@@ -812,14 +804,6 @@ tf_module {
     name: "identity_n"
     argspec: "args=[\'input\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
   }
-  member_method {
-    name: "ifft2d"
-    argspec: "args=[\'input\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "ifft3d"
-    argspec: "args=[\'input\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
   member_method {
     name: "import_graph_def"
     argspec: "args=[\'graph_def\', \'input_map\', \'return_elements\', \'name\', \'op_dict\', \'producer_op_list\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'None\', \'None\'], "
diff --git a/tensorflow/tools/api/golden/v2/tensorflow.signal.pbtxt b/tensorflow/tools/api/golden/v2/tensorflow.signal.pbtxt
index 558cbc4cfd6..2c50c41f186 100644
--- a/tensorflow/tools/api/golden/v2/tensorflow.signal.pbtxt
+++ b/tensorflow/tools/api/golden/v2/tensorflow.signal.pbtxt
@@ -1,5 +1,17 @@
 path: "tensorflow.signal"
 tf_module {
+  member_method {
+    name: "fft"
+    argspec: "args=[\'input\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "fft2d"
+    argspec: "args=[\'input\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "fft3d"
+    argspec: "args=[\'input\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
   member_method {
     name: "frame"
     argspec: "args=[\'signal\', \'frame_length\', \'frame_step\', \'pad_end\', \'pad_value\', \'axis\', \'name\'], varargs=None, keywords=None, defaults=[\'False\', \'0\', \'-1\', \'None\'], "
@@ -12,6 +24,18 @@ tf_module {
     name: "hann_window"
     argspec: "args=[\'window_length\', \'periodic\', \'dtype\', \'name\'], varargs=None, keywords=None, defaults=[\'True\', \"<dtype: \'float32\'>\", \'None\'], "
   }
+  member_method {
+    name: "ifft"
+    argspec: "args=[\'input\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "ifft2d"
+    argspec: "args=[\'input\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
+  member_method {
+    name: "ifft3d"
+    argspec: "args=[\'input\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
+  }
   member_method {
     name: "inverse_stft"
     argspec: "args=[\'stfts\', \'frame_length\', \'frame_step\', \'fft_length\', \'window_fn\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'<function hann_window instance>\', \'None\'], "
diff --git a/tensorflow/tools/api/golden/v2/tensorflow.spectral.pbtxt b/tensorflow/tools/api/golden/v2/tensorflow.spectral.pbtxt
index 6a421ef12d5..b0f0783e300 100644
--- a/tensorflow/tools/api/golden/v2/tensorflow.spectral.pbtxt
+++ b/tensorflow/tools/api/golden/v2/tensorflow.spectral.pbtxt
@@ -4,34 +4,10 @@ tf_module {
     name: "dct"
     argspec: "args=[\'input\', \'type\', \'n\', \'axis\', \'norm\', \'name\'], varargs=None, keywords=None, defaults=[\'2\', \'None\', \'-1\', \'None\', \'None\'], "
   }
-  member_method {
-    name: "fft"
-    argspec: "args=[\'input\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "fft2d"
-    argspec: "args=[\'input\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "fft3d"
-    argspec: "args=[\'input\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
   member_method {
     name: "idct"
     argspec: "args=[\'input\', \'type\', \'n\', \'axis\', \'norm\', \'name\'], varargs=None, keywords=None, defaults=[\'2\', \'None\', \'-1\', \'None\', \'None\'], "
   }
-  member_method {
-    name: "ifft"
-    argspec: "args=[\'input\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "ifft2d"
-    argspec: "args=[\'input\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
-  member_method {
-    name: "ifft3d"
-    argspec: "args=[\'input\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], "
-  }
   member_method {
     name: "irfft"
     argspec: "args=[\'input_tensor\', \'fft_length\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "