Refactor to more readable enumerated type names