Renamed almost all class names