Corrections for switching and renaming teams