Renamed Collector to Controller