*8461* Fix filenames on upgrade