Renaming of variables and methods