ticket #498 - final solution for duplicate file names.