Revert "re-renamed variables"

This reverts commit f32c5d6d10ebcfbe58481cb0e983987d091a3ba8.
Revert "renamed box variables"

This reverts commit 9d56359d625cee8af6287e82bede10098cbcaf38.