Merge change 9198

* changes:
  Fix missed Aggregate->Contact name change.