Fixing more filenames