Revert "Use better variable names"

This reverts commit f74bf92aa2ce40d2e685bcccd8559cc5a0f815d7.