More folder name fixes