diff --git a/services/etc/group b/services/etc/group
index 905886a0bf6951c7063252135b815c751e9a045a..67031bd60ea2c1edf9fe893624a7ffea2dd82c76 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 1e38e0e1c2569d5c7becfcca8c2ca2cf6d4092fd..73fa06d256025bbcc7d1c1095986e0ec6bf5be64 100755
--- a/services/etc/init.cfg
+++ b/services/etc/init.cfg
@@ -255,7 +255,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 4a0e1bebe05e1fc8901637f7b1737300d1bbcec4..9f3f3ae588ba2f9c43133409e4f4c370bc3dcf19 100755
--- a/services/etc/init.without_two_stages.cfg
+++ b/services/etc/init.without_two_stages.cfg
@@ -245,7 +245,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 7dfdf1cf77f610867c90cd3a26b40a1da4f7d46f..e24b8dd1fda28fad891c9460c740e167486f559e 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