Updated naming and added to GameState