Updated event names to be more consistent.