Renaming Event module to EventDispatcher