Teams are now identified and renamed appropriately