Unify event names