Update references to re-named Dispatcher class