Ugh... I'll clean up any comment references to classes that were renamed.