Swap things around -- rename refactors, moving towards non-derpy design. Maybe.