More folder name changes.