Did not look at tests yet, this is a very non-final commit. ref: N25B-300
Expanding abbreviations to remove ambiguity, simplifying agent names to reduce repetition. ref: N25B-257
