Added EventName to header and fixed bug for it.