Changed default EventName
Bugfixing