Issue #3455435 by roderik: Simplify UI by reverting row names used internally by the form, back to field names