Remove underscores from type names.