Rename two struct fields, for upcoming changes.  No operational changes.