Done, but a bit differently from how you asked. I did the following renames:
So now all names have dashes. This is in line with how they do it over at Stack Overflow, where they have a lot of volume of Python questions, and I guess this scheme works well for them. The old names are left as synonyms.