rename methods and variables