rename variables 2

Use full names for variables where relevant for better readability.

No functional change.