Use the new table names