Fix file name conflicts