adjusted EventNotification according to code conventions