Revert "Revert "dir -> repoDir""

This reverts commit 3ed77a7d049ccc0f2b41ce09c6d0048eed596067.