Fix the directory names