Replace deprecated generic FBV with equivalent CBV in aggregator.