Refactored DI names from supplier to the more standard form provider.