More name fixes