Some file/folder name fixes