Fix node name not being set correctly