Change all references of aggregate to annotation where appropriate