Updated roles
Fixed name
More name fixes
Updated names