more name cleanup