Fixed naming and sort order conflict with weight based shipping