diff --git a/StubLibraries.bp b/StubLibraries.bp
index 6927f4449054b..0f805655b33d2 100644
--- a/StubLibraries.bp
+++ b/StubLibraries.bp
@@ -340,7 +340,7 @@ java_library_static {
 }
 
 java_library_static {
-    name: "framework_module_app_stubs_current",
+    name: "android_module_app_stubs_current",
     srcs: [
         ":module-app-api-stubs-docs",
     ],
@@ -355,7 +355,7 @@ java_library_static {
 }
 
 java_library_static {
-    name: "framework_module_lib_stubs_current",
+    name: "android_module_lib_stubs_current",
     srcs: [
         ":module-lib-api-stubs-docs",
     ],
diff --git a/apex/statsd/framework/Android.bp b/apex/statsd/framework/Android.bp
index f66f0340edabd..231c91026bb60 100644
--- a/apex/statsd/framework/Android.bp
+++ b/apex/statsd/framework/Android.bp
@@ -34,9 +34,8 @@ java_library {
     ],
     libs: [
         "framework-annotations-lib",
-        // TODO(b/146230220): Use framework-system-stubs instead.
-        //"android_system_stubs_current",
-        //"framework_module_lib_stubs_current",
+        // TODO(b/146230220): Use android_module_lib_stubs_current instead.
+        //"android_module_lib_stubs_current",
         "framework-all",
     ],
     hostdex: true, // for hiddenapi check