Rename z_doc_var to z_ann_name