commit cce2536efbed5b3bed24e6ad13532dc4db55d4ae
Author: Andrew Beekhof <andrew@beekhof.net>
Date:   Tue Apr 1 15:13:21 2014 +1100

    Refactor: PE: Indicate the type of fencing in the fencing operation key
    
    (cherry picked from commit 22dbe7cdda718563d02f65b0009b1984497a0947)
    
    Conflicts:
    	pengine/test10/594.exp
    	pengine/test10/829.exp
    	pengine/test10/bug-5186-partial-migrate.exp
    	pengine/test10/bug-lf-2508.exp
    	pengine/test10/bug-lf-2551.exp
    	pengine/test10/bug-lf-2606.exp
    	pengine/test10/interleave-pseudo-stop.exp
    	pengine/test10/master-7.exp
    	pengine/test10/master-8.exp
    	pengine/test10/migrate-fencing.exp
    	pengine/test10/rec-node-11.exp
    	pengine/test10/rec-node-12.exp
    	pengine/test10/rec-node-13.exp
    	pengine/test10/rec-node-14.exp
    	pengine/test10/rec-node-15.exp
    	pengine/test10/rec-node-2.exp
    	pengine/test10/rec-node-4.exp
    	pengine/test10/rec-node-6.exp
    	pengine/test10/rec-node-7.exp
    	pengine/test10/rec-rsc-5.exp
    	pengine/test10/remote-fence-unclean.exp
    	pengine/test10/stonith-0.exp
    	pengine/test10/stonith-1.exp
    	pengine/test10/stonith-2.exp
    	pengine/test10/stonith-3.exp
    	pengine/test10/stonith-4.exp
    	pengine/test10/stop-failure-no-quorum.exp
    	pengine/test10/stop-failure-with-fencing.exp
    	pengine/test10/systemhealth1.exp
    	pengine/test10/systemhealth2.exp
    	pengine/test10/systemhealth3.exp
    	pengine/test10/systemhealthm1.exp
    	pengine/test10/systemhealthm2.exp
    	pengine/test10/systemhealthm3.exp
    	pengine/test10/systemhealthn1.exp
    	pengine/test10/systemhealthn2.exp
    	pengine/test10/systemhealthn3.exp
    	pengine/test10/systemhealtho1.exp
    	pengine/test10/systemhealtho2.exp
    	pengine/test10/systemhealtho3.exp
    	pengine/test10/systemhealthp1.exp
    	pengine/test10/systemhealthp2.exp
    	pengine/test10/systemhealthp3.exp
    	pengine/test10/ticket-clone-21.exp
    	pengine/test10/ticket-clone-9.exp
    	pengine/test10/ticket-group-21.exp
    	pengine/test10/ticket-group-9.exp
    	pengine/test10/ticket-master-21.exp
    	pengine/test10/ticket-master-9.exp
    	pengine/test10/ticket-primitive-21.exp
    	pengine/test10/ticket-primitive-9.exp

diff --git a/pengine/allocate.c b/pengine/allocate.c
index e535b84..a8e5412 100644
--- a/pengine/allocate.c
+++ b/pengine/allocate.c
@@ -1265,15 +1265,21 @@ any_managed_resources(pe_working_set_t * data_set)
 action_t *
 pe_fence_op(node_t * node, const char *op, pe_working_set_t * data_set)
 {
-    action_t *stonith_op =
-        custom_action(NULL, g_strdup_printf("%s-%s", CRM_OP_FENCE, node->details->uname),
-                      CRM_OP_FENCE, node, FALSE, TRUE, data_set);
+    action_t *stonith_op = NULL;
+
+    if(op == NULL) {
+        op = data_set->stonith_action;
+    }
+
+    stonith_op = custom_action(
+        NULL, g_strdup_printf("%s-%s-%s", CRM_OP_FENCE, node->details->uname, op),
+        CRM_OP_FENCE, node, FALSE, TRUE, data_set);
 
     add_hash_param(stonith_op->meta, XML_LRM_ATTR_TARGET, node->details->uname);
 
     add_hash_param(stonith_op->meta, XML_LRM_ATTR_TARGET_UUID, node->details->id);
 
-    add_hash_param(stonith_op->meta, "stonith_action", op ? op : data_set->stonith_action);
+    add_hash_param(stonith_op->meta, "stonith_action", op);
 
     return stonith_op;
 }
diff --git a/pengine/test10/594.exp b/pengine/test10/594.exp
index 5cb6931..f1e77f8 100644
--- a/pengine/test10/594.exp
+++ b/pengine/test10/594.exp
@@ -183,7 +183,7 @@
   </synapse>
   <synapse id="15">
     <action_set>
-      <crm_event id="37" operation="stonith" operation_key="stonith-hadev3" on_node="hadev3" on_node_uuid="879e65f8-4b38-4c56-9552-4752ad436669">
+      <crm_event id="37" operation="stonith" operation_key="stonith-hadev3-reboot" on_node="hadev3" on_node_uuid="879e65f8-4b38-4c56-9552-4752ad436669">
         <attributes CRM_meta_on_node="hadev3" CRM_meta_on_node_uuid="879e65f8-4b38-4c56-9552-4752ad436669" CRM_meta_probe_complete="true" CRM_meta_stonith_action="reboot" crm_feature_set="3.0.7"/>
       </crm_event>
     </action_set>
@@ -215,7 +215,7 @@
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="37" operation="stonith" operation_key="stonith-hadev3" on_node="hadev3" on_node_uuid="879e65f8-4b38-4c56-9552-4752ad436669"/>
+        <crm_event id="37" operation="stonith" operation_key="stonith-hadev3-reboot" on_node="hadev3" on_node_uuid="879e65f8-4b38-4c56-9552-4752ad436669"/>
       </trigger>
     </inputs>
   </synapse>
diff --git a/pengine/test10/829.exp b/pengine/test10/829.exp
index 4562aed..749014f 100644
--- a/pengine/test10/829.exp
+++ b/pengine/test10/829.exp
@@ -78,7 +78,7 @@
         <pseudo_event id="9" operation="probe_complete" operation_key="probe_complete"/>
       </trigger>
       <trigger>
-        <crm_event id="53" operation="stonith" operation_key="stonith-c001n02" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
+        <crm_event id="53" operation="stonith" operation_key="stonith-c001n02-reboot" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
       </trigger>
     </inputs>
   </synapse>
@@ -159,7 +159,7 @@
         <pseudo_event id="50" operation="stop" operation_key="DoFencing_stop_0"/>
       </trigger>
       <trigger>
-        <crm_event id="53" operation="stonith" operation_key="stonith-c001n02" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
+        <crm_event id="53" operation="stonith" operation_key="stonith-c001n02-reboot" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
       </trigger>
     </inputs>
   </synapse>
@@ -240,13 +240,13 @@
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="53" operation="stonith" operation_key="stonith-c001n02" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
+        <crm_event id="53" operation="stonith" operation_key="stonith-c001n02-reboot" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="23">
     <action_set>
-      <crm_event id="53" operation="stonith" operation_key="stonith-c001n02" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
+      <crm_event id="53" operation="stonith" operation_key="stonith-c001n02-reboot" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
         <attributes CRM_meta_on_node="c001n02" CRM_meta_on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f" CRM_meta_probe_complete="true" CRM_meta_stonith_action="reboot" crm_feature_set="3.0.7"/>
       </crm_event>
     </action_set>
@@ -260,7 +260,7 @@
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="53" operation="stonith" operation_key="stonith-c001n02" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
+        <crm_event id="53" operation="stonith" operation_key="stonith-c001n02-reboot" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
       </trigger>
     </inputs>
   </synapse>
diff --git a/pengine/test10/bug-5186-partial-migrate.exp b/pengine/test10/bug-5186-partial-migrate.exp
new file mode 100644
index 0000000..7e10e3a
--- /dev/null
+++ b/pengine/test10/bug-5186-partial-migrate.exp
@@ -0,0 +1,425 @@
+<transition_graph cluster-delay="60s" stonith-timeout="60s" failed-stop-offset="INFINITY" failed-start-offset="INFINITY"  transition_id="0">
+  <synapse id="0">
+    <action_set>
+      <rsc_op id="17" operation="start" operation_key="prmDummy_start_0" on_node="bl460g1n6" on_node_uuid="3232261592">
+        <primitive id="prmDummy" class="ocf" provider="pacemaker" type="Dummy"/>
+        <attributes CRM_meta_record_pending="true" CRM_meta_timeout="20000" />
+      </rsc_op>
+    </action_set>
+    <inputs>
+      <trigger>
+        <pseudo_event id="16" operation="stop" operation_key="prmDummy_stop_0"/>
+      </trigger>
+      <trigger>
+        <pseudo_event id="74" operation="stonith_complete" operation_key="stonith_complete"/>
+      </trigger>
+    </inputs>
+  </synapse>
+  <synapse id="1">
+    <action_set>
+      <pseudo_event id="16" operation="stop" operation_key="prmDummy_stop_0">
+        <attributes CRM_meta_record_pending="true" CRM_meta_timeout="20000" />
+      </pseudo_event>
+    </action_set>
+    <inputs>
+      <trigger>
+        <crm_event id="75" operation="stonith" operation_key="stonith-bl460g1n7-reboot" on_node="bl460g1n7" on_node_uuid="3232261593"/>
+      </trigger>
+    </inputs>
+  </synapse>
+  <synapse id="2">
+    <action_set>
+      <rsc_op id="20" operation="monitor" operation_key="prmVM2_monitor_10000" on_node="bl460g1n8" on_node_uuid="3232261594">
+        <primitive id="prmVM2" class="ocf" provider="heartbeat" type="VirtualDomain"/>
+        <attributes CRM_meta_interval="10000" CRM_meta_name="monitor" CRM_meta_on_fail="restart" CRM_meta_record_pending="true" CRM_meta_timeout="30000" config="/migrate_test/config/vm2.xml"  hypervisor="qemu:///system" migration_transport="ssh"/>
+      </rsc_op>
+    </action_set>
+    <inputs>
+      <trigger>
+        <rsc_op id="19" operation="start" operation_key="prmVM2_start_0" on_node="bl460g1n8" on_node_uuid="3232261594"/>
+      </trigger>
+    </inputs>
+  </synapse>
+  <synapse id="3">
+    <action_set>
+      <rsc_op id="19" operation="start" operation_key="prmVM2_start_0" on_node="bl460g1n8" on_node_uuid="3232261594">
+        <primitive id="prmVM2" class="ocf" provider="heartbeat" type="VirtualDomain"/>
+        <attributes CRM_meta_name="start" CRM_meta_on_fail="restart" CRM_meta_record_pending="true" CRM_meta_timeout="120000" config="/migrate_test/config/vm2.xml"  hypervisor="qemu:///system" migration_transport="ssh"/>
+      </rsc_op>
+    </action_set>
+    <inputs>
+      <trigger>
+        <rsc_op id="1" operation="stop" operation_key="prmVM2_stop_0" on_node="bl460g1n6" on_node_uuid="3232261592"/>
+      </trigger>
+      <trigger>
+        <pseudo_event id="18" operation="stop" operation_key="prmVM2_stop_0"/>
+      </trigger>
+      <trigger>
+        <pseudo_event id="74" operation="stonith_complete" operation_key="stonith_complete"/>
+      </trigger>
+    </inputs>
+  </synapse>
+  <synapse id="4">
+    <action_set>
+      <pseudo_event id="18" operation="stop" operation_key="prmVM2_stop_0">
+        <attributes CRM_meta_name="stop" CRM_meta_on_fail="fence" CRM_meta_record_pending="true" CRM_meta_timeout="120000" config="/migrate_test/config/vm2.xml"  hypervisor="qemu:///system" migration_transport="ssh"/>
+      </pseudo_event>
+    </action_set>
+    <inputs>
+      <trigger>
+        <crm_event id="75" operation="stonith" operation_key="stonith-bl460g1n7-reboot" on_node="bl460g1n7" on_node_uuid="3232261593"/>
+      </trigger>
+    </inputs>
+  </synapse>
+  <synapse id="5">
+    <action_set>
+      <rsc_op id="1" operation="stop" operation_key="prmVM2_stop_0" on_node="bl460g1n6" on_node_uuid="3232261592">
+        <primitive id="prmVM2" class="ocf" provider="heartbeat" type="VirtualDomain"/>
+        <attributes CRM_meta_name="stop" CRM_meta_on_fail="fence" CRM_meta_record_pending="true" CRM_meta_timeout="120000" config="/migrate_test/config/vm2.xml"  hypervisor="qemu:///system" migration_transport="ssh"/>
+      </rsc_op>
+    </action_set>
+    <inputs/>
+  </synapse>
+  <synapse id="6">
+    <action_set>
+      <pseudo_event id="46" operation="stopped" operation_key="grpStonith8_stopped_0">
+        <attributes CRM_meta_record_pending="true" CRM_meta_timeout="20000" />
+      </pseudo_event>
+    </action_set>
+    <inputs>
+      <trigger>
+        <pseudo_event id="37" operation="stop" operation_key="prmStonith8-1_stop_0"/>
+      </trigger>
+      <trigger>
+        <pseudo_event id="40" operation="stop" operation_key="prmStonith8-2_stop_0"/>
+      </trigger>
+      <trigger>
+        <pseudo_event id="45" operation="stop" operation_key="grpStonith8_stop_0"/>
+      </trigger>
+    </inputs>
+  </synapse>
+  <synapse id="7">
+    <action_set>
+      <pseudo_event id="45" operation="stop" operation_key="grpStonith8_stop_0">
+        <attributes CRM_meta_record_pending="true" CRM_meta_timeout="20000" />
+      </pseudo_event>
+    </action_set>
+    <inputs>
+      <trigger>
+        <crm_event id="75" operation="stonith" operation_key="stonith-bl460g1n7-reboot" on_node="bl460g1n7" on_node_uuid="3232261593"/>
+      </trigger>
+    </inputs>
+  </synapse>
+  <synapse id="8">
+    <action_set>
+      <pseudo_event id="44" operation="running" operation_key="grpStonith8_running_0">
+        <attributes CRM_meta_record_pending="true" CRM_meta_timeout="20000" />
+      </pseudo_event>
+    </action_set>
+    <inputs>
+      <trigger>
+        <rsc_op id="38" operation="start" operation_key="prmStonith8-1_start_0" on_node="bl460g1n6" on_node_uuid="3232261592"/>
+      </trigger>
+      <trigger>
+        <rsc_op id="41" operation="start" operation_key="prmStonith8-2_start_0" on_node="bl460g1n6" on_node_uuid="3232261592"/>
+      </trigger>
+      <trigger>
+        <pseudo_event id="43" operation="start" operation_key="grpStonith8_start_0"/>
+      </trigger>
+    </inputs>
+  </synapse>
+  <synapse id="9">
+    <action_set>
+      <pseudo_event id="43" operation="start" operation_key="grpStonith8_start_0">
+        <attributes CRM_meta_record_pending="true" CRM_meta_timeout="20000" />
+      </pseudo_event>
+    </action_set>
+    <inputs>
+      <trigger>
+        <pseudo_event id="46" operation="stopped" operation_key="grpStonith8_stopped_0"/>
+      </trigger>
+    </inputs>
+  </synapse>
+  <synapse id="10">
+    <action_set>
+      <rsc_op id="39" operation="monitor" operation_key="prmStonith8-1_monitor_10000" on_node="bl460g1n6" on_node_uuid="3232261592">
+        <primitive id="prmStonith8-1" class="stonith" type="external/stonith-helper"/>
+        <attributes CRM_meta_interval="10000" CRM_meta_name="monitor" CRM_meta_on_fail="restart" CRM_meta_record_pending="true" CRM_meta_timeout="60000"  dead_check_target="192.168.133.218 192.168.101.218 192.168.102.218 192.168.201.218 192.168.133.238" hostlist="bl460g1n8" pcmk_reboot_retries="1" pcmk_reboot_timeout="40s" run_standby_wait="no"/>
+      </rsc_op>
+    </action_set>
+    <inputs>
+      <trigger>
+        <rsc_op id="38" operation="start" operation_key="prmStonith8-1_start_0" on_node="bl460g1n6" on_node_uuid="3232261592"/>
+      </trigger>
+    </inputs>
+  </synapse>
+  <synapse id="11">
+    <action_set>
+      <rsc_op id="38" operation="start" operation_key="prmStonith8-1_start_0" on_node="bl460g1n6" on_node_uuid="3232261592">
+        <primitive id="prmStonith8-1" class="stonith" type="external/stonith-helper"/>
+        <attributes CRM_meta_name="start" CRM_meta_on_fail="restart" CRM_meta_record_pending="true" CRM_meta_timeout="60000"  dead_check_target="192.168.133.218 192.168.101.218 192.168.102.218 192.168.201.218 192.168.133.238" hostlist="bl460g1n8" pcmk_reboot_retries="1" pcmk_reboot_timeout="40s" run_standby_wait="no"/>
+      </rsc_op>
+    </action_set>
+    <inputs>
+      <trigger>
+        <pseudo_event id="37" operation="stop" operation_key="prmStonith8-1_stop_0"/>
+      </trigger>
+      <trigger>
+        <pseudo_event id="43" operation="start" operation_key="grpStonith8_start_0"/>
+      </trigger>
+      <trigger>
+        <pseudo_event id="74" operation="stonith_complete" operation_key="stonith_complete"/>
+      </trigger>
+    </inputs>
+  </synapse>
+  <synapse id="12">
+    <action_set>
+      <pseudo_event id="37" operation="stop" operation_key="prmStonith8-1_stop_0">
+        <attributes CRM_meta_name="stop" CRM_meta_on_fail="ignore" CRM_meta_record_pending="true" CRM_meta_timeout="60000"  dead_check_target="192.168.133.218 192.168.101.218 192.168.102.218 192.168.201.218 192.168.133.238" hostlist="bl460g1n8" pcmk_reboot_retries="1" pcmk_reboot_timeout="40s" run_standby_wait="no"/>
+      </pseudo_event>
+    </action_set>
+    <inputs>
+      <trigger>
+        <pseudo_event id="40" operation="stop" operation_key="prmStonith8-2_stop_0"/>
+      </trigger>
+      <trigger>
+        <pseudo_event id="45" operation="stop" operation_key="grpStonith8_stop_0"/>
+      </trigger>
+      <trigger>
+        <crm_event id="75" operation="stonith" operation_key="stonith-bl460g1n7-reboot" on_node="bl460g1n7" on_node_uuid="3232261593"/>
+      </trigger>
+    </inputs>
+  </synapse>
+  <synapse id="13">
+    <action_set>
+      <rsc_op id="42" operation="monitor" operation_key="prmStonith8-2_monitor_3600000" on_node="bl460g1n6" on_node_uuid="3232261592">
+        <primitive id="prmStonith8-2" class="stonith" type="external/ipmi"/>
+        <attributes CRM_meta_interval="3600000" CRM_meta_name="monitor" CRM_meta_on_fail="restart" CRM_meta_record_pending="true" CRM_meta_timeout="60000"  hostname="bl460g1n8" interface="lanplus" ipaddr="192.168.133.238" passwd="PASSW0RD" pcmk_reboot_retries="1" pcmk_reboot_timeout="60s" userid="USERID"/>
+      </rsc_op>
+    </action_set>
+    <inputs>
+      <trigger>
+        <rsc_op id="41" operation="start" operation_key="prmStonith8-2_start_0" on_node="bl460g1n6" on_node_uuid="3232261592"/>
+      </trigger>
+    </inputs>
+  </synapse>
+  <synapse id="14">
+    <action_set>
+      <rsc_op id="41" operation="start" operation_key="prmStonith8-2_start_0" on_node="bl460g1n6" on_node_uuid="3232261592">
+        <primitive id="prmStonith8-2" class="stonith" type="external/ipmi"/>
+        <attributes CRM_meta_name="start" CRM_meta_on_fail="restart" CRM_meta_record_pending="true" CRM_meta_timeout="60000"  hostname="bl460g1n8" interface="lanplus" ipaddr="192.168.133.238" passwd="PASSW0RD" pcmk_reboot_retries="1" pcmk_reboot_timeout="60s" userid="USERID"/>
+      </rsc_op>
+    </action_set>
+    <inputs>
+      <trigger>
+        <rsc_op id="38" operation="start" operation_key="prmStonith8-1_start_0" on_node="bl460g1n6" on_node_uuid="3232261592"/>
+      </trigger>
+      <trigger>
+        <pseudo_event id="40" operation="stop" operation_key="prmStonith8-2_stop_0"/>
+      </trigger>
+      <trigger>
+        <pseudo_event id="43" operation="start" operation_key="grpStonith8_start_0"/>
+      </trigger>
+      <trigger>
+        <pseudo_event id="74" operation="stonith_complete" operation_key="stonith_complete"/>
+      </trigger>
+    </inputs>
+  </synapse>
+  <synapse id="15">
+    <action_set>
+      <pseudo_event id="40" operation="stop" operation_key="prmStonith8-2_stop_0">
+        <attributes CRM_meta_name="stop" CRM_meta_on_fail="ignore" CRM_meta_record_pending="true" CRM_meta_timeout="60000"  hostname="bl460g1n8" interface="lanplus" ipaddr="192.168.133.238" passwd="PASSW0RD" pcmk_reboot_retries="1" pcmk_reboot_timeout="60s" userid="USERID"/>
+      </pseudo_event>
+    </action_set>
+    <inputs>
+      <trigger>
+        <pseudo_event id="45" operation="stop" operation_key="grpStonith8_stop_0"/>
+      </trigger>
+      <trigger>
+        <crm_event id="75" operation="stonith" operation_key="stonith-bl460g1n7-reboot" on_node="bl460g1n7" on_node_uuid="3232261593"/>
+      </trigger>
+    </inputs>
+  </synapse>
+  <synapse id="16">
+    <action_set>
+      <pseudo_event id="47" operation="stop" operation_key="prmDiskd1_stop_0" internal_operation_key="prmDiskd1:0_stop_0">
+        <attributes CRM_meta_clone="0" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_name="stop" CRM_meta_notify="false" CRM_meta_on_fail="ignore" CRM_meta_record_pending="true" CRM_meta_timeout="60000"  device="/dev/mapper/lun1" interval="10" name="diskcheck_status" options="-e"/>
+      </pseudo_event>
+    </action_set>
+    <inputs>
+      <trigger>
+        <pseudo_event id="54" operation="stop" operation_key="clnDiskd1_stop_0"/>
+      </trigger>
+      <trigger>
+        <crm_event id="75" operation="stonith" operation_key="stonith-bl460g1n7-reboot" on_node="bl460g1n7" on_node_uuid="3232261593"/>
+      </trigger>
+    </inputs>
+  </synapse>
+  <synapse id="17" priority="1000000">
+    <action_set>
+      <pseudo_event id="55" operation="stopped" operation_key="clnDiskd1_stopped_0">
+        <attributes CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_record_pending="true" CRM_meta_timeout="20000" />
+      </pseudo_event>
+    </action_set>
+    <inputs>
+      <trigger>
+        <pseudo_event id="47" operation="stop" operation_key="prmDiskd1_stop_0" internal_operation_key="prmDiskd1:0_stop_0"/>
+      </trigger>
+      <trigger>
+        <pseudo_event id="54" operation="stop" operation_key="clnDiskd1_stop_0"/>
+      </trigger>
+    </inputs>
+  </synapse>
+  <synapse id="18">
+    <action_set>
+      <pseudo_event id="54" operation="stop" operation_key="clnDiskd1_stop_0">
+        <attributes CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_record_pending="true" CRM_meta_timeout="20000" />
+      </pseudo_event>
+    </action_set>
+    <inputs>
+      <trigger>
+        <crm_event id="75" operation="stonith" operation_key="stonith-bl460g1n7-reboot" on_node="bl460g1n7" on_node_uuid="3232261593"/>
+      </trigger>
+    </inputs>
+  </synapse>
+  <synapse id="19">
+    <action_set>
+      <pseudo_event id="56" operation="stop" operation_key="prmDiskd2_stop_0" internal_operation_key="prmDiskd2:0_stop_0">
+        <attributes CRM_meta_clone="0" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_name="stop" CRM_meta_notify="false" CRM_meta_on_fail="ignore" CRM_meta_record_pending="true" CRM_meta_timeout="60000"  interval="10" name="diskcheck_status_internal" write_dir="/tmp/tmp2"/>
+      </pseudo_event>
+    </action_set>
+    <inputs>
+      <trigger>
+        <pseudo_event id="63" operation="stop" operation_key="clnDiskd2_stop_0"/>
+      </trigger>
+      <trigger>
+        <crm_event id="75" operation="stonith" operation_key="stonith-bl460g1n7-reboot" on_node="bl460g1n7" on_node_uuid="3232261593"/>
+      </trigger>
+    </inputs>
+  </synapse>
+  <synapse id="20" priority="1000000">
+    <action_set>
+      <pseudo_event id="64" operation="stopped" operation_key="clnDiskd2_stopped_0">
+        <attributes CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_record_pending="true" CRM_meta_timeout="20000" />
+      </pseudo_event>
+    </action_set>
+    <inputs>
+      <trigger>
+        <pseudo_event id="56" operation="stop" operation_key="prmDiskd2_stop_0" internal_operation_key="prmDiskd2:0_stop_0"/>
+      </trigger>
+      <trigger>
+        <pseudo_event id="63" operation="stop" operation_key="clnDiskd2_stop_0"/>
+      </trigger>
+    </inputs>
+  </synapse>
+  <synapse id="21">
+    <action_set>
+      <pseudo_event id="63" operation="stop" operation_key="clnDiskd2_stop_0">
+        <attributes CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_record_pending="true" CRM_meta_timeout="20000" />
+      </pseudo_event>
+    </action_set>
+    <inputs>
+      <trigger>
+        <crm_event id="75" operation="stonith" operation_key="stonith-bl460g1n7-reboot" on_node="bl460g1n7" on_node_uuid="3232261593"/>
+      </trigger>
+    </inputs>
+  </synapse>
+  <synapse id="22">
+    <action_set>
+      <pseudo_event id="65" operation="stop" operation_key="prmPing_stop_0" internal_operation_key="prmPing:0_stop_0">
+        <attributes CRM_meta_clone="0" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_name="stop" CRM_meta_notify="false" CRM_meta_on_fail="ignore" CRM_meta_record_pending="true" CRM_meta_timeout="60000" attempts="2"  host_list="192.168.201.254" multiplier="100" name="default_ping_set" timeout="2"/>
+      </pseudo_event>
+    </action_set>
+    <inputs>
+      <trigger>
+        <pseudo_event id="72" operation="stop" operation_key="clnPing_stop_0"/>
+      </trigger>
+      <trigger>
+        <crm_event id="75" operation="stonith" operation_key="stonith-bl460g1n7-reboot" on_node="bl460g1n7" on_node_uuid="3232261593"/>
+      </trigger>
+    </inputs>
+  </synapse>
+  <synapse id="23" priority="1000000">
+    <action_set>
+      <pseudo_event id="73" operation="stopped" operation_key="clnPing_stopped_0">
+        <attributes CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_record_pending="true" CRM_meta_timeout="20000" />
+      </pseudo_event>
+    </action_set>
+    <inputs>
+      <trigger>
+        <pseudo_event id="65" operation="stop" operation_key="prmPing_stop_0" internal_operation_key="prmPing:0_stop_0"/>
+      </trigger>
+      <trigger>
+        <pseudo_event id="72" operation="stop" operation_key="clnPing_stop_0"/>
+      </trigger>
+    </inputs>
+  </synapse>
+  <synapse id="24">
+    <action_set>
+      <pseudo_event id="72" operation="stop" operation_key="clnPing_stop_0">
+        <attributes CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_record_pending="true" CRM_meta_timeout="20000" />
+      </pseudo_event>
+    </action_set>
+    <inputs>
+      <trigger>
+        <crm_event id="75" operation="stonith" operation_key="stonith-bl460g1n7-reboot" on_node="bl460g1n7" on_node_uuid="3232261593"/>
+      </trigger>
+    </inputs>
+  </synapse>
+  <synapse id="25">
+    <action_set>
+      <crm_event id="75" operation="stonith" operation_key="stonith-bl460g1n7-reboot" on_node="bl460g1n7" on_node_uuid="3232261593">
+        <attributes CRM_meta_default_ping_set="100" CRM_meta_diskcheck_status="normal" CRM_meta_diskcheck_status_internal="normal" CRM_meta_on_node="bl460g1n7" CRM_meta_on_node_uuid="3232261593" CRM_meta_probe_complete="true" CRM_meta_ringnumber_0="192.168.101.217 is UP" CRM_meta_ringnumber_1="192.168.102.217 is UP" CRM_meta_shutdown="0" CRM_meta_stonith_action="reboot" />
+      </crm_event>
+    </action_set>
+    <inputs/>
+  </synapse>
+  <synapse id="26">
+    <action_set>
+      <pseudo_event id="74" operation="stonith_complete" operation_key="stonith_complete">
+        <attributes />
+      </pseudo_event>
+    </action_set>
+    <inputs>
+      <trigger>
+        <crm_event id="75" operation="stonith" operation_key="stonith-bl460g1n7-reboot" on_node="bl460g1n7" on_node_uuid="3232261593"/>
+      </trigger>
+    </inputs>
+  </synapse>
+  <synapse id="27">
+    <action_set>
+      <pseudo_event id="12" operation="all_stopped" operation_key="all_stopped">
+        <attributes />
+      </pseudo_event>
+    </action_set>
+    <inputs>
+      <trigger>
+        <rsc_op id="1" operation="stop" operation_key="prmVM2_stop_0" on_node="bl460g1n6" on_node_uuid="3232261592"/>
+      </trigger>
+      <trigger>
+        <pseudo_event id="16" operation="stop" operation_key="prmDummy_stop_0"/>
+      </trigger>
+      <trigger>
+        <pseudo_event id="18" operation="stop" operation_key="prmVM2_stop_0"/>
+      </trigger>
+      <trigger>
+        <pseudo_event id="37" operation="stop" operation_key="prmStonith8-1_stop_0"/>
+      </trigger>
+      <trigger>
+        <pseudo_event id="40" operation="stop" operation_key="prmStonith8-2_stop_0"/>
+      </trigger>
+      <trigger>
+        <pseudo_event id="47" operation="stop" operation_key="prmDiskd1_stop_0" internal_operation_key="prmDiskd1:0_stop_0"/>
+      </trigger>
+      <trigger>
+        <pseudo_event id="56" operation="stop" operation_key="prmDiskd2_stop_0" internal_operation_key="prmDiskd2:0_stop_0"/>
+      </trigger>
+      <trigger>
+        <pseudo_event id="65" operation="stop" operation_key="prmPing_stop_0" internal_operation_key="prmPing:0_stop_0"/>
+      </trigger>
+      <trigger>
+        <pseudo_event id="74" operation="stonith_complete" operation_key="stonith_complete"/>
+      </trigger>
+    </inputs>
+  </synapse>
+</transition_graph>
diff --git a/pengine/test10/bug-lf-2508.exp b/pengine/test10/bug-lf-2508.exp
index 3e54b30..d56002e 100644
--- a/pengine/test10/bug-lf-2508.exp
+++ b/pengine/test10/bug-lf-2508.exp
@@ -74,7 +74,7 @@
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="166" operation="stonith" operation_key="stonith-srv02" on_node="srv02" on_node_uuid="71085d5e-1c63-49e0-8c8c-400d610b4182"/>
+        <crm_event id="166" operation="stonith" operation_key="stonith-srv02-reboot" on_node="srv02" on_node_uuid="71085d5e-1c63-49e0-8c8c-400d610b4182"/>
       </trigger>
     </inputs>
   </synapse>
@@ -148,7 +148,7 @@
         <pseudo_event id="34" operation="stop" operation_key="Group02_stop_0"/>
       </trigger>
       <trigger>
-        <crm_event id="166" operation="stonith" operation_key="stonith-srv02" on_node="srv02" on_node_uuid="71085d5e-1c63-49e0-8c8c-400d610b4182"/>
+        <crm_event id="166" operation="stonith" operation_key="stonith-srv02-reboot" on_node="srv02" on_node_uuid="71085d5e-1c63-49e0-8c8c-400d610b4182"/>
       </trigger>
     </inputs>
   </synapse>
@@ -196,7 +196,7 @@
         <pseudo_event id="54" operation="stop" operation_key="grpStonith1:1_stop_0"/>
       </trigger>
       <trigger>
-        <crm_event id="166" operation="stonith" operation_key="stonith-srv02" on_node="srv02" on_node_uuid="71085d5e-1c63-49e0-8c8c-400d610b4182"/>
+        <crm_event id="166" operation="stonith" operation_key="stonith-srv02-reboot" on_node="srv02" on_node_uuid="71085d5e-1c63-49e0-8c8c-400d610b4182"/>
       </trigger>
     </inputs>
   </synapse>
@@ -211,7 +211,7 @@
         <pseudo_event id="54" operation="stop" operation_key="grpStonith1:1_stop_0"/>
       </trigger>
       <trigger>
-        <crm_event id="166" operation="stonith" operation_key="stonith-srv02" on_node="srv02" on_node_uuid="71085d5e-1c63-49e0-8c8c-400d610b4182"/>
+        <crm_event id="166" operation="stonith" operation_key="stonith-srv02-reboot" on_node="srv02" on_node_uuid="71085d5e-1c63-49e0-8c8c-400d610b4182"/>
       </trigger>
     </inputs>
   </synapse>
@@ -238,7 +238,7 @@
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="166" operation="stonith" operation_key="stonith-srv02" on_node="srv02" on_node_uuid="71085d5e-1c63-49e0-8c8c-400d610b4182"/>
+        <crm_event id="166" operation="stonith" operation_key="stonith-srv02-reboot" on_node="srv02" on_node_uuid="71085d5e-1c63-49e0-8c8c-400d610b4182"/>
       </trigger>
     </inputs>
   </synapse>
@@ -286,7 +286,7 @@
         <pseudo_event id="108" operation="stop" operation_key="grpStonith3:0_stop_0"/>
       </trigger>
       <trigger>
-        <crm_event id="166" operation="stonith" operation_key="stonith-srv02" on_node="srv02" on_node_uuid="71085d5e-1c63-49e0-8c8c-400d610b4182"/>
+        <crm_event id="166" operation="stonith" operation_key="stonith-srv02-reboot" on_node="srv02" on_node_uuid="71085d5e-1c63-49e0-8c8c-400d610b4182"/>
       </trigger>
     </inputs>
   </synapse>
@@ -301,7 +301,7 @@
         <pseudo_event id="108" operation="stop" operation_key="grpStonith3:0_stop_0"/>
       </trigger>
       <trigger>
-        <crm_event id="166" operation="stonith" operation_key="stonith-srv02" on_node="srv02" on_node_uuid="71085d5e-1c63-49e0-8c8c-400d610b4182"/>
+        <crm_event id="166" operation="stonith" operation_key="stonith-srv02-reboot" on_node="srv02" on_node_uuid="71085d5e-1c63-49e0-8c8c-400d610b4182"/>
       </trigger>
     </inputs>
   </synapse>
@@ -393,7 +393,7 @@
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="166" operation="stonith" operation_key="stonith-srv02" on_node="srv02" on_node_uuid="71085d5e-1c63-49e0-8c8c-400d610b4182"/>
+        <crm_event id="166" operation="stonith" operation_key="stonith-srv02-reboot" on_node="srv02" on_node_uuid="71085d5e-1c63-49e0-8c8c-400d610b4182"/>
       </trigger>
     </inputs>
   </synapse>
@@ -468,7 +468,7 @@
         <pseudo_event id="147" operation="stop" operation_key="grpStonith4:1_stop_0"/>
       </trigger>
       <trigger>
-        <crm_event id="166" operation="stonith" operation_key="stonith-srv02" on_node="srv02" on_node_uuid="71085d5e-1c63-49e0-8c8c-400d610b4182"/>
+        <crm_event id="166" operation="stonith" operation_key="stonith-srv02-reboot" on_node="srv02" on_node_uuid="71085d5e-1c63-49e0-8c8c-400d610b4182"/>
       </trigger>
     </inputs>
   </synapse>
@@ -483,7 +483,7 @@
         <pseudo_event id="147" operation="stop" operation_key="grpStonith4:1_stop_0"/>
       </trigger>
       <trigger>
-        <crm_event id="166" operation="stonith" operation_key="stonith-srv02" on_node="srv02" on_node_uuid="71085d5e-1c63-49e0-8c8c-400d610b4182"/>
+        <crm_event id="166" operation="stonith" operation_key="stonith-srv02-reboot" on_node="srv02" on_node_uuid="71085d5e-1c63-49e0-8c8c-400d610b4182"/>
       </trigger>
     </inputs>
   </synapse>
@@ -510,13 +510,13 @@
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="166" operation="stonith" operation_key="stonith-srv02" on_node="srv02" on_node_uuid="71085d5e-1c63-49e0-8c8c-400d610b4182"/>
+        <crm_event id="166" operation="stonith" operation_key="stonith-srv02-reboot" on_node="srv02" on_node_uuid="71085d5e-1c63-49e0-8c8c-400d610b4182"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="36">
     <action_set>
-      <crm_event id="166" operation="stonith" operation_key="stonith-srv02" on_node="srv02" on_node_uuid="71085d5e-1c63-49e0-8c8c-400d610b4182">
+      <crm_event id="166" operation="stonith" operation_key="stonith-srv02-reboot" on_node="srv02" on_node_uuid="71085d5e-1c63-49e0-8c8c-400d610b4182">
         <attributes CRM_meta_on_node="srv02" CRM_meta_on_node_uuid="71085d5e-1c63-49e0-8c8c-400d610b4182" CRM_meta_probe_complete="true" CRM_meta_stonith_action="reboot" crm_feature_set="3.0.7"/>
       </crm_event>
     </action_set>
@@ -530,7 +530,7 @@
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="166" operation="stonith" operation_key="stonith-srv02" on_node="srv02" on_node_uuid="71085d5e-1c63-49e0-8c8c-400d610b4182"/>
+        <crm_event id="166" operation="stonith" operation_key="stonith-srv02-reboot" on_node="srv02" on_node_uuid="71085d5e-1c63-49e0-8c8c-400d610b4182"/>
       </trigger>
     </inputs>
   </synapse>
diff --git a/pengine/test10/bug-lf-2551.exp b/pengine/test10/bug-lf-2551.exp
index 5c2fd65..7790199 100644
--- a/pengine/test10/bug-lf-2551.exp
+++ b/pengine/test10/bug-lf-2551.exp
@@ -23,7 +23,7 @@
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="249" operation="stonith" operation_key="stonith-hex-9" on_node="hex-9" on_node_uuid="hex-9"/>
+        <crm_event id="249" operation="stonith" operation_key="stonith-hex-9-reboot" on_node="hex-9" on_node_uuid="hex-9"/>
       </trigger>
     </inputs>
   </synapse>
@@ -82,7 +82,7 @@
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="249" operation="stonith" operation_key="stonith-hex-9" on_node="hex-9" on_node_uuid="hex-9"/>
+        <crm_event id="249" operation="stonith" operation_key="stonith-hex-9-reboot" on_node="hex-9" on_node_uuid="hex-9"/>
       </trigger>
     </inputs>
   </synapse>
@@ -142,7 +142,7 @@
         <pseudo_event id="226" operation="stop" operation_key="base-group:3_stop_0"/>
       </trigger>
       <trigger>
-        <crm_event id="249" operation="stonith" operation_key="stonith-hex-9" on_node="hex-9" on_node_uuid="hex-9"/>
+        <crm_event id="249" operation="stonith" operation_key="stonith-hex-9-reboot" on_node="hex-9" on_node_uuid="hex-9"/>
       </trigger>
     </inputs>
   </synapse>
@@ -160,7 +160,7 @@
         <pseudo_event id="226" operation="stop" operation_key="base-group:3_stop_0"/>
       </trigger>
       <trigger>
-        <crm_event id="249" operation="stonith" operation_key="stonith-hex-9" on_node="hex-9" on_node_uuid="hex-9"/>
+        <crm_event id="249" operation="stonith" operation_key="stonith-hex-9-reboot" on_node="hex-9" on_node_uuid="hex-9"/>
       </trigger>
     </inputs>
   </synapse>
@@ -178,7 +178,7 @@
         <pseudo_event id="226" operation="stop" operation_key="base-group:3_stop_0"/>
       </trigger>
       <trigger>
-        <crm_event id="249" operation="stonith" operation_key="stonith-hex-9" on_node="hex-9" on_node_uuid="hex-9"/>
+        <crm_event id="249" operation="stonith" operation_key="stonith-hex-9-reboot" on_node="hex-9" on_node_uuid="hex-9"/>
       </trigger>
     </inputs>
   </synapse>
@@ -196,7 +196,7 @@
         <pseudo_event id="226" operation="stop" operation_key="base-group:3_stop_0"/>
       </trigger>
       <trigger>
-        <crm_event id="249" operation="stonith" operation_key="stonith-hex-9" on_node="hex-9" on_node_uuid="hex-9"/>
+        <crm_event id="249" operation="stonith" operation_key="stonith-hex-9-reboot" on_node="hex-9" on_node_uuid="hex-9"/>
       </trigger>
     </inputs>
   </synapse>
@@ -214,7 +214,7 @@
         <pseudo_event id="226" operation="stop" operation_key="base-group:3_stop_0"/>
       </trigger>
       <trigger>
-        <crm_event id="249" operation="stonith" operation_key="stonith-hex-9" on_node="hex-9" on_node_uuid="hex-9"/>
+        <crm_event id="249" operation="stonith" operation_key="stonith-hex-9-reboot" on_node="hex-9" on_node_uuid="hex-9"/>
       </trigger>
     </inputs>
   </synapse>
@@ -229,7 +229,7 @@
         <pseudo_event id="226" operation="stop" operation_key="base-group:3_stop_0"/>
       </trigger>
       <trigger>
-        <crm_event id="249" operation="stonith" operation_key="stonith-hex-9" on_node="hex-9" on_node_uuid="hex-9"/>
+        <crm_event id="249" operation="stonith" operation_key="stonith-hex-9-reboot" on_node="hex-9" on_node_uuid="hex-9"/>
       </trigger>
     </inputs>
   </synapse>
@@ -304,7 +304,7 @@
         <pseudo_event id="247" operation="stop" operation_key="vm-61_stop_0"/>
       </trigger>
       <trigger>
-        <crm_event id="249" operation="stonith" operation_key="stonith-hex-9" on_node="hex-9" on_node_uuid="hex-9"/>
+        <crm_event id="249" operation="stonith" operation_key="stonith-hex-9-reboot" on_node="hex-9" on_node_uuid="hex-9"/>
       </trigger>
     </inputs>
   </synapse>
@@ -316,7 +316,7 @@
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="249" operation="stonith" operation_key="stonith-hex-9" on_node="hex-9" on_node_uuid="hex-9"/>
+        <crm_event id="249" operation="stonith" operation_key="stonith-hex-9-reboot" on_node="hex-9" on_node_uuid="hex-9"/>
       </trigger>
     </inputs>
   </synapse>
@@ -328,7 +328,7 @@
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="249" operation="stonith" operation_key="stonith-hex-9" on_node="hex-9" on_node_uuid="hex-9"/>
+        <crm_event id="249" operation="stonith" operation_key="stonith-hex-9-reboot" on_node="hex-9" on_node_uuid="hex-9"/>
       </trigger>
     </inputs>
   </synapse>
@@ -340,7 +340,7 @@
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="249" operation="stonith" operation_key="stonith-hex-9" on_node="hex-9" on_node_uuid="hex-9"/>
+        <crm_event id="249" operation="stonith" operation_key="stonith-hex-9-reboot" on_node="hex-9" on_node_uuid="hex-9"/>
       </trigger>
     </inputs>
   </synapse>
@@ -352,7 +352,7 @@
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="249" operation="stonith" operation_key="stonith-hex-9" on_node="hex-9" on_node_uuid="hex-9"/>
+        <crm_event id="249" operation="stonith" operation_key="stonith-hex-9-reboot" on_node="hex-9" on_node_uuid="hex-9"/>
       </trigger>
     </inputs>
   </synapse>
@@ -364,7 +364,7 @@
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="249" operation="stonith" operation_key="stonith-hex-9" on_node="hex-9" on_node_uuid="hex-9"/>
+        <crm_event id="249" operation="stonith" operation_key="stonith-hex-9-reboot" on_node="hex-9" on_node_uuid="hex-9"/>
       </trigger>
     </inputs>
   </synapse>
@@ -376,7 +376,7 @@
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="249" operation="stonith" operation_key="stonith-hex-9" on_node="hex-9" on_node_uuid="hex-9"/>
+        <crm_event id="249" operation="stonith" operation_key="stonith-hex-9-reboot" on_node="hex-9" on_node_uuid="hex-9"/>
       </trigger>
     </inputs>
   </synapse>
@@ -388,7 +388,7 @@
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="249" operation="stonith" operation_key="stonith-hex-9" on_node="hex-9" on_node_uuid="hex-9"/>
+        <crm_event id="249" operation="stonith" operation_key="stonith-hex-9-reboot" on_node="hex-9" on_node_uuid="hex-9"/>
       </trigger>
     </inputs>
   </synapse>
@@ -400,7 +400,7 @@
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="249" operation="stonith" operation_key="stonith-hex-9" on_node="hex-9" on_node_uuid="hex-9"/>
+        <crm_event id="249" operation="stonith" operation_key="stonith-hex-9-reboot" on_node="hex-9" on_node_uuid="hex-9"/>
       </trigger>
     </inputs>
   </synapse>
@@ -412,7 +412,7 @@
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="249" operation="stonith" operation_key="stonith-hex-9" on_node="hex-9" on_node_uuid="hex-9"/>
+        <crm_event id="249" operation="stonith" operation_key="stonith-hex-9-reboot" on_node="hex-9" on_node_uuid="hex-9"/>
       </trigger>
     </inputs>
   </synapse>
@@ -424,7 +424,7 @@
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="249" operation="stonith" operation_key="stonith-hex-9" on_node="hex-9" on_node_uuid="hex-9"/>
+        <crm_event id="249" operation="stonith" operation_key="stonith-hex-9-reboot" on_node="hex-9" on_node_uuid="hex-9"/>
       </trigger>
     </inputs>
   </synapse>
@@ -436,7 +436,7 @@
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="249" operation="stonith" operation_key="stonith-hex-9" on_node="hex-9" on_node_uuid="hex-9"/>
+        <crm_event id="249" operation="stonith" operation_key="stonith-hex-9-reboot" on_node="hex-9" on_node_uuid="hex-9"/>
       </trigger>
     </inputs>
   </synapse>
@@ -448,7 +448,7 @@
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="249" operation="stonith" operation_key="stonith-hex-9" on_node="hex-9" on_node_uuid="hex-9"/>
+        <crm_event id="249" operation="stonith" operation_key="stonith-hex-9-reboot" on_node="hex-9" on_node_uuid="hex-9"/>
       </trigger>
     </inputs>
   </synapse>
@@ -460,7 +460,7 @@
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="249" operation="stonith" operation_key="stonith-hex-9" on_node="hex-9" on_node_uuid="hex-9"/>
+        <crm_event id="249" operation="stonith" operation_key="stonith-hex-9-reboot" on_node="hex-9" on_node_uuid="hex-9"/>
       </trigger>
     </inputs>
   </synapse>
@@ -472,7 +472,7 @@
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="249" operation="stonith" operation_key="stonith-hex-9" on_node="hex-9" on_node_uuid="hex-9"/>
+        <crm_event id="249" operation="stonith" operation_key="stonith-hex-9-reboot" on_node="hex-9" on_node_uuid="hex-9"/>
       </trigger>
     </inputs>
   </synapse>
@@ -484,7 +484,7 @@
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="249" operation="stonith" operation_key="stonith-hex-9" on_node="hex-9" on_node_uuid="hex-9"/>
+        <crm_event id="249" operation="stonith" operation_key="stonith-hex-9-reboot" on_node="hex-9" on_node_uuid="hex-9"/>
       </trigger>
     </inputs>
   </synapse>
@@ -496,13 +496,13 @@
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="249" operation="stonith" operation_key="stonith-hex-9" on_node="hex-9" on_node_uuid="hex-9"/>
+        <crm_event id="249" operation="stonith" operation_key="stonith-hex-9-reboot" on_node="hex-9" on_node_uuid="hex-9"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="33">
     <action_set>
-      <crm_event id="249" operation="stonith" operation_key="stonith-hex-9" on_node="hex-9" on_node_uuid="hex-9">
+      <crm_event id="249" operation="stonith" operation_key="stonith-hex-9-reboot" on_node="hex-9" on_node_uuid="hex-9">
         <attributes CRM_meta_on_node="hex-9" CRM_meta_on_node_uuid="hex-9" CRM_meta_probe_complete="true" CRM_meta_standby="off" CRM_meta_stonith_action="reboot" crm_feature_set="3.0.7"/>
       </crm_event>
     </action_set>
@@ -516,7 +516,7 @@
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="249" operation="stonith" operation_key="stonith-hex-9" on_node="hex-9" on_node_uuid="hex-9"/>
+        <crm_event id="249" operation="stonith" operation_key="stonith-hex-9-reboot" on_node="hex-9" on_node_uuid="hex-9"/>
       </trigger>
     </inputs>
   </synapse>
diff --git a/pengine/test10/bug-lf-2606.exp b/pengine/test10/bug-lf-2606.exp
index ae490e6..270131a 100644
--- a/pengine/test10/bug-lf-2606.exp
+++ b/pengine/test10/bug-lf-2606.exp
@@ -7,7 +7,7 @@
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="24" operation="stonith" operation_key="stonith-node2" on_node="node2" on_node_uuid="node2"/>
+        <crm_event id="24" operation="stonith" operation_key="stonith-node2-reboot" on_node="node2" on_node_uuid="node2"/>
       </trigger>
     </inputs>
   </synapse>
@@ -48,7 +48,7 @@
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="24" operation="stonith" operation_key="stonith-node2" on_node="node2" on_node_uuid="node2"/>
+        <crm_event id="24" operation="stonith" operation_key="stonith-node2-reboot" on_node="node2" on_node_uuid="node2"/>
       </trigger>
     </inputs>
   </synapse>
@@ -66,7 +66,7 @@
         <pseudo_event id="17" operation="stop" operation_key="ms3_stop_0"/>
       </trigger>
       <trigger>
-        <crm_event id="24" operation="stonith" operation_key="stonith-node2" on_node="node2" on_node_uuid="node2"/>
+        <crm_event id="24" operation="stonith" operation_key="stonith-node2-reboot" on_node="node2" on_node_uuid="node2"/>
       </trigger>
     </inputs>
   </synapse>
@@ -81,7 +81,7 @@
         <pseudo_event id="21" operation="demote" operation_key="ms3_demote_0"/>
       </trigger>
       <trigger>
-        <crm_event id="24" operation="stonith" operation_key="stonith-node2" on_node="node2" on_node_uuid="node2"/>
+        <crm_event id="24" operation="stonith" operation_key="stonith-node2-reboot" on_node="node2" on_node_uuid="node2"/>
       </trigger>
     </inputs>
   </synapse>
@@ -134,13 +134,13 @@
         <pseudo_event id="22" operation="demoted" operation_key="ms3_demoted_0"/>
       </trigger>
       <trigger>
-        <crm_event id="24" operation="stonith" operation_key="stonith-node2" on_node="node2" on_node_uuid="node2"/>
+        <crm_event id="24" operation="stonith" operation_key="stonith-node2-reboot" on_node="node2" on_node_uuid="node2"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="10">
     <action_set>
-      <crm_event id="24" operation="stonith" operation_key="stonith-node2" on_node="node2" on_node_uuid="node2">
+      <crm_event id="24" operation="stonith" operation_key="stonith-node2-reboot" on_node="node2" on_node_uuid="node2">
         <attributes CRM_meta_on_node="node2" CRM_meta_on_node_uuid="node2" CRM_meta_stonith_action="reboot" crm_feature_set="3.0.7"/>
       </crm_event>
     </action_set>
@@ -154,7 +154,7 @@
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="24" operation="stonith" operation_key="stonith-node2" on_node="node2" on_node_uuid="node2"/>
+        <crm_event id="24" operation="stonith" operation_key="stonith-node2-reboot" on_node="node2" on_node_uuid="node2"/>
       </trigger>
     </inputs>
   </synapse>
diff --git a/pengine/test10/interleave-pseudo-stop.exp b/pengine/test10/interleave-pseudo-stop.exp
index ae5c9a6..a5e8880 100644
--- a/pengine/test10/interleave-pseudo-stop.exp
+++ b/pengine/test10/interleave-pseudo-stop.exp
@@ -10,7 +10,7 @@
         <pseudo_event id="12" operation="stop" operation_key="stonithcloneset_stop_0"/>
        </trigger>
       <trigger>
-        <crm_event id="60" operation="stonith" operation_key="stonith-node1" on_node="node1" on_node_uuid="f6d93040-a9ad-4745-a647-57ed32444ca8"/>
+        <crm_event id="60" operation="stonith" operation_key="stonith-node1-reboot" on_node="node1" on_node_uuid="f6d93040-a9ad-4745-a647-57ed32444ca8"/>
       </trigger>
      </inputs>
    </synapse>
@@ -37,7 +37,7 @@
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="60" operation="stonith" operation_key="stonith-node1" on_node="node1" on_node_uuid="f6d93040-a9ad-4745-a647-57ed32444ca8"/>
+        <crm_event id="60" operation="stonith" operation_key="stonith-node1-reboot" on_node="node1" on_node_uuid="f6d93040-a9ad-4745-a647-57ed32444ca8"/>
       </trigger>
     </inputs>
   </synapse>
@@ -93,7 +93,7 @@
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="60" operation="stonith" operation_key="stonith-node1" on_node="node1" on_node_uuid="f6d93040-a9ad-4745-a647-57ed32444ca8"/>
+        <crm_event id="60" operation="stonith" operation_key="stonith-node1-reboot" on_node="node1" on_node_uuid="f6d93040-a9ad-4745-a647-57ed32444ca8"/>
       </trigger>
      </inputs>
    </synapse>
@@ -114,7 +114,7 @@
         <pseudo_event id="46" operation="stop" operation_key="configstoreclone:0_stop_0" internal_operation_key="configstoreclone:1_stop_0"/>
        </trigger>
        <trigger>
-        <crm_event id="60" operation="stonith" operation_key="stonith-node1" on_node="node1" on_node_uuid="f6d93040-a9ad-4745-a647-57ed32444ca8"/>
+        <crm_event id="60" operation="stonith" operation_key="stonith-node1-reboot" on_node="node1" on_node_uuid="f6d93040-a9ad-4745-a647-57ed32444ca8"/>
        </trigger>
     </inputs>
   </synapse>
@@ -203,7 +203,7 @@
         <pseudo_event id="58" operation="notified" operation_key="configstorecloneset_confirmed-post_notify_stopped_0"/>
       </trigger>
       <trigger>
-        <crm_event id="60" operation="stonith" operation_key="stonith-node1" on_node="node1" on_node_uuid="f6d93040-a9ad-4745-a647-57ed32444ca8"/>
+        <crm_event id="60" operation="stonith" operation_key="stonith-node1-reboot" on_node="node1" on_node_uuid="f6d93040-a9ad-4745-a647-57ed32444ca8"/>
        </trigger>
      </inputs>
    </synapse>
@@ -259,7 +259,7 @@
      </action_set>
      <inputs>
        <trigger>
-        <crm_event id="60" operation="stonith" operation_key="stonith-node1" on_node="node1" on_node_uuid="f6d93040-a9ad-4745-a647-57ed32444ca8"/>
+        <crm_event id="60" operation="stonith" operation_key="stonith-node1-reboot" on_node="node1" on_node_uuid="f6d93040-a9ad-4745-a647-57ed32444ca8"/>
       </trigger>
     </inputs>
   </synapse>
@@ -274,7 +274,7 @@
         <pseudo_event id="38" operation="stop" operation_key="imagestorecloneset_stop_0"/>
       </trigger>
       <trigger>
-        <crm_event id="60" operation="stonith" operation_key="stonith-node1" on_node="node1" on_node_uuid="f6d93040-a9ad-4745-a647-57ed32444ca8"/>
+        <crm_event id="60" operation="stonith" operation_key="stonith-node1-reboot" on_node="node1" on_node_uuid="f6d93040-a9ad-4745-a647-57ed32444ca8"/>
       </trigger>
      </inputs>
    </synapse>
@@ -357,7 +357,7 @@
         <pseudo_event id="41" operation="notified" operation_key="imagestorecloneset_confirmed-pre_notify_stop_0"/>
        </trigger>
        <trigger>
-        <crm_event id="60" operation="stonith" operation_key="stonith-node1" on_node="node1" on_node_uuid="f6d93040-a9ad-4745-a647-57ed32444ca8"/>
+        <crm_event id="60" operation="stonith" operation_key="stonith-node1-reboot" on_node="node1" on_node_uuid="f6d93040-a9ad-4745-a647-57ed32444ca8"/>
        </trigger>
      </inputs>
    </synapse>
@@ -413,7 +413,7 @@
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="60" operation="stonith" operation_key="stonith-node1" on_node="node1" on_node_uuid="f6d93040-a9ad-4745-a647-57ed32444ca8"/>
+        <crm_event id="60" operation="stonith" operation_key="stonith-node1-reboot" on_node="node1" on_node_uuid="f6d93040-a9ad-4745-a647-57ed32444ca8"/>
       </trigger>
     </inputs>
   </synapse>
@@ -428,7 +428,7 @@
         <pseudo_event id="53" operation="stop" operation_key="configstorecloneset_stop_0"/>
        </trigger>
       <trigger>
-        <crm_event id="60" operation="stonith" operation_key="stonith-node1" on_node="node1" on_node_uuid="f6d93040-a9ad-4745-a647-57ed32444ca8"/>
+        <crm_event id="60" operation="stonith" operation_key="stonith-node1-reboot" on_node="node1" on_node_uuid="f6d93040-a9ad-4745-a647-57ed32444ca8"/>
       </trigger>
     </inputs>
   </synapse>
@@ -511,13 +511,13 @@
         <pseudo_event id="56" operation="notified" operation_key="configstorecloneset_confirmed-pre_notify_stop_0"/>
        </trigger>
       <trigger>
-        <crm_event id="60" operation="stonith" operation_key="stonith-node1" on_node="node1" on_node_uuid="f6d93040-a9ad-4745-a647-57ed32444ca8"/>
+        <crm_event id="60" operation="stonith" operation_key="stonith-node1-reboot" on_node="node1" on_node_uuid="f6d93040-a9ad-4745-a647-57ed32444ca8"/>
       </trigger>
      </inputs>
    </synapse>
   <synapse id="36">
      <action_set>
-      <crm_event id="60" operation="stonith" operation_key="stonith-node1" on_node="node1" on_node_uuid="f6d93040-a9ad-4745-a647-57ed32444ca8">
+      <crm_event id="60" operation="stonith" operation_key="stonith-node1-reboot" on_node="node1" on_node_uuid="f6d93040-a9ad-4745-a647-57ed32444ca8">
         <attributes CRM_meta_on_node="node1" CRM_meta_on_node_uuid="f6d93040-a9ad-4745-a647-57ed32444ca8" CRM_meta_probe_complete="true" CRM_meta_stonith_action="reboot" crm_feature_set="3.0.7"/>
       </crm_event>
     </action_set>
@@ -531,7 +531,7 @@
      </action_set>
      <inputs>
        <trigger>
-        <crm_event id="60" operation="stonith" operation_key="stonith-node1" on_node="node1" on_node_uuid="f6d93040-a9ad-4745-a647-57ed32444ca8"/>
+        <crm_event id="60" operation="stonith" operation_key="stonith-node1-reboot" on_node="node1" on_node_uuid="f6d93040-a9ad-4745-a647-57ed32444ca8"/>
        </trigger>
      </inputs>
    </synapse>
diff --git a/pengine/test10/master-7.exp b/pengine/test10/master-7.exp
index b9b246c..4fba172 100644
--- a/pengine/test10/master-7.exp
+++ b/pengine/test10/master-7.exp
@@ -39,7 +39,7 @@
         <pseudo_event id="18" operation="probe_complete" operation_key="probe_complete"/>
       </trigger>
       <trigger>
-        <crm_event id="98" operation="stonith" operation_key="stonith-c001n01" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
+        <crm_event id="98" operation="stonith" operation_key="stonith-c001n01-reboot" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
       </trigger>
     </inputs>
   </synapse>
@@ -349,7 +349,7 @@
         <pseudo_event id="18" operation="probe_complete" operation_key="probe_complete"/>
       </trigger>
       <trigger>
-        <crm_event id="98" operation="stonith" operation_key="stonith-c001n01" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
+        <crm_event id="98" operation="stonith" operation_key="stonith-c001n01-reboot" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
       </trigger>
     </inputs>
   </synapse>
@@ -367,7 +367,7 @@
         <pseudo_event id="72" operation="stop" operation_key="DoFencing_stop_0"/>
       </trigger>
       <trigger>
-        <crm_event id="98" operation="stonith" operation_key="stonith-c001n01" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
+        <crm_event id="98" operation="stonith" operation_key="stonith-c001n01-reboot" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
       </trigger>
     </inputs>
   </synapse>
@@ -430,7 +430,7 @@
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="98" operation="stonith" operation_key="stonith-c001n01" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
+        <crm_event id="98" operation="stonith" operation_key="stonith-c001n01-reboot" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
       </trigger>
     </inputs>
   </synapse>
@@ -451,7 +451,7 @@
         <pseudo_event id="91" operation="stop" operation_key="master_rsc_1_stop_0"/>
       </trigger>
       <trigger>
-        <crm_event id="98" operation="stonith" operation_key="stonith-c001n01" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
+        <crm_event id="98" operation="stonith" operation_key="stonith-c001n01-reboot" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
       </trigger>
     </inputs>
   </synapse>
@@ -466,7 +466,7 @@
         <pseudo_event id="95" operation="demote" operation_key="master_rsc_1_demote_0"/>
       </trigger>
       <trigger>
-        <crm_event id="98" operation="stonith" operation_key="stonith-c001n01" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
+        <crm_event id="98" operation="stonith" operation_key="stonith-c001n01-reboot" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
       </trigger>
     </inputs>
   </synapse>
@@ -484,7 +484,7 @@
         <pseudo_event id="91" operation="stop" operation_key="master_rsc_1_stop_0"/>
       </trigger>
       <trigger>
-        <crm_event id="98" operation="stonith" operation_key="stonith-c001n01" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
+        <crm_event id="98" operation="stonith" operation_key="stonith-c001n01-reboot" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
       </trigger>
     </inputs>
   </synapse>
@@ -621,13 +621,13 @@
         <pseudo_event id="96" operation="demoted" operation_key="master_rsc_1_demoted_0"/>
       </trigger>
       <trigger>
-        <crm_event id="98" operation="stonith" operation_key="stonith-c001n01" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
+        <crm_event id="98" operation="stonith" operation_key="stonith-c001n01-reboot" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="45">
     <action_set>
-      <crm_event id="98" operation="stonith" operation_key="stonith-c001n01" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3">
+      <crm_event id="98" operation="stonith" operation_key="stonith-c001n01-reboot" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3">
         <attributes CRM_meta_on_node="c001n01" CRM_meta_on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3" CRM_meta_probe_complete="true" CRM_meta_stonith_action="reboot" crm_feature_set="3.0.7"/>
       </crm_event>
     </action_set>
@@ -641,7 +641,7 @@
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="98" operation="stonith" operation_key="stonith-c001n01" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
+        <crm_event id="98" operation="stonith" operation_key="stonith-c001n01-reboot" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
       </trigger>
     </inputs>
   </synapse>
diff --git a/pengine/test10/master-8.exp b/pengine/test10/master-8.exp
index e6c73a0..c0cd853 100644
--- a/pengine/test10/master-8.exp
+++ b/pengine/test10/master-8.exp
@@ -39,7 +39,7 @@
         <pseudo_event id="17" operation="probe_complete" operation_key="probe_complete"/>
       </trigger>
       <trigger>
-        <crm_event id="97" operation="stonith" operation_key="stonith-c001n01" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
+        <crm_event id="97" operation="stonith" operation_key="stonith-c001n01-reboot" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
       </trigger>
     </inputs>
   </synapse>
@@ -349,7 +349,7 @@
         <pseudo_event id="17" operation="probe_complete" operation_key="probe_complete"/>
       </trigger>
       <trigger>
-        <crm_event id="97" operation="stonith" operation_key="stonith-c001n01" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
+        <crm_event id="97" operation="stonith" operation_key="stonith-c001n01-reboot" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
       </trigger>
     </inputs>
   </synapse>
@@ -367,7 +367,7 @@
         <pseudo_event id="72" operation="stop" operation_key="DoFencing_stop_0"/>
       </trigger>
       <trigger>
-        <crm_event id="97" operation="stonith" operation_key="stonith-c001n01" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
+        <crm_event id="97" operation="stonith" operation_key="stonith-c001n01-reboot" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
       </trigger>
     </inputs>
   </synapse>
@@ -430,7 +430,7 @@
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="97" operation="stonith" operation_key="stonith-c001n01" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
+        <crm_event id="97" operation="stonith" operation_key="stonith-c001n01-reboot" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
       </trigger>
     </inputs>
   </synapse>
@@ -489,7 +489,7 @@
         <pseudo_event id="90" operation="stop" operation_key="master_rsc_1_stop_0"/>
       </trigger>
       <trigger>
-        <crm_event id="97" operation="stonith" operation_key="stonith-c001n01" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
+        <crm_event id="97" operation="stonith" operation_key="stonith-c001n01-reboot" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
       </trigger>
     </inputs>
   </synapse>
@@ -504,7 +504,7 @@
         <pseudo_event id="94" operation="demote" operation_key="master_rsc_1_demote_0"/>
       </trigger>
       <trigger>
-        <crm_event id="97" operation="stonith" operation_key="stonith-c001n01" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
+        <crm_event id="97" operation="stonith" operation_key="stonith-c001n01-reboot" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
       </trigger>
     </inputs>
   </synapse>
@@ -647,7 +647,7 @@
         <pseudo_event id="95" operation="demoted" operation_key="master_rsc_1_demoted_0"/>
       </trigger>
       <trigger>
-        <crm_event id="97" operation="stonith" operation_key="stonith-c001n01" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
+        <crm_event id="97" operation="stonith" operation_key="stonith-c001n01-reboot" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
       </trigger>
     </inputs>
   </synapse>
@@ -683,7 +683,7 @@
   </synapse>
   <synapse id="49">
     <action_set>
-      <crm_event id="97" operation="stonith" operation_key="stonith-c001n01" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3">
+      <crm_event id="97" operation="stonith" operation_key="stonith-c001n01-reboot" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3">
         <attributes CRM_meta_on_node="c001n01" CRM_meta_on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3" CRM_meta_probe_complete="true" CRM_meta_stonith_action="reboot" crm_feature_set="3.0.7"/>
       </crm_event>
     </action_set>
@@ -697,7 +697,7 @@
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="97" operation="stonith" operation_key="stonith-c001n01" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
+        <crm_event id="97" operation="stonith" operation_key="stonith-c001n01-reboot" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
       </trigger>
     </inputs>
   </synapse>
diff --git a/pengine/test10/migrate-fencing.exp b/pengine/test10/migrate-fencing.exp
index 0fba419..02b70c8 100644
--- a/pengine/test10/migrate-fencing.exp
+++ b/pengine/test10/migrate-fencing.exp
@@ -10,7 +10,7 @@
         <pseudo_event id="33" operation="stop" operation_key="Fencing_stop_0"/>
       </trigger>
       <trigger>
-        <crm_event id="95" operation="stonith" operation_key="stonith-pcmk-4" on_node="pcmk-4" on_node_uuid="pcmk-4"/>
+        <crm_event id="95" operation="stonith" operation_key="stonith-pcmk-4-reboot" on_node="pcmk-4" on_node_uuid="pcmk-4"/>
       </trigger>
     </inputs>
   </synapse>
@@ -37,7 +37,7 @@
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="95" operation="stonith" operation_key="stonith-pcmk-4" on_node="pcmk-4" on_node_uuid="pcmk-4"/>
+        <crm_event id="95" operation="stonith" operation_key="stonith-pcmk-4-reboot" on_node="pcmk-4" on_node_uuid="pcmk-4"/>
       </trigger>
     </inputs>
   </synapse>
@@ -73,7 +73,7 @@
         <pseudo_event id="57" operation="stop" operation_key="lsb-dummy_stop_0"/>
       </trigger>
       <trigger>
-        <crm_event id="95" operation="stonith" operation_key="stonith-pcmk-4" on_node="pcmk-4" on_node_uuid="pcmk-4"/>
+        <crm_event id="95" operation="stonith" operation_key="stonith-pcmk-4-reboot" on_node="pcmk-4" on_node_uuid="pcmk-4"/>
       </trigger>
     </inputs>
   </synapse>
@@ -159,7 +159,7 @@
         <pseudo_event id="46" operation="stop" operation_key="group-1_stop_0"/>
       </trigger>
       <trigger>
-        <crm_event id="95" operation="stonith" operation_key="stonith-pcmk-4" on_node="pcmk-4" on_node_uuid="pcmk-4"/>
+        <crm_event id="95" operation="stonith" operation_key="stonith-pcmk-4-reboot" on_node="pcmk-4" on_node_uuid="pcmk-4"/>
       </trigger>
     </inputs>
   </synapse>
@@ -212,7 +212,7 @@
         <pseudo_event id="46" operation="stop" operation_key="group-1_stop_0"/>
       </trigger>
       <trigger>
-        <crm_event id="95" operation="stonith" operation_key="stonith-pcmk-4" on_node="pcmk-4" on_node_uuid="pcmk-4"/>
+        <crm_event id="95" operation="stonith" operation_key="stonith-pcmk-4-reboot" on_node="pcmk-4" on_node_uuid="pcmk-4"/>
       </trigger>
     </inputs>
   </synapse>
@@ -262,7 +262,7 @@
         <pseudo_event id="46" operation="stop" operation_key="group-1_stop_0"/>
       </trigger>
       <trigger>
-        <crm_event id="95" operation="stonith" operation_key="stonith-pcmk-4" on_node="pcmk-4" on_node_uuid="pcmk-4"/>
+        <crm_event id="95" operation="stonith" operation_key="stonith-pcmk-4-reboot" on_node="pcmk-4" on_node_uuid="pcmk-4"/>
       </trigger>
     </inputs>
   </synapse>
@@ -303,7 +303,7 @@
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="95" operation="stonith" operation_key="stonith-pcmk-4" on_node="pcmk-4" on_node_uuid="pcmk-4"/>
+        <crm_event id="95" operation="stonith" operation_key="stonith-pcmk-4-reboot" on_node="pcmk-4" on_node_uuid="pcmk-4"/>
       </trigger>
     </inputs>
   </synapse>
@@ -347,7 +347,7 @@
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="95" operation="stonith" operation_key="stonith-pcmk-4" on_node="pcmk-4" on_node_uuid="pcmk-4"/>
+        <crm_event id="95" operation="stonith" operation_key="stonith-pcmk-4-reboot" on_node="pcmk-4" on_node_uuid="pcmk-4"/>
       </trigger>
     </inputs>
   </synapse>
@@ -429,7 +429,7 @@
         <pseudo_event id="72" operation="stop" operation_key="Connectivity_stop_0"/>
       </trigger>
       <trigger>
-        <crm_event id="95" operation="stonith" operation_key="stonith-pcmk-4" on_node="pcmk-4" on_node_uuid="pcmk-4"/>
+        <crm_event id="95" operation="stonith" operation_key="stonith-pcmk-4-reboot" on_node="pcmk-4" on_node_uuid="pcmk-4"/>
       </trigger>
     </inputs>
   </synapse>
@@ -456,7 +456,7 @@
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="95" operation="stonith" operation_key="stonith-pcmk-4" on_node="pcmk-4" on_node_uuid="pcmk-4"/>
+        <crm_event id="95" operation="stonith" operation_key="stonith-pcmk-4-reboot" on_node="pcmk-4" on_node_uuid="pcmk-4"/>
       </trigger>
     </inputs>
   </synapse>
@@ -474,7 +474,7 @@
         <pseudo_event id="88" operation="stop" operation_key="master-1_stop_0"/>
       </trigger>
       <trigger>
-        <crm_event id="95" operation="stonith" operation_key="stonith-pcmk-4" on_node="pcmk-4" on_node_uuid="pcmk-4"/>
+        <crm_event id="95" operation="stonith" operation_key="stonith-pcmk-4-reboot" on_node="pcmk-4" on_node_uuid="pcmk-4"/>
       </trigger>
     </inputs>
   </synapse>
@@ -489,7 +489,7 @@
         <pseudo_event id="92" operation="demote" operation_key="master-1_demote_0"/>
       </trigger>
       <trigger>
-        <crm_event id="95" operation="stonith" operation_key="stonith-pcmk-4" on_node="pcmk-4" on_node_uuid="pcmk-4"/>
+        <crm_event id="95" operation="stonith" operation_key="stonith-pcmk-4-reboot" on_node="pcmk-4" on_node_uuid="pcmk-4"/>
       </trigger>
     </inputs>
   </synapse>
@@ -620,13 +620,13 @@
         <pseudo_event id="93" operation="demoted" operation_key="master-1_demoted_0"/>
       </trigger>
       <trigger>
-        <crm_event id="95" operation="stonith" operation_key="stonith-pcmk-4" on_node="pcmk-4" on_node_uuid="pcmk-4"/>
+        <crm_event id="95" operation="stonith" operation_key="stonith-pcmk-4-reboot" on_node="pcmk-4" on_node_uuid="pcmk-4"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="42">
     <action_set>
-      <crm_event id="95" operation="stonith" operation_key="stonith-pcmk-4" on_node="pcmk-4" on_node_uuid="pcmk-4">
+      <crm_event id="95" operation="stonith" operation_key="stonith-pcmk-4-reboot" on_node="pcmk-4" on_node_uuid="pcmk-4">
         <attributes CRM_meta_connected="1" CRM_meta_on_node="pcmk-4" CRM_meta_on_node_uuid="pcmk-4" CRM_meta_op_no_wait="true" CRM_meta_probe_complete="true" CRM_meta_standby="off" CRM_meta_stonith_action="reboot" CRM_meta_terminate="1" crm_feature_set="3.0.7"/>
       </crm_event>
     </action_set>
@@ -640,7 +640,7 @@
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="95" operation="stonith" operation_key="stonith-pcmk-4" on_node="pcmk-4" on_node_uuid="pcmk-4"/>
+        <crm_event id="95" operation="stonith" operation_key="stonith-pcmk-4-reboot" on_node="pcmk-4" on_node_uuid="pcmk-4"/>
       </trigger>
     </inputs>
   </synapse>
diff --git a/pengine/test10/rec-node-11.exp b/pengine/test10/rec-node-11.exp
index 09aaddf..173df21 100644
--- a/pengine/test10/rec-node-11.exp
+++ b/pengine/test10/rec-node-11.exp
@@ -50,7 +50,7 @@
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="19" operation="stonith" operation_key="stonith-node1" on_node="node1" on_node_uuid="uuid1"/>
+        <crm_event id="19" operation="stonith" operation_key="stonith-node1-reboot" on_node="node1" on_node_uuid="uuid1"/>
       </trigger>
     </inputs>
   </synapse>
@@ -126,7 +126,7 @@
         <pseudo_event id="14" operation="stop" operation_key="group1_stop_0"/>
       </trigger>
       <trigger>
-        <crm_event id="19" operation="stonith" operation_key="stonith-node1" on_node="node1" on_node_uuid="uuid1"/>
+        <crm_event id="19" operation="stonith" operation_key="stonith-node1-reboot" on_node="node1" on_node_uuid="uuid1"/>
       </trigger>
     </inputs>
   </synapse>
@@ -178,7 +178,7 @@
         <pseudo_event id="14" operation="stop" operation_key="group1_stop_0"/>
       </trigger>
       <trigger>
-        <crm_event id="19" operation="stonith" operation_key="stonith-node1" on_node="node1" on_node_uuid="uuid1"/>
+        <crm_event id="19" operation="stonith" operation_key="stonith-node1-reboot" on_node="node1" on_node_uuid="uuid1"/>
       </trigger>
     </inputs>
   </synapse>
@@ -225,7 +225,7 @@
   </synapse>
   <synapse id="14">
     <action_set>
-      <crm_event id="19" operation="stonith" operation_key="stonith-node1" on_node="node1" on_node_uuid="uuid1">
+      <crm_event id="19" operation="stonith" operation_key="stonith-node1-reboot" on_node="node1" on_node_uuid="uuid1">
         <attributes CRM_meta_on_node="node1" CRM_meta_on_node_uuid="uuid1" CRM_meta_stonith_action="reboot" crm_feature_set="3.0.7"/>
       </crm_event>
     </action_set>
@@ -239,7 +239,7 @@
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="19" operation="stonith" operation_key="stonith-node1" on_node="node1" on_node_uuid="uuid1"/>
+        <crm_event id="19" operation="stonith" operation_key="stonith-node1-reboot" on_node="node1" on_node_uuid="uuid1"/>
       </trigger>
     </inputs>
   </synapse>
diff --git a/pengine/test10/rec-node-12.exp b/pengine/test10/rec-node-12.exp
index 07c0027..9732907 100644
--- a/pengine/test10/rec-node-12.exp
+++ b/pengine/test10/rec-node-12.exp
@@ -514,7 +514,7 @@
   </synapse>
   <synapse id="45">
     <action_set>
-      <crm_event id="54" operation="stonith" operation_key="stonith-c001n02" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
+      <crm_event id="54" operation="stonith" operation_key="stonith-c001n02-reboot" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
         <attributes CRM_meta_on_node="c001n02" CRM_meta_on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f" CRM_meta_stonith_action="reboot" crm_feature_set="3.0.7"/>
       </crm_event>
     </action_set>
@@ -528,7 +528,7 @@
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="54" operation="stonith" operation_key="stonith-c001n02" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
+        <crm_event id="54" operation="stonith" operation_key="stonith-c001n02-reboot" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
       </trigger>
     </inputs>
   </synapse>
diff --git a/pengine/test10/rec-node-13.exp b/pengine/test10/rec-node-13.exp
index 63abd08..ae23ea5 100644
--- a/pengine/test10/rec-node-13.exp
+++ b/pengine/test10/rec-node-13.exp
@@ -10,7 +10,7 @@
         <pseudo_event id="77" operation="stop" operation_key="master_rsc_1_stop_0"/>
        </trigger>
        <trigger>
-        <crm_event id="84" operation="stonith" operation_key="stonith-c001n04" on_node="c001n04" on_node_uuid="9e080e6d-7a25-4dac-be89-f6f4f128623d"/>
+        <crm_event id="84" operation="stonith" operation_key="stonith-c001n04-reboot" on_node="c001n04" on_node_uuid="9e080e6d-7a25-4dac-be89-f6f4f128623d"/>
        </trigger>
      </inputs>
    </synapse>
@@ -37,13 +37,13 @@
      </action_set>
      <inputs>
        <trigger>
-        <crm_event id="84" operation="stonith" operation_key="stonith-c001n04" on_node="c001n04" on_node_uuid="9e080e6d-7a25-4dac-be89-f6f4f128623d"/>
+        <crm_event id="84" operation="stonith" operation_key="stonith-c001n04-reboot" on_node="c001n04" on_node_uuid="9e080e6d-7a25-4dac-be89-f6f4f128623d"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="3">
      <action_set>
-      <crm_event id="84" operation="stonith" operation_key="stonith-c001n04" on_node="c001n04" on_node_uuid="9e080e6d-7a25-4dac-be89-f6f4f128623d">
+      <crm_event id="84" operation="stonith" operation_key="stonith-c001n04-reboot" on_node="c001n04" on_node_uuid="9e080e6d-7a25-4dac-be89-f6f4f128623d">
         <attributes CRM_meta_on_node="c001n04" CRM_meta_on_node_uuid="9e080e6d-7a25-4dac-be89-f6f4f128623d" CRM_meta_op_no_wait="true" CRM_meta_probe_complete="true" CRM_meta_shutdown="1234" CRM_meta_standby="off" CRM_meta_stonith_action="reboot" crm_feature_set="3.0.7"/>
       </crm_event>
      </action_set>
@@ -57,7 +57,7 @@
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="84" operation="stonith" operation_key="stonith-c001n04" on_node="c001n04" on_node_uuid="9e080e6d-7a25-4dac-be89-f6f4f128623d"/>
+        <crm_event id="84" operation="stonith" operation_key="stonith-c001n04-reboot" on_node="c001n04" on_node_uuid="9e080e6d-7a25-4dac-be89-f6f4f128623d"/>
       </trigger>
     </inputs>
   </synapse>
diff --git a/pengine/test10/rec-node-14.exp b/pengine/test10/rec-node-14.exp
index 2ca969a..e473479 100644
--- a/pengine/test10/rec-node-14.exp
+++ b/pengine/test10/rec-node-14.exp
@@ -1,31 +1,31 @@
  <transition_graph cluster-delay="60s" stonith-timeout="60s" failed-stop-offset="INFINITY" failed-start-offset="INFINITY" batch-limit="30" transition_id="0">
    <synapse id="0">
      <action_set>
-      <crm_event id="5" operation="stonith" operation_key="stonith-node3" on_node="node3" on_node_uuid="uuid3">
+      <crm_event id="5" operation="stonith" operation_key="stonith-node3-reboot" on_node="node3" on_node_uuid="uuid3">
         <attributes CRM_meta_on_node="node3" CRM_meta_on_node_uuid="uuid3" CRM_meta_stonith_action="reboot" crm_feature_set="3.0.7"/>
       </crm_event>
      </action_set>
      <inputs>
        <trigger>
-        <crm_event id="3" operation="stonith" operation_key="stonith-node1" on_node="node1" on_node_uuid="uuid1"/>
+        <crm_event id="3" operation="stonith" operation_key="stonith-node1-reboot" on_node="node1" on_node_uuid="uuid1"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="1">
      <action_set>
-      <crm_event id="4" operation="stonith" operation_key="stonith-node2" on_node="node2" on_node_uuid="uuid2">
+      <crm_event id="4" operation="stonith" operation_key="stonith-node2-reboot" on_node="node2" on_node_uuid="uuid2">
         <attributes CRM_meta_on_node="node2" CRM_meta_on_node_uuid="uuid2" CRM_meta_op_no_wait="true" CRM_meta_stonith_action="reboot" crm_feature_set="3.0.7"/>
       </crm_event>
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="5" operation="stonith" operation_key="stonith-node3" on_node="node3" on_node_uuid="uuid3"/>
+        <crm_event id="5" operation="stonith" operation_key="stonith-node3-reboot" on_node="node3" on_node_uuid="uuid3"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="2">
     <action_set>
-      <crm_event id="3" operation="stonith" operation_key="stonith-node1" on_node="node1" on_node_uuid="uuid1">
+      <crm_event id="3" operation="stonith" operation_key="stonith-node1-reboot" on_node="node1" on_node_uuid="uuid1">
         <attributes CRM_meta_on_node="node1" CRM_meta_on_node_uuid="uuid1" CRM_meta_stonith_action="reboot" crm_feature_set="3.0.7"/>
        </crm_event>
      </action_set>
@@ -39,7 +39,7 @@
      </action_set>
      <inputs>
        <trigger>
-        <crm_event id="5" operation="stonith" operation_key="stonith-node3" on_node="node3" on_node_uuid="uuid3"/>
+        <crm_event id="5" operation="stonith" operation_key="stonith-node3-reboot" on_node="node3" on_node_uuid="uuid3"/>
        </trigger>
      </inputs>
    </synapse>
diff --git a/pengine/test10/rec-node-15.exp b/pengine/test10/rec-node-15.exp
index a48d8c5..3c79d65 100644
--- a/pengine/test10/rec-node-15.exp
+++ b/pengine/test10/rec-node-15.exp
@@ -445,7 +445,7 @@
   </synapse>
   <synapse id="28">
     <action_set>
-      <crm_event id="52" operation="stonith" operation_key="stonith-sapcl03" on_node="sapcl03" on_node_uuid="0bfb78a2-fcd2-4f52-8a06-2d17437a6750">
+      <crm_event id="52" operation="stonith" operation_key="stonith-sapcl03-reboot" on_node="sapcl03" on_node_uuid="0bfb78a2-fcd2-4f52-8a06-2d17437a6750">
         <attributes CRM_meta_on_node="sapcl03" CRM_meta_on_node_uuid="0bfb78a2-fcd2-4f52-8a06-2d17437a6750" CRM_meta_op_no_wait="true" CRM_meta_standby="off" CRM_meta_stonith_action="reboot" crm_feature_set="3.0.7"/>
       </crm_event>
     </action_set>
@@ -459,7 +459,7 @@
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="52" operation="stonith" operation_key="stonith-sapcl03" on_node="sapcl03" on_node_uuid="0bfb78a2-fcd2-4f52-8a06-2d17437a6750"/>
+        <crm_event id="52" operation="stonith" operation_key="stonith-sapcl03-reboot" on_node="sapcl03" on_node_uuid="0bfb78a2-fcd2-4f52-8a06-2d17437a6750"/>
       </trigger>
     </inputs>
   </synapse>
diff --git a/pengine/test10/rec-node-2.exp b/pengine/test10/rec-node-2.exp
index 2785c57..901eded 100644
--- a/pengine/test10/rec-node-2.exp
+++ b/pengine/test10/rec-node-2.exp
@@ -246,7 +246,7 @@
   </synapse>
   <synapse id="18">
     <action_set>
-      <crm_event id="27" operation="stonith" operation_key="stonith-node1" on_node="node1" on_node_uuid="uuid1">
+      <crm_event id="27" operation="stonith" operation_key="stonith-node1-reboot" on_node="node1" on_node_uuid="uuid1">
         <attributes CRM_meta_on_node="node1" CRM_meta_on_node_uuid="uuid1" CRM_meta_stonith_action="reboot" crm_feature_set="3.0.7"/>
       </crm_event>
     </action_set>
@@ -260,7 +260,7 @@
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="27" operation="stonith" operation_key="stonith-node1" on_node="node1" on_node_uuid="uuid1"/>
+        <crm_event id="27" operation="stonith" operation_key="stonith-node1-reboot" on_node="node1" on_node_uuid="uuid1"/>
       </trigger>
     </inputs>
   </synapse>
diff --git a/pengine/test10/rec-node-4.exp b/pengine/test10/rec-node-4.exp
index bdaaa38..1e98f4d 100644
--- a/pengine/test10/rec-node-4.exp
+++ b/pengine/test10/rec-node-4.exp
@@ -54,7 +54,7 @@
         <pseudo_event id="2" operation="probe_complete" operation_key="probe_complete"/>
       </trigger>
       <trigger>
-        <crm_event id="13" operation="stonith" operation_key="stonith-node1" on_node="node1" on_node_uuid="uuid1"/>
+        <crm_event id="13" operation="stonith" operation_key="stonith-node1-reboot" on_node="node1" on_node_uuid="uuid1"/>
       </trigger>
     </inputs>
   </synapse>
@@ -97,7 +97,7 @@
         <pseudo_event id="2" operation="probe_complete" operation_key="probe_complete"/>
       </trigger>
       <trigger>
-        <crm_event id="13" operation="stonith" operation_key="stonith-node1" on_node="node1" on_node_uuid="uuid1"/>
+        <crm_event id="13" operation="stonith" operation_key="stonith-node1-reboot" on_node="node1" on_node_uuid="uuid1"/>
       </trigger>
     </inputs>
   </synapse>
@@ -112,7 +112,7 @@
   </synapse>
   <synapse id="8">
     <action_set>
-      <crm_event id="13" operation="stonith" operation_key="stonith-node1" on_node="node1" on_node_uuid="uuid1">
+      <crm_event id="13" operation="stonith" operation_key="stonith-node1-reboot" on_node="node1" on_node_uuid="uuid1">
         <attributes CRM_meta_on_node="node1" CRM_meta_on_node_uuid="uuid1" CRM_meta_stonith_action="reboot" crm_feature_set="3.0.7"/>
       </crm_event>
     </action_set>
@@ -126,7 +126,7 @@
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="13" operation="stonith" operation_key="stonith-node1" on_node="node1" on_node_uuid="uuid1"/>
+        <crm_event id="13" operation="stonith" operation_key="stonith-node1-reboot" on_node="node1" on_node_uuid="uuid1"/>
       </trigger>
     </inputs>
   </synapse>
diff --git a/pengine/test10/rec-node-6.exp b/pengine/test10/rec-node-6.exp
index bdaaa38..1e98f4d 100644
--- a/pengine/test10/rec-node-6.exp
+++ b/pengine/test10/rec-node-6.exp
@@ -54,7 +54,7 @@
         <pseudo_event id="2" operation="probe_complete" operation_key="probe_complete"/>
       </trigger>
       <trigger>
-        <crm_event id="13" operation="stonith" operation_key="stonith-node1" on_node="node1" on_node_uuid="uuid1"/>
+        <crm_event id="13" operation="stonith" operation_key="stonith-node1-reboot" on_node="node1" on_node_uuid="uuid1"/>
       </trigger>
     </inputs>
   </synapse>
@@ -97,7 +97,7 @@
         <pseudo_event id="2" operation="probe_complete" operation_key="probe_complete"/>
       </trigger>
       <trigger>
-        <crm_event id="13" operation="stonith" operation_key="stonith-node1" on_node="node1" on_node_uuid="uuid1"/>
+        <crm_event id="13" operation="stonith" operation_key="stonith-node1-reboot" on_node="node1" on_node_uuid="uuid1"/>
       </trigger>
     </inputs>
   </synapse>
@@ -112,7 +112,7 @@
   </synapse>
   <synapse id="8">
     <action_set>
-      <crm_event id="13" operation="stonith" operation_key="stonith-node1" on_node="node1" on_node_uuid="uuid1">
+      <crm_event id="13" operation="stonith" operation_key="stonith-node1-reboot" on_node="node1" on_node_uuid="uuid1">
         <attributes CRM_meta_on_node="node1" CRM_meta_on_node_uuid="uuid1" CRM_meta_stonith_action="reboot" crm_feature_set="3.0.7"/>
       </crm_event>
     </action_set>
@@ -126,7 +126,7 @@
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="13" operation="stonith" operation_key="stonith-node1" on_node="node1" on_node_uuid="uuid1"/>
+        <crm_event id="13" operation="stonith" operation_key="stonith-node1-reboot" on_node="node1" on_node_uuid="uuid1"/>
       </trigger>
     </inputs>
   </synapse>
diff --git a/pengine/test10/rec-node-7.exp b/pengine/test10/rec-node-7.exp
index bdaaa38..1e98f4d 100644
--- a/pengine/test10/rec-node-7.exp
+++ b/pengine/test10/rec-node-7.exp
@@ -54,7 +54,7 @@
         <pseudo_event id="2" operation="probe_complete" operation_key="probe_complete"/>
       </trigger>
       <trigger>
-        <crm_event id="13" operation="stonith" operation_key="stonith-node1" on_node="node1" on_node_uuid="uuid1"/>
+        <crm_event id="13" operation="stonith" operation_key="stonith-node1-reboot" on_node="node1" on_node_uuid="uuid1"/>
       </trigger>
     </inputs>
   </synapse>
@@ -97,7 +97,7 @@
         <pseudo_event id="2" operation="probe_complete" operation_key="probe_complete"/>
       </trigger>
       <trigger>
-        <crm_event id="13" operation="stonith" operation_key="stonith-node1" on_node="node1" on_node_uuid="uuid1"/>
+        <crm_event id="13" operation="stonith" operation_key="stonith-node1-reboot" on_node="node1" on_node_uuid="uuid1"/>
       </trigger>
     </inputs>
   </synapse>
@@ -112,7 +112,7 @@
   </synapse>
   <synapse id="8">
     <action_set>
-      <crm_event id="13" operation="stonith" operation_key="stonith-node1" on_node="node1" on_node_uuid="uuid1">
+      <crm_event id="13" operation="stonith" operation_key="stonith-node1-reboot" on_node="node1" on_node_uuid="uuid1">
         <attributes CRM_meta_on_node="node1" CRM_meta_on_node_uuid="uuid1" CRM_meta_stonith_action="reboot" crm_feature_set="3.0.7"/>
       </crm_event>
     </action_set>
@@ -126,7 +126,7 @@
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="13" operation="stonith" operation_key="stonith-node1" on_node="node1" on_node_uuid="uuid1"/>
+        <crm_event id="13" operation="stonith" operation_key="stonith-node1-reboot" on_node="node1" on_node_uuid="uuid1"/>
       </trigger>
     </inputs>
   </synapse>
diff --git a/pengine/test10/rec-rsc-5.exp b/pengine/test10/rec-rsc-5.exp
index 897d5f6..69a85d1 100644
--- a/pengine/test10/rec-rsc-5.exp
+++ b/pengine/test10/rec-rsc-5.exp
@@ -54,7 +54,7 @@
         <pseudo_event id="2" operation="probe_complete" operation_key="probe_complete"/>
       </trigger>
       <trigger>
-        <crm_event id="13" operation="stonith" operation_key="stonith-node2" on_node="node2" on_node_uuid="uuid2"/>
+        <crm_event id="13" operation="stonith" operation_key="stonith-node2-reboot" on_node="node2" on_node_uuid="uuid2"/>
       </trigger>
     </inputs>
   </synapse>
@@ -97,7 +97,7 @@
         <pseudo_event id="2" operation="probe_complete" operation_key="probe_complete"/>
       </trigger>
       <trigger>
-        <crm_event id="13" operation="stonith" operation_key="stonith-node2" on_node="node2" on_node_uuid="uuid2"/>
+        <crm_event id="13" operation="stonith" operation_key="stonith-node2-reboot" on_node="node2" on_node_uuid="uuid2"/>
       </trigger>
     </inputs>
   </synapse>
@@ -112,7 +112,7 @@
   </synapse>
   <synapse id="8">
     <action_set>
-      <crm_event id="13" operation="stonith" operation_key="stonith-node2" on_node="node2" on_node_uuid="uuid2">
+      <crm_event id="13" operation="stonith" operation_key="stonith-node2-reboot" on_node="node2" on_node_uuid="uuid2">
         <attributes CRM_meta_on_node="node2" CRM_meta_on_node_uuid="uuid2" CRM_meta_stonith_action="reboot" crm_feature_set="3.0.7"/>
       </crm_event>
     </action_set>
@@ -126,7 +126,7 @@
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="13" operation="stonith" operation_key="stonith-node2" on_node="node2" on_node_uuid="uuid2"/>
+        <crm_event id="13" operation="stonith" operation_key="stonith-node2-reboot" on_node="node2" on_node_uuid="uuid2"/>
       </trigger>
     </inputs>
   </synapse>
diff --git a/pengine/test10/remote-fence-unclean.exp b/pengine/test10/remote-fence-unclean.exp
new file mode 100644
index 0000000..9b1e327
--- /dev/null
+++ b/pengine/test10/remote-fence-unclean.exp
@@ -0,0 +1,201 @@
+<transition_graph cluster-delay="60s" stonith-timeout="60s" failed-stop-offset="INFINITY" failed-start-offset="INFINITY"  transition_id="0">
+  <synapse id="0">
+    <action_set>
+      <rsc_op id="15" operation="start" operation_key="remote1_start_0" on_node="18node1" on_node_uuid="1">
+        <primitive id="remote1" class="ocf" provider="pacemaker" type="remote"/>
+        <attributes CRM_meta_timeout="20000" />
+      </rsc_op>
+    </action_set>
+    <inputs>
+      <trigger>
+        <rsc_op id="5" operation="stop" operation_key="remote1_stop_0" on_node="18node1" on_node_uuid="1"/>
+      </trigger>
+      <trigger>
+        <pseudo_event id="27" operation="stonith_complete" operation_key="stonith_complete"/>
+      </trigger>
+    </inputs>
+  </synapse>
+  <synapse id="1">
+    <action_set>
+      <rsc_op id="5" operation="stop" operation_key="remote1_stop_0" on_node="18node1" on_node_uuid="1">
+        <primitive id="remote1" class="ocf" provider="pacemaker" type="remote"/>
+        <attributes CRM_meta_timeout="20000" />
+      </rsc_op>
+    </action_set>
+    <inputs/>
+  </synapse>
+  <synapse id="2">
+    <action_set>
+      <rsc_op id="4" operation="monitor" operation_key="remote1_monitor_60000" on_node="18node1" on_node_uuid="1">
+        <primitive id="remote1" class="ocf" provider="pacemaker" type="remote"/>
+        <attributes CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_timeout="20000" />
+      </rsc_op>
+    </action_set>
+    <inputs>
+      <trigger>
+        <rsc_op id="15" operation="start" operation_key="remote1_start_0" on_node="18node1" on_node_uuid="1"/>
+      </trigger>
+    </inputs>
+  </synapse>
+  <synapse id="3">
+    <action_set>
+      <rsc_op id="20" operation="monitor" operation_key="FAKE2_monitor_60000" on_node="18builder" on_node_uuid="5">
+        <primitive id="FAKE2" class="ocf" provider="heartbeat" type="Dummy"/>
+        <attributes CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_timeout="20000" />
+      </rsc_op>
+    </action_set>
+    <inputs>
+      <trigger>
+        <rsc_op id="19" operation="start" operation_key="FAKE2_start_0" on_node="18builder" on_node_uuid="5"/>
+      </trigger>
+    </inputs>
+  </synapse>
+  <synapse id="4">
+    <action_set>
+      <rsc_op id="19" operation="start" operation_key="FAKE2_start_0" on_node="18builder" on_node_uuid="5">
+        <primitive id="FAKE2" class="ocf" provider="heartbeat" type="Dummy"/>
+        <attributes CRM_meta_timeout="20000" />
+      </rsc_op>
+    </action_set>
+    <inputs>
+      <trigger>
+        <pseudo_event id="18" operation="stop" operation_key="FAKE2_stop_0"/>
+      </trigger>
+      <trigger>
+        <pseudo_event id="27" operation="stonith_complete" operation_key="stonith_complete"/>
+      </trigger>
+    </inputs>
+  </synapse>
+  <synapse id="5">
+    <action_set>
+      <pseudo_event id="18" operation="stop" operation_key="FAKE2_stop_0">
+        <attributes CRM_meta_timeout="20000" />
+      </pseudo_event>
+    </action_set>
+    <inputs>
+      <trigger>
+        <crm_event id="28" operation="stonith" operation_key="stonith-remote1-reboot" on_node="remote1" on_node_uuid="remote1" router_node="18node1"/>
+      </trigger>
+    </inputs>
+  </synapse>
+  <synapse id="6">
+    <action_set>
+      <rsc_op id="23" operation="monitor" operation_key="FAKE3_monitor_60000" on_node="18node1" on_node_uuid="1">
+        <primitive id="FAKE3" class="ocf" provider="heartbeat" type="Dummy"/>
+        <attributes CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_timeout="20000" />
+      </rsc_op>
+    </action_set>
+    <inputs>
+      <trigger>
+        <rsc_op id="22" operation="start" operation_key="FAKE3_start_0" on_node="18node1" on_node_uuid="1"/>
+      </trigger>
+    </inputs>
+  </synapse>
+  <synapse id="7">
+    <action_set>
+      <rsc_op id="22" operation="start" operation_key="FAKE3_start_0" on_node="18node1" on_node_uuid="1">
+        <primitive id="FAKE3" class="ocf" provider="heartbeat" type="Dummy"/>
+        <attributes CRM_meta_timeout="20000" />
+      </rsc_op>
+    </action_set>
+    <inputs>
+      <trigger>
+        <rsc_op id="21" operation="stop" operation_key="FAKE3_stop_0" on_node="18builder" on_node_uuid="5"/>
+      </trigger>
+      <trigger>
+        <pseudo_event id="27" operation="stonith_complete" operation_key="stonith_complete"/>
+      </trigger>
+    </inputs>
+  </synapse>
+  <synapse id="8">
+    <action_set>
+      <rsc_op id="21" operation="stop" operation_key="FAKE3_stop_0" on_node="18builder" on_node_uuid="5">
+        <primitive id="FAKE3" class="ocf" provider="heartbeat" type="Dummy"/>
+        <attributes CRM_meta_timeout="20000" />
+      </rsc_op>
+    </action_set>
+    <inputs/>
+  </synapse>
+  <synapse id="9">
+    <action_set>
+      <rsc_op id="26" operation="monitor" operation_key="FAKE4_monitor_60000" on_node="18node2" on_node_uuid="2">
+        <primitive id="FAKE4" class="ocf" provider="heartbeat" type="Dummy"/>
+        <attributes CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_timeout="20000" />
+      </rsc_op>
+    </action_set>
+    <inputs>
+      <trigger>
+        <rsc_op id="25" operation="start" operation_key="FAKE4_start_0" on_node="18node2" on_node_uuid="2"/>
+      </trigger>
+    </inputs>
+  </synapse>
+  <synapse id="10">
+    <action_set>
+      <rsc_op id="25" operation="start" operation_key="FAKE4_start_0" on_node="18node2" on_node_uuid="2">
+        <primitive id="FAKE4" class="ocf" provider="heartbeat" type="Dummy"/>
+        <attributes CRM_meta_timeout="20000" />
+      </rsc_op>
+    </action_set>
+    <inputs>
+      <trigger>
+        <rsc_op id="24" operation="stop" operation_key="FAKE4_stop_0" on_node="18node1" on_node_uuid="1"/>
+      </trigger>
+      <trigger>
+        <pseudo_event id="27" operation="stonith_complete" operation_key="stonith_complete"/>
+      </trigger>
+    </inputs>
+  </synapse>
+  <synapse id="11">
+    <action_set>
+      <rsc_op id="24" operation="stop" operation_key="FAKE4_stop_0" on_node="18node1" on_node_uuid="1">
+        <primitive id="FAKE4" class="ocf" provider="heartbeat" type="Dummy"/>
+        <attributes CRM_meta_timeout="20000" />
+      </rsc_op>
+    </action_set>
+    <inputs/>
+  </synapse>
+  <synapse id="12">
+    <action_set>
+      <crm_event id="28" operation="stonith" operation_key="stonith-remote1-reboot" on_node="remote1" on_node_uuid="remote1" router_node="18node1">
+        <attributes CRM_meta_on_node="remote1" CRM_meta_on_node_uuid="remote1" CRM_meta_probe_complete="true" CRM_meta_stonith_action="reboot" />
+      </crm_event>
+    </action_set>
+    <inputs/>
+  </synapse>
+  <synapse id="13">
+    <action_set>
+      <pseudo_event id="27" operation="stonith_complete" operation_key="stonith_complete">
+        <attributes />
+      </pseudo_event>
+    </action_set>
+    <inputs>
+      <trigger>
+        <crm_event id="28" operation="stonith" operation_key="stonith-remote1-reboot" on_node="remote1" on_node_uuid="remote1" router_node="18node1"/>
+      </trigger>
+    </inputs>
+  </synapse>
+  <synapse id="14">
+    <action_set>
+      <pseudo_event id="7" operation="all_stopped" operation_key="all_stopped">
+        <attributes />
+      </pseudo_event>
+    </action_set>
+    <inputs>
+      <trigger>
+        <rsc_op id="5" operation="stop" operation_key="remote1_stop_0" on_node="18node1" on_node_uuid="1"/>
+      </trigger>
+      <trigger>
+        <pseudo_event id="18" operation="stop" operation_key="FAKE2_stop_0"/>
+      </trigger>
+      <trigger>
+        <rsc_op id="21" operation="stop" operation_key="FAKE3_stop_0" on_node="18builder" on_node_uuid="5"/>
+      </trigger>
+      <trigger>
+        <rsc_op id="24" operation="stop" operation_key="FAKE4_stop_0" on_node="18node1" on_node_uuid="1"/>
+      </trigger>
+      <trigger>
+        <pseudo_event id="27" operation="stonith_complete" operation_key="stonith_complete"/>
+      </trigger>
+    </inputs>
+  </synapse>
+</transition_graph>
diff --git a/pengine/test10/stonith-0.exp b/pengine/test10/stonith-0.exp
index f4aed36..d664a12 100644
--- a/pengine/test10/stonith-0.exp
+++ b/pengine/test10/stonith-0.exp
@@ -34,10 +34,10 @@
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="110" operation="stonith" operation_key="stonith-c001n03" on_node="c001n03" on_node_uuid="f5e1d2de-73da-432a-9d5c-37472253c2ee"/>
+        <crm_event id="110" operation="stonith" operation_key="stonith-c001n03-reboot" on_node="c001n03" on_node_uuid="f5e1d2de-73da-432a-9d5c-37472253c2ee"/>
       </trigger>
       <trigger>
-        <crm_event id="111" operation="stonith" operation_key="stonith-c001n05" on_node="c001n05" on_node_uuid="52a5ea5e-86ee-442c-b251-0bc9825c517e"/>
+        <crm_event id="111" operation="stonith" operation_key="stonith-c001n05-reboot" on_node="c001n05" on_node_uuid="52a5ea5e-86ee-442c-b251-0bc9825c517e"/>
       </trigger>
     </inputs>
   </synapse>
@@ -123,7 +123,7 @@
         <pseudo_event id="44" operation="stop" operation_key="group-1_stop_0"/>
       </trigger>
       <trigger>
-        <crm_event id="111" operation="stonith" operation_key="stonith-c001n05" on_node="c001n05" on_node_uuid="52a5ea5e-86ee-442c-b251-0bc9825c517e"/>
+        <crm_event id="111" operation="stonith" operation_key="stonith-c001n05-reboot" on_node="c001n05" on_node_uuid="52a5ea5e-86ee-442c-b251-0bc9825c517e"/>
       </trigger>
     </inputs>
   </synapse>
@@ -141,7 +141,7 @@
         <pseudo_event id="44" operation="stop" operation_key="group-1_stop_0"/>
       </trigger>
       <trigger>
-        <crm_event id="110" operation="stonith" operation_key="stonith-c001n03" on_node="c001n03" on_node_uuid="f5e1d2de-73da-432a-9d5c-37472253c2ee"/>
+        <crm_event id="110" operation="stonith" operation_key="stonith-c001n03-reboot" on_node="c001n03" on_node_uuid="f5e1d2de-73da-432a-9d5c-37472253c2ee"/>
       </trigger>
     </inputs>
   </synapse>
@@ -203,7 +203,7 @@
         <pseudo_event id="44" operation="stop" operation_key="group-1_stop_0"/>
       </trigger>
       <trigger>
-        <crm_event id="110" operation="stonith" operation_key="stonith-c001n03" on_node="c001n03" on_node_uuid="f5e1d2de-73da-432a-9d5c-37472253c2ee"/>
+        <crm_event id="110" operation="stonith" operation_key="stonith-c001n03-reboot" on_node="c001n03" on_node_uuid="f5e1d2de-73da-432a-9d5c-37472253c2ee"/>
       </trigger>
     </inputs>
   </synapse>
@@ -256,7 +256,7 @@
         <pseudo_event id="44" operation="stop" operation_key="group-1_stop_0"/>
       </trigger>
       <trigger>
-        <crm_event id="111" operation="stonith" operation_key="stonith-c001n05" on_node="c001n05" on_node_uuid="52a5ea5e-86ee-442c-b251-0bc9825c517e"/>
+        <crm_event id="111" operation="stonith" operation_key="stonith-c001n05-reboot" on_node="c001n05" on_node_uuid="52a5ea5e-86ee-442c-b251-0bc9825c517e"/>
       </trigger>
     </inputs>
   </synapse>
@@ -271,7 +271,7 @@
         <pseudo_event id="44" operation="stop" operation_key="group-1_stop_0"/>
       </trigger>
       <trigger>
-        <crm_event id="110" operation="stonith" operation_key="stonith-c001n03" on_node="c001n03" on_node_uuid="f5e1d2de-73da-432a-9d5c-37472253c2ee"/>
+        <crm_event id="110" operation="stonith" operation_key="stonith-c001n03-reboot" on_node="c001n03" on_node_uuid="f5e1d2de-73da-432a-9d5c-37472253c2ee"/>
       </trigger>
     </inputs>
   </synapse>
@@ -312,7 +312,7 @@
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="111" operation="stonith" operation_key="stonith-c001n05" on_node="c001n05" on_node_uuid="52a5ea5e-86ee-442c-b251-0bc9825c517e"/>
+        <crm_event id="111" operation="stonith" operation_key="stonith-c001n05-reboot" on_node="c001n05" on_node_uuid="52a5ea5e-86ee-442c-b251-0bc9825c517e"/>
       </trigger>
     </inputs>
   </synapse>
@@ -353,7 +353,7 @@
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="110" operation="stonith" operation_key="stonith-c001n03" on_node="c001n03" on_node_uuid="f5e1d2de-73da-432a-9d5c-37472253c2ee"/>
+        <crm_event id="110" operation="stonith" operation_key="stonith-c001n03-reboot" on_node="c001n03" on_node_uuid="f5e1d2de-73da-432a-9d5c-37472253c2ee"/>
       </trigger>
     </inputs>
   </synapse>
@@ -368,7 +368,7 @@
   </synapse>
   <synapse id="22">
     <action_set>
-      <crm_event id="111" operation="stonith" operation_key="stonith-c001n05" on_node="c001n05" on_node_uuid="52a5ea5e-86ee-442c-b251-0bc9825c517e">
+      <crm_event id="111" operation="stonith" operation_key="stonith-c001n05-reboot" on_node="c001n05" on_node_uuid="52a5ea5e-86ee-442c-b251-0bc9825c517e">
         <attributes CRM_meta_on_node="c001n05" CRM_meta_on_node_uuid="52a5ea5e-86ee-442c-b251-0bc9825c517e" CRM_meta_probe_complete="true" CRM_meta_stonith_action="reboot" crm_feature_set="3.0.7"/>
       </crm_event>
     </action_set>
@@ -376,13 +376,13 @@
   </synapse>
   <synapse id="23">
     <action_set>
-      <crm_event id="110" operation="stonith" operation_key="stonith-c001n03" on_node="c001n03" on_node_uuid="f5e1d2de-73da-432a-9d5c-37472253c2ee">
+      <crm_event id="110" operation="stonith" operation_key="stonith-c001n03-reboot" on_node="c001n03" on_node_uuid="f5e1d2de-73da-432a-9d5c-37472253c2ee">
         <attributes CRM_meta_on_node="c001n03" CRM_meta_on_node_uuid="f5e1d2de-73da-432a-9d5c-37472253c2ee" CRM_meta_op_no_wait="true" CRM_meta_probe_complete="true" CRM_meta_stonith_action="reboot" crm_feature_set="3.0.7"/>
       </crm_event>
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="111" operation="stonith" operation_key="stonith-c001n05" on_node="c001n05" on_node_uuid="52a5ea5e-86ee-442c-b251-0bc9825c517e"/>
+        <crm_event id="111" operation="stonith" operation_key="stonith-c001n05-reboot" on_node="c001n05" on_node_uuid="52a5ea5e-86ee-442c-b251-0bc9825c517e"/>
       </trigger>
     </inputs>
   </synapse>
@@ -394,7 +394,7 @@
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="111" operation="stonith" operation_key="stonith-c001n05" on_node="c001n05" on_node_uuid="52a5ea5e-86ee-442c-b251-0bc9825c517e"/>
+        <crm_event id="111" operation="stonith" operation_key="stonith-c001n05-reboot" on_node="c001n05" on_node_uuid="52a5ea5e-86ee-442c-b251-0bc9825c517e"/>
       </trigger>
     </inputs>
   </synapse>
diff --git a/pengine/test10/stonith-1.exp b/pengine/test10/stonith-1.exp
index 12a2839..b9798e3 100644
--- a/pengine/test10/stonith-1.exp
+++ b/pengine/test10/stonith-1.exp
@@ -108,7 +108,7 @@
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="72" operation="stonith" operation_key="stonith-sles-3" on_node="sles-3" on_node_uuid="2298606a-6a8c-499a-9d25-76242f7006ec"/>
+        <crm_event id="72" operation="stonith" operation_key="stonith-sles-3-reboot" on_node="sles-3" on_node_uuid="2298606a-6a8c-499a-9d25-76242f7006ec"/>
       </trigger>
     </inputs>
   </synapse>
@@ -158,7 +158,7 @@
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="72" operation="stonith" operation_key="stonith-sles-3" on_node="sles-3" on_node_uuid="2298606a-6a8c-499a-9d25-76242f7006ec"/>
+        <crm_event id="72" operation="stonith" operation_key="stonith-sles-3-reboot" on_node="sles-3" on_node_uuid="2298606a-6a8c-499a-9d25-76242f7006ec"/>
       </trigger>
     </inputs>
   </synapse>
@@ -211,7 +211,7 @@
         <pseudo_event id="47" operation="stop" operation_key="DoFencing_stop_0"/>
       </trigger>
       <trigger>
-        <crm_event id="72" operation="stonith" operation_key="stonith-sles-3" on_node="sles-3" on_node_uuid="2298606a-6a8c-499a-9d25-76242f7006ec"/>
+        <crm_event id="72" operation="stonith" operation_key="stonith-sles-3-reboot" on_node="sles-3" on_node_uuid="2298606a-6a8c-499a-9d25-76242f7006ec"/>
       </trigger>
     </inputs>
   </synapse>
@@ -238,7 +238,7 @@
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="72" operation="stonith" operation_key="stonith-sles-3" on_node="sles-3" on_node_uuid="2298606a-6a8c-499a-9d25-76242f7006ec"/>
+        <crm_event id="72" operation="stonith" operation_key="stonith-sles-3-reboot" on_node="sles-3" on_node_uuid="2298606a-6a8c-499a-9d25-76242f7006ec"/>
       </trigger>
     </inputs>
   </synapse>
@@ -370,7 +370,7 @@
         <pseudo_event id="65" operation="stop" operation_key="master_rsc_1_stop_0"/>
       </trigger>
       <trigger>
-        <crm_event id="72" operation="stonith" operation_key="stonith-sles-3" on_node="sles-3" on_node_uuid="2298606a-6a8c-499a-9d25-76242f7006ec"/>
+        <crm_event id="72" operation="stonith" operation_key="stonith-sles-3-reboot" on_node="sles-3" on_node_uuid="2298606a-6a8c-499a-9d25-76242f7006ec"/>
       </trigger>
     </inputs>
   </synapse>
@@ -475,7 +475,7 @@
         <pseudo_event id="65" operation="stop" operation_key="master_rsc_1_stop_0"/>
       </trigger>
       <trigger>
-        <crm_event id="72" operation="stonith" operation_key="stonith-sles-3" on_node="sles-3" on_node_uuid="2298606a-6a8c-499a-9d25-76242f7006ec"/>
+        <crm_event id="72" operation="stonith" operation_key="stonith-sles-3-reboot" on_node="sles-3" on_node_uuid="2298606a-6a8c-499a-9d25-76242f7006ec"/>
       </trigger>
     </inputs>
   </synapse>
@@ -505,7 +505,7 @@
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="72" operation="stonith" operation_key="stonith-sles-3" on_node="sles-3" on_node_uuid="2298606a-6a8c-499a-9d25-76242f7006ec"/>
+        <crm_event id="72" operation="stonith" operation_key="stonith-sles-3-reboot" on_node="sles-3" on_node_uuid="2298606a-6a8c-499a-9d25-76242f7006ec"/>
       </trigger>
     </inputs>
   </synapse>
@@ -553,7 +553,7 @@
   </synapse>
   <synapse id="39">
     <action_set>
-      <crm_event id="72" operation="stonith" operation_key="stonith-sles-3" on_node="sles-3" on_node_uuid="2298606a-6a8c-499a-9d25-76242f7006ec">
+      <crm_event id="72" operation="stonith" operation_key="stonith-sles-3-reboot" on_node="sles-3" on_node_uuid="2298606a-6a8c-499a-9d25-76242f7006ec">
         <attributes CRM_meta_on_node="sles-3" CRM_meta_on_node_uuid="2298606a-6a8c-499a-9d25-76242f7006ec" CRM_meta_probe_complete="true" CRM_meta_stonith_action="reboot" crm_feature_set="3.0.7"/>
       </crm_event>
     </action_set>
@@ -567,7 +567,7 @@
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="72" operation="stonith" operation_key="stonith-sles-3" on_node="sles-3" on_node_uuid="2298606a-6a8c-499a-9d25-76242f7006ec"/>
+        <crm_event id="72" operation="stonith" operation_key="stonith-sles-3-reboot" on_node="sles-3" on_node_uuid="2298606a-6a8c-499a-9d25-76242f7006ec"/>
       </trigger>
     </inputs>
   </synapse>
diff --git a/pengine/test10/stonith-2.exp b/pengine/test10/stonith-2.exp
index dfab333..84a7fb8 100644
--- a/pengine/test10/stonith-2.exp
+++ b/pengine/test10/stonith-2.exp
@@ -27,7 +27,7 @@
   </synapse>
   <synapse id="2">
     <action_set>
-      <crm_event id="102" operation="stonith" operation_key="stonith-sles-5" on_node="sles-5" on_node_uuid="434915c6-7b40-4d30-95ff-dc0ff3dc005a">
+      <crm_event id="102" operation="stonith" operation_key="stonith-sles-5-reboot" on_node="sles-5" on_node_uuid="434915c6-7b40-4d30-95ff-dc0ff3dc005a">
         <attributes CRM_meta_on_node="sles-5" CRM_meta_on_node_uuid="434915c6-7b40-4d30-95ff-dc0ff3dc005a" CRM_meta_standby="off" CRM_meta_stonith_action="reboot" crm_feature_set="3.0.7"/>
       </crm_event>
     </action_set>
@@ -41,7 +41,7 @@
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="102" operation="stonith" operation_key="stonith-sles-5" on_node="sles-5" on_node_uuid="434915c6-7b40-4d30-95ff-dc0ff3dc005a"/>
+        <crm_event id="102" operation="stonith" operation_key="stonith-sles-5-reboot" on_node="sles-5" on_node_uuid="434915c6-7b40-4d30-95ff-dc0ff3dc005a"/>
       </trigger>
     </inputs>
   </synapse>
diff --git a/pengine/test10/stonith-3.exp b/pengine/test10/stonith-3.exp
index bb15555..49e6e81 100644
--- a/pengine/test10/stonith-3.exp
+++ b/pengine/test10/stonith-3.exp
@@ -117,7 +117,7 @@
   </synapse>
   <synapse id="9">
     <action_set>
-      <crm_event id="22" operation="stonith" operation_key="stonith-rh5node1" on_node="rh5node1" on_node_uuid="286f4fcb-519e-4a23-b39f-9ab0017d0442">
+      <crm_event id="22" operation="stonith" operation_key="stonith-rh5node1-reboot" on_node="rh5node1" on_node_uuid="286f4fcb-519e-4a23-b39f-9ab0017d0442">
         <attributes CRM_meta_on_node="rh5node1" CRM_meta_on_node_uuid="286f4fcb-519e-4a23-b39f-9ab0017d0442" CRM_meta_stonith_action="reboot" crm_feature_set="3.0.7"/>
       </crm_event>
     </action_set>
@@ -131,7 +131,7 @@
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="22" operation="stonith" operation_key="stonith-rh5node1" on_node="rh5node1" on_node_uuid="286f4fcb-519e-4a23-b39f-9ab0017d0442"/>
+        <crm_event id="22" operation="stonith" operation_key="stonith-rh5node1-reboot" on_node="rh5node1" on_node_uuid="286f4fcb-519e-4a23-b39f-9ab0017d0442"/>
       </trigger>
     </inputs>
   </synapse>
diff --git a/pengine/test10/stonith-4.exp b/pengine/test10/stonith-4.exp
index 8e5ee2c..2cfffc0 100644
--- a/pengine/test10/stonith-4.exp
+++ b/pengine/test10/stonith-4.exp
@@ -17,43 +17,43 @@
   </synapse>
   <synapse id="1">
     <action_set>
-      <crm_event id="15" operation="stonith" operation_key="stonith-pcmk-8" on_node="pcmk-8" on_node_uuid="108">
+      <crm_event id="15" operation="stonith" operation_key="stonith-pcmk-8-reboot" on_node="pcmk-8" on_node_uuid="108">
         <attributes CRM_meta_on_node="pcmk-8" CRM_meta_on_node_uuid="108" CRM_meta_stonith_action="reboot" crm_feature_set="3.0.7"/>
       </crm_event>
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="14" operation="stonith" operation_key="stonith-pcmk-7" on_node="pcmk-7" on_node_uuid="107"/>
+        <crm_event id="14" operation="stonith" operation_key="stonith-pcmk-7-reboot" on_node="pcmk-7" on_node_uuid="107"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="2">
     <action_set>
-      <crm_event id="14" operation="stonith" operation_key="stonith-pcmk-7" on_node="pcmk-7" on_node_uuid="107">
+      <crm_event id="14" operation="stonith" operation_key="stonith-pcmk-7-reboot" on_node="pcmk-7" on_node_uuid="107">
         <attributes CRM_meta_on_node="pcmk-7" CRM_meta_on_node_uuid="107" CRM_meta_stonith_action="reboot" crm_feature_set="3.0.7"/>
       </crm_event>
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="13" operation="stonith" operation_key="stonith-pcmk-5" on_node="pcmk-5" on_node_uuid="105"/>
+        <crm_event id="13" operation="stonith" operation_key="stonith-pcmk-5-reboot" on_node="pcmk-5" on_node_uuid="105"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="3">
     <action_set>
-      <crm_event id="13" operation="stonith" operation_key="stonith-pcmk-5" on_node="pcmk-5" on_node_uuid="105">
+      <crm_event id="13" operation="stonith" operation_key="stonith-pcmk-5-reboot" on_node="pcmk-5" on_node_uuid="105">
         <attributes CRM_meta_on_node="pcmk-5" CRM_meta_on_node_uuid="105" CRM_meta_stonith_action="reboot" crm_feature_set="3.0.7"/>
       </crm_event>
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="12" operation="stonith" operation_key="stonith-pcmk-10" on_node="pcmk-10" on_node_uuid="110"/>
+        <crm_event id="12" operation="stonith" operation_key="stonith-pcmk-10-reboot" on_node="pcmk-10" on_node_uuid="110"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="4">
     <action_set>
-      <crm_event id="12" operation="stonith" operation_key="stonith-pcmk-10" on_node="pcmk-10" on_node_uuid="110">
+      <crm_event id="12" operation="stonith" operation_key="stonith-pcmk-10-reboot" on_node="pcmk-10" on_node_uuid="110">
         <attributes CRM_meta_on_node="pcmk-10" CRM_meta_on_node_uuid="110" CRM_meta_stonith_action="reboot" crm_feature_set="3.0.7"/>
       </crm_event>
     </action_set>
@@ -67,7 +67,7 @@
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="15" operation="stonith" operation_key="stonith-pcmk-8" on_node="pcmk-8" on_node_uuid="108"/>
+        <crm_event id="15" operation="stonith" operation_key="stonith-pcmk-8-reboot" on_node="pcmk-8" on_node_uuid="108"/>
       </trigger>
     </inputs>
   </synapse>
diff --git a/pengine/test10/stop-failure-no-quorum.exp b/pengine/test10/stop-failure-no-quorum.exp
index b2260c7..895d43c 100644
--- a/pengine/test10/stop-failure-no-quorum.exp
+++ b/pengine/test10/stop-failure-no-quorum.exp
@@ -10,7 +10,7 @@
         <pseudo_event id="16" operation="stop" operation_key="clvm-clone_stop_0"/>
       </trigger>
       <trigger>
-        <crm_event id="22" operation="stonith" operation_key="stonith-pcmk-2" on_node="pcmk-2" on_node_uuid="102"/>
+        <crm_event id="22" operation="stonith" operation_key="stonith-pcmk-2-reboot" on_node="pcmk-2" on_node_uuid="102"/>
       </trigger>
     </inputs>
   </synapse>
@@ -37,13 +37,13 @@
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="22" operation="stonith" operation_key="stonith-pcmk-2" on_node="pcmk-2" on_node_uuid="102"/>
+        <crm_event id="22" operation="stonith" operation_key="stonith-pcmk-2-reboot" on_node="pcmk-2" on_node_uuid="102"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="3">
     <action_set>
-      <crm_event id="22" operation="stonith" operation_key="stonith-pcmk-2" on_node="pcmk-2" on_node_uuid="102">
+      <crm_event id="22" operation="stonith" operation_key="stonith-pcmk-2-reboot" on_node="pcmk-2" on_node_uuid="102">
         <attributes CRM_meta_fail_count_clvm="INFINITY" CRM_meta_last_failure_clvm="1371014555" CRM_meta_on_node="pcmk-2" CRM_meta_on_node_uuid="102" CRM_meta_probe_complete="true" CRM_meta_shutdown="1371014551" CRM_meta_stonith_action="reboot" crm_feature_set="3.0.7"/>
       </crm_event>
     </action_set>
@@ -57,7 +57,7 @@
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="22" operation="stonith" operation_key="stonith-pcmk-2" on_node="pcmk-2" on_node_uuid="102"/>
+        <crm_event id="22" operation="stonith" operation_key="stonith-pcmk-2-reboot" on_node="pcmk-2" on_node_uuid="102"/>
       </trigger>
     </inputs>
   </synapse>
diff --git a/pengine/test10/stop-failure-with-fencing.exp b/pengine/test10/stop-failure-with-fencing.exp
index 1c22e38..335ac37 100644
--- a/pengine/test10/stop-failure-with-fencing.exp
+++ b/pengine/test10/stop-failure-with-fencing.exp
@@ -10,7 +10,7 @@
         <pseudo_event id="16" operation="stop" operation_key="clvm-clone_stop_0"/>
       </trigger>
       <trigger>
-        <crm_event id="22" operation="stonith" operation_key="stonith-pcmk-2" on_node="pcmk-2" on_node_uuid="102"/>
+        <crm_event id="22" operation="stonith" operation_key="stonith-pcmk-2-reboot" on_node="pcmk-2" on_node_uuid="102"/>
       </trigger>
     </inputs>
   </synapse>
@@ -37,7 +37,7 @@
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="22" operation="stonith" operation_key="stonith-pcmk-2" on_node="pcmk-2" on_node_uuid="102"/>
+        <crm_event id="22" operation="stonith" operation_key="stonith-pcmk-2-reboot" on_node="pcmk-2" on_node_uuid="102"/>
       </trigger>
     </inputs>
   </synapse>
@@ -52,7 +52,7 @@
   </synapse>
   <synapse id="4">
     <action_set>
-      <crm_event id="22" operation="stonith" operation_key="stonith-pcmk-2" on_node="pcmk-2" on_node_uuid="102">
+      <crm_event id="22" operation="stonith" operation_key="stonith-pcmk-2-reboot" on_node="pcmk-2" on_node_uuid="102">
         <attributes CRM_meta_fail_count_clvm="INFINITY" CRM_meta_last_failure_clvm="1371014555" CRM_meta_on_node="pcmk-2" CRM_meta_on_node_uuid="102" CRM_meta_probe_complete="true" CRM_meta_shutdown="1371014551" CRM_meta_stonith_action="reboot" crm_feature_set="3.0.7"/>
       </crm_event>
     </action_set>
@@ -66,7 +66,7 @@
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="22" operation="stonith" operation_key="stonith-pcmk-2" on_node="pcmk-2" on_node_uuid="102"/>
+        <crm_event id="22" operation="stonith" operation_key="stonith-pcmk-2-reboot" on_node="pcmk-2" on_node_uuid="102"/>
       </trigger>
     </inputs>
   </synapse>
diff --git a/pengine/test10/systemhealth1.exp b/pengine/test10/systemhealth1.exp
index f8c698e..b090f6b 100644
--- a/pengine/test10/systemhealth1.exp
+++ b/pengine/test10/systemhealth1.exp
@@ -1,7 +1,7 @@
 <transition_graph cluster-delay="60s" stonith-timeout="60s" failed-stop-offset="INFINITY" failed-start-offset="INFINITY" batch-limit="30" transition_id="0">
   <synapse id="0">
     <action_set>
-      <crm_event id="4" operation="stonith" operation_key="stonith-hs21d" on_node="hs21d" on_node_uuid="737318c6-0f92-4592-9754-45967d45aff7">
+      <crm_event id="4" operation="stonith" operation_key="stonith-hs21d-reboot" on_node="hs21d" on_node_uuid="737318c6-0f92-4592-9754-45967d45aff7">
         <attributes CRM_meta_on_node="hs21d" CRM_meta_on_node_uuid="737318c6-0f92-4592-9754-45967d45aff7" CRM_meta_stonith_action="reboot" crm_feature_set="3.0.7"/>
       </crm_event>
     </action_set>
@@ -9,13 +9,13 @@
   </synapse>
   <synapse id="1">
     <action_set>
-      <crm_event id="3" operation="stonith" operation_key="stonith-hs21c" on_node="hs21c" on_node_uuid="c97a3ee5-02d8-4fad-a9fb-a79ae2b35549">
+      <crm_event id="3" operation="stonith" operation_key="stonith-hs21c-reboot" on_node="hs21c" on_node_uuid="c97a3ee5-02d8-4fad-a9fb-a79ae2b35549">
         <attributes CRM_meta_on_node="hs21c" CRM_meta_on_node_uuid="c97a3ee5-02d8-4fad-a9fb-a79ae2b35549" CRM_meta_op_no_wait="true" CRM_meta_stonith_action="reboot" crm_feature_set="3.0.7"/>
       </crm_event>
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="4" operation="stonith" operation_key="stonith-hs21d" on_node="hs21d" on_node_uuid="737318c6-0f92-4592-9754-45967d45aff7"/>
+        <crm_event id="4" operation="stonith" operation_key="stonith-hs21d-reboot" on_node="hs21d" on_node_uuid="737318c6-0f92-4592-9754-45967d45aff7"/>
       </trigger>
     </inputs>
   </synapse>
@@ -27,7 +27,7 @@
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="4" operation="stonith" operation_key="stonith-hs21d" on_node="hs21d" on_node_uuid="737318c6-0f92-4592-9754-45967d45aff7"/>
+        <crm_event id="4" operation="stonith" operation_key="stonith-hs21d-reboot" on_node="hs21d" on_node_uuid="737318c6-0f92-4592-9754-45967d45aff7"/>
       </trigger>
     </inputs>
   </synapse>
diff --git a/pengine/test10/systemhealth2.exp b/pengine/test10/systemhealth2.exp
index 9232b32..68b5078 100644
--- a/pengine/test10/systemhealth2.exp
+++ b/pengine/test10/systemhealth2.exp
@@ -102,7 +102,7 @@
   </synapse>
   <synapse id="8">
     <action_set>
-      <crm_event id="13" operation="stonith" operation_key="stonith-hs21d" on_node="hs21d" on_node_uuid="737318c6-0f92-4592-9754-45967d45aff7">
+      <crm_event id="13" operation="stonith" operation_key="stonith-hs21d-reboot" on_node="hs21d" on_node_uuid="737318c6-0f92-4592-9754-45967d45aff7">
         <attributes CRM_meta_on_node="hs21d" CRM_meta_on_node_uuid="737318c6-0f92-4592-9754-45967d45aff7" CRM_meta_stonith_action="reboot" crm_feature_set="3.0.7"/>
       </crm_event>
     </action_set>
@@ -116,7 +116,7 @@
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="13" operation="stonith" operation_key="stonith-hs21d" on_node="hs21d" on_node_uuid="737318c6-0f92-4592-9754-45967d45aff7"/>
+        <crm_event id="13" operation="stonith" operation_key="stonith-hs21d-reboot" on_node="hs21d" on_node_uuid="737318c6-0f92-4592-9754-45967d45aff7"/>
       </trigger>
     </inputs>
   </synapse>
diff --git a/pengine/test10/systemhealth3.exp b/pengine/test10/systemhealth3.exp
index 9232b32..68b5078 100644
--- a/pengine/test10/systemhealth3.exp
+++ b/pengine/test10/systemhealth3.exp
@@ -102,7 +102,7 @@
   </synapse>
   <synapse id="8">
     <action_set>
-      <crm_event id="13" operation="stonith" operation_key="stonith-hs21d" on_node="hs21d" on_node_uuid="737318c6-0f92-4592-9754-45967d45aff7">
+      <crm_event id="13" operation="stonith" operation_key="stonith-hs21d-reboot" on_node="hs21d" on_node_uuid="737318c6-0f92-4592-9754-45967d45aff7">
         <attributes CRM_meta_on_node="hs21d" CRM_meta_on_node_uuid="737318c6-0f92-4592-9754-45967d45aff7" CRM_meta_stonith_action="reboot" crm_feature_set="3.0.7"/>
       </crm_event>
     </action_set>
@@ -116,7 +116,7 @@
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="13" operation="stonith" operation_key="stonith-hs21d" on_node="hs21d" on_node_uuid="737318c6-0f92-4592-9754-45967d45aff7"/>
+        <crm_event id="13" operation="stonith" operation_key="stonith-hs21d-reboot" on_node="hs21d" on_node_uuid="737318c6-0f92-4592-9754-45967d45aff7"/>
       </trigger>
     </inputs>
   </synapse>
diff --git a/pengine/test10/systemhealthm1.exp b/pengine/test10/systemhealthm1.exp
index f8c698e..b090f6b 100644
--- a/pengine/test10/systemhealthm1.exp
+++ b/pengine/test10/systemhealthm1.exp
@@ -1,7 +1,7 @@
 <transition_graph cluster-delay="60s" stonith-timeout="60s" failed-stop-offset="INFINITY" failed-start-offset="INFINITY" batch-limit="30" transition_id="0">
   <synapse id="0">
     <action_set>
-      <crm_event id="4" operation="stonith" operation_key="stonith-hs21d" on_node="hs21d" on_node_uuid="737318c6-0f92-4592-9754-45967d45aff7">
+      <crm_event id="4" operation="stonith" operation_key="stonith-hs21d-reboot" on_node="hs21d" on_node_uuid="737318c6-0f92-4592-9754-45967d45aff7">
         <attributes CRM_meta_on_node="hs21d" CRM_meta_on_node_uuid="737318c6-0f92-4592-9754-45967d45aff7" CRM_meta_stonith_action="reboot" crm_feature_set="3.0.7"/>
       </crm_event>
     </action_set>
@@ -9,13 +9,13 @@
   </synapse>
   <synapse id="1">
     <action_set>
-      <crm_event id="3" operation="stonith" operation_key="stonith-hs21c" on_node="hs21c" on_node_uuid="c97a3ee5-02d8-4fad-a9fb-a79ae2b35549">
+      <crm_event id="3" operation="stonith" operation_key="stonith-hs21c-reboot" on_node="hs21c" on_node_uuid="c97a3ee5-02d8-4fad-a9fb-a79ae2b35549">
         <attributes CRM_meta_on_node="hs21c" CRM_meta_on_node_uuid="c97a3ee5-02d8-4fad-a9fb-a79ae2b35549" CRM_meta_op_no_wait="true" CRM_meta_stonith_action="reboot" crm_feature_set="3.0.7"/>
       </crm_event>
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="4" operation="stonith" operation_key="stonith-hs21d" on_node="hs21d" on_node_uuid="737318c6-0f92-4592-9754-45967d45aff7"/>
+        <crm_event id="4" operation="stonith" operation_key="stonith-hs21d-reboot" on_node="hs21d" on_node_uuid="737318c6-0f92-4592-9754-45967d45aff7"/>
       </trigger>
     </inputs>
   </synapse>
@@ -27,7 +27,7 @@
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="4" operation="stonith" operation_key="stonith-hs21d" on_node="hs21d" on_node_uuid="737318c6-0f92-4592-9754-45967d45aff7"/>
+        <crm_event id="4" operation="stonith" operation_key="stonith-hs21d-reboot" on_node="hs21d" on_node_uuid="737318c6-0f92-4592-9754-45967d45aff7"/>
       </trigger>
     </inputs>
   </synapse>
diff --git a/pengine/test10/systemhealthm2.exp b/pengine/test10/systemhealthm2.exp
index 9232b32..68b5078 100644
--- a/pengine/test10/systemhealthm2.exp
+++ b/pengine/test10/systemhealthm2.exp
@@ -102,7 +102,7 @@
   </synapse>
   <synapse id="8">
     <action_set>
-      <crm_event id="13" operation="stonith" operation_key="stonith-hs21d" on_node="hs21d" on_node_uuid="737318c6-0f92-4592-9754-45967d45aff7">
+      <crm_event id="13" operation="stonith" operation_key="stonith-hs21d-reboot" on_node="hs21d" on_node_uuid="737318c6-0f92-4592-9754-45967d45aff7">
         <attributes CRM_meta_on_node="hs21d" CRM_meta_on_node_uuid="737318c6-0f92-4592-9754-45967d45aff7" CRM_meta_stonith_action="reboot" crm_feature_set="3.0.7"/>
       </crm_event>
     </action_set>
@@ -116,7 +116,7 @@
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="13" operation="stonith" operation_key="stonith-hs21d" on_node="hs21d" on_node_uuid="737318c6-0f92-4592-9754-45967d45aff7"/>
+        <crm_event id="13" operation="stonith" operation_key="stonith-hs21d-reboot" on_node="hs21d" on_node_uuid="737318c6-0f92-4592-9754-45967d45aff7"/>
       </trigger>
     </inputs>
   </synapse>
diff --git a/pengine/test10/systemhealthm3.exp b/pengine/test10/systemhealthm3.exp
index 15b37be..7246b5b 100644
--- a/pengine/test10/systemhealthm3.exp
+++ b/pengine/test10/systemhealthm3.exp
@@ -28,7 +28,7 @@
   </synapse>
   <synapse id="3">
     <action_set>
-      <crm_event id="8" operation="stonith" operation_key="stonith-hs21d" on_node="hs21d" on_node_uuid="737318c6-0f92-4592-9754-45967d45aff7">
+      <crm_event id="8" operation="stonith" operation_key="stonith-hs21d-reboot" on_node="hs21d" on_node_uuid="737318c6-0f92-4592-9754-45967d45aff7">
         <attributes CRM_meta_on_node="hs21d" CRM_meta_on_node_uuid="737318c6-0f92-4592-9754-45967d45aff7" CRM_meta_stonith_action="reboot" crm_feature_set="3.0.7"/>
       </crm_event>
     </action_set>
@@ -42,7 +42,7 @@
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="8" operation="stonith" operation_key="stonith-hs21d" on_node="hs21d" on_node_uuid="737318c6-0f92-4592-9754-45967d45aff7"/>
+        <crm_event id="8" operation="stonith" operation_key="stonith-hs21d-reboot" on_node="hs21d" on_node_uuid="737318c6-0f92-4592-9754-45967d45aff7"/>
       </trigger>
     </inputs>
   </synapse>
diff --git a/pengine/test10/systemhealthn1.exp b/pengine/test10/systemhealthn1.exp
index f8c698e..b090f6b 100644
--- a/pengine/test10/systemhealthn1.exp
+++ b/pengine/test10/systemhealthn1.exp
@@ -1,7 +1,7 @@
 <transition_graph cluster-delay="60s" stonith-timeout="60s" failed-stop-offset="INFINITY" failed-start-offset="INFINITY" batch-limit="30" transition_id="0">
   <synapse id="0">
     <action_set>
-      <crm_event id="4" operation="stonith" operation_key="stonith-hs21d" on_node="hs21d" on_node_uuid="737318c6-0f92-4592-9754-45967d45aff7">
+      <crm_event id="4" operation="stonith" operation_key="stonith-hs21d-reboot" on_node="hs21d" on_node_uuid="737318c6-0f92-4592-9754-45967d45aff7">
         <attributes CRM_meta_on_node="hs21d" CRM_meta_on_node_uuid="737318c6-0f92-4592-9754-45967d45aff7" CRM_meta_stonith_action="reboot" crm_feature_set="3.0.7"/>
       </crm_event>
     </action_set>
@@ -9,13 +9,13 @@
   </synapse>
   <synapse id="1">
     <action_set>
-      <crm_event id="3" operation="stonith" operation_key="stonith-hs21c" on_node="hs21c" on_node_uuid="c97a3ee5-02d8-4fad-a9fb-a79ae2b35549">
+      <crm_event id="3" operation="stonith" operation_key="stonith-hs21c-reboot" on_node="hs21c" on_node_uuid="c97a3ee5-02d8-4fad-a9fb-a79ae2b35549">
         <attributes CRM_meta_on_node="hs21c" CRM_meta_on_node_uuid="c97a3ee5-02d8-4fad-a9fb-a79ae2b35549" CRM_meta_op_no_wait="true" CRM_meta_stonith_action="reboot" crm_feature_set="3.0.7"/>
       </crm_event>
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="4" operation="stonith" operation_key="stonith-hs21d" on_node="hs21d" on_node_uuid="737318c6-0f92-4592-9754-45967d45aff7"/>
+        <crm_event id="4" operation="stonith" operation_key="stonith-hs21d-reboot" on_node="hs21d" on_node_uuid="737318c6-0f92-4592-9754-45967d45aff7"/>
       </trigger>
     </inputs>
   </synapse>
@@ -27,7 +27,7 @@
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="4" operation="stonith" operation_key="stonith-hs21d" on_node="hs21d" on_node_uuid="737318c6-0f92-4592-9754-45967d45aff7"/>
+        <crm_event id="4" operation="stonith" operation_key="stonith-hs21d-reboot" on_node="hs21d" on_node_uuid="737318c6-0f92-4592-9754-45967d45aff7"/>
       </trigger>
     </inputs>
   </synapse>
diff --git a/pengine/test10/systemhealthn2.exp b/pengine/test10/systemhealthn2.exp
index 9232b32..68b5078 100644
--- a/pengine/test10/systemhealthn2.exp
+++ b/pengine/test10/systemhealthn2.exp
@@ -102,7 +102,7 @@
   </synapse>
   <synapse id="8">
     <action_set>
-      <crm_event id="13" operation="stonith" operation_key="stonith-hs21d" on_node="hs21d" on_node_uuid="737318c6-0f92-4592-9754-45967d45aff7">
+      <crm_event id="13" operation="stonith" operation_key="stonith-hs21d-reboot" on_node="hs21d" on_node_uuid="737318c6-0f92-4592-9754-45967d45aff7">
         <attributes CRM_meta_on_node="hs21d" CRM_meta_on_node_uuid="737318c6-0f92-4592-9754-45967d45aff7" CRM_meta_stonith_action="reboot" crm_feature_set="3.0.7"/>
       </crm_event>
     </action_set>
@@ -116,7 +116,7 @@
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="13" operation="stonith" operation_key="stonith-hs21d" on_node="hs21d" on_node_uuid="737318c6-0f92-4592-9754-45967d45aff7"/>
+        <crm_event id="13" operation="stonith" operation_key="stonith-hs21d-reboot" on_node="hs21d" on_node_uuid="737318c6-0f92-4592-9754-45967d45aff7"/>
       </trigger>
     </inputs>
   </synapse>
diff --git a/pengine/test10/systemhealthn3.exp b/pengine/test10/systemhealthn3.exp
index 9232b32..68b5078 100644
--- a/pengine/test10/systemhealthn3.exp
+++ b/pengine/test10/systemhealthn3.exp
@@ -102,7 +102,7 @@
   </synapse>
   <synapse id="8">
     <action_set>
-      <crm_event id="13" operation="stonith" operation_key="stonith-hs21d" on_node="hs21d" on_node_uuid="737318c6-0f92-4592-9754-45967d45aff7">
+      <crm_event id="13" operation="stonith" operation_key="stonith-hs21d-reboot" on_node="hs21d" on_node_uuid="737318c6-0f92-4592-9754-45967d45aff7">
         <attributes CRM_meta_on_node="hs21d" CRM_meta_on_node_uuid="737318c6-0f92-4592-9754-45967d45aff7" CRM_meta_stonith_action="reboot" crm_feature_set="3.0.7"/>
       </crm_event>
     </action_set>
@@ -116,7 +116,7 @@
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="13" operation="stonith" operation_key="stonith-hs21d" on_node="hs21d" on_node_uuid="737318c6-0f92-4592-9754-45967d45aff7"/>
+        <crm_event id="13" operation="stonith" operation_key="stonith-hs21d-reboot" on_node="hs21d" on_node_uuid="737318c6-0f92-4592-9754-45967d45aff7"/>
       </trigger>
     </inputs>
   </synapse>
diff --git a/pengine/test10/systemhealtho1.exp b/pengine/test10/systemhealtho1.exp
index f8c698e..b090f6b 100644
--- a/pengine/test10/systemhealtho1.exp
+++ b/pengine/test10/systemhealtho1.exp
@@ -1,7 +1,7 @@
 <transition_graph cluster-delay="60s" stonith-timeout="60s" failed-stop-offset="INFINITY" failed-start-offset="INFINITY" batch-limit="30" transition_id="0">
   <synapse id="0">
     <action_set>
-      <crm_event id="4" operation="stonith" operation_key="stonith-hs21d" on_node="hs21d" on_node_uuid="737318c6-0f92-4592-9754-45967d45aff7">
+      <crm_event id="4" operation="stonith" operation_key="stonith-hs21d-reboot" on_node="hs21d" on_node_uuid="737318c6-0f92-4592-9754-45967d45aff7">
         <attributes CRM_meta_on_node="hs21d" CRM_meta_on_node_uuid="737318c6-0f92-4592-9754-45967d45aff7" CRM_meta_stonith_action="reboot" crm_feature_set="3.0.7"/>
       </crm_event>
     </action_set>
@@ -9,13 +9,13 @@
   </synapse>
   <synapse id="1">
     <action_set>
-      <crm_event id="3" operation="stonith" operation_key="stonith-hs21c" on_node="hs21c" on_node_uuid="c97a3ee5-02d8-4fad-a9fb-a79ae2b35549">
+      <crm_event id="3" operation="stonith" operation_key="stonith-hs21c-reboot" on_node="hs21c" on_node_uuid="c97a3ee5-02d8-4fad-a9fb-a79ae2b35549">
         <attributes CRM_meta_on_node="hs21c" CRM_meta_on_node_uuid="c97a3ee5-02d8-4fad-a9fb-a79ae2b35549" CRM_meta_op_no_wait="true" CRM_meta_stonith_action="reboot" crm_feature_set="3.0.7"/>
       </crm_event>
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="4" operation="stonith" operation_key="stonith-hs21d" on_node="hs21d" on_node_uuid="737318c6-0f92-4592-9754-45967d45aff7"/>
+        <crm_event id="4" operation="stonith" operation_key="stonith-hs21d-reboot" on_node="hs21d" on_node_uuid="737318c6-0f92-4592-9754-45967d45aff7"/>
       </trigger>
     </inputs>
   </synapse>
@@ -27,7 +27,7 @@
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="4" operation="stonith" operation_key="stonith-hs21d" on_node="hs21d" on_node_uuid="737318c6-0f92-4592-9754-45967d45aff7"/>
+        <crm_event id="4" operation="stonith" operation_key="stonith-hs21d-reboot" on_node="hs21d" on_node_uuid="737318c6-0f92-4592-9754-45967d45aff7"/>
       </trigger>
     </inputs>
   </synapse>
diff --git a/pengine/test10/systemhealtho2.exp b/pengine/test10/systemhealtho2.exp
index 15b37be..7246b5b 100644
--- a/pengine/test10/systemhealtho2.exp
+++ b/pengine/test10/systemhealtho2.exp
@@ -28,7 +28,7 @@
   </synapse>
   <synapse id="3">
     <action_set>
-      <crm_event id="8" operation="stonith" operation_key="stonith-hs21d" on_node="hs21d" on_node_uuid="737318c6-0f92-4592-9754-45967d45aff7">
+      <crm_event id="8" operation="stonith" operation_key="stonith-hs21d-reboot" on_node="hs21d" on_node_uuid="737318c6-0f92-4592-9754-45967d45aff7">
         <attributes CRM_meta_on_node="hs21d" CRM_meta_on_node_uuid="737318c6-0f92-4592-9754-45967d45aff7" CRM_meta_stonith_action="reboot" crm_feature_set="3.0.7"/>
       </crm_event>
     </action_set>
@@ -42,7 +42,7 @@
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="8" operation="stonith" operation_key="stonith-hs21d" on_node="hs21d" on_node_uuid="737318c6-0f92-4592-9754-45967d45aff7"/>
+        <crm_event id="8" operation="stonith" operation_key="stonith-hs21d-reboot" on_node="hs21d" on_node_uuid="737318c6-0f92-4592-9754-45967d45aff7"/>
       </trigger>
     </inputs>
   </synapse>
diff --git a/pengine/test10/systemhealtho3.exp b/pengine/test10/systemhealtho3.exp
index 15b37be..7246b5b 100644
--- a/pengine/test10/systemhealtho3.exp
+++ b/pengine/test10/systemhealtho3.exp
@@ -28,7 +28,7 @@
   </synapse>
   <synapse id="3">
     <action_set>
-      <crm_event id="8" operation="stonith" operation_key="stonith-hs21d" on_node="hs21d" on_node_uuid="737318c6-0f92-4592-9754-45967d45aff7">
+      <crm_event id="8" operation="stonith" operation_key="stonith-hs21d-reboot" on_node="hs21d" on_node_uuid="737318c6-0f92-4592-9754-45967d45aff7">
         <attributes CRM_meta_on_node="hs21d" CRM_meta_on_node_uuid="737318c6-0f92-4592-9754-45967d45aff7" CRM_meta_stonith_action="reboot" crm_feature_set="3.0.7"/>
       </crm_event>
     </action_set>
@@ -42,7 +42,7 @@
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="8" operation="stonith" operation_key="stonith-hs21d" on_node="hs21d" on_node_uuid="737318c6-0f92-4592-9754-45967d45aff7"/>
+        <crm_event id="8" operation="stonith" operation_key="stonith-hs21d-reboot" on_node="hs21d" on_node_uuid="737318c6-0f92-4592-9754-45967d45aff7"/>
       </trigger>
     </inputs>
   </synapse>
diff --git a/pengine/test10/systemhealthp1.exp b/pengine/test10/systemhealthp1.exp
index f8c698e..b090f6b 100644
--- a/pengine/test10/systemhealthp1.exp
+++ b/pengine/test10/systemhealthp1.exp
@@ -1,7 +1,7 @@
 <transition_graph cluster-delay="60s" stonith-timeout="60s" failed-stop-offset="INFINITY" failed-start-offset="INFINITY" batch-limit="30" transition_id="0">
   <synapse id="0">
     <action_set>
-      <crm_event id="4" operation="stonith" operation_key="stonith-hs21d" on_node="hs21d" on_node_uuid="737318c6-0f92-4592-9754-45967d45aff7">
+      <crm_event id="4" operation="stonith" operation_key="stonith-hs21d-reboot" on_node="hs21d" on_node_uuid="737318c6-0f92-4592-9754-45967d45aff7">
         <attributes CRM_meta_on_node="hs21d" CRM_meta_on_node_uuid="737318c6-0f92-4592-9754-45967d45aff7" CRM_meta_stonith_action="reboot" crm_feature_set="3.0.7"/>
       </crm_event>
     </action_set>
@@ -9,13 +9,13 @@
   </synapse>
   <synapse id="1">
     <action_set>
-      <crm_event id="3" operation="stonith" operation_key="stonith-hs21c" on_node="hs21c" on_node_uuid="c97a3ee5-02d8-4fad-a9fb-a79ae2b35549">
+      <crm_event id="3" operation="stonith" operation_key="stonith-hs21c-reboot" on_node="hs21c" on_node_uuid="c97a3ee5-02d8-4fad-a9fb-a79ae2b35549">
         <attributes CRM_meta_on_node="hs21c" CRM_meta_on_node_uuid="c97a3ee5-02d8-4fad-a9fb-a79ae2b35549" CRM_meta_op_no_wait="true" CRM_meta_stonith_action="reboot" crm_feature_set="3.0.7"/>
       </crm_event>
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="4" operation="stonith" operation_key="stonith-hs21d" on_node="hs21d" on_node_uuid="737318c6-0f92-4592-9754-45967d45aff7"/>
+        <crm_event id="4" operation="stonith" operation_key="stonith-hs21d-reboot" on_node="hs21d" on_node_uuid="737318c6-0f92-4592-9754-45967d45aff7"/>
       </trigger>
     </inputs>
   </synapse>
@@ -27,7 +27,7 @@
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="4" operation="stonith" operation_key="stonith-hs21d" on_node="hs21d" on_node_uuid="737318c6-0f92-4592-9754-45967d45aff7"/>
+        <crm_event id="4" operation="stonith" operation_key="stonith-hs21d-reboot" on_node="hs21d" on_node_uuid="737318c6-0f92-4592-9754-45967d45aff7"/>
       </trigger>
     </inputs>
   </synapse>
diff --git a/pengine/test10/systemhealthp2.exp b/pengine/test10/systemhealthp2.exp
index f333166..e3ba25d 100644
--- a/pengine/test10/systemhealthp2.exp
+++ b/pengine/test10/systemhealthp2.exp
@@ -86,7 +86,7 @@
   </synapse>
   <synapse id="7">
     <action_set>
-      <crm_event id="12" operation="stonith" operation_key="stonith-hs21d" on_node="hs21d" on_node_uuid="737318c6-0f92-4592-9754-45967d45aff7">
+      <crm_event id="12" operation="stonith" operation_key="stonith-hs21d-reboot" on_node="hs21d" on_node_uuid="737318c6-0f92-4592-9754-45967d45aff7">
         <attributes CRM_meta_on_node="hs21d" CRM_meta_on_node_uuid="737318c6-0f92-4592-9754-45967d45aff7" CRM_meta_stonith_action="reboot" crm_feature_set="3.0.7"/>
       </crm_event>
     </action_set>
@@ -100,7 +100,7 @@
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="12" operation="stonith" operation_key="stonith-hs21d" on_node="hs21d" on_node_uuid="737318c6-0f92-4592-9754-45967d45aff7"/>
+        <crm_event id="12" operation="stonith" operation_key="stonith-hs21d-reboot" on_node="hs21d" on_node_uuid="737318c6-0f92-4592-9754-45967d45aff7"/>
       </trigger>
     </inputs>
   </synapse>
diff --git a/pengine/test10/systemhealthp3.exp b/pengine/test10/systemhealthp3.exp
index 15b37be..7246b5b 100644
--- a/pengine/test10/systemhealthp3.exp
+++ b/pengine/test10/systemhealthp3.exp
@@ -28,7 +28,7 @@
   </synapse>
   <synapse id="3">
     <action_set>
-      <crm_event id="8" operation="stonith" operation_key="stonith-hs21d" on_node="hs21d" on_node_uuid="737318c6-0f92-4592-9754-45967d45aff7">
+      <crm_event id="8" operation="stonith" operation_key="stonith-hs21d-reboot" on_node="hs21d" on_node_uuid="737318c6-0f92-4592-9754-45967d45aff7">
         <attributes CRM_meta_on_node="hs21d" CRM_meta_on_node_uuid="737318c6-0f92-4592-9754-45967d45aff7" CRM_meta_stonith_action="reboot" crm_feature_set="3.0.7"/>
       </crm_event>
     </action_set>
@@ -42,7 +42,7 @@
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="8" operation="stonith" operation_key="stonith-hs21d" on_node="hs21d" on_node_uuid="737318c6-0f92-4592-9754-45967d45aff7"/>
+        <crm_event id="8" operation="stonith" operation_key="stonith-hs21d-reboot" on_node="hs21d" on_node_uuid="737318c6-0f92-4592-9754-45967d45aff7"/>
       </trigger>
     </inputs>
   </synapse>
diff --git a/pengine/test10/ticket-clone-21.exp b/pengine/test10/ticket-clone-21.exp
index ee3a383..00f136d 100644
--- a/pengine/test10/ticket-clone-21.exp
+++ b/pengine/test10/ticket-clone-21.exp
@@ -7,7 +7,7 @@
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="12" operation="stonith" operation_key="stonith-node1" on_node="node1" on_node_uuid="node1"/>
+        <crm_event id="12" operation="stonith" operation_key="stonith-node1-reboot" on_node="node1" on_node_uuid="node1"/>
       </trigger>
     </inputs>
   </synapse>
@@ -22,7 +22,7 @@
         <pseudo_event id="9" operation="stop" operation_key="clone1_stop_0"/>
       </trigger>
       <trigger>
-        <crm_event id="12" operation="stonith" operation_key="stonith-node1" on_node="node1" on_node_uuid="node1"/>
+        <crm_event id="12" operation="stonith" operation_key="stonith-node1-reboot" on_node="node1" on_node_uuid="node1"/>
       </trigger>
     </inputs>
   </synapse>
@@ -37,7 +37,7 @@
         <pseudo_event id="9" operation="stop" operation_key="clone1_stop_0"/>
       </trigger>
       <trigger>
-        <crm_event id="13" operation="stonith" operation_key="stonith-node2" on_node="node2" on_node_uuid="node2"/>
+        <crm_event id="13" operation="stonith" operation_key="stonith-node2-reboot" on_node="node2" on_node_uuid="node2"/>
       </trigger>
     </inputs>
   </synapse>
@@ -67,28 +67,28 @@
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="12" operation="stonith" operation_key="stonith-node1" on_node="node1" on_node_uuid="node1"/>
+        <crm_event id="12" operation="stonith" operation_key="stonith-node1-reboot" on_node="node1" on_node_uuid="node1"/>
       </trigger>
       <trigger>
-        <crm_event id="13" operation="stonith" operation_key="stonith-node2" on_node="node2" on_node_uuid="node2"/>
+        <crm_event id="13" operation="stonith" operation_key="stonith-node2-reboot" on_node="node2" on_node_uuid="node2"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="5">
     <action_set>
-      <crm_event id="13" operation="stonith" operation_key="stonith-node2" on_node="node2" on_node_uuid="node2">
+      <crm_event id="13" operation="stonith" operation_key="stonith-node2-reboot" on_node="node2" on_node_uuid="node2">
         <attributes CRM_meta_on_node="node2" CRM_meta_on_node_uuid="node2" CRM_meta_stonith_action="reboot" crm_feature_set="3.0.7"/>
       </crm_event>
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="12" operation="stonith" operation_key="stonith-node1" on_node="node1" on_node_uuid="node1"/>
+        <crm_event id="12" operation="stonith" operation_key="stonith-node1-reboot" on_node="node1" on_node_uuid="node1"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="6">
     <action_set>
-      <crm_event id="12" operation="stonith" operation_key="stonith-node1" on_node="node1" on_node_uuid="node1">
+      <crm_event id="12" operation="stonith" operation_key="stonith-node1-reboot" on_node="node1" on_node_uuid="node1">
         <attributes CRM_meta_on_node="node1" CRM_meta_on_node_uuid="node1" CRM_meta_stonith_action="reboot" crm_feature_set="3.0.7"/>
       </crm_event>
     </action_set>
@@ -102,7 +102,7 @@
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="13" operation="stonith" operation_key="stonith-node2" on_node="node2" on_node_uuid="node2"/>
+        <crm_event id="13" operation="stonith" operation_key="stonith-node2-reboot" on_node="node2" on_node_uuid="node2"/>
       </trigger>
     </inputs>
   </synapse>
diff --git a/pengine/test10/ticket-clone-9.exp b/pengine/test10/ticket-clone-9.exp
index ee3a383..00f136d 100644
--- a/pengine/test10/ticket-clone-9.exp
+++ b/pengine/test10/ticket-clone-9.exp
@@ -7,7 +7,7 @@
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="12" operation="stonith" operation_key="stonith-node1" on_node="node1" on_node_uuid="node1"/>
+        <crm_event id="12" operation="stonith" operation_key="stonith-node1-reboot" on_node="node1" on_node_uuid="node1"/>
       </trigger>
     </inputs>
   </synapse>
@@ -22,7 +22,7 @@
         <pseudo_event id="9" operation="stop" operation_key="clone1_stop_0"/>
       </trigger>
       <trigger>
-        <crm_event id="12" operation="stonith" operation_key="stonith-node1" on_node="node1" on_node_uuid="node1"/>
+        <crm_event id="12" operation="stonith" operation_key="stonith-node1-reboot" on_node="node1" on_node_uuid="node1"/>
       </trigger>
     </inputs>
   </synapse>
@@ -37,7 +37,7 @@
         <pseudo_event id="9" operation="stop" operation_key="clone1_stop_0"/>
       </trigger>
       <trigger>
-        <crm_event id="13" operation="stonith" operation_key="stonith-node2" on_node="node2" on_node_uuid="node2"/>
+        <crm_event id="13" operation="stonith" operation_key="stonith-node2-reboot" on_node="node2" on_node_uuid="node2"/>
       </trigger>
     </inputs>
   </synapse>
@@ -67,28 +67,28 @@
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="12" operation="stonith" operation_key="stonith-node1" on_node="node1" on_node_uuid="node1"/>
+        <crm_event id="12" operation="stonith" operation_key="stonith-node1-reboot" on_node="node1" on_node_uuid="node1"/>
       </trigger>
       <trigger>
-        <crm_event id="13" operation="stonith" operation_key="stonith-node2" on_node="node2" on_node_uuid="node2"/>
+        <crm_event id="13" operation="stonith" operation_key="stonith-node2-reboot" on_node="node2" on_node_uuid="node2"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="5">
     <action_set>
-      <crm_event id="13" operation="stonith" operation_key="stonith-node2" on_node="node2" on_node_uuid="node2">
+      <crm_event id="13" operation="stonith" operation_key="stonith-node2-reboot" on_node="node2" on_node_uuid="node2">
         <attributes CRM_meta_on_node="node2" CRM_meta_on_node_uuid="node2" CRM_meta_stonith_action="reboot" crm_feature_set="3.0.7"/>
       </crm_event>
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="12" operation="stonith" operation_key="stonith-node1" on_node="node1" on_node_uuid="node1"/>
+        <crm_event id="12" operation="stonith" operation_key="stonith-node1-reboot" on_node="node1" on_node_uuid="node1"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="6">
     <action_set>
-      <crm_event id="12" operation="stonith" operation_key="stonith-node1" on_node="node1" on_node_uuid="node1">
+      <crm_event id="12" operation="stonith" operation_key="stonith-node1-reboot" on_node="node1" on_node_uuid="node1">
         <attributes CRM_meta_on_node="node1" CRM_meta_on_node_uuid="node1" CRM_meta_stonith_action="reboot" crm_feature_set="3.0.7"/>
       </crm_event>
     </action_set>
@@ -102,7 +102,7 @@
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="13" operation="stonith" operation_key="stonith-node2" on_node="node2" on_node_uuid="node2"/>
+        <crm_event id="13" operation="stonith" operation_key="stonith-node2-reboot" on_node="node2" on_node_uuid="node2"/>
       </trigger>
     </inputs>
   </synapse>
diff --git a/pengine/test10/ticket-group-21.exp b/pengine/test10/ticket-group-21.exp
index 53e30f0..d85b683 100644
--- a/pengine/test10/ticket-group-21.exp
+++ b/pengine/test10/ticket-group-21.exp
@@ -25,7 +25,7 @@
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="15" operation="stonith" operation_key="stonith-node2" on_node="node2" on_node_uuid="node2"/>
+        <crm_event id="15" operation="stonith" operation_key="stonith-node2-reboot" on_node="node2" on_node_uuid="node2"/>
       </trigger>
     </inputs>
   </synapse>
@@ -43,7 +43,7 @@
         <pseudo_event id="12" operation="stop" operation_key="group1_stop_0"/>
       </trigger>
       <trigger>
-        <crm_event id="15" operation="stonith" operation_key="stonith-node2" on_node="node2" on_node_uuid="node2"/>
+        <crm_event id="15" operation="stonith" operation_key="stonith-node2-reboot" on_node="node2" on_node_uuid="node2"/>
       </trigger>
     </inputs>
   </synapse>
@@ -58,13 +58,13 @@
         <pseudo_event id="12" operation="stop" operation_key="group1_stop_0"/>
       </trigger>
       <trigger>
-        <crm_event id="15" operation="stonith" operation_key="stonith-node2" on_node="node2" on_node_uuid="node2"/>
+        <crm_event id="15" operation="stonith" operation_key="stonith-node2-reboot" on_node="node2" on_node_uuid="node2"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="4">
     <action_set>
-      <crm_event id="15" operation="stonith" operation_key="stonith-node2" on_node="node2" on_node_uuid="node2">
+      <crm_event id="15" operation="stonith" operation_key="stonith-node2-reboot" on_node="node2" on_node_uuid="node2">
         <attributes CRM_meta_on_node="node2" CRM_meta_on_node_uuid="node2" CRM_meta_stonith_action="reboot" crm_feature_set="3.0.7"/>
       </crm_event>
     </action_set>
@@ -78,7 +78,7 @@
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="15" operation="stonith" operation_key="stonith-node2" on_node="node2" on_node_uuid="node2"/>
+        <crm_event id="15" operation="stonith" operation_key="stonith-node2-reboot" on_node="node2" on_node_uuid="node2"/>
       </trigger>
     </inputs>
   </synapse>
diff --git a/pengine/test10/ticket-group-9.exp b/pengine/test10/ticket-group-9.exp
index 53e30f0..d85b683 100644
--- a/pengine/test10/ticket-group-9.exp
+++ b/pengine/test10/ticket-group-9.exp
@@ -25,7 +25,7 @@
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="15" operation="stonith" operation_key="stonith-node2" on_node="node2" on_node_uuid="node2"/>
+        <crm_event id="15" operation="stonith" operation_key="stonith-node2-reboot" on_node="node2" on_node_uuid="node2"/>
       </trigger>
     </inputs>
   </synapse>
@@ -43,7 +43,7 @@
         <pseudo_event id="12" operation="stop" operation_key="group1_stop_0"/>
       </trigger>
       <trigger>
-        <crm_event id="15" operation="stonith" operation_key="stonith-node2" on_node="node2" on_node_uuid="node2"/>
+        <crm_event id="15" operation="stonith" operation_key="stonith-node2-reboot" on_node="node2" on_node_uuid="node2"/>
       </trigger>
     </inputs>
   </synapse>
@@ -58,13 +58,13 @@
         <pseudo_event id="12" operation="stop" operation_key="group1_stop_0"/>
       </trigger>
       <trigger>
-        <crm_event id="15" operation="stonith" operation_key="stonith-node2" on_node="node2" on_node_uuid="node2"/>
+        <crm_event id="15" operation="stonith" operation_key="stonith-node2-reboot" on_node="node2" on_node_uuid="node2"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="4">
     <action_set>
-      <crm_event id="15" operation="stonith" operation_key="stonith-node2" on_node="node2" on_node_uuid="node2">
+      <crm_event id="15" operation="stonith" operation_key="stonith-node2-reboot" on_node="node2" on_node_uuid="node2">
         <attributes CRM_meta_on_node="node2" CRM_meta_on_node_uuid="node2" CRM_meta_stonith_action="reboot" crm_feature_set="3.0.7"/>
       </crm_event>
     </action_set>
@@ -78,7 +78,7 @@
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="15" operation="stonith" operation_key="stonith-node2" on_node="node2" on_node_uuid="node2"/>
+        <crm_event id="15" operation="stonith" operation_key="stonith-node2-reboot" on_node="node2" on_node_uuid="node2"/>
       </trigger>
     </inputs>
   </synapse>
diff --git a/pengine/test10/ticket-master-21.exp b/pengine/test10/ticket-master-21.exp
index 47f4257..1ed731c 100644
--- a/pengine/test10/ticket-master-21.exp
+++ b/pengine/test10/ticket-master-21.exp
@@ -23,7 +23,7 @@
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="21" operation="stonith" operation_key="stonith-node1" on_node="node1" on_node_uuid="node1"/>
+        <crm_event id="21" operation="stonith" operation_key="stonith-node1-reboot" on_node="node1" on_node_uuid="node1"/>
       </trigger>
     </inputs>
   </synapse>
@@ -41,7 +41,7 @@
         <pseudo_event id="14" operation="stop" operation_key="ms1_stop_0"/>
       </trigger>
       <trigger>
-        <crm_event id="21" operation="stonith" operation_key="stonith-node1" on_node="node1" on_node_uuid="node1"/>
+        <crm_event id="21" operation="stonith" operation_key="stonith-node1-reboot" on_node="node1" on_node_uuid="node1"/>
       </trigger>
     </inputs>
   </synapse>
@@ -56,7 +56,7 @@
         <pseudo_event id="18" operation="demote" operation_key="ms1_demote_0"/>
       </trigger>
       <trigger>
-        <crm_event id="21" operation="stonith" operation_key="stonith-node1" on_node="node1" on_node_uuid="node1"/>
+        <crm_event id="21" operation="stonith" operation_key="stonith-node1-reboot" on_node="node1" on_node_uuid="node1"/>
       </trigger>
     </inputs>
   </synapse>
@@ -109,13 +109,13 @@
         <pseudo_event id="19" operation="demoted" operation_key="ms1_demoted_0"/>
       </trigger>
       <trigger>
-        <crm_event id="21" operation="stonith" operation_key="stonith-node1" on_node="node1" on_node_uuid="node1"/>
+        <crm_event id="21" operation="stonith" operation_key="stonith-node1-reboot" on_node="node1" on_node_uuid="node1"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="8">
     <action_set>
-      <crm_event id="21" operation="stonith" operation_key="stonith-node1" on_node="node1" on_node_uuid="node1">
+      <crm_event id="21" operation="stonith" operation_key="stonith-node1-reboot" on_node="node1" on_node_uuid="node1">
         <attributes CRM_meta_on_node="node1" CRM_meta_on_node_uuid="node1" CRM_meta_stonith_action="reboot" crm_feature_set="3.0.7"/>
       </crm_event>
     </action_set>
@@ -129,7 +129,7 @@
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="21" operation="stonith" operation_key="stonith-node1" on_node="node1" on_node_uuid="node1"/>
+        <crm_event id="21" operation="stonith" operation_key="stonith-node1-reboot" on_node="node1" on_node_uuid="node1"/>
       </trigger>
     </inputs>
   </synapse>
diff --git a/pengine/test10/ticket-master-9.exp b/pengine/test10/ticket-master-9.exp
index 47f4257..1ed731c 100644
--- a/pengine/test10/ticket-master-9.exp
+++ b/pengine/test10/ticket-master-9.exp
@@ -23,7 +23,7 @@
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="21" operation="stonith" operation_key="stonith-node1" on_node="node1" on_node_uuid="node1"/>
+        <crm_event id="21" operation="stonith" operation_key="stonith-node1-reboot" on_node="node1" on_node_uuid="node1"/>
       </trigger>
     </inputs>
   </synapse>
@@ -41,7 +41,7 @@
         <pseudo_event id="14" operation="stop" operation_key="ms1_stop_0"/>
       </trigger>
       <trigger>
-        <crm_event id="21" operation="stonith" operation_key="stonith-node1" on_node="node1" on_node_uuid="node1"/>
+        <crm_event id="21" operation="stonith" operation_key="stonith-node1-reboot" on_node="node1" on_node_uuid="node1"/>
       </trigger>
     </inputs>
   </synapse>
@@ -56,7 +56,7 @@
         <pseudo_event id="18" operation="demote" operation_key="ms1_demote_0"/>
       </trigger>
       <trigger>
-        <crm_event id="21" operation="stonith" operation_key="stonith-node1" on_node="node1" on_node_uuid="node1"/>
+        <crm_event id="21" operation="stonith" operation_key="stonith-node1-reboot" on_node="node1" on_node_uuid="node1"/>
       </trigger>
     </inputs>
   </synapse>
@@ -109,13 +109,13 @@
         <pseudo_event id="19" operation="demoted" operation_key="ms1_demoted_0"/>
       </trigger>
       <trigger>
-        <crm_event id="21" operation="stonith" operation_key="stonith-node1" on_node="node1" on_node_uuid="node1"/>
+        <crm_event id="21" operation="stonith" operation_key="stonith-node1-reboot" on_node="node1" on_node_uuid="node1"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="8">
     <action_set>
-      <crm_event id="21" operation="stonith" operation_key="stonith-node1" on_node="node1" on_node_uuid="node1">
+      <crm_event id="21" operation="stonith" operation_key="stonith-node1-reboot" on_node="node1" on_node_uuid="node1">
         <attributes CRM_meta_on_node="node1" CRM_meta_on_node_uuid="node1" CRM_meta_stonith_action="reboot" crm_feature_set="3.0.7"/>
       </crm_event>
     </action_set>
@@ -129,7 +129,7 @@
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="21" operation="stonith" operation_key="stonith-node1" on_node="node1" on_node_uuid="node1"/>
+        <crm_event id="21" operation="stonith" operation_key="stonith-node1-reboot" on_node="node1" on_node_uuid="node1"/>
       </trigger>
     </inputs>
   </synapse>
diff --git a/pengine/test10/ticket-primitive-21.exp b/pengine/test10/ticket-primitive-21.exp
index 8e8b128..c88cf38 100644
--- a/pengine/test10/ticket-primitive-21.exp
+++ b/pengine/test10/ticket-primitive-21.exp
@@ -7,13 +7,13 @@
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="9" operation="stonith" operation_key="stonith-node2" on_node="node2" on_node_uuid="node2"/>
+        <crm_event id="9" operation="stonith" operation_key="stonith-node2-reboot" on_node="node2" on_node_uuid="node2"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="1">
     <action_set>
-      <crm_event id="9" operation="stonith" operation_key="stonith-node2" on_node="node2" on_node_uuid="node2">
+      <crm_event id="9" operation="stonith" operation_key="stonith-node2-reboot" on_node="node2" on_node_uuid="node2">
         <attributes CRM_meta_on_node="node2" CRM_meta_on_node_uuid="node2" CRM_meta_stonith_action="reboot" crm_feature_set="3.0.7"/>
       </crm_event>
     </action_set>
@@ -27,7 +27,7 @@
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="9" operation="stonith" operation_key="stonith-node2" on_node="node2" on_node_uuid="node2"/>
+        <crm_event id="9" operation="stonith" operation_key="stonith-node2-reboot" on_node="node2" on_node_uuid="node2"/>
       </trigger>
     </inputs>
   </synapse>
diff --git a/pengine/test10/ticket-primitive-9.exp b/pengine/test10/ticket-primitive-9.exp
index 8e8b128..c88cf38 100644
--- a/pengine/test10/ticket-primitive-9.exp
+++ b/pengine/test10/ticket-primitive-9.exp
@@ -7,13 +7,13 @@
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="9" operation="stonith" operation_key="stonith-node2" on_node="node2" on_node_uuid="node2"/>
+        <crm_event id="9" operation="stonith" operation_key="stonith-node2-reboot" on_node="node2" on_node_uuid="node2"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="1">
     <action_set>
-      <crm_event id="9" operation="stonith" operation_key="stonith-node2" on_node="node2" on_node_uuid="node2">
+      <crm_event id="9" operation="stonith" operation_key="stonith-node2-reboot" on_node="node2" on_node_uuid="node2">
         <attributes CRM_meta_on_node="node2" CRM_meta_on_node_uuid="node2" CRM_meta_stonith_action="reboot" crm_feature_set="3.0.7"/>
       </crm_event>
     </action_set>
@@ -27,7 +27,7 @@
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="9" operation="stonith" operation_key="stonith-node2" on_node="node2" on_node_uuid="node2"/>
+        <crm_event id="9" operation="stonith" operation_key="stonith-node2-reboot" on_node="node2" on_node_uuid="node2"/>
       </trigger>
     </inputs>
   </synapse>