More name adjustments