Correct name mappings.