Expand variable naming

Refactoring some old and complicated code by introducing longer variable
names.