Revert "Renamed variables"

This reverts commit 6e4f9df7f5cbd38ef07d4fd7772a079afac19b5c.