Refactored Event naming and Enums concept