Renamed provider; minor tweaks