PROV-840 Refactor field names