Matched enum order to other tools, and made names less likely to clash