diff --git a/pengine/test10/inc11.exp b/pengine/test10/inc11.exp
index f0ed4a04ea..54314c11bf 100644
--- a/pengine/test10/inc11.exp
+++ b/pengine/test10/inc11.exp
@@ -1,267 +1,267 @@
  <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>
       <rsc_op id="15" operation="start" operation_key="simple-rsc_start_0" on_node="node2" on_node_uuid="uuid2">
         <primitive id="simple-rsc" class="heartbeat" type="apache"/>
         <attributes CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
        </rsc_op>
      </action_set>
     <inputs>
       <trigger>
         <pseudo_event id="2" operation="probe_complete" operation_key="probe_complete"/>
       </trigger>
     </inputs>
    </synapse>
    <synapse id="1">
      <action_set>
       <rsc_op id="12" operation="monitor" operation_key="simple-rsc_monitor_0" on_node="node2" on_node_uuid="uuid2">
         <primitive id="simple-rsc" class="heartbeat" type="apache"/>
         <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="2">
      <action_set>
       <rsc_op id="8" operation="monitor" operation_key="simple-rsc_monitor_0" on_node="node1" on_node_uuid="uuid1">
         <primitive id="simple-rsc" class="heartbeat" type="apache"/>
         <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="3">
      <action_set>
       <rsc_op id="4" operation="monitor" operation_key="simple-rsc_monitor_0" on_node="node0" on_node_uuid="uuid0">
         <primitive id="simple-rsc" class="heartbeat" type="apache"/>
         <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
       </rsc_op>
     </action_set>
     <inputs/>
   </synapse>
   <synapse id="4">
     <action_set>
       <rsc_op id="16" operation="start" operation_key="child_rsc1:0_start_0" on_node="node1" on_node_uuid="uuid1">
-        <primitive id="child_rsc1:0" class="heartbeat" type="apache"/>
+        <primitive id="child_rsc1:0" class="ocf" provider="heartbeat" type="apache"/>
         <attributes CRM_meta_clone="0" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="2" operation="probe_complete" operation_key="probe_complete"/>
        </trigger>
       <trigger>
         <pseudo_event id="19" operation="start" operation_key="rsc1_start_0"/>
       </trigger>
      </inputs>
    </synapse>
   <synapse id="5">
      <action_set>
       <rsc_op id="13" operation="monitor" operation_key="child_rsc1:0_monitor_0" on_node="node2" on_node_uuid="uuid2">
-        <primitive id="child_rsc1:0" class="heartbeat" type="apache"/>
+        <primitive id="child_rsc1:0" class="ocf" provider="heartbeat" type="apache"/>
         <attributes CRM_meta_clone="0" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
   <synapse id="6">
      <action_set>
        <rsc_op id="9" operation="monitor" operation_key="child_rsc1:0_monitor_0" on_node="node1" on_node_uuid="uuid1">
-        <primitive id="child_rsc1:0" class="heartbeat" type="apache"/>
+        <primitive id="child_rsc1:0" class="ocf" provider="heartbeat" type="apache"/>
         <attributes CRM_meta_clone="0" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
   <synapse id="7">
      <action_set>
       <rsc_op id="5" operation="monitor" operation_key="child_rsc1:0_monitor_0" on_node="node0" on_node_uuid="uuid0">
-        <primitive id="child_rsc1:0" class="heartbeat" type="apache"/>
+        <primitive id="child_rsc1:0" class="ocf" provider="heartbeat" type="apache"/>
         <attributes CRM_meta_clone="0" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
   <synapse id="8">
      <action_set>
       <rsc_op id="18" operation="promote" operation_key="child_rsc1:1_promote_0" on_node="node2" on_node_uuid="uuid2">
-        <primitive id="child_rsc1:1" class="heartbeat" type="apache"/>
+        <primitive id="child_rsc1:1" class="ocf" provider="heartbeat" type="apache"/>
         <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="17" operation="start" operation_key="child_rsc1:1_start_0" on_node="node2" on_node_uuid="uuid2"/>
       </trigger>
       <trigger>
         <pseudo_event id="23" operation="promote" operation_key="rsc1_promote_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="9">
     <action_set>
       <rsc_op id="17" operation="start" operation_key="child_rsc1:1_start_0" on_node="node2" on_node_uuid="uuid2">
-        <primitive id="child_rsc1:1" class="heartbeat" type="apache"/>
+        <primitive id="child_rsc1:1" class="ocf" provider="heartbeat" type="apache"/>
         <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="2" operation="probe_complete" operation_key="probe_complete"/>
        </trigger>
        <trigger>
          <pseudo_event id="19" operation="start" operation_key="rsc1_start_0"/>
        </trigger>
      </inputs>
    </synapse>
   <synapse id="10">
      <action_set>
       <rsc_op id="14" operation="monitor" operation_key="child_rsc1:1_monitor_0" on_node="node2" on_node_uuid="uuid2">
-        <primitive id="child_rsc1:1" class="heartbeat" type="apache"/>
+        <primitive id="child_rsc1:1" class="ocf" provider="heartbeat" type="apache"/>
         <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
   <synapse id="11">
      <action_set>
        <rsc_op id="10" operation="monitor" operation_key="child_rsc1:1_monitor_0" on_node="node1" on_node_uuid="uuid1">
-        <primitive id="child_rsc1:1" class="heartbeat" type="apache"/>
+        <primitive id="child_rsc1:1" class="ocf" provider="heartbeat" type="apache"/>
         <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
   <synapse id="12">
      <action_set>
       <rsc_op id="6" operation="monitor" operation_key="child_rsc1:1_monitor_0" on_node="node0" on_node_uuid="uuid0">
-        <primitive id="child_rsc1:1" class="heartbeat" type="apache"/>
+        <primitive id="child_rsc1:1" class="ocf" provider="heartbeat" type="apache"/>
         <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
   <synapse id="13" priority="1000000">
      <action_set>
       <pseudo_event id="24" operation="promoted" operation_key="rsc1_promoted_0">
         <attributes CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
       </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
         <rsc_op id="18" operation="promote" operation_key="child_rsc1:1_promote_0" on_node="node2" on_node_uuid="uuid2"/>
        </trigger>
      </inputs>
    </synapse>
   <synapse id="14">
      <action_set>
       <pseudo_event id="23" operation="promote" operation_key="rsc1_promote_0">
         <attributes CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
       </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
         <pseudo_event id="20" operation="running" operation_key="rsc1_running_0"/>
        </trigger>
      </inputs>
    </synapse>
   <synapse id="15" priority="1000000">
      <action_set>
        <pseudo_event id="20" operation="running" operation_key="rsc1_running_0">
         <attributes CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="16" operation="start" operation_key="child_rsc1:0_start_0" on_node="node1" on_node_uuid="uuid1"/>
        </trigger>
        <trigger>
          <rsc_op id="17" operation="start" operation_key="child_rsc1:1_start_0" on_node="node2" on_node_uuid="uuid2"/>
        </trigger>
        <trigger>
          <pseudo_event id="19" operation="start" operation_key="rsc1_start_0"/>
        </trigger>
      </inputs>
    </synapse>
   <synapse id="16">
      <action_set>
       <pseudo_event id="19" operation="start" operation_key="rsc1_start_0">
         <attributes CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
        </pseudo_event>
      </action_set>
     <inputs/>
    </synapse>
   <synapse id="17" priority="1000000">
      <action_set>
       <rsc_op id="11" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="uuid2">
         <attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
       </rsc_op>
      </action_set>
      <inputs>
        <trigger>
         <rsc_op id="12" operation="monitor" operation_key="simple-rsc_monitor_0" on_node="node2" on_node_uuid="uuid2"/>
        </trigger>
        <trigger>
         <rsc_op id="13" operation="monitor" operation_key="child_rsc1:0_monitor_0" on_node="node2" on_node_uuid="uuid2"/>
        </trigger>
        <trigger>
         <rsc_op id="14" operation="monitor" operation_key="child_rsc1:1_monitor_0" on_node="node2" on_node_uuid="uuid2"/>
        </trigger>
      </inputs>
    </synapse>
   <synapse id="18" priority="1000000">
      <action_set>
       <rsc_op id="7" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="uuid1">
         <attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
         <rsc_op id="8" operation="monitor" operation_key="simple-rsc_monitor_0" on_node="node1" on_node_uuid="uuid1"/>
        </trigger>
        <trigger>
         <rsc_op id="9" operation="monitor" operation_key="child_rsc1:0_monitor_0" on_node="node1" on_node_uuid="uuid1"/>
        </trigger>
        <trigger>
         <rsc_op id="10" operation="monitor" operation_key="child_rsc1:1_monitor_0" on_node="node1" on_node_uuid="uuid1"/>
        </trigger>
      </inputs>
    </synapse>
   <synapse id="19" priority="1000000">
      <action_set>
       <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node0" on_node_uuid="uuid0">
         <attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
         <rsc_op id="4" operation="monitor" operation_key="simple-rsc_monitor_0" on_node="node0" on_node_uuid="uuid0"/>
        </trigger>
        <trigger>
         <rsc_op id="5" operation="monitor" operation_key="child_rsc1:0_monitor_0" on_node="node0" on_node_uuid="uuid0"/>
        </trigger>
        <trigger>
         <rsc_op id="6" operation="monitor" operation_key="child_rsc1:1_monitor_0" on_node="node0" on_node_uuid="uuid0"/>
        </trigger>
      </inputs>
    </synapse>
   <synapse id="20">
      <action_set>
       <pseudo_event id="2" operation="probe_complete" operation_key="probe_complete">
         <attributes crm_feature_set="3.0.7"/>
       </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
         <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node0" on_node_uuid="uuid0"/>
        </trigger>
        <trigger>
         <rsc_op id="7" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="uuid1"/>
        </trigger>
        <trigger>
         <rsc_op id="11" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="uuid2"/>
        </trigger>
      </inputs>
    </synapse>
  </transition_graph>
 
diff --git a/pengine/test10/inc11.summary b/pengine/test10/inc11.summary
index 33c9622bcf..4d183c54ab 100644
--- a/pengine/test10/inc11.summary
+++ b/pengine/test10/inc11.summary
@@ -1,43 +1,43 @@
 
 Current cluster status:
 Online: [ node0 node1 node2 ]
 
  simple-rsc	(heartbeat:apache):	Stopped 
  Master/Slave Set: rsc1 [child_rsc1] (unique)
-     child_rsc1:0	(heartbeat:apache):	Stopped 
-     child_rsc1:1	(heartbeat:apache):	Stopped 
+     child_rsc1:0	(ocf::heartbeat:apache):	Stopped 
+     child_rsc1:1	(ocf::heartbeat:apache):	Stopped 
 
 Transition Summary:
  * Start   simple-rsc	(node2)
  * Start   child_rsc1:0	(node1)
  * Start   child_rsc1:1	(node2)
  * Promote child_rsc1:1	(Stopped -> Master node2)
 
 Executing cluster transition:
  * Resource action: simple-rsc      monitor on node2
  * Resource action: simple-rsc      monitor on node1
  * Resource action: simple-rsc      monitor on node0
  * Resource action: child_rsc1:0    monitor on node2
  * Resource action: child_rsc1:0    monitor on node1
  * Resource action: child_rsc1:0    monitor on node0
  * Resource action: child_rsc1:1    monitor on node2
  * Resource action: child_rsc1:1    monitor on node1
  * Resource action: child_rsc1:1    monitor on node0
  * Pseudo action:   rsc1_start_0
  * Pseudo action:   probe_complete
  * Resource action: simple-rsc      start on node2
  * Resource action: child_rsc1:0    start on node1
  * Resource action: child_rsc1:1    start on node2
  * Pseudo action:   rsc1_running_0
  * Pseudo action:   rsc1_promote_0
  * Resource action: child_rsc1:1    promote on node2
  * Pseudo action:   rsc1_promoted_0
 
 Revised cluster status:
 Online: [ node0 node1 node2 ]
 
  simple-rsc	(heartbeat:apache):	Started node2
  Master/Slave Set: rsc1 [child_rsc1] (unique)
-     child_rsc1:0	(heartbeat:apache):	Started node1
-     child_rsc1:1	(heartbeat:apache):	Master node2
+     child_rsc1:0	(ocf::heartbeat:apache):	Started node1
+     child_rsc1:1	(ocf::heartbeat:apache):	Master node2
 
diff --git a/pengine/test10/inc11.xml b/pengine/test10/inc11.xml
index 7a413db6e4..d7cde55a96 100644
--- a/pengine/test10/inc11.xml
+++ b/pengine/test10/inc11.xml
@@ -1,86 +1,86 @@
 <cib admin_epoch="0" epoch="1" num_updates="1" dc-uuid="0" have-quorum="false" remote-tls-port="0" validate-with="pacemaker-1.0" cib-last-written="Fri Jul 13 13:51:05 2012">
   <configuration>
     <crm_config>
       <cluster_property_set id="no-stonith">
         <nvpair id="opt-no-stonith" name="stonith-enabled" value="false"/>
       </cluster_property_set>
       <cluster_property_set id="cib-bootstrap-options">
         <nvpair id="nvpair.id21832" name="no-quorum-policy" value="ignore"/>
       </cluster_property_set>
     </crm_config>
     <nodes>
       <node id="uuid0" uname="node0" type="member"/>
       <node id="uuid1" uname="node1" type="member">
         <instance_attributes id="instance_attributes.id21862">
           <nvpair id="nvpair.id21869" name="master-child_rsc1:0" value="10"/>
           <nvpair id="nvpair.id21877" name="master-child_rsc1:1" value="100"/>
         </instance_attributes>
       </node>
       <node id="uuid2" uname="node2" type="member">
         <instance_attributes id="instance_attributes.id21898">
           <nvpair id="nvpair.id21905" name="master-child_rsc1:0" value="30"/>
           <nvpair id="nvpair.id21913" name="master-child_rsc1:1" value="300"/>
         </instance_attributes>
       </node>
     </nodes>
     <resources>
       <primitive id="simple-rsc" class="heartbeat" type="apache">
         <meta_attributes id="primitive-simple-rsc.meta"/>
       </primitive>
       <master id="rsc1">
-        <primitive id="child_rsc1" class="heartbeat" type="apache">
+        <primitive id="child_rsc1" class="ocf" provider="heartbeat" type="apache">
           <meta_attributes id="primitive-child_rsc1.meta"/>
         </primitive>
         <meta_attributes id="master_slave-rsc1.meta">
           <nvpair id="nvpair.meta.auto-61" name="resource-stickiness" value="1"/>
           <nvpair id="nvpair.meta.auto-53" name="clone-max" value="2"/>
           <nvpair id="nvpair.meta.auto-55" name="clone-node-max" value="1"/>
           <nvpair id="nvpair.meta.auto-57" name="master-max" value="1"/>
           <nvpair id="nvpair.meta.auto-59" name="master-node-max" value="1"/>
           <nvpair id="unique-1" name="globally-unique" value="true"/>
         </meta_attributes>
       </master>
     </resources>
     <constraints>
       <rsc_colocation id="simple-with-master" rsc="simple-rsc" with-rsc="rsc1" with-rsc-role="Master" score="INFINITY"/>
       <rsc_location id="master-cons" rsc="rsc1">
         <rule id="master-rule" score="100" role="Master">
           <expression id="expression.id22031" attribute="#uname" operation="eq" value="node2"/>
         </rule>
       </rsc_location>
       <rsc_location id="simple-node0" rsc="simple-rsc">
         <rule id="simple-rule-node0" score="99999">
           <expression id="expression.id22057" attribute="#uname" operation="eq" value="node0"/>
         </rule>
       </rsc_location>
       <rsc_location id="clone-node0" rsc="rsc1">
         <rule id="clone-rule-node0" score="-INFINITY">
           <expression id="expression.id22082" attribute="#uname" operation="eq" value="node0"/>
         </rule>
       </rsc_location>
     </constraints>
   </configuration>
   <status>
     <node_state id="uuid0" ha="active" uname="node0" crmd="online" join="member" expected="member" in_ccm="true">
       <transient_attributes id="transient_attributes.id22116">
         <instance_attributes id="instance_attributes.id22118">
           <nvpair id="nvpair.id22124" name="probe_complete" value="true"/>
         </instance_attributes>
       </transient_attributes>
     </node_state>
     <node_state id="uuid1" ha="active" uname="node1" crmd="online" join="member" expected="member" in_ccm="true">
       <transient_attributes id="transient_attributes.id22154">
         <instance_attributes id="instance_attributes.id22156">
           <nvpair id="nvpair.id22162" name="probe_complete" value="true"/>
         </instance_attributes>
       </transient_attributes>
     </node_state>
     <node_state id="uuid2" ha="active" uname="node2" crmd="online" join="member" expected="member" in_ccm="true">
       <transient_attributes id="transient_attributes.id22192">
         <instance_attributes id="instance_attributes.id22194">
           <nvpair id="nvpair.id22201" name="probe_complete" value="true"/>
         </instance_attributes>
       </transient_attributes>
     </node_state>
   </status>
-</cib>
\ No newline at end of file
+</cib>
diff --git a/pengine/test10/master-0.exp b/pengine/test10/master-0.exp
index 8288d31711..695f27476e 100644
--- a/pengine/test10/master-0.exp
+++ b/pengine/test10/master-0.exp
@@ -1,252 +1,252 @@
  <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>
       <rsc_op id="15" operation="start" operation_key="child_rsc1:0_start_0" on_node="node1" on_node_uuid="uuid1">
-        <primitive id="child_rsc1:0" class="heartbeat" type="apache"/>
+        <primitive id="child_rsc1:0" class="ocf" provider="heartbeat" type="apache"/>
         <attributes CRM_meta_clone="0" CRM_meta_clone_max="5" CRM_meta_clone_node_max="2" CRM_meta_globally_unique="true" CRM_meta_master_max="2" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
        </rsc_op>
      </action_set>
     <inputs>
       <trigger>
         <pseudo_event id="2" operation="probe_complete" operation_key="probe_complete"/>
       </trigger>
       <trigger>
         <pseudo_event id="19" operation="start" operation_key="rsc1_start_0"/>
       </trigger>
     </inputs>
    </synapse>
    <synapse id="1">
      <action_set>
        <rsc_op id="10" operation="monitor" operation_key="child_rsc1:0_monitor_0" on_node="node2" on_node_uuid="uuid2">
-        <primitive id="child_rsc1:0" class="heartbeat" type="apache"/>
+        <primitive id="child_rsc1:0" class="ocf" provider="heartbeat" type="apache"/>
         <attributes CRM_meta_clone="0" CRM_meta_clone_max="5" CRM_meta_clone_node_max="2" CRM_meta_globally_unique="true" CRM_meta_master_max="2" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="2">
      <action_set>
       <rsc_op id="4" operation="monitor" operation_key="child_rsc1:0_monitor_0" on_node="node1" on_node_uuid="uuid1">
-        <primitive id="child_rsc1:0" class="heartbeat" type="apache"/>
+        <primitive id="child_rsc1:0" class="ocf" provider="heartbeat" type="apache"/>
         <attributes CRM_meta_clone="0" CRM_meta_clone_max="5" CRM_meta_clone_node_max="2" CRM_meta_globally_unique="true" CRM_meta_master_max="2" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
       </rsc_op>
     </action_set>
     <inputs/>
   </synapse>
   <synapse id="3">
     <action_set>
       <rsc_op id="16" operation="start" operation_key="child_rsc1:1_start_0" on_node="node2" on_node_uuid="uuid2">
-        <primitive id="child_rsc1:1" class="heartbeat" type="apache"/>
+        <primitive id="child_rsc1:1" class="ocf" provider="heartbeat" type="apache"/>
         <attributes CRM_meta_clone="1" CRM_meta_clone_max="5" CRM_meta_clone_node_max="2" CRM_meta_globally_unique="true" CRM_meta_master_max="2" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="2" operation="probe_complete" operation_key="probe_complete"/>
        </trigger>
        <trigger>
          <pseudo_event id="19" operation="start" operation_key="rsc1_start_0"/>
        </trigger>
      </inputs>
    </synapse>
   <synapse id="4">
      <action_set>
       <rsc_op id="11" operation="monitor" operation_key="child_rsc1:1_monitor_0" on_node="node2" on_node_uuid="uuid2">
-        <primitive id="child_rsc1:1" class="heartbeat" type="apache"/>
+        <primitive id="child_rsc1:1" class="ocf" provider="heartbeat" type="apache"/>
         <attributes CRM_meta_clone="1" CRM_meta_clone_max="5" CRM_meta_clone_node_max="2" CRM_meta_globally_unique="true" CRM_meta_master_max="2" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
   <synapse id="5">
      <action_set>
       <rsc_op id="5" operation="monitor" operation_key="child_rsc1:1_monitor_0" on_node="node1" on_node_uuid="uuid1">
-        <primitive id="child_rsc1:1" class="heartbeat" type="apache"/>
+        <primitive id="child_rsc1:1" class="ocf" provider="heartbeat" type="apache"/>
         <attributes CRM_meta_clone="1" CRM_meta_clone_max="5" CRM_meta_clone_node_max="2" CRM_meta_globally_unique="true" CRM_meta_master_max="2" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
   <synapse id="6">
      <action_set>
       <rsc_op id="17" operation="start" operation_key="child_rsc1:2_start_0" on_node="node1" on_node_uuid="uuid1">
-        <primitive id="child_rsc1:2" class="heartbeat" type="apache"/>
+        <primitive id="child_rsc1:2" class="ocf" provider="heartbeat" type="apache"/>
         <attributes CRM_meta_clone="2" CRM_meta_clone_max="5" CRM_meta_clone_node_max="2" CRM_meta_globally_unique="true" CRM_meta_master_max="2" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="2" operation="probe_complete" operation_key="probe_complete"/>
        </trigger>
        <trigger>
          <pseudo_event id="19" operation="start" operation_key="rsc1_start_0"/>
        </trigger>
      </inputs>
    </synapse>
   <synapse id="7">
      <action_set>
       <rsc_op id="12" operation="monitor" operation_key="child_rsc1:2_monitor_0" on_node="node2" on_node_uuid="uuid2">
-        <primitive id="child_rsc1:2" class="heartbeat" type="apache"/>
+        <primitive id="child_rsc1:2" class="ocf" provider="heartbeat" type="apache"/>
         <attributes CRM_meta_clone="2" CRM_meta_clone_max="5" CRM_meta_clone_node_max="2" CRM_meta_globally_unique="true" CRM_meta_master_max="2" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
   <synapse id="8">
      <action_set>
       <rsc_op id="6" operation="monitor" operation_key="child_rsc1:2_monitor_0" on_node="node1" on_node_uuid="uuid1">
-        <primitive id="child_rsc1:2" class="heartbeat" type="apache"/>
+        <primitive id="child_rsc1:2" class="ocf" provider="heartbeat" type="apache"/>
         <attributes CRM_meta_clone="2" CRM_meta_clone_max="5" CRM_meta_clone_node_max="2" CRM_meta_globally_unique="true" CRM_meta_master_max="2" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
   <synapse id="9">
      <action_set>
       <rsc_op id="18" operation="start" operation_key="child_rsc1:3_start_0" on_node="node2" on_node_uuid="uuid2">
-        <primitive id="child_rsc1:3" class="heartbeat" type="apache"/>
+        <primitive id="child_rsc1:3" class="ocf" provider="heartbeat" type="apache"/>
         <attributes CRM_meta_clone="3" CRM_meta_clone_max="5" CRM_meta_clone_node_max="2" CRM_meta_globally_unique="true" CRM_meta_master_max="2" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="2" operation="probe_complete" operation_key="probe_complete"/>
        </trigger>
        <trigger>
          <pseudo_event id="19" operation="start" operation_key="rsc1_start_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="10">
      <action_set>
        <rsc_op id="13" operation="monitor" operation_key="child_rsc1:3_monitor_0" on_node="node2" on_node_uuid="uuid2">
-        <primitive id="child_rsc1:3" class="heartbeat" type="apache"/>
+        <primitive id="child_rsc1:3" class="ocf" provider="heartbeat" type="apache"/>
         <attributes CRM_meta_clone="3" CRM_meta_clone_max="5" CRM_meta_clone_node_max="2" CRM_meta_globally_unique="true" CRM_meta_master_max="2" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="11">
      <action_set>
       <rsc_op id="7" operation="monitor" operation_key="child_rsc1:3_monitor_0" on_node="node1" on_node_uuid="uuid1">
-        <primitive id="child_rsc1:3" class="heartbeat" type="apache"/>
+        <primitive id="child_rsc1:3" class="ocf" provider="heartbeat" type="apache"/>
         <attributes CRM_meta_clone="3" CRM_meta_clone_max="5" CRM_meta_clone_node_max="2" CRM_meta_globally_unique="true" CRM_meta_master_max="2" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
        </rsc_op>
      </action_set>
     <inputs/>
    </synapse>
    <synapse id="12">
      <action_set>
       <rsc_op id="14" operation="monitor" operation_key="child_rsc1:4_monitor_0" on_node="node2" on_node_uuid="uuid2">
-        <primitive id="child_rsc1:4" class="heartbeat" type="apache"/>
+        <primitive id="child_rsc1:4" class="ocf" provider="heartbeat" type="apache"/>
         <attributes CRM_meta_clone="4" CRM_meta_clone_max="5" CRM_meta_clone_node_max="2" CRM_meta_globally_unique="true" CRM_meta_master_max="2" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="13">
      <action_set>
       <rsc_op id="8" operation="monitor" operation_key="child_rsc1:4_monitor_0" on_node="node1" on_node_uuid="uuid1">
-        <primitive id="child_rsc1:4" class="heartbeat" type="apache"/>
+        <primitive id="child_rsc1:4" class="ocf" provider="heartbeat" type="apache"/>
         <attributes CRM_meta_clone="4" CRM_meta_clone_max="5" CRM_meta_clone_node_max="2" CRM_meta_globally_unique="true" CRM_meta_master_max="2" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
   <synapse id="14" priority="1000000">
      <action_set>
        <pseudo_event id="20" operation="running" operation_key="rsc1_running_0">
         <attributes CRM_meta_clone_max="5" CRM_meta_clone_node_max="2" CRM_meta_globally_unique="true" CRM_meta_master_max="2" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="15" operation="start" operation_key="child_rsc1:0_start_0" on_node="node1" on_node_uuid="uuid1"/>
        </trigger>
        <trigger>
          <rsc_op id="16" operation="start" operation_key="child_rsc1:1_start_0" on_node="node2" on_node_uuid="uuid2"/>
        </trigger>
        <trigger>
          <rsc_op id="17" operation="start" operation_key="child_rsc1:2_start_0" on_node="node1" on_node_uuid="uuid1"/>
        </trigger>
        <trigger>
          <rsc_op id="18" operation="start" operation_key="child_rsc1:3_start_0" on_node="node2" on_node_uuid="uuid2"/>
        </trigger>
        <trigger>
          <pseudo_event id="19" operation="start" operation_key="rsc1_start_0"/>
        </trigger>
      </inputs>
    </synapse>
   <synapse id="15">
      <action_set>
       <pseudo_event id="19" operation="start" operation_key="rsc1_start_0">
         <attributes CRM_meta_clone_max="5" CRM_meta_clone_node_max="2" CRM_meta_globally_unique="true" CRM_meta_master_max="2" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
        </pseudo_event>
      </action_set>
     <inputs/>
   </synapse>
   <synapse id="16" priority="1000000">
     <action_set>
       <rsc_op id="9" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="uuid2">
         <attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
       </rsc_op>
     </action_set>
      <inputs>
        <trigger>
         <rsc_op id="10" operation="monitor" operation_key="child_rsc1:0_monitor_0" on_node="node2" on_node_uuid="uuid2"/>
        </trigger>
        <trigger>
         <rsc_op id="11" operation="monitor" operation_key="child_rsc1:1_monitor_0" on_node="node2" on_node_uuid="uuid2"/>
       </trigger>
       <trigger>
         <rsc_op id="12" operation="monitor" operation_key="child_rsc1:2_monitor_0" on_node="node2" on_node_uuid="uuid2"/>
       </trigger>
       <trigger>
         <rsc_op id="13" operation="monitor" operation_key="child_rsc1:3_monitor_0" on_node="node2" on_node_uuid="uuid2"/>
       </trigger>
       <trigger>
         <rsc_op id="14" operation="monitor" operation_key="child_rsc1:4_monitor_0" on_node="node2" on_node_uuid="uuid2"/>
        </trigger>
      </inputs>
    </synapse>
   <synapse id="17" priority="1000000">
      <action_set>
        <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="uuid1">
         <attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="4" operation="monitor" operation_key="child_rsc1:0_monitor_0" on_node="node1" on_node_uuid="uuid1"/>
        </trigger>
        <trigger>
          <rsc_op id="5" operation="monitor" operation_key="child_rsc1:1_monitor_0" on_node="node1" on_node_uuid="uuid1"/>
        </trigger>
        <trigger>
          <rsc_op id="6" operation="monitor" operation_key="child_rsc1:2_monitor_0" on_node="node1" on_node_uuid="uuid1"/>
        </trigger>
        <trigger>
          <rsc_op id="7" operation="monitor" operation_key="child_rsc1:3_monitor_0" on_node="node1" on_node_uuid="uuid1"/>
        </trigger>
        <trigger>
          <rsc_op id="8" operation="monitor" operation_key="child_rsc1:4_monitor_0" on_node="node1" on_node_uuid="uuid1"/>
        </trigger>
      </inputs>
    </synapse>
   <synapse id="18">
      <action_set>
       <pseudo_event id="2" operation="probe_complete" operation_key="probe_complete">
         <attributes crm_feature_set="3.0.7"/>
       </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
         <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="uuid1"/>
        </trigger>
        <trigger>
         <rsc_op id="9" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="uuid2"/>
        </trigger>
      </inputs>
    </synapse>
  </transition_graph>
 
diff --git a/pengine/test10/master-0.summary b/pengine/test10/master-0.summary
index 8403e8eb25..188f4612b4 100644
--- a/pengine/test10/master-0.summary
+++ b/pengine/test10/master-0.summary
@@ -1,46 +1,46 @@
 
 Current cluster status:
 Online: [ node1 node2 ]
 
  Master/Slave Set: rsc1 [child_rsc1] (unique)
-     child_rsc1:0	(heartbeat:apache):	Stopped 
-     child_rsc1:1	(heartbeat:apache):	Stopped 
-     child_rsc1:2	(heartbeat:apache):	Stopped 
-     child_rsc1:3	(heartbeat:apache):	Stopped 
-     child_rsc1:4	(heartbeat:apache):	Stopped 
+     child_rsc1:0	(ocf::heartbeat:apache):	Stopped 
+     child_rsc1:1	(ocf::heartbeat:apache):	Stopped 
+     child_rsc1:2	(ocf::heartbeat:apache):	Stopped 
+     child_rsc1:3	(ocf::heartbeat:apache):	Stopped 
+     child_rsc1:4	(ocf::heartbeat:apache):	Stopped 
 
 Transition Summary:
  * Start   child_rsc1:0	(node1)
  * Start   child_rsc1:1	(node2)
  * Start   child_rsc1:2	(node1)
  * Start   child_rsc1:3	(node2)
 
 Executing cluster transition:
  * Resource action: child_rsc1:0    monitor on node2
  * Resource action: child_rsc1:0    monitor on node1
  * Resource action: child_rsc1:1    monitor on node2
  * Resource action: child_rsc1:1    monitor on node1
  * Resource action: child_rsc1:2    monitor on node2
  * Resource action: child_rsc1:2    monitor on node1
  * Resource action: child_rsc1:3    monitor on node2
  * Resource action: child_rsc1:3    monitor on node1
  * Resource action: child_rsc1:4    monitor on node2
  * Resource action: child_rsc1:4    monitor on node1
  * Pseudo action:   rsc1_start_0
  * Pseudo action:   probe_complete
  * Resource action: child_rsc1:0    start on node1
  * Resource action: child_rsc1:1    start on node2
  * Resource action: child_rsc1:2    start on node1
  * Resource action: child_rsc1:3    start on node2
  * Pseudo action:   rsc1_running_0
 
 Revised cluster status:
 Online: [ node1 node2 ]
 
  Master/Slave Set: rsc1 [child_rsc1] (unique)
-     child_rsc1:0	(heartbeat:apache):	Started node1
-     child_rsc1:1	(heartbeat:apache):	Started node2
-     child_rsc1:2	(heartbeat:apache):	Started node1
-     child_rsc1:3	(heartbeat:apache):	Started node2
-     child_rsc1:4	(heartbeat:apache):	Stopped 
+     child_rsc1:0	(ocf::heartbeat:apache):	Started node1
+     child_rsc1:1	(ocf::heartbeat:apache):	Started node2
+     child_rsc1:2	(ocf::heartbeat:apache):	Started node1
+     child_rsc1:3	(ocf::heartbeat:apache):	Started node2
+     child_rsc1:4	(ocf::heartbeat:apache):	Stopped 
 
diff --git a/pengine/test10/master-0.xml b/pengine/test10/master-0.xml
index ceffc64b82..9bbfdf99ad 100644
--- a/pengine/test10/master-0.xml
+++ b/pengine/test10/master-0.xml
@@ -1,48 +1,48 @@
 <cib admin_epoch="0" epoch="1" num_updates="1" dc-uuid="0" have-quorum="false" remote-tls-port="0" validate-with="pacemaker-1.0" cib-last-written="Fri Jul 13 13:51:06 2012">
   <configuration>
     <crm_config>
       <cluster_property_set id="no-stonith">
         <nvpair id="opt-no-stonith" name="stonith-enabled" value="false"/>
       </cluster_property_set>
       <cluster_property_set id="cib-bootstrap-options">
         <nvpair id="nvpair.id21832" name="no-quorum-policy" value="ignore"/>
       </cluster_property_set>
     </crm_config>
     <nodes>
       <node id="uuid1" uname="node1" type="member"/>
       <node id="uuid2" uname="node2" type="member"/>
     </nodes>
     <resources>
       <master id="rsc1">
-        <primitive id="child_rsc1" class="heartbeat" type="apache">
+        <primitive id="child_rsc1" class="ocf" provider="heartbeat" type="apache">
           <meta_attributes id="primitive-child_rsc1.meta"/>
         </primitive>
         <meta_attributes id="master_slave-rsc1.meta">
           <nvpair id="nvpair.meta.auto-35" name="resource-stickiness" value="1"/>
           <nvpair id="nvpair.meta.auto-27" name="clone-max" value="5"/>
           <nvpair id="nvpair.meta.auto-29" name="clone-node-max" value="2"/>
           <nvpair id="nvpair.meta.auto-31" name="master-max" value="2"/>
           <nvpair id="nvpair.meta.auto-33" name="master-node-max" value="1"/>
           <nvpair id="unique-1" name="globally-unique" value="true"/>
         </meta_attributes>
       </master>
     </resources>
     <constraints/>
   </configuration>
   <status>
     <node_state id="uuid1" ha="active" uname="node1" crmd="online" join="member" expected="member" in_ccm="true">
       <transient_attributes id="transient_attributes.id21955">
         <instance_attributes id="instance_attributes.id21957">
           <nvpair id="nvpair.id21964" name="probe_complete" value="true"/>
         </instance_attributes>
       </transient_attributes>
     </node_state>
     <node_state id="uuid2" ha="active" uname="node2" crmd="online" join="member" expected="member" in_ccm="true">
       <transient_attributes id="transient_attributes.id21993">
         <instance_attributes id="instance_attributes.id21996">
           <nvpair id="nvpair.id22002" name="probe_complete" value="true"/>
         </instance_attributes>
       </transient_attributes>
     </node_state>
   </status>
-</cib>
\ No newline at end of file
+</cib>
diff --git a/pengine/test10/master-1.exp b/pengine/test10/master-1.exp
index 802bebd98f..d5e0def15b 100644
--- a/pengine/test10/master-1.exp
+++ b/pengine/test10/master-1.exp
@@ -1,292 +1,292 @@
  <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>
        <rsc_op id="15" operation="start" operation_key="child_rsc1:0_start_0" on_node="node1" on_node_uuid="uuid1">
-        <primitive id="child_rsc1:0" class="heartbeat" type="apache"/>
+        <primitive id="child_rsc1:0" class="ocf" provider="heartbeat" type="apache"/>
         <attributes CRM_meta_clone="0" CRM_meta_clone_max="5" CRM_meta_clone_node_max="2" CRM_meta_globally_unique="true" CRM_meta_master_max="2" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="2" operation="probe_complete" operation_key="probe_complete"/>
        </trigger>
        <trigger>
          <pseudo_event id="20" operation="start" operation_key="rsc1_start_0"/>
        </trigger>
      </inputs>
    </synapse>
   <synapse id="1">
      <action_set>
       <rsc_op id="10" operation="monitor" operation_key="child_rsc1:0_monitor_0" on_node="node2" on_node_uuid="uuid2">
-        <primitive id="child_rsc1:0" class="heartbeat" type="apache"/>
+        <primitive id="child_rsc1:0" class="ocf" provider="heartbeat" type="apache"/>
         <attributes CRM_meta_clone="0" CRM_meta_clone_max="5" CRM_meta_clone_node_max="2" CRM_meta_globally_unique="true" CRM_meta_master_max="2" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
   <synapse id="2">
      <action_set>
       <rsc_op id="4" operation="monitor" operation_key="child_rsc1:0_monitor_0" on_node="node1" on_node_uuid="uuid1">
-        <primitive id="child_rsc1:0" class="heartbeat" type="apache"/>
+        <primitive id="child_rsc1:0" class="ocf" provider="heartbeat" type="apache"/>
         <attributes CRM_meta_clone="0" CRM_meta_clone_max="5" CRM_meta_clone_node_max="2" CRM_meta_globally_unique="true" CRM_meta_master_max="2" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
   <synapse id="3">
      <action_set>
       <rsc_op id="17" operation="promote" operation_key="child_rsc1:1_promote_0" on_node="node2" on_node_uuid="uuid2">
-        <primitive id="child_rsc1:1" class="heartbeat" type="apache"/>
+        <primitive id="child_rsc1:1" class="ocf" provider="heartbeat" type="apache"/>
         <attributes CRM_meta_clone="1" CRM_meta_clone_max="5" CRM_meta_clone_node_max="2" CRM_meta_globally_unique="true" CRM_meta_master_max="2" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
         <rsc_op id="16" operation="start" operation_key="child_rsc1:1_start_0" on_node="node2" on_node_uuid="uuid2"/>
        </trigger>
        <trigger>
         <pseudo_event id="24" operation="promote" operation_key="rsc1_promote_0"/>
        </trigger>
      </inputs>
    </synapse>
   <synapse id="4">
      <action_set>
       <rsc_op id="16" operation="start" operation_key="child_rsc1:1_start_0" on_node="node2" on_node_uuid="uuid2">
-        <primitive id="child_rsc1:1" class="heartbeat" type="apache"/>
+        <primitive id="child_rsc1:1" class="ocf" provider="heartbeat" type="apache"/>
         <attributes CRM_meta_clone="1" CRM_meta_clone_max="5" CRM_meta_clone_node_max="2" CRM_meta_globally_unique="true" CRM_meta_master_max="2" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
         <pseudo_event id="2" operation="probe_complete" operation_key="probe_complete"/>
        </trigger>
        <trigger>
         <pseudo_event id="20" operation="start" operation_key="rsc1_start_0"/>
        </trigger>
      </inputs>
    </synapse>
   <synapse id="5">
      <action_set>
       <rsc_op id="11" operation="monitor" operation_key="child_rsc1:1_monitor_0" on_node="node2" on_node_uuid="uuid2">
-        <primitive id="child_rsc1:1" class="heartbeat" type="apache"/>
+        <primitive id="child_rsc1:1" class="ocf" provider="heartbeat" type="apache"/>
         <attributes CRM_meta_clone="1" CRM_meta_clone_max="5" CRM_meta_clone_node_max="2" CRM_meta_globally_unique="true" CRM_meta_master_max="2" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
   <synapse id="6">
      <action_set>
       <rsc_op id="5" operation="monitor" operation_key="child_rsc1:1_monitor_0" on_node="node1" on_node_uuid="uuid1">
-        <primitive id="child_rsc1:1" class="heartbeat" type="apache"/>
+        <primitive id="child_rsc1:1" class="ocf" provider="heartbeat" type="apache"/>
         <attributes CRM_meta_clone="1" CRM_meta_clone_max="5" CRM_meta_clone_node_max="2" CRM_meta_globally_unique="true" CRM_meta_master_max="2" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
   <synapse id="7">
      <action_set>
        <rsc_op id="18" operation="start" operation_key="child_rsc1:2_start_0" on_node="node1" on_node_uuid="uuid1">
-        <primitive id="child_rsc1:2" class="heartbeat" type="apache"/>
+        <primitive id="child_rsc1:2" class="ocf" provider="heartbeat" type="apache"/>
         <attributes CRM_meta_clone="2" CRM_meta_clone_max="5" CRM_meta_clone_node_max="2" CRM_meta_globally_unique="true" CRM_meta_master_max="2" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="2" operation="probe_complete" operation_key="probe_complete"/>
        </trigger>
        <trigger>
          <pseudo_event id="20" operation="start" operation_key="rsc1_start_0"/>
        </trigger>
      </inputs>
    </synapse>
   <synapse id="8">
      <action_set>
       <rsc_op id="12" operation="monitor" operation_key="child_rsc1:2_monitor_0" on_node="node2" on_node_uuid="uuid2">
-        <primitive id="child_rsc1:2" class="heartbeat" type="apache"/>
+        <primitive id="child_rsc1:2" class="ocf" provider="heartbeat" type="apache"/>
         <attributes CRM_meta_clone="2" CRM_meta_clone_max="5" CRM_meta_clone_node_max="2" CRM_meta_globally_unique="true" CRM_meta_master_max="2" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
   <synapse id="9">
      <action_set>
       <rsc_op id="6" operation="monitor" operation_key="child_rsc1:2_monitor_0" on_node="node1" on_node_uuid="uuid1">
-        <primitive id="child_rsc1:2" class="heartbeat" type="apache"/>
+        <primitive id="child_rsc1:2" class="ocf" provider="heartbeat" type="apache"/>
         <attributes CRM_meta_clone="2" CRM_meta_clone_max="5" CRM_meta_clone_node_max="2" CRM_meta_globally_unique="true" CRM_meta_master_max="2" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
   <synapse id="10">
      <action_set>
        <rsc_op id="19" operation="start" operation_key="child_rsc1:3_start_0" on_node="node2" on_node_uuid="uuid2">
-        <primitive id="child_rsc1:3" class="heartbeat" type="apache"/>
+        <primitive id="child_rsc1:3" class="ocf" provider="heartbeat" type="apache"/>
         <attributes CRM_meta_clone="3" CRM_meta_clone_max="5" CRM_meta_clone_node_max="2" CRM_meta_globally_unique="true" CRM_meta_master_max="2" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="2" operation="probe_complete" operation_key="probe_complete"/>
        </trigger>
        <trigger>
          <pseudo_event id="20" operation="start" operation_key="rsc1_start_0"/>
        </trigger>
      </inputs>
    </synapse>
   <synapse id="11">
     <action_set>
       <rsc_op id="13" operation="monitor" operation_key="child_rsc1:3_monitor_0" on_node="node2" on_node_uuid="uuid2">
-        <primitive id="child_rsc1:3" class="heartbeat" type="apache"/>
+        <primitive id="child_rsc1:3" class="ocf" provider="heartbeat" type="apache"/>
         <attributes CRM_meta_clone="3" CRM_meta_clone_max="5" CRM_meta_clone_node_max="2" CRM_meta_globally_unique="true" CRM_meta_master_max="2" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
       </rsc_op>
     </action_set>
     <inputs/>
   </synapse>
   <synapse id="12">
     <action_set>
       <rsc_op id="7" operation="monitor" operation_key="child_rsc1:3_monitor_0" on_node="node1" on_node_uuid="uuid1">
-        <primitive id="child_rsc1:3" class="heartbeat" type="apache"/>
+        <primitive id="child_rsc1:3" class="ocf" provider="heartbeat" type="apache"/>
         <attributes CRM_meta_clone="3" CRM_meta_clone_max="5" CRM_meta_clone_node_max="2" CRM_meta_globally_unique="true" CRM_meta_master_max="2" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
       </rsc_op>
     </action_set>
     <inputs/>
   </synapse>
    <synapse id="13">
      <action_set>
       <rsc_op id="14" operation="monitor" operation_key="child_rsc1:4_monitor_0" on_node="node2" on_node_uuid="uuid2">
-        <primitive id="child_rsc1:4" class="heartbeat" type="apache"/>
+        <primitive id="child_rsc1:4" class="ocf" provider="heartbeat" type="apache"/>
         <attributes CRM_meta_clone="4" CRM_meta_clone_max="5" CRM_meta_clone_node_max="2" CRM_meta_globally_unique="true" CRM_meta_master_max="2" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="14">
      <action_set>
       <rsc_op id="8" operation="monitor" operation_key="child_rsc1:4_monitor_0" on_node="node1" on_node_uuid="uuid1">
-        <primitive id="child_rsc1:4" class="heartbeat" type="apache"/>
+        <primitive id="child_rsc1:4" class="ocf" provider="heartbeat" type="apache"/>
         <attributes CRM_meta_clone="4" CRM_meta_clone_max="5" CRM_meta_clone_node_max="2" CRM_meta_globally_unique="true" CRM_meta_master_max="2" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
   <synapse id="15" priority="1000000">
      <action_set>
       <pseudo_event id="25" operation="promoted" operation_key="rsc1_promoted_0">
         <attributes CRM_meta_clone_max="5" CRM_meta_clone_node_max="2" CRM_meta_globally_unique="true" CRM_meta_master_max="2" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
        </pseudo_event>
      </action_set>
     <inputs>
       <trigger>
         <rsc_op id="17" operation="promote" operation_key="child_rsc1:1_promote_0" on_node="node2" on_node_uuid="uuid2"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="16">
     <action_set>
       <pseudo_event id="24" operation="promote" operation_key="rsc1_promote_0">
         <attributes CRM_meta_clone_max="5" CRM_meta_clone_node_max="2" CRM_meta_globally_unique="true" CRM_meta_master_max="2" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
         <pseudo_event id="21" operation="running" operation_key="rsc1_running_0"/>
       </trigger>
     </inputs>
    </synapse>
   <synapse id="17" priority="1000000">
      <action_set>
        <pseudo_event id="21" operation="running" operation_key="rsc1_running_0">
         <attributes CRM_meta_clone_max="5" CRM_meta_clone_node_max="2" CRM_meta_globally_unique="true" CRM_meta_master_max="2" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="15" operation="start" operation_key="child_rsc1:0_start_0" on_node="node1" on_node_uuid="uuid1"/>
        </trigger>
        <trigger>
          <rsc_op id="16" operation="start" operation_key="child_rsc1:1_start_0" on_node="node2" on_node_uuid="uuid2"/>
        </trigger>
        <trigger>
          <rsc_op id="18" operation="start" operation_key="child_rsc1:2_start_0" on_node="node1" on_node_uuid="uuid1"/>
        </trigger>
        <trigger>
          <rsc_op id="19" operation="start" operation_key="child_rsc1:3_start_0" on_node="node2" on_node_uuid="uuid2"/>
        </trigger>
        <trigger>
          <pseudo_event id="20" operation="start" operation_key="rsc1_start_0"/>
        </trigger>
      </inputs>
    </synapse>
   <synapse id="18">
      <action_set>
       <pseudo_event id="20" operation="start" operation_key="rsc1_start_0">
         <attributes CRM_meta_clone_max="5" CRM_meta_clone_node_max="2" CRM_meta_globally_unique="true" CRM_meta_master_max="2" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
        </pseudo_event>
      </action_set>
     <inputs/>
    </synapse>
   <synapse id="19" priority="1000000">
      <action_set>
       <rsc_op id="9" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="uuid2">
         <attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
       </rsc_op>
      </action_set>
      <inputs>
        <trigger>
         <rsc_op id="10" operation="monitor" operation_key="child_rsc1:0_monitor_0" on_node="node2" on_node_uuid="uuid2"/>
        </trigger>
        <trigger>
         <rsc_op id="11" operation="monitor" operation_key="child_rsc1:1_monitor_0" on_node="node2" on_node_uuid="uuid2"/>
        </trigger>
        <trigger>
         <rsc_op id="12" operation="monitor" operation_key="child_rsc1:2_monitor_0" on_node="node2" on_node_uuid="uuid2"/>
       </trigger>
       <trigger>
         <rsc_op id="13" operation="monitor" operation_key="child_rsc1:3_monitor_0" on_node="node2" on_node_uuid="uuid2"/>
       </trigger>
       <trigger>
         <rsc_op id="14" operation="monitor" operation_key="child_rsc1:4_monitor_0" on_node="node2" on_node_uuid="uuid2"/>
        </trigger>
      </inputs>
    </synapse>
   <synapse id="20" priority="1000000">
      <action_set>
        <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="uuid1">
         <attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="4" operation="monitor" operation_key="child_rsc1:0_monitor_0" on_node="node1" on_node_uuid="uuid1"/>
        </trigger>
        <trigger>
          <rsc_op id="5" operation="monitor" operation_key="child_rsc1:1_monitor_0" on_node="node1" on_node_uuid="uuid1"/>
        </trigger>
        <trigger>
          <rsc_op id="6" operation="monitor" operation_key="child_rsc1:2_monitor_0" on_node="node1" on_node_uuid="uuid1"/>
        </trigger>
        <trigger>
          <rsc_op id="7" operation="monitor" operation_key="child_rsc1:3_monitor_0" on_node="node1" on_node_uuid="uuid1"/>
        </trigger>
        <trigger>
          <rsc_op id="8" operation="monitor" operation_key="child_rsc1:4_monitor_0" on_node="node1" on_node_uuid="uuid1"/>
        </trigger>
      </inputs>
    </synapse>
   <synapse id="21">
      <action_set>
       <pseudo_event id="2" operation="probe_complete" operation_key="probe_complete">
         <attributes crm_feature_set="3.0.7"/>
       </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
         <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="uuid1"/>
        </trigger>
        <trigger>
         <rsc_op id="9" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="uuid2"/>
        </trigger>
      </inputs>
    </synapse>
  </transition_graph>
 
diff --git a/pengine/test10/master-1.summary b/pengine/test10/master-1.summary
index d65778afa0..3edc1bb805 100644
--- a/pengine/test10/master-1.summary
+++ b/pengine/test10/master-1.summary
@@ -1,50 +1,50 @@
 
 Current cluster status:
 Online: [ node1 node2 ]
 
  Master/Slave Set: rsc1 [child_rsc1] (unique)
-     child_rsc1:0	(heartbeat:apache):	Stopped 
-     child_rsc1:1	(heartbeat:apache):	Stopped 
-     child_rsc1:2	(heartbeat:apache):	Stopped 
-     child_rsc1:3	(heartbeat:apache):	Stopped 
-     child_rsc1:4	(heartbeat:apache):	Stopped 
+     child_rsc1:0	(ocf::heartbeat:apache):	Stopped 
+     child_rsc1:1	(ocf::heartbeat:apache):	Stopped 
+     child_rsc1:2	(ocf::heartbeat:apache):	Stopped 
+     child_rsc1:3	(ocf::heartbeat:apache):	Stopped 
+     child_rsc1:4	(ocf::heartbeat:apache):	Stopped 
 
 Transition Summary:
  * Start   child_rsc1:0	(node1)
  * Start   child_rsc1:1	(node2)
  * Promote child_rsc1:1	(Stopped -> Master node2)
  * Start   child_rsc1:2	(node1)
  * Start   child_rsc1:3	(node2)
 
 Executing cluster transition:
  * Resource action: child_rsc1:0    monitor on node2
  * Resource action: child_rsc1:0    monitor on node1
  * Resource action: child_rsc1:1    monitor on node2
  * Resource action: child_rsc1:1    monitor on node1
  * Resource action: child_rsc1:2    monitor on node2
  * Resource action: child_rsc1:2    monitor on node1
  * Resource action: child_rsc1:3    monitor on node2
  * Resource action: child_rsc1:3    monitor on node1
  * Resource action: child_rsc1:4    monitor on node2
  * Resource action: child_rsc1:4    monitor on node1
  * Pseudo action:   rsc1_start_0
  * Pseudo action:   probe_complete
  * Resource action: child_rsc1:0    start on node1
  * Resource action: child_rsc1:1    start on node2
  * Resource action: child_rsc1:2    start on node1
  * Resource action: child_rsc1:3    start on node2
  * Pseudo action:   rsc1_running_0
  * Pseudo action:   rsc1_promote_0
  * Resource action: child_rsc1:1    promote on node2
  * Pseudo action:   rsc1_promoted_0
 
 Revised cluster status:
 Online: [ node1 node2 ]
 
  Master/Slave Set: rsc1 [child_rsc1] (unique)
-     child_rsc1:0	(heartbeat:apache):	Started node1
-     child_rsc1:1	(heartbeat:apache):	Master node2
-     child_rsc1:2	(heartbeat:apache):	Started node1
-     child_rsc1:3	(heartbeat:apache):	Started node2
-     child_rsc1:4	(heartbeat:apache):	Stopped 
+     child_rsc1:0	(ocf::heartbeat:apache):	Started node1
+     child_rsc1:1	(ocf::heartbeat:apache):	Master node2
+     child_rsc1:2	(ocf::heartbeat:apache):	Started node1
+     child_rsc1:3	(ocf::heartbeat:apache):	Started node2
+     child_rsc1:4	(ocf::heartbeat:apache):	Stopped 
 
diff --git a/pengine/test10/master-1.xml b/pengine/test10/master-1.xml
index 9cc90631db..852fe4b6b2 100644
--- a/pengine/test10/master-1.xml
+++ b/pengine/test10/master-1.xml
@@ -1,54 +1,54 @@
 <cib admin_epoch="0" epoch="1" num_updates="1" dc-uuid="0" have-quorum="false" remote-tls-port="0" validate-with="pacemaker-1.0" cib-last-written="Fri Jul 13 13:51:06 2012">
   <configuration>
     <crm_config>
       <cluster_property_set id="no-stonith">
         <nvpair id="opt-no-stonith" name="stonith-enabled" value="false"/>
       </cluster_property_set>
       <cluster_property_set id="cib-bootstrap-options">
         <nvpair id="nvpair.id21832" name="no-quorum-policy" value="ignore"/>
       </cluster_property_set>
     </crm_config>
     <nodes>
       <node id="uuid1" uname="node1" type="member"/>
       <node id="uuid2" uname="node2" type="member"/>
     </nodes>
     <resources>
       <master id="rsc1">
-        <primitive id="child_rsc1" class="heartbeat" type="apache">
+        <primitive id="child_rsc1" class="ocf" provider="heartbeat" type="apache">
           <meta_attributes id="primitive-child_rsc1.meta"/>
         </primitive>
         <meta_attributes id="master_slave-rsc1.meta">
           <nvpair id="nvpair.meta.auto-37" name="resource-stickiness" value="1"/>
           <nvpair id="nvpair.meta.auto-29" name="clone-max" value="5"/>
           <nvpair id="nvpair.meta.auto-31" name="clone-node-max" value="2"/>
           <nvpair id="nvpair.meta.auto-33" name="master-max" value="2"/>
           <nvpair id="nvpair.meta.auto-35" name="master-node-max" value="1"/>
           <nvpair id="unique-1" name="globally-unique" value="true"/>
         </meta_attributes>
       </master>
     </resources>
     <constraints>
       <rsc_location id="master-node2" rsc="rsc1">
         <rule id="master-rule-node2" score="100" role="Master">
           <expression id="expression.id21950" attribute="#uname" operation="eq" value="node2"/>
         </rule>
       </rsc_location>
     </constraints>
   </configuration>
   <status>
     <node_state id="uuid1" ha="active" uname="node1" crmd="online" join="member" expected="member" in_ccm="true">
       <transient_attributes id="transient_attributes.id21983">
         <instance_attributes id="instance_attributes.id21985">
           <nvpair id="nvpair.id21991" name="probe_complete" value="true"/>
         </instance_attributes>
       </transient_attributes>
     </node_state>
     <node_state id="uuid2" ha="active" uname="node2" crmd="online" join="member" expected="member" in_ccm="true">
       <transient_attributes id="transient_attributes.id22021">
         <instance_attributes id="instance_attributes.id22023">
           <nvpair id="nvpair.id22029" name="probe_complete" value="true"/>
         </instance_attributes>
       </transient_attributes>
     </node_state>
   </status>
-</cib>
\ No newline at end of file
+</cib>
diff --git a/pengine/test10/master-10.exp b/pengine/test10/master-10.exp
index 62a631d9ca..c34c62c364 100644
--- a/pengine/test10/master-10.exp
+++ b/pengine/test10/master-10.exp
@@ -1,668 +1,668 @@
  <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" priority="1000000">
      <action_set>
       <rsc_op id="64" operation="notify" operation_key="child_rsc1:0_post_notify_promote_0" on_node="node1" on_node_uuid="uuid1">
-        <primitive id="child_rsc1:0" class="heartbeat" type="apache"/>
+        <primitive id="child_rsc1:0" class="ocf" provider="heartbeat" type="apache"/>
         <attributes CRM_meta_clone="0" CRM_meta_clone_max="5" CRM_meta_clone_node_max="2" CRM_meta_globally_unique="true" CRM_meta_master_max="2" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="child_rsc1:0 child_rsc1:1 child_rsc1:2 child_rsc1:3 child_rsc1:4 " CRM_meta_notify_key_operation="promoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="child_rsc1:0 " CRM_meta_notify_promote_uname="node1 " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="child_rsc1:0 child_rsc1:1 child_rsc1:2 child_rsc1:3 " CRM_meta_notify_start_uname="node1 node2 node1 node2 " CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="post" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
        </rsc_op>
      </action_set>
     <inputs>
       <trigger>
         <pseudo_event id="40" operation="notify" operation_key="rsc1_post_notify_promoted_0"/>
       </trigger>
     </inputs>
    </synapse>
    <synapse id="1">
      <action_set>
       <rsc_op id="63" operation="notify" operation_key="child_rsc1:0_pre_notify_promote_0" on_node="node1" on_node_uuid="uuid1">
-        <primitive id="child_rsc1:0" class="heartbeat" type="apache"/>
+        <primitive id="child_rsc1:0" class="ocf" provider="heartbeat" type="apache"/>
         <attributes CRM_meta_clone="0" CRM_meta_clone_max="5" CRM_meta_clone_node_max="2" CRM_meta_globally_unique="true" CRM_meta_master_max="2" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="child_rsc1:0 child_rsc1:1 child_rsc1:2 child_rsc1:3 child_rsc1:4 " CRM_meta_notify_key_operation="promote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="child_rsc1:0 " CRM_meta_notify_promote_uname="node1 " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="child_rsc1:0 child_rsc1:1 child_rsc1:2 child_rsc1:3 " CRM_meta_notify_start_uname="node1 node2 node1 node2 " CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="pre" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
         <pseudo_event id="38" operation="notify" operation_key="rsc1_pre_notify_promote_0"/>
        </trigger>
      </inputs>
    </synapse>
   <synapse id="2" priority="1000000">
      <action_set>
       <rsc_op id="59" operation="notify" operation_key="child_rsc1:0_post_notify_start_0" on_node="node1" on_node_uuid="uuid1">
-        <primitive id="child_rsc1:0" class="heartbeat" type="apache"/>
+        <primitive id="child_rsc1:0" class="ocf" provider="heartbeat" type="apache"/>
         <attributes CRM_meta_clone="0" CRM_meta_clone_max="5" CRM_meta_clone_node_max="2" CRM_meta_globally_unique="true" CRM_meta_master_max="2" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="child_rsc1:0 child_rsc1:1 child_rsc1:2 child_rsc1:3 child_rsc1:4 " CRM_meta_notify_key_operation="running" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="start" CRM_meta_notify_promote_resource="child_rsc1:0 " CRM_meta_notify_promote_uname="node1 " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="child_rsc1:0 child_rsc1:1 child_rsc1:2 child_rsc1:3 " CRM_meta_notify_start_uname="node1 node2 node1 node2 " CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="post" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
         <pseudo_event id="28" operation="notify" operation_key="rsc1_post_notify_running_0"/>
        </trigger>
      </inputs>
    </synapse>
   <synapse id="3">
      <action_set>
        <rsc_op id="17" operation="monitor" operation_key="child_rsc1:0_monitor_11000" on_node="node1" on_node_uuid="uuid1">
-        <primitive id="child_rsc1:0" class="heartbeat" type="apache"/>
+        <primitive id="child_rsc1:0" class="ocf" provider="heartbeat" type="apache"/>
         <attributes CRM_meta_clone="0" CRM_meta_clone_max="5" CRM_meta_clone_node_max="2" CRM_meta_globally_unique="true" CRM_meta_interval="11000" CRM_meta_master_max="2" CRM_meta_master_node_max="1" CRM_meta_name="monitor" CRM_meta_notify="true" CRM_meta_op_target_rc="8" CRM_meta_role="Master" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="15" operation="start" operation_key="child_rsc1:0_start_0" on_node="node1" on_node_uuid="uuid1"/>
        </trigger>
        <trigger>
          <rsc_op id="16" operation="promote" operation_key="child_rsc1:0_promote_0" on_node="node1" on_node_uuid="uuid1"/>
        </trigger>
        <trigger>
          <pseudo_event id="29" operation="notified" operation_key="rsc1_confirmed-post_notify_running_0"/>
        </trigger>
        <trigger>
          <pseudo_event id="41" operation="notified" operation_key="rsc1_confirmed-post_notify_promoted_0"/>
        </trigger>
      </inputs>
    </synapse>
   <synapse id="4">
      <action_set>
       <rsc_op id="16" operation="promote" operation_key="child_rsc1:0_promote_0" on_node="node1" on_node_uuid="uuid1">
-        <primitive id="child_rsc1:0" class="heartbeat" type="apache"/>
+        <primitive id="child_rsc1:0" class="ocf" provider="heartbeat" type="apache"/>
         <attributes CRM_meta_clone="0" CRM_meta_clone_max="5" CRM_meta_clone_node_max="2" CRM_meta_globally_unique="true" CRM_meta_master_max="2" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="child_rsc1:0 child_rsc1:1 child_rsc1:2 child_rsc1:3 child_rsc1:4 " CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_promote_resource="child_rsc1:0 " CRM_meta_notify_promote_uname="node1 " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="child_rsc1:0 child_rsc1:1 child_rsc1:2 child_rsc1:3 " CRM_meta_notify_start_uname="node1 node2 node1 node2 " CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
         <rsc_op id="15" operation="start" operation_key="child_rsc1:0_start_0" on_node="node1" on_node_uuid="uuid1"/>
       </trigger>
       <trigger>
         <pseudo_event id="36" operation="promote" operation_key="rsc1_promote_0"/>
        </trigger>
      </inputs>
    </synapse>
   <synapse id="5">
      <action_set>
       <rsc_op id="15" operation="start" operation_key="child_rsc1:0_start_0" on_node="node1" on_node_uuid="uuid1">
-        <primitive id="child_rsc1:0" class="heartbeat" type="apache"/>
+        <primitive id="child_rsc1:0" class="ocf" provider="heartbeat" type="apache"/>
         <attributes CRM_meta_clone="0" CRM_meta_clone_max="5" CRM_meta_clone_node_max="2" CRM_meta_globally_unique="true" CRM_meta_master_max="2" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="child_rsc1:0 child_rsc1:1 child_rsc1:2 child_rsc1:3 child_rsc1:4 " CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_promote_resource="child_rsc1:0 " CRM_meta_notify_promote_uname="node1 " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="child_rsc1:0 child_rsc1:1 child_rsc1:2 child_rsc1:3 " CRM_meta_notify_start_uname="node1 node2 node1 node2 " CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
         <pseudo_event id="2" operation="probe_complete" operation_key="probe_complete"/>
       </trigger>
       <trigger>
         <pseudo_event id="24" operation="start" operation_key="rsc1_start_0"/>
        </trigger>
      </inputs>
    </synapse>
   <synapse id="6">
      <action_set>
       <rsc_op id="10" operation="monitor" operation_key="child_rsc1:0_monitor_0" on_node="node2" on_node_uuid="uuid2">
-        <primitive id="child_rsc1:0" class="heartbeat" type="apache"/>
+        <primitive id="child_rsc1:0" class="ocf" provider="heartbeat" type="apache"/>
         <attributes CRM_meta_clone="0" CRM_meta_clone_max="5" CRM_meta_clone_node_max="2" CRM_meta_globally_unique="true" CRM_meta_master_max="2" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
        </rsc_op>
      </action_set>
     <inputs/>
    </synapse>
   <synapse id="7">
      <action_set>
       <rsc_op id="4" operation="monitor" operation_key="child_rsc1:0_monitor_0" on_node="node1" on_node_uuid="uuid1">
-        <primitive id="child_rsc1:0" class="heartbeat" type="apache"/>
+        <primitive id="child_rsc1:0" class="ocf" provider="heartbeat" type="apache"/>
         <attributes CRM_meta_clone="0" CRM_meta_clone_max="5" CRM_meta_clone_node_max="2" CRM_meta_globally_unique="true" CRM_meta_master_max="2" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
   <synapse id="8" priority="1000000">
      <action_set>
       <rsc_op id="66" operation="notify" operation_key="child_rsc1:1_post_notify_promote_0" on_node="node2" on_node_uuid="uuid2">
-        <primitive id="child_rsc1:1" class="heartbeat" type="apache"/>
+        <primitive id="child_rsc1:1" class="ocf" provider="heartbeat" type="apache"/>
         <attributes CRM_meta_clone="1" CRM_meta_clone_max="5" CRM_meta_clone_node_max="2" CRM_meta_globally_unique="true" CRM_meta_master_max="2" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="child_rsc1:0 child_rsc1:1 child_rsc1:2 child_rsc1:3 child_rsc1:4 " CRM_meta_notify_key_operation="promoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="child_rsc1:0 " CRM_meta_notify_promote_uname="node1 " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="child_rsc1:0 child_rsc1:1 child_rsc1:2 child_rsc1:3 " CRM_meta_notify_start_uname="node1 node2 node1 node2 " CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="post" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
        </rsc_op>
      </action_set>
     <inputs>
       <trigger>
         <pseudo_event id="40" operation="notify" operation_key="rsc1_post_notify_promoted_0"/>
       </trigger>
     </inputs>
    </synapse>
   <synapse id="9">
      <action_set>
       <rsc_op id="65" operation="notify" operation_key="child_rsc1:1_pre_notify_promote_0" on_node="node2" on_node_uuid="uuid2">
-        <primitive id="child_rsc1:1" class="heartbeat" type="apache"/>
+        <primitive id="child_rsc1:1" class="ocf" provider="heartbeat" type="apache"/>
         <attributes CRM_meta_clone="1" CRM_meta_clone_max="5" CRM_meta_clone_node_max="2" CRM_meta_globally_unique="true" CRM_meta_master_max="2" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="child_rsc1:0 child_rsc1:1 child_rsc1:2 child_rsc1:3 child_rsc1:4 " CRM_meta_notify_key_operation="promote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="child_rsc1:0 " CRM_meta_notify_promote_uname="node1 " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="child_rsc1:0 child_rsc1:1 child_rsc1:2 child_rsc1:3 " CRM_meta_notify_start_uname="node1 node2 node1 node2 " CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="pre" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
         <pseudo_event id="38" operation="notify" operation_key="rsc1_pre_notify_promote_0"/>
        </trigger>
     </inputs>
   </synapse>
   <synapse id="10" priority="1000000">
     <action_set>
       <rsc_op id="60" operation="notify" operation_key="child_rsc1:1_post_notify_start_0" on_node="node2" on_node_uuid="uuid2">
-        <primitive id="child_rsc1:1" class="heartbeat" type="apache"/>
+        <primitive id="child_rsc1:1" class="ocf" provider="heartbeat" type="apache"/>
         <attributes CRM_meta_clone="1" CRM_meta_clone_max="5" CRM_meta_clone_node_max="2" CRM_meta_globally_unique="true" CRM_meta_master_max="2" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="child_rsc1:0 child_rsc1:1 child_rsc1:2 child_rsc1:3 child_rsc1:4 " CRM_meta_notify_key_operation="running" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="start" CRM_meta_notify_promote_resource="child_rsc1:0 " CRM_meta_notify_promote_uname="node1 " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="child_rsc1:0 child_rsc1:1 child_rsc1:2 child_rsc1:3 " CRM_meta_notify_start_uname="node1 node2 node1 node2 " CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="post" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
       </rsc_op>
     </action_set>
     <inputs>
        <trigger>
         <pseudo_event id="28" operation="notify" operation_key="rsc1_post_notify_running_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="11">
      <action_set>
        <rsc_op id="19" operation="monitor" operation_key="child_rsc1:1_monitor_1000" on_node="node2" on_node_uuid="uuid2">
-        <primitive id="child_rsc1:1" class="heartbeat" type="apache"/>
+        <primitive id="child_rsc1:1" class="ocf" provider="heartbeat" type="apache"/>
         <attributes CRM_meta_clone="1" CRM_meta_clone_max="5" CRM_meta_clone_node_max="2" CRM_meta_globally_unique="true" CRM_meta_interval="1000" CRM_meta_master_max="2" CRM_meta_master_node_max="1" CRM_meta_name="monitor" CRM_meta_notify="true" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="18" operation="start" operation_key="child_rsc1:1_start_0" on_node="node2" on_node_uuid="uuid2"/>
        </trigger>
        <trigger>
          <pseudo_event id="29" operation="notified" operation_key="rsc1_confirmed-post_notify_running_0"/>
        </trigger>
        <trigger>
          <pseudo_event id="41" operation="notified" operation_key="rsc1_confirmed-post_notify_promoted_0"/>
        </trigger>
      </inputs>
    </synapse>
   <synapse id="12">
      <action_set>
       <rsc_op id="18" operation="start" operation_key="child_rsc1:1_start_0" on_node="node2" on_node_uuid="uuid2">
-        <primitive id="child_rsc1:1" class="heartbeat" type="apache"/>
+        <primitive id="child_rsc1:1" class="ocf" provider="heartbeat" type="apache"/>
         <attributes CRM_meta_clone="1" CRM_meta_clone_max="5" CRM_meta_clone_node_max="2" CRM_meta_globally_unique="true" CRM_meta_master_max="2" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="child_rsc1:0 child_rsc1:1 child_rsc1:2 child_rsc1:3 child_rsc1:4 " CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_promote_resource="child_rsc1:0 " CRM_meta_notify_promote_uname="node1 " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="child_rsc1:0 child_rsc1:1 child_rsc1:2 child_rsc1:3 " CRM_meta_notify_start_uname="node1 node2 node1 node2 " CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
         <pseudo_event id="2" operation="probe_complete" operation_key="probe_complete"/>
       </trigger>
       <trigger>
         <pseudo_event id="24" operation="start" operation_key="rsc1_start_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="13">
      <action_set>
       <rsc_op id="11" operation="monitor" operation_key="child_rsc1:1_monitor_0" on_node="node2" on_node_uuid="uuid2">
-        <primitive id="child_rsc1:1" class="heartbeat" type="apache"/>
+        <primitive id="child_rsc1:1" class="ocf" provider="heartbeat" type="apache"/>
         <attributes CRM_meta_clone="1" CRM_meta_clone_max="5" CRM_meta_clone_node_max="2" CRM_meta_globally_unique="true" CRM_meta_master_max="2" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
        </rsc_op>
      </action_set>
     <inputs/>
    </synapse>
   <synapse id="14">
      <action_set>
       <rsc_op id="5" operation="monitor" operation_key="child_rsc1:1_monitor_0" on_node="node1" on_node_uuid="uuid1">
-        <primitive id="child_rsc1:1" class="heartbeat" type="apache"/>
+        <primitive id="child_rsc1:1" class="ocf" provider="heartbeat" type="apache"/>
         <attributes CRM_meta_clone="1" CRM_meta_clone_max="5" CRM_meta_clone_node_max="2" CRM_meta_globally_unique="true" CRM_meta_master_max="2" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
        </rsc_op>
      </action_set>
     <inputs/>
    </synapse>
   <synapse id="15" priority="1000000">
      <action_set>
       <rsc_op id="68" operation="notify" operation_key="child_rsc1:2_post_notify_promote_0" on_node="node1" on_node_uuid="uuid1">
-        <primitive id="child_rsc1:2" class="heartbeat" type="apache"/>
+        <primitive id="child_rsc1:2" class="ocf" provider="heartbeat" type="apache"/>
         <attributes CRM_meta_clone="2" CRM_meta_clone_max="5" CRM_meta_clone_node_max="2" CRM_meta_globally_unique="true" CRM_meta_master_max="2" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="child_rsc1:0 child_rsc1:1 child_rsc1:2 child_rsc1:3 child_rsc1:4 " CRM_meta_notify_key_operation="promoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="child_rsc1:0 " CRM_meta_notify_promote_uname="node1 " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="child_rsc1:0 child_rsc1:1 child_rsc1:2 child_rsc1:3 " CRM_meta_notify_start_uname="node1 node2 node1 node2 " CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="post" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
        </rsc_op>
      </action_set>
     <inputs>
       <trigger>
         <pseudo_event id="40" operation="notify" operation_key="rsc1_post_notify_promoted_0"/>
       </trigger>
     </inputs>
    </synapse>
    <synapse id="16">
      <action_set>
       <rsc_op id="67" operation="notify" operation_key="child_rsc1:2_pre_notify_promote_0" on_node="node1" on_node_uuid="uuid1">
-        <primitive id="child_rsc1:2" class="heartbeat" type="apache"/>
+        <primitive id="child_rsc1:2" class="ocf" provider="heartbeat" type="apache"/>
         <attributes CRM_meta_clone="2" CRM_meta_clone_max="5" CRM_meta_clone_node_max="2" CRM_meta_globally_unique="true" CRM_meta_master_max="2" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="child_rsc1:0 child_rsc1:1 child_rsc1:2 child_rsc1:3 child_rsc1:4 " CRM_meta_notify_key_operation="promote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="child_rsc1:0 " CRM_meta_notify_promote_uname="node1 " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="child_rsc1:0 child_rsc1:1 child_rsc1:2 child_rsc1:3 " CRM_meta_notify_start_uname="node1 node2 node1 node2 " CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="pre" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
        </rsc_op>
      </action_set>
     <inputs>
       <trigger>
         <pseudo_event id="38" operation="notify" operation_key="rsc1_pre_notify_promote_0"/>
       </trigger>
     </inputs>
    </synapse>
   <synapse id="17" priority="1000000">
      <action_set>
       <rsc_op id="61" operation="notify" operation_key="child_rsc1:2_post_notify_start_0" on_node="node1" on_node_uuid="uuid1">
-        <primitive id="child_rsc1:2" class="heartbeat" type="apache"/>
+        <primitive id="child_rsc1:2" class="ocf" provider="heartbeat" type="apache"/>
         <attributes CRM_meta_clone="2" CRM_meta_clone_max="5" CRM_meta_clone_node_max="2" CRM_meta_globally_unique="true" CRM_meta_master_max="2" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="child_rsc1:0 child_rsc1:1 child_rsc1:2 child_rsc1:3 child_rsc1:4 " CRM_meta_notify_key_operation="running" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="start" CRM_meta_notify_promote_resource="child_rsc1:0 " CRM_meta_notify_promote_uname="node1 " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="child_rsc1:0 child_rsc1:1 child_rsc1:2 child_rsc1:3 " CRM_meta_notify_start_uname="node1 node2 node1 node2 " CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="post" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
         <pseudo_event id="28" operation="notify" operation_key="rsc1_post_notify_running_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="18">
      <action_set>
        <rsc_op id="21" operation="monitor" operation_key="child_rsc1:2_monitor_1000" on_node="node1" on_node_uuid="uuid1">
-        <primitive id="child_rsc1:2" class="heartbeat" type="apache"/>
+        <primitive id="child_rsc1:2" class="ocf" provider="heartbeat" type="apache"/>
         <attributes CRM_meta_clone="2" CRM_meta_clone_max="5" CRM_meta_clone_node_max="2" CRM_meta_globally_unique="true" CRM_meta_interval="1000" CRM_meta_master_max="2" CRM_meta_master_node_max="1" CRM_meta_name="monitor" CRM_meta_notify="true" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="20" operation="start" operation_key="child_rsc1:2_start_0" on_node="node1" on_node_uuid="uuid1"/>
        </trigger>
        <trigger>
          <pseudo_event id="29" operation="notified" operation_key="rsc1_confirmed-post_notify_running_0"/>
        </trigger>
        <trigger>
          <pseudo_event id="41" operation="notified" operation_key="rsc1_confirmed-post_notify_promoted_0"/>
        </trigger>
      </inputs>
    </synapse>
   <synapse id="19">
      <action_set>
       <rsc_op id="20" operation="start" operation_key="child_rsc1:2_start_0" on_node="node1" on_node_uuid="uuid1">
-        <primitive id="child_rsc1:2" class="heartbeat" type="apache"/>
+        <primitive id="child_rsc1:2" class="ocf" provider="heartbeat" type="apache"/>
         <attributes CRM_meta_clone="2" CRM_meta_clone_max="5" CRM_meta_clone_node_max="2" CRM_meta_globally_unique="true" CRM_meta_master_max="2" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="child_rsc1:0 child_rsc1:1 child_rsc1:2 child_rsc1:3 child_rsc1:4 " CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_promote_resource="child_rsc1:0 " CRM_meta_notify_promote_uname="node1 " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="child_rsc1:0 child_rsc1:1 child_rsc1:2 child_rsc1:3 " CRM_meta_notify_start_uname="node1 node2 node1 node2 " CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
         <pseudo_event id="2" operation="probe_complete" operation_key="probe_complete"/>
       </trigger>
       <trigger>
         <pseudo_event id="24" operation="start" operation_key="rsc1_start_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="20">
      <action_set>
       <rsc_op id="12" operation="monitor" operation_key="child_rsc1:2_monitor_0" on_node="node2" on_node_uuid="uuid2">
-        <primitive id="child_rsc1:2" class="heartbeat" type="apache"/>
+        <primitive id="child_rsc1:2" class="ocf" provider="heartbeat" type="apache"/>
         <attributes CRM_meta_clone="2" CRM_meta_clone_max="5" CRM_meta_clone_node_max="2" CRM_meta_globally_unique="true" CRM_meta_master_max="2" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
        </rsc_op>
      </action_set>
     <inputs/>
    </synapse>
   <synapse id="21">
      <action_set>
       <rsc_op id="6" operation="monitor" operation_key="child_rsc1:2_monitor_0" on_node="node1" on_node_uuid="uuid1">
-        <primitive id="child_rsc1:2" class="heartbeat" type="apache"/>
+        <primitive id="child_rsc1:2" class="ocf" provider="heartbeat" type="apache"/>
         <attributes CRM_meta_clone="2" CRM_meta_clone_max="5" CRM_meta_clone_node_max="2" CRM_meta_globally_unique="true" CRM_meta_master_max="2" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
        </rsc_op>
      </action_set>
     <inputs/>
    </synapse>
   <synapse id="22" priority="1000000">
      <action_set>
       <rsc_op id="70" operation="notify" operation_key="child_rsc1:3_post_notify_promote_0" on_node="node2" on_node_uuid="uuid2">
-        <primitive id="child_rsc1:3" class="heartbeat" type="apache"/>
+        <primitive id="child_rsc1:3" class="ocf" provider="heartbeat" type="apache"/>
         <attributes CRM_meta_clone="3" CRM_meta_clone_max="5" CRM_meta_clone_node_max="2" CRM_meta_globally_unique="true" CRM_meta_master_max="2" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="child_rsc1:0 child_rsc1:1 child_rsc1:2 child_rsc1:3 child_rsc1:4 " CRM_meta_notify_key_operation="promoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="child_rsc1:0 " CRM_meta_notify_promote_uname="node1 " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="child_rsc1:0 child_rsc1:1 child_rsc1:2 child_rsc1:3 " CRM_meta_notify_start_uname="node1 node2 node1 node2 " CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="post" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
        </rsc_op>
      </action_set>
     <inputs>
       <trigger>
         <pseudo_event id="40" operation="notify" operation_key="rsc1_post_notify_promoted_0"/>
       </trigger>
     </inputs>
    </synapse>
    <synapse id="23">
      <action_set>
       <rsc_op id="69" operation="notify" operation_key="child_rsc1:3_pre_notify_promote_0" on_node="node2" on_node_uuid="uuid2">
-        <primitive id="child_rsc1:3" class="heartbeat" type="apache"/>
+        <primitive id="child_rsc1:3" class="ocf" provider="heartbeat" type="apache"/>
         <attributes CRM_meta_clone="3" CRM_meta_clone_max="5" CRM_meta_clone_node_max="2" CRM_meta_globally_unique="true" CRM_meta_master_max="2" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="child_rsc1:0 child_rsc1:1 child_rsc1:2 child_rsc1:3 child_rsc1:4 " CRM_meta_notify_key_operation="promote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="child_rsc1:0 " CRM_meta_notify_promote_uname="node1 " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="child_rsc1:0 child_rsc1:1 child_rsc1:2 child_rsc1:3 " CRM_meta_notify_start_uname="node1 node2 node1 node2 " CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="pre" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
        </rsc_op>
      </action_set>
     <inputs>
       <trigger>
         <pseudo_event id="38" operation="notify" operation_key="rsc1_pre_notify_promote_0"/>
       </trigger>
     </inputs>
    </synapse>
   <synapse id="24" priority="1000000">
      <action_set>
       <rsc_op id="62" operation="notify" operation_key="child_rsc1:3_post_notify_start_0" on_node="node2" on_node_uuid="uuid2">
-        <primitive id="child_rsc1:3" class="heartbeat" type="apache"/>
+        <primitive id="child_rsc1:3" class="ocf" provider="heartbeat" type="apache"/>
         <attributes CRM_meta_clone="3" CRM_meta_clone_max="5" CRM_meta_clone_node_max="2" CRM_meta_globally_unique="true" CRM_meta_master_max="2" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="child_rsc1:0 child_rsc1:1 child_rsc1:2 child_rsc1:3 child_rsc1:4 " CRM_meta_notify_key_operation="running" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="start" CRM_meta_notify_promote_resource="child_rsc1:0 " CRM_meta_notify_promote_uname="node1 " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="child_rsc1:0 child_rsc1:1 child_rsc1:2 child_rsc1:3 " CRM_meta_notify_start_uname="node1 node2 node1 node2 " CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="post" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
         <pseudo_event id="28" operation="notify" operation_key="rsc1_post_notify_running_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="25">
      <action_set>
        <rsc_op id="23" operation="monitor" operation_key="child_rsc1:3_monitor_1000" on_node="node2" on_node_uuid="uuid2">
-        <primitive id="child_rsc1:3" class="heartbeat" type="apache"/>
+        <primitive id="child_rsc1:3" class="ocf" provider="heartbeat" type="apache"/>
         <attributes CRM_meta_clone="3" CRM_meta_clone_max="5" CRM_meta_clone_node_max="2" CRM_meta_globally_unique="true" CRM_meta_interval="1000" CRM_meta_master_max="2" CRM_meta_master_node_max="1" CRM_meta_name="monitor" CRM_meta_notify="true" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="22" operation="start" operation_key="child_rsc1:3_start_0" on_node="node2" on_node_uuid="uuid2"/>
        </trigger>
        <trigger>
          <pseudo_event id="29" operation="notified" operation_key="rsc1_confirmed-post_notify_running_0"/>
        </trigger>
        <trigger>
          <pseudo_event id="41" operation="notified" operation_key="rsc1_confirmed-post_notify_promoted_0"/>
        </trigger>
      </inputs>
    </synapse>
   <synapse id="26">
      <action_set>
       <rsc_op id="22" operation="start" operation_key="child_rsc1:3_start_0" on_node="node2" on_node_uuid="uuid2">
-        <primitive id="child_rsc1:3" class="heartbeat" type="apache"/>
+        <primitive id="child_rsc1:3" class="ocf" provider="heartbeat" type="apache"/>
         <attributes CRM_meta_clone="3" CRM_meta_clone_max="5" CRM_meta_clone_node_max="2" CRM_meta_globally_unique="true" CRM_meta_master_max="2" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="child_rsc1:0 child_rsc1:1 child_rsc1:2 child_rsc1:3 child_rsc1:4 " CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_promote_resource="child_rsc1:0 " CRM_meta_notify_promote_uname="node1 " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="child_rsc1:0 child_rsc1:1 child_rsc1:2 child_rsc1:3 " CRM_meta_notify_start_uname="node1 node2 node1 node2 " CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
         <pseudo_event id="2" operation="probe_complete" operation_key="probe_complete"/>
       </trigger>
       <trigger>
         <pseudo_event id="24" operation="start" operation_key="rsc1_start_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="27">
      <action_set>
       <rsc_op id="13" operation="monitor" operation_key="child_rsc1:3_monitor_0" on_node="node2" on_node_uuid="uuid2">
-        <primitive id="child_rsc1:3" class="heartbeat" type="apache"/>
+        <primitive id="child_rsc1:3" class="ocf" provider="heartbeat" type="apache"/>
         <attributes CRM_meta_clone="3" CRM_meta_clone_max="5" CRM_meta_clone_node_max="2" CRM_meta_globally_unique="true" CRM_meta_master_max="2" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
        </rsc_op>
      </action_set>
     <inputs/>
    </synapse>
   <synapse id="28">
      <action_set>
       <rsc_op id="7" operation="monitor" operation_key="child_rsc1:3_monitor_0" on_node="node1" on_node_uuid="uuid1">
-        <primitive id="child_rsc1:3" class="heartbeat" type="apache"/>
+        <primitive id="child_rsc1:3" class="ocf" provider="heartbeat" type="apache"/>
         <attributes CRM_meta_clone="3" CRM_meta_clone_max="5" CRM_meta_clone_node_max="2" CRM_meta_globally_unique="true" CRM_meta_master_max="2" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
        </rsc_op>
      </action_set>
     <inputs/>
    </synapse>
    <synapse id="29">
      <action_set>
       <rsc_op id="14" operation="monitor" operation_key="child_rsc1:4_monitor_0" on_node="node2" on_node_uuid="uuid2">
-        <primitive id="child_rsc1:4" class="heartbeat" type="apache"/>
+        <primitive id="child_rsc1:4" class="ocf" provider="heartbeat" type="apache"/>
         <attributes CRM_meta_clone="4" CRM_meta_clone_max="5" CRM_meta_clone_node_max="2" CRM_meta_globally_unique="true" CRM_meta_master_max="2" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="30">
      <action_set>
       <rsc_op id="8" operation="monitor" operation_key="child_rsc1:4_monitor_0" on_node="node1" on_node_uuid="uuid1">
-        <primitive id="child_rsc1:4" class="heartbeat" type="apache"/>
+        <primitive id="child_rsc1:4" class="ocf" provider="heartbeat" type="apache"/>
         <attributes CRM_meta_clone="4" CRM_meta_clone_max="5" CRM_meta_clone_node_max="2" CRM_meta_globally_unique="true" CRM_meta_master_max="2" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
   <synapse id="31" priority="1000000">
      <action_set>
       <pseudo_event id="41" operation="notified" operation_key="rsc1_confirmed-post_notify_promoted_0">
         <attributes CRM_meta_clone_max="5" CRM_meta_clone_node_max="2" CRM_meta_globally_unique="true" CRM_meta_master_max="2" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_key_operation="promoted" CRM_meta_notify_key_type="confirmed-post" CRM_meta_notify_operation="promote" CRM_meta_notify_type="post" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
         <pseudo_event id="40" operation="notify" operation_key="rsc1_post_notify_promoted_0"/>
       </trigger>
       <trigger>
         <rsc_op id="64" operation="notify" operation_key="child_rsc1:0_post_notify_promote_0" on_node="node1" on_node_uuid="uuid1"/>
       </trigger>
       <trigger>
         <rsc_op id="66" operation="notify" operation_key="child_rsc1:1_post_notify_promote_0" on_node="node2" on_node_uuid="uuid2"/>
       </trigger>
       <trigger>
         <rsc_op id="68" operation="notify" operation_key="child_rsc1:2_post_notify_promote_0" on_node="node1" on_node_uuid="uuid1"/>
       </trigger>
       <trigger>
         <rsc_op id="70" operation="notify" operation_key="child_rsc1:3_post_notify_promote_0" on_node="node2" on_node_uuid="uuid2"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="32" priority="1000000">
      <action_set>
       <pseudo_event id="40" operation="notify" operation_key="rsc1_post_notify_promoted_0">
         <attributes CRM_meta_clone_max="5" CRM_meta_clone_node_max="2" CRM_meta_globally_unique="true" CRM_meta_master_max="2" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_key_operation="promoted" CRM_meta_notify_key_type="post" CRM_meta_notify_operation="promote" CRM_meta_notify_type="post" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
         <pseudo_event id="37" operation="promoted" operation_key="rsc1_promoted_0"/>
        </trigger>
        <trigger>
         <pseudo_event id="39" operation="notified" operation_key="rsc1_confirmed-pre_notify_promote_0"/>
        </trigger>
     </inputs>
   </synapse>
   <synapse id="33">
     <action_set>
       <pseudo_event id="39" operation="notified" operation_key="rsc1_confirmed-pre_notify_promote_0">
         <attributes CRM_meta_clone_max="5" CRM_meta_clone_node_max="2" CRM_meta_globally_unique="true" CRM_meta_master_max="2" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_key_operation="promote" CRM_meta_notify_key_type="confirmed-pre" CRM_meta_notify_operation="promote" CRM_meta_notify_type="pre" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
       </pseudo_event>
     </action_set>
     <inputs>
        <trigger>
         <pseudo_event id="38" operation="notify" operation_key="rsc1_pre_notify_promote_0"/>
        </trigger>
        <trigger>
         <rsc_op id="63" operation="notify" operation_key="child_rsc1:0_pre_notify_promote_0" on_node="node1" on_node_uuid="uuid1"/>
        </trigger>
        <trigger>
         <rsc_op id="65" operation="notify" operation_key="child_rsc1:1_pre_notify_promote_0" on_node="node2" on_node_uuid="uuid2"/>
       </trigger>
       <trigger>
         <rsc_op id="67" operation="notify" operation_key="child_rsc1:2_pre_notify_promote_0" on_node="node1" on_node_uuid="uuid1"/>
       </trigger>
       <trigger>
         <rsc_op id="69" operation="notify" operation_key="child_rsc1:3_pre_notify_promote_0" on_node="node2" on_node_uuid="uuid2"/>
        </trigger>
      </inputs>
    </synapse>
   <synapse id="34">
      <action_set>
       <pseudo_event id="38" operation="notify" operation_key="rsc1_pre_notify_promote_0">
         <attributes CRM_meta_clone_max="5" CRM_meta_clone_node_max="2" CRM_meta_globally_unique="true" CRM_meta_master_max="2" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_key_operation="promote" CRM_meta_notify_key_type="pre" CRM_meta_notify_operation="promote" CRM_meta_notify_type="pre" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
        </pseudo_event>
      </action_set>
     <inputs>
       <trigger>
         <pseudo_event id="29" operation="notified" operation_key="rsc1_confirmed-post_notify_running_0"/>
       </trigger>
     </inputs>
    </synapse>
   <synapse id="35" priority="1000000">
      <action_set>
       <pseudo_event id="37" operation="promoted" operation_key="rsc1_promoted_0">
         <attributes CRM_meta_clone_max="5" CRM_meta_clone_node_max="2" CRM_meta_globally_unique="true" CRM_meta_master_max="2" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
         <rsc_op id="16" operation="promote" operation_key="child_rsc1:0_promote_0" on_node="node1" on_node_uuid="uuid1"/>
        </trigger>
      </inputs>
    </synapse>
   <synapse id="36">
      <action_set>
       <pseudo_event id="36" operation="promote" operation_key="rsc1_promote_0">
         <attributes CRM_meta_clone_max="5" CRM_meta_clone_node_max="2" CRM_meta_globally_unique="true" CRM_meta_master_max="2" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="25" operation="running" operation_key="rsc1_running_0"/>
        </trigger>
       <trigger>
         <pseudo_event id="39" operation="notified" operation_key="rsc1_confirmed-pre_notify_promote_0"/>
       </trigger>
      </inputs>
    </synapse>
   <synapse id="37" priority="1000000">
      <action_set>
        <pseudo_event id="29" operation="notified" operation_key="rsc1_confirmed-post_notify_running_0">
         <attributes CRM_meta_clone_max="5" CRM_meta_clone_node_max="2" CRM_meta_globally_unique="true" CRM_meta_master_max="2" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_key_operation="running" CRM_meta_notify_key_type="confirmed-post" CRM_meta_notify_operation="start" CRM_meta_notify_type="post" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="28" operation="notify" operation_key="rsc1_post_notify_running_0"/>
        </trigger>
        <trigger>
         <rsc_op id="59" operation="notify" operation_key="child_rsc1:0_post_notify_start_0" on_node="node1" on_node_uuid="uuid1"/>
        </trigger>
        <trigger>
         <rsc_op id="60" operation="notify" operation_key="child_rsc1:1_post_notify_start_0" on_node="node2" on_node_uuid="uuid2"/>
        </trigger>
        <trigger>
         <rsc_op id="61" operation="notify" operation_key="child_rsc1:2_post_notify_start_0" on_node="node1" on_node_uuid="uuid1"/>
        </trigger>
        <trigger>
         <rsc_op id="62" operation="notify" operation_key="child_rsc1:3_post_notify_start_0" on_node="node2" on_node_uuid="uuid2"/>
        </trigger>
      </inputs>
    </synapse>
   <synapse id="38" priority="1000000">
      <action_set>
       <pseudo_event id="28" operation="notify" operation_key="rsc1_post_notify_running_0">
         <attributes CRM_meta_clone_max="5" CRM_meta_clone_node_max="2" CRM_meta_globally_unique="true" CRM_meta_master_max="2" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_key_operation="running" CRM_meta_notify_key_type="post" CRM_meta_notify_operation="start" CRM_meta_notify_type="post" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="25" operation="running" operation_key="rsc1_running_0"/>
        </trigger>
        <trigger>
         <pseudo_event id="27" operation="notified" operation_key="rsc1_confirmed-pre_notify_start_0"/>
        </trigger>
      </inputs>
    </synapse>
   <synapse id="39">
      <action_set>
       <pseudo_event id="27" operation="notified" operation_key="rsc1_confirmed-pre_notify_start_0">
         <attributes CRM_meta_clone_max="5" CRM_meta_clone_node_max="2" CRM_meta_globally_unique="true" CRM_meta_master_max="2" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_key_operation="start" CRM_meta_notify_key_type="confirmed-pre" CRM_meta_notify_operation="start" CRM_meta_notify_type="pre" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
         <pseudo_event id="26" operation="notify" operation_key="rsc1_pre_notify_start_0"/>
        </trigger>
      </inputs>
    </synapse>
   <synapse id="40">
      <action_set>
       <pseudo_event id="26" operation="notify" operation_key="rsc1_pre_notify_start_0">
         <attributes CRM_meta_clone_max="5" CRM_meta_clone_node_max="2" CRM_meta_globally_unique="true" CRM_meta_master_max="2" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_key_operation="start" CRM_meta_notify_key_type="pre" CRM_meta_notify_operation="start" CRM_meta_notify_type="pre" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
        </pseudo_event>
      </action_set>
     <inputs/>
    </synapse>
   <synapse id="41" priority="1000000">
      <action_set>
       <pseudo_event id="25" operation="running" operation_key="rsc1_running_0">
         <attributes CRM_meta_clone_max="5" CRM_meta_clone_node_max="2" CRM_meta_globally_unique="true" CRM_meta_master_max="2" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
         <rsc_op id="15" operation="start" operation_key="child_rsc1:0_start_0" on_node="node1" on_node_uuid="uuid1"/>
        </trigger>
        <trigger>
         <rsc_op id="18" operation="start" operation_key="child_rsc1:1_start_0" on_node="node2" on_node_uuid="uuid2"/>
        </trigger>
        <trigger>
         <rsc_op id="20" operation="start" operation_key="child_rsc1:2_start_0" on_node="node1" on_node_uuid="uuid1"/>
        </trigger>
        <trigger>
         <rsc_op id="22" operation="start" operation_key="child_rsc1:3_start_0" on_node="node2" on_node_uuid="uuid2"/>
        </trigger>
        <trigger>
         <pseudo_event id="24" operation="start" operation_key="rsc1_start_0"/>
        </trigger>
      </inputs>
    </synapse>
   <synapse id="42">
      <action_set>
       <pseudo_event id="24" operation="start" operation_key="rsc1_start_0">
         <attributes CRM_meta_clone_max="5" CRM_meta_clone_node_max="2" CRM_meta_globally_unique="true" CRM_meta_master_max="2" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
         <pseudo_event id="27" operation="notified" operation_key="rsc1_confirmed-pre_notify_start_0"/>
       </trigger>
      </inputs>
    </synapse>
   <synapse id="43" priority="1000000">
      <action_set>
       <rsc_op id="9" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="uuid2">
         <attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
       </rsc_op>
      </action_set>
      <inputs>
        <trigger>
         <rsc_op id="10" operation="monitor" operation_key="child_rsc1:0_monitor_0" on_node="node2" on_node_uuid="uuid2"/>
        </trigger>
        <trigger>
         <rsc_op id="11" operation="monitor" operation_key="child_rsc1:1_monitor_0" on_node="node2" on_node_uuid="uuid2"/>
        </trigger>
        <trigger>
         <rsc_op id="12" operation="monitor" operation_key="child_rsc1:2_monitor_0" on_node="node2" on_node_uuid="uuid2"/>
        </trigger>
        <trigger>
         <rsc_op id="13" operation="monitor" operation_key="child_rsc1:3_monitor_0" on_node="node2" on_node_uuid="uuid2"/>
        </trigger>
        <trigger>
         <rsc_op id="14" operation="monitor" operation_key="child_rsc1:4_monitor_0" on_node="node2" on_node_uuid="uuid2"/>
        </trigger>
      </inputs>
    </synapse>
   <synapse id="44" priority="1000000">
      <action_set>
        <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="uuid1">
         <attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="4" operation="monitor" operation_key="child_rsc1:0_monitor_0" on_node="node1" on_node_uuid="uuid1"/>
        </trigger>
        <trigger>
          <rsc_op id="5" operation="monitor" operation_key="child_rsc1:1_monitor_0" on_node="node1" on_node_uuid="uuid1"/>
        </trigger>
        <trigger>
          <rsc_op id="6" operation="monitor" operation_key="child_rsc1:2_monitor_0" on_node="node1" on_node_uuid="uuid1"/>
        </trigger>
        <trigger>
          <rsc_op id="7" operation="monitor" operation_key="child_rsc1:3_monitor_0" on_node="node1" on_node_uuid="uuid1"/>
        </trigger>
        <trigger>
          <rsc_op id="8" operation="monitor" operation_key="child_rsc1:4_monitor_0" on_node="node1" on_node_uuid="uuid1"/>
        </trigger>
      </inputs>
    </synapse>
   <synapse id="45">
      <action_set>
       <pseudo_event id="2" operation="probe_complete" operation_key="probe_complete">
         <attributes crm_feature_set="3.0.7"/>
       </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
         <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="uuid1"/>
        </trigger>
        <trigger>
         <rsc_op id="9" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="uuid2"/>
        </trigger>
      </inputs>
    </synapse>
  </transition_graph>
 
diff --git a/pengine/test10/master-10.summary b/pengine/test10/master-10.summary
index d8563570c7..424edb067a 100644
--- a/pengine/test10/master-10.summary
+++ b/pengine/test10/master-10.summary
@@ -1,74 +1,74 @@
 
 Current cluster status:
 Online: [ node1 node2 ]
 
  Master/Slave Set: rsc1 [child_rsc1] (unique)
-     child_rsc1:0	(heartbeat:apache):	Stopped 
-     child_rsc1:1	(heartbeat:apache):	Stopped 
-     child_rsc1:2	(heartbeat:apache):	Stopped 
-     child_rsc1:3	(heartbeat:apache):	Stopped 
-     child_rsc1:4	(heartbeat:apache):	Stopped 
+     child_rsc1:0	(ocf::heartbeat:apache):	Stopped 
+     child_rsc1:1	(ocf::heartbeat:apache):	Stopped 
+     child_rsc1:2	(ocf::heartbeat:apache):	Stopped 
+     child_rsc1:3	(ocf::heartbeat:apache):	Stopped 
+     child_rsc1:4	(ocf::heartbeat:apache):	Stopped 
 
 Transition Summary:
  * Start   child_rsc1:0	(node1)
  * Promote child_rsc1:0	(Stopped -> Master node1)
  * Start   child_rsc1:1	(node2)
  * Start   child_rsc1:2	(node1)
  * Start   child_rsc1:3	(node2)
 
 Executing cluster transition:
  * Resource action: child_rsc1:0    monitor on node2
  * Resource action: child_rsc1:0    monitor on node1
  * Resource action: child_rsc1:1    monitor on node2
  * Resource action: child_rsc1:1    monitor on node1
  * Resource action: child_rsc1:2    monitor on node2
  * Resource action: child_rsc1:2    monitor on node1
  * Resource action: child_rsc1:3    monitor on node2
  * Resource action: child_rsc1:3    monitor on node1
  * Resource action: child_rsc1:4    monitor on node2
  * Resource action: child_rsc1:4    monitor on node1
  * Pseudo action:   rsc1_pre_notify_start_0
  * Pseudo action:   probe_complete
  * Pseudo action:   rsc1_confirmed-pre_notify_start_0
  * Pseudo action:   rsc1_start_0
  * Resource action: child_rsc1:0    start on node1
  * Resource action: child_rsc1:1    start on node2
  * Resource action: child_rsc1:2    start on node1
  * Resource action: child_rsc1:3    start on node2
  * Pseudo action:   rsc1_running_0
  * Pseudo action:   rsc1_post_notify_running_0
  * Resource action: child_rsc1:0    notify on node1
  * Resource action: child_rsc1:1    notify on node2
  * Resource action: child_rsc1:2    notify on node1
  * Resource action: child_rsc1:3    notify on node2
  * Pseudo action:   rsc1_confirmed-post_notify_running_0
  * Pseudo action:   rsc1_pre_notify_promote_0
  * Resource action: child_rsc1:0    notify on node1
  * Resource action: child_rsc1:1    notify on node2
  * Resource action: child_rsc1:2    notify on node1
  * Resource action: child_rsc1:3    notify on node2
  * Pseudo action:   rsc1_confirmed-pre_notify_promote_0
  * Pseudo action:   rsc1_promote_0
  * Resource action: child_rsc1:0    promote on node1
  * Pseudo action:   rsc1_promoted_0
  * Pseudo action:   rsc1_post_notify_promoted_0
  * Resource action: child_rsc1:0    notify on node1
  * Resource action: child_rsc1:1    notify on node2
  * Resource action: child_rsc1:2    notify on node1
  * Resource action: child_rsc1:3    notify on node2
  * Pseudo action:   rsc1_confirmed-post_notify_promoted_0
  * Resource action: child_rsc1:0    monitor=11000 on node1
  * Resource action: child_rsc1:1    monitor=1000 on node2
  * Resource action: child_rsc1:2    monitor=1000 on node1
  * Resource action: child_rsc1:3    monitor=1000 on node2
 
 Revised cluster status:
 Online: [ node1 node2 ]
 
  Master/Slave Set: rsc1 [child_rsc1] (unique)
-     child_rsc1:0	(heartbeat:apache):	Master node1
-     child_rsc1:1	(heartbeat:apache):	Started node2
-     child_rsc1:2	(heartbeat:apache):	Started node1
-     child_rsc1:3	(heartbeat:apache):	Started node2
-     child_rsc1:4	(heartbeat:apache):	Stopped 
+     child_rsc1:0	(ocf::heartbeat:apache):	Master node1
+     child_rsc1:1	(ocf::heartbeat:apache):	Started node2
+     child_rsc1:2	(ocf::heartbeat:apache):	Started node1
+     child_rsc1:3	(ocf::heartbeat:apache):	Started node2
+     child_rsc1:4	(ocf::heartbeat:apache):	Stopped 
 
diff --git a/pengine/test10/master-10.xml b/pengine/test10/master-10.xml
index 3c7a6574a0..e47061d1c5 100644
--- a/pengine/test10/master-10.xml
+++ b/pengine/test10/master-10.xml
@@ -1,69 +1,69 @@
 <cib admin_epoch="0" epoch="1" num_updates="1" dc-uuid="0" have-quorum="false" remote-tls-port="0" validate-with="pacemaker-1.0" cib-last-written="Fri Jul 13 13:51:07 2012">
   <configuration>
     <crm_config>
       <cluster_property_set id="no-stonith">
         <nvpair id="opt-no-stonith" name="stonith-enabled" value="false"/>
       </cluster_property_set>
       <cluster_property_set id="cib-bootstrap-options">
         <nvpair id="nvpair.id21832" name="no-quorum-policy" value="ignore"/>
       </cluster_property_set>
     </crm_config>
     <nodes>
       <node id="uuid1" uname="node1" type="member">
         <instance_attributes id="instance_attributes.id21853">
           <nvpair id="nvpair.id21860" name="master-child_rsc1:0" value="20"/>
           <nvpair id="nvpair.id21868" name="master-child_rsc1:2" value="10"/>
         </instance_attributes>
       </node>
       <node id="uuid2" uname="node2" type="member">
         <instance_attributes id="instance_attributes.id21888">
           <nvpair id="nvpair.id21894" name="master-child_rsc1:1" value="10"/>
           <nvpair id="nvpair.id21902" name="master-child_rsc1:3" value="20"/>
         </instance_attributes>
       </node>
     </nodes>
     <resources>
       <master id="rsc1">
-        <primitive id="child_rsc1" class="heartbeat" type="apache">
+        <primitive id="child_rsc1" class="ocf" provider="heartbeat" type="apache">
           <operations>
             <op name="monitor" interval="1" id="mon-1"/>
             <op name="monitor" interval="11" id="mon-2" role="Master"/>
           </operations>
           <meta_attributes id="primitive-child_rsc1.meta"/>
         </primitive>
         <meta_attributes id="master_slave-rsc1.meta">
           <nvpair id="notify.meta.auto-43" name="notify" value="true"/>
           <nvpair id="nvpair.meta.auto-57" name="resource-stickiness" value="1"/>
           <nvpair id="nvpair.meta.auto-49" name="clone-max" value="5"/>
           <nvpair id="nvpair.meta.auto-51" name="clone-node-max" value="2"/>
           <nvpair id="nvpair.meta.auto-53" name="master-max" value="2"/>
           <nvpair id="nvpair.meta.auto-55" name="master-node-max" value="1"/>
           <nvpair id="unique-1" name="globally-unique" value="true"/>
         </meta_attributes>
       </master>
     </resources>
     <constraints>
       <rsc_location id="master-node2" rsc="rsc1">
         <rule id="master-rule-node2" score="100" role="Master">
           <expression id="expression.id22025" attribute="#uname" operation="eq" value="node1"/>
         </rule>
       </rsc_location>
     </constraints>
   </configuration>
   <status>
     <node_state id="uuid1" ha="active" uname="node1" crmd="online" join="member" expected="member" in_ccm="true">
       <transient_attributes id="transient_attributes.id22057">
         <instance_attributes id="instance_attributes.id22059">
           <nvpair id="nvpair.id22065" name="probe_complete" value="true"/>
         </instance_attributes>
       </transient_attributes>
     </node_state>
     <node_state id="uuid2" ha="active" uname="node2" crmd="online" join="member" expected="member" in_ccm="true">
       <transient_attributes id="transient_attributes.id22095">
         <instance_attributes id="instance_attributes.id22097">
           <nvpair id="nvpair.id22103" name="probe_complete" value="true"/>
         </instance_attributes>
       </transient_attributes>
     </node_state>
   </status>
-</cib>
\ No newline at end of file
+</cib>
diff --git a/pengine/test10/master-11.exp b/pengine/test10/master-11.exp
index d2c5a726e6..ae85aa6353 100644
--- a/pengine/test10/master-11.exp
+++ b/pengine/test10/master-11.exp
@@ -1,219 +1,219 @@
  <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>
        <rsc_op id="11" operation="start" operation_key="simple-rsc_start_0" on_node="node2" on_node_uuid="uuid2">
         <primitive id="simple-rsc" class="heartbeat" type="apache"/>
         <attributes CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="2" operation="probe_complete" operation_key="probe_complete"/>
        </trigger>
      </inputs>
    </synapse>
   <synapse id="1">
      <action_set>
       <rsc_op id="8" operation="monitor" operation_key="simple-rsc_monitor_0" on_node="node2" on_node_uuid="uuid2">
         <primitive id="simple-rsc" class="heartbeat" type="apache"/>
         <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
   <synapse id="2">
      <action_set>
       <rsc_op id="4" operation="monitor" operation_key="simple-rsc_monitor_0" on_node="node1" on_node_uuid="uuid1">
         <primitive id="simple-rsc" class="heartbeat" type="apache"/>
         <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
   <synapse id="3">
      <action_set>
        <rsc_op id="12" operation="start" operation_key="child_rsc1:0_start_0" on_node="node1" on_node_uuid="uuid1">
-        <primitive id="child_rsc1:0" class="heartbeat" type="apache"/>
+        <primitive id="child_rsc1:0" class="ocf" provider="heartbeat" type="apache"/>
         <attributes CRM_meta_clone="0" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="2" operation="probe_complete" operation_key="probe_complete"/>
        </trigger>
        <trigger>
          <pseudo_event id="15" operation="start" operation_key="rsc1_start_0"/>
        </trigger>
      </inputs>
    </synapse>
   <synapse id="4">
      <action_set>
       <rsc_op id="9" operation="monitor" operation_key="child_rsc1:0_monitor_0" on_node="node2" on_node_uuid="uuid2">
-        <primitive id="child_rsc1:0" class="heartbeat" type="apache"/>
+        <primitive id="child_rsc1:0" class="ocf" provider="heartbeat" type="apache"/>
         <attributes CRM_meta_clone="0" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
   <synapse id="5">
      <action_set>
       <rsc_op id="5" operation="monitor" operation_key="child_rsc1:0_monitor_0" on_node="node1" on_node_uuid="uuid1">
-        <primitive id="child_rsc1:0" class="heartbeat" type="apache"/>
+        <primitive id="child_rsc1:0" class="ocf" provider="heartbeat" type="apache"/>
         <attributes CRM_meta_clone="0" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
   <synapse id="6">
      <action_set>
       <rsc_op id="14" operation="promote" operation_key="child_rsc1:1_promote_0" on_node="node2" on_node_uuid="uuid2">
-        <primitive id="child_rsc1:1" class="heartbeat" type="apache"/>
+        <primitive id="child_rsc1:1" class="ocf" provider="heartbeat" type="apache"/>
         <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
         <rsc_op id="13" operation="start" operation_key="child_rsc1:1_start_0" on_node="node2" on_node_uuid="uuid2"/>
        </trigger>
        <trigger>
         <pseudo_event id="19" operation="promote" operation_key="rsc1_promote_0"/>
        </trigger>
      </inputs>
    </synapse>
   <synapse id="7">
      <action_set>
       <rsc_op id="13" operation="start" operation_key="child_rsc1:1_start_0" on_node="node2" on_node_uuid="uuid2">
-        <primitive id="child_rsc1:1" class="heartbeat" type="apache"/>
+        <primitive id="child_rsc1:1" class="ocf" provider="heartbeat" type="apache"/>
         <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
         <pseudo_event id="2" operation="probe_complete" operation_key="probe_complete"/>
        </trigger>
        <trigger>
         <pseudo_event id="15" operation="start" operation_key="rsc1_start_0"/>
        </trigger>
      </inputs>
    </synapse>
   <synapse id="8">
      <action_set>
       <rsc_op id="10" operation="monitor" operation_key="child_rsc1:1_monitor_0" on_node="node2" on_node_uuid="uuid2">
-        <primitive id="child_rsc1:1" class="heartbeat" type="apache"/>
+        <primitive id="child_rsc1:1" class="ocf" provider="heartbeat" type="apache"/>
         <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
       </rsc_op>
      </action_set>
     <inputs/>
    </synapse>
   <synapse id="9">
      <action_set>
       <rsc_op id="6" operation="monitor" operation_key="child_rsc1:1_monitor_0" on_node="node1" on_node_uuid="uuid1">
-        <primitive id="child_rsc1:1" class="heartbeat" type="apache"/>
+        <primitive id="child_rsc1:1" class="ocf" provider="heartbeat" type="apache"/>
         <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
       </rsc_op>
     </action_set>
     <inputs/>
   </synapse>
   <synapse id="10" priority="1000000">
     <action_set>
       <pseudo_event id="20" operation="promoted" operation_key="rsc1_promoted_0">
         <attributes CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
         <rsc_op id="14" operation="promote" operation_key="child_rsc1:1_promote_0" on_node="node2" on_node_uuid="uuid2"/>
        </trigger>
      </inputs>
    </synapse>
   <synapse id="11">
      <action_set>
        <pseudo_event id="19" operation="promote" operation_key="rsc1_promote_0">
         <attributes CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="16" operation="running" operation_key="rsc1_running_0"/>
        </trigger>
      </inputs>
    </synapse>
   <synapse id="12" priority="1000000">
      <action_set>
       <pseudo_event id="16" operation="running" operation_key="rsc1_running_0">
         <attributes CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
         <rsc_op id="12" operation="start" operation_key="child_rsc1:0_start_0" on_node="node1" on_node_uuid="uuid1"/>
       </trigger>
       <trigger>
         <rsc_op id="13" operation="start" operation_key="child_rsc1:1_start_0" on_node="node2" on_node_uuid="uuid2"/>
       </trigger>
       <trigger>
         <pseudo_event id="15" operation="start" operation_key="rsc1_start_0"/>
        </trigger>
      </inputs>
    </synapse>
   <synapse id="13">
      <action_set>
       <pseudo_event id="15" operation="start" operation_key="rsc1_start_0">
         <attributes CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
        </pseudo_event>
      </action_set>
     <inputs/>
   </synapse>
   <synapse id="14" priority="1000000">
     <action_set>
       <rsc_op id="7" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="uuid2">
         <attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
       </rsc_op>
     </action_set>
      <inputs>
        <trigger>
         <rsc_op id="8" operation="monitor" operation_key="simple-rsc_monitor_0" on_node="node2" on_node_uuid="uuid2"/>
        </trigger>
        <trigger>
         <rsc_op id="9" operation="monitor" operation_key="child_rsc1:0_monitor_0" on_node="node2" on_node_uuid="uuid2"/>
       </trigger>
       <trigger>
         <rsc_op id="10" operation="monitor" operation_key="child_rsc1:1_monitor_0" on_node="node2" on_node_uuid="uuid2"/>
        </trigger>
      </inputs>
    </synapse>
   <synapse id="15" priority="1000000">
      <action_set>
        <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="uuid1">
         <attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="4" operation="monitor" operation_key="simple-rsc_monitor_0" on_node="node1" on_node_uuid="uuid1"/>
        </trigger>
        <trigger>
          <rsc_op id="5" operation="monitor" operation_key="child_rsc1:0_monitor_0" on_node="node1" on_node_uuid="uuid1"/>
        </trigger>
        <trigger>
          <rsc_op id="6" operation="monitor" operation_key="child_rsc1:1_monitor_0" on_node="node1" on_node_uuid="uuid1"/>
        </trigger>
      </inputs>
    </synapse>
   <synapse id="16">
      <action_set>
       <pseudo_event id="2" operation="probe_complete" operation_key="probe_complete">
         <attributes crm_feature_set="3.0.7"/>
       </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
         <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="uuid1"/>
        </trigger>
        <trigger>
         <rsc_op id="7" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="uuid2"/>
        </trigger>
      </inputs>
    </synapse>
  </transition_graph>
 
diff --git a/pengine/test10/master-11.summary b/pengine/test10/master-11.summary
index 22e44dccf1..487aa8131a 100644
--- a/pengine/test10/master-11.summary
+++ b/pengine/test10/master-11.summary
@@ -1,40 +1,40 @@
 
 Current cluster status:
 Online: [ node1 node2 ]
 
  simple-rsc	(heartbeat:apache):	Stopped 
  Master/Slave Set: rsc1 [child_rsc1] (unique)
-     child_rsc1:0	(heartbeat:apache):	Stopped 
-     child_rsc1:1	(heartbeat:apache):	Stopped 
+     child_rsc1:0	(ocf::heartbeat:apache):	Stopped 
+     child_rsc1:1	(ocf::heartbeat:apache):	Stopped 
 
 Transition Summary:
  * Start   simple-rsc	(node2)
  * Start   child_rsc1:0	(node1)
  * Start   child_rsc1:1	(node2)
  * Promote child_rsc1:1	(Stopped -> Master node2)
 
 Executing cluster transition:
  * Resource action: simple-rsc      monitor on node2
  * Resource action: simple-rsc      monitor on node1
  * Resource action: child_rsc1:0    monitor on node2
  * Resource action: child_rsc1:0    monitor on node1
  * Resource action: child_rsc1:1    monitor on node2
  * Resource action: child_rsc1:1    monitor on node1
  * Pseudo action:   rsc1_start_0
  * Pseudo action:   probe_complete
  * Resource action: simple-rsc      start on node2
  * Resource action: child_rsc1:0    start on node1
  * Resource action: child_rsc1:1    start on node2
  * Pseudo action:   rsc1_running_0
  * Pseudo action:   rsc1_promote_0
  * Resource action: child_rsc1:1    promote on node2
  * Pseudo action:   rsc1_promoted_0
 
 Revised cluster status:
 Online: [ node1 node2 ]
 
  simple-rsc	(heartbeat:apache):	Started node2
  Master/Slave Set: rsc1 [child_rsc1] (unique)
-     child_rsc1:0	(heartbeat:apache):	Started node1
-     child_rsc1:1	(heartbeat:apache):	Master node2
+     child_rsc1:0	(ocf::heartbeat:apache):	Started node1
+     child_rsc1:1	(ocf::heartbeat:apache):	Master node2
 
diff --git a/pengine/test10/master-11.xml b/pengine/test10/master-11.xml
index 6d1b49a16c..52e3a89cd3 100644
--- a/pengine/test10/master-11.xml
+++ b/pengine/test10/master-11.xml
@@ -1,68 +1,68 @@
 <cib admin_epoch="0" epoch="1" num_updates="1" dc-uuid="0" have-quorum="false" remote-tls-port="0" validate-with="pacemaker-1.0" cib-last-written="Fri Jul 13 13:51:07 2012">
   <configuration>
     <crm_config>
       <cluster_property_set id="no-stonith">
         <nvpair id="opt-no-stonith" name="stonith-enabled" value="false"/>
       </cluster_property_set>
       <cluster_property_set id="cib-bootstrap-options">
         <nvpair id="nvpair.id21832" name="no-quorum-policy" value="ignore"/>
       </cluster_property_set>
     </crm_config>
     <nodes>
       <node id="uuid1" uname="node1" type="member">
         <instance_attributes id="instance_attributes.id21853">
           <nvpair id="nvpair.id21860" name="master-child_rsc1:0" value="10"/>
           <nvpair id="nvpair.id21869" name="master-child_rsc1:1" value="100"/>
         </instance_attributes>
       </node>
       <node id="uuid2" uname="node2" type="member">
         <instance_attributes id="instance_attributes.id21890">
           <nvpair id="nvpair.id21896" name="master-child_rsc1:0" value="30"/>
           <nvpair id="nvpair.id21905" name="master-child_rsc1:1" value="300"/>
         </instance_attributes>
       </node>
     </nodes>
     <resources>
       <primitive id="simple-rsc" class="heartbeat" type="apache">
         <meta_attributes id="primitive-simple-rsc.meta"/>
       </primitive>
       <master id="rsc1">
-        <primitive id="child_rsc1" class="heartbeat" type="apache">
+        <primitive id="child_rsc1" class="ocf" provider="heartbeat" type="apache">
           <meta_attributes id="primitive-child_rsc1.meta"/>
         </primitive>
         <meta_attributes id="master_slave-rsc1.meta">
           <nvpair id="nvpair.meta.auto-59" name="resource-stickiness" value="1"/>
           <nvpair id="nvpair.meta.auto-51" name="clone-max" value="2"/>
           <nvpair id="nvpair.meta.auto-53" name="clone-node-max" value="1"/>
           <nvpair id="nvpair.meta.auto-55" name="master-max" value="1"/>
           <nvpair id="nvpair.meta.auto-57" name="master-node-max" value="1"/>
           <nvpair id="unique-1" name="globally-unique" value="true"/>
         </meta_attributes>
       </master>
     </resources>
     <constraints>
       <rsc_colocation id="simple-with-master" rsc="simple-rsc" with-rsc="rsc1" with-rsc-role="Master" score="INFINITY"/>
       <rsc_location id="master-node2" rsc="rsc1">
         <rule id="master-rule-node2" score="100" role="Master">
           <expression id="expression.id22023" attribute="#uname" operation="eq" value="node2"/>
         </rule>
       </rsc_location>
     </constraints>
   </configuration>
   <status>
     <node_state id="uuid1" ha="active" uname="node1" crmd="online" join="member" expected="member" in_ccm="true">
       <transient_attributes id="transient_attributes.id22057">
         <instance_attributes id="instance_attributes.id22059">
           <nvpair id="nvpair.id22065" name="probe_complete" value="true"/>
         </instance_attributes>
       </transient_attributes>
     </node_state>
     <node_state id="uuid2" ha="active" uname="node2" crmd="online" join="member" expected="member" in_ccm="true">
       <transient_attributes id="transient_attributes.id22095">
         <instance_attributes id="instance_attributes.id22097">
           <nvpair id="nvpair.id22103" name="probe_complete" value="true"/>
         </instance_attributes>
       </transient_attributes>
     </node_state>
   </status>
-</cib>
\ No newline at end of file
+</cib>
diff --git a/pengine/test10/master-2.exp b/pengine/test10/master-2.exp
index 70a7a3e50a..ef4095bede 100644
--- a/pengine/test10/master-2.exp
+++ b/pengine/test10/master-2.exp
@@ -1,589 +1,589 @@
  <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" priority="1000000">
      <action_set>
       <rsc_op id="60" operation="notify" operation_key="child_rsc1:0_post_notify_promote_0" on_node="node1" on_node_uuid="uuid1">
-        <primitive id="child_rsc1:0" class="heartbeat" type="apache"/>
+        <primitive id="child_rsc1:0" class="ocf" provider="heartbeat" type="apache"/>
         <attributes CRM_meta_clone="0" CRM_meta_clone_max="5" CRM_meta_clone_node_max="2" CRM_meta_globally_unique="true" CRM_meta_master_max="2" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="child_rsc1:0 child_rsc1:1 child_rsc1:2 child_rsc1:3 child_rsc1:4 " CRM_meta_notify_key_operation="promoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="child_rsc1:0 " CRM_meta_notify_promote_uname="node1 " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="child_rsc1:0 child_rsc1:1 child_rsc1:2 child_rsc1:3 " CRM_meta_notify_start_uname="node1 node2 node1 node2 " CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="post" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
         <pseudo_event id="36" operation="notify" operation_key="rsc1_post_notify_promoted_0"/>
        </trigger>
      </inputs>
    </synapse>
   <synapse id="1">
      <action_set>
       <rsc_op id="59" operation="notify" operation_key="child_rsc1:0_pre_notify_promote_0" on_node="node1" on_node_uuid="uuid1">
-        <primitive id="child_rsc1:0" class="heartbeat" type="apache"/>
+        <primitive id="child_rsc1:0" class="ocf" provider="heartbeat" type="apache"/>
         <attributes CRM_meta_clone="0" CRM_meta_clone_max="5" CRM_meta_clone_node_max="2" CRM_meta_globally_unique="true" CRM_meta_master_max="2" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="child_rsc1:0 child_rsc1:1 child_rsc1:2 child_rsc1:3 child_rsc1:4 " CRM_meta_notify_key_operation="promote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="child_rsc1:0 " CRM_meta_notify_promote_uname="node1 " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="child_rsc1:0 child_rsc1:1 child_rsc1:2 child_rsc1:3 " CRM_meta_notify_start_uname="node1 node2 node1 node2 " CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="pre" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
         <pseudo_event id="34" operation="notify" operation_key="rsc1_pre_notify_promote_0"/>
        </trigger>
      </inputs>
    </synapse>
   <synapse id="2" priority="1000000">
      <action_set>
       <rsc_op id="55" operation="notify" operation_key="child_rsc1:0_post_notify_start_0" on_node="node1" on_node_uuid="uuid1">
-        <primitive id="child_rsc1:0" class="heartbeat" type="apache"/>
+        <primitive id="child_rsc1:0" class="ocf" provider="heartbeat" type="apache"/>
         <attributes CRM_meta_clone="0" CRM_meta_clone_max="5" CRM_meta_clone_node_max="2" CRM_meta_globally_unique="true" CRM_meta_master_max="2" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="child_rsc1:0 child_rsc1:1 child_rsc1:2 child_rsc1:3 child_rsc1:4 " CRM_meta_notify_key_operation="running" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="start" CRM_meta_notify_promote_resource="child_rsc1:0 " CRM_meta_notify_promote_uname="node1 " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="child_rsc1:0 child_rsc1:1 child_rsc1:2 child_rsc1:3 " CRM_meta_notify_start_uname="node1 node2 node1 node2 " CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="post" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="24" operation="notify" operation_key="rsc1_post_notify_running_0"/>
        </trigger>
      </inputs>
    </synapse>
   <synapse id="3">
      <action_set>
       <rsc_op id="16" operation="promote" operation_key="child_rsc1:0_promote_0" on_node="node1" on_node_uuid="uuid1">
-        <primitive id="child_rsc1:0" class="heartbeat" type="apache"/>
+        <primitive id="child_rsc1:0" class="ocf" provider="heartbeat" type="apache"/>
         <attributes CRM_meta_clone="0" CRM_meta_clone_max="5" CRM_meta_clone_node_max="2" CRM_meta_globally_unique="true" CRM_meta_master_max="2" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="child_rsc1:0 child_rsc1:1 child_rsc1:2 child_rsc1:3 child_rsc1:4 " CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_promote_resource="child_rsc1:0 " CRM_meta_notify_promote_uname="node1 " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="child_rsc1:0 child_rsc1:1 child_rsc1:2 child_rsc1:3 " CRM_meta_notify_start_uname="node1 node2 node1 node2 " CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
         <rsc_op id="15" operation="start" operation_key="child_rsc1:0_start_0" on_node="node1" on_node_uuid="uuid1"/>
       </trigger>
       <trigger>
         <pseudo_event id="32" operation="promote" operation_key="rsc1_promote_0"/>
        </trigger>
      </inputs>
    </synapse>
   <synapse id="4">
      <action_set>
       <rsc_op id="15" operation="start" operation_key="child_rsc1:0_start_0" on_node="node1" on_node_uuid="uuid1">
-        <primitive id="child_rsc1:0" class="heartbeat" type="apache"/>
+        <primitive id="child_rsc1:0" class="ocf" provider="heartbeat" type="apache"/>
         <attributes CRM_meta_clone="0" CRM_meta_clone_max="5" CRM_meta_clone_node_max="2" CRM_meta_globally_unique="true" CRM_meta_master_max="2" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="child_rsc1:0 child_rsc1:1 child_rsc1:2 child_rsc1:3 child_rsc1:4 " CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_promote_resource="child_rsc1:0 " CRM_meta_notify_promote_uname="node1 " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="child_rsc1:0 child_rsc1:1 child_rsc1:2 child_rsc1:3 " CRM_meta_notify_start_uname="node1 node2 node1 node2 " CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
         <pseudo_event id="2" operation="probe_complete" operation_key="probe_complete"/>
       </trigger>
       <trigger>
         <pseudo_event id="20" operation="start" operation_key="rsc1_start_0"/>
        </trigger>
      </inputs>
    </synapse>
   <synapse id="5">
      <action_set>
       <rsc_op id="10" operation="monitor" operation_key="child_rsc1:0_monitor_0" on_node="node2" on_node_uuid="uuid2">
-        <primitive id="child_rsc1:0" class="heartbeat" type="apache"/>
+        <primitive id="child_rsc1:0" class="ocf" provider="heartbeat" type="apache"/>
         <attributes CRM_meta_clone="0" CRM_meta_clone_max="5" CRM_meta_clone_node_max="2" CRM_meta_globally_unique="true" CRM_meta_master_max="2" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
   <synapse id="6">
      <action_set>
       <rsc_op id="4" operation="monitor" operation_key="child_rsc1:0_monitor_0" on_node="node1" on_node_uuid="uuid1">
-        <primitive id="child_rsc1:0" class="heartbeat" type="apache"/>
+        <primitive id="child_rsc1:0" class="ocf" provider="heartbeat" type="apache"/>
         <attributes CRM_meta_clone="0" CRM_meta_clone_max="5" CRM_meta_clone_node_max="2" CRM_meta_globally_unique="true" CRM_meta_master_max="2" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
   <synapse id="7" priority="1000000">
      <action_set>
       <rsc_op id="62" operation="notify" operation_key="child_rsc1:1_post_notify_promote_0" on_node="node2" on_node_uuid="uuid2">
-        <primitive id="child_rsc1:1" class="heartbeat" type="apache"/>
+        <primitive id="child_rsc1:1" class="ocf" provider="heartbeat" type="apache"/>
         <attributes CRM_meta_clone="1" CRM_meta_clone_max="5" CRM_meta_clone_node_max="2" CRM_meta_globally_unique="true" CRM_meta_master_max="2" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="child_rsc1:0 child_rsc1:1 child_rsc1:2 child_rsc1:3 child_rsc1:4 " CRM_meta_notify_key_operation="promoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="child_rsc1:0 " CRM_meta_notify_promote_uname="node1 " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="child_rsc1:0 child_rsc1:1 child_rsc1:2 child_rsc1:3 " CRM_meta_notify_start_uname="node1 node2 node1 node2 " CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="post" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
         <pseudo_event id="36" operation="notify" operation_key="rsc1_post_notify_promoted_0"/>
        </trigger>
      </inputs>
    </synapse>
   <synapse id="8">
      <action_set>
       <rsc_op id="61" operation="notify" operation_key="child_rsc1:1_pre_notify_promote_0" on_node="node2" on_node_uuid="uuid2">
-        <primitive id="child_rsc1:1" class="heartbeat" type="apache"/>
+        <primitive id="child_rsc1:1" class="ocf" provider="heartbeat" type="apache"/>
         <attributes CRM_meta_clone="1" CRM_meta_clone_max="5" CRM_meta_clone_node_max="2" CRM_meta_globally_unique="true" CRM_meta_master_max="2" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="child_rsc1:0 child_rsc1:1 child_rsc1:2 child_rsc1:3 child_rsc1:4 " CRM_meta_notify_key_operation="promote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="child_rsc1:0 " CRM_meta_notify_promote_uname="node1 " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="child_rsc1:0 child_rsc1:1 child_rsc1:2 child_rsc1:3 " CRM_meta_notify_start_uname="node1 node2 node1 node2 " CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="pre" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
         <pseudo_event id="34" operation="notify" operation_key="rsc1_pre_notify_promote_0"/>
        </trigger>
      </inputs>
    </synapse>
   <synapse id="9" priority="1000000">
      <action_set>
       <rsc_op id="56" operation="notify" operation_key="child_rsc1:1_post_notify_start_0" on_node="node2" on_node_uuid="uuid2">
-        <primitive id="child_rsc1:1" class="heartbeat" type="apache"/>
+        <primitive id="child_rsc1:1" class="ocf" provider="heartbeat" type="apache"/>
         <attributes CRM_meta_clone="1" CRM_meta_clone_max="5" CRM_meta_clone_node_max="2" CRM_meta_globally_unique="true" CRM_meta_master_max="2" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="child_rsc1:0 child_rsc1:1 child_rsc1:2 child_rsc1:3 child_rsc1:4 " CRM_meta_notify_key_operation="running" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="start" CRM_meta_notify_promote_resource="child_rsc1:0 " CRM_meta_notify_promote_uname="node1 " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="child_rsc1:0 child_rsc1:1 child_rsc1:2 child_rsc1:3 " CRM_meta_notify_start_uname="node1 node2 node1 node2 " CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="post" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
         <pseudo_event id="24" operation="notify" operation_key="rsc1_post_notify_running_0"/>
        </trigger>
      </inputs>
    </synapse>
   <synapse id="10">
      <action_set>
       <rsc_op id="17" operation="start" operation_key="child_rsc1:1_start_0" on_node="node2" on_node_uuid="uuid2">
-        <primitive id="child_rsc1:1" class="heartbeat" type="apache"/>
+        <primitive id="child_rsc1:1" class="ocf" provider="heartbeat" type="apache"/>
         <attributes CRM_meta_clone="1" CRM_meta_clone_max="5" CRM_meta_clone_node_max="2" CRM_meta_globally_unique="true" CRM_meta_master_max="2" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="child_rsc1:0 child_rsc1:1 child_rsc1:2 child_rsc1:3 child_rsc1:4 " CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_promote_resource="child_rsc1:0 " CRM_meta_notify_promote_uname="node1 " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="child_rsc1:0 child_rsc1:1 child_rsc1:2 child_rsc1:3 " CRM_meta_notify_start_uname="node1 node2 node1 node2 " CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
         <pseudo_event id="2" operation="probe_complete" operation_key="probe_complete"/>
       </trigger>
       <trigger>
         <pseudo_event id="20" operation="start" operation_key="rsc1_start_0"/>
        </trigger>
      </inputs>
    </synapse>
   <synapse id="11">
      <action_set>
       <rsc_op id="11" operation="monitor" operation_key="child_rsc1:1_monitor_0" on_node="node2" on_node_uuid="uuid2">
-        <primitive id="child_rsc1:1" class="heartbeat" type="apache"/>
+        <primitive id="child_rsc1:1" class="ocf" provider="heartbeat" type="apache"/>
         <attributes CRM_meta_clone="1" CRM_meta_clone_max="5" CRM_meta_clone_node_max="2" CRM_meta_globally_unique="true" CRM_meta_master_max="2" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
   <synapse id="12">
      <action_set>
       <rsc_op id="5" operation="monitor" operation_key="child_rsc1:1_monitor_0" on_node="node1" on_node_uuid="uuid1">
-        <primitive id="child_rsc1:1" class="heartbeat" type="apache"/>
+        <primitive id="child_rsc1:1" class="ocf" provider="heartbeat" type="apache"/>
         <attributes CRM_meta_clone="1" CRM_meta_clone_max="5" CRM_meta_clone_node_max="2" CRM_meta_globally_unique="true" CRM_meta_master_max="2" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
   <synapse id="13" priority="1000000">
      <action_set>
       <rsc_op id="64" operation="notify" operation_key="child_rsc1:2_post_notify_promote_0" on_node="node1" on_node_uuid="uuid1">
-        <primitive id="child_rsc1:2" class="heartbeat" type="apache"/>
+        <primitive id="child_rsc1:2" class="ocf" provider="heartbeat" type="apache"/>
         <attributes CRM_meta_clone="2" CRM_meta_clone_max="5" CRM_meta_clone_node_max="2" CRM_meta_globally_unique="true" CRM_meta_master_max="2" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="child_rsc1:0 child_rsc1:1 child_rsc1:2 child_rsc1:3 child_rsc1:4 " CRM_meta_notify_key_operation="promoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="child_rsc1:0 " CRM_meta_notify_promote_uname="node1 " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="child_rsc1:0 child_rsc1:1 child_rsc1:2 child_rsc1:3 " CRM_meta_notify_start_uname="node1 node2 node1 node2 " CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="post" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
         <pseudo_event id="36" operation="notify" operation_key="rsc1_post_notify_promoted_0"/>
        </trigger>
      </inputs>
    </synapse>
   <synapse id="14">
      <action_set>
       <rsc_op id="63" operation="notify" operation_key="child_rsc1:2_pre_notify_promote_0" on_node="node1" on_node_uuid="uuid1">
-        <primitive id="child_rsc1:2" class="heartbeat" type="apache"/>
+        <primitive id="child_rsc1:2" class="ocf" provider="heartbeat" type="apache"/>
         <attributes CRM_meta_clone="2" CRM_meta_clone_max="5" CRM_meta_clone_node_max="2" CRM_meta_globally_unique="true" CRM_meta_master_max="2" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="child_rsc1:0 child_rsc1:1 child_rsc1:2 child_rsc1:3 child_rsc1:4 " CRM_meta_notify_key_operation="promote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="child_rsc1:0 " CRM_meta_notify_promote_uname="node1 " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="child_rsc1:0 child_rsc1:1 child_rsc1:2 child_rsc1:3 " CRM_meta_notify_start_uname="node1 node2 node1 node2 " CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="pre" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
         <pseudo_event id="34" operation="notify" operation_key="rsc1_pre_notify_promote_0"/>
        </trigger>
      </inputs>
    </synapse>
   <synapse id="15" priority="1000000">
      <action_set>
       <rsc_op id="57" operation="notify" operation_key="child_rsc1:2_post_notify_start_0" on_node="node1" on_node_uuid="uuid1">
-        <primitive id="child_rsc1:2" class="heartbeat" type="apache"/>
+        <primitive id="child_rsc1:2" class="ocf" provider="heartbeat" type="apache"/>
         <attributes CRM_meta_clone="2" CRM_meta_clone_max="5" CRM_meta_clone_node_max="2" CRM_meta_globally_unique="true" CRM_meta_master_max="2" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="child_rsc1:0 child_rsc1:1 child_rsc1:2 child_rsc1:3 child_rsc1:4 " CRM_meta_notify_key_operation="running" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="start" CRM_meta_notify_promote_resource="child_rsc1:0 " CRM_meta_notify_promote_uname="node1 " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="child_rsc1:0 child_rsc1:1 child_rsc1:2 child_rsc1:3 " CRM_meta_notify_start_uname="node1 node2 node1 node2 " CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="post" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
         <pseudo_event id="24" operation="notify" operation_key="rsc1_post_notify_running_0"/>
        </trigger>
      </inputs>
    </synapse>
   <synapse id="16">
      <action_set>
       <rsc_op id="18" operation="start" operation_key="child_rsc1:2_start_0" on_node="node1" on_node_uuid="uuid1">
-        <primitive id="child_rsc1:2" class="heartbeat" type="apache"/>
+        <primitive id="child_rsc1:2" class="ocf" provider="heartbeat" type="apache"/>
         <attributes CRM_meta_clone="2" CRM_meta_clone_max="5" CRM_meta_clone_node_max="2" CRM_meta_globally_unique="true" CRM_meta_master_max="2" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="child_rsc1:0 child_rsc1:1 child_rsc1:2 child_rsc1:3 child_rsc1:4 " CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_promote_resource="child_rsc1:0 " CRM_meta_notify_promote_uname="node1 " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="child_rsc1:0 child_rsc1:1 child_rsc1:2 child_rsc1:3 " CRM_meta_notify_start_uname="node1 node2 node1 node2 " CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
         <pseudo_event id="2" operation="probe_complete" operation_key="probe_complete"/>
       </trigger>
       <trigger>
         <pseudo_event id="20" operation="start" operation_key="rsc1_start_0"/>
        </trigger>
      </inputs>
    </synapse>
   <synapse id="17">
      <action_set>
       <rsc_op id="12" operation="monitor" operation_key="child_rsc1:2_monitor_0" on_node="node2" on_node_uuid="uuid2">
-        <primitive id="child_rsc1:2" class="heartbeat" type="apache"/>
+        <primitive id="child_rsc1:2" class="ocf" provider="heartbeat" type="apache"/>
         <attributes CRM_meta_clone="2" CRM_meta_clone_max="5" CRM_meta_clone_node_max="2" CRM_meta_globally_unique="true" CRM_meta_master_max="2" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
   <synapse id="18">
      <action_set>
       <rsc_op id="6" operation="monitor" operation_key="child_rsc1:2_monitor_0" on_node="node1" on_node_uuid="uuid1">
-        <primitive id="child_rsc1:2" class="heartbeat" type="apache"/>
+        <primitive id="child_rsc1:2" class="ocf" provider="heartbeat" type="apache"/>
         <attributes CRM_meta_clone="2" CRM_meta_clone_max="5" CRM_meta_clone_node_max="2" CRM_meta_globally_unique="true" CRM_meta_master_max="2" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
   <synapse id="19" priority="1000000">
      <action_set>
       <rsc_op id="66" operation="notify" operation_key="child_rsc1:3_post_notify_promote_0" on_node="node2" on_node_uuid="uuid2">
-        <primitive id="child_rsc1:3" class="heartbeat" type="apache"/>
+        <primitive id="child_rsc1:3" class="ocf" provider="heartbeat" type="apache"/>
         <attributes CRM_meta_clone="3" CRM_meta_clone_max="5" CRM_meta_clone_node_max="2" CRM_meta_globally_unique="true" CRM_meta_master_max="2" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="child_rsc1:0 child_rsc1:1 child_rsc1:2 child_rsc1:3 child_rsc1:4 " CRM_meta_notify_key_operation="promoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="child_rsc1:0 " CRM_meta_notify_promote_uname="node1 " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="child_rsc1:0 child_rsc1:1 child_rsc1:2 child_rsc1:3 " CRM_meta_notify_start_uname="node1 node2 node1 node2 " CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="post" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
         <pseudo_event id="36" operation="notify" operation_key="rsc1_post_notify_promoted_0"/>
        </trigger>
     </inputs>
   </synapse>
   <synapse id="20">
     <action_set>
       <rsc_op id="65" operation="notify" operation_key="child_rsc1:3_pre_notify_promote_0" on_node="node2" on_node_uuid="uuid2">
-        <primitive id="child_rsc1:3" class="heartbeat" type="apache"/>
+        <primitive id="child_rsc1:3" class="ocf" provider="heartbeat" type="apache"/>
         <attributes CRM_meta_clone="3" CRM_meta_clone_max="5" CRM_meta_clone_node_max="2" CRM_meta_globally_unique="true" CRM_meta_master_max="2" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="child_rsc1:0 child_rsc1:1 child_rsc1:2 child_rsc1:3 child_rsc1:4 " CRM_meta_notify_key_operation="promote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="child_rsc1:0 " CRM_meta_notify_promote_uname="node1 " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="child_rsc1:0 child_rsc1:1 child_rsc1:2 child_rsc1:3 " CRM_meta_notify_start_uname="node1 node2 node1 node2 " CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="pre" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
       </rsc_op>
     </action_set>
     <inputs>
        <trigger>
         <pseudo_event id="34" operation="notify" operation_key="rsc1_pre_notify_promote_0"/>
        </trigger>
      </inputs>
    </synapse>
   <synapse id="21" priority="1000000">
      <action_set>
       <rsc_op id="58" operation="notify" operation_key="child_rsc1:3_post_notify_start_0" on_node="node2" on_node_uuid="uuid2">
-        <primitive id="child_rsc1:3" class="heartbeat" type="apache"/>
+        <primitive id="child_rsc1:3" class="ocf" provider="heartbeat" type="apache"/>
         <attributes CRM_meta_clone="3" CRM_meta_clone_max="5" CRM_meta_clone_node_max="2" CRM_meta_globally_unique="true" CRM_meta_master_max="2" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="child_rsc1:0 child_rsc1:1 child_rsc1:2 child_rsc1:3 child_rsc1:4 " CRM_meta_notify_key_operation="running" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="start" CRM_meta_notify_promote_resource="child_rsc1:0 " CRM_meta_notify_promote_uname="node1 " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="child_rsc1:0 child_rsc1:1 child_rsc1:2 child_rsc1:3 " CRM_meta_notify_start_uname="node1 node2 node1 node2 " CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="post" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="24" operation="notify" operation_key="rsc1_post_notify_running_0"/>
        </trigger>
      </inputs>
    </synapse>
   <synapse id="22">
      <action_set>
       <rsc_op id="19" operation="start" operation_key="child_rsc1:3_start_0" on_node="node2" on_node_uuid="uuid2">
-        <primitive id="child_rsc1:3" class="heartbeat" type="apache"/>
+        <primitive id="child_rsc1:3" class="ocf" provider="heartbeat" type="apache"/>
         <attributes CRM_meta_clone="3" CRM_meta_clone_max="5" CRM_meta_clone_node_max="2" CRM_meta_globally_unique="true" CRM_meta_master_max="2" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="child_rsc1:0 child_rsc1:1 child_rsc1:2 child_rsc1:3 child_rsc1:4 " CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_promote_resource="child_rsc1:0 " CRM_meta_notify_promote_uname="node1 " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="child_rsc1:0 child_rsc1:1 child_rsc1:2 child_rsc1:3 " CRM_meta_notify_start_uname="node1 node2 node1 node2 " CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
         <pseudo_event id="2" operation="probe_complete" operation_key="probe_complete"/>
       </trigger>
       <trigger>
         <pseudo_event id="20" operation="start" operation_key="rsc1_start_0"/>
        </trigger>
      </inputs>
    </synapse>
   <synapse id="23">
      <action_set>
       <rsc_op id="13" operation="monitor" operation_key="child_rsc1:3_monitor_0" on_node="node2" on_node_uuid="uuid2">
-        <primitive id="child_rsc1:3" class="heartbeat" type="apache"/>
+        <primitive id="child_rsc1:3" class="ocf" provider="heartbeat" type="apache"/>
         <attributes CRM_meta_clone="3" CRM_meta_clone_max="5" CRM_meta_clone_node_max="2" CRM_meta_globally_unique="true" CRM_meta_master_max="2" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
        </rsc_op>
      </action_set>
     <inputs/>
   </synapse>
   <synapse id="24">
     <action_set>
       <rsc_op id="7" operation="monitor" operation_key="child_rsc1:3_monitor_0" on_node="node1" on_node_uuid="uuid1">
-        <primitive id="child_rsc1:3" class="heartbeat" type="apache"/>
+        <primitive id="child_rsc1:3" class="ocf" provider="heartbeat" type="apache"/>
         <attributes CRM_meta_clone="3" CRM_meta_clone_max="5" CRM_meta_clone_node_max="2" CRM_meta_globally_unique="true" CRM_meta_master_max="2" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
       </rsc_op>
     </action_set>
     <inputs/>
    </synapse>
    <synapse id="25">
      <action_set>
       <rsc_op id="14" operation="monitor" operation_key="child_rsc1:4_monitor_0" on_node="node2" on_node_uuid="uuid2">
-        <primitive id="child_rsc1:4" class="heartbeat" type="apache"/>
+        <primitive id="child_rsc1:4" class="ocf" provider="heartbeat" type="apache"/>
         <attributes CRM_meta_clone="4" CRM_meta_clone_max="5" CRM_meta_clone_node_max="2" CRM_meta_globally_unique="true" CRM_meta_master_max="2" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="26">
      <action_set>
       <rsc_op id="8" operation="monitor" operation_key="child_rsc1:4_monitor_0" on_node="node1" on_node_uuid="uuid1">
-        <primitive id="child_rsc1:4" class="heartbeat" type="apache"/>
+        <primitive id="child_rsc1:4" class="ocf" provider="heartbeat" type="apache"/>
         <attributes CRM_meta_clone="4" CRM_meta_clone_max="5" CRM_meta_clone_node_max="2" CRM_meta_globally_unique="true" CRM_meta_master_max="2" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
   <synapse id="27" priority="1000000">
      <action_set>
       <pseudo_event id="37" operation="notified" operation_key="rsc1_confirmed-post_notify_promoted_0">
         <attributes CRM_meta_clone_max="5" CRM_meta_clone_node_max="2" CRM_meta_globally_unique="true" CRM_meta_master_max="2" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_key_operation="promoted" CRM_meta_notify_key_type="confirmed-post" CRM_meta_notify_operation="promote" CRM_meta_notify_type="post" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
         <pseudo_event id="36" operation="notify" operation_key="rsc1_post_notify_promoted_0"/>
       </trigger>
       <trigger>
         <rsc_op id="60" operation="notify" operation_key="child_rsc1:0_post_notify_promote_0" on_node="node1" on_node_uuid="uuid1"/>
       </trigger>
       <trigger>
         <rsc_op id="62" operation="notify" operation_key="child_rsc1:1_post_notify_promote_0" on_node="node2" on_node_uuid="uuid2"/>
       </trigger>
       <trigger>
         <rsc_op id="64" operation="notify" operation_key="child_rsc1:2_post_notify_promote_0" on_node="node1" on_node_uuid="uuid1"/>
       </trigger>
       <trigger>
         <rsc_op id="66" operation="notify" operation_key="child_rsc1:3_post_notify_promote_0" on_node="node2" on_node_uuid="uuid2"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="28" priority="1000000">
      <action_set>
       <pseudo_event id="36" operation="notify" operation_key="rsc1_post_notify_promoted_0">
         <attributes CRM_meta_clone_max="5" CRM_meta_clone_node_max="2" CRM_meta_globally_unique="true" CRM_meta_master_max="2" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_key_operation="promoted" CRM_meta_notify_key_type="post" CRM_meta_notify_operation="promote" CRM_meta_notify_type="post" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
         <pseudo_event id="33" operation="promoted" operation_key="rsc1_promoted_0"/>
        </trigger>
        <trigger>
         <pseudo_event id="35" operation="notified" operation_key="rsc1_confirmed-pre_notify_promote_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="29">
     <action_set>
       <pseudo_event id="35" operation="notified" operation_key="rsc1_confirmed-pre_notify_promote_0">
         <attributes CRM_meta_clone_max="5" CRM_meta_clone_node_max="2" CRM_meta_globally_unique="true" CRM_meta_master_max="2" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_key_operation="promote" CRM_meta_notify_key_type="confirmed-pre" CRM_meta_notify_operation="promote" CRM_meta_notify_type="pre" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
         <pseudo_event id="34" operation="notify" operation_key="rsc1_pre_notify_promote_0"/>
        </trigger>
        <trigger>
         <rsc_op id="59" operation="notify" operation_key="child_rsc1:0_pre_notify_promote_0" on_node="node1" on_node_uuid="uuid1"/>
        </trigger>
        <trigger>
         <rsc_op id="61" operation="notify" operation_key="child_rsc1:1_pre_notify_promote_0" on_node="node2" on_node_uuid="uuid2"/>
        </trigger>
        <trigger>
         <rsc_op id="63" operation="notify" operation_key="child_rsc1:2_pre_notify_promote_0" on_node="node1" on_node_uuid="uuid1"/>
       </trigger>
       <trigger>
         <rsc_op id="65" operation="notify" operation_key="child_rsc1:3_pre_notify_promote_0" on_node="node2" on_node_uuid="uuid2"/>
        </trigger>
      </inputs>
    </synapse>
   <synapse id="30">
      <action_set>
       <pseudo_event id="34" operation="notify" operation_key="rsc1_pre_notify_promote_0">
         <attributes CRM_meta_clone_max="5" CRM_meta_clone_node_max="2" CRM_meta_globally_unique="true" CRM_meta_master_max="2" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_key_operation="promote" CRM_meta_notify_key_type="pre" CRM_meta_notify_operation="promote" CRM_meta_notify_type="pre" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
        </pseudo_event>
      </action_set>
     <inputs>
       <trigger>
         <pseudo_event id="25" operation="notified" operation_key="rsc1_confirmed-post_notify_running_0"/>
       </trigger>
     </inputs>
    </synapse>
   <synapse id="31" priority="1000000">
      <action_set>
       <pseudo_event id="33" operation="promoted" operation_key="rsc1_promoted_0">
         <attributes CRM_meta_clone_max="5" CRM_meta_clone_node_max="2" CRM_meta_globally_unique="true" CRM_meta_master_max="2" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
         <rsc_op id="16" operation="promote" operation_key="child_rsc1:0_promote_0" on_node="node1" on_node_uuid="uuid1"/>
        </trigger>
      </inputs>
    </synapse>
   <synapse id="32">
      <action_set>
       <pseudo_event id="32" operation="promote" operation_key="rsc1_promote_0">
         <attributes CRM_meta_clone_max="5" CRM_meta_clone_node_max="2" CRM_meta_globally_unique="true" CRM_meta_master_max="2" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="21" operation="running" operation_key="rsc1_running_0"/>
        </trigger>
       <trigger>
         <pseudo_event id="35" operation="notified" operation_key="rsc1_confirmed-pre_notify_promote_0"/>
       </trigger>
      </inputs>
    </synapse>
   <synapse id="33" priority="1000000">
      <action_set>
        <pseudo_event id="25" operation="notified" operation_key="rsc1_confirmed-post_notify_running_0">
         <attributes CRM_meta_clone_max="5" CRM_meta_clone_node_max="2" CRM_meta_globally_unique="true" CRM_meta_master_max="2" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_key_operation="running" CRM_meta_notify_key_type="confirmed-post" CRM_meta_notify_operation="start" CRM_meta_notify_type="post" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="24" operation="notify" operation_key="rsc1_post_notify_running_0"/>
        </trigger>
        <trigger>
         <rsc_op id="55" operation="notify" operation_key="child_rsc1:0_post_notify_start_0" on_node="node1" on_node_uuid="uuid1"/>
        </trigger>
        <trigger>
         <rsc_op id="56" operation="notify" operation_key="child_rsc1:1_post_notify_start_0" on_node="node2" on_node_uuid="uuid2"/>
        </trigger>
        <trigger>
         <rsc_op id="57" operation="notify" operation_key="child_rsc1:2_post_notify_start_0" on_node="node1" on_node_uuid="uuid1"/>
        </trigger>
        <trigger>
         <rsc_op id="58" operation="notify" operation_key="child_rsc1:3_post_notify_start_0" on_node="node2" on_node_uuid="uuid2"/>
        </trigger>
      </inputs>
    </synapse>
   <synapse id="34" priority="1000000">
      <action_set>
       <pseudo_event id="24" operation="notify" operation_key="rsc1_post_notify_running_0">
         <attributes CRM_meta_clone_max="5" CRM_meta_clone_node_max="2" CRM_meta_globally_unique="true" CRM_meta_master_max="2" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_key_operation="running" CRM_meta_notify_key_type="post" CRM_meta_notify_operation="start" CRM_meta_notify_type="post" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="21" operation="running" operation_key="rsc1_running_0"/>
        </trigger>
        <trigger>
         <pseudo_event id="23" operation="notified" operation_key="rsc1_confirmed-pre_notify_start_0"/>
        </trigger>
      </inputs>
    </synapse>
   <synapse id="35">
      <action_set>
       <pseudo_event id="23" operation="notified" operation_key="rsc1_confirmed-pre_notify_start_0">
         <attributes CRM_meta_clone_max="5" CRM_meta_clone_node_max="2" CRM_meta_globally_unique="true" CRM_meta_master_max="2" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_key_operation="start" CRM_meta_notify_key_type="confirmed-pre" CRM_meta_notify_operation="start" CRM_meta_notify_type="pre" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
         <pseudo_event id="22" operation="notify" operation_key="rsc1_pre_notify_start_0"/>
        </trigger>
      </inputs>
    </synapse>
   <synapse id="36">
      <action_set>
       <pseudo_event id="22" operation="notify" operation_key="rsc1_pre_notify_start_0">
         <attributes CRM_meta_clone_max="5" CRM_meta_clone_node_max="2" CRM_meta_globally_unique="true" CRM_meta_master_max="2" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_key_operation="start" CRM_meta_notify_key_type="pre" CRM_meta_notify_operation="start" CRM_meta_notify_type="pre" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
        </pseudo_event>
      </action_set>
     <inputs/>
    </synapse>
   <synapse id="37" priority="1000000">
      <action_set>
       <pseudo_event id="21" operation="running" operation_key="rsc1_running_0">
         <attributes CRM_meta_clone_max="5" CRM_meta_clone_node_max="2" CRM_meta_globally_unique="true" CRM_meta_master_max="2" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
         <rsc_op id="15" operation="start" operation_key="child_rsc1:0_start_0" on_node="node1" on_node_uuid="uuid1"/>
        </trigger>
        <trigger>
         <rsc_op id="17" operation="start" operation_key="child_rsc1:1_start_0" on_node="node2" on_node_uuid="uuid2"/>
        </trigger>
        <trigger>
         <rsc_op id="18" operation="start" operation_key="child_rsc1:2_start_0" on_node="node1" on_node_uuid="uuid1"/>
        </trigger>
        <trigger>
         <rsc_op id="19" operation="start" operation_key="child_rsc1:3_start_0" on_node="node2" on_node_uuid="uuid2"/>
        </trigger>
        <trigger>
         <pseudo_event id="20" operation="start" operation_key="rsc1_start_0"/>
        </trigger>
      </inputs>
    </synapse>
   <synapse id="38">
      <action_set>
       <pseudo_event id="20" operation="start" operation_key="rsc1_start_0">
         <attributes CRM_meta_clone_max="5" CRM_meta_clone_node_max="2" CRM_meta_globally_unique="true" CRM_meta_master_max="2" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
         <pseudo_event id="23" operation="notified" operation_key="rsc1_confirmed-pre_notify_start_0"/>
       </trigger>
      </inputs>
    </synapse>
   <synapse id="39" priority="1000000">
      <action_set>
       <rsc_op id="9" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="uuid2">
         <attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
       </rsc_op>
      </action_set>
      <inputs>
        <trigger>
         <rsc_op id="10" operation="monitor" operation_key="child_rsc1:0_monitor_0" on_node="node2" on_node_uuid="uuid2"/>
        </trigger>
        <trigger>
         <rsc_op id="11" operation="monitor" operation_key="child_rsc1:1_monitor_0" on_node="node2" on_node_uuid="uuid2"/>
        </trigger>
        <trigger>
         <rsc_op id="12" operation="monitor" operation_key="child_rsc1:2_monitor_0" on_node="node2" on_node_uuid="uuid2"/>
        </trigger>
        <trigger>
         <rsc_op id="13" operation="monitor" operation_key="child_rsc1:3_monitor_0" on_node="node2" on_node_uuid="uuid2"/>
        </trigger>
        <trigger>
         <rsc_op id="14" operation="monitor" operation_key="child_rsc1:4_monitor_0" on_node="node2" on_node_uuid="uuid2"/>
        </trigger>
      </inputs>
    </synapse>
   <synapse id="40" priority="1000000">
      <action_set>
        <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="uuid1">
         <attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="4" operation="monitor" operation_key="child_rsc1:0_monitor_0" on_node="node1" on_node_uuid="uuid1"/>
        </trigger>
        <trigger>
          <rsc_op id="5" operation="monitor" operation_key="child_rsc1:1_monitor_0" on_node="node1" on_node_uuid="uuid1"/>
        </trigger>
        <trigger>
          <rsc_op id="6" operation="monitor" operation_key="child_rsc1:2_monitor_0" on_node="node1" on_node_uuid="uuid1"/>
        </trigger>
        <trigger>
          <rsc_op id="7" operation="monitor" operation_key="child_rsc1:3_monitor_0" on_node="node1" on_node_uuid="uuid1"/>
        </trigger>
        <trigger>
          <rsc_op id="8" operation="monitor" operation_key="child_rsc1:4_monitor_0" on_node="node1" on_node_uuid="uuid1"/>
        </trigger>
      </inputs>
    </synapse>
   <synapse id="41">
      <action_set>
       <pseudo_event id="2" operation="probe_complete" operation_key="probe_complete">
         <attributes crm_feature_set="3.0.7"/>
       </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
         <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="uuid1"/>
        </trigger>
        <trigger>
         <rsc_op id="9" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="uuid2"/>
        </trigger>
      </inputs>
    </synapse>
  </transition_graph>
 
diff --git a/pengine/test10/master-2.summary b/pengine/test10/master-2.summary
index 7482495813..bcf34dbfb6 100644
--- a/pengine/test10/master-2.summary
+++ b/pengine/test10/master-2.summary
@@ -1,70 +1,70 @@
 
 Current cluster status:
 Online: [ node1 node2 ]
 
  Master/Slave Set: rsc1 [child_rsc1] (unique)
-     child_rsc1:0	(heartbeat:apache):	Stopped 
-     child_rsc1:1	(heartbeat:apache):	Stopped 
-     child_rsc1:2	(heartbeat:apache):	Stopped 
-     child_rsc1:3	(heartbeat:apache):	Stopped 
-     child_rsc1:4	(heartbeat:apache):	Stopped 
+     child_rsc1:0	(ocf::heartbeat:apache):	Stopped 
+     child_rsc1:1	(ocf::heartbeat:apache):	Stopped 
+     child_rsc1:2	(ocf::heartbeat:apache):	Stopped 
+     child_rsc1:3	(ocf::heartbeat:apache):	Stopped 
+     child_rsc1:4	(ocf::heartbeat:apache):	Stopped 
 
 Transition Summary:
  * Start   child_rsc1:0	(node1)
  * Promote child_rsc1:0	(Stopped -> Master node1)
  * Start   child_rsc1:1	(node2)
  * Start   child_rsc1:2	(node1)
  * Start   child_rsc1:3	(node2)
 
 Executing cluster transition:
  * Resource action: child_rsc1:0    monitor on node2
  * Resource action: child_rsc1:0    monitor on node1
  * Resource action: child_rsc1:1    monitor on node2
  * Resource action: child_rsc1:1    monitor on node1
  * Resource action: child_rsc1:2    monitor on node2
  * Resource action: child_rsc1:2    monitor on node1
  * Resource action: child_rsc1:3    monitor on node2
  * Resource action: child_rsc1:3    monitor on node1
  * Resource action: child_rsc1:4    monitor on node2
  * Resource action: child_rsc1:4    monitor on node1
  * Pseudo action:   rsc1_pre_notify_start_0
  * Pseudo action:   probe_complete
  * Pseudo action:   rsc1_confirmed-pre_notify_start_0
  * Pseudo action:   rsc1_start_0
  * Resource action: child_rsc1:0    start on node1
  * Resource action: child_rsc1:1    start on node2
  * Resource action: child_rsc1:2    start on node1
  * Resource action: child_rsc1:3    start on node2
  * Pseudo action:   rsc1_running_0
  * Pseudo action:   rsc1_post_notify_running_0
  * Resource action: child_rsc1:0    notify on node1
  * Resource action: child_rsc1:1    notify on node2
  * Resource action: child_rsc1:2    notify on node1
  * Resource action: child_rsc1:3    notify on node2
  * Pseudo action:   rsc1_confirmed-post_notify_running_0
  * Pseudo action:   rsc1_pre_notify_promote_0
  * Resource action: child_rsc1:0    notify on node1
  * Resource action: child_rsc1:1    notify on node2
  * Resource action: child_rsc1:2    notify on node1
  * Resource action: child_rsc1:3    notify on node2
  * Pseudo action:   rsc1_confirmed-pre_notify_promote_0
  * Pseudo action:   rsc1_promote_0
  * Resource action: child_rsc1:0    promote on node1
  * Pseudo action:   rsc1_promoted_0
  * Pseudo action:   rsc1_post_notify_promoted_0
  * Resource action: child_rsc1:0    notify on node1
  * Resource action: child_rsc1:1    notify on node2
  * Resource action: child_rsc1:2    notify on node1
  * Resource action: child_rsc1:3    notify on node2
  * Pseudo action:   rsc1_confirmed-post_notify_promoted_0
 
 Revised cluster status:
 Online: [ node1 node2 ]
 
  Master/Slave Set: rsc1 [child_rsc1] (unique)
-     child_rsc1:0	(heartbeat:apache):	Master node1
-     child_rsc1:1	(heartbeat:apache):	Started node2
-     child_rsc1:2	(heartbeat:apache):	Started node1
-     child_rsc1:3	(heartbeat:apache):	Started node2
-     child_rsc1:4	(heartbeat:apache):	Stopped 
+     child_rsc1:0	(ocf::heartbeat:apache):	Master node1
+     child_rsc1:1	(ocf::heartbeat:apache):	Started node2
+     child_rsc1:2	(ocf::heartbeat:apache):	Started node1
+     child_rsc1:3	(ocf::heartbeat:apache):	Started node2
+     child_rsc1:4	(ocf::heartbeat:apache):	Stopped 
 
diff --git a/pengine/test10/master-2.xml b/pengine/test10/master-2.xml
index 790aca47c4..5b3c5c2b49 100644
--- a/pengine/test10/master-2.xml
+++ b/pengine/test10/master-2.xml
@@ -1,65 +1,65 @@
 <cib admin_epoch="0" epoch="1" num_updates="1" dc-uuid="0" have-quorum="false" remote-tls-port="0" validate-with="pacemaker-1.0" cib-last-written="Fri Jul 13 13:51:07 2012">
   <configuration>
     <crm_config>
       <cluster_property_set id="no-stonith">
         <nvpair id="opt-no-stonith" name="stonith-enabled" value="false"/>
       </cluster_property_set>
       <cluster_property_set id="cib-bootstrap-options">
         <nvpair id="nvpair.id21832" name="no-quorum-policy" value="ignore"/>
       </cluster_property_set>
     </crm_config>
     <nodes>
       <node id="uuid1" uname="node1" type="member">
         <instance_attributes id="instance_attributes.id21853">
           <nvpair id="nvpair.id21860" name="master-child_rsc1:0" value="20"/>
           <nvpair id="nvpair.id21868" name="master-child_rsc1:2" value="10"/>
         </instance_attributes>
       </node>
       <node id="uuid2" uname="node2" type="member">
         <instance_attributes id="instance_attributes.id21888">
           <nvpair id="nvpair.id21894" name="master-child_rsc1:1" value="10"/>
           <nvpair id="nvpair.id21902" name="master-child_rsc1:3" value="20"/>
         </instance_attributes>
       </node>
     </nodes>
     <resources>
       <master id="rsc1">
-        <primitive id="child_rsc1" class="heartbeat" type="apache">
+        <primitive id="child_rsc1" class="ocf" provider="heartbeat" type="apache">
           <meta_attributes id="primitive-child_rsc1.meta"/>
         </primitive>
         <meta_attributes id="master_slave-rsc1.meta">
           <nvpair id="notify.meta.auto-43" name="notify" value="true"/>
           <nvpair id="nvpair.meta.auto-57" name="resource-stickiness" value="1"/>
           <nvpair id="nvpair.meta.auto-49" name="clone-max" value="5"/>
           <nvpair id="nvpair.meta.auto-51" name="clone-node-max" value="2"/>
           <nvpair id="nvpair.meta.auto-53" name="master-max" value="2"/>
           <nvpair id="nvpair.meta.auto-55" name="master-node-max" value="1"/>
           <nvpair id="unique-1" name="globally-unique" value="true"/>
         </meta_attributes>
       </master>
     </resources>
     <constraints>
       <rsc_location id="master-node2" rsc="rsc1">
         <rule id="master-rule-node2" score="100" role="Master">
           <expression id="expression.id22001" attribute="#uname" operation="eq" value="node1"/>
         </rule>
       </rsc_location>
     </constraints>
   </configuration>
   <status>
     <node_state id="uuid1" ha="active" uname="node1" crmd="online" join="member" expected="member" in_ccm="true">
       <transient_attributes id="transient_attributes.id22033">
         <instance_attributes id="instance_attributes.id22036">
           <nvpair id="nvpair.id22042" name="probe_complete" value="true"/>
         </instance_attributes>
       </transient_attributes>
     </node_state>
     <node_state id="uuid2" ha="active" uname="node2" crmd="online" join="member" expected="member" in_ccm="true">
       <transient_attributes id="transient_attributes.id22072">
         <instance_attributes id="instance_attributes.id22074">
           <nvpair id="nvpair.id22080" name="probe_complete" value="true"/>
         </instance_attributes>
       </transient_attributes>
     </node_state>
   </status>
-</cib>
\ No newline at end of file
+</cib>
diff --git a/pengine/test10/master-3.exp b/pengine/test10/master-3.exp
index 802bebd98f..d5e0def15b 100644
--- a/pengine/test10/master-3.exp
+++ b/pengine/test10/master-3.exp
@@ -1,292 +1,292 @@
  <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>
        <rsc_op id="15" operation="start" operation_key="child_rsc1:0_start_0" on_node="node1" on_node_uuid="uuid1">
-        <primitive id="child_rsc1:0" class="heartbeat" type="apache"/>
+        <primitive id="child_rsc1:0" class="ocf" provider="heartbeat" type="apache"/>
         <attributes CRM_meta_clone="0" CRM_meta_clone_max="5" CRM_meta_clone_node_max="2" CRM_meta_globally_unique="true" CRM_meta_master_max="2" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="2" operation="probe_complete" operation_key="probe_complete"/>
        </trigger>
        <trigger>
          <pseudo_event id="20" operation="start" operation_key="rsc1_start_0"/>
        </trigger>
      </inputs>
    </synapse>
   <synapse id="1">
      <action_set>
       <rsc_op id="10" operation="monitor" operation_key="child_rsc1:0_monitor_0" on_node="node2" on_node_uuid="uuid2">
-        <primitive id="child_rsc1:0" class="heartbeat" type="apache"/>
+        <primitive id="child_rsc1:0" class="ocf" provider="heartbeat" type="apache"/>
         <attributes CRM_meta_clone="0" CRM_meta_clone_max="5" CRM_meta_clone_node_max="2" CRM_meta_globally_unique="true" CRM_meta_master_max="2" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
   <synapse id="2">
      <action_set>
       <rsc_op id="4" operation="monitor" operation_key="child_rsc1:0_monitor_0" on_node="node1" on_node_uuid="uuid1">
-        <primitive id="child_rsc1:0" class="heartbeat" type="apache"/>
+        <primitive id="child_rsc1:0" class="ocf" provider="heartbeat" type="apache"/>
         <attributes CRM_meta_clone="0" CRM_meta_clone_max="5" CRM_meta_clone_node_max="2" CRM_meta_globally_unique="true" CRM_meta_master_max="2" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
   <synapse id="3">
      <action_set>
       <rsc_op id="17" operation="promote" operation_key="child_rsc1:1_promote_0" on_node="node2" on_node_uuid="uuid2">
-        <primitive id="child_rsc1:1" class="heartbeat" type="apache"/>
+        <primitive id="child_rsc1:1" class="ocf" provider="heartbeat" type="apache"/>
         <attributes CRM_meta_clone="1" CRM_meta_clone_max="5" CRM_meta_clone_node_max="2" CRM_meta_globally_unique="true" CRM_meta_master_max="2" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
         <rsc_op id="16" operation="start" operation_key="child_rsc1:1_start_0" on_node="node2" on_node_uuid="uuid2"/>
        </trigger>
        <trigger>
         <pseudo_event id="24" operation="promote" operation_key="rsc1_promote_0"/>
        </trigger>
      </inputs>
    </synapse>
   <synapse id="4">
      <action_set>
       <rsc_op id="16" operation="start" operation_key="child_rsc1:1_start_0" on_node="node2" on_node_uuid="uuid2">
-        <primitive id="child_rsc1:1" class="heartbeat" type="apache"/>
+        <primitive id="child_rsc1:1" class="ocf" provider="heartbeat" type="apache"/>
         <attributes CRM_meta_clone="1" CRM_meta_clone_max="5" CRM_meta_clone_node_max="2" CRM_meta_globally_unique="true" CRM_meta_master_max="2" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
         <pseudo_event id="2" operation="probe_complete" operation_key="probe_complete"/>
        </trigger>
        <trigger>
         <pseudo_event id="20" operation="start" operation_key="rsc1_start_0"/>
        </trigger>
      </inputs>
    </synapse>
   <synapse id="5">
      <action_set>
       <rsc_op id="11" operation="monitor" operation_key="child_rsc1:1_monitor_0" on_node="node2" on_node_uuid="uuid2">
-        <primitive id="child_rsc1:1" class="heartbeat" type="apache"/>
+        <primitive id="child_rsc1:1" class="ocf" provider="heartbeat" type="apache"/>
         <attributes CRM_meta_clone="1" CRM_meta_clone_max="5" CRM_meta_clone_node_max="2" CRM_meta_globally_unique="true" CRM_meta_master_max="2" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
   <synapse id="6">
      <action_set>
       <rsc_op id="5" operation="monitor" operation_key="child_rsc1:1_monitor_0" on_node="node1" on_node_uuid="uuid1">
-        <primitive id="child_rsc1:1" class="heartbeat" type="apache"/>
+        <primitive id="child_rsc1:1" class="ocf" provider="heartbeat" type="apache"/>
         <attributes CRM_meta_clone="1" CRM_meta_clone_max="5" CRM_meta_clone_node_max="2" CRM_meta_globally_unique="true" CRM_meta_master_max="2" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
   <synapse id="7">
      <action_set>
        <rsc_op id="18" operation="start" operation_key="child_rsc1:2_start_0" on_node="node1" on_node_uuid="uuid1">
-        <primitive id="child_rsc1:2" class="heartbeat" type="apache"/>
+        <primitive id="child_rsc1:2" class="ocf" provider="heartbeat" type="apache"/>
         <attributes CRM_meta_clone="2" CRM_meta_clone_max="5" CRM_meta_clone_node_max="2" CRM_meta_globally_unique="true" CRM_meta_master_max="2" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="2" operation="probe_complete" operation_key="probe_complete"/>
        </trigger>
        <trigger>
          <pseudo_event id="20" operation="start" operation_key="rsc1_start_0"/>
        </trigger>
      </inputs>
    </synapse>
   <synapse id="8">
      <action_set>
       <rsc_op id="12" operation="monitor" operation_key="child_rsc1:2_monitor_0" on_node="node2" on_node_uuid="uuid2">
-        <primitive id="child_rsc1:2" class="heartbeat" type="apache"/>
+        <primitive id="child_rsc1:2" class="ocf" provider="heartbeat" type="apache"/>
         <attributes CRM_meta_clone="2" CRM_meta_clone_max="5" CRM_meta_clone_node_max="2" CRM_meta_globally_unique="true" CRM_meta_master_max="2" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
   <synapse id="9">
      <action_set>
       <rsc_op id="6" operation="monitor" operation_key="child_rsc1:2_monitor_0" on_node="node1" on_node_uuid="uuid1">
-        <primitive id="child_rsc1:2" class="heartbeat" type="apache"/>
+        <primitive id="child_rsc1:2" class="ocf" provider="heartbeat" type="apache"/>
         <attributes CRM_meta_clone="2" CRM_meta_clone_max="5" CRM_meta_clone_node_max="2" CRM_meta_globally_unique="true" CRM_meta_master_max="2" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
   <synapse id="10">
      <action_set>
        <rsc_op id="19" operation="start" operation_key="child_rsc1:3_start_0" on_node="node2" on_node_uuid="uuid2">
-        <primitive id="child_rsc1:3" class="heartbeat" type="apache"/>
+        <primitive id="child_rsc1:3" class="ocf" provider="heartbeat" type="apache"/>
         <attributes CRM_meta_clone="3" CRM_meta_clone_max="5" CRM_meta_clone_node_max="2" CRM_meta_globally_unique="true" CRM_meta_master_max="2" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="2" operation="probe_complete" operation_key="probe_complete"/>
        </trigger>
        <trigger>
          <pseudo_event id="20" operation="start" operation_key="rsc1_start_0"/>
        </trigger>
      </inputs>
    </synapse>
   <synapse id="11">
     <action_set>
       <rsc_op id="13" operation="monitor" operation_key="child_rsc1:3_monitor_0" on_node="node2" on_node_uuid="uuid2">
-        <primitive id="child_rsc1:3" class="heartbeat" type="apache"/>
+        <primitive id="child_rsc1:3" class="ocf" provider="heartbeat" type="apache"/>
         <attributes CRM_meta_clone="3" CRM_meta_clone_max="5" CRM_meta_clone_node_max="2" CRM_meta_globally_unique="true" CRM_meta_master_max="2" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
       </rsc_op>
     </action_set>
     <inputs/>
   </synapse>
   <synapse id="12">
     <action_set>
       <rsc_op id="7" operation="monitor" operation_key="child_rsc1:3_monitor_0" on_node="node1" on_node_uuid="uuid1">
-        <primitive id="child_rsc1:3" class="heartbeat" type="apache"/>
+        <primitive id="child_rsc1:3" class="ocf" provider="heartbeat" type="apache"/>
         <attributes CRM_meta_clone="3" CRM_meta_clone_max="5" CRM_meta_clone_node_max="2" CRM_meta_globally_unique="true" CRM_meta_master_max="2" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
       </rsc_op>
     </action_set>
     <inputs/>
   </synapse>
    <synapse id="13">
      <action_set>
       <rsc_op id="14" operation="monitor" operation_key="child_rsc1:4_monitor_0" on_node="node2" on_node_uuid="uuid2">
-        <primitive id="child_rsc1:4" class="heartbeat" type="apache"/>
+        <primitive id="child_rsc1:4" class="ocf" provider="heartbeat" type="apache"/>
         <attributes CRM_meta_clone="4" CRM_meta_clone_max="5" CRM_meta_clone_node_max="2" CRM_meta_globally_unique="true" CRM_meta_master_max="2" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="14">
      <action_set>
       <rsc_op id="8" operation="monitor" operation_key="child_rsc1:4_monitor_0" on_node="node1" on_node_uuid="uuid1">
-        <primitive id="child_rsc1:4" class="heartbeat" type="apache"/>
+        <primitive id="child_rsc1:4" class="ocf" provider="heartbeat" type="apache"/>
         <attributes CRM_meta_clone="4" CRM_meta_clone_max="5" CRM_meta_clone_node_max="2" CRM_meta_globally_unique="true" CRM_meta_master_max="2" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
   <synapse id="15" priority="1000000">
      <action_set>
       <pseudo_event id="25" operation="promoted" operation_key="rsc1_promoted_0">
         <attributes CRM_meta_clone_max="5" CRM_meta_clone_node_max="2" CRM_meta_globally_unique="true" CRM_meta_master_max="2" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
        </pseudo_event>
      </action_set>
     <inputs>
       <trigger>
         <rsc_op id="17" operation="promote" operation_key="child_rsc1:1_promote_0" on_node="node2" on_node_uuid="uuid2"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="16">
     <action_set>
       <pseudo_event id="24" operation="promote" operation_key="rsc1_promote_0">
         <attributes CRM_meta_clone_max="5" CRM_meta_clone_node_max="2" CRM_meta_globally_unique="true" CRM_meta_master_max="2" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
         <pseudo_event id="21" operation="running" operation_key="rsc1_running_0"/>
       </trigger>
     </inputs>
    </synapse>
   <synapse id="17" priority="1000000">
      <action_set>
        <pseudo_event id="21" operation="running" operation_key="rsc1_running_0">
         <attributes CRM_meta_clone_max="5" CRM_meta_clone_node_max="2" CRM_meta_globally_unique="true" CRM_meta_master_max="2" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="15" operation="start" operation_key="child_rsc1:0_start_0" on_node="node1" on_node_uuid="uuid1"/>
        </trigger>
        <trigger>
          <rsc_op id="16" operation="start" operation_key="child_rsc1:1_start_0" on_node="node2" on_node_uuid="uuid2"/>
        </trigger>
        <trigger>
          <rsc_op id="18" operation="start" operation_key="child_rsc1:2_start_0" on_node="node1" on_node_uuid="uuid1"/>
        </trigger>
        <trigger>
          <rsc_op id="19" operation="start" operation_key="child_rsc1:3_start_0" on_node="node2" on_node_uuid="uuid2"/>
        </trigger>
        <trigger>
          <pseudo_event id="20" operation="start" operation_key="rsc1_start_0"/>
        </trigger>
      </inputs>
    </synapse>
   <synapse id="18">
      <action_set>
       <pseudo_event id="20" operation="start" operation_key="rsc1_start_0">
         <attributes CRM_meta_clone_max="5" CRM_meta_clone_node_max="2" CRM_meta_globally_unique="true" CRM_meta_master_max="2" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
        </pseudo_event>
      </action_set>
     <inputs/>
    </synapse>
   <synapse id="19" priority="1000000">
      <action_set>
       <rsc_op id="9" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="uuid2">
         <attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
       </rsc_op>
      </action_set>
      <inputs>
        <trigger>
         <rsc_op id="10" operation="monitor" operation_key="child_rsc1:0_monitor_0" on_node="node2" on_node_uuid="uuid2"/>
        </trigger>
        <trigger>
         <rsc_op id="11" operation="monitor" operation_key="child_rsc1:1_monitor_0" on_node="node2" on_node_uuid="uuid2"/>
        </trigger>
        <trigger>
         <rsc_op id="12" operation="monitor" operation_key="child_rsc1:2_monitor_0" on_node="node2" on_node_uuid="uuid2"/>
       </trigger>
       <trigger>
         <rsc_op id="13" operation="monitor" operation_key="child_rsc1:3_monitor_0" on_node="node2" on_node_uuid="uuid2"/>
       </trigger>
       <trigger>
         <rsc_op id="14" operation="monitor" operation_key="child_rsc1:4_monitor_0" on_node="node2" on_node_uuid="uuid2"/>
        </trigger>
      </inputs>
    </synapse>
   <synapse id="20" priority="1000000">
      <action_set>
        <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="uuid1">
         <attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="4" operation="monitor" operation_key="child_rsc1:0_monitor_0" on_node="node1" on_node_uuid="uuid1"/>
        </trigger>
        <trigger>
          <rsc_op id="5" operation="monitor" operation_key="child_rsc1:1_monitor_0" on_node="node1" on_node_uuid="uuid1"/>
        </trigger>
        <trigger>
          <rsc_op id="6" operation="monitor" operation_key="child_rsc1:2_monitor_0" on_node="node1" on_node_uuid="uuid1"/>
        </trigger>
        <trigger>
          <rsc_op id="7" operation="monitor" operation_key="child_rsc1:3_monitor_0" on_node="node1" on_node_uuid="uuid1"/>
        </trigger>
        <trigger>
          <rsc_op id="8" operation="monitor" operation_key="child_rsc1:4_monitor_0" on_node="node1" on_node_uuid="uuid1"/>
        </trigger>
      </inputs>
    </synapse>
   <synapse id="21">
      <action_set>
       <pseudo_event id="2" operation="probe_complete" operation_key="probe_complete">
         <attributes crm_feature_set="3.0.7"/>
       </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
         <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="uuid1"/>
        </trigger>
        <trigger>
         <rsc_op id="9" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="uuid2"/>
        </trigger>
      </inputs>
    </synapse>
  </transition_graph>
 
diff --git a/pengine/test10/master-3.summary b/pengine/test10/master-3.summary
index d65778afa0..3edc1bb805 100644
--- a/pengine/test10/master-3.summary
+++ b/pengine/test10/master-3.summary
@@ -1,50 +1,50 @@
 
 Current cluster status:
 Online: [ node1 node2 ]
 
  Master/Slave Set: rsc1 [child_rsc1] (unique)
-     child_rsc1:0	(heartbeat:apache):	Stopped 
-     child_rsc1:1	(heartbeat:apache):	Stopped 
-     child_rsc1:2	(heartbeat:apache):	Stopped 
-     child_rsc1:3	(heartbeat:apache):	Stopped 
-     child_rsc1:4	(heartbeat:apache):	Stopped 
+     child_rsc1:0	(ocf::heartbeat:apache):	Stopped 
+     child_rsc1:1	(ocf::heartbeat:apache):	Stopped 
+     child_rsc1:2	(ocf::heartbeat:apache):	Stopped 
+     child_rsc1:3	(ocf::heartbeat:apache):	Stopped 
+     child_rsc1:4	(ocf::heartbeat:apache):	Stopped 
 
 Transition Summary:
  * Start   child_rsc1:0	(node1)
  * Start   child_rsc1:1	(node2)
  * Promote child_rsc1:1	(Stopped -> Master node2)
  * Start   child_rsc1:2	(node1)
  * Start   child_rsc1:3	(node2)
 
 Executing cluster transition:
  * Resource action: child_rsc1:0    monitor on node2
  * Resource action: child_rsc1:0    monitor on node1
  * Resource action: child_rsc1:1    monitor on node2
  * Resource action: child_rsc1:1    monitor on node1
  * Resource action: child_rsc1:2    monitor on node2
  * Resource action: child_rsc1:2    monitor on node1
  * Resource action: child_rsc1:3    monitor on node2
  * Resource action: child_rsc1:3    monitor on node1
  * Resource action: child_rsc1:4    monitor on node2
  * Resource action: child_rsc1:4    monitor on node1
  * Pseudo action:   rsc1_start_0
  * Pseudo action:   probe_complete
  * Resource action: child_rsc1:0    start on node1
  * Resource action: child_rsc1:1    start on node2
  * Resource action: child_rsc1:2    start on node1
  * Resource action: child_rsc1:3    start on node2
  * Pseudo action:   rsc1_running_0
  * Pseudo action:   rsc1_promote_0
  * Resource action: child_rsc1:1    promote on node2
  * Pseudo action:   rsc1_promoted_0
 
 Revised cluster status:
 Online: [ node1 node2 ]
 
  Master/Slave Set: rsc1 [child_rsc1] (unique)
-     child_rsc1:0	(heartbeat:apache):	Started node1
-     child_rsc1:1	(heartbeat:apache):	Master node2
-     child_rsc1:2	(heartbeat:apache):	Started node1
-     child_rsc1:3	(heartbeat:apache):	Started node2
-     child_rsc1:4	(heartbeat:apache):	Stopped 
+     child_rsc1:0	(ocf::heartbeat:apache):	Started node1
+     child_rsc1:1	(ocf::heartbeat:apache):	Master node2
+     child_rsc1:2	(ocf::heartbeat:apache):	Started node1
+     child_rsc1:3	(ocf::heartbeat:apache):	Started node2
+     child_rsc1:4	(ocf::heartbeat:apache):	Stopped 
 
diff --git a/pengine/test10/master-3.xml b/pengine/test10/master-3.xml
index 0bcff0c2ea..245f7635f8 100644
--- a/pengine/test10/master-3.xml
+++ b/pengine/test10/master-3.xml
@@ -1,57 +1,57 @@
 <cib admin_epoch="0" epoch="1" num_updates="1" dc-uuid="0" have-quorum="false" remote-tls-port="0" validate-with="pacemaker-1.0" cib-last-written="Fri Jul 13 13:51:07 2012">
   <configuration>
     <crm_config>
       <cluster_property_set id="no-stonith">
         <nvpair id="opt-no-stonith" name="stonith-enabled" value="false"/>
       </cluster_property_set>
       <cluster_property_set id="cib-bootstrap-options">
         <nvpair id="nvpair.id21832" name="no-quorum-policy" value="ignore"/>
       </cluster_property_set>
     </crm_config>
     <nodes>
       <node id="uuid1" uname="node1" type="member"/>
       <node id="uuid2" uname="node2" type="member"/>
     </nodes>
     <resources>
       <master id="rsc1">
-        <primitive id="child_rsc1" class="heartbeat" type="apache">
+        <primitive id="child_rsc1" class="ocf" provider="heartbeat" type="apache">
           <meta_attributes id="primitive-child_rsc1.meta"/>
         </primitive>
         <meta_attributes id="master_slave-rsc1.meta">
           <nvpair id="nvpair.meta.auto-37" name="resource-stickiness" value="1"/>
           <nvpair id="nvpair.meta.auto-29" name="clone-max" value="5"/>
           <nvpair id="nvpair.meta.auto-31" name="clone-node-max" value="2"/>
           <nvpair id="nvpair.meta.auto-33" name="master-max" value="2"/>
           <nvpair id="nvpair.meta.auto-35" name="master-node-max" value="1"/>
           <nvpair id="unique-1" name="globally-unique" value="true"/>
         </meta_attributes>
       </master>
     </resources>
     <constraints>
       <rsc_location id="rsc1_master" rsc="rsc1">
         <rule id="pref_rsc1_master-1" score="100" role="Master">
           <expression id="expression.id21950" attribute="#uname" operation="eq" value="node2"/>
         </rule>
         <rule id="pref_rsc1_master-2" score="-INFINITY" role="Master">
           <expression id="expression.id21969" attribute="#uname" operation="eq" value="node1"/>
         </rule>
       </rsc_location>
     </constraints>
   </configuration>
   <status>
     <node_state id="uuid1" ha="active" uname="node1" crmd="online" join="member" expected="member" in_ccm="true">
       <transient_attributes id="transient_attributes.id22002">
         <instance_attributes id="instance_attributes.id22005">
           <nvpair id="nvpair.id22011" name="probe_complete" value="true"/>
         </instance_attributes>
       </transient_attributes>
     </node_state>
     <node_state id="uuid2" ha="active" uname="node2" crmd="online" join="member" expected="member" in_ccm="true">
       <transient_attributes id="transient_attributes.id22041">
         <instance_attributes id="instance_attributes.id22043">
           <nvpair id="nvpair.id22049" name="probe_complete" value="true"/>
         </instance_attributes>
       </transient_attributes>
     </node_state>
   </status>
-</cib>
\ No newline at end of file
+</cib>