Refactor names and enumeration