MYLOC-59 - Fixing namespace events