Change uses of cp-set to cp-data