Drop underscore in name