Change friendly names of attributes for clarity

Friendly names of some attributes have had their friendly names changed
to improve clarity.