Fixed name overlap issue in Quote/Sales Order