A few more table name updates