Remove *_table terminolgy in favor of setup/cleanup