No also adds app name for files in the simulator. Cleaner code.