diff --git a/examples/hello_world/BUILD b/examples/hello_world/BUILD
index 2e951cc..f8ee957 100644
--- a/examples/hello_world/BUILD
+++ b/examples/hello_world/BUILD
@@ -1,4 +1,4 @@
-load("//java:defs.bzl", "java_binary")
+load("//java:java_binary.bzl", "java_binary")
 
 package(default_applicable_licenses = ["@rules_java//:license"])
 
diff --git a/java/runfiles/src/main/java/com/google/devtools/build/runfiles/BUILD b/java/runfiles/src/main/java/com/google/devtools/build/runfiles/BUILD
index 5b521a9..11b8ae0 100644
--- a/java/runfiles/src/main/java/com/google/devtools/build/runfiles/BUILD
+++ b/java/runfiles/src/main/java/com/google/devtools/build/runfiles/BUILD
@@ -1,4 +1,5 @@
-load("//java:defs.bzl", "java_library", "java_plugin")
+load("//java:java_library.bzl", "java_library")
+load("//java:java_plugin.bzl", "java_plugin")
 
 package(default_applicable_licenses = ["@rules_java//:license"])
 
diff --git a/test/java/private/android_support_tests.bzl b/test/java/private/android_support_tests.bzl
index 95596de..8f9bea6 100644
--- a/test/java/private/android_support_tests.bzl
+++ b/test/java/private/android_support_tests.bzl
@@ -15,7 +15,8 @@
 
 load("@rules_testing//lib:analysis_test.bzl", "analysis_test", "test_suite")
 load("@rules_testing//lib:util.bzl", "util")
-load("//java:defs.bzl", "java_library", "java_plugin")
+load("//java:java_library.bzl", "java_library")
+load("//java:java_plugin.bzl", "java_plugin")
 load("//java/common:java_info.bzl", "JavaInfo")
 load("//java/private:android_support.bzl", "android_support")  # buildifier: disable=bzl-visibility
 load("//test/java/testutil:java_info_subject.bzl", "java_info_subject")
diff --git a/test/java/testutil/rules/custom_library_with_wrong_plugins_type.bzl b/test/java/testutil/rules/custom_library_with_wrong_plugins_type.bzl
index 1253530..dc58cee 100644
--- a/test/java/testutil/rules/custom_library_with_wrong_plugins_type.bzl
+++ b/test/java/testutil/rules/custom_library_with_wrong_plugins_type.bzl
@@ -1,6 +1,7 @@
 """Custom rule to test java_common.compile(plugins = ...) expects JavaPluginInfo"""
 
-load("//java:defs.bzl", "JavaInfo", "java_common")
+load("//java/common:java_common.bzl", "java_common")
+load("//java/common:java_info.bzl", "JavaInfo")
 load("//java/common:java_semantics.bzl", "semantics")
 
 def _impl(ctx):