Renamed some roles + deleted obsoleted roles