Extended and adapted event support

Extended event support
added language support for all names
adapted function use for events to use for matches