folder name fixes