Rename some methods and vars