Fix node name expansion