Rename some methods for increased consistency.