Merge pull request #1765 from gcomte/refactor/remove-redundant-field-names