MISC: update with new role names