Updated references and fixed db table name