Some minor refactoring, set node names with set_node_name!.