Two more table name fixes