Move variant name and value out of partial. Change trash links