diff --git a/csit/data/cps-core/dataOperationRequest.json b/csit/data/cps-core/dataOperationRequest.json
index 1b94a29..ddaecdf 100644
--- a/csit/data/cps-core/dataOperationRequest.json
+++ b/csit/data/cps-core/dataOperationRequest.json
@@ -6,7 +6,7 @@
       "datastore": "ncmp-datastore:passthrough-operational",
       "options": "(fields=schemas/schema)",
       "resourceIdentifier": "parent/child",
-      "targetIds": ["850117873c9a4936856a5081be96e6a8"]
+      "targetIds": ["CMHandle1"]
     }
   ]
 }
\ No newline at end of file
diff --git a/csit/data/subscription-notification/cmSubscriptionNcmpInEventForCsit.json b/csit/data/subscription-notification/cmSubscriptionNcmpInEventForCsit.json
index be749ad..755f9a9 100644
--- a/csit/data/subscription-notification/cmSubscriptionNcmpInEventForCsit.json
+++ b/csit/data/subscription-notification/cmSubscriptionNcmpInEventForCsit.json
@@ -11,7 +11,7 @@
     },
     "predicates": {
       "targets": [
-        "CMHandle1"
+        "ietfYang-CMHandle1"
       ],
       "datastore": "ncmp-datastore:passthrough-running",
       "datastore-xpath-filter": "//_3gpp-nr-nrm-gnbdufunction:GNBDUFunction/_3gpp-nr-nrm-nrcelldu:NRCellDU/ | //_3gpp-nr-nrm-gnbcuupfunction:GNBCUUPFunction// | //_3gpp-nr-nrm-gnbcucpfunction:GNBCUCPFunction/_3gpp-nr-nrm-nrcelldu:NRCellCU// | //_3gpp-nr-nrm-nrsectorcarrier:NRSectorCarrier//"
diff --git a/csit/data/subscription-notification/createCmHandleRequestBody.json b/csit/data/subscription-notification/createCmHandleRequestBody.json
index 642ea62..cc096e4 100644
--- a/csit/data/subscription-notification/createCmHandleRequestBody.json
+++ b/csit/data/subscription-notification/createCmHandleRequestBody.json
@@ -3,7 +3,7 @@
   "dmiModelPlugin":"x",
   "createdCmHandles": [
     {
-      "cmHandle": "CMHandle1",
+      "cmHandle": "ietfYang-CMHandle1",
       "cmHandleProperties": {
         "Books": "Social Media"
       },