Fix file names (step 2)