More directory name cleanup