Renaming variables and methods