Fix event names