Fixed issue in naming with shipment mailer