Added affiliate. Change names