Fixed directory names handling