cleanup names