Rename entity fields

Some entity fields have very general names like "label". This is very technical and does not describe the field's purpose. Such fields should be renamed to better represent their purpose.

See sbj9 for details.