Fixed name changing, some message inconsistencies.
Merge GameController changes