diff --git a/Tethering/common/TetheringLib/Android.bp b/Tethering/common/TetheringLib/Android.bp
index bf643cd..02dfdfe 100644
--- a/Tethering/common/TetheringLib/Android.bp
+++ b/Tethering/common/TetheringLib/Android.bp
@@ -16,7 +16,9 @@
 java_sdk_library {
     name: "framework-tethering",
     defaults: ["framework-module-defaults"],
-    impl_library_visibility: ["//frameworks/base/packages/Tethering:__subpackages__"],
+    impl_library_visibility: [
+        "//packages/modules/Connectivity/Tethering:__subpackages__"
+    ],
 
     srcs: [":framework-tethering-srcs"],
 
diff --git a/Tethering/tests/unit/Android.bp b/Tethering/tests/unit/Android.bp
index 45c7b65..637a6b6 100644
--- a/Tethering/tests/unit/Android.bp
+++ b/Tethering/tests/unit/Android.bp
@@ -31,7 +31,10 @@
         "framework-minus-apex",
         "framework-tethering.impl",
     ],
-    visibility: ["//cts/tests/tests/tethering"],
+    visibility: [
+        "//cts/tests/tests/tethering",
+        "//packages/modules/Connectivity/tests/cts/tethering",
+    ],
 }
 
 java_defaults {
@@ -77,7 +80,7 @@
     name: "TetheringTestsLib",
     defaults: ["TetheringTestsDefaults"],
     visibility: [
-        "//frameworks/base/packages/Tethering/tests/integration",
+        "//packages/modules/Connectivity/Tethering/tests/integration",
     ]
 }