Updated the naming scheme for folders