Fix folder name part1.
Fix folder name part2.