Rename a couple of fields so their name is different from two methods.
Authored by: dannybackx 2018-11-20
Parent: [r125]
Child: [r127]