add code to cleanup names a bit