Start removing AOKP naming

Just to avoid any confusion