refactor variables names

2 jobs for !175 with GONRG-4668-refactor-variables-names in 28 minutes and 7 seconds (queued for 3 seconds)
latest merge request