AVALANCHE: Do renaming/refactoring in Closing.
Merge branch 'avalanche' of https://github.com/urukgit/scummvm into avalanche