diff --git a/target/product/base_system.mk b/target/product/base_system.mk
index 987dd4c..b1d896b 100644
--- a/target/product/base_system.mk
+++ b/target/product/base_system.mk
@@ -30,7 +30,7 @@
     apexd \
     appops \
     app_process \
-    appsearch-service \
+    service-appsearch \
     appwidget \
     atrace \
     audioserver \
@@ -38,7 +38,7 @@
     bcc \
     blank_screen \
     blkid \
-    blobstore-service \
+    service-blobstore \
     bmgr \
     bootanimation \
     bootstat \
@@ -109,7 +109,7 @@
     iptables \
     ip-up-vpn \
     javax.obex \
-    jobscheduler-service \
+    service-jobscheduler \
     keystore \
     ld.config.txt \
     ld.mc \
@@ -244,7 +244,7 @@
     snapshotctl \
     SoundPicker \
     statsd \
-    statsd-service \
+    service-statsd \
     storaged \
     surfaceflinger \
     svc \
diff --git a/target/product/media_system.mk b/target/product/media_system.mk
index aba9081..97c81e1 100644
--- a/target/product/media_system.mk
+++ b/target/product/media_system.mk
@@ -54,10 +54,10 @@
     services \
     ethernet-service \
     com.android.location.provider \
-    jobscheduler-service \
-    statsd-service \
-    blobstore-service \
-    appsearch-service \
+    service-jobscheduler \
+    service-statsd \
+    service-blobstore \
+    service-appsearch \
 
 PRODUCT_COPY_FILES += \
     system/core/rootdir/etc/public.libraries.android.txt:system/etc/public.libraries.txt