Tidyup of filenames