diff --git a/crm/pengine/testcases/agent2.exp b/crm/pengine/testcases/agent2.exp
index d69faff763..f1a66e0707 100644
--- a/crm/pengine/testcases/agent2.exp
+++ b/crm/pengine/testcases/agent2.exp
@@ -1,10 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE transition_graph SYSTEM "crm-1.0.dtd">
 <transition_graph>
   <actions id="0">
-    <rsc_op id="2" rsc_id="rsc1" on_node="node1" operation="start" runnable="true" optional="false" discard="false" allow_fail="false">
+    <rsc_op id="2" rsc_id="rsc1" on_node="node1" on_node_uuid="node1" operation="start" runnable="true" optional="false" discard="false" allow_fail="false">
       <resource id="rsc1" class="heartbeat" type="apache" priority="1.0" version="1.0"/>
       <args/>
     </rsc_op>
   </actions>
 </transition_graph>
diff --git a/crm/pengine/testcases/agent3.exp b/crm/pengine/testcases/agent3.exp
index d69faff763..f1a66e0707 100644
--- a/crm/pengine/testcases/agent3.exp
+++ b/crm/pengine/testcases/agent3.exp
@@ -1,10 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE transition_graph SYSTEM "crm-1.0.dtd">
 <transition_graph>
   <actions id="0">
-    <rsc_op id="2" rsc_id="rsc1" on_node="node1" operation="start" runnable="true" optional="false" discard="false" allow_fail="false">
+    <rsc_op id="2" rsc_id="rsc1" on_node="node1" on_node_uuid="node1" operation="start" runnable="true" optional="false" discard="false" allow_fail="false">
       <resource id="rsc1" class="heartbeat" type="apache" priority="1.0" version="1.0"/>
       <args/>
     </rsc_op>
   </actions>
 </transition_graph>
diff --git a/crm/pengine/testcases/attrs1.exp b/crm/pengine/testcases/attrs1.exp
index 6a262b6e47..5e8898081c 100644
--- a/crm/pengine/testcases/attrs1.exp
+++ b/crm/pengine/testcases/attrs1.exp
@@ -1,10 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE transition_graph SYSTEM "crm-1.0.dtd">
 <transition_graph>
   <actions id="0">
-    <rsc_op id="2" rsc_id="rsc1" on_node="node2" operation="start" runnable="true" optional="false" discard="false" allow_fail="false">
+    <rsc_op id="2" rsc_id="rsc1" on_node="node2" on_node_uuid="uuid2" operation="start" runnable="true" optional="false" discard="false" allow_fail="false">
       <resource id="rsc1" class="heartbeat" type="apache" priority="1.0"/>
       <args/>
     </rsc_op>
   </actions>
 </transition_graph>
diff --git a/crm/pengine/testcases/attrs2.exp b/crm/pengine/testcases/attrs2.exp
index 6a262b6e47..5e8898081c 100644
--- a/crm/pengine/testcases/attrs2.exp
+++ b/crm/pengine/testcases/attrs2.exp
@@ -1,10 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE transition_graph SYSTEM "crm-1.0.dtd">
 <transition_graph>
   <actions id="0">
-    <rsc_op id="2" rsc_id="rsc1" on_node="node2" operation="start" runnable="true" optional="false" discard="false" allow_fail="false">
+    <rsc_op id="2" rsc_id="rsc1" on_node="node2" on_node_uuid="uuid2" operation="start" runnable="true" optional="false" discard="false" allow_fail="false">
       <resource id="rsc1" class="heartbeat" type="apache" priority="1.0"/>
       <args/>
     </rsc_op>
   </actions>
 </transition_graph>
diff --git a/crm/pengine/testcases/attrs3.exp b/crm/pengine/testcases/attrs3.exp
index 61b2fed979..3660365d35 100644
--- a/crm/pengine/testcases/attrs3.exp
+++ b/crm/pengine/testcases/attrs3.exp
@@ -1,10 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE transition_graph SYSTEM "crm-1.0.dtd">
 <transition_graph>
   <actions id="0">
-    <rsc_op id="2" rsc_id="rsc1" on_node="node1" operation="start" runnable="true" optional="false" discard="false" allow_fail="false">
+    <rsc_op id="2" rsc_id="rsc1" on_node="node1" on_node_uuid="uuid1" operation="start" runnable="true" optional="false" discard="false" allow_fail="false">
       <resource id="rsc1" class="heartbeat" type="apache" priority="1.0"/>
       <args/>
     </rsc_op>
   </actions>
 </transition_graph>
diff --git a/crm/pengine/testcases/attrs4.exp b/crm/pengine/testcases/attrs4.exp
index 61b2fed979..3660365d35 100644
--- a/crm/pengine/testcases/attrs4.exp
+++ b/crm/pengine/testcases/attrs4.exp
@@ -1,10 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE transition_graph SYSTEM "crm-1.0.dtd">
 <transition_graph>
   <actions id="0">
-    <rsc_op id="2" rsc_id="rsc1" on_node="node1" operation="start" runnable="true" optional="false" discard="false" allow_fail="false">
+    <rsc_op id="2" rsc_id="rsc1" on_node="node1" on_node_uuid="uuid1" operation="start" runnable="true" optional="false" discard="false" allow_fail="false">
       <resource id="rsc1" class="heartbeat" type="apache" priority="1.0"/>
       <args/>
     </rsc_op>
   </actions>
 </transition_graph>
diff --git a/crm/pengine/testcases/bad1.exp b/crm/pengine/testcases/bad1.exp
index 6780573c10..bc39917bcb 100644
--- a/crm/pengine/testcases/bad1.exp
+++ b/crm/pengine/testcases/bad1.exp
@@ -1,16 +1,16 @@
 <?xml version="1.0"?>
 <!DOCTYPE transition_graph SYSTEM "crm-1.0.dtd">
 <transition_graph>
   <actions id="0">
-    <rsc_op id="4" rsc_id="rsc2" on_node="node1" operation="start" runnable="true" optional="false" discard="false" allow_fail="false">
+    <rsc_op id="4" rsc_id="rsc2" on_node="node1" on_node_uuid="node1" operation="start" runnable="true" optional="false" discard="false" allow_fail="false">
       <resource id="rsc2" class="heartbeat" type="apache" priority="2.0"/>
       <args/>
     </rsc_op>
   </actions>
   <actions id="1">
-    <rsc_op id="2" rsc_id="rsc1" on_node="node2" operation="start" runnable="true" optional="false" discard="false" allow_fail="false">
+    <rsc_op id="2" rsc_id="rsc1" on_node="node2" on_node_uuid="node2" operation="start" runnable="true" optional="false" discard="false" allow_fail="false">
       <resource id="rsc1" class="heartbeat" type="apache" priority="1.0"/>
       <args/>
     </rsc_op>
   </actions>
 </transition_graph>
diff --git a/crm/pengine/testcases/bad2.exp b/crm/pengine/testcases/bad2.exp
index ef1663f143..24e679bf59 100644
--- a/crm/pengine/testcases/bad2.exp
+++ b/crm/pengine/testcases/bad2.exp
@@ -1,16 +1,16 @@
 <?xml version="1.0"?>
 <!DOCTYPE transition_graph SYSTEM "crm-1.0.dtd">
 <transition_graph>
   <actions id="0">
-    <rsc_op id="4" rsc_id="rsc2" on_node="node1" operation="start" runnable="true" optional="false" discard="false" allow_fail="false">
+    <rsc_op id="4" rsc_id="rsc2" on_node="node1" on_node_uuid="node1" operation="start" runnable="true" optional="false" discard="false" allow_fail="false">
       <resource id="rsc2" class="heartbeat" type="apache" priority="2.0"/>
       <args/>
     </rsc_op>
   </actions>
   <actions id="1">
-    <rsc_op id="2" rsc_id="rsc1" on_node="node1" operation="start" runnable="true" optional="false" discard="false" allow_fail="false">
+    <rsc_op id="2" rsc_id="rsc1" on_node="node1" on_node_uuid="node1" operation="start" runnable="true" optional="false" discard="false" allow_fail="false">
       <resource id="rsc1" class="heartbeat" type="apache" priority="1.0"/>
       <args/>
     </rsc_op>
   </actions>
 </transition_graph>
diff --git a/crm/pengine/testcases/bad3.exp b/crm/pengine/testcases/bad3.exp
index 41640fbde3..372bb67887 100644
--- a/crm/pengine/testcases/bad3.exp
+++ b/crm/pengine/testcases/bad3.exp
@@ -1,10 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE transition_graph SYSTEM "crm-1.0.dtd">
 <transition_graph>
   <actions id="0">
-    <rsc_op id="2" rsc_id="rsc1" on_node="node1" operation="start" runnable="true" optional="false" discard="false" allow_fail="false">
+    <rsc_op id="2" rsc_id="rsc1" on_node="node1" on_node_uuid="node1" operation="start" runnable="true" optional="false" discard="false" allow_fail="false">
       <resource id="rsc1" type="apache" priority="1.0"/>
       <args/>
     </rsc_op>
   </actions>
 </transition_graph>
diff --git a/crm/pengine/testcases/bad3.xml b/crm/pengine/testcases/bad3.xml
index 0670277d89..4b676bc069 100644
--- a/crm/pengine/testcases/bad3.xml
+++ b/crm/pengine/testcases/bad3.xml
@@ -1,30 +1,30 @@
 <?xml version="1.0"?>
 <!DOCTYPE cib SYSTEM "crm-1.0.dtd">
 <!-- no rsc class -->
 <cib>
  <configuration>
   <nodes>
     <node id="node1" uname="node1" type="member"/>
   </nodes>
   <resources>
      <resource id="rsc1" type="apache" priority="1.0"/>
   </resources>
   <constraints>
       <rsc_location id="run_rsc1" rsc="rsc1">
 	<rule id="can1" result="can"/>
       </rsc_location>
   </constraints>
  </configuration>
  <status>
     <node_state id="node1" uname="node1" crmd="online" join="member" expected="member" timestamp="1086187789" in_ccm="true">
       <lrm>
 	<lrm_agents>
 	  <lrm_agent class="heartbeat" type="apache"/>
 	</lrm_agents>
         <lrm_resources>
-          <lrm_resource id="rsc1" last_op="stop" op_state="stopped" op_code="0" target="hadev"/>
+          <lrm_resource id="rsc1" last_op="stop" rsc_state="stopped" op_status="0" rc_code="0" on_node="hadev"/>
         </lrm_resources>
       </lrm>
     </node_state>
  </status>
 </cib>
diff --git a/crm/pengine/testcases/bad4.xml b/crm/pengine/testcases/bad4.xml
index 64b2aec151..393366f22f 100644
--- a/crm/pengine/testcases/bad4.xml
+++ b/crm/pengine/testcases/bad4.xml
@@ -1,30 +1,30 @@
 <?xml version="1.0"?>
 <!DOCTYPE cib SYSTEM "crm-1.0.dtd">
 <!-- no rsc type -->
 <cib>
  <configuration>
   <nodes>
     <node id="node1" uname="node1" type="member"/>
   </nodes>
   <resources>
      <resource id="rsc1" class="heartbeat" priority="1.0"/>
   </resources>
   <constraints> 
      <rsc_location id="run_rsc1" rsc="rsc">
 	<rule id="can1" result="can"/>
       </rsc_location>
   <constraints/> 
  </configuration>
  <status>
     <node_state id="node1" uname="node1" crmd="online" join="member" expected="member" timestamp="1086187789" in_ccm="true">
       <lrm>
 	<lrm_agents>
 	  <lrm_agent class="heartbeat" type="apache"/>
 	</lrm_agents>
         <lrm_resources>
-          <lrm_resource id="rsc1" last_op="stop" op_state="stopped" op_code="0" target="hadev"/>
+          <lrm_resource id="rsc1" last_op="stop" rsc_state="stopped" op_status="0" rc_code="0" on_node="hadev"/>
         </lrm_resources>
       </lrm>
     </node_state>
  </status>
 </cib>
diff --git a/crm/pengine/testcases/bad5.exp b/crm/pengine/testcases/bad5.exp
index 61b2fed979..dc7a46fb49 100644
--- a/crm/pengine/testcases/bad5.exp
+++ b/crm/pengine/testcases/bad5.exp
@@ -1,10 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE transition_graph SYSTEM "crm-1.0.dtd">
 <transition_graph>
   <actions id="0">
-    <rsc_op id="2" rsc_id="rsc1" on_node="node1" operation="start" runnable="true" optional="false" discard="false" allow_fail="false">
+    <rsc_op id="2" rsc_id="rsc1" on_node="node1" on_node_uuid="node1" operation="start" runnable="true" optional="false" discard="false" allow_fail="false">
       <resource id="rsc1" class="heartbeat" type="apache" priority="1.0"/>
       <args/>
     </rsc_op>
   </actions>
 </transition_graph>
diff --git a/crm/pengine/testcases/bad5.xml b/crm/pengine/testcases/bad5.xml
index a4ab7d4eef..9c3e2adb44 100644
--- a/crm/pengine/testcases/bad5.xml
+++ b/crm/pengine/testcases/bad5.xml
@@ -1,30 +1,30 @@
 <?xml version="1.0"?>
 <!DOCTYPE cib SYSTEM "crm-1.0.dtd">
 <!-- lrm status -->
 <cib>
  <configuration>
   <nodes>
     <node id="node1" uname="node1" type="member"/>
   </nodes>
   <resources>
      <resource id="rsc1" class="heartbeat" type="apache" priority="1.0"/>
   </resources>
   <constraints> 
     <rsc_location id="run_rsc1" rsc="rsc1">
       <rule id="can1" result="can"/>
     </rsc_location>
   </constraints> 
  </configuration>
  <status>
     <node_state id="node1" uname="node1" crmd="online" join="member" expected="member" timestamp="1086187789" in_ccm="true">
       <lrm>
 	<lrm_agents>
 	  <lrm_agent class="heartbeat" type="apache"/>
 	</lrm_agents>
         <lrm_resources>
-          <lrm_resource id="rsc2" last_op="stop" op_state="stopped" op_code="0" target="hadev"/>
+          <lrm_resource id="rsc2" last_op="stop" rsc_state="stopped" op_status="0" rc_code="0" on_node="hadev"/>
         </lrm_resources>
       </lrm>
     </node_state>
  </status>
 </cib>
diff --git a/crm/pengine/testcases/bad6.exp b/crm/pengine/testcases/bad6.exp
index 61b2fed979..dc7a46fb49 100644
--- a/crm/pengine/testcases/bad6.exp
+++ b/crm/pengine/testcases/bad6.exp
@@ -1,10 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE transition_graph SYSTEM "crm-1.0.dtd">
 <transition_graph>
   <actions id="0">
-    <rsc_op id="2" rsc_id="rsc1" on_node="node1" operation="start" runnable="true" optional="false" discard="false" allow_fail="false">
+    <rsc_op id="2" rsc_id="rsc1" on_node="node1" on_node_uuid="node1" operation="start" runnable="true" optional="false" discard="false" allow_fail="false">
       <resource id="rsc1" class="heartbeat" type="apache" priority="1.0"/>
       <args/>
     </rsc_op>
   </actions>
 </transition_graph>
diff --git a/crm/pengine/testcases/rsc_attr1.xml b/crm/pengine/testcases/rsc_attr1.xml
index ea73b4d2dc..5fc2ab559f 100644
--- a/crm/pengine/testcases/rsc_attr1.xml
+++ b/crm/pengine/testcases/rsc_attr1.xml
@@ -1,42 +1,42 @@
 <?xml version="1.0"?>
 <!DOCTYPE cib SYSTEM "crm-1.0.dtd">
 <cib>
  <configuration>
   <nodes>
     <node id="node1" uname="node1" type="member"/>
     <node id="node2" uname="node2" type="member">
       <attributes>
 	<nvpair id="" name="hdd" value="false"/>
 	<nvpair id="" name="kernel" value="2.4"/>
       </attributes>
     </node>
   </nodes>
   <resources>
      <resource id="rsc1" class="heartbeat" type="apache" priority="1.0"/>
   </resources>
   <constraints>
      <rsc_to_attr id="cons2" from="rsc1" weight="200.0" modifier="inc">
        <attr_expression id="attr_exp_2">
-          <node_match id="node_match_3" type="has_attr" target="hdd"/>
-          <node_match id="node_match_4" type="attr_value" target="kernel" value="2.4"/>
+          <node_match id="node_match_3" type="has_attr" on_node="hdd"/>
+          <node_match id="node_match_4" type="attr_value" on_node="kernel" value="2.4"/>
        </attr_expression>
      </rsc_to_attr>
   </constraints>
  </configuration>
  <status>
     <node_state id="node1" crmd="online" join="member" expected="member" timestamp="1086187789" in_ccm="true">
       <lrm>
 	<lrm_agents>
 	  <lrm_agent class="heartbeat" type="apache"/>
 	</lrm_agents>
       </lrm>
     </node_state>
     <node_state id="node2" crmd="online" join="member" expected="member" timestamp="1086187789" in_ccm="true">
       <lrm>
 	<lrm_agents>
 	  <lrm_agent class="heartbeat" type="apache"/>
 	</lrm_agents>
       </lrm>
     </node_state>
  </status>
 </cib>
diff --git a/crm/pengine/testcases/rsc_attr2.xml b/crm/pengine/testcases/rsc_attr2.xml
index 68b9e0b897..b3eda37daa 100644
--- a/crm/pengine/testcases/rsc_attr2.xml
+++ b/crm/pengine/testcases/rsc_attr2.xml
@@ -1,42 +1,42 @@
 <?xml version="1.0"?>
 <!DOCTYPE cib SYSTEM "crm-1.0.dtd">
 <cib>
  <configuration>
   <nodes>
     <node id="node1" uname="node1" type="member">
       <attributes>
 	<nvpair id="" name="hdd" value="false"/>
 	<nvpair id="" name="kernel" value="2.4"/>
       </attributes>
     </node>
     <node id="node2" uname="node2" type="member"/>
   </nodes>
   <resources>
      <resource id="rsc1" class="heartbeat" type="apache" priority="1.0"/>
   </resources>
   <constraints>
      <rsc_to_attr id="cons2" from="rsc1" weight="200.0" modifier="dec">
        <attr_expression id="attr_exp_2">
-          <node_match id="node_match_3" type="has_attr" target="hdd"/>
-          <node_match id="node_match_4" type="attr_value" target="kernel" value="2.4"/>
+          <node_match id="node_match_3" type="has_attr" on_node="hdd"/>
+          <node_match id="node_match_4" type="attr_value" on_node="kernel" value="2.4"/>
        </attr_expression>
      </rsc_to_attr>
   </constraints>
  </configuration>
  <status>
     <node_state id="node1" crmd="online" join="member" expected="member" timestamp="1086187789" in_ccm="true">
       <lrm>
 	<lrm_agents>
 	  <lrm_agent class="heartbeat" type="apache"/>
 	</lrm_agents>
       </lrm>
     </node_state>
     <node_state id="node2" crmd="online" join="member" expected="member" timestamp="1086187789" in_ccm="true">
       <lrm>
 	<lrm_agents>
 	  <lrm_agent class="heartbeat" type="apache"/>
 	</lrm_agents>
       </lrm>
     </node_state>
  </status>
 </cib>
diff --git a/crm/pengine/testcases/rsc_attr3.xml b/crm/pengine/testcases/rsc_attr3.xml
index 3df322a5a0..51fd32a694 100644
--- a/crm/pengine/testcases/rsc_attr3.xml
+++ b/crm/pengine/testcases/rsc_attr3.xml
@@ -1,42 +1,42 @@
 <?xml version="1.0"?>
 <!DOCTYPE cib SYSTEM "crm-1.0.dtd">
 <cib>
  <configuration>
   <nodes>
     <node id="node1" uname="node1" type="member">
       <attributes>
 	<nvpair id="" name="hdd" value="false"/>
 	<nvpair id="" name="kernel" value="2.4"/>
       </attributes>
     </node>
     <node id="node2" uname="node2" type="member"/>
   </nodes>
   <resources>
      <resource id="rsc1" class="heartbeat" type="apache" priority="1.0"/>
   </resources>
   <constraints>
      <rsc_to_attr id="cons2" from="rsc1" weight="-200.0" modifier="set">
        <attr_expression id="attr_exp_2">
-          <node_match id="node_match_3" type="has_attr" target="hdd"/>
-          <node_match id="node_match_4" type="attr_value" target="kernel" value="2.4"/>
+          <node_match id="node_match_3" type="has_attr" on_node="hdd"/>
+          <node_match id="node_match_4" type="attr_value" on_node="kernel" value="2.4"/>
        </attr_expression>
      </rsc_to_attr>
   </constraints>
  </configuration>
  <status>
     <node_state id="node1" crmd="online" join="member" expected="member" timestamp="1086187789" in_ccm="true">
       <lrm>
 	<lrm_agents>
 	  <lrm_agent class="heartbeat" type="apache"/>
 	</lrm_agents>
       </lrm>
     </node_state>
     <node_state id="node2" crmd="online" join="member" expected="member" timestamp="1086187789" in_ccm="true">
       <lrm>
 	<lrm_agents>
 	  <lrm_agent class="heartbeat" type="apache"/>
 	</lrm_agents>
       </lrm>
     </node_state>
  </status>
 </cib>
diff --git a/crm/pengine/testcases/rsc_attr4.xml b/crm/pengine/testcases/rsc_attr4.xml
index be462f507d..6334cac239 100644
--- a/crm/pengine/testcases/rsc_attr4.xml
+++ b/crm/pengine/testcases/rsc_attr4.xml
@@ -1,42 +1,42 @@
 <?xml version="1.0"?>
 <!DOCTYPE cib SYSTEM "crm-1.0.dtd">
 <cib>
  <configuration>
   <nodes>
     <node id="node1" uname="node1" type="member"/>
     <node id="node2" uname="node2" type="member">
       <attributes>
 	<nvpair id="" name="hdd" value="false"/>
 	<nvpair id="" name="kernel" value="2.4"/>
       </attributes>
     </node>
   </nodes>
   <resources>
      <resource id="rsc1" class="heartbeat" type="apache" priority="1.0"/>
   </resources>
   <constraints>
      <rsc_to_attr id="cons2" from="rsc1" weight="200.0" modifier="set">
        <attr_expression id="attr_exp_2">
-          <node_match id="node_match_3" type="has_attr" target="hdd"/>
-          <node_match id="node_match_4" type="attr_value" target="kernel" value="2.4"/>
+          <node_match id="node_match_3" type="has_attr" on_node="hdd"/>
+          <node_match id="node_match_4" type="attr_value" on_node="kernel" value="2.4"/>
        </attr_expression>
      </rsc_to_attr>
   </constraints>
  </configuration>
  <status>
     <node_state id="node1" crmd="online" join="member" expected="member" timestamp="1086187789" in_ccm="true">
       <lrm>
 	<lrm_agents>
 	  <lrm_agent class="heartbeat" type="apache"/>
 	</lrm_agents>
       </lrm>
     </node_state>
     <node_state id="node2" crmd="online" join="member" expected="member" timestamp="1086187789" in_ccm="true">
       <lrm>
 	<lrm_agents>
 	  <lrm_agent class="heartbeat" type="apache"/>
 	</lrm_agents>
       </lrm>
     </node_state>
  </status>
 </cib>
diff --git a/crm/pengine/testcases/rsc_attr5.xml b/crm/pengine/testcases/rsc_attr5.xml
index 54f2492372..10c3291126 100644
--- a/crm/pengine/testcases/rsc_attr5.xml
+++ b/crm/pengine/testcases/rsc_attr5.xml
@@ -1,45 +1,45 @@
 <?xml version="1.0"?>
 <!DOCTYPE cib SYSTEM "crm-1.0.dtd">
 <cib>
  <configuration>
   <nodes>
     <node id="node1" uname="node1" type="member"/>
     <node id="node2" uname="node2" type="member">
       <attributes>
 	<nvpair id="" name="hdd" value="false"/>
 	<nvpair id="" name="kernel" value="2.4"/>
       </attributes>
     </node>
   </nodes>
   <resources>
      <resource id="rsc1" class="heartbeat" type="apache" priority="1.0"/>
   </resources>
   <constraints>
      <rsc_to_node id="cons1" from="rsc1" weight="2000.0" modifier="inc">
        <node_ref id="node_match_1" type="uname" name="node1"/>
      </rsc_to_node>
      <rsc_to_attr id="cons2" from="rsc1" weight="200.0" modifier="only">
        <attr_expression id="attr_exp_2">
-          <node_match id="node_match_3" type="has_attr" target="hdd"/>
-          <node_match id="node_match_4" type="attr_value" target="kernel" value="2.4"/>
+          <node_match id="node_match_3" type="has_attr" on_node="hdd"/>
+          <node_match id="node_match_4" type="attr_value" on_node="kernel" value="2.4"/>
        </attr_expression>
      </rsc_to_attr>
   </constraints>
  </configuration>
  <status>
     <node_state id="node1" crmd="online" join="member" expected="member" timestamp="1086187789" in_ccm="true">
       <lrm>
 	<lrm_agents>
 	  <lrm_agent class="heartbeat" type="apache"/>
 	</lrm_agents>
       </lrm>
     </node_state>
     <node_state id="node2" crmd="online" join="member" expected="member" timestamp="1086187789" in_ccm="true">
       <lrm>
 	<lrm_agents>
 	  <lrm_agent class="heartbeat" type="apache"/>
 	</lrm_agents>
       </lrm>
     </node_state>
  </status>
 </cib>
diff --git a/crm/pengine/testcases/rsc_attr6.xml b/crm/pengine/testcases/rsc_attr6.xml
index 3459edf58f..64d76c598f 100644
--- a/crm/pengine/testcases/rsc_attr6.xml
+++ b/crm/pengine/testcases/rsc_attr6.xml
@@ -1,58 +1,58 @@
 <?xml version="1.0"?>
 <!DOCTYPE cib SYSTEM "crm-1.0.dtd">
 <cib>
  <configuration>
   <nodes>
     <node id="node1" uname="node1" type="member">
       <attributes>
 	<nvpair id="" name="hdd" value="true"/>
 	<nvpair id="" name="kernel" value="2.4"/>
       </attributes>
     </node>
     <node id="node2" uname="node2" type="member">
       <attributes>
 	<nvpair id="" name="hdd" value="false"/>
 	<nvpair id="" name="cpu" value="true"/>
 	<nvpair id="" name="kernel" value="2.6"/>
       </attributes>
     </node>
    </nodes>
   <resources>
      <resource id="rsc1" class="heartbeat" type="apache" priority="1.0"/>
   </resources>
   <constraints>
      <rsc_to_node id="cons1" from="rsc1" weight="200.0" modifier="inc">
        <node_ref id="node_match_1" type="uname" name="node1"/>
      </rsc_to_node>
      <rsc_to_attr id="cons2" from="rsc1" weight="20.0" modifier="inc">
        <attr_expression id="attr_exp_1">
-          <node_match id="node_match_4" type="attr_value" target="hdd" value="true"/>
-          <node_match id="node_match_5" type="attr_value" target="kernel" value="2.4"/>
+          <node_match id="node_match_4" type="attr_value" on_node="hdd" value="true"/>
+          <node_match id="node_match_5" type="attr_value" on_node="kernel" value="2.4"/>
        </attr_expression>
      </rsc_to_attr>
      <rsc_to_attr id="cons3" from="rsc1" weight="400.0" modifier="inc">
        <attr_expression id="attr_exp_2">
-          <node_match id="node_match_1" type="has_attr" target="cpu"/>
-          <node_match id="node_match_2" type="attr_value" target="kernel" value="2.6"/>
-          <node_match id="node_match_3" type="has_attr" target="hdd"/>
+          <node_match id="node_match_1" type="has_attr" on_node="cpu"/>
+          <node_match id="node_match_2" type="attr_value" on_node="kernel" value="2.6"/>
+          <node_match id="node_match_3" type="has_attr" on_node="hdd"/>
        </attr_expression>
      </rsc_to_attr>
   </constraints>
  </configuration>
  <status>
     <node_state id="node1" crmd="online" join="member" expected="member" timestamp="1086187789" in_ccm="true">
       <lrm>
 	<lrm_agents>
 	  <lrm_agent class="heartbeat" type="apache"/>
 	</lrm_agents>
       </lrm>
     </node_state>
    <node_state id="node2" crmd="online" join="member" expected="member" timestamp="1086187789" in_ccm="true">
       <lrm>
 	<lrm_agents>
 	  <lrm_agent class="heartbeat" type="apache"/>
 	</lrm_agents>
       </lrm>
     </node_state>
   </status>
 </cib>
diff --git a/crm/pengine/testcases/rsc_location1.exp b/crm/pengine/testcases/rsc_location1.exp
index ef1663f143..24e679bf59 100644
--- a/crm/pengine/testcases/rsc_location1.exp
+++ b/crm/pengine/testcases/rsc_location1.exp
@@ -1,16 +1,16 @@
 <?xml version="1.0"?>
 <!DOCTYPE transition_graph SYSTEM "crm-1.0.dtd">
 <transition_graph>
   <actions id="0">
-    <rsc_op id="4" rsc_id="rsc2" on_node="node1" operation="start" runnable="true" optional="false" discard="false" allow_fail="false">
+    <rsc_op id="4" rsc_id="rsc2" on_node="node1" on_node_uuid="node1" operation="start" runnable="true" optional="false" discard="false" allow_fail="false">
       <resource id="rsc2" class="heartbeat" type="apache" priority="2.0"/>
       <args/>
     </rsc_op>
   </actions>
   <actions id="1">
-    <rsc_op id="2" rsc_id="rsc1" on_node="node1" operation="start" runnable="true" optional="false" discard="false" allow_fail="false">
+    <rsc_op id="2" rsc_id="rsc1" on_node="node1" on_node_uuid="node1" operation="start" runnable="true" optional="false" discard="false" allow_fail="false">
       <resource id="rsc1" class="heartbeat" type="apache" priority="1.0"/>
       <args/>
     </rsc_op>
   </actions>
 </transition_graph>
diff --git a/crm/pengine/testcases/rsc_location2.exp b/crm/pengine/testcases/rsc_location2.exp
index b0a372475c..b4d2c252b7 100644
--- a/crm/pengine/testcases/rsc_location2.exp
+++ b/crm/pengine/testcases/rsc_location2.exp
@@ -1,20 +1,20 @@
 <?xml version="1.0"?>
 <!DOCTYPE transition_graph SYSTEM "crm-1.0.dtd">
 <transition_graph>
   <actions id="0">
-    <rsc_op id="4" rsc_id="rsc2" on_node="node1" operation="start" runnable="true" optional="false" discard="false" allow_fail="false">
+    <rsc_op id="4" rsc_id="rsc2" on_node="node1" on_node_uuid="node1" operation="start" runnable="true" optional="false" discard="false" allow_fail="false">
       <resource id="rsc2" class="heartbeat" type="apache" priority="2.0"/>
       <args/>
     </rsc_op>
   </actions>
   <actions id="1">
-    <rsc_op id="1" rsc_id="rsc1" on_node="node2" operation="stop" runnable="true" optional="true" discard="false" allow_fail="false">
+    <rsc_op id="1" rsc_id="rsc1" on_node="node2" on_node_uuid="node2" operation="stop" runnable="true" optional="true" discard="false" allow_fail="false">
       <resource id="rsc1" class="heartbeat" type="apache" priority="1.0"/>
       <args/>
     </rsc_op>
-    <rsc_op id="2" rsc_id="rsc1" on_node="node2" operation="start" runnable="true" optional="true" discard="false" allow_fail="false">
+    <rsc_op id="2" rsc_id="rsc1" on_node="node2" on_node_uuid="node2" operation="start" runnable="true" optional="true" discard="false" allow_fail="false">
       <resource id="rsc1" class="heartbeat" type="apache" priority="1.0"/>
       <args/>
     </rsc_op>
   </actions>
 </transition_graph>
diff --git a/crm/pengine/testcases/rsc_location2.xml b/crm/pengine/testcases/rsc_location2.xml
index 410868f317..1840252968 100644
--- a/crm/pengine/testcases/rsc_location2.xml
+++ b/crm/pengine/testcases/rsc_location2.xml
@@ -1,46 +1,46 @@
 <?xml version="1.0"?>
 <!DOCTYPE cib SYSTEM "crm-1.0.dtd">
 <!-- must not -->
 <cib>
  <configuration>
   <nodes>
     <node id="node1" uname="node1" type="member"/>
     <node id="node2" uname="node2" type="member"/>
   </nodes>
   <resources>
      <resource id="rsc1" class="heartbeat" type="apache" priority="1.0"/>
      <resource id="rsc2" class="heartbeat" type="apache" priority="2.0"/>
   </resources>
   <constraints>
       <rsc_location id="run_rsc1" rsc="rsc1">
 	<rule id="can1" result="can"/>
 	<rule id="score1" score="10">
 	  <expression id="exp1" attribute="rsc1" operation="running"/>
 	</rule>
       </rsc_location>
       <rsc_location id="run_rsc2" rsc="rsc2">
 	<rule id="can2" result="can"/>
       </rsc_location>
   </constraints>
  </configuration>
  <status>
     <node_state id="node1" uname="node1" crmd="online" join="member" expected="member" timestamp="1086187789" in_ccm="true">
       <lrm>
 	<lrm_agents>
 	  <lrm_agent class="heartbeat" type="apache"/>
 	</lrm_agents>
         <lrm_resources/>
       </lrm>
     </node_state>
     <node_state id="node2" uname="node2" crmd="online" join="member" expected="member" timestamp="1086187789" in_ccm="true">
       <lrm>
 	<lrm_agents>
 	  <lrm_agent class="heartbeat" type="apache"/>
 	</lrm_agents>
         <lrm_resources>
-          <lrm_resource id="rsc1" last_op="start" op_state="started" op_code="0" target="node1"/>
+          <lrm_resource id="rsc1" last_op="start" rsc_state="started" op_status="0" rc_code="0" on_node="node2"/>
         </lrm_resources>
       </lrm>
     </node_state>
  </status>
 </cib>
diff --git a/crm/pengine/testcases/rsc_location3.exp b/crm/pengine/testcases/rsc_location3.exp
index 8e8ebf80f4..aa75f410d1 100644
--- a/crm/pengine/testcases/rsc_location3.exp
+++ b/crm/pengine/testcases/rsc_location3.exp
@@ -1,18 +1,18 @@
 <?xml version="1.0"?>
 <!DOCTYPE transition_graph SYSTEM "crm-1.0.dtd">
 <transition_graph>
   <actions id="0">
-    <rsc_op id="1" rsc_id="rsc1" on_node="node2" operation="stop" runnable="true" optional="true" discard="false" allow_fail="false">
+    <rsc_op id="1" rsc_id="rsc1" on_node="node2" on_node_uuid="node2" operation="stop" runnable="true" optional="true" discard="false" allow_fail="false">
       <resource id="rsc1" class="heartbeat" type="apache" priority="1.0"/>
       <args/>
     </rsc_op>
-    <rsc_op id="4" rsc_id="rsc2" on_node="node1" operation="start" runnable="true" optional="false" discard="false" allow_fail="false">
+    <rsc_op id="4" rsc_id="rsc2" on_node="node1" on_node_uuid="node1" operation="start" runnable="true" optional="false" discard="false" allow_fail="false">
       <resource id="rsc2" class="heartbeat" type="apache" priority="2.0"/>
       <args/>
     </rsc_op>
-    <rsc_op id="2" rsc_id="rsc1" on_node="node2" operation="start" runnable="true" optional="true" discard="false" allow_fail="false">
+    <rsc_op id="2" rsc_id="rsc1" on_node="node2" on_node_uuid="node2" operation="start" runnable="true" optional="true" discard="false" allow_fail="false">
       <resource id="rsc1" class="heartbeat" type="apache" priority="1.0"/>
       <args/>
     </rsc_op>
   </actions>
 </transition_graph>
diff --git a/crm/pengine/testcases/rsc_location3.xml b/crm/pengine/testcases/rsc_location3.xml
index b1903c721e..6704791e57 100644
--- a/crm/pengine/testcases/rsc_location3.xml
+++ b/crm/pengine/testcases/rsc_location3.xml
@@ -1,44 +1,44 @@
 <?xml version="1.0"?>
 <!DOCTYPE cib SYSTEM "crm-1.0.dtd">
 <!-- must not -->
 <cib>
  <configuration>
   <nodes>
     <node id="node1" uname="node1" type="member"/>
     <node id="node2" uname="node2" type="member"/>
   </nodes>
   <resources>
      <resource id="rsc1" class="heartbeat" type="apache" priority="1.0"/>
      <resource id="rsc2" class="heartbeat" type="apache" priority="2.0"/>
   </resources>
   <constraints>
       <rsc_to_rsc id="not_same_1" from="rsc1" to="rsc2" type="placement" strength="must_not"/>    
       <rsc_location id="run_rsc1" rsc="rsc1">
 	<rule id="can1" result="can"/>
       </rsc_location>
       <rsc_location id="run_rsc2" rsc="rsc2">
 	<rule id="can2" result="can"/>
       </rsc_location>
   </constraints>
  </configuration>
  <status>
     <node_state id="node1" uname="node1" crmd="online" join="member" expected="member" timestamp="1086187789" in_ccm="true">
       <lrm>
 	<lrm_agents>
 	  <lrm_agent class="heartbeat" type="apache"/>
 	</lrm_agents>
         <lrm_resources/>
       </lrm>
     </node_state>
     <node_state id="node2" uname="node2" crmd="online" join="member" expected="member" timestamp="1086187789" in_ccm="true">
       <lrm>
 	<lrm_agents>
 	  <lrm_agent class="heartbeat" type="apache"/>
 	</lrm_agents>
         <lrm_resources>
-          <lrm_resource id="rsc1" last_op="start" op_state="started" op_code="0" target="node1"/>
+          <lrm_resource id="rsc1" last_op="start" rsc_state="started" op_status="0" rc_code="0" on_node="node1"/>
         </lrm_resources>
       </lrm>
     </node_state>
  </status>
 </cib>
diff --git a/crm/pengine/testcases/rsc_location4.exp b/crm/pengine/testcases/rsc_location4.exp
index 09fcd3f019..0dffe0b7ab 100644
--- a/crm/pengine/testcases/rsc_location4.exp
+++ b/crm/pengine/testcases/rsc_location4.exp
@@ -1,18 +1,18 @@
 <?xml version="1.0"?>
 <!DOCTYPE transition_graph SYSTEM "crm-1.0.dtd">
 <transition_graph>
   <actions id="0">
-    <rsc_op id="1" rsc_id="rsc1" on_node="node2" operation="stop" runnable="true" optional="false" discard="false" allow_fail="false">
+    <rsc_op id="1" rsc_id="rsc1" on_node="node2" on_node_uuid="node2" operation="stop" runnable="true" optional="false" discard="false" allow_fail="false">
       <resource id="rsc1" class="heartbeat" type="apache" priority="1.0"/>
       <args/>
     </rsc_op>
-    <rsc_op id="4" rsc_id="rsc2" on_node="node2" operation="start" runnable="true" optional="false" discard="false" allow_fail="false">
+    <rsc_op id="4" rsc_id="rsc2" on_node="node2" on_node_uuid="node2" operation="start" runnable="true" optional="false" discard="false" allow_fail="false">
       <resource id="rsc2" class="heartbeat" type="apache" priority="2.0"/>
       <args/>
     </rsc_op>
-    <rsc_op id="2" rsc_id="rsc1" on_node="node1" operation="start" runnable="true" optional="false" discard="false" allow_fail="false">
+    <rsc_op id="2" rsc_id="rsc1" on_node="node1" on_node_uuid="node1" operation="start" runnable="true" optional="false" discard="false" allow_fail="false">
       <resource id="rsc1" class="heartbeat" type="apache" priority="1.0"/>
       <args/>
     </rsc_op>
   </actions>
 </transition_graph>
diff --git a/crm/pengine/testcases/rsc_location4.xml b/crm/pengine/testcases/rsc_location4.xml
index 0e82487de6..d91127755e 100644
--- a/crm/pengine/testcases/rsc_location4.xml
+++ b/crm/pengine/testcases/rsc_location4.xml
@@ -1,47 +1,47 @@
 <?xml version="1.0"?>
 <!DOCTYPE cib SYSTEM "crm-1.0.dtd">
 <!-- must not -->
 <cib>
  <configuration>
   <nodes>
     <node id="node1" uname="node1" type="member"/>
     <node id="node2" uname="node2" type="member"/>
   </nodes>
   <resources>
      <resource id="rsc1" class="heartbeat" type="apache" priority="1.0"/>
      <resource id="rsc2" class="heartbeat" type="apache" priority="2.0"/>
   </resources>
   <constraints>
       <rsc_to_rsc id="not_same_1" from="rsc1" to="rsc2" type="placement" strength="must_not"/>    
       <rsc_location id="run_rsc1" rsc="rsc1">
 	<rule id="can1" result="can"/>
       </rsc_location>
       <rsc_location id="run_rsc2" rsc="rsc2">
 	<rule id="can2" result="can"/>
 	<rule id="score1" score="10">
 	  <expression id="exp1" attribute="rsc1" operation="running"/>
 	</rule>
       </rsc_location>
   </constraints>
  </configuration>
  <status>
     <node_state id="node1" uname="node1" crmd="online" join="member" expected="member" timestamp="1086187789" in_ccm="true">
       <lrm>
 	<lrm_agents>
 	  <lrm_agent class="heartbeat" type="apache"/>
 	</lrm_agents>
         <lrm_resources/>
       </lrm>
     </node_state>
     <node_state id="node2" uname="node2" crmd="online" join="member" expected="member" timestamp="1086187789" in_ccm="true">
       <lrm>
 	<lrm_agents>
 	  <lrm_agent class="heartbeat" type="apache"/>
 	</lrm_agents>
         <lrm_resources>
-          <lrm_resource id="rsc1" last_op="start" op_state="started" op_code="0" target="node1"/>
+          <lrm_resource id="rsc1" last_op="start" rsc_state="started" op_status="0" rc_code="0" on_node="node1"/>
         </lrm_resources>
       </lrm>
     </node_state>
  </status>
 </cib>
diff --git a/crm/pengine/testcases/rsc_location5.exp b/crm/pengine/testcases/rsc_location5.exp
index f91a662305..3f4fc1194e 100644
--- a/crm/pengine/testcases/rsc_location5.exp
+++ b/crm/pengine/testcases/rsc_location5.exp
@@ -1,14 +1,14 @@
 <?xml version="1.0"?>
 <!DOCTYPE transition_graph SYSTEM "crm-1.0.dtd">
 <transition_graph>
   <actions id="0">
-    <rsc_op id="1" rsc_id="rsc1" on_node="node1" operation="stop" runnable="true" optional="false" discard="false" allow_fail="false">
+    <rsc_op id="1" rsc_id="rsc1" on_node="node1" on_node_uuid="node1" operation="stop" runnable="true" optional="false" discard="false" allow_fail="false">
       <resource id="rsc1" class="heartbeat" type="apache" priority="1.0"/>
       <args/>
     </rsc_op>
-    <rsc_op id="2" rsc_id="rsc1" on_node="node2" operation="start" runnable="true" optional="false" discard="false" allow_fail="false">
+    <rsc_op id="2" rsc_id="rsc1" on_node="node2" on_node_uuid="node2" operation="start" runnable="true" optional="false" discard="false" allow_fail="false">
       <resource id="rsc1" class="heartbeat" type="apache" priority="1.0"/>
       <args/>
     </rsc_op>
   </actions>
 </transition_graph>
diff --git a/crm/pengine/testcases/rsc_location5.xml b/crm/pengine/testcases/rsc_location5.xml
index b3338df1a2..088cf10e9f 100644
--- a/crm/pengine/testcases/rsc_location5.xml
+++ b/crm/pengine/testcases/rsc_location5.xml
@@ -1,42 +1,42 @@
 <?xml version="1.0"?>
 <!DOCTYPE cib SYSTEM "crm-1.0.dtd">
 <!-- must not -->
 <cib>
  <configuration>
   <nodes>
     <node id="node1" uname="node1" type="member"/>
     <node id="node2" uname="node2" type="member"/>
   </nodes>
   <resources>
      <resource id="rsc1" class="heartbeat" type="apache" priority="1.0"/>
   </resources>
   <constraints>
       <rsc_location id="run_rsc1" rsc="rsc1">
 	<rule id="can1" result="can"/>
 	<rule id="score1" score="1000">
 	  <expression id="exp1" attribute="rsc1" operation="not_running"/>
 	</rule>
       </rsc_location>
   </constraints>
  </configuration>
  <status>
     <node_state id="node1" uname="node1" crmd="online" join="member" expected="member" timestamp="1086187789" in_ccm="true">
       <lrm>
 	<lrm_agents>
 	  <lrm_agent class="heartbeat" type="apache"/>
 	</lrm_agents>
         <lrm_resources>
-          <lrm_resource id="rsc1" last_op="start" op_state="started" op_code="0" target="node1"/>
+          <lrm_resource id="rsc1" last_op="start" rsc_state="started" op_status="0" rc_code="0" on_node="node1"/>
         </lrm_resources>
       </lrm>
     </node_state>
     <node_state id="node2" uname="node2" crmd="online" join="member" expected="member" timestamp="1086187789" in_ccm="true">
       <lrm>
 	<lrm_agents>
 	  <lrm_agent class="heartbeat" type="apache"/>
 	</lrm_agents>
         <lrm_resources/>
       </lrm>
     </node_state>
  </status>
 </cib>
diff --git a/crm/pengine/testcases/rsc_node1.exp b/crm/pengine/testcases/rsc_node1.exp
index de5a141253..9ad190428a 100644
--- a/crm/pengine/testcases/rsc_node1.exp
+++ b/crm/pengine/testcases/rsc_node1.exp
@@ -1,12 +1,12 @@
 <?xml version="1.0"?>
 <!DOCTYPE transition_graph SYSTEM "crm-1.0.dtd">
 <transition_graph>
-<actions id="0">
-<rsc_op id="4" rsc_id="rsc2" on_node="node1" operation="start" runnable="true" optional="false" discard="false" allow_fail="false">
-<resource id="rsc2" class="heartbeat" type="apache" priority="2.0"/>
-</rsc_op>
-<rsc_op id="2" rsc_id="rsc1" on_node="node2" operation="start" runnable="true" optional="false" discard="false" allow_fail="false">
-<resource id="rsc1" class="heartbeat" type="apache" priority="1.0"/>
-</rsc_op>
-</actions>
+  <actions id="0">
+    <rsc_op id="4" rsc_id="rsc2" on_node="node1" operation="start" runnable="true" optional="false" discard="false" allow_fail="false">
+      <resource id="rsc2" class="heartbeat" type="apache" priority="2.0"/>
+    </rsc_op>
+    <rsc_op id="2" rsc_id="rsc1" on_node="node2" operation="start" runnable="true" optional="false" discard="false" allow_fail="false">
+      <resource id="rsc1" class="heartbeat" type="apache" priority="1.0"/>
+    </rsc_op>
+  </actions>
 </transition_graph>
diff --git a/crm/pengine/testcases/rsc_node2.exp b/crm/pengine/testcases/rsc_node2.exp
index 860c14e05a..d8df05d162 100644
--- a/crm/pengine/testcases/rsc_node2.exp
+++ b/crm/pengine/testcases/rsc_node2.exp
@@ -1,12 +1,12 @@
 <?xml version="1.0"?>
 <!DOCTYPE transition_graph SYSTEM "crm-1.0.dtd">
 <transition_graph>
-<actions id="0">
-<rsc_op id="4" rsc_id="rsc2" on_node="node2" operation="start" runnable="true" optional="false" discard="false" allow_fail="false">
-<resource id="rsc2" class="heartbeat" type="apache" priority="2.0"/>
-</rsc_op>
-<rsc_op id="2" rsc_id="rsc1" on_node="node1" operation="start" runnable="true" optional="false" discard="false" allow_fail="false">
-<resource id="rsc1" class="heartbeat" type="apache" priority="1.0"/>
-</rsc_op>
-</actions>
+  <actions id="0">
+    <rsc_op id="4" rsc_id="rsc2" on_node="node2" operation="start" runnable="true" optional="false" discard="false" allow_fail="false">
+      <resource id="rsc2" class="heartbeat" type="apache" priority="2.0"/>
+    </rsc_op>
+    <rsc_op id="2" rsc_id="rsc1" on_node="node1" operation="start" runnable="true" optional="false" discard="false" allow_fail="false">
+      <resource id="rsc1" class="heartbeat" type="apache" priority="1.0"/>
+    </rsc_op>
+  </actions>
 </transition_graph>
diff --git a/crm/pengine/testcases/rsc_rsc1.exp b/crm/pengine/testcases/rsc_rsc1.exp
index 5f085c86b1..424bb873c0 100644
--- a/crm/pengine/testcases/rsc_rsc1.exp
+++ b/crm/pengine/testcases/rsc_rsc1.exp
@@ -1,14 +1,14 @@
 <?xml version="1.0"?>
 <!DOCTYPE transition_graph SYSTEM "crm-1.0.dtd">
 <transition_graph>
   <actions id="0">
-    <rsc_op id="4" rsc_id="rsc2" on_node="node1" operation="start" runnable="true" optional="false" discard="false" allow_fail="false">
+    <rsc_op id="4" rsc_id="rsc2" on_node="node1" on_node_uuid="node1" operation="start" runnable="true" optional="false" discard="false" allow_fail="false">
       <resource id="rsc2" class="heartbeat" type="apache" priority="2.0"/>
       <args/>
     </rsc_op>
-    <rsc_op id="2" rsc_id="rsc1" on_node="node2" operation="start" runnable="true" optional="false" discard="false" allow_fail="false">
+    <rsc_op id="2" rsc_id="rsc1" on_node="node2" on_node_uuid="node2" operation="start" runnable="true" optional="false" discard="false" allow_fail="false">
       <resource id="rsc1" class="heartbeat" type="apache" priority="1.0"/>
       <args/>
     </rsc_op>
   </actions>
 </transition_graph>
diff --git a/crm/pengine/testcases/rsc_rsc2.exp b/crm/pengine/testcases/rsc_rsc2.exp
index 5f085c86b1..424bb873c0 100644
--- a/crm/pengine/testcases/rsc_rsc2.exp
+++ b/crm/pengine/testcases/rsc_rsc2.exp
@@ -1,14 +1,14 @@
 <?xml version="1.0"?>
 <!DOCTYPE transition_graph SYSTEM "crm-1.0.dtd">
 <transition_graph>
   <actions id="0">
-    <rsc_op id="4" rsc_id="rsc2" on_node="node1" operation="start" runnable="true" optional="false" discard="false" allow_fail="false">
+    <rsc_op id="4" rsc_id="rsc2" on_node="node1" on_node_uuid="node1" operation="start" runnable="true" optional="false" discard="false" allow_fail="false">
       <resource id="rsc2" class="heartbeat" type="apache" priority="2.0"/>
       <args/>
     </rsc_op>
-    <rsc_op id="2" rsc_id="rsc1" on_node="node2" operation="start" runnable="true" optional="false" discard="false" allow_fail="false">
+    <rsc_op id="2" rsc_id="rsc1" on_node="node2" on_node_uuid="node2" operation="start" runnable="true" optional="false" discard="false" allow_fail="false">
       <resource id="rsc1" class="heartbeat" type="apache" priority="1.0"/>
       <args/>
     </rsc_op>
   </actions>
 </transition_graph>
diff --git a/crm/pengine/testcases/rsc_rsc3.exp b/crm/pengine/testcases/rsc_rsc3.exp
index 5e2208fe79..9f98767f4c 100644
--- a/crm/pengine/testcases/rsc_rsc3.exp
+++ b/crm/pengine/testcases/rsc_rsc3.exp
@@ -1,14 +1,14 @@
 <?xml version="1.0"?>
 <!DOCTYPE transition_graph SYSTEM "crm-1.0.dtd">
 <transition_graph>
   <actions id="0">
-    <rsc_op id="4" rsc_id="rsc2" on_node="node1" operation="start" runnable="true" optional="false" discard="false" allow_fail="false">
+    <rsc_op id="4" rsc_id="rsc2" on_node="node1" on_node_uuid="node1" operation="start" runnable="true" optional="false" discard="false" allow_fail="false">
       <resource id="rsc2" class="heartbeat" type="apache" priority="2.0"/>
       <args/>
     </rsc_op>
-    <rsc_op id="2" rsc_id="rsc1" on_node="node1" operation="start" runnable="true" optional="false" discard="false" allow_fail="false">
+    <rsc_op id="2" rsc_id="rsc1" on_node="node1" on_node_uuid="node1" operation="start" runnable="true" optional="false" discard="false" allow_fail="false">
       <resource id="rsc1" class="heartbeat" type="apache" priority="1.0"/>
       <args/>
     </rsc_op>
   </actions>
 </transition_graph>
diff --git a/crm/pengine/testcases/rsc_rsc4.exp b/crm/pengine/testcases/rsc_rsc4.exp
index 5e2208fe79..9f98767f4c 100644
--- a/crm/pengine/testcases/rsc_rsc4.exp
+++ b/crm/pengine/testcases/rsc_rsc4.exp
@@ -1,14 +1,14 @@
 <?xml version="1.0"?>
 <!DOCTYPE transition_graph SYSTEM "crm-1.0.dtd">
 <transition_graph>
   <actions id="0">
-    <rsc_op id="4" rsc_id="rsc2" on_node="node1" operation="start" runnable="true" optional="false" discard="false" allow_fail="false">
+    <rsc_op id="4" rsc_id="rsc2" on_node="node1" on_node_uuid="node1" operation="start" runnable="true" optional="false" discard="false" allow_fail="false">
       <resource id="rsc2" class="heartbeat" type="apache" priority="2.0"/>
       <args/>
     </rsc_op>
-    <rsc_op id="2" rsc_id="rsc1" on_node="node1" operation="start" runnable="true" optional="false" discard="false" allow_fail="false">
+    <rsc_op id="2" rsc_id="rsc1" on_node="node1" on_node_uuid="node1" operation="start" runnable="true" optional="false" discard="false" allow_fail="false">
       <resource id="rsc1" class="heartbeat" type="apache" priority="1.0"/>
       <args/>
     </rsc_op>
   </actions>
 </transition_graph>
diff --git a/crm/pengine/testcases/rsc_rsc5.exp b/crm/pengine/testcases/rsc_rsc5.exp
index 46996e8622..efc1df1f42 100644
--- a/crm/pengine/testcases/rsc_rsc5.exp
+++ b/crm/pengine/testcases/rsc_rsc5.exp
@@ -1,14 +1,14 @@
 <?xml version="1.0"?>
 <!DOCTYPE transition_graph SYSTEM "crm-1.0.dtd">
 <transition_graph>
   <actions id="0">
-    <rsc_op id="6" rsc_id="rsc3" on_node="node1" operation="start" runnable="true" optional="false" discard="false" allow_fail="false">
+    <rsc_op id="6" rsc_id="rsc3" on_node="node1" on_node_uuid="node1" operation="start" runnable="true" optional="false" discard="false" allow_fail="false">
       <resource id="rsc3" class="heartbeat" type="apache" priority="3.0"/>
       <args/>
     </rsc_op>
-    <rsc_op id="4" rsc_id="rsc2" on_node="node2" operation="start" runnable="true" optional="false" discard="false" allow_fail="false">
+    <rsc_op id="4" rsc_id="rsc2" on_node="node2" on_node_uuid="node2" operation="start" runnable="true" optional="false" discard="false" allow_fail="false">
       <resource id="rsc2" class="heartbeat" type="apache" priority="2.0"/>
       <args/>
     </rsc_op>
   </actions>
 </transition_graph>
diff --git a/crm/pengine/testcases/rsc_rsc6.exp b/crm/pengine/testcases/rsc_rsc6.exp
index 3d88d21c8a..b2f0b5b1a9 100644
--- a/crm/pengine/testcases/rsc_rsc6.exp
+++ b/crm/pengine/testcases/rsc_rsc6.exp
@@ -1,18 +1,18 @@
 <?xml version="1.0"?>
 <!DOCTYPE transition_graph SYSTEM "crm-1.0.dtd">
 <transition_graph>
   <actions id="0">
-    <rsc_op id="6" rsc_id="rsc3" on_node="node1" operation="start" runnable="true" optional="false" discard="false" allow_fail="false">
+    <rsc_op id="6" rsc_id="rsc3" on_node="node1" on_node_uuid="node1" operation="start" runnable="true" optional="false" discard="false" allow_fail="false">
       <resource id="rsc3" class="heartbeat" type="apache" priority="3.0"/>
       <args/>
     </rsc_op>
-    <rsc_op id="4" rsc_id="rsc2" on_node="node2" operation="start" runnable="true" optional="false" discard="false" allow_fail="false">
+    <rsc_op id="4" rsc_id="rsc2" on_node="node2" on_node_uuid="node2" operation="start" runnable="true" optional="false" discard="false" allow_fail="false">
       <resource id="rsc2" class="heartbeat" type="apache" priority="2.0"/>
       <args/>
     </rsc_op>
-    <rsc_op id="2" rsc_id="rsc1" on_node="node1" operation="start" runnable="true" optional="false" discard="false" allow_fail="false">
+    <rsc_op id="2" rsc_id="rsc1" on_node="node1" on_node_uuid="node1" operation="start" runnable="true" optional="false" discard="false" allow_fail="false">
       <resource id="rsc1" class="heartbeat" type="apache" priority="1.0"/>
       <args/>
     </rsc_op>
   </actions>
 </transition_graph>
diff --git a/crm/pengine/testcases/rsc_rsc7.exp b/crm/pengine/testcases/rsc_rsc7.exp
index 10b0c554c6..8419e34b41 100644
--- a/crm/pengine/testcases/rsc_rsc7.exp
+++ b/crm/pengine/testcases/rsc_rsc7.exp
@@ -1,18 +1,18 @@
 <?xml version="1.0"?>
 <!DOCTYPE transition_graph SYSTEM "crm-1.0.dtd">
 <transition_graph>
   <actions id="0">
-    <rsc_op id="6" rsc_id="rsc3" on_node="node1" operation="start" runnable="true" optional="false" discard="false" allow_fail="false">
+    <rsc_op id="6" rsc_id="rsc3" on_node="node1" on_node_uuid="node1" operation="start" runnable="true" optional="false" discard="false" allow_fail="false">
       <resource id="rsc3" class="heartbeat" type="apache" priority="3.0"/>
       <args/>
     </rsc_op>
-    <rsc_op id="4" rsc_id="rsc2" on_node="node1" operation="start" runnable="true" optional="false" discard="false" allow_fail="false">
+    <rsc_op id="4" rsc_id="rsc2" on_node="node1" on_node_uuid="node1" operation="start" runnable="true" optional="false" discard="false" allow_fail="false">
       <resource id="rsc2" class="heartbeat" type="apache" priority="2.0"/>
       <args/>
     </rsc_op>
-    <rsc_op id="2" rsc_id="rsc1" on_node="node1" operation="start" runnable="true" optional="false" discard="false" allow_fail="false">
+    <rsc_op id="2" rsc_id="rsc1" on_node="node1" on_node_uuid="node1" operation="start" runnable="true" optional="false" discard="false" allow_fail="false">
       <resource id="rsc1" class="heartbeat" type="apache" priority="1.0"/>
       <args/>
     </rsc_op>
   </actions>
 </transition_graph>
diff --git a/crm/pengine/testcases/rsc_rsc8.exp b/crm/pengine/testcases/rsc_rsc8.exp
index 10b0c554c6..8419e34b41 100644
--- a/crm/pengine/testcases/rsc_rsc8.exp
+++ b/crm/pengine/testcases/rsc_rsc8.exp
@@ -1,18 +1,18 @@
 <?xml version="1.0"?>
 <!DOCTYPE transition_graph SYSTEM "crm-1.0.dtd">
 <transition_graph>
   <actions id="0">
-    <rsc_op id="6" rsc_id="rsc3" on_node="node1" operation="start" runnable="true" optional="false" discard="false" allow_fail="false">
+    <rsc_op id="6" rsc_id="rsc3" on_node="node1" on_node_uuid="node1" operation="start" runnable="true" optional="false" discard="false" allow_fail="false">
       <resource id="rsc3" class="heartbeat" type="apache" priority="3.0"/>
       <args/>
     </rsc_op>
-    <rsc_op id="4" rsc_id="rsc2" on_node="node1" operation="start" runnable="true" optional="false" discard="false" allow_fail="false">
+    <rsc_op id="4" rsc_id="rsc2" on_node="node1" on_node_uuid="node1" operation="start" runnable="true" optional="false" discard="false" allow_fail="false">
       <resource id="rsc2" class="heartbeat" type="apache" priority="2.0"/>
       <args/>
     </rsc_op>
-    <rsc_op id="2" rsc_id="rsc1" on_node="node1" operation="start" runnable="true" optional="false" discard="false" allow_fail="false">
+    <rsc_op id="2" rsc_id="rsc1" on_node="node1" on_node_uuid="node1" operation="start" runnable="true" optional="false" discard="false" allow_fail="false">
       <resource id="rsc1" class="heartbeat" type="apache" priority="1.0"/>
       <args/>
     </rsc_op>
   </actions>
 </transition_graph>
diff --git a/crm/pengine/testcases/rsc_rsc9.exp b/crm/pengine/testcases/rsc_rsc9.exp
index 65a6002fa1..d3e985ef9b 100644
--- a/crm/pengine/testcases/rsc_rsc9.exp
+++ b/crm/pengine/testcases/rsc_rsc9.exp
@@ -1,18 +1,18 @@
 <?xml version="1.0"?>
 <!DOCTYPE transition_graph SYSTEM "crm-1.0.dtd">
 <transition_graph>
   <actions id="0">
-    <rsc_op id="6" rsc_id="rsc3" on_node="node1" operation="start" runnable="true" optional="false" discard="false" allow_fail="false">
+    <rsc_op id="6" rsc_id="rsc3" on_node="node1" on_node_uuid="node1" operation="start" runnable="true" optional="false" discard="false" allow_fail="false">
       <resource id="rsc3" class="heartbeat" type="apache" priority="3.0"/>
       <args/>
     </rsc_op>
-    <rsc_op id="4" rsc_id="rsc2" on_node="node2" operation="start" runnable="true" optional="false" discard="false" allow_fail="false">
+    <rsc_op id="4" rsc_id="rsc2" on_node="node2" on_node_uuid="node2" operation="start" runnable="true" optional="false" discard="false" allow_fail="false">
       <resource id="rsc2" class="heartbeat" type="apache" priority="2.0"/>
       <args/>
     </rsc_op>
-    <rsc_op id="2" rsc_id="rsc1" on_node="node2" operation="start" runnable="true" optional="false" discard="false" allow_fail="false">
+    <rsc_op id="2" rsc_id="rsc1" on_node="node2" on_node_uuid="node2" operation="start" runnable="true" optional="false" discard="false" allow_fail="false">
       <resource id="rsc1" class="heartbeat" type="apache" priority="1.0"/>
       <args/>
     </rsc_op>
   </actions>
 </transition_graph>
diff --git a/crm/pengine/testcases/simple11.exp b/crm/pengine/testcases/simple11.exp
index e59e4a617d..1c4376ffd3 100644
--- a/crm/pengine/testcases/simple11.exp
+++ b/crm/pengine/testcases/simple11.exp
@@ -1,16 +1,16 @@
 <?xml version="1.0"?>
 <!DOCTYPE transition_graph SYSTEM "crm-1.0.dtd">
 <transition_graph>
   <actions id="0">
-    <rsc_op id="2" rsc_id="rsc1" on_node="node1" operation="start" runnable="true" optional="false" discard="false" allow_fail="false">
+    <rsc_op id="2" rsc_id="rsc1" on_node="node1" on_node_uuid="node1" operation="start" runnable="true" optional="false" discard="false" allow_fail="false">
       <resource id="rsc1" class="heartbeat" type="apache" priority="3.0"/>
       <args/>
     </rsc_op>
   </actions>
   <actions id="1">
-    <rsc_op id="4" rsc_id="rsc2" on_node="node1" operation="start" runnable="true" optional="false" discard="false" allow_fail="false">
+    <rsc_op id="4" rsc_id="rsc2" on_node="node1" on_node_uuid="node1" operation="start" runnable="true" optional="false" discard="false" allow_fail="false">
       <resource id="rsc2" class="heartbeat" type="apache" priority="2.0"/>
       <args/>
     </rsc_op>
   </actions>
 </transition_graph>
diff --git a/crm/pengine/testcases/simple12.exp b/crm/pengine/testcases/simple12.exp
index c8a84c17d1..a861993314 100644
--- a/crm/pengine/testcases/simple12.exp
+++ b/crm/pengine/testcases/simple12.exp
@@ -1,16 +1,16 @@
 <?xml version="1.0"?>
 <!DOCTYPE transition_graph SYSTEM "crm-1.0.dtd">
 <transition_graph>
   <actions id="0">
-    <rsc_op id="4" rsc_id="rsc2" on_node="node1" operation="start" runnable="true" optional="false" discard="false" allow_fail="false">
+    <rsc_op id="4" rsc_id="rsc2" on_node="node1" on_node_uuid="node1" operation="start" runnable="true" optional="false" discard="false" allow_fail="false">
       <resource id="rsc2" class="heartbeat" type="apache" priority="2.0"/>
       <args/>
     </rsc_op>
   </actions>
   <actions id="1">
-    <rsc_op id="2" rsc_id="rsc1" on_node="node2" operation="start" runnable="true" optional="false" discard="false" allow_fail="false">
+    <rsc_op id="2" rsc_id="rsc1" on_node="node2" on_node_uuid="node2" operation="start" runnable="true" optional="false" discard="false" allow_fail="false">
       <resource id="rsc1" class="heartbeat" type="apache" priority="2.0"/>
       <args/>
     </rsc_op>
   </actions>
 </transition_graph>
diff --git a/crm/pengine/testcases/simple2.exp b/crm/pengine/testcases/simple2.exp
index 61b2fed979..3660365d35 100644
--- a/crm/pengine/testcases/simple2.exp
+++ b/crm/pengine/testcases/simple2.exp
@@ -1,10 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE transition_graph SYSTEM "crm-1.0.dtd">
 <transition_graph>
   <actions id="0">
-    <rsc_op id="2" rsc_id="rsc1" on_node="node1" operation="start" runnable="true" optional="false" discard="false" allow_fail="false">
+    <rsc_op id="2" rsc_id="rsc1" on_node="node1" on_node_uuid="uuid1" operation="start" runnable="true" optional="false" discard="false" allow_fail="false">
       <resource id="rsc1" class="heartbeat" type="apache" priority="1.0"/>
       <args/>
     </rsc_op>
   </actions>
 </transition_graph>
diff --git a/crm/pengine/testcases/simple3.exp b/crm/pengine/testcases/simple3.exp
index 61b2fed979..dc7a46fb49 100644
--- a/crm/pengine/testcases/simple3.exp
+++ b/crm/pengine/testcases/simple3.exp
@@ -1,10 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE transition_graph SYSTEM "crm-1.0.dtd">
 <transition_graph>
   <actions id="0">
-    <rsc_op id="2" rsc_id="rsc1" on_node="node1" operation="start" runnable="true" optional="false" discard="false" allow_fail="false">
+    <rsc_op id="2" rsc_id="rsc1" on_node="node1" on_node_uuid="node1" operation="start" runnable="true" optional="false" discard="false" allow_fail="false">
       <resource id="rsc1" class="heartbeat" type="apache" priority="1.0"/>
       <args/>
     </rsc_op>
   </actions>
 </transition_graph>
diff --git a/crm/pengine/testcases/simple3.xml b/crm/pengine/testcases/simple3.xml
index 65266d8722..11c37b0756 100644
--- a/crm/pengine/testcases/simple3.xml
+++ b/crm/pengine/testcases/simple3.xml
@@ -1,29 +1,29 @@
 <?xml version="1.0"?>
 <!DOCTYPE cib SYSTEM "crm-1.0.dtd">
 <cib>
  <configuration>
   <nodes>
     <node id="node1" uname="node1" type="member"/>
   </nodes>
   <resources>
      <resource id="rsc1" class="heartbeat" type="apache" priority="1.0"/>
   </resources>
   <constraints>
       <rsc_location id="run_rsc1" rsc="rsc1">
 	<rule id="can1" result="can"/>
       </rsc_location>
   </constraints>
  </configuration>
  <status>
     <node_state id="node1" uname="node1" crmd="online" join="member" expected="member" timestamp="1086187789" in_ccm="true">
       <lrm>
 	<lrm_agents>
 	  <lrm_agent class="heartbeat" type="apache"/>
 	</lrm_agents>
         <lrm_resources>
-          <lrm_resource id="rsc1" last_op="stop" op_state="stopped" op_code="0" target="hadev"/>
+          <lrm_resource id="rsc1" last_op="stop" rsc_state="stopped" op_status="0" rc_code="0" on_node="hadev"/>
         </lrm_resources>
       </lrm>
     </node_state>
  </status>
 </cib>
diff --git a/crm/pengine/testcases/simple4.xml b/crm/pengine/testcases/simple4.xml
index 02c6889dca..6565361272 100644
--- a/crm/pengine/testcases/simple4.xml
+++ b/crm/pengine/testcases/simple4.xml
@@ -1,29 +1,29 @@
 <?xml version="1.0"?>
 <!DOCTYPE cib SYSTEM "crm-1.0.dtd">
 <cib>
  <configuration>
   <nodes>
     <node id="node1" uname="node1" type="member"/>
   </nodes>
   <resources>
      <resource id="rsc1" class="heartbeat" type="apache" priority="1.0"/>
   </resources>
   <constraints>
       <rsc_location id="run_rsc1" rsc="rsc1">
 	<rule id="can1" result="can"/>
       </rsc_location>
   </constraints>
  </configuration>
  <status>
     <node_state id="node1" uname="node1" crmd="online" join="member" expected="member" timestamp="1086187789" in_ccm="true">
       <lrm>
 	<lrm_agents>
 	  <lrm_agent class="heartbeat" type="apache"/>
 	</lrm_agents>
         <lrm_resources>
-          <lrm_resource id="rsc1" last_op="start" op_state="failed" op_code="4" target="hadev"/>
+          <lrm_resource id="rsc1" last_op="start" rsc_state="failed" op_status="4" rc_code="4" on_node="hadev"/>
         </lrm_resources>
       </lrm>
     </node_state>
  </status>
 </cib>
diff --git a/crm/pengine/testcases/simple5.xml b/crm/pengine/testcases/simple5.xml
index acdcc2f20b..67cb56631b 100644
--- a/crm/pengine/testcases/simple5.xml
+++ b/crm/pengine/testcases/simple5.xml
@@ -1,30 +1,30 @@
 <?xml version="1.0"?>
 <!DOCTYPE cib SYSTEM "crm-1.0.dtd">
 <!-- shutdown then stontih -->
 <cib>
  <configuration>
   <nodes>
     <node id="node1" uname="node1" type="member"/>
   </nodes>
   <resources>
      <resource id="rsc1" class="heartbeat" type="apache" priority="1.0"/>
   </resources>
   <constraints>
       <rsc_location id="run_rsc1" rsc="rsc1">
 	<rule id="can1" result="can"/>
       </rsc_location>
   </constraints>
  </configuration>
  <status>
     <node_state id="node1" uname="node1" crmd="online" join="member" expected="member" timestamp="1086187789" in_ccm="true">
       <lrm>
 	<lrm_agents>
 	  <lrm_agent class="heartbeat" type="apache"/>
 	</lrm_agents>
         <lrm_resources>
-          <lrm_resource id="rsc1" last_op="stop" op_state="failed" op_code="4" target="hadev"/>
+          <lrm_resource id="rsc1" last_op="stop" rsc_state="failed" op_status="4" on_node="hadev"/>
         </lrm_resources>
       </lrm>
     </node_state>
  </status>
 </cib>
diff --git a/crm/pengine/testcases/simple6.exp b/crm/pengine/testcases/simple6.exp
index 7cf032878b..13114ecfa4 100644
--- a/crm/pengine/testcases/simple6.exp
+++ b/crm/pengine/testcases/simple6.exp
@@ -1,14 +1,14 @@
 <?xml version="1.0"?>
 <!DOCTYPE transition_graph SYSTEM "crm-1.0.dtd">
 <transition_graph>
   <actions id="0">
-    <rsc_op id="1" rsc_id="rsc1" on_node="node1" operation="stop" runnable="true" optional="false" discard="false" allow_fail="false">
+    <rsc_op id="1" rsc_id="rsc1" on_node="node1" on_node_uuid="node1" operation="stop" runnable="true" optional="false" discard="false" allow_fail="false">
       <resource id="rsc1" class="heartbeat" type="apache" priority="1.0"/>
       <args/>
     </rsc_op>
-    <rsc_op id="4" rsc_id="rsc2" on_node="node1" operation="start" runnable="true" optional="false" discard="false" allow_fail="false">
+    <rsc_op id="4" rsc_id="rsc2" on_node="node1" on_node_uuid="node1" operation="start" runnable="true" optional="false" discard="false" allow_fail="false">
       <resource id="rsc2" class="heartbeat" type="apache" priority="2.0"/>
       <args/>
     </rsc_op>
   </actions>
 </transition_graph>
diff --git a/crm/pengine/testcases/simple6.xml b/crm/pengine/testcases/simple6.xml
index 98b43b8e68..0193d89142 100644
--- a/crm/pengine/testcases/simple6.xml
+++ b/crm/pengine/testcases/simple6.xml
@@ -1,35 +1,35 @@
 <?xml version="1.0"?>
 <!DOCTYPE cib SYSTEM "crm-1.0.dtd">
 <!-- stop rsc1 start rsc2 -->
 <cib>
  <configuration>
   <nodes>
     <node id="node1" uname="node1" type="member"/>
   </nodes>
   <resources>
      <resource id="rsc1" class="heartbeat" type="apache" priority="1.0"/>
      <resource id="rsc2" class="heartbeat" type="apache" priority="2.0"/>
   </resources>
   <constraints>
       <rsc_to_rsc id="not_same_1" from="rsc1" to="rsc2" type="placement" strength="must_not"/>    
       <rsc_location id="run_rsc1" rsc="rsc1">
 	<rule id="can1" result="can"/>
       </rsc_location>
       <rsc_location id="run_rsc2" rsc="rsc2">
 	<rule id="can1" result="can"/>
       </rsc_location>
   </constraints>
  </configuration>
  <status>
     <node_state id="node1" uname="node1" crmd="online" join="member" expected="member" timestamp="1086187789" in_ccm="true">
       <lrm>
 	<lrm_agents>
 	  <lrm_agent class="heartbeat" type="apache"/>
 	</lrm_agents>
         <lrm_resources>
-          <lrm_resource id="rsc1" last_op="start" op_state="started" op_code="0" target="hadev"/>
+          <lrm_resource id="rsc1" last_op="start" rsc_state="started" op_status="0" rc_code="0" on_node="hadev"/>
         </lrm_resources>
       </lrm>
     </node_state>
  </status>
 </cib>
diff --git a/crm/pengine/testcases/simple7.exp b/crm/pengine/testcases/simple7.exp
index 0efdd957ce..5cba597bdb 100644
--- a/crm/pengine/testcases/simple7.exp
+++ b/crm/pengine/testcases/simple7.exp
@@ -1,13 +1,13 @@
 <?xml version="1.0"?>
 <!DOCTYPE transition_graph SYSTEM "crm-1.0.dtd">
 <transition_graph>
   <actions id="0">
-    <rsc_op id="1" rsc_id="rsc1" on_node="node1" operation="stop" runnable="true" optional="false" discard="false" allow_fail="false">
+    <rsc_op id="1" rsc_id="rsc1" on_node="node1" on_node_uuid="node1" operation="stop" runnable="true" optional="false" discard="false" allow_fail="false">
       <resource id="rsc1" class="heartbeat" type="apache" priority="1.0"/>
       <args/>
     </rsc_op>
-    <crm_event id="3" on_node="node1" operation="shutdown_crm" runnable="true" optional="false" discard="false" allow_fail="false">
+    <crm_event id="3" on_node="node1" on_node_uuid="node1" operation="shutdown_crm" runnable="true" optional="false" discard="false" allow_fail="false">
       <args/>
     </crm_event>
   </actions>
 </transition_graph>
diff --git a/crm/pengine/testcases/simple7.xml b/crm/pengine/testcases/simple7.xml
index fbd65a6980..448d7fca37 100644
--- a/crm/pengine/testcases/simple7.xml
+++ b/crm/pengine/testcases/simple7.xml
@@ -1,30 +1,30 @@
 <?xml version="1.0"?>
 <!DOCTYPE cib SYSTEM "crm-1.0.dtd">
 <!-- shutdown -->
 <cib>
  <configuration>
   <nodes>
     <node id="node1" uname="node1" type="member"/>
   </nodes>
   <resources>
      <resource id="rsc1" class="heartbeat" type="apache" priority="1.0"/>
   </resources>
   <constraints>
       <rsc_location id="run_rsc1" rsc="rsc1">
 	<rule id="can1" result="can"/>
       </rsc_location>
   </constraints>
  </configuration>
  <status>
     <node_state id="node1" uname="node1" crmd="online" join="member" expected="member" timestamp="1086187789" in_ccm="true" shutdown="1086187789">
       <lrm>
 	<lrm_agents>
 	  <lrm_agent class="heartbeat" type="apache"/>
 	</lrm_agents>
         <lrm_resources>
-          <lrm_resource id="rsc1" last_op="start" op_state="started" op_code="0" target="hadev"/>
+          <lrm_resource id="rsc1" last_op="start" rsc_state="started" op_status="0" rc_code="0" on_node="hadev"/>
         </lrm_resources>
       </lrm>
     </node_state>
  </status>
 </cib>
diff --git a/crm/pengine/testcases/simple8.xml b/crm/pengine/testcases/simple8.xml
index 2300a4ccf4..c2a2de8f28 100644
--- a/crm/pengine/testcases/simple8.xml
+++ b/crm/pengine/testcases/simple8.xml
@@ -1,26 +1,26 @@
 <?xml version="1.0"?>
 <!DOCTYPE cib SYSTEM "crm-1.0.dtd">
 <!-- shutdown -->
 <cib>
  <configuration>
   <nodes>
     <node id="node1" uname="node1" type="member"/>
   </nodes>
   <resources>
      <resource id="rsc1" class="heartbeat" type="apache" priority="1.0"/>
   </resources>
   <constraints/>
  </configuration>
  <status>
     <node_state id="node1" uname="node1" crmd="online" join="member" expected="member" timestamp="1086187789" in_ccm="true" stonith="1086187789">
       <lrm>
 	<lrm_agents>
 	  <lrm_agent class="heartbeat" type="apache"/>
 	</lrm_agents>
         <lrm_resources>
-          <lrm_resource id="rsc1" last_op="start" op_state="started" op_code="0" target="hadev"/>
+          <lrm_resource id="rsc1" last_op="start" rsc_state="started" op_status="0" rc_code="0" on_node="hadev"/>
         </lrm_resources>
       </lrm>
     </node_state>
  </status>
 </cib>
diff --git a/crm/pengine/testcases/simple9.exp b/crm/pengine/testcases/simple9.exp
index aaf123f679..89fd3580c0 100644
--- a/crm/pengine/testcases/simple9.exp
+++ b/crm/pengine/testcases/simple9.exp
@@ -1,10 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE transition_graph SYSTEM "crm-1.0.dtd">
 <transition_graph>
   <actions id="0">
-    <rsc_op id="2" rsc_id="rsc1" on_node="node1" operation="start" runnable="true" optional="false" discard="false" allow_fail="false">
+    <rsc_op id="2" rsc_id="rsc1" on_node="node1" on_node_uuid="node1" operation="start" runnable="true" optional="false" discard="false" allow_fail="false">
       <resource id="rsc1" class="heartbeat" type="apache" priority="1.0" version="2.0"/>
       <args/>
     </rsc_op>
   </actions>
 </transition_graph>
diff --git a/crm/pengine/testcases/stopfail1.exp b/crm/pengine/testcases/stopfail1.exp
index 7c70982418..13e11d9295 100644
--- a/crm/pengine/testcases/stopfail1.exp
+++ b/crm/pengine/testcases/stopfail1.exp
@@ -1,20 +1,20 @@
 <?xml version="1.0"?>
 <!DOCTYPE transition_graph SYSTEM "crm-1.0.dtd">
 <transition_graph>
   <actions id="0">
-    <rsc_op id="1" rsc_id="rsc1" on_node="node1" operation="stop" runnable="true" optional="true" discard="false" allow_fail="true">
+    <rsc_op id="1" rsc_id="rsc1" on_node="node1" on_node_uuid="node1" operation="stop" runnable="true" optional="true" discard="false" allow_fail="true">
       <resource id="rsc1" class="heartbeat" type="apache" priority="1.0" on_stopfail="stonith"/>
       <args/>
     </rsc_op>
-    <crm_event id="3" on_node="node1" operation="shutdown_crm" runnable="true" optional="false" discard="false" allow_fail="true">
+    <crm_event id="3" on_node="node1" on_node_uuid="node1" operation="shutdown_crm" runnable="true" optional="false" discard="false" allow_fail="true">
       <args/>
     </crm_event>
-    <rsc_op id="4" rsc_id="__no_rsc__" on_node="__no_node__" operation="stonith" runnable="true" optional="false" discard="false" allow_fail="false">
+    <rsc_op id="4" rsc_id="__no_rsc__" on_node="__no_node__" on_node_uuid="__no_node_uuid__" operation="stonith" runnable="true" optional="false" discard="false" allow_fail="false">
       <args target="node1"/>
     </rsc_op>
-    <rsc_op id="2" rsc_id="rsc1" on_node="node1" operation="start" runnable="true" optional="true" discard="false" allow_fail="false">
+    <rsc_op id="2" rsc_id="rsc1" on_node="node1" on_node_uuid="node1" operation="start" runnable="true" optional="true" discard="false" allow_fail="false">
       <resource id="rsc1" class="heartbeat" type="apache" priority="1.0" on_stopfail="stonith"/>
       <args/>
     </rsc_op>
   </actions>
 </transition_graph>
diff --git a/crm/pengine/testcases/stopfail1.xml b/crm/pengine/testcases/stopfail1.xml
index cd126dc181..8db86459f8 100644
--- a/crm/pengine/testcases/stopfail1.xml
+++ b/crm/pengine/testcases/stopfail1.xml
@@ -1,34 +1,34 @@
 <?xml version="1.0"?>
 <!DOCTYPE cib SYSTEM "crm-1.0.dtd">
 <!-- shutdown then stontih -->
 <cib>
  <configuration>
   <nodes>
     <node id="node1" uname="node1" type="member"/>
   </nodes>
   <resources>
      <resource id="rsc1" class="heartbeat" type="apache" priority="1.0" 
 	       on_stopfail="stonith"/>
   </resources>
   <constraints>
       <rsc_location id="run_rsc1" rsc="rsc1">
 	<rule id="can1" result="can"/>
       </rsc_location>
   </constraints>
   <crm_config>
     <nv_pair id="failed_nodes" name="failed_nodes" value="stonith"/>
   </crm_config>
  </configuration>
  <status>
     <node_state id="node1" uname="node1" crmd="online" join="member" expected="member" timestamp="1086187789" in_ccm="true">
       <lrm>
 	<lrm_agents>
 	  <lrm_agent class="heartbeat" type="apache"/>
 	</lrm_agents>
         <lrm_resources>
-          <lrm_resource id="rsc1" last_op="stop" op_state="failed" op_code="4" target="hadev"/>
+          <lrm_resource id="rsc1" last_op="stop" rsc_state="failed" op_status="4" on_node="hadev"/>
         </lrm_resources>
       </lrm>
     </node_state>
  </status>
 </cib>
diff --git a/crm/pengine/testcases/stopfail2.xml b/crm/pengine/testcases/stopfail2.xml
index badc4ce109..eae0aa23dd 100644
--- a/crm/pengine/testcases/stopfail2.xml
+++ b/crm/pengine/testcases/stopfail2.xml
@@ -1,31 +1,31 @@
 <?xml version="1.0"?>
 <!DOCTYPE cib SYSTEM "crm-1.0.dtd">
 <!-- shutdown then stontih -->
 <cib>
  <configuration>
   <nodes>
     <node id="node1" uname="node1" type="member"/>
   </nodes>
   <resources>
      <resource id="rsc1" class="heartbeat" type="apache" priority="1.0" 
 	       on_stopfail="block"/>
   </resources>
   <constraints>
       <rsc_location id="run_rsc1" rsc="rsc1">
 	<rule id="can1" result="can"/>
       </rsc_location>
   </constraints>
  </configuration>
  <status>
     <node_state id="node1" uname="node1" crmd="online" join="member" expected="member" timestamp="1086187789" in_ccm="true">
       <lrm>
 	<lrm_agents>
 	  <lrm_agent class="heartbeat" type="apache"/>
 	</lrm_agents>
         <lrm_resources>
-          <lrm_resource id="rsc1" last_op="stop" op_state="failed" op_code="4" target="hadev"/>
+          <lrm_resource id="rsc1" last_op="stop" rsc_state="failed" op_status="4" on_node="node1"/>
         </lrm_resources>
       </lrm>
     </node_state>
  </status>
 </cib>
diff --git a/crm/pengine/testcases/stopfail3.xml b/crm/pengine/testcases/stopfail3.xml
index 549b45ffd7..7c71f238a1 100644
--- a/crm/pengine/testcases/stopfail3.xml
+++ b/crm/pengine/testcases/stopfail3.xml
@@ -1,30 +1,30 @@
 <?xml version="1.0"?>
 <!DOCTYPE cib SYSTEM "crm-1.0.dtd">
 <!-- shutdown then stontih -->
 <cib>
  <configuration>
   <nodes>
     <node id="node1" uname="node1" type="member"/>
   </nodes>
   <resources>
      <resource id="rsc1" class="heartbeat" type="apache" priority="1.0"/>
   </resources>
   <constraints>
       <rsc_location id="run_rsc1" rsc="rsc1">
 	<rule id="can1" result="can"/>
       </rsc_location>
   </constraints>
  </configuration>
  <status>
     <node_state id="node1" uname="node1" crmd="online" join="member" expected="member" timestamp="1086187789" in_ccm="true">
       <lrm>
 	<lrm_agents>
 	  <lrm_agent class="heartbeat" type="apache"/>
 	</lrm_agents>
         <lrm_resources>
-          <lrm_resource id="rsc1" last_op="stop" op_state="failed" op_code="4" target="hadev"/>
+          <lrm_resource id="rsc1" last_op="stop" rsc_state="failed" op_status="4" on_node="hadev"/>
         </lrm_resources>
       </lrm>
     </node_state>
 </status>
 </cib>
diff --git a/crm/pengine/testcases/stopfail4.exp b/crm/pengine/testcases/stopfail4.exp
index 267965b8e2..2e09ecd310 100644
--- a/crm/pengine/testcases/stopfail4.exp
+++ b/crm/pengine/testcases/stopfail4.exp
@@ -1,10 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE transition_graph SYSTEM "crm-1.0.dtd">
 <transition_graph>
   <actions id="0">
-    <rsc_op id="2" rsc_id="rsc1" on_node="node2" operation="start" runnable="true" optional="false" discard="false" allow_fail="false">
+    <rsc_op id="2" rsc_id="rsc1" on_node="node2" on_node_uuid="node2" operation="start" runnable="true" optional="false" discard="false" allow_fail="false">
       <resource id="rsc1" class="heartbeat" type="apache" priority="1.0" on_stopfail="ignore"/>
       <args/>
     </rsc_op>
   </actions>
 </transition_graph>
diff --git a/crm/pengine/testcases/stopfail4.xml b/crm/pengine/testcases/stopfail4.xml
index 893115edf4..1770b86434 100644
--- a/crm/pengine/testcases/stopfail4.xml
+++ b/crm/pengine/testcases/stopfail4.xml
@@ -1,39 +1,39 @@
 <?xml version="1.0"?>
 <!DOCTYPE cib SYSTEM "crm-1.0.dtd">
 <!-- shutdown then stontih -->
 <cib>
  <configuration>
   <nodes>
     <node id="node1" uname="node1" type="member"/>
     <node id="node2" uname="node2" type="member"/>
   </nodes>
   <resources>
      <resource id="rsc1" class="heartbeat" type="apache" priority="1.0" on_stopfail="ignore"/>
   </resources>
   <constraints>
       <rsc_location id="run_rsc1" rsc="rsc1">
 	<rule id="can1" result="can"/>
       </rsc_location>
   </constraints>
  </configuration>
  <status>
     <node_state id="node1" uname="node1" crmd="online" join="member" expected="member" timestamp="1086187789" in_ccm="true">
       <lrm>
 	<lrm_agents>
 	  <lrm_agent class="heartbeat" type="apache"/>
 	</lrm_agents>
         <lrm_resources>
-          <lrm_resource id="rsc1" last_op="stop" op_state="failed" op_code="4" target="hadev"/>
+          <lrm_resource id="rsc1" last_op="stop" rsc_state="failed" op_status="4" on_node="hadev"/>
         </lrm_resources>
       </lrm>
     </node_state>
     <node_state id="node2" uname="node2" crmd="online" join="member" expected="member" timestamp="1086187789" in_ccm="true">
       <lrm>
 	<lrm_agents>
 	  <lrm_agent class="heartbeat" type="apache"/>
 	</lrm_agents>
         <lrm_resources/>
       </lrm>
     </node_state>
  </status>
 </cib>
diff --git a/crm/pengine/testcases/stopfail5.exp b/crm/pengine/testcases/stopfail5.exp
index 75e48848c6..501f1c0968 100644
--- a/crm/pengine/testcases/stopfail5.exp
+++ b/crm/pengine/testcases/stopfail5.exp
@@ -1,30 +1,30 @@
 <?xml version="1.0"?>
 <!DOCTYPE transition_graph SYSTEM "crm-1.0.dtd">
 <transition_graph>
   <actions id="0">
-    <rsc_op id="3" rsc_id="stonith1" on_node="node2" operation="stop" runnable="true" optional="true" discard="false" allow_fail="false">
+    <rsc_op id="3" rsc_id="stonith1" on_node="node2" on_node_uuid="node2" operation="stop" runnable="true" optional="true" discard="false" allow_fail="false">
       <resource id="stonith1" class="stonith" type="uml" priority="1.0" on_stopfail="stonith"/>
       <args/>
     </rsc_op>
-    <rsc_op id="4" rsc_id="stonith1" on_node="node2" operation="start" runnable="true" optional="true" discard="false" allow_fail="false">
+    <rsc_op id="4" rsc_id="stonith1" on_node="node2" on_node_uuid="node2" operation="start" runnable="true" optional="true" discard="false" allow_fail="false">
       <resource id="stonith1" class="stonith" type="uml" priority="1.0" on_stopfail="stonith"/>
       <args/>
     </rsc_op>
   </actions>
   <actions id="1">
-    <rsc_op id="1" rsc_id="rsc1" on_node="node1" operation="stop" runnable="true" optional="true" discard="false" allow_fail="true">
+    <rsc_op id="1" rsc_id="rsc1" on_node="node1" on_node_uuid="node1" operation="stop" runnable="true" optional="true" discard="false" allow_fail="true">
       <resource id="rsc1" class="heartbeat" type="apache" priority="1.0" on_stopfail="stonith"/>
       <args/>
     </rsc_op>
-    <crm_event id="5" on_node="node1" operation="shutdown_crm" runnable="true" optional="false" discard="false" allow_fail="true">
+    <crm_event id="5" on_node="node1" on_node_uuid="node1" operation="shutdown_crm" runnable="true" optional="false" discard="false" allow_fail="true">
       <args/>
     </crm_event>
-    <rsc_op id="6" rsc_id="__no_rsc__" on_node="node2" operation="stonith" runnable="true" optional="false" discard="false" allow_fail="false">
+    <rsc_op id="6" rsc_id="__no_rsc__" on_node="node2" on_node_uuid="node2" operation="stonith" runnable="true" optional="false" discard="false" allow_fail="false">
       <args target="node1"/>
     </rsc_op>
-    <rsc_op id="2" rsc_id="rsc1" on_node="node1" operation="start" runnable="true" optional="true" discard="false" allow_fail="false">
+    <rsc_op id="2" rsc_id="rsc1" on_node="node1" on_node_uuid="node1" operation="start" runnable="true" optional="true" discard="false" allow_fail="false">
       <resource id="rsc1" class="heartbeat" type="apache" priority="1.0" on_stopfail="stonith"/>
       <args/>
     </rsc_op>
   </actions>
 </transition_graph>
diff --git a/crm/pengine/testcases/stopfail5.xml b/crm/pengine/testcases/stopfail5.xml
index ad1a58217d..12573097b5 100644
--- a/crm/pengine/testcases/stopfail5.xml
+++ b/crm/pengine/testcases/stopfail5.xml
@@ -1,53 +1,53 @@
 <?xml version="1.0"?>
 <!DOCTYPE cib SYSTEM "crm-1.0.dtd">
 <!-- shutdown then stontih -->
 <cib>
  <configuration>
   <nodes>
     <node id="node1" uname="node1" type="member"/>
     <node id="node2" uname="node2" type="member"/>
   </nodes>
   <resources>
      <resource id="rsc1" class="heartbeat" type="apache" priority="1.0" 
 	       on_stopfail="stonith"/>
      <resource id="stonith1" class="stonith" type="uml" priority="1.0" 
 	       on_stopfail="stonith"/>
   </resources>
   <constraints>
       <rsc_location id="run_rsc1" rsc="rsc1">
 	<rule id="can1" result="can"/>
       </rsc_location>
       <rsc_location id="run_stonith1" rsc="stonith1">
 	<rule id="can1" result="can"/>
       </rsc_location>
   </constraints>
   <crm_config>
     <nv_pair id="failed_nodes" name="failed_nodes" value="stonith"/>
   </crm_config>
  </configuration>
  <status>
     <node_state id="node1" uname="node1" crmd="online" join="member" expected="member" timestamp="1086187789" in_ccm="true">
       <lrm>
 	<lrm_agents>
 	  <lrm_agent class="heartbeat" type="apache"/>
 	</lrm_agents>
         <lrm_resources>
-          <lrm_resource id="rsc1" last_op="stop" op_state="failed" op_code="4" target="hadev"/>
+          <lrm_resource id="rsc1" last_op="stop" rsc_state="failed" op_status="4" on_node="hadev"/>
         </lrm_resources>
       </lrm>
     </node_state>
     <node_state id="node2" uname="node2" crmd="online" join="member" expected="member" timestamp="1086187789" in_ccm="true">
       <lrm>
 	<lrm_agents>
 	  <lrm_agent class="heartbeat" type="apache"/>
 	  <lrm_agent class="stonith" type="uml"/>
 	</lrm_agents>
         <lrm_resources>
-          <lrm_resource id="stonith1" last_op="start" op_state="started" op_code="0" target="hadev">
+          <lrm_resource id="stonith1" last_op="start" rsc_state="started" op_status="0" rc_code="0" on_node="hadev">
 	    <can_fence id="node1"/>
 	  </lrm_resource>
         </lrm_resources>
       </lrm>
     </node_state>
  </status>
 </cib>
diff --git a/crm/pengine/testcases/stopfail6.exp b/crm/pengine/testcases/stopfail6.exp
index f5ea27e973..3b49e07527 100644
--- a/crm/pengine/testcases/stopfail6.exp
+++ b/crm/pengine/testcases/stopfail6.exp
@@ -1,40 +1,40 @@
 <?xml version="1.0"?>
 <!DOCTYPE transition_graph SYSTEM "crm-1.0.dtd">
 <transition_graph>
   <actions id="0">
-    <rsc_op id="5" rsc_id="stonith2" on_node="node3" operation="stop" runnable="true" optional="false" discard="false" allow_fail="false">
+    <rsc_op id="5" rsc_id="stonith2" on_node="node3" on_node_uuid="node3" operation="stop" runnable="true" optional="false" discard="false" allow_fail="false">
       <resource id="stonith2" class="stonith" type="uml" priority="1.0" on_stopfail="stonith"/>
       <args/>
     </rsc_op>
-    <rsc_op id="6" rsc_id="stonith2" on_node="node2" operation="start" runnable="true" optional="false" discard="false" allow_fail="false">
+    <rsc_op id="6" rsc_id="stonith2" on_node="node2" on_node_uuid="node2" operation="start" runnable="true" optional="false" discard="false" allow_fail="false">
       <resource id="stonith2" class="stonith" type="uml" priority="1.0" on_stopfail="stonith"/>
       <args/>
     </rsc_op>
   </actions>
   <actions id="1">
-    <rsc_op id="3" rsc_id="stonith1" on_node="node2" operation="stop" runnable="true" optional="true" discard="false" allow_fail="false">
+    <rsc_op id="3" rsc_id="stonith1" on_node="node2" on_node_uuid="node2" operation="stop" runnable="true" optional="true" discard="false" allow_fail="false">
       <resource id="stonith1" class="stonith" type="uml" priority="1.0" on_stopfail="stonith"/>
       <args/>
     </rsc_op>
-    <rsc_op id="4" rsc_id="stonith1" on_node="node2" operation="start" runnable="true" optional="true" discard="false" allow_fail="false">
+    <rsc_op id="4" rsc_id="stonith1" on_node="node2" on_node_uuid="node2" operation="start" runnable="true" optional="true" discard="false" allow_fail="false">
       <resource id="stonith1" class="stonith" type="uml" priority="1.0" on_stopfail="stonith"/>
       <args/>
     </rsc_op>
   </actions>
   <actions id="2">
-    <rsc_op id="1" rsc_id="rsc1" on_node="node1" operation="stop" runnable="true" optional="true" discard="false" allow_fail="true">
+    <rsc_op id="1" rsc_id="rsc1" on_node="node1" on_node_uuid="node1" operation="stop" runnable="true" optional="true" discard="false" allow_fail="true">
       <resource id="rsc1" class="heartbeat" type="apache" priority="1.0" on_stopfail="stonith"/>
       <args/>
     </rsc_op>
-    <crm_event id="7" on_node="node1" operation="shutdown_crm" runnable="true" optional="false" discard="false" allow_fail="true">
+    <crm_event id="7" on_node="node1" on_node_uuid="node1" operation="shutdown_crm" runnable="true" optional="false" discard="false" allow_fail="true">
       <args/>
     </crm_event>
-    <rsc_op id="8" rsc_id="__no_rsc__" on_node="node3" operation="stonith" runnable="true" optional="false" discard="false" allow_fail="false">
+    <rsc_op id="8" rsc_id="__no_rsc__" on_node="node3" on_node_uuid="node3" operation="stonith" runnable="true" optional="false" discard="false" allow_fail="false">
       <args target="node1"/>
     </rsc_op>
-    <rsc_op id="2" rsc_id="rsc1" on_node="node1" operation="start" runnable="true" optional="true" discard="false" allow_fail="false">
+    <rsc_op id="2" rsc_id="rsc1" on_node="node1" on_node_uuid="node1" operation="start" runnable="true" optional="true" discard="false" allow_fail="false">
       <resource id="rsc1" class="heartbeat" type="apache" priority="1.0" on_stopfail="stonith"/>
       <args/>
     </rsc_op>
   </actions>
 </transition_graph>
diff --git a/crm/pengine/testcases/stopfail6.xml b/crm/pengine/testcases/stopfail6.xml
index e77220aa04..b9df9a63c7 100644
--- a/crm/pengine/testcases/stopfail6.xml
+++ b/crm/pengine/testcases/stopfail6.xml
@@ -1,74 +1,74 @@
 <?xml version="1.0"?>
 <!DOCTYPE cib SYSTEM "crm-1.0.dtd">
 <!-- shutdown then stontih -->
 <cib>
  <configuration>
   <nodes>
     <node id="node1" uname="node1" type="member"/>
     <node id="node2" uname="node2" type="member"/>
     <node id="node3" uname="node3" type="member"/>
   </nodes>
   <resources>
      <resource id="rsc1" class="heartbeat" type="apache" priority="1.0" 
 	       on_stopfail="stonith"/>
      <resource id="stonith1" class="stonith" type="uml" priority="1.0" 
 	       on_stopfail="stonith"/>
      <resource id="stonith2" class="stonith" type="uml" priority="1.0" 
 	       on_stopfail="stonith"/>
   </resources>
   <constraints>
       <rsc_location id="run_rsc1" rsc="rsc1">
 	<rule id="can1" result="can"/>
       </rsc_location>
       <rsc_location id="run_stonith1" rsc="stonith1">
 	<rule id="can1" result="can"/>
       </rsc_location>
       <rsc_location id="run_stonith2" rsc="stonith2">
 	<rule id="can1" result="can"/>
       </rsc_location>
   </constraints>
   <crm_config>
     <nv_pair id="failed_nodes" name="failed_nodes" value="stonith"/>
   </crm_config>
  </configuration>
  <status>
     <node_state id="node1" uname="node1" crmd="online" join="member" expected="member" timestamp="1086187789" in_ccm="true">
       <lrm>
 	<lrm_agents>
 	  <lrm_agent class="heartbeat" type="apache"/>
 	</lrm_agents>
         <lrm_resources>
-          <lrm_resource id="rsc1" last_op="stop" op_state="failed" op_code="4" target="hadev"/>
+          <lrm_resource id="rsc1" last_op="stop" rsc_state="failed" op_status="4" on_node="hadev"/>
         </lrm_resources>
       </lrm>
     </node_state>
     <node_state id="node2" uname="node2" crmd="online" join="member" expected="member" timestamp="1086187789" in_ccm="true">
       <lrm>
 	<lrm_agents>
 	  <lrm_agent class="heartbeat" type="apache"/>
 	  <lrm_agent class="stonith" type="uml"/>
 	</lrm_agents>
         <lrm_resources>
-          <lrm_resource id="stonith1" last_op="start" op_state="started" op_code="0" target="hadev">
+          <lrm_resource id="stonith1" last_op="start" rsc_state="started" op_status="0" rc_code="0" on_node="hadev">
 	    <can_fence id="node3"/>
 	    <can_fence id="node1"/>
 	  </lrm_resource>
         </lrm_resources>
       </lrm>
     </node_state>
     <node_state id="node3" uname="node3" crmd="online" join="member" expected="member" timestamp="1086187789" in_ccm="true">
       <lrm>
 	<lrm_agents>
 	  <lrm_agent class="heartbeat" type="apache"/>
 	  <lrm_agent class="stonith" type="uml"/>
 	</lrm_agents>
         <lrm_resources>
-          <lrm_resource id="stonith2" last_op="start" op_state="started" op_code="0" target="hadev">
+          <lrm_resource id="stonith2" last_op="start" rsc_state="started" op_status="0" rc_code="0" on_node="hadev">
 	    <can_fence id="node1"/>
 	    <can_fence id="node2"/>
 	  </lrm_resource>
         </lrm_resources>
       </lrm>
     </node_state>
  </status>
 </cib>
diff --git a/crm/pengine/testcases/stopfail7.exp b/crm/pengine/testcases/stopfail7.exp
index 8e963881ca..21eb7c9ef4 100644
--- a/crm/pengine/testcases/stopfail7.exp
+++ b/crm/pengine/testcases/stopfail7.exp
@@ -1,19 +1,26 @@
 <?xml version="1.0"?>
 <!DOCTYPE transition_graph SYSTEM "crm-1.0.dtd">
 <transition_graph>
   <actions id="0">
-    <rsc_op id="3" rsc_id="stonith1" on_node="node2" operation="stop" runnable="true" optional="false" discard="false" allow_fail="false">
+    <rsc_op id="3" rsc_id="stonith1" on_node="node2" on_node_uuid="node2" operation="stop" runnable="true" optional="false" discard="false" allow_fail="false">
       <resource id="stonith1" class="stonith" type="uml" priority="1.0" on_stopfail="stonith"/>
+      <args/>
     </rsc_op>
   </actions>
   <actions id="1">
-    <rsc_op id="1" rsc_id="rsc1" on_node="node1" operation="stop" runnable="true" optional="true" discard="false" allow_fail="true">
+    <rsc_op id="1" rsc_id="rsc1" on_node="node1" on_node_uuid="node1" operation="stop" runnable="true" optional="true" discard="false" allow_fail="true">
       <resource id="rsc1" class="heartbeat" type="apache" priority="1.0" on_stopfail="stonith"/>
+      <args/>
     </rsc_op>
-    <crm_event id="5" on_node="node1" operation="shutdown_crm" runnable="true" optional="false" discard="false" allow_fail="true"/>
-    <pseduo_event id="6" on_node="node2" operation="stonith" runnable="true" optional="false" discard="false" allow_fail="false"/>
-    <rsc_op id="2" rsc_id="rsc1" on_node="node1" operation="start" runnable="true" optional="true" discard="false" allow_fail="false">
+    <crm_event id="5" on_node="node1" on_node_uuid="node1" operation="shutdown_crm" runnable="true" optional="false" discard="false" allow_fail="true">
+      <args/>
+    </crm_event>
+    <rsc_op id="6" rsc_id="__no_rsc__" on_node="node2" on_node_uuid="node2" operation="stonith" runnable="true" optional="false" discard="false" allow_fail="false">
+      <args target="node1"/>
+    </rsc_op>
+    <rsc_op id="2" rsc_id="rsc1" on_node="node1" on_node_uuid="node1" operation="start" runnable="true" optional="true" discard="false" allow_fail="false">
       <resource id="rsc1" class="heartbeat" type="apache" priority="1.0" on_stopfail="stonith"/>
+      <args/>
     </rsc_op>
   </actions>
 </transition_graph>
diff --git a/crm/pengine/testcases/stopfail7.xml b/crm/pengine/testcases/stopfail7.xml
index 5f8295b355..29595a92ae 100644
--- a/crm/pengine/testcases/stopfail7.xml
+++ b/crm/pengine/testcases/stopfail7.xml
@@ -1,52 +1,52 @@
 <?xml version="1.0"?>
 <!DOCTYPE cib SYSTEM "crm-1.0.dtd">
 <!-- stontih resource must be shutdown first -->
 <cib>
  <configuration>
   <nodes>
     <node id="node1" uname="node1" type="member"/>
     <node id="node2" uname="node2" type="member"/>
   </nodes>
   <resources>
      <resource id="rsc1" class="heartbeat" type="apache" priority="1.0" 
 	       on_stopfail="stonith"/>
      <resource id="stonith1" class="stonith" type="uml" priority="1.0" 
 	       on_stopfail="stonith"/>
   </resources>
   <constraints>
       <rsc_location id="run_rsc1" rsc="rsc1">
 	<rule id="can1" result="can"/>
       </rsc_location>
       <rsc_location id="run_stonith1" rsc="stonith1">
 	<rule id="can1" result="can"/>
       </rsc_location>
   </constraints>
   <crm_config>
     <nv_pair id="failed_nodes" name="failed_nodes" value="stonith"/>
   </crm_config>
  </configuration>
  <status>
     <node_state id="node1" uname="node1" crmd="online" join="member" expected="member" timestamp="1086187789" in_ccm="true">
       <lrm>
 	<lrm_agents>
 	  <lrm_agent class="heartbeat" type="apache"/>
 	</lrm_agents>
         <lrm_resources>
-          <lrm_resource id="rsc1" last_op="stop" op_state="failed" op_code="4" target="hadev"/>
+          <lrm_resource id="rsc1" last_op="stop" rsc_state="failed" op_status="4" on_node="hadev"/>
         </lrm_resources>
       </lrm>
     </node_state>
     <node_state id="node2" uname="node2" crmd="online" join="member" expected="member" timestamp="1086187789" in_ccm="true">
       <lrm>
 	<lrm_agents>
 	  <lrm_agent class="heartbeat" type="apache"/>
 	</lrm_agents>
         <lrm_resources>
-          <lrm_resource id="stonith1" last_op="start" op_state="started" op_code="0" target="hadev">
+          <lrm_resource id="stonith1" last_op="start" rsc_state="started" op_status="0" rc_code="0" on_node="hadev">
 	    <can_fence id="node1"/>
 	  </lrm_resource>
         </lrm_resources>
       </lrm>
     </node_state>
  </status>
 </cib>