Filenames now changed properly