Updated name_tag to opt-out