Fix product name computation