Correcting for renaming ELF to Map