diff --git a/pengine/testcases/inc1.xml b/pengine/testcases/inc1.xml
index 27a8b55176..4add1f9115 100644
--- a/pengine/testcases/inc1.xml
+++ b/pengine/testcases/inc1.xml
@@ -1,51 +1,51 @@
 <?xml version="1.0"?>
 <!DOCTYPE cib SYSTEM "crm-1.0.dtd">
 <cib num_updates="1" epoch="1" admin_epoch="0">
   <configuration>
     <crm_config><cluster_property_set id="cib-bootstrap-options"><attributes>
       <nvpair id="no_quorum_policy" name="no_quorum_policy" value="ignore"/>
     </attributes></cluster_property_set></crm_config>
     <nodes>
       <node id="uuid1" uname="node1" type="member"/>
       <node id="uuid2" uname="node2" type="member"/>
     </nodes>
     <resources>
       <primitive id="rsc1" class="heartbeat" type="apache"/>
       <clone id="rsc2">
         <instance_attributes>
           <attributes>
             <nvpair name="clone_max" value="5"/>
             <nvpair name="clone_node_max" value="2"/>
             <nvpair name="resource_stickiness" value="1"/>
           </attributes>
         </instance_attributes>
 	<primitive id="child_rsc2" class="heartbeat" type="apache"/>
       </clone>
       <primitive id="rsc3" class="heartbeat" type="apache"/>
     </resources>
     <constraints>
       <rsc_order id="order1" from="rsc1" type="before" to="rsc2" score="0"/>
-      <rsc_order id="order1" from="rsc2" type="before" to="rsc3" score="0"/>
+      <rsc_order id="order2" from="rsc2" type="before" to="rsc3" score="0"/>
     </constraints>
   </configuration>
   <status>
     <node_state id="uuid1" ha="active" uname="node1" crmd="online" join="member" expected="member" in_ccm="true">
       <transient_attributes>
         <instance_attributes>
 	  <attributes>
 	    <nvpair id="probed" name="probe_complete" value="true"/>
 	  </attributes>
         </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>
         <instance_attributes>
 	  <attributes>
 	    <nvpair id="probed" name="probe_complete" value="true"/>
 	  </attributes>
         </instance_attributes>
       </transient_attributes>
     </node_state>
   </status>
 </cib>
diff --git a/pengine/testcases/inc7.xml b/pengine/testcases/inc7.xml
index 18f61996a2..b7e6bbe92c 100644
--- a/pengine/testcases/inc7.xml
+++ b/pengine/testcases/inc7.xml
@@ -1,70 +1,70 @@
 <?xml version="1.0"?>
 <!DOCTYPE cib SYSTEM "crm-1.0.dtd">
 <cib num_updates="1" epoch="1" admin_epoch="0">
   <configuration>
     <crm_config><cluster_property_set id="cib-bootstrap-options"><attributes>
       <nvpair id="no_quorum_policy" name="no_quorum_policy" value="ignore"/>
     </attributes></cluster_property_set></crm_config>
     <nodes>
       <node id="uuid1" uname="node1" type="member"/>
       <node id="uuid2" uname="node2" type="member"/>
       <node id="uuid3" uname="node3" type="member"/>
     </nodes>
     <resources>
       <primitive id="rsc0" class="heartbeat" type="apache"/>
       <clone id="rsc1" interleave="1">
         <instance_attributes>
           <attributes>
             <nvpair name="clone_max" value="5"/>
             <nvpair name="clone_node_max" value="2"/>
             <nvpair name="resource_stickiness" value="1"/>
           </attributes>
         </instance_attributes>
 	<primitive id="child_rsc1" class="heartbeat" type="apache"/>
       </clone>
       <clone id="rsc2" interleave="1">
         <instance_attributes>
           <attributes>
             <nvpair name="clone_max" value="5"/>
             <nvpair name="clone_node_max" value="2"/>
             <nvpair name="resource_stickiness" value="1"/>
           </attributes>
         </instance_attributes>
 	<primitive id="child_rsc2" class="heartbeat" type="apache"/>
       </clone>
     </resources>
     <constraints>
       <rsc_order id="order1" from="rsc1" type="before" to="rsc2" score="0"/>
-      <rsc_colocation id="order1" from="rsc1" to="rsc2" score="INFINITY"/>
+      <rsc_colocation id="coloc1" from="rsc1" to="rsc2" score="INFINITY"/>
     </constraints>
   </configuration>
   <status>
     <node_state id="uuid1" ha="active" uname="node1" crmd="online" join="member" expected="member" in_ccm="true">
       <transient_attributes>
         <instance_attributes>
 	  <attributes>
 	    <nvpair id="probed" name="probe_complete" value="true"/>
 	  </attributes>
         </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>
         <instance_attributes>
 	  <attributes>
 	    <nvpair id="probed" name="probe_complete" value="true"/>
 	  </attributes>
         </instance_attributes>
       </transient_attributes>
     </node_state>
     <node_state id="uuid3" ha="active" uname="node3" crmd="online" join="member" expected="member" in_ccm="true">
       <transient_attributes>
         <instance_attributes>
 	  <attributes>
 	    <nvpair id="probed" name="probe_complete" value="true"/>
 	  </attributes>
         </instance_attributes>
       </transient_attributes>
     </node_state>
   </status>
 </cib>
diff --git a/pengine/testcases/rec-rsc-9.xml b/pengine/testcases/rec-rsc-9.xml
index 671ca5d5e9..d5d92dd86b 100644
--- a/pengine/testcases/rec-rsc-9.xml
+++ b/pengine/testcases/rec-rsc-9.xml
@@ -1,51 +1,51 @@
 <?xml version="1.0"?>
 <!DOCTYPE cib SYSTEM "crm-1.0.dtd">
 <!-- shutdown -->
 <cib num_updates="1" epoch="1" admin_epoch="0">
   <configuration>
     <crm_config><cluster_property_set id="cib-bootstrap-options"><attributes>
       <nvpair id="no_quorum_policy" name="no_quorum_policy" value="ignore"/>
       <nvpair id="symmetric_cluster" name="symmetric_cluster" value="true"/>
       <nvpair id="default_resource_stickiness" name="default_resource_stickiness" value="100"/>
     </attributes></cluster_property_set></crm_config>
     <nodes>
       <node id="node1" uname="node1" type="member"/>
     </nodes>
     <resources>
       <primitive id="rsc1" class="heartbeat" type="apache" restart_type="restart"/>
       <group id="foo" restart_type="restart">
 	<meta_attributes id="1">
 	  <attributes>
             <nvpair id="2" name="restart_type" value="restart"/>
           </attributes>
 	</meta_attributes>
 	<primitive id="rsc2" class="heartbeat" type="apache"/>
       </group>
       <group id="bar">
 	<primitive id="rsc3" class="heartbeat" type="apache" />
       </group>
     </resources>
     <constraints>
-      <rsc_order id="order_recover" from="rsc1" type="after" to="bar" score="0"/>
-      <rsc_order id="order_recover" from="foo" type="after" to="bar" score="0"/>
+      <rsc_order id="order_recover-1" from="rsc1" type="after" to="bar" score="0"/>
+      <rsc_order id="order_recover-2" from="foo" type="after" to="bar" score="0"/>
     </constraints>
   </configuration>
   <status>
     <node_state id="node1" ha="active" uname="node1" crmd="online" join="member" expected="member" in_ccm="true">
       <lrm>
         <lrm_resources>
           <lrm_resource id="rsc1" class="heartbeat" type="apache">
             <lrm_rsc_op id="rsc1_start_0" operation="start" interval="0" op_status="0" rc_code="0" call_id="1" op_digest="f2317cad3d54cec5d7d7aa7d0bf35cf8" crm_feature_set="1.0.6" transition_magic=""/>
           </lrm_resource>
           <lrm_resource id="rsc3" class="heartbeat" type="apache">
             <lrm_rsc_op id="rsc3_start_0" operation="start" interval="0" op_status="0" rc_code="0" call_id="1" op_digest="f2317cad3d54cec5d7d7aa7d0bf35cf8" crm_feature_set="1.0.6" transition_magic=""/>
             <lrm_rsc_op id="rsc3_fail_0" operation="fail" interval="0" op_status="4" rc_code="60" call_id="2" op_digest="f2317cad3d54cec5d7d7aa7d0bf35cf8" crm_feature_set="1.0.6" transition_magic=""/>
           </lrm_resource>
           <lrm_resource id="rsc2" class="heartbeat" type="apache">
             <lrm_rsc_op id="rsc2_start_0" operation="start" interval="0" op_status="0" rc_code="0" call_id="1" op_digest="f2317cad3d54cec5d7d7aa7d0bf35cf8" crm_feature_set="1.0.6" transition_magic=""/>
           </lrm_resource>
         </lrm_resources>
       </lrm>
     </node_state>
   </status>
 </cib>