More cleanup and app name fixing