FIXUP: Use correct namespace for event handlers.