[markdotto]

You should be able to use find-and-replace to tackle most of this—the classes aren't changing too much.