adapt new AOKP naming convention