Stash some minor edits before making some name changes...

... I'm dissatisfied with the overall verbosity of the naming. Going to make a few changes while I am on the verge of breaking everything anyway.