Update event namespacing to deal with global events.j