Removes deprecated names for/references to CCIs
Merge pull request #465 from briancline/cci-wat

Removes deprecated names for/references to CCIs