[TASK] Change to more generic role name