some var renaming