Better variable names.
Merge pull request #11838 from s0undt3ch/develop

Better variable names.