changed some tag names