Fix issue with multiple instances causing conflicting event names