updating event names, unit tests to pass