Rename some methods