rename some nodes to be more concise.