Renamed MessageDispatchers to MessageDispatcher