Revise collector mapping for event counts to reflect goals