Reference event names
No need for current step to be underscore-prefixed
Change step property in event detail