Revert "Namespace before event name"

This reverts commit 481353217ec48c9a26f1cad50c5b21cf9e2a6041.