Revert "change variable names"

This reverts commit de4a8a308620f7bc6fcabb79ec4edeef1caedf4c.