diff --git a/gapidapk/android/apk/rules.bzl b/gapidapk/android/apk/rules.bzl
index e82882deec..9987a969ea 100644
--- a/gapidapk/android/apk/rules.bzl
+++ b/gapidapk/android/apk/rules.bzl
@@ -35,8 +35,7 @@ _strip = rule(
     implementation = _strip_impl,
     attrs = {
         "lib": attr.label(
-            single_file = True,
-            allow_files = True,
+            allow_single_file = True,
             mandatory = True,
         ),
         "abi": attr.string(),
diff --git a/tools/build/rules/cc.bzl b/tools/build/rules/cc.bzl
index b51a15e3c0..efae41561f 100644
--- a/tools/build/rules/cc.bzl
+++ b/tools/build/rules/cc.bzl
@@ -122,8 +122,7 @@ _symbols = rule(
     _symbols_impl,
     attrs = {
         "src": attr.label(
-            allow_files = True,
-            single_file = True,
+            allow_single_file = True,
         ),
         "_dump_syms": attr.label(
             executable = True,
diff --git a/tools/build/rules/common.bzl b/tools/build/rules/common.bzl
index 6550ff5fa6..75afa79bdb 100644
--- a/tools/build/rules/common.bzl
+++ b/tools/build/rules/common.bzl
@@ -40,8 +40,7 @@ copy = rule(
     _copy_impl,
     attrs = {
         "src": attr.label(
-            single_file = True,
-            allow_files = True,
+            allow_single_file = True,
             mandatory = True,
         ),
         "dst": attr.output(),
diff --git a/tools/build/rules/filehash.bzl b/tools/build/rules/filehash.bzl
index 7527e9cdd1..e0954b04f1 100644
--- a/tools/build/rules/filehash.bzl
+++ b/tools/build/rules/filehash.bzl
@@ -37,8 +37,7 @@ filehash = rule(
         ),
         "template": attr.label(
             mandatory = True,
-            single_file = True,
-            allow_files = True,
+            allow_single_file = True,
         ),
         "replace": attr.string(mandatory = True),
         "out": attr.output(mandatory = True),
diff --git a/tools/build/rules/gapil.bzl b/tools/build/rules/gapil.bzl
index cd77220b3d..29ca33b38e 100644
--- a/tools/build/rules/gapil.bzl
+++ b/tools/build/rules/gapil.bzl
@@ -35,8 +35,7 @@ api_library = rule(
     attrs = {
         "apiname": attr.string(mandatory=True),
         "api": attr.label(
-            single_file = True,
-            allow_files = True,
+            allow_single_file = True,
         ),
         "includes": attr.label_list(allow_files = True),
         "deps": attr.label_list(
@@ -68,8 +67,7 @@ api_template = rule(
     _api_template_impl,
     attrs = {
         "template": attr.label(
-            single_file = True,
-            allow_files = True,
+            allow_single_file = True,
         ),
         "includes": attr.label_list(allow_files = True),
         "outputs": attr.string_list(),
diff --git a/tools/build/rules/repository.bzl b/tools/build/rules/repository.bzl
index 2230adae69..46aa8484cb 100644
--- a/tools/build/rules/repository.bzl
+++ b/tools/build/rules/repository.bzl
@@ -14,8 +14,7 @@
 
 _BUILD_FILE_ATTRS = {
   "build_file": attr.label(
-      allow_files = True,
-      single_file = True,
+      allow_single_file = True,
   ),
   "build_file_content": attr.string(),
 }
diff --git a/tools/build/rules/stringgen.bzl b/tools/build/rules/stringgen.bzl
index b2761e5dfa..3b2a81e768 100644
--- a/tools/build/rules/stringgen.bzl
+++ b/tools/build/rules/stringgen.bzl
@@ -43,8 +43,7 @@ stringgen = rule(
     _stringgen_impl,
     attrs = {
         "input": attr.label(
-            single_file = True,
-            allow_files = True,
+            allow_single_file = True,
             mandatory = True,
         ),
         "_stringgen": attr.label(
diff --git a/tools/build/rules/zip.bzl b/tools/build/rules/zip.bzl
index 8eb95ceaec..3516162796 100644
--- a/tools/build/rules/zip.bzl
+++ b/tools/build/rules/zip.bzl
@@ -34,8 +34,7 @@ extract = rule(
     _extract_impl,
     attrs = {
         "zip": attr.label(
-            single_file = True,
-            allow_files = True,
+            allow_single_file = True,
             mandatory = True,
         ),
         "entries": attr.string_list(mandatory=True),
diff --git a/tools/build/third_party/breakpad.bzl b/tools/build/third_party/breakpad.bzl
index a6587c7949..eaa0f3ea2d 100644
--- a/tools/build/third_party/breakpad.bzl
+++ b/tools/build/third_party/breakpad.bzl
@@ -40,8 +40,7 @@ breakpad = repository_rule(
         "commit": attr.string(mandatory = True),
         "build_file": attr.label(
             mandatory = True,
-            allow_files = True,
-            single_file = True,
+            allow_single_file = True,
         ),
     },
 )
diff --git a/tools/build/third_party/llvm/rules.bzl b/tools/build/third_party/llvm/rules.bzl
index 0ec4a82044..19b2dc901b 100644
--- a/tools/build/third_party/llvm/rules.bzl
+++ b/tools/build/third_party/llvm/rules.bzl
@@ -88,8 +88,7 @@ llvm_tablegen = rule(
     _tablegen_impl,
     attrs = {
         "table": attr.label(
-            single_file = True,
-            allow_files = True,
+            allow_single_file = True,
         ),
         "deps": attr.label_list(allow_files = True),
         "generate": attr.output(),
diff --git a/version.bzl b/version.bzl
index a3701eb0a2..50f8cafdbe 100644
--- a/version.bzl
+++ b/version.bzl
@@ -39,8 +39,13 @@ def _gapid_version(ctx):
 gapid_version = rule(
     implementation=_gapid_version,
     attrs = {
-        "template": attr.label(mandatory = True, allow_files = True, single_file = True),
-        "out": attr.output(mandatory = True),
+        "template": attr.label(
+            mandatory = True,
+            allow_single_file = True,
+        ),
+        "out": attr.output(
+            mandatory = True,
+        ),
     },
     output_to_genfiles = True,
 )