Fixed enum names based on code review that wasn't even in Johan his code.