Replaced "provider" in identifiers with "supplier"