Fix file name bugs