Fix file name issues that were remaining