Auto team/identifiers improvements. Based on the work of @BurgundyBadger in 57b13ceabec8c4de8460e97ff1518067a09555c0