Changes after review
The eventNameMapper became an Enum
Made the test work