diff --git a/curl/upload/ManifestInfo.bzl b/curl/upload/ManifestInfo.bzl
index 60d5d604a4ae1babadbe1380dd62a9c07f7b1ba0..2694446a2c11ffe591b22c58724d2eb1d95d6c25 100644
--- a/curl/upload/ManifestInfo.bzl
+++ b/curl/upload/ManifestInfo.bzl
@@ -1,6 +1,6 @@
 load("@bazel_skylib//lib:types.bzl", "types")
 
-visibility("public")
+visibility("//...")
 
 def init(file, url):
     """
diff --git a/curl/upload/ManifestsInfo.bzl b/curl/upload/ManifestsInfo.bzl
index 9bf15e75275b82617030ce1767c1aba17890b598..800e6d3eb2cde58822ea9a6de87cc43dc4225b26 100644
--- a/curl/upload/ManifestsInfo.bzl
+++ b/curl/upload/ManifestsInfo.bzl
@@ -1,6 +1,6 @@
 load("@bazel_skylib//lib:types.bzl", "types")
 
-visibility("public")
+visibility("//...")
 
 def init(manifests):
     """
diff --git a/curl/upload/manifest/BUILD.bazel b/curl/upload/manifest/BUILD.bazel
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/curl/upload/manifest/defs.bzl b/curl/upload/manifest/defs.bzl
new file mode 100644
index 0000000000000000000000000000000000000000..ce7ef89794a233248c70386e6cf35ccc3bcf225a
--- /dev/null
+++ b/curl/upload/manifest/defs.bzl
@@ -0,0 +1,5 @@
+load("//curl/upload:ManifestInfo.bzl", _Manifest = "Info")
+
+visibility("public")
+
+CurlUploadManifestInfo = _Manifest
diff --git a/curl/upload/manifests/defs.bzl b/curl/upload/manifests/defs.bzl
index 0625998093da44bf289465a6cd6f8a52d1c51771..0da0eba9e30c6eabdb15119927a3d343282a140a 100644
--- a/curl/upload/manifests/defs.bzl
+++ b/curl/upload/manifests/defs.bzl
@@ -1,5 +1,9 @@
 load(":rule.bzl", _manifests = "manifests")
+load("//curl/upload:ManifestInfo.bzl", _Manifest = "Info")
+load("//curl/upload:ManifestsInfo.bzl", _Manifests = "Info")
 
 visibility("public")
 
 curl_upload_manifests = _manifests
+CurlUploadManifestInfo = _Manifest
+CurlUploadManifestsInfo = _Manifests
diff --git a/e2e/mock/manifest/rule.bzl b/e2e/mock/manifest/rule.bzl
index 6d3bbe20ccd68dd09e5a89c65543446c871afb9d..8dcd73885bf99b2aa46cf7dad44b530130c4fe4c 100644
--- a/e2e/mock/manifest/rule.bzl
+++ b/e2e/mock/manifest/rule.bzl
@@ -1,4 +1,4 @@
-load("@rules_curl//curl/upload:ManifestInfo.bzl", "ManifestInfo")
+load("@rules_curl//curl/upload/manifest:defs.bzl", ManifestInfo = "CurlUploadManifestInfo")
 
 DOC = """Mock rule with output `ManifestInfo` provider.
 
diff --git a/e2e/mock/manifests/rule.bzl b/e2e/mock/manifests/rule.bzl
index 8f3caea59a0daabf2b8a07c0e4dc7bbebfe35486..d786e4e220f14bd760f63ddcfb5787b9b821f8c0 100644
--- a/e2e/mock/manifests/rule.bzl
+++ b/e2e/mock/manifests/rule.bzl
@@ -1,5 +1,4 @@
-load("@rules_curl//curl/upload:ManifestInfo.bzl", "ManifestInfo", "manifest_info")
-load("@rules_curl//curl/upload:ManifestsInfo.bzl", "ManifestsInfo")
+load("@rules_curl//curl/upload/manifests:defs.bzl", ManifestsInfo = "CurlUploadManifestsInfo", ManifestInfo = "CurlUploadManifestInfo")
 
 DOC = """Mock rule with output `ManifestsInfo` provider.
 
@@ -33,7 +32,7 @@ def _impl(ctx):
 
     files = depset(outs)
 
-    manifests = [manifest_info(file = o, url = "{{.URL.Href}}/{{.File.Path}}") for o in outs]
+    manifests = [ManifestInfo(file = o, url = "{{.URL.Href}}/{{.File.Path}}") for o in outs]
     manifests.extend([dep[ManifestInfo] for dep in ctx.attr.deps if ManifestInfo in dep])
 
     transitive = [dep[ManifestsInfo].manifests for dep in ctx.attr.deps if ManifestsInfo in dep]