Updated references to correct db table names