Should this variable name be changed to fieldName to be consistent with new usage above?