diff --git a/Android.bp b/Android.bp
index 630f5a0..e93d967 100644
--- a/Android.bp
+++ b/Android.bp
@@ -373,13 +373,13 @@
     static_libs: [
         "framework-appsearch-stubs", // TODO: Update to module_libs_api when there is one.
         "framework-graphics-stubs-module_libs_api",
-        "framework-media-stubs-module_libs_api",
-        "framework-mediaprovider-stubs-module_libs_api",
-        "framework-permission-stubs-module_libs_api",
-        "framework-sdkextensions-stubs-module_libs_api",
-        "framework-statsd-stubs-module_libs_api",
-        "framework-tethering-stubs-module_libs_api",
-        "framework-wifi-stubs-module_libs_api",
+        "framework-media.stubs.module_lib",
+        "framework-mediaprovider.stubs.module_lib",
+        "framework-permission.stubs.module_lib",
+        "framework-sdkextensions.stubs.module_lib",
+        "framework-statsd.stubs.module_lib",
+        "framework-tethering.stubs.module_lib",
+        "framework-wifi.stubs.module_lib",
     ],
     sdk_version: "module_current",
     visibility: [":__pkg__"],
diff --git a/StubLibraries.bp b/StubLibraries.bp
index 2c96405..7f95702 100644
--- a/StubLibraries.bp
+++ b/StubLibraries.bp
@@ -338,13 +338,13 @@
     static_libs: [
         "conscrypt.module.public.api.stubs",
         "framework-graphics-stubs-publicapi",
-        "framework-media-stubs-publicapi",
-        "framework-mediaprovider-stubs-publicapi",
-        "framework-permission-stubs-publicapi",
-        "framework-sdkextensions-stubs-publicapi",
-        "framework-statsd-stubs-publicapi",
-        "framework-tethering-stubs-publicapi",
-        "framework-wifi-stubs-publicapi",
+        "framework-media.stubs",
+        "framework-mediaprovider.stubs",
+        "framework-permission.stubs",
+        "framework-sdkextensions.stubs",
+        "framework-statsd.stubs",
+        "framework-tethering.stubs",
+        "framework-wifi.stubs",
         "private-stub-annotations-jar",
     ],
     defaults: ["android_defaults_stubs_current"],
@@ -370,13 +370,13 @@
         "conscrypt.module.public.api.stubs",
         "framework-appsearch-stubs", // TODO: standardize appsearch stubs
         "framework-graphics-stubs-systemapi",
-        "framework-media-stubs-systemapi",
-        "framework-mediaprovider-stubs-systemapi",
-        "framework-permission-stubs-systemapi",
-        "framework-sdkextensions-stubs-systemapi",
-        "framework-statsd-stubs-systemapi",
-        "framework-tethering-stubs-systemapi",
-        "framework-wifi-stubs-systemapi",
+        "framework-media.stubs.system",
+        "framework-mediaprovider.stubs.system",
+        "framework-permission.stubs.system",
+        "framework-sdkextensions.stubs.system",
+        "framework-statsd.stubs.system",
+        "framework-tethering.stubs.system",
+        "framework-wifi.stubs.system",
         "private-stub-annotations-jar",
     ],
     defaults: ["android_defaults_stubs_current"],
diff --git a/apex/media/framework/Android.bp b/apex/media/framework/Android.bp
index 4d6ac72..03290a3 100644
--- a/apex/media/framework/Android.bp
+++ b/apex/media/framework/Android.bp
@@ -96,11 +96,6 @@
         ":updatable-media-srcs",
     ],
 
-    // TODO(b/155480189) - Remove naming_scheme once references have been resolved.
-    // Temporary java_sdk_library component naming scheme to use to ease the transition from separate
-    // modules to java_sdk_library.
-    naming_scheme: "framework-modules",
-
     libs: [
         "framework_media_annotation",
     ],
diff --git a/apex/permission/framework/Android.bp b/apex/permission/framework/Android.bp
index c43fabd..f5520a3 100644
--- a/apex/permission/framework/Android.bp
+++ b/apex/permission/framework/Android.bp
@@ -28,11 +28,6 @@
         ":framework-permission-sources",
     ],
 
-    // TODO(b/155480189) - Remove naming_scheme once references have been resolved.
-    // Temporary java_sdk_library component naming scheme to use to ease the transition from separate
-    // modules to java_sdk_library.
-    naming_scheme: "framework-modules",
-
     apex_available: [
         "com.android.permission",
         "test_com.android.permission",
diff --git a/apex/statsd/framework/Android.bp b/apex/statsd/framework/Android.bp
index 27bd2e3..b20a0bf 100644
--- a/apex/statsd/framework/Android.bp
+++ b/apex/statsd/framework/Android.bp
@@ -51,11 +51,6 @@
     defaults: ["framework-module-defaults"],
     installable: true,
 
-    // TODO(b/155480189) - Remove naming_scheme once references have been resolved.
-    // Temporary java_sdk_library component naming scheme to use to ease the transition from separate
-    // modules to java_sdk_library.
-    naming_scheme: "framework-modules",
-
     srcs: [
         ":framework-statsd-sources",
     ],
diff --git a/packages/Tethering/Android.bp b/packages/Tethering/Android.bp
index ad903e0..93e41a3 100644
--- a/packages/Tethering/Android.bp
+++ b/packages/Tethering/Android.bp
@@ -35,7 +35,7 @@
     libs: [
         "framework-tethering.impl",
         "framework-telephony-stubs",
-        "framework-wifi-stubs-systemapi",
+        "framework-wifi",
         "unsupportedappusage",
     ],
     plugins: ["java_api_finder"],
diff --git a/packages/Tethering/common/TetheringLib/Android.bp b/packages/Tethering/common/TetheringLib/Android.bp
index 408725c..a631a88 100644
--- a/packages/Tethering/common/TetheringLib/Android.bp
+++ b/packages/Tethering/common/TetheringLib/Android.bp
@@ -20,11 +20,6 @@
         ":framework-tethering-srcs",
     ],
 
-    // TODO(b/155480189) - Remove naming_scheme once references have been resolved.
-    // Temporary java_sdk_library component naming scheme to use to ease the transition from separate
-    // modules to java_sdk_library.
-    naming_scheme: "framework-modules",
-
     jarjar_rules: "jarjar-rules.txt",
     installable: true,
 
diff --git a/packages/Tethering/tests/unit/Android.bp b/packages/Tethering/tests/unit/Android.bp
index 4e3048e..0413714 100644
--- a/packages/Tethering/tests/unit/Android.bp
+++ b/packages/Tethering/tests/unit/Android.bp
@@ -61,7 +61,7 @@
         "framework-res",
         "framework-telephony-stubs",
         "framework-tethering.impl",
-        "framework-wifi-stubs-module_libs_api",
+        "framework-wifi.stubs.module_lib",
     ],
     jni_libs: [
         // For mockito extended
diff --git a/services/Android.bp b/services/Android.bp
index 882085a..00676e3 100644
--- a/services/Android.bp
+++ b/services/Android.bp
@@ -87,7 +87,7 @@
 
     libs: [
         "android.hidl.manager-V1.0-java",
-        "framework-tethering-stubs-module_libs_api",
+        "framework-tethering.stubs.module_lib",
     ],
 
     // Uncomment to enable output of certain warnings (deprecated, unchecked)
diff --git a/services/core/Android.bp b/services/core/Android.bp
index e4d3a8e..3a7769b 100644
--- a/services/core/Android.bp
+++ b/services/core/Android.bp
@@ -99,7 +99,7 @@
         "android.hardware.vibrator-java",
         "android.net.ipsec.ike.stubs.module_lib",
         "app-compat-annotations",
-        "framework-tethering-stubs-module_libs_api",
+        "framework-tethering.stubs.module_lib",
         "service-permission-stubs",
     ],
 
diff --git a/wifi/Android.bp b/wifi/Android.bp
index 63c14e9..46ec0ae 100644
--- a/wifi/Android.bp
+++ b/wifi/Android.bp
@@ -111,11 +111,6 @@
         ":framework-wifi-util-lib-aidls",
     ],
 
-    // TODO(b/155480189) - Remove naming_scheme once references have been resolved.
-    // Temporary java_sdk_library component naming scheme to use to ease the transition from separate
-    // modules to java_sdk_library.
-    naming_scheme: "framework-modules",
-
     jarjar_rules: ":wifi-jarjar-rules",
 
     installable: true,