Better handling of files names.