Fixed names, and made it easy to add new groups/rankings.