Corrected "event_type" instead of "event_class" in several places