Fix references to event model