Rename some aggregate fields