Fixed event namespaces