Rename folders correctly