small refactoring: 2 providers renamed.