More name fixes!