Get rid of automatic chapter naming?

All the new changes are really great. But for me, this one is just an absolute pain. It was easy to just leave chapters as Untitled 1, Untitled 2, which was just as good as Chapter 1 or Scene 1. But the AI names never really work for me--they're often too cutsie and not really accurate, and either way, they're just not useful for me personally. I can never tell what chapter is what, and if rearrange them, then things really can get confusing. Having to go in and change the name to Ch 1, Ch 2, is just an added, unnecessary time sink. Is there maybe a way to toggle it on and off, so people who want it can keep it and those who don't can quit fighting with it? Admittedly, low priority, but maybe for Christmas? :-)