refactoring of enum names