diff --git a/api/Android.bp b/api/Android.bp
index dbb81a6cb21c2..7590177fe2255 100644
--- a/api/Android.bp
+++ b/api/Android.bp
@@ -437,7 +437,7 @@ genrule {
 }
 
 genrule {
-    name: "services-system-server-current.txt",
+    name: "frameworks-base-api-system-server-current.txt",
     srcs: [
         ":service-media-s{.system-server.api.txt}",
         ":service-permission{.system-server.api.txt}",
@@ -464,7 +464,7 @@ genrule {
 }
 
 genrule {
-    name: "services-system-server-removed.txt",
+    name: "frameworks-base-api-system-server-removed.txt",
     srcs: [
         ":service-media-s{.system-server.removed-api.txt}",
         ":service-permission{.system-server.removed-api.txt}",