Changed names on variables