Fixes due to not complete ProductAttribute renaming