rename variables 2

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

Here just write: until 'condition' turns true

Better don't repeat word "condition"