More name cleanup