Renamed class + interface names.