Shuffle some names around.
Misc cleanups.
Eliminated a bunch of api.