Undoing some unwanted method renames