Renamed some classes and methods.