changing shipment->id to shipment_id