Revert "Set name on data instead of node"
This reverts commit 09379b6f640bcebce3ba52b94660a77557320d4c.