*8461* Move filename generation to sanity