PIM-3365 : re-work naming of product saver variables