Touched up a bunch of naming issues after re-extracting the TaskScheduler interface