Get the table names right.