Included team names in state saving.