re #919 - Improved UX, naming things is the hardest...