Revert "rename some var"

This reverts commit b8b03f1956bd8ed4fe9447bb915839b9739ee67b.