Renamed collectors and providers to definitions