renaming some vars