Renaming of variables and functions