Start removing AOKP naming

To avoid any confusion