Cleaned up app name and file names