I moved PR 2307 here.  I made trivial PR 2322 for the config_key typo.

Cheryl, how did you do the name changes?  Did you prepare a rename mapping or script that could be applied to other patch files?  If so, please upload.

If sensibly possible, I would like rename patches to start with a rename list that can be reviewed before making a patch.  For example, #24225 began with a patch first, followed by the list of renames in msg243572.  I rejected some of the renames as too mechanical and posted https://bugs.python.org/file42678/%40newnames.txt for review.  It would have saved me a couple of hours if the OP had done the same before making the patch.