Minor name change to reflect API change...
Changed various interfaces and internal functions to adjust to proposed interface. I *highly* doubt it works, I have not tested.