Rename service_provider to service_providers as per spec