Update for latest table names.