Table Manager: Misc cleanup and renames, no functional change.

Some various cleanups and renames.