renamed roles to match what they do