Fix references to mapping.