Rename enums to match convention and remove superfluous "dwarf" in names.