Renaming InfrastructureManager to InfrastructureProvider