Rename kind, add Truck