Handle existing tables with non-expected table ids

On upgrade we merge the existing tables with the pre-defined ones, but we only check if the tableid exists, we should also check the name of the table since the id can be defined by the user.