diff --git a/udev/rules.d/70-mt6771.rules b/udev/rules.d/70-mt6771.rules
index 402c385..fc29ca9 100644
--- a/udev/rules.d/70-mt6771.rules
+++ b/udev/rules.d/70-mt6771.rules
@@ -85,14 +85,14 @@ ACTION=="add", KERNEL=="ashmem", OWNER="root", GROUP="root", MODE="0666"
 ACTION=="add", KERNEL=="binder", OWNER="root", GROUP="root", MODE="0666"
 ACTION=="add", KERNEL=="hwbinder", OWNER="root", GROUP="root", MODE="0666"
 ACTION=="add", KERNEL=="vndbinder", OWNER="root", GROUP="root", MODE="0666"
-ACTION=="add", KERNEL=="pmsg0", OWNER="root", GROUP="log", MODE="0222"
+ACTION=="add", KERNEL=="pmsg0", OWNER="root", GROUP="aid_log", MODE="0222"
 ACTION=="add", KERNEL=="msm_hw3dc", OWNER="root", GROUP="root", MODE="0666"
 ACTION=="add", KERNEL=="kgsl", OWNER="root", GROUP="root", MODE="0666"
 ACTION=="add", KERNEL=="dri/*", OWNER="root", GROUP="aid_graphics", MODE="0666"
 ACTION=="add", KERNEL=="diag", OWNER="radio", GROUP="radio", MODE="0660"
 ACTION=="add", KERNEL=="diag_arm9", OWNER="radio", GROUP="radio", MODE="0660"
 ACTION=="add", KERNEL=="ttyMSM0", OWNER="aid_bluetooth", GROUP="aid_bluetooth", MODE="0600"
-ACTION=="add", KERNEL=="uhid", OWNER="uhid", GROUP="uhid", MODE="0660"
+ACTION=="add", KERNEL=="uhid", OWNER="aid_input", GROUP="aid_input", MODE="0660"
 ACTION=="add", KERNEL=="uinput", OWNER="aid_system", GROUP="bluetooth", MODE="0660"
 ACTION=="add", KERNEL=="alarm", OWNER="aid_system", GROUP="radio", MODE="0664"
 ACTION=="add", KERNEL=="rtc0", OWNER="aid_system", GROUP="aid_system", MODE="0640"
@@ -102,22 +102,22 @@ ACTION=="add", KERNEL=="msm_hw3dm", OWNER="aid_system", GROUP="aid_graphics", MO
 ACTION=="add", KERNEL=="input/*", OWNER="root", GROUP="input", MODE="0660"
 ACTION=="add", KERNEL=="v4l-touch*", OWNER="root", GROUP="input", MODE="0660"
 ACTION=="add", KERNEL=="eac", OWNER="root", GROUP="aid_audio", MODE="0660"
-ACTION=="add", KERNEL=="cam", OWNER="root", GROUP="camera", MODE="0660"
+ACTION=="add", KERNEL=="cam", OWNER="root", GROUP="aid_media", MODE="0660"
 ACTION=="add", KERNEL=="pmem", OWNER="aid_system", GROUP="aid_graphics", MODE="0660"
 ACTION=="add", KERNEL=="pmem_adsp*", OWNER="aid_system", GROUP="aid_audio", MODE="0660"
-ACTION=="add", KERNEL=="pmem_camera*", OWNER="aid_system", GROUP="camera", MODE="0660"
+ACTION=="add", KERNEL=="pmem_camera*", OWNER="aid_system", GROUP="aid_media", MODE="0660"
 ACTION=="add", KERNEL=="oncrpc/*", OWNER="root", GROUP="aid_system", MODE="0660"
 ACTION=="add", KERNEL=="adsp/*", OWNER="aid_system", GROUP="aid_audio", MODE="0660"
 ACTION=="add", KERNEL=="snd/*", OWNER="aid_system", GROUP="aid_audio", MODE="0660"
 ACTION=="add", KERNEL=="mt9t013", OWNER="aid_system", GROUP="aid_system", MODE="0660"
 ACTION=="add", KERNEL=="msm_camera/*", OWNER="aid_system", GROUP="aid_system", MODE="0660"
-ACTION=="add", KERNEL=="akm8976_daemon", OWNER="compass", GROUP="aid_system", MODE="0640"
-ACTION=="add", KERNEL=="akm8976_aot", OWNER="compass", GROUP="aid_system", MODE="0640"
-ACTION=="add", KERNEL=="akm8973_daemon", OWNER="compass", GROUP="aid_system", MODE="0640"
-ACTION=="add", KERNEL=="akm8973_aot", OWNER="compass", GROUP="aid_system", MODE="0640"
-ACTION=="add", KERNEL=="bma150", OWNER="compass", GROUP="aid_system", MODE="0640"
-ACTION=="add", KERNEL=="cm3602", OWNER="compass", GROUP="aid_system", MODE="0640"
-ACTION=="add", KERNEL=="akm8976_pffd", OWNER="compass", GROUP="aid_system", MODE="0640"
+ACTION=="add", KERNEL=="akm8976_daemon", OWNER="aid_system", GROUP="aid_system", MODE="0640"
+ACTION=="add", KERNEL=="akm8976_aot", OWNER="aid_system", GROUP="aid_system", MODE="0640"
+ACTION=="add", KERNEL=="akm8973_daemon", OWNER="aid_system", GROUP="aid_system", MODE="0640"
+ACTION=="add", KERNEL=="akm8973_aot", OWNER="aid_system", GROUP="aid_system", MODE="0640"
+ACTION=="add", KERNEL=="bma150", OWNER="aid_system", GROUP="aid_system", MODE="0640"
+ACTION=="add", KERNEL=="cm3602", OWNER="aid_system", GROUP="aid_system", MODE="0640"
+ACTION=="add", KERNEL=="akm8976_pffd", OWNER="aid_system", GROUP="aid_system", MODE="0640"
 ACTION=="add", KERNEL=="lightsensor", OWNER="aid_system", GROUP="aid_system", MODE="0640"
 ACTION=="add", KERNEL=="msm_pcm_out*", OWNER="aid_system", GROUP="aid_audio", MODE="0660"
 ACTION=="add", KERNEL=="msm_pcm_in*", OWNER="aid_system", GROUP="aid_audio", MODE="0660"
@@ -140,9 +140,9 @@ ACTION=="add", KERNEL=="qmi0", OWNER="radio", GROUP="radio", MODE="0640"
 ACTION=="add", KERNEL=="qmi1", OWNER="radio", GROUP="radio", MODE="0640"
 ACTION=="add", KERNEL=="qmi2", OWNER="radio", GROUP="radio", MODE="0640"
 ACTION=="add", KERNEL=="bus/usb/*", OWNER="root", GROUP="aid_usb", MODE="0660"
-ACTION=="add", KERNEL=="mtp_usb", OWNER="root", GROUP="mtp", MODE="0660"
+ACTION=="add", KERNEL=="mtp_usb", OWNER="root", GROUP="aid_usb", MODE="0660"
 ACTION=="add", KERNEL=="usb_accessory", OWNER="root", GROUP="aid_usb", MODE="0660"
-ACTION=="add", KERNEL=="tun", OWNER="aid_system", GROUP="vpn", MODE="0660"
+ACTION=="add", KERNEL=="tun", OWNER="aid_system", GROUP="aid_vpn", MODE="0660"
 ACTION=="add", KERNEL=="ts0710mux*", OWNER="radio", GROUP="radio", MODE="0640"
-ACTION=="add", KERNEL=="ppp", OWNER="radio", GROUP="vpn", MODE="0660"
+ACTION=="add", KERNEL=="ppp", OWNER="radio", GROUP="aid_vpn", MODE="0660"
 ACTION=="add", KERNEL=="dvb*", OWNER="root", GROUP="aid_system", MODE="0660"
diff --git a/udev/rules.d/70-mt6873.rules b/udev/rules.d/70-mt6873.rules
index ee0de3d..8f32faf 100644
--- a/udev/rules.d/70-mt6873.rules
+++ b/udev/rules.d/70-mt6873.rules
@@ -21,7 +21,7 @@ ACTION=="add", KERNEL=="input/*", OWNER="root", GROUP="input", MODE="0660"
 ACTION=="add", KERNEL=="v4l-touch*", OWNER="root", GROUP="input", MODE="0660"
 ACTION=="add", KERNEL=="snd/*", OWNER="aid_system", GROUP="aid_audio", MODE="0660"
 ACTION=="add", KERNEL=="bus/usb/*", OWNER="root", GROUP="aid_usb", MODE="0660"
-ACTION=="add", KERNEL=="mtp_usb", OWNER="root", GROUP="plugdev", MODE="0660"
+ACTION=="add", KERNEL=="mtp_usb", OWNER="root", GROUP="aid_usb", MODE="0660"
 ACTION=="add", KERNEL=="usb_accessory", OWNER="root", GROUP="aid_usb", MODE="0660"
 ACTION=="add", KERNEL=="tun", OWNER="aid_system", GROUP="aid_vpn", MODE="0660"
 ACTION=="add", KERNEL=="ppp", OWNER="radio", GROUP="aid_vpn", MODE="0660"