Refactor ENUM name