Fix file name substitutions