Issue #2558839 by quietone, mikeryan, phenaproxima: Node builder should incorporate node type into label