diff --git a/shell/regression/crm-interface b/shell/regression/crm-interface
index 7298dec3e4..58a85b146a 100644
--- a/shell/regression/crm-interface
+++ b/shell/regression/crm-interface
@@ -1,61 +1,61 @@
 crm_setup() {
 	$CRM_NO_REG options check-frequency on-verify
 	$CRM_NO_REG options check-mode relaxed
 }
 crm_mksample() {
 	cp empty.xml sample.xml
 	CIB_file=sample.xml $CRM_NO_REG<<EOF
 configure
 erase
 erase nodes
 node node1
-primitive p0 ocf:heartbeat:Dummy
-primitive p1 ocf:heartbeat:Dummy
+primitive p0 ocf:pacemaker:Dummy
+primitive p1 ocf:pacemaker:Dummy
 primitive p2 ocf:heartbeat:Delay \
 	params startdelay=2 mondelay=2 stopdelay=2
-primitive p3 ocf:heartbeat:Dummy
+primitive p3 ocf:pacemaker:Dummy
 primitive st stonith:null params hostlist=node1
 clone c1 p1
 ms m1 p2
 property default-action-timeout=60s
 commit
 end
 EOF
 }
 crm_show() {
 	CIB_file=sample.xml $CRM<<EOF
 configure
 _regtest on
 erase
 erase nodes
 `cat`
 show
 commit
 EOF
 }
 crm_showxml() {
 	CIB_file=sample.xml $CRM<<EOF
 configure
 _regtest on
 erase
 erase nodes
 `cat`
 show xml
 commit
 EOF
 }
 crm_session() {
 	CIB_file=sample.xml $CRM <<EOF
 `cat`
 EOF
 }
 crm_single() {
 	CIB_file=sample.xml $CRM $*
 }
 crm_showobj() {
 	CIB_file=sample.xml $CRM<<EOF
 configure
 _regtest on
 show xml $1
 EOF
 }
diff --git a/shell/regression/testcases/confbasic b/shell/regression/testcases/confbasic
index b8e4c80bd6..01a344d1be 100644
--- a/shell/regression/testcases/confbasic
+++ b/shell/regression/testcases/confbasic
@@ -1,62 +1,62 @@
 show Basic configure
 node node1
 delete node1
 node node1 \
 	attributes mem=16G
 node pingnode:ping
 primitive st stonith:ssh \
 	params hostlist='node1' \
 	meta target-role="Started" \
 	op start requires=nothing timeout=60s \
 	op monitor interval=60m timeout=60s
-primitive d1 ocf:heartbeat:Dummy \
+primitive d1 ocf:pacemaker:Dummy \
 	operations $id=d1-ops \
 	op monitor interval=60m \
 	op monitor interval=120m OCF_CHECK_LEVEL=10
 monitor d1 60s:30s
 primitive d2 ocf:heartbeat:Delay \
 	params mondelay=60 \
 	op start timeout=60s \
 	op stop timeout=60s
 monitor d2:Started 60s:30s
 group g1 d1 d2
-primitive d3 ocf:heartbeat:Dummy
+primitive d3 ocf:pacemaker:Dummy
 clone c d3 \
 	meta clone-max=1
-primitive d4 ocf:heartbeat:Dummy
+primitive d4 ocf:pacemaker:Dummy
 ms m d4
 delete m
 master m d4
-primitive d5 ocf:heartbeat:Dummy \
+primitive d5 ocf:pacemaker:Dummy \
 	operations $id-ref=d1-ops
-primitive d6 ocf:heartbeat:Dummy \
+primitive d6 ocf:pacemaker:Dummy \
 	operations $id-ref=d1
 location l1 g1 100: node1
 location l2 c \
 	rule $id=l2-rule1 100: #uname eq node1
 location l3 d5 \
 	rule inf: #uname eq node1 and pingd gt 0
 location l4 d5 \
 	rule -inf: not_defined pingd or pingd lte 0
 location l5 d5 \
 	rule -inf: not_defined pingd or pingd lte 0 \
 	rule inf: #uname eq node1 and pingd gt 0 \
 	rule inf: date lt "2009-05-26" and \
 		date in_range start="2009-05-26" end="2009-07-26" and \
 		date in_range start="2009-05-26" years="2009" and \
 		date date_spec years="2009" hours="09-17"
 location l6 d5 \
 	rule $id-ref=l2-rule1
 location l7 d5 \
 	rule $id-ref=l2
 collocation c1 inf: d5 d6
 collocation c2 inf: d5:Started d6:Started
 order o1 mandatory: d5 d6
 order o2 advisory: d5:start d6:promote
 property stonith-enabled=true
 property $id=cpset2 maintenance-mode=true
 rsc_defaults failure-timeout=10m
 op_defaults $id=opsdef2 record-pending=true
 _test
 verify
 .
diff --git a/shell/regression/testcases/confbasic-xml b/shell/regression/testcases/confbasic-xml
index 896b90ba0a..f89b9fa53d 100644
--- a/shell/regression/testcases/confbasic-xml
+++ b/shell/regression/testcases/confbasic-xml
@@ -1,62 +1,62 @@
 showxml Basic configure (xml dump)
 node node1
 delete node1
 node node1 \
 	attributes mem=16G
 node pingnode:ping
 primitive st stonith:ssh \
 	params hostlist='node1' \
 	meta target-role="Started" \
 	op start requires=nothing timeout=60s \
 	op monitor interval=60m timeout=60s
-primitive d1 ocf:heartbeat:Dummy \
+primitive d1 ocf:pacemaker:Dummy \
 	operations $id=d1-ops \
 	op monitor interval=60m \
 	op monitor interval=120m OCF_CHECK_LEVEL=10
 monitor d1 60s:30s
 primitive d2 ocf:heartbeat:Delay \
 	params mondelay=60 \
 	op start timeout=60s \
 	op stop timeout=60s
 monitor d2:Started 60s:30s
 group g1 d1 d2
-primitive d3 ocf:heartbeat:Dummy
+primitive d3 ocf:pacemaker:Dummy
 clone c d3 \
 	meta clone-max=1
-primitive d4 ocf:heartbeat:Dummy
+primitive d4 ocf:pacemaker:Dummy
 ms m d4
 delete m
 master m d4
-primitive d5 ocf:heartbeat:Dummy \
+primitive d5 ocf:pacemaker:Dummy \
 	operations $id-ref=d1-ops
-primitive d6 ocf:heartbeat:Dummy \
+primitive d6 ocf:pacemaker:Dummy \
 	operations $id-ref=d1
 location l1 g1 100: node1
 location l2 c \
 	rule $id=l2-rule1 100: #uname eq node1
 location l3 d5 \
 	rule inf: #uname eq node1 and pingd gt 0
 location l4 d5 \
 	rule -inf: not_defined pingd or pingd lte 0
 location l5 d5 \
 	rule -inf: not_defined pingd or pingd lte 0 \
 	rule inf: #uname eq node1 and pingd gt 0 \
 	rule inf: date lt "2009-05-26" and \
 		date in_range start="2009-05-26" end="2009-07-26" and \
 		date in_range start="2009-05-26" years="2009" and \
 		date date_spec years="2009" hours="09-17"
 location l6 d5 \
 	rule $id-ref=l2-rule1
 location l7 d5 \
 	rule $id-ref=l2
 collocation c1 inf: d5 d6
 collocation c2 inf: d5:Started d6:Started
 order o1 mandatory: d5 d6
 order o2 advisory: d5:start d6:promote
 property stonith-enabled=true
 property $id=cpset2 maintenance-mode=true
 rsc_defaults failure-timeout=10m
 op_defaults $id=opsdef2 record-pending=true
 _test
 verify
 .
diff --git a/shell/regression/testcases/confbasic-xml.exp b/shell/regression/testcases/confbasic-xml.exp
index f59021b383..764e97e8ae 100644
--- a/shell/regression/testcases/confbasic-xml.exp
+++ b/shell/regression/testcases/confbasic-xml.exp
@@ -1,133 +1,133 @@
 <?xml version="1.0" ?>
 <cib admin_epoch="0" crm_feature_set="3.0.1" dc-uuid="f36760d8-d84a-46b2-b452-4c8cac8b3396" epoch="0" have-quorum="1" num_updates="1" remote-tls-port="0" validate-with="pacemaker-1.2">
   <configuration>
     <crm_config>
       <cluster_property_set id="cib-bootstrap-options">
         <nvpair id="cib-bootstrap-options-stonith-enabled" name="stonith-enabled" value="true"/>
       </cluster_property_set>
       <cluster_property_set id="cpset2">
         <nvpair id="cpset2-maintenance-mode" name="maintenance-mode" value="true"/>
       </cluster_property_set>
     </crm_config>
     <rsc_defaults>
       <meta_attributes id="rsc-options">
         <nvpair id="rsc-options-failure-timeout" name="failure-timeout" value="10m"/>
       </meta_attributes>
     </rsc_defaults>
     <op_defaults>
       <meta_attributes id="opsdef2">
         <nvpair id="opsdef2-record-pending" name="record-pending" value="true"/>
       </meta_attributes>
     </op_defaults>
     <nodes>
       <node id="pingnode" type="ping" uname="pingnode"/>
       <node id="node1" type="normal" uname="node1">
         <instance_attributes id="node1-instance_attributes">
           <nvpair id="node1-instance_attributes-mem" name="mem" value="16G"/>
         </instance_attributes>
       </node>
     </nodes>
     <resources>
       <group id="g1">
-        <primitive class="ocf" id="d1" provider="heartbeat" type="Dummy">
+        <primitive class="ocf" id="d1" provider="pacemaker" type="Dummy">
           <operations id="d1-ops">
             <op id="d1-monitor-60m" interval="60m" name="monitor"/>
             <op id="d1-monitor-120m" interval="120m" name="monitor">
               <instance_attributes id="d1-monitor-120m-instance_attributes">
                 <nvpair id="d1-monitor-120m-instance_attributes-OCF_CHECK_LEVEL" name="OCF_CHECK_LEVEL" value="10"/>
               </instance_attributes>
             </op>
             <op id="d1-monitor-60s" interval="60s" name="monitor" timeout="30s"/>
           </operations>
         </primitive>
         <primitive class="ocf" id="d2" provider="heartbeat" type="Delay">
           <instance_attributes id="d2-instance_attributes">
             <nvpair id="d2-instance_attributes-mondelay" name="mondelay" value="60"/>
           </instance_attributes>
           <operations>
             <op id="d2-start-0" interval="0" name="start" timeout="60s"/>
             <op id="d2-stop-0" interval="0" name="stop" timeout="60s"/>
             <op id="d2-monitor-60s" interval="60s" name="monitor" role="Started" timeout="30s"/>
           </operations>
         </primitive>
       </group>
       <master id="m">
-        <primitive class="ocf" id="d4" provider="heartbeat" type="Dummy"/>
+        <primitive class="ocf" id="d4" provider="pacemaker" type="Dummy"/>
       </master>
       <primitive class="stonith" id="st" type="ssh">
         <instance_attributes id="st-instance_attributes">
           <nvpair id="st-instance_attributes-hostlist" name="hostlist" value="node1"/>
         </instance_attributes>
         <meta_attributes id="st-meta_attributes">
           <nvpair id="st-meta_attributes-target-role" name="target-role" value="Started"/>
         </meta_attributes>
         <operations>
           <op id="st-start-0" interval="0" name="start" requires="nothing" timeout="60s"/>
           <op id="st-monitor-60m" interval="60m" name="monitor" timeout="60s"/>
         </operations>
       </primitive>
       <clone id="c">
         <meta_attributes id="c-meta_attributes">
           <nvpair id="c-meta_attributes-clone-max" name="clone-max" value="1"/>
         </meta_attributes>
-        <primitive class="ocf" id="d3" provider="heartbeat" type="Dummy"/>
+        <primitive class="ocf" id="d3" provider="pacemaker" type="Dummy"/>
       </clone>
-      <primitive class="ocf" id="d5" provider="heartbeat" type="Dummy">
+      <primitive class="ocf" id="d5" provider="pacemaker" type="Dummy">
         <operations id-ref="d1-ops"/>
       </primitive>
-      <primitive class="ocf" id="d6" provider="heartbeat" type="Dummy">
+      <primitive class="ocf" id="d6" provider="pacemaker" type="Dummy">
         <operations id-ref="d1-ops"/>
       </primitive>
     </resources>
     <constraints>
       <rsc_location id="l5" rsc="d5">
         <rule boolean-op="or" id="l5-rule" score="-INFINITY">
           <expression attribute="pingd" id="l5-expression" operation="not_defined"/>
           <expression attribute="pingd" id="l5-expression-0" operation="lte" value="0"/>
         </rule>
         <rule id="l5-rule-0" score="INFINITY">
           <expression attribute="#uname" id="l5-expression-1" operation="eq" value="node1"/>
           <expression attribute="pingd" id="l5-expression-2" operation="gt" value="0"/>
         </rule>
         <rule id="l5-rule-1" score="INFINITY">
           <date_expression end="2009-05-26" id="l5-expression-3" operation="lt"/>
           <date_expression end="2009-07-26" id="l5-expression-4" operation="in_range" start="2009-05-26"/>
           <date_expression id="l5-expression-5" operation="in_range" start="2009-05-26">
             <duration id="l5-duration" years="2009"/>
           </date_expression>
           <date_expression id="l5-expression-6" operation="date_spec">
             <date_spec hours="09-17" id="l5-date_spec" years="2009"/>
           </date_expression>
         </rule>
       </rsc_location>
       <rsc_location id="l1" node="node1" rsc="g1" score="100"/>
       <rsc_location id="l2" rsc="c">
         <rule id="l2-rule1" score="100">
           <expression attribute="#uname" id="l2-expression" operation="eq" value="node1"/>
         </rule>
       </rsc_location>
       <rsc_location id="l3" rsc="d5">
         <rule id="l3-rule" score="INFINITY">
           <expression attribute="#uname" id="l3-expression" operation="eq" value="node1"/>
           <expression attribute="pingd" id="l3-expression-0" operation="gt" value="0"/>
         </rule>
       </rsc_location>
       <rsc_location id="l4" rsc="d5">
         <rule boolean-op="or" id="l4-rule" score="-INFINITY">
           <expression attribute="pingd" id="l4-expression" operation="not_defined"/>
           <expression attribute="pingd" id="l4-expression-0" operation="lte" value="0"/>
         </rule>
       </rsc_location>
       <rsc_location id="l7" rsc="d5">
         <rule id-ref="l2-rule1"/>
       </rsc_location>
       <rsc_location id="l6" rsc="d5">
         <rule id-ref="l2-rule1"/>
       </rsc_location>
       <rsc_colocation id="c1" rsc="d5" score="INFINITY" with-rsc="d6"/>
       <rsc_colocation id="c2" rsc="d5" rsc-role="Started" score="INFINITY" with-rsc="d6" with-rsc-role="Started"/>
       <rsc_order first="d5" id="o1" score="INFINITY" then="d6"/>
       <rsc_order first="d5" first-action="start" id="o2" score="0" then="d6" then-action="promote"/>
     </constraints>
   </configuration>
 </cib>
diff --git a/shell/regression/testcases/confbasic.exp b/shell/regression/testcases/confbasic.exp
index 92953e7f81..d1d31a98f7 100644
--- a/shell/regression/testcases/confbasic.exp
+++ b/shell/regression/testcases/confbasic.exp
@@ -1,97 +1,97 @@
 .TRY Basic configure
 .INP: configure
 .INP: _regtest on
 .INP: erase
 .INP: erase nodes
 .INP: node node1
 .INP: delete node1
 .INP: node node1 	attributes mem=16G
 .INP: node pingnode:ping
 .INP: primitive st stonith:ssh 	params hostlist='node1' 	meta target-role="Started" 	op start requires=nothing timeout=60s 	op monitor interval=60m timeout=60s
-.INP: primitive d1 ocf:heartbeat:Dummy 	operations $id=d1-ops 	op monitor interval=60m 	op monitor interval=120m OCF_CHECK_LEVEL=10
+.INP: primitive d1 ocf:pacemaker:Dummy 	operations $id=d1-ops 	op monitor interval=60m 	op monitor interval=120m OCF_CHECK_LEVEL=10
 .INP: monitor d1 60s:30s
 .INP: primitive d2 ocf:heartbeat:Delay 	params mondelay=60 	op start timeout=60s 	op stop timeout=60s
 .INP: monitor d2:Started 60s:30s
 .INP: group g1 d1 d2
-.INP: primitive d3 ocf:heartbeat:Dummy
+.INP: primitive d3 ocf:pacemaker:Dummy
 .INP: clone c d3 	meta clone-max=1
-.INP: primitive d4 ocf:heartbeat:Dummy
+.INP: primitive d4 ocf:pacemaker:Dummy
 .INP: ms m d4
 .INP: delete m
 .INP: master m d4
-.INP: primitive d5 ocf:heartbeat:Dummy 	operations $id-ref=d1-ops
-.INP: primitive d6 ocf:heartbeat:Dummy 	operations $id-ref=d1
+.INP: primitive d5 ocf:pacemaker:Dummy 	operations $id-ref=d1-ops
+.INP: primitive d6 ocf:pacemaker:Dummy 	operations $id-ref=d1
 .INP: location l1 g1 100: node1
 .INP: location l2 c 	rule $id=l2-rule1 100: #uname eq node1
 .INP: location l3 d5 	rule inf: #uname eq node1 and pingd gt 0
 .INP: location l4 d5 	rule -inf: not_defined pingd or pingd lte 0
 .INP: location l5 d5 	rule -inf: not_defined pingd or pingd lte 0 	rule inf: #uname eq node1 and pingd gt 0 	rule inf: date lt "2009-05-26" and 		date in_range start="2009-05-26" end="2009-07-26" and 		date in_range start="2009-05-26" years="2009" and 		date date_spec years="2009" hours="09-17"
 .INP: location l6 d5 	rule $id-ref=l2-rule1
 .INP: location l7 d5 	rule $id-ref=l2
 .INP: collocation c1 inf: d5 d6
 .INP: collocation c2 inf: d5:Started d6:Started
 .INP: order o1 mandatory: d5 d6
 .INP: order o2 advisory: d5:start d6:promote
 .INP: property stonith-enabled=true
 .INP: property $id=cpset2 maintenance-mode=true
 .INP: rsc_defaults failure-timeout=10m
 .INP: op_defaults $id=opsdef2 record-pending=true
 .INP: _test
 .INP: verify
 .INP: show
 node node1 \
 	attributes mem="16G"
 node pingnode:ping
-primitive d1 ocf:heartbeat:Dummy \
+primitive d1 ocf:pacemaker:Dummy \
 	operations $id="d1-ops" \
 	op monitor interval="60m" \
 	op monitor interval="120m" OCF_CHECK_LEVEL="10" \
 	op monitor interval="60s" timeout="30s"
 primitive d2 ocf:heartbeat:Delay \
 	params mondelay="60" \
 	op start interval="0" timeout="60s" \
 	op stop interval="0" timeout="60s" \
 	op monitor interval="60s" role="Started" timeout="30s"
-primitive d3 ocf:heartbeat:Dummy
-primitive d4 ocf:heartbeat:Dummy
-primitive d5 ocf:heartbeat:Dummy \
+primitive d3 ocf:pacemaker:Dummy
+primitive d4 ocf:pacemaker:Dummy
+primitive d5 ocf:pacemaker:Dummy \
 	operations  $id-ref="d1-ops"
-primitive d6 ocf:heartbeat:Dummy \
+primitive d6 ocf:pacemaker:Dummy \
 	operations  $id-ref="d1-ops"
 primitive st stonith:ssh \
 	params hostlist="node1" \
 	meta target-role="Started" \
 	op start interval="0" timeout="60s" requires="nothing" \
 	op monitor interval="60m" timeout="60s"
 group g1 d1 d2
 ms m d4
 clone c d3 \
 	meta clone-max="1"
 location l1 g1 100: node1
 location l2 c \
 	rule $id="l2-rule1" 100: #uname eq node1
 location l3 d5 \
 	rule $id="l3-rule" inf: #uname eq node1 and pingd gt 0
 location l4 d5 \
 	rule $id="l4-rule" -inf: not_defined pingd or pingd lte 0
 location l5 d5 \
 	rule $id="l5-rule" -inf: not_defined pingd or pingd lte 0 \
 	rule $id="l5-rule-0" inf: #uname eq node1 and pingd gt 0 \
 	rule $id="l5-rule-1" inf: date lt "2009-05-26" and date in_range start="2009-05-26" end="2009-07-26" and date in_range start="2009-05-26" years="2009" and date date_spec hours="09-17" years="2009"
 location l6 d5 \
 	rule $id-ref="l2-rule1"
 location l7 d5 \
 	rule $id-ref="l2-rule1"
 colocation c1 inf: d5 d6
 colocation c2 inf: d5:Started d6:Started
 order o1 inf: d5 d6
 order o2 0: d5:start d6:promote
 property $id="cib-bootstrap-options" \
 	stonith-enabled="true"
 property $id="cpset2" \
 	maintenance-mode="true"
 rsc_defaults $id="rsc-options" \
 	failure-timeout="10m"
 op_defaults $id="opsdef2" \
 	record-pending="true"
 .INP: commit
diff --git a/shell/regression/testcases/delete b/shell/regression/testcases/delete
index f258a52007..6e9e946e19 100644
--- a/shell/regression/testcases/delete
+++ b/shell/regression/testcases/delete
@@ -1,63 +1,63 @@
 session Delete/Rename test
 configure
 # erase to start from scratch
 erase
 erase nodes
 # create one stonith so that verify does not complain
 primitive st stonith:ssh \
 	params hostlist='node1' \
 	meta target-role="Started" \
 	op start requires=nothing timeout=60s \
 	op monitor interval=60m timeout=60s
-primitive d1 ocf:heartbeat:Dummy
-primitive d2 ocf:heartbeat:Dummy
+primitive d1 ocf:pacemaker:Dummy
+primitive d2 ocf:pacemaker:Dummy
 location d1-pref d1 100: node1
 show
 _test
 rename d1 p1
 show
 # delete primitive
 delete d2
 _test
 show
 # delete primitive with constraint
 delete p1
 _test
 show
-primitive d1 ocf:heartbeat:Dummy
+primitive d1 ocf:pacemaker:Dummy
 location d1-pref d1 100: node1
 _test
 # delete primitive belonging to a group
-primitive d2 ocf:heartbeat:Dummy
+primitive d2 ocf:pacemaker:Dummy
 _test
 group g1 d2 d1
 delete d2
 show
 _test
 delete g1
 show
 verify
 # delete a group which is in a clone
-primitive d2 ocf:heartbeat:Dummy
+primitive d2 ocf:pacemaker:Dummy
 group g1 d2 d1
 clone c1 g1
 delete g1
 show
 _test
 group g1 d2 d1
 clone c1 g1
 _test
 # delete group from a clone (again)
 delete g1
 show
 _test
 group g1 d2 d1
 clone c1 g1
 # delete primitive and its group and their clone
 delete d2 d1 c1 g1
 show
 _test
 # verify
 verify
 commit
 .
diff --git a/shell/regression/testcases/delete.exp b/shell/regression/testcases/delete.exp
index 7b10766de1..644f1e8c83 100644
--- a/shell/regression/testcases/delete.exp
+++ b/shell/regression/testcases/delete.exp
@@ -1,139 +1,139 @@
 .TRY Delete/Rename test
 .INP: configure
 .INP: # erase to start from scratch
 .INP: erase
 .INP: erase nodes
 .INP: # create one stonith so that verify does not complain
 .INP: primitive st stonith:ssh 	params hostlist='node1' 	meta target-role="Started" 	op start requires=nothing timeout=60s 	op monitor interval=60m timeout=60s
-.INP: primitive d1 ocf:heartbeat:Dummy
-.INP: primitive d2 ocf:heartbeat:Dummy
+.INP: primitive d1 ocf:pacemaker:Dummy
+.INP: primitive d2 ocf:pacemaker:Dummy
 .INP: location d1-pref d1 100: node1
 .INP: show
-primitive d1 ocf:heartbeat:Dummy
-primitive d2 ocf:heartbeat:Dummy
+primitive d1 ocf:pacemaker:Dummy
+primitive d2 ocf:pacemaker:Dummy
 primitive st stonith:ssh \
 	params hostlist="node1" \
 	meta target-role="Started" \
 	op start interval="0" timeout="60s" requires="nothing" \
 	op monitor interval="60m" timeout="60s"
 location d1-pref d1 100: node1
 .INP: _test
 .INP: rename d1 p1
 INFO: 12: resource references in location:d1-pref updated
 .INP: show
-primitive d2 ocf:heartbeat:Dummy
-primitive p1 ocf:heartbeat:Dummy
+primitive d2 ocf:pacemaker:Dummy
+primitive p1 ocf:pacemaker:Dummy
 primitive st stonith:ssh \
 	params hostlist="node1" \
 	meta target-role="Started" \
 	op start interval="0" timeout="60s" requires="nothing" \
 	op monitor interval="60m" timeout="60s"
 location d1-pref p1 100: node1
 .INP: # delete primitive
 .INP: delete d2
 .INP: _test
 .INP: show
-primitive p1 ocf:heartbeat:Dummy
+primitive p1 ocf:pacemaker:Dummy
 primitive st stonith:ssh \
 	params hostlist="node1" \
 	meta target-role="Started" \
 	op start interval="0" timeout="60s" requires="nothing" \
 	op monitor interval="60m" timeout="60s"
 location d1-pref p1 100: node1
 .INP: # delete primitive with constraint
 .INP: delete p1
 INFO: 19: hanging location:d1-pref deleted
 .INP: _test
 .INP: show
 primitive st stonith:ssh \
 	params hostlist="node1" \
 	meta target-role="Started" \
 	op start interval="0" timeout="60s" requires="nothing" \
 	op monitor interval="60m" timeout="60s"
-.INP: primitive d1 ocf:heartbeat:Dummy
+.INP: primitive d1 ocf:pacemaker:Dummy
 .INP: location d1-pref d1 100: node1
 .INP: _test
 .INP: # delete primitive belonging to a group
-.INP: primitive d2 ocf:heartbeat:Dummy
+.INP: primitive d2 ocf:pacemaker:Dummy
 .INP: _test
 .INP: group g1 d2 d1
 INFO: 28: resource references in location:d1-pref updated
 .INP: delete d2
 .INP: show
-primitive d1 ocf:heartbeat:Dummy
+primitive d1 ocf:pacemaker:Dummy
 primitive st stonith:ssh \
 	params hostlist="node1" \
 	meta target-role="Started" \
 	op start interval="0" timeout="60s" requires="nothing" \
 	op monitor interval="60m" timeout="60s"
 group g1 d1
 location d1-pref g1 100: node1
 .INP: _test
 .INP: delete g1
 INFO: 32: resource references in location:d1-pref updated
 .INP: show
-primitive d1 ocf:heartbeat:Dummy
+primitive d1 ocf:pacemaker:Dummy
 primitive st stonith:ssh \
 	params hostlist="node1" \
 	meta target-role="Started" \
 	op start interval="0" timeout="60s" requires="nothing" \
 	op monitor interval="60m" timeout="60s"
 location d1-pref d1 100: node1
 .INP: verify
 .INP: # delete a group which is in a clone
-.INP: primitive d2 ocf:heartbeat:Dummy
+.INP: primitive d2 ocf:pacemaker:Dummy
 .INP: group g1 d2 d1
 INFO: 37: resource references in location:d1-pref updated
 .INP: clone c1 g1
 INFO: 38: resource references in location:d1-pref updated
 .INP: delete g1
 INFO: 39: resource references in location:d1-pref updated
 INFO: 39: resource references in location:d1-pref updated
 .INP: show
-primitive d1 ocf:heartbeat:Dummy
-primitive d2 ocf:heartbeat:Dummy
+primitive d1 ocf:pacemaker:Dummy
+primitive d2 ocf:pacemaker:Dummy
 primitive st stonith:ssh \
 	params hostlist="node1" \
 	meta target-role="Started" \
 	op start interval="0" timeout="60s" requires="nothing" \
 	op monitor interval="60m" timeout="60s"
 location d1-pref d2 100: node1
 .INP: _test
 .INP: group g1 d2 d1
 INFO: 42: resource references in location:d1-pref updated
 .INP: clone c1 g1
 INFO: 43: resource references in location:d1-pref updated
 .INP: _test
 .INP: # delete group from a clone (again)
 .INP: delete g1
 INFO: 46: resource references in location:d1-pref updated
 INFO: 46: resource references in location:d1-pref updated
 .INP: show
-primitive d1 ocf:heartbeat:Dummy
-primitive d2 ocf:heartbeat:Dummy
+primitive d1 ocf:pacemaker:Dummy
+primitive d2 ocf:pacemaker:Dummy
 primitive st stonith:ssh \
 	params hostlist="node1" \
 	meta target-role="Started" \
 	op start interval="0" timeout="60s" requires="nothing" \
 	op monitor interval="60m" timeout="60s"
 location d1-pref d2 100: node1
 .INP: _test
 .INP: group g1 d2 d1
 INFO: 49: resource references in location:d1-pref updated
 .INP: clone c1 g1
 INFO: 50: resource references in location:d1-pref updated
 .INP: # delete primitive and its group and their clone
 .INP: delete d2 d1 c1 g1
 INFO: 52: resource references in location:d1-pref updated
 INFO: 52: resource references in location:d1-pref updated
 INFO: 52: hanging location:d1-pref deleted
 .INP: show
 primitive st stonith:ssh \
 	params hostlist="node1" \
 	meta target-role="Started" \
 	op start interval="0" timeout="60s" requires="nothing" \
 	op monitor interval="60m" timeout="60s"
 .INP: _test
 .INP: # verify
 .INP: verify
 .INP: commit
diff --git a/shell/regression/testcases/file.exp b/shell/regression/testcases/file.exp
index d5b0b12465..aa7bf8f846 100644
--- a/shell/regression/testcases/file.exp
+++ b/shell/regression/testcases/file.exp
@@ -1,35 +1,35 @@
 .TRY configure save sample.txt
 .EXT cat sample.txt
 node node1
-primitive p0 ocf:heartbeat:Dummy
-primitive p1 ocf:heartbeat:Dummy
+primitive p0 ocf:pacemaker:Dummy
+primitive p1 ocf:pacemaker:Dummy
 primitive p2 ocf:heartbeat:Delay \
 	params startdelay="2" mondelay="2" stopdelay="2"
-primitive p3 ocf:heartbeat:Dummy
+primitive p3 ocf:pacemaker:Dummy
 primitive st stonith:null \
 	params hostlist="node1"
 ms m1 p2
 clone c1 p1
 property $id="cib-bootstrap-options" \
 	default-action-timeout="60s"
 .TRY configure erase nodes
 .TRY configure load replace sample.txt
 .TRY Load update
 .INP: configure
 .INP: erase
 .INP: erase nodes
 .INP: load update sample.txt
 .TRY configure show
 node node1
-primitive p0 ocf:heartbeat:Dummy
-primitive p1 ocf:heartbeat:Dummy
+primitive p0 ocf:pacemaker:Dummy
+primitive p1 ocf:pacemaker:Dummy
 primitive p2 ocf:heartbeat:Delay \
 	params startdelay="2" mondelay="2" stopdelay="2"
-primitive p3 ocf:heartbeat:Dummy
+primitive p3 ocf:pacemaker:Dummy
 primitive st stonith:null \
 	params hostlist="node1"
 ms m1 p2
 clone c1 p1
 property $id="cib-bootstrap-options" \
 	default-action-timeout="60s"
 .EXT rm sample.txt
diff --git a/shell/regression/testcases/resource.exp b/shell/regression/testcases/resource.exp
index 7268feb7b9..1a84925fc9 100644
--- a/shell/regression/testcases/resource.exp
+++ b/shell/regression/testcases/resource.exp
@@ -1,386 +1,386 @@
 .TRY resource status p0
 .EXT crm_resource -W -r 'p0'
 resource p0 is NOT running
 .SETENV showobj=p3
 .TRY resource start p3
 .INP: configure
 .INP: _regtest on
 .INP: show xml p3
 <?xml version="1.0" ?>
 <cib admin_epoch="0" crm_feature_set="3.0.1" dc-uuid="f36760d8-d84a-46b2-b452-4c8cac8b3396" epoch="0" have-quorum="1" num_updates="1" remote-tls-port="0" validate-with="pacemaker-1.2">
   <configuration>
     <crm_config/>
     <rsc_defaults/>
     <op_defaults/>
     <nodes/>
     <resources>
-      <primitive class="ocf" id="p3" provider="heartbeat" type="Dummy">
+      <primitive class="ocf" id="p3" provider="pacemaker" type="Dummy">
         <meta_attributes id="p3-meta_attributes">
           <nvpair id="p3-meta_attributes-target-role" name="target-role" value="Started"/>
         </meta_attributes>
       </primitive>
     </resources>
     <constraints/>
   </configuration>
 </cib>
 
 .TRY resource stop p3
 .INP: configure
 .INP: _regtest on
 .INP: show xml p3
 <?xml version="1.0" ?>
 <cib admin_epoch="0" crm_feature_set="3.0.1" dc-uuid="f36760d8-d84a-46b2-b452-4c8cac8b3396" epoch="0" have-quorum="1" num_updates="1" remote-tls-port="0" validate-with="pacemaker-1.2">
   <configuration>
     <crm_config/>
     <rsc_defaults/>
     <op_defaults/>
     <nodes/>
     <resources>
-      <primitive class="ocf" id="p3" provider="heartbeat" type="Dummy">
+      <primitive class="ocf" id="p3" provider="pacemaker" type="Dummy">
         <meta_attributes id="p3-meta_attributes">
           <nvpair id="p3-meta_attributes-target-role" name="target-role" value="Stopped"/>
         </meta_attributes>
       </primitive>
     </resources>
     <constraints/>
   </configuration>
 </cib>
 
 .SETENV showobj=c1
 .TRY resource manage c1
 .INP: configure
 .INP: _regtest on
 .INP: show xml c1
 <?xml version="1.0" ?>
 <cib admin_epoch="0" crm_feature_set="3.0.1" dc-uuid="f36760d8-d84a-46b2-b452-4c8cac8b3396" epoch="0" have-quorum="1" num_updates="1" remote-tls-port="0" validate-with="pacemaker-1.2">
   <configuration>
     <crm_config/>
     <rsc_defaults/>
     <op_defaults/>
     <nodes/>
     <resources>
       <clone id="c1">
         <meta_attributes id="c1-meta_attributes">
           <nvpair id="c1-meta_attributes-is-managed" name="is-managed" value="true"/>
         </meta_attributes>
-        <primitive class="ocf" id="p1" provider="heartbeat" type="Dummy"/>
+        <primitive class="ocf" id="p1" provider="pacemaker" type="Dummy"/>
       </clone>
     </resources>
     <constraints/>
   </configuration>
 </cib>
 
 .TRY resource unmanage c1
 .INP: configure
 .INP: _regtest on
 .INP: show xml c1
 <?xml version="1.0" ?>
 <cib admin_epoch="0" crm_feature_set="3.0.1" dc-uuid="f36760d8-d84a-46b2-b452-4c8cac8b3396" epoch="0" have-quorum="1" num_updates="1" remote-tls-port="0" validate-with="pacemaker-1.2">
   <configuration>
     <crm_config/>
     <rsc_defaults/>
     <op_defaults/>
     <nodes/>
     <resources>
       <clone id="c1">
         <meta_attributes id="c1-meta_attributes">
           <nvpair id="c1-meta_attributes-is-managed" name="is-managed" value="false"/>
         </meta_attributes>
-        <primitive class="ocf" id="p1" provider="heartbeat" type="Dummy"/>
+        <primitive class="ocf" id="p1" provider="pacemaker" type="Dummy"/>
       </clone>
     </resources>
     <constraints/>
   </configuration>
 </cib>
 
 .SETENV showobj=cli-prefer-p3
 .TRY resource migrate p3
 .EXT crm_resource -M -r 'p3' 
 Resource p3 not moved: not-active and no preferred location specified.
 Error performing operation: cib object missing
 .INP: configure
 .INP: _regtest on
 .INP: show xml cli-prefer-p3
 <?xml version="1.0" ?>
 <cib admin_epoch="0" crm_feature_set="3.0.1" dc-uuid="f36760d8-d84a-46b2-b452-4c8cac8b3396" epoch="0" have-quorum="1" num_updates="1" remote-tls-port="0" validate-with="pacemaker-1.2">
   <configuration>
     <crm_config/>
     <rsc_defaults/>
     <op_defaults/>
     <nodes/>
     <resources/>
     <constraints/>
   </configuration>
 </cib>
 
 .TRY resource migrate p3 node1
 .EXT crm_resource -M -r 'p3' --node='node1'
 .INP: configure
 .INP: _regtest on
 .INP: show xml cli-prefer-p3
 <?xml version="1.0" ?>
 <cib admin_epoch="0" crm_feature_set="3.0.1" dc-uuid="f36760d8-d84a-46b2-b452-4c8cac8b3396" epoch="0" have-quorum="1" num_updates="1" remote-tls-port="0" validate-with="pacemaker-1.2">
   <configuration>
     <crm_config/>
     <rsc_defaults/>
     <op_defaults/>
     <nodes/>
     <resources/>
     <constraints>
       <rsc_location id="cli-prefer-p3" rsc="p3">
         <rule id="cli-prefer-rule-p3" score="INFINITY">
           <expression attribute="#uname" id="cli-prefer-expr-p3" operation="eq" value="node1"/>
         </rule>
       </rsc_location>
     </constraints>
   </configuration>
 </cib>
 
 .TRY resource unmigrate p3
 .EXT crm_resource -U -r 'p3'
 .INP: configure
 .INP: _regtest on
 .INP: show xml cli-prefer-p3
 <?xml version="1.0" ?>
 <cib admin_epoch="0" crm_feature_set="3.0.1" dc-uuid="f36760d8-d84a-46b2-b452-4c8cac8b3396" epoch="0" have-quorum="1" num_updates="1" remote-tls-port="0" validate-with="pacemaker-1.2">
   <configuration>
     <crm_config/>
     <rsc_defaults/>
     <op_defaults/>
     <nodes/>
     <resources/>
     <constraints/>
   </configuration>
 </cib>
 
 .SETENV showobj=p0
 .TRY resource param p0 set a0 "1 2 3"
 .EXT crm_resource -r 'p0' -p 'a0' -v '1 2 3'
 .INP: configure
 .INP: _regtest on
 .INP: show xml p0
 <?xml version="1.0" ?>
 <cib admin_epoch="0" crm_feature_set="3.0.1" dc-uuid="f36760d8-d84a-46b2-b452-4c8cac8b3396" epoch="0" have-quorum="1" num_updates="1" remote-tls-port="0" validate-with="pacemaker-1.2">
   <configuration>
     <crm_config/>
     <rsc_defaults/>
     <op_defaults/>
     <nodes/>
     <resources>
-      <primitive class="ocf" id="p0" provider="heartbeat" type="Dummy">
+      <primitive class="ocf" id="p0" provider="pacemaker" type="Dummy">
         <instance_attributes id="p0-instance_attributes">
           <nvpair id="p0-instance_attributes-a0" name="a0" value="1 2 3"/>
         </instance_attributes>
       </primitive>
     </resources>
     <constraints/>
   </configuration>
 </cib>
 
 .TRY resource param p0 show a0
 .EXT crm_resource -r 'p0' -g 'a0'
 1 2 3
 .INP: configure
 .INP: _regtest on
 .INP: show xml p0
 <?xml version="1.0" ?>
 <cib admin_epoch="0" crm_feature_set="3.0.1" dc-uuid="f36760d8-d84a-46b2-b452-4c8cac8b3396" epoch="0" have-quorum="1" num_updates="1" remote-tls-port="0" validate-with="pacemaker-1.2">
   <configuration>
     <crm_config/>
     <rsc_defaults/>
     <op_defaults/>
     <nodes/>
     <resources>
-      <primitive class="ocf" id="p0" provider="heartbeat" type="Dummy">
+      <primitive class="ocf" id="p0" provider="pacemaker" type="Dummy">
         <instance_attributes id="p0-instance_attributes">
           <nvpair id="p0-instance_attributes-a0" name="a0" value="1 2 3"/>
         </instance_attributes>
       </primitive>
     </resources>
     <constraints/>
   </configuration>
 </cib>
 
 .TRY resource param p0 delete a0
 .EXT crm_resource -r 'p0' -d 'a0'
 Deleted p0 option: id=p0-instance_attributes-a0 name=a0
 .INP: configure
 .INP: _regtest on
 .INP: show xml p0
 <?xml version="1.0" ?>
 <cib admin_epoch="0" crm_feature_set="3.0.1" dc-uuid="f36760d8-d84a-46b2-b452-4c8cac8b3396" epoch="0" have-quorum="1" num_updates="1" remote-tls-port="0" validate-with="pacemaker-1.2">
   <configuration>
     <crm_config/>
     <rsc_defaults/>
     <op_defaults/>
     <nodes/>
     <resources>
-      <primitive class="ocf" id="p0" provider="heartbeat" type="Dummy"/>
+      <primitive class="ocf" id="p0" provider="pacemaker" type="Dummy"/>
     </resources>
     <constraints/>
   </configuration>
 </cib>
 
 .TRY resource meta p0 set m0 123
 .EXT crm_resource --meta -r 'p0' -p 'm0' -v '123'
 .INP: configure
 .INP: _regtest on
 .INP: show xml p0
 <?xml version="1.0" ?>
 <cib admin_epoch="0" crm_feature_set="3.0.1" dc-uuid="f36760d8-d84a-46b2-b452-4c8cac8b3396" epoch="0" have-quorum="1" num_updates="1" remote-tls-port="0" validate-with="pacemaker-1.2">
   <configuration>
     <crm_config/>
     <rsc_defaults/>
     <op_defaults/>
     <nodes/>
     <resources>
-      <primitive class="ocf" id="p0" provider="heartbeat" type="Dummy">
+      <primitive class="ocf" id="p0" provider="pacemaker" type="Dummy">
         <meta_attributes id="p0-meta_attributes">
           <nvpair id="p0-meta_attributes-m0" name="m0" value="123"/>
         </meta_attributes>
       </primitive>
     </resources>
     <constraints/>
   </configuration>
 </cib>
 
 .TRY resource meta p0 show m0
 .EXT crm_resource --meta -r 'p0' -g 'm0'
 123
 .INP: configure
 .INP: _regtest on
 .INP: show xml p0
 <?xml version="1.0" ?>
 <cib admin_epoch="0" crm_feature_set="3.0.1" dc-uuid="f36760d8-d84a-46b2-b452-4c8cac8b3396" epoch="0" have-quorum="1" num_updates="1" remote-tls-port="0" validate-with="pacemaker-1.2">
   <configuration>
     <crm_config/>
     <rsc_defaults/>
     <op_defaults/>
     <nodes/>
     <resources>
-      <primitive class="ocf" id="p0" provider="heartbeat" type="Dummy">
+      <primitive class="ocf" id="p0" provider="pacemaker" type="Dummy">
         <meta_attributes id="p0-meta_attributes">
           <nvpair id="p0-meta_attributes-m0" name="m0" value="123"/>
         </meta_attributes>
       </primitive>
     </resources>
     <constraints/>
   </configuration>
 </cib>
 
 .TRY resource meta p0 delete m0
 .EXT crm_resource --meta -r 'p0' -d 'm0'
 Deleted p0 option: id=p0-meta_attributes-m0 name=m0
 .INP: configure
 .INP: _regtest on
 .INP: show xml p0
 <?xml version="1.0" ?>
 <cib admin_epoch="0" crm_feature_set="3.0.1" dc-uuid="f36760d8-d84a-46b2-b452-4c8cac8b3396" epoch="0" have-quorum="1" num_updates="1" remote-tls-port="0" validate-with="pacemaker-1.2">
   <configuration>
     <crm_config/>
     <rsc_defaults/>
     <op_defaults/>
     <nodes/>
     <resources>
-      <primitive class="ocf" id="p0" provider="heartbeat" type="Dummy"/>
+      <primitive class="ocf" id="p0" provider="pacemaker" type="Dummy"/>
     </resources>
     <constraints/>
   </configuration>
 </cib>
 
 .TRY resource failcount p0 set node1 5
 .EXT crm_failcount -r 'p0' -N 'node1' -v '5'
 .INP: configure
 .INP: _regtest on
 .INP: show xml p0
 <?xml version="1.0" ?>
 <cib admin_epoch="0" crm_feature_set="3.0.1" dc-uuid="f36760d8-d84a-46b2-b452-4c8cac8b3396" epoch="0" have-quorum="1" num_updates="1" remote-tls-port="0" validate-with="pacemaker-1.2">
   <configuration>
     <crm_config/>
     <rsc_defaults/>
     <op_defaults/>
     <nodes/>
     <resources>
-      <primitive class="ocf" id="p0" provider="heartbeat" type="Dummy"/>
+      <primitive class="ocf" id="p0" provider="pacemaker" type="Dummy"/>
     </resources>
     <constraints/>
   </configuration>
 </cib>
 
 .TRY resource failcount p0 show node1
 .EXT crm_failcount -r 'p0' -N 'node1' -G
 scope=status  name=fail-count-p0 value=0
 .INP: configure
 .INP: _regtest on
 .INP: show xml p0
 <?xml version="1.0" ?>
 <cib admin_epoch="0" crm_feature_set="3.0.1" dc-uuid="f36760d8-d84a-46b2-b452-4c8cac8b3396" epoch="0" have-quorum="1" num_updates="1" remote-tls-port="0" validate-with="pacemaker-1.2">
   <configuration>
     <crm_config/>
     <rsc_defaults/>
     <op_defaults/>
     <nodes/>
     <resources>
-      <primitive class="ocf" id="p0" provider="heartbeat" type="Dummy"/>
+      <primitive class="ocf" id="p0" provider="pacemaker" type="Dummy"/>
     </resources>
     <constraints/>
   </configuration>
 </cib>
 
 .TRY resource failcount p0 delete node1
 .EXT crm_failcount -r 'p0' -N 'node1' -D
 .INP: configure
 .INP: _regtest on
 .INP: show xml p0
 <?xml version="1.0" ?>
 <cib admin_epoch="0" crm_feature_set="3.0.1" dc-uuid="f36760d8-d84a-46b2-b452-4c8cac8b3396" epoch="0" have-quorum="1" num_updates="1" remote-tls-port="0" validate-with="pacemaker-1.2">
   <configuration>
     <crm_config/>
     <rsc_defaults/>
     <op_defaults/>
     <nodes/>
     <resources>
-      <primitive class="ocf" id="p0" provider="heartbeat" type="Dummy"/>
+      <primitive class="ocf" id="p0" provider="pacemaker" type="Dummy"/>
     </resources>
     <constraints/>
   </configuration>
 </cib>
 
 .TRY resource cleanup p0 node1
 .EXT crm_resource -C -r 'p0' -H 'node1'
 .INP: configure
 .INP: _regtest on
 .INP: show xml p0
 <?xml version="1.0" ?>
 <cib admin_epoch="0" crm_feature_set="3.0.1" dc-uuid="f36760d8-d84a-46b2-b452-4c8cac8b3396" epoch="0" have-quorum="1" num_updates="1" remote-tls-port="0" validate-with="pacemaker-1.2">
   <configuration>
     <crm_config/>
     <rsc_defaults/>
     <op_defaults/>
     <nodes/>
     <resources>
-      <primitive class="ocf" id="p0" provider="heartbeat" type="Dummy"/>
+      <primitive class="ocf" id="p0" provider="pacemaker" type="Dummy"/>
     </resources>
     <constraints/>
   </configuration>
 </cib>
 
 .TRY resource cleanup p0
 .EXT crm_resource -C -r 'p0' -H 'node1'
 .INP: configure
 .INP: _regtest on
 .INP: show xml p0
 <?xml version="1.0" ?>
 <cib admin_epoch="0" crm_feature_set="3.0.1" dc-uuid="f36760d8-d84a-46b2-b452-4c8cac8b3396" epoch="0" have-quorum="1" num_updates="1" remote-tls-port="0" validate-with="pacemaker-1.2">
   <configuration>
     <crm_config/>
     <rsc_defaults/>
     <op_defaults/>
     <nodes/>
     <resources>
-      <primitive class="ocf" id="p0" provider="heartbeat" type="Dummy"/>
+      <primitive class="ocf" id="p0" provider="pacemaker" type="Dummy"/>
     </resources>
     <constraints/>
   </configuration>
 </cib>