consistency between "aggregationMethod" and "consolidateFunc" names

first one is whisper's name, second one is graphite's