Removed hard coding of team name in comms