No - we should change all instances (including variables, classes, events) like 'active geo network' to 'data collection' based on Pete's recommendation yesterday.  But I think this can probably be a separate task to this one.  As it stands currently, the naming is consistent even if incorrect!