Adjusted event names to match dispatcher events.