MYLOC-59 - Fixing event namespaces