Refactored node names. (reverse-merged from commit c4e91c817be161f4010a3d860d7c2c6ea4a8bfb2)