Refactoring: Rename some local variables to make the code more readable.
Authored by: david_costanzo 2020-07-02
Parent: [r5319]
Child: [r5321]