Fix file references and changed output names