Renamed a couple of classes and methods.