More name corrections