Rename aggregate to count