Revert f906ef0 but maintain table name improvements