diff --git a/pengine/testcases/probe-0.dot b/pengine/testcases/probe-0.dot
index a959370ed5..37dc831124 100644
--- a/pengine/testcases/probe-0.dot
+++ b/pengine/testcases/probe-0.dot
@@ -1,37 +1,37 @@
  digraph "g" {
-"configstoreclone:0_monitor_0 32c48" -> "probe_complete 32c48" [ style = bold]
-"configstoreclone:0_monitor_0 32c48" [ style=bold color="green" fontcolor="black" ]
-"configstoreclone:0_post_notify_start_0 32c48" -> "configstorecloneset_confirmed-post_notify_start_0" [ style = bold]
-"configstoreclone:0_post_notify_start_0 32c48" [ style=bold color="green" fontcolor="black" ]
-"configstoreclone:0_start_0 32c48" -> "configstorecloneset_running_0" [ style = bold]
-"configstoreclone:0_start_0 32c48" [ style=bold color="green" fontcolor="black" ]
-"configstoreclone:1_monitor_0 32c47" -> "probe_complete 32c47" [ style = bold]
-"configstoreclone:1_monitor_0 32c47" [ style=bold color="green" fontcolor="black"  ]
-"configstoreclone:1_post_notify_start_0 32c47" -> "configstorecloneset_confirmed-post_notify_start_0" [ style = bold]
-"configstoreclone:1_post_notify_start_0 32c47" [ style=bold color="green" fontcolor="black" ]
-"configstoreclone:1_start_0 32c47" -> "configstorecloneset_running_0" [ style = bold]
-"configstoreclone:1_start_0 32c47" [ style=bold color="green" fontcolor="black" ]
+"configstoreclone:0_monitor_0 x32c48" -> "probe_complete x32c48" [ style = bold]
+"configstoreclone:0_monitor_0 x32c48" [ style=bold color="green" fontcolor="black" ]
+"configstoreclone:0_post_notify_start_0 x32c48" -> "configstorecloneset_confirmed-post_notify_start_0" [ style = bold]
+"configstoreclone:0_post_notify_start_0 x32c48" [ style=bold color="green" fontcolor="black" ]
+"configstoreclone:0_start_0 x32c48" -> "configstorecloneset_running_0" [ style = bold]
+"configstoreclone:0_start_0 x32c48" [ style=bold color="green" fontcolor="black" ]
+"configstoreclone:1_monitor_0 x32c47" -> "probe_complete x32c47" [ style = bold]
+"configstoreclone:1_monitor_0 x32c47" [ style=bold color="green" fontcolor="black"  ]
+"configstoreclone:1_post_notify_start_0 x32c47" -> "configstorecloneset_confirmed-post_notify_start_0" [ style = bold]
+"configstoreclone:1_post_notify_start_0 x32c47" [ style=bold color="green" fontcolor="black" ]
+"configstoreclone:1_start_0 x32c47" -> "configstorecloneset_running_0" [ style = bold]
+"configstoreclone:1_start_0 x32c47" [ style=bold color="green" fontcolor="black" ]
 "configstorecloneset_confirmed-post_notify_start_0" [ style=bold color="green" fontcolor="orange" ]
 "configstorecloneset_confirmed-pre_notify_start_0" -> "configstorecloneset_start_0" [ style = bold]
 "configstorecloneset_confirmed-pre_notify_start_0" [ style=bold color="green" fontcolor="orange" ]
 "configstorecloneset_post_notify_start_0" -> "configstoreclone:0_post_notify_start_0 x32c48" [ style = bold]
 "configstorecloneset_post_notify_start_0" -> "configstoreclone:1_post_notify_start_0 x32c47" [ style = bold]
 "configstorecloneset_post_notify_start_0" -> "configstorecloneset_confirmed-post_notify_start_0" [ style = bold]
 "configstorecloneset_post_notify_start_0" [ style=bold color="green" fontcolor="orange" ]
 "configstorecloneset_pre_notify_start_0" -> "configstorecloneset_confirmed-pre_notify_start_0" [ style = bold]
 "configstorecloneset_pre_notify_start_0" [ style=bold color="green" fontcolor="orange" ]
 "configstorecloneset_running_0" -> "configstorecloneset_post_notify_start_0" [ style = bold]
 "configstorecloneset_running_0" [ style=bold color="green" fontcolor="orange" ]
 "configstorecloneset_start_0" -> "configstoreclone:0_start_0 x32c48" [ style = bold]
 "configstorecloneset_start_0" -> "configstoreclone:1_start_0 x32c47" [ style = bold]
 "configstorecloneset_start_0" -> "configstorecloneset_running_0" [ style = bold]
 "configstorecloneset_start_0" [ style=bold color="green" fontcolor="orange" ]
-"probe_complete 32c47" -> "probe_complete" [ style = bold]
-"probe_complete 32c47" [ style=bold color="green" fontcolor="black" ]
-"probe_complete 32c48" -> "probe_complete" [ style = bold]
-"probe_complete 32c48" [ style=bold color="green" fontcolor="black" ]
-"probe_complete" -> "configstoreclone:0_start_0 32c48" [ style = bold]
-"probe_complete" -> "configstoreclone:1_start_0 32c47" [ style = bold]
+"probe_complete x32c47" -> "probe_complete" [ style = bold]
+"probe_complete x32c47" [ style=bold color="green" fontcolor="black" ]
+"probe_complete x32c48" -> "probe_complete" [ style = bold]
+"probe_complete x32c48" [ style=bold color="green" fontcolor="black" ]
+"probe_complete" -> "configstoreclone:0_start_0 x32c48" [ style = bold]
+"probe_complete" -> "configstoreclone:1_start_0 x32c47" [ style = bold]
 "probe_complete" -> "configstorecloneset_start_0" [ style = bold]
 "probe_complete" [ style=bold color="green" fontcolor="orange" ]
 }
diff --git a/pengine/testcases/probe-0.exp b/pengine/testcases/probe-0.exp
index 7ca0d413a7..e69a3be037 100644
--- a/pengine/testcases/probe-0.exp
+++ b/pengine/testcases/probe-0.exp
@@ -1,201 +1,201 @@
  <transition_graph cluster-delay="60" batch-limit="30" transition_id="0">
    <synapse id="0">
      <action_set>
-       <rsc_op id="6" operation="monitor" operation_key="configstoreclone:0_monitor_0" on_node="32c48" on_node_uuid="ca93fea5-67c9-473d-9ce0-7ed7fb823872">
+       <rsc_op id="6" operation="monitor" operation_key="configstoreclone:0_monitor_0" on_node="x32c48" on_node_uuid="ca93fea5-67c9-473d-9ce0-7ed7fb823872">
          <primitive id="configstoreclone:0" long-id="configstorecloneset:configstoreclone:0" class="ocf" provider="heartbeat" type="Filesystem"/>
          <attributes crm_feature_set="2.1" directory="/vm" fstype="ocfs2" device="/dev/sdb2" CRM_meta_timeout="20000" CRM_meta_op_target_rc="7" CRM_meta_globally_unique="false" CRM_meta_clone="0" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="1">
      <action_set>
-       <rsc_op id="33" operation="start" operation_key="configstoreclone:0_start_0" on_node="32c48" on_node_uuid="ca93fea5-67c9-473d-9ce0-7ed7fb823872">
+       <rsc_op id="33" operation="start" operation_key="configstoreclone:0_start_0" on_node="x32c48" on_node_uuid="ca93fea5-67c9-473d-9ce0-7ed7fb823872">
          <primitive id="configstoreclone:0" long-id="configstorecloneset:configstoreclone:0" class="ocf" provider="heartbeat" type="Filesystem"/>
-         <attributes crm_feature_set="2.1" directory="/vm" fstype="ocfs2" device="/dev/sdb2" CRM_meta_timeout="20000" CRM_meta_notify_start_uname="32c48 32c47 " CRM_meta_notify_start_resource="configstoreclone:0 configstoreclone:1 " CRM_meta_globally_unique="false" CRM_meta_clone="0" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1"/>
+         <attributes crm_feature_set="2.1" directory="/vm" fstype="ocfs2" device="/dev/sdb2" CRM_meta_timeout="20000" CRM_meta_notify_start_uname="x32c48 x32c47 " CRM_meta_notify_start_resource="configstoreclone:0 configstoreclone:1 " CRM_meta_globally_unique="false" CRM_meta_clone="0" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="4" operation="probe_complete" operation_key="probe_complete"/>
        </trigger>
        <trigger>
          <pseudo_event id="35" operation="start" operation_key="configstorecloneset_start_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="2" priority="1000000">
      <action_set>
-       <rsc_op id="58" operation="notify" operation_key="configstoreclone:0_post_notify_start_0" on_node="32c48" on_node_uuid="ca93fea5-67c9-473d-9ce0-7ed7fb823872">
+       <rsc_op id="58" operation="notify" operation_key="configstoreclone:0_post_notify_start_0" on_node="x32c48" on_node_uuid="ca93fea5-67c9-473d-9ce0-7ed7fb823872">
          <primitive id="configstoreclone:0" long-id="configstorecloneset:configstoreclone:0" class="ocf" provider="heartbeat" type="Filesystem"/>
-         <attributes crm_feature_set="2.1" CRM_meta_notify_operation="start" CRM_meta_timeout="20000" CRM_meta_notify_confirm="yes" CRM_meta_notify_type="post" directory="/vm" fstype="ocfs2" device="/dev/sdb2" CRM_meta_notify_start_uname="32c48 32c47 " CRM_meta_notify_start_resource="configstoreclone:0 configstoreclone:1 " CRM_meta_globally_unique="false" CRM_meta_clone="0" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1"/>
+         <attributes crm_feature_set="2.1" CRM_meta_notify_operation="start" CRM_meta_timeout="20000" CRM_meta_notify_confirm="yes" CRM_meta_notify_type="post" directory="/vm" fstype="ocfs2" device="/dev/sdb2" CRM_meta_notify_start_uname="x32c48 x32c47 " CRM_meta_notify_start_resource="configstoreclone:0 configstoreclone:1 " CRM_meta_globally_unique="false" CRM_meta_clone="0" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="39" operation="notify" operation_key="configstorecloneset_post_notify_start_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="3">
      <action_set>
-       <rsc_op id="8" operation="monitor" operation_key="configstoreclone:1_monitor_0" on_node="32c47" on_node_uuid="a1dbc8cc-4d33-41e7-a75a-cd4f93b26410">
+       <rsc_op id="8" operation="monitor" operation_key="configstoreclone:1_monitor_0" on_node="x32c47" on_node_uuid="a1dbc8cc-4d33-41e7-a75a-cd4f93b26410">
          <primitive id="configstoreclone:1" long-id="configstorecloneset:configstoreclone:1" class="ocf" provider="heartbeat" type="Filesystem"/>
          <attributes crm_feature_set="2.1" directory="/vm" fstype="ocfs2" device="/dev/sdb2" CRM_meta_timeout="20000" CRM_meta_op_target_rc="7" CRM_meta_globally_unique="false" CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="4">
      <action_set>
-       <rsc_op id="34" operation="start" operation_key="configstoreclone:1_start_0" on_node="32c47" on_node_uuid="a1dbc8cc-4d33-41e7-a75a-cd4f93b26410">
+       <rsc_op id="34" operation="start" operation_key="configstoreclone:1_start_0" on_node="x32c47" on_node_uuid="a1dbc8cc-4d33-41e7-a75a-cd4f93b26410">
          <primitive id="configstoreclone:1" long-id="configstorecloneset:configstoreclone:1" class="ocf" provider="heartbeat" type="Filesystem"/>
-         <attributes crm_feature_set="2.1" directory="/vm" fstype="ocfs2" device="/dev/sdb2" CRM_meta_timeout="20000" CRM_meta_notify_start_uname="32c48 32c47 " CRM_meta_notify_start_resource="configstoreclone:0 configstoreclone:1 " CRM_meta_globally_unique="false" CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1"/>
+         <attributes crm_feature_set="2.1" directory="/vm" fstype="ocfs2" device="/dev/sdb2" CRM_meta_timeout="20000" CRM_meta_notify_start_uname="x32c48 x32c47 " CRM_meta_notify_start_resource="configstoreclone:0 configstoreclone:1 " CRM_meta_globally_unique="false" CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="4" operation="probe_complete" operation_key="probe_complete"/>
        </trigger>
        <trigger>
          <pseudo_event id="35" operation="start" operation_key="configstorecloneset_start_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="5" priority="1000000">
      <action_set>
-       <rsc_op id="59" operation="notify" operation_key="configstoreclone:1_post_notify_start_0" on_node="32c47" on_node_uuid="a1dbc8cc-4d33-41e7-a75a-cd4f93b26410">
+       <rsc_op id="59" operation="notify" operation_key="configstoreclone:1_post_notify_start_0" on_node="x32c47" on_node_uuid="a1dbc8cc-4d33-41e7-a75a-cd4f93b26410">
          <primitive id="configstoreclone:1" long-id="configstorecloneset:configstoreclone:1" class="ocf" provider="heartbeat" type="Filesystem"/>
-         <attributes crm_feature_set="2.1" CRM_meta_notify_operation="start" CRM_meta_timeout="20000" CRM_meta_notify_confirm="yes" CRM_meta_notify_type="post" directory="/vm" fstype="ocfs2" device="/dev/sdb2" CRM_meta_notify_start_uname="32c48 32c47 " CRM_meta_notify_start_resource="configstoreclone:0 configstoreclone:1 " CRM_meta_globally_unique="false" CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1"/>
+         <attributes crm_feature_set="2.1" CRM_meta_notify_operation="start" CRM_meta_timeout="20000" CRM_meta_notify_confirm="yes" CRM_meta_notify_type="post" directory="/vm" fstype="ocfs2" device="/dev/sdb2" CRM_meta_notify_start_uname="x32c48 x32c47 " CRM_meta_notify_start_resource="configstoreclone:0 configstoreclone:1 " CRM_meta_globally_unique="false" CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="39" operation="notify" operation_key="configstorecloneset_post_notify_start_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="6">
      <action_set>
        <pseudo_event id="35" operation="start" operation_key="configstorecloneset_start_0">
          <attributes crm_feature_set="2.1" CRM_meta_timeout="20000" CRM_meta_globally_unique="false" CRM_meta_clone_node_max="1"/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="4" operation="probe_complete" operation_key="probe_complete"/>
        </trigger>
        <trigger>
          <pseudo_event id="38" operation="notified" operation_key="configstorecloneset_confirmed-pre_notify_start_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="7" priority="1000000">
      <action_set>
        <pseudo_event id="36" operation="running" operation_key="configstorecloneset_running_0">
          <attributes crm_feature_set="2.1" CRM_meta_timeout="20000" CRM_meta_globally_unique="false" CRM_meta_clone_node_max="1"/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
-         <rsc_op id="33" operation="start" operation_key="configstoreclone:0_start_0" on_node="32c48" on_node_uuid="ca93fea5-67c9-473d-9ce0-7ed7fb823872"/>
+         <rsc_op id="33" operation="start" operation_key="configstoreclone:0_start_0" on_node="x32c48" on_node_uuid="ca93fea5-67c9-473d-9ce0-7ed7fb823872"/>
        </trigger>
        <trigger>
-         <rsc_op id="34" operation="start" operation_key="configstoreclone:1_start_0" on_node="32c47" on_node_uuid="a1dbc8cc-4d33-41e7-a75a-cd4f93b26410"/>
+         <rsc_op id="34" operation="start" operation_key="configstoreclone:1_start_0" on_node="x32c47" on_node_uuid="a1dbc8cc-4d33-41e7-a75a-cd4f93b26410"/>
        </trigger>
        <trigger>
          <pseudo_event id="35" operation="start" operation_key="configstorecloneset_start_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="8">
      <action_set>
        <pseudo_event id="37" operation="notify" operation_key="configstorecloneset_pre_notify_start_0">
          <attributes crm_feature_set="2.1" CRM_meta_timeout="20000" CRM_meta_notify_confirm="yes" CRM_meta_notify_type="pre" CRM_meta_notify_operation="start" CRM_meta_globally_unique="false" CRM_meta_clone_node_max="1"/>
        </pseudo_event>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="9">
      <action_set>
        <pseudo_event id="38" operation="notified" operation_key="configstorecloneset_confirmed-pre_notify_start_0">
          <attributes crm_feature_set="2.1" CRM_meta_timeout="20000" CRM_meta_notify_type="pre" CRM_meta_notify_operation="start" CRM_meta_globally_unique="false" CRM_meta_clone_node_max="1"/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="37" operation="notify" operation_key="configstorecloneset_pre_notify_start_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="10" priority="1000000">
      <action_set>
        <pseudo_event id="39" operation="notify" operation_key="configstorecloneset_post_notify_start_0">
          <attributes crm_feature_set="2.1" CRM_meta_timeout="20000" CRM_meta_notify_confirm="yes" CRM_meta_notify_type="post" CRM_meta_notify_operation="start" CRM_meta_globally_unique="false" CRM_meta_clone_node_max="1"/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="36" operation="running" operation_key="configstorecloneset_running_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="11" priority="1000000">
      <action_set>
        <pseudo_event id="40" operation="notified" operation_key="configstorecloneset_confirmed-post_notify_start_0">
          <attributes crm_feature_set="2.1" CRM_meta_timeout="20000" CRM_meta_notify_type="pre" CRM_meta_notify_operation="start" CRM_meta_globally_unique="false" CRM_meta_clone_node_max="1"/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="39" operation="notify" operation_key="configstorecloneset_post_notify_start_0"/>
        </trigger>
        <trigger>
-         <rsc_op id="58" operation="notify" operation_key="configstoreclone:0_post_notify_start_0" on_node="32c48" on_node_uuid="ca93fea5-67c9-473d-9ce0-7ed7fb823872"/>
+         <rsc_op id="58" operation="notify" operation_key="configstoreclone:0_post_notify_start_0" on_node="x32c48" on_node_uuid="ca93fea5-67c9-473d-9ce0-7ed7fb823872"/>
        </trigger>
        <trigger>
-         <rsc_op id="59" operation="notify" operation_key="configstoreclone:1_post_notify_start_0" on_node="32c47" on_node_uuid="a1dbc8cc-4d33-41e7-a75a-cd4f93b26410"/>
+         <rsc_op id="59" operation="notify" operation_key="configstoreclone:1_post_notify_start_0" on_node="x32c47" on_node_uuid="a1dbc8cc-4d33-41e7-a75a-cd4f93b26410"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="12">
      <action_set>
        <pseudo_event id="4" operation="probe_complete" operation_key="probe_complete">
          <attributes crm_feature_set="2.1"/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
-         <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="32c48" on_node_uuid="ca93fea5-67c9-473d-9ce0-7ed7fb823872"/>
+         <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="x32c48" on_node_uuid="ca93fea5-67c9-473d-9ce0-7ed7fb823872"/>
        </trigger>
        <trigger>
-         <rsc_op id="7" operation="probe_complete" operation_key="probe_complete" on_node="32c47" on_node_uuid="a1dbc8cc-4d33-41e7-a75a-cd4f93b26410"/>
+         <rsc_op id="7" operation="probe_complete" operation_key="probe_complete" on_node="x32c47" on_node_uuid="a1dbc8cc-4d33-41e7-a75a-cd4f93b26410"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="13" priority="1000000">
      <action_set>
-       <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="32c48" on_node_uuid="ca93fea5-67c9-473d-9ce0-7ed7fb823872">
+       <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="x32c48" on_node_uuid="ca93fea5-67c9-473d-9ce0-7ed7fb823872">
          <attributes crm_feature_set="2.1" CRM_meta_op_no_wait="true"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
-         <rsc_op id="6" operation="monitor" operation_key="configstoreclone:0_monitor_0" on_node="32c48" on_node_uuid="ca93fea5-67c9-473d-9ce0-7ed7fb823872"/>
+         <rsc_op id="6" operation="monitor" operation_key="configstoreclone:0_monitor_0" on_node="x32c48" on_node_uuid="ca93fea5-67c9-473d-9ce0-7ed7fb823872"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="14" priority="1000000">
      <action_set>
-       <rsc_op id="7" operation="probe_complete" operation_key="probe_complete" on_node="32c47" on_node_uuid="a1dbc8cc-4d33-41e7-a75a-cd4f93b26410">
+       <rsc_op id="7" operation="probe_complete" operation_key="probe_complete" on_node="x32c47" on_node_uuid="a1dbc8cc-4d33-41e7-a75a-cd4f93b26410">
          <attributes crm_feature_set="2.1" CRM_meta_op_no_wait="true"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
-         <rsc_op id="8" operation="monitor" operation_key="configstoreclone:1_monitor_0" on_node="32c47" on_node_uuid="a1dbc8cc-4d33-41e7-a75a-cd4f93b26410"/>
+         <rsc_op id="8" operation="monitor" operation_key="configstoreclone:1_monitor_0" on_node="x32c47" on_node_uuid="a1dbc8cc-4d33-41e7-a75a-cd4f93b26410"/>
        </trigger>
      </inputs>
    </synapse>
  </transition_graph>