Refactor sanitize_name() to know about renaming map