Use new team name format