Renamed all groups to roles.
Merge branch 'role-rename' into test