More name mapping updates.