Small name changes to table merge options/fixes for merging two
unassigned tables.