undecorated_table_name was moved and refactored