AVALANCHE: Refactor some variables. This breaks savegame compatibility