Fix file rename after refactoring