call this field `character` to make it less confusing.

Also, could you open a PR for just the changes required to fix #13776? I think that is a subset of this PR which we can merge first.