Alex <agrambot@gmail.com> writes:

> How about the attached patch? I can mention each rename individually in
> the commit message if you agree.

Sorry, I sent out an unfinished patch; here's the correct one: