Fixed some namig conflicts in EventHandlerListener