Revert "code refactoring (renaming variables)"

This reverts commit 7fb85ca95964ba64dc5bf35734d54534a93bf821.