Made game and player state machines and data more consistent with each other (naming-wise)