more directory name fixes