Fix event type using new gen classes