Refactored map names.