improve filenames