Merge pull request #97 from glenwks/master

More Rename Fixes in tournament