diff --git a/tools/test/scenarios/net-point-intent.xml b/tools/test/scenarios/net-point-intent.xml
index c60e85e..125f491 100644
--- a/tools/test/scenarios/net-point-intent.xml
+++ b/tools/test/scenarios/net-point-intent.xml
@@ -25,28 +25,32 @@
               exec="onos-mininet sendAndExpect h4 ping -c1 h1 --expect ."/>
 
         <step name="P2P-Create-Intent-1-To-4" requires="^"
-              exec="onos ${OC1} add-point-intent of:0000000000000001/1 of:0000000000000004/1"/>
+              exec="onos-create-intent ${OC1} oneToFour point of:0000000000000001/1 of:0000000000000004/1"/>
         <step name="P2P-Create-Intent-4-To-1" requires="^"
-              exec="onos ${OC1} add-point-intent of:0000000000000004/1 of:0000000000000001/1"/>
-        <step name="P2P-Validate-Point-Intents-Installed" exec="onos-check-intent ${OC1} INSTALLED"
-              requires="P2P-Create-Intent-4-To-1" />
+              exec="onos-create-intent ${OC1} fourToOne point of:0000000000000004/1 of:0000000000000001/1"/>
+
+        <step name="P2P-Validate-Point-Intents-Installed1" exec="onos-check-intent ${OC1} ${fourToOneId} INSTALLED"
+              requires="^" />
+        <step name="P2P-Validate-Point-Intents-Installed2" exec="onos-check-intent ${OC1} ${oneToFourId} INSTALLED"
+              requires="^" />
 
         <import file="${ONOS_SCENARIOS}/net-link-down-up.xml" namespace="Point-To-Point-Intent"/>
-        <dependency name="Point-To-Point-Intent.Net-Link-Down-Up" requires="P2P-Validate-Point-Intents-Installed"/>
-        <step name="P2P-Validate-Intent-Installed-Still" exec="onos-check-intent ${OC1} INSTALLED"
+        <dependency name="Point-To-Point-Intent.Net-Link-Down-Up" requires="P2P-Validate-Point-Intents-Installed2"/>
+        <step name="P2P-Validate-Intent-Installed-Still" exec="onos-check-intent ${OC1} ${fourToOneId} INSTALLED"
               requires="Point-To-Point-Intent.Link-1-Down" />
 
-        <step name="P2P-Validate-Intent-Failed" exec="onos-check-intent ${OC1} FAILED"
+        <step name="P2P-Validate-Intent-Failed" exec="onos-check-intent ${OC1} ${fourToOneId} FAILED"
+              requires="Point-To-Point-Intent.Link-2-Down" />
+        <step name="P2P-Validate-Intent-Failed2" exec="onos-check-intent ${OC1} ${oneToFourId} FAILED"
               requires="Point-To-Point-Intent.Link-2-Down" />
 
-        <step name="P2P-Validate-Intent-Installed-Again" exec="onos-check-intent ${OC1} INSTALLED"
+        <step name="P2P-Validate-Intent-Installed-Again" exec="onos-check-intent ${OC1} ${fourToOneId} INSTALLED"
               requires="Point-To-Point-Intent.Link-1-Up" />
         <dependency name="Point-To-Point-Intent.Ping-4" requires="P2P-Validate-Intent-Installed-Again" />
 
-        <step name="P2P-Remove-Intent" requires="~Point-To-Point-Intent.Net-Link-Down-Up"
-              exec="onos ${OC1} remove-intent -p"/>
-
-
-
+        <step name="P2P-Remove-Intent-4-to-1" requires="~Point-To-Point-Intent.Net-Link-Down-Up"
+              exec="onos ${OC1} remove-intent -p org.onosproject.cli ${fourToOneId}"/>
+        <step name="P2P-Remove-Intent-1-to-4" requires="^"
+              exec="onos ${OC1} remove-intent -p org.onosproject.cli ${oneToFourId}"/>
     </group>
 </scenario>