Change event namespaces

As per nickvergessen's suggestion