Improvement for #80359: added some units and modified field titles to fo...

...llow a customer supplied document more closely.