Undo some less pertinent name changes.