remove underscore from names