Merge pull request #15227 from surajshetty3416/fixes-and-improvements

Remove occurrences of hub_item_code and replace some hub_item_code -> hub_item_name