GONRG-4668: refactor variables names

Merged Igor Zimovets (EPAM) requested to merge GONRG-4668-refactor-variables-names into master

Merge request reports