diff --git a/.github/workflows/bazel.yml b/.github/workflows/bazel.yml
index ff89a35a5c..38ba0fc30d 100644
--- a/.github/workflows/bazel.yml
+++ b/.github/workflows/bazel.yml
@@ -33,7 +33,7 @@ jobs:
           password: ${{ secrets.BAZEL_CACHE_PASSWORD }}
 
       - name: bazel ${{ matrix.action }}
-        run: bazel ${{ matrix.action }} ...   --config=ci ${{ matrix.config }} --verbose_failures
+        run: bazel --output_user_root=C:\\bazelroot ${{ matrix.action }} ... --config=ci ${{ matrix.config }} --verbose_failures
         shell: bash
 
   build-mac:
diff --git a/BUILD.bazel b/BUILD.bazel
index cf7e7ee180..ac1e2f69df 100644
--- a/BUILD.bazel
+++ b/BUILD.bazel
@@ -69,6 +69,7 @@ publish_all(
         "//cameraserver:cameraserver-java_publish.publish",
         "//cscore:cscore-cpp_publish.publish",
         "//cscore:cscore-java_publish.publish",
+        "//cscore:cscorejnicvstatic-cpp_publish.publish",
         "//datalog:datalog-cpp_publish.publish",
         "//datalog:datalog-java_publish.publish",
         "//tools/datalogtool:datalogtool_publish.publish",
diff --git a/apriltag/BUILD.bazel b/apriltag/BUILD.bazel
index b51d967f1f..9fc0ed5d78 100644
--- a/apriltag/BUILD.bazel
+++ b/apriltag/BUILD.bazel
@@ -8,7 +8,7 @@ load("//apriltag:robotpy_pybind_build_info.bzl", "apriltag_extension", "define_p
 load("//shared/bazel/rules:cc_rules.bzl", "wpilib_cc_library", "wpilib_cc_shared_library", "wpilib_cc_static_library")
 load("//shared/bazel/rules:java_rules.bzl", "wpilib_java_junit5_test")
 load("//shared/bazel/rules:jni_rules.bzl", "wpilib_jni_cc_library", "wpilib_jni_java_library")
-load("//shared/bazel/rules:packaging.bzl", "package_minimal_jni_project")
+load("//shared/bazel/rules:packaging.bzl", "package_default_jni_project")
 load("//shared/bazel/rules/gen:gen-resources.bzl", "generate_resources")
 load("//shared/bazel/rules/robotpy:build_info_gen.bzl", "generate_robotpy_native_wrapper_build_info", "generate_robotpy_pybind_build_info")
 load("//shared/bazel/rules/robotpy:pytest_util.bzl", "robotpy_py_test")
@@ -212,7 +212,7 @@ py_binary(
     }),
 )
 
-package_minimal_jni_project(
+package_default_jni_project(
     name = "apriltag",
     maven_artifact_name = "apriltag-cpp",
     maven_group_id = "org.wpilib.apriltag",
diff --git a/cameraserver/BUILD.bazel b/cameraserver/BUILD.bazel
index 50bedb393e..ffaee307df 100644
--- a/cameraserver/BUILD.bazel
+++ b/cameraserver/BUILD.bazel
@@ -3,7 +3,7 @@ load("@rules_cc//cc:defs.bzl", "cc_binary", "cc_test")
 load("@rules_java//java:defs.bzl", "java_binary")
 load("//shared/bazel/rules:cc_rules.bzl", "wpilib_cc_library", "wpilib_cc_shared_library", "wpilib_cc_static_library")
 load("//shared/bazel/rules:java_rules.bzl", "wpilib_java_library")
-load("//shared/bazel/rules:packaging.bzl", "package_minimal_cc_project")
+load("//shared/bazel/rules:packaging.bzl", "package_default_cc_project")
 
 filegroup(
     name = "doxygen-files",
@@ -93,7 +93,7 @@ java_binary(
     ],
 )
 
-package_minimal_cc_project(
+package_default_cc_project(
     name = "cameraserver",
     maven_artifact_name = "cameraserver-cpp",
     maven_group_id = "org.wpilib.cameraserver",
diff --git a/commandsv2/BUILD.bazel b/commandsv2/BUILD.bazel
index 86be7d837c..f643290b45 100644
--- a/commandsv2/BUILD.bazel
+++ b/commandsv2/BUILD.bazel
@@ -6,7 +6,7 @@ load("@rules_python//python:defs.bzl", "py_binary")
 load("//commandsv2:generate.bzl", "generate_wpilib_new_commands")
 load("//shared/bazel/rules:cc_rules.bzl", "third_party_cc_lib_helper", "wpilib_cc_library", "wpilib_cc_shared_library", "wpilib_cc_static_library")
 load("//shared/bazel/rules:java_rules.bzl", "wpilib_java_junit5_test", "wpilib_java_library")
-load("//shared/bazel/rules:packaging.bzl", "package_minimal_cc_project")
+load("//shared/bazel/rules:packaging.bzl", "package_default_cc_project")
 
 filegroup(
     name = "doxygen-files",
@@ -178,7 +178,7 @@ java_binary(
     ],
 )
 
-package_minimal_cc_project(
+package_default_cc_project(
     name = "commandsv2",
     maven_artifact_name = "commandsv2-cpp",
     maven_group_id = "org.wpilib.commandsv2",
diff --git a/cscore/BUILD.bazel b/cscore/BUILD.bazel
index 420bc3d2f4..eef0ce6899 100644
--- a/cscore/BUILD.bazel
+++ b/cscore/BUILD.bazel
@@ -5,7 +5,7 @@ load("//shared/bazel/rules:cc_rules.bzl", "wpilib_cc_library", "wpilib_cc_shared
 load("//shared/bazel/rules:java_rules.bzl", "wpilib_java_junit5_test")
 load("//shared/bazel/rules:jni_rules.bzl", "wpilib_jni_cc_library", "wpilib_jni_java_library")
 load("//shared/bazel/rules:objectivec_rules.bzl", "wpilib_objc_library")
-load("//shared/bazel/rules:packaging.bzl", "package_minimal_jni_project")
+load("//shared/bazel/rules:packaging.bzl", "package_default_jni_project", "package_shared_cc_project")
 
 filegroup(
     name = "doxygen-files",
@@ -182,6 +182,7 @@ wpilib_cc_shared_library(
         "//wpinet:shared/wpinet",
         "//wpiutil:shared/wpiutil",
     ],
+    use_debug_name = False,
     user_link_flags = select({
         "@platforms//os:linux": [
             "-Wl,-soname,libcscorejnicvstatic.so",
@@ -278,7 +279,7 @@ java_binary(
     "usbviewer",
 ]]
 
-package_minimal_jni_project(
+package_default_jni_project(
     name = "cscore",
     maven_artifact_name = "cscore-cpp",
     maven_group_id = "org.wpilib.cscore",
@@ -293,3 +294,9 @@ alias(
     name = "cscorejnicvstatic-srcs-zip",
     actual = "cscore-srcs-zip",
 )
+
+package_shared_cc_project(
+    name = "cscorejnicvstatic",
+    maven_artifact_name = "cscore-jnicvstatic",
+    maven_group_id = "edu.wpi.first.cscore",
+)
diff --git a/datalog/BUILD.bazel b/datalog/BUILD.bazel
index 8301dfb6a5..54eac8debf 100644
--- a/datalog/BUILD.bazel
+++ b/datalog/BUILD.bazel
@@ -7,7 +7,7 @@ load("//datalog:robotpy_pybind_build_info.bzl", "define_pybind_library", "wpilog
 load("//shared/bazel/rules:cc_rules.bzl", "wpilib_cc_library", "wpilib_cc_shared_library", "wpilib_cc_static_library")
 load("//shared/bazel/rules:java_rules.bzl", "wpilib_java_junit5_test")
 load("//shared/bazel/rules:jni_rules.bzl", "wpilib_jni_cc_library", "wpilib_jni_java_library")
-load("//shared/bazel/rules:packaging.bzl", "package_minimal_jni_project")
+load("//shared/bazel/rules:packaging.bzl", "package_default_jni_project")
 load("//shared/bazel/rules/robotpy:build_info_gen.bzl", "generate_robotpy_native_wrapper_build_info", "generate_robotpy_pybind_build_info")
 load("//shared/bazel/rules/robotpy:pytest_util.bzl", "robotpy_py_test")
 
@@ -146,7 +146,7 @@ wpilib_java_junit5_test(
     ],
 )
 
-package_minimal_jni_project(
+package_default_jni_project(
     name = "datalog",
     maven_artifact_name = "datalog-cpp",
     maven_group_id = "org.wpilib.datalog",
diff --git a/fields/BUILD.bazel b/fields/BUILD.bazel
index 9104cbff33..b349ba481a 100644
--- a/fields/BUILD.bazel
+++ b/fields/BUILD.bazel
@@ -1,7 +1,7 @@
 load("@rules_pkg//:mappings.bzl", "pkg_files")
 load("//shared/bazel/rules:cc_rules.bzl", "wpilib_cc_library", "wpilib_cc_static_library")
 load("//shared/bazel/rules:java_rules.bzl", "wpilib_java_junit5_test", "wpilib_java_library")
-load("//shared/bazel/rules:packaging.bzl", "package_minimal_cc_project")
+load("//shared/bazel/rules:packaging.bzl", "package_static_cc_project")
 load("//shared/bazel/rules/gen:gen-resources.bzl", "generate_resources")
 
 generate_resources(
@@ -61,7 +61,7 @@ wpilib_java_junit5_test(
     ],
 )
 
-package_minimal_cc_project(
+package_static_cc_project(
     name = "fields",
     maven_artifact_name = "fields-cpp",
     maven_group_id = "org.wpilib.fields",
diff --git a/glass/BUILD.bazel b/glass/BUILD.bazel
index f645a242df..4c61ed3eb4 100644
--- a/glass/BUILD.bazel
+++ b/glass/BUILD.bazel
@@ -1,6 +1,7 @@
 load("@rules_cc//cc:defs.bzl", "cc_binary")
 load("//shared/bazel/rules:cc_rules.bzl", "wpilib_cc_library", "wpilib_cc_static_library")
-load("//shared/bazel/rules:packaging.bzl", "package_binary_cc_project", "package_minimal_cc_project")
+load("//shared/bazel/rules:packaging.bzl", "package_binary_cc_project", "package_static_cc_project")
+load("//shared/bazel/rules:publishing.bzl", "host_architectures")
 load("//shared/bazel/rules/gen:gen-resources.bzl", "generate_resources")
 load("//shared/bazel/rules/gen:gen-version-file.bzl", "generate_version_file")
 
@@ -99,14 +100,16 @@ cc_binary(
     ],
 )
 
-package_minimal_cc_project(
+package_static_cc_project(
     name = "glass",
+    architectures = host_architectures,
     maven_artifact_name = "libglass",
     maven_group_id = "org.wpilib.glass",
 )
 
-package_minimal_cc_project(
+package_static_cc_project(
     name = "glassnt",
+    architectures = host_architectures,
     maven_artifact_name = "libglassnt",
     maven_group_id = "org.wpilib.glass",
 )
diff --git a/hal/BUILD.bazel b/hal/BUILD.bazel
index 53d5e31a1b..f80892a31d 100644
--- a/hal/BUILD.bazel
+++ b/hal/BUILD.bazel
@@ -10,7 +10,7 @@ load("//hal:robotpy_pybind_build_info.bzl", "define_pybind_library", "hal_simula
 load("//shared/bazel/rules:cc_rules.bzl", "third_party_cc_lib_helper", "wpilib_cc_library", "wpilib_cc_shared_library", "wpilib_cc_static_library")
 load("//shared/bazel/rules:java_rules.bzl", "wpilib_java_junit5_test")
 load("//shared/bazel/rules:jni_rules.bzl", "wpilib_jni_cc_library", "wpilib_jni_java_library")
-load("//shared/bazel/rules:packaging.bzl", "package_minimal_jni_project")
+load("//shared/bazel/rules:packaging.bzl", "package_default_jni_project")
 load("//shared/bazel/rules/robotpy:build_info_gen.bzl", "generate_robotpy_native_wrapper_build_info", "generate_robotpy_pybind_build_info")
 load("//shared/bazel/rules/robotpy:pytest_util.bzl", "robotpy_py_test")
 
@@ -232,7 +232,7 @@ java_binary(
     ],
 )
 
-package_minimal_jni_project(
+package_default_jni_project(
     name = "wpiHal",
     maven_artifact_name = "hal-cpp",
     maven_group_id = "org.wpilib.hal",
diff --git a/romiVendordep/BUILD.bazel b/romiVendordep/BUILD.bazel
index c7c31ffbcc..9c65bd98d0 100644
--- a/romiVendordep/BUILD.bazel
+++ b/romiVendordep/BUILD.bazel
@@ -5,7 +5,7 @@ load("//romiVendordep:robotpy_native_build_info.bzl", "define_native_wrapper")
 load("//romiVendordep:robotpy_pybind_build_info.bzl", "define_pybind_library", "romi_extension")
 load("//shared/bazel/rules:cc_rules.bzl", "wpilib_cc_library", "wpilib_cc_shared_library", "wpilib_cc_static_library")
 load("//shared/bazel/rules:java_rules.bzl", "wpilib_java_library")
-load("//shared/bazel/rules:packaging.bzl", "package_minimal_cc_project")
+load("//shared/bazel/rules:packaging.bzl", "package_default_cc_project")
 load("//shared/bazel/rules/robotpy:build_info_gen.bzl", "generate_robotpy_native_wrapper_build_info", "generate_robotpy_pybind_build_info")
 load("//shared/bazel/rules/robotpy:pytest_util.bzl", "robotpy_py_test")
 
@@ -101,7 +101,7 @@ java_binary(
     ],
 )
 
-package_minimal_cc_project(
+package_default_cc_project(
     name = "romiVendordep",
     maven_artifact_name = "romiVendordep-cpp",
     maven_group_id = "org.wpilib.romiVendordep",
diff --git a/simulation/halsim_ds_socket/BUILD.bazel b/simulation/halsim_ds_socket/BUILD.bazel
index 212090b3c6..407e4d19ed 100644
--- a/simulation/halsim_ds_socket/BUILD.bazel
+++ b/simulation/halsim_ds_socket/BUILD.bazel
@@ -1,6 +1,7 @@
 load("@rules_cc//cc:defs.bzl", "cc_binary", "cc_library", "cc_test")
 load("//shared/bazel/rules:cc_rules.bzl", "wpilib_cc_library", "wpilib_cc_shared_library", "wpilib_cc_static_library")
-load("//shared/bazel/rules:packaging.bzl", "package_minimal_cc_project")
+load("//shared/bazel/rules:packaging.bzl", "package_default_cc_project")
+load("//shared/bazel/rules:publishing.bzl", "host_architectures")
 
 cc_library(
     name = "headers",
@@ -85,8 +86,9 @@ cc_binary(
     ],
 )
 
-package_minimal_cc_project(
+package_default_cc_project(
     name = "halsim_ds_socket",
+    architectures = host_architectures,
     maven_artifact_name = "halsim_ds_socket",
     maven_group_id = "org.wpilib.halsim",
 )
diff --git a/simulation/halsim_gui/BUILD.bazel b/simulation/halsim_gui/BUILD.bazel
index fdec998e6f..19668c4317 100644
--- a/simulation/halsim_gui/BUILD.bazel
+++ b/simulation/halsim_gui/BUILD.bazel
@@ -1,6 +1,7 @@
 load("@rules_cc//cc:defs.bzl", "cc_binary", "cc_test")
 load("//shared/bazel/rules:cc_rules.bzl", "wpilib_cc_library", "wpilib_cc_shared_library", "wpilib_cc_static_library")
-load("//shared/bazel/rules:packaging.bzl", "package_minimal_cc_project")
+load("//shared/bazel/rules:packaging.bzl", "package_default_cc_project")
+load("//shared/bazel/rules:publishing.bzl", "host_architectures")
 
 wpilib_cc_library(
     name = "halsim_gui",
@@ -141,8 +142,9 @@ cc_binary(
     ],
 )
 
-package_minimal_cc_project(
+package_default_cc_project(
     name = "halsim_gui",
+    architectures = host_architectures,
     maven_artifact_name = "halsim_gui",
     maven_group_id = "org.wpilib.halsim",
 )
diff --git a/simulation/halsim_ws_client/BUILD.bazel b/simulation/halsim_ws_client/BUILD.bazel
index 69cc886f0e..3dca2ba5bc 100644
--- a/simulation/halsim_ws_client/BUILD.bazel
+++ b/simulation/halsim_ws_client/BUILD.bazel
@@ -1,7 +1,8 @@
 load("@rules_cc//cc:defs.bzl", "cc_binary")
 load("//shared/bazel/rules:cc_rules.bzl", "wpilib_cc_shared_library", "wpilib_cc_static_library")
 load("//shared/bazel/rules:halsim_library.bzl", "wpilib_halsim_extension")
-load("//shared/bazel/rules:packaging.bzl", "package_minimal_cc_project")
+load("//shared/bazel/rules:packaging.bzl", "package_default_cc_project")
+load("//shared/bazel/rules:publishing.bzl", "host_architectures")
 
 wpilib_halsim_extension(
     name = "halsim_ws_client",
@@ -63,8 +64,9 @@ cc_binary(
     ],
 )
 
-package_minimal_cc_project(
+package_default_cc_project(
     name = "halsim_ws_client",
+    architectures = host_architectures,
     maven_artifact_name = "halsim_ws_client",
     maven_group_id = "org.wpilib.halsim",
 )
diff --git a/simulation/halsim_ws_core/BUILD.bazel b/simulation/halsim_ws_core/BUILD.bazel
index dd8df3c531..0674d31703 100644
--- a/simulation/halsim_ws_core/BUILD.bazel
+++ b/simulation/halsim_ws_core/BUILD.bazel
@@ -1,5 +1,6 @@
 load("//shared/bazel/rules:cc_rules.bzl", "wpilib_cc_library", "wpilib_cc_shared_library", "wpilib_cc_static_library")
-load("//shared/bazel/rules:packaging.bzl", "package_minimal_cc_project")
+load("//shared/bazel/rules:packaging.bzl", "package_default_cc_project")
+load("//shared/bazel/rules:publishing.bzl", "host_architectures")
 
 wpilib_cc_library(
     name = "halsim_ws_core",
@@ -47,8 +48,9 @@ wpilib_cc_static_library(
     ],
 )
 
-package_minimal_cc_project(
+package_default_cc_project(
     name = "halsim_ws_core",
+    architectures = host_architectures,
     maven_artifact_name = "halsim_ws_core",
     maven_group_id = "org.wpilib.halsim",
 )
diff --git a/simulation/halsim_ws_server/BUILD.bazel b/simulation/halsim_ws_server/BUILD.bazel
index 0ce6862652..a25fcce1de 100644
--- a/simulation/halsim_ws_server/BUILD.bazel
+++ b/simulation/halsim_ws_server/BUILD.bazel
@@ -1,6 +1,7 @@
 load("@rules_cc//cc:defs.bzl", "cc_binary", "cc_library", "cc_test")
 load("//shared/bazel/rules:cc_rules.bzl", "wpilib_cc_library", "wpilib_cc_shared_library", "wpilib_cc_static_library")
-load("//shared/bazel/rules:packaging.bzl", "package_minimal_cc_project")
+load("//shared/bazel/rules:packaging.bzl", "package_default_cc_project")
+load("//shared/bazel/rules:publishing.bzl", "host_architectures")
 
 cc_library(
     name = "headers",
@@ -100,8 +101,9 @@ cc_binary(
     ],
 )
 
-package_minimal_cc_project(
+package_default_cc_project(
     name = "halsim_ws_server",
+    architectures = host_architectures,
     maven_artifact_name = "halsim_ws_server",
     maven_group_id = "org.wpilib.halsim",
 )
diff --git a/simulation/halsim_xrp/BUILD.bazel b/simulation/halsim_xrp/BUILD.bazel
index 477dda6bed..4abfe3bf28 100644
--- a/simulation/halsim_xrp/BUILD.bazel
+++ b/simulation/halsim_xrp/BUILD.bazel
@@ -1,6 +1,7 @@
 load("@rules_cc//cc:defs.bzl", "cc_binary")
 load("//shared/bazel/rules:cc_rules.bzl", "wpilib_cc_library", "wpilib_cc_shared_library", "wpilib_cc_static_library")
-load("//shared/bazel/rules:packaging.bzl", "package_minimal_cc_project")
+load("//shared/bazel/rules:packaging.bzl", "package_default_cc_project")
+load("//shared/bazel/rules:publishing.bzl", "host_architectures")
 
 wpilib_cc_library(
     name = "halsim_xrp",
@@ -76,8 +77,9 @@ cc_binary(
     srcs = ["src/dev/native/cpp/main.cpp"],
 )
 
-package_minimal_cc_project(
+package_default_cc_project(
     name = "halsim_xrp",
+    architectures = host_architectures,
     maven_artifact_name = "halsim_xrp",
     maven_group_id = "org.wpilib.halsim",
 )
diff --git a/thirdparty/googletest/BUILD.bazel b/thirdparty/googletest/BUILD.bazel
index b20323b71b..6de1512ccd 100644
--- a/thirdparty/googletest/BUILD.bazel
+++ b/thirdparty/googletest/BUILD.bazel
@@ -1,5 +1,5 @@
 load("//shared/bazel/rules:cc_rules.bzl", "wpilib_cc_library", "wpilib_cc_static_library")
-load("//shared/bazel/rules:packaging.bzl", "package_minimal_cc_project")
+load("//shared/bazel/rules:packaging.bzl", "package_static_cc_project")
 
 wpilib_cc_library(
     name = "googletest",
@@ -25,7 +25,7 @@ wpilib_cc_static_library(
     ],
 )
 
-package_minimal_cc_project(
+package_static_cc_project(
     name = "googletest",
     maven_artifact_name = "googletest-cpp",
     maven_group_id = "edu.wpi.first.thirdparty.googletest",
diff --git a/thirdparty/imgui_suite/BUILD.bazel b/thirdparty/imgui_suite/BUILD.bazel
index edb78deeb6..1f49f595e8 100644
--- a/thirdparty/imgui_suite/BUILD.bazel
+++ b/thirdparty/imgui_suite/BUILD.bazel
@@ -4,7 +4,8 @@ load("@rules_pkg//:pkg.bzl", "pkg_zip")
 load("@rules_python//python:defs.bzl", "py_binary")
 load("//shared/bazel/rules:cc_rules.bzl", "wpilib_cc_library", "wpilib_cc_static_library")
 load("//shared/bazel/rules:objectivec_rules.bzl", "wpilib_objc_library")
-load("//shared/bazel/rules:packaging.bzl", "package_minimal_cc_project")
+load("//shared/bazel/rules:packaging.bzl", "package_static_cc_project")
+load("//shared/bazel/rules:publishing.bzl", "host_architectures")
 
 cc_library(
     name = "gl3w",
@@ -486,8 +487,9 @@ pkg_zip(
     ],
 )
 
-package_minimal_cc_project(
+package_static_cc_project(
     name = "imguiSuite",
+    architectures = host_architectures,
     maven_artifact_name = "imguiSuite-cpp",
     maven_group_id = "edu.wpi.first.thirdparty.imguiSuite",
 )
diff --git a/wpigui/BUILD.bazel b/wpigui/BUILD.bazel
index b40adec141..1cf452fc1b 100644
--- a/wpigui/BUILD.bazel
+++ b/wpigui/BUILD.bazel
@@ -2,7 +2,8 @@ load("@rules_cc//cc:defs.bzl", "cc_library")
 load("@rules_pkg//:mappings.bzl", "pkg_files")
 load("//shared/bazel/rules:cc_rules.bzl", "wpilib_cc_library", "wpilib_cc_static_library")
 load("//shared/bazel/rules:objectivec_rules.bzl", "wpilib_objc_library")
-load("//shared/bazel/rules:packaging.bzl", "package_minimal_cc_project")
+load("//shared/bazel/rules:packaging.bzl", "package_static_cc_project")
+load("//shared/bazel/rules:publishing.bzl", "host_architectures")
 
 WIN_SRCS = glob(["src/main/native/directx11/**/*.cpp"])
 
@@ -83,8 +84,9 @@ wpilib_cc_static_library(
     ],
 )
 
-package_minimal_cc_project(
+package_static_cc_project(
     name = "wpigui",
+    architectures = host_architectures,
     maven_artifact_name = "wpigui-cpp",
     maven_group_id = "org.wpilib.wpigui",
 )
diff --git a/wpilibc/BUILD.bazel b/wpilibc/BUILD.bazel
index e06c2f94d4..0419e8803f 100644
--- a/wpilibc/BUILD.bazel
+++ b/wpilibc/BUILD.bazel
@@ -4,7 +4,7 @@ load("@rules_cc//cc:defs.bzl", "cc_binary", "cc_library", "cc_test")
 load("@rules_pkg//:mappings.bzl", "pkg_files")
 load("@rules_python//python:defs.bzl", "py_binary")
 load("//shared/bazel/rules:cc_rules.bzl", "third_party_cc_lib_helper", "wpilib_cc_library", "wpilib_cc_shared_library", "wpilib_cc_static_library")
-load("//shared/bazel/rules:packaging.bzl", "package_minimal_cc_project")
+load("//shared/bazel/rules:packaging.bzl", "package_default_cc_project")
 load("//shared/bazel/rules/gen:gen-version-file.bzl", "generate_version_file")
 load("//shared/bazel/rules/robotpy:build_info_gen.bzl", "generate_robotpy_native_wrapper_build_info", "generate_robotpy_pybind_build_info")
 load("//shared/bazel/rules/robotpy:pytest_util.bzl", "robotpy_py_test")
@@ -198,7 +198,7 @@ cc_binary(
     ],
 )
 
-package_minimal_cc_project(
+package_default_cc_project(
     name = "wpilibc",
     maven_artifact_name = "wpilibc-cpp",
     maven_group_id = "org.wpilib.wpilibc",
diff --git a/wpinet/BUILD.bazel b/wpinet/BUILD.bazel
index 1334f4607f..b457124e52 100644
--- a/wpinet/BUILD.bazel
+++ b/wpinet/BUILD.bazel
@@ -5,7 +5,7 @@ load("@rules_pkg//:mappings.bzl", "pkg_files")
 load("//shared/bazel/rules:cc_rules.bzl", "third_party_cc_lib_helper", "wpilib_cc_library", "wpilib_cc_shared_library", "wpilib_cc_static_library")
 load("//shared/bazel/rules:java_rules.bzl", "wpilib_java_junit5_test")
 load("//shared/bazel/rules:jni_rules.bzl", "wpilib_jni_cc_library", "wpilib_jni_java_library")
-load("//shared/bazel/rules:packaging.bzl", "package_minimal_jni_project")
+load("//shared/bazel/rules:packaging.bzl", "package_default_jni_project")
 load("//shared/bazel/rules/robotpy:build_info_gen.bzl", "generate_robotpy_native_wrapper_build_info", "generate_robotpy_pybind_build_info")
 load("//shared/bazel/rules/robotpy:pytest_util.bzl", "robotpy_py_test")
 load("//wpinet:robotpy_native_build_info.bzl", "define_native_wrapper")
@@ -350,7 +350,7 @@ robotpy_py_test(
     ],
 )
 
-package_minimal_jni_project(
+package_default_jni_project(
     name = "wpinet",
     maven_artifact_name = "wpinet-cpp",
     maven_group_id = "org.wpilib.wpinet",
diff --git a/xrpVendordep/BUILD.bazel b/xrpVendordep/BUILD.bazel
index b7aef9a5ee..02aee050aa 100644
--- a/xrpVendordep/BUILD.bazel
+++ b/xrpVendordep/BUILD.bazel
@@ -3,7 +3,7 @@ load("@rules_cc//cc:defs.bzl", "cc_binary", "cc_test")
 load("@rules_java//java:defs.bzl", "java_binary")
 load("//shared/bazel/rules:cc_rules.bzl", "wpilib_cc_library", "wpilib_cc_shared_library", "wpilib_cc_static_library")
 load("//shared/bazel/rules:java_rules.bzl", "wpilib_java_library")
-load("//shared/bazel/rules:packaging.bzl", "package_minimal_cc_project")
+load("//shared/bazel/rules:packaging.bzl", "package_default_cc_project")
 load("//shared/bazel/rules/robotpy:build_info_gen.bzl", "generate_robotpy_native_wrapper_build_info", "generate_robotpy_pybind_build_info")
 load("//shared/bazel/rules/robotpy:pytest_util.bzl", "robotpy_py_test")
 load("//xrpVendordep:robotpy_native_build_info.bzl", "define_native_wrapper")
@@ -99,7 +99,7 @@ java_binary(
     ],
 )
 
-package_minimal_cc_project(
+package_default_cc_project(
     name = "xrpVendordep",
     maven_artifact_name = "xrpVendordep-cpp",
     maven_group_id = "org.wpilib.xrpVendordep",