Another round of name corrections