naming conventions

Exported revision 8999, 20211023165353, by Tim

~~REDIRECT>:naming|Naming~~