Revert "Use set_table_name"

This reverts commit 233fb10d70413dee4ee2ec657c39e2f80c519d68.
Alternative way to define table name