Rename tag.tag back to tag.name