Changed events names from onEventName to eventName