Revert "Changed variables names to be more meaningful"

This reverts commit 5618436055e25478b96d6c397ec3c9124551b163.