diff --git a/services/etc/group b/services/etc/group
index 78f8bc3373e1bbcee3df84b20f3404661a3a2f4b..a231b1b0f53355e6788797971fdf574119593c90 100755
--- a/services/etc/group
+++ b/services/etc/group
@@ -21,7 +21,7 @@ sdcard_r:x:1028:
 package_info:x:1032:
 logd:x:1036:
 shared_relro:x:1037:
-audioserver:x:1041:
+audio:x:1041:
 cameraserver:x:1047:
 shell:x:2000:
 cache:x:2001:
diff --git a/services/etc/init.cfg b/services/etc/init.cfg
index efb36517e527aa676317883799ac104b7d4920b2..bbc01881c834eebbb7b3d9bf66df22eb5c7a31df 100755
--- a/services/etc/init.cfg
+++ b/services/etc/init.cfg
@@ -256,7 +256,7 @@
                 "chmod 0660 /data/misc/wifi/wpa_supplicant.conf",
                 "mkdir /data/local 0751 root root",
                 "mkdir /data/misc/media 0700 media media",
-                "mkdir /data/misc/audioserver 0700 audioserver audioserver",
+                "mkdir /data/misc/audio 0700 audio audio",
                 "mkdir /data/misc/cameraserver 0700 cameraserver cameraserver",
                 "mkdir /data/misc/vold 0700 root root",
                 "mkdir /data/misc/boottrace 0771 system shell",
diff --git a/services/etc/init.without_two_stages.cfg b/services/etc/init.without_two_stages.cfg
index 246a118366703649b52bd0e2954acec83bcdfe21..1f4f084edf5eb733df35738451698b9495d3f617 100755
--- a/services/etc/init.without_two_stages.cfg
+++ b/services/etc/init.without_two_stages.cfg
@@ -250,7 +250,7 @@
                 "chmod 0660 /data/misc/wifi/wpa_supplicant.conf",
                 "mkdir /data/local 0751 root root",
                 "mkdir /data/misc/media 0700 media media",
-                "mkdir /data/misc/audioserver 0700 audioserver audioserver",
+                "mkdir /data/misc/audio 0700 audio audio",
                 "mkdir /data/misc/cameraserver 0700 cameraserver cameraserver",
                 "mkdir /data/misc/vold 0700 root root",
                 "mkdir /data/misc/boottrace 0771 system shell",
diff --git a/services/etc/passwd b/services/etc/passwd
index 7b1c60c6a8dcb45605a012e3ed0e03a540b3a54a..3a5dbc60b6c0e1d04fb22ca75088b682e65eb94d 100755
--- a/services/etc/passwd
+++ b/services/etc/passwd
@@ -22,7 +22,7 @@ sdcard_r:x:1028:1028:::/bin/false
 package_info:x:1032:1032:::/bin/false
 logd:x:1036:1036:::/bin/false
 shared_relro:x:1037:1037:::/bin/false
-audioserver:x:1041:1041:::/bin/false
+audio:x:1041:1041:::/bin/false
 cameraserver:x:1047:1047:::/bin/false
 shell:x:2000:2000:::/bin/false
 cache:x:2001:2001:::/bin/false