Rename some methods and variables