diff --git a/cts/scheduler/xml/systemhealthm1.xml b/cts/scheduler/xml/systemhealthm1.xml
index 6c4a4d60fe..a5102d007c 100644
--- a/cts/scheduler/xml/systemhealthm1.xml
+++ b/cts/scheduler/xml/systemhealthm1.xml
@@ -1,51 +1,51 @@
 <cib validate-with="pacemaker-3.0" crm_feature_set="3.0.1" have-quorum="1" admin_epoch="0" epoch="13924" num_updates="0" cib-last-written="Fri Jul 13 13:51:16 2012" dc-uuid="c97a3ee5-02d8-4fad-a9fb-a79ae2b35549">
   <configuration>
     <crm_config>
       <cluster_property_set id="cib-bootstrap-options">
         <nvpair id="cib-bootstrap-options-dc-version" name="dc-version" value="1.0.3-b133b3f19797c00f9189f4b66b513963f9d25db9"/>
-        <nvpair id="cib-bootstrap-options-pe-node-health-strategy" name="pe-node-health-strategy" value="migrate-on-red"/>
+        <nvpair id="cib-bootstrap-options-node-health-strategy" name="node-health-strategy" value="migrate-on-red"/>
       </cluster_property_set>
     </crm_config>
     <nodes>
       <node id="c97a3ee5-02d8-4fad-a9fb-a79ae2b35549" uname="hs21c" type="member"/>
       <node id="737318c6-0f92-4592-9754-45967d45aff7" uname="hs21d" type="member"/>
     </nodes>
     <resources>
       <primitive id="stonith-1" class="stonith" type="dummy"/>
       <primitive class="ocf" id="apache_1" provider="heartbeat" type="apache">
         <meta_attributes id="apache_1-meta_attributes">
           <nvpair id="nvpair-e97ad6f0-db94-47af-8f2c-056a80a21a4d" name="target-role" value="Started"/>
         </meta_attributes>
         <operations id="apache_1-operations">
           <op id="apache_1-op-monitor-10" interval="10" name="monitor" start-delay="1m" timeout="20"/>
         </operations>
         <instance_attributes id="apache_1-instance_attributes">
           <nvpair id="nvpair-a915b958-b215-4fa1-b465-23ab60aa06ca" name="configfile"/>
         </instance_attributes>
       </primitive>
       <primitive class="ocf" id="nfs_1" provider="heartbeat" type="Filesystem">
         <meta_attributes id="nfs_1-meta_attributes">
           <nvpair id="nvpair-c6f3f9e7-ec22-4c24-b3f6-3828228529dd" name="target-role" value="Started"/>
         </meta_attributes>
         <operations id="nfs_1-operations">
           <op id="nfs_1-op-monitor-20" interval="20" name="monitor" start-delay="10" timeout="40"/>
         </operations>
         <instance_attributes id="nfs_1-instance_attributes">
           <nvpair id="nvpair-601b9377-3c22-4094-b8c1-8e7c12b3b00a" name="device" value="hs21d:/nfs"/>
           <nvpair id="nvpair-1ea657a3-eaaf-48f3-912e-ce3a3431c220" name="directory" value="/mnt/tmp"/>
           <nvpair id="nvpair-08b520ca-8679-4157-a0e3-d70985948290" name="fstype" value="nfs"/>
           <nvpair id="nvpair-b5699b8c-bc64-4efa-91d1-5d0618ec7382" name="options" value="ro"/>
         </instance_attributes>
       </primitive>
     </resources>
     <constraints>
       <rsc_location id="preferred_location_apache_1" node="hs21c" rsc="apache_1" score="100"/>
       <rsc_location id="preferred_location_nfs_1" node="hs21c" rsc="nfs_1" score="100"/>
     </constraints>
     <op_defaults>
       <meta_attributes id="op_defaults-options"/>
     </op_defaults>
     <rsc_defaults/>
   </configuration>
   <status/>
 </cib>
diff --git a/cts/scheduler/xml/systemhealthn1.xml b/cts/scheduler/xml/systemhealthn1.xml
index fef0ebb9ea..9b30696c6c 100644
--- a/cts/scheduler/xml/systemhealthn1.xml
+++ b/cts/scheduler/xml/systemhealthn1.xml
@@ -1,51 +1,51 @@
 <cib validate-with="pacemaker-3.0" crm_feature_set="3.0.1" have-quorum="1" admin_epoch="0" epoch="13924" num_updates="0" cib-last-written="Fri Jul 13 13:51:16 2012" dc-uuid="c97a3ee5-02d8-4fad-a9fb-a79ae2b35549">
   <configuration>
     <crm_config>
       <cluster_property_set id="cib-bootstrap-options">
         <nvpair id="cib-bootstrap-options-dc-version" name="dc-version" value="1.0.3-b133b3f19797c00f9189f4b66b513963f9d25db9"/>
-        <nvpair id="cib-bootstrap-options-pe-node-health-strategy" name="pe-node-health-strategy" value="none"/>
+        <nvpair id="cib-bootstrap-options-node-health-strategy" name="node-health-strategy" value="none"/>
       </cluster_property_set>
     </crm_config>
     <nodes>
       <node id="c97a3ee5-02d8-4fad-a9fb-a79ae2b35549" uname="hs21c" type="member"/>
       <node id="737318c6-0f92-4592-9754-45967d45aff7" uname="hs21d" type="member"/>
     </nodes>
     <resources>
       <primitive id="stonith-1" class="stonith" type="dummy"/>
       <primitive class="ocf" id="apache_1" provider="heartbeat" type="apache">
         <meta_attributes id="apache_1-meta_attributes">
           <nvpair id="nvpair-e97ad6f0-db94-47af-8f2c-056a80a21a4d" name="target-role" value="Started"/>
         </meta_attributes>
         <operations id="apache_1-operations">
           <op id="apache_1-op-monitor-10" interval="10" name="monitor" start-delay="1m" timeout="20"/>
         </operations>
         <instance_attributes id="apache_1-instance_attributes">
           <nvpair id="nvpair-a915b958-b215-4fa1-b465-23ab60aa06ca" name="configfile"/>
         </instance_attributes>
       </primitive>
       <primitive class="ocf" id="nfs_1" provider="heartbeat" type="Filesystem">
         <meta_attributes id="nfs_1-meta_attributes">
           <nvpair id="nvpair-c6f3f9e7-ec22-4c24-b3f6-3828228529dd" name="target-role" value="Started"/>
         </meta_attributes>
         <operations id="nfs_1-operations">
           <op id="nfs_1-op-monitor-20" interval="20" name="monitor" start-delay="10" timeout="40"/>
         </operations>
         <instance_attributes id="nfs_1-instance_attributes">
           <nvpair id="nvpair-601b9377-3c22-4094-b8c1-8e7c12b3b00a" name="device" value="hs21d:/nfs"/>
           <nvpair id="nvpair-1ea657a3-eaaf-48f3-912e-ce3a3431c220" name="directory" value="/mnt/tmp"/>
           <nvpair id="nvpair-08b520ca-8679-4157-a0e3-d70985948290" name="fstype" value="nfs"/>
           <nvpair id="nvpair-b5699b8c-bc64-4efa-91d1-5d0618ec7382" name="options" value="ro"/>
         </instance_attributes>
       </primitive>
     </resources>
     <constraints>
       <rsc_location id="preferred_location_apache_1" node="hs21c" rsc="apache_1" score="100"/>
       <rsc_location id="preferred_location_nfs_1" node="hs21c" rsc="nfs_1" score="100"/>
     </constraints>
     <op_defaults>
       <meta_attributes id="op_defaults-options"/>
     </op_defaults>
     <rsc_defaults/>
   </configuration>
   <status/>
 </cib>
diff --git a/cts/scheduler/xml/systemhealtho1.xml b/cts/scheduler/xml/systemhealtho1.xml
index da6fb2d6a8..56ee19d23e 100644
--- a/cts/scheduler/xml/systemhealtho1.xml
+++ b/cts/scheduler/xml/systemhealtho1.xml
@@ -1,51 +1,51 @@
 <cib validate-with="pacemaker-3.0" crm_feature_set="3.0.1" have-quorum="1" admin_epoch="0" epoch="13924" num_updates="0" cib-last-written="Fri Jul 13 13:51:16 2012" dc-uuid="c97a3ee5-02d8-4fad-a9fb-a79ae2b35549">
   <configuration>
     <crm_config>
       <cluster_property_set id="cib-bootstrap-options">
         <nvpair id="cib-bootstrap-options-dc-version" name="dc-version" value="1.0.3-b133b3f19797c00f9189f4b66b513963f9d25db9"/>
-        <nvpair id="cib-bootstrap-options-pe-node-health-strategy" name="pe-node-health-strategy" value="only-green"/>
+        <nvpair id="cib-bootstrap-options-node-health-strategy" name="node-health-strategy" value="only-green"/>
       </cluster_property_set>
     </crm_config>
     <nodes>
       <node id="c97a3ee5-02d8-4fad-a9fb-a79ae2b35549" uname="hs21c" type="member"/>
       <node id="737318c6-0f92-4592-9754-45967d45aff7" uname="hs21d" type="member"/>
     </nodes>
     <resources>
       <primitive id="stonith-1" class="stonith" type="dummy"/>
       <primitive class="ocf" id="apache_1" provider="heartbeat" type="apache">
         <meta_attributes id="apache_1-meta_attributes">
           <nvpair id="nvpair-e97ad6f0-db94-47af-8f2c-056a80a21a4d" name="target-role" value="Started"/>
         </meta_attributes>
         <operations id="apache_1-operations">
           <op id="apache_1-op-monitor-10" interval="10" name="monitor" start-delay="1m" timeout="20"/>
         </operations>
         <instance_attributes id="apache_1-instance_attributes">
           <nvpair id="nvpair-a915b958-b215-4fa1-b465-23ab60aa06ca" name="configfile"/>
         </instance_attributes>
       </primitive>
       <primitive class="ocf" id="nfs_1" provider="heartbeat" type="Filesystem">
         <meta_attributes id="nfs_1-meta_attributes">
           <nvpair id="nvpair-c6f3f9e7-ec22-4c24-b3f6-3828228529dd" name="target-role" value="Started"/>
         </meta_attributes>
         <operations id="nfs_1-operations">
           <op id="nfs_1-op-monitor-20" interval="20" name="monitor" start-delay="10" timeout="40"/>
         </operations>
         <instance_attributes id="nfs_1-instance_attributes">
           <nvpair id="nvpair-601b9377-3c22-4094-b8c1-8e7c12b3b00a" name="device" value="hs21d:/nfs"/>
           <nvpair id="nvpair-1ea657a3-eaaf-48f3-912e-ce3a3431c220" name="directory" value="/mnt/tmp"/>
           <nvpair id="nvpair-08b520ca-8679-4157-a0e3-d70985948290" name="fstype" value="nfs"/>
           <nvpair id="nvpair-b5699b8c-bc64-4efa-91d1-5d0618ec7382" name="options" value="ro"/>
         </instance_attributes>
       </primitive>
     </resources>
     <constraints>
       <rsc_location id="preferred_location_apache_1" node="hs21c" rsc="apache_1" score="100"/>
       <rsc_location id="preferred_location_nfs_1" node="hs21c" rsc="nfs_1" score="100"/>
     </constraints>
     <op_defaults>
       <meta_attributes id="op_defaults-options"/>
     </op_defaults>
     <rsc_defaults/>
   </configuration>
   <status/>
 </cib>
diff --git a/cts/scheduler/xml/systemhealthp1.xml b/cts/scheduler/xml/systemhealthp1.xml
index 4c2279c84a..2e68c9daf8 100644
--- a/cts/scheduler/xml/systemhealthp1.xml
+++ b/cts/scheduler/xml/systemhealthp1.xml
@@ -1,51 +1,51 @@
 <cib validate-with="pacemaker-3.0" crm_feature_set="3.0.1" have-quorum="1" admin_epoch="0" epoch="13924" num_updates="0" cib-last-written="Fri Jul 13 13:51:16 2012" dc-uuid="c97a3ee5-02d8-4fad-a9fb-a79ae2b35549">
   <configuration>
     <crm_config>
       <cluster_property_set id="cib-bootstrap-options">
         <nvpair id="cib-bootstrap-options-dc-version" name="dc-version" value="1.0.3-b133b3f19797c00f9189f4b66b513963f9d25db9"/>
-        <nvpair id="cib-bootstrap-options-pe-node-health-strategy" name="pe-node-health-strategy" value="progressive"/>
+        <nvpair id="cib-bootstrap-options-node-health-strategy" name="node-health-strategy" value="progressive"/>
       </cluster_property_set>
     </crm_config>
     <nodes>
       <node id="c97a3ee5-02d8-4fad-a9fb-a79ae2b35549" uname="hs21c" type="member"/>
       <node id="737318c6-0f92-4592-9754-45967d45aff7" uname="hs21d" type="member"/>
     </nodes>
     <resources>
       <primitive id="stonith-1" class="stonith" type="dummy"/>
       <primitive class="ocf" id="apache_1" provider="heartbeat" type="apache">
         <meta_attributes id="apache_1-meta_attributes">
           <nvpair id="nvpair-e97ad6f0-db94-47af-8f2c-056a80a21a4d" name="target-role" value="Started"/>
         </meta_attributes>
         <operations id="apache_1-operations">
           <op id="apache_1-op-monitor-10" interval="10" name="monitor" start-delay="1m" timeout="20"/>
         </operations>
         <instance_attributes id="apache_1-instance_attributes">
           <nvpair id="nvpair-a915b958-b215-4fa1-b465-23ab60aa06ca" name="configfile"/>
         </instance_attributes>
       </primitive>
       <primitive class="ocf" id="nfs_1" provider="heartbeat" type="Filesystem">
         <meta_attributes id="nfs_1-meta_attributes">
           <nvpair id="nvpair-c6f3f9e7-ec22-4c24-b3f6-3828228529dd" name="target-role" value="Started"/>
         </meta_attributes>
         <operations id="nfs_1-operations">
           <op id="nfs_1-op-monitor-20" interval="20" name="monitor" start-delay="10" timeout="40"/>
         </operations>
         <instance_attributes id="nfs_1-instance_attributes">
           <nvpair id="nvpair-601b9377-3c22-4094-b8c1-8e7c12b3b00a" name="device" value="hs21d:/nfs"/>
           <nvpair id="nvpair-1ea657a3-eaaf-48f3-912e-ce3a3431c220" name="directory" value="/mnt/tmp"/>
           <nvpair id="nvpair-08b520ca-8679-4157-a0e3-d70985948290" name="fstype" value="nfs"/>
           <nvpair id="nvpair-b5699b8c-bc64-4efa-91d1-5d0618ec7382" name="options" value="ro"/>
         </instance_attributes>
       </primitive>
     </resources>
     <constraints>
       <rsc_location id="preferred_location_apache_1" node="hs21c" rsc="apache_1" score="100"/>
       <rsc_location id="preferred_location_nfs_1" node="hs21c" rsc="nfs_1" score="100"/>
     </constraints>
     <op_defaults>
       <meta_attributes id="op_defaults-options"/>
     </op_defaults>
     <rsc_defaults/>
   </configuration>
   <status/>
 </cib>