starting first pass of cleanup, using more descriptive names for everything
(not yet done, and theres many more breaking changes to come)