Fix some shadowing by using more distinct variable names#228

0Xellos wants to merge 2 commits into

MikeMirzayanov:masterMikeMirzayanov/testlib:masterfrom

0Xellos:fix-some-shadowing0Xellos/testlib:fix-some-shadowingCopy head branch name to clipboard