diff --git a/build.xml b/build.xml
index 868b7eb2..2c00bab6 100644
--- a/build.xml
+++ b/build.xml
@@ -83,7 +83,7 @@
 	-->
 	<property name="tools.dir" value="tools"/>
 	<property name="tools.ant" value="${tools.dir}/ant"/>
-	<property name="tools.mda" value="${tools.dir}/mda"/>
+	<property name="tools.mda" value="${tools.dir}/aggregator-cli-0.8.0"/>
     <property name="tools.mdnorm" value="${tools.dir}/mdnorm"/>
 	<property name="tools.metadatatool" value="${tools.dir}/metadatatool"/>
 	<property name="tools.xmlsectool" value="${tools.dir}/xmlsectool"/>
diff --git a/mdx/at_aconet/beans.xml b/mdx/at_aconet/beans.xml
index 90876b46..b0b51976 100644
--- a/mdx/at_aconet/beans.xml
+++ b/mdx/at_aconet/beans.xml
@@ -27,9 +27,9 @@
     <!--
         Fetch the production aggregate.
     -->
-    <bean id="at_aconet_productionAggregate" parent="DomResourceSourceStage"
+    <bean id="at_aconet_productionAggregate" parent="DOMResourceSourceStage"
         p:id="at_aconet_productionAggregate">
-        <property name="domResource">
+        <property name="DOMResource">
             <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
                 <constructor-arg name="client" ref="httpClient"/>
                 <constructor-arg name="url"    ref="at_aconet_registrarAggregate_url"/>
@@ -40,9 +40,9 @@
     <!--
         Fetch the eduGAIN export aggregate.
     -->
-    <bean id="at_aconet_edugainAggregate" parent="DomResourceSourceStage"
+    <bean id="at_aconet_edugainAggregate" parent="DOMResourceSourceStage"
         p:id="at_aconet_edugainAggregate">
-        <property name="domResource">
+        <property name="DOMResource">
             <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
                 <constructor-arg name="client" ref="httpClient"/>
                 <constructor-arg name="url"    ref="at_aconet_edugainAggregate_url"/>
diff --git a/mdx/au_aaf/beans.xml b/mdx/au_aaf/beans.xml
index d8a39aa9..760d9aa4 100644
--- a/mdx/au_aaf/beans.xml
+++ b/mdx/au_aaf/beans.xml
@@ -15,9 +15,9 @@
     <!--
         Fetch the production aggregate.
     -->
-    <bean id="au_aaf_productionAggregate" parent="DomResourceSourceStage"
+    <bean id="au_aaf_productionAggregate" parent="DOMResourceSourceStage"
         p:id="au_aaf_productionAggregate">
-        <property name="domResource">
+        <property name="DOMResource">
             <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
                 <constructor-arg name="client" ref="httpClient"/>
                 <constructor-arg name="url" value="http://manager.aaf.edu.au/metadata/metadata.aaf.signed.xml"/>
diff --git a/mdx/be_belnet/beans.xml b/mdx/be_belnet/beans.xml
index cf0f5c4c..053d3d5d 100644
--- a/mdx/be_belnet/beans.xml
+++ b/mdx/be_belnet/beans.xml
@@ -25,9 +25,9 @@
     <!--
         Fetch the production aggregate.
     -->
-    <bean id="be_belnet_productionAggregate" parent="DomResourceSourceStage"
+    <bean id="be_belnet_productionAggregate" parent="DOMResourceSourceStage"
         p:id="be_belnet_productionAggregate">
-        <property name="domResource">
+        <property name="DOMResource">
             <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
                 <constructor-arg name="client" ref="httpClient"/>
                 <constructor-arg name="url"    ref="be_belnet_productionAggregate_url"/>
@@ -38,9 +38,9 @@
     <!--
         Fetch the eduGAIN export aggregate.
     -->
-    <bean id="be_belnet_edugainAggregate" parent="DomResourceSourceStage"
+    <bean id="be_belnet_edugainAggregate" parent="DOMResourceSourceStage"
         p:id="be_belnet_edugainAggregate">
-        <property name="domResource">
+        <property name="DOMResource">
             <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
                 <constructor-arg name="client" ref="httpClient"/>
                 <constructor-arg name="url"    ref="be_belnet_edugainAggregate_url"/>
diff --git a/mdx/br_cafe/beans.xml b/mdx/br_cafe/beans.xml
index 2b09ea74..622975e0 100644
--- a/mdx/br_cafe/beans.xml
+++ b/mdx/br_cafe/beans.xml
@@ -25,9 +25,9 @@
     <!--
         Fetch the production aggregate.
     -->
-    <bean id="br_cafe_productionAggregate" parent="DomResourceSourceStage"
+    <bean id="br_cafe_productionAggregate" parent="DOMResourceSourceStage"
         p:id="br_cafe_productionAggregate">
-        <property name="domResource">
+        <property name="DOMResource">
             <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
                 <constructor-arg name="client" ref="httpClient"/>
                 <constructor-arg name="url"    ref="br_cafe_productionAggregate_url"/>
@@ -38,9 +38,9 @@
     <!--
         Fetch the eduGAIN export aggregate.
     -->
-    <bean id="br_cafe_edugainAggregate" parent="DomResourceSourceStage"
+    <bean id="br_cafe_edugainAggregate" parent="DOMResourceSourceStage"
         p:id="br_cafe_edugainAggregate">
-        <property name="domResource">
+        <property name="DOMResource">
             <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
                 <constructor-arg name="client" ref="httpClient"/>
                 <constructor-arg name="url"    ref="br_cafe_edugainAggregate_url"/>
diff --git a/mdx/ca_caf/beans.xml b/mdx/ca_caf/beans.xml
index 5967608b..ca30558d 100644
--- a/mdx/ca_caf/beans.xml
+++ b/mdx/ca_caf/beans.xml
@@ -25,9 +25,9 @@
     <!--
         Fetch the production aggregate.
     -->
-    <bean id="ca_caf_productionAggregate" parent="DomResourceSourceStage"
+    <bean id="ca_caf_productionAggregate" parent="DOMResourceSourceStage"
         p:id="ca_caf_productionAggregate">
-        <property name="domResource">
+        <property name="DOMResource">
             <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
                 <constructor-arg name="client" ref="httpClient"/>
                 <constructor-arg name="url" ref="ca_caf_productionAggregate_url"/>
@@ -38,9 +38,9 @@
     <!--
         Fetch the eduGAIN export aggregate.
     -->
-    <bean id="ca_caf_edugainAggregate" parent="DomResourceSourceStage"
+    <bean id="ca_caf_edugainAggregate" parent="DOMResourceSourceStage"
         p:id="ca_caf_edugainAggregate">
-        <property name="domResource">
+        <property name="DOMResource">
             <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
                 <constructor-arg name="client" ref="httpClient"/>
                 <constructor-arg name="url"    ref="ca_caf_edugainAggregate_url"/>
diff --git a/mdx/ch_switchaai/beans.xml b/mdx/ch_switchaai/beans.xml
index dab6cd95..92d317ff 100644
--- a/mdx/ch_switchaai/beans.xml
+++ b/mdx/ch_switchaai/beans.xml
@@ -25,9 +25,9 @@
     <!--
         Fetch the production aggregate.
     -->
-    <bean id="ch_switchaai_productionAggregate" parent="DomResourceSourceStage"
+    <bean id="ch_switchaai_productionAggregate" parent="DOMResourceSourceStage"
         p:id="ch_switchaai_productionAggregate">
-        <property name="domResource">
+        <property name="DOMResource">
             <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
                 <constructor-arg name="client" ref="httpClient"/>
                 <constructor-arg name="url"    ref="ch_switchaai_productionAggregate_url"/>
@@ -38,9 +38,9 @@
     <!--
         Fetch the eduGAIN export aggregate.
     -->
-    <bean id="ch_switchaai_edugainAggregate" parent="DomResourceSourceStage"
+    <bean id="ch_switchaai_edugainAggregate" parent="DOMResourceSourceStage"
         p:id="ch_switchaai_edugainAggregate">
-        <property name="domResource">
+        <property name="DOMResource">
             <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
                 <constructor-arg name="client" ref="httpClient"/>
                 <constructor-arg name="url"    ref="ch_switchaai_edugainAggregate_url"/>
diff --git a/mdx/cl_cofre/beans.xml b/mdx/cl_cofre/beans.xml
index b06f55ea..d545a950 100644
--- a/mdx/cl_cofre/beans.xml
+++ b/mdx/cl_cofre/beans.xml
@@ -23,9 +23,9 @@
     <!--
         Fetch the eduGAIN export aggregate.
     -->
-    <bean id="cl_cofre_edugainAggregate" parent="DomResourceSourceStage"
+    <bean id="cl_cofre_edugainAggregate" parent="DOMResourceSourceStage"
         p:id="cl_cofre_edugainAggregate">
-        <property name="domResource">
+        <property name="DOMResource">
             <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
                 <constructor-arg name="client" ref="httpClient"/>
                 <constructor-arg name="url"    ref="cl_cofre_edugainAggregate_url"/>
diff --git a/mdx/common-beans.xml b/mdx/common-beans.xml
index f852ac9f..80020aaa 100644
--- a/mdx/common-beans.xml
+++ b/mdx/common-beans.xml
@@ -118,18 +118,18 @@
         
         Parent for DOM filesystem source stages.
     -->
-    <bean id="DomFilesystemSourceStage" abstract="true" parent="stage_parent"
-        class="net.shibboleth.metadata.dom.DomFilesystemSourceStage">
+    <bean id="DOMFilesystemSourceStage" abstract="true" parent="stage_parent"
+        class="net.shibboleth.metadata.dom.DOMFilesystemSourceStage">
         <property name="parserPool" ref="parserPool"/>
     </bean>
 
     <!--
-        DomResourceSourceStage
+        DOMResourceSourceStage
         
         Parent for DOM resource source stages.
     -->
-    <bean id="DomResourceSourceStage" abstract="true" parent="stage_parent"
-        class="net.shibboleth.metadata.dom.DomResourceSourceStage">
+    <bean id="DOMResourceSourceStage" abstract="true" parent="stage_parent"
+        class="net.shibboleth.metadata.dom.DOMResourceSourceStage">
         <property name="parserPool" ref="parserPool"/>
     </bean>
 
@@ -313,7 +313,7 @@
     -->
     <bean id="normaliseNamespaces" parent="XSLTransformationStage"
         p:id="normaliseNamespaces">
-        <property name="xslResource">
+        <property name="XSLResource">
             <bean parent="ClasspathResource">
                 <constructor-arg value="ns_norm.xsl"/>
             </bean>
@@ -584,7 +584,7 @@
         Populate RegistrationAuthority values from entities.
     -->
     <bean id="populateRegistrationAuthorities" parent="stage_parent"
-        class="uk.org.ukfederation.mda.validate.mdrpi.RegistrationAuthorityPopulationStage"
+        class="net.shibboleth.metadata.dom.saml.mdrpi.RegistrationAuthorityPopulationStage"
         p:id="populateRegistrationAuthorities"/>
     
     <!--
@@ -596,7 +596,7 @@
         channel must match the known registration authority value.
     -->
     <bean id="default_regauth_parent" abstract="true" parent="XSLTransformationStage">
-        <property name="xslResource">
+        <property name="XSLResource">
             <bean parent="ClasspathResource">
                 <constructor-arg value="default_regauth.xsl"/>
             </bean>
@@ -783,7 +783,7 @@
     
     <bean id="stripComments" parent="XSLTransformationStage"
         p:id="stripComments">
-        <property name="xslResource">
+        <property name="XSLResource">
             <bean parent="ClasspathResource">
                 <constructor-arg value="strip-comments.xsl"/>
             </bean>
@@ -801,7 +801,7 @@
     <!--
         Standard serializer.
     -->
-    <bean id="serializer" class="net.shibboleth.metadata.dom.DomElementSerializer"/>
+    <bean id="serializer" class="net.shibboleth.metadata.dom.DOMElementSerializer"/>
     
     <!--
         Merge strategy that removes duplicates.
@@ -827,7 +827,7 @@
     -->
     <bean id="cleanImport" parent="XSLTransformationStage"
         p:id="cleanImport">
-        <property name="xslResource">
+        <property name="XSLResource">
             <bean parent="ClasspathResource">
                 <constructor-arg value="clean-import.xsl"/>
             </bean>
diff --git a/mdx/cz_eduid/beans.xml b/mdx/cz_eduid/beans.xml
index 4248c0f4..d524fec7 100644
--- a/mdx/cz_eduid/beans.xml
+++ b/mdx/cz_eduid/beans.xml
@@ -35,9 +35,9 @@
     <!--
         Fetch the production aggregate.
     -->
-    <bean id="cz_eduid_productionAggregate" parent="DomResourceSourceStage"
+    <bean id="cz_eduid_productionAggregate" parent="DOMResourceSourceStage"
         p:id="cz_eduid_productionAggregate">
-        <property name="domResource">
+        <property name="DOMResource">
             <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
                 <constructor-arg name="client" ref="httpClient"/>
                 <constructor-arg name="url"    ref="cz_eduid_productionAggregate_url"/>
@@ -48,9 +48,9 @@
     <!--
         Fetch the eduGAIN export aggregate.
     -->
-    <bean id="cz_eduid_edugainAggregate" parent="DomResourceSourceStage"
+    <bean id="cz_eduid_edugainAggregate" parent="DOMResourceSourceStage"
         p:id="cz_eduid_edugainAggregate">
-        <property name="domResource">
+        <property name="DOMResource">
             <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
                 <constructor-arg name="client" ref="httpClient"/>
                 <constructor-arg name="url"    ref="cz_eduid_edugainAggregate_url"/>
diff --git a/mdx/de_dfnaai/beans.xml b/mdx/de_dfnaai/beans.xml
index bdf8107a..24b01266 100644
--- a/mdx/de_dfnaai/beans.xml
+++ b/mdx/de_dfnaai/beans.xml
@@ -25,9 +25,9 @@
     <!--
         Fetch the production aggregate.
     -->
-    <bean id="de_dfnaai_productionAggregate" parent="DomResourceSourceStage"
+    <bean id="de_dfnaai_productionAggregate" parent="DOMResourceSourceStage"
         p:id="de_dfnaai_productionAggregate">
-        <property name="domResource">
+        <property name="DOMResource">
             <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
                 <constructor-arg name="client" ref="httpClient"/>
                 <constructor-arg name="url"    ref="de_dfnaai_productionAggregate_url"/>
@@ -38,9 +38,9 @@
     <!--
         Fetch the eduGAIN export aggregate.
     -->
-    <bean id="de_dfnaai_edugainAggregate" parent="DomResourceSourceStage"
+    <bean id="de_dfnaai_edugainAggregate" parent="DOMResourceSourceStage"
         p:id="de_dfnaai_edugainAggregate">
-        <property name="domResource">
+        <property name="DOMResource">
             <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
                 <constructor-arg name="client" ref="httpClient"/>
                 <constructor-arg name="url"    ref="de_dfnaai_edugainAggregate_url"/>
diff --git a/mdx/dk_wayf/beans.xml b/mdx/dk_wayf/beans.xml
index 9ecfc197..7bda1ded 100644
--- a/mdx/dk_wayf/beans.xml
+++ b/mdx/dk_wayf/beans.xml
@@ -34,9 +34,9 @@
     <!--
         Fetch the IdP metadata.
     -->
-    <bean id="dk_wayf_idpMetadata" parent="DomResourceSourceStage"
+    <bean id="dk_wayf_idpMetadata" parent="DOMResourceSourceStage"
         p:id="dk_wayf_idpMetadata">
-        <property name="domResource">
+        <property name="DOMResource">
             <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
                 <constructor-arg name="client" ref="httpClient"/>
                 <constructor-arg name="url"    ref="dk_wayf_productionIdpMetadata_url"/>
@@ -47,9 +47,9 @@
     <!--
         Fetch the SP metadata.
     -->
-    <bean id="dk_wayf_spMetadata" parent="DomResourceSourceStage"
+    <bean id="dk_wayf_spMetadata" parent="DOMResourceSourceStage"
         p:id="dk_wayf_spMetadata">
-        <property name="domResource">
+        <property name="DOMResource">
             <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
                 <constructor-arg name="client" ref="httpClient"/>
                 <constructor-arg name="url"    ref="dk_wayf_productionSpMetadata_url"/>
@@ -62,9 +62,9 @@
         
         See http://wayf.dk/en/services/connection-technology-for-services/412
     -->
-    <bean id="dk_wayf_birkMetadata" parent="DomResourceSourceStage"
+    <bean id="dk_wayf_birkMetadata" parent="DOMResourceSourceStage"
         p:id="dk_wayf_birkMetadata">
-        <property name="domResource">
+        <property name="DOMResource">
             <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
                 <constructor-arg name="client" ref="httpClient"/>
                 <constructor-arg name="url" value="https://metadata.wayf.dk//birk-idp.xml"/>
@@ -96,9 +96,9 @@
     <!--
         Fetch the eduGAIN export aggregate.
     -->
-    <bean id="dk_wayf_edugainAggregate" parent="DomResourceSourceStage"
+    <bean id="dk_wayf_edugainAggregate" parent="DOMResourceSourceStage"
         p:id="dk_wayf_edugainAggregate">
-        <property name="domResource">
+        <property name="DOMResource">
             <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
                 <constructor-arg name="client" ref="httpClient"/>
                 <constructor-arg name="url"    ref="dk_wayf_edugainAggregate_url"/>
diff --git a/mdx/es_sir/beans.xml b/mdx/es_sir/beans.xml
index c77dbace..ba067c8b 100644
--- a/mdx/es_sir/beans.xml
+++ b/mdx/es_sir/beans.xml
@@ -25,9 +25,9 @@
     <!--
         Fetch the production aggregate.
     -->
-    <bean id="es_sir_productionAggregate" parent="DomResourceSourceStage"
+    <bean id="es_sir_productionAggregate" parent="DOMResourceSourceStage"
         p:id="es_sir_productionAggregate">
-        <property name="domResource">
+        <property name="DOMResource">
             <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
                 <constructor-arg name="client" ref="httpClient"/>
                 <constructor-arg name="url"    ref="es_sir_productionAggregate_url"/>
@@ -38,9 +38,9 @@
     <!--
         Fetch the eduGAIN export aggregate.
     -->
-    <bean id="es_sir_edugainAggregate" parent="DomResourceSourceStage"
+    <bean id="es_sir_edugainAggregate" parent="DOMResourceSourceStage"
         p:id="es_sir_edugainAggregate">
-        <property name="domResource">
+        <property name="DOMResource">
             <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
                 <constructor-arg name="client" ref="httpClient"/>
                 <constructor-arg name="url"    ref="es_sir_edugainAggregate_url"/>
diff --git a/mdx/eu_clarin/beans.xml b/mdx/eu_clarin/beans.xml
index 54aebcfe..7dd12483 100644
--- a/mdx/eu_clarin/beans.xml
+++ b/mdx/eu_clarin/beans.xml
@@ -15,9 +15,9 @@
     <!--
         Fetch the export aggregate.
     -->
-    <bean id="eu_clarin_exportAggregate" parent="DomResourceSourceStage"
+    <bean id="eu_clarin_exportAggregate" parent="DOMResourceSourceStage"
         p:id="eu_clarin_exportAggregate">
-        <property name="domResource">
+        <property name="DOMResource">
             <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
                 <constructor-arg name="client" ref="httpClient"/>
                 <constructor-arg name="url" value="http://www.clarin.eu/aai/clarin-sp-metadata.xml"/>
diff --git a/mdx/fi_haka/beans.xml b/mdx/fi_haka/beans.xml
index 20fb30e4..6f91c6f4 100644
--- a/mdx/fi_haka/beans.xml
+++ b/mdx/fi_haka/beans.xml
@@ -25,9 +25,9 @@
     <!--
         Fetch the production aggregate.
     -->
-    <bean id="fi_haka_productionAggregate" parent="DomResourceSourceStage"
+    <bean id="fi_haka_productionAggregate" parent="DOMResourceSourceStage"
         p:id="fi_haka_productionAggregate">
-        <property name="domResource">
+        <property name="DOMResource">
             <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
                 <constructor-arg name="client" ref="httpClient"/>
                 <constructor-arg name="url"    ref="fi_haka_productionAggregate_url"/>
@@ -38,9 +38,9 @@
     <!--
         Fetch the eduGAIN export aggregate.
     -->
-    <bean id="fi_haka_edugainAggregate" parent="DomResourceSourceStage"
+    <bean id="fi_haka_edugainAggregate" parent="DOMResourceSourceStage"
         p:id="fi_haka_edugainAggregate">
-        <property name="domResource">
+        <property name="DOMResource">
             <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
                 <constructor-arg name="client" ref="httpClient"/>
                 <constructor-arg name="url"    ref="fi_haka_edugainAggregate_url"/>
diff --git a/mdx/fr_renater/beans.xml b/mdx/fr_renater/beans.xml
index dbd64273..3a55ce7a 100644
--- a/mdx/fr_renater/beans.xml
+++ b/mdx/fr_renater/beans.xml
@@ -28,9 +28,9 @@
     <!--
         Fetch the production aggregate.
     -->
-    <bean id="fr_renater_productionAggregate" parent="DomResourceSourceStage"
+    <bean id="fr_renater_productionAggregate" parent="DOMResourceSourceStage"
         p:id="fr_renater_productionAggregate">
-        <property name="domResource">
+        <property name="DOMResource">
             <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
                 <constructor-arg name="client" ref="httpClient"/>
                 <constructor-arg name="url" ref="fr_renater_productionAggregate_url"/>
@@ -41,9 +41,9 @@
     <!--
         Fetch the eduGAIN export aggregate.
     -->
-    <bean id="fr_renater_edugainAggregate" parent="DomResourceSourceStage"
+    <bean id="fr_renater_edugainAggregate" parent="DOMResourceSourceStage"
         p:id="fr_renater_edugainAggregate">
-        <property name="domResource">
+        <property name="DOMResource">
             <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
                 <constructor-arg name="client" ref="httpClient"/>
                 <constructor-arg name="url" ref="fr_renater_edugainAggregate_url"/>
@@ -54,9 +54,9 @@
     <!--
         Fetch the test aggregate.
     -->
-    <bean id="fr_renater_testAggregate" parent="DomResourceSourceStage"
+    <bean id="fr_renater_testAggregate" parent="DOMResourceSourceStage"
         p:id="fr_renater_testAggregate">
-        <property name="domResource">
+        <property name="DOMResource">
             <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
                 <constructor-arg name="client" ref="httpClient"/>
                 <constructor-arg name="url" ref="fr_renater_testAggregate_url"/>
diff --git a/mdx/gr_grnet/beans.xml b/mdx/gr_grnet/beans.xml
index 95b3136b..1131a8b1 100644
--- a/mdx/gr_grnet/beans.xml
+++ b/mdx/gr_grnet/beans.xml
@@ -25,9 +25,9 @@
     <!--
         Fetch the production aggregate.
     -->
-    <bean id="gr_grnet_productionAggregate" parent="DomResourceSourceStage"
+    <bean id="gr_grnet_productionAggregate" parent="DOMResourceSourceStage"
         p:id="gr_grnet_productionAggregate">
-        <property name="domResource">
+        <property name="DOMResource">
             <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
                 <constructor-arg name="client" ref="httpClient"/>
                 <constructor-arg name="url"    ref="gr_grnet_productionAggregate_url"/>
@@ -38,9 +38,9 @@
     <!--
         Fetch the eduGAIN export aggregate.
     -->
-    <bean id="gr_grnet_edugainAggregate" parent="DomResourceSourceStage"
+    <bean id="gr_grnet_edugainAggregate" parent="DOMResourceSourceStage"
         p:id="gr_grnet_edugainAggregate">
-        <property name="domResource">
+        <property name="DOMResource">
             <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
                 <constructor-arg name="client" ref="httpClient"/>
                 <constructor-arg name="url"    ref="gr_grnet_edugainAggregate_url"/>
diff --git a/mdx/hr_eduhr/beans.xml b/mdx/hr_eduhr/beans.xml
index 04ba99fa..4ce2f172 100644
--- a/mdx/hr_eduhr/beans.xml
+++ b/mdx/hr_eduhr/beans.xml
@@ -22,9 +22,9 @@
     <!--
         Fetch the eduGAIN export aggregate.
     -->
-    <bean id="hr_eduhr_edugainAggregate" parent="DomResourceSourceStage"
+    <bean id="hr_eduhr_edugainAggregate" parent="DOMResourceSourceStage"
         p:id="hr_eduhr_edugainAggregate">
-        <property name="domResource">
+        <property name="DOMResource">
             <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
                 <constructor-arg name="client" ref="httpClient"/>
                 <constructor-arg name="url"    ref="hr_eduhr_edugainAggregate_url"/>
diff --git a/mdx/hu_eduid/beans.xml b/mdx/hu_eduid/beans.xml
index 8a1d36b2..9cd11207 100644
--- a/mdx/hu_eduid/beans.xml
+++ b/mdx/hu_eduid/beans.xml
@@ -25,9 +25,9 @@
     <!--
         Fetch the production aggregate.
     -->
-    <bean id="hu_eduid_productionAggregate" parent="DomResourceSourceStage"
+    <bean id="hu_eduid_productionAggregate" parent="DOMResourceSourceStage"
         p:id="hu_eduid_productionAggregate">
-        <property name="domResource">
+        <property name="DOMResource">
             <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
                 <constructor-arg name="client" ref="httpClient"/>
                 <constructor-arg name="url"    ref="hu_eduid_productionAggregate_url"/>
@@ -38,9 +38,9 @@
     <!--
         Fetch the eduGAIN export aggregate.
     -->
-    <bean id="hu_eduid_edugainAggregate" parent="DomResourceSourceStage"
+    <bean id="hu_eduid_edugainAggregate" parent="DOMResourceSourceStage"
         p:id="hu_eduid_edugainAggregate">
-        <property name="domResource">
+        <property name="DOMResource">
             <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
                 <constructor-arg name="client" ref="httpClient"/>
                 <constructor-arg name="url"    ref="hu_eduid_edugainAggregate_url"/>
diff --git a/mdx/ie_edugate/beans.xml b/mdx/ie_edugate/beans.xml
index 13b2513c..c474ab4c 100644
--- a/mdx/ie_edugate/beans.xml
+++ b/mdx/ie_edugate/beans.xml
@@ -15,9 +15,9 @@
     <!--
         Fetch the export aggregate.
     -->
-    <bean id="ie_edugate_exportAggregate" parent="DomResourceSourceStage"
+    <bean id="ie_edugate_exportAggregate" parent="DOMResourceSourceStage"
         p:id="ie_edugate_exportAggregate">
-        <property name="domResource">
+        <property name="DOMResource">
             <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
                 <constructor-arg name="client" ref="httpClient"/>
                 <constructor-arg name="url" value="https://edugate.heanet.ie/edugate-ukfed-signed.xml"/>        
@@ -28,9 +28,9 @@
     <!--
         Fetch the production aggregate.
     -->
-    <bean id="ie_edugate_productionAggregate" parent="DomResourceSourceStage"
+    <bean id="ie_edugate_productionAggregate" parent="DOMResourceSourceStage"
         p:id="ie_edugate_productionAggregate">
-        <property name="domResource">
+        <property name="DOMResource">
             <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
                 <constructor-arg name="client" ref="httpClient"/>
                 <constructor-arg name="url" value="https://edugate.heanet.ie/edugate-metadata-signed.xml"/>        
diff --git a/mdx/in_infed/beans.xml b/mdx/in_infed/beans.xml
index 81211fe8..6478d4d9 100644
--- a/mdx/in_infed/beans.xml
+++ b/mdx/in_infed/beans.xml
@@ -22,9 +22,9 @@
     <!--
         Fetch the production aggregate.
     -->
-    <bean id="in_infed_productionAggregate" parent="DomResourceSourceStage"
+    <bean id="in_infed_productionAggregate" parent="DOMResourceSourceStage"
         p:id="in_infed_productionAggregate">
-        <property name="domResource">
+        <property name="DOMResource">
             <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
                 <constructor-arg name="client" ref="httpClient"/>
                 <constructor-arg name="url" ref="in_infed_productionAggregate_url"/>
diff --git a/mdx/int_edugain/beans.xml b/mdx/int_edugain/beans.xml
index 5ab9c00b..467b2b8d 100644
--- a/mdx/int_edugain/beans.xml
+++ b/mdx/int_edugain/beans.xml
@@ -33,9 +33,9 @@
     <!--
         Fetches the eduGAIN production aggregate.
     -->
-    <bean id="int_edugain_productionAggregate" parent="DomResourceSourceStage"
+    <bean id="int_edugain_productionAggregate" parent="DOMResourceSourceStage"
         p:id="int_edugain_productionAggregate">
-        <property name="domResource">
+        <property name="DOMResource">
             <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
                 <constructor-arg name="client" ref="httpClient"/>
                 <constructor-arg name="url" ref="int_edugain_productionAggregate_url"/>
@@ -46,9 +46,9 @@
     <!--
         Fetch the eduGAIN test aggregate.
     -->
-    <bean id="int_edugain_testAggregate" parent="DomResourceSourceStage"
+    <bean id="int_edugain_testAggregate" parent="DOMResourceSourceStage"
         p:id="int_edugain_testAggregate">
-        <property name="domResource">
+        <property name="DOMResource">
             <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
                 <constructor-arg name="client" ref="httpClient"/>
                 <constructor-arg name="url" ref="int_edugain_testAggregate_url"/>
diff --git a/mdx/int_testshib/beans.xml b/mdx/int_testshib/beans.xml
index a51a18de..9a0ef07b 100644
--- a/mdx/int_testshib/beans.xml
+++ b/mdx/int_testshib/beans.xml
@@ -22,9 +22,9 @@
     <!--
         Fetch the production aggregate.
     -->
-    <bean id="int_testshib_productionAggregate" parent="DomResourceSourceStage"
+    <bean id="int_testshib_productionAggregate" parent="DOMResourceSourceStage"
         p:id="int_testshib_productionAggregate">
-        <property name="domResource">
+        <property name="DOMResource">
             <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
                 <constructor-arg name="client" ref="httpClient"/>
                 <constructor-arg name="url"    ref="int_testshib_productionAggregate_url"/>
diff --git a/mdx/it_idem/beans.xml b/mdx/it_idem/beans.xml
index 7c2c84fb..b3c79eeb 100644
--- a/mdx/it_idem/beans.xml
+++ b/mdx/it_idem/beans.xml
@@ -25,9 +25,9 @@
     <!--
         Fetch the production aggregate.
     -->
-    <bean id="it_idem_productionAggregate" parent="DomResourceSourceStage"
+    <bean id="it_idem_productionAggregate" parent="DOMResourceSourceStage"
         p:id="it_idem_productionAggregate">
-        <property name="domResource">
+        <property name="DOMResource">
             <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
                 <constructor-arg name="client" ref="httpClient"/>
                 <constructor-arg name="url"    ref="it_idem_productionAggregate_url"/>
@@ -38,9 +38,9 @@
     <!--
         Fetch the eduGAIN export aggregate.
     -->
-    <bean id="it_idem_edugainAggregate" parent="DomResourceSourceStage"
+    <bean id="it_idem_edugainAggregate" parent="DOMResourceSourceStage"
         p:id="it_idem_edugainAggregate">
-        <property name="domResource">
+        <property name="DOMResource">
             <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
                 <constructor-arg name="client" ref="httpClient"/>
                 <constructor-arg name="url"    ref="it_idem_edugainAggregate_url"/>
diff --git a/mdx/jp_gakunin/beans.xml b/mdx/jp_gakunin/beans.xml
index 6e9b2428..03197886 100644
--- a/mdx/jp_gakunin/beans.xml
+++ b/mdx/jp_gakunin/beans.xml
@@ -15,9 +15,9 @@
     <!--
         Fetch the production aggregate.
     -->
-    <bean id="jp_gakunin_productionAggregate" parent="DomResourceSourceStage"
+    <bean id="jp_gakunin_productionAggregate" parent="DOMResourceSourceStage"
         p:id="jp_gakunin_productionAggregate">
-        <property name="domResource">
+        <property name="DOMResource">
             <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
                 <constructor-arg name="client" ref="httpClient"/>
                 <constructor-arg name="url" value="https://metadata.gakunin.nii.ac.jp/gakunin-metadata.xml"/>
diff --git a/mdx/lv_laife/beans.xml b/mdx/lv_laife/beans.xml
index b7a4cbb3..600ff14e 100644
--- a/mdx/lv_laife/beans.xml
+++ b/mdx/lv_laife/beans.xml
@@ -25,9 +25,9 @@
     <!--
         Fetch the production aggregate.
     -->
-    <bean id="lv_laife_productionAggregate" parent="DomResourceSourceStage"
+    <bean id="lv_laife_productionAggregate" parent="DOMResourceSourceStage"
         p:id="lv_laife_productionAggregate">
-        <property name="domResource">
+        <property name="DOMResource">
             <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
                 <constructor-arg name="client" ref="httpClient"/>
                 <constructor-arg name="url"    ref="lv_laife_productionAggregate_url"/>
@@ -38,9 +38,9 @@
     <!--
         Fetch the eduGAIN export aggregate.
     -->
-    <bean id="lv_laife_edugainAggregate" parent="DomResourceSourceStage"
+    <bean id="lv_laife_edugainAggregate" parent="DOMResourceSourceStage"
         p:id="lv_laife_edugainAggregate">
-        <property name="domResource">
+        <property name="DOMResource">
             <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
                 <constructor-arg name="client" ref="httpClient"/>
                 <constructor-arg name="url"    ref="lv_laife_edugainAggregate_url"/>
diff --git a/mdx/nl_surfconext/beans.xml b/mdx/nl_surfconext/beans.xml
index beedd21e..471d9ccd 100644
--- a/mdx/nl_surfconext/beans.xml
+++ b/mdx/nl_surfconext/beans.xml
@@ -43,9 +43,9 @@
     <!--
         Fetch the IdP aggregate.
     -->
-    <bean id="nl_surfconext_idpAggregate" parent="DomResourceSourceStage"
+    <bean id="nl_surfconext_idpAggregate" parent="DOMResourceSourceStage"
         p:id="nl_surfconext_idpAggregate">
-        <property name="domResource">
+        <property name="DOMResource">
             <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
                 <constructor-arg name="client" ref="httpClient"/>
                 <constructor-arg name="url" value="https://engine.surfconext.nl/authentication/proxy/idps-metadata"/>
@@ -56,9 +56,9 @@
     <!--
         Fetch the SP aggregate.
     -->
-    <bean id="nl_surfconext_spAggregate" parent="DomResourceSourceStage"
+    <bean id="nl_surfconext_spAggregate" parent="DOMResourceSourceStage"
         p:id="nl_surfconext_spAggregate">
-        <property name="domResource">
+        <property name="DOMResource">
             <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
                 <constructor-arg name="client" ref="httpClient"/>
                 <constructor-arg name="url" value="http://federatie.surfnet.nl/metadata-sfs-sp-saml20-signed.xml"/>
diff --git a/mdx/nl_surfnet/beans.xml b/mdx/nl_surfnet/beans.xml
index 2456cc4b..10b541cc 100644
--- a/mdx/nl_surfnet/beans.xml
+++ b/mdx/nl_surfnet/beans.xml
@@ -22,9 +22,9 @@
     <!--
         Fetch the eduGAIN export aggregate.
     -->
-    <bean id="nl_surfnet_edugainAggregate" parent="DomResourceSourceStage"
+    <bean id="nl_surfnet_edugainAggregate" parent="DOMResourceSourceStage"
         p:id="nl_surfnet_edugainAggregate">
-        <property name="domResource">
+        <property name="DOMResource">
             <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
                 <constructor-arg name="client" ref="httpClient"/>
                 <constructor-arg name="url"    ref="nl_surfnet_edugainAggregate_url"/>
@@ -55,9 +55,9 @@
     <!--
         Fetch the IdP aggregate.
     -->
-    <bean id="nl_surfnet_idpAggregate" parent="DomResourceSourceStage"
+    <bean id="nl_surfnet_idpAggregate" parent="DOMResourceSourceStage"
         p:id="nl_surfnet_idpAggregate">
-        <property name="domResource">
+        <property name="DOMResource">
             <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
                 <constructor-arg name="client" ref="httpClient"/>
                 <constructor-arg name="url" value="https://wayf.surfnet.nl/federate/metadata"/>
@@ -68,9 +68,9 @@
     <!--
         Fetch the SP aggregate.
     -->
-    <bean id="nl_surfnet_spAggregate" parent="DomResourceSourceStage"
+    <bean id="nl_surfnet_spAggregate" parent="DOMResourceSourceStage"
         p:id="nl_surfnet_spAggregate">
-        <property name="domResource">
+        <property name="DOMResource">
             <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
                 <constructor-arg name="client" ref="httpClient"/>
                 <constructor-arg name="url" value="http://federatie.surfnet.nl/metadata-sfs-sp-saml20-signed.xml"/>
diff --git a/mdx/no_feide/beans.xml b/mdx/no_feide/beans.xml
index a73b7ebc..4e9b0dc7 100644
--- a/mdx/no_feide/beans.xml
+++ b/mdx/no_feide/beans.xml
@@ -24,9 +24,9 @@
         
         FEIDE is a hub-and-spoke federation with a single IdP.  SP metadata is not published.
     -->
-    <bean id="no_feide_idpMetadata" parent="DomResourceSourceStage"
+    <bean id="no_feide_idpMetadata" parent="DOMResourceSourceStage"
         p:id="no_feide_idpMetadata">
-        <property name="domResource">
+        <property name="DOMResource">
             <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
                 <constructor-arg name="client" ref="httpClient"/>
                 <constructor-arg name="url" value="https://idp.feide.no/simplesaml/saml2/idp/metadata.php"/>
@@ -52,9 +52,9 @@
     <!--
         Fetch the eduGAIN export aggregate.
     -->
-    <bean id="no_feide_edugainAggregate" parent="DomResourceSourceStage"
+    <bean id="no_feide_edugainAggregate" parent="DOMResourceSourceStage"
         p:id="no_feide_edugainAggregate">
-        <property name="domResource">
+        <property name="DOMResource">
             <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
                 <constructor-arg name="client" ref="httpClient"/>
                 <constructor-arg name="url"    ref="no_feide_edugainAggregate_url"/>
diff --git a/mdx/nz_tuakiri/beans.xml b/mdx/nz_tuakiri/beans.xml
index d599ecb7..dd3c0089 100644
--- a/mdx/nz_tuakiri/beans.xml
+++ b/mdx/nz_tuakiri/beans.xml
@@ -15,9 +15,9 @@
     <!--
         Fetch the production aggregate.
     -->
-    <bean id="nz_tuakiri_productionAggregate" parent="DomResourceSourceStage"
+    <bean id="nz_tuakiri_productionAggregate" parent="DOMResourceSourceStage"
         p:id="nz_tuakiri_productionAggregate">
-        <property name="domResource">
+        <property name="DOMResource">
             <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
                 <constructor-arg name="client" ref="httpClient"/>
                 <constructor-arg name="url" value="http://directory.test.tuakiri.ac.nz/metadata/tuakiri-test-metadata-signed.xml"/>
diff --git a/mdx/se_swamid/beans.xml b/mdx/se_swamid/beans.xml
index 506ef842..c2a1d239 100644
--- a/mdx/se_swamid/beans.xml
+++ b/mdx/se_swamid/beans.xml
@@ -31,9 +31,9 @@
     <!--
         Fetch the production aggregate.
     -->
-    <bean id="se_swamid_productionAggregate" parent="DomResourceSourceStage"
+    <bean id="se_swamid_productionAggregate" parent="DOMResourceSourceStage"
         p:id="se_swamid_productionAggregate">
-        <property name="domResource">
+        <property name="DOMResource">
             <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
                 <constructor-arg name="client" ref="httpClient"/>
                 <constructor-arg name="url"    ref="se_swamid_productionAggregate_url"/>
@@ -44,9 +44,9 @@
     <!--
         Fetch the eduGAIN export aggregate.
     -->
-    <bean id="se_swamid_edugainAggregate" parent="DomResourceSourceStage"
+    <bean id="se_swamid_edugainAggregate" parent="DOMResourceSourceStage"
         p:id="se_swamid_edugainAggregate">
-        <property name="domResource">
+        <property name="DOMResource">
             <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
                 <constructor-arg name="client" ref="httpClient"/>
                 <constructor-arg name="url"    ref="se_swamid_edugainAggregate_url"/>
diff --git a/mdx/si_arnes/beans.xml b/mdx/si_arnes/beans.xml
index b8a36bc6..e095b737 100644
--- a/mdx/si_arnes/beans.xml
+++ b/mdx/si_arnes/beans.xml
@@ -15,9 +15,9 @@
     <!--
         Fetch the ARNES production aggregate.
     -->
-    <bean id="si_arnes_productionAggregate" parent="DomResourceSourceStage"
+    <bean id="si_arnes_productionAggregate" parent="DOMResourceSourceStage"
         p:id="si_arnes_productionAggregate">
-        <property name="domResource">
+        <property name="DOMResource">
             <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
                 <constructor-arg name="client" ref="httpClient"/>
                 <constructor-arg name="url" value="http://ds.aai.arnes.si/metadata/aai.arnes.si.signed.xml"/>
diff --git a/mdx/uk/beans.xml b/mdx/uk/beans.xml
index 0592f43a..c499dc0d 100644
--- a/mdx/uk/beans.xml
+++ b/mdx/uk/beans.xml
@@ -43,9 +43,9 @@
     <!--
         Fetch the export aggregate.
     -->
-    <bean id="uk_exportAggregate" parent="DomResourceSourceStage"
+    <bean id="uk_exportAggregate" parent="DOMResourceSourceStage"
         p:id="uk_exportAggregate">
-        <property name="domResource">
+        <property name="DOMResource">
             <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
                 <constructor-arg name="client" ref="httpClient"/>
                 <constructor-arg name="url" ref="uk_exportAggregate_url"/>        
@@ -57,9 +57,9 @@
     <!--
         Fetch the production aggregate.
     -->
-    <bean id="uk_productionAggregate" parent="DomResourceSourceStage"
+    <bean id="uk_productionAggregate" parent="DOMResourceSourceStage"
         p:id="uk_productionAggregate">
-        <property name="domResource">
+        <property name="DOMResource">
             <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
                 <constructor-arg name="client" ref="httpClient"/>
                 <constructor-arg name="url" ref="uk_productionAggregate_url"/>        
@@ -120,7 +120,7 @@
         eligible file matches a particular regular expression.
     -->
     <bean id="uk_fetchFragmentFiles" parent="stage_parent"
-        class="net.shibboleth.metadata.dom.DomFilesystemSourceStage"
+        class="net.shibboleth.metadata.dom.DOMFilesystemSourceStage"
         p:id="uk_fetchFragmentFiles">
         <property name="parserPool" ref="parserPool"/>
         <property name="source">
@@ -152,7 +152,7 @@
     -->
     <bean id="uk_processScopes" parent="XSLTransformationStage"
         p:id="uk_processScopes">
-        <property name="xslResource">
+        <property name="XSLResource">
             <bean parent="ClasspathResource">
                 <constructor-arg value="uk/scopes.xsl"/>
             </bean>
@@ -207,7 +207,7 @@
     -->
     <bean id="uk_fix_mailto" parent="XSLTransformationStage"
         p:id="uk_fix_mailto">
-        <property name="xslResource">
+        <property name="XSLResource">
             <bean parent="ClasspathResource">
                 <constructor-arg value="uk/fix_mailto.xsl"/>
             </bean>
@@ -225,7 +225,7 @@
     -->
     <bean id="uk_hide_idps" parent="XSLTransformationStage"
         p:id="uk_hide_idps">
-        <property name="xslResource">
+        <property name="XSLResource">
             <bean parent="ClasspathResource">
                 <constructor-arg value="uk/hide_idps.xsl"/>
             </bean>
@@ -240,7 +240,7 @@
     -->
     <bean id="check_ukreg" parent="XSLValidationStage"
         p:id="check_ukreg">
-        <property name="xslResource">
+        <property name="XSLResource">
             <bean parent="FilesystemResource">
                 <constructor-arg value="#{ systemProperties['basedir'] }/mdx/uk/check_ukreg.xsl"/>
             </bean>
@@ -258,7 +258,7 @@
     -->
     <bean id="check_uk_mdrps" parent="XSLValidationStage"
         p:id="check_uk_mdrps">
-        <property name="xslResource">
+        <property name="XSLResource">
             <bean parent="FilesystemResource">
                 <constructor-arg value="#{ systemProperties['basedir'] }/mdx/uk/check_uk_mdrps.xsl"/>
             </bean>
@@ -271,7 +271,7 @@
     -->
     <bean id="check_uk_urlenc" parent="XSLValidationStage"
         p:id="check_uk_urlenc">
-        <property name="xslResource">
+        <property name="XSLResource">
             <bean parent="FilesystemResource">
                 <constructor-arg value="#{ systemProperties['basedir'] }/mdx/uk/check_uk_urlenc.xsl"/>
             </bean>
@@ -301,7 +301,7 @@
     -->
     <bean id="uk_addTrustRoots" parent="XSLTransformationStage"
         p:id="uk_addTrustRoots">
-        <property name="xslResource">
+        <property name="XSLResource">
             <bean parent="ClasspathResource">
                 <constructor-arg value="uk/trust-roots.xsl"/>
             </bean>
@@ -321,7 +321,7 @@
     -->
     <bean id="uk_processFragment" parent="XSLTransformationStage"
         p:id="uk_processFragment">
-        <property name="xslResource">
+        <property name="XSLResource">
             <bean parent="ClasspathResource">
                 <constructor-arg value="uk/fragment.xsl"/>
             </bean>
@@ -421,7 +421,7 @@
     -->
     <bean id="uk_stripExtensions" parent="XSLTransformationStage"
         p:id="uk_stripExtensions">
-        <property name="xslResource">
+        <property name="XSLResource">
             <bean parent="ClasspathResource">
                 <constructor-arg value="uk/strip_extensions.xsl"/>
             </bean>
@@ -446,7 +446,7 @@
     -->
     <bean id="uk_normaliseNamespaces" parent="XSLTransformationStage"
         p:id="uk_normaliseNamespaces">
-        <property name="xslResource">
+        <property name="XSLResource">
             <bean parent="FilesystemResource">
                 <constructor-arg value="#{ systemProperties['basedir'] }/mdx/uk/ns_norm_uk.xsl"/>
             </bean>
@@ -521,7 +521,7 @@
     -->
     <bean id="uk_generateStatistics" parent="XSLTransformationStage"
         p:id="uk_generateStatistics">
-        <property name="xslResource">
+        <property name="XSLResource">
             <bean parent="ClasspathResource">
                 <constructor-arg value="uk/statistics.xsl"/>
             </bean>
diff --git a/mdx/uk/generate.xml b/mdx/uk/generate.xml
index c41ce6b9..287eaf4b 100644
--- a/mdx/uk/generate.xml
+++ b/mdx/uk/generate.xml
@@ -47,7 +47,7 @@
     -->
     <bean id="stripEntityScopes" parent="XSLTransformationStage"
         p:id="stripEntityScopes">
-        <property name="xslResource">
+        <property name="XSLResource">
             <bean parent="ClasspathResource">
                 <constructor-arg value="uk/entity_scopes.xsl"/>
             </bean>
@@ -61,7 +61,7 @@
         final tweaks on the document.
     -->
     <bean id="finalise_parent" abstract="true" parent="XSLTransformationStage">
-        <property name="xslResource">
+        <property name="XSLResource">
             <bean parent="ClasspathResource">
                 <constructor-arg value="uk/final_tweak.xsl"/>
             </bean>
@@ -120,7 +120,7 @@
     -->
     <bean id="fixup_keyuse" parent="XSLTransformationStage"
         p:id="fixup_keyuse">
-        <property name="xslResource">
+        <property name="XSLResource">
             <bean parent="ClasspathResource">
                 <constructor-arg value="uk/fixup_keyuse.xsl"/>
             </bean>
@@ -149,7 +149,7 @@
     -->
     <bean id="check_fixup_encmethod" parent="XSLValidationStage"
         p:id="check_fixup_encmethod">
-        <property name="xslResource">
+        <property name="XSLResource">
             <bean parent="FilesystemResource">
                 <constructor-arg value="#{ systemProperties['basedir'] }/mdx/uk/check_fixup_encmethod.xsl"/>
             </bean>
@@ -161,7 +161,7 @@
     -->
     <bean id="check_fixup_keyuse" parent="XSLValidationStage"
         p:id="check_fixup_keyuse">
-        <property name="xslResource">
+        <property name="XSLResource">
             <bean parent="FilesystemResource">
                 <constructor-arg value="#{ systemProperties['basedir'] }/mdx/uk/check_fixup_keyuse.xsl"/>
             </bean>
@@ -501,7 +501,7 @@
     
     <bean id="CDSNormaliseNamespaces" parent="XSLTransformationStage"
         p:id="CDSNormaliseNamespaces">
-        <property name="xslResource">
+        <property name="XSLResource">
             <bean parent="FilesystemResource">
                 <constructor-arg value="#{ systemProperties['basedir'] }/mdx/uk/ns_norm_cds.xsl"/>
             </bean>
@@ -583,7 +583,7 @@
     
     <bean id="uk_normaliseFallback" parent="XSLTransformationStage"
         p:id="uk_normaliseFallback">
-        <property name="xslResource">
+        <property name="XSLResource">
             <bean parent="FilesystemResource">
                 <constructor-arg value="#{ systemProperties['basedir'] }/mdx/uk/ns_norm_back.xsl"/>
             </bean>
@@ -647,7 +647,7 @@
     
     <bean id="uk_normaliseTest" parent="XSLTransformationStage"
         p:id="uk_normaliseTest">
-        <property name="xslResource">
+        <property name="XSLResource">
             <bean parent="FilesystemResource">
                 <constructor-arg value="#{ systemProperties['basedir'] }/mdx/uk/ns_norm_test.xsl"/>
             </bean>
@@ -710,7 +710,7 @@
     
     <bean id="uk_normaliseExport" parent="XSLTransformationStage"
         p:id="uk_normaliseExport">
-        <property name="xslResource">
+        <property name="XSLResource">
             <bean parent="FilesystemResource">
                 <constructor-arg value="#{ systemProperties['basedir'] }/mdx/uk/ns_norm_export.xsl"/>
             </bean>
diff --git a/mdx/uk/verbs.xml b/mdx/uk/verbs.xml
index 7e94f1cc..e57c5aa1 100644
--- a/mdx/uk/verbs.xml
+++ b/mdx/uk/verbs.xml
@@ -191,7 +191,7 @@
         Fetches the contents of the file used to hold metadata to be imported
         into a UK federation fragment file.
     -->
-    <bean id="fetchImportMetadata" parent="DomFilesystemSourceStage"
+    <bean id="fetchImportMetadata" parent="DOMFilesystemSourceStage"
         p:id="fetchImportMetadata">
         <property name="source">
             <bean class="java.io.File">
@@ -206,7 +206,7 @@
         Fetches the contents of the file used to hold metadata just imported
         by the federation's import transform.
     -->
-    <bean id="fetchImportedMetadata" parent="DomFilesystemSourceStage"
+    <bean id="fetchImportedMetadata" parent="DOMFilesystemSourceStage"
         p:id="fetchImportedMetadata">
         <property name="source">
             <bean class="java.io.File">
diff --git a/mdx/uk_eduserv/beans.xml b/mdx/uk_eduserv/beans.xml
index 746b7f7e..e55986a5 100644
--- a/mdx/uk_eduserv/beans.xml
+++ b/mdx/uk_eduserv/beans.xml
@@ -15,9 +15,9 @@
     <!--
         Fetch the export metadata aggregate.
     -->
-    <bean id="uk_eduserv_exportAggregate" parent="DomResourceSourceStage"
+    <bean id="uk_eduserv_exportAggregate" parent="DOMResourceSourceStage"
         p:id="uk_eduserv_exportAggregate">
-        <property name="domResource">
+        <property name="DOMResource">
             <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
                 <constructor-arg name="client" ref="httpClient"/>
                 <constructor-arg name="url" value="https://auth.athensams.net/saml/metadata?name=ukfederation"/>
diff --git a/mdx/us_incommon/beans.xml b/mdx/us_incommon/beans.xml
index 5afde8ec..c2c5c4e9 100644
--- a/mdx/us_incommon/beans.xml
+++ b/mdx/us_incommon/beans.xml
@@ -22,9 +22,9 @@
     <!--
         Fetch the production aggregate.
     -->
-    <bean id="us_incommon_productionAggregate" parent="DomResourceSourceStage"
+    <bean id="us_incommon_productionAggregate" parent="DOMResourceSourceStage"
         p:id="us_incommon_productionAggregate">
-        <property name="domResource">
+        <property name="DOMResource">
             <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
                 <constructor-arg name="client" ref="httpClient"/>
                 <constructor-arg name="url"    ref="us_incommon_productionAggregate_url"/>
diff --git a/mdx/validation-beans.xml b/mdx/validation-beans.xml
index 0706ddde..4bc41403 100644
--- a/mdx/validation-beans.xml
+++ b/mdx/validation-beans.xml
@@ -37,7 +37,7 @@
     -->
     <bean id="check_future_0" parent="XSLValidationStage"
         p:id="check_future_0">
-        <property name="xslResource">
+        <property name="XSLResource">
             <bean parent="FilesystemResource">
                 <constructor-arg value="#{ systemProperties['rulesdir'] }/check_future_0.xsl"/>
             </bean>
@@ -49,7 +49,7 @@
     -->
     <bean id="check_future_1" parent="XSLValidationStage"
         p:id="check_future_1">
-        <property name="xslResource">
+        <property name="XSLResource">
             <bean parent="FilesystemResource">
                 <constructor-arg value="#{ systemProperties['rulesdir'] }/check_future_1.xsl"/>
             </bean>
@@ -61,7 +61,7 @@
     -->
     <bean id="check_future_2" parent="XSLValidationStage"
         p:id="check_future_2">
-        <property name="xslResource">
+        <property name="XSLResource">
             <bean parent="FilesystemResource">
                 <constructor-arg value="#{ systemProperties['rulesdir'] }/check_future_2.xsl"/>
             </bean>
@@ -73,7 +73,7 @@
     -->
     <bean id="check_future_3" parent="XSLValidationStage"
         p:id="check_future_3">
-        <property name="xslResource">
+        <property name="XSLResource">
             <bean parent="FilesystemResource">
                 <constructor-arg value="#{ systemProperties['rulesdir'] }/check_future_3.xsl"/>
             </bean>
@@ -85,7 +85,7 @@
     -->
     <bean id="check_future_4" parent="XSLValidationStage"
         p:id="check_future_4">
-        <property name="xslResource">
+        <property name="XSLResource">
             <bean parent="FilesystemResource">
                 <constructor-arg value="#{ systemProperties['rulesdir'] }/check_future_4.xsl"/>
             </bean>
@@ -97,7 +97,7 @@
     -->
     <bean id="check_future_5" parent="XSLValidationStage"
         p:id="check_future_5">
-        <property name="xslResource">
+        <property name="XSLResource">
             <bean parent="FilesystemResource">
                 <constructor-arg value="#{ systemProperties['rulesdir'] }/check_future_5.xsl"/>
             </bean>
@@ -109,7 +109,7 @@
     -->
     <bean id="check_future_6" parent="XSLValidationStage"
         p:id="check_future_6">
-        <property name="xslResource">
+        <property name="XSLResource">
             <bean parent="FilesystemResource">
                 <constructor-arg value="#{ systemProperties['rulesdir'] }/check_future_6.xsl"/>
             </bean>
@@ -121,7 +121,7 @@
     -->
     <bean id="check_future_7" parent="XSLValidationStage"
         p:id="check_future_7">
-        <property name="xslResource">
+        <property name="XSLResource">
             <bean parent="FilesystemResource">
                 <constructor-arg value="#{ systemProperties['rulesdir'] }/check_future_7.xsl"/>
             </bean>
@@ -133,7 +133,7 @@
     -->
     <bean id="check_future_8" parent="XSLValidationStage"
         p:id="check_future_8">
-        <property name="xslResource">
+        <property name="XSLResource">
             <bean parent="FilesystemResource">
                 <constructor-arg value="#{ systemProperties['rulesdir'] }/check_future_8.xsl"/>
             </bean>
@@ -145,7 +145,7 @@
     -->
     <bean id="check_future_9" parent="XSLValidationStage"
         p:id="check_future_9">
-        <property name="xslResource">
+        <property name="XSLResource">
             <bean parent="FilesystemResource">
                 <constructor-arg value="#{ systemProperties['rulesdir'] }/check_future_9.xsl"/>
             </bean>
@@ -190,7 +190,7 @@
     -->
     <bean id="check_algsupport" parent="XSLValidationStage"
         p:id="check_algsupport">
-        <property name="xslResource">
+        <property name="XSLResource">
             <bean parent="FilesystemResource">
                 <constructor-arg value="#{ systemProperties['rulesdir'] }/check_algsupport.xsl"/>
             </bean>
@@ -212,7 +212,7 @@
     -->
     <bean id="check_adfs" parent="XSLValidationStage"
         p:id="check_adfs">
-        <property name="xslResource">
+        <property name="XSLResource">
             <bean parent="FilesystemResource">
                 <constructor-arg value="#{ systemProperties['rulesdir'] }/check_adfs.xsl"/>
             </bean>
@@ -224,7 +224,7 @@
     -->
     <bean id="check_bindings" parent="XSLValidationStage"
         p:id="check_bindings">
-        <property name="xslResource">
+        <property name="XSLResource">
             <bean parent="FilesystemResource">
                 <constructor-arg value="#{ systemProperties['rulesdir'] }/check_bindings.xsl"/>
             </bean>
@@ -236,7 +236,7 @@
     -->
     <bean id="check_filtered" parent="XSLValidationStage"
         p:id="check_filtered">
-        <property name="xslResource">
+        <property name="XSLResource">
             <bean parent="FilesystemResource">
                 <constructor-arg value="#{ systemProperties['rulesdir'] }/check_filtered.xsl"/>
             </bean>
@@ -248,7 +248,7 @@
     -->
     <bean id="check_hoksso" parent="XSLValidationStage"
         p:id="check_hoksso">
-        <property name="xslResource">
+        <property name="XSLResource">
             <bean parent="FilesystemResource">
                 <constructor-arg value="#{ systemProperties['rulesdir'] }/check_hoksso.xsl"/>
             </bean>
@@ -260,7 +260,7 @@
     -->
     <bean id="check_idpdisc" parent="XSLValidationStage"
         p:id="check_idpdisc">
-        <property name="xslResource">
+        <property name="XSLResource">
             <bean parent="FilesystemResource">
                 <constructor-arg value="#{ systemProperties['rulesdir'] }/check_idpdisc.xsl"/>
             </bean>
@@ -272,7 +272,7 @@
     -->
     <bean id="check_imported" parent="XSLValidationStage"
         p:id="check_imported">
-        <property name="xslResource">
+        <property name="XSLResource">
             <bean parent="FilesystemResource">
                 <constructor-arg value="#{ systemProperties['rulesdir'] }/check_imported.xsl"/>
             </bean>
@@ -284,7 +284,7 @@
     -->
     <bean id="check_init" parent="XSLValidationStage"
         p:id="check_init">
-        <property name="xslResource">
+        <property name="XSLResource">
             <bean parent="FilesystemResource">
                 <constructor-arg value="#{ systemProperties['rulesdir'] }/check_init.xsl"/>
             </bean>
@@ -296,7 +296,7 @@
     -->
     <bean id="check_mdiop" parent="XSLValidationStage"
         p:id="check_mdiop">
-        <property name="xslResource">
+        <property name="XSLResource">
             <bean parent="FilesystemResource">
                 <constructor-arg value="#{ systemProperties['rulesdir'] }/check_mdiop.xsl"/>
             </bean>
@@ -318,7 +318,7 @@
     -->
     <bean id="check_mdrpi_xslt" parent="XSLValidationStage"
         p:id="check_mdrpi_xslt">
-        <property name="xslResource">
+        <property name="XSLResource">
             <bean parent="FilesystemResource">
                 <constructor-arg value="#{ systemProperties['rulesdir'] }/check_mdrpi.xsl"/>
             </bean>
@@ -348,7 +348,7 @@
         channel must match the known registration authority value.
     -->
     <bean id="check_regauth_parent" abstract="true" parent="XSLValidationStage">
-        <property name="xslResource">
+        <property name="XSLResource">
             <bean parent="FilesystemResource">
                 <constructor-arg value="#{ systemProperties['rulesdir'] }/check_regauth.xsl"/>
             </bean>
@@ -362,7 +362,7 @@
     -->
     <bean id="check_hasreginfo" parent="XSLValidationStage"
         p:id="check_hasreginfo">
-        <property name="xslResource">
+        <property name="XSLResource">
             <bean parent="FilesystemResource" c:resourcePath="#{ systemProperties['rulesdir'] }/check_hasreginfo.xsl"/>
         </property>
     </bean>
@@ -392,7 +392,7 @@
     -->
     <bean id="check_mdui_xslt" parent="XSLValidationStage"
         p:id="check_mdui_xslt">
-        <property name="xslResource">
+        <property name="XSLResource">
             <bean parent="FilesystemResource">
                 <constructor-arg value="#{ systemProperties['rulesdir'] }/check_mdui.xsl"/>
             </bean>
@@ -409,7 +409,7 @@
     -->
     <bean id="mdui_dn_en_match" parent="XSLValidationStage"
         p:id="mdui_dn_en_match">
-        <property name="xslResource">
+        <property name="XSLResource">
             <bean parent="FilesystemResource">
                 <constructor-arg value="#{ systemProperties['rulesdir'] }/mdui_dn_en_match.xsl"/>
             </bean>
@@ -424,7 +424,7 @@
     -->
     <bean id="mdui_dn_en_present" parent="XSLValidationStage"
         p:id="mdui_dn_en_present">
-        <property name="xslResource">
+        <property name="XSLResource">
             <bean parent="FilesystemResource">
                 <constructor-arg value="#{ systemProperties['rulesdir'] }/mdui_dn_en_present.xsl"/>
             </bean>
@@ -465,7 +465,7 @@
     -->
     <bean id="check_misc" parent="XSLValidationStage"
         p:id="check_misc">
-        <property name="xslResource">
+        <property name="XSLResource">
             <bean parent="FilesystemResource">
                 <constructor-arg value="#{ systemProperties['rulesdir'] }/check_misc.xsl"/>
             </bean>
@@ -477,7 +477,7 @@
     -->
     <bean id="check_namespaces" parent="XSLValidationStage"
         p:id="check_namespaces">
-        <property name="xslResource">
+        <property name="XSLResource">
             <bean parent="FilesystemResource">
                 <constructor-arg value="#{ systemProperties['rulesdir'] }/check_namespaces.xsl"/>
             </bean>
@@ -489,7 +489,7 @@
     -->
     <bean id="check_nokeyname" parent="XSLValidationStage"
         p:id="check_nokeyname">
-        <property name="xslResource">
+        <property name="XSLResource">
             <bean parent="FilesystemResource">
                 <constructor-arg value="#{ systemProperties['rulesdir'] }/check_nokeyname.xsl"/>
             </bean>
@@ -503,7 +503,7 @@
     -->
     <bean id="check_regscope" parent="XSLValidationStage"
         p:id="check_regscope">
-        <property name="xslResource">
+        <property name="XSLResource">
             <bean parent="FilesystemResource">
                 <constructor-arg value="#{ systemProperties['rulesdir'] }/check_regscope.xsl"/>
             </bean>
@@ -515,7 +515,7 @@
     -->
     <bean id="check_reqattr" parent="XSLValidationStage"
         p:id="check_reqattr">
-        <property name="xslResource">
+        <property name="XSLResource">
             <bean parent="FilesystemResource">
                 <constructor-arg value="#{ systemProperties['rulesdir'] }/check_reqattr.xsl"/>
             </bean>
@@ -527,7 +527,7 @@
     -->
     <bean id="check_saml2int" parent="XSLValidationStage"
         p:id="check_saml2int">
-        <property name="xslResource">
+        <property name="XSLResource">
             <bean parent="FilesystemResource">
                 <constructor-arg value="#{ systemProperties['rulesdir'] }/check_saml2int.xsl"/>
             </bean>
@@ -539,7 +539,7 @@
     -->
     <bean id="check_saml1" parent="XSLValidationStage"
         p:id="check_saml1">
-        <property name="xslResource">
+        <property name="XSLResource">
             <bean parent="FilesystemResource">
                 <constructor-arg value="#{ systemProperties['rulesdir'] }/check_saml1.xsl"/>
             </bean>
@@ -551,7 +551,7 @@
     -->
     <bean id="check_saml2" parent="XSLValidationStage"
         p:id="check_saml2">
-        <property name="xslResource">
+        <property name="XSLResource">
             <bean parent="FilesystemResource">
                 <constructor-arg value="#{ systemProperties['rulesdir'] }/check_saml2.xsl"/>
             </bean>
@@ -563,7 +563,7 @@
     -->
     <bean id="check_saml2meta" parent="XSLValidationStage"
         p:id="check_saml2meta">
-        <property name="xslResource">
+        <property name="XSLResource">
             <bean parent="FilesystemResource">
                 <constructor-arg value="#{ systemProperties['rulesdir'] }/check_saml2meta.xsl"/>
             </bean>
@@ -575,7 +575,7 @@
     -->
     <bean id="check_shibboleth" parent="XSLValidationStage"
         p:id="check_shibboleth">
-        <property name="xslResource">
+        <property name="XSLResource">
             <bean parent="FilesystemResource">
                 <constructor-arg value="#{ systemProperties['rulesdir'] }/check_shibboleth.xsl"/>
             </bean>
@@ -607,7 +607,7 @@
     -->
     <bean id="check_vhosts" parent="XSLValidationStage"
         p:id="check_vhosts">
-        <property name="xslResource">
+        <property name="XSLResource">
             <bean parent="FilesystemResource">
                 <constructor-arg value="#{ systemProperties['rulesdir'] }/check_vhosts.xsl"/>
             </bean>
@@ -627,7 +627,7 @@
     -->
     <bean id="check_incmd" parent="XSLValidationStage"
         p:id="check_incmd">
-        <property name="xslResource">
+        <property name="XSLResource">
             <bean parent="FilesystemResource" c:resourcePath="#{ systemProperties['rulesdir'] }/check_incmd.xsl"/>
         </property>
     </bean>
@@ -645,7 +645,7 @@
     -->
     <bean id="check_uk_trust" parent="XSLValidationStage"
         p:id="check_uk_trust">
-        <property name="xslResource">
+        <property name="XSLResource">
             <bean parent="FilesystemResource">
                 <constructor-arg value="#{ systemProperties['rulesdir'] }/check_uk_trust.xsl"/>
             </bean>
@@ -674,7 +674,7 @@
     -->
     <bean id="check_aggregate" parent="XSLValidationStage"
         p:id="check_aggregate">
-        <property name="xslResource">
+        <property name="XSLResource">
             <bean parent="FilesystemResource">
                 <constructor-arg value="#{ systemProperties['rulesdir'] }/check_aggregate.xsl"/>
             </bean>
diff --git a/tools/ukf-mda/ukf-mda-0.7.4.jar b/tools/ukf-mda/ukf-mda-0.7.4.jar
deleted file mode 100644
index 9a966569..00000000
Binary files a/tools/ukf-mda/ukf-mda-0.7.4.jar and /dev/null differ
diff --git a/tools/ukf-mda/ukf-mda-0.8.0.jar b/tools/ukf-mda/ukf-mda-0.8.0.jar
new file mode 100644
index 00000000..56fb5b11
Binary files /dev/null and b/tools/ukf-mda/ukf-mda-0.8.0.jar differ