Renamed provider an collectors to definitions