Moved the EventEm to properly declared namespace and removed the temporary namespace vars