CMS-3849 Module App - Convert all events to use Event2