Fix saved images filenames and destination