*8461* Use richer filenames on download