Revert "rename variables"

This reverts commit a1e01f2d04da12a31bdf58c614a1243226b75918.