More Rename Fixes in tournament