A third and last mass update of class names.  Most changes made by the @test replace class names.  Some tweaks were made by hand. All unit tests pass and pylint -a passes.