Updated how file name is set