Wanted to change the ID for tables to be more

general, but broke more things than I was willing

to fix.  Reverted it back.