change tag name accordingly