change table names
more name cleanups