Use normalized map names and some minor refactoring