change event names and classes