Decide on nomenclature

[justmoon]

We've gotten feedback from various people that the current nomenclature is not very clear. We should consider nomenclature carefully and change it if necessary. The window for doing that is closing quickly.