renamed doctags to the original doc_tags to ease future merges ?