set names correctly
Merge branch 'doc_overhaul' into testing