Better renaming of files.