Removed enum constants, fixed names.