Changed default EventName
Fixed merge bugs