Fixed some naming issues (XDispatcher is now just a Dispatcher).