diff --git a/mot_aids.fs b/mot_aids.fs
index 48f88cb..ffb32ef 100644
--- a/mot_aids.fs
+++ b/mot_aids.fs
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2017 The LineageOS Project
+# Copyright (C) 2017-2022 The LineageOS Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -13,68 +13,26 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-[AID_VENDOR_MOT_ACCY]
-value: 5000
-
-[AID_VENDOR_MOT_PWRIC]
+[AID_VENDOR_BRIDGE_RW]
 value: 5001
 
-[AID_VENDOR_MOT_USB]
-value: 5002
+[AID_VENDOR_PWRIC]
+value: 5101
 
-[AID_VENDOR_MOT_DRM]
-value: 5003
+[AID_VENDOR_TCMD]
+value: 5104
 
-[AID_VENDOR_MOT_TCMD]
-value: 5004
-
-[AID_VENDOR_MOT_SEC_RTC]
-value: 5005
-
-[AID_VENDOR_MOT_TOMBSTONE]
-value: 5006
-
-[AID_VENDOR_MOT_TPAPI]
-value: 5007
-
-[AID_VENDOR_MOT_SECCLKD]
-value: 5008
-
-[AID_VENDOR_MOT_WHISPER]
-value: 5009
-
-[AID_VENDOR_MOT_CAIF]
-value: 5010
-
-[AID_VENDOR_MOT_DLNA]
-value: 5011
-
-[AID_VENDOR_MOT_ATVC]
-value: 5012
-
-[AID_VENDOR_MOT_DBVC]
-value: 5014
+[AID_VENDOR_DBVC]
+value: 5114
 
 [AID_VENDOR_FINGERP]
-value: 5015
+value: 5115
 
-[AID_VENDOR_MOT_ESDFS]
-value: 5016
+[AID_VENDOR_DTV]
+value: 5119
 
-[AID_VENDOR_POWER]
-value: 5017
+[AID_VENDOR_MOD]
+value: 5120
 
-[AID_VENDOR_ITSON]
-value: 5018
-
-[AID_VENDOR_MOT_DTV]
-value: 5019
-
-[AID_VENDOR_MOT_MOD]
-value: 5020
-
-[AID_VENDOR_MOT_SHARED]
-value: 5323
-
-[AID_VENDOR_MOT_COMMON]
-value: 5341
+[AID_VENDOR_PROD_PERSIST]
+value: 5121