Some filenames issues solved