Changed field names on event model