Fix EventName converter