fix up class changes in cps