More name updates