formatting in shipment classes and fixed class name