Fix file and function names