Make changes to match the refactor result of nfc-game.