diff --git a/mdx/aaf/aaf-beans.xml b/mdx/aaf/aaf-beans.xml
index 0bf1149d..51174904 100644
--- a/mdx/aaf/aaf-beans.xml
+++ b/mdx/aaf/aaf-beans.xml
@@ -9,7 +9,7 @@
         Fetch the AAF export metadata aggregate.  For the moment, use the production aggregate in lieu
         of a designated export aggregate.
     -->
-    <bean id="fetchAafExportAggregate" class="net.shibboleth.metadata.dom.stage.DomHttpSourceStage">
+    <bean id="fetchAafExportAggregate" class="net.shibboleth.metadata.dom.DomHttpSourceStage">
         <property name="id" value="fetchAafExportAggregate"/>
         <property name="parserPool" ref="parserPool"/>
         <property name="sourceUrl" value="http://manager.aaf.edu.au/metadata/metadata.aaf.signed.xml"/>        
@@ -29,7 +29,7 @@
     <!--
         Check AAF signing signature.
     -->
-    <bean id="checkAafSignature" class="net.shibboleth.metadata.dom.stage.XMLSignatureValidationStage">
+    <bean id="checkAafSignature" class="net.shibboleth.metadata.dom.XMLSignatureValidationStage">
         <property name="id" value="checkAafSignature"/>
         <property name="verificationCertificate" ref="aafSigningCertificate"/>
     </bean>
diff --git a/mdx/arnes/arnes-beans.xml b/mdx/arnes/arnes-beans.xml
index 0a0023ca..c1ccd956 100644
--- a/mdx/arnes/arnes-beans.xml
+++ b/mdx/arnes/arnes-beans.xml
@@ -9,7 +9,7 @@
         Fetch the ARNES export metadata aggregate.  For the moment, use the production aggregate in lieu
         of a designated export aggregate.
     -->
-    <bean id="fetchArnesExportAggregate" class="net.shibboleth.metadata.dom.stage.DomHttpSourceStage">
+    <bean id="fetchArnesExportAggregate" class="net.shibboleth.metadata.dom.DomHttpSourceStage">
         <property name="id" value="fetchArnesExportAggregate"/>
         <property name="parserPool" ref="parserPool"/>
         <property name="sourceUrl" value="http://ds.aai.arnes.si/metadata/aai.arnes.si.signed.xml"/>        
@@ -29,7 +29,7 @@
     <!--
         Check ARNES signing signature.
     -->
-    <bean id="checkArnesSignature" class="net.shibboleth.metadata.dom.stage.XMLSignatureValidationStage">
+    <bean id="checkArnesSignature" class="net.shibboleth.metadata.dom.XMLSignatureValidationStage">
         <property name="id" value="checkArnesSignature"/>
         <property name="verificationCertificate" ref="arnesSigningCertificate"/>
     </bean>
diff --git a/mdx/caf/caf-beans.xml b/mdx/caf/caf-beans.xml
index cd8a560c..733ff20e 100644
--- a/mdx/caf/caf-beans.xml
+++ b/mdx/caf/caf-beans.xml
@@ -9,7 +9,7 @@
         Fetch the CAF export metadata aggregate.  For the moment, use the production aggregate in lieu
         of a designated export aggregate.
     -->
-    <bean id="fetchCafExportAggregate" class="net.shibboleth.metadata.dom.stage.DomHttpSourceStage">
+    <bean id="fetchCafExportAggregate" class="net.shibboleth.metadata.dom.DomHttpSourceStage">
         <property name="id" value="fetchCafExportAggregate"/>
         <property name="parserPool" ref="parserPool"/>
         <property name="sourceUrl" value="https://caf-shibops.ca/CoreServices/cafshib_metadata_signed.xml"/>        
@@ -29,7 +29,7 @@
     <!--
         Check CAF signing signature.
     -->
-    <bean id="checkCafSignature" class="net.shibboleth.metadata.dom.stage.XMLSignatureValidationStage">
+    <bean id="checkCafSignature" class="net.shibboleth.metadata.dom.XMLSignatureValidationStage">
         <property name="id" value="checkCafSignature"/>
         <property name="verificationCertificate" ref="cafSigningCertificate"/>
     </bean>
diff --git a/mdx/common-beans.xml b/mdx/common-beans.xml
index cf59bae4..e3b99861 100644
--- a/mdx/common-beans.xml
+++ b/mdx/common-beans.xml
@@ -101,7 +101,7 @@
         
         A pipeline stage that checks against all the common schemas, as above.
     -->
-    <bean id="checkSchemas" class="net.shibboleth.metadata.dom.stage.XMLSchemaValidationStage">
+    <bean id="checkSchemas" class="net.shibboleth.metadata.dom.XMLSchemaValidationStage">
         <property name="id" value="checkSchemas"/>
         <property name="schemaResources" ref="schemaResources"/>
     </bean>
@@ -123,7 +123,7 @@
         presented, for example by removing redundant attributes or elements which only have
         meaning when added by the UK federation registrar.
     -->
-    <bean id="cleanImport" class="net.shibboleth.metadata.dom.stage.XSLTStage">
+    <bean id="cleanImport" class="net.shibboleth.metadata.dom.XSLTStage">
         <property name="id" value="cleanImport"/>
         <property name="xslResource">
             <bean class="org.opensaml.util.resource.FilesystemResource">
diff --git a/mdx/edugain/edugain-beans.xml b/mdx/edugain/edugain-beans.xml
index 6fc8cfa7..f80f154f 100644
--- a/mdx/edugain/edugain-beans.xml
+++ b/mdx/edugain/edugain-beans.xml
@@ -9,7 +9,7 @@
         http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
         http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-3.0.xsd">
     
-    <bean id="fetchEduGainExportAggregate" class="net.shibboleth.metadata.dom.stage.DomHttpSourceStage">
+    <bean id="fetchEduGainExportAggregate" class="net.shibboleth.metadata.dom.DomHttpSourceStage">
         <property name="id" value="fetchEduGainExportAggregate"/>
         <property name="parserPool" ref="parserPool"/>
         <property name="sourceUrl" value="http://mds.edugain.org"/>
@@ -26,7 +26,7 @@
         </property>
     </bean>
     
-    <bean id="checkEdugainSignature" class="net.shibboleth.metadata.dom.stage.XMLSignatureValidationStage">
+    <bean id="checkEdugainSignature" class="net.shibboleth.metadata.dom.XMLSignatureValidationStage">
         <property name="id" value="checkEdugainSignature"/>
         <property name="verificationCertificate" ref="edugainSigningCertificate"/>
     </bean>
diff --git a/mdx/edugate/edugate-beans.xml b/mdx/edugate/edugate-beans.xml
index 08e97fd3..133ae9ba 100644
--- a/mdx/edugate/edugate-beans.xml
+++ b/mdx/edugate/edugate-beans.xml
@@ -9,7 +9,7 @@
         Fetch the Edugate metadata aggregate.  For the moment, use the production aggregate in lieu
         of a designated export aggregate.
     -->
-    <bean id="fetchEdugateExportAggregate" class="net.shibboleth.metadata.dom.stage.DomHttpSourceStage">
+    <bean id="fetchEdugateExportAggregate" class="net.shibboleth.metadata.dom.DomHttpSourceStage">
         <property name="id" value="fetchEdugateExportAggregate"/>
         <property name="parserPool" ref="parserPool"/>
         <property name="sourceUrl" value="https://edugate.heanet.ie/edugate-metadata-signed.xml"/>        
@@ -26,7 +26,7 @@
         </property>
     </bean>
     
-    <bean id="checkEdugateSignature" class="net.shibboleth.metadata.dom.stage.XMLSignatureValidationStage">
+    <bean id="checkEdugateSignature" class="net.shibboleth.metadata.dom.XMLSignatureValidationStage">
         <property name="id" value="checkEdugateSignature"/>
         <property name="verificationCertificate" ref="edugateSigningCertificate"/>
     </bean>
diff --git a/mdx/incommon/incommon-beans.xml b/mdx/incommon/incommon-beans.xml
index f509fdd1..8444de1c 100644
--- a/mdx/incommon/incommon-beans.xml
+++ b/mdx/incommon/incommon-beans.xml
@@ -9,7 +9,7 @@
         Fetch the InCommon export metadata aggregate.  For the moment, use the production aggregate in lieu
         of a designated export aggregate.
     -->
-    <bean id="fetchInCommonExportAggregate" class="net.shibboleth.metadata.dom.stage.DomHttpSourceStage">
+    <bean id="fetchInCommonExportAggregate" class="net.shibboleth.metadata.dom.DomHttpSourceStage">
         <property name="id" value="fetchInCommonExportAggregate"/>
         <property name="parserPool" ref="parserPool"/>
         <property name="sourceUrl" value="http://wayf.incommonfederation.org/InCommon/InCommon-metadata.xml"/>        
@@ -29,7 +29,7 @@
     <!--
         Check InCommon signing signature.
     -->
-    <bean id="checkInCommonSignature" class="net.shibboleth.metadata.dom.stage.XMLSignatureValidationStage">
+    <bean id="checkInCommonSignature" class="net.shibboleth.metadata.dom.XMLSignatureValidationStage">
         <property name="id" value="checkInCommonSignature"/>
         <property name="verificationCertificate" ref="inCommonSigningCertificate"/>
     </bean>
diff --git a/mdx/swamid/swamid-beans.xml b/mdx/swamid/swamid-beans.xml
index 441de1a8..d54638b3 100644
--- a/mdx/swamid/swamid-beans.xml
+++ b/mdx/swamid/swamid-beans.xml
@@ -9,7 +9,7 @@
         Fetch the SWAMID export metadata aggregate.  For the moment, use the production aggregate in lieu
         of a designated export aggregate.
     -->
-    <bean id="fetchSwamidExportAggregate" class="net.shibboleth.metadata.dom.stage.DomHttpSourceStage">
+    <bean id="fetchSwamidExportAggregate" class="net.shibboleth.metadata.dom.DomHttpSourceStage">
         <property name="id" value="fetchSwamidExportAggregate"/>
         <property name="parserPool" ref="parserPool"/>
         <property name="sourceUrl" value="http://md.swamid.se/md/swamid-1.0.xml"/>        
@@ -29,7 +29,7 @@
     <!--
         Check SWAMID signing signature.
     -->
-    <bean id="checkSwamidSignature" class="net.shibboleth.metadata.dom.stage.XMLSignatureValidationStage">
+    <bean id="checkSwamidSignature" class="net.shibboleth.metadata.dom.XMLSignatureValidationStage">
         <property name="id" value="checkSwamidSignature"/>
         <property name="verificationCertificate" ref="swamidSigningCertificate"/>
     </bean>
diff --git a/mdx/switch/switch-beans.xml b/mdx/switch/switch-beans.xml
index 7fd7997b..b8f2f996 100644
--- a/mdx/switch/switch-beans.xml
+++ b/mdx/switch/switch-beans.xml
@@ -9,7 +9,7 @@
         Fetch the SWITCH metadata aggregate.  For the moment, use the production aggregate in lieu
         of a designated export aggregate.
     -->
-    <bean id="fetchSwitchExportAggregate" class="net.shibboleth.metadata.dom.stage.DomHttpSourceStage">
+    <bean id="fetchSwitchExportAggregate" class="net.shibboleth.metadata.dom.DomHttpSourceStage">
         <property name="id" value="fetchSwitchExportAggregate"/>
         <property name="parserPool" ref="parserPool"/>
         <property name="sourceUrl" value="http://switch.ch/aai/federation/SWITCHaai/metadata.switchaai_signed.xml"/>        
@@ -26,7 +26,7 @@
         </property>
     </bean>
     
-    <bean id="checkSwitchSignature" class="net.shibboleth.metadata.dom.stage.XMLSignatureValidationStage">
+    <bean id="checkSwitchSignature" class="net.shibboleth.metadata.dom.XMLSignatureValidationStage">
         <property name="id" value="checkSwitchSignature"/>
         <property name="verificationCertificate" ref="switchSigningCertificate"/>
     </bean>
diff --git a/mdx/uk/uk-collect.xml b/mdx/uk/uk-collect.xml
index 7947cde1..7c529bd2 100644
--- a/mdx/uk/uk-collect.xml
+++ b/mdx/uk/uk-collect.xml
@@ -25,7 +25,7 @@
         <constructor-arg name="prefixMappings" ref="commonNamespaces"/>
     </bean>
     
-    <bean id="fetchUkFragmentFiles" class="net.shibboleth.metadata.dom.stage.DomFilesystemSourceStage">
+    <bean id="fetchUkFragmentFiles" class="net.shibboleth.metadata.dom.DomFilesystemSourceStage">
         <property name="id" value="fetchUkFragmentFiles"/>
         <property name="parserPool" ref="parserPool"/>
         <property name="source">