Refactoring event naming normalisation