Fix some event names