Reordered and renamed output terms in analysis library.