more name cleanup'