Changed naming of roles