diff --git a/hpb/BUILD b/hpb/BUILD
index 91e21fe8bf..a82d1278cc 100644
--- a/hpb/BUILD
+++ b/hpb/BUILD
@@ -116,13 +116,13 @@ cc_library(
 
 # Common support code for C++ generated code.
 cc_library(
-    name = "generated_protos_support__only_for_generated_code_do_not_use__i_give_permission_to_break_me",
+    name = "generated_hpb_support",
     hdrs = [
         "internal.h",
     ],
     compatible_with = ["//buildenv/target:non_prod"],
     copts = UPB_DEFAULT_CPPOPTS,
-    visibility = ["//visibility:public"],
+    visibility = ["//hpb/bazel:__pkg__"],
     deps = [
         ":hpb",
         ":internal",
diff --git a/hpb/bazel/upb_cc_proto_library.bzl b/hpb/bazel/upb_cc_proto_library.bzl
index 91c9f7e0af..ac9b9afbfe 100644
--- a/hpb/bazel/upb_cc_proto_library.bzl
+++ b/hpb/bazel/upb_cc_proto_library.bzl
@@ -254,7 +254,7 @@ _upb_cc_proto_library_aspect = aspect(
             default = [
                 # TODO: Add dependencies for cc runtime (absl/string etc..)
                 "//upb:generated_cpp_support__only_for_generated_code_do_not_use__i_give_permission_to_break_me",
-                "//hpb:generated_protos_support__only_for_generated_code_do_not_use__i_give_permission_to_break_me",
+                "//hpb:generated_hpb_support",
                 "@com_google_absl//absl/strings",
                 "@com_google_absl//absl/status:statusor",
                 "//hpb:repeated_field",