Variable name adjustment for the match simulation algorithm.
Merge remote-tracking branch 'origin/master'