Refactor naming magic into a module
Apply the same naming love to enums