fix references to deprecated classes
Merge pull request #1029 from dimagi/fix-deprecation-csa

fix references to deprecated classes