Fix event namespaces