Closes #19: Disable irrelevant roles, and rename roles for clarity