diff --git a/xml/constraints.rng.in b/xml/constraints.rng.in
index 577ed1c1e9..e2c73876d5 100644
--- a/xml/constraints.rng.in
+++ b/xml/constraints.rng.in
@@ -1,155 +1,159 @@
 <?xml version="1.0" encoding="utf-8"?>
 <grammar xmlns="http://relaxng.org/ns/structure/1.0" 
          datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
   <start>
       <ref name="element-constraints"/>
   </start>
 
   <define name="element-constraints">
       <zeroOrMore>
 	<choice>
 	  <ref name="element-location"/>
 	  <ref name="element-colocation"/>
 	  <ref name="element-order"/>
 	</choice>
       </zeroOrMore>
   </define>
 
   <define name="element-location">
     <element name="rsc_location">
       <attribute name="id"><data type="ID"/></attribute>
       <attribute name="rsc"><data type="IDREF"/></attribute>
       <choice>
 	<group>
 	  <externalRef href="score.rng"/>
 	  <attribute name="node"><data type="IDREF"/></attribute>
 	</group>
 	<oneOrMore>
 	  <externalRef href="rule-@DTD_VERSION@.rng"/>
 	</oneOrMore>
       </choice>
       <optional>
 	<ref name="element-lifetime"/>
       </optional>
     </element>
   </define>
 
   <define name="element-resource-set">
     <element name="resource_set">
       <attribute name="id"><data type="ID"/></attribute>
       <optional>
 	<attribute name="sequential"><data type="boolean"/></attribute>
       </optional>
       <optional>
 	<attribute name="action">
 	  <ref name="attribute-actions"/>
 	</attribute>
       </optional>
       <optional>
 	<attribute name="role">
 	  <ref name="attribute-roles"/>
 	</attribute>
       </optional>
       <optional>
 	<externalRef href="score.rng"/>
       </optional>
       <oneOrMore>
 	<element name="resource_ref">
 	  <attribute name="id"><data type="IDREF"/></attribute>
 	</element>
       </oneOrMore>
     </element>
   </define>
 
   <define name="element-colocation">
     <element name="rsc_colocation">
       <attribute name="id"><data type="ID"/></attribute>
       <optional>
-	<externalRef href="score.rng"/>
+	<choice>
+	  <externalRef href="score.rng"/>
+	  <attribute name="score-attribute"><text/></attribute>
+	  <attribute name="score-attribute-mangle"><text/></attribute>
+	</choice>
       </optional>
       <optional>
 	<ref name="element-lifetime"/>
       </optional>
       <choice>
 	<oneOrMore>
 	  <ref name="element-resource-set"/>
 	</oneOrMore>
 	<group>
 	  <attribute name="rsc"><data type="IDREF"/></attribute>
-	  <attribute name="with"><data type="IDREF"/></attribute>
+	  <attribute name="with-rsc"><data type="IDREF"/></attribute>
 	  <optional>
 	    <attribute name="rsc-role">
 	      <ref name="attribute-roles"/>
 	    </attribute>
 	  </optional>
 	  <optional>
 	    <attribute name="with-rsc-role">
 	      <ref name="attribute-roles"/>
 	    </attribute>
 	  </optional>
 	</group>
       </choice>
     </element>
   </define>
 
   <define name="element-order">
     <element name="rsc_order">
       <attribute name="id"><data type="ID"/></attribute>
       <optional>
 	<ref name="element-lifetime"/>
       </optional>
       <optional>
 	<attribute name="symmetrical"><data type="boolean"/></attribute>
       </optional>
       <choice>
 	<oneOrMore>
 	  <ref name="element-resource-set"/>
 	</oneOrMore>
 	<group>
-	  <attribute name="rsc"><data type="IDREF"/></attribute>
-	  <attribute name="before"><data type="IDREF"/></attribute>
+	  <attribute name="first-rsc"><data type="IDREF"/></attribute>
+	  <attribute name="then-rsc"><data type="IDREF"/></attribute>
 	  <optional>
 	    <externalRef href="score.rng"/>
 	  </optional>
 	  <optional>
-	    <attribute name="rsc-action">
+	    <attribute name="first-action">
 	      <ref name="attribute-actions"/>
 	    </attribute>
 	  </optional>
 	  <optional>
-	    <attribute name="before-rsc-action">
+	    <attribute name="then-action">
 	      <ref name="attribute-actions"/>
 	    </attribute>
 	  </optional>
 	</group>
       </choice>
     </element>
   </define>
  
   <define name="attribute-actions">
     <choice>
       <value>start</value>
       <value>promote</value>
       <value>demote</value>
       <value>stop</value>
     </choice>
   </define>
       
   <define name="attribute-roles">
     <choice>
       <value>Stopped</value>
       <value>Started</value>
       <value>Master</value>
       <value>Slave</value>
     </choice>
   </define>
 
   <define name="element-lifetime">
     <element name="lifetime">
       <oneOrMore>
 	<externalRef href="rule-@DTD_VERSION@.rng"/>
       </oneOrMore>
     </element>
   </define>
   
 </grammar>
diff --git a/xml/pacemaker.rng.in b/xml/pacemaker.rng.in
index 922ae7eec1..f0e43f831f 100644
--- a/xml/pacemaker.rng.in
+++ b/xml/pacemaker.rng.in
@@ -1,111 +1,113 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- types: http://www.w3.org/TR/xmlschema-2/#dateTime -->
 <grammar xmlns="http://relaxng.org/ns/structure/1.0" 
          datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
   <start>
     <element name="cib">
       <ref name="element-cib"/>
     </element>
   </start>
 
   <define name="element-cib">
     <ref name="attribute-options"/>
     <element name="configuration">
       <interleave>
 	<element name="crm_config">
 	  <zeroOrMore>
 	    <element name="cluster_property_set">
 	      <externalRef href="nvset-@DTD_VERSION@.rng"/>
 	    </element>
 	  </zeroOrMore>
 	</element>
 	<ref name="element-nodes"/>
 	<element name="resources">
 	  <externalRef href="resources-@DTD_VERSION@.rng"/>
 	</element>
 	<element name="constraints">
 	  <externalRef href="constraints-@DTD_VERSION@.rng"/>
 	</element>
       </interleave>
     </element>
-    <ref name="element-status"/>
+    <element name="status">
+      <ref name="element-status"/>
+    </element>
   </define>
 
   <define name="attribute-options">
     <attribute name="validate-with">
       <choice>
 	<value>none</value>
 	<value>dtd</value>
 	<value>relax-ng</value>
 	<value>relax-ng-1.0</value>
       </choice>
     </attribute>
     <attribute name="admin-epoch"><data type="nonNegativeInteger"/></attribute>
     <attribute name="epoch"><data type="nonNegativeInteger"/></attribute>
     <attribute name="num-updates"><data type="nonNegativeInteger"/></attribute>
     <optional>
       <attribute name="num-peers"><data type="integer"/></attribute>
     </optional>
     <optional>
       <attribute name="remote-access-port"><data type="nonNegativeInteger"/></attribute>
     </optional>
     <optional>
       <attribute name="have-quorum"><data type="boolean"/></attribute>
     </optional>
     <optional>
       <attribute name="dc-uuid"><text/></attribute>
     </optional>
     <optional>
       <attribute name="cib-feature-revision"><text/></attribute>
     </optional>
     <optional>
       <attribute name="crm-feature-set"><text/></attribute>
     </optional>
     <optional>
       <attribute name="cib-last-written"><text/></attribute>
     </optional>
   </define>
 
   <define name="element-nodes">
     <element name="nodes">
       <zeroOrMore>
 	<element name="node">
 	  <attribute name="id"><text/></attribute>
 	  <attribute name="uname"><data type="ID"/></attribute>
 	  <attribute name="type">
 	    <choice>
 	      <value>normal</value>
 	      <value>member</value>
 	      <value>ping</value>
 	    </choice>
 	  </attribute>
 	  <optional>
 	    <attribute name="description"><text/></attribute>
 	  </optional>
 	  <zeroOrMore>
 	    <element name="instance_attributes">
 	      <externalRef href="nvset-@DTD_VERSION@.rng"/>
 	    </element>
 	  </zeroOrMore>
 	</element>
       </zeroOrMore>
     </element>
   </define>
 
   <define name="element-status">
     <zeroOrMore>
       <choice>
         <attribute>
           <anyName/>
           <text/>
         </attribute>
         <element>
           <anyName/>
           <ref name="element-status"/>
         </element>
         <text/>
       </choice>
     </zeroOrMore>
   </define>
 
 </grammar>
diff --git a/xml/regression.core.sh b/xml/regression.core.sh
index 4cc860b32f..dd3db312a6 100755
--- a/xml/regression.core.sh
+++ b/xml/regression.core.sh
@@ -1,90 +1,90 @@
 #!/bin/bash
 
  # Copyright (C) 2004 Andrew Beekhof <andrew@beekhof.net>
  # 
  # This program is free software; you can redistribute it and/or
  # modify it under the terms of the GNU General Public
  # License as published by the Free Software Foundation; either
  # version 2.1 of the License, or (at your option) any later version.
  # 
  # This software is distributed in the hope that it will be useful,
  # but WITHOUT ANY WARRANTY; without even the implied warranty of
  # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  # General Public License for more details.
  # 
  # You should have received a copy of the GNU General Public
  # License along with this library; if not, write to the Free Software
  # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  #
 
 verbose=$1
 io_dir=../pengine/testcases
 diff_opts="--ignore-all-space -u -N"
 failed=.regression.failed.diff
 # zero out the error log
 > $failed
 
 num_failed=0
 function do_test {
 
     base=$1; shift
     name=$1; shift
     input=$io_dir/${base}.xml
     output=$io_dir/${base}.upgrade.xml
     expected=$io_dir/${base}.expected.xml
 
     if [ ! -f $input ]; then
 	echo "Test $name	($base)...	Error (PE : input)";
 	num_failed=`expr $num_failed + 1`
 	return;
     fi
 
     echo "Test $base	:	$name";
     if [ "$create_mode" != "true" -a ! -f $expected ]; then
 	:
 #	echo "	Error (PE : expected)";
 #	return;
     fi
 
     xsltproc --novalid upgrade.xsl $input > $output
     if [ $? != 0 ]; then
 	echo "	* Failed (xml : xsltproc)";
 	num_failed=`expr $num_failed + 1`
     fi
 
      if [ ! -s $output ]; then
 	echo "	Error (xml : no conversion)";
 	num_failed=`expr $num_failed + 1`
 	rm $output
 	return;
     fi
 
-    xmllint --relaxng pacemaker-1.0.rng $output > /dev/null 2>&1
+    xmllint --relaxng pacemaker-0.7.rng $output > /dev/null 2>&1
 
     if [ $? != 0 ]; then
 	echo "	* Failed (xml : xmllint)";
 	num_failed=`expr $num_failed + 1`
-	xmllint --relaxng pacemaker-1.0.rng $output > /dev/null
+	xmllint --relaxng pacemaker-0.7.rng $output > /dev/null
 	cat -n $output
     fi
 
     rm -f $output
 }
 
 function test_results {
     if [ $num_failed != 0 ]; then
 	if [ -s $failed ]; then
 	    if [ "$verbose" = "-v" ]; then
 		echo "Results of $num_failed failed tests...."
 		less $failed
 	    else
 		echo "Results of $num_failed failed tests are in $failed...."
 		echo "Use $0 -v to display them automatically."
 	    fi
 	else
 	    echo "$num_failed tests failed (no diff results)"
 	    rm $failed
 	fi
     fi
 }
 
diff --git a/xml/resources.rng.in b/xml/resources.rng.in
index ffa909e095..c5c1649b1e 100644
--- a/xml/resources.rng.in
+++ b/xml/resources.rng.in
@@ -1,159 +1,162 @@
 <?xml version="1.0" encoding="utf-8"?>
 <grammar xmlns="http://relaxng.org/ns/structure/1.0" 
          datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
   <start>
       <ref name="element-resources"/>
   </start>
 
   <define name="element-resources">
       <zeroOrMore>
 	<choice>
 	  <ref name="element-primitive"/>
 	  <ref name="element-group"/>
 	  <ref name="element-clone"/>
 	  <ref name="element-master"/>
 	</choice>
       </zeroOrMore>
   </define>
 
   <define name="element-primitive">
     <element name="primitive">
       <interleave>
 	<attribute name="id"><data type="ID"/></attribute>
 	<choice>
 	  <group>
 	    <attribute name="class"><value>ocf</value></attribute>
 	    <attribute name="provider"><text/></attribute>
 	  </group>
 	  <attribute name="class">
 	    <choice>
 	      <value>lsb</value>
 	      <value>heartbeat</value>
 	      <value>stonith</value>
 	    </choice>
 	  </attribute>
 	</choice>
 	<attribute name="type"><text/></attribute>
 	<optional>
 	  <attribute name="description"><text/></attribute>
 	</optional>
 	<ref name="element-resource-extra"/>
 	<ref name="element-operations"/>
       </interleave>
     </element>
   </define>
 
   <define name="element-group">
     <element name="group">
       <attribute name="id"><data type="ID"/></attribute>
       <optional>
 	<attribute name="description"><text/></attribute>
       </optional>
       <interleave>
 	<ref name="element-resource-extra"/>
 	<oneOrMore>
 	  <ref name="element-primitive"/>
 	</oneOrMore>
       </interleave>
     </element>
   </define>
  
   <define name="element-clone">
     <element name="clone">
       <attribute name="id"><data type="ID"/></attribute>
       <optional>
 	<attribute name="description"><text/></attribute>
       </optional>
       <interleave>
 	<ref name="element-resource-extra"/>
 	<choice>
 	  <ref name="element-primitive"/>
 	  <ref name="element-group"/>
 	</choice>
       </interleave>
     </element>
   </define>
 
   <define name="element-master">
     <element name="master">
       <attribute name="id"><data type="ID"/></attribute>
       <optional>
 	<attribute name="description"><text/></attribute>
       </optional>
       <interleave>
 	<ref name="element-resource-extra"/>
 	<choice>
 	  <ref name="element-primitive"/>
 	  <ref name="element-group"/>
 	</choice>
       </interleave>
     </element>
   </define>
 
   <define name="element-resource-extra">
       <zeroOrMore>
 	<choice>
 	  <element name="meta_attributes">
 	    <externalRef href="nvset-@DTD_VERSION@.rng"/>
 	  </element>
 	  <element name="instance_attributes">
 	    <externalRef href="nvset-@DTD_VERSION@.rng"/>
 	  </element>
 	</choice>
       </zeroOrMore>
   </define>
  
   <define name="element-operations">
     <optional>
       <element name="operations">
 	<zeroOrMore>
 	  <element name="op">
 	    <attribute name="id"><data type="ID"/></attribute>
 	    <attribute name="name"><text/></attribute>
 	    <attribute name="interval"><text/></attribute>
 	    <optional>
 	      <attribute name="description"><text/></attribute>
 	    </optional>
+	    <optional>
+	      <attribute name="start-delay"><text/></attribute>
+	    </optional>
 	    <optional>
 	      <attribute name="timeout"><text/></attribute>
 	    </optional>
 	    <optional>
 	      <attribute name="enabled"><data type="boolean"/></attribute>
 	    </optional>
 	    <optional>
 	      <attribute name="role">
 		<choice>
 		  <value>Started</value>
 		  <value>Slave</value>
 		  <value>Master</value>
 		</choice>
 	      </attribute>
 	    </optional>
 	    <optional>
 	      <attribute name="requires">
 		<choice>
 		  <value>nothing</value>
 		  <value>quorum</value>
 		  <value>fencing</value>
 		</choice>
 	      </attribute>
 	    </optional>
 	    <optional>
 	      <attribute name="on-fail">
 		<choice>
 		  <value>ignore</value>
 		  <value>block</value>
 		  <value>stop</value>
 		  <value>restart</value>
 		  <value>fence</value>
 		</choice>
 	      </attribute>
 	    </optional>
 	    <ref name="element-resource-extra"/>
 	  </element>
 	</zeroOrMore>
       </element>
     </optional>
   </define>
 
 </grammar>
diff --git a/xml/rule.rng.in b/xml/rule.rng.in
index 2a507718c4..464afe74f9 100644
--- a/xml/rule.rng.in
+++ b/xml/rule.rng.in
@@ -1,134 +1,134 @@
 <?xml version="1.0" encoding="utf-8"?>
 <grammar xmlns="http://relaxng.org/ns/structure/1.0" 
 	 xmlns:ann="http://relaxng.org/ns/compatibility/annotations/1.0"
          datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
   <start>
       <ref name="element-rule"/>
   </start>
 
   <define name="element-rule">
     <element name="rule">
       <attribute name="id"><data type="ID"/></attribute>
       <choice>
 	<externalRef href="score.rng"/>
-	<attribute name="score_attribute"><text/></attribute>
+	<attribute name="score-attribute"><text/></attribute>
       </choice>
       <optional>
 	<attribute name="boolean-op">
 	  <choice>
 	    <value>or</value>
 	    <value>and</value>
 	  </choice>
 	</attribute>
       </optional>
       <optional>
 	<attribute name="role"><text/></attribute>
       </optional>
       <oneOrMore>
 	<choice>
           <element name="expression">
 	    <attribute name="id"><data type="ID"/></attribute>
 	    <attribute name="attribute"><text/></attribute>
 	    <attribute name="operation">
 	      <choice>
 		<value>lt</value>
 		<value>gt</value>
 		<value>lte</value>
 		<value>gte</value>
 		<value>eq</value>
 		<value>ne</value>
 		<value>defined</value>
 		<value>not_defined</value>
 	      </choice>
 	    </attribute>
 	    <optional>
 	      <attribute name="value"><text/></attribute>
 	    </optional>
 	    <optional>
 	      <attribute name="type" ann:defaultValue="string">
 		<choice>
 		  <value>string</value>
 		  <value>number</value>
 		  <value>version</value>
 		</choice>
 	      </attribute>
 	    </optional>
 	  </element>
           <element name="date_expression">
 	    <attribute name="id"><data type="ID"/></attribute>
 	    <choice>
 	      <group>
 		<attribute name="operation"><value>in_range</value></attribute>
 		<choice>
 		  <group>
 		    <optional>
 		      <attribute name="start"><text/></attribute>
 		    </optional>
 		    <attribute name="end"><text/></attribute>
 		  </group>
 		  <group>
 		    <attribute name="start"><text/></attribute>
 		    <element name="duration">
 		      <ref name="date-common"/>
 		    </element>
 		  </group>
 		</choice>
 	      </group>
 	      <group>
 		<attribute name="operation"><value>gt</value></attribute>
 		<attribute name="start"><text/></attribute>
 	      </group>
 	      <group>
 		<attribute name="operation"><value>lt</value></attribute>
 		<choice>
 		  <attribute name="end"><text/></attribute>
 		</choice>
 	      </group>
 	      <group>
 		<attribute name="operation"><value>date_spec</value></attribute>
 		<element name="date_spec">
 		  <ref name="date-common"/>
 		</element> 
 	      </group>
 	    </choice>
 	  </element> 
 	  <ref name="element-rule"/>
 	</choice>
       </oneOrMore>
     </element>
   </define>
 
   <define name="date-common">
     <attribute name="id"><data type="ID"/></attribute>
     <oneOrMore>
       <optional>
 	<attribute name="hours"><text/></attribute>
       </optional>
       <optional>
 	<attribute name="monthdays"><text/></attribute>
       </optional>
       <optional>
 	<attribute name="weekdays"><text/></attribute>
       </optional>
       <optional>
 	<attribute name="yearsdays"><text/></attribute>
       </optional>
       <optional>
 	<attribute name="months"><text/></attribute>
       </optional>
       <optional>
 	<attribute name="weeks"><text/></attribute>
       </optional>
       <optional>
 	<attribute name="years"><text/></attribute>
       </optional>
       <optional>
 	<attribute name="weekyears"><text/></attribute>
       </optional>
       <optional>
 	<attribute name="moon"><text/></attribute>
       </optional>
     </oneOrMore>
   </define>
 
 </grammar>
diff --git a/xml/upgrade.xsl b/xml/upgrade.xsl
index 86e9145ddc..2f92e47746 100644
--- a/xml/upgrade.xsl
+++ b/xml/upgrade.xsl
@@ -1,475 +1,616 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <xsl:stylesheet version="1.0"
-		xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+		xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+		xmlns:fn="http://www.w3.org/2005/02/xpath-functions">
 <xsl:output method='xml' version='1.0' encoding='UTF-8' indent='yes'/>
 
 <!-- Utility templates -->
 <xsl:template name="auto-id">
   <xsl:attribute name="id">
     <xsl:value-of select="name()"/>
     <xsl:text>.auto-</xsl:text>
-    <xsl:number level="any"/>
+    <xsl:number level="any" from="cib" count="node()"/>
   </xsl:attribute>
 </xsl:template>
 
 <xsl:template name="lower-case-value">
   <xsl:param name="value"/> 
   <xsl:value-of select="translate($value, 'ABCDEFGHIJKLMNOPQRSTUVWXYZ', 'abcdefghijklmnopqrstuvwxyz')"/>
 </xsl:template>
 
 <xsl:template name="upper-case-value">
   <xsl:param name="value"/> 
   <xsl:value-of select="translate($value, 'abcdefghijklmnopqrstuvwxyz', 'ABCDEFGHIJKLMNOPQRSTUVWXYZ')"/>
 </xsl:template>
 
 <xsl:template name="camel-case-value">
   <xsl:param name="value"/> 
     <xsl:call-template name="upper-case-value">
       <xsl:with-param name="value"><xsl:value-of select="substring($value,1,1)"/></xsl:with-param>
     </xsl:call-template>
     <xsl:call-template name="lower-case-value">
       <xsl:with-param name="value"><xsl:value-of select="substring($value,2)"/></xsl:with-param>
     </xsl:call-template>
 </xsl:template>
 
 <xsl:template name="create-as-attr"> 
   <xsl:param name="name"/> 
   <xsl:param name="value"/> 
   <xsl:element name="nvpair">
     <xsl:attribute name="id">
       <xsl:value-of select="name()"/>
-      <xsl:text>.auto-</xsl:text>
+      <xsl:text>.meta.auto-</xsl:text>
       <xsl:number level="any" from="cib" count="node()"/>
     </xsl:attribute>
     <xsl:attribute name="name">
       <xsl:value-of select="translate($name,'_','-')"/>
     </xsl:attribute>
     <xsl:attribute name="value">
       <xsl:value-of select="$value"/>
     </xsl:attribute>
   </xsl:element>
 </xsl:template> 
 
+<xsl:template name="convert-instance-to-meta">
+  <xsl:for-each select="instance_attributes//nvpair[@name='resource_stickiness']"> 
+    <xsl:call-template name="create-as-attr">
+      <xsl:with-param name="name"><xsl:value-of select="translate(@name, '_', '-')"/></xsl:with-param>
+      <xsl:with-param name="value"><xsl:value-of select="@value"/></xsl:with-param>
+    </xsl:call-template>
+  </xsl:for-each>
+  <xsl:for-each select="instance_attributes//nvpair[@name='allow_migrate']"> 
+    <xsl:call-template name="create-as-attr">
+      <xsl:with-param name="name"><xsl:value-of select="translate(@name, '_', '-')"/></xsl:with-param>
+      <xsl:with-param name="value"><xsl:value-of select="@value"/></xsl:with-param>
+    </xsl:call-template>
+  </xsl:for-each>
+  <xsl:for-each select="instance_attributes//nvpair[@name='globally_unique']"> 
+    <xsl:call-template name="create-as-attr">
+      <xsl:with-param name="name"><xsl:value-of select="translate(@name, '_', '-')"/></xsl:with-param>
+      <xsl:with-param name="value"><xsl:value-of select="@value"/></xsl:with-param>
+    </xsl:call-template>
+  </xsl:for-each>
+  <xsl:for-each select="instance_attributes//nvpair[@name='target_role']"> 
+    <xsl:call-template name="create-as-attr">
+      <xsl:with-param name="name"><xsl:value-of select="translate(@name, '_', '-')"/></xsl:with-param>
+      <xsl:with-param name="value"><xsl:value-of select="@value"/></xsl:with-param>
+    </xsl:call-template>
+  </xsl:for-each>
+  <xsl:for-each select="instance_attributes//nvpair[@name='clone_max']"> 
+    <xsl:call-template name="create-as-attr">
+      <xsl:with-param name="name"><xsl:value-of select="translate(@name, '_', '-')"/></xsl:with-param>
+      <xsl:with-param name="value"><xsl:value-of select="@value"/></xsl:with-param>
+    </xsl:call-template>
+  </xsl:for-each>
+  <xsl:for-each select="instance_attributes//nvpair[@name='clone_node_max']"> 
+    <xsl:call-template name="create-as-attr">
+      <xsl:with-param name="name"><xsl:value-of select="translate(@name, '_', '-')"/></xsl:with-param>
+      <xsl:with-param name="value"><xsl:value-of select="@value"/></xsl:with-param>
+    </xsl:call-template>
+  </xsl:for-each>
+  <xsl:for-each select="instance_attributes//nvpair[@name='master_max']"> 
+    <xsl:call-template name="create-as-attr">
+      <xsl:with-param name="name"><xsl:value-of select="translate(@name, '_', '-')"/></xsl:with-param>
+      <xsl:with-param name="value"><xsl:value-of select="@value"/></xsl:with-param>
+    </xsl:call-template>
+  </xsl:for-each>
+  <xsl:for-each select="instance_attributes//nvpair[@name='master_node_max']"> 
+    <xsl:call-template name="create-as-attr">
+      <xsl:with-param name="name"><xsl:value-of select="translate(@name, '_', '-')"/></xsl:with-param>
+      <xsl:with-param name="value"><xsl:value-of select="@value"/></xsl:with-param>
+    </xsl:call-template>
+  </xsl:for-each>
+</xsl:template>
+
+<xsl:template match="instance_attributes">
+  <xsl:element name="instance_attributes">
+    <xsl:call-template name="auto-id"/>
+    <xsl:element name="attributes">
+      <xsl:for-each select="attributes//nvpair"> 
+	<xsl:element name="nvpair">
+	  <xsl:apply-templates select="@*"/>
+	  <xsl:call-template name="auto-id"/>
+	</xsl:element>
+      </xsl:for-each>
+    </xsl:element>
+  </xsl:element>
+</xsl:template>
+
+<xsl:template match="meta_attributes">
+  <xsl:element name="meta_attributes">
+    <xsl:call-template name="auto-id"/>
+    <xsl:element name="attributes">
+      <xsl:for-each select="attributes//nvpair">
+	<xsl:element name="nvpair">
+	  <xsl:call-template name="auto-id"/>
+	  <xsl:attribute name="name"><xsl:value-of select="translate(@name, '_', '-')"/></xsl:attribute>
+	  <xsl:attribute name="value"><xsl:value-of select="@value"/></xsl:attribute>
+	</xsl:element>
+	</xsl:for-each>
+    </xsl:element>
+  </xsl:element>
+</xsl:template>
+
 <!-- Sanitizing templates -->
-<xsl:template match="status"/>
 
-<xsl:template match="@generated|@ccm_transition|@num_peers|@cib_last_written|@have_quorum|@dc_uuid|@start_delay">
+<xsl:template match="@generated|@ccm_transition|@num_peers|@cib_last_written|@ignore_dtd|@crm-debug-origin">
   <!-- swallow -->
 </xsl:template>
 
 <xsl:template match="@disabled">
   <xsl:attribute name="enabled">true</xsl:attribute>
   <xsl:if test="contains(translate(., 'ABCDEFGHIJKLMNOPQRSTUVWXYZ', 'abcdefghijklmnopqrstuvwxyz'), 'true')">
     <xsl:attribute name="enabled">false</xsl:attribute>
   </xsl:if>
 </xsl:template>
 
 <xsl:template match="@action">
   <xsl:attribute name="rsc-action">
     <xsl:value-of select="."/>
   </xsl:attribute>
 </xsl:template>
 
 <xsl:template match="@to_action">
   <xsl:attribute name="before-rsc-action">
     <xsl:value-of select="."/>
   </xsl:attribute>
 </xsl:template>
 
-<xsl:template match="@role">
-  <xsl:attribute name="{name()}">
-    <xsl:call-template name="camel-case-value">
-      <xsl:with-param name="value"><xsl:value-of select="."/></xsl:with-param>
-    </xsl:call-template>
-  </xsl:attribute>
-</xsl:template>
-
-<xsl:template match="@from_role">
-  <xsl:attribute name="rsc-role">
-    <xsl:call-template name="camel-case-value">
-      <xsl:with-param name="value"><xsl:value-of select="."/></xsl:with-param>
-    </xsl:call-template>
-  </xsl:attribute>
-</xsl:template>
-
-<xsl:template match="@to_role">
-  <xsl:attribute name="with-rsc-role">
-    <xsl:call-template name="camel-case-value">
-      <xsl:with-param name="value"><xsl:value-of select="."/></xsl:with-param>
-    </xsl:call-template>
-  </xsl:attribute>
-</xsl:template>
-
 <xsl:template match="@score">
   <xsl:attribute name="{name()}">
     <xsl:if test="contains(., '.')">
       <xsl:value-of select="substring-before(.,'.')"/>
     </xsl:if>
     <xsl:if test="not(contains(., '.'))">
       <xsl:call-template name="upper-case-value">
 	<xsl:with-param name="value"><xsl:value-of select="."/></xsl:with-param>
       </xsl:call-template>
     </xsl:if>
   </xsl:attribute>
 </xsl:template>
 
 <xsl:template match="@provider">
   <!-- only set provider for OCF resources -->
   <xsl:if test="contains(../@class, 'ocf')">
     <xsl:attribute name="{name()}">
       <xsl:value-of select="."/>
     </xsl:attribute>
   </xsl:if>
 </xsl:template>
 
 <xsl:template match="@id">
-  <xsl:choose>
-    <!-- IDs cant start with a digit -->
-    <xsl:when test='not(string(number(substring(.,1,1))) = "NaN")'>
-      <!-- set an automatic id -->
-      <xsl:for-each select=".."> 
-	<xsl:attribute name="id">
+  <xsl:attribute name="{name()}">
+    <xsl:choose>
+      <!-- IDs cant start with a digit -->
+      <xsl:when test='not(string(number(substring(.,1,1))) = "NaN")'>
+	<!-- set an automatic id -->
+	<xsl:for-each select=".."> 
 	  <xsl:value-of select="name()"/>
 	  <xsl:text>.auto-</xsl:text>
 	  <xsl:number level="any"/>
-	</xsl:attribute>
-      </xsl:for-each>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:attribute name="{name()}">
+	</xsl:for-each>
+      </xsl:when>
+      <xsl:otherwise>
 	<xsl:value-of select="translate(., ':', '-')"/>
-      </xsl:attribute>
-    </xsl:otherwise>
-  </xsl:choose>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:attribute>
 </xsl:template>
 
+
 <!-- Rename templates -->
-<xsl:template match="@admin_epoch|@num_updates|@boolean_op|@cib_feature_revision|@crm_feature_set|@on_fail">
+<xsl:template match="@admin_epoch|@num_updates|@boolean_op|@cib_feature_revision|@crm_feature_set|@on_fail|@have_quorum|@dc_uuid|@op_status|@transition_magic|@call_id|@rc_code|@op_digest|@transition_key|@op_restart_digest|@op_force_restart|@score_attribute|@score_attribute_mangled|@start_delay">
   <xsl:attribute name="{translate(name(),'_','-')}">
     <xsl:value-of select="."/>
   </xsl:attribute>
 </xsl:template>
 
 <xsl:template match="@prereq">
   <xsl:attribute name="requires">
     <xsl:value-of select="."/>
   </xsl:attribute>
 </xsl:template>
 
+<xsl:template match="@name">
+  <xsl:attribute name="{name()}">
+    <xsl:choose>
+
+      <xsl:when test="contains(., 'default_resource_stickiness')">
+	<xsl:value-of select="translate(., '_', '-')"/>
+      </xsl:when>
+      <xsl:when test="contains(., 'no_quorum_policy')">
+	<xsl:value-of select="translate(., '_', '-')"/>
+      </xsl:when>
+      <xsl:when test="contains(., 'transition_idle_timeout')">
+	<xsl:text>cluster-delay</xsl:text>
+      </xsl:when>
+      <xsl:when test="contains(., 'symmetric_cluster')">
+	<xsl:value-of select="translate(., '_', '-')"/>
+      </xsl:when>
+      <xsl:when test="contains(., 'stonith_enabled')">
+	<xsl:value-of select="translate(., '_', '-')"/>
+      </xsl:when>
+      <xsl:when test="contains(., 'stonith_action')">
+	<xsl:value-of select="translate(., '_', '-')"/>
+      </xsl:when>
+      <xsl:when test="contains(., 'is_managed_default')">
+	<xsl:value-of select="translate(., '_', '-')"/>
+      </xsl:when>
+      <xsl:when test="contains(., 'stop_orphan_resources')">
+	<xsl:value-of select="translate(., '_', '-')"/>
+      </xsl:when>
+      <xsl:when test="contains(., 'stop_orphan_actions')">
+	<xsl:value-of select="translate(., '_', '-')"/>
+      </xsl:when>
+      <xsl:when test="contains(., 'remove_after_stop')">
+	<xsl:value-of select="translate(., '_', '-')"/>
+      </xsl:when>
+<!--
+      <xsl:when test="contains(., '')">
+	<xsl:value-of select="translate(., '_', '-')"/>
+      </xsl:when>
+-->
+      <xsl:otherwise>
+	<xsl:value-of select="."/>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:attribute>
+</xsl:template>
 
 <!-- regular transformations -->
 
 <xsl:template match="primitive|group|clone">
   <xsl:element name="{name()}">
     <xsl:apply-templates select="@id"/>
 
     <xsl:if test="contains(name(), 'primitive')">
       <xsl:for-each select="@*"> 
 	<xsl:choose>
 	  <xsl:when test="starts-with(name(), 'type')">
 	    <xsl:apply-templates select="."/>
 	  </xsl:when>
 	  <xsl:when test="starts-with(name(), 'class')">
 	    <xsl:apply-templates select="."/>
 	  </xsl:when>
 	  <xsl:when test="starts-with(name(), 'provider')">
 	    <xsl:apply-templates select="."/>
 	  </xsl:when>
 	</xsl:choose>
       </xsl:for-each>
     </xsl:if>
 
     <xsl:if test="@description">
       <xsl:apply-templates select="@description"/>
     </xsl:if>
 
-    <xsl:apply-templates select="node()" />
+    <xsl:apply-templates select="node()"/>
 
     <xsl:element name="meta_attributes">
       <xsl:attribute name="id">
 	<xsl:value-of select="name()"/>
 	<xsl:text>-</xsl:text>
 	<xsl:value-of select="@id"/>
 	<xsl:text>.meta</xsl:text>
       </xsl:attribute>
       <xsl:element name="attributes">
 	<xsl:for-each select="@*"> 
 	  <xsl:choose>
 	    <xsl:when test="starts-with(name(), 'id')"/>
 	    <xsl:when test="starts-with(name(), 'type')"/>
 	    <xsl:when test="starts-with(name(), 'class')"/>
 	    <xsl:when test="starts-with(name(), 'provider')"/>
 	    <xsl:when test="starts-with(name(), 'description')"/>
 	    <xsl:otherwise>
 	      <xsl:call-template name="create-as-attr">
 		<xsl:with-param name="name"><xsl:value-of select="name()"/></xsl:with-param>
 		<xsl:with-param name="value"><xsl:value-of select="."/></xsl:with-param>
 	      </xsl:call-template>
 	    </xsl:otherwise>
 	  </xsl:choose>
 	</xsl:for-each>
+	<xsl:call-template name="convert-instance-to-meta"/>
       </xsl:element>
     </xsl:element>
   </xsl:element>
 </xsl:template>
 
 <xsl:template match="master_slave">
   <xsl:element name="master">
     <xsl:apply-templates select="@id"/>
 
     <xsl:if test="@description">
       <xsl:apply-templates select="@description"/>
     </xsl:if>
 
-    <xsl:apply-templates select="node()" />
+    <xsl:apply-templates select="node()"/>
 
     <xsl:element name="meta_attributes">
       <xsl:attribute name="id">
 	<xsl:value-of select="name()"/>
 	<xsl:text>-</xsl:text>
 	<xsl:value-of select="@id"/>
 	<xsl:text>.meta</xsl:text>
       </xsl:attribute>
       <xsl:element name="attributes">
 	<xsl:for-each select="@*"> 
 	  <xsl:choose>
 	    <xsl:when test="starts-with(name(), 'id')"/>
 	    <xsl:when test="starts-with(name(), 'type')"/>
 	    <xsl:otherwise>
 	      <xsl:call-template name="create-as-attr">
 		<xsl:with-param name="name"><xsl:value-of select="name()"/></xsl:with-param>
 		<xsl:with-param name="value"><xsl:value-of select="."/></xsl:with-param>
 	      </xsl:call-template>
 	    </xsl:otherwise>
 	  </xsl:choose>
 	</xsl:for-each>
+	<xsl:call-template name="convert-instance-to-meta"/>
       </xsl:element>
     </xsl:element>
   </xsl:element>
 </xsl:template>
 
 
 
 <xsl:template match="cib">
   <xsl:element name="{name()}">
     <xsl:apply-templates select="@*"/>
     <xsl:attribute name="validate-with">relax-ng</xsl:attribute>
     <xsl:apply-templates select="node()" />
   </xsl:element>
 </xsl:template>
 
-<xsl:template match="configuration|nodes|node|crm_config|resources|constraints|operations|attributes">
+<xsl:template match="configuration|nodes|crm_config|resources|constraints|operations|attributes|status">
   <!-- no ID required -->
   <xsl:element name="{name()}">
     <xsl:apply-templates select="@*"/>
     <xsl:apply-templates select="node()" />
   </xsl:element>
 </xsl:template>
 
 <!-- override the ID field for these objects -->
-<xsl:template match="nvpair|instance_attributes|expression|meta_attributes">
+<xsl:template match="nvpair|expression">
   <xsl:element name="{name()}">
     <xsl:apply-templates select="@*" />
 
     <!-- use an automatic ID -->
     <xsl:call-template name="auto-id"/>
 
     <xsl:apply-templates select="node()" />
 
   </xsl:element>
   <!--xsl:apply-templates/-->
 </xsl:template>
 
 <xsl:template match="rule">
   <xsl:element name="{name()}">
 
     <!-- make sure some sort of score is always set -->
     <xsl:if test="not(@score)">
       <xsl:if test="not(@score_attribute)">
 	<xsl:attribute name="score">0</xsl:attribute>
       </xsl:if>
     </xsl:if>
 
     <!-- use an automatic ID -->
     <xsl:call-template name="auto-id"/>
 
     <xsl:apply-templates select="@*" />
     <xsl:apply-templates select="node()" />
 
   </xsl:element>
   <!--xsl:apply-templates/-->
 </xsl:template>
 
 <xsl:template match="date_expression">
   <xsl:element name="{name()}">
 
     <!-- make sure operation is always set -->
     <xsl:attribute name="operation">in_range</xsl:attribute>
 
     <!-- use an automatic ID -->
     <xsl:call-template name="auto-id"/>
 
     <xsl:apply-templates select="@*" />
     <xsl:apply-templates select="node()" />
 
   </xsl:element>
   <!--xsl:apply-templates/-->
 </xsl:template>
 
 <xsl:template match="op">
   <xsl:element name="{name()}">
 
     <!-- arrange for the name to be before interval -->
     <xsl:attribute name="name"/>
 
     <!-- make sure interval is always set -->
     <xsl:attribute name="interval">0</xsl:attribute>
 
     <!-- use an automatic ID -->
     <xsl:call-template name="auto-id"/>
 
     <xsl:apply-templates select="@*" />
     <xsl:apply-templates select="node()" />
 
   </xsl:element>
   <!--xsl:apply-templates/-->
 </xsl:template>
 
 <xsl:template match="date_expression">
   <xsl:element name="{name()}">
 
     <!-- make sure operation is always set -->
     <xsl:attribute name="operation">in_range</xsl:attribute>
 
     <!-- use an automatic ID -->
     <xsl:call-template name="auto-id"/>
 
     <xsl:apply-templates select="@*" />
     <xsl:apply-templates select="node()" />
 
   </xsl:element>
 </xsl:template>
 
 <xsl:template match="rsc_colocation">
   <xsl:element name="{name()}">
 
     <!-- set a automatic ID -->
     <xsl:call-template name="auto-id"/>
     
     <xsl:attribute name="rsc">
       <xsl:value-of select="@from"/>
     </xsl:attribute>
-    <xsl:attribute name="with">
+    <xsl:attribute name="with-rsc">
       <xsl:value-of select="@to"/>
     </xsl:attribute>
+
+    <xsl:if test="@from_role">
+      <xsl:attribute name="rsc-role">
+	<xsl:call-template name="camel-case-value">
+	  <xsl:with-param name="value"><xsl:value-of select="@from_role"/></xsl:with-param>
+	</xsl:call-template>
+      </xsl:attribute>
+    </xsl:if>
+    <xsl:if test="@to_role">
+      <xsl:attribute name="with-rsc-role">
+	<xsl:call-template name="camel-case-value">
+	  <xsl:with-param name="value"><xsl:value-of select="@to_role"/></xsl:with-param>
+	</xsl:call-template>
+      </xsl:attribute>
+    </xsl:if>
     
     <xsl:for-each select="@*"> 
       <xsl:choose>
 	<xsl:when test="starts-with(name(), 'to')"/>
 	<xsl:when test="starts-with(name(), 'from')"/>
 	<xsl:otherwise>
 	  <xsl:apply-templates select="."/>
 	</xsl:otherwise>
       </xsl:choose>
     </xsl:for-each>
     <xsl:apply-templates select="node()" />
 
   </xsl:element>
 </xsl:template>
 
 <xsl:template match="rsc_order">
   <xsl:element name="{name()}">
 
     <!-- set a automatic ID -->
     <xsl:call-template name="auto-id"/>
 
     <!-- normalize ordering  -->
     <xsl:choose>
       <xsl:when test="not(contains(@type, 'before'))">
 	<xsl:choose>
 	  <xsl:when test="@to_action">
-	    <xsl:attribute name="rsc-action">
+	    <xsl:attribute name="first-action">
 	      <xsl:value-of select="@to_action"/>
 	    </xsl:attribute>
 	  </xsl:when>
 	  <xsl:when test="@action">
-	    <xsl:attribute name="rsc-action">
+	    <xsl:attribute name="first-action">
 	      <xsl:value-of select="@action"/>
 	    </xsl:attribute>
-	</xsl:when>
+	  </xsl:when>
 	</xsl:choose>
-	<xsl:attribute name="rsc">
+
+	<xsl:attribute name="first-rsc">
 	  <xsl:value-of select="@to"/>
 	</xsl:attribute>
-	<xsl:attribute name="before">
+	<xsl:attribute name="then-rsc">
 	  <xsl:value-of select="@from"/>
 	</xsl:attribute>
 	<xsl:if test="@action">
-	  <xsl:attribute name="before-rsc-action">
+	  <xsl:attribute name="then-action">
 	  <xsl:value-of select="@action"/>
 	  </xsl:attribute>
 	</xsl:if>
+
       </xsl:when>
+
       <xsl:otherwise>
 	<xsl:if test="@action">
-	  <xsl:attribute name="rsc-action">
+	  <xsl:attribute name="first-action">
 	  <xsl:value-of select="@action"/>
 	  </xsl:attribute>
 	</xsl:if>
-	<xsl:attribute name="rsc">
+	<xsl:attribute name="first-rsc">
 	  <xsl:value-of select="@from"/>
 	</xsl:attribute>
-	<xsl:attribute name="before">
+	<xsl:attribute name="then-rsc">
 	  <xsl:value-of select="@to"/>
 	</xsl:attribute>
 	<xsl:if test="@to_action">
-	  <xsl:attribute name="before-rsc-action">
+	  <xsl:attribute name="then-action">
 	    <xsl:value-of select="@to_action"/>
 	  </xsl:attribute>
 	</xsl:if>
       </xsl:otherwise>
+
     </xsl:choose>
 
     <xsl:for-each select="@*"> 
       <xsl:choose>
 	<xsl:when test="starts-with(name(), 'to')"/>
 	<xsl:when test="starts-with(name(), 'from')"/>
 	<xsl:when test="contains(name(), 'action')"/>
 	<xsl:when test="starts-with(name(), 'type')"/>
 	<xsl:otherwise>
 	  <xsl:apply-templates select="."/>
 	</xsl:otherwise>
       </xsl:choose>
     </xsl:for-each>
     <xsl:apply-templates select="node()" />
 
   </xsl:element>
   <!--xsl:apply-templates/-->
 </xsl:template>
 
+<xsl:template match="lrm_resource|node|node_state">
+  <xsl:element name="{name()}">
+    <xsl:call-template name="auto-id"/>
+    <xsl:for-each select="@*"> 
+      <xsl:choose>
+	<xsl:when test="starts-with(name(), 'id')">
+	  <!--
+	      Do not s/:/-/ for lrm_resource IDs 
+	      Leave node IDs unmodified
+	    -->
+	  <xsl:attribute name="id">
+	    <xsl:value-of select="."/>
+	  </xsl:attribute>  
+	</xsl:when>
+	<xsl:otherwise>
+	  <xsl:apply-templates select="."/>
+	</xsl:otherwise>
+      </xsl:choose>
+    </xsl:for-each>
+    <xsl:apply-templates select="node()" />
+  </xsl:element>
+  <!--xsl:apply-templates/-->
+</xsl:template>
+
 <xsl:template match="@*">
   <xsl:attribute name="{name()}">
     <xsl:value-of select="."/>
   </xsl:attribute>
 </xsl:template>
 
 <xsl:template match="/">
   <xsl:apply-templates select="@*"/>
   <xsl:apply-templates select="node()"/>
   <!--xsl:apply-templates/-->
 </xsl:template>
 
 <xsl:template match="*">
   <xsl:element name="{name()}">
-    <xsl:attribute name="id">
-      <xsl:value-of select="name()"/>
-      <xsl:text>.auto-</xsl:text>
-      <xsl:number level="any" from="cib"/>
-    </xsl:attribute>
+    <xsl:call-template name="auto-id"/>
     <xsl:apply-templates select="@*"/>
     <xsl:apply-templates select="node()" />
   </xsl:element>
   <!--xsl:apply-templates/-->
 </xsl:template>
 
 </xsl:stylesheet>