fixes #1753 Fixes to app naming

So far, just a first pass.