Update ScummVM for new naming conventions
Merge pull request #1600 from Cottser/scummvm

Update ScummVM for new naming conventions