Fwiw btw, I've never really liked the idea that we're prefixing everything with its menu parent's name.  While we're renaming these, maybe we should just strip the prefix off altogether?  (On the symbolic constants, not necessarily the underlying string values).