Renaming the files correctly...