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

This reverts commit c859224385c6ca42f992a72a963e4f02a3830dab.