Rename cheat_type elements to be more consistent