rename folders for consistency