Also fix new provider names