Bring inline with CyanogenMod naming