Fix file rename issues.