Fix file names; allow variance in debug files