Include tag name to the node name
Fix typo