Update #283 - Refactoring of namespaces & classes in ADO

Brining names inline with what we use elsewhere these days