unify EventDispatcher/event dispatcher usages