naming

Exported revision 9000, 20211023165353, by Tim

This may require some cleaning up of infobox labels as well as top level categories