Any suggestion for renaming of fields, terms etc in either schema or document for clarity