diff --git a/examples/android_instrumentation_test/BUILD.bazel b/examples/android_instrumentation_test/BUILD
similarity index 100%
rename from examples/android_instrumentation_test/BUILD.bazel
rename to examples/android_instrumentation_test/BUILD
diff --git a/examples/java-export/BUILD.bazel b/examples/java-export/BUILD
similarity index 99%
rename from examples/java-export/BUILD.bazel
rename to examples/java-export/BUILD
index 2fcaecbcf..f87dea410 100644
--- a/examples/java-export/BUILD.bazel
+++ b/examples/java-export/BUILD
@@ -14,4 +14,3 @@ java_export(
         "//src/main/java/com/github/bazelbuild/rulesjvmexternal/example/export",
     ],
 )
-
diff --git a/examples/java-export/src/main/java/com/github/bazelbuild/rulesjvmexternal/example/export/BUILD.bazel b/examples/java-export/src/main/java/com/github/bazelbuild/rulesjvmexternal/example/export/BUILD
similarity index 92%
rename from examples/java-export/src/main/java/com/github/bazelbuild/rulesjvmexternal/example/export/BUILD.bazel
rename to examples/java-export/src/main/java/com/github/bazelbuild/rulesjvmexternal/example/export/BUILD
index 5fe5a9a37..c16f6861c 100644
--- a/examples/java-export/src/main/java/com/github/bazelbuild/rulesjvmexternal/example/export/BUILD.bazel
+++ b/examples/java-export/src/main/java/com/github/bazelbuild/rulesjvmexternal/example/export/BUILD
@@ -3,11 +3,11 @@ load("@rules_jvm_external//:defs.bzl", "artifact", "java_export")
 java_library(
     name = "export",
     srcs = glob(["Main.java"]),
+    visibility = [
+        "//:__pkg__",
+    ],
     deps = [
         "//src/main/proto",
         artifact("com.google.guava:guava"),
     ],
-    visibility = [
-      "//:__pkg__",
-    ],
 )
diff --git a/examples/java-export/src/main/proto/BUILD.bazel b/examples/java-export/src/main/proto/BUILD
similarity index 100%
rename from examples/java-export/src/main/proto/BUILD.bazel
rename to examples/java-export/src/main/proto/BUILD
diff --git a/examples/scala_akka/BUILD.bazel b/examples/scala_akka/BUILD
similarity index 100%
rename from examples/scala_akka/BUILD.bazel
rename to examples/scala_akka/BUILD
diff --git a/examples/spring_boot/src/main/java/hello/BUILD.bazel b/examples/spring_boot/src/main/java/hello/BUILD
similarity index 100%
rename from examples/spring_boot/src/main/java/hello/BUILD.bazel
rename to examples/spring_boot/src/main/java/hello/BUILD
diff --git a/examples/spring_boot/src/test/java/hello/BUILD.bazel b/examples/spring_boot/src/test/java/hello/BUILD
similarity index 100%
rename from examples/spring_boot/src/test/java/hello/BUILD.bazel
rename to examples/spring_boot/src/test/java/hello/BUILD
diff --git a/private/tools/java/rules/jvm/external/BUILD.bazel b/private/tools/java/rules/jvm/external/BUILD
similarity index 97%
rename from private/tools/java/rules/jvm/external/BUILD.bazel
rename to private/tools/java/rules/jvm/external/BUILD
index 973896336..fe1952059 100644
--- a/private/tools/java/rules/jvm/external/BUILD.bazel
+++ b/private/tools/java/rules/jvm/external/BUILD
@@ -4,7 +4,7 @@ java_library(
     visibility = [
         "//private/tools/java/rules/jvm/external:__subpackages__",
         "//tests/com/jvm/external:__subpackages__",
-    ]
+    ],
 )
 
 java_library(
@@ -12,7 +12,7 @@ java_library(
     srcs = ["Hasher.java"],
     visibility = [
         "//private/tools:__subpackages__",
-    ]
+    ],
 )
 
 java_test(
diff --git a/private/tools/java/rules/jvm/external/jar/BUILD.bazel b/private/tools/java/rules/jvm/external/jar/BUILD
similarity index 100%
rename from private/tools/java/rules/jvm/external/jar/BUILD.bazel
rename to private/tools/java/rules/jvm/external/jar/BUILD
index 98880a4e8..c43f2f682 100644
--- a/private/tools/java/rules/jvm/external/jar/BUILD.bazel
+++ b/private/tools/java/rules/jvm/external/jar/BUILD
@@ -7,12 +7,12 @@ java_binary(
         "-target",
         "8",
     ],
-    deps = [
-        "//private/tools/java/rules/jvm/external:byte-streams",
-        "//private/tools/java/rules/jvm/external/zip",
-    ],
     main_class = "rules.jvm.external.jar.MergeJars",
     visibility = [
         "//visibility:public",
     ],
+    deps = [
+        "//private/tools/java/rules/jvm/external:byte-streams",
+        "//private/tools/java/rules/jvm/external/zip",
+    ],
 )
diff --git a/private/tools/java/rules/jvm/external/javadoc/BUILD.bazel b/private/tools/java/rules/jvm/external/javadoc/BUILD
similarity index 100%
rename from private/tools/java/rules/jvm/external/javadoc/BUILD.bazel
rename to private/tools/java/rules/jvm/external/javadoc/BUILD
diff --git a/private/tools/java/rules/jvm/external/maven/BUILD.bazel b/private/tools/java/rules/jvm/external/maven/BUILD
similarity index 100%
rename from private/tools/java/rules/jvm/external/maven/BUILD.bazel
rename to private/tools/java/rules/jvm/external/maven/BUILD
index 37e9f5579..b26ff7daf 100644
--- a/private/tools/java/rules/jvm/external/maven/BUILD.bazel
+++ b/private/tools/java/rules/jvm/external/maven/BUILD
@@ -8,8 +8,8 @@ java_binary(
         "8",
     ],
     main_class = "rules.jvm.external.maven.MavenPublisher",
+    visibility = ["//visibility:public"],
     deps = [
         "//private/tools/java/rules/jvm/external:byte-streams",
     ],
-    visibility = ["//visibility:public"],
 )
diff --git a/private/tools/java/rules/jvm/external/zip/BUILD.bazel b/private/tools/java/rules/jvm/external/zip/BUILD
similarity index 100%
rename from private/tools/java/rules/jvm/external/zip/BUILD.bazel
rename to private/tools/java/rules/jvm/external/zip/BUILD
diff --git a/tests/com/jvm/external/javadoc/BUILD.bazel b/tests/com/jvm/external/javadoc/BUILD
similarity index 100%
rename from tests/com/jvm/external/javadoc/BUILD.bazel
rename to tests/com/jvm/external/javadoc/BUILD