Some cosmetic team names / cleanup.