Refactoring and renaming of game