Rename these visitors to match the provider.