variable name change and user event_type corrected