(MODULES-1570) Improve variable names

Lets keep it vaguely consistent