Add uniquify for proper naming of multiple files with same name