Renamed team types