diff --git a/benchmarks/BUILD b/benchmarks/BUILD
index 07f87a91e7..108eab493f 100644
--- a/benchmarks/BUILD
+++ b/benchmarks/BUILD
@@ -13,7 +13,7 @@ load("@rules_python//python:defs.bzl", "py_binary")
 
 load(
     "//bazel:upb_proto_library.bzl",
-    "upb_proto_library",
+    "upb_c_proto_library",
     "upb_proto_reflection_library",
 )
 load(
@@ -35,7 +35,7 @@ proto_library(
     srcs = ["descriptor.proto"],
 )
 
-upb_proto_library(
+upb_c_proto_library(
     name = "benchmark_descriptor_upb_proto",
     deps = [":descriptor_proto"],
 )
@@ -154,7 +154,7 @@ proto_library(
 )
 
 [(
-    upb_proto_library(
+    upb_c_proto_library(
         name = k + "_upb_proto",
         deps = [":" + k + "_proto"],
     ),
diff --git a/protos_generator/tests/BUILD b/protos_generator/tests/BUILD
index e5c203f229..e4b236626f 100644
--- a/protos_generator/tests/BUILD
+++ b/protos_generator/tests/BUILD
@@ -11,7 +11,7 @@ load(
 )
 load(
     "//bazel:upb_proto_library.bzl",
-    "upb_proto_library",
+    "upb_c_proto_library",
 )
 load(
     "//protos/bazel:upb_cc_proto_library.bzl",
@@ -60,7 +60,7 @@ proto_library(
     deps = [":no_package_proto"],
 )
 
-upb_proto_library(
+upb_c_proto_library(
     name = "test_model_upb_proto",
     visibility = [
         "//protos:__pkg__",
diff --git a/upb/conformance/BUILD b/upb/conformance/BUILD
index c22ea41301..18cfc57c14 100644
--- a/upb/conformance/BUILD
+++ b/upb/conformance/BUILD
@@ -12,7 +12,7 @@ load(
 )
 load(
     "//bazel:upb_proto_library.bzl",
-    "upb_proto_library",
+    "upb_c_proto_library",
     "upb_proto_reflection_library",
 )
 
@@ -28,7 +28,7 @@ config_setting(
     visibility = ["//visibility:public"],
 )
 
-upb_proto_library(
+upb_c_proto_library(
     name = "conformance_upb_proto",
     testonly = 1,
     deps = ["//conformance:conformance_proto"],
diff --git a/upb/json/BUILD b/upb/json/BUILD
index 31840a4f29..b560854f50 100644
--- a/upb/json/BUILD
+++ b/upb/json/BUILD
@@ -3,7 +3,7 @@
 load("//bazel:build_defs.bzl", "UPB_DEFAULT_COPTS")
 load(
     "//bazel:upb_proto_library.bzl",
-    "upb_proto_library",
+    "upb_c_proto_library",
     "upb_proto_reflection_library",
 )
 
@@ -64,7 +64,7 @@ proto_library(
     deps = ["//:struct_proto"],
 )
 
-upb_proto_library(
+upb_c_proto_library(
     name = "test_upb_proto",
     testonly = 1,
     deps = [":test_proto"],
@@ -77,7 +77,7 @@ upb_proto_reflection_library(
 )
 
 # TODO: This target arguably belongs in //google/protobuf/BUILD
-upb_proto_library(
+upb_c_proto_library(
     name = "struct_upb_proto",
     testonly = 1,
     deps = ["//:struct_proto"],
diff --git a/upb/message/BUILD b/upb/message/BUILD
index 72a4500e67..22d4ea9319 100644
--- a/upb/message/BUILD
+++ b/upb/message/BUILD
@@ -12,7 +12,7 @@ load(
 )
 load(
     "//bazel:upb_proto_library.bzl",
-    "upb_proto_library",
+    "upb_c_proto_library",
     "upb_proto_reflection_library",
 )
 
@@ -235,7 +235,7 @@ upb_minitable_proto_library(
     deps = [":message_test_proto"],
 )
 
-upb_proto_library(
+upb_c_proto_library(
     name = "message_test_upb_proto",
     testonly = 1,
     deps = [":message_test_proto"],
@@ -377,7 +377,7 @@ upb_minitable_proto_library(
     deps = [":utf8_test_proto"],
 )
 
-upb_proto_library(
+upb_c_proto_library(
     name = "utf8_test_upb_proto",
     testonly = 1,
     deps = [":utf8_test_proto"],
diff --git a/upb/test/BUILD b/upb/test/BUILD
index b147e06c08..6ae451d029 100644
--- a/upb/test/BUILD
+++ b/upb/test/BUILD
@@ -15,7 +15,7 @@ load(
 )
 load(
     "//bazel:upb_proto_library.bzl",
-    "upb_proto_library",
+    "upb_c_proto_library",
     "upb_proto_reflection_library",
 )
 
@@ -52,7 +52,7 @@ proto_library(
     deps = ["//:descriptor_proto"],
 )
 
-upb_proto_library(
+upb_c_proto_library(
     name = "proto3_test_upb_proto",
     testonly = 1,
     deps = [":proto3_test_proto"],
@@ -77,7 +77,7 @@ upb_minitable_proto_library(
     deps = [":test_proto"],
 )
 
-upb_proto_library(
+upb_c_proto_library(
     name = "test_upb_proto",
     testonly = 1,
     visibility = ["//upb:__subpackages__"],
@@ -90,7 +90,7 @@ proto_library(
     deps = ["//:timestamp_proto"],
 )
 
-upb_proto_library(
+upb_c_proto_library(
     name = "test_cpp_upb_proto",
     deps = ["test_cpp_proto"],
 )
@@ -114,21 +114,21 @@ upb_minitable_proto_library(
     deps = ["//src/google/protobuf:test_messages_proto3_proto"],
 )
 
-upb_proto_library(
+upb_c_proto_library(
     name = "test_messages_proto2_upb_proto",
     testonly = 1,
     visibility = ["//upb:__subpackages__"],
     deps = ["//src/google/protobuf:test_messages_proto2_proto"],
 )
 
-upb_proto_library(
+upb_c_proto_library(
     name = "test_messages_proto3_upb_proto",
     testonly = 1,
     visibility = ["//upb:__subpackages__"],
     deps = ["//src/google/protobuf:test_messages_proto3_proto"],
 )
 
-upb_proto_library(
+upb_c_proto_library(
     name = "timestamp_upb_proto",
     deps = ["//:timestamp_proto"],
 )
@@ -252,7 +252,7 @@ upb_minitable_proto_library(
     deps = [":test_import_empty_srcs_proto"],
 )
 
-upb_proto_library(
+upb_c_proto_library(
     name = "test_import_empty_srcs_upb_proto",
     testonly = 1,
     deps = [":test_import_empty_srcs_proto"],
diff --git a/upb/util/BUILD b/upb/util/BUILD
index 1abbaf070f..f15f351017 100644
--- a/upb/util/BUILD
+++ b/upb/util/BUILD
@@ -1,6 +1,6 @@
 load(
     "//bazel:upb_proto_library.bzl",
-    "upb_proto_library",
+    "upb_c_proto_library",
     "upb_proto_reflection_library",
 )
 
@@ -33,7 +33,7 @@ proto_library(
     ],
 )
 
-upb_proto_library(
+upb_c_proto_library(
     name = "def_to_proto_test_upb_proto",
     deps = ["def_to_proto_test_proto"],
 )
@@ -110,7 +110,7 @@ proto_library(
     srcs = ["required_fields_test.proto"],
 )
 
-upb_proto_library(
+upb_c_proto_library(
     name = "required_fields_test_upb_proto",
     deps = ["required_fields_test_proto"],
 )
diff --git a/upb_generator/BUILD b/upb_generator/BUILD
index bf0a1b9143..79f2ac3649 100644
--- a/upb_generator/BUILD
+++ b/upb_generator/BUILD
@@ -16,7 +16,7 @@ load(
 )
 load(
     "//bazel:upb_proto_library.bzl",
-    "upb_proto_library",
+    "upb_c_proto_library",
     "upb_proto_reflection_library",
 )
 load(
@@ -39,7 +39,7 @@ proto_library(
     deps = ["//:compiler_plugin_proto"],
 )
 
-upb_proto_library(
+upb_c_proto_library(
     name = "code_generator_request_upb_proto",
     visibility = ["//upb:friends"],
     deps = [":code_generator_request"],