Remove namespace from EventDispatcher