Add event types and names to activity providers (#2250)