Rename methods and variables