Provider table - standardize the way providers are identified

Discussion continued here. Let’s close this.