diff --git a/Tethering/Android.bp b/Tethering/Android.bp
index b4426a6..d04660d 100644
--- a/Tethering/Android.bp
+++ b/Tethering/Android.bp
@@ -69,7 +69,7 @@
         "android.hardware.tetheroffload.control-V1.0-java",
         "android.hardware.tetheroffload.control-V1.1-java",
         "android.hidl.manager-V1.2-java",
-        "net-utils-tethering",
+        "net-utils-connectivity-apks",
         "netd-client",
         "tetheringstatsprotos",
     ],
diff --git a/staticlibs/Android.bp b/staticlibs/Android.bp
index de7f2d4..cfb8cef 100644
--- a/staticlibs/Android.bp
+++ b/staticlibs/Android.bp
@@ -503,6 +503,7 @@
         "//apex_available:platform",
     ],
     visibility: [
+        "//packages/modules/CaptivePortalLogin:__subpackages__",
         "//packages/modules/Connectivity:__subpackages__",
     ],
     defaults_visibility: [
@@ -530,7 +531,7 @@
 }
 
 java_library {
-    name: "net-utils-tethering",
+    name: "net-utils-connectivity-apks",
     srcs: [
         ":net-utils-all-srcs",
         ":framework-connectivity-shared-srcs",