some name cleanup