Renaming some instances of 'handler' to 'provider'.