Refactor : tag.name -> tag