Fix file rename issues.
Merge pull request #1775 from vlad-ghita/patch-4

Fix file rename issues.