Rename some nodes to be more consistent.