Remove needless underscore from names.