Fix keep-names filename discovery, including accounting for files with the same names or spoilered images