refactored some tag names