Finished cleaning up terminology in the collector specs - names now better reflect what they are, and associated confusion in the code removed.