Rename files correctly