Directory name fixes