GameModel: rename some properties