Fix misleading names

I was stuck for some time on this part of the code while debugging another issue, because these names were not appropriate.
I think these ones may help understanding the code better.