some var renaming.