Revert previous commit and refactor use of getProductTypeNameShort() to getProductTypeCode()