[DF-2846] update variables name