Fixed directory name issues