savegame: refactoring function and file names