Fixup name vs ID terminology

Closes #1135 

Makes CLI header columns consistent with API attribute that is rendered.
Please add two extra spaces here so that folks using a fixed width font will still see the headings line up above the dashes. Same below.