Added short team name conversion