Rename events to match namespacing standards