Change event names to be namespaced