diff --git a/tensorboard/components/polymer/BUILD b/tensorboard/components/polymer/BUILD
index 202113dd5a..6c96bf4ccf 100644
--- a/tensorboard/components/polymer/BUILD
+++ b/tensorboard/components/polymer/BUILD
@@ -68,7 +68,7 @@ genrule(
     ],
     outs = ["plottable-style.ts"],
     cmd = "$(execpath //tensorboard/tools:inline_file_content) $(SRCS) >'$@'",
-    exec_tools = ["//tensorboard/tools:inline_file_content"],
+    tools = ["//tensorboard/tools:inline_file_content"],
 )
 
 tf_ts_library(
diff --git a/tensorboard/components/tensor_widget/BUILD b/tensorboard/components/tensor_widget/BUILD
index a689dcb144..7672210b36 100644
--- a/tensorboard/components/tensor_widget/BUILD
+++ b/tensorboard/components/tensor_widget/BUILD
@@ -13,7 +13,7 @@ genrule(
     ],
     outs = ["tensor-widget-style.ts"],
     cmd = "$(execpath //tensorboard/tools:inline_file_content) $(SRCS) >'$@'",
-    exec_tools = ["//tensorboard/tools:inline_file_content"],
+    tools = ["//tensorboard/tools:inline_file_content"],
 )
 
 tf_web_library(
diff --git a/tensorboard/defs/defs.bzl b/tensorboard/defs/defs.bzl
index aa63719825..0be01beb93 100644
--- a/tensorboard/defs/defs.bzl
+++ b/tensorboard/defs/defs.bzl
@@ -331,5 +331,5 @@ def tf_inline_pngs(name, html_template, images, out):
         srcs = [html_template] + images,
         outs = [out],
         cmd = "$(execpath //tensorboard/defs:inline_images) $(SRCS) >'$@'",
-        exec_tools = ["//tensorboard/defs:inline_images"],
+        tools = ["//tensorboard/defs:inline_images"],
     )
diff --git a/tensorboard/defs/internal/resource.bzl b/tensorboard/defs/internal/resource.bzl
index f436fc009b..9c114bbb88 100644
--- a/tensorboard/defs/internal/resource.bzl
+++ b/tensorboard/defs/internal/resource.bzl
@@ -51,7 +51,7 @@ def tf_resource_digest_suffixer(name, resources, template, out):
             $(execpath //tensorboard/defs/internal:resource_digest_suffixer) %s
           } > $@
         """ % " ".join(args),
-        exec_tools = [
+        tools = [
             "//tensorboard/defs/internal:resource_digest_suffixer",
         ],
     )
diff --git a/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/BUILD b/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/BUILD
index 7a703547de..2c85a3ce6c 100644
--- a/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/BUILD
+++ b/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/BUILD
@@ -117,7 +117,7 @@ genrule(
     name = "generate_dtypes",
     outs = ["tf_dtypes.ts"],
     cmd = "$(execpath :extract_dtypes_from_python) $@",
-    exec_tools = [
+    tools = [
         ":extract_dtypes_from_python",
     ],
 )