Fix confusion around provider_id and provider_code