Use intention-revealing names

* Replace one-letter variables

https://trello.com/c/6ciBtZOf