Move namespacing to delegateEvents