This seems more consistent with the pre-existing choices for names of
other statistics columns.  Rename assorted internal identifiers to match.