More cleanup - changing app name to something appropriate