fix - refs to aggregator constants.

Change-Id: Id8c5fe2cf447f1abd2f7c96a7f79bd9308990247