Re-add support for configurable table name