Filenames now changed properly. All tested.