Ogre's names are now more prominent than their labels, and more friendly
when editing.
Merge branch 'betternames'