Changed some tag names.