Add dir name checks