Issue #65: avoid duplicate files with different names