Added trailing underscore removal in names.