[DF-873] Fix: variables names fix