Rename a var to better reflect meaning
Merge pull request #3751 from ussuri/small-fixes-4

Rename a var to better reflect meaning