Renamings

Into `aggregate`