Now properly setting tag names as pointed out by Ms2ger