Drop the 'd' suffix on event types