fixing ordering in enums and remove dash #3752, #3736