minor renaming variables