Fix file inclusion and name