name cleanup