cleanup names from headers