Fix file naming issues