Change App Name & Misc Cleanup