fix the problem with the cpm connection facotry naming with ds creation and modifying.