Review and refactor wax internals

We made significant name changes to wax's client interface, which means internally named objects now have significant mismatches with the client interface names. As a lower priority item we need to review and clean this up.