Update the header command to support database/table name distinctions