Transition to team names almost complete