Updated role names