Revert "Revert "Revert "dir -> repoDir"""

This reverts commit 14d9fbfef285c7e5db82fe1183b13bae60dd3f39.