Fix file naming problems