Fixing node name bugs